From 48c82810715011513dc38dc1fd39d67134d899c5 Mon Sep 17 00:00:00 2001
From: Marcelo Boveto Shima <marceloshima@gmail.com>
Date: Mon, 9 Feb 2015 11:57:55 +0100
Subject: Description: gcc43 fix (005_nxcomp_gcc43.full+lite.patch)  Use
 builtin includes to build with gcc43.

---
 nxcomp/Message.cpp | 4 ++--
 nxcomp/Misc.cpp    | 8 ++++----
 nxcomp/Misc.h      | 4 ++--
 nxcomp/Proxy.cpp   | 4 ++--
 nxcomp/Split.cpp   | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Message.cpp b/nxcomp/Message.cpp
index 72d4fff3d..188ed9a0e 100644
--- a/nxcomp/Message.cpp
+++ b/nxcomp/Message.cpp
@@ -15,9 +15,9 @@
 /*                                                                        */
 /**************************************************************************/
 
-#include <stdio.h>
+#include <cstdio>
 #include <unistd.h>
-#include <string.h>
+#include <cstring>
 
 #include <algorithm>
 
diff --git a/nxcomp/Misc.cpp b/nxcomp/Misc.cpp
index 2c72259e3..7303c595b 100644
--- a/nxcomp/Misc.cpp
+++ b/nxcomp/Misc.cpp
@@ -15,11 +15,11 @@
 /*                                                                        */
 /**************************************************************************/
 
-#include <stdio.h>
-#include <ctype.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cctype>
+#include <cstdlib>
 #include <unistd.h>
-#include <signal.h>
+#include <csignal>
 
 #include <errno.h>
 #include <string.h>
diff --git a/nxcomp/Misc.h b/nxcomp/Misc.h
index 200831757..3f37836f5 100644
--- a/nxcomp/Misc.h
+++ b/nxcomp/Misc.h
@@ -21,8 +21,8 @@
 #include <iostream>
 #include <fstream>
 
-#include <errno.h>
-#include <string.h>
+#include <cerrno>
+#include <cstring>
 
 #ifdef __sun
 
diff --git a/nxcomp/Proxy.cpp b/nxcomp/Proxy.cpp
index 3b4df7eb6..d6c67e0e8 100644
--- a/nxcomp/Proxy.cpp
+++ b/nxcomp/Proxy.cpp
@@ -15,9 +15,9 @@
 /*                                                                        */
 /**************************************************************************/
 
-#include <stdio.h>
+#include <cstdio>
 #include <unistd.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <sys/types.h>
 #include <sys/stat.h>
 
diff --git a/nxcomp/Split.cpp b/nxcomp/Split.cpp
index 50627e793..35a4ed4a2 100644
--- a/nxcomp/Split.cpp
+++ b/nxcomp/Split.cpp
@@ -16,7 +16,7 @@
 /**************************************************************************/
 
 #include <unistd.h>
-#include <string.h>
+#include <cstring>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <utime.h>
-- 
cgit v1.2.3


From f27e7424fc314e50f826036fd078ca64fe3f31ba Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 9 Feb 2015 14:16:10 +0100
Subject: Fix building against libpng 1.5
 (006_nxcomp_libpng15.full+lite.patch).  From the libpng homepage...

 The libpng 1.5.x series continues the evolution of the libpng API,
 finally hiding the contents of the venerable and hoary png_struct and
 png_info data structures inside private (i.e., non-installed) header
 files. Instead of direct struct-access, applications should be using
 the various png_get_xxx() and png_set_xxx() accessor functions, which
 have existed for almost as long as libpng itself. (Apps that compiled
 against libpng 1.4 without warnings about deprecated features should
 happily compile against 1.5, too.

 Patch origin: Fedora packagers of libXcomp3.
---
 debian/patches/006_nxcomp_libpng15.full+lite.patch | 43 ----------------------
 debian/patches/series                              |  1 -
 nxcomp/Pgn.cpp                                     |  6 +--
 3 files changed, 3 insertions(+), 47 deletions(-)
 delete mode 100644 debian/patches/006_nxcomp_libpng15.full+lite.patch

(limited to 'nxcomp')

diff --git a/debian/patches/006_nxcomp_libpng15.full+lite.patch b/debian/patches/006_nxcomp_libpng15.full+lite.patch
deleted file mode 100644
index a75c59bac..000000000
--- a/debian/patches/006_nxcomp_libpng15.full+lite.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Description: Fix building against libpng 1.5.
- From the libpng homepage...
- 
- The libpng 1.5.x series continues the evolution of the libpng API,
- finally hiding the contents of the venerable and hoary png_struct and
- png_info data structures inside private (i.e., non-installed) header
- files. Instead of direct struct-access, applications should be using
- the various png_get_xxx() and png_set_xxx() accessor functions, which
- have existed for almost as long as libpng itself. (Apps that compiled
- against libpng 1.4 without warnings about deprecated features should
- happily compile against 1.5, too.
-Forwarded: pending...
-Author: Fedora packagers of NX
-Last-Update: 2012-02-06
---- a/nxcomp/Pgn.cpp	2010-03-01 19:18:59.000000000 +0200
-+++ b/nxcomp/Pgn.cpp	2011-09-13 16:35:12.000000000 +0300
-@@ -414,7 +414,7 @@
- 
-   png_read_info(pngPtr, infoPtr);
- 
--  if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
-+  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
-   {
-     png_set_expand(pngPtr);
-   }
-@@ -565,7 +565,7 @@
- 
-   png_read_info( pngPtr, infoPtr ) ;
- 
--  if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
-+  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
-   {
-     png_set_expand(pngPtr);
-   }
-@@ -709,7 +709,7 @@
-   png_read_info(pngPtr, infoPtr) ;
- 
- 
--  if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
-+  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
-   {
-     png_set_expand(pngPtr);
-   }
diff --git a/debian/patches/series b/debian/patches/series
index 9779715e4..f82c87bf0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-006_nxcomp_libpng15.full+lite.patch
 007_nxcompshad_clean-gch-files.full.patch
 008_nxcomp_sa-restorer.full+lite.patch
 009_nxproxy_add-man-page.full+lite.patch
diff --git a/nxcomp/Pgn.cpp b/nxcomp/Pgn.cpp
index a68373441..af26724ef 100644
--- a/nxcomp/Pgn.cpp
+++ b/nxcomp/Pgn.cpp
@@ -414,7 +414,7 @@ int DecompressPng16(unsigned char *compressedData, int compressedLen,
 
   png_read_info(pngPtr, infoPtr);
 
-  if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
+  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
   {
     png_set_expand(pngPtr);
   }
@@ -565,7 +565,7 @@ int DecompressPng24(unsigned char *compressedData, int compressedLen,
 
   png_read_info( pngPtr, infoPtr ) ;
 
-  if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
+  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
   {
     png_set_expand(pngPtr);
   }
@@ -709,7 +709,7 @@ int DecompressPng32(unsigned char *compressedData, int compressedLen,
   png_read_info(pngPtr, infoPtr) ;
 
 
-  if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
+  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
   {
     png_set_expand(pngPtr);
   }
-- 
cgit v1.2.3


From a0b2fd836883e8ec429d5f31779c61f31b1a204d Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 9 Feb 2015 14:20:22 +0100
Subject: sa_restorer vs. memset (008_nxcomp_sa-restorer.full+lite.patch).  Use
 memset instead of setting sa_restorer to NULL.

Original-Author: Alexander Morozov
---
 .../patches/008_nxcomp_sa-restorer.full+lite.patch | 46 ----------------------
 debian/patches/series                              |  1 -
 nxcomp/Loop.cpp                                    | 23 ++---------
 3 files changed, 4 insertions(+), 66 deletions(-)
 delete mode 100644 debian/patches/008_nxcomp_sa-restorer.full+lite.patch

(limited to 'nxcomp')

diff --git a/debian/patches/008_nxcomp_sa-restorer.full+lite.patch b/debian/patches/008_nxcomp_sa-restorer.full+lite.patch
deleted file mode 100644
index f1447ccb0..000000000
--- a/debian/patches/008_nxcomp_sa-restorer.full+lite.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Description: sa_restorer vs. memset
- Use memset instead of setting sa_restorer to NULL.
-Forwarded: pending
-Author: Alexander Morozov
-Last-Update: 2012-02-07
---- a/nxcomp/Loop.cpp
-+++ b/nxcomp/Loop.cpp
-@@ -5884,20 +5884,9 @@
- 
-   struct sigaction newAction;
- 
--  newAction.sa_handler = HandleSignal;
--
--  //
--  // This field doesn't exist on most OSes except
--  // Linux. We keep setting the field to NULL to
--  // avoid side-effects in the case the field is
--  // a value return.
--  //
-+  memset(&newAction, 0, sizeof(newAction));
- 
--  #if defined(__linux__)
--
--  newAction.sa_restorer = NULL;
--
--  #endif
-+  newAction.sa_handler = HandleSignal;
- 
-   sigemptyset(&(newAction.sa_mask));
- 
-@@ -6509,13 +6498,9 @@
- 
-   struct sigaction action;
- 
--  action.sa_handler = HandleTimer;
--
--  #if defined(__linux__)
-+  memset(&action, 0, sizeof(action));
- 
--  action.sa_restorer = NULL;
--
--  #endif
-+  action.sa_handler = HandleTimer;
- 
-   sigemptyset(&action.sa_mask);
- 
diff --git a/debian/patches/series b/debian/patches/series
index 81a71d3a1..9f56169bf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-008_nxcomp_sa-restorer.full+lite.patch
 009_nxproxy_add-man-page.full+lite.patch
 009_nxagent_add-man-page.full.patch
 010_nxauth_fix-binary-name-in-man-page.full.patch
diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 92b6fc28f..14e5ee795 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -5884,20 +5884,9 @@ void InstallSignal(int signal, int action)
 
   struct sigaction newAction;
 
-  newAction.sa_handler = HandleSignal;
-
-  //
-  // This field doesn't exist on most OSes except
-  // Linux. We keep setting the field to NULL to
-  // avoid side-effects in the case the field is
-  // a value return.
-  //
+  memset(&newAction, 0, sizeof(newAction));
 
-  #if defined(__linux__)
-
-  newAction.sa_restorer = NULL;
-
-  #endif
+  newAction.sa_handler = HandleSignal;
 
   sigemptyset(&(newAction.sa_mask));
 
@@ -6509,13 +6498,9 @@ void SetTimer(int value)
 
   struct sigaction action;
 
-  action.sa_handler = HandleTimer;
-
-  #if defined(__linux__)
+  memset(&action, 0, sizeof(action));
 
-  action.sa_restorer = NULL;
-
-  #endif
+  action.sa_handler = HandleTimer;
 
   sigemptyset(&action.sa_mask);
 
-- 
cgit v1.2.3


From 4bc550e867f6168c1090aa4e1959a22238be84f1 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 9 Feb 2015 14:26:02 +0100
Subject: nxcomp*,nxproxy: Add clean rules to Makefile.in templates.

---
 ...omp_makefile-uninstall+autoconf.full+lite.patch | 74 ----------------------
 ...xcompext_makefile-uninstall+autoconf.full.patch | 66 -------------------
 ...compshad_makefile-uninstall+autoconf.full.patch | 70 --------------------
 .../015_nxproxy_makefile-uninstall.full+lite.patch | 40 ------------
 debian/patches/series                              |  4 --
 nxcomp/Makefile.in                                 | 39 +++++++++++-
 nxcompext/Makefile.in                              | 31 ++++++++-
 nxcompshad/Makefile.in                             | 35 +++++++++-
 nxproxy/Makefile.in                                | 17 ++++-
 9 files changed, 115 insertions(+), 261 deletions(-)
 delete mode 100644 debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch
 delete mode 100644 debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch
 delete mode 100644 debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch
 delete mode 100644 debian/patches/015_nxproxy_makefile-uninstall.full+lite.patch

(limited to 'nxcomp')

diff --git a/debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch b/debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch
deleted file mode 100644
index af778fefc..000000000
--- a/debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Description: Add install and uninstall stanzas to nxcomp/Makefile, honor ac dirs
- Provide install and uninstall functionality in nxcomp/Makefile.
- .
- Honor autoconf's libdir (and includedir, while at it). This is a
- must-have for multiarch platforms like x86_64 et al where multiple
- forms of libraries can be installed at the same time.
-Forwarded: pending...
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Author: Jan Engelhardt <jengelh@medozas.de>
-Last-Update: 2012-02-14
---- a/nxcomp/Makefile.in
-+++ b/nxcomp/Makefile.in
-@@ -64,10 +64,15 @@
- bindir      = @bindir@
- man1dir     = @mandir@/man1
- VPATH       = @srcdir@
-+libdir      = @libdir@
-+includedir  = @includedir@
- 
- INSTALL         = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA    = @INSTALL_DATA@
-+INSTALL_LINK    = cp -av
-+DESTDIR         =
-+RM_FILE         = rm -f
- 
- #
- # This should be autodetected.
-@@ -264,12 +269,44 @@
- 		fi
- 		touch depend.status
- 
--install:	install.bin install.man
-+install:	install.bin install.lib install.man
- 
- install.bin:
- 
-+install.lib: all
-+	./mkinstalldirs $(DESTDIR)${libdir}
-+	./mkinstalldirs $(DESTDIR)${includedir}/nx
-+	$(INSTALL_DATA) $(LIBFULL)              $(DESTDIR)${libdir}
-+	$(INSTALL_LINK) libXcomp.so.3           $(DESTDIR)${libdir}
-+	$(INSTALL_LINK) libXcomp.so             $(DESTDIR)${libdir}
-+	$(INSTALL_DATA) libXcomp.a              $(DESTDIR)${libdir}
-+	$(INSTALL_DATA) NX*.h                   $(DESTDIR)${includedir}/nx
-+	$(INSTALL_DATA) MD5.h                   $(DESTDIR)${includedir}/nx
-+	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
-+
- install.man:
- 
-+uninstall:	uninstall.bin uninstall.lib uninstall.man
-+
-+uninstall.bin:
-+
-+uninstall.lib:
-+	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
-+	$(RM_FILE) $(DESTDIR)${libdir}/libXcomp.so.3
-+	$(RM_FILE) $(DESTDIR)${libdir}/libXcomp.so
-+	$(RM_FILE) $(DESTDIR)${libdir}/libXcomp.a
-+	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXalert.h
-+	$(RM_FILE) $(DESTDIR)${includedir}/nx/NX.h
-+	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXmitshm.h
-+	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXpack.h
-+	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXproto.h
-+	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXrender.h
-+	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXvars.h
-+	$(RM_FILE) $(DESTDIR)${includedir}/nx/MD5.h
-+	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
-+
-+uninstall.man:
-+
- clean:
- 		-rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \
- 		@ALL@
diff --git a/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch b/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch
deleted file mode 100644
index 300c0a39e..000000000
--- a/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Description: Add install and uninstall stanzas to nxcompext/Makefile, honor autoconf dirs.
- Provide install and uninstall functionality in nxcompext/Makefile.
- .
- Honor autoconf's libdir (and includedir, while at it). This is a
- must-have for multiarch platforms like x86_64 et al where multiple
- forms of libraries can be installed at the same time.
-Forwarded: pending...
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Author: Jan Engelhardt <jengelh@medozas.de>
-Last-Update: 2012-02-14
---- a/nxcompext/Makefile.in
-+++ b/nxcompext/Makefile.in
-@@ -56,11 +56,15 @@
- bindir      = @bindir@
- man1dir     = @mandir@/man1
- VPATH       = @srcdir@
-+libdir = @libdir@
-+includedir = @includedir@
- 
- INSTALL         = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA    = @INSTALL_DATA@
--
-+INSTALL_LINK    = cp -av
-+DESTDIR         =
-+RM_FILE         = rm -f
- #
- # This should be autodetected.
- #
-@@ -147,12 +151,35 @@
- 		fi
- 		touch depend.status
- 
--install:	install.bin install.man
-+install:       install.bin install.lib install.man
- 
- install.bin:
- 
-+install.lib: all
-+	./mkinstalldirs $(DESTDIR)${libdir}
-+	./mkinstalldirs $(DESTDIR)${includedir}/nx
-+	$(INSTALL_DATA) $(LIBFULL)              $(DESTDIR)${libdir}
-+	$(INSTALL_LINK) libXcompext.so.3	$(DESTDIR)${libdir}
-+	$(INSTALL_LINK) libXcompext.so          $(DESTDIR)${libdir}
-+	$(INSTALL_DATA) NX*.h                   $(DESTDIR)${includedir}/nx
-+	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
-+
- install.man:
- 
-+uninstall:     uninstall.bin uninstall.lib uninstall.man
-+
-+uninstall.bin:
-+
-+uninstall.lib:
-+	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
-+	$(RM_FILE) $(DESTDIR)${libdir}/libXcompext.so.3
-+	$(RM_FILE) $(DESTDIR)${libdir}/libXcompext.so
-+	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXlib.h
-+	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXlibint.h
-+	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
-+
-+uninstall.man:
-+
- clean:
- 		-rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \
- 		@ALL@
diff --git a/debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch b/debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch
deleted file mode 100644
index 921eccc4f..000000000
--- a/debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Description: Add install and uninstall stanzas to nxcompshad/Makefile, honor autoconf dirs
- Provide install and uninstall functionality in nxcompshad/Makefile.
- .
- Honor autoconf's libdir (and includedir, while at it). This is a
- must-have for multiarch platforms like x86_64 et al where multiple
- forms of libraries can be installed at the same time.
-Forwarded: pending...
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Author: Jan Engelhardt <jengelh@medozas.de>
-Last-Update: 2012-02-14
---- a/nxcompshad/Makefile.in
-+++ b/nxcompshad/Makefile.in
-@@ -74,10 +74,17 @@
- bindir      = @bindir@
- man1dir     = @mandir@/man1
- VPATH       = @srcdir@
-+libdir      = @libdir@
-+includedir  = @includedir@
- 
- INSTALL         = @INSTALL@
-+INSTALL_DIR     = $(INSTALL) -d -o root -g root -m 0755 
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA    = @INSTALL_DATA@
-+INSTALL_LINK    = cp -av
-+DESTDIR         =
-+RM_FILE         = rm -f
-+RM_DIR          = rmdir -p --ignore-fail-on-non-empty
- 
- #
- # This should be autodetected.
-@@ -178,12 +185,38 @@
- 		fi
- 		touch depend.status
- 
--install:	install.bin install.man
-+install:       install.bin install.lib install.man
- 
- install.bin:
- 
-+install.lib: all
-+	$(INSTALL_DIR)                          $(DESTDIR)${libdir}
-+	$(INSTALL_DIR)                          $(DESTDIR)${includedir}/nx
-+	$(INSTALL_DATA) $(LIBFULL)              $(DESTDIR)${libdir}
-+	$(INSTALL_LINK) libXcompshad.so.3       $(DESTDIR)${libdir}
-+	$(INSTALL_LINK) libXcompshad.so         $(DESTDIR)${libdir}
-+	$(INSTALL_DATA) *.a                     $(DESTDIR)${libdir}
-+	$(INSTALL_DATA) *.h                     $(DESTDIR)${includedir}/nx
-+	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
-+
- install.man:
- 
-+uninstall:     uninstall.bin uninstall.lib uninstall.man
-+
-+uninstall.bin:
-+
-+uninstall.lib:
-+	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
-+	$(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.so.3
-+	$(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.so
-+	$(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.a
-+	for header in *.h; do $(RM_FILE) $(DESTDIR)${includedir}/nx/$$header; done
-+	$(RM_DIR) $(DESTDIR)${libdir}/nx/
-+	$(RM_DIR) $(DESTDIR)${includedir}/nx/
-+	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
-+
-+uninstall.man:
-+
- clean:
- 		-rm -f *~ *.o *.gch *.bak st?????? core core.* *.out.* *.exe.stackdump \
- 		$(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) $(LIBDLL) $(LIBDLLSTATIC) $(PROGRAM) $(PROGRAM).exe
diff --git a/debian/patches/015_nxproxy_makefile-uninstall.full+lite.patch b/debian/patches/015_nxproxy_makefile-uninstall.full+lite.patch
deleted file mode 100644
index 554c86aa4..000000000
--- a/debian/patches/015_nxproxy_makefile-uninstall.full+lite.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: Add install and uninstall stanzas to nxcomp/Makefile
- Provide install and uninstall functionality in nxcomp/Makefile.
-Forwarded: pending...
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Last-Update: 2011-12-31
---- a/nxproxy/Makefile.in
-+++ b/nxproxy/Makefile.in
-@@ -41,6 +41,8 @@
- INSTALL         = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA    = @INSTALL_DATA@
-+DESTDIR         =
-+RM_FILE         = rm -f
- 
- #
- # This should be autodetected.
-@@ -87,11 +89,20 @@
- install:	install.bin install.man
- 
- install.bin:	$(PROGRAM)
--		$(srcdir)/mkinstalldirs $(bindir)
--		$(INSTALL) $(PROGRAM) $(bindir)/$(PROGRAM)
-+		$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
-+		$(INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM)
- 
- install.man:
--		$(srcdir)/mkinstalldirs $(man1dir)
-+		$(srcdir)/mkinstalldirs $(DESTDIR)$(man1dir)
-+		$(INSTALL_DATA) man/$(PROGRAM).1 $(DESTDIR)$(man1dir)/$(PROGRAM).1
-+
-+uninstall:      uninstall.bin uninstall.man
-+
-+uninstall.bin:
-+		$(RM_FILE) $(DESTDIR)$(bindir)/$(PROGRAM)
-+
-+uninstall.man:
-+		$(RM_FILE) $(DESTDIR)$(man1dir)/nxproxy.1
- 
- clean:
- 		-rm -f *~ *.o *.bak st?????? core core.* *.out.* \
diff --git a/debian/patches/series b/debian/patches/series
index 8bbb69182..f3678f428 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,3 @@
-012_nxcomp_makefile-uninstall+autoconf.full+lite.patch
-013_nxcompext_makefile-uninstall+autoconf.full.patch
-014_nxcompshad_makefile-uninstall+autoconf.full.patch
-015_nxproxy_makefile-uninstall.full+lite.patch
 016_nx-X11_install-location.full.patch
 024_fix-make-clean.full.patch
 024_fix-make-clean.full+lite.patch
diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in
index 434118b4e..d291c3967 100644
--- a/nxcomp/Makefile.in
+++ b/nxcomp/Makefile.in
@@ -64,10 +64,15 @@ exec_prefix = @exec_prefix@
 bindir      = @bindir@
 man1dir     = @mandir@/man1
 VPATH       = @srcdir@
+libdir      = @libdir@
+includedir  = @includedir@
 
 INSTALL         = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA    = @INSTALL_DATA@
+INSTALL_LINK    = cp -av
+DESTDIR         =
+RM_FILE         = rm -f
 
 #
 # This should be autodetected.
@@ -264,12 +269,44 @@ depend.status:
 		fi
 		touch depend.status
 
-install:	install.bin install.man
+install:	install.bin install.lib install.man
 
 install.bin:
 
+install.lib: all
+	./mkinstalldirs $(DESTDIR)${libdir}
+	./mkinstalldirs $(DESTDIR)${includedir}/nx
+	$(INSTALL_DATA) $(LIBFULL)              $(DESTDIR)${libdir}
+	$(INSTALL_LINK) libXcomp.so.3           $(DESTDIR)${libdir}
+	$(INSTALL_LINK) libXcomp.so             $(DESTDIR)${libdir}
+	$(INSTALL_DATA) libXcomp.a              $(DESTDIR)${libdir}
+	$(INSTALL_DATA) NX*.h                   $(DESTDIR)${includedir}/nx
+	$(INSTALL_DATA) MD5.h                   $(DESTDIR)${includedir}/nx
+	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
+
 install.man:
 
+uninstall:	uninstall.bin uninstall.lib uninstall.man
+
+uninstall.bin:
+
+uninstall.lib:
+	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
+	$(RM_FILE) $(DESTDIR)${libdir}/libXcomp.so.3
+	$(RM_FILE) $(DESTDIR)${libdir}/libXcomp.so
+	$(RM_FILE) $(DESTDIR)${libdir}/libXcomp.a
+	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXalert.h
+	$(RM_FILE) $(DESTDIR)${includedir}/nx/NX.h
+	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXmitshm.h
+	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXpack.h
+	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXproto.h
+	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXrender.h
+	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXvars.h
+	$(RM_FILE) $(DESTDIR)${includedir}/nx/MD5.h
+	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
+
+uninstall.man:
+
 clean:
 		-rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \
 		@ALL@
diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in
index cdf0b1cd9..51bc06ed2 100644
--- a/nxcompext/Makefile.in
+++ b/nxcompext/Makefile.in
@@ -56,11 +56,15 @@ exec_prefix = @exec_prefix@
 bindir      = @bindir@
 man1dir     = @mandir@/man1
 VPATH       = @srcdir@
+libdir = @libdir@
+includedir = @includedir@
 
 INSTALL         = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA    = @INSTALL_DATA@
-
+INSTALL_LINK    = cp -av
+DESTDIR         =
+RM_FILE         = rm -f
 #
 # This should be autodetected.
 #
@@ -147,12 +151,35 @@ depend.status:
 		fi
 		touch depend.status
 
-install:	install.bin install.man
+install:       install.bin install.lib install.man
 
 install.bin:
 
+install.lib: all
+	./mkinstalldirs $(DESTDIR)${libdir}
+	./mkinstalldirs $(DESTDIR)${includedir}/nx
+	$(INSTALL_DATA) $(LIBFULL)              $(DESTDIR)${libdir}
+	$(INSTALL_LINK) libXcompext.so.3	$(DESTDIR)${libdir}
+	$(INSTALL_LINK) libXcompext.so          $(DESTDIR)${libdir}
+	$(INSTALL_DATA) NX*.h                   $(DESTDIR)${includedir}/nx
+	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
+
 install.man:
 
+uninstall:     uninstall.bin uninstall.lib uninstall.man
+
+uninstall.bin:
+
+uninstall.lib:
+	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
+	$(RM_FILE) $(DESTDIR)${libdir}/libXcompext.so.3
+	$(RM_FILE) $(DESTDIR)${libdir}/libXcompext.so
+	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXlib.h
+	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXlibint.h
+	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
+
+uninstall.man:
+
 clean:
 		-rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \
 		@ALL@
diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in
index caf9eb14c..26a92bdce 100644
--- a/nxcompshad/Makefile.in
+++ b/nxcompshad/Makefile.in
@@ -74,10 +74,17 @@ exec_prefix = @exec_prefix@
 bindir      = @bindir@
 man1dir     = @mandir@/man1
 VPATH       = @srcdir@
+libdir      = @libdir@
+includedir  = @includedir@
 
 INSTALL         = @INSTALL@
+INSTALL_DIR     = $(INSTALL) -d -o root -g root -m 0755 
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA    = @INSTALL_DATA@
+INSTALL_LINK    = cp -av
+DESTDIR         =
+RM_FILE         = rm -f
+RM_DIR          = rmdir -p --ignore-fail-on-non-empty
 
 #
 # This should be autodetected.
@@ -178,12 +185,38 @@ depend.status:
 		fi
 		touch depend.status
 
-install:	install.bin install.man
+install:       install.bin install.lib install.man
 
 install.bin:
 
+install.lib: all
+	$(INSTALL_DIR)                          $(DESTDIR)${libdir}
+	$(INSTALL_DIR)                          $(DESTDIR)${includedir}/nx
+	$(INSTALL_DATA) $(LIBFULL)              $(DESTDIR)${libdir}
+	$(INSTALL_LINK) libXcompshad.so.3       $(DESTDIR)${libdir}
+	$(INSTALL_LINK) libXcompshad.so         $(DESTDIR)${libdir}
+	$(INSTALL_DATA) *.a                     $(DESTDIR)${libdir}
+	$(INSTALL_DATA) *.h                     $(DESTDIR)${includedir}/nx
+	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
+
 install.man:
 
+uninstall:     uninstall.bin uninstall.lib uninstall.man
+
+uninstall.bin:
+
+uninstall.lib:
+	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
+	$(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.so.3
+	$(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.so
+	$(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.a
+	for header in *.h; do $(RM_FILE) $(DESTDIR)${includedir}/nx/$$header; done
+	$(RM_DIR) $(DESTDIR)${libdir}/nx/
+	$(RM_DIR) $(DESTDIR)${includedir}/nx/
+	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
+
+uninstall.man:
+
 clean:
 		-rm -f *~ *.o *.gch *.bak st?????? core core.* *.out.* *.exe.stackdump \
 		$(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) $(LIBDLL) $(LIBDLLSTATIC) $(PROGRAM) $(PROGRAM).exe
diff --git a/nxproxy/Makefile.in b/nxproxy/Makefile.in
index 928e0d34e..5d78972b9 100644
--- a/nxproxy/Makefile.in
+++ b/nxproxy/Makefile.in
@@ -41,6 +41,8 @@ VPATH       = @srcdir@
 INSTALL         = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA    = @INSTALL_DATA@
+DESTDIR         =
+RM_FILE         = rm -f
 
 #
 # This should be autodetected.
@@ -87,11 +89,20 @@ depend.status:
 install:	install.bin install.man
 
 install.bin:	$(PROGRAM)
-		$(srcdir)/mkinstalldirs $(bindir)
-		$(INSTALL) $(PROGRAM) $(bindir)/$(PROGRAM)
+		$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
+		$(INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM)
 
 install.man:
-		$(srcdir)/mkinstalldirs $(man1dir)
+		$(srcdir)/mkinstalldirs $(DESTDIR)$(man1dir)
+		$(INSTALL_DATA) man/$(PROGRAM).1 $(DESTDIR)$(man1dir)/$(PROGRAM).1
+
+uninstall:      uninstall.bin uninstall.man
+
+uninstall.bin:
+		$(RM_FILE) $(DESTDIR)$(bindir)/$(PROGRAM)
+
+uninstall.man:
+		$(RM_FILE) $(DESTDIR)$(man1dir)/nxproxy.1
 
 clean:
 		-rm -f *~ *.o *.bak st?????? core core.* *.out.* \
-- 
cgit v1.2.3


From 236ee4ffa8e4fa92bb748301986307841ef060ab Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 9 Feb 2015 15:16:30 +0100
Subject: nxcomp*, nxproxy: Fix clean-up of source tree via Makefile.in
 templates.

  024_fix-make-clean.full.patch
  024_fix-make-clean.full+lite.patch
---
 debian/patches/024_fix-make-clean.full+lite.patch | 19 ---------
 debian/patches/024_fix-make-clean.full.patch      | 51 -----------------------
 debian/patches/series                             |  2 -
 nx-X11/Makefile                                   | 10 ++++-
 nxcomp/Makefile.in                                |  2 +-
 nxcompext/Makefile.in                             |  2 +-
 nxcompshad/Makefile.in                            |  2 +-
 nxproxy/Makefile.in                               |  2 +-
 8 files changed, 12 insertions(+), 78 deletions(-)
 delete mode 100644 debian/patches/024_fix-make-clean.full+lite.patch
 delete mode 100644 debian/patches/024_fix-make-clean.full.patch

(limited to 'nxcomp')

diff --git a/debian/patches/024_fix-make-clean.full+lite.patch b/debian/patches/024_fix-make-clean.full+lite.patch
deleted file mode 100644
index 7f0b327cf..000000000
--- a/debian/patches/024_fix-make-clean.full+lite.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: fix clean rule in nxcomp's Makefile.in
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-
---- a/nxcomp/Makefile.in
-+++ b/nxcomp/Makefile.in
-@@ -313,4 +313,4 @@
- 
- distclean:	clean
- 		-rm -rf autom4te.cache config.status config.log \
--		config.cache depend.status Makefile tags
-+		config.cache depend.status Makefile tags configure
---- a/nxproxy/Makefile.in
-+++ b/nxproxy/Makefile.in
-@@ -109,4 +109,4 @@
- 		$(PROGRAM) $(PROGRAM).exe $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE)
- 
- distclean:	clean
--		-rm -f config.status config.log config.cache depend.status Makefile tags
-+		-rm -rf autom4te.cache config.status config.log config.cache depend.status Makefile tags configure
diff --git a/debian/patches/024_fix-make-clean.full.patch b/debian/patches/024_fix-make-clean.full.patch
deleted file mode 100644
index 356ce47d8..000000000
--- a/debian/patches/024_fix-make-clean.full.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Description: Provide main Makefile for whole source tree
- By design this patch is not needed to be sent upstream.
-Forwarded: not-needed
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Last-Update: 2012-10-19
---- a/nx-X11/Makefile
-+++ b/nx-X11/Makefile
-@@ -138,6 +138,7 @@
- 
- xmakefile: Imakefile
- 	$(RM) xmakefile
-+	@rm -f $(IRULESRC)/date.def; echo "" > $(IRULESRC)/date.def;
- 	$(IMAKE_CMD) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
- 
- World.Win32:
-@@ -197,11 +198,16 @@
- # a copy of every rule that might be invoked at top level
- 
- clean:
--	    $(MAKE_CMD) $@
-+	    -$(MAKE_CMD) $@
-+	    find config -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done
-+	    find lib -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done
-+	    find programs -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done
-+	    find include -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done
-+	    rm -f config/cf/{version.def,date.def}
- dangerous_strip_clean:
- 	    $(MAKE_CMD) $@
- distclean:
--	    $(MAKE_CMD) $@
-+	    -$(MAKE_CMD) $@
- 	    $(RM) xmakefile $(IRULESRC)/version.def $(IRULESRC)/date.def
- depend:
- 	    $(MAKE_CMD) $@
---- a/nxcompext/Makefile.in
-+++ b/nxcompext/Makefile.in
-@@ -185,5 +185,5 @@
- 		@ALL@
- 
- distclean:	clean
--		-rm -rf autom4te.cache config.status config.log \
-+		-rm -rf autom4te.cache config.status config.log configure \
- 		config.cache depend.status Makefile tags
---- a/nxcompshad/Makefile.in
-+++ b/nxcompshad/Makefile.in
-@@ -222,4 +222,4 @@
- 		$(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) $(LIBDLL) $(LIBDLLSTATIC) $(PROGRAM) $(PROGRAM).exe
- 
- distclean:	clean
--		-rm -rf config.status config.log config.cache depend.status Makefile tags autom4te.cache
-+		-rm -rf config.status config.log config.cache depend.status Makefile tags autom4te.cache configure 
diff --git a/debian/patches/series b/debian/patches/series
index 70c573c38..63bc3dc43 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-024_fix-make-clean.full.patch
-024_fix-make-clean.full+lite.patch
 025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch
 026_nxcompext_honour-optflags.full.patch
 026_nxcomp_honour-optflags.full+lite.patch
diff --git a/nx-X11/Makefile b/nx-X11/Makefile
index 3aefb7974..7c4090a95 100644
--- a/nx-X11/Makefile
+++ b/nx-X11/Makefile
@@ -138,6 +138,7 @@ Makefile::
 
 xmakefile: Imakefile
 	$(RM) xmakefile
+	@rm -f $(IRULESRC)/date.def; echo "" > $(IRULESRC)/date.def;
 	$(IMAKE_CMD) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
 
 World.Win32:
@@ -197,11 +198,16 @@ World.OS2:
 # a copy of every rule that might be invoked at top level
 
 clean:
-	    $(MAKE_CMD) $@
+	    -$(MAKE_CMD) $@
+	    find config -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done
+	    find lib -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done
+	    find programs -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done
+	    find include -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done
+	    rm -f config/cf/{version.def,date.def}
 dangerous_strip_clean:
 	    $(MAKE_CMD) $@
 distclean:
-	    $(MAKE_CMD) $@
+	    -$(MAKE_CMD) $@
 	    $(RM) xmakefile $(IRULESRC)/version.def $(IRULESRC)/date.def
 depend:
 	    $(MAKE_CMD) $@
diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in
index d291c3967..1be928167 100644
--- a/nxcomp/Makefile.in
+++ b/nxcomp/Makefile.in
@@ -313,4 +313,4 @@ clean:
 
 distclean:	clean
 		-rm -rf autom4te.cache config.status config.log \
-		config.cache depend.status Makefile tags
+		config.cache depend.status Makefile tags configure
diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in
index 51bc06ed2..9fd2c7d7d 100644
--- a/nxcompext/Makefile.in
+++ b/nxcompext/Makefile.in
@@ -185,5 +185,5 @@ clean:
 		@ALL@
 
 distclean:	clean
-		-rm -rf autom4te.cache config.status config.log \
+		-rm -rf autom4te.cache config.status config.log configure \
 		config.cache depend.status Makefile tags
diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in
index 26a92bdce..00bca25c9 100644
--- a/nxcompshad/Makefile.in
+++ b/nxcompshad/Makefile.in
@@ -222,4 +222,4 @@ clean:
 		$(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) $(LIBDLL) $(LIBDLLSTATIC) $(PROGRAM) $(PROGRAM).exe
 
 distclean:	clean
-		-rm -rf config.status config.log config.cache depend.status Makefile tags autom4te.cache
+		-rm -rf config.status config.log config.cache depend.status Makefile tags autom4te.cache configure
diff --git a/nxproxy/Makefile.in b/nxproxy/Makefile.in
index 5d78972b9..c00df91dc 100644
--- a/nxproxy/Makefile.in
+++ b/nxproxy/Makefile.in
@@ -109,4 +109,4 @@ clean:
 		$(PROGRAM) $(PROGRAM).exe $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE)
 
 distclean:	clean
-		-rm -f config.status config.log config.cache depend.status Makefile tags
+		-rm -rf autom4te.cache config.status config.log config.cache depend.status Makefile tags configure
-- 
cgit v1.2.3


From 78efa8bf9889a006cd5c0a34a22d458de59ee60a Mon Sep 17 00:00:00 2001
From: Gabriel Marcano <gabemarcano@yahoo.com>
Date: Mon, 9 Feb 2015 15:19:12 +0100
Subject: Fix FTBFS against libjpeg9a
 (025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch).

---
 ...nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch | 40 ----------------------
 debian/patches/series                              |  1 -
 nxcomp/Jpeg.cpp                                    |  8 ++---
 3 files changed, 4 insertions(+), 45 deletions(-)
 delete mode 100644 debian/patches/025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch

(limited to 'nxcomp')

diff --git a/debian/patches/025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch b/debian/patches/025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch
deleted file mode 100644
index 66ca8c33e..000000000
--- a/debian/patches/025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: Fix FTBFS when built against libjpeg9a
-Author: Gabriel Marcano <gabemarcano@yahoo.com>
---- a/nxcomp/Jpeg.cpp	2014-08-19 22:23:36.139072400 -0400
-+++ b/nxcomp/Jpeg.cpp	2014-08-19 22:25:24.323182800 -0400
-@@ -440,7 +440,7 @@
- 
-   JpegSetSrcManager(&cinfo, compressedData, compressedLen);
- 
--  jpeg_read_header(&cinfo, 1);
-+  jpeg_read_header(&cinfo, TRUE);
- 
-   if (jpegError) goto AbortDecompressJpeg16;
- 
-@@ -581,7 +581,7 @@
- 
-   JpegSetSrcManager(&cinfo, compressedData, compressedLen);
- 
--  jpeg_read_header(&cinfo, 1);
-+  jpeg_read_header(&cinfo, TRUE);
- 
-   if (jpegError) goto AbortDecompressJpeg24;
- 
-@@ -718,7 +718,7 @@
- 
-   JpegSetSrcManager(&cinfo, compressedData, compressedLen);
- 
--  jpeg_read_header(&cinfo, 1);
-+  jpeg_read_header(&cinfo, TRUE);
- 
-   if (jpegError) goto AbortDecompressJpeg32;
- 
-@@ -833,7 +833,7 @@
-   jpegSrcManager.bytes_in_buffer = jpegBufferLen;
-   jpegSrcManager.next_input_byte = (JOCTET *)jpegBufferPtr;
- 
--  return 1;
-+  return TRUE;
- }
- 
- static void JpegSkipInputData(j_decompress_ptr cinfo, long num_bytes)
diff --git a/debian/patches/series b/debian/patches/series
index 63bc3dc43..6eadd7bd9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch
 026_nxcompext_honour-optflags.full.patch
 026_nxcomp_honour-optflags.full+lite.patch
 026_nxcompshad_honour-optflags.full.patch
diff --git a/nxcomp/Jpeg.cpp b/nxcomp/Jpeg.cpp
index b3973227c..9f71cbadf 100644
--- a/nxcomp/Jpeg.cpp
+++ b/nxcomp/Jpeg.cpp
@@ -440,7 +440,7 @@ int DecompressJpeg16(unsigned char *compressedData, int compressedLen,
 
   JpegSetSrcManager(&cinfo, compressedData, compressedLen);
 
-  jpeg_read_header(&cinfo, 1);
+  jpeg_read_header(&cinfo, TRUE);
 
   if (jpegError) goto AbortDecompressJpeg16;
 
@@ -581,7 +581,7 @@ int DecompressJpeg24(unsigned char *compressedData, int compressedLen,
 
   JpegSetSrcManager(&cinfo, compressedData, compressedLen);
 
-  jpeg_read_header(&cinfo, 1);
+  jpeg_read_header(&cinfo, TRUE);
 
   if (jpegError) goto AbortDecompressJpeg24;
 
@@ -718,7 +718,7 @@ int DecompressJpeg32(unsigned char *compressedData, int compressedLen,
 
   JpegSetSrcManager(&cinfo, compressedData, compressedLen);
 
-  jpeg_read_header(&cinfo, 1);
+  jpeg_read_header(&cinfo, TRUE);
 
   if (jpegError) goto AbortDecompressJpeg32;
 
@@ -833,7 +833,7 @@ static boolean JpegFillInputBuffer(j_decompress_ptr cinfo)
   jpegSrcManager.bytes_in_buffer = jpegBufferLen;
   jpegSrcManager.next_input_byte = (JOCTET *)jpegBufferPtr;
 
-  return 1;
+  return TRUE;
 }
 
 static void JpegSkipInputData(j_decompress_ptr cinfo, long num_bytes)
-- 
cgit v1.2.3


From 3384aba386c44ec26d3f131b897f77da440324d7 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Mon, 9 Feb 2015 15:22:07 +0100
Subject: Honour compiler/linker option flags.

 026_nxcompext_honour-optflags.full.patch
 026_nxcomp_honour-optflags.full+lite.patch
 026_nxcompshad_honour-optflags.full.patch
---
 .../026_nxcomp_honour-optflags.full+lite.patch     | 31 ----------------------
 .../026_nxcompext_honour-optflags.full.patch       | 17 ------------
 .../026_nxcompshad_honour-optflags.full.patch      | 17 ------------
 debian/patches/series                              |  3 ---
 nxcomp/configure.in                                |  4 +--
 nxcompext/configure.in                             |  4 +--
 nxcompshad/configure.in                            |  4 +--
 nxproxy/configure.in                               |  4 +--
 8 files changed, 8 insertions(+), 76 deletions(-)
 delete mode 100644 debian/patches/026_nxcomp_honour-optflags.full+lite.patch
 delete mode 100644 debian/patches/026_nxcompext_honour-optflags.full.patch
 delete mode 100644 debian/patches/026_nxcompshad_honour-optflags.full.patch

(limited to 'nxcomp')

diff --git a/debian/patches/026_nxcomp_honour-optflags.full+lite.patch b/debian/patches/026_nxcomp_honour-optflags.full+lite.patch
deleted file mode 100644
index a2713a1bc..000000000
--- a/debian/patches/026_nxcomp_honour-optflags.full+lite.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Honour compiler/linker option flags
-Forwarded: pending
-Author: Orion Poplawski <orion@cora.nwra.com>
-diff -up a/nxcomp/configure.in b/nxcomp/configure.in
---- a/nxcomp/configure.in	2012-11-10 06:40:55.000000000 -0700
-+++ b/nxcomp/configure.in	2012-12-11 13:13:19.390229196 -0700
-@@ -7,8 +7,8 @@ AC_PREREQ(2.13)
- 
- dnl Set our default compilation flags.
- 
--CXXFLAGS="-O3 -fno-rtti -fno-exceptions"
--CFLAGS="-O3"
-+CXXFLAGS="$CXXFLAGS -O3 -fno-rtti -fno-exceptions"
-+CFLAGS="$CFLAGS -O3"
- 
- dnl Reset default linking directives.
- 
-diff -up a/nxproxy/configure.in b/nxproxy/configure.in
---- a/nxproxy/configure.in	2012-11-10 06:40:55.000000000 -0700
-+++ b/nxproxy/configure.in	2012-12-11 13:16:19.955301045 -0700
-@@ -7,8 +7,8 @@ AC_PREREQ(2.13)
- 
- dnl Reset default compilation flags.
- 
--CXXFLAGS="-O3"
--CPPFLAGS="-O3"
-+CXXFLAGS="$CXXFLAGS -O3"
-+CPPFLAGS="$CPPFLAGS -O3"
- 
- dnl Prefer headers and libraries from nx-X11 if present.
- 
diff --git a/debian/patches/026_nxcompext_honour-optflags.full.patch b/debian/patches/026_nxcompext_honour-optflags.full.patch
deleted file mode 100644
index 4d5df3e6b..000000000
--- a/debian/patches/026_nxcompext_honour-optflags.full.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Honour compiler/linker option flags
-Forwarded: pending
-Author: Orion Poplawski <orion@cora.nwra.com>
-diff -up a/nxcompext/configure.in b/nxcompext/configure.in
---- a/nxcompext/configure.in	2012-11-10 06:40:55.000000000 -0700
-+++ b/nxcompext/configure.in	2012-12-11 13:15:26.712576302 -0700
-@@ -7,8 +7,8 @@ AC_PREREQ(2.13)
- 
- dnl Reset default compilation flags.
- 
--CXXFLAGS="-O3"
--CFLAGS="-O3"
-+CXXFLAGS="$CXXFLAGS -O3"
-+CFLAGS="$CFLAGS -O3"
- 
- dnl Reset default linking directives.
- 
diff --git a/debian/patches/026_nxcompshad_honour-optflags.full.patch b/debian/patches/026_nxcompshad_honour-optflags.full.patch
deleted file mode 100644
index ea1d2ad80..000000000
--- a/debian/patches/026_nxcompshad_honour-optflags.full.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Honour compiler/linker option flags
-Forwarded: pending
-Author: Orion Poplawski <orion@cora.nwra.com>
-diff -up a/nxcompshad/configure.in b/nxcompshad/configure.in
---- a/nxcompshad/configure.in	2012-11-10 06:40:56.000000000 -0700
-+++ b/nxcompshad/configure.in	2012-12-11 13:13:25.915196300 -0700
-@@ -7,8 +7,8 @@ AC_PREREQ(2.13)
- 
- dnl Reset default compilation flags.
- 
--CXXFLAGS="-O3"
--CPPFLAGS="-O3"
-+CXXFLAGS="$CXXFLAGS -O3"
-+CPPFLAGS="$CPPFLAGS -O3"
- 
- dnl Reset default linking directives.
- 
diff --git a/debian/patches/series b/debian/patches/series
index 6eadd7bd9..ca6b6dcdc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,3 @@
-026_nxcompext_honour-optflags.full.patch
-026_nxcomp_honour-optflags.full+lite.patch
-026_nxcompshad_honour-optflags.full.patch
 027_nxcomp_abstract-X11-socket.full+lite.patch
 028_nx-X11_abstract-kernel-sockets.full.patch
 029_nxcomp_ppc64.full+lite.patch
diff --git a/nxcomp/configure.in b/nxcomp/configure.in
index e9ab81da8..6fa9757a7 100644
--- a/nxcomp/configure.in
+++ b/nxcomp/configure.in
@@ -7,8 +7,8 @@ AC_PREREQ(2.13)
 
 dnl Set our default compilation flags.
 
-CXXFLAGS="-O3 -fno-rtti -fno-exceptions"
-CFLAGS="-O3"
+CXXFLAGS="$CXXFLAGS -O3 -fno-rtti -fno-exceptions"
+CFLAGS="$CFLAGS -O3"
 
 dnl Reset default linking directives.
 
diff --git a/nxcompext/configure.in b/nxcompext/configure.in
index fe5abf7cb..08c48a751 100644
--- a/nxcompext/configure.in
+++ b/nxcompext/configure.in
@@ -7,8 +7,8 @@ AC_PREREQ(2.13)
 
 dnl Reset default compilation flags.
 
-CXXFLAGS="-O3"
-CFLAGS="-O3"
+CXXFLAGS="$CXXFLAGS -O3"
+CFLAGS="$CFLAGS -O3"
 
 dnl Reset default linking directives.
 
diff --git a/nxcompshad/configure.in b/nxcompshad/configure.in
index f0bdecd12..13149b3a0 100644
--- a/nxcompshad/configure.in
+++ b/nxcompshad/configure.in
@@ -7,8 +7,8 @@ AC_PREREQ(2.13)
 
 dnl Reset default compilation flags.
 
-CXXFLAGS="-O3"
-CPPFLAGS="-O3"
+CXXFLAGS="$CXXFLAGS -O3"
+CPPFLAGS="$CPPFLAGS -O3"
 
 dnl Reset default linking directives.
 
diff --git a/nxproxy/configure.in b/nxproxy/configure.in
index bd930f166..b86828d02 100644
--- a/nxproxy/configure.in
+++ b/nxproxy/configure.in
@@ -7,8 +7,8 @@ AC_PREREQ(2.13)
 
 dnl Reset default compilation flags.
 
-CXXFLAGS="-O3"
-CPPFLAGS="-O3"
+CXXFLAGS="$CXXFLAGS -O3"
+CPPFLAGS="$CPPFLAGS -O3"
 
 dnl Prefer headers and libraries from nx-X11 if present.
 
-- 
cgit v1.2.3


From aaf4a59e4c4ec54a26283bce6bf25281e12f0424 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 9 Feb 2015 15:27:46 +0100
Subject: Add X11 abstract socket support to nxcomp/nxproxy
 (027_nxcomp_abstract-X11-socket.full+lite.patch).

---
 .../027_nxcomp_abstract-X11-socket.full+lite.patch | 59 ----------------------
 debian/patches/series                              |  1 -
 nxcomp/Loop.cpp                                    | 38 ++++++++++++++
 3 files changed, 38 insertions(+), 60 deletions(-)
 delete mode 100644 debian/patches/027_nxcomp_abstract-X11-socket.full+lite.patch

(limited to 'nxcomp')

diff --git a/debian/patches/027_nxcomp_abstract-X11-socket.full+lite.patch b/debian/patches/027_nxcomp_abstract-X11-socket.full+lite.patch
deleted file mode 100644
index 4c457c5d5..000000000
--- a/debian/patches/027_nxcomp_abstract-X11-socket.full+lite.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Description: Add X11 abstract socket support to nxcomp/nxproxy
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-
-diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
-index 92b6fc2..d86809d 100644
---- a/nxcomp/Loop.cpp
-+++ b/nxcomp/Loop.cpp
-@@ -4250,6 +4250,39 @@ int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
-     // where the socket will be created.
-     //
- 
-+    // Try abstract X11 socket first (via a test connect), if that fails
-+    // fall back to Unix domain socket file.
-+
-+    #ifdef __linux__
-+    int testSocketFD;
-+    testSocketFD = socket(xServerAddrFamily, SOCK_STREAM, PF_UNSPEC);
-+
-+    int len = sprintf(unixSocketName + 1, "/tmp/.X11-unix/X%d", xPort);
-+    unixSocketName[0] = '\0';
-+
-+    sockaddr_un *xServerAddrABSTRACT = new sockaddr_un;
-+    memset(xServerAddrABSTRACT, 0, xServerAddrLength);
-+    xServerAddrABSTRACT -> sun_family = AF_UNIX;
-+    memcpy(xServerAddrABSTRACT -> sun_path, unixSocketName, len+1);
-+    xServerAddrLength = len +3;
-+
-+    int ret = connect(testSocketFD, (struct sockaddr *) xServerAddrABSTRACT, xServerAddrLength);
-+    if (ret == 0) {
-+
-+        cerr << "Info" << ": Using abstract X11 socket in kernel namespace "
-+             << "for accessing DISPLAY=:" << xPort << ".\n";
-+
-+        close(testSocketFD);
-+        xServerAddr = (sockaddr *) xServerAddrABSTRACT;
-+        return 1;
-+
-+    } else {
-+
-+        cerr << "Info" << ": Falling back to file system X11 socket "
-+             << "for accessing DISPLAY=:" << xPort << ".\n";
-+
-+    #endif
-+
-     struct stat statInfo;
- 
-     char unixSocketDir[DEFAULT_STRING_LENGTH];
-@@ -4322,6 +4355,11 @@ int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
- 
-     xServerAddr = (sockaddr *) xServerAddrUNIX;
-     xServerAddrLength = sizeof(sockaddr_un);
-+
-+    #ifdef __linux__
-+
-+    }
-+    #endif
-   }
-   else
-   {
diff --git a/debian/patches/series b/debian/patches/series
index ca6b6dcdc..8da3bdbf9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-027_nxcomp_abstract-X11-socket.full+lite.patch
 028_nx-X11_abstract-kernel-sockets.full.patch
 029_nxcomp_ppc64.full+lite.patch
 030_nx-X11_configure-args.full.patch
diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 14e5ee795..6fd772912 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -4250,6 +4250,39 @@ int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
     // where the socket will be created.
     //
 
+    // Try abstract X11 socket first (via a test connect), if that fails
+    // fall back to Unix domain socket file.
+
+    #ifdef __linux__
+    int testSocketFD;
+    testSocketFD = socket(xServerAddrFamily, SOCK_STREAM, PF_UNSPEC);
+
+    int len = sprintf(unixSocketName + 1, "/tmp/.X11-unix/X%d", xPort);
+    unixSocketName[0] = '\0';
+
+    sockaddr_un *xServerAddrABSTRACT = new sockaddr_un;
+    memset(xServerAddrABSTRACT, 0, xServerAddrLength);
+    xServerAddrABSTRACT -> sun_family = AF_UNIX;
+    memcpy(xServerAddrABSTRACT -> sun_path, unixSocketName, len+1);
+    xServerAddrLength = len +3;
+
+    int ret = connect(testSocketFD, (struct sockaddr *) xServerAddrABSTRACT, xServerAddrLength);
+    if (ret == 0) {
+
+        cerr << "Info" << ": Using abstract X11 socket in kernel namespace "
+             << "for accessing DISPLAY=:" << xPort << ".\n";
+
+        close(testSocketFD);
+        xServerAddr = (sockaddr *) xServerAddrABSTRACT;
+        return 1;
+
+    } else {
+
+        cerr << "Info" << ": Falling back to file system X11 socket "
+             << "for accessing DISPLAY=:" << xPort << ".\n";
+
+    #endif
+
     struct stat statInfo;
 
     char unixSocketDir[DEFAULT_STRING_LENGTH];
@@ -4322,6 +4355,11 @@ int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
 
     xServerAddr = (sockaddr *) xServerAddrUNIX;
     xServerAddrLength = sizeof(sockaddr_un);
+
+    #ifdef __linux__
+
+    }
+    #endif
   }
   else
   {
-- 
cgit v1.2.3


From bd10fe5919594afe37d0019bf58c359e79b54979 Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Mon, 9 Feb 2015 15:31:46 +0100
Subject: Fix BIGENDIAN issue in nxcomp (relevant on PPC64 arch)
 (029_nxcomp_ppc64.full+lite.patch)

---
 debian/patches/029_nxcomp_ppc64.full+lite.patch | 17 -----------------
 debian/patches/series                           |  1 -
 nxcomp/Loop.cpp                                 |  4 ++--
 3 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 debian/patches/029_nxcomp_ppc64.full+lite.patch

(limited to 'nxcomp')

diff --git a/debian/patches/029_nxcomp_ppc64.full+lite.patch b/debian/patches/029_nxcomp_ppc64.full+lite.patch
deleted file mode 100644
index 9d454d5db..000000000
--- a/debian/patches/029_nxcomp_ppc64.full+lite.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix BIGENDIAN issue in nxcomp (relevant on PPC64 arch)
-Author: Mihai Moldovan <ionic@ionic.de>
-
---- a/nxcomp/Loop.cpp
-+++ b/nxcomp/Loop.cpp
-@@ -6832,9 +6832,9 @@
-     {
-       sockaddr_in newAddr;
- 
--      size_t addrLen = sizeof(sockaddr_in);
-+      socklen_t addrLen = sizeof(sockaddr_in);
- 
--      newFD = accept(proxyFD, (sockaddr *) &newAddr, (socklen_t *) &addrLen);
-+      newFD = accept(proxyFD, (sockaddr *) &newAddr, &addrLen);
- 
-       if (newFD == -1)
-       {
diff --git a/debian/patches/series b/debian/patches/series
index b184a1fb0..de6e0905a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-029_nxcomp_ppc64.full+lite.patch
 030_nx-X11_configure-args.full.patch
 031_nx-X11_parallel-make.full.patch
 051_nxcomp_macos105-fdisset.full+lite.patch
diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 6fd772912..7e2b990de 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -6832,9 +6832,9 @@ int WaitForRemote(int portNum)
     {
       sockaddr_in newAddr;
 
-      size_t addrLen = sizeof(sockaddr_in);
+      socklen_t addrLen = sizeof(sockaddr_in);
 
-      newFD = accept(proxyFD, (sockaddr *) &newAddr, (socklen_t *) &addrLen);
+      newFD = accept(proxyFD, (sockaddr *) &newAddr, &addrLen);
 
       if (newFD == -1)
       {
-- 
cgit v1.2.3


From 9054786947b2f6b82078f6e5f965c3b0b629c880 Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Mon, 9 Feb 2015 15:41:35 +0100
Subject: workaround for Mac OS X 10.5
 (051_nxcomp_macos105-fdisset.full+lite.patch(

 The Mac OS X 10.5 SDK requires the second argument of FD_ISSET to be
 writeable, although it does only access the data. Given that we have a
 const pointer for a const struct, copy and pass that.
 .
 Note that this is merely a workaround for OS X 10.5, as 10.6 and later
 define the second argument of FD_ISSET as const struct const *foo, too.
 .
 It is safe, as data is accessed read-only by FD_ISSET, even on 10.5.
---
 .../051_nxcomp_macos105-fdisset.full+lite.patch    | 82 ----------------------
 debian/patches/series                              |  1 -
 nxcomp/Agent.h                                     | 28 +++++---
 3 files changed, 20 insertions(+), 91 deletions(-)
 delete mode 100644 debian/patches/051_nxcomp_macos105-fdisset.full+lite.patch

(limited to 'nxcomp')

diff --git a/debian/patches/051_nxcomp_macos105-fdisset.full+lite.patch b/debian/patches/051_nxcomp_macos105-fdisset.full+lite.patch
deleted file mode 100644
index 6b78a6bc2..000000000
--- a/debian/patches/051_nxcomp_macos105-fdisset.full+lite.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Description: workaround for Mac OS X 10.5 
- The Mac OS X 10.5 SDK requires the second argument of FD_ISSET to be
- writeable, although it does only access the data. Given that we have a
- const pointer for a const struct, copy and pass that.
- .
- Note that this is merely a workaround for OS X 10.5, as 10.6 and later
- define the second argument of FD_ISSET as const struct const *foo, too.
- .
- It is safe, as data is accessed read-only by FD_ISSET, even on 10.5.
-Forward: pending
-Author: Mihai Moldovan <ionic@ionic.de>
----
- nxcomp/Agent.h |   28 ++++++++++++++++++++--------
- 1 files changed, 20 insertions(+), 8 deletions(-)
-
---- a/nxcomp/Agent.h
-+++ b/nxcomp/Agent.h
-@@ -149,30 +149,38 @@
- 
-   int remoteCanRead(const fd_set * const readSet)
-   {
-+    // OS X 10.5 requires the second argument to be non-const, so copy readSet.
-+    // It's safe though, as FD_ISSET does not operate on it.
-+    fd_set readWorkSet = *readSet;
-+
-     #if defined(TEST) || defined(INFO)
-     *logofs << "Agent: remoteCanRead() is " <<
--               (FD_ISSET(remoteFd_, readSet) && transport_ -> dequeuable() != 0)
--            << " with FD_ISSET() " << (int) FD_ISSET(remoteFd_, readSet)
-+               (FD_ISSET(remoteFd_, &readWorkSet) && transport_ -> dequeuable() != 0)
-+            << " with FD_ISSET() " << (int) FD_ISSET(remoteFd_, &readWorkSet)
-             << " and dequeuable " << transport_ -> dequeuable()
-             << ".\n" << logofs_flush;
-     #endif
- 
--    return (FD_ISSET(remoteFd_, readSet) &&
-+    return (FD_ISSET(remoteFd_, &readWorkSet) &&
-                 transport_ -> dequeuable() != 0);
-   }
- 
-   int remoteCanWrite(const fd_set * const writeSet)
-   {
-+    // OS X 10.5 requires the second argument to be non-const, so copy writeSet.
-+    // It's safe though, as FD_ISSET does not operate on it.
-+    fd_set writeWorkSet = *writeSet;
-+
-     #if defined(TEST) || defined(INFO)
-     *logofs << "Agent: remoteCanWrite() is " <<
--               (FD_ISSET(remoteFd_, writeSet) && transport_ ->
-+               (FD_ISSET(remoteFd_, &writeWorkSet) && transport_ ->
-                queuable() != 0 && canRead_ == 1) << " with FD_ISSET() "
--            << (int) FD_ISSET(remoteFd_, writeSet) << " queueable "
-+            << (int) FD_ISSET(remoteFd_, &writeWorkSet) << " queueable "
-             << transport_ -> queuable() << " channel can read "
-             << canRead_ << ".\n" << logofs_flush;
-     #endif
- 
--    return (FD_ISSET(remoteFd_, writeSet) &&
-+    return (FD_ISSET(remoteFd_, &writeWorkSet) &&
-                 transport_ -> queuable() != 0 &&
-                     canRead_ == 1);
-   }
-@@ -203,13 +211,17 @@
- 
-   int proxyCanRead(const fd_set * const readSet)
-   {
-+    // OS X 10.5 requires the second argument to be non-const, so copy readSet.
-+    // It's safe though, as FD_ISSET does not operate on it.
-+    fd_set readWorkSet = *readSet;
-+
-     #if defined(TEST) || defined(INFO)
-     *logofs << "Agent: proxyCanRead() is "
--            << ((int) FD_ISSET(proxy -> getFd(), readSet)
-+            << ((int) FD_ISSET(proxy -> getFd(), &readWorkSet)
-             << ".\n" << logofs_flush;
-     #endif
- 
--    return (FD_ISSET(proxy -> getFd(), readSet));
-+    return (FD_ISSET(proxy -> getFd(), &readWorkSet));
-   }
- 
-   int enqueueData(const char *data, const int size) const
diff --git a/debian/patches/series b/debian/patches/series
index 2c9811e29..214bf6a69 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-051_nxcomp_macos105-fdisset.full+lite.patch
 052_nxcomp_macos10-nxauth-location.full+lite.patch
 053_nx-X11_no-xcomp1-install-target.full.patch
 054_nx-X11_ppc64-ftbfs.full.patch
diff --git a/nxcomp/Agent.h b/nxcomp/Agent.h
index fac5acd43..ded344d84 100644
--- a/nxcomp/Agent.h
+++ b/nxcomp/Agent.h
@@ -149,30 +149,38 @@ class Agent
 
   int remoteCanRead(const fd_set * const readSet)
   {
+    // OS X 10.5 requires the second argument to be non-const, so copy readSet.
+    // It's safe though, as FD_ISSET does not operate on it.
+    fd_set readWorkSet = *readSet;
+
     #if defined(TEST) || defined(INFO)
     *logofs << "Agent: remoteCanRead() is " <<
-               (FD_ISSET(remoteFd_, readSet) && transport_ -> dequeuable() != 0)
-            << " with FD_ISSET() " << (int) FD_ISSET(remoteFd_, readSet)
+               (FD_ISSET(remoteFd_, &readWorkSet) && transport_ -> dequeuable() != 0)
+            << " with FD_ISSET() " << (int) FD_ISSET(remoteFd_, &readWorkSet)
             << " and dequeuable " << transport_ -> dequeuable()
             << ".\n" << logofs_flush;
     #endif
 
-    return (FD_ISSET(remoteFd_, readSet) &&
+    return (FD_ISSET(remoteFd_, &readWorkSet) &&
                 transport_ -> dequeuable() != 0);
   }
 
   int remoteCanWrite(const fd_set * const writeSet)
   {
+    // OS X 10.5 requires the second argument to be non-const, so copy writeSet.
+    // It's safe though, as FD_ISSET does not operate on it.
+    fd_set writeWorkSet = *writeSet;
+
     #if defined(TEST) || defined(INFO)
     *logofs << "Agent: remoteCanWrite() is " <<
-               (FD_ISSET(remoteFd_, writeSet) && transport_ ->
+               (FD_ISSET(remoteFd_, &writeWorkSet) && transport_ ->
                queuable() != 0 && canRead_ == 1) << " with FD_ISSET() "
-            << (int) FD_ISSET(remoteFd_, writeSet) << " queueable "
+            << (int) FD_ISSET(remoteFd_, &writeWorkSet) << " queueable "
             << transport_ -> queuable() << " channel can read "
             << canRead_ << ".\n" << logofs_flush;
     #endif
 
-    return (FD_ISSET(remoteFd_, writeSet) &&
+    return (FD_ISSET(remoteFd_, &writeWorkSet) &&
                 transport_ -> queuable() != 0 &&
                     canRead_ == 1);
   }
@@ -203,13 +211,17 @@ class Agent
 
   int proxyCanRead(const fd_set * const readSet)
   {
+    // OS X 10.5 requires the second argument to be non-const, so copy readSet.
+    // It's safe though, as FD_ISSET does not operate on it.
+    fd_set readWorkSet = *readSet;
+
     #if defined(TEST) || defined(INFO)
     *logofs << "Agent: proxyCanRead() is "
-            << ((int) FD_ISSET(proxy -> getFd(), readSet)
+            << ((int) FD_ISSET(proxy -> getFd(), &readWorkSet)
             << ".\n" << logofs_flush;
     #endif
 
-    return (FD_ISSET(proxy -> getFd(), readSet));
+    return (FD_ISSET(proxy -> getFd(), &readWorkSet));
   }
 
   int enqueueData(const char *data, const int size) const
-- 
cgit v1.2.3


From e736fff09871bbbc6101f3da444afbccd473a915 Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Mon, 9 Feb 2015 15:45:33 +0100
Subject: Fix nxauth location on Mac OS X 10
 (052_nxcomp_macos10-nxauth-location.full+lite.patch)

---
 ..._nxcomp_macos10-nxauth-location.full+lite.patch | 41 ----------------------
 debian/patches/series                              |  1 -
 nxcomp/Auth.cpp                                    | 17 ++++++---
 3 files changed, 13 insertions(+), 46 deletions(-)
 delete mode 100644 debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch

(limited to 'nxcomp')

diff --git a/debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch b/debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch
deleted file mode 100644
index 813363e69..000000000
--- a/debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Fix nxauth location on Mac OS X 10
-Author: Mihai Moldovan <ionic@ionic.de>
-
---- a/nxcomp/Auth.cpp
-+++ b/nxcomp/Auth.cpp
-@@ -217,22 +217,31 @@
- 
-   //
-   // Use the nxauth command on Windows and the Mac, xauth
--  // on all the other platforms. On Windows and on the Mac
--  // we assume that the nxauth command is located under
--  // bin in the client installation directory. On all the
-+  // on all the other platforms. On Windows we assume that
-+  // the nxauth command is located under bin in the client
-+  // installation directory. On Mac OS X we assume that the
-+  // command is located directly in the client installation
-+  // directory, to make bundle shipping easier. On all the
-   // other platforms we use the default xauth command that
-   // is in our path.
-   //
- 
-   char command[DEFAULT_STRING_LIMIT];
- 
--  #if defined(__CYGWIN32__) || defined(__APPLE__)
-+  #if defined(__CYGWIN32__)
- 
-   snprintf(command, DEFAULT_STRING_LIMIT - 1,
-                "%s/bin/nxauth", control -> SystemPath);
- 
-   *(command + DEFAULT_STRING_LIMIT - 1) = '\0';
- 
-+  #elif defined(__APPLE__)
-+
-+  snprintf(command, DEFAULT_STRING_LIMIT - 1,
-+               "%s/nxauth", control -> SystemPath);
-+
-+  *(command + DEFAULT_STRING_LIMIT - 1) = '\0';
-+
-   #else
- 
-   strcpy(command, "xauth");
diff --git a/debian/patches/series b/debian/patches/series
index 214bf6a69..138d87ae9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-052_nxcomp_macos10-nxauth-location.full+lite.patch
 053_nx-X11_no-xcomp1-install-target.full.patch
 054_nx-X11_ppc64-ftbfs.full.patch
 055_nx-X11_imake-Werror-format-security.full.patch
diff --git a/nxcomp/Auth.cpp b/nxcomp/Auth.cpp
index d8e999132..c52392a51 100644
--- a/nxcomp/Auth.cpp
+++ b/nxcomp/Auth.cpp
@@ -217,22 +217,31 @@ int Auth::getCookie()
 
   //
   // Use the nxauth command on Windows and the Mac, xauth
-  // on all the other platforms. On Windows and on the Mac
-  // we assume that the nxauth command is located under
-  // bin in the client installation directory. On all the
+  // on all the other platforms. On Windows we assume that
+  // the nxauth command is located under bin in the client
+  // installation directory. On Mac OS X we assume that the
+  // command is located directly in the client installation
+  // directory, to make bundle shipping easier. On all the
   // other platforms we use the default xauth command that
   // is in our path.
   //
 
   char command[DEFAULT_STRING_LIMIT];
 
-  #if defined(__CYGWIN32__) || defined(__APPLE__)
+  #if defined(__CYGWIN32__)
 
   snprintf(command, DEFAULT_STRING_LIMIT - 1,
                "%s/bin/nxauth", control -> SystemPath);
 
   *(command + DEFAULT_STRING_LIMIT - 1) = '\0';
 
+  #elif defined(__APPLE__)
+
+  snprintf(command, DEFAULT_STRING_LIMIT - 1,
+               "%s/nxauth", control -> SystemPath);
+
+  *(command + DEFAULT_STRING_LIMIT - 1) = '\0';
+
   #else
 
   strcpy(command, "xauth");
-- 
cgit v1.2.3


From 8c1b852abf692af4898368132292eb8c7278a7c2 Mon Sep 17 00:00:00 2001
From: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>
Date: Tue, 10 Feb 2015 19:43:41 +0100
Subject: Save session state in file.

  210_nxagent_save_session_state.full.patch
  210_nxcomp_save_session_state.full+lite.patch

  This patch adds a "state" option to NX (agent) which
  allows one to specify a file where nxagent will write
  its session state into.
---
 .../210_nxagent_save_session_state.full.patch      | 176 ---------------------
 .../210_nxcomp_save_session_state.full+lite.patch  |  15 --
 debian/patches/series                              |   2 -
 nx-X11/programs/Xserver/hw/nxagent/Args.c          |  11 ++
 nx-X11/programs/Xserver/hw/nxagent/Init.c          |   3 +-
 nx-X11/programs/Xserver/hw/nxagent/Reconnect.c     |  33 ++++
 nx-X11/programs/Xserver/hw/nxagent/Reconnect.h     |   2 +
 nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c  |   3 +
 nxcomp/Loop.cpp                                    |   3 +-
 9 files changed, 53 insertions(+), 195 deletions(-)
 delete mode 100644 debian/patches/210_nxagent_save_session_state.full.patch
 delete mode 100644 debian/patches/210_nxcomp_save_session_state.full+lite.patch

(limited to 'nxcomp')

diff --git a/debian/patches/210_nxagent_save_session_state.full.patch b/debian/patches/210_nxagent_save_session_state.full.patch
deleted file mode 100644
index 223d0bc7a..000000000
--- a/debian/patches/210_nxagent_save_session_state.full.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-Description: Save session state in file
-Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>
-
---- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
-+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
-@@ -60,6 +60,7 @@
- #endif
- #include "Handlers.h"
- #include "Error.h"
-+#include "Reconnect.h"
- 
- /*
-  * NX includes and definitions.
-@@ -1090,6 +1091,11 @@
- 
-     return;
-   }
-+  else if (!strcmp(name, "state"))
-+  {
-+    setStatePath(value);
-+    return;
-+  }
-   else if (!strcmp(name, "fullscreen"))
-   {
-     if (nxagentReconnectTrap == True)
-@@ -1369,6 +1375,11 @@
-               validateString(nxagentOptionFile));
-   #endif
- 
-+  /*
-+   * Init statePath
-+   */
-+  setStatePath("");
-+
-   if (nxagentOptionFile == NULL)
-   {
-     return;
---- a/nx-X11/programs/Xserver/hw/nxagent/Init.c
-+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c
-@@ -63,7 +63,7 @@
- 
- #include "NX.h"
- #include "NXlib.h"
--
-+#include "Reconnect.h"
- /*
-  * Set here the required log level.
-  */
-@@ -233,6 +233,7 @@
-     fprintf(stderr, "Info: Agent running with pid '%d'.\n", getpid());
- 
-     fprintf(stderr, "Session: Starting session at '%s'.\n", GetTimeAsString());
-+    saveAgentState("STARTING");
-   }
- 
-   /*
---- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
-+++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
-@@ -118,6 +118,33 @@
- 
- static enum RECONNECTION_STEP failedStep;
- 
-+#include <limits.h>
-+
-+/*
-+ * Path of state File
-+ */
-+char stateFile[PATH_MAX];
-+
-+
-+void setStatePath(char* path)
-+{
-+    strncpy(stateFile, path, PATH_MAX-1);
-+}
-+
-+void saveAgentState(char* state)
-+{
-+    FILE* fptr;
-+    if(strlen(stateFile))
-+    {
-+        fptr=fopen(stateFile, "w");
-+        if(!fptr)
-+            return;
-+        fprintf(fptr,"%s", state);
-+        fclose(fptr);
-+    }
-+}
-+
-+
- int nxagentHandleConnectionStates(void)
- {
-   #ifdef TEST
-@@ -211,6 +238,7 @@
-           fprintf(stderr, "Session: Display failure detected at '%s'.\n", GetTimeAsString());
- 
-           fprintf(stderr, "Session: Suspending session at '%s'.\n", GetTimeAsString());
-+          saveAgentState("SUSPENDING");
-         }
- 
-         nxagentDisconnectSession();
-@@ -265,6 +293,7 @@
-         fprintf(stderr, "Session: Session suspended at '%s'.\n", GetTimeAsString());
-         #endif
-       }
-+      saveAgentState("SUSPENDED");
- 
-       nxagentResetDisplayHandlers();
- 
-@@ -622,6 +651,7 @@
-   #else
-   fprintf(stderr, "Session: Session resumed at '%s'.\n", GetTimeAsString());
-   #endif
-+  saveAgentState("RUNNING");
- 
-   nxagentRemoveSplashWindow(NULL);
- 
-@@ -785,12 +815,14 @@
-   if (nxagentSessionState == SESSION_GOING_DOWN)
-   {
-     fprintf(stderr, "Session: Suspending session at '%s'.\n", GetTimeAsString());
-+    saveAgentState("SUSPENDING");
- 
-     nxagentDisconnectSession();
-   }
-   else if (nxagentSessionState == SESSION_GOING_UP)
-   {
-     fprintf(stderr, "Session: Resuming session at '%s'.\n", GetTimeAsString());
-+    saveAgentState("RESUMING");
- 
-     if (nxagentReconnectSession())
-     {
-@@ -803,6 +835,7 @@
-       fprintf(stderr, "Session: Display failure detected at '%s'.\n", GetTimeAsString());
- 
-       fprintf(stderr, "Session: Suspending session at '%s'.\n", GetTimeAsString());
-+      saveAgentState("SUSPENDING");
- 
-       nxagentDisconnectSession();
-     }
---- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.h
-+++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.h
-@@ -34,6 +34,8 @@
- Bool nxagentReconnectSession(void);
- int nxagentHandleConnectionStates(void);
- void nxagentHandleConnectionChanges(void);
-+void setStatePath(char*);
-+void saveAgentState(char*);
- 
- enum SESSION_STATE
- {
---- a/nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c
-+++ b/nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c
-@@ -609,6 +609,7 @@
-           #endif
- 
-           nxagentSessionState = SESSION_UP;
-+          saveAgentState("RUNNING");
-         }
- 
-         #ifdef BLOCKS
-@@ -823,6 +824,7 @@
-        */
-   
-       fprintf(stderr, "Session: Terminating session at '%s'.\n", GetTimeAsString());
-+      saveAgentState("TERMINATING");
- 
-       nxagentWaitDisplay();
- 
-@@ -833,6 +835,7 @@
-     {
-       NXShadowDestroy();
-     }
-+    saveAgentState("TERMINATED");
- 
-     KillAllClients();
-     DEALLOCATE_LOCAL(clientReady);
diff --git a/debian/patches/210_nxcomp_save_session_state.full+lite.patch b/debian/patches/210_nxcomp_save_session_state.full+lite.patch
deleted file mode 100644
index 1ef4440d8..000000000
--- a/debian/patches/210_nxcomp_save_session_state.full+lite.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Ignore state=<statefile> option in nxproxy/nxcomp
-Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>
-
---- a/nxcomp/Loop.cpp
-+++ b/nxcomp/Loop.cpp
-@@ -8872,7 +8872,8 @@
-     }
-     else if (strcasecmp(name, "defer") == 0 ||
-                  strcasecmp(name, "tile") == 0 ||
--                     strcasecmp(name, "menu") == 0)
-+                     strcasecmp(name, "menu") == 0 ||
-+                        strcasecmp(name, "state") == 0 )
-     {
-       #ifdef DEBUG
-       *logofs << "Loop: Ignoring agent option '" << name
diff --git a/debian/patches/series b/debian/patches/series
index 48b9abddc..9e0e64701 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-210_nxagent_save_session_state.full.patch
-210_nxcomp_save_session_state.full+lite.patch
 211_nxcomp_set_default_options.full+lite.patch
 212_nxcomp_build-on-Android.full+lite.patch
 220_nxproxy_bind-loopback-only.full+lite.patch
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c
index c72b9c4e8..7074a1818 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
@@ -60,6 +60,7 @@ is" without express or implied warranty.
 #endif
 #include "Handlers.h"
 #include "Error.h"
+#include "Reconnect.h"
 
 /*
  * NX includes and definitions.
@@ -1090,6 +1091,11 @@ static void nxagentParseOptions(char *name, char *value)
 
     return;
   }
+  else if (!strcmp(name, "state"))
+  {
+    setStatePath(value);
+    return;
+  }
   else if (!strcmp(name, "fullscreen"))
   {
     if (nxagentReconnectTrap == True)
@@ -1369,6 +1375,11 @@ void nxagentProcessOptionsFile()
               validateString(nxagentOptionFile));
   #endif
 
+  /*
+   * Init statePath
+   */
+  setStatePath("");
+
   if (nxagentOptionFile == NULL)
   {
     return;
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c
index 1794f1551..8d4eed2b6 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Init.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c
@@ -63,7 +63,7 @@ is" without express or implied warranty.
 
 #include "NX.h"
 #include "NXlib.h"
-
+#include "Reconnect.h"
 /*
  * Set here the required log level.
  */
@@ -233,6 +233,7 @@ void InitOutput(ScreenInfo *screenInfo, int argc, char *argv[])
     fprintf(stderr, "Info: Agent running with pid '%d'.\n", getpid());
 
     fprintf(stderr, "Session: Starting session at '%s'.\n", GetTimeAsString());
+    saveAgentState("STARTING");
   }
 
   /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
index 3c576c6e0..b26fa9cfe 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
@@ -118,6 +118,33 @@ void *reconnectLossyLevel[STEP_NONE];
 
 static enum RECONNECTION_STEP failedStep;
 
+#include <limits.h>
+
+/*
+ * Path of state File
+ */
+char stateFile[PATH_MAX];
+
+
+void setStatePath(char* path)
+{
+    strncpy(stateFile, path, PATH_MAX-1);
+}
+
+void saveAgentState(char* state)
+{
+    FILE* fptr;
+    if(strlen(stateFile))
+    {
+        fptr=fopen(stateFile, "w");
+        if(!fptr)
+            return;
+        fprintf(fptr,"%s", state);
+        fclose(fptr);
+    }
+}
+
+
 int nxagentHandleConnectionStates(void)
 {
   #ifdef TEST
@@ -211,6 +238,7 @@ TODO: This should be reset only when
           fprintf(stderr, "Session: Display failure detected at '%s'.\n", GetTimeAsString());
 
           fprintf(stderr, "Session: Suspending session at '%s'.\n", GetTimeAsString());
+          saveAgentState("SUSPENDING");
         }
 
         nxagentDisconnectSession();
@@ -265,6 +293,7 @@ TODO: This should be reset only when
         fprintf(stderr, "Session: Session suspended at '%s'.\n", GetTimeAsString());
         #endif
       }
+      saveAgentState("SUSPENDED");
 
       nxagentResetDisplayHandlers();
 
@@ -622,6 +651,7 @@ Bool nxagentReconnectSession(void)
   #else
   fprintf(stderr, "Session: Session resumed at '%s'.\n", GetTimeAsString());
   #endif
+  saveAgentState("RUNNING");
 
   nxagentRemoveSplashWindow(NULL);
 
@@ -785,12 +815,14 @@ void nxagentHandleConnectionChanges()
   if (nxagentSessionState == SESSION_GOING_DOWN)
   {
     fprintf(stderr, "Session: Suspending session at '%s'.\n", GetTimeAsString());
+    saveAgentState("SUSPENDING");
 
     nxagentDisconnectSession();
   }
   else if (nxagentSessionState == SESSION_GOING_UP)
   {
     fprintf(stderr, "Session: Resuming session at '%s'.\n", GetTimeAsString());
+    saveAgentState("RESUMING");
 
     if (nxagentReconnectSession())
     {
@@ -803,6 +835,7 @@ void nxagentHandleConnectionChanges()
       fprintf(stderr, "Session: Display failure detected at '%s'.\n", GetTimeAsString());
 
       fprintf(stderr, "Session: Suspending session at '%s'.\n", GetTimeAsString());
+      saveAgentState("SUSPENDING");
 
       nxagentDisconnectSession();
     }
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.h b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.h
index c321bfada..5be2928b8 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.h
@@ -34,6 +34,8 @@ void nxagentInitReconnector(void);
 Bool nxagentReconnectSession(void);
 int nxagentHandleConnectionStates(void);
 void nxagentHandleConnectionChanges(void);
+void setStatePath(char*);
+void saveAgentState(char*);
 
 enum SESSION_STATE
 {
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c
index 69ad30d2d..f18c09fe4 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c
@@ -609,6 +609,7 @@ Reply   Total	Cached	Bits In			Bits Out		Bits/Reply	  Ratio
           #endif
 
           nxagentSessionState = SESSION_UP;
+          saveAgentState("RUNNING");
         }
 
         #ifdef BLOCKS
@@ -823,6 +824,7 @@ Reply   Total	Cached	Bits In			Bits Out		Bits/Reply	  Ratio
        */
   
       fprintf(stderr, "Session: Terminating session at '%s'.\n", GetTimeAsString());
+      saveAgentState("TERMINATING");
 
       nxagentWaitDisplay();
 
@@ -833,6 +835,7 @@ Reply   Total	Cached	Bits In			Bits Out		Bits/Reply	  Ratio
     {
       NXShadowDestroy();
     }
+    saveAgentState("TERMINATED");
 
     KillAllClients();
     DEALLOCATE_LOCAL(clientReady);
diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 7e2b990de..12a858b0f 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -8872,7 +8872,8 @@ int ParseEnvironmentOptions(const char *env, int force)
     }
     else if (strcasecmp(name, "defer") == 0 ||
                  strcasecmp(name, "tile") == 0 ||
-                     strcasecmp(name, "menu") == 0)
+                     strcasecmp(name, "menu") == 0 ||
+                        strcasecmp(name, "state") == 0 )
     {
       #ifdef DEBUG
       *logofs << "Loop: Ignoring agent option '" << name
-- 
cgit v1.2.3


From 46c2aebca5196ad4c10bb4f6f2558d656c22f5d9 Mon Sep 17 00:00:00 2001
From: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>
Date: Tue, 10 Feb 2015 19:46:04 +0100
Subject: Set default pack and link options to avoid damage of session
 (211_nxcomp_set_default_options.full+lite.patch).

---
 .../211_nxcomp_set_default_options.full+lite.patch | 27 ----------------------
 debian/patches/series                              |  1 -
 nxcomp/Loop.cpp                                    |  8 +++----
 3 files changed, 4 insertions(+), 32 deletions(-)
 delete mode 100644 debian/patches/211_nxcomp_set_default_options.full+lite.patch

(limited to 'nxcomp')

diff --git a/debian/patches/211_nxcomp_set_default_options.full+lite.patch b/debian/patches/211_nxcomp_set_default_options.full+lite.patch
deleted file mode 100644
index 7bd8a781d..000000000
--- a/debian/patches/211_nxcomp_set_default_options.full+lite.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Set default pack and link options to avoid damage of session.
-Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>
-
---- a/nxcomp/Loop.cpp
-+++ b/nxcomp/Loop.cpp
-@@ -8328,8 +8328,8 @@
- 
-         cerr << "Error" << ": Can't identify 'link' option in string '"
-              << value << "'.\n";
--
--        return -1;
-+        if (ParseLinkOption("adsl") < 0)
-+           return -1;
-       }
-     }
-     else if (strcasecmp(name, "limit") == 0)
-@@ -8783,8 +8783,8 @@
- 
-         cerr << "Error" << ": Can't identify pack method for string '"
-              << value << "'.\n";
--
--        return -1;
-+        if (ParsePackOption("nopack")<0)
-+           return -1;
-       }
-     }
-     else if (strcasecmp(name, "core") == 0)
diff --git a/debian/patches/series b/debian/patches/series
index 9e0e64701..0174ca194 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-211_nxcomp_set_default_options.full+lite.patch
 212_nxcomp_build-on-Android.full+lite.patch
 220_nxproxy_bind-loopback-only.full+lite.patch
 300_nxagent_set-wm-class.full.patch
diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 12a858b0f..d5c8eb25d 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -8328,8 +8328,8 @@ int ParseEnvironmentOptions(const char *env, int force)
 
         cerr << "Error" << ": Can't identify 'link' option in string '"
              << value << "'.\n";
-
-        return -1;
+        if (ParseLinkOption("adsl") < 0)
+           return -1;
       }
     }
     else if (strcasecmp(name, "limit") == 0)
@@ -8783,8 +8783,8 @@ int ParseEnvironmentOptions(const char *env, int force)
 
         cerr << "Error" << ": Can't identify pack method for string '"
              << value << "'.\n";
-
-        return -1;
+        if (ParsePackOption("nopack")<0)
+           return -1;
       }
     }
     else if (strcasecmp(name, "core") == 0)
-- 
cgit v1.2.3


From 79f218b563f6a4d3b17e92ee85ad242575daf8da Mon Sep 17 00:00:00 2001
From: Nito Martinez <Nito@Qindel.ES>
Date: Tue, 10 Feb 2015 19:47:58 +0100
Subject: Fix FTBFS of nxproxy/nxcomp on Android
 (212_nxcomp_build-on-Android.full+lite.patch).

---
 .../212_nxcomp_build-on-Android.full+lite.patch    | 253 ---------------------
 debian/patches/series                              |   1 -
 nxcomp/Jpeg.cpp                                    |   3 +
 nxcomp/Loop.cpp                                    |  12 +-
 nxcomp/Pgn.cpp                                     |   3 +
 nxcomp/Proxy.cpp                                   |   7 +
 nxcomp/ServerChannel.cpp                           |  52 ++++-
 7 files changed, 64 insertions(+), 267 deletions(-)
 delete mode 100644 debian/patches/212_nxcomp_build-on-Android.full+lite.patch

(limited to 'nxcomp')

diff --git a/debian/patches/212_nxcomp_build-on-Android.full+lite.patch b/debian/patches/212_nxcomp_build-on-Android.full+lite.patch
deleted file mode 100644
index 528d33b74..000000000
--- a/debian/patches/212_nxcomp_build-on-Android.full+lite.patch
+++ /dev/null
@@ -1,253 +0,0 @@
-Author: Nito Martinez <Nito@Qindel.ES>
-Description: Fix FTBFS of nxproxy/nxcomp on Android
-
---- a/nxcomp/Jpeg.cpp
-+++ b/nxcomp/Jpeg.cpp
-@@ -17,6 +17,9 @@
- 
- #include <X11/Xmd.h>
- 
-+#ifdef ANDROID
-+#include <strings.h>
-+#endif
- #include <unistd.h>
- #include <setjmp.h>
- #include <zlib.h>
---- a/nxcomp/Loop.cpp
-+++ b/nxcomp/Loop.cpp
-@@ -4187,7 +4187,7 @@
- 
-   #endif
- 
--  char *separator = rindex(display, ':');
-+  char *separator = strrchr(display, ':');
- 
-   if ((separator == NULL) || !isdigit(*(separator + 1)))
-   {
-@@ -8240,7 +8240,7 @@
-   char *name;
-   char *value;
- 
--  value = rindex(nextOpts, ':');
-+  value = strrchr(nextOpts, ':');
- 
-   if (value != NULL)
-   {
-@@ -11010,7 +11010,7 @@
-                                       packMethod == PACK_LOSSLESS ||
-                                           packMethod == PACK_ADAPTIVE)
-   {
--    const char *dash = rindex(opt, '-');
-+    const char *dash = strrchr(opt, '-');
- 
-     if (dash != NULL && strlen(dash) == 2 &&
-             *(dash + 1) >= '0' && *(dash + 1) <= '9')
-@@ -12275,6 +12275,10 @@
-     control -> ShmemServer = 0;
-   }
- 
-+  // For android, no shared memory available
-+  control -> ShmemServer = 0;
-+  control -> ShmemClientSize = 0;
-+
-   return 1;
- }
- 
-@@ -13525,7 +13529,7 @@
- 
-   int newPort = port;
- 
--  const char *separator = rindex(opt, ':');
-+  const char *separator = strrchr(opt, ':');
- 
-   if (separator != NULL)
-   {
---- a/nxcomp/Pgn.cpp
-+++ b/nxcomp/Pgn.cpp
-@@ -23,6 +23,9 @@
- 
- #include <X11/Xmd.h>
- 
-+#ifdef ANDROID
-+#include <strings.h>
-+#endif
- #include <unistd.h>
- #include <stdio.h>
- #include <png.h>
---- a/nxcomp/Proxy.cpp
-+++ b/nxcomp/Proxy.cpp
-@@ -20,6 +20,11 @@
- #include <cstdlib>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#ifdef ANDROID
-+#include <netinet/in.h>
-+#include <netinet/ip.h>
-+#include <netinet/tcp.h>
-+#endif
- 
- #include "Misc.h"
- 
-@@ -31,9 +36,11 @@
- #include <sys/un.h>
- #endif
- 
-+#ifndef ANDROID
- #include <netinet/in.h>
- #include <netinet/ip.h>
- #include <netinet/tcp.h>
-+#endif
- 
- #if defined(__EMX__ ) || defined(__CYGWIN32__)
- 
---- a/nxcomp/ServerChannel.cpp
-+++ b/nxcomp/ServerChannel.cpp
-@@ -18,7 +18,9 @@
- #include <string.h>
- #include <sys/types.h>
- #include <sys/ipc.h>
-+#ifndef ANDROID
- #include <sys/shm.h>
-+#endif
- 
- #include <X11/X.h>
- #include <X11/Xatom.h>
-@@ -1079,7 +1081,6 @@
- 
-                   priority_++;
-                 }
--
-                 //
-                 // Account this data to the original opcode.
-                 //
-@@ -1500,7 +1501,6 @@
-             continue;
-           }
-         }
--
-         //
-         // Check if user pressed the CTRL+ALT+SHIFT+ESC key
-         // sequence because was unable to kill the session
-@@ -5475,7 +5475,7 @@
-     *logofs << "handleColormap: Dumping colormap entries:\n"
-             << logofs_flush;
- 
--    const unsigned char *p = unpackState_[resource] -> colormap -> data;
-+    const unsigned char *p = (const unsigned char *) unpackState_[resource] -> colormap -> data;
- 
-     for (unsigned int i = 0; i < unpackState_[resource] ->
-              colormap -> entries; i++)
-@@ -7100,7 +7100,12 @@
-   {
-     encodeBuffer.encodeValue(stage, 2);
- 
-+#ifndef ANDROID
-     shmemState_ -> present = *(buffer + 8);
-+#else
-+    shmemState_ -> present = 0;
-+    cerr << "Info: handleShmemReply: In android no shared memory. Setting present to 0 hardcoded\n";
-+#endif
-     shmemState_ -> opcode  = *(buffer + 9);
-     shmemState_ -> event   = *(buffer + 10);
-     shmemState_ -> error   = *(buffer + 11);
-@@ -7128,7 +7133,12 @@
-       cerr << "Info" << ": Using shared memory parameters 1/"
-            << (shmemState_ -> size / 1024) << "K.\n";
- 
-+#ifndef ANDROID
-       shmemState_ -> enabled = 1;
-+#else
-+      cerr << "Info: handleShmemReply: In android no shared memory. Setting enabled to -1. This should not be displayed\n";
-+      shmemState_ -> enabled = -1;
-+#endif
- 
-       encodeBuffer.encodeBoolValue(1);
-     }
-@@ -7241,7 +7251,7 @@
-       // memory support is disabled by the
-       // user.
-       //
--
-+#ifndef ANDROID
-       if (control -> ShmemServer == 1 &&
-               control -> ShmemServerSize > 0 &&
-                   enableServer == 1)
-@@ -7252,8 +7262,12 @@
-       {
-         memcpy(buffer + 8, "NO-MIT-", 7);
-       }
-+#else
-+      cerr << "Info: handleShmemRequest: In android no shared memory. Returning NO-MIT- answer\n";
- 
--      sequenceQueue_.push(clientSequence_, opcode,
-+        memcpy(buffer + 8, "NO-MIT-", 7);
-+#endif
-+     sequenceQueue_.push(clientSequence_, opcode,
-                               opcodeStore_ -> getShmemParameters, stage);
- 
-       //
-@@ -7289,9 +7303,13 @@
- 
-         shmemState_ -> size = control -> ShmemServerSize;
- 
-+#ifndef ANDROID
-         shmemState_ -> id = shmget(IPC_PRIVATE, shmemState_ -> size,
-                                        IPC_CREAT | permissions);
--
-+#else
-+	cerr << "Info: handleShmemReqyest: In android no shared memory (shmget). This message should not be displayed present should never be 1 in android\n";
-+	shmemState_ -> id = -1;
-+#endif
-         if (shmemState_ -> id >= 0)
-         {
-           #if defined(TEST) || defined(INFO)
-@@ -7302,8 +7320,12 @@
-           #endif
- 
- 
-+#ifndef ANDROID
-           shmemState_ -> address = shmat(shmemState_ -> id, 0, 0);
--
-+#else
-+	  cerr << "Info: handleShmemReqyest: In android no shared memory (shmat). This message should not be displayed. present should never be 1 in android\n";
-+	  shmemState_ -> address = NULL;
-+#endif
-           if (shmemState_ -> address != NULL)
-           {
-             #ifdef TEST
-@@ -7437,6 +7459,10 @@
- 
-     return 0;
-   }
-+#ifdef ANDROID
-+  cerr << "Info: handleShmem: In android no shared memory.  enabled should never be 1. This should not be displayed\n";
-+  return 0;
-+#endif
- 
-   //
-   // Ignore null requests and requests that will not result
-@@ -8054,14 +8080,22 @@
- {
-   if (shmemState_ != NULL)
-   {
--    if (shmemState_ -> address != NULL)
-+   if (shmemState_ -> address != NULL)
-     {
--      shmdt((char *) shmemState_ -> address);
-+#ifndef ANDROID
-+       shmdt((char *) shmemState_ -> address);
-+#else
-+    cerr << "Info: handleShmemStateRemove: In android no shared memory. This should not be displayed. address should always be NULL\n";
-+#endif
-     }
- 
-     if (shmemState_ -> id > 0)
-     {
-+#ifndef ANDROID
-       shmctl(shmemState_ -> id, IPC_RMID, 0);
-+#else
-+      cerr << "Info: handleShmemStateRemove: In android no shared memory. This should not be displayed. id should always be 0\n";
-+#endif
-     }
- 
-     delete shmemState_;
diff --git a/debian/patches/series b/debian/patches/series
index 0174ca194..b6a467730 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-212_nxcomp_build-on-Android.full+lite.patch
 220_nxproxy_bind-loopback-only.full+lite.patch
 300_nxagent_set-wm-class.full.patch
 301_nx-X11_use-shared-libs.full.patch
diff --git a/nxcomp/Jpeg.cpp b/nxcomp/Jpeg.cpp
index 9f71cbadf..414d373ef 100644
--- a/nxcomp/Jpeg.cpp
+++ b/nxcomp/Jpeg.cpp
@@ -17,6 +17,9 @@
 
 #include <X11/Xmd.h>
 
+#ifdef ANDROID
+#include <strings.h>
+#endif
 #include <unistd.h>
 #include <setjmp.h>
 #include <zlib.h>
diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index d5c8eb25d..05b514570 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -4187,7 +4187,7 @@ int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
 
   #endif
 
-  char *separator = rindex(display, ':');
+  char *separator = strrchr(display, ':');
 
   if ((separator == NULL) || !isdigit(*(separator + 1)))
   {
@@ -8240,7 +8240,7 @@ int ParseEnvironmentOptions(const char *env, int force)
   char *name;
   char *value;
 
-  value = rindex(nextOpts, ':');
+  value = strrchr(nextOpts, ':');
 
   if (value != NULL)
   {
@@ -11010,7 +11010,7 @@ int ParsePackOption(const char *opt)
                                       packMethod == PACK_LOSSLESS ||
                                           packMethod == PACK_ADAPTIVE)
   {
-    const char *dash = rindex(opt, '-');
+    const char *dash = strrchr(opt, '-');
 
     if (dash != NULL && strlen(dash) == 2 &&
             *(dash + 1) >= '0' && *(dash + 1) <= '9')
@@ -12275,6 +12275,10 @@ int SetShmem()
     control -> ShmemServer = 0;
   }
 
+  // For android, no shared memory available
+  control -> ShmemServer = 0;
+  control -> ShmemClientSize = 0;
+
   return 1;
 }
 
@@ -13525,7 +13529,7 @@ int ParseHostOption(const char *opt, char *host, int &port)
 
   int newPort = port;
 
-  const char *separator = rindex(opt, ':');
+  const char *separator = strrchr(opt, ':');
 
   if (separator != NULL)
   {
diff --git a/nxcomp/Pgn.cpp b/nxcomp/Pgn.cpp
index af26724ef..cdcde84ce 100644
--- a/nxcomp/Pgn.cpp
+++ b/nxcomp/Pgn.cpp
@@ -23,6 +23,9 @@
 
 #include <X11/Xmd.h>
 
+#ifdef ANDROID
+#include <strings.h>
+#endif
 #include <unistd.h>
 #include <stdio.h>
 #include <png.h>
diff --git a/nxcomp/Proxy.cpp b/nxcomp/Proxy.cpp
index d6c67e0e8..9b38661b4 100644
--- a/nxcomp/Proxy.cpp
+++ b/nxcomp/Proxy.cpp
@@ -20,6 +20,11 @@
 #include <cstdlib>
 #include <sys/types.h>
 #include <sys/stat.h>
+#ifdef ANDROID
+#include <netinet/in.h>
+#include <netinet/ip.h>
+#include <netinet/tcp.h>
+#endif
 
 #include "Misc.h"
 
@@ -31,9 +36,11 @@
 #include <sys/un.h>
 #endif
 
+#ifndef ANDROID
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
+#endif
 
 #if defined(__EMX__ ) || defined(__CYGWIN32__)
 
diff --git a/nxcomp/ServerChannel.cpp b/nxcomp/ServerChannel.cpp
index 4e6dea324..0f3a3e552 100644
--- a/nxcomp/ServerChannel.cpp
+++ b/nxcomp/ServerChannel.cpp
@@ -18,7 +18,9 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/ipc.h>
+#ifndef ANDROID
 #include <sys/shm.h>
+#endif
 
 #include <X11/X.h>
 #include <X11/Xatom.h>
@@ -1079,7 +1081,6 @@ int ServerChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
 
                   priority_++;
                 }
-
                 //
                 // Account this data to the original opcode.
                 //
@@ -1500,7 +1501,6 @@ int ServerChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
             continue;
           }
         }
-
         //
         // Check if user pressed the CTRL+ALT+SHIFT+ESC key
         // sequence because was unable to kill the session
@@ -5475,7 +5475,7 @@ int ServerChannel::handleColormap(unsigned char &opcode, unsigned char *&buffer,
     *logofs << "handleColormap: Dumping colormap entries:\n"
             << logofs_flush;
 
-    const unsigned char *p = unpackState_[resource] -> colormap -> data;
+    const unsigned char *p = (const unsigned char *) unpackState_[resource] -> colormap -> data;
 
     for (unsigned int i = 0; i < unpackState_[resource] ->
              colormap -> entries; i++)
@@ -7100,7 +7100,12 @@ int ServerChannel::handleShmemReply(EncodeBuffer &encodeBuffer, const unsigned c
   {
     encodeBuffer.encodeValue(stage, 2);
 
+#ifndef ANDROID
     shmemState_ -> present = *(buffer + 8);
+#else
+    shmemState_ -> present = 0;
+    cerr << "Info: handleShmemReply: In android no shared memory. Setting present to 0 hardcoded\n";
+#endif
     shmemState_ -> opcode  = *(buffer + 9);
     shmemState_ -> event   = *(buffer + 10);
     shmemState_ -> error   = *(buffer + 11);
@@ -7128,7 +7133,12 @@ int ServerChannel::handleShmemReply(EncodeBuffer &encodeBuffer, const unsigned c
       cerr << "Info" << ": Using shared memory parameters 1/"
            << (shmemState_ -> size / 1024) << "K.\n";
 
+#ifndef ANDROID
       shmemState_ -> enabled = 1;
+#else
+      cerr << "Info: handleShmemReply: In android no shared memory. Setting enabled to -1. This should not be displayed\n";
+      shmemState_ -> enabled = -1;
+#endif
 
       encodeBuffer.encodeBoolValue(1);
     }
@@ -7241,7 +7251,7 @@ int ServerChannel::handleShmemRequest(DecodeBuffer &decodeBuffer, unsigned char
       // memory support is disabled by the
       // user.
       //
-
+#ifndef ANDROID
       if (control -> ShmemServer == 1 &&
               control -> ShmemServerSize > 0 &&
                   enableServer == 1)
@@ -7252,8 +7262,12 @@ int ServerChannel::handleShmemRequest(DecodeBuffer &decodeBuffer, unsigned char
       {
         memcpy(buffer + 8, "NO-MIT-", 7);
       }
+#else
+      cerr << "Info: handleShmemRequest: In android no shared memory. Returning NO-MIT- answer\n";
 
-      sequenceQueue_.push(clientSequence_, opcode,
+        memcpy(buffer + 8, "NO-MIT-", 7);
+#endif
+     sequenceQueue_.push(clientSequence_, opcode,
                               opcodeStore_ -> getShmemParameters, stage);
 
       //
@@ -7289,9 +7303,13 @@ int ServerChannel::handleShmemRequest(DecodeBuffer &decodeBuffer, unsigned char
 
         shmemState_ -> size = control -> ShmemServerSize;
 
+#ifndef ANDROID
         shmemState_ -> id = shmget(IPC_PRIVATE, shmemState_ -> size,
                                        IPC_CREAT | permissions);
-
+#else
+	cerr << "Info: handleShmemReqyest: In android no shared memory (shmget). This message should not be displayed present should never be 1 in android\n";
+	shmemState_ -> id = -1;
+#endif
         if (shmemState_ -> id >= 0)
         {
           #if defined(TEST) || defined(INFO)
@@ -7302,8 +7320,12 @@ int ServerChannel::handleShmemRequest(DecodeBuffer &decodeBuffer, unsigned char
           #endif
 
 
+#ifndef ANDROID
           shmemState_ -> address = shmat(shmemState_ -> id, 0, 0);
-
+#else
+	  cerr << "Info: handleShmemReqyest: In android no shared memory (shmat). This message should not be displayed. present should never be 1 in android\n";
+	  shmemState_ -> address = NULL;
+#endif
           if (shmemState_ -> address != NULL)
           {
             #ifdef TEST
@@ -7437,6 +7459,10 @@ int ServerChannel::handleShmem(unsigned char &opcode, unsigned char *&buffer,
 
     return 0;
   }
+#ifdef ANDROID
+  cerr << "Info: handleShmem: In android no shared memory.  enabled should never be 1. This should not be displayed\n";
+  return 0;
+#endif
 
   //
   // Ignore null requests and requests that will not result
@@ -8054,14 +8080,22 @@ void ServerChannel::handleShmemStateRemove()
 {
   if (shmemState_ != NULL)
   {
-    if (shmemState_ -> address != NULL)
+   if (shmemState_ -> address != NULL)
     {
-      shmdt((char *) shmemState_ -> address);
+#ifndef ANDROID
+       shmdt((char *) shmemState_ -> address);
+#else
+    cerr << "Info: handleShmemStateRemove: In android no shared memory. This should not be displayed. address should always be NULL\n";
+#endif
     }
 
     if (shmemState_ -> id > 0)
     {
+#ifndef ANDROID
       shmctl(shmemState_ -> id, IPC_RMID, 0);
+#else
+      cerr << "Info: handleShmemStateRemove: In android no shared memory. This should not be displayed. id should always be 0\n";
+#endif
     }
 
     delete shmemState_;
-- 
cgit v1.2.3


From 1be1c4a21bb54e60ec60456374d9ef55aaf55e2f Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 10 Feb 2015 21:11:27 +0100
Subject: Force NX proxy to bind to loopback devices only (loopback option)
 (220_nxproxy_bind-loopback-only.full+lite.patch).

---
 .../220_nxproxy_bind-loopback-only.full+lite.patch | 130 ---------------------
 debian/patches/series                              |   1 -
 nxcomp/Loop.cpp                                    |  41 ++++++-
 nxcomp/Misc.cpp                                    |  10 ++
 nxcomp/Misc.h                                      |   8 ++
 5 files changed, 55 insertions(+), 135 deletions(-)
 delete mode 100644 debian/patches/220_nxproxy_bind-loopback-only.full+lite.patch

(limited to 'nxcomp')

diff --git a/debian/patches/220_nxproxy_bind-loopback-only.full+lite.patch b/debian/patches/220_nxproxy_bind-loopback-only.full+lite.patch
deleted file mode 100644
index c65b85501..000000000
--- a/debian/patches/220_nxproxy_bind-loopback-only.full+lite.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-Description: Force NX proxy to bind to loopback devices only (loopback option)
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
---- a/nxcomp/Loop.cpp
-+++ b/nxcomp/Loop.cpp
-@@ -952,6 +952,7 @@
- static char displayHost[DEFAULT_STRING_LENGTH] = { 0 };
- static char authCookie[DEFAULT_STRING_LENGTH]  = { 0 };
- 
-+static int loopbackBind = DEFAULT_LOOPBACK_BIND;
- static int proxyPort = DEFAULT_NX_PROXY_PORT;
- static int xPort     = DEFAULT_NX_X_PORT;
- 
-@@ -3959,7 +3960,14 @@
- 
-   tcpAddr.sin_family = AF_INET;
-   tcpAddr.sin_port = htons(proxyPortTCP);
--  tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-+  if ( loopbackBind )
-+  {
-+    tcpAddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-+  }
-+  else
-+  {
-+    tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-+  }
- 
-   if (bind(tcpFD, (sockaddr *) &tcpAddr, sizeof(tcpAddr)) == -1)
-   {
-@@ -4550,7 +4558,14 @@
- 
-   tcpAddr.sin_family = AF_INET;
-   tcpAddr.sin_port = htons(portTCP);
--  tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-+  if ( loopbackBind )
-+  {
-+    tcpAddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-+  }
-+  else
-+  {
-+    tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-+  }
- 
-   if (bind(newFD, (sockaddr *) &tcpAddr, sizeof(tcpAddr)) == -1)
-   {
-@@ -6718,7 +6733,14 @@
- 
-   #ifdef __APPLE__
- 
--  tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-+  if ( loopbackBind )
-+  {
-+    tcpAddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-+  }
-+  else
-+  {
-+    tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-+  }
- 
-   #else
- 
-@@ -8397,6 +8419,10 @@
- 
-       listenPort = ValidateArg("local", name, value);
-     }
-+    else if (strcasecmp(name, "loopback") == 0)
-+    {
-+      loopbackBind = ValidateArg("local", name, value);
-+    }
-     else if (strcasecmp(name, "accept") == 0)
-     {
-       if (*connectHost != '\0')
-@@ -13778,7 +13804,14 @@
-     }
-     else
-     {
--      address = htonl(INADDR_ANY);
-+      if ( loopbackBind )
-+      {
-+        address = htonl(INADDR_LOOPBACK);
-+      }
-+      else
-+      {
-+        address = htonl(INADDR_ANY);
-+      }
-     }
-   }
-   else
---- a/nxcomp/Misc.cpp
-+++ b/nxcomp/Misc.cpp
-@@ -42,6 +42,14 @@
- #undef  DEBUG
- 
- //
-+// By default nxproxy binds to all network interfaces, setting
-+// DEFAULT_LOOPBACK_BIND to 1 enables binding to the loopback
-+// device only.
-+//
-+
-+const int DEFAULT_LOOPBACK_BIND = 0;
-+
-+//
- // TCP port offset applied to any NX port specification.
- //
- 
-@@ -137,6 +145,8 @@
- \n\
-   listen=n     Local port used for accepting the proxy connection.\n\
- \n\
-+  loopback=b   Bind to the loopback device only.\n\
-+\n\
-   accept=s     Name or IP of host that can connect to the proxy.\n\
- \n\
-   connect=s    Name or IP of host that the proxy will connect to.\n\
---- a/nxcomp/Misc.h
-+++ b/nxcomp/Misc.h
-@@ -90,6 +90,14 @@
- extern const int DEFAULT_NX_SLAVE_PORT_SERVER_OFFSET;
- 
- //
-+// NX proxy binds to all network interfaces by default
-+// With the -loopback parameter, you can switch
-+// over to binding to the loopback device only.
-+//
-+
-+extern const int DEFAULT_LOOPBACK_BIND;
-+
-+//
- // Return strings containing various info.
- //
- 
diff --git a/debian/patches/series b/debian/patches/series
index b6a467730..30ed936f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-220_nxproxy_bind-loopback-only.full+lite.patch
 300_nxagent_set-wm-class.full.patch
 301_nx-X11_use-shared-libs.full.patch
 302_nx-X11_xkbbasedir-detection.full.patch
diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 05b514570..77b0c806c 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -952,6 +952,7 @@ static char listenHost[DEFAULT_STRING_LENGTH]  = { 0 };
 static char displayHost[DEFAULT_STRING_LENGTH] = { 0 };
 static char authCookie[DEFAULT_STRING_LENGTH]  = { 0 };
 
+static int loopbackBind = DEFAULT_LOOPBACK_BIND;
 static int proxyPort = DEFAULT_NX_PROXY_PORT;
 static int xPort     = DEFAULT_NX_X_PORT;
 
@@ -3959,7 +3960,14 @@ int SetupTcpSocket()
 
   tcpAddr.sin_family = AF_INET;
   tcpAddr.sin_port = htons(proxyPortTCP);
-  tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY);
+  if ( loopbackBind )
+  {
+    tcpAddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+  }
+  else
+  {
+    tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY);
+  }
 
   if (bind(tcpFD, (sockaddr *) &tcpAddr, sizeof(tcpAddr)) == -1)
   {
@@ -4550,7 +4558,14 @@ int ListenConnection(int port, const char *label)
 
   tcpAddr.sin_family = AF_INET;
   tcpAddr.sin_port = htons(portTCP);
-  tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY);
+  if ( loopbackBind )
+  {
+    tcpAddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+  }
+  else
+  {
+    tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY);
+  }
 
   if (bind(newFD, (sockaddr *) &tcpAddr, sizeof(tcpAddr)) == -1)
   {
@@ -6718,7 +6733,14 @@ int WaitForRemote(int portNum)
 
   #ifdef __APPLE__
 
-  tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY);
+  if ( loopbackBind )
+  {
+    tcpAddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+  }
+  else
+  {
+    tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY);
+  }
 
   #else
 
@@ -8397,6 +8419,10 @@ int ParseEnvironmentOptions(const char *env, int force)
 
       listenPort = ValidateArg("local", name, value);
     }
+    else if (strcasecmp(name, "loopback") == 0)
+    {
+      loopbackBind = ValidateArg("local", name, value);
+    }
     else if (strcasecmp(name, "accept") == 0)
     {
       if (*connectHost != '\0')
@@ -13778,7 +13804,14 @@ int ParseListenOption(int &address)
     }
     else
     {
-      address = htonl(INADDR_ANY);
+      if ( loopbackBind )
+      {
+        address = htonl(INADDR_LOOPBACK);
+      }
+      else
+      {
+        address = htonl(INADDR_ANY);
+      }
     }
   }
   else
diff --git a/nxcomp/Misc.cpp b/nxcomp/Misc.cpp
index 7303c595b..0095eaa74 100644
--- a/nxcomp/Misc.cpp
+++ b/nxcomp/Misc.cpp
@@ -41,6 +41,14 @@
 #undef  TEST
 #undef  DEBUG
 
+//
+// By default nxproxy binds to all network interfaces, setting
+// DEFAULT_LOOPBACK_BIND to 1 enables binding to the loopback
+// device only.
+//
+
+const int DEFAULT_LOOPBACK_BIND = 0;
+
 //
 // TCP port offset applied to any NX port specification.
 //
@@ -136,6 +144,8 @@ static const char UsageInfo[] =
                to be forwarded by the proxy running on the client.\n\
 \n\
   listen=n     Local port used for accepting the proxy connection.\n\
+\n\
+  loopback=b   Bind to the loopback device only.\n\
 \n\
   accept=s     Name or IP of host that can connect to the proxy.\n\
 \n\
diff --git a/nxcomp/Misc.h b/nxcomp/Misc.h
index 3f37836f5..21a503082 100644
--- a/nxcomp/Misc.h
+++ b/nxcomp/Misc.h
@@ -89,6 +89,14 @@ extern const int DEFAULT_NX_FONT_PORT_OFFSET;
 extern const int DEFAULT_NX_SLAVE_PORT_CLIENT_OFFSET;
 extern const int DEFAULT_NX_SLAVE_PORT_SERVER_OFFSET;
 
+//
+// NX proxy binds to all network interfaces by default
+// With the -loopback parameter, you can switch
+// over to binding to the loopback device only.
+//
+
+extern const int DEFAULT_LOOPBACK_BIND;
+
 //
 // Return strings containing various info.
 //
-- 
cgit v1.2.3


From d4d3fe0e6e77a58e68defc5895a589a681d7d092 Mon Sep 17 00:00:00 2001
From: Nito Martinez <Nito@Qindel.ES>
Date: Fri, 13 Feb 2015 13:26:27 +0100
Subject: Allow version 4-digit version comparison/handshake
 (400_nxcomp-version.full+lite.patch).

---
 debian/patches/400_nxcomp-version.full+lite.patch | 240 ----------------------
 debian/patches/series                             |   1 -
 nxcomp/Control.cpp                                |  40 +---
 nxcomp/Control.h                                  |   9 +
 nxcomp/Loop.cpp                                   |   3 +-
 nxcomp/Makefile.in                                |   3 +-
 nxcomp/NX.h                                       |   6 +
 7 files changed, 26 insertions(+), 276 deletions(-)
 delete mode 100644 debian/patches/400_nxcomp-version.full+lite.patch

(limited to 'nxcomp')

diff --git a/debian/patches/400_nxcomp-version.full+lite.patch b/debian/patches/400_nxcomp-version.full+lite.patch
deleted file mode 100644
index 703cec823..000000000
--- a/debian/patches/400_nxcomp-version.full+lite.patch
+++ /dev/null
@@ -1,240 +0,0 @@
-Description: Allow version 4-digit version comparison/handshake
-Author: Nito Martinez <Nito@Qindel.ES>
---- a/nxcomp/Control.cpp
-+++ b/nxcomp/Control.cpp
-@@ -15,6 +15,7 @@
- /*                                                                        */
- /**************************************************************************/
- 
-+#include "NX.h"
- #include "NXpack.h"
- 
- #include "Control.h"
-@@ -594,44 +595,17 @@
-   RemoteVersionMajor = -1;
-   RemoteVersionMinor = -1;
-   RemoteVersionPatch = -1;
-+  RemoteVersionMaintenancePatch = -1;
- 
-   CompatVersionMajor = -1;
-   CompatVersionMinor = -1;
-   CompatVersionPatch = -1;
-+  CompatVersionMaintenancePatch = -1;
- 
--  char version[32];
--
--  strcpy(version, VERSION);
--
--  char *value;
--
--  value = strtok(version, ".");
--
--  for (int i = 0; value != NULL && i < 3; i++)
--  {
--    switch (i)
--    {
--      case 0:
--
--        LocalVersionMajor = atoi(value);
--
--        break;
--
--      case 1:
--
--        LocalVersionMinor = atoi(value);
--
--        break;
--
--      case 2:
--
--        LocalVersionPatch = atoi(value);
--
--        break;
--    }
--
--    value = strtok(NULL, ".");
--  }
-+  LocalVersionMajor = NXMajorVersion();
-+  LocalVersionMinor = NXMinorVersion();
-+  LocalVersionPatch = NXPatchVersion();
-+  LocalVersionMaintenancePatch = NXMaintenancePatchVersion();
- 
-   #ifdef TEST
-   *logofs << "Control: Major version is " << LocalVersionMajor
---- a/nxcomp/Control.h
-+++ b/nxcomp/Control.h
-@@ -299,17 +299,26 @@
-   // Version number of local and remote proxy.
-   //
- 
-+  /* 
-+   * LocalVersionMaintenancePatch, RemoteVersionMaintenancePatch
-+   * CompatVersionMaintenancePatch
-+   *
-+   * currently not used, for future compatibility checks
-+   */
-   int LocalVersionMajor;
-   int LocalVersionMinor;
-   int LocalVersionPatch;
-+  int LocalVersionMaintenancePatch;
- 
-   int RemoteVersionMajor;
-   int RemoteVersionMinor;
-   int RemoteVersionPatch;
-+  int RemoteVersionMaintenancePatch;
- 
-   int CompatVersionMajor;
-   int CompatVersionMinor;
-   int CompatVersionPatch;
-+  int CompatVersionMaintenancePatch;
- 
-   //
-   // Which unpack methods are implemented in proxy?
---- a/nxcomp/Loop.cpp
-+++ b/nxcomp/Loop.cpp
-@@ -14250,7 +14250,8 @@
-   cerr << "NXPROXY - " << "Version "
-        << control -> LocalVersionMajor << "."
-        << control -> LocalVersionMinor << "."
--       << control -> LocalVersionPatch;
-+       << control -> LocalVersionPatch << "."
-+       << control -> LocalVersionMaintenancePatch;
- 
-   cerr << endl;
- }
---- a/nxcomp/Makefile.in
-+++ b/nxcomp/Makefile.in
-@@ -105,7 +105,8 @@
- 
- CSRC   = MD5.c					\
- 	 Pack.c					\
--         Vars.c
-+	 Vars.c					\
-+	 Version.c
- 
- CXXSRC = Loop.cpp 				\
- 	 Children.cpp				\
---- a/nxcomp/NX.h
-+++ b/nxcomp/NX.h
-@@ -442,6 +442,12 @@
- 
- extern void NXTransCleanup(void) __attribute__((noreturn));
- 
-+extern const char* NXVersion();
-+extern int NXMajorVersion();
-+extern int NXMinorVersion();
-+extern int NXPatchVersion();
-+extern int NXMaintenancePatchVersion();
-+
- #ifdef __cplusplus
- }
- #endif
---- /dev/null
-+++ b/nxcomp/Version.c
-@@ -0,0 +1,106 @@
-+/**************************************************************************/
-+/*                                                                        */
-+/* Copyright (C) 2014 Qindel http://qindel.com and QVD http://theqvd.com  */
-+/*                                                                        */
-+/* This program is free software; you can redistribute it and/or modify   */
-+/* it under the terms of the GNU General Public License as published by   */
-+/* the Free Software Foundation; either version 3 of the License, or (at  */
-+/* your option) any later version.                                        */
-+/*                                                                        */
-+/* This program is distributed in the hope that it will be useful, but    */
-+/* WITHOUT ANY WARRANTY; without even the implied warranty of             */
-+/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                   */
-+/* See the GNU General Public License for more details.                   */
-+/*                                                                        */
-+/* You should have received a copy of the GNU General Public License      */
-+/* along with this program; if not, see <http://www.gnu.org/licenses>.    */
-+/*                                                                        */
-+/* Additional permission under GNU GPL version 3 section 7                */
-+/*                                                                        */
-+/* If you modify this Program, or any covered work, by linking or         */
-+/* combining it with [name of library] (or a modified version of that     */
-+/* library), containing parts covered by the terms of [name of library's  */
-+/* license], the licensors of this Program grant you additional           */
-+/* permission to convey the resulting work. {Corresponding Source for a   */
-+/* non-source form of such a combination shall include the source code    */
-+/* for the parts of [name of library] used as well as that of the covered */
-+/* work.}                                                                 */
-+/*                                                                        */
-+/*                                                                        */
-+/**************************************************************************/
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include "NX.h"
-+
-+
-+static int _NXVersionMajor = -1;
-+static int _NXVersionMinor = -1;
-+static int _NXVersionPatch = -1;
-+static int _NXVersionMaintenancePatch = -1;
-+
-+
-+const char* NXVersion() {
-+  const char *version = VERSION;
-+  return version;
-+}
-+
-+void _parseNXVersion() {
-+  char version[32];
-+  int i;
-+  strcpy(version, VERSION);
-+
-+  char *value;
-+  /* Reset values to 0 if undefined */
-+  _NXVersionMajor = _NXVersionMinor = _NXVersionPatch = _NXVersionMaintenancePatch = 0;
-+
-+
-+#define NXVERSIONSEPARATOR "."
-+  value = strtok(version, NXVERSIONSEPARATOR);
-+
-+  for (i = 0; value != NULL && i < 4; i++)
-+  {
-+    switch (i)
-+    {
-+      case 0:
-+        _NXVersionMajor = atoi(value);
-+        break;
-+
-+      case 1:
-+        _NXVersionMinor = atoi(value);
-+        break;
-+
-+      case 2:
-+        _NXVersionPatch = atoi(value);
-+        break;
-+
-+      case 3:
-+        _NXVersionMaintenancePatch = atoi(value);
-+        break;
-+    }
-+
-+    value = strtok(NULL, NXVERSIONSEPARATOR);
-+  }
-+}
-+
-+int NXMajorVersion() {
-+  if (_NXVersionMajor == -1)
-+    _parseNXVersion();
-+  return _NXVersionMajor;
-+}
-+int NXMinorVersion() {
-+  if (_NXVersionMinor == -1)
-+    _parseNXVersion();
-+  return _NXVersionMinor;
-+}
-+int NXPatchVersion() {
-+  if (_NXVersionPatch == -1)
-+    _parseNXVersion();
-+  return _NXVersionPatch;
-+}
-+int NXMaintenancePatchVersion() {
-+  if (_NXVersionMaintenancePatch == -1)
-+    _parseNXVersion();
-+  return _NXVersionMaintenancePatch;
-+}
diff --git a/debian/patches/series b/debian/patches/series
index 86575ece8..b00553eed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-400_nxcomp-version.full+lite.patch
 #401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch
 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch
 601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch
diff --git a/nxcomp/Control.cpp b/nxcomp/Control.cpp
index ce99567d7..062654235 100644
--- a/nxcomp/Control.cpp
+++ b/nxcomp/Control.cpp
@@ -15,6 +15,7 @@
 /*                                                                        */
 /**************************************************************************/
 
+#include "NX.h"
 #include "NXpack.h"
 
 #include "Control.h"
@@ -594,44 +595,17 @@ Control::Control()
   RemoteVersionMajor = -1;
   RemoteVersionMinor = -1;
   RemoteVersionPatch = -1;
+  RemoteVersionMaintenancePatch = -1;
 
   CompatVersionMajor = -1;
   CompatVersionMinor = -1;
   CompatVersionPatch = -1;
+  CompatVersionMaintenancePatch = -1;
 
-  char version[32];
-
-  strcpy(version, VERSION);
-
-  char *value;
-
-  value = strtok(version, ".");
-
-  for (int i = 0; value != NULL && i < 3; i++)
-  {
-    switch (i)
-    {
-      case 0:
-
-        LocalVersionMajor = atoi(value);
-
-        break;
-
-      case 1:
-
-        LocalVersionMinor = atoi(value);
-
-        break;
-
-      case 2:
-
-        LocalVersionPatch = atoi(value);
-
-        break;
-    }
-
-    value = strtok(NULL, ".");
-  }
+  LocalVersionMajor = NXMajorVersion();
+  LocalVersionMinor = NXMinorVersion();
+  LocalVersionPatch = NXPatchVersion();
+  LocalVersionMaintenancePatch = NXMaintenancePatchVersion();
 
   #ifdef TEST
   *logofs << "Control: Major version is " << LocalVersionMajor
diff --git a/nxcomp/Control.h b/nxcomp/Control.h
index c21477544..71f357c4a 100644
--- a/nxcomp/Control.h
+++ b/nxcomp/Control.h
@@ -299,17 +299,26 @@ class Control
   // Version number of local and remote proxy.
   //
 
+  /* 
+   * LocalVersionMaintenancePatch, RemoteVersionMaintenancePatch
+   * CompatVersionMaintenancePatch
+   *
+   * currently not used, for future compatibility checks
+   */
   int LocalVersionMajor;
   int LocalVersionMinor;
   int LocalVersionPatch;
+  int LocalVersionMaintenancePatch;
 
   int RemoteVersionMajor;
   int RemoteVersionMinor;
   int RemoteVersionPatch;
+  int RemoteVersionMaintenancePatch;
 
   int CompatVersionMajor;
   int CompatVersionMinor;
   int CompatVersionPatch;
+  int CompatVersionMaintenancePatch;
 
   //
   // Which unpack methods are implemented in proxy?
diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 77b0c806c..c8c95bd72 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -14250,7 +14250,8 @@ void PrintVersionInfo()
   cerr << "NXPROXY - " << "Version "
        << control -> LocalVersionMajor << "."
        << control -> LocalVersionMinor << "."
-       << control -> LocalVersionPatch;
+       << control -> LocalVersionPatch << "."
+       << control -> LocalVersionMaintenancePatch;
 
   cerr << endl;
 }
diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in
index 1be928167..93bb0b38c 100644
--- a/nxcomp/Makefile.in
+++ b/nxcomp/Makefile.in
@@ -105,7 +105,8 @@ MSRC   =
 
 CSRC   = MD5.c					\
 	 Pack.c					\
-         Vars.c
+	 Vars.c					\
+	 Version.c
 
 CXXSRC = Loop.cpp 				\
 	 Children.cpp				\
diff --git a/nxcomp/NX.h b/nxcomp/NX.h
index d98af79bb..2dbf68662 100644
--- a/nxcomp/NX.h
+++ b/nxcomp/NX.h
@@ -442,6 +442,12 @@ extern int NXTransParseEnvironment(const char *env, int force);
 
 extern void NXTransCleanup(void) __attribute__((noreturn));
 
+extern const char* NXVersion();
+extern int NXMajorVersion();
+extern int NXMinorVersion();
+extern int NXPatchVersion();
+extern int NXMaintenancePatchVersion();
+
 #ifdef __cplusplus
 }
 #endif
-- 
cgit v1.2.3


From 415b20b6fbf562d4132fca90a00b6c32d94040ed Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Fri, 13 Feb 2015 13:32:17 +0100
Subject: Be compliant with POS36-C: Observe correct revocation order while
 relinquishing privileges (602_nx-X11_initgroups.full.patch).

  The Fedora review of NX (redistributed) caught the following rpmlint issue:

  This executable is calling setuid and setgid without setgroups or initgroups.
  There is a high probability this mean it didn't relinquish all groups, and this
  would be a potential security issue to be fixed. Seek POS36-C on the web for
  details about the problem.

  Ref POS36-C:
  https://www.securecoding.cert.org/confluence/display/seccode/POS36-C.+Observe+correct+revocation+order+while+relinquishing+privileges

  This patch adds initgroups() calls to the code to initialize the supplemental group list.
---
 debian/patches/602_nx-X11_initgroups.full.patch | 67 -------------------------
 debian/patches/series                           |  1 -
 nx-X11/programs/Xserver/os/utils.c              |  7 +++
 nxcomp/Pipe.cpp                                 |  3 ++
 4 files changed, 10 insertions(+), 68 deletions(-)
 delete mode 100644 debian/patches/602_nx-X11_initgroups.full.patch

(limited to 'nxcomp')

diff --git a/debian/patches/602_nx-X11_initgroups.full.patch b/debian/patches/602_nx-X11_initgroups.full.patch
deleted file mode 100644
index 182b378dc..000000000
--- a/debian/patches/602_nx-X11_initgroups.full.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Description: Be compliant with POS36-C: Observe correct revocation order while relinquishing privileges
-Author: Orion Poplawski <orion@cora.nwra.com>
-Abstract:
- The Fedora review of NX (redistributed) caught the following rpmlint issue:
- .
- This executable is calling setuid and setgid without setgroups or initgroups.
- There is a high probability this mean it didn't relinquish all groups, and this
- would be a potential security issue to be fixed. Seek POS36-C on the web for
- details about the problem.
- .
- Ref POS36-C:
- https://www.securecoding.cert.org/confluence/display/seccode/POS36-C.+Observe+correct+revocation+order+while+relinquishing+privileges
- .
- This patch adds initgroups() calls to the code to initialize the supplemental group list.
-diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c
-index 7e62654..9b2431a 100644
---- a/nx-X11/programs/Xserver/os/utils.c
-+++ b/nx-X11/programs/Xserver/os/utils.c
-@@ -112,6 +112,9 @@ OR PERFORMANCE OF THIS SOFTWARE.
- #include <sys/stat.h>
- #include <ctype.h>    /* for isspace */
- #include <stdarg.h>
-+#include <sys/types.h>
-+#include <grp.h>
-+#include <pwd.h>
- 
- #if defined(DGUX)
- #include <sys/resource.h>
-@@ -1770,6 +1773,7 @@ System(char *command)
-     void (*csig)(int);
- #endif
-     int status;
-+    struct passwd *pwent;
- 
-     if (!command)
- 	return(1);
-@@ -1791,6 +1795,9 @@ System(char *command)
-     case -1:	/* error */
- 	p = -1;
-     case 0:	/* child */
-+	pwent = getpwuid(getuid());
-+	if (initgroups(pwent->pw_name,getgid()) == -1)
-+	    _exit(127);
- 	if (setgid(getgid()) == -1)
- 	    _exit(127);
- 	if (setuid(getuid()) == -1)
-diff --git a/nxcomp/Pipe.cpp b/nxcomp/Pipe.cpp
-index 7238d0c..aacbbae 100644
---- a/nxcomp/Pipe.cpp
-+++ b/nxcomp/Pipe.cpp
-@@ -21,6 +21,7 @@
- #include <pwd.h>
- #include <sys/types.h>
- #include <sys/wait.h>
-+#include <grp.h>
- 
- #include "Pipe.h"
- #include "Misc.h"
-@@ -234,6 +235,8 @@ FILE *Popen(char * const parameters[], const char *type)
-       // Child.
-       //
- 
-+      struct passwd *pwent = getpwuid(getuid());
-+      if (pwent) initgroups(pwent->pw_name,getgid());
-       setgid(getgid());
-       setuid(getuid());
- 
diff --git a/debian/patches/series b/debian/patches/series
index 21cf21d53..c80570682 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 #401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch
-602_nx-X11_initgroups.full.patch
 603_nx-X11_compilation_warnings.full.patch
 605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch
 606_nx-X11_build-on-aarch64.full.patch
diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c
index 7e626542e..9b2431af7 100644
--- a/nx-X11/programs/Xserver/os/utils.c
+++ b/nx-X11/programs/Xserver/os/utils.c
@@ -112,6 +112,9 @@ OR PERFORMANCE OF THIS SOFTWARE.
 #include <sys/stat.h>
 #include <ctype.h>    /* for isspace */
 #include <stdarg.h>
+#include <sys/types.h>
+#include <grp.h>
+#include <pwd.h>
 
 #if defined(DGUX)
 #include <sys/resource.h>
@@ -1770,6 +1773,7 @@ System(char *command)
     void (*csig)(int);
 #endif
     int status;
+    struct passwd *pwent;
 
     if (!command)
 	return(1);
@@ -1791,6 +1795,9 @@ System(char *command)
     case -1:	/* error */
 	p = -1;
     case 0:	/* child */
+	pwent = getpwuid(getuid());
+	if (initgroups(pwent->pw_name,getgid()) == -1)
+	    _exit(127);
 	if (setgid(getgid()) == -1)
 	    _exit(127);
 	if (setuid(getuid()) == -1)
diff --git a/nxcomp/Pipe.cpp b/nxcomp/Pipe.cpp
index 7238d0c73..aacbbaeb3 100644
--- a/nxcomp/Pipe.cpp
+++ b/nxcomp/Pipe.cpp
@@ -21,6 +21,7 @@
 #include <pwd.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <grp.h>
 
 #include "Pipe.h"
 #include "Misc.h"
@@ -234,6 +235,8 @@ FILE *Popen(char * const parameters[], const char *type)
       // Child.
       //
 
+      struct passwd *pwent = getpwuid(getuid());
+      if (pwent) initgroups(pwent->pw_name,getgid());
       setgid(getgid());
       setuid(getuid());
 
-- 
cgit v1.2.3


From ab8d1276f5c7ebef6f959cfb691cce5fff6867b4 Mon Sep 17 00:00:00 2001
From: Clemens Lang <cal@macports.org>
Date: Fri, 13 Feb 2015 13:35:40 +0100
Subject: In Types.h, don't use STL internals on libc++
 (605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch).

  The nx-libs-lite package does not compile on OS X Mavericks because
  Apple's clang compilers now default to compiling against the libc++ STL
  rather than (their outdated copy of) libstdc++.

  While the compiler still allows changing that, we should not rely on
  this being possible forever.

  The compiler chokes in Types.h, specifically the clear() methods in
  subclasses of vectors that use implementation details of the GNU STL.
  The attached patch fixes these compilation issues by not overriding the
  clear() method when compiling against libc++, since the libc++ headers
  seem to do essentially the same as the overriden method.
---
 ...ont-use-STL-internals-on-libc++.full+lite.patch | 52 ----------------------
 debian/patches/series                              |  1 -
 nxcomp/Types.h                                     |  8 ++++
 3 files changed, 8 insertions(+), 53 deletions(-)
 delete mode 100644 debian/patches/605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch

(limited to 'nxcomp')

diff --git a/debian/patches/605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch b/debian/patches/605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch
deleted file mode 100644
index 60f33ce3f..000000000
--- a/debian/patches/605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Description: In Types.h, don't use STL internals on libc++.
-Author: Clemens Lang <cal@macports.org>
-Abstract:
- The nx-libs-lite package does not compile on OS X Mavericks because
- Apple's clang compilers now default to compiling against the libc++ STL
- rather than (their outdated copy of) libstdc++.
- .
- While the compiler still allows changing that, we should not rely on
- this being possible forever.
- .
- The compiler chokes in Types.h, specifically the clear() methods in
- subclasses of vectors that use implementation details of the GNU STL.
- The attached patch fixes these compilation issues by not overriding the
- clear() method when compiling against libc++, since the libc++ headers
- seem to do essentially the same as the overriden method.
---- a/nxcomp/Types.h	2013-11-05 01:35:22.000000000 +0100
-+++ b/nxcomp/Types.h	2013-11-05 01:37:30.000000000 +0100
-@@ -55,6 +55,9 @@
-     return &*(vector < unsigned char >::begin());
-   }
- 
-+  // Avoid overriding clear() when using libc++. Fiddling with STL internals
-+  // doesn't really seem like a good idea to me anyway.
-+  #ifndef _LIBCPP_VECTOR
-   void clear()
-   {
-     #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H)
-@@ -95,12 +98,16 @@
- 
-     #endif  /* #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) */
-   }
-+  #endif /* #ifdef _LIBCPP_VECTOR */
- };
- 
- class T_messages : public vector < Message * >
- {
-   public:
- 
-+  // Avoid overriding clear() when using libc++. Fiddling with STL internals
-+  // doesn't really seem like a good idea to me anyway.
-+  #ifndef _LIBCPP_VECTOR
-   void clear()
-   {
-     #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H)
-@@ -141,6 +148,7 @@
- 
-     #endif /* #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) */
-   }
-+  #endif /* #ifndef _LIBCPP_VECTOR */
- };
- 
- typedef md5_byte_t * T_checksum;
diff --git a/debian/patches/series b/debian/patches/series
index 1d0f53bf9..ee95c5b49 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 #401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch
-605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch
 606_nx-X11_build-on-aarch64.full.patch
 607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch
 990_fix-DEBUG-and-TEST-builds.full.patch
diff --git a/nxcomp/Types.h b/nxcomp/Types.h
index 05f62bd00..b3fe40e31 100644
--- a/nxcomp/Types.h
+++ b/nxcomp/Types.h
@@ -55,6 +55,9 @@ class T_data : public vector < unsigned char >
     return &*(vector < unsigned char >::begin());
   }
 
+  // Avoid overriding clear() when using libc++. Fiddling with STL internals
+  // doesn't really seem like a good idea to me anyway.
+  #ifndef _LIBCPP_VECTOR
   void clear()
   {
     #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H)
@@ -95,12 +98,16 @@ class T_data : public vector < unsigned char >
 
     #endif  /* #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) */
   }
+  #endif /* #ifdef _LIBCPP_VECTOR */
 };
 
 class T_messages : public vector < Message * >
 {
   public:
 
+  // Avoid overriding clear() when using libc++. Fiddling with STL internals
+  // doesn't really seem like a good idea to me anyway.
+  #ifndef _LIBCPP_VECTOR
   void clear()
   {
     #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H)
@@ -141,6 +148,7 @@ class T_messages : public vector < Message * >
 
     #endif /* #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) */
   }
+  #endif /* #ifndef _LIBCPP_VECTOR */
 };
 
 typedef md5_byte_t * T_checksum;
-- 
cgit v1.2.3


From a8fb7d4f5149e28216ffd38838af1cbfd6527002 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Fri, 13 Feb 2015 13:38:39 +0100
Subject: Detection for Mac OS X's launchd service on Mac OS X 10.10 and beyond
 (607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch).

---
 ...comp_macosx-X11-launcher-in-private-tmp.full+lite.patch | 14 --------------
 debian/patches/series                                      |  1 -
 nxcomp/Loop.cpp                                            |  2 +-
 3 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 debian/patches/607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch

(limited to 'nxcomp')

diff --git a/debian/patches/607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch b/debian/patches/607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch
deleted file mode 100644
index 535671fef..000000000
--- a/debian/patches/607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Detection for Mac OS X's launchd service on Mac OS X 10.10 and beyond
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-
---- a/nxcomp/Loop.cpp
-+++ b/nxcomp/Loop.cpp
-@@ -4183,7 +4183,7 @@
- 
-   #ifdef __APPLE__
- 
--  if (strncasecmp(display, "/tmp/launch", 11) == 0)
-+  if ((strncasecmp(display, "/tmp/launch", 11) == 0) || (strncasecmp(display, "/private/tmp/com.apple.launchd", 30) == 0))
-   {
-     #ifdef TEST
-     *logofs << "Loop: Using launchd service on socket '"
diff --git a/debian/patches/series b/debian/patches/series
index e975e3cac..0c9d34366 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 #401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch
-607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch
 990_fix-DEBUG-and-TEST-builds.full.patch
 991_fix-hr-typos.full+lite.patch
 991_fix-hr-typos.full.patch
diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index c8c95bd72..7bc154f36 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -4183,7 +4183,7 @@ int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
 
   #ifdef __APPLE__
 
-  if (strncasecmp(display, "/tmp/launch", 11) == 0)
+  if ((strncasecmp(display, "/tmp/launch", 11) == 0) || (strncasecmp(display, "/private/tmp/com.apple.launchd", 30) == 0))
   {
     #ifdef TEST
     *logofs << "Loop: Using launchd service on socket '"
-- 
cgit v1.2.3


From 23fb617551f7d89dbc1fc9e216b7f12d2936e1a2 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Fri, 13 Feb 2015 13:43:54 +0100
Subject: Fix several typos in nxcomp.

  Former patch file names:
  991_fix-hr-typos.full+lite.patch
  991_fix-hr-typos.full.patch
---
 debian/patches/991_fix-hr-typos.full+lite.patch   | 97 -----------------------
 debian/patches/991_fix-hr-typos.full.patch        | 36 ---------
 debian/patches/series                             |  2 -
 nx-X11/ChangeLog.X.org                            |  2 +-
 nx-X11/extras/Mesa/src/mesa/main/debug.c          |  2 +-
 nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c |  2 +-
 nxcomp/CHANGELOG                                  |  2 +-
 nxcomp/ClientReadBuffer.cpp                       |  2 +-
 nxcomp/EncodeBuffer.cpp                           |  4 +-
 nxcomp/GenericChannel.cpp                         |  2 +-
 nxcomp/ProxyReadBuffer.cpp                        |  2 +-
 nxcomp/ServerReadBuffer.cpp                       |  2 +-
 nxcomp/Transport.h                                |  2 +-
 nxcomp/Types.h                                    |  2 +-
 14 files changed, 12 insertions(+), 147 deletions(-)
 delete mode 100644 debian/patches/991_fix-hr-typos.full+lite.patch
 delete mode 100644 debian/patches/991_fix-hr-typos.full.patch

(limited to 'nxcomp')

diff --git a/debian/patches/991_fix-hr-typos.full+lite.patch b/debian/patches/991_fix-hr-typos.full+lite.patch
deleted file mode 100644
index 4ff18462e..000000000
--- a/debian/patches/991_fix-hr-typos.full+lite.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-Description: Fix several typos in nxcomp
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-
---- a/nxcomp/CHANGELOG
-+++ b/nxcomp/CHANGELOG
-@@ -668,7 +668,7 @@
- 
- nxcomp-2.0.0-69
- 
--- Changed the format of the persistent cache to accomodate the new
-+- Changed the format of the persistent cache to accommodate the new
-   encoding of the render opcodes. Caches from the 1.4.0 and 1.5.0
-   should be still loaded and saved correctly when connected to and
-   old version of the library.
---- a/nxcomp/ClientReadBuffer.cpp
-+++ b/nxcomp/ClientReadBuffer.cpp
-@@ -29,7 +29,7 @@
-   //
-   // Even if the pending data is not
-   // enough to make a complete message,
--  // resize the buffer to accomodate
-+  // resize the buffer to accommodate
-   // it all.
-   //
- 
---- a/nxcomp/EncodeBuffer.cpp
-+++ b/nxcomp/EncodeBuffer.cpp
-@@ -505,12 +505,12 @@
-   {
-     #ifdef PANIC
-     *logofs << "EncodeBuffer: PANIC! Error in context [C] "
--            << "growing buffer to accomodate " << numBytes
-+            << "growing buffer to accommodate " << numBytes
-             << " bytes .\n" << logofs_flush;
-     #endif
- 
-     cerr << "Error" << ": Error in context [C] "
--         << "growing encode buffer to accomodate "
-+         << "growing encode buffer to accommodate "
-          << numBytes << " bytes.\n";
- 
-     HandleAbort();
---- a/nxcomp/GenericChannel.cpp
-+++ b/nxcomp/GenericChannel.cpp
-@@ -210,7 +210,7 @@
-   // All data has been read from the read buffer.
-   // We still need to mark the end of the encode
-   // buffer just before sending the frame. This
--  // allows us to accomodate multiple reads in
-+  // allows us to accommodate multiple reads in
-   // a single frame.
-   //
- 
---- a/nxcomp/ProxyReadBuffer.cpp
-+++ b/nxcomp/ProxyReadBuffer.cpp
-@@ -50,7 +50,7 @@
-   //
-   // Even if the readable data is not
-   // enough to make a complete message,
--  // resize the buffer to accomodate
-+  // resize the buffer to accommodate
-   // it all.
-   //
- 
---- a/nxcomp/ServerReadBuffer.cpp
-+++ b/nxcomp/ServerReadBuffer.cpp
-@@ -46,7 +46,7 @@
-   //
-   // Even if the readable data is not
-   // enough to make a complete message,
--  // resize the buffer to accomodate
-+  // resize the buffer to accommodate
-   // it all.
-   //
- 
---- a/nxcomp/Transport.h
-+++ b/nxcomp/Transport.h
-@@ -226,7 +226,7 @@
-   protected:
- 
-   //
--  // Make room in the buffer to accomodate 
-+  // Make room in the buffer to accommodate 
-   // at least size bytes.
-   //
- 
---- a/nxcomp/Types.h
-+++ b/nxcomp/Types.h
-@@ -179,7 +179,7 @@
- typedef list < int > T_list;
- 
- //
--// Used to accomodate data to be read and
-+// Used to accommodate data to be read and
- // written to a socket.
- //
- 
diff --git a/debian/patches/991_fix-hr-typos.full.patch b/debian/patches/991_fix-hr-typos.full.patch
deleted file mode 100644
index 3836adf55..000000000
--- a/debian/patches/991_fix-hr-typos.full.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Fix several typos in nx-X11
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-
---- a/nx-X11/extras/Mesa/src/mesa/main/debug.c
-+++ b/nx-X11/extras/Mesa/src/mesa/main/debug.c
-@@ -43,7 +43,7 @@
-    "GL_QUAD_STRIP",
-    "GL_POLYGON",
-    "outside begin/end",
--   "inside unkown primitive",
-+   "inside unknown primitive",
-    "unknown state"
- };
- 
---- a/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c
-+++ b/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c
-@@ -4106,7 +4106,7 @@
-    if (*inst++ != REVISION) {
-       _mesa_set_program_error (ctx, 0, "Grammar version mismatch");
-       _mesa_error(ctx, GL_INVALID_OPERATION,
--                  "glProgramStringARB(Grammar verison mismatch)");
-+                  "glProgramStringARB(Grammar version mismatch)");
-       err = GL_TRUE;
-    }
-    else {
---- a/nx-X11/ChangeLog.X.org
-+++ b/nx-X11/ChangeLog.X.org
-@@ -12733,7 +12733,7 @@
- 	* programs/xkill/xkill.c: (get_window_id):
- 	Changed cursor for the 'kill' action from XC_draped_box to
- 	XC_Pirate. If you don't like it we can change it back
--	(original author unkown).
-+	(original author unknown).
- 
- 	* programs/xman/vendor.h:
- 	Added 'pic' to the man page rendering command pipeline
diff --git a/debian/patches/series b/debian/patches/series
index 76709c4ad..3ee62f39c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
 #401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch
-991_fix-hr-typos.full+lite.patch
-991_fix-hr-typos.full.patch
 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch
 016_nx-X11_install-location.debian.patch
 102_xserver-xext_set-securitypolicy-path.debian.patch
diff --git a/nx-X11/ChangeLog.X.org b/nx-X11/ChangeLog.X.org
index bb0bbb0fb..5c49bba13 100644
--- a/nx-X11/ChangeLog.X.org
+++ b/nx-X11/ChangeLog.X.org
@@ -12733,7 +12733,7 @@ Mon Jan  3 12:45:10 2005  Søren Sandmann  <sandmann@redhat.com>
 	* programs/xkill/xkill.c: (get_window_id):
 	Changed cursor for the 'kill' action from XC_draped_box to
 	XC_Pirate. If you don't like it we can change it back
-	(original author unkown).
+	(original author unknown).
 
 	* programs/xman/vendor.h:
 	Added 'pic' to the man page rendering command pipeline
diff --git a/nx-X11/extras/Mesa/src/mesa/main/debug.c b/nx-X11/extras/Mesa/src/mesa/main/debug.c
index edc32b1f9..43b119239 100644
--- a/nx-X11/extras/Mesa/src/mesa/main/debug.c
+++ b/nx-X11/extras/Mesa/src/mesa/main/debug.c
@@ -43,7 +43,7 @@ const char *_mesa_prim_name[GL_POLYGON+4] = {
    "GL_QUAD_STRIP",
    "GL_POLYGON",
    "outside begin/end",
-   "inside unkown primitive",
+   "inside unknown primitive",
    "unknown state"
 };
 
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c b/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c
index ed1cbd908..c998f7c66 100644
--- a/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c
+++ b/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c
@@ -4106,7 +4106,7 @@ _mesa_parse_arb_program (GLcontext * ctx, const GLubyte * str, GLsizei len,
    if (*inst++ != REVISION) {
       _mesa_set_program_error (ctx, 0, "Grammar version mismatch");
       _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glProgramStringARB(Grammar verison mismatch)");
+                  "glProgramStringARB(Grammar version mismatch)");
       err = GL_TRUE;
    }
    else {
diff --git a/nxcomp/CHANGELOG b/nxcomp/CHANGELOG
index b7ef0d97a..b0323d4a7 100644
--- a/nxcomp/CHANGELOG
+++ b/nxcomp/CHANGELOG
@@ -668,7 +668,7 @@ nxcomp-2.0.0-70
 
 nxcomp-2.0.0-69
 
-- Changed the format of the persistent cache to accomodate the new
+- Changed the format of the persistent cache to accommodate the new
   encoding of the render opcodes. Caches from the 1.4.0 and 1.5.0
   should be still loaded and saved correctly when connected to and
   old version of the library.
diff --git a/nxcomp/ClientReadBuffer.cpp b/nxcomp/ClientReadBuffer.cpp
index b32033b17..14aca3240 100644
--- a/nxcomp/ClientReadBuffer.cpp
+++ b/nxcomp/ClientReadBuffer.cpp
@@ -29,7 +29,7 @@ unsigned int ClientReadBuffer::suggestedLength(unsigned int pendingLength)
   //
   // Even if the pending data is not
   // enough to make a complete message,
-  // resize the buffer to accomodate
+  // resize the buffer to accommodate
   // it all.
   //
 
diff --git a/nxcomp/EncodeBuffer.cpp b/nxcomp/EncodeBuffer.cpp
index 466a1d7a0..12a57180e 100644
--- a/nxcomp/EncodeBuffer.cpp
+++ b/nxcomp/EncodeBuffer.cpp
@@ -505,12 +505,12 @@ void EncodeBuffer::growBuffer(unsigned int numBytes)
   {
     #ifdef PANIC
     *logofs << "EncodeBuffer: PANIC! Error in context [C] "
-            << "growing buffer to accomodate " << numBytes
+            << "growing buffer to accommodate " << numBytes
             << " bytes .\n" << logofs_flush;
     #endif
 
     cerr << "Error" << ": Error in context [C] "
-         << "growing encode buffer to accomodate "
+         << "growing encode buffer to accommodate "
          << numBytes << " bytes.\n";
 
     HandleAbort();
diff --git a/nxcomp/GenericChannel.cpp b/nxcomp/GenericChannel.cpp
index 641ad36d4..bf72bf091 100644
--- a/nxcomp/GenericChannel.cpp
+++ b/nxcomp/GenericChannel.cpp
@@ -210,7 +210,7 @@ int GenericChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *
   // All data has been read from the read buffer.
   // We still need to mark the end of the encode
   // buffer just before sending the frame. This
-  // allows us to accomodate multiple reads in
+  // allows us to accommodate multiple reads in
   // a single frame.
   //
 
diff --git a/nxcomp/ProxyReadBuffer.cpp b/nxcomp/ProxyReadBuffer.cpp
index b0de14921..99c3cbaa2 100644
--- a/nxcomp/ProxyReadBuffer.cpp
+++ b/nxcomp/ProxyReadBuffer.cpp
@@ -50,7 +50,7 @@ unsigned int ProxyReadBuffer::suggestedLength(unsigned int pendingLength)
   //
   // Even if the readable data is not
   // enough to make a complete message,
-  // resize the buffer to accomodate
+  // resize the buffer to accommodate
   // it all.
   //
 
diff --git a/nxcomp/ServerReadBuffer.cpp b/nxcomp/ServerReadBuffer.cpp
index 53c1dec57..96c146b77 100644
--- a/nxcomp/ServerReadBuffer.cpp
+++ b/nxcomp/ServerReadBuffer.cpp
@@ -46,7 +46,7 @@ unsigned int ServerReadBuffer::suggestedLength(unsigned int pendingLength)
   //
   // Even if the readable data is not
   // enough to make a complete message,
-  // resize the buffer to accomodate
+  // resize the buffer to accommodate
   // it all.
   //
 
diff --git a/nxcomp/Transport.h b/nxcomp/Transport.h
index 2f313b29f..a2efa5270 100644
--- a/nxcomp/Transport.h
+++ b/nxcomp/Transport.h
@@ -226,7 +226,7 @@ class Transport
   protected:
 
   //
-  // Make room in the buffer to accomodate 
+  // Make room in the buffer to accommodate
   // at least size bytes.
   //
 
diff --git a/nxcomp/Types.h b/nxcomp/Types.h
index b3fe40e31..b7506124e 100644
--- a/nxcomp/Types.h
+++ b/nxcomp/Types.h
@@ -179,7 +179,7 @@ typedef set < File *, T_older > T_files;
 typedef list < int > T_list;
 
 //
-// Used to accomodate data to be read and
+// Used to accommodate data to be read and
 // written to a socket.
 //
 
-- 
cgit v1.2.3


From 823450515591369d1899e85ab86a8780ed3d995b Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Sat, 14 Feb 2015 14:43:13 +0100
Subject: nxcomp: Add Version.c file. Fix for commit
 d4d3fe0e6e77a58e68defc5895a589a681d7d092.

---
 nxcomp/Version.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 nxcomp/Version.c

(limited to 'nxcomp')

diff --git a/nxcomp/Version.c b/nxcomp/Version.c
new file mode 100644
index 000000000..2b431532b
--- /dev/null
+++ b/nxcomp/Version.c
@@ -0,0 +1,106 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (C) 2014 Qindel http://qindel.com and QVD http://theqvd.com  */
+/*                                                                        */
+/* This program is free software; you can redistribute it and/or modify   */
+/* it under the terms of the GNU General Public License as published by   */
+/* the Free Software Foundation; either version 3 of the License, or (at  */
+/* your option) any later version.                                        */
+/*                                                                        */
+/* This program is distributed in the hope that it will be useful, but    */
+/* WITHOUT ANY WARRANTY; without even the implied warranty of             */
+/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                   */
+/* See the GNU General Public License for more details.                   */
+/*                                                                        */
+/* You should have received a copy of the GNU General Public License      */
+/* along with this program; if not, see <http://www.gnu.org/licenses>.    */
+/*                                                                        */
+/* Additional permission under GNU GPL version 3 section 7                */
+/*                                                                        */
+/* If you modify this Program, or any covered work, by linking or         */
+/* combining it with [name of library] (or a modified version of that     */
+/* library), containing parts covered by the terms of [name of library's  */
+/* license], the licensors of this Program grant you additional           */
+/* permission to convey the resulting work. {Corresponding Source for a   */
+/* non-source form of such a combination shall include the source code    */
+/* for the parts of [name of library] used as well as that of the covered */
+/* work.}                                                                 */
+/*                                                                        */
+/*                                                                        */
+/**************************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "NX.h"
+
+
+static int _NXVersionMajor = -1;
+static int _NXVersionMinor = -1;
+static int _NXVersionPatch = -1;
+static int _NXVersionMaintenancePatch = -1;
+
+
+const char* NXVersion() {
+  const char *version = VERSION;
+  return version;
+}
+
+void _parseNXVersion() {
+  char version[32];
+  int i;
+  strcpy(version, VERSION);
+
+  char *value;
+  /* Reset values to 0 if undefined */
+  _NXVersionMajor = _NXVersionMinor = _NXVersionPatch = _NXVersionMaintenancePatch = 0;
+
+
+#define NXVERSIONSEPARATOR "."
+  value = strtok(version, NXVERSIONSEPARATOR);
+
+  for (i = 0; value != NULL && i < 4; i++)
+  {
+    switch (i)
+    {
+      case 0:
+        _NXVersionMajor = atoi(value);
+        break;
+
+      case 1:
+        _NXVersionMinor = atoi(value);
+        break;
+
+      case 2:
+        _NXVersionPatch = atoi(value);
+        break;
+
+      case 3:
+        _NXVersionMaintenancePatch = atoi(value);
+        break;
+    }
+
+    value = strtok(NULL, NXVERSIONSEPARATOR);
+  }
+}
+
+int NXMajorVersion() {
+  if (_NXVersionMajor == -1)
+    _parseNXVersion();
+  return _NXVersionMajor;
+}
+int NXMinorVersion() {
+  if (_NXVersionMinor == -1)
+    _parseNXVersion();
+  return _NXVersionMinor;
+}
+int NXPatchVersion() {
+  if (_NXVersionPatch == -1)
+    _parseNXVersion();
+  return _NXVersionPatch;
+}
+int NXMaintenancePatchVersion() {
+  if (_NXVersionMaintenancePatch == -1)
+    _parseNXVersion();
+  return _NXVersionMaintenancePatch;
+}
-- 
cgit v1.2.3


From ce531230f148a8c586a6e29c340e2db03d7bd3bb Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Sat, 14 Feb 2015 15:14:23 +0100
Subject: VERSION file: master VERSION file is in base folder, symlinked from
 nx*/VERSION and hw/nxagent/VERSION.

  This commit removes the debian/VERSION file at makes it now unnecessary to
  copy/symlink the VERSION file at build time. These build scripts got adapted:

    debian/roll-tarballs.sh
    debian/rules
    nx-libs.spec

  Furthermore, all NX component now use the main VERSION file as reference.

    typechange: nxcomp/VERSION
    typechange: nxcompext/VERSION
    typechange: nxcompshad/VERSION
    typechange: nxproxy/VERSION
---
 VERSION                                    | 1 +
 VERSION.x2goagent                          | 1 +
 debian/VERSION                             | 1 -
 debian/roll-tarballs.sh                    | 2 --
 debian/rules                               | 6 +-----
 nx-X11/programs/Xserver/hw/nxagent/VERSION | 1 +
 nx-libs.spec                               | 2 --
 nxcomp/VERSION                             | 2 +-
 nxcompext/VERSION                          | 2 +-
 nxcompshad/VERSION                         | 2 +-
 nxproxy/VERSION                            | 2 +-
 11 files changed, 8 insertions(+), 14 deletions(-)
 create mode 100644 VERSION
 create mode 120000 VERSION.x2goagent
 delete mode 100644 debian/VERSION
 create mode 120000 nx-X11/programs/Xserver/hw/nxagent/VERSION
 mode change 100644 => 120000 nxcomp/VERSION
 mode change 100644 => 120000 nxcompext/VERSION
 mode change 100644 => 120000 nxcompshad/VERSION
 mode change 100644 => 120000 nxproxy/VERSION

(limited to 'nxcomp')

diff --git a/VERSION b/VERSION
new file mode 100644
index 000000000..9af1780f9
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+3.5.99.0
diff --git a/VERSION.x2goagent b/VERSION.x2goagent
new file mode 120000
index 000000000..974cf28e0
--- /dev/null
+++ b/VERSION.x2goagent
@@ -0,0 +1 @@
+VERSION
\ No newline at end of file
diff --git a/debian/VERSION b/debian/VERSION
deleted file mode 100644
index 9af1780f9..000000000
--- a/debian/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-3.5.99.0
diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh
index 02a25dff5..03ab6778b 100755
--- a/debian/roll-tarballs.sh
+++ b/debian/roll-tarballs.sh
@@ -90,7 +90,6 @@ if [ "x$MODE" = "xfull" ]; then
     cp -v debian/rgb ./etc/
     cp -v debian/nxagent.keyboard ./etc/
     cp -v debian/x2goagent.keyboard ./etc/
-    cp -v debian/VERSION ./VERSION.x2goagent
 else
     rm -Rf "nxcompshad"*
     rm -Rf "nxcompext"*
@@ -101,7 +100,6 @@ else
         echo ${file##*/} >> doc/applied-patches/series
     done
 fi
-cp -v debian/VERSION ./nxcomp/VERSION
 cp -v debian/COPYING.full+lite COPYING
 cp -v debian/nxagent.keyboard nxagent.keyboard
 cp -v debian/x2goagent.keyboard x2goagent.keyboard
diff --git a/debian/rules b/debian/rules
index ad9ddded6..e0b4166f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,10 +24,9 @@ override_dh_clean:
 	rm -f nx-X11/programs/Xserver/hw/nxagent/changelog
 	rm -f nx-X11/programs/nxauth/changelog
 	. ./replace.sh; set -x; ls debian/*.install.in | while read file; do rm -f $$(string_rep $$file .install.in .install); done
-	rm -fR bin etc/rgb VERSION.x2goagent etc/keystrokes.cfg etc/nxagent.keyboard etc/x2goagent.keyboard
+	rm -fR bin etc/rgb etc/keystrokes.cfg etc/nxagent.keyboard etc/x2goagent.keyboard
 	rm -f debian/libnx-xinerama1.postinst
 	rm -fR .preserve/
-	if [ -f nxcomp/.VERSION.NoMachine ]; then mv nxcomp/.VERSION.NoMachine nxcomp/VERSION; fi
 	dh_clean
 
 override_dh_installchangelog:
@@ -91,7 +90,6 @@ override_dh_auto_build:
 	# create copies of upstream changelogs so that names apply to Debian policy...
 	cp -a nx-X11/CHANGELOG nx-X11/changelog
 	cp -a nxcomp/CHANGELOG nxcomp/changelog
-	if [ -f nxcomp/VERSION ]; then cp nxcomp/VERSION nxcomp/.VERSION.NoMachine; fi
 	cp -a nxcompext/CHANGELOG nxcompext/changelog
 	cp -a nxcompshad/CHANGELOG nxcompshad/changelog
 	cp -a nx-X11/programs/Xserver/hw/nxagent/CHANGELOG nx-X11/programs/Xserver/hw/nxagent/changelog
@@ -105,8 +103,6 @@ override_dh_auto_build:
 	ln -s ../debian/x2goagent.keyboard etc/x2goagent.keyboard
 	mkdir -p doc/
 	ln -s ../debian/changelog doc/changelog
-	ln -sf debian/VERSION VERSION.x2goagent
-	ln -sf ../debian/VERSION nxcomp/VERSION
 
 	# let's prep the libnx-xinerama1.postinst script with the value of the build systems's DEB_BUILD_MULTIARCH variable
 	sed debian/libnx-xinerama1.postinst.in -e 's/#DEB_BUILD_MULTIARCH#/$(DEB_BUILD_MULTIARCH)/' > debian/libnx-xinerama1.postinst
diff --git a/nx-X11/programs/Xserver/hw/nxagent/VERSION b/nx-X11/programs/Xserver/hw/nxagent/VERSION
new file mode 120000
index 000000000..9ca2cfb9d
--- /dev/null
+++ b/nx-X11/programs/Xserver/hw/nxagent/VERSION
@@ -0,0 +1 @@
+../../../../../VERSION
\ No newline at end of file
diff --git a/nx-libs.spec b/nx-libs.spec
index b5ac8d92f..c037a2662 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -668,8 +668,6 @@ cp -v debian/keystrokes.cfg etc/keystrokes.cfg
 cp -v debian/rgb etc/rgb
 cp -v debian/nxagent.keyboard etc/nxagent.keyboard
 cp -v debian/x2goagent.keyboard etc/x2goagent.keyboard
-cp -v debian/VERSION VERSION.x2goagent
-cp -v debian/VERSION nxcomp/VERSION
 
 # remove build cruft that is in Git (also taken from roll-tarball.sh)
 rm -Rf nx*/configure nx*/autom4te.cache*
diff --git a/nxcomp/VERSION b/nxcomp/VERSION
deleted file mode 100644
index 1545d9665..000000000
--- a/nxcomp/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-3.5.0
diff --git a/nxcomp/VERSION b/nxcomp/VERSION
new file mode 120000
index 000000000..6ff19de4b
--- /dev/null
+++ b/nxcomp/VERSION
@@ -0,0 +1 @@
+../VERSION
\ No newline at end of file
diff --git a/nxcompext/VERSION b/nxcompext/VERSION
deleted file mode 100644
index 1545d9665..000000000
--- a/nxcompext/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-3.5.0
diff --git a/nxcompext/VERSION b/nxcompext/VERSION
new file mode 120000
index 000000000..6ff19de4b
--- /dev/null
+++ b/nxcompext/VERSION
@@ -0,0 +1 @@
+../VERSION
\ No newline at end of file
diff --git a/nxcompshad/VERSION b/nxcompshad/VERSION
deleted file mode 100644
index 1545d9665..000000000
--- a/nxcompshad/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-3.5.0
diff --git a/nxcompshad/VERSION b/nxcompshad/VERSION
new file mode 120000
index 000000000..6ff19de4b
--- /dev/null
+++ b/nxcompshad/VERSION
@@ -0,0 +1 @@
+../VERSION
\ No newline at end of file
diff --git a/nxproxy/VERSION b/nxproxy/VERSION
deleted file mode 100644
index 1545d9665..000000000
--- a/nxproxy/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-3.5.0
diff --git a/nxproxy/VERSION b/nxproxy/VERSION
new file mode 120000
index 000000000..6ff19de4b
--- /dev/null
+++ b/nxproxy/VERSION
@@ -0,0 +1 @@
+../VERSION
\ No newline at end of file
-- 
cgit v1.2.3


From 5464a6dba5742a9f22ba18c9b307d4ee42394378 Mon Sep 17 00:00:00 2001
From: Clemens Lang <cal@macports.org>
Date: Sun, 15 Mar 2015 17:22:38 +0100
Subject: nx{comp{,ext,shad},proxy}: use path discovery for finding makedepend.
 Remove old cruft.

---
 debian/changelog        |  4 ++--
 nxcomp/configure.in     | 15 +--------------
 nxcompext/configure.in  | 15 +--------------
 nxcompshad/configure.in | 15 +--------------
 nxproxy/configure.in    | 15 +--------------
 5 files changed, 6 insertions(+), 58 deletions(-)

(limited to 'nxcomp')

diff --git a/debian/changelog b/debian/changelog
index 3b4175f92..664717898 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,8 @@ nx-libs (2:3.5.99.0-0~build1) UNRELEASED; urgency=medium
 
 nx-libs (2:3.5.0.31-0x2go1) UNRELEASED; urgency=low
 
-  [ X2Go Release Manager ]
-  * Continue development
+  [ Clemens Lang ]
+  * Use path discovery for finding makedepend. Remove old cruft.
 
  -- X2Go Release Manager <git-admin@x2go.org>  Sun, 15 Mar 2015 00:48:06 +0100
 
diff --git a/nxcomp/configure.in b/nxcomp/configure.in
index 6fa9757a7..2378a9398 100644
--- a/nxcomp/configure.in
+++ b/nxcomp/configure.in
@@ -362,20 +362,7 @@ fi
 dnl Find makedepend somewhere.
 
 AC_SUBST(MAKEDEPEND)
-
-if test -x "../nx-X11/config/makedepend/makedepend" ; then
-  MAKEDEPEND=../nx-X11/config/makedepend/makedepend
-else
-  if test -x "/usr/X11R6/bin/makedepend" ; then
-    MAKEDEPEND=/usr/X11R6/bin/makedepend
-  else
-    if test -x "/usr/openwin/bin/makedepend" ; then
-      MAKEDEPEND=/usr/openwin/bin/makedepend
-    else
-      MAKEDEPEND=/usr/bin/makedepend
-    fi
-  fi
-fi
+MAKEDEPEND="$(which makedepend)"
 
 dnl Determine what to build based on the platform.
 dnl Override the LIBS settings on Cygwin32 so that
diff --git a/nxcompext/configure.in b/nxcompext/configure.in
index 08c48a751..6159e84c1 100644
--- a/nxcompext/configure.in
+++ b/nxcompext/configure.in
@@ -219,20 +219,7 @@ CFLAGS="$CFLAGS -DVERSION=\\\"${VERSION}\\\""
 dnl Find makedepend somewhere.
 
 AC_SUBST(MAKEDEPEND)
-
-if test -x "../nx-X11/config/makedepend/makedepend" ; then
-  MAKEDEPEND=../nx-X11/config/makedepend/makedepend
-else
-  if test -x "/usr/X11R6/bin/makedepend" ; then
-    MAKEDEPEND=/usr/X11R6/bin/makedepend
-  else
-    if test -x "/usr/openwin/bin/makedepend" ; then
-      MAKEDEPEND=/usr/openwin/bin/makedepend
-    else
-      MAKEDEPEND=/usr/bin/makedepend
-    fi
-  fi
-fi
+MAKEDEPEND="$(which makedepend)"
 
 dnl Determine what to build based on the platform.
 dnl Override the LIBS settings on Cygwin32 so that
diff --git a/nxcompshad/configure.in b/nxcompshad/configure.in
index 13149b3a0..a76c6b9a1 100644
--- a/nxcompshad/configure.in
+++ b/nxcompshad/configure.in
@@ -269,19 +269,6 @@ fi
 dnl Find makedepend somewhere.
 
 AC_SUBST(MAKEDEPEND)
-
-if test -x "../nx-X11/config/makedepend/makedepend" ; then
-  MAKEDEPEND=../nx-X11/config/makedepend/makedepend
-else
-  if test -x "/usr/X11R6/bin/makedepend" ; then
-    MAKEDEPEND=/usr/X11R6/bin/makedepend
-  else
-    if test -x "/usr/openwin/bin/makedepend" ; then
-      MAKEDEPEND=/usr/openwin/bin/makedepend
-    else
-      MAKEDEPEND=makedepend
-    fi
-  fi
-fi
+MAKEDEPEND="$(which makedepend)"
 
 AC_OUTPUT(Makefile)
diff --git a/nxproxy/configure.in b/nxproxy/configure.in
index b86828d02..914e70738 100644
--- a/nxproxy/configure.in
+++ b/nxproxy/configure.in
@@ -167,19 +167,6 @@ fi
 dnl Find makedepend somewhere.
 
 AC_SUBST(MAKEDEPEND)
-
-if test -x "../nx-X11/config/makedepend/makedepend" ; then
-  MAKEDEPEND=../nx-X11/config/makedepend/makedepend
-else
-  if test -x "/usr/X11R6/bin/makedepend" ; then
-    MAKEDEPEND=/usr/X11R6/bin/makedepend
-  else
-    if test -x "/usr/openwin/bin/makedepend" ; then
-      MAKEDEPEND=/usr/openwin/bin/makedepend
-    else
-      MAKEDEPEND=makedepend
-    fi
-  fi
-fi
+MAKEDEPEND="$(which makedepend)"
 
 AC_OUTPUT(Makefile)
-- 
cgit v1.2.3


From ad7e12ed39cc4091ff878ea2b3e748e0147dd57f Mon Sep 17 00:00:00 2001
From: Clemens Lang <cal@macports.org>
Date: Sun, 15 Mar 2015 17:26:24 +0100
Subject: nxcomp{,shad}: fix dynamic library linking on OS X. Use -dynamiclib
 instead of -bundle.

---
 debian/changelog        | 1 +
 nxcomp/configure.in     | 4 ++--
 nxcompshad/configure.in | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'nxcomp')

diff --git a/debian/changelog b/debian/changelog
index 664717898..771139d9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ nx-libs (2:3.5.0.31-0x2go1) UNRELEASED; urgency=low
 
   [ Clemens Lang ]
   * Use path discovery for finding makedepend. Remove old cruft.
+  * Fix dynamic library linking on OS X. Use -dynamiclib instead of -bundle.
 
  -- X2Go Release Manager <git-admin@x2go.org>  Sun, 15 Mar 2015 00:48:06 +0100
 
diff --git a/nxcomp/configure.in b/nxcomp/configure.in
index 2378a9398..07c88df77 100644
--- a/nxcomp/configure.in
+++ b/nxcomp/configure.in
@@ -183,11 +183,11 @@ if test "$FreeBSD" = yes; then
 fi
 
 dnl Under Darwin we don't have support for -soname option and
-dnl we need the -bundle flag. Under Solaris, instead, we need
+dnl we need the -dynamiclib flag. Under Solaris, instead, we need
 dnl the options -G -h.
 
 if test "$DARWIN" = yes; then
-  LDFLAGS="$LDFLAGS -bundle"
+  LDFLAGS="$LDFLAGS -dynamiclib"
 elif test "$SUN" = yes; then
   LDFLAGS="$LDFLAGS -G -h \$(LIBLOAD)"
 else
diff --git a/nxcompshad/configure.in b/nxcompshad/configure.in
index a76c6b9a1..4e91361ff 100644
--- a/nxcompshad/configure.in
+++ b/nxcompshad/configure.in
@@ -175,11 +175,11 @@ if test "$FreeBSD" = yes; then
 fi
 
 dnl Under Darwin we don't have support for -soname option and
-dnl we need the -bundle flag. Under Solaris, instead, we need
+dnl we need the -dynamiclib flag. Under Solaris, instead, we need
 dnl the options -G -h.
 
 if test "$DARWIN" = yes; then
-  LDFLAGS="$LDFLAGS -bundle"
+  LDFLAGS="$LDFLAGS -dynamiclib"
 elif test "$SUN" = yes; then
   LDFLAGS="$LDFLAGS -G -h \$(LIBLOAD)"
 else
-- 
cgit v1.2.3


From 638e31c2f33723123d35ce65db88071a1be5cdb0 Mon Sep 17 00:00:00 2001
From: Clemens Lang <cal@macports.org>
Date: Sun, 15 Mar 2015 17:29:50 +0100
Subject: nxcomp{,ext,shad}: use the correct library naming scheme on OS X. It
 differs from other UNIX-based systems.

---
 debian/changelog       |  2 ++
 nxcomp/Makefile.in     | 22 +++++++++++++++-------
 nxcompext/Makefile.in  | 18 +++++++++++++-----
 nxcompshad/Makefile.in | 22 +++++++++++++++-------
 4 files changed, 45 insertions(+), 19 deletions(-)

(limited to 'nxcomp')

diff --git a/debian/changelog b/debian/changelog
index 771139d9a..197b257a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ nx-libs (2:3.5.0.31-0x2go1) UNRELEASED; urgency=low
   [ Clemens Lang ]
   * Use path discovery for finding makedepend. Remove old cruft.
   * Fix dynamic library linking on OS X. Use -dynamiclib instead of -bundle.
+  * Use the correct library naming scheme on OS X. It differs from other
+    UNIX-based systems.
 
  -- X2Go Release Manager <git-admin@x2go.org>  Sun, 15 Mar 2015 00:48:06 +0100
 
diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in
index 93bb0b38c..2234474ec 100644
--- a/nxcomp/Makefile.in
+++ b/nxcomp/Makefile.in
@@ -91,9 +91,17 @@ DEPENDINCLUDES = -I/usr/include/c++ -I/usr/include/g++ -I/usr/include/g++-3
 LIBRARY = Xcomp
 
 LIBNAME    = lib$(LIBRARY)
+ifeq ($(shell uname),Darwin)
+LIBFULL    = lib$(LIBRARY).$(VERSION).dylib
+LIBLOAD    = lib$(LIBRARY).$(LIBVERSION).dylib
+LIBSHARED  = lib$(LIBRARY).dylib
+LIBFLAGS   = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(VERSION)
+else
 LIBFULL    = lib$(LIBRARY).so.$(VERSION)
 LIBLOAD    = lib$(LIBRARY).so.$(LIBVERSION)
 LIBSHARED  = lib$(LIBRARY).so
+LIBFLAGS   =
+endif
 LIBARCHIVE = lib$(LIBRARY).a
 
 LIBCYGSHARED  = cyg$(LIBRARY).dll
@@ -232,7 +240,7 @@ COBJ   = $(CSRC:.c=.o)
 CXXOBJ = $(CXXSRC:.cpp=.o)
 
 $(LIBFULL):	 $(CXXOBJ) $(COBJ)
-		 $(CXX) -o $@ $(LDFLAGS) $(CXXOBJ) $(COBJ) $(LIBS)
+		 $(CXX) -o $@ $(LDFLAGS) $(LIBFLAGS) $(CXXOBJ) $(COBJ) $(LIBS)
 
 $(LIBLOAD):	 $(LIBFULL)
 		 rm -f $(LIBLOAD)
@@ -278,9 +286,9 @@ install.lib: all
 	./mkinstalldirs $(DESTDIR)${libdir}
 	./mkinstalldirs $(DESTDIR)${includedir}/nx
 	$(INSTALL_DATA) $(LIBFULL)              $(DESTDIR)${libdir}
-	$(INSTALL_LINK) libXcomp.so.3           $(DESTDIR)${libdir}
-	$(INSTALL_LINK) libXcomp.so             $(DESTDIR)${libdir}
-	$(INSTALL_DATA) libXcomp.a              $(DESTDIR)${libdir}
+	$(INSTALL_LINK) $(LIBLOAD)              $(DESTDIR)${libdir}
+	$(INSTALL_LINK) $(LIBSHARED)            $(DESTDIR)${libdir}
+	$(INSTALL_DATA) $(LIBARCHIVE)           $(DESTDIR)${libdir}
 	$(INSTALL_DATA) NX*.h                   $(DESTDIR)${includedir}/nx
 	$(INSTALL_DATA) MD5.h                   $(DESTDIR)${includedir}/nx
 	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
@@ -293,9 +301,9 @@ uninstall.bin:
 
 uninstall.lib:
 	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
-	$(RM_FILE) $(DESTDIR)${libdir}/libXcomp.so.3
-	$(RM_FILE) $(DESTDIR)${libdir}/libXcomp.so
-	$(RM_FILE) $(DESTDIR)${libdir}/libXcomp.a
+	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBLOAD)
+	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBSHARED)
+	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBARCHIVE)
 	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXalert.h
 	$(RM_FILE) $(DESTDIR)${includedir}/nx/NX.h
 	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXmitshm.h
diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in
index 7987c7563..8777ceeed 100644
--- a/nxcompext/Makefile.in
+++ b/nxcompext/Makefile.in
@@ -82,9 +82,17 @@ DEPENDINCLUDES =  -I/usr/include/c++ -I/usr/include/g++ -I/usr/include/g++-3
 LIBRARY = Xcompext
 
 LIBNAME    = lib$(LIBRARY)
+ifeq ($(shell uname),Darwin)
+LIBFULL    = lib$(LIBRARY).$(VERSION).dylib
+LIBLOAD    = lib$(LIBRARY).$(LIBVERSION).dylib
+LIBSHARED  = lib$(LIBRARY).dylib
+LIBFLAGS   = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(VERSION)
+else
 LIBFULL    = lib$(LIBRARY).so.$(VERSION)
 LIBLOAD    = lib$(LIBRARY).so.$(LIBVERSION)
 LIBSHARED  = lib$(LIBRARY).so
+LIBFLAGS   =
+endif
 LIBARCHIVE = lib$(LIBRARY).a
 
 LIBCYGSHARED  = cyg$(LIBRARY).dll
@@ -113,7 +121,7 @@ COBJ   = $(CSRC:.c=.o)
 CXXOBJ = $(CXXSRC:.cpp=.o)
 
 $(LIBFULL):	 $(CXXOBJ) $(COBJ)
-		 $(CXX) -o $@ $(LDFLAGS) $(CXXOBJ) $(COBJ) $(LIBS)
+		 $(CXX) -o $@ $(LDFLAGS) $(LIBFLAGS) $(CXXOBJ) $(COBJ) $(LIBS)
 
 $(LIBLOAD):	 $(LIBFULL)
 		 rm -f $(LIBLOAD)
@@ -159,8 +167,8 @@ install.lib: all
 	./mkinstalldirs $(DESTDIR)${libdir}
 	./mkinstalldirs $(DESTDIR)${includedir}/nx
 	$(INSTALL_DATA) $(LIBFULL)              $(DESTDIR)${libdir}
-	$(INSTALL_LINK) libXcompext.so.3	$(DESTDIR)${libdir}
-	$(INSTALL_LINK) libXcompext.so          $(DESTDIR)${libdir}
+	$(INSTALL_LINK) $(LIBLOAD)              $(DESTDIR)${libdir}
+	$(INSTALL_LINK) $(LIBSHARED)            $(DESTDIR)${libdir}
 	$(INSTALL_DATA) NX*.h                   $(DESTDIR)${includedir}/nx
 	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
 
@@ -172,8 +180,8 @@ uninstall.bin:
 
 uninstall.lib:
 	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
-	$(RM_FILE) $(DESTDIR)${libdir}/libXcompext.so.3
-	$(RM_FILE) $(DESTDIR)${libdir}/libXcompext.so
+	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBLOAD)
+	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBSHARED)
 	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXlib.h
 	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXlibint.h
 	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in
index f7e89a6f2..2f6e50bf9 100644
--- a/nxcompshad/Makefile.in
+++ b/nxcompshad/Makefile.in
@@ -103,9 +103,17 @@ DEPENDINCLUDES = -I/usr/include/g++ -I/usr/include/g++-3
 LIBRARY = Xcompshad
 
 LIBNAME    = lib$(LIBRARY)
+ifeq ($(shell uname),Darwin)
+LIBFULL    = lib$(LIBRARY).$(VERSION).dylib
+LIBLOAD    = lib$(LIBRARY).$(LIBVERSION).dylib
+LIBSHARED  = lib$(LIBRARY).dylib
+LIBFLAGS   = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(VERSION)
+else
 LIBFULL    = lib$(LIBRARY).so.$(VERSION)
 LIBLOAD    = lib$(LIBRARY).so.$(LIBVERSION)
 LIBSHARED  = lib$(LIBRARY).so
+LIBFLAGS   =
+endif
 LIBARCHIVE = lib$(LIBRARY).a
 
 MSRC   = Main.c
@@ -146,7 +154,7 @@ all: depend $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE)
 endif
 
 $(LIBFULL):	$(CXXOBJ) $(COBJ)
-		$(CXX) -o $@ $(LDFLAGS) $(CXXOBJ) $(COBJ) $(LIBS) $(EXTRALIBS)
+		$(CXX) -o $@ $(LDFLAGS) $(LIBFLAGS) $(CXXOBJ) $(COBJ) $(LIBS) $(EXTRALIBS)
 
 $(LIBLOAD):	$(LIBFULL)
 		rm -f $(LIBLOAD)
@@ -193,9 +201,9 @@ install.lib: all
 	$(INSTALL_DIR)                          $(DESTDIR)${libdir}
 	$(INSTALL_DIR)                          $(DESTDIR)${includedir}/nx
 	$(INSTALL_DATA) $(LIBFULL)              $(DESTDIR)${libdir}
-	$(INSTALL_LINK) libXcompshad.so.3       $(DESTDIR)${libdir}
-	$(INSTALL_LINK) libXcompshad.so         $(DESTDIR)${libdir}
-	$(INSTALL_DATA) *.a                     $(DESTDIR)${libdir}
+	$(INSTALL_LINK) $(LIBLOAD)              $(DESTDIR)${libdir}
+	$(INSTALL_LINK) $(LIBSHARED)            $(DESTDIR)${libdir}
+	$(INSTALL_DATA) $(LIBARCHIVE)           $(DESTDIR)${libdir}
 	$(INSTALL_DATA) *.h                     $(DESTDIR)${includedir}/nx
 	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
 
@@ -207,9 +215,9 @@ uninstall.bin:
 
 uninstall.lib:
 	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
-	$(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.so.3
-	$(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.so
-	$(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.a
+	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBLOAD)
+	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBSHARED)
+	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBARCHIVE)
 	for header in *.h; do $(RM_FILE) $(DESTDIR)${includedir}/nx/$$header; done
 	$(RM_DIR) $(DESTDIR)${libdir}/nx/
 	$(RM_DIR) $(DESTDIR)${includedir}/nx/
-- 
cgit v1.2.3


From d8de5928e1e7a0677ed2d38fa4d9f53a58514ebe Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Mon, 16 Mar 2015 03:29:16 +0100
Subject: nx{comp{,ext,shad},proxy}: try really hard to find makedepend. Do not
 fail if it is not available.

---
 nxcomp/Makefile.in      |  4 ++--
 nxcomp/configure.in     | 10 ++++++++++
 nxcompext/Makefile.in   |  4 ++--
 nxcompext/configure.in  | 10 ++++++++++
 nxcompshad/Makefile.in  |  4 ++--
 nxcompshad/configure.in | 10 ++++++++++
 nxproxy/Makefile.in     |  4 ++--
 nxproxy/configure.in    | 10 ++++++++++
 8 files changed, 48 insertions(+), 8 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in
index 2234474ec..e571b3c90 100644
--- a/nxcomp/Makefile.in
+++ b/nxcomp/Makefile.in
@@ -271,9 +271,9 @@ depends:	depend.status
 depend:		depend.status
 
 depend.status:	
-		if [ -x $(MAKEDEPEND) ] ; then \
+		if [ -n "$(MAKEDEPEND)" ] && [ -x "$(MAKEDEPEND)" ] ; then \
 			$(MAKEDEPEND) $(CXXINCLUDES) $(CCINCLUDES) \
-                        $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) \
+			$(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) \
 			$(CXXSRC) 2>/dev/null; \
 		fi
 		touch depend.status
diff --git a/nxcomp/configure.in b/nxcomp/configure.in
index 07c88df77..43b51573a 100644
--- a/nxcomp/configure.in
+++ b/nxcomp/configure.in
@@ -364,6 +364,16 @@ dnl Find makedepend somewhere.
 AC_SUBST(MAKEDEPEND)
 MAKEDEPEND="$(which makedepend)"
 
+# Try to desperately find makedepend.
+# Set MAKEDEPEND to the shipped makedepend binary. This will not
+# exist in nx-libs-lite, though, in which case MAKEDEPEND
+# will stay empty.
+if test -z "${MAKEDEPEND}"; then
+  if test -x "../nx-X11/config/makedepend/makedepend"; then
+    MAKEDEPEND="../nx-X11/config/makedepend/makedepend"
+  fi
+fi
+
 dnl Determine what to build based on the platform.
 dnl Override the LIBS settings on Cygwin32 so that
 dnl we always link with the exact set of libraries.
diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in
index 8777ceeed..da464bd6d 100644
--- a/nxcompext/Makefile.in
+++ b/nxcompext/Makefile.in
@@ -152,9 +152,9 @@ depends:	depend.status
 depend:		depend.status
 
 depend.status:	
-		if [ -x $(MAKEDEPEND) ] ; then \
+		if [ -n "$(MAKEDEPEND)" ] && [ -x "$(MAKEDEPEND)" ] ; then \
 			$(MAKEDEPEND) $(CXXINCLUDES) $(CCINCLUDES) \
-                        $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) \
+			$(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) \
 			$(CXXSRC) 2>/dev/null; \
 		fi
 		touch depend.status
diff --git a/nxcompext/configure.in b/nxcompext/configure.in
index 6159e84c1..e6f13c0ea 100644
--- a/nxcompext/configure.in
+++ b/nxcompext/configure.in
@@ -221,6 +221,16 @@ dnl Find makedepend somewhere.
 AC_SUBST(MAKEDEPEND)
 MAKEDEPEND="$(which makedepend)"
 
+# Try to desperately find makedepend.
+# Set MAKEDEPEND to the shipped makedepend binary. This will not
+# exist in nx-libs-lite, though, in which case MAKEDEPEND
+# will stay empty.
+if test -z "${MAKEDEPEND}"; then
+  if test -x "../nx-X11/config/makedepend/makedepend"; then
+    MAKEDEPEND="../nx-X11/config/makedepend/makedepend"
+  fi
+fi
+
 dnl Determine what to build based on the platform.
 dnl Override the LIBS settings on Cygwin32 so that
 dnl we always link with the exact set of libraries.
diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in
index 2f6e50bf9..5ea286395 100644
--- a/nxcompshad/Makefile.in
+++ b/nxcompshad/Makefile.in
@@ -187,9 +187,9 @@ depends:	depend.status
 depend:		depend.status
 
 depend.status:	
-		if [ -x $(MAKEDEPEND) ] ; then \
+		if [ -n "$(MAKEDEPEND)" ] && [ -x "$(MAKEDEPEND)" ] ; then \
 			$(MAKEDEPEND) $(CXXINCLUDES) $(CCINCLUDES) \
-                        $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) $(CXXSRC) 2>/dev/null; \
+			$(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) $(CXXSRC) 2>/dev/null; \
 		fi
 		touch depend.status
 
diff --git a/nxcompshad/configure.in b/nxcompshad/configure.in
index 4e91361ff..8dd1b2e21 100644
--- a/nxcompshad/configure.in
+++ b/nxcompshad/configure.in
@@ -271,4 +271,14 @@ dnl Find makedepend somewhere.
 AC_SUBST(MAKEDEPEND)
 MAKEDEPEND="$(which makedepend)"
 
+# Try to desperately find makedepend.
+# Set MAKEDEPEND to the shipped makedepend binary. This will not
+# exist in nx-libs-lite, though, in which case MAKEDEPEND
+# will stay empty.
+if test -z "${MAKEDEPEND}"; then
+  if test -x "../nx-X11/config/makedepend/makedepend"; then
+    MAKEDEPEND="../nx-X11/config/makedepend/makedepend"
+  fi
+fi
+
 AC_OUTPUT(Makefile)
diff --git a/nxproxy/Makefile.in b/nxproxy/Makefile.in
index c00df91dc..3a27cbd29 100644
--- a/nxproxy/Makefile.in
+++ b/nxproxy/Makefile.in
@@ -80,9 +80,9 @@ depends:	depend.status
 depend:		depend.status
 
 depend.status:	
-		if [ -x $(MAKEDEPEND) ] ; then \
+		if [ -n "$(MAKEDEPEND)" ] && [ -x "$(MAKEDEPEND)" ] ; then \
 			$(MAKEDEPEND) $(CXXINCLUDES) $(CCINCLUDES) \
-                        $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) $(CXXSRC) 2>/dev/null; \
+			$(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) $(CXXSRC) 2>/dev/null; \
 		fi
 		touch depend.status
 
diff --git a/nxproxy/configure.in b/nxproxy/configure.in
index 914e70738..268584216 100644
--- a/nxproxy/configure.in
+++ b/nxproxy/configure.in
@@ -169,4 +169,14 @@ dnl Find makedepend somewhere.
 AC_SUBST(MAKEDEPEND)
 MAKEDEPEND="$(which makedepend)"
 
+# Try to desperately find makedepend.
+# Set MAKEDEPEND to the shipped makedepend binary. This will not
+# exist in nx-libs-lite, though, in which case MAKEDEPEND
+# will stay empty.
+if test -z "${MAKEDEPEND}"; then
+  if test -x "../nx-X11/config/makedepend/makedepend"; then
+    MAKEDEPEND="../nx-X11/config/makedepend/makedepend"
+  fi
+fi
+
 AC_OUTPUT(Makefile)
-- 
cgit v1.2.3


From d86ce9c7a44118082612c3cfb3a866b9f8f6098f Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Thu, 26 Mar 2015 00:32:27 +0100
Subject: nxcomp{,ext,shad}: only use the first three numbers in the full
 version for current_version on OS X. ld(1) on 10.6 fails otherwise.

---
 nxcomp/Makefile.in     | 3 ++-
 nxcompext/Makefile.in  | 3 ++-
 nxcompshad/Makefile.in | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in
index e571b3c90..6022747cb 100644
--- a/nxcomp/Makefile.in
+++ b/nxcomp/Makefile.in
@@ -95,7 +95,8 @@ ifeq ($(shell uname),Darwin)
 LIBFULL    = lib$(LIBRARY).$(VERSION).dylib
 LIBLOAD    = lib$(LIBRARY).$(LIBVERSION).dylib
 LIBSHARED  = lib$(LIBRARY).dylib
-LIBFLAGS   = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(VERSION)
+COMP_VER   = $(shell echo '$(VERSION)' | cut -d '.' -f 1-3)
+LIBFLAGS   = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(COMP_VER)
 else
 LIBFULL    = lib$(LIBRARY).so.$(VERSION)
 LIBLOAD    = lib$(LIBRARY).so.$(LIBVERSION)
diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in
index da464bd6d..b33c5aaf3 100644
--- a/nxcompext/Makefile.in
+++ b/nxcompext/Makefile.in
@@ -86,7 +86,8 @@ ifeq ($(shell uname),Darwin)
 LIBFULL    = lib$(LIBRARY).$(VERSION).dylib
 LIBLOAD    = lib$(LIBRARY).$(LIBVERSION).dylib
 LIBSHARED  = lib$(LIBRARY).dylib
-LIBFLAGS   = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(VERSION)
+COMP_VER   = $(shell echo '$(VERSION)' | cut -d '.' -f 1-3)
+LIBFLAGS   = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(COMP_VER)
 else
 LIBFULL    = lib$(LIBRARY).so.$(VERSION)
 LIBLOAD    = lib$(LIBRARY).so.$(LIBVERSION)
diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in
index 5ea286395..41d644f5e 100644
--- a/nxcompshad/Makefile.in
+++ b/nxcompshad/Makefile.in
@@ -107,7 +107,8 @@ ifeq ($(shell uname),Darwin)
 LIBFULL    = lib$(LIBRARY).$(VERSION).dylib
 LIBLOAD    = lib$(LIBRARY).$(LIBVERSION).dylib
 LIBSHARED  = lib$(LIBRARY).dylib
-LIBFLAGS   = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(VERSION)
+COMP_VER   = $(shell echo '$(VERSION)' | cut -d '.' -f 1-3)
+LIBFLAGS   = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(COMP_VER)
 else
 LIBFULL    = lib$(LIBRARY).so.$(VERSION)
 LIBLOAD    = lib$(LIBRARY).so.$(LIBVERSION)
-- 
cgit v1.2.3


From 4fefe352c9d93b0a51ed2e7c34f47a0d951413db Mon Sep 17 00:00:00 2001
From: Nito Martinez <Nito@Qindel.ES>
Date: Fri, 15 May 2015 15:20:52 +0200
Subject: This patch allows to cleanup the nxcomp resources to allow for a
 second connection inside the same process, instead of a new process as is the
 nxproxy case.

This involves creating a new API call

void NXTransCleanupForReconnect(void);

which basically cleans up the global state for the connection but does not exit the process.

Background
==========
This is needed for the IOS platform, where the nxproxy model of forking does not work.
Also NX handles most of the errors with an "exit" call which in IOS cannot be easily handled.
---
 nxcomp/Loop.cpp | 27 +++++++++++++++++++++++++++
 nxcomp/Misc.h   |  1 +
 nxcomp/NX.h     |  8 ++++++++
 3 files changed, 36 insertions(+)

(limited to 'nxcomp')

diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 7bc154f36..f25aed353 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -1311,6 +1311,11 @@ void NXTransCleanup()
   HandleCleanup();
 }
 
+void NXTransCleanupForReconnect()
+{
+  HandleCleanupForReconnect();
+}
+
 //
 // Check the parameters for subsequent
 // initialization of the NX transport.
@@ -4873,6 +4878,28 @@ int StartKeeper()
   return 1;
 }
 
+void HandleCleanupForReconnect()
+{
+  #ifdef TEST
+  *logofs << "Loop: Going to clean up system resources for Reconnect "
+          << "in process '" << getpid() << "'.\n"
+          << logofs_flush;
+  #endif
+  handleTerminatedInLoop();
+  DisableSignals();
+  if (control)
+    CleanupChildren();
+  CleanupListeners();
+  CleanupSockets();
+  CleanupKeeper();
+  CleanupStreams();
+  CleanupLocal();
+  CleanupGlobal();
+  RestoreSignals();
+  ServerCache::lastInitReply.set(0,NULL);
+  ServerCache::lastKeymap.set(0,NULL);
+  ServerCache::getKeyboardMappingLastMap.set(0,NULL);
+}
 void HandleCleanup(int code)
 {
   #ifdef TEST
diff --git a/nxcomp/Misc.h b/nxcomp/Misc.h
index 21a503082..0cc396933 100644
--- a/nxcomp/Misc.h
+++ b/nxcomp/Misc.h
@@ -140,6 +140,7 @@ void HandleShutdown() __attribute__((noreturn));
 extern "C"
 {
   void HandleCleanup(int code = 0) __attribute__((noreturn));
+  void HandleCleanupForReconnect();
 }
 
 //
diff --git a/nxcomp/NX.h b/nxcomp/NX.h
index 2dbf68662..0e4734e5f 100644
--- a/nxcomp/NX.h
+++ b/nxcomp/NX.h
@@ -442,6 +442,14 @@ extern int NXTransParseEnvironment(const char *env, int force);
 
 extern void NXTransCleanup(void) __attribute__((noreturn));
 
+/*
+ * Cleans up the global and local state
+ * (the same way as NXTransCleanup does)
+ * but does not exit the process
+ * Needed for IOS platform
+ */
+extern void NXTransCleanupForReconnect(void);
+
 extern const char* NXVersion();
 extern int NXMajorVersion();
 extern int NXMinorVersion();
-- 
cgit v1.2.3


From cf4ed917e2d7d6b3683ba1aa4ea4662538b69516 Mon Sep 17 00:00:00 2001
From: Nito Martinez <Nito@Qindel.ES>
Date: Fri, 15 May 2015 22:40:05 +0200
Subject: This patch is some code fixes to debug some debuging macro usage in
 the NX code.

Particularly the following macros have been tested -DTEST -DDEBUG -DDUMP -DFLUSH -DTOKEN -DSPLIT -DPING -DMIXED -DMATCH -DTIME
---
 nxcomp/Agent.h       | 2 +-
 nxcomp/ClearArea.cpp | 2 +-
 nxcomp/Proxy.cpp     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Agent.h b/nxcomp/Agent.h
index ded344d84..2c5badf53 100644
--- a/nxcomp/Agent.h
+++ b/nxcomp/Agent.h
@@ -217,7 +217,7 @@ class Agent
 
     #if defined(TEST) || defined(INFO)
     *logofs << "Agent: proxyCanRead() is "
-            << ((int) FD_ISSET(proxy -> getFd(), &readWorkSet)
+            << ((int) FD_ISSET(proxy -> getFd(), &readWorkSet))
             << ".\n" << logofs_flush;
     #endif
 
diff --git a/nxcomp/ClearArea.cpp b/nxcomp/ClearArea.cpp
index 223a3b3e1..83b728158 100644
--- a/nxcomp/ClearArea.cpp
+++ b/nxcomp/ClearArea.cpp
@@ -92,7 +92,7 @@ void ClearAreaStore::dumpIdentity(const Message *message) const
 
   ClearAreaMessage *clearArea = (ClearAreaMessage *) message;
 
-  *logofs << name() << ": Identity exposures " << clearArea -> (unsigned int) exposures 
+  *logofs << name() << ": Identity exposures " << (unsigned int) clearArea -> exposures 
           << ", window " << clearArea -> window  << ", x " << clearArea -> x 
           << ", y " << clearArea -> y << ", width  " << clearArea -> width 
           << ", height " << clearArea -> height << ", size " << clearArea -> size_ 
diff --git a/nxcomp/Proxy.cpp b/nxcomp/Proxy.cpp
index 9b38661b4..4eb99cf45 100644
--- a/nxcomp/Proxy.cpp
+++ b/nxcomp/Proxy.cpp
@@ -5176,7 +5176,7 @@ char *Proxy::handleSaveAllStores(const char *savePath) const
 
   *(cacheDumpName + DEFAULT_STRING_LENGTH - 1) = '\0';
 
-  mode_t fileMode = umask(0077);
+  fileMode = umask(0077);
 
   cacheDump = new ofstream(cacheDumpName, ios::out);
 
-- 
cgit v1.2.3


From f982cbc85e9ffff24a6a348c3637b54a7e8cbc34 Mon Sep 17 00:00:00 2001
From: Vadim Troshchinskiy <vtroshchinskiy@qindel.com>
Date: Wed, 20 May 2015 15:47:45 +0200
Subject: Fix negotiation in stage 10 error

Problem fixed by adding a select() call to implement a timeout,
and retrying writes if needed.
---
 nxcomp/Loop.cpp | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index f25aed353..0ab0dd988 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -8100,16 +8100,52 @@ int ReadRemoteData(int fd, char *buffer, int size, char stop)
 int WriteLocalData(int fd, const char *buffer, int size)
 {
   int position = 0;
+  int ret = 0;
+  fd_set writeSet;
+  struct timeval selectTs = {30, 0};
 
   while (position < size)
   {
+
+    // A write to a non-blocking socket may fail with EAGAIN. The problem is
+    // that cache data is done in several writes, and there's no easy way
+    // to handle failure without rewriting a significant amount of code.
+    //
+    // Bailing out of the outer loop would result in restarting the sending
+    // of the entire cache list, which would confuse the other side.
+
+    FD_ZERO(&writeSet);
+    FD_SET(fd, &writeSet);
+
+    ret = select(fd+1, NULL, &writeSet, NULL, &selectTs);
+
+    #ifdef DEBUG
+    *logofs << "Loop: WriteLocalData: select() returned with a code of " << ret << " and remaining timeout of " 
+            << selectTs.tv_sec << " sec, " << selectTs.tv_usec << "usec\n" << logofs_flush;
+    #endif
+
+    if ( ret < 0 )
+    {
+      *logofs << "Loop: Error in select() when writing data to FD#" << fd << ": " << strerror(EGET()) << "\n" << logofs_flush;
+
+      if ( EGET() == EINTR )
+        continue;
+
+      return -1;
+    }
+    else if ( ret == 0 )
+    {
+      *logofs << "Loop: Timeout expired in select() when writing data to FD#" << fd << ": " << strerror(EGET()) << "\n" << logofs_flush;
+      return -1;
+    }
+
     int result = write(fd, buffer + position, size - position);
 
     getNewTimestamp();
 
     if (result <= 0)
     {
-      if (result < 0 && EGET() == EINTR)
+      if (result < 0 && (EGET() == EINTR || EGET() == EAGAIN || EGET() == EWOULDBLOCK))
       {
         continue;
       }
-- 
cgit v1.2.3


From 1f44331574bdbe4069d13e4c26df18094b49e658 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Thu, 21 May 2015 12:25:13 +0200
Subject: Document retroactive re-licensing of the original DXPC code (closes
 #30).

  * Update nxcomp/LICENSE.
  * Add nxcomp/README.on-retroactive-DXPC-license, giving a
    short overview of the flow of discussions
  * Add "modified or unmodified" to the license information
    printed out to stdout in nxcomp/Misc.cpp
  * Fix copyright year (2006->2003) for Gian Filippo Pinzari
    (and move him to the GPL-2 section).
  * Add the complete .mbox file of Debian bug #748565.
---
 doc/DXPC_re-licensed::debbug_784565.mbox  | 3769 +++++++++++++++++++++++++++++
 nxcomp/LICENSE                            |   59 +-
 nxcomp/Misc.cpp                           |    6 +-
 nxcomp/README.on-retroactive-DXPC-license |  269 ++
 4 files changed, 4097 insertions(+), 6 deletions(-)
 create mode 100644 doc/DXPC_re-licensed::debbug_784565.mbox
 create mode 100644 nxcomp/README.on-retroactive-DXPC-license

(limited to 'nxcomp')

diff --git a/doc/DXPC_re-licensed::debbug_784565.mbox b/doc/DXPC_re-licensed::debbug_784565.mbox
new file mode 100644
index 000000000..be813246c
--- /dev/null
+++ b/doc/DXPC_re-licensed::debbug_784565.mbox
@@ -0,0 +1,3769 @@
+From invernomuto@paranoici.org Wed May 06 17:36:12 2015
+Received: (at submit) by bugs.debian.org; 6 May 2015 17:36:12 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-12.0 required=4.0 tests=BAYES_00,DKIM_SIGNED,
+	DKIM_VALID,DKIM_VALID_AU,FOURLA,HAS_PACKAGE,SPF_HELO_PASS,SPF_PASS,
+	XMAILER_REPORTBUG autolearn=ham autolearn_force=no
+	version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 12; hammy, 150; neutral, 79; spammy,
+	0. spammytokens: hammytokens:0.000-+--H*M:reportbug, 0.000-+--H*MI:reportbug,
+	0.000-+--H*x:reportbug, 0.000-+--H*UA:reportbug, 0.000-+--H*x:6.6.3
+Return-path: <invernomuto@paranoici.org>
+Received: from perdizione.investici.org ([94.23.50.208])
+	by buxtehude.debian.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256)
+	(Exim 4.80)
+	(envelope-from <invernomuto@paranoici.org>)
+	id 1Yq3Ex-0001dB-Ks
+	for submit@bugs.debian.org; Wed, 06 May 2015 17:36:11 +0000
+Received: from [94.23.50.208] (perdizione [94.23.50.208]) (Authenticated sender: invernomuto@paranoici.org) by localhost (Postfix) with ESMTPSA id 3987C120F77;
+	Wed,  6 May 2015 17:36:07 +0000 (UTC)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paranoici.org;
+	s=stigmate; t=1430933767;
+	bh=QAdaIheSnzoHI301+0HPUrAK62wjbKWg7iWEzGzlOTs=;
+	h=From:To:Subject:Date;
+	b=X/2YGWFWL2KRAVqONR2Q6Q6HuMii+1WfGCbSpf8XvQesaf7qWlvY2u1IVKgKVpN2m
+	 Baq+3OrQ1adlmdHQQJm7tLfv37vRZVNOUpP3lyKQX4v3B/Gos63+1GqfyJ7qGkvQha
+	 4qwytZrPI20VmUswHf7qhgSGIVQmy0COEZZX0PF8=
+Received: from frx by homebrew with local (Exim 4.85)
+	(envelope-from <invernomuto@paranoici.org>)
+	id 1Yq3EK-0001ye-Bx; Wed, 06 May 2015 19:35:32 +0200
+Content-Type: text/plain; charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+From: "Francesco Poli \(wintermute\)" <invernomuto@paranoici.org>
+To: Debian Bug Tracking System <submit@bugs.debian.org>
+Subject: nx-libs-lite: parts are derived from non-free code
+Message-ID: <20150506173532.7531.31389.reportbug@homebrew>
+X-Mailer: reportbug 6.6.3
+Date: Wed, 06 May 2015 19:35:32 +0200
+Delivered-To: submit@bugs.debian.org
+
+Package: nx-libs-lite
+Version: 3.5.0.27-1
+Severity: serious
+Justification: Policy 2.2.1
+
+Hello and thanks for maintaining this package in Debian!
+
+I noticed that the debian/copyright states:
+
+[...]
+| Parts of this software are derived from DXPC project. These copyright
+| notices apply to original DXPC code:
+| 
+|    Redistribution and use in source and binary forms are permitted provided
+|    that the above copyright notice and this paragraph are duplicated in all
+|    such forms.
+| 
+|    THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+|    WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+|    MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+| 
+|    Copyright (c) 1995,1996 Brian Pane
+|    Copyright (c) 1996,1997 Zachary Vonler and Brian Pane
+|    Copyright (c) 1999 Kevin Vigor and Brian Pane
+|    Copyright (c) 2000,2001 Gian Filippo Pinzari and Brian Pane
+[...]
+
+This license lacks the permission to modify the DXPC code.
+Hence, the original DXPC code does not appear to comply with the
+DFSG. And the nx-libs-lite is in part derived from DXPC code.
+
+This basically means that nx-libs-lite includes parts which are
+non-free (as they are derived from non-modifiable code) and
+are also possibly legally undistributable (as they are non-modifiable,
+but actually modified). The combination with the rest of nx-libs-lite
+(which is GPL-licensed) may also be legally undistributable (since
+the license with no permission to modify is GPL-incompatible).
+
+
+If there's anything I misunderstood, please clarify.
+
+Otherwise, please address this issue as soon as possible.
+The copyright owners for the original DXPC code should be
+contacted and persuaded to re-license under GPL-compatible
+terms.
+
+Thanks for your time.
+Bye.
+
+
+
+From mike.gabriel@das-netzwerkteam.de Mon May 11 09:07:54 2015
+Received: (at 784565) by bugs.debian.org; 11 May 2015 09:07:54 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-11.9 required=4.0 tests=BAYES_00,FOURLA,
+	HAS_BUG_NUMBER,PGPSIGNATURE,T_RP_MATCHES_RCVD autolearn=ham
+	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 24; hammy, 150; neutral, 203; spammy,
+	0. spammytokens: hammytokens:0.000-+--H*c:pgp-signature,
+	0.000-+--H*c:protocol, 0.000-+--H*c:micalg, 0.000-+--H*c:signed,
+	0.000-+--H*RU:sk:grimnir
+Return-path: <mike.gabriel@das-netzwerkteam.de>
+Received: from freya.das-netzwerkteam.de ([88.198.48.199])
+	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
+	(Exim 4.80)
+	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
+	id 1Yrjgn-0001o6-MP
+	for 784565@bugs.debian.org; Mon, 11 May 2015 09:07:54 +0000
+Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
+	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id 85F37E4B;
+	Mon, 11 May 2015 11:07:49 +0200 (CEST)
+Received: from localhost (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id F1CFF3C20D;
+	Mon, 11 May 2015 11:07:48 +0200 (CEST)
+X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
+Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
+	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id wKYnujH8-HJ8; Mon, 11 May 2015 11:07:48 +0200 (CEST)
+Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPS id 960E33C18A;
+	Mon, 11 May 2015 11:07:48 +0200 (CEST)
+Received: from bifrost.das-netzwerkteam.de (bifrost.das-netzwerkteam.de
+ [178.62.101.154]) by mail.das-netzwerkteam.de (Horde Framework) with HTTP;
+ Mon, 11 May 2015 09:07:48 +0000
+Date: Mon, 11 May 2015 09:07:48 +0000
+Message-ID: <20150511090748.Horde.Edus-FOfuc519TjISGi1vQ2@mail.das-netzwerkteam.de>
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+To: "Francesco Poli (wintermute)" <invernomuto@paranoici.org>,
+ 784565@bugs.debian.org
+Cc: x2go-dev@lists.x2go.org, Nito Martinez <nito.martinez@qindel.com>,
+ opensource@gznianguan.com, dktrkranz@debian.org
+Subject: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are derived
+ from non-free code
+In-Reply-To: <20150506173532.7531.31389.reportbug@homebrew>
+User-Agent: Internet Messaging Program (IMP) H5 (6.2.2)
+Accept-Language: de,en
+Organization: DAS-NETZWERKTEAM
+X-Originating-IP: 178.62.101.154
+X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:32.0) Gecko/20100101
+ Firefox/32.0 Iceweasel/32.0
+Content-Type: multipart/signed; boundary="=_ALb-1vQm6P3YAYx12TU2SQ1";
+ protocol="application/pgp-signature"; micalg=pgp-sha1
+MIME-Version: 1.0
+
+This message is in MIME format and has been PGP signed.
+
+--=_ALb-1vQm6P3YAYx12TU2SQ1
+Content-Type: text/plain; charset=us-ascii; format=flowed; DelSp=Yes
+Content-Disposition: inline
+Content-Transfer-Encoding: quoted-printable
+
+Hi Francesco,
+Cc:ing a couple of people/groups being affected by the below.
+
+On  Mi 06 Mai 2015 19:35:32 CEST, Francesco Poli (wintermute) wrote:
+
+> Package: nx-libs-lite
+> Version: 3.5.0.27-1
+> Severity: serious
+> Justification: Policy 2.2.1
+>
+> Hello and thanks for maintaining this package in Debian!
+>
+> I noticed that the debian/copyright states:
+>
+> [...]
+> | Parts of this software are derived from DXPC project. These copyright
+> | notices apply to original DXPC code:
+> |
+> |    Redistribution and use in source and binary forms are permitted prov=
+ided
+> |    that the above copyright notice and this paragraph are duplicated in=
+ all
+> |    such forms.
+> |
+> |    THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLI=
+ED
+> |    WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+> |    MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+> |
+> |    Copyright (c) 1995,1996 Brian Pane
+> |    Copyright (c) 1996,1997 Zachary Vonler and Brian Pane
+> |    Copyright (c) 1999 Kevin Vigor and Brian Pane
+> |    Copyright (c) 2000,2001 Gian Filippo Pinzari and Brian Pane
+> [...]
+>
+> This license lacks the permission to modify the DXPC code.
+> Hence, the original DXPC code does not appear to comply with the
+> DFSG. And the nx-libs-lite is in part derived from DXPC code.
+>
+> This basically means that nx-libs-lite includes parts which are
+> non-free (as they are derived from non-modifiable code) and
+> are also possibly legally undistributable (as they are non-modifiable,
+> but actually modified). The combination with the rest of nx-libs-lite
+> (which is GPL-licensed) may also be legally undistributable (since
+> the license with no permission to modify is GPL-incompatible).
+>
+>
+> If there's anything I misunderstood, please clarify.
+>
+> Otherwise, please address this issue as soon as possible.
+> The copyright owners for the original DXPC code should be
+> contacted and persuaded to re-license under GPL-compatible
+> terms.
+>
+> Thanks for your time.
+> Bye.
+
+I/we will investigate this asap. Thanks for bringing this up.
+
+Greets,
+Mike
+--=20
+
+DAS-NETZWERKTEAM
+mike=20gabriel, herweg 7, 24357 fleckeby
+fon: +49 (1520) 1976 148
+
+GnuPG Key ID 0x25771B31
+mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
+
+freeBusy:
+https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x=
+fb
+
+--=_ALb-1vQm6P3YAYx12TU2SQ1
+Content-Type: application/pgp-signature
+Content-Description: Digitale PGP-Signatur
+Content-Disposition: inline
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJVUHFkAAoJEJr0azAldxsxbNYP/jqxwacIBSYlAhaZEf62JFtt
+ObBSEqUQfjljkolnzeaf2K4lBT6dl1x9VxGvIM5S8y9H/qpbFW+XWNHIR1BpdAsw
+TgKuqb6giM+28V9pMaHuqwPwMQ7YnFsfSKf/YCEs0AvJJKsf5jSUbeHAJ/RHwC4Z
+iGOj/KRqQ3tqIZJbzV2TCMNYnPm4sttcvKcRIOnBLDEVn1CRhlYX93v/pP87iPok
+wvvnbPpM+D2oq1JjS6mR2JbVHspc9/ZGq5I100Cdo5r3Y3upunNyG4IRCL0ttBzg
+nRjEiktViU/hhBB2xjYRaDsEpRFSsOeItLWss2PNYER2uIYuimvUsJzhtj7IwsV8
+4J8wlvn0uRZRiQwSWI/UaL1r1eqI4AlMA4hzDnWR7cBB4nTNE6YWzTpYYhsqNVfJ
+jURTKIwGzDVVcpU5UZZhEtPcD5utkd8eYn4fA68pvkje3OFpLjfQnFWUcjIn5ywb
+mejuW08cnsdfB0he+NTFXpK4p4wiu92pqul/EqPKW3Dm1w7FZXPHpIkN6VQ03LdY
+kSXOOpITg8cHESsHlvyKIZITaLDrNAPB4RHkRxyWhRpZWgEM35FasE6hIRTbszQ9
+jpuXcrG11L7HbITi599U8ZAo4qK9OgWfzJEsBdQKXBHEqCjiv4GvdXvgJyR2Eukp
+OIldtig78B5JgGKDLKjY
+=G+R6
+-----END PGP SIGNATURE-----
+
+--=_ALb-1vQm6P3YAYx12TU2SQ1--
+
+
+
+
+From X2Go-ML-1@baur-itcs.de Mon May 11 09:21:13 2015
+Received: (at 784565) by bugs.debian.org; 11 May 2015 09:21:13 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-9.4 required=4.0 tests=BAYES_00,DIGITS_LETTERS,
+	FOURLA,FVGT_m_MULTI_ODD,HAS_BUG_NUMBER,MONEY,PGPSIGNATURE,RCVD_IN_DNSWL_NONE,
+	RCVD_IN_MSPIKE_H2,STOCKLIKE autolearn=ham autolearn_force=no
+	version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 67; hammy, 149; neutral, 240; spammy,
+	1. spammytokens:0.997-1--jjng hammytokens:0.000-+--sk:iqecbae,
+	0.000-+--sk:iQEcBAE, 0.000-+--sha256, 0.000-+--SHA256, 0.000-+--H*UA:31.6.0
+Return-path: <X2Go-ML-1@baur-itcs.de>
+Received: from mout.kundenserver.de ([212.227.17.10])
+	by buxtehude.debian.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256)
+	(Exim 4.80)
+	(envelope-from <X2Go-ML-1@baur-itcs.de>)
+	id 1Yrjtg-0003AA-Jy
+	for 784565@bugs.debian.org; Mon, 11 May 2015 09:21:13 +0000
+Received: from [192.168.0.171] ([78.43.125.82]) by mrelayeu.kundenserver.de
+ (mreue102) with ESMTPSA (Nemesis) id 0MBke7-1Z2Qat2SRz-00AqUz; Mon, 11 May
+ 2015 11:20:48 +0200
+Message-ID: <5550746E.1040707@baur-itcs.de>
+Date: Mon, 11 May 2015 11:20:46 +0200
+From: Stefan Baur <X2Go-ML-1@baur-itcs.de>
+User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0
+MIME-Version: 1.0
+To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 
+ "Francesco Poli (wintermute)" <invernomuto@paranoici.org>,
+ 784565@bugs.debian.org
+CC: opensource@gznianguan.com, Nito Martinez <nito.martinez@qindel.com>, 
+ dktrkranz@debian.org, x2go-dev@lists.x2go.org
+Subject: Re: [X2Go-Dev] [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are
+ derived from non-free code
+References: <20150511090748.Horde.Edus-FOfuc519TjISGi1vQ2@mail.das-netzwerkteam.de>
+In-Reply-To: <20150511090748.Horde.Edus-FOfuc519TjISGi1vQ2@mail.das-netzwerkteam.de>
+Content-Type: text/plain; charset=windows-1252
+Content-Transfer-Encoding: 8bit
+X-Provags-ID:  V03:K0:1hGpzbQ6YusgDW3LQNBHFEMw92BwlVIDUv6GGAN1bbqSykY6aoQ
+ ekoiYjWtMWz72yWg8Xd5/k/PEjXU7VxzZNBzxoyEx46ughI6kPZG/kS6r+aMsjf3KVXNi4U
+ da367A2ZowOeet1s6/LouBbblzzvjx7LF9SFO2TW4oakOyxhNCWEhVpveTV9FQPnavxZzhL
+ D5GN1YjxQGdnacFHIIuSQ==
+X-UI-Out-Filterresults: notjunk:1;
+
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+hi everyone,
+
+looking at the current homepage of DXPC, the following can be found in
+their changelog http://www.vigor.nu/dxpc/CHANGES:
+
+
+3.8.1 Release:
+
+[...]
+
+Changed license to BSD license.
+
+- -Stefan
+
+Am 11.05.2015 um 11:07 schrieb Mike Gabriel:
+> Hi Francesco, Cc:ing a couple of people/groups being affected by
+> the below.
+> 
+> On  Mi 06 Mai 2015 19:35:32 CEST, Francesco Poli (wintermute)
+> wrote:
+> 
+>> Package: nx-libs-lite Version: 3.5.0.27-1 Severity: serious 
+>> Justification: Policy 2.2.1
+>> 
+>> Hello and thanks for maintaining this package in Debian!
+>> 
+>> I noticed that the debian/copyright states:
+>> 
+>> [...] | Parts of this software are derived from DXPC project.
+>> These copyright | notices apply to original DXPC code: | |
+>> Redistribution and use in source and binary forms are permitted 
+>> provided |    that the above copyright notice and this paragraph
+>> are duplicated in all |    such forms. | |    THIS SOFTWARE IS
+>> PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED |
+>> WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES
+>> OF |    MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. | |
+>> Copyright (c) 1995,1996 Brian Pane |    Copyright (c) 1996,1997
+>> Zachary Vonler and Brian Pane |    Copyright (c) 1999 Kevin Vigor
+>> and Brian Pane |    Copyright (c) 2000,2001 Gian Filippo Pinzari
+>> and Brian Pane [...]
+>> 
+>> This license lacks the permission to modify the DXPC code. Hence,
+>> the original DXPC code does not appear to comply with the DFSG.
+>> And the nx-libs-lite is in part derived from DXPC code.
+>> 
+>> This basically means that nx-libs-lite includes parts which are 
+>> non-free (as they are derived from non-modifiable code) and are
+>> also possibly legally undistributable (as they are
+>> non-modifiable, but actually modified). The combination with the
+>> rest of nx-libs-lite (which is GPL-licensed) may also be legally
+>> undistributable (since the license with no permission to modify
+>> is GPL-incompatible).
+>> 
+>> 
+>> If there's anything I misunderstood, please clarify.
+>> 
+>> Otherwise, please address this issue as soon as possible. The
+>> copyright owners for the original DXPC code should be contacted
+>> and persuaded to re-license under GPL-compatible terms.
+>> 
+>> Thanks for your time. Bye.
+> 
+> I/we will investigate this asap. Thanks for bringing this up.
+> 
+> Greets, Mike
+> 
+> 
+> _______________________________________________ x2go-dev mailing
+> list x2go-dev@lists.x2go.org 
+> http://lists.x2go.org/listinfo/x2go-dev
+> 
+
+
+- -- 
+BAUR-ITCS UG (haftungsbeschränkt)
+Geschäftsführer: Stefan Baur
+Eichenäckerweg 10, 89081 Ulm | Registergericht Ulm, HRB 724364
+Fon/Fax 0731 40 34 66-36/-35 | USt-IdNr.: DE268653243
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJVUHRuAAoJEG7d9BjNvlEZsCYH/i0GArfIg0xNQ91srhMtMxVf
+NcaQ5uOJLLZ+e0WOcRMm5Kprg9f6uKQNFRo1dv9NCFNxjrpdR/5/LMmeSYxafIQA
+beoYbnuMMRBvcjoUN5ScGD/jjng/9VCiwviBVjUc6AhDebGjVone2OtaIXPoMELI
+ClKnDShC41qQpSUgEESUYHiIIptkkmSrIJS6Ostsby5rhT1mApv7ulBqVvADUKCX
+OtNZmG+O6Bvur63G2fBTrdQwZAed0+Q6/XlhfOkf5QNG4I9fd5KlrMDpSmO8w7Cm
+h4rVnveLS5+0afZXs9sImhNW4I7Ah8zh5sAUFNCGXEuO60XRRysUO4i1WjRgnZw=
+=sgsA
+-----END PGP SIGNATURE-----
+
+
+
+From mike.gabriel@das-netzwerkteam.de Mon May 11 09:26:40 2015
+Received: (at 784565) by bugs.debian.org; 11 May 2015 09:26:40 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-11.9 required=4.0 tests=BAYES_00,FOURLA,
+	HAS_BUG_NUMBER,PGPSIGNATURE,T_RP_MATCHES_RCVD autolearn=ham
+	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 15; hammy, 150; neutral, 246; spammy,
+	0. spammytokens: hammytokens:0.000-+--H*c:pgp-signature,
+	0.000-+--H*c:protocol, 0.000-+--H*c:micalg, 0.000-+--H*c:signed,
+	0.000-+--H*RU:sk:grimnir
+Return-path: <mike.gabriel@das-netzwerkteam.de>
+Received: from freya.das-netzwerkteam.de ([88.198.48.199])
+	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
+	(Exim 4.80)
+	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
+	id 1Yrjyx-0003n8-Sv
+	for 784565@bugs.debian.org; Mon, 11 May 2015 09:26:40 +0000
+Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
+	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id B938DE53;
+	Mon, 11 May 2015 11:26:37 +0200 (CEST)
+Received: from localhost (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 564F73C20D;
+	Mon, 11 May 2015 11:26:37 +0200 (CEST)
+X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
+Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
+	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id zA86M1U+gj03; Mon, 11 May 2015 11:26:37 +0200 (CEST)
+Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPS id E81223BF5A;
+	Mon, 11 May 2015 11:26:36 +0200 (CEST)
+Received: from bifrost.das-netzwerkteam.de (bifrost.das-netzwerkteam.de
+ [178.62.101.154]) by mail.das-netzwerkteam.de (Horde Framework) with HTTP;
+ Mon, 11 May 2015 09:26:36 +0000
+Date: Mon, 11 May 2015 09:26:36 +0000
+Message-ID: <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+To: "Francesco Poli (wintermute)" <invernomuto@paranoici.org>,
+ 784565@bugs.debian.org
+Cc: x2go-dev@lists.x2go.org, nito.martinez@qindel.com,
+ opensource@gznianguan.com
+Subject: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are derived
+ from non-free code
+In-Reply-To: <20150506173532.7531.31389.reportbug@homebrew>
+User-Agent: Internet Messaging Program (IMP) H5 (6.2.2)
+Accept-Language: de,en
+Organization: DAS-NETZWERKTEAM
+X-Originating-IP: 178.62.101.154
+X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:32.0) Gecko/20100101
+ Firefox/32.0 Iceweasel/32.0
+Content-Type: multipart/signed; boundary="=_8dL5yJABYXdTfUqhzQkNVg1";
+ protocol="application/pgp-signature"; micalg=pgp-sha1
+MIME-Version: 1.0
+
+This message is in MIME format and has been PGP signed.
+
+--=_8dL5yJABYXdTfUqhzQkNVg1
+Content-Type: text/plain; charset=us-ascii; format=flowed; DelSp=Yes
+Content-Disposition: inline
+Content-Transfer-Encoding: quoted-printable
+
+Hi Francesco,
+
+On  Mi 06 Mai 2015 19:35:32 CEST, Francesco Poli (wintermute) wrote:
+
+> Package: nx-libs-lite
+> Version: 3.5.0.27-1
+> Severity: serious
+> Justification: Policy 2.2.1
+>
+> Hello and thanks for maintaining this package in Debian!
+>
+> I noticed that the debian/copyright states:
+>
+> [...]
+> | Parts of this software are derived from DXPC project. These copyright
+> | notices apply to original DXPC code:
+> |
+> |    Redistribution and use in source and binary forms are permitted prov=
+ided
+> |    that the above copyright notice and this paragraph are duplicated in=
+ all
+> |    such forms.
+> |
+> |    THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLI=
+ED
+> |    WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+> |    MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+> |
+> |    Copyright (c) 1995,1996 Brian Pane
+> |    Copyright (c) 1996,1997 Zachary Vonler and Brian Pane
+> |    Copyright (c) 1999 Kevin Vigor and Brian Pane
+> |    Copyright (c) 2000,2001 Gian Filippo Pinzari and Brian Pane
+> [...]
+>
+> This license lacks the permission to modify the DXPC code.
+> Hence, the original DXPC code does not appear to comply with the
+> DFSG. And the nx-libs-lite is in part derived from DXPC code.
+>
+> This basically means that nx-libs-lite includes parts which are
+> non-free (as they are derived from non-modifiable code) and
+> are also possibly legally undistributable (as they are non-modifiable,
+> but actually modified). The combination with the rest of nx-libs-lite
+> (which is GPL-licensed) may also be legally undistributable (since
+> the license with no permission to modify is GPL-incompatible).
+>
+>
+> If there's anything I misunderstood, please clarify.
+>
+> Otherwise, please address this issue as soon as possible.
+> The copyright owners for the original DXPC code should be
+> contacted and persuaded to re-license under GPL-compatible
+> terms.
+>
+> Thanks for your time.
+> Bye.
+
+Please follow-up with reading [1].
+
+As it seems, dxpc has been long ago relicensed to BSD-2-clause (for=20=20
+v3.8.1=20in/around 2002).
+
+I have no exact clue, if NoMachine forked prior to that (if they quote=20=
+=20
+the=20old licensing terms, then probably they did).
+
+However, how do you see the situation considering that upstream=20=20
+changed=20to BSD-2-clause a long time ago. What approach do you propose=20=
+=20
+for=20nx-libs-lite to get the issue fully fixed?
+
+Mike
+
+[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=3D142028
+
+--=20
+
+DAS-NETZWERKTEAM
+mike=20gabriel, herweg 7, 24357 fleckeby
+fon: +49 (1520) 1976 148
+
+GnuPG Key ID 0x25771B31
+mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
+
+freeBusy:
+https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x=
+fb
+
+--=_8dL5yJABYXdTfUqhzQkNVg1
+Content-Type: application/pgp-signature
+Content-Description: Digitale PGP-Signatur
+Content-Disposition: inline
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJVUHXMAAoJEJr0azAldxsxls4P/RyFv6ghemJhfrHNbAUEDmNz
+kyY2Q4Jt6pIDXX3U3yThYCeyG1nVAwKJI2B/q7q/YWWdzea8RzTTXrj3DubYplOZ
+PatD30FhlKdL+rsohmLFrA5dHVcwFbJA4GqrR2Y8y6NSLEtifYE4EDIDKLqvX6Dy
+msvHyLl+3AXg2gR4Wmu9lOLC8MrPA3A7nwlw/wCa6kwf3i6FUsAB2nzUsj3yUX1f
+4iXzcZhjGCJli9otPLlYFjPuc0HjwBgoOx5tEOL1hgVYP+yiQCw24LOKwHTnDogZ
+ONio1VdS+VPUbhVTlBfYD29lSDO8pgBGk43325b7Bmo56Ica+HCr8TznMVASidvJ
+dbAXZQOMuHxBofP9sm89q2lIXjPmJFWspG76OEM8dAIMKo87gQNuOTNPuOK0Zj8T
+Ua+40fIc5/C7CyRgGO8wqb6dYjD4Q6HxbjSQJrlxsHdjKIozv+MXGV+if/bKSXM8
+tIAh9JzcwgYtRVlVQXCmpk+yP9DntWFs5WeOEGBqKZw+was5OSXSlpjukNn9us2a
+bWj0E84zMlIu61KVZ8ot14OMIzgUxzymIt/LzWHKiiSezb20S22LJGBaKLxbqplp
+9Gi8g9rEhjn5Pgpt9B3MlIWQTKhpAa71GCD9Okt9vhPsBiKE57fSjCYgQR83lhDy
+kbLoUbByjixBA+TXUYM8
+=NW/2
+-----END PGP SIGNATURE-----
+
+--=_8dL5yJABYXdTfUqhzQkNVg1--
+
+
+
+
+From invernomuto@paranoici.org Mon May 11 19:37:54 2015
+Received: (at 784565) by bugs.debian.org; 11 May 2015 19:37:54 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-11.5 required=4.0 tests=BAYES_00,DKIM_SIGNED,
+	DKIM_VALID,DKIM_VALID_AU,FOURLA,HAS_BUG_NUMBER,MDO_CABLE_TV3,PGPSIGNATURE,
+	SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no
+	version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 9; hammy, 150; neutral, 119; spammy,
+	0. spammytokens: hammytokens:0.000-+--H*UA:sk:x86_64-,
+	0.000-+--H*x:sk:x86_64-, 0.000-+--H*c:PGP-SHA256, 0.000-+--H*c:SignHturH,
+	0.000-+--H*c:pgp-signature
+Return-path: <invernomuto@paranoici.org>
+Received: from perdizione.investici.org ([94.23.50.208])
+	by buxtehude.debian.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256)
+	(Exim 4.80)
+	(envelope-from <invernomuto@paranoici.org>)
+	id 1YrtWT-0004t9-Ty
+	for 784565@bugs.debian.org; Mon, 11 May 2015 19:37:54 +0000
+Received: from [94.23.50.208] (perdizione [94.23.50.208]) (Authenticated sender: invernomuto@paranoici.org) by localhost (Postfix) with ESMTPSA id 9C4DF120408;
+	Mon, 11 May 2015 19:37:46 +0000 (UTC)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paranoici.org;
+	s=stigmate; t=1431373066;
+	bh=vGWv2ZFJgWpWShHOYFcPN0r6i8IFunsxG5IJHqxpdbk=;
+	h=Date:From:To:Cc:Subject:In-Reply-To:References;
+	b=JQRMmMDPSZFkJ21FEn1TdsCco0YtUFBII0CsMLxdl3mxM5SzGN9flVttwlZ+5RrgR
+	 a7/u/VUVPzv0ZcdVKwrC+Nq6imwd5hzUj80C+e6KLZQoovz6shmhuIdKtga2OIl7lm
+	 cF0ONDqjdq0pI158Ws5hz0MiwJkzF6V5VbIEk3SY=
+Received: from frx by homebrew with local (Exim 4.85)
+	(envelope-from <invernomuto@paranoici.org>)
+	id 1YrtVj-0001Cl-NV; Mon, 11 May 2015 21:37:07 +0200
+Date: Mon, 11 May 2015 21:36:59 +0200
+From: Francesco Poli <invernomuto@paranoici.org>
+To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Cc: 784565@bugs.debian.org, x2go-dev@lists.x2go.org,
+ nito.martinez@qindel.com, opensource@gznianguan.com
+Subject: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are derived
+ from non-free code
+Message-Id: <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
+In-Reply-To: <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
+References: <20150506173532.7531.31389.reportbug@homebrew>
+	<20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
+X-Mailer: Sylpheed 3.5.0beta1 (GTK+ 2.24.25; x86_64-pc-linux-gnu)
+Mime-Version: 1.0
+Content-Type: multipart/signed; protocol="application/pgp-signature";
+ micalg="PGP-SHA256";
+ boundary="Signature=_Mon__11_May_2015_21_36_59_+0200_DweA9EbdD2ISBmUH"
+
+--Signature=_Mon__11_May_2015_21_36_59_+0200_DweA9EbdD2ISBmUH
+Content-Type: text/plain; charset=US-ASCII
+Content-Disposition: inline
+Content-Transfer-Encoding: quoted-printable
+
+On Mon, 11 May 2015 09:26:36 +0000 Mike Gabriel wrote:
+
+[...]
+> As it seems, dxpc has been long ago relicensed to BSD-2-clause (for =20
+> v3.8.1 in/around 2002).
+
+This is great news, indeed!
+
+>=20
+> I have no exact clue, if NoMachine forked prior to that (if they quote =20
+> the old licensing terms, then probably they did).
+
+Yep, it's plausible...
+
+>=20
+> However, how do you see the situation considering that upstream =20
+> changed to BSD-2-clause a long time ago. What approach do you propose =20
+> for nx-libs-lite to get the issue fully fixed?
+
+If the fork has been performed before the DXPC re-licensing (as it's
+likely), I see two possible strategies:
+
+ (A) someone gets in touch with DXPC copyright owners and asks them
+whether the re-licensing may be considered retroactive (applicable to
+older versions of DXPC); in case the answer is negative, DXPC copyright
+owners should be persuaded to make the re-licensing retroactive
+
+ (B) nx-libs-lite upstream developers re-fork from scratch, basing the
+new code on a BSD-licensed version of DXPC (I suspect this may turn out
+to be somewhat painful...)
+
+
+Obviously, the optimal solution is (A). I hope it may work...
+
+Thanks for your time and for your prompt and kind replies.
+
+
+--=20
+ http://www.inventati.org/frx/
+ There's not a second to spare! To the laboratory!
+..................................................... Francesco Poli .
+ GnuPG key fpr =3D=3D CA01 1147 9CD2 EFDF FB82  3925 3E1C 27E1 1F69 BFFE
+
+--Signature=_Mon__11_May_2015_21_36_59_+0200_DweA9EbdD2ISBmUH
+Content-Type: application/pgp-signature
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVUQTgAAoJED4cJ+Efab/+Mx4QAMLmPwqnPYyI0Bl6sZgxP3nA
+Yfrf7m2+swTrNz3M2xNepx1KoylRNlz2DiCuG7QWABNupSK60ACtIuAvWIAPSYNt
+wlHDRGiVrpCKBKzB4N3zjB0MN1VELhdWqrap8Yw5nnwohJ2jXoAUaqorwEba6YBg
+VK1BsGvlqcwSYt8eWt+ugpaRR43DbZTCpAvBn3t9DdYe8LwtlJDTCatbJfovlTJ9
+P19TNbwxiEoj8uWbmpOO/kLvvMed0avTEsvgAROQKF/dnWCnB1dh5QGd06IHdAY7
+KfnoZc4HUM8BB/ylWsaV13Cd8UA/2B2FKp3xbab3ry8gWeMe6dnk/pFa+pv6TGeT
+I+6VxWOMT/hc4AwBOl+R7yqp2AkcNO+KP2o5i04+yENcbgrGxyCQU2aVsHkJsVYi
+N5myXypSZY3tF6TnAm/UYP2GgiMCo0FXptwVoLiGSJkBw0tn13I25pYSqjYZlq4q
+4RQYuTEHEkV16tCdEdy+DSuI0GsABYUkY3a3A3TLj9LjiPPEDwLOxHjZlLbeyXP+
+xtmC3d82YvMmLXUiqItuhiBYjCRFq8piGGCDRX7wp1B+t6xHUcR8UV5O4s554iMX
++r2m1mLzM285PoKwP/Smd6BXU5RfhT4svmxvaMSSvADNo8X4ddNd2Hiq/Gib2ftH
+mYKFpBE7IMwQqfrOpAW5
+=Bt09
+-----END PGP SIGNATURE-----
+
+--Signature=_Mon__11_May_2015_21_36_59_+0200_DweA9EbdD2ISBmUH--
+
+
+
+From mike.gabriel@das-netzwerkteam.de Tue May 12 03:59:27 2015
+Received: (at 784565) by bugs.debian.org; 12 May 2015 03:59:27 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-11.4 required=4.0 tests=BAYES_00,FOURLA,
+	HAS_BUG_NUMBER,MDO_CABLE_TV3,PGPSIGNATURE,T_RP_MATCHES_RCVD autolearn=ham
+	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 21; hammy, 150; neutral, 206; spammy,
+	0. spammytokens: hammytokens:0.000-+--H*c:pgp-signature,
+	0.000-+--H*c:protocol, 0.000-+--H*c:micalg, 0.000-+--H*c:signed,
+	0.000-+--H*RU:sk:grimnir
+Return-path: <mike.gabriel@das-netzwerkteam.de>
+Received: from freya.das-netzwerkteam.de ([88.198.48.199])
+	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
+	(Exim 4.80)
+	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
+	id 1Ys1Lq-0000j4-Sf
+	for 784565@bugs.debian.org; Tue, 12 May 2015 03:59:27 +0000
+Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
+	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id B4F9BAA3;
+	Tue, 12 May 2015 05:59:21 +0200 (CEST)
+Received: from localhost (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 299233C21D;
+	Tue, 12 May 2015 05:59:21 +0200 (CEST)
+X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
+Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
+	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id G2j6l6YtFs0q; Tue, 12 May 2015 05:59:21 +0200 (CEST)
+Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPS id C67023BF5A;
+	Tue, 12 May 2015 05:59:20 +0200 (CEST)
+Received: from p5B3B925B.dip0.t-ipconnect.de (p5B3B925B.dip0.t-ipconnect.de
+ [91.59.146.91]) by mail.das-netzwerkteam.de (Horde Framework) with HTTP;
+ Tue, 12 May 2015 03:59:20 +0000
+Date: Tue, 12 May 2015 03:59:20 +0000
+Message-ID: <20150512035920.Horde.JnI2DWx-AAFvzpbQFqakJw3@mail.das-netzwerkteam.de>
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+To: Francesco Poli <invernomuto@paranoici.org>
+Cc: 784565@bugs.debian.org, x2go-dev@lists.x2go.org,
+ nito.martinez@qindel.com, opensource@gznianguan.com
+Subject: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are derived
+ from non-free code
+References: <20150506173532.7531.31389.reportbug@homebrew>
+ <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
+ <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
+In-Reply-To: <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
+User-Agent: Internet Messaging Program (IMP) H5 (6.2.2)
+Accept-Language: de,en
+Organization: DAS-NETZWERKTEAM
+X-Originating-IP: 91.59.146.91
+X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:32.0) Gecko/20100101
+ Firefox/32.0 Iceweasel/32.0
+Content-Type: multipart/signed; boundary="=_kYZkQgyfaSLUTLVIkzgq8w1";
+ protocol="application/pgp-signature"; micalg=pgp-sha1
+MIME-Version: 1.0
+
+This message is in MIME format and has been PGP signed.
+
+--=_kYZkQgyfaSLUTLVIkzgq8w1
+Content-Type: text/plain; charset=us-ascii; format=flowed; DelSp=Yes
+Content-Disposition: inline
+Content-Transfer-Encoding: quoted-printable
+
+Hi Francesco,
+
+On  Mo 11 Mai 2015 21:36:59 CEST, Francesco Poli wrote:
+
+> On Mon, 11 May 2015 09:26:36 +0000 Mike Gabriel wrote:
+>
+> [...]
+>> As it seems, dxpc has been long ago relicensed to BSD-2-clause (for
+>> v3.8.1 in/around 2002).
+>
+> This is great news, indeed!
+>
+>>
+>> I have no exact clue, if NoMachine forked prior to that (if they quote
+>> the old licensing terms, then probably they did).
+>
+> Yep, it's plausible...
+>
+>>
+>> However, how do you see the situation considering that upstream
+>> changed to BSD-2-clause a long time ago. What approach do you propose
+>> for nx-libs-lite to get the issue fully fixed?
+>
+> If the fork has been performed before the DXPC re-licensing (as it's
+> likely), I see two possible strategies:
+>
+>  (A) someone gets in touch with DXPC copyright owners and asks them
+> whether the re-licensing may be considered retroactive (applicable to
+> older versions of DXPC); in case the answer is negative, DXPC copyright
+> owners should be persuaded to make the re-licensing retroactive
+
+This is the way to go, I will pull in Kevin Vigor (the upstream author=20=
+=20
+of=20DXPC) into this thread with my next email.
+
+>  (B) nx-libs-lite upstream developers re-fork from scratch, basing the
+> new code on a BSD-licensed version of DXPC (I suspect this may turn out
+> to be somewhat painful...)
+
+Yeah, indeed painful.
+
+> Obviously, the optimal solution is (A). I hope it may work...
+>
+> Thanks for your time and for your prompt and kind replies.
+
+Also, Michael DePaulo, one of the upstream NX maintainers noted that=20=20
+DXPC=20simply used a previous version of the BSD license, see [1]. The=20=
+=20
+weakness=20of that ancient license template is that modification is not=20=
+=20
+explictily=20allowed, but neither forbidden.
+
+I think, regarding the historical usage of the BSD license predecessor=20=
+=20
+and=20the switch to BSD-2-clause should be fine already (I am not a=20=20
+lawyer,=20though). I will contact DXPC upstream nonetheless and ask for=20=
+=20
+a=20statement.
+
+Greets,
+Mike
+
+[1] http://en.wikipedia.org/wiki/BSD_licenses#Previous_license
+
+--=20
+
+DAS-NETZWERKTEAM
+mike=20gabriel, herweg 7, 24357 fleckeby
+fon: +49 (1520) 1976 148
+
+GnuPG Key ID 0x25771B31
+mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
+
+freeBusy:
+https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x=
+fb
+
+--=_kYZkQgyfaSLUTLVIkzgq8w1
+Content-Type: application/pgp-signature
+Content-Description: Digitale PGP-Signatur
+Content-Disposition: inline
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIbBAABAgAGBQJVUXqYAAoJEJr0azAldxsxYVAP+Pg4A2zg6TEs+vk/mknbLwV2
+dOv/tQiarKfb6JJRcm1j6rzGBhGzO4iwj/Uk8wmbFvIJgxs6mM93kfOPa0lJYM1N
+D0YcKPPsHqgxcyVW8pIyawhnW5IsIDSaugjsandx1hbfl+J5SBCAtSovhz5F+Fkf
+fs1wvgYcGKtWGNTxV5Qy48EnzSzAVz2r4GKBYUdRiCNpXtl/M8jJFIfm/cmJ7PJq
+ycY8Diu6x3mVvPdvap/0pOOY0uqg256XX7dcFJUtTNZoai4oGOuwR1o4g9jztyd/
+4JJ2E1MigAjGSYPpTnQGhORA86yDLQrk/NlLG/2/J8meG7Nsky6xmf3zBhuG/0G0
+3TZYQcoFrFS3EWQs0uKiGKGylchODCfXHZgF0y5NT5iqr4DMT51AlUeQl3MWhxf8
+j8OMjK86jsPMrSjL0l4uYbs+znMdlVpgjBSYsKoXg3tIc3WJpj77qyPUbfwO8hys
+5Q2j4lDaGV5NAnSmZ//p9lPwRu8oAMwSkrMkRTaJwLVhcmDzgoujZEpEPj64lIEy
+HD3p/5dSJF+RsYT6286JkWAZm+XvXeFpEqGZ7xAVsrYSY1qFm3g0se1oHxxcVWyN
+PEsQBOt8WXgYmtz7RLaBDbBQVMmeRMxbPCkC1xCHCU+Vq3y9dW/3TyOW4Oz1YoZR
+3YATO+YehUKVdM5teyg=
+=884K
+-----END PGP SIGNATURE-----
+
+--=_kYZkQgyfaSLUTLVIkzgq8w1--
+
+
+
+
+From mike.gabriel@das-netzwerkteam.de Tue May 12 04:46:43 2015
+Received: (at 784565) by bugs.debian.org; 12 May 2015 04:46:44 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-11.4 required=4.0 tests=BAYES_00,FOURLA,
+	HAS_BUG_NUMBER,MDO_CABLE_TV3,PGPSIGNATURE,T_RP_MATCHES_RCVD autolearn=ham
+	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 27; hammy, 149; neutral, 375; spammy,
+	1. spammytokens:0.998-1--arctica hammytokens:0.000-+--IIRC,
+	0.000-+--H*c:pgp-signature, 0.000-+--H*c:protocol, 0.000-+--H*c:micalg,
+	0.000-+--H*c:signed
+Return-path: <mike.gabriel@das-netzwerkteam.de>
+Received: from freya.das-netzwerkteam.de ([88.198.48.199])
+	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
+	(Exim 4.80)
+	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
+	id 1Ys25b-0004lf-4r
+	for 784565@bugs.debian.org; Tue, 12 May 2015 04:46:43 +0000
+Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
+	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id 6AB7617F5;
+	Tue, 12 May 2015 06:46:40 +0200 (CEST)
+Received: from localhost (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 71D923BC0D;
+	Tue, 12 May 2015 06:46:38 +0200 (CEST)
+X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
+Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
+	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id TYvbPGLabTH7; Tue, 12 May 2015 06:46:38 +0200 (CEST)
+Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPS id 0669F3BA08;
+	Tue, 12 May 2015 06:46:38 +0200 (CEST)
+Received: from p5B3B925B.dip0.t-ipconnect.de (p5B3B925B.dip0.t-ipconnect.de
+ [91.59.146.91]) by mail.das-netzwerkteam.de (Horde Framework) with HTTP;
+ Tue, 12 May 2015 04:46:37 +0000
+Date: Tue, 12 May 2015 04:46:37 +0000
+Message-ID: <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+To: Kevin Vigor <kevin@vigor.nu>
+Cc: 784565@bugs.debian.org, x2go-dev@lists.x2go.org,
+ nito.martinez@qindel.com, opensource@gznianguan.com, Francesco Poli
+ <invernomuto@paranoici.org>
+Subject: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are derived
+ from non-free code
+References: <20150506173532.7531.31389.reportbug@homebrew>
+ <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
+ <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
+In-Reply-To: <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
+User-Agent: Internet Messaging Program (IMP) H5 (6.2.2)
+Accept-Language: de,en
+Organization: DAS-NETZWERKTEAM
+X-Originating-IP: 91.59.146.91
+X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:32.0) Gecko/20100101
+ Firefox/32.0 Iceweasel/32.0
+Content-Type: multipart/signed; boundary="=_9zX_XixEpAdR4NT64zJguA1";
+ protocol="application/pgp-signature"; micalg=pgp-sha1
+MIME-Version: 1.0
+
+This message is in MIME format and has been PGP signed.
+
+--=_9zX_XixEpAdR4NT64zJguA1
+Content-Type: text/plain; charset=us-ascii; format=flowed; DelSp=Yes
+Content-Disposition: inline
+Content-Transfer-Encoding: quoted-printable
+
+Dear Kevin,
+
+(I Cc: several people involved in this, also the X2Go development=20=20
+mailing=20list...)
+
+[If you feel unconfortable with discussing the details / the impact of=20=
+=20
+the=20below in public, feel free to answer to me directly first with=20=20
+questions=20and concerns, before answering to all people who are listed=20=
+=20
+in=20Cc:.]
+
+Someone from the Debian legal team recently brought up a license issue=20=
+=20
+discovered=20in nx-libs 3.x series.
+
+TL;DR; Suggested by Francesco Poli from the Debian legal team: """
+(A) someone gets in touch with DXPC copyright owners and asks them
+whether the re-licensing [in 2002] may be considered retroactive=20=20
+(applicable=20to
+older versions of DXPC); in case the answer is negative, DXPC copyright
+owners should be persuaded to make the re-licensing retroactive
+"""
+
+The person contacting you about the above question is me. Mike=20=20
+Gabriel,=20Debian Developer and one of the current upstream maintainers=20=
+=20
+of=20nx-libs 3.x (previously also know as  "NX redistributed" for X2Go)=20=
+=20
+[1].
+
+This=20issue requires some time of reading from you and (hopefully) a=20=20
+public=20statement, that the original DXPC code can be considered as=20=20
+BSD-2-clause=20(the current license) also for released versions prior=20=20
+2002=20when the ancient BSD license template [2] was still shipped with=20=
+=20
+DXPC.
+
+For=20a complete follow-up, please check Debian bug #784565 [3].
+
+We are aware that NoMachine forked DXPC at some early stage around the=20=
+=20
+year=202000 and wrote their own commercial product around it. Obviously,=20=
+=20
+this=20fork happened before 2002 (i.e., before DXPC release 3.8.1), as=20=
+=20
+libxcomp3=20in NoMachine's NX ships the previously used BSD license=20=20
+template.=20I am not sure, if that fork was easy for you or actually a=20=
+=20
+nuisance.=20I may only guess at this point. I'd be happy to know more=20=20
+(maybe=20not in this mail thread, though).
+
+NoMachine has stopped publishing NXv3 updates a couple of years ago=20=20
+(2011=20IIRC), now. The maintenance has been moved into the hands of the=20=
+=20
+currently=20available FLOSS projects "X2Go", "Arctica Project" [NEW] and=20=
+=20
+"TheQVD".=20Some of us are running a business model on top of that=20=20
+(consultancy,=20support contracts, feature development contracts), some=20=
+=20
+of=20us spend a lot of their free time on improving / maintaining=20=20
+nx-libs=20(as we call NoMachine's NXv3 at the moment).
+
+To outline the impact of my mail clearly: If you say that it was not=20=20
+legal=20by NoMachine to fork DXPC at the given time (before 2002), then=20=
+=20
+all=20FLOSS remote desktop / remote application would be in real=20=20
+trouble,=20because then the core component of their software projects=20=20
+could=20not be considered as free (as in DFSG, Debian free software=20=20
+guidelines[4])=20anymore. Also the code changes originally performed by=20=
+=20
+NoMachine=20might have been illegal in the first place. All current=20=20
+maintenance=20activities and also planned future development on nx-libs=20=
+=20
+would=20become questionable.
+
+Thus, I hope you can chime in on this: Dear developers of nx-libs,=20=20
+please=20assume the BSD-2-license as retroactive and applicable to DXPC=20=
+=20
+version=20earlier than 3.8.1. As the copyright holder, I agree with=20=20
+modifications=20of code bases that originate before the change to=20=20
+BSD-2-clause=20license got introduced in 3.8.1 of DXPC.
+
+And... I will bring up that question later (but it is burning under my=20=
+=20
+nails)...=20Be sure: The nx-libs maintainers would be happy to have the=20=
+=20
+original=20DXPC author on the nx-libs developer team. But I will bring=20=
+=20
+up=20that question later (when this very issue is settled). ;-)
+
+Greets,
+Mike
+
+[1] https://github.com/ArcticaProject/nx-libs
+[2] http://en.wikipedia.org/wiki/BSD_licenses#Previous_license
+[3] http://bugs.debian.org/784565
+[4] http://de.wikipedia.org/wiki/Debian_Free_Software_Guidelines
+
+On  Mo 11 Mai 2015 21:36:59 CEST, Francesco Poli wrote:
+
+> On Mon, 11 May 2015 09:26:36 +0000 Mike Gabriel wrote:
+>
+> [...]
+>> As it seems, dxpc has been long ago relicensed to BSD-2-clause (for
+>> v3.8.1 in/around 2002).
+>
+> This is great news, indeed!
+>
+>>
+>> I have no exact clue, if NoMachine forked prior to that (if they quote
+>> the old licensing terms, then probably they did).
+>
+> Yep, it's plausible...
+>
+>>
+>> However, how do you see the situation considering that upstream
+>> changed to BSD-2-clause a long time ago. What approach do you propose
+>> for nx-libs-lite to get the issue fully fixed?
+>
+> If the fork has been performed before the DXPC re-licensing (as it's
+> likely), I see two possible strategies:
+>
+>  (A) someone gets in touch with DXPC copyright owners and asks them
+> whether the re-licensing may be considered retroactive (applicable to
+> older versions of DXPC); in case the answer is negative, DXPC copyright
+> owners should be persuaded to make the re-licensing retroactive
+>
+>  (B) nx-libs-lite upstream developers re-fork from scratch, basing the
+> new code on a BSD-licensed version of DXPC (I suspect this may turn out
+> to be somewhat painful...)
+>
+>
+> Obviously, the optimal solution is (A). I hope it may work...
+>
+> Thanks for your time and for your prompt and kind replies.
+
+
+--=20
+
+DAS-NETZWERKTEAM
+mike=20gabriel, herweg 7, 24357 fleckeby
+fon: +49 (1520) 1976 148
+
+GnuPG Key ID 0x25771B31
+mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
+
+freeBusy:
+https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x=
+fb
+
+--=_9zX_XixEpAdR4NT64zJguA1
+Content-Type: application/pgp-signature
+Content-Description: Digitale PGP-Signatur
+Content-Disposition: inline
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJVUYWtAAoJEJr0azAldxsxEMcP/0mjNHW4k/IiNjSbrm1j7pIQ
+k6yVqJ8cMW/71H0/VLuzS6roL02JAXMzToMzAcbPGqeV5rjhLDJNjcOuuADhb8HI
+Izisai5ABzHiclnITalVTsF4i5+MsTXI+6eNez9sv3Es8pwFuLkvAlqKsheO33mP
+dz83ZqDmCGKcCCbZmhbhGHdhScS8GMSyU7cBm6xu0TMh8rOtcECBG/+wfohVeR2I
+vy0GeYR0ZF0yIxcBGXYvjiocStjsxaqnD9QCt8JAfewVO3jY/Ye6DIEI92moS/Nz
+6iTA9GspZyYNqL7QsOraG2HF6TmIfK5xBaUjDrLH+HfKm2K6Dxp0wo6Y6VDY9mIi
+svCFCoIQ3RBihcsOp7k1v1eZl+WJJ2XXilQr3SrtlOiZAK0/FtbkUwhk4DLu5o3R
+CBHwy6F14szo8F4ChFGqqbOlODGJOiCONfOShRZQLgAgHciRirrgTKF4b25cspNU
+v7ag47K4WN3YNtkA5DO5Bj2NKAP8oWyvlTpO0uIuUZo/pj+7sHnWG8QSDJiyunVt
+3VxMLM4h3C02k+EtR2uvtKKqVFf+JgiwRGDhFx2ldUwWFg0+3IeWKuuTxRt6NcR+
+ZdDN2tR0PWpe4v+jsUqSD3YJNRoK1oyj9kMYriTkHTvhr/XcKr5KYNsWMC6nvqps
+JDhKCpypB1iR9N13NpeX
+=HDe/
+-----END PGP SIGNATURE-----
+
+--=_9zX_XixEpAdR4NT64zJguA1--
+
+
+
+
+From kevin@vigor.nu Tue May 12 15:07:38 2015
+Received: (at 784565) by bugs.debian.org; 12 May 2015 15:07:38 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-6.4 required=4.0 tests=BAYES_00,FOURLA,
+	HAS_BUG_NUMBER,MDO_CABLE_TV3,SPF_PASS autolearn=ham autolearn_force=no
+	version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 34; hammy, 150; neutral, 395; spammy,
+	0. spammytokens: hammytokens:0.000-+--IIRC, 0.000-+--H*f:sk:2015050,
+	0.000-+--H*UA:31.0, 0.000-+--H*u:31.0, 0.000-+--H*u:x86_64
+Return-path: <kevin@vigor.nu>
+Received: from gateway30.websitewelcome.com ([192.185.184.48])
+	by buxtehude.debian.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256)
+	(Exim 4.80)
+	(envelope-from <kevin@vigor.nu>)
+	id 1YsBmT-0007o6-Qg
+	for 784565@bugs.debian.org; Tue, 12 May 2015 15:07:38 +0000
+Received: by gateway30.websitewelcome.com (Postfix, from userid 500)
+	id 69AEB573DA20; Tue, 12 May 2015 09:55:02 -0500 (CDT)
+Received: from gator4058.hostgator.com (gator4058.hostgator.com [192.185.4.69])
+	by gateway30.websitewelcome.com (Postfix) with ESMTP id 677E2573DA04
+	for <784565@bugs.debian.org>; Tue, 12 May 2015 09:55:02 -0500 (CDT)
+Received: from [63.158.132.10] (port=46206 helo=[10.50.3.84])
+	by gator4058.hostgator.com with esmtpsa (UNKNOWN:DHE-RSA-AES128-SHA:128)
+	(Exim 4.82)
+	(envelope-from <kevin@vigor.nu>)
+	id 1YsBaH-0003xr-Ii; Tue, 12 May 2015 09:55:01 -0500
+Message-ID: <55521444.9090407@vigor.nu>
+Date: Tue, 12 May 2015 08:55:00 -0600
+From: Kevin Vigor <kevin@vigor.nu>
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0
+MIME-Version: 1.0
+To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+CC: 784565@bugs.debian.org, x2go-dev@lists.x2go.org, 
+ nito.martinez@qindel.com, opensource@gznianguan.com, 
+ Francesco Poli <invernomuto@paranoici.org>
+Subject: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are derived
+ from non-free code
+References: <20150506173532.7531.31389.reportbug@homebrew> <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de> <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org> <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
+In-Reply-To: <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
+Content-Type: text/plain; charset=windows-1252; format=flowed
+Content-Transfer-Encoding: 7bit
+X-AntiAbuse: This header was added to track abuse, please include it with any abuse report
+X-AntiAbuse: Primary Hostname - gator4058.hostgator.com
+X-AntiAbuse: Original Domain - bugs.debian.org
+X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12]
+X-AntiAbuse: Sender Address Domain - vigor.nu
+X-BWhitelist: no
+X-Source-IP: 63.158.132.10
+X-Exim-ID: 1YsBaH-0003xr-Ii
+X-Source: 
+X-Source-Args: 
+X-Source-Dir: 
+X-Source-Sender: ([10.50.3.84]) [63.158.132.10]:46206
+X-Source-Auth: kevin@vigor.nu
+X-Email-Count: 2
+X-Source-Cap: a3ZpZ29yO2t2aWdvcjtnYXRvcjQwNTguaG9zdGdhdG9yLmNvbQ==
+X-Greylist: delayed 379 seconds by postgrey-1.34 at buxtehude; Tue, 12 May 2015 15:07:37 UTC
+
+Hi Mike, et al,
+
+    I am not the original author of dxpc, that being Brian Pane. However, I took over maintenance circa 1999 and am still the primary maintainer (though the project has effectively been dead for most of a decade now).
+
+    As you are aware, when I inherited the code, it was licensed under a variant of the BSD license that did not include the 'with modification' clause. To the best of my recollection, somebody from the FSF contacted me circa 2001 regarding this and as a result, subsequent releases were done under a standard 2-clause BSD license with the modification clause. Again, to the best of my recollection, I contacted Brian about this change and he offered no objection.
+
+    Further, I recall distinctly that NoMachine contacted me and explicitly asked permission before including DXPC code in NX, which I happily granted with no new conditions beyond the BSD license already in play.
+
+    It is possible, though by no means certain, that I could dig up ancient email to corroborate this account if necessary. However, I am more than willing to publicly state that I believe NoMachine's use of DXPC code to be both legal and ethical, and that my intent when changing the license to 2-clause BSD was simply to clarity the existing intent and that it ought therefore be considered retroactive.
+
+    Yours,
+       Kevin Vigor
+
+On 05/11/15 22:46, Mike Gabriel wrote:
+> Dear Kevin,
+>
+> (I Cc: several people involved in this, also the X2Go development mailing list...)
+>
+> [If you feel unconfortable with discussing the details / the impact of the below in public, feel free to answer to me directly first with questions and concerns, before answering to all people who are listed in Cc:.]
+>
+> Someone from the Debian legal team recently brought up a license issue discovered in nx-libs 3.x series.
+>
+> TL;DR; Suggested by Francesco Poli from the Debian legal team: """
+> (A) someone gets in touch with DXPC copyright owners and asks them
+> whether the re-licensing [in 2002] may be considered retroactive (applicable to
+> older versions of DXPC); in case the answer is negative, DXPC copyright
+> owners should be persuaded to make the re-licensing retroactive
+> """
+>
+> The person contacting you about the above question is me. Mike Gabriel, Debian Developer and one of the current upstream maintainers of nx-libs 3.x (previously also know as  "NX redistributed" for X2Go) [1].
+>
+> This issue requires some time of reading from you and (hopefully) a public statement, that the original DXPC code can be considered as BSD-2-clause (the current license) also for released versions prior 2002 when the ancient BSD license template [2] was still shipped with DXPC.
+>
+> For a complete follow-up, please check Debian bug #784565 [3].
+>
+> We are aware that NoMachine forked DXPC at some early stage around the year 2000 and wrote their own commercial product around it. Obviously, this fork happened before 2002 (i.e., before DXPC release 3.8.1), as libxcomp3 in NoMachine's NX ships the previously used BSD license template. I am not sure, if that fork was easy for you or actually a nuisance. I may only guess at this point. I'd be happy to know more (maybe not in this mail thread, though).
+>
+> NoMachine has stopped publishing NXv3 updates a couple of years ago (2011 IIRC), now. The maintenance has been moved into the hands of the currently available FLOSS projects "X2Go", "Arctica Project" [NEW] and "TheQVD". Some of us are running a business model on top of that (consultancy, support contracts, feature development contracts), some of us spend a lot of their free time on improving / maintaining nx-libs (as we call NoMachine's NXv3 at the moment).
+>
+> To outline the impact of my mail clearly: If you say that it was not legal by NoMachine to fork DXPC at the given time (before 2002), then all FLOSS remote desktop / remote application would be in real trouble, because then the core component of their software projects could not be considered as free (as in DFSG, Debian free software guidelines[4]) anymore. Also the code changes originally performed by NoMachine might have been illegal in the first place. All current maintenance activities and also planned future development on nx-libs would become questionable.
+>
+> Thus, I hope you can chime in on this: Dear developers of nx-libs, please assume the BSD-2-license as retroactive and applicable to DXPC version earlier than 3.8.1. As the copyright holder, I agree with modifications of code bases that originate before the change to BSD-2-clause license got introduced in 3.8.1 of DXPC.
+>
+> And... I will bring up that question later (but it is burning under my nails)... Be sure: The nx-libs maintainers would be happy to have the original DXPC author on the nx-libs developer team. But I will bring up that question later (when this very issue is settled). ;-)
+>
+> Greets,
+> Mike
+>
+> [1] https://github.com/ArcticaProject/nx-libs
+> [2] http://en.wikipedia.org/wiki/BSD_licenses#Previous_license
+> [3] http://bugs.debian.org/784565
+> [4] http://de.wikipedia.org/wiki/Debian_Free_Software_Guidelines
+>
+> On  Mo 11 Mai 2015 21:36:59 CEST, Francesco Poli wrote:
+>
+>> On Mon, 11 May 2015 09:26:36 +0000 Mike Gabriel wrote:
+>>
+>> [...]
+>>> As it seems, dxpc has been long ago relicensed to BSD-2-clause (for
+>>> v3.8.1 in/around 2002).
+>>
+>> This is great news, indeed!
+>>
+>>>
+>>> I have no exact clue, if NoMachine forked prior to that (if they quote
+>>> the old licensing terms, then probably they did).
+>>
+>> Yep, it's plausible...
+>>
+>>>
+>>> However, how do you see the situation considering that upstream
+>>> changed to BSD-2-clause a long time ago. What approach do you propose
+>>> for nx-libs-lite to get the issue fully fixed?
+>>
+>> If the fork has been performed before the DXPC re-licensing (as it's
+>> likely), I see two possible strategies:
+>>
+>>  (A) someone gets in touch with DXPC copyright owners and asks them
+>> whether the re-licensing may be considered retroactive (applicable to
+>> older versions of DXPC); in case the answer is negative, DXPC copyright
+>> owners should be persuaded to make the re-licensing retroactive
+>>
+>>  (B) nx-libs-lite upstream developers re-fork from scratch, basing the
+>> new code on a BSD-licensed version of DXPC (I suspect this may turn out
+>> to be somewhat painful...)
+>>
+>>
+>> Obviously, the optimal solution is (A). I hope it may work...
+>>
+>> Thanks for your time and for your prompt and kind replies.
+>
+>
+
+
+
+
+From mike.gabriel@das-netzwerkteam.de Tue May 12 15:42:13 2015
+Received: (at 784565) by bugs.debian.org; 12 May 2015 15:42:13 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-6.4 required=4.0 tests=BAYES_00,FOURLA,
+	HAS_BUG_NUMBER,MDO_CABLE_TV3,T_RP_MATCHES_RCVD autolearn=ham
+	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 28; hammy, 150; neutral, 444; spammy,
+	0. spammytokens: hammytokens:0.000-+--IIRC, 0.000-+--H*RU:sk:grimnir,
+	0.000-+--H*r:sk:grimnir, 0.000-+--H*RU:78.46.204.98,
+	0.000-+--H*RU:88.198.48.199
+Return-path: <mike.gabriel@das-netzwerkteam.de>
+Received: from freya.das-netzwerkteam.de ([88.198.48.199])
+	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
+	(Exim 4.80)
+	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
+	id 1YsCJx-0003Fj-12
+	for 784565@bugs.debian.org; Tue, 12 May 2015 15:42:13 +0000
+Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
+	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id AB2291F6
+	for <784565@bugs.debian.org>; Tue, 12 May 2015 17:42:08 +0200 (CEST)
+Received: from localhost (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 0899C3BFDA
+	for <784565@bugs.debian.org>; Tue, 12 May 2015 17:42:08 +0200 (CEST)
+X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
+Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
+	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id tKjFu527nUiq for <784565@bugs.debian.org>;
+	Tue, 12 May 2015 17:42:07 +0200 (CEST)
+Received: from localhost (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 558633C022
+	for <784565@bugs.debian.org>; Tue, 12 May 2015 17:42:07 +0200 (CEST)
+Received: from localhost (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 1F4393BFDA
+	for <784565@bugs.debian.org>; Tue, 12 May 2015 17:42:07 +0200 (CEST)
+Received: from [10.215.43.89] (unknown [46.115.20.43])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPSA id 867C23BA87;
+	Tue, 12 May 2015 17:42:02 +0200 (CEST)
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Reply-To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+To: Kevin Vigor <kevin@vigor.nu>
+Cc: 784565@bugs.debian.org, x2go-dev@lists.x2go.org, nito.martinez@qindel.com,  opensource@gznianguan.com, Francesco Poli <invernomuto@paranoici.org>
+Subject: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are derived
+	from non-free code
+X-Mailer: Modest 3.2
+References: <20150506173532.7531.31389.reportbug@homebrew>
+	 <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
+	 <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
+	 <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
+	  <55521444.9090407@vigor.nu>
+In-Reply-To: <55521444.9090407@vigor.nu>
+Content-Type: text/plain; charset=utf-8
+Content-ID: <1431445315.4712.6.camel@Nokia-N900>
+Date: Tue, 12 May 2015 17:41:55 +0200
+Message-Id: <1431445315.4712.7.camel@Nokia-N900>
+Mime-Version: 1.0
+Content-Transfer-Encoding: 8bit
+
+Hi Kevin,
+
+thanks for your feedback. Let us wait for Francesco, our expert on license issues, and see what he thinks about your feedback.
+
+Thank you very much for providing info and sharing pieces of nx-libs's history.
+
+As you sent your reply to the Debian bug tracker already, this will public statement enough, I guess.
+
+Thanks a lot,
+Mike
+
+-- 
+
+DAS-NETZWERKTEAM
+mike gabriel, herweg 7, 24357 fleckeby
+fon: +49 (1520) 1976148
+
+GnuPG Key ID 0x25771B13
+mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
+
+
+----- Original message -----
+> Hi Mike, et al,
+> 
+>         I am not the original author of dxpc, that being Brian Pane.
+> However, I took over maintenance circa 1999 and am still the primary
+> maintainer (though the project has effectively been dead for most of a
+> decade now).
+> 
+>         As you are aware, when I inherited the code, it was licensed under a
+> variant of the BSD license that did not include the 'with modification'
+> clause. To the best of my recollection, somebody from the FSF contacted
+> me circa 2001 regarding this and as a result, subsequent releases were
+> done under a standard 2-clause BSD license with the modification clause.
+> Again, to the best of my recollection, I contacted Brian about this
+> change and he offered no objection.
+> 
+>         Further, I recall distinctly that NoMachine contacted me and
+> explicitly asked permission before including DXPC code in NX, which I
+> happily granted with no new conditions beyond the BSD license already in
+> play.
+> 
+>         It is possible, though by no means certain, that I could dig up
+> ancient email to corroborate this account if necessary. However, I am
+> more than willing to publicly state that I believe NoMachine's use of
+> DXPC code to be both legal and ethical, and that my intent when changing
+> the license to 2-clause BSD was simply to clarity the existing intent
+> and that it ought therefore be considered retroactive.
+> 
+>         Yours,
+>               Kevin Vigor
+> 
+> On 05/11/15 22:46, Mike Gabriel wrote:
+> > Dear Kevin,
+> > 
+> > (I Cc: several people involved in this, also the X2Go development
+> > mailing list...)
+> > 
+> > [If you feel unconfortable with discussing the details / the impact of
+> > the below in public, feel free to answer to me directly first with
+> > questions and concerns, before answering to all people who are listed
+> > in Cc:.]
+> > 
+> > Someone from the Debian legal team recently brought up a license issue
+> > discovered in nx-libs 3.x series.
+> > 
+> > TL;DR; Suggested by Francesco Poli from the Debian legal team: """
+> > (A) someone gets in touch with DXPC copyright owners and asks them
+> > whether the re-licensing [in 2002] may be considered retroactive
+> > (applicable to older versions of DXPC); in case the answer is
+> > negative, DXPC copyright owners should be persuaded to make the
+> > re-licensing retroactive """
+> > 
+> > The person contacting you about the above question is me. Mike
+> > Gabriel, Debian Developer and one of the current upstream maintainers
+> > of nx-libs 3.x (previously also know as   "NX redistributed" for X2Go)
+> > [1].
+> > 
+> > This issue requires some time of reading from you and (hopefully) a
+> > public statement, that the original DXPC code can be considered as
+> > BSD-2-clause (the current license) also for released versions prior
+> > 2002 when the ancient BSD license template [2] was still shipped with
+> > DXPC.
+> > 
+> > For a complete follow-up, please check Debian bug #784565 [3].
+> > 
+> > We are aware that NoMachine forked DXPC at some early stage around the
+> > year 2000 and wrote their own commercial product around it. Obviously,
+> > this fork happened before 2002 (i.e., before DXPC release 3.8.1), as
+> > libxcomp3 in NoMachine's NX ships the previously used BSD license
+> > template. I am not sure, if that fork was easy for you or actually a
+> > nuisance. I may only guess at this point. I'd be happy to know more
+> > (maybe not in this mail thread, though).
+> > 
+> > NoMachine has stopped publishing NXv3 updates a couple of years ago
+> > (2011 IIRC), now. The maintenance has been moved into the hands of the
+> > currently available FLOSS projects "X2Go", "Arctica Project" [NEW] and
+> > "TheQVD". Some of us are running a business model on top of that
+> > (consultancy, support contracts, feature development contracts), some
+> > of us spend a lot of their free time on improving / maintaining
+> > nx-libs (as we call NoMachine's NXv3 at the moment).
+> > 
+> > To outline the impact of my mail clearly: If you say that it was not
+> > legal by NoMachine to fork DXPC at the given time (before 2002), then
+> > all FLOSS remote desktop / remote application would be in real
+> > trouble, because then the core component of their software projects
+> > could not be considered as free (as in DFSG, Debian free software
+> > guidelines[4]) anymore. Also the code changes originally performed by
+> > NoMachine might have been illegal in the first place. All current
+> > maintenance activities and also planned future development on nx-libs
+> > would become questionable.
+> > 
+> > Thus, I hope you can chime in on this: Dear developers of nx-libs,
+> > please assume the BSD-2-license as retroactive and applicable to DXPC
+> > version earlier than 3.8.1. As the copyright holder, I agree with
+> > modifications of code bases that originate before the change to
+> > BSD-2-clause license got introduced in 3.8.1 of DXPC.
+> > 
+> > And... I will bring up that question later (but it is burning under my
+> > nails)... Be sure: The nx-libs maintainers would be happy to have the
+> > original DXPC author on the nx-libs developer team. But I will bring
+> > up that question later (when this very issue is settled). ;-)
+> > 
+> > Greets,
+> > Mike
+> > 
+> > [1] https://github.com/ArcticaProject/nx-libs
+> > [2] http://en.wikipedia.org/wiki/BSD_licenses#Previous_license
+> > [3] http://bugs.debian.org/784565
+> > [4] http://de.wikipedia.org/wiki/Debian_Free_Software_Guidelines
+> > 
+> > On   Mo 11 Mai 2015 21:36:59 CEST, Francesco Poli wrote:
+> > 
+> > > On Mon, 11 May 2015 09:26:36 +0000 Mike Gabriel wrote:
+> > > 
+> > > [...]
+> > > > As it seems, dxpc has been long ago relicensed to BSD-2-clause (for
+> > > > v3.8.1 in/around 2002).
+> > > 
+> > > This is great news, indeed!
+> > > 
+> > > > 
+> > > > I have no exact clue, if NoMachine forked prior to that (if they
+> > > > quote the old licensing terms, then probably they did).
+> > > 
+> > > Yep, it's plausible...
+> > > 
+> > > > 
+> > > > However, how do you see the situation considering that upstream
+> > > > changed to BSD-2-clause a long time ago. What approach do you
+> > > > propose for nx-libs-lite to get the issue fully fixed?
+> > > 
+> > > If the fork has been performed before the DXPC re-licensing (as it's
+> > > likely), I see two possible strategies:
+> > > 
+> > > (A) someone gets in touch with DXPC copyright owners and asks them
+> > > whether the re-licensing may be considered retroactive (applicable to
+> > > older versions of DXPC); in case the answer is negative, DXPC
+> > > copyright owners should be persuaded to make the re-licensing
+> > > retroactive
+> > > 
+> > > (B) nx-libs-lite upstream developers re-fork from scratch, basing the
+> > > new code on a BSD-licensed version of DXPC (I suspect this may turn
+> > > out to be somewhat painful...)
+> > > 
+> > > 
+> > > Obviously, the optimal solution is (A). I hope it may work...
+> > > 
+> > > Thanks for your time and for your prompt and kind replies.
+> > 
+> > 
+> 
+
+
+
+
+From invernomuto@paranoici.org Tue May 12 21:42:01 2015
+Received: (at 784565) by bugs.debian.org; 12 May 2015 21:42:01 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-12.0 required=4.0 tests=BAYES_00,DKIM_SIGNED,
+	DKIM_VALID,DKIM_VALID_AU,FOURLA,HAS_BUG_NUMBER,PGPSIGNATURE,SPF_HELO_PASS,
+	SPF_PASS autolearn=ham autolearn_force=no
+	version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 15; hammy, 150; neutral, 119; spammy,
+	0. spammytokens: hammytokens:0.000-+--H*UA:sk:x86_64-,
+	0.000-+--H*x:sk:x86_64-, 0.000-+--H*c:PGP-SHA256, 0.000-+--H*c:SignHturH,
+	0.000-+--H*c:pgp-signature
+Return-path: <invernomuto@paranoici.org>
+Received: from perdizione.investici.org ([94.23.50.208])
+	by buxtehude.debian.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256)
+	(Exim 4.80)
+	(envelope-from <invernomuto@paranoici.org>)
+	id 1YsHw8-0008Hh-DT
+	for 784565@bugs.debian.org; Tue, 12 May 2015 21:42:01 +0000
+Received: from [94.23.50.208] (perdizione [94.23.50.208]) (Authenticated sender: invernomuto@paranoici.org) by localhost (Postfix) with ESMTPSA id 9E73512097E;
+	Tue, 12 May 2015 21:41:55 +0000 (UTC)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paranoici.org;
+	s=stigmate; t=1431466915;
+	bh=w0yVuJLtWq+0cj6zbjNb4THkJk0Xq3N9SMQ1+u0ZZnk=;
+	h=Date:From:To:Cc:Subject:In-Reply-To:References;
+	b=RRQcr33uMGnEaupGoWl0nXectE2hPbUghdie73/SnVp5Ax5QWxqK90ic5VPUE7RsN
+	 RsJ6HcYccQEzYLzm37W24u9eQZFa+Oc1CZaJBvFgOg9MAvh6tHaLUgOuFGkYXhn5R0
+	 Nlq5WHCpVKi9YvGfj/aAtfe84CJPt2HIKAqPXb5w=
+Received: from frx by homebrew with local (Exim 4.85)
+	(envelope-from <invernomuto@paranoici.org>)
+	id 1YsHvP-00019Q-D1; Tue, 12 May 2015 23:41:15 +0200
+Date: Tue, 12 May 2015 23:40:48 +0200
+From: Francesco Poli <invernomuto@paranoici.org>
+To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Cc: Kevin Vigor <kevin@vigor.nu>, 784565@bugs.debian.org,
+ x2go-dev@lists.x2go.org, nito.martinez@qindel.com,
+ opensource@gznianguan.com
+Subject: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are derived
+ from non-free code
+Message-Id: <20150512234048.054319a449ffadcf87577425@paranoici.org>
+In-Reply-To: <1431445315.4712.7.camel@Nokia-N900>
+References: <20150506173532.7531.31389.reportbug@homebrew>
+	<20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
+	<20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
+	<20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
+	<55521444.9090407@vigor.nu>
+	<1431445315.4712.7.camel@Nokia-N900>
+X-Mailer: Sylpheed 3.5.0beta1 (GTK+ 2.24.25; x86_64-pc-linux-gnu)
+Mime-Version: 1.0
+Content-Type: multipart/signed; protocol="application/pgp-signature";
+ micalg="PGP-SHA256";
+ boundary="Signature=_Tue__12_May_2015_23_40_48_+0200_KqpLAiCdvC+4zCCk"
+
+--Signature=_Tue__12_May_2015_23_40_48_+0200_KqpLAiCdvC+4zCCk
+Content-Type: text/plain; charset=US-ASCII
+Content-Disposition: inline
+Content-Transfer-Encoding: quoted-printable
+
+On Tue, 12 May 2015 17:41:55 +0200 Mike Gabriel wrote:
+
+> Hi Kevin,
+
+Hello Mike, hello Kevin, hello to all the other recipients.
+
+First of all, I wish to express my gratitude to Kevin for his prompt,
+kind and generous response.
+
+>=20
+> thanks for your feedback. Let us wait for Francesco, our expert on licens=
+e issues, and see what he thinks about your feedback.
+
+I think that this is an important first step to solve this issue for
+the best.
+Kevin Vigor is one of the copyright owners of the code that was forked
+before the re-licensing.
+We now know that he intended the re-licensing to be retroactive and
+this is really good.
+
+I think that now it would be useful to ascertain that the other
+copyright owners (Brian Pane, Zachary Vonler, Gian Filippo Pinzari) are
+also OK with this interpretation of the re-licensing operation.
+
+Maybe Kevin is able to dig the original conversations (assuming they
+were carried on by e-mail or similar archived means) or otherwise to
+get in touch with them and check? Or, alternatively, Kevin could help
+Mike to get in touch with them?
+
+I hope everything may be settled for the best soon.
+Thanks a lot to everyone involved.
+
+
+
+--=20
+ http://www.inventati.org/frx/
+ There's not a second to spare! To the laboratory!
+..................................................... Francesco Poli .
+ GnuPG key fpr =3D=3D CA01 1147 9CD2 EFDF FB82  3925 3E1C 27E1 1F69 BFFE
+
+--Signature=_Tue__12_May_2015_23_40_48_+0200_KqpLAiCdvC+4zCCk
+Content-Type: application/pgp-signature
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVUnNlAAoJED4cJ+Efab/+CBQP/33+SjLcIk2VZbjeeyCxhCAo
+kmgg9BDtqce1Dy22ONotywDNQ187suqlmkEa6yAAdglB0M3CYMFKSIsZHn2C0uGb
+B45HnzXE7PJd/j/WOXuCIvDe70iGJ7Ubk16DCjyRuKsF70cr2DcsbieiwZh8Wi4v
+GXNOxpm5Nv2bs1vQnRzYFc7GLWny3eCqcWF23XisqvxQecOHopoGWr9F6NuS5ymz
+NQ8Z7eanEPaqE86GYFIqJyt9Wcz+fM2r1d/IrNmYaTVBJPrqndQKnXJAViwYhtaM
+V8+CIKDuttcIYMto9dyE9+vr6wgtDyepVatQIHyVA2LpzR9jub8MGelXMdA7em3i
+/H3gz3H/tQti3T3HoHu+4CSAEWsXdtkHq2RWU9k3+HQuWB00z7WDr404xzs7k2Wg
+h6VR9c+VjV92KnMvDqWjE4VBYjrn6Ag5u/0Cf6HMx5RAGFNL8ROjOGbQSskfUogo
+GnWX2b8yLIe8ojg3AVowWV2oKVlWzsjZVHH9lp0M/lqGmnPVEJk0mh6DKbZPjK8O
+P2dpZ8IlSa18R2CvMWnf7HXKRR/s2ef7rUmBkT2sFnTwsT5PeDSU45/7ZuWbNIpw
+8/Y5q38c36Axeng1J0OCR8YX47dH0PubVnBzYEqoun3GucR1jifOiNzWLyM2ZxNe
+0JSSqn5ddFC8/iuGpFDI
+=ZqCl
+-----END PGP SIGNATURE-----
+
+--Signature=_Tue__12_May_2015_23_40_48_+0200_KqpLAiCdvC+4zCCk--
+
+
+
+From niels@thykier.net Wed May 13 16:04:21 2015
+Received: (at control) by bugs.debian.org; 13 May 2015 16:04:21 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-3.9 required=4.0 tests=BAYES_00,DKIM_SIGNED,
+	DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H4,
+	RCVD_IN_MSPIKE_WL autolearn=ham autolearn_force=no
+	version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 6; hammy, 61; neutral, 18; spammy, 0.
+	spammytokens: hammytokens:0.000-+--H*u:devscripts, 0.000-+--H*u:bts,
+	0.000-+--H*UA:bts, 0.000-+--H*UA:devscripts, 0.000-+--H*MI:thykier
+Return-path: <niels@thykier.net>
+Received: from mailrelay11.public.one.com ([195.47.247.189])
+	by buxtehude.debian.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256)
+	(Exim 4.80)
+	(envelope-from <niels@thykier.net>)
+	id 1YsZ8u-0002Ch-RD
+	for control@bugs.debian.org; Wed, 13 May 2015 16:04:21 +0000
+X-HalOne-Cookie: 4652f81fa62fa9da4dd9249e7484054c41bc782d
+X-HalOne-ID: b22b9887-f989-11e4-950a-b82a72d06996
+DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple;
+	d=thykier.net; s=20140924;
+	h=from:subject:date:message-id:to;
+	bh=EysymZxJFEX8N6fIBUIaFmFP7WdtVLf5PrmWzWVb22Y=;
+	b=Ur7nNbvtl3pu7O1YKIHwSM8MHIW+JPWJKM1GBE23FB4sLbENnBM2V0rmU5++qyolEv7hHAhvKkWFO
+	 lH4tbbHCyoYVdUE76nRT/1HEb5/X+pxjrsC1qTXWWXkekbuLNcDwIl0+WdVVEd5B4LYpW7igVWi4AH
+	 XncGXx/MNYDQvFiU=
+Received: from thykier.net (unknown [80.62.116.219])
+	by smtpfilter3.public.one.com (Halon Mail Gateway) with ESMTPSA
+	for <control@bugs.debian.org>; Wed, 13 May 2015 16:04:12 +0000 (GMT)
+Received: by thykier.net (Postfix, from userid 1000)
+	id 985EB4BB; Wed, 13 May 2015 18:04:10 +0200 (CEST)
+From: Niels Thykier <niels@thykier.net>
+To: control@bugs.debian.org
+Subject: tagging 784565
+Date: Wed, 13 May 2015 18:04:10 +0200
+User-Agent: devscripts bts/2.15.4
+Message-ID: <1431533050-371-bts-niels@thykier.net>
+Delivered-To: control@bugs.debian.org
+
+# distributable
+tags 784565 + jessie-ignore
+thanks
+
+
+
+
+From mike.gabriel@das-netzwerkteam.de Thu May 14 04:58:16 2015
+Received: (at 784565) by bugs.debian.org; 14 May 2015 04:58:16 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-11.9 required=4.0 tests=BAYES_00,FOURLA,
+	HAS_BUG_NUMBER,PGPSIGNATURE,T_RP_MATCHES_RCVD autolearn=ham
+	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 22; hammy, 150; neutral, 339; spammy,
+	0. spammytokens: hammytokens:0.000-+--H*c:pgp-signature,
+	0.000-+--H*c:protocol, 0.000-+--H*c:micalg, 0.000-+--H*c:signed,
+	0.000-+--H*RU:sk:grimnir
+Return-path: <mike.gabriel@das-netzwerkteam.de>
+Received: from freya.das-netzwerkteam.de ([88.198.48.199])
+	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
+	(Exim 4.80)
+	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
+	id 1YslDr-0000NV-Ur
+	for 784565@bugs.debian.org; Thu, 14 May 2015 04:58:16 +0000
+Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
+	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id A03C82B5;
+	Thu, 14 May 2015 06:58:11 +0200 (CEST)
+Received: from localhost (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id E89E93BD2E;
+	Thu, 14 May 2015 06:58:10 +0200 (CEST)
+X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
+Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
+	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id 5m6G8sqwjlfJ; Thu, 14 May 2015 06:58:10 +0200 (CEST)
+Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPS id 5713E3BB3A;
+	Thu, 14 May 2015 06:58:10 +0200 (CEST)
+Received: from bifrost.das-netzwerkteam.de (bifrost.das-netzwerkteam.de
+ [178.62.101.154]) by mail.das-netzwerkteam.de (Horde Framework) with HTTP;
+ Thu, 14 May 2015 04:58:10 +0000
+Date: Thu, 14 May 2015 04:58:09 +0000
+Message-ID: <20150514045809.Horde.-3NIZzBnA5V5B6a721F2kg2@mail.das-netzwerkteam.de>
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+To: Francesco Poli <invernomuto@paranoici.org>
+Cc: Kevin Vigor <kevin@vigor.nu>, 784565@bugs.debian.org,
+ x2go-dev@lists.x2go.org, nito.martinez@qindel.com, opensource@gznianguan.com
+Subject: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are derived
+ from non-free code
+References: <20150506173532.7531.31389.reportbug@homebrew>
+ <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
+ <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
+ <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
+ <55521444.9090407@vigor.nu> <1431445315.4712.7.camel@Nokia-N900>
+ <20150512234048.054319a449ffadcf87577425@paranoici.org>
+In-Reply-To: <20150512234048.054319a449ffadcf87577425@paranoici.org>
+User-Agent: Internet Messaging Program (IMP) H5 (6.2.2)
+Accept-Language: de,en
+Organization: DAS-NETZWERKTEAM
+X-Originating-IP: 178.62.101.154
+X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:32.0) Gecko/20100101
+ Firefox/32.0 Iceweasel/32.0
+Content-Type: multipart/signed; boundary="=_SHoEHYV8bfary9lJHYP1lQ1";
+ protocol="application/pgp-signature"; micalg=pgp-sha1
+MIME-Version: 1.0
+
+This message is in MIME format and has been PGP signed.
+
+--=_SHoEHYV8bfary9lJHYP1lQ1
+Content-Type: text/plain; charset=us-ascii; format=flowed; DelSp=Yes
+Content-Disposition: inline
+Content-Transfer-Encoding: quoted-printable
+
+Hi all,
+
+there has been an off-list mail exchange between Francesco and Kevin=20=20
+(and=20me in Cc:) which I will quote at the end of this mail (as it was=20=
+=20
+not=20meant to be private and we should fully document the flow on this=20=
+=20
+issue).
+
+@Kevin:=20I will take you off this mail thread's Cc: field with my next=20=
+=20
+post.=20Feel free to follow-up via #784565 [1] on the Debian bug=20=20
+tracker.=20Thanks a lot for being so responsive and generous with=20=20
+providing=20information.
+
+On  Di 12 Mai 2015 23:40:48 CEST, Francesco Poli wrote:
+
+> On Tue, 12 May 2015 17:41:55 +0200 Mike Gabriel wrote:
+
+> I think that now it would be useful to ascertain that the other
+> copyright owners (Brian Pane, Zachary Vonler, Gian Filippo Pinzari) are
+> also OK with this interpretation of the re-licensing operation.
+
+As stated by Kevin, Gian Filippo worked/works on the NoMachine side. I=20=
+=20
+will=20include him in Cc:.
+
+For Brian Pane we also found and e-Mail address, for Zach Vonler, I=20=20
+will=20use the mail address provided in DXPC code (which might be=20=20
+outdated),=20but I think I actually have found his phone number on the=20=
+=20
+web,=20so if that mail address bounces I will give him a ring.
+
+> Maybe Kevin is able to dig the original conversations (assuming they
+> were carried on by e-mail or similar archived means) or otherwise to
+> get in touch with them and check? Or, alternatively, Kevin could help
+
+As stated in the forwarded messages below, Kevin was unable to dig out=20=
+=20
+any=20mails from backups. So we switch to plan B: contact Brian, Zach=20=20
+and=20Gian Filippo.
+
+> Mike to get in touch with them?
+
+I will do that.
+
+> I hope everything may be settled for the best soon.
+> Thanks a lot to everyone involved.
+
+/me, too.
+
+light+love
+Mike
+
+[1] http://bugs.debian.org/784565
+
+
+----- Weitergeleitete Nachricht von Kevin Vigor <kevin@vigor.nu> -----
+   Datum: Wed, 13 May 2015 09:01:27 -0600
+     Von: Kevin Vigor <kevin@vigor.nu>
+Betreff: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are=20=20
+derived=20from non-free code
+      An: Francesco Poli <invernomuto@paranoici.org>
+      Cc: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+On 05/12/15 15:40, Francesco Poli wrote:
+
+> Maybe Kevin is able to dig the original conversations (assuming they
+> were carried on by e-mail or similar archived means) or otherwise to
+> get in touch with them and check? Or, alternatively, Kevin could help
+> Mike to get in touch with them?
+
+I'm afraid I was not able to dig anything out of old backups last=20=20
+night.=20I still have a stack of CDs to look through, but don't hold=20=20
+your=20breath. Sorry about that.
+
+I have never had any contact with Zachary Vonler or Gian Filippo=20=20
+Pinzari,=20and have not spoken with Brian Pane in many years, so I have=20=
+=20
+no=20recent contact information for any of them. However, a quick google=20=
+=20
+turns=20up:
+
+https://www.linkedin.com/profile/view?id=3D728859
+http://www.brianp.net/contact/
+
+which is almost certainly the right Brian Pane (he was at CNet at the=20=20
+proper=20time).
+
+
+    Good luck,
+          Kevin
+
+----- Ende der weitergeleiteten Nachricht -----
+
+----- Weitergeleitete Nachricht von Francesco Poli=20=20
+<invernomuto@paranoici.org>=20-----
+   Datum: Wed, 13 May 2015 19:43:44 +0200
+     Von: Francesco Poli <invernomuto@paranoici.org>
+Betreff: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are=20=20
+derived=20from non-free code
+      An: Kevin Vigor <kevin@vigor.nu>
+      Cc: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+On Wed, 13 May 2015 09:01:27 -0600 Kevin Vigor wrote:
+
+> On 05/12/15 15:40, Francesco Poli wrote:
+>
+> > Maybe Kevin is able to dig the original conversations (assuming they
+> > were carried on by e-mail or similar archived means) or otherwise to
+> > get in touch with them and check? Or, alternatively, Kevin could help
+> > Mike to get in touch with them?
+>
+> I'm afraid I was not able to dig anything out of old backups last=20=20
+>=20night. I still have a stack of CDs to look through, but don't hold=20=
+=20
+>=20your breath. Sorry about that.
+
+Thanks a lot for searching: this is really appreciated, at least from
+my side.
+
+>
+> I have never had any contact with Zachary Vonler or Gian Filippo Pinzari,
+
+Then I wonder how it was possible to re-license DXPC in 2002...
+:-|
+
+> and have not spoken with Brian Pane in many years, so I have no recent
+contact information for any of them. However, a quick google turns up:
+>
+> https://www.linkedin.com/profile/view?id=3D728859
+> http://www.brianp.net/contact/
+>
+> which is almost certainly the right Brian Pane (he was at CNet at=20=20
+>=20the proper time).
+
+This could be really useful, thank you very much!
+
+Mike, I hope the search may go on from there: Brian should be asked
+about the retroactive nature of the re-licensing of DXPC and maybe he
+also knows how to get in touch with Zachary and/or Gian Filippo...
+
+
+P.S.: Kevin, any special reason why you dropped several addresses from
+the Cc list? Should this part of our conversation be kept private for
+the time being? Please clarify. Thanks!
+
+----- Ende der weitergeleiteten Nachricht -----
+
+----- Weitergeleitete Nachricht von Kevin Vigor <kevin@vigor.nu> -----
+   Datum: Wed, 13 May 2015 14:08:48 -0600
+     Von: Kevin Vigor <kevin@vigor.nu>
+Betreff: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are=20=20
+derived=20from non-free code
+      An: Francesco Poli <invernomuto@paranoici.org>
+      Cc: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+On 05/13/15 11:43, Francesco Poli wrote:
+> On Wed, 13 May 2015 09:01:27 -0600 Kevin Vigor wrote:
+
+>> I have never had any contact with Zachary Vonler or Gian Filippo Pinzari=
+,
+>
+> Then I wonder how it was possible to re-license DXPC in 2002...
+> :-|
+>
+
+I believe Gian worked on the NoMachine code; he has never contributed=20=20
+to=20DXPC directly.
+
+Zachary Vonler was allegedly the maintainer of DXPC for a while circa=20=20
+1999,=20but never responded to any email when I attempted to contact=20=20
+him,=20which is how I came to take over maintenance.
+
+
+> P.S.: Kevin, any special reason why you dropped several addresses from
+> the Cc list? Should this part of our conversation be kept private for
+> the time being? Please clarify. Thanks!
+
+No, I was just trying to keep from spamming email lists unnecessarily.=20=
+=20
+I=20do not consider any part of this conversation private.
+
+----- Ende der weitergeleiteten Nachricht -----
+
+----- Weitergeleitete Nachricht von Francesco Poli=20=20
+<invernomuto@paranoici.org>=20-----
+   Datum: Wed, 13 May 2015 22:50:32 +0200
+     Von: Francesco Poli <invernomuto@paranoici.org>
+Betreff: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are=20=20
+derived=20from non-free code
+      An: Kevin Vigor <kevin@vigor.nu>
+      Cc: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+On Wed, 13 May 2015 14:08:48 -0600 Kevin Vigor wrote:
+
+> On 05/13/15 11:43, Francesco Poli wrote:
+> > On Wed, 13 May 2015 09:01:27 -0600 Kevin Vigor wrote:
+>
+> >> I have never had any contact with Zachary Vonler or Gian Filippo Pinza=
+ri,
+> >
+> > Then I wonder how it was possible to re-license DXPC in 2002...
+> > :-|
+> >
+>
+> I believe Gian worked on the NoMachine code; he has never=20=20
+>=20contributed to DXPC directly.
+
+Good, then only Zachary has to be tracked down.
+
+>
+> Zachary Vonler was allegedly the maintainer of DXPC for a while=20=20
+>=20circa 1999, but never responded to any email when I attempted to=20=20
+>=20contact him, which is how I came to take over maintenance.
+
+Let's hope Brian is able to help Mike in getting in touch with
+Zachary...
+
+>
+>
+> > P.S.: Kevin, any special reason why you dropped several addresses from
+> > the Cc list? Should this part of our conversation be kept private for
+> > the time being? Please clarify. Thanks!
+>
+> No, I was just trying to keep from spamming email lists=20=20
+>=20unnecessarily. I do not consider any part of this conversation=20=20
+>=20private.
+>
+
+OK, thanks for clarifying.
+
+----- Ende der weitergeleiteten Nachricht -----
+
+--=20
+
+DAS-NETZWERKTEAM
+mike gabriel, herweg 7, 24357 fleckeby
+fon: +49 (1520) 1976 148
+
+GnuPG Key ID 0x25771B31
+mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
+
+freeBusy:
+https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x=
+fb
+
+--=_SHoEHYV8bfary9lJHYP1lQ1
+Content-Type: application/pgp-signature
+Content-Description: Digitale PGP-Signatur
+Content-Disposition: inline
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJVVCthAAoJEJr0azAldxsx3KUP/2997X9KnhVEedREGxsuqvQn
+Dp5oGK2JPf0Z2MZui1FVehvakoHQD0MuhpVs7ZktnshwNvAgxyhW5esC617a9gsz
+jJvaJz0S0MPHfSM4Dz8Yg2t0u0DpueVZBpOeDOlt9W9ECXkpe2YPk5AOialHwTPX
+OP5KKfMSLEGFreUL7U0WeetC/To5zm54Ivx1a0wx2I+HdPJ0YXTxIC7JvUSNejFE
+0+yhK1thXf38juOeb2pxTvRQXcj1IoDMRSc0k7KHeNGmP1NF38fh1illPlBABG1u
+wa3hn+1uMe3+On8LJkDtIHtsXrR2RUuOP+0FbI4rTRo5SOeVFNRSl1ldp2ywl8rQ
+9WkK623cuurOydsHjj+fIlcb7GN/OgrTay8VRS3jUjy9tlQ7PCpF5W1m7kMPHrCP
+nh6/hUa6ep8qE+86dosQS4FxvOgSHOEpbNZ8ulEib/ClHr9wsnWpjxQtvRnZsBTl
+PAIXKvdiHUCgyfs4efSWYtR8QUJTYmPDrGr2V8jWAtzZOo6NSa09c2Yc2OxLRDpP
+HBGVSLUOrocvbb3wPAgnsogxtYCpzo/ga1Rnx2LdIfLNaTv62sek+nHqJzICqtcH
+SdMajeJTVksKQCmHqIQS7C2V44cDYizTe9exZIl75OKT6TDujuW/KZiPQK6VCCNv
+eEgOxmCOHlc8YLLz0dEP
+=N9IW
+-----END PGP SIGNATURE-----
+
+--=_SHoEHYV8bfary9lJHYP1lQ1--
+
+
+
+
+From mike.gabriel@das-netzwerkteam.de Thu May 14 05:55:46 2015
+Received: (at 784565) by bugs.debian.org; 14 May 2015 05:55:46 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-11.9 required=4.0 tests=BAYES_00,FOURLA,
+	HAS_BUG_NUMBER,PGPSIGNATURE,T_RP_MATCHES_RCVD autolearn=ham
+	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 23; hammy, 150; neutral, 392; spammy,
+	0. spammytokens: hammytokens:0.000-+--H*c:pgp-signature,
+	0.000-+--H*c:protocol, 0.000-+--H*c:micalg, 0.000-+--H*c:signed,
+	0.000-+--H*RU:sk:grimnir
+Return-path: <mike.gabriel@das-netzwerkteam.de>
+Received: from freya.das-netzwerkteam.de ([88.198.48.199])
+	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
+	(Exim 4.80)
+	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
+	id 1Ysm7W-0005fv-3I
+	for 784565@bugs.debian.org; Thu, 14 May 2015 05:55:46 +0000
+Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
+	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id BDB433282;
+	Thu, 14 May 2015 07:55:43 +0200 (CEST)
+Received: from localhost (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 20DC03BD2E;
+	Thu, 14 May 2015 07:55:43 +0200 (CEST)
+X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
+Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
+	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id 3Dt4TKuxIMPh; Thu, 14 May 2015 07:55:43 +0200 (CEST)
+Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPS id 871AB3B9EA;
+	Thu, 14 May 2015 07:55:42 +0200 (CEST)
+Received: from bifrost.das-netzwerkteam.de (bifrost.das-netzwerkteam.de
+ [178.62.101.154]) by mail.das-netzwerkteam.de (Horde Framework) with HTTP;
+ Thu, 14 May 2015 05:55:42 +0000
+Date: Thu, 14 May 2015 05:55:42 +0000
+Message-ID: <20150514055542.Horde.LWDaJ7sgQHr-LCJySXbtvQ3@mail.das-netzwerkteam.de>
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+To: Zach Vonler <lightborn@mail.utexas.edu>, Brian Pane <brianp@brianp.net>,
+ Gian Filippo Pinzari <pinzari@nomachine.com>
+Cc: nito.martinez@qindel.com, x2go-dev@lists.x2go.org,
+ opensource@gznianguan.com, 784565@bugs.debian.org, Francesco Poli
+ <invernomuto@paranoici.org>
+Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: nx-libs-lite: parts
+ are derived from non-free code
+References: <20150506173532.7531.31389.reportbug@homebrew>
+ <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
+ <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
+ <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
+ <55521444.9090407@vigor.nu> <1431445315.4712.7.camel@Nokia-N900>
+ <20150512234048.054319a449ffadcf87577425@paranoici.org>
+In-Reply-To: <20150512234048.054319a449ffadcf87577425@paranoici.org>
+User-Agent: Internet Messaging Program (IMP) H5 (6.2.2)
+Accept-Language: de,en
+Organization: DAS-NETZWERKTEAM
+X-Originating-IP: 178.62.101.154
+X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:32.0) Gecko/20100101
+ Firefox/32.0 Iceweasel/32.0
+Content-Type: multipart/signed; boundary="=_whjzG6t3RqUoHnRlD0aGiA1";
+ protocol="application/pgp-signature"; micalg=pgp-sha1
+MIME-Version: 1.0
+
+This message is in MIME format and has been PGP signed.
+
+--=_whjzG6t3RqUoHnRlD0aGiA1
+Content-Type: text/plain; charset=us-ascii; format=flowed; DelSp=Yes
+Content-Disposition: inline
+Content-Transfer-Encoding: quoted-printable
+
+Dear Brian, dear Zachary, dear Gian Filippo,
+
+(Find a TL;DR; at the end of this mail...)
+
+I am contacting you on a licensing issue related to the DXPC code that=20=
+=20
+you=20worked on at the end of the nineties. I'd highly appreciate it if=20=
+=20
+you=20could take a little time to read this mail and get back to me,=20=20
+either=20privately or in public.
+[I have actually Cc:ed quite a number of people in this mail (thread).=20=
+=20
+All=20of them will be affected by the outcome of this license issue to=20=
+=20
+some=20lesser or greater extent. If you feel inconvenient with replying=20=
+=20
+to=20so many people you don't know, really don't hesitate to get back to=20=
+=20
+me=20in private first, so that we can sort things out. Thank you.]
+
+Before I continue, let me shortly introduce myself. My name is Mike=20=20
+Gabriel,=20I work for the Debian project [1.1, 1.2] (which brings forth=20=
+=20
+one=20of the major GNU/Linux distributions world-wide. I am also the=20=20
+upstream=20code maintainer of a software project called nx-libs [2]. The=20=
+=20
+nx-libs=20code has been derived from several of NoMachine's NXv3 [11]=20=20
+components=20(namely: nx-X11, nxagent, nxcomp, nxcompext and nxcompshad).
+
+A member of the Debian legal team [3] (Francesco Poli) made us (i.e.,=20=20
+the=20nx-libs developers, users, package maintainers) aware of an issue=20=
+=20
+[4]=20in the nx-libs component NXCOMP (which has been derived from DXPC=20=
+=20
+[5]).=20Please read Message #5 of the brought up issue on the Debian bug=20=
+=20
+tracker=20(#784565) [4] before you continue reading. Thanks.
+
+I will now jump into the below quoted mail and continue inline...
+
+On  Di 12 Mai 2015 23:40:48 CEST, Francesco Poli wrote:
+
+> On Tue, 12 May 2015 17:41:55 +0200 Mike Gabriel wrote:
+>
+>> Hi Kevin,
+>
+> Hello Mike, hello Kevin, hello to all the other recipients.
+>
+> First of all, I wish to express my gratitude to Kevin for his prompt,
+> kind and generous response.
+
+>> thanks for your feedback. Let us wait for Francesco, our expert on=20=20
+>>=20license issues, and see what he thinks about your feedback.
+>
+> I think that this is an important first step to solve this issue for
+> the best.
+> Kevin Vigor is one of the copyright owners of the code that was forked
+> before the re-licensing.
+> We now know that he intended the re-licensing to be retroactive and
+> this is really good.
+
+We are currently in the process of contacting all DXPC related=20=20
+copyright=20holders mentioned in the NXCOMP license file [6]. We already=20=
+=20
+received=20some feedback from Kevin Vigor [7], but we also need to=20=20
+address=20you (Brian, Zachary, Gian Filippo) with this. (The mail=20=20
+address=20I have from Zachary may be outdated, so any current contact=20=20
+address=20is highly welcome, in case the mail address being used will=20=20
+bounce=20back).
+
+At the moment, NXCOMP (and thus nx-libs, but also NoMachine's NXv3=20=20
+code)=20cannot be considered as fully free software, until this issue is=20=
+=20
+settled.=20The DXPC license before DXPC v3.8.1 was an ancient BSD style=20=
+=20
+license=20that failed in explicitly mentioning, that it is allowed to=20=20
+modify=20the DXPC code in derivative works. In 2002, DXPC 3.8.1 got=20=20
+released=20[12], using a more compliant license (BSD-2-clause). As Kevin=20=
+=20
+told=20us, this license change [8,9] was done after the FSF [10] had=20=20
+contacted=20the DXPC developers.
+
+However, the NXCOMP code in NXv3 got forked from DXPC before 2002, as=20=20
+it=20seems. So unfortunately, the modifications of DXPC as found in=20=20
+NoMachine's=20NXCOMP product are not compliant with the pre-3.8.1=20=20
+license=20of DXPC.
+
+> I think that now it would be useful to ascertain that the other
+> copyright owners (Brian Pane, Zachary Vonler, Gian Filippo Pinzari) are
+> also OK with this interpretation of the re-licensing operation.
+
+TL;DR; So here comes my actual question: are you (Brian Pane, Zachary=20=20
+Vonler,=20Gian Filippo Pinzari) ok with retroactively regarding=20=20
+pre-3.8.1=20code of DXPC (that you probably all worked on at that time)=20=
+=20
+as=20BSD-2-clause? Are you ok with others having taken or taking the=20=20
+pre-3.8.1=20DXPC code and distribute it in a modified form?
+
+A yes from all of you as DXPC copyright holders is essential for the=20=20
+continuation=20of nx-libs development under a free license. This may=20=20
+also=20possibly be an issue for NXv4 in case parts of it have been=20=20
+derived=20from DXPC.
+
+Thanks to all of you for taking your time.
+
+light+love
+Mike
+
+[1.1] http://www.debian.org
+[1.2] https://qa.debian.org/developer.php?login=3Dsunweaver%40debian.org
+[2] https://github.com/ArcticaProject/nx-libs
+[3] https://www.debian.org/legal/
+[4] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=3D784565#5
+[5] http://www.vigor.nu/dxpc/
+[6] https://github.com/ArcticaProject/nx-libs/blob/3.6.x/nxcomp/LICENSE#L32
+[7] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=3D784565#40
+[8] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=3D72020
+[9] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=3D142028
+[10] http://www.fsf.org/
+[11] https://www.nomachine.com/version-3
+[12] http://www.vigor.nu/dxpc/CHANGES
+--=20
+
+DAS-NETZWERKTEAM
+mike=20gabriel, herweg 7, 24357 fleckeby
+fon: +49 (1520) 1976 148
+
+GnuPG Key ID 0x25771B31
+mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
+
+freeBusy:
+https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x=
+fb
+
+--=_whjzG6t3RqUoHnRlD0aGiA1
+Content-Type: application/pgp-signature
+Content-Description: Digitale PGP-Signatur
+Content-Disposition: inline
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJVVDjeAAoJEJr0azAldxsx1JUP/RdzhmQ3HU+6x479AoGBTKxV
+onR3XPlq8Iw9f6dU0TjqlAHCOGeftJ+X7A3HamiTFsr5wUqlrTuKeYnVd4hTa08e
+ge9WIODczQfnoHm47siTjlMfQuHFIGDnHuJ+3GbvojMI7QXWrM9wgxGo2B/2UUQS
+tFlYPbvfAGhCyUVx/zLRFqDVzzdo+UCVoLLYKE1pkwjhpnGGamY1xd/KFjCgi0Vx
+f/Nx9w28EqmRFZCTmxghLngkTlQwrtBkSUAhLS3ntxV12RrrQQ2verXPWbW1DU9C
+3TZypNZSMc4O8etJ244YUk7wAvspUtJnXyvxoQ2Padw0ogGFayIdLtC8HStCy+Mx
+Q/FIND8+aGdYALNTbQfTCpJ1fmg06Id4hn96rdZOhpT80M3vTuY9HpIyf2dDCdHu
+OmHEjUKnMRgjPbVoIU5lz8s4X/ET7hzxb2psXSwscxI+qqlSrADzC98QB23djJii
+O9qPVB/HqJXwNNXlwiScrLC/q4ro0QgdurKmIDQq1zjdFXyBDEwMzxLNlVSJiEeG
+gMSiXD9lD8J1KBDp35P4wxmOcCSymILU11Lpvf5N22ID7cfk8x58+Fsik+RkQZcm
+94ll8p4XU0xOt8pgzGOVL4rLBsjcPGzuTjUoDsB8zmZLSgEgrISZNQC7pRhEXTRW
+3g7fQuF635IMObwgVJJB
+=c1td
+-----END PGP SIGNATURE-----
+
+--=_whjzG6t3RqUoHnRlD0aGiA1--
+
+
+
+
+From mike.gabriel@das-netzwerkteam.de Thu May 14 06:20:24 2015
+Received: (at 784565) by bugs.debian.org; 14 May 2015 06:20:24 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-11.9 required=4.0 tests=BAYES_00,FOURLA,
+	HAS_BUG_NUMBER,PGPSIGNATURE,T_RP_MATCHES_RCVD autolearn=ham
+	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 15; hammy, 149; neutral, 94; spammy,
+	1. spammytokens:0.997-1--sk:austin. hammytokens:0.000-+--H*c:pgp-signature,
+	0.000-+--H*c:protocol, 0.000-+--H*c:micalg, 0.000-+--H*c:signed,
+	0.000-+--H*RU:sk:grimnir
+Return-path: <mike.gabriel@das-netzwerkteam.de>
+Received: from freya.das-netzwerkteam.de ([88.198.48.199])
+	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
+	(Exim 4.80)
+	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
+	id 1YsmVL-0008TY-AE
+	for 784565@bugs.debian.org; Thu, 14 May 2015 06:20:24 +0000
+Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
+	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id AA82B3282;
+	Thu, 14 May 2015 08:20:19 +0200 (CEST)
+Received: from localhost (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id A8B823BD2E;
+	Thu, 14 May 2015 08:20:18 +0200 (CEST)
+X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
+Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
+	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id LyPILriO4mkm; Thu, 14 May 2015 08:20:18 +0200 (CEST)
+Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPS id 4BB463BB3A;
+	Thu, 14 May 2015 08:20:18 +0200 (CEST)
+Received: from bifrost.das-netzwerkteam.de (bifrost.das-netzwerkteam.de
+ [178.62.101.154]) by mail.das-netzwerkteam.de (Horde Framework) with HTTP;
+ Thu, 14 May 2015 06:20:18 +0000
+Date: Thu, 14 May 2015 06:20:18 +0000
+Message-ID: <20150514062018.Horde.T6fBfDEHTv_IkVi4n506ew5@mail.das-netzwerkteam.de>
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+To: Brian Pane <brianp@brianp.net>, Gian Filippo Pinzari
+ <pinzari@nomachine.com>
+Cc: opensource@gznianguan.com, 784565@bugs.debian.org,
+ nito.martinez@qindel.com, Francesco Poli <invernomuto@paranoici.org>,
+ x2go-dev@lists.x2go.org
+Subject: Re: [X2Go-Dev] [pkg-x2go-devel] Bug#784565: Bug#784565:
+ nx-libs-lite: parts are derived from non-free code
+References: <20150506173532.7531.31389.reportbug@homebrew>
+ <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
+ <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
+ <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
+ <55521444.9090407@vigor.nu> <1431445315.4712.7.camel@Nokia-N900>
+ <20150512234048.054319a449ffadcf87577425@paranoici.org>
+ <20150514055542.Horde.LWDaJ7sgQHr-LCJySXbtvQ3@mail.das-netzwerkteam.de>
+In-Reply-To: <20150514055542.Horde.LWDaJ7sgQHr-LCJySXbtvQ3@mail.das-netzwerkteam.de>
+User-Agent: Internet Messaging Program (IMP) H5 (6.2.2)
+Accept-Language: de,en
+Organization: DAS-NETZWERKTEAM
+X-Originating-IP: 178.62.101.154
+X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:32.0) Gecko/20100101
+ Firefox/32.0 Iceweasel/32.0
+Content-Type: multipart/signed; boundary="=_FXxC2VoubfzELdkXQu84zQ1";
+ protocol="application/pgp-signature"; micalg=pgp-sha1
+MIME-Version: 1.0
+
+This message is in MIME format and has been PGP signed.
+
+--=_FXxC2VoubfzELdkXQu84zQ1
+Content-Type: text/plain; charset=us-ascii; format=flowed; DelSp=Yes
+Content-Disposition: inline
+Content-Transfer-Encoding: quoted-printable
+
+Hi again,
+
+On  Do 14 Mai 2015 07:55:42 CEST, Mike Gabriel wrote:
+
+> [...] (The mail address I have from Zachary may be outdated, so any=20=20
+>=20current contact address is highly welcome, in case the mail address=20=
+=20
+>=20being used will bounce back).
+
+As it seems, the publicly known mail address of Zachary Vonler at=20=20
+austin.utexas.edu=20is outdated.
+
+@Brian: if you happen to have a recent mail address of Zachary, could=20=20
+you=20please provide it to me privately? Thanks.
+
+Mike
+--=20
+
+DAS-NETZWERKTEAM
+mike=20gabriel, herweg 7, 24357 fleckeby
+fon: +49 (1520) 1976 148
+
+GnuPG Key ID 0x25771B31
+mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
+
+freeBusy:
+https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x=
+fb
+
+--=_FXxC2VoubfzELdkXQu84zQ1
+Content-Type: application/pgp-signature
+Content-Description: Digitale PGP-Signatur
+Content-Disposition: inline
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJVVD6iAAoJEJr0azAldxsx4+8QAI9fbkDu0G/1NpC4+MDJ3HtH
+wzfUUIIoBAPTahr1ZGrGK4ZMH5+RvXtwX2OBTwRRgKlZOqsdU35bj2HKi01KNLGx
+9NXXnLz97CuTrXJrzis3C+pzCIpR6cR/SPhDdExdhjR8nawXcejfFhPUnbVvPvxY
+jYN43cYFScovk5f5bUtIAybVZZCpdRZwDRevD+1qTTs+WtDf/9PXL7CX9A7j7r6T
+XQIURSVQq/FVXcJHSdZcYZza/4JHIZbEQTeX3FaUK+zkdHlBbbmRwzN0YLP/XQiY
+06tQXFjgjqjjkoxTE5gQrlN3kyxNH2WpXj2eeAqQarkCOnKgiuFEYxhTCYnZHCmk
+WVYhb2/78VbRlRbDJH0jJ0KKNOi9fbXGcVa36IOgV2dLN+tnNorAQjHm7LkBDhyi
+c3EmzEPtDTmcb5XuPYwwbNGn2EE47UsTx3UjPFWAQVQ2LwMXoFb+iH+WWSQ8KW1b
+xKRDOtarACd06rbW/sKQVdzNytydvFkZZn//AHHA7KP7jmqhl/bub8EyEf9cCTVr
+92XB5bbI1rLfEo1D3FTUaCt1tUEumhgRzwlJteX5/vbpf0fJ3QcWMUQSQWYqbhEm
+LnlGOM44jZDtQ7QonezcB/+lQDu2/0Q7fZtgqtr9bxkJ5URr8/ByTI+E3K2bxdme
+jQAQL6yyRC5s419MIJTr
+=6/Dc
+-----END PGP SIGNATURE-----
+
+--=_FXxC2VoubfzELdkXQu84zQ1--
+
+
+
+
+From mike.gabriel@das-netzwerkteam.de Sat May 16 09:19:18 2015
+Received: (at 784565) by bugs.debian.org; 16 May 2015 09:19:18 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-10.9 required=4.0 tests=BAYES_00,DIGITS_LETTERS,
+	FOURLA,HAS_BUG_NUMBER,PGPSIGNATURE,T_RP_MATCHES_RCVD autolearn=ham
+	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 31; hammy, 150; neutral, 208; spammy,
+	0. spammytokens: hammytokens:0.000-+--tarballs, 0.000-+--H*c:pgp-signature,
+	0.000-+--H*c:protocol, 0.000-+--H*c:micalg, 0.000-+--H*c:signed
+Return-path: <mike.gabriel@das-netzwerkteam.de>
+Received: from freya.das-netzwerkteam.de ([88.198.48.199])
+	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
+	(Exim 4.80)
+	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
+	id 1YtYFZ-0006BP-Mo
+	for 784565@bugs.debian.org; Sat, 16 May 2015 09:19:18 +0000
+Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
+	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id 434CF3D4F;
+	Sat, 16 May 2015 11:19:13 +0200 (CEST)
+Received: from localhost (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 9294C3BB55;
+	Sat, 16 May 2015 11:19:12 +0200 (CEST)
+X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
+Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
+	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id a-GW73-71I6N; Sat, 16 May 2015 11:19:12 +0200 (CEST)
+Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPS id 224123BB3B;
+	Sat, 16 May 2015 11:19:12 +0200 (CEST)
+Received: from 176.4.79.4 ([176.4.79.4]) by mail.das-netzwerkteam.de (Horde
+ Framework) with HTTP; Sat, 16 May 2015 09:19:12 +0000
+Date: Sat, 16 May 2015 09:19:12 +0000
+Message-ID: <20150516091912.Horde.W_1Szu5msccGYo-Ndwv3cg1@mail.das-netzwerkteam.de>
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+To: 784565@bugs.debian.org, Francesco Poli <invernomuto@paranoici.org>
+Cc: Kevin Vigor <kevin@vigor.nu>, nito.martinez@qindel.com,
+ x2go-dev@lists.x2go.org, opensource@gznianguan.com
+Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: nx-libs-lite: parts
+ are derived from non-free code
+References: <20150506173532.7531.31389.reportbug@homebrew>
+ <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
+ <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
+ <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
+ <55521444.9090407@vigor.nu> <1431445315.4712.7.camel@Nokia-N900>
+ <20150512234048.054319a449ffadcf87577425@paranoici.org>
+ <20150514045809.Horde.-3NIZzBnA5V5B6a721F2kg2@mail.das-netzwerkteam.de>
+In-Reply-To: <20150514045809.Horde.-3NIZzBnA5V5B6a721F2kg2@mail.das-netzwerkteam.de>
+User-Agent: Internet Messaging Program (IMP) H5 (6.2.2)
+Accept-Language: de,en
+Organization: DAS-NETZWERKTEAM
+X-Originating-IP: 176.4.79.4
+X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:32.0) Gecko/20100101
+ Firefox/32.0 Iceweasel/32.0
+Content-Type: multipart/signed; boundary="=_n6jEwcfiXkrvf2B-ZGaJrw3";
+ protocol="application/pgp-signature"; micalg=pgp-sha1
+MIME-Version: 1.0
+
+This message is in MIME format and has been PGP signed.
+
+--=_n6jEwcfiXkrvf2B-ZGaJrw3
+Content-Type: text/plain; charset=us-ascii; format=flowed; DelSp=Yes
+Content-Disposition: inline
+Content-Transfer-Encoding: quoted-printable
+
+Hi all, esp. Kevin,
+
+On  Do 14 Mai 2015 06:58:09 CEST, Mike Gabriel wrote:
+
+I looked at dxpc releases (I obtained upstream tarballs from=20=20
+snapshot.debian.org).
+
+I=20currently have:
+
+"""
+[mike@minobo dxpc.nxrebase (upstream-nxrebase)]$ git log
+commit 0676a768a96383641a73a72ecd2e1083322e6abe
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Date:   Sat May 16 10:52:24 2015 +0200
+
+     Imported Upstream version 3.9.2
+
+commit 4ccf34b2c4763dfb01dceb8588b204b0d029cc3d
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Date:   Sat May 16 10:51:04 2015 +0200
+
+     Imported Upstream version 3.9.1
+
+commit dd8f60ce63c70ed605a2e1717feb7128e59fb8e6
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Date:   Sat May 16 10:49:19 2015 +0200
+
+     Imported Upstream version 3.9.0
+
+commit 01c990099aea802405f8d39c0b819ee1742c185c
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Date:   Sat May 16 10:32:06 2015 +0200
+
+     Imported Upstream version 3.8.2
+
+commit 48df60b3b946a08541ee48371634f074e875adda
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Date:   Sat May 16 10:31:57 2015 +0200
+
+     Imported Upstream version 3.8.0
+
+commit 11d81444d0f86a67f9b8483cbfa33343714b26e9
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Date:   Sat May 16 10:31:53 2015 +0200
+
+     Imported Upstream version 3.7.0
+
+commit e4f550abd4cd49ecc2381e717a55a9940087a376
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Date:   Sat May 16 10:31:44 2015 +0200
+
+     Imported Upstream version 3.5.0
+"""
+
+> @Kevin: I will take you off this mail thread's Cc: field with my=20=20
+>=20next post. Feel free to follow-up via #784565 [1] on the Debian bug=20=
+=20
+>=20tracker. Thanks a lot for being so responsive and generous with=20=20
+>=20providing information.
+
+With this post I actually reincluded you because it becomes technical=20=20
+from=20here on and I probably will need your expertise on DXPC. Not sure=20=
+=20
+if=20you have time or prio or are willing to provide that. Would you be=20=
+=20
+open=20for answering technical questions on DXPC and esp. the changes=20=20
+between=203.7.0 and 3.8.1/3.8.2? I'd highly appreciate that.
+
+As I have not heard back neither from Brian Pane, Zachary Vonler nor=20=20
+Gian=20Filippo Pinzari (we had Ascension Day and maybe a prolonged=20=20
+weekend=20that people used for going on VAC), I will try looking at the=20=
+=20
+DXPC=20changes between 3.7.0 and 3.8.1. Obviously, NoMachine forked=20=20
+NXCOMP=20from DXPC some time between DXPC 3.7.0 and DXPC 3.8.0.
+
+Questions to Kevin:
+
+   o Is there any SVN upstream repo still online
+     (I saw it in one of the tarballs, that SVN was
+     used for 3.9.0).
+   o Do you have any tarballs documenting the
+     changes between 3.7.0 and 3.8.0? Do you also
+     have the 3.8.1 tarball?
+   o Did the 3.8.0 version of DXPC break proto
+     compatibility (i.e., you could not use client
+     3.7.0 and server 3.8.0 and vice versa with
+     each other)?
+
+Any help on this is appreciated. Thanks.
+
+Mike
+
+
+--=20
+
+DAS-NETZWERKTEAM
+mike=20gabriel, herweg 7, 24357 fleckeby
+fon: +49 (1520) 1976 148
+
+GnuPG Key ID 0x25771B31
+mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
+
+freeBusy:
+https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x=
+fb
+
+--=_n6jEwcfiXkrvf2B-ZGaJrw3
+Content-Type: application/pgp-signature
+Content-Description: Digitale PGP-Signatur
+Content-Disposition: inline
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJVVwuPAAoJEJr0azAldxsxAqoQAI1IOApnU8WLZH+VT1GIgtvx
+XxuBALPeR8KobmGRfJd4bSzeIpAqw+JSGa0/XApTwjYbpsIUKnMrEfoHfS0wt4Tb
+ZmSiHL4XCYa6SCGOAbSe89QXNA8kS4ewQMSaPTZhGvoR6wIjdNfxXDN5aO6TkUlw
+qw786fMKYcj9htNnshlq264uSfkrMusFEw614dnfKEVnx8YrIUU5lNY9AInShO9S
+K0vy1vn53/Ie5Fec1FK0WUsT4xTu7NW80Ch0+IgopURIl9NmlomJVRwoDLbR47Ox
+6dFVGJ5VKmOt+oW2g4YAdti8YNhSYteyPgTAPMdtU4XqkHV5/RepCoV/6gr3/YR1
+To63WGpt2B+jl2d4OAPuWWdTRucB2QYsCz/jCvLKeLcg2ODHZJXhSzVYlIie0uFY
+SRvqM8qW+WyuYek2vZDneKvDB2eUqMhRb5dmSeod9UR+3RYTq+JrFUoDq65PONbM
+A0QZ+cG0EkQdxG/1V8yZoMRgxPOtb+AZcMIjC5NikWUsyIkGjMHNHSbJCboJBlyM
+DdyRCTxuM09cpzNxS7Ph0z0iSdQZAl2D7vPCAY1jwyLdu7Xra/p3aM6pqeYuIaWh
+OpoF/sRq08CjWmgVe7MdfkgxZQxW4qIdOeNYGUDIADzzj6cHdNV+WP13ISizeoyO
+u4cspyl/6lFu3TyMWkh8
+=fu9u
+-----END PGP SIGNATURE-----
+
+--=_n6jEwcfiXkrvf2B-ZGaJrw3--
+
+
+
+
+From zvonler@gmail.com Mon May 18 15:05:45 2015
+Received: (at 784565) by bugs.debian.org; 18 May 2015 15:05:46 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-5.3 required=4.0 tests=BAYES_00,DKIM_SIGNED,
+	DKIM_VALID,DKIM_VALID_AU,FOURLA,FREEMAIL_FROM,HAS_BUG_NUMBER,HTML_MESSAGE,
+	MULTALT,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_PASS
+	autolearn=ham autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 14; hammy, 104; neutral, 41; spammy,
+	1. spammytokens:0.940-+--H*c:alternative
+	hammytokens:0.000-+--D*das-netzwerkteam.de, 0.000-+--sk:mikega,
+	0.000-+--sk:mike.ga, 0.000-+--U*mike.gabriel,
+	0.000-+--mike.gabriel@das-netzwerkteam.de
+Return-path: <zvonler@gmail.com>
+Received: from mail-ob0-f181.google.com ([209.85.214.181])
+	by buxtehude.debian.org with esmtps (TLS1.2:RSA_ARCFOUR_SHA1:128)
+	(Exim 4.80)
+	(envelope-from <zvonler@gmail.com>)
+	id 1YuMbx-0004SF-RZ
+	for 784565@bugs.debian.org; Mon, 18 May 2015 15:05:45 +0000
+Received: by obblk2 with SMTP id lk2so127830096obb.0
+        for <784565@bugs.debian.org>; Mon, 18 May 2015 08:05:39 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+        d=gmail.com; s=20120113;
+        h=mime-version:date:message-id:subject:from:to:content-type;
+        bh=nHgAzYNhWTJXAXb1d3jfmZVOFHEEaolqyRCNmCThusM=;
+        b=ilsboi8m+iXF7pVv2MVsvJqi8Es4/o3Awnfg5nSzWVB34kDB0g7zczoEfC4d9km/Bn
+         WDerLV30mJ+OfaRA5elHld2CsY9ByX2MuU73jj2kNenlEV15s7LdJxYsWiZeKM4AEeOw
+         gGF3oU3A/FfhVUrhoPjcGXiF7xjXh1kkPGjkmXFJgthTnyJQjrL6Kw6jfsqhQtbEpqnc
+         5hsWFCNR7O780T1pkf+MisASrWFXI3oolY4EV8/P6OeEWmmKd7L9h8YHPegOdFq543qZ
+         na9coEvmwpnReWORK79ycOgZa1DwiX1h2SvS+wgigQx8j9ZlJld5SpJFTcV3vSJxmICQ
+         i7Wg==
+MIME-Version: 1.0
+X-Received: by 10.202.89.131 with SMTP id n125mr19222614oib.91.1431961538959;
+ Mon, 18 May 2015 08:05:38 -0700 (PDT)
+Received: by 10.202.212.10 with HTTP; Mon, 18 May 2015 08:05:38 -0700 (PDT)
+Date: Mon, 18 May 2015 10:05:38 -0500
+Message-ID: <CAAnzQj-6Tgiar-GOxXx9FXU21cU4Be05Yo3zUSgr094sYXZP+w@mail.gmail.com>
+Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: nx-libs-lite: parts are
+ derived from non-free code
+From: Zach Vonler <zvonler@gmail.com>
+To: 784565@bugs.debian.org
+Content-Type: multipart/alternative; boundary=001a113d381edcb3e205165c863b
+
+--001a113d381edcb3e205165c863b
+Content-Type: text/plain; charset=UTF-8
+
+On Thu, 14 May 2015 05:55:42 +0000 Mike Gabriel <
+mike.gabriel@das-netzwerkteam.de> wrote:
+
+>
+> TL;DR; So here comes my actual question: are you (Brian Pane, Zachary
+> Vonler, Gian Filippo Pinzari) ok with retroactively regarding
+> pre-3.8.1 code of DXPC (that you probably all worked on at that time)
+> as BSD-2-clause? Are you ok with others having taken or taking the
+> pre-3.8.1 DXPC code and distribute it in a modified form?
+>
+
+
+> A yes from all of you as DXPC copyright holders is essential for the
+> continuation of nx-libs development under a free license. This may
+> also possibly be an issue for NXv4 in case parts of it have been
+> derived from DXPC.
+
+
+Yes, I am fine with considering the license change to be retroactive to
+cover the time I was the maintainer.
+
+I have no objections to others distributing modified versions of that code.
+
+Zach
+
+--001a113d381edcb3e205165c863b
+Content-Type: text/html; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+
+<div dir=3D"ltr">On Thu, 14 May 2015 05:55:42 +0000 Mike Gabriel &lt;<a hre=
+f=3D"mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel@das-netzwerkteam=
+.de</a>&gt; wrote:<br><div><blockquote class=3D"gmail_quote" style=3D"margi=
+n:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204=
+);border-left-style:solid;padding-left:1ex"><br>TL;DR; So here comes my act=
+ual question: are you (Brian Pane, Zachary =C2=A0<br>Vonler, Gian Filippo P=
+inzari) ok with retroactively regarding =C2=A0<br>pre-3.8.1 code of DXPC (t=
+hat you probably all worked on at that time) =C2=A0<br>as BSD-2-clause? Are=
+ you ok with others having taken or taking the =C2=A0<br>pre-3.8.1 DXPC cod=
+e and distribute it in a modified form?<br></blockquote><div>=C2=A0</div><b=
+lockquote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-le=
+ft-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;pad=
+ding-left:1ex">A yes from all of you as DXPC copyright holders is essential=
+ for the =C2=A0<br>continuation of nx-libs development under a free license=
+. This may =C2=A0<br>also possibly be an issue for NXv4 in case parts of it=
+ have been =C2=A0<br>derived from DXPC.</blockquote><div>=C2=A0</div></div>=
+<div>Yes, I am fine with considering the license change to be retroactive t=
+o cover the time I was the maintainer.</div><div><br></div><div>I have no o=
+bjections to others distributing modified versions of that code.</div><div>=
+<br></div><div>Zach</div></div>
+
+--001a113d381edcb3e205165c863b--
+
+
+
+From kevin@vigor.nu Mon May 18 21:26:12 2015
+Received: (at 784565) by bugs.debian.org; 18 May 2015 21:26:12 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-8.0 required=4.0 tests=BAYES_00,FOURLA,
+	HAS_BUG_NUMBER,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=ham
+	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 16; hammy, 150; neutral, 121; spammy,
+	0. spammytokens: hammytokens:0.000-+--tarballs, 0.000-+--H*f:sk:2015050,
+	0.000-+--3.9.0, 0.000-+--3.8.0, 0.000-+--H*UA:31.0
+Return-path: <kevin@vigor.nu>
+Received: from gateway13.websitewelcome.com ([69.56.148.12])
+	by buxtehude.debian.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:256)
+	(Exim 4.80)
+	(envelope-from <kevin@vigor.nu>)
+	id 1YuSY8-0004Mq-9I
+	for 784565@bugs.debian.org; Mon, 18 May 2015 21:26:12 +0000
+Received: by gateway13.websitewelcome.com (Postfix, from userid 5007)
+	id 248D59C09927E; Mon, 18 May 2015 15:38:28 -0500 (CDT)
+Received: from gator4058.hostgator.com (gator4058.hostgator.com [192.185.4.69])
+	by gateway13.websitewelcome.com (Postfix) with ESMTP id 1EB399C099246
+	for <784565@bugs.debian.org>; Mon, 18 May 2015 15:38:28 -0500 (CDT)
+Received: from [63.158.132.10] (port=43192 helo=[10.50.3.84])
+	by gator4058.hostgator.com with esmtpsa (UNKNOWN:DHE-RSA-AES128-SHA:128)
+	(Exim 4.82)
+	(envelope-from <kevin@vigor.nu>)
+	id 1YuRnv-0001VU-8i; Mon, 18 May 2015 15:38:27 -0500
+Message-ID: <555A4DC1.2040900@vigor.nu>
+Date: Mon, 18 May 2015 14:38:25 -0600
+From: Kevin Vigor <kevin@vigor.nu>
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0
+MIME-Version: 1.0
+To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 
+ 784565@bugs.debian.org, Francesco Poli <invernomuto@paranoici.org>
+CC: nito.martinez@qindel.com, x2go-dev@lists.x2go.org, 
+ opensource@gznianguan.com
+Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: nx-libs-lite: parts
+ are derived from non-free code
+References: <20150506173532.7531.31389.reportbug@homebrew> <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de> <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org> <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de> <55521444.9090407@vigor.nu> <1431445315.4712.7.camel@Nokia-N900> <20150512234048.054319a449ffadcf87577425@paranoici.org> <20150514045809.Horde.-3NIZzBnA5V5B6a721F2kg2@mail.das-netzwerkteam.de> <20150516091912.Horde.W_1Szu5msccGYo-Ndwv3cg1@mail.das-netzwerkteam.de>
+In-Reply-To: <20150516091912.Horde.W_1Szu5msccGYo-Ndwv3cg1@mail.das-netzwerkteam.de>
+Content-Type: text/plain; charset=windows-1252; format=flowed
+Content-Transfer-Encoding: 7bit
+X-AntiAbuse: This header was added to track abuse, please include it with any abuse report
+X-AntiAbuse: Primary Hostname - gator4058.hostgator.com
+X-AntiAbuse: Original Domain - bugs.debian.org
+X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12]
+X-AntiAbuse: Sender Address Domain - vigor.nu
+X-BWhitelist: no
+X-Source-IP: 63.158.132.10
+X-Exim-ID: 1YuRnv-0001VU-8i
+X-Source: 
+X-Source-Args: 
+X-Source-Dir: 
+X-Source-Sender: ([10.50.3.84]) [63.158.132.10]:43192
+X-Source-Auth: kevin@vigor.nu
+X-Email-Count: 2
+X-Source-Cap: a3ZpZ29yO2t2aWdvcjtnYXRvcjQwNTguaG9zdGdhdG9yLmNvbQ==
+X-Greylist: delayed 1495 seconds by postgrey-1.34 at buxtehude; Mon, 18 May 2015 21:26:12 UTC
+
+On 05/16/15 03:19, Mike Gabriel wrote:
+  As I have not heard back neither from Brian Pane, Zachary Vonler nor Gian Filippo Pinzari (we had Ascension Day and maybe a prolonged weekend that people used for going on VAC), I will try looking at the DXPC changes between 3.7.0 and 3.8.1. Obviously, NoMachine forked NXCOMP from DXPC some time between DXPC 3.7.0 and DXPC 3.8.0.
+>
+> Questions to Kevin:
+>
+>    o Is there any SVN upstream repo still online
+>      (I saw it in one of the tarballs, that SVN was
+>      used for 3.9.0).
+
+I'm afraid not. There was never an online repo available, and if I used one personally it is lost to the mists of time.
+
+>    o Do you have any tarballs documenting the
+>      changes between 3.7.0 and 3.8.0? Do you also
+>      have the 3.8.1 tarball?
+
+I have the source tarballs to each of those (including the 3.8.1 version). The 3.8.0 release includes a README-3.8.0 file which documents the changes between 3.7.0 and 3.8.0 reasonably well.
+
+As will be (unfortunately) obvious from examining the deltas between 3.7.0 (the last release by Brian and/or Zachary) and 3.8.0 (the first release by me), I inherited a significant majority of the code.
+
+>    o Did the 3.8.0 version of DXPC break proto
+>      compatibility (i.e., you could not use client
+>      3.7.0 and server 3.8.0 and vice versa with
+>      each other)?
+
+Yes, minor version number bumps were used to indicate compatibility. 3.8.x was incompatible with 3.7.x (and also with 3.9.x).
+
+
+
+
+From kevin@vigor.nu Mon May 18 21:34:50 2015
+Received: (at 784565) by bugs.debian.org; 18 May 2015 21:34:50 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-8.0 required=4.0 tests=BAYES_00,FOURLA,
+	HAS_BUG_NUMBER,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=ham
+	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 39; hammy, 146; neutral, 132; spammy,
+	4. spammytokens:0.999-1--tecnologies, 0.993-1--H*RU:67.18.68.12,
+	0.987-1--D*ascend.com, 0.987-1--H*r:34828 hammytokens:0.000-+--H*f:sk:2015050,
+	 0.000-+--3.8.0, 0.000-+--H*UA:31.0, 0.000-+--H*u:31.0,
+	0.000-+--H*f:sk:2015051
+Return-path: <kevin@vigor.nu>
+Received: from gateway15.websitewelcome.com ([67.18.68.12])
+	by buxtehude.debian.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:256)
+	(Exim 4.80)
+	(envelope-from <kevin@vigor.nu>)
+	id 1YuSgU-0005Jq-92
+	for 784565@bugs.debian.org; Mon, 18 May 2015 21:34:50 +0000
+Received: by gateway15.websitewelcome.com (Postfix, from userid 5007)
+	id 8BB94ED5E6912; Mon, 18 May 2015 16:11:44 -0500 (CDT)
+Received: from gator4058.hostgator.com (gator4058.hostgator.com [192.185.4.69])
+	by gateway15.websitewelcome.com (Postfix) with ESMTP id 84825ED5E68F2
+	for <784565@bugs.debian.org>; Mon, 18 May 2015 16:11:44 -0500 (CDT)
+Received: from [63.158.132.10] (port=34828 helo=[10.50.3.84])
+	by gator4058.hostgator.com with esmtpsa (UNKNOWN:DHE-RSA-AES128-SHA:128)
+	(Exim 4.82)
+	(envelope-from <kevin@vigor.nu>)
+	id 1YuSK7-00005R-B6; Mon, 18 May 2015 16:11:43 -0500
+Message-ID: <555A558E.1020703@vigor.nu>
+Date: Mon, 18 May 2015 15:11:42 -0600
+From: Kevin Vigor <kevin@vigor.nu>
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0
+MIME-Version: 1.0
+To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 
+ 784565@bugs.debian.org, Francesco Poli <invernomuto@paranoici.org>
+CC: nito.martinez@qindel.com, x2go-dev@lists.x2go.org, 
+ opensource@gznianguan.com
+Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: nx-libs-lite: parts
+ are derived from non-free code
+References: <20150506173532.7531.31389.reportbug@homebrew> <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de> <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org> <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de> <55521444.9090407@vigor.nu> <1431445315.4712.7.camel@Nokia-N900> <20150512234048.054319a449ffadcf87577425@paranoici.org> <20150514045809.Horde.-3NIZzBnA5V5B6a721F2kg2@mail.das-netzwerkteam.de> <20150516091912.Horde.W_1Szu5msccGYo-Ndwv3cg1@mail.das-netzwerkteam.de>
+In-Reply-To: <20150516091912.Horde.W_1Szu5msccGYo-Ndwv3cg1@mail.das-netzwerkteam.de>
+Content-Type: text/plain; charset=windows-1252; format=flowed
+Content-Transfer-Encoding: 7bit
+X-AntiAbuse: This header was added to track abuse, please include it with any abuse report
+X-AntiAbuse: Primary Hostname - gator4058.hostgator.com
+X-AntiAbuse: Original Domain - bugs.debian.org
+X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12]
+X-AntiAbuse: Sender Address Domain - vigor.nu
+X-BWhitelist: no
+X-Source-IP: 63.158.132.10
+X-Exim-ID: 1YuSK7-00005R-B6
+X-Source: 
+X-Source-Args: 
+X-Source-Dir: 
+X-Source-Sender: ([10.50.3.84]) [63.158.132.10]:34828
+X-Source-Auth: kevin@vigor.nu
+X-Email-Count: 2
+X-Source-Cap: a3ZpZ29yO2t2aWdvcjtnYXRvcjQwNTguaG9zdGdhdG9yLmNvbQ==
+X-Greylist: delayed 1383 seconds by postgrey-1.34 at buxtehude; Mon, 18 May 2015 21:34:50 UTC
+
+By the way, poking around the interwebs I find there is an archive of the old DXPC mailing list available at:
+
+http://marc.info/?l=dxpc&r=1&w=2
+
+I think you will find this of particular interest:
+
+
+http://marc.info/?l=dxpc&m=93093790813555&w=2
+
+
+List:       dxpc
+Subject:    Re: future tecnologies
+From:       Brian Pane <brianp () cnet ! com>
+Date:       1999-07-02 16:42:18
+[Download message RAW]
+
+Kevin Vigor <kvigor@eng.ascend.com> wrote:
+> On 01-Jul-99 dxpc@mcfeeley.cc.utexas.edu wrote:
+> > Speaking of licensing, are you putting your 3.8.0 changes to the dxpc
+> > code itself under GPL, or are they going to use the original dxpc's
+> > licensing?
+>
+> No, as you can probably guess, I am no fan of the GPL. For stuff on
+> this level, where my hacking is pretty simple and probably devoid of
+> commercial value, I'll just release my changes to the public domain and
+> give up even a copyright interest in them.
+>
+> Your and Zach's copyrights still stand, of course.
+>
+> I *think* that fact that we use the LZO library and API, but do not
+> directly incorporate the code, allows us to escape the clutch of the GPL
+> virus.
+>
+> btw, is there an original dxpc license? I haven't seen anything but a
+> copyright notice, which to my non-lawyerly mind translates as "free to
+> all the world as is, negotiate with copyright owner if modifying or
+> including in some other product".
+
+The copyright banner in the Readme is all the documentation there's ever
+been.  My intent was to allow _any_ distribution, use, and modification
+of the source, without imposing restrictions on the licensing style of
+any system into which others might incorporate the code.  We probably
+should start stating this clearly in the distributions.
+
+-brian
+
+[prev in list] [next in list] [prev in thread] [next in thread]
+
+
+
+From mike.gabriel@das-netzwerkteam.de Mon May 18 21:49:10 2015
+Received: (at 784565) by bugs.debian.org; 18 May 2015 21:49:10 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-6.9 required=4.0 tests=BAYES_00,FOURLA,
+	HAS_BUG_NUMBER,T_RP_MATCHES_RCVD autolearn=ham autolearn_force=no
+	version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 35; hammy, 150; neutral, 281; spammy,
+	0. spammytokens: hammytokens:0.000-+--H*RU:sk:grimnir,
+	0.000-+--H*r:sk:grimnir, 0.000-+--H*RU:78.46.204.98,
+	0.000-+--H*RU:88.198.48.199, 0.000-+--H*RU:sk:freya.d
+Return-path: <mike.gabriel@das-netzwerkteam.de>
+Received: from freya.das-netzwerkteam.de ([88.198.48.199])
+	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
+	(Exim 4.80)
+	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
+	id 1YuSuK-0007oj-Hh
+	for 784565@bugs.debian.org; Mon, 18 May 2015 21:49:10 +0000
+Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
+	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id 253493049
+	for <784565@bugs.debian.org>; Mon, 18 May 2015 23:49:04 +0200 (CEST)
+Received: from localhost (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id ACC2E3BD6C
+	for <784565@bugs.debian.org>; Mon, 18 May 2015 23:49:03 +0200 (CEST)
+X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
+Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
+	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id Hh79XOiBkYIp for <784565@bugs.debian.org>;
+	Mon, 18 May 2015 23:49:03 +0200 (CEST)
+Received: from localhost (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 6CC483BC0D
+	for <784565@bugs.debian.org>; Mon, 18 May 2015 23:49:03 +0200 (CEST)
+Received: from localhost (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 2100C3BD6C
+	for <784565@bugs.debian.org>; Mon, 18 May 2015 23:49:03 +0200 (CEST)
+Received: from [10.139.193.227] (unknown [176.0.38.193])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPSA id 453F63BB1E;
+	Mon, 18 May 2015 23:48:59 +0200 (CEST)
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Reply-To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+To: Kevin Vigor <kevin@vigor.nu>, 784565@bugs.debian.org, Francesco Poli <invernomuto@paranoici.org>
+Cc: nito.martinez@qindel.com, x2go-dev@lists.x2go.org,  opensource@gznianguan.com, zvonler@gmail.com
+Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: nx-libs-lite: parts
+	are derived from non-free code
+X-Mailer: Modest 3.2
+References: <20150506173532.7531.31389.reportbug@homebrew>
+	 <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
+	 <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
+	 <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
+	 <55521444.9090407@vigor.nu> <1431445315.4712.7.camel@Nokia-N900>
+	 <20150512234048.054319a449ffadcf87577425@paranoici.org>
+	 <20150514045809.Horde.-3NIZzBnA5V5B6a721F2kg2@mail.das-netzwerkteam.de>
+	 <20150516091912.Horde.W_1Szu5msccGYo-Ndwv3cg1@mail.das-netzwerkteam.de>
+	  <555A558E.1020703@vigor.nu>
+In-Reply-To: <555A558E.1020703@vigor.nu>
+Content-Type: text/plain; charset=utf-8
+Content-ID: <1431985731.1406.1.camel@Nokia-N900>
+Date: Mon, 18 May 2015 23:48:51 +0200
+Message-Id: <1431985731.1406.2.camel@Nokia-N900>
+Mime-Version: 1.0
+Content-Transfer-Encoding: 8bit
+
+Hi Kevin, hi Zach, hi Francesco, hi all,
+
+@Francesco, please review the recent posts and sum up what to do next.
+
+----- Original message -----
+> By the way, poking around the interwebs I find there is an archive of
+> the old DXPC mailing list available at:
+> 
+> http://marc.info/?l=dxpc&r=1&w=2
+> 
+> I think you will find this of particular interest:
+> 
+> 
+> http://marc.info/?l=dxpc&m=93093790813555&w=2
+
+
+> 
+> 
+> List:             dxpc
+> Subject:       Re: future tecnologies
+> From:             Brian Pane <brianp () cnet ! com>
+> Date:             1999-07-02 16:42:18
+> [Download message RAW]
+> 
+> Kevin Vigor <kvigor@eng.ascend.com> wrote:
+> > On 01-Jul-99 dxpc@mcfeeley.cc.utexas.edu wrote:
+> > > Speaking of licensing, are you putting your 3.8.0 changes to the dxpc
+> > > code itself under GPL, or are they going to use the original dxpc's
+> > > licensing?
+> > 
+> > No, as you can probably guess, I am no fan of the GPL. For stuff on
+> > this level, where my hacking is pretty simple and probably devoid of
+> > commercial value, I'll just release my changes to the public domain and
+> > give up even a copyright interest in them.
+> > 
+> > Your and Zach's copyrights still stand, of course.
+> > 
+> > I *think* that fact that we use the LZO library and API, but do not
+> > directly incorporate the code, allows us to escape the clutch of the
+> > GPL virus.
+> > 
+> > btw, is there an original dxpc license? I haven't seen anything but a
+> > copyright notice, which to my non-lawyerly mind translates as "free to
+> > all the world as is, negotiate with copyright owner if modifying or
+> > including in some other product".
+> 
+> The copyright banner in the Readme is all the documentation there's ever
+> been.   My intent was to allow _any_ distribution, use, and modification
+> of the source, without imposing restrictions on the licensing style of
+> any system into which others might incorporate the code.   We probably
+> should start stating this clearly in the distributions.
+> 
+> -brian
+> 
+> [prev in list] [next in list] [prev in thread] [next in thread]
+
+@Kevin: You are very awesome!
+
+@Francesco: that old post from Brian should be the statement we need, right? As Brian has not answered back, so far, does that post suffice?
+
+I also had a mail from Zach in my mailbox this morning. I managed to get hold of him via phone over the weekend. He posted his agreement to this Debian bug (as message #77) [1] earlier today. @Zach: thanks a lot for that!!!
+
+@Francesco: by looking at [2], I cannot see any hint for Gian Filippo Pinzari being a copyright holder of DXPC. This is stated in the NoMachine files at at least one place, but not in the latest DXPC upstream release. I am on my mobile right now, need to check old versions of DXPC, but if Gian Filippo Pinzari is not listed in the DXPC 3.7.0 release (where nxcomp obviously got forked from), then I think that we don't require his feedback, right?
+
+To my opinion, this issue can be settled. We have direct feedback from Kevin and Zach and Kevin dug out an old post from Brian stating the retroactive nature of the BSD-2-clause while Gian Filippo probably not being a real copyright holder of the original DXPC code. Right?
+
+light+love,
+Mike
+
+[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=77;att=0;bug=784565
+[2] http://www.vigor.nu/dxpc/README
+
+
+-- 
+
+DAS-NETZWERKTEAM
+mike gabriel, herweg 7, 24357 fleckeby
+fon: +49 (1520) 1976148
+
+GnuPG Key ID 0x25771B13
+mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
+
+
+
+
+From invernomuto@paranoici.org Mon May 18 22:15:14 2015
+Received: (at 784565) by bugs.debian.org; 18 May 2015 22:15:14 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-12.0 required=4.0 tests=BAYES_00,DKIM_SIGNED,
+	DKIM_VALID,DKIM_VALID_AU,FOURLA,HAS_BUG_NUMBER,PGPSIGNATURE,SPF_HELO_PASS,
+	SPF_PASS autolearn=ham autolearn_force=no
+	version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 12; hammy, 150; neutral, 220; spammy,
+	0. spammytokens: hammytokens:0.000-+--H*UA:sk:x86_64-,
+	0.000-+--H*x:sk:x86_64-, 0.000-+--H*c:PGP-SHA256, 0.000-+--H*c:SignHturH,
+	0.000-+--H*c:pgp-signature
+Return-path: <invernomuto@paranoici.org>
+Received: from latitanza.investici.org ([82.94.249.234])
+	by buxtehude.debian.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256)
+	(Exim 4.80)
+	(envelope-from <invernomuto@paranoici.org>)
+	id 1YuTJa-0002xP-0G
+	for 784565@bugs.debian.org; Mon, 18 May 2015 22:15:14 +0000
+Received: from [82.94.249.234] (latitanza [82.94.249.234]) (Authenticated sender: invernomuto@paranoici.org) by localhost (Postfix) with ESMTPSA id 921B3120546;
+	Mon, 18 May 2015 22:15:05 +0000 (UTC)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paranoici.org;
+	s=stigmate; t=1431987305;
+	bh=RQEA/1bkAQ71T0PpK/7XelDXEZBLyoVavVl9tpWLzWY=;
+	h=Date:From:To:Cc:Subject:In-Reply-To:References;
+	b=sO+MOEv4mZZNK2g5Om9IC7Og5k2qPAvFepN+ei+3/jCixgNBbvaLuRpMgJw6l1yjD
+	 hpqRYIxtNgyVywgpuiFVACFBuDn1ksfdFrEPNAcgRl//Sert2aOjetbZcKi1VouhXi
+	 eexR8IP81C0C1UjzjeC7zEmF5V+wSyhVs9jKvKfg=
+Received: from frx by homebrew with local (Exim 4.85)
+	(envelope-from <invernomuto@paranoici.org>)
+	id 1YuTIi-0002Se-TN; Tue, 19 May 2015 00:14:20 +0200
+Date: Tue, 19 May 2015 00:14:08 +0200
+From: Francesco Poli <invernomuto@paranoici.org>
+To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Cc: Kevin Vigor <kevin@vigor.nu>, 784565@bugs.debian.org,
+ nito.martinez@qindel.com, x2go-dev@lists.x2go.org,
+ opensource@gznianguan.com, zvonler@gmail.com
+Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: nx-libs-lite: parts
+ are derived from non-free code
+Message-Id: <20150519001408.8e5452a098db48d6867af6cb@paranoici.org>
+In-Reply-To: <1431985731.1406.2.camel@Nokia-N900>
+References: <20150506173532.7531.31389.reportbug@homebrew>
+	<20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
+	<20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
+	<20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
+	<55521444.9090407@vigor.nu>
+	<1431445315.4712.7.camel@Nokia-N900>
+	<20150512234048.054319a449ffadcf87577425@paranoici.org>
+	<20150514045809.Horde.-3NIZzBnA5V5B6a721F2kg2@mail.das-netzwerkteam.de>
+	<20150516091912.Horde.W_1Szu5msccGYo-Ndwv3cg1@mail.das-netzwerkteam.de>
+	<555A558E.1020703@vigor.nu>
+	<1431985731.1406.2.camel@Nokia-N900>
+X-Mailer: Sylpheed 3.5.0beta1 (GTK+ 2.24.25; x86_64-pc-linux-gnu)
+Mime-Version: 1.0
+Content-Type: multipart/signed; protocol="application/pgp-signature";
+ micalg="PGP-SHA256";
+ boundary="Signature=_Tue__19_May_2015_00_14_08_+0200_Wl9eJ95DZcVokEvx"
+
+--Signature=_Tue__19_May_2015_00_14_08_+0200_Wl9eJ95DZcVokEvx
+Content-Type: text/plain; charset=US-ASCII
+Content-Disposition: inline
+Content-Transfer-Encoding: quoted-printable
+
+On Mon, 18 May 2015 23:48:51 +0200 Mike Gabriel wrote:
+
+[...]
+> @Francesco: that old post from Brian should be the statement we need,
+> right? As Brian has not answered back, so far, does that post suffice?
+
+Yes, I am under the impression that it may be considered as evidence
+that Brian had always meant to grant permission to modify, despite not
+being overly clear until DXPC version 3.8.1.
+In other words, it seems that the re-licensing was more intended to be
+a clarification, rather than a change of mind.
+
+>=20
+> I also had a mail from Zach in my mailbox this morning. I managed to
+> get hold of him via phone over the weekend. He posted his agreement
+> to this Debian bug (as message #77) [1] earlier today. @Zach: thanks
+> a lot for that!!!
+
+This is really great!
+
+>=20
+> @Francesco: by looking at [2], I cannot see any hint for Gian Filippo
+> Pinzari being a copyright holder of DXPC. This is stated in the
+> NoMachine files at at least one place, but not in the latest DXPC
+> upstream release. I am on my mobile right now, need to check old
+> versions of DXPC, but if Gian Filippo Pinzari is not listed in
+> the DXPC 3.7.0 release (where nxcomp obviously got forked from),
+> then I think that we don't require his feedback, right?
+
+If it is confirmed that Gian Filippo contributed to the forking of DXPC
+within the NoMachine project, but not directly to DXPC, then I think
+that he made his contributions available under the terms of the GPL v2
+of the NoMachine project.
+If this is the case, no feedback should be required from his side.
+
+>=20
+> To my opinion, this issue can be settled. We have direct feedback
+> from Kevin and Zach and Kevin dug out an old post from Brian stating
+> the retroactive nature of the BSD-2-clause while Gian Filippo probably
+> not being a real copyright holder of the original DXPC code. Right?
+
+Yes, I agree with this analysis.
+The only missing check is the one about Gian Filippo's involvement (as
+explained above).
+
+Thanks a lot to everyone involved in this license fixing effort!
+Bye.
+
+>=20
+> [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=3D77;att=3D0;bug=3D=
+784565
+> [2] http://www.vigor.nu/dxpc/README
+
+
+
+--=20
+ http://www.inventati.org/frx/
+ There's not a second to spare! To the laboratory!
+..................................................... Francesco Poli .
+ GnuPG key fpr =3D=3D CA01 1147 9CD2 EFDF FB82  3925 3E1C 27E1 1F69 BFFE
+
+--Signature=_Tue__19_May_2015_00_14_08_+0200_Wl9eJ95DZcVokEvx
+Content-Type: application/pgp-signature
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVWmQ1AAoJED4cJ+Efab/+FowQALSZya0Xp8IXNA+d0gjQBLGQ
+7eDzaX+kPVKkbYdb7ZDlQF+ZVTwjOnqjf1dDLXWSHwcXYhFd3DeeFB11QfAKXptI
+GyzOt/vrh+w1K2zMb4rR9lxyUKIrKmVI6aOxyRTP7ojqkqqFvpF7ZVkDJZBFCSvx
+LXdAWTaz5NLIH5R4lzvTcTFYmC3JhBtf8m58l4jT3GC1pxoqlYQk0svWOrdlULQZ
+zh1dy6Sf0guwMuOH4pfreTKlNIizFj7BwanoN+tNvYG1sbQnyIwNRKUfG+v5/13P
+3tyjknNDTTE67T40qSv6pcZs46vqMTevL8E+s+wGfcvdKQ5Y2fPQ8Q9yxS6cVxH2
+DXsLV97RFCcdD+ys+7P9j7xYG0e38juu61sU42cNmrb5iU0woB3SJtFvABhioGZg
+TLFi/OxOT6ZTHcZtfwqozVyB1fOesqx3nvwCEE3pNuf58ErxRy1sIXwoChNL4+eo
+ET1kojXBXHER6W6EHno0yz600sJXHE8rco+fv5b5qGBHdLEJ0k80YXQI4FhJQT69
+I8FyASmNX4u6HvH6hRVm2BwE9WrZTUUQRb0m/pEfZVVroiRrqTl/ntvWchXvI2Tt
+IGfoDMtmVbSkh+2DQmsG9oDqiG1pCt3eNkLa1oftlQ7oIQem2MajCOS4QN20PMpU
+d/smtrrNvkmiWuQrjwDF
+=R0ou
+-----END PGP SIGNATURE-----
+
+--Signature=_Tue__19_May_2015_00_14_08_+0200_Wl9eJ95DZcVokEvx--
+
+
+
+From kevin@vigor.nu Tue May 19 01:41:18 2015
+Received: (at 784565) by bugs.debian.org; 19 May 2015 01:41:18 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-6.9 required=4.0 tests=BAYES_00,FOURLA,
+	HAS_BUG_NUMBER,SPF_PASS autolearn=ham autolearn_force=no
+	version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 26; hammy, 131; neutral, 46; spammy,
+	0. spammytokens: hammytokens:0.000-+--H*UA:31.6.0, 0.000-+--H*u:31.6.0,
+	0.000-+--H*f:sk:2015050, 0.000-+--H*UA:31.0, 0.000-+--H*u:31.0
+Return-path: <kevin@vigor.nu>
+Received: from gateway32.websitewelcome.com ([192.185.145.107])
+	by buxtehude.debian.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256)
+	(Exim 4.80)
+	(envelope-from <kevin@vigor.nu>)
+	id 1YuWX0-0002lG-Du
+	for 784565@bugs.debian.org; Tue, 19 May 2015 01:41:18 +0000
+Received: by gateway32.websitewelcome.com (Postfix, from userid 500)
+	id 311BBD143B8C; Mon, 18 May 2015 20:16:29 -0500 (CDT)
+Received: from gator4058.hostgator.com (gator4058.hostgator.com [192.185.4.69])
+	by gateway32.websitewelcome.com (Postfix) with ESMTP id 2F036D143B72
+	for <784565@bugs.debian.org>; Mon, 18 May 2015 20:16:29 -0500 (CDT)
+Received: from [98.202.128.111] (port=49655 helo=[192.168.7.118])
+	by gator4058.hostgator.com with esmtpsa (UNKNOWN:DHE-RSA-AES128-SHA:128)
+	(Exim 4.82)
+	(envelope-from <kevin@vigor.nu>)
+	id 1YuW8y-0004Tt-DX; Mon, 18 May 2015 20:16:28 -0500
+Message-ID: <555A8EE9.9000503@vigor.nu>
+Date: Mon, 18 May 2015 19:16:25 -0600
+From: Kevin Vigor <kevin@vigor.nu>
+User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0
+MIME-Version: 1.0
+To: Francesco Poli <invernomuto@paranoici.org>, 
+ Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+CC: 784565@bugs.debian.org, nito.martinez@qindel.com, 
+ x2go-dev@lists.x2go.org, opensource@gznianguan.com, zvonler@gmail.com
+Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: nx-libs-lite: parts
+ are derived from non-free code
+References: <20150506173532.7531.31389.reportbug@homebrew>	<20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>	<20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>	<20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>	<55521444.9090407@vigor.nu>	<1431445315.4712.7.camel@Nokia-N900>	<20150512234048.054319a449ffadcf87577425@paranoici.org>	<20150514045809.Horde.-3NIZzBnA5V5B6a721F2kg2@mail.das-netzwerkteam.de>	<20150516091912.Horde.W_1Szu5msccGYo-Ndwv3cg1@mail.das-netzwerkteam.de>	<555A558E.1020703@vigor.nu>	<1431985731.1406.2.camel@Nokia-N900> <20150519001408.8e5452a098db48d6867af6cb@paranoici.org>
+In-Reply-To: <20150519001408.8e5452a098db48d6867af6cb@paranoici.org>
+Content-Type: text/plain; charset=windows-1252; format=flowed
+Content-Transfer-Encoding: 7bit
+X-AntiAbuse: This header was added to track abuse, please include it with any abuse report
+X-AntiAbuse: Primary Hostname - gator4058.hostgator.com
+X-AntiAbuse: Original Domain - bugs.debian.org
+X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12]
+X-AntiAbuse: Sender Address Domain - vigor.nu
+X-BWhitelist: no
+X-Source-IP: 98.202.128.111
+X-Exim-ID: 1YuW8y-0004Tt-DX
+X-Source: 
+X-Source-Args: 
+X-Source-Dir: 
+X-Source-Sender: ([192.168.7.118]) [98.202.128.111]:49655
+X-Source-Auth: kevin@vigor.nu
+X-Email-Count: 3
+X-Source-Cap: a3ZpZ29yO2t2aWdvcjtnYXRvcjQwNTguaG9zdGdhdG9yLmNvbQ==
+X-Greylist: delayed 1487 seconds by postgrey-1.34 at buxtehude; Tue, 19 May 2015 01:41:18 UTC
+
+On 5/18/2015 4:14 PM, Francesco Poli wrote:
+> If it is confirmed that Gian Filippo contributed to the forking of 
+> DXPC within the NoMachine project, but not directly to DXPC, then I 
+> think that he made his contributions available under the terms of the 
+> GPL v2 of the NoMachine project. If this is the case, no feedback 
+> should be required from his side.
+I can confirm that Gian Fillippo never contributed directly to DXPC. 
+You'll note his name does not appear in the DXPC README, and never has.
+
+
+
+From mike.gabriel@das-netzwerkteam.de Tue May 19 08:15:28 2015
+Received: (at 784565) by bugs.debian.org; 19 May 2015 08:15:28 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-11.9 required=4.0 tests=BAYES_00,FOURLA,
+	HAS_BUG_NUMBER,PGPSIGNATURE,T_RP_MATCHES_RCVD autolearn=ham
+	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 24; hammy, 150; neutral, 195; spammy,
+	0. spammytokens: hammytokens:0.000-+--H*c:pgp-signature,
+	0.000-+--H*c:protocol, 0.000-+--H*c:micalg, 0.000-+--H*c:signed,
+	0.000-+--H*RU:sk:grimnir
+Return-path: <mike.gabriel@das-netzwerkteam.de>
+Received: from freya.das-netzwerkteam.de ([88.198.48.199])
+	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
+	(Exim 4.80)
+	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
+	id 1YucgR-0008T9-K0
+	for 784565@bugs.debian.org; Tue, 19 May 2015 08:15:28 +0000
+Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
+	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id 7D1773C96;
+	Tue, 19 May 2015 10:15:23 +0200 (CEST)
+Received: from localhost (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 08FEE3BFD5;
+	Tue, 19 May 2015 10:15:23 +0200 (CEST)
+X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
+Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
+	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id MW9pv+xO3WwY; Tue, 19 May 2015 10:15:22 +0200 (CEST)
+Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPS id 97FCC3C2AA;
+	Tue, 19 May 2015 10:15:12 +0200 (CEST)
+Received: from bifrost.das-netzwerkteam.de (bifrost.das-netzwerkteam.de
+ [178.62.101.154]) by mail.das-netzwerkteam.de (Horde Framework) with HTTP;
+ Tue, 19 May 2015 08:15:12 +0000
+Date: Tue, 19 May 2015 08:15:12 +0000
+Message-ID: <20150519081512.Horde.36QI-nOdkbpWsXrDE4E8Yw1@mail.das-netzwerkteam.de>
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+To: Kevin Vigor <kevin@vigor.nu>, 784565@bugs.debian.org, Francesco Poli
+ <invernomuto@paranoici.org>
+Cc: opensource@gznianguan.com, zvonler@gmail.com, nito.martinez@qindel.com,
+ x2go-dev@lists.x2go.org
+Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: Bug#784565:
+ nx-libs-lite: parts are derived from non-free code
+References: <20150506173532.7531.31389.reportbug@homebrew>
+ <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
+ <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
+ <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
+ <55521444.9090407@vigor.nu> <1431445315.4712.7.camel@Nokia-N900>
+ <20150512234048.054319a449ffadcf87577425@paranoici.org>
+ <20150514045809.Horde.-3NIZzBnA5V5B6a721F2kg2@mail.das-netzwerkteam.de>
+ <20150516091912.Horde.W_1Szu5msccGYo-Ndwv3cg1@mail.das-netzwerkteam.de>
+ <555A558E.1020703@vigor.nu> <1431985731.1406.2.camel@Nokia-N900>
+ <20150519001408.8e5452a098db48d6867af6cb@paranoici.org>
+ <555A8EE9.9000503@vigor.nu>
+In-Reply-To: <555A8EE9.9000503@vigor.nu>
+User-Agent: Internet Messaging Program (IMP) H5 (6.2.2)
+Accept-Language: de,en
+Organization: DAS-NETZWERKTEAM
+X-Originating-IP: 178.62.101.154
+X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:32.0) Gecko/20100101
+ Firefox/32.0 Iceweasel/32.0
+Content-Type: multipart/signed; boundary="=_AI4511z4pP7yPmTeeGgEoA6";
+ protocol="application/pgp-signature"; micalg=pgp-sha1
+MIME-Version: 1.0
+
+This message is in MIME format and has been PGP signed.
+
+--=_AI4511z4pP7yPmTeeGgEoA6
+Content-Type: text/plain; charset=us-ascii; format=flowed; DelSp=Yes
+Content-Disposition: inline
+Content-Transfer-Encoding: quoted-printable
+
+Hi Kevin, hi Frederico,
+
+On  Di 19 Mai 2015 03:16:25 CEST, Kevin Vigor wrote:
+
+> On 5/18/2015 4:14 PM, Francesco Poli wrote:
+>> If it is confirmed that Gian Filippo contributed to the forking of=20=20
+>>=20DXPC within the NoMachine project, but not directly to DXPC, then I=20=
+=20
+>>=20think that he made his contributions available under the terms of=20=
+=20
+>>=20the GPL v2 of the NoMachine project. If this is the case, no=20=20
+>>=20feedback should be required from his side.
+
+> I can confirm that Gian Fillippo never contributed directly to DXPC.=20=
+=20
+>=20You'll note his name does not appear in the DXPC README, and never=20=
+=20
+>=20has.
+
+@Kevin: This is again good news for sorting out this issue. Thanks a=20=20
+lot=20for your help, Kevin.
+
+@Frederico: I guess we are through then. Thanks for helping with=20=20
+clarifying=20the situation (and bringing it up in the first place).
+
+For fixing this issue (in terms of closing the bug), I propose this=20=20
+for=20downstream (i.e., Debian):
+
+   o copy bug_784565.mbox [1] into the debian/ folder of the=20=20
+nx-libs-lite=20package
+   o upload some latest release of nx-libs-lite 3.5.0.x to unstable
+   o update debian/copyright accordingly
+   o close this bug via debian/changelog
+
+For upstream, I propose this:
+
+   o copy bug_784565.mbox into the docs/ folder
+   o update copyright information in nxcomp/ subfolder
+   o provide some README or such that shortly explains our last weeks' proc=
+ess
+   o this will be for the upcoming 3.6.x release series of nx-libs
+
+   o this should also be backported to the 3.5.x release series
+
+Once the mbox file and README are upstreamed, I will drop that content=20=
+=20
+from=20the debian/ folder in the Debian package nx-libs-lite (as it will=20=
+=20
+be=20in the upstream tarball of nx-libs-lite).
+
+Feedback (esp. from Frederico), concerns, other suggestions?
+
+Greets,
+Mike
+
+
+[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?mbox=3Dyes;bug=3D784565
+--=20
+
+DAS-NETZWERKTEAM
+mike=20gabriel, herweg 7, 24357 fleckeby
+fon: +49 (1520) 1976 148
+
+GnuPG Key ID 0x25771B31
+mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
+
+freeBusy:
+https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x=
+fb
+
+--=_AI4511z4pP7yPmTeeGgEoA6
+Content-Type: application/pgp-signature
+Content-Description: Digitale PGP-Signatur
+Content-Disposition: inline
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJVWvEQAAoJEJr0azAldxsxiZgP/1MhcK1h2or3zG3P9h3oOqFk
+rsknSn/0paY8HlzggWh5N4juLU9ET/VyO+xMCbVFDXb9jv5ryRI0MinPGwp6ujTl
+DxHAz5q5YrC/NYH9IU0PqL2Zja952xbjlVPgf64+iLT0kqFmY7L48bkxVXd4cKnJ
+flflATeaPTcVgIVcfFte2q/NJV7AAGjwb/tEOOMbqrRYOu1hKLozWnRSLZ/rdl5V
+OmktCjfAfw6Cvy4/IN6pCjG4uqFvsWvzjMofR53MLuy8cwQhtpvK9KPLCZlo9Efm
+KyrFNl866Egmc/HTLQkSaOJOKartANw+Ev7qsVi30OJOEWh9T1fDjnFvLn6hesKf
+9pAS/+mkuCUVNjLI/ATZAwY93bzBS+vo7fya2D/DxDk8FoLIe7XdI9GABdTE2U0H
+eyNLb/Lq485BEQEu9ThtvACZYH3F3UqA7OcFfLKyVw2lsOJV7SN3KCl76te4iNcf
+UlVzVr211lKhGTV9hLF3daKntu1H3jQku9zLK9ShJR6bYTpCAsGi2h2xzZm5PLDE
+9tbf+qUmDn3lp4uMaBtBdtq+yt47Wk95iS41x/qyvy0PK/RdnPxTpfdbriu4+1l2
+ij6Dq5bb7GckZDmpVjSsGSr4jjWtJ5QrnZbpv/u/v3+wliZL0c+CScrA+5I/qJeI
+eGXnQIwqcWE/2/AcAz2r
+=Q2/H
+-----END PGP SIGNATURE-----
+
+--=_AI4511z4pP7yPmTeeGgEoA6--
+
+
+
+
+From invernomuto@paranoici.org Wed May 20 18:04:34 2015
+Received: (at 784565) by bugs.debian.org; 20 May 2015 18:04:34 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-12.0 required=4.0 tests=BAYES_00,DKIM_SIGNED,
+	DKIM_VALID,DKIM_VALID_AU,FOURLA,HAS_BUG_NUMBER,PGPSIGNATURE,SPF_HELO_PASS,
+	SPF_PASS autolearn=ham autolearn_force=no
+	version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 11; hammy, 150; neutral, 212; spammy,
+	0. spammytokens: hammytokens:0.000-+--H*UA:sk:x86_64-,
+	0.000-+--H*x:sk:x86_64-, 0.000-+--H*c:PGP-SHA256, 0.000-+--H*c:SignHturH,
+	0.000-+--H*c:pgp-signature
+Return-path: <invernomuto@paranoici.org>
+Received: from latitanza.investici.org ([82.94.249.234])
+	by buxtehude.debian.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256)
+	(Exim 4.80)
+	(envelope-from <invernomuto@paranoici.org>)
+	id 1Yv8M4-00011u-4i
+	for 784565@bugs.debian.org; Wed, 20 May 2015 18:04:34 +0000
+Received: from [82.94.249.234] (latitanza [82.94.249.234]) (Authenticated sender: invernomuto@paranoici.org) by localhost (Postfix) with ESMTPSA id C5F33121147;
+	Wed, 20 May 2015 18:04:24 +0000 (UTC)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paranoici.org;
+	s=stigmate; t=1432145064;
+	bh=kDc9DoBw4hJZuuDTXyurpbInn9fdFF6IfH4jMVGqQB4=;
+	h=Date:From:To:Cc:Subject:In-Reply-To:References;
+	b=frjvhV6NrKV9TyZSGeK6evsHeI9sAgoPOPboFwSAIij0bPp1G5rCLaVWFjD1RtFsK
+	 j+6I/XZ60KTIjiXaQGqqznF3jU2dQ/lzPkj1VYKa9Kmt1pw4UhJvU+mbyrO6cX2mSi
+	 52Wi1of3M+l/UT9DYKjXgzMRuWkYoAq4tmsOe9jY=
+Received: from frx by homebrew with local (Exim 4.85)
+	(envelope-from <invernomuto@paranoici.org>)
+	id 1Yv8LB-0001gi-7y; Wed, 20 May 2015 20:03:37 +0200
+Date: Wed, 20 May 2015 20:03:25 +0200
+From: Francesco Poli <invernomuto@paranoici.org>
+To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Cc: Kevin Vigor <kevin@vigor.nu>, 784565@bugs.debian.org,
+ opensource@gznianguan.com, zvonler@gmail.com, nito.martinez@qindel.com,
+ x2go-dev@lists.x2go.org
+Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: Bug#784565:
+ nx-libs-lite: parts are derived from non-free code
+Message-Id: <20150520200325.6641876f5b4b2f483bdaea7d@paranoici.org>
+In-Reply-To: <20150519081512.Horde.36QI-nOdkbpWsXrDE4E8Yw1@mail.das-netzwerkteam.de>
+References: <20150506173532.7531.31389.reportbug@homebrew>
+	<20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
+	<20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
+	<20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
+	<55521444.9090407@vigor.nu>
+	<1431445315.4712.7.camel@Nokia-N900>
+	<20150512234048.054319a449ffadcf87577425@paranoici.org>
+	<20150514045809.Horde.-3NIZzBnA5V5B6a721F2kg2@mail.das-netzwerkteam.de>
+	<20150516091912.Horde.W_1Szu5msccGYo-Ndwv3cg1@mail.das-netzwerkteam.de>
+	<555A558E.1020703@vigor.nu>
+	<1431985731.1406.2.camel@Nokia-N900>
+	<20150519001408.8e5452a098db48d6867af6cb@paranoici.org>
+	<555A8EE9.9000503@vigor.nu>
+	<20150519081512.Horde.36QI-nOdkbpWsXrDE4E8Yw1@mail.das-netzwerkteam.de>
+X-Mailer: Sylpheed 3.5.0beta1 (GTK+ 2.24.25; x86_64-pc-linux-gnu)
+Mime-Version: 1.0
+Content-Type: multipart/signed; protocol="application/pgp-signature";
+ micalg="PGP-SHA256";
+ boundary="Signature=_Wed__20_May_2015_20_03_25_+0200__3Vr7Ml7uHmX7EzV"
+
+--Signature=_Wed__20_May_2015_20_03_25_+0200__3Vr7Ml7uHmX7EzV
+Content-Type: text/plain; charset=US-ASCII
+Content-Disposition: inline
+Content-Transfer-Encoding: quoted-printable
+
+On Tue, 19 May 2015 08:15:12 +0000 Mike Gabriel wrote:
+
+[...]
+> @Frederico: I guess we are through then.
+
+Yes, it seems so (I'm assuming you meant to direct this question to
+me...).
+
+> Thanks for helping with =20
+> clarifying the situation (and bringing it up in the first place).
+
+You're welcome!
+Thanks to you and all the involved people for helping to solve this
+issue.
+
+>=20
+> For fixing this issue (in terms of closing the bug), I propose this =20
+> for downstream (i.e., Debian):
+>=20
+>    o copy bug_784565.mbox [1] into the debian/ folder of the =20
+> nx-libs-lite package
+
+Maybe the entire bug log is an overkill...
+I would include the relevant replies only. For instance:
+https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=3D40;mbox=3Dyes;bug=3D784=
+565
+https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=3D77;mbox=3Dyes;bug=3D784=
+565
+https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=3D87;mbox=3Dyes;bug=3D784=
+565
+https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=3D102;mbox=3Dyes;bug=3D78=
+4565
+
+>    o upload some latest release of nx-libs-lite 3.5.0.x to unstable
+>    o update debian/copyright accordingly
+
+In the debian/copyright file the license for the original DXPC code
+should be replaced with the 2-clause BSD license (currently adopted for
+DXPC) with a comment saying something like:
+
+  The original DXPC code used to be available under a license which
+  failed to explicitly grant the permission to modify, but was later
+  retroactively re-licensed under the 2-clause BSD license (see
+  debian/bug_784565_*.mbox for the copyright owners' statements; see
+  <https://bugs.debian.org/784565> for more details)
+
+Moreover, the copyright notice of Gian Filippo Pinzari should be
+documented in some more appropriate part of the debian/copyright file,
+associated with the NoMachine license (GPL v2 or later).
+
+>    o close this bug via debian/changelog
+>=20
+> For upstream, I propose this:
+>=20
+>    o copy bug_784565.mbox into the docs/ folder
+
+Again, I would not include the entire bug log, but only the relevant
+messages (see above)...
+
+>    o update copyright information in nxcomp/ subfolder
+>    o provide some README or such that shortly explains our last weeks' pr=
+ocess
+>    o this will be for the upcoming 3.6.x release series of nx-libs
+>=20
+>    o this should also be backported to the 3.5.x release series
+
+
+Thanks to everyone involved!
+Bye.
+
+--=20
+ http://www.inventati.org/frx/
+ There's not a second to spare! To the laboratory!
+..................................................... Francesco Poli .
+ GnuPG key fpr =3D=3D CA01 1147 9CD2 EFDF FB82  3925 3E1C 27E1 1F69 BFFE
+
+--Signature=_Wed__20_May_2015_20_03_25_+0200__3Vr7Ml7uHmX7EzV
+Content-Type: application/pgp-signature
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVXMxyAAoJED4cJ+Efab/+yUsP/RWzC9NoVGF7UnEIEpJODu0u
+hVkX1zjpJ+iMByHVlatR90ulKwkvVb4d354YJqyI0VM2wUtif6XBoroB0K3i6vZE
+DsxugBlzhnH8jgpPVKbOyBKshpKKZsUbvDdEXM20ZkfI4xwokymiSdHOKoHH4ZHS
+WN9q+i6OezfWvZSKQ+VCbe7QiQABAcB+zCdVvUWevhNqMDKdhsDC03Ju+5YZQbse
+QbgYSazZvJouLPamivquh8nBdjGpPxqAJGrlUu3SR5slJxRojRvl2cl/CDFEQEQR
+gbLMnnr2nj1hF4JI2WaWCSX90NrGTfGxCN4IdNd7tmjtkg5lB+KFx63YjHbLmUl/
+k87XAyXxSWyGvc7M2xyIXBQQrHtRxtK0rdN+e7ht9PcXYyxUtQzr7vfPwvI+B2GV
+M23ZUoyV1rFp5JymbUL4Vk6pq/hLnv9FzwOySNVcj6Pt8eT+BcoSbwOI1AMq1P1S
+wCs/PhEGBA3TDWERXF0Fb7x24NEf7EdjmzKTGGdXTCfSkacxkGzsMaRpWb0D6IaV
+tSI6CmBQ9uOdkbiNDhGX4esosyJZJQ9GrnWX9d/lTs9wXUHHykvnYRbDzpkChZdI
+ICqc+IxnPmX6HU2kyq2ZAzfhx/drqLizcv0gQlyY6APjRu3EQ3tapR9kYB6BcuGU
+cMLlO0549ekk8/s3Zk0i
+=9Hew
+-----END PGP SIGNATURE-----
+
+--Signature=_Wed__20_May_2015_20_03_25_+0200__3Vr7Ml7uHmX7EzV--
+
+
+
+From mike.gabriel@das-netzwerkteam.de Thu May 21 09:35:35 2015
+Received: (at 784565) by bugs.debian.org; 21 May 2015 09:35:35 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-11.9 required=4.0 tests=BAYES_00,FOURLA,
+	HAS_BUG_NUMBER,PGPSIGNATURE,T_RP_MATCHES_RCVD autolearn=ham
+	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 15; hammy, 150; neutral, 222; spammy,
+	0. spammytokens: hammytokens:0.000-+--H*c:pgp-signature,
+	0.000-+--H*c:protocol, 0.000-+--H*c:micalg, 0.000-+--H*c:signed,
+	0.000-+--H*RU:sk:grimnir
+Return-path: <mike.gabriel@das-netzwerkteam.de>
+Received: from freya.das-netzwerkteam.de ([88.198.48.199])
+	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
+	(Exim 4.80)
+	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
+	id 1YvMt4-0006Ry-Ri
+	for 784565@bugs.debian.org; Thu, 21 May 2015 09:35:35 +0000
+Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
+	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id 89FD21F2;
+	Thu, 21 May 2015 11:35:31 +0200 (CEST)
+Received: from localhost (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id C86AC3BAE9;
+	Thu, 21 May 2015 11:35:30 +0200 (CEST)
+X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
+Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
+	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id GqfEjOoeH2CA; Thu, 21 May 2015 11:35:30 +0200 (CEST)
+Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPS id 615DC3BAB2;
+	Thu, 21 May 2015 11:35:30 +0200 (CEST)
+Received: from bifrost.das-netzwerkteam.de (bifrost.das-netzwerkteam.de
+ [178.62.101.154]) by mail.das-netzwerkteam.de (Horde Framework) with HTTP;
+ Thu, 21 May 2015 09:35:30 +0000
+Date: Thu, 21 May 2015 09:35:30 +0000
+Message-ID: <20150521093530.Horde.Oeys0xv-mTUN5U5IZtdeLA1@mail.das-netzwerkteam.de>
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+To: Francesco Poli <invernomuto@paranoici.org>, 784565@bugs.debian.org
+Cc: nito.martinez@qindel.com, opensource@gznianguan.com
+Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: Bug#784565:
+ Bug#784565: nx-libs-lite: parts are derived from non-free code
+References: <20150506173532.7531.31389.reportbug@homebrew>
+ <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
+ <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
+ <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
+ <55521444.9090407@vigor.nu> <1431445315.4712.7.camel@Nokia-N900>
+ <20150512234048.054319a449ffadcf87577425@paranoici.org>
+ <20150514045809.Horde.-3NIZzBnA5V5B6a721F2kg2@mail.das-netzwerkteam.de>
+ <20150516091912.Horde.W_1Szu5msccGYo-Ndwv3cg1@mail.das-netzwerkteam.de>
+ <555A558E.1020703@vigor.nu> <1431985731.1406.2.camel@Nokia-N900>
+ <20150519001408.8e5452a098db48d6867af6cb@paranoici.org>
+ <555A8EE9.9000503@vigor.nu>
+ <20150519081512.Horde.36QI-nOdkbpWsXrDE4E8Yw1@mail.das-netzwerkteam.de>
+ <20150520200325.6641876f5b4b2f483bdaea7d@paranoici.org>
+In-Reply-To: <20150520200325.6641876f5b4b2f483bdaea7d@paranoici.org>
+User-Agent: Internet Messaging Program (IMP) H5 (6.2.2)
+Accept-Language: de,en
+Organization: DAS-NETZWERKTEAM
+X-Originating-IP: 178.62.101.154
+X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:32.0) Gecko/20100101
+ Firefox/32.0 Iceweasel/32.0
+Content-Type: multipart/signed; boundary="=_5hM8_j7kivGPCYTZql9Fug5";
+ protocol="application/pgp-signature"; micalg=pgp-sha1
+MIME-Version: 1.0
+
+This message is in MIME format and has been PGP signed.
+
+--=_5hM8_j7kivGPCYTZql9Fug5
+Content-Type: text/plain; charset=us-ascii; format=flowed; DelSp=Yes
+Content-Disposition: inline
+Content-Transfer-Encoding: quoted-printable
+
+Control: forwarded -1 https://github.com/ArcticaProject/nx-libs/issues/30
+
+Hi Francesco,
+
+On  Mi 20 Mai 2015 20:03:25 CEST, Francesco Poli wrote:
+
+> On Tue, 19 May 2015 08:15:12 +0000 Mike Gabriel wrote:
+>
+> [...]
+>> @Frederico: I guess we are through then.
+>
+> Yes, it seems so (I'm assuming you meant to direct this question to
+> me...).
+
+Yes. :-)
+
+>> For fixing this issue (in terms of closing the bug), I propose this
+>> for downstream (i.e., Debian):
+>>
+>>    o copy bug_784565.mbox [1] into the debian/ folder of the
+>> nx-libs-lite package
+>
+> Maybe the entire bug log is an overkill...
+> I would include the relevant replies only. For instance:
+> https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=3D40;mbox=3Dyes;bug=3D7=
+84565
+> https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=3D77;mbox=3Dyes;bug=3D7=
+84565
+> https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=3D87;mbox=3Dyes;bug=3D7=
+84565
+> https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=3D102;mbox=3Dyes;bug=3D=
+784565
+
+ACK.
+
+>>    o upload some latest release of nx-libs-lite 3.5.0.x to unstable
+>>    o update debian/copyright accordingly
+>
+> In the debian/copyright file the license for the original DXPC code
+> should be replaced with the 2-clause BSD license (currently adopted for
+> DXPC) with a comment saying something like:
+>
+>   The original DXPC code used to be available under a license which
+>   failed to explicitly grant the permission to modify, but was later
+>   retroactively re-licensed under the 2-clause BSD license (see
+>   debian/bug_784565_*.mbox for the copyright owners' statements; see
+>   <https://bugs.debian.org/784565> for more details)
+>
+> Moreover, the copyright notice of Gian Filippo Pinzari should be
+> documented in some more appropriate part of the debian/copyright file,
+> associated with the NoMachine license (GPL v2 or later).
+>
+>>    o close this bug via debian/changelog
+>>
+>> For upstream, I propose this:
+>>
+>>    o copy bug_784565.mbox into the docs/ folder
+>
+> Again, I would not include the entire bug log, but only the relevant
+> messages (see above)...
+>
+>>    o update copyright information in nxcomp/ subfolder
+>>    o provide some README or such that shortly explains our last=20=20
+>>=20weeks' process
+>>    o this will be for the upcoming 3.6.x release series of nx-libs
+>>
+>>    o this should also be backported to the 3.5.x release series
+
+Doing all the above now.
+
+Thanks to all,
+Mike
+
+--=20
+
+DAS-NETZWERKTEAM
+mike=20gabriel, herweg 7, 24357 fleckeby
+fon: +49 (1520) 1976 148
+
+GnuPG Key ID 0x25771B31
+mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
+
+freeBusy:
+https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x=
+fb
+
+--=_5hM8_j7kivGPCYTZql9Fug5
+Content-Type: application/pgp-signature
+Content-Description: Digitale PGP-Signatur
+Content-Disposition: inline
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJVXabiAAoJEJr0azAldxsxd4cP/in26lIPvdANMyDaqq3zQOMh
+n/Q+oZK5SYnHQP7vaS4mOWjTw5tCbfcUMcKwu1KpbgpUGOl9e1c/oKGxR3j5GWh3
+XiqQhPWEMf64OsM4vW5prJFrx0VNqfxykMWbGzQfs6Dz9ihJ6+HzVudOk3bfHwj2
+GahCflRo7xA1hJjwz5cIX1/WJaAF25TVSQ43jVpPu0pnAYOWvhOAZMpTJTZqRbgT
+peuFaiKE+NOb4C/WO9mkuO3wlEBZ5Ef/RinKQDlbV5/CZElEs1f42A4t5q909EVi
+U2PpaEis8BJAIKetl8g/bPoHh9u6X3tbeOKJlZBo5l2SMyLUG0sYsoAyhJKJtIvk
+gwdGdO71A7HLEJ6DfvE8vYXUPy9JEOQ6hhL2qeZOtJG2DZ2Qcoll9eK5scg2YutW
+ZXHRTYcCQeS4PQpvQPlCR5LuFTJeNBwJ0cWgtfXYPIrPMyeEZj/VP+Ypm82hBT+I
+JFjo80QjOEJ7uEM1wmn8nD0rbbP/NVf6ot/UcwlejC/XaYIlWDW5FrXf18UbGsvu
+VzaHkLbhbGUYedwsb50Uu6Nn4IX8IEcF3zbwnqmB5IlbPYV0UokjgtnKEIQbdmF4
+fQ5xe5u/p2aZTnQwt39vey2W/RxJVOHRjVVrYGv0eqgda8TYOWzI3UIjSYGfuLcU
+kDRest50Qfy4tmilPx3z
+=Cf5/
+-----END PGP SIGNATURE-----
+
+--=_5hM8_j7kivGPCYTZql9Fug5--
+
+
+
+
diff --git a/nxcomp/LICENSE b/nxcomp/LICENSE
index 2b3203474..02ab0e272 100644
--- a/nxcomp/LICENSE
+++ b/nxcomp/LICENSE
@@ -1,4 +1,5 @@
-Copyright (c) 2001, 2010 NoMachine - http://www.nomachine.com/.
+Copyright (c) 2001,2010 NoMachine - http://www.nomachine.com/.
+Copyright (c) 2000,2003 Gian Filippo Pinzari
 
 NXCOMP library and NX extensions to X are copyright of NoMachine.
 Redistribution and use of this software is allowed according to the
@@ -18,6 +19,8 @@ along with this program; if not, you can request a copy to NoMachine
 or write to the Free Software Foundation, Inc., 59 Temple Place, Suite
 330, Boston, MA  02111-1307 USA
 
+==============================================================================
+
 Parts of this software are derived from DXPC project. These copyright
 notices apply to original DXPC code:
 
@@ -29,9 +32,59 @@ THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 
-Copyright (c) 1995,1996 Brian Pane
+Copyright (c) 1995,1996,2000,2006 Brian Pane
 Copyright (c) 1996,1997 Zachary Vonler and Brian Pane
 Copyright (c) 1999 Kevin Vigor and Brian Pane
-Copyright (c) 2000,2006 Gian Filippo Pinzari and Brian Pane
+<crossed-out>Copyright (c) 2000,2006 Gian Filippo Pinzari and Brian Pane</crossed-out>
+
+All rights reserved.
+
+==============================================================================
+
+Update 2015-05-21 on the nature of the original DXPC license: The
+original DXPC code used to be available under a license which failed to
+explicitly grant the permission to modify, but was later retroactively
+re-licensed under the 2-clause BSD license (see
+README.on-retroactive-DXPC-license for the copyright owners' statements;
+see <https://bugs.debian.org/784565> for more details).
+
+In the course of discussion, it also became evident that Gian Filippo
+Pinzari never participated in any of the official DXPC releases, but
+rather worked on the forked code on the NoMachine side. Thus, we
+crossed-out his name in the above copyright notice and moved him to the
+top list of copyright holders associated with the GPL-2 re-licensing done
+by NoMachine.
 
+Thus, the version of DXPC where NXCOMP got forked from (most likely some
+DXPC version between release 3.7.0 and release 3.8.0) can be considered
+as BSD-2-clause, as quoted below:
+
+Copyright (c) 1995,1996 Brian Pane
+Copyright (c) 1996,1997 Zachary Vonler and Brian Pane
+Copyright (c) 1999-2002 Kevin Vigor and Brian Pane
 All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
diff --git a/nxcomp/Misc.cpp b/nxcomp/Misc.cpp
index 0095eaa74..5d53524cf 100644
--- a/nxcomp/Misc.cpp
+++ b/nxcomp/Misc.cpp
@@ -384,9 +384,9 @@ static const char CopyrightInfo[] =
 Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.\n\
 \n\
 NXCOMP, NX protocol compression and NX extensions to this software \n\
-are copyright of NoMachine. Redistribution and use of the present\n\
-software is allowed according to terms specified in the file LICENSE\n\
-which comes in the source distribution.\n\
+are copyright of NoMachine. Redistribution (modified or unmodified) and
+use of the present\n\ software is allowed according to terms specified in
+the file LICENSE\n\ which comes in the source distribution.\n\
 \n\
 Check http://www.nomachine.com/licensing.html for applicability.\n\
 \n\
diff --git a/nxcomp/README.on-retroactive-DXPC-license b/nxcomp/README.on-retroactive-DXPC-license
new file mode 100644
index 000000000..d7fc8c560
--- /dev/null
+++ b/nxcomp/README.on-retroactive-DXPC-license
@@ -0,0 +1,269 @@
+On DXPC retroactive relicensing as BSD-2-clause
+===============================================
+
+TL;DR; In May 2015, all versions of DXPC released before version 3.8.1 (sometime
+in 2002) have retroactively been re-licensed by all previous maintainers
+of DXPC as BSD-2-clause.
+
+This README file gives an overview of the discussion thread that lead to
+the retroactive re-licensing of DXPC.
+
+For the full discussion, see doc/DXPC_re-licensed::debbug_784565.mbox in
+this source project or #784565 on the Debian bug tracker [1].
+
+light+love,
+20150521, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=784565
+
+------------------------------------------------------------------------------
+
+STEP 1
+======
+
+In May 2015, a serious license issue around the nxcomp code shipped in
+this source project was raised and solved on the Debian bug tracker (thanks to
+Francesco Poli and many others): http://bugs.debian.org/784565
+
+"""
+From: "Francesco Poli \(wintermute\)" <invernomuto@paranoici.org>
+To: Debian Bug Tracking System <submit@bugs.debian.org>
+Date: Wed, 06 May 2015 19:35:32 +0200
+
+I noticed that the debian/copyright states:
+
+[...]
+| Parts of this software are derived from DXPC project. These copyright
+| notices apply to original DXPC code:
+|
+|    Redistribution and use in source and binary forms are permitted provided
+|    that the above copyright notice and this paragraph are duplicated in all
+|    such forms.
+|
+|    THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+|    WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+|    MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+|
+|    Copyright (c) 1995,1996 Brian Pane
+|    Copyright (c) 1996,1997 Zachary Vonler and Brian Pane
+|    Copyright (c) 1999 Kevin Vigor and Brian Pane
+|    Copyright (c) 2000,2001 Gian Filippo Pinzari and Brian Pane
+[...]
+
+This license lacks the permission to modify the DXPC code.
+Hence, the original DXPC code does not appear to comply with the
+DFSG. And the nx-libs-lite is in part derived from DXPC code.
+
+This basically means that nx-libs-lite includes parts which are
+non-free (as they are derived from non-modifiable code) and
+are also possibly legally undistributable (as they are non-modifiable,
+but actually modified). The combination with the rest of nx-libs-lite
+(which is GPL-licensed) may also be legally undistributable (since
+the license with no permission to modify is GPL-incompatible).
+
+
+If there's anything I misunderstood, please clarify.
+
+Otherwise, please address this issue as soon as possible.
+The copyright owners for the original DXPC code should be
+contacted and persuaded to re-license under GPL-compatible
+terms.
+"""
+The issue has been settled by asking all recent maintainers (i.e.,
+copyright holders) of DXPC, to agree on considering the BSD-2-clause
+license (as introduced in DXPC 3.8.1) retro-actively as the license of
+all pre-3.8.1 DXPC releases.
+"""
+
+STEP 2:
+=======
+
+Kevin Vigor, the (at that time being) latest known maintainer of DXPC
+replied back immediately and provided the info given below. He also
+stated that he agrees to applying BSD-2-clause retroactively to all
+pre-3.8.1 releases of DXPC.
+
+"""
+From: Kevin Vigor <kevin@vigor.nu>
+To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+CC: 784565@bugs.debian.org, [...]
+Subject: Re: Bug#784565: nx-libs-lite: parts are derived from non-free code
+
+Hi Mike, et al,
+
+   I am not the original author of dxpc, that being Brian Pane. However,
+   I took over maintenance circa 1999 and am still the primary maintainer
+   (though the project has effectively been dead for most of a decade
+   now).
+
+   As you are aware, when I inherited the code, it was licensed under a
+   variant of the BSD license that did not include the 'with
+   modification' clause. To the best of my recollection, somebody from
+   the FSF contacted me circa 2001 regarding this and as a result,
+   subsequent releases were done under a standard 2-clause BSD license
+   with the modification clause. Again, to the best of my recollection, I
+   contacted Brian about this change and he offered no objection.
+
+   Further, I recall distinctly that NoMachine contacted me and
+   explicitly asked permission before including DXPC code in NX, which I
+   happily granted with no new conditions beyond the BSD license already
+   in play.
+
+   It is possible, though by no means certain, that I could dig up
+   ancient email to corroborate this account if necessary. However, I am
+   more than willing to publicly state that I believe NoMachine's use of
+   DXPC code to be both legal and ethical, and that my intent when
+   changing the license to 2-clause BSD was simply to clarity the
+   existing intent and that it ought therefore be considered retroactive.
+
+   Yours,
+      Kevin Vigor
+
+[...]
+"""
+
+STEP 3:
+-------
+
+We were not able to dig out any recent mail address of Zachary Volner,
+another of the DXPC copyright holders, but a phone number.
+
+On Friday, May 15th, I (Mike Gabriel) called that phone number and left a
+message on - hopefully - Zach's voicebox, asking him to mail me, so I
+could explain everything. He mailed back and later on posted the below
+statement to the Debian BTS, also expressing his agreement to the
+retroactive re-licensing of DXPC.
+
+"""
+Date: Mon, 18 May 2015 10:05:38 -0500
+Subject: Re: Bug#784565: nx-libs-lite: parts are derived from non-free code
+From: Zach Vonler <zvonler@gmail.com>
+To: 784565@bugs.debian.org
+
+On Thu, 14 May 2015 05:55:42 +0000 Mike Gabriel <
+mike.gabriel@das-netzwerkteam.de> wrote:
+
+>
+> TL;DR; So here comes my actual question: are you (Brian Pane, Zachary
+> Vonler, Gian Filippo Pinzari) ok with retroactively regarding
+> pre-3.8.1 code of DXPC (that you probably all worked on at that time)
+> as BSD-2-clause? Are you ok with others having taken or taking the
+> pre-3.8.1 DXPC code and distribute it in a modified form?
+>
+
+
+> A yes from all of you as DXPC copyright holders is essential for the
+> continuation of nx-libs development under a free license. This may
+> also possibly be an issue for NXv4 in case parts of it have been
+> derived from DXPC.
+
+
+Yes, I am fine with considering the license change to be retroactive to
+cover the time I was the maintainer.
+
+I have no objections to others distributing modified versions of that code.
+
+Zach
+"""
+
+STEP 4:
+-------
+
+By 18th May 2015, Brian Pane had not mailed back to us. Hoping he is well
+and alive. Giving my personal gratitude to him for his work on DXPC back
+in the nighties.
+
+However, Kevin found an old archive of the DXPC mailing lists, esp. a
+post by Brian expressing openness to modifications of all DXPC code
+versions.
+
+We refer to this regarding his consent on the re-licensing.
+
+"""
+Date: Mon, 18 May 2015 15:11:42 -0600
+From: Kevin Vigor <kevin@vigor.nu>
+To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>,  784565@bugs.debian.org, Francesco Poli <invernomuto@paranoici.org>
+CC: [...]
+Subject: Re: Bug#784565: nx-libs-lite: parts are derived from non-free code
+
+By the way, poking around the interwebs I find there is an archive of the old DXPC mailing list available at:
+
+http://marc.info/?l=dxpc&r=1&w=2
+
+I think you will find this of particular interest:
+
+
+http://marc.info/?l=dxpc&m=93093790813555&w=2
+
+
+List:       dxpc
+Subject:    Re: future tecnologies
+From:       Brian Pane <brianp () cnet ! com>
+Date:       1999-07-02 16:42:18
+[Download message RAW]
+
+Kevin Vigor <kvigor@eng.ascend.com> wrote:
+> On 01-Jul-99 dxpc@mcfeeley.cc.utexas.edu wrote:
+> > Speaking of licensing, are you putting your 3.8.0 changes to the dxpc
+> > code itself under GPL, or are they going to use the original dxpc's
+> > licensing?
+>
+> No, as you can probably guess, I am no fan of the GPL. For stuff on
+> this level, where my hacking is pretty simple and probably devoid of
+> commercial value, I'll just release my changes to the public domain and
+> give up even a copyright interest in them.
+>
+> Your and Zach's copyrights still stand, of course.
+>
+> I *think* that fact that we use the LZO library and API, but do not
+> directly incorporate the code, allows us to escape the clutch of the GPL
+> virus.
+>
+> btw, is there an original dxpc license? I haven't seen anything but a
+> copyright notice, which to my non-lawyerly mind translates as "free to
+> all the world as is, negotiate with copyright owner if modifying or
+> including in some other product".
+
+The copyright banner in the Readme is all the documentation there's ever
+been.  My intent was to allow _any_ distribution, use, and modification
+of the source, without imposing restrictions on the licensing style of
+any system into which others might incorporate the code.  We probably
+should start stating this clearly in the distributions.
+
+-brian
+
+[prev in list] [next in list] [prev in thread] [next in thread]
+"""
+
+STEP 5:
+-------
+
+Last but not least, Kevin informed us that Gian Filippo Pinzari never
+contributed any code to any of the official DPXC releases. So we assumed
+that his copyrights on the code stem from the time where he - under the
+NoMachine umbrella - worked on the code and should probably be associated
+with the GPL-2 re-licensing of the code later on done by NoMachine
+(which we did in the LICENSE file).
+
+It also appears, that there has been an incongruity between the copyright
+statement in nxcomp/Misc.cpp and nxcomp/LICENSE for Gian Filippo Pinzari.
+We used the copyright years (2000,2003) from nxcomp/Misc.cpp instead of
+those originally given in nxcomp/LICENSE (2000,2006).
+
+"""
+Date: Mon, 18 May 2015 19:16:25 -0600
+From: Kevin Vigor <kevin@vigor.nu>
+To: Francesco Poli <invernomuto@paranoici.org>,
+ Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+CC: 784565@bugs.debian.org, [...]
+Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: nx-libs-lite: parts are derived from non-free code
+
+On 5/18/2015 4:14 PM, Francesco Poli wrote:
+> If it is confirmed that Gian Filippo contributed to the forking of
+> DXPC within the NoMachine project, but not directly to DXPC, then I
+> think that he made his contributions available under the terms of the
+> GPL v2 of the NoMachine project. If this is the case, no feedback
+> should be required from his side.
+I can confirm that Gian Fillippo never contributed directly to DXPC.
+You'll note his name does not appear in the DXPC README, and never has.
+"""
-- 
cgit v1.2.3


From 5bc91ad49ffaf48af7240871aa2cdf50d07c6ecc Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Thu, 28 May 2015 22:36:59 +0200
Subject: nxcomp/Misc.cpp: fix build failure introduced in
 1f44331574bdbe4069d13e4c26df18094b49e658.

---
 nxcomp/Misc.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Misc.cpp b/nxcomp/Misc.cpp
index 5d53524cf..3297d8ee8 100644
--- a/nxcomp/Misc.cpp
+++ b/nxcomp/Misc.cpp
@@ -384,9 +384,9 @@ static const char CopyrightInfo[] =
 Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.\n\
 \n\
 NXCOMP, NX protocol compression and NX extensions to this software \n\
-are copyright of NoMachine. Redistribution (modified or unmodified) and
-use of the present\n\ software is allowed according to terms specified in
-the file LICENSE\n\ which comes in the source distribution.\n\
+are copyright of NoMachine. Redistribution (modified or unmodified) and\n\
+use of the present software is allowed according to terms specified in\n\
+the file LICENSE which comes in the source distribution.\n\
 \n\
 Check http://www.nomachine.com/licensing.html for applicability.\n\
 \n\
-- 
cgit v1.2.3


From 4ed85e8ef572130d7862b155d3ee9c1e52743230 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Fri, 29 May 2015 11:15:19 +0200
Subject: nxcomp/README.on-retroactive-DXPC-license: Some layout and
 interpunctuation fixes.

---
 nxcomp/README.on-retroactive-DXPC-license | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nxcomp')

diff --git a/nxcomp/README.on-retroactive-DXPC-license b/nxcomp/README.on-retroactive-DXPC-license
index d7fc8c560..9ff3c1db6 100644
--- a/nxcomp/README.on-retroactive-DXPC-license
+++ b/nxcomp/README.on-retroactive-DXPC-license
@@ -69,11 +69,11 @@ The copyright owners for the original DXPC code should be
 contacted and persuaded to re-license under GPL-compatible
 terms.
 """
+
 The issue has been settled by asking all recent maintainers (i.e.,
 copyright holders) of DXPC, to agree on considering the BSD-2-clause
 license (as introduced in DXPC 3.8.1) retro-actively as the license of
 all pre-3.8.1 DXPC releases.
-"""
 
 STEP 2:
 =======
-- 
cgit v1.2.3


From 5a64974cc5f0e9001cb0ddba4cb2c956ba43f7df Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Tue, 16 Jun 2015 22:43:21 +0200
Subject: nxcomp/Loop.cpp: tiny whitespace fix. No functional change.

---
 nxcomp/Loop.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 0ab0dd988..7d17c19c8 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -8120,7 +8120,7 @@ int WriteLocalData(int fd, const char *buffer, int size)
     ret = select(fd+1, NULL, &writeSet, NULL, &selectTs);
 
     #ifdef DEBUG
-    *logofs << "Loop: WriteLocalData: select() returned with a code of " << ret << " and remaining timeout of " 
+    *logofs << "Loop: WriteLocalData: select() returned with a code of " << ret << " and remaining timeout of "
             << selectTs.tv_sec << " sec, " << selectTs.tv_usec << "usec\n" << logofs_flush;
     #endif
 
-- 
cgit v1.2.3


From 00cec4924157db9498d56e5c1fbde852e8eb3717 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Sun, 12 Jul 2015 01:52:29 +0200
Subject: Add pkg-config support to nxcomp, nxcompext and nxcompshad

---
 nxcomp/Makefile.in          | 19 +++++++++++--------
 nxcomp/configure.in         |  5 ++++-
 nxcomp/nxcomp.pc.in         | 15 +++++++++++++++
 nxcompext/Makefile.in       | 19 +++++++++++--------
 nxcompext/configure.in      |  5 ++++-
 nxcompext/nxcompext.pc.in   | 13 +++++++++++++
 nxcompshad/Makefile.in      | 19 +++++++++++--------
 nxcompshad/configure.in     |  5 ++++-
 nxcompshad/nxcompshad.pc.in | 13 +++++++++++++
 9 files changed, 86 insertions(+), 27 deletions(-)
 create mode 100644 nxcomp/nxcomp.pc.in
 create mode 100644 nxcompext/nxcompext.pc.in
 create mode 100644 nxcompshad/nxcompshad.pc.in

(limited to 'nxcomp')

diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in
index 6022747cb..a8647cead 100644
--- a/nxcomp/Makefile.in
+++ b/nxcomp/Makefile.in
@@ -58,14 +58,15 @@ LIBS        = @LIBS@
 # Other autoconfigured settings, not used at the moment.
 #
 
-srcdir      = @srcdir@
-prefix      = @prefix@
-exec_prefix = @exec_prefix@
-bindir      = @bindir@
-man1dir     = @mandir@/man1
-VPATH       = @srcdir@
-libdir      = @libdir@
-includedir  = @includedir@
+srcdir       = @srcdir@
+prefix       = @prefix@
+exec_prefix  = @exec_prefix@
+bindir       = @bindir@
+man1dir      = @mandir@/man1
+VPATH        = @srcdir@
+libdir       = @libdir@
+includedir   = @includedir@
+pkgconfigdir = @pkgconfigdir@
 
 INSTALL         = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -292,6 +293,7 @@ install.lib: all
 	$(INSTALL_DATA) $(LIBARCHIVE)           $(DESTDIR)${libdir}
 	$(INSTALL_DATA) NX*.h                   $(DESTDIR)${includedir}/nx
 	$(INSTALL_DATA) MD5.h                   $(DESTDIR)${includedir}/nx
+	$(INSTALL_DATA) nxcomp.pc               $(DESTDIR)${pkgconfigdir}
 	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
 
 install.man:
@@ -313,6 +315,7 @@ uninstall.lib:
 	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXrender.h
 	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXvars.h
 	$(RM_FILE) $(DESTDIR)${includedir}/nx/MD5.h
+	$(RM_FILE) $(DESTDIR)${pkgconfigdir}/nxcomp.pc
 	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
 
 uninstall.man:
diff --git a/nxcomp/configure.in b/nxcomp/configure.in
index 43b51573a..206df2ec7 100644
--- a/nxcomp/configure.in
+++ b/nxcomp/configure.in
@@ -5,6 +5,9 @@ dnl Prolog
 AC_INIT(NX.h)
 AC_PREREQ(2.13)
 
+pkgconfigdir=${libdir}/pkgconfig
+AC_SUBST(pkgconfigdir)
+
 dnl Set our default compilation flags.
 
 CXXFLAGS="$CXXFLAGS -O3 -fno-rtti -fno-exceptions"
@@ -387,4 +390,4 @@ else
     ALL="\$(LIBFULL) \$(LIBLOAD) \$(LIBSHARED) \$(LIBARCHIVE)"
 fi
 
-AC_OUTPUT(Makefile)
+AC_OUTPUT(Makefile nxcomp.pc)
diff --git a/nxcomp/nxcomp.pc.in b/nxcomp/nxcomp.pc.in
new file mode 100644
index 000000000..f4d3a7efb
--- /dev/null
+++ b/nxcomp/nxcomp.pc.in
@@ -0,0 +1,15 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: nxcomp
+Description: NX Compression Library
+Version: @VERSION@
+#libjepg does not provide a pkgconfig-file, zlib does not provide it for older versions
+#Requires: libjpeg zlib
+Requires: libpng
+Requires.private: x11
+Cflags: -I${includedir} -I${includedir}/nx
+Libs: -L${libdir} -lXcomp
+
diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in
index b33c5aaf3..b66a4c361 100644
--- a/nxcompext/Makefile.in
+++ b/nxcompext/Makefile.in
@@ -50,14 +50,15 @@ LIBS        = @LIBS@ -lz -lNX_X11 -lXcomp
 # LIBS = @LIBS@ -lz -ljpeg -lpthread -lNX_X11 -lXcomp
 #
 
-srcdir      = @srcdir@
-prefix      = @prefix@
-exec_prefix = @exec_prefix@
-bindir      = @bindir@
-man1dir     = @mandir@/man1
-VPATH       = @srcdir@
-libdir = @libdir@
-includedir = @includedir@
+srcdir       = @srcdir@
+prefix       = @prefix@
+exec_prefix  = @exec_prefix@
+bindir       = @bindir@
+man1dir      = @mandir@/man1
+VPATH        = @srcdir@
+libdir       = @libdir@
+includedir   = @includedir@
+pkgconfigdir = @pkgconfigdir@
 
 INSTALL         = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -171,6 +172,7 @@ install.lib: all
 	$(INSTALL_LINK) $(LIBLOAD)              $(DESTDIR)${libdir}
 	$(INSTALL_LINK) $(LIBSHARED)            $(DESTDIR)${libdir}
 	$(INSTALL_DATA) NX*.h                   $(DESTDIR)${includedir}/nx
+	$(INSTALL_DATA) nxcompext.pc            $(DESTDIR)${pkgconfigdir}
 	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
 
 install.man:
@@ -185,6 +187,7 @@ uninstall.lib:
 	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBSHARED)
 	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXlib.h
 	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXlibint.h
+	$(RM_FILE) $(DESTDIR)${pkgconfigdir}/nxcompext.pc
 	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
 
 uninstall.man:
diff --git a/nxcompext/configure.in b/nxcompext/configure.in
index e6f13c0ea..eb6604dba 100644
--- a/nxcompext/configure.in
+++ b/nxcompext/configure.in
@@ -5,6 +5,9 @@ dnl Prolog
 AC_INIT(NXlib.h)
 AC_PREREQ(2.13)
 
+pkgconfigdir=${libdir}/pkgconfig
+AC_SUBST(pkgconfigdir)
+
 dnl Reset default compilation flags.
 
 CXXFLAGS="$CXXFLAGS -O3"
@@ -243,4 +246,4 @@ else
     ALL="\$(LIBFULL) \$(LIBLOAD) \$(LIBSHARED) \$(LIBARCHIVE)"
 fi
 
-AC_OUTPUT(Makefile)
+AC_OUTPUT(Makefile nxcompext.pc)
diff --git a/nxcompext/nxcompext.pc.in b/nxcompext/nxcompext.pc.in
new file mode 100644
index 000000000..669397af6
--- /dev/null
+++ b/nxcompext/nxcompext.pc.in
@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: nxcompext
+Description: Extension for NX Compression Library
+Version: @VERSION@
+Requires: nxcomp
+Requires.private: x11
+Cflags: -I${includedir} -I${includedir}/nx
+Libs: -L${libdir} -lXcompext
+
diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in
index 3e5c33a22..5b1abebed 100644
--- a/nxcompshad/Makefile.in
+++ b/nxcompshad/Makefile.in
@@ -68,14 +68,15 @@ LIBS        = @LIBS@ -lNX_X11
 # LIBS = $(LIBS) -lmpatrol -lbfd -liberty
 #
 
-srcdir      = @srcdir@
-prefix      = @prefix@
-exec_prefix = @exec_prefix@
-bindir      = @bindir@
-man1dir     = @mandir@/man1
-VPATH       = @srcdir@
-libdir      = @libdir@
-includedir  = @includedir@
+srcdir       = @srcdir@
+prefix       = @prefix@
+exec_prefix  = @exec_prefix@
+bindir       = @bindir@
+man1dir      = @mandir@/man1
+VPATH        = @srcdir@
+libdir       = @libdir@
+includedir   = @includedir@
+pkgconfigdir = @pkgconfigdir@
 
 INSTALL         = @INSTALL@
 INSTALL_DIR     = $(INSTALL) -d -o root -g root -m 0755 
@@ -206,6 +207,7 @@ install.lib: all
 	$(INSTALL_LINK) $(LIBSHARED)            $(DESTDIR)${libdir}
 	$(INSTALL_DATA) $(LIBARCHIVE)           $(DESTDIR)${libdir}
 	$(INSTALL_DATA) *.h                     $(DESTDIR)${includedir}/nx
+	$(INSTALL_DATA) nxcompshad.pc           $(DESTDIR)${pkgconfigdir}
 	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
 
 install.man:
@@ -222,6 +224,7 @@ uninstall.lib:
 	for header in *.h; do $(RM_FILE) $(DESTDIR)${includedir}/nx/$$header; done
 	$(RM_DIR) $(DESTDIR)${libdir}/nx/
 	$(RM_DIR) $(DESTDIR)${includedir}/nx/
+	$(RM_FILE) $(DESTDIR)${pkgconfigdir}/nxcompshad.pc
 	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
 
 uninstall.man:
diff --git a/nxcompshad/configure.in b/nxcompshad/configure.in
index 8dd1b2e21..8468b4733 100644
--- a/nxcompshad/configure.in
+++ b/nxcompshad/configure.in
@@ -5,6 +5,9 @@ dnl Prolog
 AC_INIT(Shadow.h)
 AC_PREREQ(2.13)
 
+pkgconfigdir=${libdir}/pkgconfig
+AC_SUBST(pkgconfigdir)
+
 dnl Reset default compilation flags.
 
 CXXFLAGS="$CXXFLAGS -O3"
@@ -281,4 +284,4 @@ if test -z "${MAKEDEPEND}"; then
   fi
 fi
 
-AC_OUTPUT(Makefile)
+AC_OUTPUT(Makefile nxcompshad.pc)
diff --git a/nxcompshad/nxcompshad.pc.in b/nxcompshad/nxcompshad.pc.in
new file mode 100644
index 000000000..4d4265c76
--- /dev/null
+++ b/nxcompshad/nxcompshad.pc.in
@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: nxcompshad
+Description: Shadow Session Support for NX Compression Library
+Version: @VERSION@
+Requires: nxcomp
+Requires.private: x11
+Cflags: -I${includedir} -I${includedir}/nx
+Libs: -L${libdir} -lXcompshad
+
-- 
cgit v1.2.3


From 39ae817885b1555a3a660b5c80a2d45c1ff29568 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 14 Jul 2015 01:39:17 +0200
Subject: nxcomp{,shad,ext}: Remove nxcomp*.pc file on clean and distclean.

---
 nxcomp/Makefile.in     | 2 +-
 nxcompext/Makefile.in  | 2 +-
 nxcompshad/Makefile.in | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in
index a8647cead..f01d47b4f 100644
--- a/nxcomp/Makefile.in
+++ b/nxcomp/Makefile.in
@@ -321,7 +321,7 @@ uninstall.lib:
 uninstall.man:
 
 clean:
-		-rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \
+		-rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* *.pc \
 		@ALL@
 
 distclean:	clean
diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in
index b66a4c361..7a83b4fd1 100644
--- a/nxcompext/Makefile.in
+++ b/nxcompext/Makefile.in
@@ -193,7 +193,7 @@ uninstall.lib:
 uninstall.man:
 
 clean:
-		-rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \
+		-rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* *.pc \
 		@ALL@
 
 distclean:	clean
diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in
index 5b1abebed..9068b1a30 100644
--- a/nxcompshad/Makefile.in
+++ b/nxcompshad/Makefile.in
@@ -230,7 +230,7 @@ uninstall.lib:
 uninstall.man:
 
 clean:
-		-rm -f *~ *.o *.gch *.bak st?????? core core.* *.out.* *.exe.stackdump \
+		-rm -f *~ *.o *.gch *.bak st?????? core core.* *.out.* *.exe.stackdump *.pc \
 		$(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) $(LIBDLL) $(LIBDLLSTATIC) $(PROGRAM) $(PROGRAM).exe
 
 distclean:	clean
-- 
cgit v1.2.3


From ee0ed871a0ba1de21dbd3c035ebdddd2ff248469 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 14 Jul 2015 14:43:34 +0200
Subject: nxcomp{,ext,shad}/Makefile.in: Create pkgconfigdir before putting
 files in it.

---
 nxcomp/Makefile.in     | 1 +
 nxcompext/Makefile.in  | 1 +
 nxcompshad/Makefile.in | 1 +
 3 files changed, 3 insertions(+)

(limited to 'nxcomp')

diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in
index f01d47b4f..b4d11e53b 100644
--- a/nxcomp/Makefile.in
+++ b/nxcomp/Makefile.in
@@ -287,6 +287,7 @@ install.bin:
 install.lib: all
 	./mkinstalldirs $(DESTDIR)${libdir}
 	./mkinstalldirs $(DESTDIR)${includedir}/nx
+	./mkinstalldirs $(DESTDIR)${pkgconfigdir}
 	$(INSTALL_DATA) $(LIBFULL)              $(DESTDIR)${libdir}
 	$(INSTALL_LINK) $(LIBLOAD)              $(DESTDIR)${libdir}
 	$(INSTALL_LINK) $(LIBSHARED)            $(DESTDIR)${libdir}
diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in
index 7a83b4fd1..a8a94353b 100644
--- a/nxcompext/Makefile.in
+++ b/nxcompext/Makefile.in
@@ -168,6 +168,7 @@ install.bin:
 install.lib: all
 	./mkinstalldirs $(DESTDIR)${libdir}
 	./mkinstalldirs $(DESTDIR)${includedir}/nx
+	./mkinstalldirs $(DESTDIR)${pkgconfigdir}
 	$(INSTALL_DATA) $(LIBFULL)              $(DESTDIR)${libdir}
 	$(INSTALL_LINK) $(LIBLOAD)              $(DESTDIR)${libdir}
 	$(INSTALL_LINK) $(LIBSHARED)            $(DESTDIR)${libdir}
diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in
index 9068b1a30..3b4dc0745 100644
--- a/nxcompshad/Makefile.in
+++ b/nxcompshad/Makefile.in
@@ -202,6 +202,7 @@ install.bin:
 install.lib: all
 	$(INSTALL_DIR)                          $(DESTDIR)${libdir}
 	$(INSTALL_DIR)                          $(DESTDIR)${includedir}/nx
+	$(INSTALL_DIR)                          $(DESTDIR)${pkgconfigdir}
 	$(INSTALL_DATA) $(LIBFULL)              $(DESTDIR)${libdir}
 	$(INSTALL_LINK) $(LIBLOAD)              $(DESTDIR)${libdir}
 	$(INSTALL_LINK) $(LIBSHARED)            $(DESTDIR)${libdir}
-- 
cgit v1.2.3


From 6615de8dd9a08dd3c6cd0d6bebdb6158b32844f6 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Wed, 26 Aug 2015 00:29:14 +0200
Subject: create pkgcnfig dir before copying anything

---
 nxcomp/Makefile.in     | 1 +
 nxcompext/Makefile.in  | 1 +
 nxcompshad/Makefile.in | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in
index a8647cead..83da1ec4f 100644
--- a/nxcomp/Makefile.in
+++ b/nxcomp/Makefile.in
@@ -287,6 +287,7 @@ install.bin:
 install.lib: all
 	./mkinstalldirs $(DESTDIR)${libdir}
 	./mkinstalldirs $(DESTDIR)${includedir}/nx
+	./mkinstalldirs $(DESTDIR)${pkgconfigdir}
 	$(INSTALL_DATA) $(LIBFULL)              $(DESTDIR)${libdir}
 	$(INSTALL_LINK) $(LIBLOAD)              $(DESTDIR)${libdir}
 	$(INSTALL_LINK) $(LIBSHARED)            $(DESTDIR)${libdir}
diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in
index b66a4c361..66388f86d 100644
--- a/nxcompext/Makefile.in
+++ b/nxcompext/Makefile.in
@@ -167,6 +167,7 @@ install.bin:
 
 install.lib: all
 	./mkinstalldirs $(DESTDIR)${libdir}
+	./mkinstalldirs $(DESTDIR)${pkgconfigdir}
 	./mkinstalldirs $(DESTDIR)${includedir}/nx
 	$(INSTALL_DATA) $(LIBFULL)              $(DESTDIR)${libdir}
 	$(INSTALL_LINK) $(LIBLOAD)              $(DESTDIR)${libdir}
diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in
index 5b1abebed..da10f7cad 100644
--- a/nxcompshad/Makefile.in
+++ b/nxcompshad/Makefile.in
@@ -76,7 +76,7 @@ man1dir      = @mandir@/man1
 VPATH        = @srcdir@
 libdir       = @libdir@
 includedir   = @includedir@
-pkgconfigdir = @pkgconfigdir@
+pkgconfigdir = @libdir@/pkgconfig
 
 INSTALL         = @INSTALL@
 INSTALL_DIR     = $(INSTALL) -d -o root -g root -m 0755 
@@ -201,6 +201,7 @@ install.bin:
 
 install.lib: all
 	$(INSTALL_DIR)                          $(DESTDIR)${libdir}
+	$(INSTALL_DIR)                          $(DESTDIR)${pkgconfigdir}
 	$(INSTALL_DIR)                          $(DESTDIR)${includedir}/nx
 	$(INSTALL_DATA) $(LIBFULL)              $(DESTDIR)${libdir}
 	$(INSTALL_LINK) $(LIBLOAD)              $(DESTDIR)${libdir}
-- 
cgit v1.2.3


From 96a1c5edf09d9a613f142f20599696352aee51fb Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Wed, 26 Aug 2015 01:02:34 +0200
Subject: Fix "Makefile.in seems to ignore the --datarootdir setting" warning

---
 nxcomp/Makefile.in     | 2 ++
 nxcompext/Makefile.in  | 2 ++
 nxcompshad/Makefile.in | 2 ++
 3 files changed, 6 insertions(+)

(limited to 'nxcomp')

diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in
index 83da1ec4f..675a71d72 100644
--- a/nxcomp/Makefile.in
+++ b/nxcomp/Makefile.in
@@ -60,6 +60,8 @@ LIBS        = @LIBS@
 
 srcdir       = @srcdir@
 prefix       = @prefix@
+datarootdir  = @datarootdir@
+datadir      = @datadir@
 exec_prefix  = @exec_prefix@
 bindir       = @bindir@
 man1dir      = @mandir@/man1
diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in
index 66388f86d..62dda4482 100644
--- a/nxcompext/Makefile.in
+++ b/nxcompext/Makefile.in
@@ -52,6 +52,8 @@ LIBS        = @LIBS@ -lz -lNX_X11 -lXcomp
 
 srcdir       = @srcdir@
 prefix       = @prefix@
+datarootdir  = @datarootdir@
+datadir      = @datadir@
 exec_prefix  = @exec_prefix@
 bindir       = @bindir@
 man1dir      = @mandir@/man1
diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in
index da10f7cad..d13ad9fc7 100644
--- a/nxcompshad/Makefile.in
+++ b/nxcompshad/Makefile.in
@@ -70,6 +70,8 @@ LIBS        = @LIBS@ -lNX_X11
 
 srcdir       = @srcdir@
 prefix       = @prefix@
+datarootdir  = @datarootdir@
+datadir      = @datadir@
 exec_prefix  = @exec_prefix@
 bindir       = @bindir@
 man1dir      = @mandir@/man1
-- 
cgit v1.2.3


From 0297567cd501b6fc012c41ff4a1ae27304ff6a10 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 7 Oct 2015 20:51:12 +0200
Subject: Provide support for re-enabling Xinerama on session resumptions.

 By design, when resuming a session, Xinerama can only be re-enabled
 by NX option parsing.

 Thus, this change introduces a "xinerama" NX option that can
 be loaded via an options file into NX agent when resuming
 a session. The new xinerame NX session option also allows
 switching on Xinerama at session startup via an option file.

 When implementing the new NX Xinerama support into clients (like
 TheQVD, X2Go Client, etc., this new xinerama NX option should be
 used for activating Xinerama in the NX / QVD / X2Go session.
---
 nx-X11/programs/Xserver/hw/nxagent/Args.c      | 31 ++++++++++++++++++++++++++
 nx-X11/programs/Xserver/hw/nxagent/Reconnect.c |  2 +-
 nx-X11/programs/Xserver/hw/nxagent/Screen.c    |  6 +++--
 nxcomp/Misc.cpp                                |  1 +
 4 files changed, 37 insertions(+), 3 deletions(-)

(limited to 'nxcomp')

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c
index 5c5a1e8f8..309f08d0e 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
@@ -42,6 +42,7 @@ is" without express or implied warranty.
 #include "screenint.h"
 #include "input.h"
 #include "misc.h"
+#include "globals.h"
 #include "scrnintstr.h"
 #include "dixstruct.h"
 #include "servermd.h"
@@ -1202,6 +1203,36 @@ static void nxagentParseOptions(char *name, char *value)
 
     return;
   }
+  else if (!strcmp(name, "xinerama"))
+  {
+#ifdef PANORAMIX
+    if (!PanoramiXExtensionDisabledHack)
+    {
+      if (!strcmp(value, "1"))
+      {
+        nxagentChangeOption(Xinerama, 1);
+      }
+      else if (!strcmp(value, "0"))
+      {
+        nxagentChangeOption(Xinerama, 0);
+      }
+      else
+      {
+        fprintf(stderr, "Warning: Ignoring bad value '%s' for option 'xinerama'.\n",
+                    validateString(value));
+      }
+    }
+    else
+    {
+      nxagentChangeOption(Xinerama, 0);
+      fprintf(stderr, "Warning: Xinerama extension has been disabled via -disablexineramaextension cmdline switch.\n");
+    }
+#else
+    nxagentChangeOption(Xinerama, 0);
+    fprintf(stderr, "Warning: No Xinerama support compiled into nxagent.\n")
+#endif /* of PANORAMIX */
+    return;
+  }
   else if (!strcmp(name, "resize"))
   {
     if (nxagentOption(DesktopResize) == 0 || strcmp(value, "0") == 0)
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
index b26fa9cfe..660d30863 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
@@ -624,7 +624,7 @@ Bool nxagentReconnectSession(void)
 
   nxagentRedirectDefaultWindows();
 
-  if (nxagentResizeDesktopAtStartup || nxagentOption(Rootless) == True)
+  if (nxagentResizeDesktopAtStartup || nxagentOption(Rootless) == True || nxagentOption(Xinerama) == True)
   {
     nxagentChangeScreenConfig(0, nxagentOption(RootWidth),
                                   nxagentOption(RootHeight), 0, 0);
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index 087f3f41a..17e749a6b 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -1113,8 +1113,10 @@ Bool nxagentOpenScreen(int index, ScreenPtr pScreen,
   nxagentChangeOption(ViewportXSpan, nxagentOption(Width) - nxagentOption(RootWidth));
   nxagentChangeOption(ViewportYSpan, nxagentOption(Height) - nxagentOption(RootHeight));
 
-  /* store the user's preference provided via cmdline */
-  nxagentOption(Xinerama) = !noPanoramiXExtension;
+  /* PanoramiXExtension enabled via cmdline, turn on Xinerama in nxagent
+   */
+  if( (!noPanoramiXExtension) && (!PanoramiXExtensionDisabledHack) )
+    nxagentOption(Xinerama) = True;
 
   if (nxagentReconnectTrap == 0)
   {
diff --git a/nxcomp/Misc.cpp b/nxcomp/Misc.cpp
index 3297d8ee8..ee73f19d8 100644
--- a/nxcomp/Misc.cpp
+++ b/nxcomp/Misc.cpp
@@ -306,6 +306,7 @@ clipboard=n\n\
 streaming=n\n\
 backingstore=n\n\
 composite=n\n\
+xinerama=n\n\
 shmem=b\n\
 shpix=b\n\
 kbtype=s\n\
-- 
cgit v1.2.3


From fa497ac95937b9fc06ff12638d9ae5057c0534ec Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 30 Dec 2015 19:25:08 +0100
Subject: nxcomp: Make nxcomp/nxproxy aware of nxagent's xinerama option in the
 $DISPLAY variable.

---
 nxcomp/Loop.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 7d17c19c8..79d753dea 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -8951,7 +8951,8 @@ int ParseEnvironmentOptions(const char *env, int force)
                                  strcasecmp(name, "shadow") == 0 ||
                                      strcasecmp(name, "shadowuid") == 0 ||
                                          strcasecmp(name, "shadowmode") == 0 ||
-                                             strcasecmp(name, "clients") == 0)
+                                             strcasecmp(name, "clients") == 0 ||
+                                                 strcasecmp(name, "xinerama") == 0)
     {
       #ifdef DEBUG
       *logofs << "Loop: Ignoring agent option '" << name
-- 
cgit v1.2.3


From b8c5f677c7f56024a14db457f99eda12d8e809fb Mon Sep 17 00:00:00 2001
From: Nito Martinez <Nito@Qindel.ES>
Date: Wed, 2 Mar 2016 09:33:13 +0100
Subject: Rename file for windows environments, Fixes #96

---
 doc/DXPC_re-licensed::debbug_784565.mbox  | 3769 -----------------------------
 doc/DXPC_re-licensed_debug_784565.mbox    | 3769 +++++++++++++++++++++++++++++
 nxcomp/README.on-retroactive-DXPC-license |    2 +-
 3 files changed, 3770 insertions(+), 3770 deletions(-)
 delete mode 100644 doc/DXPC_re-licensed::debbug_784565.mbox
 create mode 100644 doc/DXPC_re-licensed_debug_784565.mbox

(limited to 'nxcomp')

diff --git a/doc/DXPC_re-licensed::debbug_784565.mbox b/doc/DXPC_re-licensed::debbug_784565.mbox
deleted file mode 100644
index be813246c..000000000
--- a/doc/DXPC_re-licensed::debbug_784565.mbox
+++ /dev/null
@@ -1,3769 +0,0 @@
-From invernomuto@paranoici.org Wed May 06 17:36:12 2015
-Received: (at submit) by bugs.debian.org; 6 May 2015 17:36:12 +0000
-X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
-	(2014-02-07) on buxtehude.debian.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-12.0 required=4.0 tests=BAYES_00,DKIM_SIGNED,
-	DKIM_VALID,DKIM_VALID_AU,FOURLA,HAS_PACKAGE,SPF_HELO_PASS,SPF_PASS,
-	XMAILER_REPORTBUG autolearn=ham autolearn_force=no
-	version=3.4.0-bugs.debian.org_2005_01_02
-X-Spam-Bayes: score:0.0000 Tokens: new, 12; hammy, 150; neutral, 79; spammy,
-	0. spammytokens: hammytokens:0.000-+--H*M:reportbug, 0.000-+--H*MI:reportbug,
-	0.000-+--H*x:reportbug, 0.000-+--H*UA:reportbug, 0.000-+--H*x:6.6.3
-Return-path: <invernomuto@paranoici.org>
-Received: from perdizione.investici.org ([94.23.50.208])
-	by buxtehude.debian.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256)
-	(Exim 4.80)
-	(envelope-from <invernomuto@paranoici.org>)
-	id 1Yq3Ex-0001dB-Ks
-	for submit@bugs.debian.org; Wed, 06 May 2015 17:36:11 +0000
-Received: from [94.23.50.208] (perdizione [94.23.50.208]) (Authenticated sender: invernomuto@paranoici.org) by localhost (Postfix) with ESMTPSA id 3987C120F77;
-	Wed,  6 May 2015 17:36:07 +0000 (UTC)
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paranoici.org;
-	s=stigmate; t=1430933767;
-	bh=QAdaIheSnzoHI301+0HPUrAK62wjbKWg7iWEzGzlOTs=;
-	h=From:To:Subject:Date;
-	b=X/2YGWFWL2KRAVqONR2Q6Q6HuMii+1WfGCbSpf8XvQesaf7qWlvY2u1IVKgKVpN2m
-	 Baq+3OrQ1adlmdHQQJm7tLfv37vRZVNOUpP3lyKQX4v3B/Gos63+1GqfyJ7qGkvQha
-	 4qwytZrPI20VmUswHf7qhgSGIVQmy0COEZZX0PF8=
-Received: from frx by homebrew with local (Exim 4.85)
-	(envelope-from <invernomuto@paranoici.org>)
-	id 1Yq3EK-0001ye-Bx; Wed, 06 May 2015 19:35:32 +0200
-Content-Type: text/plain; charset="us-ascii"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-From: "Francesco Poli \(wintermute\)" <invernomuto@paranoici.org>
-To: Debian Bug Tracking System <submit@bugs.debian.org>
-Subject: nx-libs-lite: parts are derived from non-free code
-Message-ID: <20150506173532.7531.31389.reportbug@homebrew>
-X-Mailer: reportbug 6.6.3
-Date: Wed, 06 May 2015 19:35:32 +0200
-Delivered-To: submit@bugs.debian.org
-
-Package: nx-libs-lite
-Version: 3.5.0.27-1
-Severity: serious
-Justification: Policy 2.2.1
-
-Hello and thanks for maintaining this package in Debian!
-
-I noticed that the debian/copyright states:
-
-[...]
-| Parts of this software are derived from DXPC project. These copyright
-| notices apply to original DXPC code:
-| 
-|    Redistribution and use in source and binary forms are permitted provided
-|    that the above copyright notice and this paragraph are duplicated in all
-|    such forms.
-| 
-|    THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
-|    WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-|    MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-| 
-|    Copyright (c) 1995,1996 Brian Pane
-|    Copyright (c) 1996,1997 Zachary Vonler and Brian Pane
-|    Copyright (c) 1999 Kevin Vigor and Brian Pane
-|    Copyright (c) 2000,2001 Gian Filippo Pinzari and Brian Pane
-[...]
-
-This license lacks the permission to modify the DXPC code.
-Hence, the original DXPC code does not appear to comply with the
-DFSG. And the nx-libs-lite is in part derived from DXPC code.
-
-This basically means that nx-libs-lite includes parts which are
-non-free (as they are derived from non-modifiable code) and
-are also possibly legally undistributable (as they are non-modifiable,
-but actually modified). The combination with the rest of nx-libs-lite
-(which is GPL-licensed) may also be legally undistributable (since
-the license with no permission to modify is GPL-incompatible).
-
-
-If there's anything I misunderstood, please clarify.
-
-Otherwise, please address this issue as soon as possible.
-The copyright owners for the original DXPC code should be
-contacted and persuaded to re-license under GPL-compatible
-terms.
-
-Thanks for your time.
-Bye.
-
-
-
-From mike.gabriel@das-netzwerkteam.de Mon May 11 09:07:54 2015
-Received: (at 784565) by bugs.debian.org; 11 May 2015 09:07:54 +0000
-X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
-	(2014-02-07) on buxtehude.debian.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-11.9 required=4.0 tests=BAYES_00,FOURLA,
-	HAS_BUG_NUMBER,PGPSIGNATURE,T_RP_MATCHES_RCVD autolearn=ham
-	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
-X-Spam-Bayes: score:0.0000 Tokens: new, 24; hammy, 150; neutral, 203; spammy,
-	0. spammytokens: hammytokens:0.000-+--H*c:pgp-signature,
-	0.000-+--H*c:protocol, 0.000-+--H*c:micalg, 0.000-+--H*c:signed,
-	0.000-+--H*RU:sk:grimnir
-Return-path: <mike.gabriel@das-netzwerkteam.de>
-Received: from freya.das-netzwerkteam.de ([88.198.48.199])
-	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
-	(Exim 4.80)
-	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
-	id 1Yrjgn-0001o6-MP
-	for 784565@bugs.debian.org; Mon, 11 May 2015 09:07:54 +0000
-Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
-	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id 85F37E4B;
-	Mon, 11 May 2015 11:07:49 +0200 (CEST)
-Received: from localhost (localhost [127.0.0.1])
-	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id F1CFF3C20D;
-	Mon, 11 May 2015 11:07:48 +0200 (CEST)
-X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
-Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
-	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
-	with ESMTP id wKYnujH8-HJ8; Mon, 11 May 2015 11:07:48 +0200 (CEST)
-Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1])
-	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPS id 960E33C18A;
-	Mon, 11 May 2015 11:07:48 +0200 (CEST)
-Received: from bifrost.das-netzwerkteam.de (bifrost.das-netzwerkteam.de
- [178.62.101.154]) by mail.das-netzwerkteam.de (Horde Framework) with HTTP;
- Mon, 11 May 2015 09:07:48 +0000
-Date: Mon, 11 May 2015 09:07:48 +0000
-Message-ID: <20150511090748.Horde.Edus-FOfuc519TjISGi1vQ2@mail.das-netzwerkteam.de>
-From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-To: "Francesco Poli (wintermute)" <invernomuto@paranoici.org>,
- 784565@bugs.debian.org
-Cc: x2go-dev@lists.x2go.org, Nito Martinez <nito.martinez@qindel.com>,
- opensource@gznianguan.com, dktrkranz@debian.org
-Subject: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are derived
- from non-free code
-In-Reply-To: <20150506173532.7531.31389.reportbug@homebrew>
-User-Agent: Internet Messaging Program (IMP) H5 (6.2.2)
-Accept-Language: de,en
-Organization: DAS-NETZWERKTEAM
-X-Originating-IP: 178.62.101.154
-X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:32.0) Gecko/20100101
- Firefox/32.0 Iceweasel/32.0
-Content-Type: multipart/signed; boundary="=_ALb-1vQm6P3YAYx12TU2SQ1";
- protocol="application/pgp-signature"; micalg=pgp-sha1
-MIME-Version: 1.0
-
-This message is in MIME format and has been PGP signed.
-
---=_ALb-1vQm6P3YAYx12TU2SQ1
-Content-Type: text/plain; charset=us-ascii; format=flowed; DelSp=Yes
-Content-Disposition: inline
-Content-Transfer-Encoding: quoted-printable
-
-Hi Francesco,
-Cc:ing a couple of people/groups being affected by the below.
-
-On  Mi 06 Mai 2015 19:35:32 CEST, Francesco Poli (wintermute) wrote:
-
-> Package: nx-libs-lite
-> Version: 3.5.0.27-1
-> Severity: serious
-> Justification: Policy 2.2.1
->
-> Hello and thanks for maintaining this package in Debian!
->
-> I noticed that the debian/copyright states:
->
-> [...]
-> | Parts of this software are derived from DXPC project. These copyright
-> | notices apply to original DXPC code:
-> |
-> |    Redistribution and use in source and binary forms are permitted prov=
-ided
-> |    that the above copyright notice and this paragraph are duplicated in=
- all
-> |    such forms.
-> |
-> |    THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLI=
-ED
-> |    WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-> |    MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-> |
-> |    Copyright (c) 1995,1996 Brian Pane
-> |    Copyright (c) 1996,1997 Zachary Vonler and Brian Pane
-> |    Copyright (c) 1999 Kevin Vigor and Brian Pane
-> |    Copyright (c) 2000,2001 Gian Filippo Pinzari and Brian Pane
-> [...]
->
-> This license lacks the permission to modify the DXPC code.
-> Hence, the original DXPC code does not appear to comply with the
-> DFSG. And the nx-libs-lite is in part derived from DXPC code.
->
-> This basically means that nx-libs-lite includes parts which are
-> non-free (as they are derived from non-modifiable code) and
-> are also possibly legally undistributable (as they are non-modifiable,
-> but actually modified). The combination with the rest of nx-libs-lite
-> (which is GPL-licensed) may also be legally undistributable (since
-> the license with no permission to modify is GPL-incompatible).
->
->
-> If there's anything I misunderstood, please clarify.
->
-> Otherwise, please address this issue as soon as possible.
-> The copyright owners for the original DXPC code should be
-> contacted and persuaded to re-license under GPL-compatible
-> terms.
->
-> Thanks for your time.
-> Bye.
-
-I/we will investigate this asap. Thanks for bringing this up.
-
-Greets,
-Mike
---=20
-
-DAS-NETZWERKTEAM
-mike=20gabriel, herweg 7, 24357 fleckeby
-fon: +49 (1520) 1976 148
-
-GnuPG Key ID 0x25771B31
-mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
-
-freeBusy:
-https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x=
-fb
-
---=_ALb-1vQm6P3YAYx12TU2SQ1
-Content-Type: application/pgp-signature
-Content-Description: Digitale PGP-Signatur
-Content-Disposition: inline
-
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAABAgAGBQJVUHFkAAoJEJr0azAldxsxbNYP/jqxwacIBSYlAhaZEf62JFtt
-ObBSEqUQfjljkolnzeaf2K4lBT6dl1x9VxGvIM5S8y9H/qpbFW+XWNHIR1BpdAsw
-TgKuqb6giM+28V9pMaHuqwPwMQ7YnFsfSKf/YCEs0AvJJKsf5jSUbeHAJ/RHwC4Z
-iGOj/KRqQ3tqIZJbzV2TCMNYnPm4sttcvKcRIOnBLDEVn1CRhlYX93v/pP87iPok
-wvvnbPpM+D2oq1JjS6mR2JbVHspc9/ZGq5I100Cdo5r3Y3upunNyG4IRCL0ttBzg
-nRjEiktViU/hhBB2xjYRaDsEpRFSsOeItLWss2PNYER2uIYuimvUsJzhtj7IwsV8
-4J8wlvn0uRZRiQwSWI/UaL1r1eqI4AlMA4hzDnWR7cBB4nTNE6YWzTpYYhsqNVfJ
-jURTKIwGzDVVcpU5UZZhEtPcD5utkd8eYn4fA68pvkje3OFpLjfQnFWUcjIn5ywb
-mejuW08cnsdfB0he+NTFXpK4p4wiu92pqul/EqPKW3Dm1w7FZXPHpIkN6VQ03LdY
-kSXOOpITg8cHESsHlvyKIZITaLDrNAPB4RHkRxyWhRpZWgEM35FasE6hIRTbszQ9
-jpuXcrG11L7HbITi599U8ZAo4qK9OgWfzJEsBdQKXBHEqCjiv4GvdXvgJyR2Eukp
-OIldtig78B5JgGKDLKjY
-=G+R6
------END PGP SIGNATURE-----
-
---=_ALb-1vQm6P3YAYx12TU2SQ1--
-
-
-
-
-From X2Go-ML-1@baur-itcs.de Mon May 11 09:21:13 2015
-Received: (at 784565) by bugs.debian.org; 11 May 2015 09:21:13 +0000
-X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
-	(2014-02-07) on buxtehude.debian.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-9.4 required=4.0 tests=BAYES_00,DIGITS_LETTERS,
-	FOURLA,FVGT_m_MULTI_ODD,HAS_BUG_NUMBER,MONEY,PGPSIGNATURE,RCVD_IN_DNSWL_NONE,
-	RCVD_IN_MSPIKE_H2,STOCKLIKE autolearn=ham autolearn_force=no
-	version=3.4.0-bugs.debian.org_2005_01_02
-X-Spam-Bayes: score:0.0000 Tokens: new, 67; hammy, 149; neutral, 240; spammy,
-	1. spammytokens:0.997-1--jjng hammytokens:0.000-+--sk:iqecbae,
-	0.000-+--sk:iQEcBAE, 0.000-+--sha256, 0.000-+--SHA256, 0.000-+--H*UA:31.6.0
-Return-path: <X2Go-ML-1@baur-itcs.de>
-Received: from mout.kundenserver.de ([212.227.17.10])
-	by buxtehude.debian.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256)
-	(Exim 4.80)
-	(envelope-from <X2Go-ML-1@baur-itcs.de>)
-	id 1Yrjtg-0003AA-Jy
-	for 784565@bugs.debian.org; Mon, 11 May 2015 09:21:13 +0000
-Received: from [192.168.0.171] ([78.43.125.82]) by mrelayeu.kundenserver.de
- (mreue102) with ESMTPSA (Nemesis) id 0MBke7-1Z2Qat2SRz-00AqUz; Mon, 11 May
- 2015 11:20:48 +0200
-Message-ID: <5550746E.1040707@baur-itcs.de>
-Date: Mon, 11 May 2015 11:20:46 +0200
-From: Stefan Baur <X2Go-ML-1@baur-itcs.de>
-User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0
-MIME-Version: 1.0
-To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 
- "Francesco Poli (wintermute)" <invernomuto@paranoici.org>,
- 784565@bugs.debian.org
-CC: opensource@gznianguan.com, Nito Martinez <nito.martinez@qindel.com>, 
- dktrkranz@debian.org, x2go-dev@lists.x2go.org
-Subject: Re: [X2Go-Dev] [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are
- derived from non-free code
-References: <20150511090748.Horde.Edus-FOfuc519TjISGi1vQ2@mail.das-netzwerkteam.de>
-In-Reply-To: <20150511090748.Horde.Edus-FOfuc519TjISGi1vQ2@mail.das-netzwerkteam.de>
-Content-Type: text/plain; charset=windows-1252
-Content-Transfer-Encoding: 8bit
-X-Provags-ID:  V03:K0:1hGpzbQ6YusgDW3LQNBHFEMw92BwlVIDUv6GGAN1bbqSykY6aoQ
- ekoiYjWtMWz72yWg8Xd5/k/PEjXU7VxzZNBzxoyEx46ughI6kPZG/kS6r+aMsjf3KVXNi4U
- da367A2ZowOeet1s6/LouBbblzzvjx7LF9SFO2TW4oakOyxhNCWEhVpveTV9FQPnavxZzhL
- D5GN1YjxQGdnacFHIIuSQ==
-X-UI-Out-Filterresults: notjunk:1;
-
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-hi everyone,
-
-looking at the current homepage of DXPC, the following can be found in
-their changelog http://www.vigor.nu/dxpc/CHANGES:
-
-
-3.8.1 Release:
-
-[...]
-
-Changed license to BSD license.
-
-- -Stefan
-
-Am 11.05.2015 um 11:07 schrieb Mike Gabriel:
-> Hi Francesco, Cc:ing a couple of people/groups being affected by
-> the below.
-> 
-> On  Mi 06 Mai 2015 19:35:32 CEST, Francesco Poli (wintermute)
-> wrote:
-> 
->> Package: nx-libs-lite Version: 3.5.0.27-1 Severity: serious 
->> Justification: Policy 2.2.1
->> 
->> Hello and thanks for maintaining this package in Debian!
->> 
->> I noticed that the debian/copyright states:
->> 
->> [...] | Parts of this software are derived from DXPC project.
->> These copyright | notices apply to original DXPC code: | |
->> Redistribution and use in source and binary forms are permitted 
->> provided |    that the above copyright notice and this paragraph
->> are duplicated in all |    such forms. | |    THIS SOFTWARE IS
->> PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED |
->> WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES
->> OF |    MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. | |
->> Copyright (c) 1995,1996 Brian Pane |    Copyright (c) 1996,1997
->> Zachary Vonler and Brian Pane |    Copyright (c) 1999 Kevin Vigor
->> and Brian Pane |    Copyright (c) 2000,2001 Gian Filippo Pinzari
->> and Brian Pane [...]
->> 
->> This license lacks the permission to modify the DXPC code. Hence,
->> the original DXPC code does not appear to comply with the DFSG.
->> And the nx-libs-lite is in part derived from DXPC code.
->> 
->> This basically means that nx-libs-lite includes parts which are 
->> non-free (as they are derived from non-modifiable code) and are
->> also possibly legally undistributable (as they are
->> non-modifiable, but actually modified). The combination with the
->> rest of nx-libs-lite (which is GPL-licensed) may also be legally
->> undistributable (since the license with no permission to modify
->> is GPL-incompatible).
->> 
->> 
->> If there's anything I misunderstood, please clarify.
->> 
->> Otherwise, please address this issue as soon as possible. The
->> copyright owners for the original DXPC code should be contacted
->> and persuaded to re-license under GPL-compatible terms.
->> 
->> Thanks for your time. Bye.
-> 
-> I/we will investigate this asap. Thanks for bringing this up.
-> 
-> Greets, Mike
-> 
-> 
-> _______________________________________________ x2go-dev mailing
-> list x2go-dev@lists.x2go.org 
-> http://lists.x2go.org/listinfo/x2go-dev
-> 
-
-
-- -- 
-BAUR-ITCS UG (haftungsbeschränkt)
-Geschäftsführer: Stefan Baur
-Eichenäckerweg 10, 89081 Ulm | Registergericht Ulm, HRB 724364
-Fon/Fax 0731 40 34 66-36/-35 | USt-IdNr.: DE268653243
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQEcBAEBCAAGBQJVUHRuAAoJEG7d9BjNvlEZsCYH/i0GArfIg0xNQ91srhMtMxVf
-NcaQ5uOJLLZ+e0WOcRMm5Kprg9f6uKQNFRo1dv9NCFNxjrpdR/5/LMmeSYxafIQA
-beoYbnuMMRBvcjoUN5ScGD/jjng/9VCiwviBVjUc6AhDebGjVone2OtaIXPoMELI
-ClKnDShC41qQpSUgEESUYHiIIptkkmSrIJS6Ostsby5rhT1mApv7ulBqVvADUKCX
-OtNZmG+O6Bvur63G2fBTrdQwZAed0+Q6/XlhfOkf5QNG4I9fd5KlrMDpSmO8w7Cm
-h4rVnveLS5+0afZXs9sImhNW4I7Ah8zh5sAUFNCGXEuO60XRRysUO4i1WjRgnZw=
-=sgsA
------END PGP SIGNATURE-----
-
-
-
-From mike.gabriel@das-netzwerkteam.de Mon May 11 09:26:40 2015
-Received: (at 784565) by bugs.debian.org; 11 May 2015 09:26:40 +0000
-X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
-	(2014-02-07) on buxtehude.debian.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-11.9 required=4.0 tests=BAYES_00,FOURLA,
-	HAS_BUG_NUMBER,PGPSIGNATURE,T_RP_MATCHES_RCVD autolearn=ham
-	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
-X-Spam-Bayes: score:0.0000 Tokens: new, 15; hammy, 150; neutral, 246; spammy,
-	0. spammytokens: hammytokens:0.000-+--H*c:pgp-signature,
-	0.000-+--H*c:protocol, 0.000-+--H*c:micalg, 0.000-+--H*c:signed,
-	0.000-+--H*RU:sk:grimnir
-Return-path: <mike.gabriel@das-netzwerkteam.de>
-Received: from freya.das-netzwerkteam.de ([88.198.48.199])
-	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
-	(Exim 4.80)
-	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
-	id 1Yrjyx-0003n8-Sv
-	for 784565@bugs.debian.org; Mon, 11 May 2015 09:26:40 +0000
-Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
-	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id B938DE53;
-	Mon, 11 May 2015 11:26:37 +0200 (CEST)
-Received: from localhost (localhost [127.0.0.1])
-	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 564F73C20D;
-	Mon, 11 May 2015 11:26:37 +0200 (CEST)
-X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
-Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
-	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
-	with ESMTP id zA86M1U+gj03; Mon, 11 May 2015 11:26:37 +0200 (CEST)
-Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1])
-	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPS id E81223BF5A;
-	Mon, 11 May 2015 11:26:36 +0200 (CEST)
-Received: from bifrost.das-netzwerkteam.de (bifrost.das-netzwerkteam.de
- [178.62.101.154]) by mail.das-netzwerkteam.de (Horde Framework) with HTTP;
- Mon, 11 May 2015 09:26:36 +0000
-Date: Mon, 11 May 2015 09:26:36 +0000
-Message-ID: <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
-From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-To: "Francesco Poli (wintermute)" <invernomuto@paranoici.org>,
- 784565@bugs.debian.org
-Cc: x2go-dev@lists.x2go.org, nito.martinez@qindel.com,
- opensource@gznianguan.com
-Subject: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are derived
- from non-free code
-In-Reply-To: <20150506173532.7531.31389.reportbug@homebrew>
-User-Agent: Internet Messaging Program (IMP) H5 (6.2.2)
-Accept-Language: de,en
-Organization: DAS-NETZWERKTEAM
-X-Originating-IP: 178.62.101.154
-X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:32.0) Gecko/20100101
- Firefox/32.0 Iceweasel/32.0
-Content-Type: multipart/signed; boundary="=_8dL5yJABYXdTfUqhzQkNVg1";
- protocol="application/pgp-signature"; micalg=pgp-sha1
-MIME-Version: 1.0
-
-This message is in MIME format and has been PGP signed.
-
---=_8dL5yJABYXdTfUqhzQkNVg1
-Content-Type: text/plain; charset=us-ascii; format=flowed; DelSp=Yes
-Content-Disposition: inline
-Content-Transfer-Encoding: quoted-printable
-
-Hi Francesco,
-
-On  Mi 06 Mai 2015 19:35:32 CEST, Francesco Poli (wintermute) wrote:
-
-> Package: nx-libs-lite
-> Version: 3.5.0.27-1
-> Severity: serious
-> Justification: Policy 2.2.1
->
-> Hello and thanks for maintaining this package in Debian!
->
-> I noticed that the debian/copyright states:
->
-> [...]
-> | Parts of this software are derived from DXPC project. These copyright
-> | notices apply to original DXPC code:
-> |
-> |    Redistribution and use in source and binary forms are permitted prov=
-ided
-> |    that the above copyright notice and this paragraph are duplicated in=
- all
-> |    such forms.
-> |
-> |    THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLI=
-ED
-> |    WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-> |    MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-> |
-> |    Copyright (c) 1995,1996 Brian Pane
-> |    Copyright (c) 1996,1997 Zachary Vonler and Brian Pane
-> |    Copyright (c) 1999 Kevin Vigor and Brian Pane
-> |    Copyright (c) 2000,2001 Gian Filippo Pinzari and Brian Pane
-> [...]
->
-> This license lacks the permission to modify the DXPC code.
-> Hence, the original DXPC code does not appear to comply with the
-> DFSG. And the nx-libs-lite is in part derived from DXPC code.
->
-> This basically means that nx-libs-lite includes parts which are
-> non-free (as they are derived from non-modifiable code) and
-> are also possibly legally undistributable (as they are non-modifiable,
-> but actually modified). The combination with the rest of nx-libs-lite
-> (which is GPL-licensed) may also be legally undistributable (since
-> the license with no permission to modify is GPL-incompatible).
->
->
-> If there's anything I misunderstood, please clarify.
->
-> Otherwise, please address this issue as soon as possible.
-> The copyright owners for the original DXPC code should be
-> contacted and persuaded to re-license under GPL-compatible
-> terms.
->
-> Thanks for your time.
-> Bye.
-
-Please follow-up with reading [1].
-
-As it seems, dxpc has been long ago relicensed to BSD-2-clause (for=20=20
-v3.8.1=20in/around 2002).
-
-I have no exact clue, if NoMachine forked prior to that (if they quote=20=
-=20
-the=20old licensing terms, then probably they did).
-
-However, how do you see the situation considering that upstream=20=20
-changed=20to BSD-2-clause a long time ago. What approach do you propose=20=
-=20
-for=20nx-libs-lite to get the issue fully fixed?
-
-Mike
-
-[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=3D142028
-
---=20
-
-DAS-NETZWERKTEAM
-mike=20gabriel, herweg 7, 24357 fleckeby
-fon: +49 (1520) 1976 148
-
-GnuPG Key ID 0x25771B31
-mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
-
-freeBusy:
-https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x=
-fb
-
---=_8dL5yJABYXdTfUqhzQkNVg1
-Content-Type: application/pgp-signature
-Content-Description: Digitale PGP-Signatur
-Content-Disposition: inline
-
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAABAgAGBQJVUHXMAAoJEJr0azAldxsxls4P/RyFv6ghemJhfrHNbAUEDmNz
-kyY2Q4Jt6pIDXX3U3yThYCeyG1nVAwKJI2B/q7q/YWWdzea8RzTTXrj3DubYplOZ
-PatD30FhlKdL+rsohmLFrA5dHVcwFbJA4GqrR2Y8y6NSLEtifYE4EDIDKLqvX6Dy
-msvHyLl+3AXg2gR4Wmu9lOLC8MrPA3A7nwlw/wCa6kwf3i6FUsAB2nzUsj3yUX1f
-4iXzcZhjGCJli9otPLlYFjPuc0HjwBgoOx5tEOL1hgVYP+yiQCw24LOKwHTnDogZ
-ONio1VdS+VPUbhVTlBfYD29lSDO8pgBGk43325b7Bmo56Ica+HCr8TznMVASidvJ
-dbAXZQOMuHxBofP9sm89q2lIXjPmJFWspG76OEM8dAIMKo87gQNuOTNPuOK0Zj8T
-Ua+40fIc5/C7CyRgGO8wqb6dYjD4Q6HxbjSQJrlxsHdjKIozv+MXGV+if/bKSXM8
-tIAh9JzcwgYtRVlVQXCmpk+yP9DntWFs5WeOEGBqKZw+was5OSXSlpjukNn9us2a
-bWj0E84zMlIu61KVZ8ot14OMIzgUxzymIt/LzWHKiiSezb20S22LJGBaKLxbqplp
-9Gi8g9rEhjn5Pgpt9B3MlIWQTKhpAa71GCD9Okt9vhPsBiKE57fSjCYgQR83lhDy
-kbLoUbByjixBA+TXUYM8
-=NW/2
------END PGP SIGNATURE-----
-
---=_8dL5yJABYXdTfUqhzQkNVg1--
-
-
-
-
-From invernomuto@paranoici.org Mon May 11 19:37:54 2015
-Received: (at 784565) by bugs.debian.org; 11 May 2015 19:37:54 +0000
-X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
-	(2014-02-07) on buxtehude.debian.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-11.5 required=4.0 tests=BAYES_00,DKIM_SIGNED,
-	DKIM_VALID,DKIM_VALID_AU,FOURLA,HAS_BUG_NUMBER,MDO_CABLE_TV3,PGPSIGNATURE,
-	SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no
-	version=3.4.0-bugs.debian.org_2005_01_02
-X-Spam-Bayes: score:0.0000 Tokens: new, 9; hammy, 150; neutral, 119; spammy,
-	0. spammytokens: hammytokens:0.000-+--H*UA:sk:x86_64-,
-	0.000-+--H*x:sk:x86_64-, 0.000-+--H*c:PGP-SHA256, 0.000-+--H*c:SignHturH,
-	0.000-+--H*c:pgp-signature
-Return-path: <invernomuto@paranoici.org>
-Received: from perdizione.investici.org ([94.23.50.208])
-	by buxtehude.debian.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256)
-	(Exim 4.80)
-	(envelope-from <invernomuto@paranoici.org>)
-	id 1YrtWT-0004t9-Ty
-	for 784565@bugs.debian.org; Mon, 11 May 2015 19:37:54 +0000
-Received: from [94.23.50.208] (perdizione [94.23.50.208]) (Authenticated sender: invernomuto@paranoici.org) by localhost (Postfix) with ESMTPSA id 9C4DF120408;
-	Mon, 11 May 2015 19:37:46 +0000 (UTC)
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paranoici.org;
-	s=stigmate; t=1431373066;
-	bh=vGWv2ZFJgWpWShHOYFcPN0r6i8IFunsxG5IJHqxpdbk=;
-	h=Date:From:To:Cc:Subject:In-Reply-To:References;
-	b=JQRMmMDPSZFkJ21FEn1TdsCco0YtUFBII0CsMLxdl3mxM5SzGN9flVttwlZ+5RrgR
-	 a7/u/VUVPzv0ZcdVKwrC+Nq6imwd5hzUj80C+e6KLZQoovz6shmhuIdKtga2OIl7lm
-	 cF0ONDqjdq0pI158Ws5hz0MiwJkzF6V5VbIEk3SY=
-Received: from frx by homebrew with local (Exim 4.85)
-	(envelope-from <invernomuto@paranoici.org>)
-	id 1YrtVj-0001Cl-NV; Mon, 11 May 2015 21:37:07 +0200
-Date: Mon, 11 May 2015 21:36:59 +0200
-From: Francesco Poli <invernomuto@paranoici.org>
-To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Cc: 784565@bugs.debian.org, x2go-dev@lists.x2go.org,
- nito.martinez@qindel.com, opensource@gznianguan.com
-Subject: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are derived
- from non-free code
-Message-Id: <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
-In-Reply-To: <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
-References: <20150506173532.7531.31389.reportbug@homebrew>
-	<20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
-X-Mailer: Sylpheed 3.5.0beta1 (GTK+ 2.24.25; x86_64-pc-linux-gnu)
-Mime-Version: 1.0
-Content-Type: multipart/signed; protocol="application/pgp-signature";
- micalg="PGP-SHA256";
- boundary="Signature=_Mon__11_May_2015_21_36_59_+0200_DweA9EbdD2ISBmUH"
-
---Signature=_Mon__11_May_2015_21_36_59_+0200_DweA9EbdD2ISBmUH
-Content-Type: text/plain; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: quoted-printable
-
-On Mon, 11 May 2015 09:26:36 +0000 Mike Gabriel wrote:
-
-[...]
-> As it seems, dxpc has been long ago relicensed to BSD-2-clause (for =20
-> v3.8.1 in/around 2002).
-
-This is great news, indeed!
-
->=20
-> I have no exact clue, if NoMachine forked prior to that (if they quote =20
-> the old licensing terms, then probably they did).
-
-Yep, it's plausible...
-
->=20
-> However, how do you see the situation considering that upstream =20
-> changed to BSD-2-clause a long time ago. What approach do you propose =20
-> for nx-libs-lite to get the issue fully fixed?
-
-If the fork has been performed before the DXPC re-licensing (as it's
-likely), I see two possible strategies:
-
- (A) someone gets in touch with DXPC copyright owners and asks them
-whether the re-licensing may be considered retroactive (applicable to
-older versions of DXPC); in case the answer is negative, DXPC copyright
-owners should be persuaded to make the re-licensing retroactive
-
- (B) nx-libs-lite upstream developers re-fork from scratch, basing the
-new code on a BSD-licensed version of DXPC (I suspect this may turn out
-to be somewhat painful...)
-
-
-Obviously, the optimal solution is (A). I hope it may work...
-
-Thanks for your time and for your prompt and kind replies.
-
-
---=20
- http://www.inventati.org/frx/
- There's not a second to spare! To the laboratory!
-..................................................... Francesco Poli .
- GnuPG key fpr =3D=3D CA01 1147 9CD2 EFDF FB82  3925 3E1C 27E1 1F69 BFFE
-
---Signature=_Mon__11_May_2015_21_36_59_+0200_DweA9EbdD2ISBmUH
-Content-Type: application/pgp-signature
-
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJVUQTgAAoJED4cJ+Efab/+Mx4QAMLmPwqnPYyI0Bl6sZgxP3nA
-Yfrf7m2+swTrNz3M2xNepx1KoylRNlz2DiCuG7QWABNupSK60ACtIuAvWIAPSYNt
-wlHDRGiVrpCKBKzB4N3zjB0MN1VELhdWqrap8Yw5nnwohJ2jXoAUaqorwEba6YBg
-VK1BsGvlqcwSYt8eWt+ugpaRR43DbZTCpAvBn3t9DdYe8LwtlJDTCatbJfovlTJ9
-P19TNbwxiEoj8uWbmpOO/kLvvMed0avTEsvgAROQKF/dnWCnB1dh5QGd06IHdAY7
-KfnoZc4HUM8BB/ylWsaV13Cd8UA/2B2FKp3xbab3ry8gWeMe6dnk/pFa+pv6TGeT
-I+6VxWOMT/hc4AwBOl+R7yqp2AkcNO+KP2o5i04+yENcbgrGxyCQU2aVsHkJsVYi
-N5myXypSZY3tF6TnAm/UYP2GgiMCo0FXptwVoLiGSJkBw0tn13I25pYSqjYZlq4q
-4RQYuTEHEkV16tCdEdy+DSuI0GsABYUkY3a3A3TLj9LjiPPEDwLOxHjZlLbeyXP+
-xtmC3d82YvMmLXUiqItuhiBYjCRFq8piGGCDRX7wp1B+t6xHUcR8UV5O4s554iMX
-+r2m1mLzM285PoKwP/Smd6BXU5RfhT4svmxvaMSSvADNo8X4ddNd2Hiq/Gib2ftH
-mYKFpBE7IMwQqfrOpAW5
-=Bt09
------END PGP SIGNATURE-----
-
---Signature=_Mon__11_May_2015_21_36_59_+0200_DweA9EbdD2ISBmUH--
-
-
-
-From mike.gabriel@das-netzwerkteam.de Tue May 12 03:59:27 2015
-Received: (at 784565) by bugs.debian.org; 12 May 2015 03:59:27 +0000
-X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
-	(2014-02-07) on buxtehude.debian.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-11.4 required=4.0 tests=BAYES_00,FOURLA,
-	HAS_BUG_NUMBER,MDO_CABLE_TV3,PGPSIGNATURE,T_RP_MATCHES_RCVD autolearn=ham
-	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
-X-Spam-Bayes: score:0.0000 Tokens: new, 21; hammy, 150; neutral, 206; spammy,
-	0. spammytokens: hammytokens:0.000-+--H*c:pgp-signature,
-	0.000-+--H*c:protocol, 0.000-+--H*c:micalg, 0.000-+--H*c:signed,
-	0.000-+--H*RU:sk:grimnir
-Return-path: <mike.gabriel@das-netzwerkteam.de>
-Received: from freya.das-netzwerkteam.de ([88.198.48.199])
-	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
-	(Exim 4.80)
-	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
-	id 1Ys1Lq-0000j4-Sf
-	for 784565@bugs.debian.org; Tue, 12 May 2015 03:59:27 +0000
-Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
-	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id B4F9BAA3;
-	Tue, 12 May 2015 05:59:21 +0200 (CEST)
-Received: from localhost (localhost [127.0.0.1])
-	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 299233C21D;
-	Tue, 12 May 2015 05:59:21 +0200 (CEST)
-X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
-Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
-	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
-	with ESMTP id G2j6l6YtFs0q; Tue, 12 May 2015 05:59:21 +0200 (CEST)
-Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1])
-	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPS id C67023BF5A;
-	Tue, 12 May 2015 05:59:20 +0200 (CEST)
-Received: from p5B3B925B.dip0.t-ipconnect.de (p5B3B925B.dip0.t-ipconnect.de
- [91.59.146.91]) by mail.das-netzwerkteam.de (Horde Framework) with HTTP;
- Tue, 12 May 2015 03:59:20 +0000
-Date: Tue, 12 May 2015 03:59:20 +0000
-Message-ID: <20150512035920.Horde.JnI2DWx-AAFvzpbQFqakJw3@mail.das-netzwerkteam.de>
-From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-To: Francesco Poli <invernomuto@paranoici.org>
-Cc: 784565@bugs.debian.org, x2go-dev@lists.x2go.org,
- nito.martinez@qindel.com, opensource@gznianguan.com
-Subject: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are derived
- from non-free code
-References: <20150506173532.7531.31389.reportbug@homebrew>
- <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
- <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
-In-Reply-To: <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
-User-Agent: Internet Messaging Program (IMP) H5 (6.2.2)
-Accept-Language: de,en
-Organization: DAS-NETZWERKTEAM
-X-Originating-IP: 91.59.146.91
-X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:32.0) Gecko/20100101
- Firefox/32.0 Iceweasel/32.0
-Content-Type: multipart/signed; boundary="=_kYZkQgyfaSLUTLVIkzgq8w1";
- protocol="application/pgp-signature"; micalg=pgp-sha1
-MIME-Version: 1.0
-
-This message is in MIME format and has been PGP signed.
-
---=_kYZkQgyfaSLUTLVIkzgq8w1
-Content-Type: text/plain; charset=us-ascii; format=flowed; DelSp=Yes
-Content-Disposition: inline
-Content-Transfer-Encoding: quoted-printable
-
-Hi Francesco,
-
-On  Mo 11 Mai 2015 21:36:59 CEST, Francesco Poli wrote:
-
-> On Mon, 11 May 2015 09:26:36 +0000 Mike Gabriel wrote:
->
-> [...]
->> As it seems, dxpc has been long ago relicensed to BSD-2-clause (for
->> v3.8.1 in/around 2002).
->
-> This is great news, indeed!
->
->>
->> I have no exact clue, if NoMachine forked prior to that (if they quote
->> the old licensing terms, then probably they did).
->
-> Yep, it's plausible...
->
->>
->> However, how do you see the situation considering that upstream
->> changed to BSD-2-clause a long time ago. What approach do you propose
->> for nx-libs-lite to get the issue fully fixed?
->
-> If the fork has been performed before the DXPC re-licensing (as it's
-> likely), I see two possible strategies:
->
->  (A) someone gets in touch with DXPC copyright owners and asks them
-> whether the re-licensing may be considered retroactive (applicable to
-> older versions of DXPC); in case the answer is negative, DXPC copyright
-> owners should be persuaded to make the re-licensing retroactive
-
-This is the way to go, I will pull in Kevin Vigor (the upstream author=20=
-=20
-of=20DXPC) into this thread with my next email.
-
->  (B) nx-libs-lite upstream developers re-fork from scratch, basing the
-> new code on a BSD-licensed version of DXPC (I suspect this may turn out
-> to be somewhat painful...)
-
-Yeah, indeed painful.
-
-> Obviously, the optimal solution is (A). I hope it may work...
->
-> Thanks for your time and for your prompt and kind replies.
-
-Also, Michael DePaulo, one of the upstream NX maintainers noted that=20=20
-DXPC=20simply used a previous version of the BSD license, see [1]. The=20=
-=20
-weakness=20of that ancient license template is that modification is not=20=
-=20
-explictily=20allowed, but neither forbidden.
-
-I think, regarding the historical usage of the BSD license predecessor=20=
-=20
-and=20the switch to BSD-2-clause should be fine already (I am not a=20=20
-lawyer,=20though). I will contact DXPC upstream nonetheless and ask for=20=
-=20
-a=20statement.
-
-Greets,
-Mike
-
-[1] http://en.wikipedia.org/wiki/BSD_licenses#Previous_license
-
---=20
-
-DAS-NETZWERKTEAM
-mike=20gabriel, herweg 7, 24357 fleckeby
-fon: +49 (1520) 1976 148
-
-GnuPG Key ID 0x25771B31
-mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
-
-freeBusy:
-https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x=
-fb
-
---=_kYZkQgyfaSLUTLVIkzgq8w1
-Content-Type: application/pgp-signature
-Content-Description: Digitale PGP-Signatur
-Content-Disposition: inline
-
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIbBAABAgAGBQJVUXqYAAoJEJr0azAldxsxYVAP+Pg4A2zg6TEs+vk/mknbLwV2
-dOv/tQiarKfb6JJRcm1j6rzGBhGzO4iwj/Uk8wmbFvIJgxs6mM93kfOPa0lJYM1N
-D0YcKPPsHqgxcyVW8pIyawhnW5IsIDSaugjsandx1hbfl+J5SBCAtSovhz5F+Fkf
-fs1wvgYcGKtWGNTxV5Qy48EnzSzAVz2r4GKBYUdRiCNpXtl/M8jJFIfm/cmJ7PJq
-ycY8Diu6x3mVvPdvap/0pOOY0uqg256XX7dcFJUtTNZoai4oGOuwR1o4g9jztyd/
-4JJ2E1MigAjGSYPpTnQGhORA86yDLQrk/NlLG/2/J8meG7Nsky6xmf3zBhuG/0G0
-3TZYQcoFrFS3EWQs0uKiGKGylchODCfXHZgF0y5NT5iqr4DMT51AlUeQl3MWhxf8
-j8OMjK86jsPMrSjL0l4uYbs+znMdlVpgjBSYsKoXg3tIc3WJpj77qyPUbfwO8hys
-5Q2j4lDaGV5NAnSmZ//p9lPwRu8oAMwSkrMkRTaJwLVhcmDzgoujZEpEPj64lIEy
-HD3p/5dSJF+RsYT6286JkWAZm+XvXeFpEqGZ7xAVsrYSY1qFm3g0se1oHxxcVWyN
-PEsQBOt8WXgYmtz7RLaBDbBQVMmeRMxbPCkC1xCHCU+Vq3y9dW/3TyOW4Oz1YoZR
-3YATO+YehUKVdM5teyg=
-=884K
------END PGP SIGNATURE-----
-
---=_kYZkQgyfaSLUTLVIkzgq8w1--
-
-
-
-
-From mike.gabriel@das-netzwerkteam.de Tue May 12 04:46:43 2015
-Received: (at 784565) by bugs.debian.org; 12 May 2015 04:46:44 +0000
-X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
-	(2014-02-07) on buxtehude.debian.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-11.4 required=4.0 tests=BAYES_00,FOURLA,
-	HAS_BUG_NUMBER,MDO_CABLE_TV3,PGPSIGNATURE,T_RP_MATCHES_RCVD autolearn=ham
-	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
-X-Spam-Bayes: score:0.0000 Tokens: new, 27; hammy, 149; neutral, 375; spammy,
-	1. spammytokens:0.998-1--arctica hammytokens:0.000-+--IIRC,
-	0.000-+--H*c:pgp-signature, 0.000-+--H*c:protocol, 0.000-+--H*c:micalg,
-	0.000-+--H*c:signed
-Return-path: <mike.gabriel@das-netzwerkteam.de>
-Received: from freya.das-netzwerkteam.de ([88.198.48.199])
-	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
-	(Exim 4.80)
-	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
-	id 1Ys25b-0004lf-4r
-	for 784565@bugs.debian.org; Tue, 12 May 2015 04:46:43 +0000
-Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
-	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id 6AB7617F5;
-	Tue, 12 May 2015 06:46:40 +0200 (CEST)
-Received: from localhost (localhost [127.0.0.1])
-	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 71D923BC0D;
-	Tue, 12 May 2015 06:46:38 +0200 (CEST)
-X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
-Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
-	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
-	with ESMTP id TYvbPGLabTH7; Tue, 12 May 2015 06:46:38 +0200 (CEST)
-Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1])
-	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPS id 0669F3BA08;
-	Tue, 12 May 2015 06:46:38 +0200 (CEST)
-Received: from p5B3B925B.dip0.t-ipconnect.de (p5B3B925B.dip0.t-ipconnect.de
- [91.59.146.91]) by mail.das-netzwerkteam.de (Horde Framework) with HTTP;
- Tue, 12 May 2015 04:46:37 +0000
-Date: Tue, 12 May 2015 04:46:37 +0000
-Message-ID: <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
-From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-To: Kevin Vigor <kevin@vigor.nu>
-Cc: 784565@bugs.debian.org, x2go-dev@lists.x2go.org,
- nito.martinez@qindel.com, opensource@gznianguan.com, Francesco Poli
- <invernomuto@paranoici.org>
-Subject: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are derived
- from non-free code
-References: <20150506173532.7531.31389.reportbug@homebrew>
- <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
- <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
-In-Reply-To: <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
-User-Agent: Internet Messaging Program (IMP) H5 (6.2.2)
-Accept-Language: de,en
-Organization: DAS-NETZWERKTEAM
-X-Originating-IP: 91.59.146.91
-X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:32.0) Gecko/20100101
- Firefox/32.0 Iceweasel/32.0
-Content-Type: multipart/signed; boundary="=_9zX_XixEpAdR4NT64zJguA1";
- protocol="application/pgp-signature"; micalg=pgp-sha1
-MIME-Version: 1.0
-
-This message is in MIME format and has been PGP signed.
-
---=_9zX_XixEpAdR4NT64zJguA1
-Content-Type: text/plain; charset=us-ascii; format=flowed; DelSp=Yes
-Content-Disposition: inline
-Content-Transfer-Encoding: quoted-printable
-
-Dear Kevin,
-
-(I Cc: several people involved in this, also the X2Go development=20=20
-mailing=20list...)
-
-[If you feel unconfortable with discussing the details / the impact of=20=
-=20
-the=20below in public, feel free to answer to me directly first with=20=20
-questions=20and concerns, before answering to all people who are listed=20=
-=20
-in=20Cc:.]
-
-Someone from the Debian legal team recently brought up a license issue=20=
-=20
-discovered=20in nx-libs 3.x series.
-
-TL;DR; Suggested by Francesco Poli from the Debian legal team: """
-(A) someone gets in touch with DXPC copyright owners and asks them
-whether the re-licensing [in 2002] may be considered retroactive=20=20
-(applicable=20to
-older versions of DXPC); in case the answer is negative, DXPC copyright
-owners should be persuaded to make the re-licensing retroactive
-"""
-
-The person contacting you about the above question is me. Mike=20=20
-Gabriel,=20Debian Developer and one of the current upstream maintainers=20=
-=20
-of=20nx-libs 3.x (previously also know as  "NX redistributed" for X2Go)=20=
-=20
-[1].
-
-This=20issue requires some time of reading from you and (hopefully) a=20=20
-public=20statement, that the original DXPC code can be considered as=20=20
-BSD-2-clause=20(the current license) also for released versions prior=20=20
-2002=20when the ancient BSD license template [2] was still shipped with=20=
-=20
-DXPC.
-
-For=20a complete follow-up, please check Debian bug #784565 [3].
-
-We are aware that NoMachine forked DXPC at some early stage around the=20=
-=20
-year=202000 and wrote their own commercial product around it. Obviously,=20=
-=20
-this=20fork happened before 2002 (i.e., before DXPC release 3.8.1), as=20=
-=20
-libxcomp3=20in NoMachine's NX ships the previously used BSD license=20=20
-template.=20I am not sure, if that fork was easy for you or actually a=20=
-=20
-nuisance.=20I may only guess at this point. I'd be happy to know more=20=20
-(maybe=20not in this mail thread, though).
-
-NoMachine has stopped publishing NXv3 updates a couple of years ago=20=20
-(2011=20IIRC), now. The maintenance has been moved into the hands of the=20=
-=20
-currently=20available FLOSS projects "X2Go", "Arctica Project" [NEW] and=20=
-=20
-"TheQVD".=20Some of us are running a business model on top of that=20=20
-(consultancy,=20support contracts, feature development contracts), some=20=
-=20
-of=20us spend a lot of their free time on improving / maintaining=20=20
-nx-libs=20(as we call NoMachine's NXv3 at the moment).
-
-To outline the impact of my mail clearly: If you say that it was not=20=20
-legal=20by NoMachine to fork DXPC at the given time (before 2002), then=20=
-=20
-all=20FLOSS remote desktop / remote application would be in real=20=20
-trouble,=20because then the core component of their software projects=20=20
-could=20not be considered as free (as in DFSG, Debian free software=20=20
-guidelines[4])=20anymore. Also the code changes originally performed by=20=
-=20
-NoMachine=20might have been illegal in the first place. All current=20=20
-maintenance=20activities and also planned future development on nx-libs=20=
-=20
-would=20become questionable.
-
-Thus, I hope you can chime in on this: Dear developers of nx-libs,=20=20
-please=20assume the BSD-2-license as retroactive and applicable to DXPC=20=
-=20
-version=20earlier than 3.8.1. As the copyright holder, I agree with=20=20
-modifications=20of code bases that originate before the change to=20=20
-BSD-2-clause=20license got introduced in 3.8.1 of DXPC.
-
-And... I will bring up that question later (but it is burning under my=20=
-=20
-nails)...=20Be sure: The nx-libs maintainers would be happy to have the=20=
-=20
-original=20DXPC author on the nx-libs developer team. But I will bring=20=
-=20
-up=20that question later (when this very issue is settled). ;-)
-
-Greets,
-Mike
-
-[1] https://github.com/ArcticaProject/nx-libs
-[2] http://en.wikipedia.org/wiki/BSD_licenses#Previous_license
-[3] http://bugs.debian.org/784565
-[4] http://de.wikipedia.org/wiki/Debian_Free_Software_Guidelines
-
-On  Mo 11 Mai 2015 21:36:59 CEST, Francesco Poli wrote:
-
-> On Mon, 11 May 2015 09:26:36 +0000 Mike Gabriel wrote:
->
-> [...]
->> As it seems, dxpc has been long ago relicensed to BSD-2-clause (for
->> v3.8.1 in/around 2002).
->
-> This is great news, indeed!
->
->>
->> I have no exact clue, if NoMachine forked prior to that (if they quote
->> the old licensing terms, then probably they did).
->
-> Yep, it's plausible...
->
->>
->> However, how do you see the situation considering that upstream
->> changed to BSD-2-clause a long time ago. What approach do you propose
->> for nx-libs-lite to get the issue fully fixed?
->
-> If the fork has been performed before the DXPC re-licensing (as it's
-> likely), I see two possible strategies:
->
->  (A) someone gets in touch with DXPC copyright owners and asks them
-> whether the re-licensing may be considered retroactive (applicable to
-> older versions of DXPC); in case the answer is negative, DXPC copyright
-> owners should be persuaded to make the re-licensing retroactive
->
->  (B) nx-libs-lite upstream developers re-fork from scratch, basing the
-> new code on a BSD-licensed version of DXPC (I suspect this may turn out
-> to be somewhat painful...)
->
->
-> Obviously, the optimal solution is (A). I hope it may work...
->
-> Thanks for your time and for your prompt and kind replies.
-
-
---=20
-
-DAS-NETZWERKTEAM
-mike=20gabriel, herweg 7, 24357 fleckeby
-fon: +49 (1520) 1976 148
-
-GnuPG Key ID 0x25771B31
-mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
-
-freeBusy:
-https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x=
-fb
-
---=_9zX_XixEpAdR4NT64zJguA1
-Content-Type: application/pgp-signature
-Content-Description: Digitale PGP-Signatur
-Content-Disposition: inline
-
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAABAgAGBQJVUYWtAAoJEJr0azAldxsxEMcP/0mjNHW4k/IiNjSbrm1j7pIQ
-k6yVqJ8cMW/71H0/VLuzS6roL02JAXMzToMzAcbPGqeV5rjhLDJNjcOuuADhb8HI
-Izisai5ABzHiclnITalVTsF4i5+MsTXI+6eNez9sv3Es8pwFuLkvAlqKsheO33mP
-dz83ZqDmCGKcCCbZmhbhGHdhScS8GMSyU7cBm6xu0TMh8rOtcECBG/+wfohVeR2I
-vy0GeYR0ZF0yIxcBGXYvjiocStjsxaqnD9QCt8JAfewVO3jY/Ye6DIEI92moS/Nz
-6iTA9GspZyYNqL7QsOraG2HF6TmIfK5xBaUjDrLH+HfKm2K6Dxp0wo6Y6VDY9mIi
-svCFCoIQ3RBihcsOp7k1v1eZl+WJJ2XXilQr3SrtlOiZAK0/FtbkUwhk4DLu5o3R
-CBHwy6F14szo8F4ChFGqqbOlODGJOiCONfOShRZQLgAgHciRirrgTKF4b25cspNU
-v7ag47K4WN3YNtkA5DO5Bj2NKAP8oWyvlTpO0uIuUZo/pj+7sHnWG8QSDJiyunVt
-3VxMLM4h3C02k+EtR2uvtKKqVFf+JgiwRGDhFx2ldUwWFg0+3IeWKuuTxRt6NcR+
-ZdDN2tR0PWpe4v+jsUqSD3YJNRoK1oyj9kMYriTkHTvhr/XcKr5KYNsWMC6nvqps
-JDhKCpypB1iR9N13NpeX
-=HDe/
------END PGP SIGNATURE-----
-
---=_9zX_XixEpAdR4NT64zJguA1--
-
-
-
-
-From kevin@vigor.nu Tue May 12 15:07:38 2015
-Received: (at 784565) by bugs.debian.org; 12 May 2015 15:07:38 +0000
-X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
-	(2014-02-07) on buxtehude.debian.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-6.4 required=4.0 tests=BAYES_00,FOURLA,
-	HAS_BUG_NUMBER,MDO_CABLE_TV3,SPF_PASS autolearn=ham autolearn_force=no
-	version=3.4.0-bugs.debian.org_2005_01_02
-X-Spam-Bayes: score:0.0000 Tokens: new, 34; hammy, 150; neutral, 395; spammy,
-	0. spammytokens: hammytokens:0.000-+--IIRC, 0.000-+--H*f:sk:2015050,
-	0.000-+--H*UA:31.0, 0.000-+--H*u:31.0, 0.000-+--H*u:x86_64
-Return-path: <kevin@vigor.nu>
-Received: from gateway30.websitewelcome.com ([192.185.184.48])
-	by buxtehude.debian.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256)
-	(Exim 4.80)
-	(envelope-from <kevin@vigor.nu>)
-	id 1YsBmT-0007o6-Qg
-	for 784565@bugs.debian.org; Tue, 12 May 2015 15:07:38 +0000
-Received: by gateway30.websitewelcome.com (Postfix, from userid 500)
-	id 69AEB573DA20; Tue, 12 May 2015 09:55:02 -0500 (CDT)
-Received: from gator4058.hostgator.com (gator4058.hostgator.com [192.185.4.69])
-	by gateway30.websitewelcome.com (Postfix) with ESMTP id 677E2573DA04
-	for <784565@bugs.debian.org>; Tue, 12 May 2015 09:55:02 -0500 (CDT)
-Received: from [63.158.132.10] (port=46206 helo=[10.50.3.84])
-	by gator4058.hostgator.com with esmtpsa (UNKNOWN:DHE-RSA-AES128-SHA:128)
-	(Exim 4.82)
-	(envelope-from <kevin@vigor.nu>)
-	id 1YsBaH-0003xr-Ii; Tue, 12 May 2015 09:55:01 -0500
-Message-ID: <55521444.9090407@vigor.nu>
-Date: Tue, 12 May 2015 08:55:00 -0600
-From: Kevin Vigor <kevin@vigor.nu>
-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0
-MIME-Version: 1.0
-To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-CC: 784565@bugs.debian.org, x2go-dev@lists.x2go.org, 
- nito.martinez@qindel.com, opensource@gznianguan.com, 
- Francesco Poli <invernomuto@paranoici.org>
-Subject: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are derived
- from non-free code
-References: <20150506173532.7531.31389.reportbug@homebrew> <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de> <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org> <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
-In-Reply-To: <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
-Content-Type: text/plain; charset=windows-1252; format=flowed
-Content-Transfer-Encoding: 7bit
-X-AntiAbuse: This header was added to track abuse, please include it with any abuse report
-X-AntiAbuse: Primary Hostname - gator4058.hostgator.com
-X-AntiAbuse: Original Domain - bugs.debian.org
-X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12]
-X-AntiAbuse: Sender Address Domain - vigor.nu
-X-BWhitelist: no
-X-Source-IP: 63.158.132.10
-X-Exim-ID: 1YsBaH-0003xr-Ii
-X-Source: 
-X-Source-Args: 
-X-Source-Dir: 
-X-Source-Sender: ([10.50.3.84]) [63.158.132.10]:46206
-X-Source-Auth: kevin@vigor.nu
-X-Email-Count: 2
-X-Source-Cap: a3ZpZ29yO2t2aWdvcjtnYXRvcjQwNTguaG9zdGdhdG9yLmNvbQ==
-X-Greylist: delayed 379 seconds by postgrey-1.34 at buxtehude; Tue, 12 May 2015 15:07:37 UTC
-
-Hi Mike, et al,
-
-    I am not the original author of dxpc, that being Brian Pane. However, I took over maintenance circa 1999 and am still the primary maintainer (though the project has effectively been dead for most of a decade now).
-
-    As you are aware, when I inherited the code, it was licensed under a variant of the BSD license that did not include the 'with modification' clause. To the best of my recollection, somebody from the FSF contacted me circa 2001 regarding this and as a result, subsequent releases were done under a standard 2-clause BSD license with the modification clause. Again, to the best of my recollection, I contacted Brian about this change and he offered no objection.
-
-    Further, I recall distinctly that NoMachine contacted me and explicitly asked permission before including DXPC code in NX, which I happily granted with no new conditions beyond the BSD license already in play.
-
-    It is possible, though by no means certain, that I could dig up ancient email to corroborate this account if necessary. However, I am more than willing to publicly state that I believe NoMachine's use of DXPC code to be both legal and ethical, and that my intent when changing the license to 2-clause BSD was simply to clarity the existing intent and that it ought therefore be considered retroactive.
-
-    Yours,
-       Kevin Vigor
-
-On 05/11/15 22:46, Mike Gabriel wrote:
-> Dear Kevin,
->
-> (I Cc: several people involved in this, also the X2Go development mailing list...)
->
-> [If you feel unconfortable with discussing the details / the impact of the below in public, feel free to answer to me directly first with questions and concerns, before answering to all people who are listed in Cc:.]
->
-> Someone from the Debian legal team recently brought up a license issue discovered in nx-libs 3.x series.
->
-> TL;DR; Suggested by Francesco Poli from the Debian legal team: """
-> (A) someone gets in touch with DXPC copyright owners and asks them
-> whether the re-licensing [in 2002] may be considered retroactive (applicable to
-> older versions of DXPC); in case the answer is negative, DXPC copyright
-> owners should be persuaded to make the re-licensing retroactive
-> """
->
-> The person contacting you about the above question is me. Mike Gabriel, Debian Developer and one of the current upstream maintainers of nx-libs 3.x (previously also know as  "NX redistributed" for X2Go) [1].
->
-> This issue requires some time of reading from you and (hopefully) a public statement, that the original DXPC code can be considered as BSD-2-clause (the current license) also for released versions prior 2002 when the ancient BSD license template [2] was still shipped with DXPC.
->
-> For a complete follow-up, please check Debian bug #784565 [3].
->
-> We are aware that NoMachine forked DXPC at some early stage around the year 2000 and wrote their own commercial product around it. Obviously, this fork happened before 2002 (i.e., before DXPC release 3.8.1), as libxcomp3 in NoMachine's NX ships the previously used BSD license template. I am not sure, if that fork was easy for you or actually a nuisance. I may only guess at this point. I'd be happy to know more (maybe not in this mail thread, though).
->
-> NoMachine has stopped publishing NXv3 updates a couple of years ago (2011 IIRC), now. The maintenance has been moved into the hands of the currently available FLOSS projects "X2Go", "Arctica Project" [NEW] and "TheQVD". Some of us are running a business model on top of that (consultancy, support contracts, feature development contracts), some of us spend a lot of their free time on improving / maintaining nx-libs (as we call NoMachine's NXv3 at the moment).
->
-> To outline the impact of my mail clearly: If you say that it was not legal by NoMachine to fork DXPC at the given time (before 2002), then all FLOSS remote desktop / remote application would be in real trouble, because then the core component of their software projects could not be considered as free (as in DFSG, Debian free software guidelines[4]) anymore. Also the code changes originally performed by NoMachine might have been illegal in the first place. All current maintenance activities and also planned future development on nx-libs would become questionable.
->
-> Thus, I hope you can chime in on this: Dear developers of nx-libs, please assume the BSD-2-license as retroactive and applicable to DXPC version earlier than 3.8.1. As the copyright holder, I agree with modifications of code bases that originate before the change to BSD-2-clause license got introduced in 3.8.1 of DXPC.
->
-> And... I will bring up that question later (but it is burning under my nails)... Be sure: The nx-libs maintainers would be happy to have the original DXPC author on the nx-libs developer team. But I will bring up that question later (when this very issue is settled). ;-)
->
-> Greets,
-> Mike
->
-> [1] https://github.com/ArcticaProject/nx-libs
-> [2] http://en.wikipedia.org/wiki/BSD_licenses#Previous_license
-> [3] http://bugs.debian.org/784565
-> [4] http://de.wikipedia.org/wiki/Debian_Free_Software_Guidelines
->
-> On  Mo 11 Mai 2015 21:36:59 CEST, Francesco Poli wrote:
->
->> On Mon, 11 May 2015 09:26:36 +0000 Mike Gabriel wrote:
->>
->> [...]
->>> As it seems, dxpc has been long ago relicensed to BSD-2-clause (for
->>> v3.8.1 in/around 2002).
->>
->> This is great news, indeed!
->>
->>>
->>> I have no exact clue, if NoMachine forked prior to that (if they quote
->>> the old licensing terms, then probably they did).
->>
->> Yep, it's plausible...
->>
->>>
->>> However, how do you see the situation considering that upstream
->>> changed to BSD-2-clause a long time ago. What approach do you propose
->>> for nx-libs-lite to get the issue fully fixed?
->>
->> If the fork has been performed before the DXPC re-licensing (as it's
->> likely), I see two possible strategies:
->>
->>  (A) someone gets in touch with DXPC copyright owners and asks them
->> whether the re-licensing may be considered retroactive (applicable to
->> older versions of DXPC); in case the answer is negative, DXPC copyright
->> owners should be persuaded to make the re-licensing retroactive
->>
->>  (B) nx-libs-lite upstream developers re-fork from scratch, basing the
->> new code on a BSD-licensed version of DXPC (I suspect this may turn out
->> to be somewhat painful...)
->>
->>
->> Obviously, the optimal solution is (A). I hope it may work...
->>
->> Thanks for your time and for your prompt and kind replies.
->
->
-
-
-
-
-From mike.gabriel@das-netzwerkteam.de Tue May 12 15:42:13 2015
-Received: (at 784565) by bugs.debian.org; 12 May 2015 15:42:13 +0000
-X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
-	(2014-02-07) on buxtehude.debian.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-6.4 required=4.0 tests=BAYES_00,FOURLA,
-	HAS_BUG_NUMBER,MDO_CABLE_TV3,T_RP_MATCHES_RCVD autolearn=ham
-	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
-X-Spam-Bayes: score:0.0000 Tokens: new, 28; hammy, 150; neutral, 444; spammy,
-	0. spammytokens: hammytokens:0.000-+--IIRC, 0.000-+--H*RU:sk:grimnir,
-	0.000-+--H*r:sk:grimnir, 0.000-+--H*RU:78.46.204.98,
-	0.000-+--H*RU:88.198.48.199
-Return-path: <mike.gabriel@das-netzwerkteam.de>
-Received: from freya.das-netzwerkteam.de ([88.198.48.199])
-	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
-	(Exim 4.80)
-	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
-	id 1YsCJx-0003Fj-12
-	for 784565@bugs.debian.org; Tue, 12 May 2015 15:42:13 +0000
-Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
-	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id AB2291F6
-	for <784565@bugs.debian.org>; Tue, 12 May 2015 17:42:08 +0200 (CEST)
-Received: from localhost (localhost [127.0.0.1])
-	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 0899C3BFDA
-	for <784565@bugs.debian.org>; Tue, 12 May 2015 17:42:08 +0200 (CEST)
-X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
-Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
-	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
-	with ESMTP id tKjFu527nUiq for <784565@bugs.debian.org>;
-	Tue, 12 May 2015 17:42:07 +0200 (CEST)
-Received: from localhost (localhost [127.0.0.1])
-	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 558633C022
-	for <784565@bugs.debian.org>; Tue, 12 May 2015 17:42:07 +0200 (CEST)
-Received: from localhost (localhost [127.0.0.1])
-	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 1F4393BFDA
-	for <784565@bugs.debian.org>; Tue, 12 May 2015 17:42:07 +0200 (CEST)
-Received: from [10.215.43.89] (unknown [46.115.20.43])
-	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPSA id 867C23BA87;
-	Tue, 12 May 2015 17:42:02 +0200 (CEST)
-From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Reply-To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-To: Kevin Vigor <kevin@vigor.nu>
-Cc: 784565@bugs.debian.org, x2go-dev@lists.x2go.org, nito.martinez@qindel.com,  opensource@gznianguan.com, Francesco Poli <invernomuto@paranoici.org>
-Subject: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are derived
-	from non-free code
-X-Mailer: Modest 3.2
-References: <20150506173532.7531.31389.reportbug@homebrew>
-	 <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
-	 <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
-	 <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
-	  <55521444.9090407@vigor.nu>
-In-Reply-To: <55521444.9090407@vigor.nu>
-Content-Type: text/plain; charset=utf-8
-Content-ID: <1431445315.4712.6.camel@Nokia-N900>
-Date: Tue, 12 May 2015 17:41:55 +0200
-Message-Id: <1431445315.4712.7.camel@Nokia-N900>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 8bit
-
-Hi Kevin,
-
-thanks for your feedback. Let us wait for Francesco, our expert on license issues, and see what he thinks about your feedback.
-
-Thank you very much for providing info and sharing pieces of nx-libs's history.
-
-As you sent your reply to the Debian bug tracker already, this will public statement enough, I guess.
-
-Thanks a lot,
-Mike
-
--- 
-
-DAS-NETZWERKTEAM
-mike gabriel, herweg 7, 24357 fleckeby
-fon: +49 (1520) 1976148
-
-GnuPG Key ID 0x25771B13
-mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
-
-
------ Original message -----
-> Hi Mike, et al,
-> 
->         I am not the original author of dxpc, that being Brian Pane.
-> However, I took over maintenance circa 1999 and am still the primary
-> maintainer (though the project has effectively been dead for most of a
-> decade now).
-> 
->         As you are aware, when I inherited the code, it was licensed under a
-> variant of the BSD license that did not include the 'with modification'
-> clause. To the best of my recollection, somebody from the FSF contacted
-> me circa 2001 regarding this and as a result, subsequent releases were
-> done under a standard 2-clause BSD license with the modification clause.
-> Again, to the best of my recollection, I contacted Brian about this
-> change and he offered no objection.
-> 
->         Further, I recall distinctly that NoMachine contacted me and
-> explicitly asked permission before including DXPC code in NX, which I
-> happily granted with no new conditions beyond the BSD license already in
-> play.
-> 
->         It is possible, though by no means certain, that I could dig up
-> ancient email to corroborate this account if necessary. However, I am
-> more than willing to publicly state that I believe NoMachine's use of
-> DXPC code to be both legal and ethical, and that my intent when changing
-> the license to 2-clause BSD was simply to clarity the existing intent
-> and that it ought therefore be considered retroactive.
-> 
->         Yours,
->               Kevin Vigor
-> 
-> On 05/11/15 22:46, Mike Gabriel wrote:
-> > Dear Kevin,
-> > 
-> > (I Cc: several people involved in this, also the X2Go development
-> > mailing list...)
-> > 
-> > [If you feel unconfortable with discussing the details / the impact of
-> > the below in public, feel free to answer to me directly first with
-> > questions and concerns, before answering to all people who are listed
-> > in Cc:.]
-> > 
-> > Someone from the Debian legal team recently brought up a license issue
-> > discovered in nx-libs 3.x series.
-> > 
-> > TL;DR; Suggested by Francesco Poli from the Debian legal team: """
-> > (A) someone gets in touch with DXPC copyright owners and asks them
-> > whether the re-licensing [in 2002] may be considered retroactive
-> > (applicable to older versions of DXPC); in case the answer is
-> > negative, DXPC copyright owners should be persuaded to make the
-> > re-licensing retroactive """
-> > 
-> > The person contacting you about the above question is me. Mike
-> > Gabriel, Debian Developer and one of the current upstream maintainers
-> > of nx-libs 3.x (previously also know as   "NX redistributed" for X2Go)
-> > [1].
-> > 
-> > This issue requires some time of reading from you and (hopefully) a
-> > public statement, that the original DXPC code can be considered as
-> > BSD-2-clause (the current license) also for released versions prior
-> > 2002 when the ancient BSD license template [2] was still shipped with
-> > DXPC.
-> > 
-> > For a complete follow-up, please check Debian bug #784565 [3].
-> > 
-> > We are aware that NoMachine forked DXPC at some early stage around the
-> > year 2000 and wrote their own commercial product around it. Obviously,
-> > this fork happened before 2002 (i.e., before DXPC release 3.8.1), as
-> > libxcomp3 in NoMachine's NX ships the previously used BSD license
-> > template. I am not sure, if that fork was easy for you or actually a
-> > nuisance. I may only guess at this point. I'd be happy to know more
-> > (maybe not in this mail thread, though).
-> > 
-> > NoMachine has stopped publishing NXv3 updates a couple of years ago
-> > (2011 IIRC), now. The maintenance has been moved into the hands of the
-> > currently available FLOSS projects "X2Go", "Arctica Project" [NEW] and
-> > "TheQVD". Some of us are running a business model on top of that
-> > (consultancy, support contracts, feature development contracts), some
-> > of us spend a lot of their free time on improving / maintaining
-> > nx-libs (as we call NoMachine's NXv3 at the moment).
-> > 
-> > To outline the impact of my mail clearly: If you say that it was not
-> > legal by NoMachine to fork DXPC at the given time (before 2002), then
-> > all FLOSS remote desktop / remote application would be in real
-> > trouble, because then the core component of their software projects
-> > could not be considered as free (as in DFSG, Debian free software
-> > guidelines[4]) anymore. Also the code changes originally performed by
-> > NoMachine might have been illegal in the first place. All current
-> > maintenance activities and also planned future development on nx-libs
-> > would become questionable.
-> > 
-> > Thus, I hope you can chime in on this: Dear developers of nx-libs,
-> > please assume the BSD-2-license as retroactive and applicable to DXPC
-> > version earlier than 3.8.1. As the copyright holder, I agree with
-> > modifications of code bases that originate before the change to
-> > BSD-2-clause license got introduced in 3.8.1 of DXPC.
-> > 
-> > And... I will bring up that question later (but it is burning under my
-> > nails)... Be sure: The nx-libs maintainers would be happy to have the
-> > original DXPC author on the nx-libs developer team. But I will bring
-> > up that question later (when this very issue is settled). ;-)
-> > 
-> > Greets,
-> > Mike
-> > 
-> > [1] https://github.com/ArcticaProject/nx-libs
-> > [2] http://en.wikipedia.org/wiki/BSD_licenses#Previous_license
-> > [3] http://bugs.debian.org/784565
-> > [4] http://de.wikipedia.org/wiki/Debian_Free_Software_Guidelines
-> > 
-> > On   Mo 11 Mai 2015 21:36:59 CEST, Francesco Poli wrote:
-> > 
-> > > On Mon, 11 May 2015 09:26:36 +0000 Mike Gabriel wrote:
-> > > 
-> > > [...]
-> > > > As it seems, dxpc has been long ago relicensed to BSD-2-clause (for
-> > > > v3.8.1 in/around 2002).
-> > > 
-> > > This is great news, indeed!
-> > > 
-> > > > 
-> > > > I have no exact clue, if NoMachine forked prior to that (if they
-> > > > quote the old licensing terms, then probably they did).
-> > > 
-> > > Yep, it's plausible...
-> > > 
-> > > > 
-> > > > However, how do you see the situation considering that upstream
-> > > > changed to BSD-2-clause a long time ago. What approach do you
-> > > > propose for nx-libs-lite to get the issue fully fixed?
-> > > 
-> > > If the fork has been performed before the DXPC re-licensing (as it's
-> > > likely), I see two possible strategies:
-> > > 
-> > > (A) someone gets in touch with DXPC copyright owners and asks them
-> > > whether the re-licensing may be considered retroactive (applicable to
-> > > older versions of DXPC); in case the answer is negative, DXPC
-> > > copyright owners should be persuaded to make the re-licensing
-> > > retroactive
-> > > 
-> > > (B) nx-libs-lite upstream developers re-fork from scratch, basing the
-> > > new code on a BSD-licensed version of DXPC (I suspect this may turn
-> > > out to be somewhat painful...)
-> > > 
-> > > 
-> > > Obviously, the optimal solution is (A). I hope it may work...
-> > > 
-> > > Thanks for your time and for your prompt and kind replies.
-> > 
-> > 
-> 
-
-
-
-
-From invernomuto@paranoici.org Tue May 12 21:42:01 2015
-Received: (at 784565) by bugs.debian.org; 12 May 2015 21:42:01 +0000
-X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
-	(2014-02-07) on buxtehude.debian.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-12.0 required=4.0 tests=BAYES_00,DKIM_SIGNED,
-	DKIM_VALID,DKIM_VALID_AU,FOURLA,HAS_BUG_NUMBER,PGPSIGNATURE,SPF_HELO_PASS,
-	SPF_PASS autolearn=ham autolearn_force=no
-	version=3.4.0-bugs.debian.org_2005_01_02
-X-Spam-Bayes: score:0.0000 Tokens: new, 15; hammy, 150; neutral, 119; spammy,
-	0. spammytokens: hammytokens:0.000-+--H*UA:sk:x86_64-,
-	0.000-+--H*x:sk:x86_64-, 0.000-+--H*c:PGP-SHA256, 0.000-+--H*c:SignHturH,
-	0.000-+--H*c:pgp-signature
-Return-path: <invernomuto@paranoici.org>
-Received: from perdizione.investici.org ([94.23.50.208])
-	by buxtehude.debian.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256)
-	(Exim 4.80)
-	(envelope-from <invernomuto@paranoici.org>)
-	id 1YsHw8-0008Hh-DT
-	for 784565@bugs.debian.org; Tue, 12 May 2015 21:42:01 +0000
-Received: from [94.23.50.208] (perdizione [94.23.50.208]) (Authenticated sender: invernomuto@paranoici.org) by localhost (Postfix) with ESMTPSA id 9E73512097E;
-	Tue, 12 May 2015 21:41:55 +0000 (UTC)
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paranoici.org;
-	s=stigmate; t=1431466915;
-	bh=w0yVuJLtWq+0cj6zbjNb4THkJk0Xq3N9SMQ1+u0ZZnk=;
-	h=Date:From:To:Cc:Subject:In-Reply-To:References;
-	b=RRQcr33uMGnEaupGoWl0nXectE2hPbUghdie73/SnVp5Ax5QWxqK90ic5VPUE7RsN
-	 RsJ6HcYccQEzYLzm37W24u9eQZFa+Oc1CZaJBvFgOg9MAvh6tHaLUgOuFGkYXhn5R0
-	 Nlq5WHCpVKi9YvGfj/aAtfe84CJPt2HIKAqPXb5w=
-Received: from frx by homebrew with local (Exim 4.85)
-	(envelope-from <invernomuto@paranoici.org>)
-	id 1YsHvP-00019Q-D1; Tue, 12 May 2015 23:41:15 +0200
-Date: Tue, 12 May 2015 23:40:48 +0200
-From: Francesco Poli <invernomuto@paranoici.org>
-To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Cc: Kevin Vigor <kevin@vigor.nu>, 784565@bugs.debian.org,
- x2go-dev@lists.x2go.org, nito.martinez@qindel.com,
- opensource@gznianguan.com
-Subject: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are derived
- from non-free code
-Message-Id: <20150512234048.054319a449ffadcf87577425@paranoici.org>
-In-Reply-To: <1431445315.4712.7.camel@Nokia-N900>
-References: <20150506173532.7531.31389.reportbug@homebrew>
-	<20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
-	<20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
-	<20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
-	<55521444.9090407@vigor.nu>
-	<1431445315.4712.7.camel@Nokia-N900>
-X-Mailer: Sylpheed 3.5.0beta1 (GTK+ 2.24.25; x86_64-pc-linux-gnu)
-Mime-Version: 1.0
-Content-Type: multipart/signed; protocol="application/pgp-signature";
- micalg="PGP-SHA256";
- boundary="Signature=_Tue__12_May_2015_23_40_48_+0200_KqpLAiCdvC+4zCCk"
-
---Signature=_Tue__12_May_2015_23_40_48_+0200_KqpLAiCdvC+4zCCk
-Content-Type: text/plain; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: quoted-printable
-
-On Tue, 12 May 2015 17:41:55 +0200 Mike Gabriel wrote:
-
-> Hi Kevin,
-
-Hello Mike, hello Kevin, hello to all the other recipients.
-
-First of all, I wish to express my gratitude to Kevin for his prompt,
-kind and generous response.
-
->=20
-> thanks for your feedback. Let us wait for Francesco, our expert on licens=
-e issues, and see what he thinks about your feedback.
-
-I think that this is an important first step to solve this issue for
-the best.
-Kevin Vigor is one of the copyright owners of the code that was forked
-before the re-licensing.
-We now know that he intended the re-licensing to be retroactive and
-this is really good.
-
-I think that now it would be useful to ascertain that the other
-copyright owners (Brian Pane, Zachary Vonler, Gian Filippo Pinzari) are
-also OK with this interpretation of the re-licensing operation.
-
-Maybe Kevin is able to dig the original conversations (assuming they
-were carried on by e-mail or similar archived means) or otherwise to
-get in touch with them and check? Or, alternatively, Kevin could help
-Mike to get in touch with them?
-
-I hope everything may be settled for the best soon.
-Thanks a lot to everyone involved.
-
-
-
---=20
- http://www.inventati.org/frx/
- There's not a second to spare! To the laboratory!
-..................................................... Francesco Poli .
- GnuPG key fpr =3D=3D CA01 1147 9CD2 EFDF FB82  3925 3E1C 27E1 1F69 BFFE
-
---Signature=_Tue__12_May_2015_23_40_48_+0200_KqpLAiCdvC+4zCCk
-Content-Type: application/pgp-signature
-
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJVUnNlAAoJED4cJ+Efab/+CBQP/33+SjLcIk2VZbjeeyCxhCAo
-kmgg9BDtqce1Dy22ONotywDNQ187suqlmkEa6yAAdglB0M3CYMFKSIsZHn2C0uGb
-B45HnzXE7PJd/j/WOXuCIvDe70iGJ7Ubk16DCjyRuKsF70cr2DcsbieiwZh8Wi4v
-GXNOxpm5Nv2bs1vQnRzYFc7GLWny3eCqcWF23XisqvxQecOHopoGWr9F6NuS5ymz
-NQ8Z7eanEPaqE86GYFIqJyt9Wcz+fM2r1d/IrNmYaTVBJPrqndQKnXJAViwYhtaM
-V8+CIKDuttcIYMto9dyE9+vr6wgtDyepVatQIHyVA2LpzR9jub8MGelXMdA7em3i
-/H3gz3H/tQti3T3HoHu+4CSAEWsXdtkHq2RWU9k3+HQuWB00z7WDr404xzs7k2Wg
-h6VR9c+VjV92KnMvDqWjE4VBYjrn6Ag5u/0Cf6HMx5RAGFNL8ROjOGbQSskfUogo
-GnWX2b8yLIe8ojg3AVowWV2oKVlWzsjZVHH9lp0M/lqGmnPVEJk0mh6DKbZPjK8O
-P2dpZ8IlSa18R2CvMWnf7HXKRR/s2ef7rUmBkT2sFnTwsT5PeDSU45/7ZuWbNIpw
-8/Y5q38c36Axeng1J0OCR8YX47dH0PubVnBzYEqoun3GucR1jifOiNzWLyM2ZxNe
-0JSSqn5ddFC8/iuGpFDI
-=ZqCl
------END PGP SIGNATURE-----
-
---Signature=_Tue__12_May_2015_23_40_48_+0200_KqpLAiCdvC+4zCCk--
-
-
-
-From niels@thykier.net Wed May 13 16:04:21 2015
-Received: (at control) by bugs.debian.org; 13 May 2015 16:04:21 +0000
-X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
-	(2014-02-07) on buxtehude.debian.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-3.9 required=4.0 tests=BAYES_00,DKIM_SIGNED,
-	DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H4,
-	RCVD_IN_MSPIKE_WL autolearn=ham autolearn_force=no
-	version=3.4.0-bugs.debian.org_2005_01_02
-X-Spam-Bayes: score:0.0000 Tokens: new, 6; hammy, 61; neutral, 18; spammy, 0.
-	spammytokens: hammytokens:0.000-+--H*u:devscripts, 0.000-+--H*u:bts,
-	0.000-+--H*UA:bts, 0.000-+--H*UA:devscripts, 0.000-+--H*MI:thykier
-Return-path: <niels@thykier.net>
-Received: from mailrelay11.public.one.com ([195.47.247.189])
-	by buxtehude.debian.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256)
-	(Exim 4.80)
-	(envelope-from <niels@thykier.net>)
-	id 1YsZ8u-0002Ch-RD
-	for control@bugs.debian.org; Wed, 13 May 2015 16:04:21 +0000
-X-HalOne-Cookie: 4652f81fa62fa9da4dd9249e7484054c41bc782d
-X-HalOne-ID: b22b9887-f989-11e4-950a-b82a72d06996
-DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple;
-	d=thykier.net; s=20140924;
-	h=from:subject:date:message-id:to;
-	bh=EysymZxJFEX8N6fIBUIaFmFP7WdtVLf5PrmWzWVb22Y=;
-	b=Ur7nNbvtl3pu7O1YKIHwSM8MHIW+JPWJKM1GBE23FB4sLbENnBM2V0rmU5++qyolEv7hHAhvKkWFO
-	 lH4tbbHCyoYVdUE76nRT/1HEb5/X+pxjrsC1qTXWWXkekbuLNcDwIl0+WdVVEd5B4LYpW7igVWi4AH
-	 XncGXx/MNYDQvFiU=
-Received: from thykier.net (unknown [80.62.116.219])
-	by smtpfilter3.public.one.com (Halon Mail Gateway) with ESMTPSA
-	for <control@bugs.debian.org>; Wed, 13 May 2015 16:04:12 +0000 (GMT)
-Received: by thykier.net (Postfix, from userid 1000)
-	id 985EB4BB; Wed, 13 May 2015 18:04:10 +0200 (CEST)
-From: Niels Thykier <niels@thykier.net>
-To: control@bugs.debian.org
-Subject: tagging 784565
-Date: Wed, 13 May 2015 18:04:10 +0200
-User-Agent: devscripts bts/2.15.4
-Message-ID: <1431533050-371-bts-niels@thykier.net>
-Delivered-To: control@bugs.debian.org
-
-# distributable
-tags 784565 + jessie-ignore
-thanks
-
-
-
-
-From mike.gabriel@das-netzwerkteam.de Thu May 14 04:58:16 2015
-Received: (at 784565) by bugs.debian.org; 14 May 2015 04:58:16 +0000
-X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
-	(2014-02-07) on buxtehude.debian.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-11.9 required=4.0 tests=BAYES_00,FOURLA,
-	HAS_BUG_NUMBER,PGPSIGNATURE,T_RP_MATCHES_RCVD autolearn=ham
-	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
-X-Spam-Bayes: score:0.0000 Tokens: new, 22; hammy, 150; neutral, 339; spammy,
-	0. spammytokens: hammytokens:0.000-+--H*c:pgp-signature,
-	0.000-+--H*c:protocol, 0.000-+--H*c:micalg, 0.000-+--H*c:signed,
-	0.000-+--H*RU:sk:grimnir
-Return-path: <mike.gabriel@das-netzwerkteam.de>
-Received: from freya.das-netzwerkteam.de ([88.198.48.199])
-	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
-	(Exim 4.80)
-	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
-	id 1YslDr-0000NV-Ur
-	for 784565@bugs.debian.org; Thu, 14 May 2015 04:58:16 +0000
-Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
-	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id A03C82B5;
-	Thu, 14 May 2015 06:58:11 +0200 (CEST)
-Received: from localhost (localhost [127.0.0.1])
-	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id E89E93BD2E;
-	Thu, 14 May 2015 06:58:10 +0200 (CEST)
-X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
-Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
-	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
-	with ESMTP id 5m6G8sqwjlfJ; Thu, 14 May 2015 06:58:10 +0200 (CEST)
-Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1])
-	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPS id 5713E3BB3A;
-	Thu, 14 May 2015 06:58:10 +0200 (CEST)
-Received: from bifrost.das-netzwerkteam.de (bifrost.das-netzwerkteam.de
- [178.62.101.154]) by mail.das-netzwerkteam.de (Horde Framework) with HTTP;
- Thu, 14 May 2015 04:58:10 +0000
-Date: Thu, 14 May 2015 04:58:09 +0000
-Message-ID: <20150514045809.Horde.-3NIZzBnA5V5B6a721F2kg2@mail.das-netzwerkteam.de>
-From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-To: Francesco Poli <invernomuto@paranoici.org>
-Cc: Kevin Vigor <kevin@vigor.nu>, 784565@bugs.debian.org,
- x2go-dev@lists.x2go.org, nito.martinez@qindel.com, opensource@gznianguan.com
-Subject: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are derived
- from non-free code
-References: <20150506173532.7531.31389.reportbug@homebrew>
- <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
- <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
- <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
- <55521444.9090407@vigor.nu> <1431445315.4712.7.camel@Nokia-N900>
- <20150512234048.054319a449ffadcf87577425@paranoici.org>
-In-Reply-To: <20150512234048.054319a449ffadcf87577425@paranoici.org>
-User-Agent: Internet Messaging Program (IMP) H5 (6.2.2)
-Accept-Language: de,en
-Organization: DAS-NETZWERKTEAM
-X-Originating-IP: 178.62.101.154
-X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:32.0) Gecko/20100101
- Firefox/32.0 Iceweasel/32.0
-Content-Type: multipart/signed; boundary="=_SHoEHYV8bfary9lJHYP1lQ1";
- protocol="application/pgp-signature"; micalg=pgp-sha1
-MIME-Version: 1.0
-
-This message is in MIME format and has been PGP signed.
-
---=_SHoEHYV8bfary9lJHYP1lQ1
-Content-Type: text/plain; charset=us-ascii; format=flowed; DelSp=Yes
-Content-Disposition: inline
-Content-Transfer-Encoding: quoted-printable
-
-Hi all,
-
-there has been an off-list mail exchange between Francesco and Kevin=20=20
-(and=20me in Cc:) which I will quote at the end of this mail (as it was=20=
-=20
-not=20meant to be private and we should fully document the flow on this=20=
-=20
-issue).
-
-@Kevin:=20I will take you off this mail thread's Cc: field with my next=20=
-=20
-post.=20Feel free to follow-up via #784565 [1] on the Debian bug=20=20
-tracker.=20Thanks a lot for being so responsive and generous with=20=20
-providing=20information.
-
-On  Di 12 Mai 2015 23:40:48 CEST, Francesco Poli wrote:
-
-> On Tue, 12 May 2015 17:41:55 +0200 Mike Gabriel wrote:
-
-> I think that now it would be useful to ascertain that the other
-> copyright owners (Brian Pane, Zachary Vonler, Gian Filippo Pinzari) are
-> also OK with this interpretation of the re-licensing operation.
-
-As stated by Kevin, Gian Filippo worked/works on the NoMachine side. I=20=
-=20
-will=20include him in Cc:.
-
-For Brian Pane we also found and e-Mail address, for Zach Vonler, I=20=20
-will=20use the mail address provided in DXPC code (which might be=20=20
-outdated),=20but I think I actually have found his phone number on the=20=
-=20
-web,=20so if that mail address bounces I will give him a ring.
-
-> Maybe Kevin is able to dig the original conversations (assuming they
-> were carried on by e-mail or similar archived means) or otherwise to
-> get in touch with them and check? Or, alternatively, Kevin could help
-
-As stated in the forwarded messages below, Kevin was unable to dig out=20=
-=20
-any=20mails from backups. So we switch to plan B: contact Brian, Zach=20=20
-and=20Gian Filippo.
-
-> Mike to get in touch with them?
-
-I will do that.
-
-> I hope everything may be settled for the best soon.
-> Thanks a lot to everyone involved.
-
-/me, too.
-
-light+love
-Mike
-
-[1] http://bugs.debian.org/784565
-
-
------ Weitergeleitete Nachricht von Kevin Vigor <kevin@vigor.nu> -----
-   Datum: Wed, 13 May 2015 09:01:27 -0600
-     Von: Kevin Vigor <kevin@vigor.nu>
-Betreff: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are=20=20
-derived=20from non-free code
-      An: Francesco Poli <invernomuto@paranoici.org>
-      Cc: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-
-On 05/12/15 15:40, Francesco Poli wrote:
-
-> Maybe Kevin is able to dig the original conversations (assuming they
-> were carried on by e-mail or similar archived means) or otherwise to
-> get in touch with them and check? Or, alternatively, Kevin could help
-> Mike to get in touch with them?
-
-I'm afraid I was not able to dig anything out of old backups last=20=20
-night.=20I still have a stack of CDs to look through, but don't hold=20=20
-your=20breath. Sorry about that.
-
-I have never had any contact with Zachary Vonler or Gian Filippo=20=20
-Pinzari,=20and have not spoken with Brian Pane in many years, so I have=20=
-=20
-no=20recent contact information for any of them. However, a quick google=20=
-=20
-turns=20up:
-
-https://www.linkedin.com/profile/view?id=3D728859
-http://www.brianp.net/contact/
-
-which is almost certainly the right Brian Pane (he was at CNet at the=20=20
-proper=20time).
-
-
-    Good luck,
-          Kevin
-
------ Ende der weitergeleiteten Nachricht -----
-
------ Weitergeleitete Nachricht von Francesco Poli=20=20
-<invernomuto@paranoici.org>=20-----
-   Datum: Wed, 13 May 2015 19:43:44 +0200
-     Von: Francesco Poli <invernomuto@paranoici.org>
-Betreff: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are=20=20
-derived=20from non-free code
-      An: Kevin Vigor <kevin@vigor.nu>
-      Cc: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-
-On Wed, 13 May 2015 09:01:27 -0600 Kevin Vigor wrote:
-
-> On 05/12/15 15:40, Francesco Poli wrote:
->
-> > Maybe Kevin is able to dig the original conversations (assuming they
-> > were carried on by e-mail or similar archived means) or otherwise to
-> > get in touch with them and check? Or, alternatively, Kevin could help
-> > Mike to get in touch with them?
->
-> I'm afraid I was not able to dig anything out of old backups last=20=20
->=20night. I still have a stack of CDs to look through, but don't hold=20=
-=20
->=20your breath. Sorry about that.
-
-Thanks a lot for searching: this is really appreciated, at least from
-my side.
-
->
-> I have never had any contact with Zachary Vonler or Gian Filippo Pinzari,
-
-Then I wonder how it was possible to re-license DXPC in 2002...
-:-|
-
-> and have not spoken with Brian Pane in many years, so I have no recent
-contact information for any of them. However, a quick google turns up:
->
-> https://www.linkedin.com/profile/view?id=3D728859
-> http://www.brianp.net/contact/
->
-> which is almost certainly the right Brian Pane (he was at CNet at=20=20
->=20the proper time).
-
-This could be really useful, thank you very much!
-
-Mike, I hope the search may go on from there: Brian should be asked
-about the retroactive nature of the re-licensing of DXPC and maybe he
-also knows how to get in touch with Zachary and/or Gian Filippo...
-
-
-P.S.: Kevin, any special reason why you dropped several addresses from
-the Cc list? Should this part of our conversation be kept private for
-the time being? Please clarify. Thanks!
-
------ Ende der weitergeleiteten Nachricht -----
-
------ Weitergeleitete Nachricht von Kevin Vigor <kevin@vigor.nu> -----
-   Datum: Wed, 13 May 2015 14:08:48 -0600
-     Von: Kevin Vigor <kevin@vigor.nu>
-Betreff: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are=20=20
-derived=20from non-free code
-      An: Francesco Poli <invernomuto@paranoici.org>
-      Cc: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-
-On 05/13/15 11:43, Francesco Poli wrote:
-> On Wed, 13 May 2015 09:01:27 -0600 Kevin Vigor wrote:
-
->> I have never had any contact with Zachary Vonler or Gian Filippo Pinzari=
-,
->
-> Then I wonder how it was possible to re-license DXPC in 2002...
-> :-|
->
-
-I believe Gian worked on the NoMachine code; he has never contributed=20=20
-to=20DXPC directly.
-
-Zachary Vonler was allegedly the maintainer of DXPC for a while circa=20=20
-1999,=20but never responded to any email when I attempted to contact=20=20
-him,=20which is how I came to take over maintenance.
-
-
-> P.S.: Kevin, any special reason why you dropped several addresses from
-> the Cc list? Should this part of our conversation be kept private for
-> the time being? Please clarify. Thanks!
-
-No, I was just trying to keep from spamming email lists unnecessarily.=20=
-=20
-I=20do not consider any part of this conversation private.
-
------ Ende der weitergeleiteten Nachricht -----
-
------ Weitergeleitete Nachricht von Francesco Poli=20=20
-<invernomuto@paranoici.org>=20-----
-   Datum: Wed, 13 May 2015 22:50:32 +0200
-     Von: Francesco Poli <invernomuto@paranoici.org>
-Betreff: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are=20=20
-derived=20from non-free code
-      An: Kevin Vigor <kevin@vigor.nu>
-      Cc: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-
-On Wed, 13 May 2015 14:08:48 -0600 Kevin Vigor wrote:
-
-> On 05/13/15 11:43, Francesco Poli wrote:
-> > On Wed, 13 May 2015 09:01:27 -0600 Kevin Vigor wrote:
->
-> >> I have never had any contact with Zachary Vonler or Gian Filippo Pinza=
-ri,
-> >
-> > Then I wonder how it was possible to re-license DXPC in 2002...
-> > :-|
-> >
->
-> I believe Gian worked on the NoMachine code; he has never=20=20
->=20contributed to DXPC directly.
-
-Good, then only Zachary has to be tracked down.
-
->
-> Zachary Vonler was allegedly the maintainer of DXPC for a while=20=20
->=20circa 1999, but never responded to any email when I attempted to=20=20
->=20contact him, which is how I came to take over maintenance.
-
-Let's hope Brian is able to help Mike in getting in touch with
-Zachary...
-
->
->
-> > P.S.: Kevin, any special reason why you dropped several addresses from
-> > the Cc list? Should this part of our conversation be kept private for
-> > the time being? Please clarify. Thanks!
->
-> No, I was just trying to keep from spamming email lists=20=20
->=20unnecessarily. I do not consider any part of this conversation=20=20
->=20private.
->
-
-OK, thanks for clarifying.
-
------ Ende der weitergeleiteten Nachricht -----
-
---=20
-
-DAS-NETZWERKTEAM
-mike gabriel, herweg 7, 24357 fleckeby
-fon: +49 (1520) 1976 148
-
-GnuPG Key ID 0x25771B31
-mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
-
-freeBusy:
-https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x=
-fb
-
---=_SHoEHYV8bfary9lJHYP1lQ1
-Content-Type: application/pgp-signature
-Content-Description: Digitale PGP-Signatur
-Content-Disposition: inline
-
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAABAgAGBQJVVCthAAoJEJr0azAldxsx3KUP/2997X9KnhVEedREGxsuqvQn
-Dp5oGK2JPf0Z2MZui1FVehvakoHQD0MuhpVs7ZktnshwNvAgxyhW5esC617a9gsz
-jJvaJz0S0MPHfSM4Dz8Yg2t0u0DpueVZBpOeDOlt9W9ECXkpe2YPk5AOialHwTPX
-OP5KKfMSLEGFreUL7U0WeetC/To5zm54Ivx1a0wx2I+HdPJ0YXTxIC7JvUSNejFE
-0+yhK1thXf38juOeb2pxTvRQXcj1IoDMRSc0k7KHeNGmP1NF38fh1illPlBABG1u
-wa3hn+1uMe3+On8LJkDtIHtsXrR2RUuOP+0FbI4rTRo5SOeVFNRSl1ldp2ywl8rQ
-9WkK623cuurOydsHjj+fIlcb7GN/OgrTay8VRS3jUjy9tlQ7PCpF5W1m7kMPHrCP
-nh6/hUa6ep8qE+86dosQS4FxvOgSHOEpbNZ8ulEib/ClHr9wsnWpjxQtvRnZsBTl
-PAIXKvdiHUCgyfs4efSWYtR8QUJTYmPDrGr2V8jWAtzZOo6NSa09c2Yc2OxLRDpP
-HBGVSLUOrocvbb3wPAgnsogxtYCpzo/ga1Rnx2LdIfLNaTv62sek+nHqJzICqtcH
-SdMajeJTVksKQCmHqIQS7C2V44cDYizTe9exZIl75OKT6TDujuW/KZiPQK6VCCNv
-eEgOxmCOHlc8YLLz0dEP
-=N9IW
------END PGP SIGNATURE-----
-
---=_SHoEHYV8bfary9lJHYP1lQ1--
-
-
-
-
-From mike.gabriel@das-netzwerkteam.de Thu May 14 05:55:46 2015
-Received: (at 784565) by bugs.debian.org; 14 May 2015 05:55:46 +0000
-X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
-	(2014-02-07) on buxtehude.debian.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-11.9 required=4.0 tests=BAYES_00,FOURLA,
-	HAS_BUG_NUMBER,PGPSIGNATURE,T_RP_MATCHES_RCVD autolearn=ham
-	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
-X-Spam-Bayes: score:0.0000 Tokens: new, 23; hammy, 150; neutral, 392; spammy,
-	0. spammytokens: hammytokens:0.000-+--H*c:pgp-signature,
-	0.000-+--H*c:protocol, 0.000-+--H*c:micalg, 0.000-+--H*c:signed,
-	0.000-+--H*RU:sk:grimnir
-Return-path: <mike.gabriel@das-netzwerkteam.de>
-Received: from freya.das-netzwerkteam.de ([88.198.48.199])
-	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
-	(Exim 4.80)
-	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
-	id 1Ysm7W-0005fv-3I
-	for 784565@bugs.debian.org; Thu, 14 May 2015 05:55:46 +0000
-Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
-	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id BDB433282;
-	Thu, 14 May 2015 07:55:43 +0200 (CEST)
-Received: from localhost (localhost [127.0.0.1])
-	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 20DC03BD2E;
-	Thu, 14 May 2015 07:55:43 +0200 (CEST)
-X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
-Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
-	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
-	with ESMTP id 3Dt4TKuxIMPh; Thu, 14 May 2015 07:55:43 +0200 (CEST)
-Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1])
-	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPS id 871AB3B9EA;
-	Thu, 14 May 2015 07:55:42 +0200 (CEST)
-Received: from bifrost.das-netzwerkteam.de (bifrost.das-netzwerkteam.de
- [178.62.101.154]) by mail.das-netzwerkteam.de (Horde Framework) with HTTP;
- Thu, 14 May 2015 05:55:42 +0000
-Date: Thu, 14 May 2015 05:55:42 +0000
-Message-ID: <20150514055542.Horde.LWDaJ7sgQHr-LCJySXbtvQ3@mail.das-netzwerkteam.de>
-From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-To: Zach Vonler <lightborn@mail.utexas.edu>, Brian Pane <brianp@brianp.net>,
- Gian Filippo Pinzari <pinzari@nomachine.com>
-Cc: nito.martinez@qindel.com, x2go-dev@lists.x2go.org,
- opensource@gznianguan.com, 784565@bugs.debian.org, Francesco Poli
- <invernomuto@paranoici.org>
-Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: nx-libs-lite: parts
- are derived from non-free code
-References: <20150506173532.7531.31389.reportbug@homebrew>
- <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
- <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
- <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
- <55521444.9090407@vigor.nu> <1431445315.4712.7.camel@Nokia-N900>
- <20150512234048.054319a449ffadcf87577425@paranoici.org>
-In-Reply-To: <20150512234048.054319a449ffadcf87577425@paranoici.org>
-User-Agent: Internet Messaging Program (IMP) H5 (6.2.2)
-Accept-Language: de,en
-Organization: DAS-NETZWERKTEAM
-X-Originating-IP: 178.62.101.154
-X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:32.0) Gecko/20100101
- Firefox/32.0 Iceweasel/32.0
-Content-Type: multipart/signed; boundary="=_whjzG6t3RqUoHnRlD0aGiA1";
- protocol="application/pgp-signature"; micalg=pgp-sha1
-MIME-Version: 1.0
-
-This message is in MIME format and has been PGP signed.
-
---=_whjzG6t3RqUoHnRlD0aGiA1
-Content-Type: text/plain; charset=us-ascii; format=flowed; DelSp=Yes
-Content-Disposition: inline
-Content-Transfer-Encoding: quoted-printable
-
-Dear Brian, dear Zachary, dear Gian Filippo,
-
-(Find a TL;DR; at the end of this mail...)
-
-I am contacting you on a licensing issue related to the DXPC code that=20=
-=20
-you=20worked on at the end of the nineties. I'd highly appreciate it if=20=
-=20
-you=20could take a little time to read this mail and get back to me,=20=20
-either=20privately or in public.
-[I have actually Cc:ed quite a number of people in this mail (thread).=20=
-=20
-All=20of them will be affected by the outcome of this license issue to=20=
-=20
-some=20lesser or greater extent. If you feel inconvenient with replying=20=
-=20
-to=20so many people you don't know, really don't hesitate to get back to=20=
-=20
-me=20in private first, so that we can sort things out. Thank you.]
-
-Before I continue, let me shortly introduce myself. My name is Mike=20=20
-Gabriel,=20I work for the Debian project [1.1, 1.2] (which brings forth=20=
-=20
-one=20of the major GNU/Linux distributions world-wide. I am also the=20=20
-upstream=20code maintainer of a software project called nx-libs [2]. The=20=
-=20
-nx-libs=20code has been derived from several of NoMachine's NXv3 [11]=20=20
-components=20(namely: nx-X11, nxagent, nxcomp, nxcompext and nxcompshad).
-
-A member of the Debian legal team [3] (Francesco Poli) made us (i.e.,=20=20
-the=20nx-libs developers, users, package maintainers) aware of an issue=20=
-=20
-[4]=20in the nx-libs component NXCOMP (which has been derived from DXPC=20=
-=20
-[5]).=20Please read Message #5 of the brought up issue on the Debian bug=20=
-=20
-tracker=20(#784565) [4] before you continue reading. Thanks.
-
-I will now jump into the below quoted mail and continue inline...
-
-On  Di 12 Mai 2015 23:40:48 CEST, Francesco Poli wrote:
-
-> On Tue, 12 May 2015 17:41:55 +0200 Mike Gabriel wrote:
->
->> Hi Kevin,
->
-> Hello Mike, hello Kevin, hello to all the other recipients.
->
-> First of all, I wish to express my gratitude to Kevin for his prompt,
-> kind and generous response.
-
->> thanks for your feedback. Let us wait for Francesco, our expert on=20=20
->>=20license issues, and see what he thinks about your feedback.
->
-> I think that this is an important first step to solve this issue for
-> the best.
-> Kevin Vigor is one of the copyright owners of the code that was forked
-> before the re-licensing.
-> We now know that he intended the re-licensing to be retroactive and
-> this is really good.
-
-We are currently in the process of contacting all DXPC related=20=20
-copyright=20holders mentioned in the NXCOMP license file [6]. We already=20=
-=20
-received=20some feedback from Kevin Vigor [7], but we also need to=20=20
-address=20you (Brian, Zachary, Gian Filippo) with this. (The mail=20=20
-address=20I have from Zachary may be outdated, so any current contact=20=20
-address=20is highly welcome, in case the mail address being used will=20=20
-bounce=20back).
-
-At the moment, NXCOMP (and thus nx-libs, but also NoMachine's NXv3=20=20
-code)=20cannot be considered as fully free software, until this issue is=20=
-=20
-settled.=20The DXPC license before DXPC v3.8.1 was an ancient BSD style=20=
-=20
-license=20that failed in explicitly mentioning, that it is allowed to=20=20
-modify=20the DXPC code in derivative works. In 2002, DXPC 3.8.1 got=20=20
-released=20[12], using a more compliant license (BSD-2-clause). As Kevin=20=
-=20
-told=20us, this license change [8,9] was done after the FSF [10] had=20=20
-contacted=20the DXPC developers.
-
-However, the NXCOMP code in NXv3 got forked from DXPC before 2002, as=20=20
-it=20seems. So unfortunately, the modifications of DXPC as found in=20=20
-NoMachine's=20NXCOMP product are not compliant with the pre-3.8.1=20=20
-license=20of DXPC.
-
-> I think that now it would be useful to ascertain that the other
-> copyright owners (Brian Pane, Zachary Vonler, Gian Filippo Pinzari) are
-> also OK with this interpretation of the re-licensing operation.
-
-TL;DR; So here comes my actual question: are you (Brian Pane, Zachary=20=20
-Vonler,=20Gian Filippo Pinzari) ok with retroactively regarding=20=20
-pre-3.8.1=20code of DXPC (that you probably all worked on at that time)=20=
-=20
-as=20BSD-2-clause? Are you ok with others having taken or taking the=20=20
-pre-3.8.1=20DXPC code and distribute it in a modified form?
-
-A yes from all of you as DXPC copyright holders is essential for the=20=20
-continuation=20of nx-libs development under a free license. This may=20=20
-also=20possibly be an issue for NXv4 in case parts of it have been=20=20
-derived=20from DXPC.
-
-Thanks to all of you for taking your time.
-
-light+love
-Mike
-
-[1.1] http://www.debian.org
-[1.2] https://qa.debian.org/developer.php?login=3Dsunweaver%40debian.org
-[2] https://github.com/ArcticaProject/nx-libs
-[3] https://www.debian.org/legal/
-[4] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=3D784565#5
-[5] http://www.vigor.nu/dxpc/
-[6] https://github.com/ArcticaProject/nx-libs/blob/3.6.x/nxcomp/LICENSE#L32
-[7] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=3D784565#40
-[8] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=3D72020
-[9] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=3D142028
-[10] http://www.fsf.org/
-[11] https://www.nomachine.com/version-3
-[12] http://www.vigor.nu/dxpc/CHANGES
---=20
-
-DAS-NETZWERKTEAM
-mike=20gabriel, herweg 7, 24357 fleckeby
-fon: +49 (1520) 1976 148
-
-GnuPG Key ID 0x25771B31
-mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
-
-freeBusy:
-https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x=
-fb
-
---=_whjzG6t3RqUoHnRlD0aGiA1
-Content-Type: application/pgp-signature
-Content-Description: Digitale PGP-Signatur
-Content-Disposition: inline
-
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAABAgAGBQJVVDjeAAoJEJr0azAldxsx1JUP/RdzhmQ3HU+6x479AoGBTKxV
-onR3XPlq8Iw9f6dU0TjqlAHCOGeftJ+X7A3HamiTFsr5wUqlrTuKeYnVd4hTa08e
-ge9WIODczQfnoHm47siTjlMfQuHFIGDnHuJ+3GbvojMI7QXWrM9wgxGo2B/2UUQS
-tFlYPbvfAGhCyUVx/zLRFqDVzzdo+UCVoLLYKE1pkwjhpnGGamY1xd/KFjCgi0Vx
-f/Nx9w28EqmRFZCTmxghLngkTlQwrtBkSUAhLS3ntxV12RrrQQ2verXPWbW1DU9C
-3TZypNZSMc4O8etJ244YUk7wAvspUtJnXyvxoQ2Padw0ogGFayIdLtC8HStCy+Mx
-Q/FIND8+aGdYALNTbQfTCpJ1fmg06Id4hn96rdZOhpT80M3vTuY9HpIyf2dDCdHu
-OmHEjUKnMRgjPbVoIU5lz8s4X/ET7hzxb2psXSwscxI+qqlSrADzC98QB23djJii
-O9qPVB/HqJXwNNXlwiScrLC/q4ro0QgdurKmIDQq1zjdFXyBDEwMzxLNlVSJiEeG
-gMSiXD9lD8J1KBDp35P4wxmOcCSymILU11Lpvf5N22ID7cfk8x58+Fsik+RkQZcm
-94ll8p4XU0xOt8pgzGOVL4rLBsjcPGzuTjUoDsB8zmZLSgEgrISZNQC7pRhEXTRW
-3g7fQuF635IMObwgVJJB
-=c1td
------END PGP SIGNATURE-----
-
---=_whjzG6t3RqUoHnRlD0aGiA1--
-
-
-
-
-From mike.gabriel@das-netzwerkteam.de Thu May 14 06:20:24 2015
-Received: (at 784565) by bugs.debian.org; 14 May 2015 06:20:24 +0000
-X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
-	(2014-02-07) on buxtehude.debian.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-11.9 required=4.0 tests=BAYES_00,FOURLA,
-	HAS_BUG_NUMBER,PGPSIGNATURE,T_RP_MATCHES_RCVD autolearn=ham
-	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
-X-Spam-Bayes: score:0.0000 Tokens: new, 15; hammy, 149; neutral, 94; spammy,
-	1. spammytokens:0.997-1--sk:austin. hammytokens:0.000-+--H*c:pgp-signature,
-	0.000-+--H*c:protocol, 0.000-+--H*c:micalg, 0.000-+--H*c:signed,
-	0.000-+--H*RU:sk:grimnir
-Return-path: <mike.gabriel@das-netzwerkteam.de>
-Received: from freya.das-netzwerkteam.de ([88.198.48.199])
-	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
-	(Exim 4.80)
-	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
-	id 1YsmVL-0008TY-AE
-	for 784565@bugs.debian.org; Thu, 14 May 2015 06:20:24 +0000
-Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
-	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id AA82B3282;
-	Thu, 14 May 2015 08:20:19 +0200 (CEST)
-Received: from localhost (localhost [127.0.0.1])
-	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id A8B823BD2E;
-	Thu, 14 May 2015 08:20:18 +0200 (CEST)
-X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
-Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
-	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
-	with ESMTP id LyPILriO4mkm; Thu, 14 May 2015 08:20:18 +0200 (CEST)
-Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1])
-	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPS id 4BB463BB3A;
-	Thu, 14 May 2015 08:20:18 +0200 (CEST)
-Received: from bifrost.das-netzwerkteam.de (bifrost.das-netzwerkteam.de
- [178.62.101.154]) by mail.das-netzwerkteam.de (Horde Framework) with HTTP;
- Thu, 14 May 2015 06:20:18 +0000
-Date: Thu, 14 May 2015 06:20:18 +0000
-Message-ID: <20150514062018.Horde.T6fBfDEHTv_IkVi4n506ew5@mail.das-netzwerkteam.de>
-From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-To: Brian Pane <brianp@brianp.net>, Gian Filippo Pinzari
- <pinzari@nomachine.com>
-Cc: opensource@gznianguan.com, 784565@bugs.debian.org,
- nito.martinez@qindel.com, Francesco Poli <invernomuto@paranoici.org>,
- x2go-dev@lists.x2go.org
-Subject: Re: [X2Go-Dev] [pkg-x2go-devel] Bug#784565: Bug#784565:
- nx-libs-lite: parts are derived from non-free code
-References: <20150506173532.7531.31389.reportbug@homebrew>
- <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
- <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
- <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
- <55521444.9090407@vigor.nu> <1431445315.4712.7.camel@Nokia-N900>
- <20150512234048.054319a449ffadcf87577425@paranoici.org>
- <20150514055542.Horde.LWDaJ7sgQHr-LCJySXbtvQ3@mail.das-netzwerkteam.de>
-In-Reply-To: <20150514055542.Horde.LWDaJ7sgQHr-LCJySXbtvQ3@mail.das-netzwerkteam.de>
-User-Agent: Internet Messaging Program (IMP) H5 (6.2.2)
-Accept-Language: de,en
-Organization: DAS-NETZWERKTEAM
-X-Originating-IP: 178.62.101.154
-X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:32.0) Gecko/20100101
- Firefox/32.0 Iceweasel/32.0
-Content-Type: multipart/signed; boundary="=_FXxC2VoubfzELdkXQu84zQ1";
- protocol="application/pgp-signature"; micalg=pgp-sha1
-MIME-Version: 1.0
-
-This message is in MIME format and has been PGP signed.
-
---=_FXxC2VoubfzELdkXQu84zQ1
-Content-Type: text/plain; charset=us-ascii; format=flowed; DelSp=Yes
-Content-Disposition: inline
-Content-Transfer-Encoding: quoted-printable
-
-Hi again,
-
-On  Do 14 Mai 2015 07:55:42 CEST, Mike Gabriel wrote:
-
-> [...] (The mail address I have from Zachary may be outdated, so any=20=20
->=20current contact address is highly welcome, in case the mail address=20=
-=20
->=20being used will bounce back).
-
-As it seems, the publicly known mail address of Zachary Vonler at=20=20
-austin.utexas.edu=20is outdated.
-
-@Brian: if you happen to have a recent mail address of Zachary, could=20=20
-you=20please provide it to me privately? Thanks.
-
-Mike
---=20
-
-DAS-NETZWERKTEAM
-mike=20gabriel, herweg 7, 24357 fleckeby
-fon: +49 (1520) 1976 148
-
-GnuPG Key ID 0x25771B31
-mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
-
-freeBusy:
-https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x=
-fb
-
---=_FXxC2VoubfzELdkXQu84zQ1
-Content-Type: application/pgp-signature
-Content-Description: Digitale PGP-Signatur
-Content-Disposition: inline
-
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAABAgAGBQJVVD6iAAoJEJr0azAldxsx4+8QAI9fbkDu0G/1NpC4+MDJ3HtH
-wzfUUIIoBAPTahr1ZGrGK4ZMH5+RvXtwX2OBTwRRgKlZOqsdU35bj2HKi01KNLGx
-9NXXnLz97CuTrXJrzis3C+pzCIpR6cR/SPhDdExdhjR8nawXcejfFhPUnbVvPvxY
-jYN43cYFScovk5f5bUtIAybVZZCpdRZwDRevD+1qTTs+WtDf/9PXL7CX9A7j7r6T
-XQIURSVQq/FVXcJHSdZcYZza/4JHIZbEQTeX3FaUK+zkdHlBbbmRwzN0YLP/XQiY
-06tQXFjgjqjjkoxTE5gQrlN3kyxNH2WpXj2eeAqQarkCOnKgiuFEYxhTCYnZHCmk
-WVYhb2/78VbRlRbDJH0jJ0KKNOi9fbXGcVa36IOgV2dLN+tnNorAQjHm7LkBDhyi
-c3EmzEPtDTmcb5XuPYwwbNGn2EE47UsTx3UjPFWAQVQ2LwMXoFb+iH+WWSQ8KW1b
-xKRDOtarACd06rbW/sKQVdzNytydvFkZZn//AHHA7KP7jmqhl/bub8EyEf9cCTVr
-92XB5bbI1rLfEo1D3FTUaCt1tUEumhgRzwlJteX5/vbpf0fJ3QcWMUQSQWYqbhEm
-LnlGOM44jZDtQ7QonezcB/+lQDu2/0Q7fZtgqtr9bxkJ5URr8/ByTI+E3K2bxdme
-jQAQL6yyRC5s419MIJTr
-=6/Dc
------END PGP SIGNATURE-----
-
---=_FXxC2VoubfzELdkXQu84zQ1--
-
-
-
-
-From mike.gabriel@das-netzwerkteam.de Sat May 16 09:19:18 2015
-Received: (at 784565) by bugs.debian.org; 16 May 2015 09:19:18 +0000
-X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
-	(2014-02-07) on buxtehude.debian.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-10.9 required=4.0 tests=BAYES_00,DIGITS_LETTERS,
-	FOURLA,HAS_BUG_NUMBER,PGPSIGNATURE,T_RP_MATCHES_RCVD autolearn=ham
-	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
-X-Spam-Bayes: score:0.0000 Tokens: new, 31; hammy, 150; neutral, 208; spammy,
-	0. spammytokens: hammytokens:0.000-+--tarballs, 0.000-+--H*c:pgp-signature,
-	0.000-+--H*c:protocol, 0.000-+--H*c:micalg, 0.000-+--H*c:signed
-Return-path: <mike.gabriel@das-netzwerkteam.de>
-Received: from freya.das-netzwerkteam.de ([88.198.48.199])
-	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
-	(Exim 4.80)
-	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
-	id 1YtYFZ-0006BP-Mo
-	for 784565@bugs.debian.org; Sat, 16 May 2015 09:19:18 +0000
-Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
-	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id 434CF3D4F;
-	Sat, 16 May 2015 11:19:13 +0200 (CEST)
-Received: from localhost (localhost [127.0.0.1])
-	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 9294C3BB55;
-	Sat, 16 May 2015 11:19:12 +0200 (CEST)
-X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
-Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
-	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
-	with ESMTP id a-GW73-71I6N; Sat, 16 May 2015 11:19:12 +0200 (CEST)
-Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1])
-	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPS id 224123BB3B;
-	Sat, 16 May 2015 11:19:12 +0200 (CEST)
-Received: from 176.4.79.4 ([176.4.79.4]) by mail.das-netzwerkteam.de (Horde
- Framework) with HTTP; Sat, 16 May 2015 09:19:12 +0000
-Date: Sat, 16 May 2015 09:19:12 +0000
-Message-ID: <20150516091912.Horde.W_1Szu5msccGYo-Ndwv3cg1@mail.das-netzwerkteam.de>
-From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-To: 784565@bugs.debian.org, Francesco Poli <invernomuto@paranoici.org>
-Cc: Kevin Vigor <kevin@vigor.nu>, nito.martinez@qindel.com,
- x2go-dev@lists.x2go.org, opensource@gznianguan.com
-Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: nx-libs-lite: parts
- are derived from non-free code
-References: <20150506173532.7531.31389.reportbug@homebrew>
- <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
- <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
- <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
- <55521444.9090407@vigor.nu> <1431445315.4712.7.camel@Nokia-N900>
- <20150512234048.054319a449ffadcf87577425@paranoici.org>
- <20150514045809.Horde.-3NIZzBnA5V5B6a721F2kg2@mail.das-netzwerkteam.de>
-In-Reply-To: <20150514045809.Horde.-3NIZzBnA5V5B6a721F2kg2@mail.das-netzwerkteam.de>
-User-Agent: Internet Messaging Program (IMP) H5 (6.2.2)
-Accept-Language: de,en
-Organization: DAS-NETZWERKTEAM
-X-Originating-IP: 176.4.79.4
-X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:32.0) Gecko/20100101
- Firefox/32.0 Iceweasel/32.0
-Content-Type: multipart/signed; boundary="=_n6jEwcfiXkrvf2B-ZGaJrw3";
- protocol="application/pgp-signature"; micalg=pgp-sha1
-MIME-Version: 1.0
-
-This message is in MIME format and has been PGP signed.
-
---=_n6jEwcfiXkrvf2B-ZGaJrw3
-Content-Type: text/plain; charset=us-ascii; format=flowed; DelSp=Yes
-Content-Disposition: inline
-Content-Transfer-Encoding: quoted-printable
-
-Hi all, esp. Kevin,
-
-On  Do 14 Mai 2015 06:58:09 CEST, Mike Gabriel wrote:
-
-I looked at dxpc releases (I obtained upstream tarballs from=20=20
-snapshot.debian.org).
-
-I=20currently have:
-
-"""
-[mike@minobo dxpc.nxrebase (upstream-nxrebase)]$ git log
-commit 0676a768a96383641a73a72ecd2e1083322e6abe
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Date:   Sat May 16 10:52:24 2015 +0200
-
-     Imported Upstream version 3.9.2
-
-commit 4ccf34b2c4763dfb01dceb8588b204b0d029cc3d
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Date:   Sat May 16 10:51:04 2015 +0200
-
-     Imported Upstream version 3.9.1
-
-commit dd8f60ce63c70ed605a2e1717feb7128e59fb8e6
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Date:   Sat May 16 10:49:19 2015 +0200
-
-     Imported Upstream version 3.9.0
-
-commit 01c990099aea802405f8d39c0b819ee1742c185c
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Date:   Sat May 16 10:32:06 2015 +0200
-
-     Imported Upstream version 3.8.2
-
-commit 48df60b3b946a08541ee48371634f074e875adda
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Date:   Sat May 16 10:31:57 2015 +0200
-
-     Imported Upstream version 3.8.0
-
-commit 11d81444d0f86a67f9b8483cbfa33343714b26e9
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Date:   Sat May 16 10:31:53 2015 +0200
-
-     Imported Upstream version 3.7.0
-
-commit e4f550abd4cd49ecc2381e717a55a9940087a376
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Date:   Sat May 16 10:31:44 2015 +0200
-
-     Imported Upstream version 3.5.0
-"""
-
-> @Kevin: I will take you off this mail thread's Cc: field with my=20=20
->=20next post. Feel free to follow-up via #784565 [1] on the Debian bug=20=
-=20
->=20tracker. Thanks a lot for being so responsive and generous with=20=20
->=20providing information.
-
-With this post I actually reincluded you because it becomes technical=20=20
-from=20here on and I probably will need your expertise on DXPC. Not sure=20=
-=20
-if=20you have time or prio or are willing to provide that. Would you be=20=
-=20
-open=20for answering technical questions on DXPC and esp. the changes=20=20
-between=203.7.0 and 3.8.1/3.8.2? I'd highly appreciate that.
-
-As I have not heard back neither from Brian Pane, Zachary Vonler nor=20=20
-Gian=20Filippo Pinzari (we had Ascension Day and maybe a prolonged=20=20
-weekend=20that people used for going on VAC), I will try looking at the=20=
-=20
-DXPC=20changes between 3.7.0 and 3.8.1. Obviously, NoMachine forked=20=20
-NXCOMP=20from DXPC some time between DXPC 3.7.0 and DXPC 3.8.0.
-
-Questions to Kevin:
-
-   o Is there any SVN upstream repo still online
-     (I saw it in one of the tarballs, that SVN was
-     used for 3.9.0).
-   o Do you have any tarballs documenting the
-     changes between 3.7.0 and 3.8.0? Do you also
-     have the 3.8.1 tarball?
-   o Did the 3.8.0 version of DXPC break proto
-     compatibility (i.e., you could not use client
-     3.7.0 and server 3.8.0 and vice versa with
-     each other)?
-
-Any help on this is appreciated. Thanks.
-
-Mike
-
-
---=20
-
-DAS-NETZWERKTEAM
-mike=20gabriel, herweg 7, 24357 fleckeby
-fon: +49 (1520) 1976 148
-
-GnuPG Key ID 0x25771B31
-mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
-
-freeBusy:
-https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x=
-fb
-
---=_n6jEwcfiXkrvf2B-ZGaJrw3
-Content-Type: application/pgp-signature
-Content-Description: Digitale PGP-Signatur
-Content-Disposition: inline
-
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAABAgAGBQJVVwuPAAoJEJr0azAldxsxAqoQAI1IOApnU8WLZH+VT1GIgtvx
-XxuBALPeR8KobmGRfJd4bSzeIpAqw+JSGa0/XApTwjYbpsIUKnMrEfoHfS0wt4Tb
-ZmSiHL4XCYa6SCGOAbSe89QXNA8kS4ewQMSaPTZhGvoR6wIjdNfxXDN5aO6TkUlw
-qw786fMKYcj9htNnshlq264uSfkrMusFEw614dnfKEVnx8YrIUU5lNY9AInShO9S
-K0vy1vn53/Ie5Fec1FK0WUsT4xTu7NW80Ch0+IgopURIl9NmlomJVRwoDLbR47Ox
-6dFVGJ5VKmOt+oW2g4YAdti8YNhSYteyPgTAPMdtU4XqkHV5/RepCoV/6gr3/YR1
-To63WGpt2B+jl2d4OAPuWWdTRucB2QYsCz/jCvLKeLcg2ODHZJXhSzVYlIie0uFY
-SRvqM8qW+WyuYek2vZDneKvDB2eUqMhRb5dmSeod9UR+3RYTq+JrFUoDq65PONbM
-A0QZ+cG0EkQdxG/1V8yZoMRgxPOtb+AZcMIjC5NikWUsyIkGjMHNHSbJCboJBlyM
-DdyRCTxuM09cpzNxS7Ph0z0iSdQZAl2D7vPCAY1jwyLdu7Xra/p3aM6pqeYuIaWh
-OpoF/sRq08CjWmgVe7MdfkgxZQxW4qIdOeNYGUDIADzzj6cHdNV+WP13ISizeoyO
-u4cspyl/6lFu3TyMWkh8
-=fu9u
------END PGP SIGNATURE-----
-
---=_n6jEwcfiXkrvf2B-ZGaJrw3--
-
-
-
-
-From zvonler@gmail.com Mon May 18 15:05:45 2015
-Received: (at 784565) by bugs.debian.org; 18 May 2015 15:05:46 +0000
-X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
-	(2014-02-07) on buxtehude.debian.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-5.3 required=4.0 tests=BAYES_00,DKIM_SIGNED,
-	DKIM_VALID,DKIM_VALID_AU,FOURLA,FREEMAIL_FROM,HAS_BUG_NUMBER,HTML_MESSAGE,
-	MULTALT,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_PASS
-	autolearn=ham autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
-X-Spam-Bayes: score:0.0000 Tokens: new, 14; hammy, 104; neutral, 41; spammy,
-	1. spammytokens:0.940-+--H*c:alternative
-	hammytokens:0.000-+--D*das-netzwerkteam.de, 0.000-+--sk:mikega,
-	0.000-+--sk:mike.ga, 0.000-+--U*mike.gabriel,
-	0.000-+--mike.gabriel@das-netzwerkteam.de
-Return-path: <zvonler@gmail.com>
-Received: from mail-ob0-f181.google.com ([209.85.214.181])
-	by buxtehude.debian.org with esmtps (TLS1.2:RSA_ARCFOUR_SHA1:128)
-	(Exim 4.80)
-	(envelope-from <zvonler@gmail.com>)
-	id 1YuMbx-0004SF-RZ
-	for 784565@bugs.debian.org; Mon, 18 May 2015 15:05:45 +0000
-Received: by obblk2 with SMTP id lk2so127830096obb.0
-        for <784565@bugs.debian.org>; Mon, 18 May 2015 08:05:39 -0700 (PDT)
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=gmail.com; s=20120113;
-        h=mime-version:date:message-id:subject:from:to:content-type;
-        bh=nHgAzYNhWTJXAXb1d3jfmZVOFHEEaolqyRCNmCThusM=;
-        b=ilsboi8m+iXF7pVv2MVsvJqi8Es4/o3Awnfg5nSzWVB34kDB0g7zczoEfC4d9km/Bn
-         WDerLV30mJ+OfaRA5elHld2CsY9ByX2MuU73jj2kNenlEV15s7LdJxYsWiZeKM4AEeOw
-         gGF3oU3A/FfhVUrhoPjcGXiF7xjXh1kkPGjkmXFJgthTnyJQjrL6Kw6jfsqhQtbEpqnc
-         5hsWFCNR7O780T1pkf+MisASrWFXI3oolY4EV8/P6OeEWmmKd7L9h8YHPegOdFq543qZ
-         na9coEvmwpnReWORK79ycOgZa1DwiX1h2SvS+wgigQx8j9ZlJld5SpJFTcV3vSJxmICQ
-         i7Wg==
-MIME-Version: 1.0
-X-Received: by 10.202.89.131 with SMTP id n125mr19222614oib.91.1431961538959;
- Mon, 18 May 2015 08:05:38 -0700 (PDT)
-Received: by 10.202.212.10 with HTTP; Mon, 18 May 2015 08:05:38 -0700 (PDT)
-Date: Mon, 18 May 2015 10:05:38 -0500
-Message-ID: <CAAnzQj-6Tgiar-GOxXx9FXU21cU4Be05Yo3zUSgr094sYXZP+w@mail.gmail.com>
-Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: nx-libs-lite: parts are
- derived from non-free code
-From: Zach Vonler <zvonler@gmail.com>
-To: 784565@bugs.debian.org
-Content-Type: multipart/alternative; boundary=001a113d381edcb3e205165c863b
-
---001a113d381edcb3e205165c863b
-Content-Type: text/plain; charset=UTF-8
-
-On Thu, 14 May 2015 05:55:42 +0000 Mike Gabriel <
-mike.gabriel@das-netzwerkteam.de> wrote:
-
->
-> TL;DR; So here comes my actual question: are you (Brian Pane, Zachary
-> Vonler, Gian Filippo Pinzari) ok with retroactively regarding
-> pre-3.8.1 code of DXPC (that you probably all worked on at that time)
-> as BSD-2-clause? Are you ok with others having taken or taking the
-> pre-3.8.1 DXPC code and distribute it in a modified form?
->
-
-
-> A yes from all of you as DXPC copyright holders is essential for the
-> continuation of nx-libs development under a free license. This may
-> also possibly be an issue for NXv4 in case parts of it have been
-> derived from DXPC.
-
-
-Yes, I am fine with considering the license change to be retroactive to
-cover the time I was the maintainer.
-
-I have no objections to others distributing modified versions of that code.
-
-Zach
-
---001a113d381edcb3e205165c863b
-Content-Type: text/html; charset=UTF-8
-Content-Transfer-Encoding: quoted-printable
-
-<div dir=3D"ltr">On Thu, 14 May 2015 05:55:42 +0000 Mike Gabriel &lt;<a hre=
-f=3D"mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel@das-netzwerkteam=
-.de</a>&gt; wrote:<br><div><blockquote class=3D"gmail_quote" style=3D"margi=
-n:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204=
-);border-left-style:solid;padding-left:1ex"><br>TL;DR; So here comes my act=
-ual question: are you (Brian Pane, Zachary =C2=A0<br>Vonler, Gian Filippo P=
-inzari) ok with retroactively regarding =C2=A0<br>pre-3.8.1 code of DXPC (t=
-hat you probably all worked on at that time) =C2=A0<br>as BSD-2-clause? Are=
- you ok with others having taken or taking the =C2=A0<br>pre-3.8.1 DXPC cod=
-e and distribute it in a modified form?<br></blockquote><div>=C2=A0</div><b=
-lockquote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-le=
-ft-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;pad=
-ding-left:1ex">A yes from all of you as DXPC copyright holders is essential=
- for the =C2=A0<br>continuation of nx-libs development under a free license=
-. This may =C2=A0<br>also possibly be an issue for NXv4 in case parts of it=
- have been =C2=A0<br>derived from DXPC.</blockquote><div>=C2=A0</div></div>=
-<div>Yes, I am fine with considering the license change to be retroactive t=
-o cover the time I was the maintainer.</div><div><br></div><div>I have no o=
-bjections to others distributing modified versions of that code.</div><div>=
-<br></div><div>Zach</div></div>
-
---001a113d381edcb3e205165c863b--
-
-
-
-From kevin@vigor.nu Mon May 18 21:26:12 2015
-Received: (at 784565) by bugs.debian.org; 18 May 2015 21:26:12 +0000
-X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
-	(2014-02-07) on buxtehude.debian.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-8.0 required=4.0 tests=BAYES_00,FOURLA,
-	HAS_BUG_NUMBER,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=ham
-	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
-X-Spam-Bayes: score:0.0000 Tokens: new, 16; hammy, 150; neutral, 121; spammy,
-	0. spammytokens: hammytokens:0.000-+--tarballs, 0.000-+--H*f:sk:2015050,
-	0.000-+--3.9.0, 0.000-+--3.8.0, 0.000-+--H*UA:31.0
-Return-path: <kevin@vigor.nu>
-Received: from gateway13.websitewelcome.com ([69.56.148.12])
-	by buxtehude.debian.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:256)
-	(Exim 4.80)
-	(envelope-from <kevin@vigor.nu>)
-	id 1YuSY8-0004Mq-9I
-	for 784565@bugs.debian.org; Mon, 18 May 2015 21:26:12 +0000
-Received: by gateway13.websitewelcome.com (Postfix, from userid 5007)
-	id 248D59C09927E; Mon, 18 May 2015 15:38:28 -0500 (CDT)
-Received: from gator4058.hostgator.com (gator4058.hostgator.com [192.185.4.69])
-	by gateway13.websitewelcome.com (Postfix) with ESMTP id 1EB399C099246
-	for <784565@bugs.debian.org>; Mon, 18 May 2015 15:38:28 -0500 (CDT)
-Received: from [63.158.132.10] (port=43192 helo=[10.50.3.84])
-	by gator4058.hostgator.com with esmtpsa (UNKNOWN:DHE-RSA-AES128-SHA:128)
-	(Exim 4.82)
-	(envelope-from <kevin@vigor.nu>)
-	id 1YuRnv-0001VU-8i; Mon, 18 May 2015 15:38:27 -0500
-Message-ID: <555A4DC1.2040900@vigor.nu>
-Date: Mon, 18 May 2015 14:38:25 -0600
-From: Kevin Vigor <kevin@vigor.nu>
-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0
-MIME-Version: 1.0
-To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 
- 784565@bugs.debian.org, Francesco Poli <invernomuto@paranoici.org>
-CC: nito.martinez@qindel.com, x2go-dev@lists.x2go.org, 
- opensource@gznianguan.com
-Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: nx-libs-lite: parts
- are derived from non-free code
-References: <20150506173532.7531.31389.reportbug@homebrew> <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de> <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org> <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de> <55521444.9090407@vigor.nu> <1431445315.4712.7.camel@Nokia-N900> <20150512234048.054319a449ffadcf87577425@paranoici.org> <20150514045809.Horde.-3NIZzBnA5V5B6a721F2kg2@mail.das-netzwerkteam.de> <20150516091912.Horde.W_1Szu5msccGYo-Ndwv3cg1@mail.das-netzwerkteam.de>
-In-Reply-To: <20150516091912.Horde.W_1Szu5msccGYo-Ndwv3cg1@mail.das-netzwerkteam.de>
-Content-Type: text/plain; charset=windows-1252; format=flowed
-Content-Transfer-Encoding: 7bit
-X-AntiAbuse: This header was added to track abuse, please include it with any abuse report
-X-AntiAbuse: Primary Hostname - gator4058.hostgator.com
-X-AntiAbuse: Original Domain - bugs.debian.org
-X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12]
-X-AntiAbuse: Sender Address Domain - vigor.nu
-X-BWhitelist: no
-X-Source-IP: 63.158.132.10
-X-Exim-ID: 1YuRnv-0001VU-8i
-X-Source: 
-X-Source-Args: 
-X-Source-Dir: 
-X-Source-Sender: ([10.50.3.84]) [63.158.132.10]:43192
-X-Source-Auth: kevin@vigor.nu
-X-Email-Count: 2
-X-Source-Cap: a3ZpZ29yO2t2aWdvcjtnYXRvcjQwNTguaG9zdGdhdG9yLmNvbQ==
-X-Greylist: delayed 1495 seconds by postgrey-1.34 at buxtehude; Mon, 18 May 2015 21:26:12 UTC
-
-On 05/16/15 03:19, Mike Gabriel wrote:
-  As I have not heard back neither from Brian Pane, Zachary Vonler nor Gian Filippo Pinzari (we had Ascension Day and maybe a prolonged weekend that people used for going on VAC), I will try looking at the DXPC changes between 3.7.0 and 3.8.1. Obviously, NoMachine forked NXCOMP from DXPC some time between DXPC 3.7.0 and DXPC 3.8.0.
->
-> Questions to Kevin:
->
->    o Is there any SVN upstream repo still online
->      (I saw it in one of the tarballs, that SVN was
->      used for 3.9.0).
-
-I'm afraid not. There was never an online repo available, and if I used one personally it is lost to the mists of time.
-
->    o Do you have any tarballs documenting the
->      changes between 3.7.0 and 3.8.0? Do you also
->      have the 3.8.1 tarball?
-
-I have the source tarballs to each of those (including the 3.8.1 version). The 3.8.0 release includes a README-3.8.0 file which documents the changes between 3.7.0 and 3.8.0 reasonably well.
-
-As will be (unfortunately) obvious from examining the deltas between 3.7.0 (the last release by Brian and/or Zachary) and 3.8.0 (the first release by me), I inherited a significant majority of the code.
-
->    o Did the 3.8.0 version of DXPC break proto
->      compatibility (i.e., you could not use client
->      3.7.0 and server 3.8.0 and vice versa with
->      each other)?
-
-Yes, minor version number bumps were used to indicate compatibility. 3.8.x was incompatible with 3.7.x (and also with 3.9.x).
-
-
-
-
-From kevin@vigor.nu Mon May 18 21:34:50 2015
-Received: (at 784565) by bugs.debian.org; 18 May 2015 21:34:50 +0000
-X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
-	(2014-02-07) on buxtehude.debian.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-8.0 required=4.0 tests=BAYES_00,FOURLA,
-	HAS_BUG_NUMBER,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=ham
-	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
-X-Spam-Bayes: score:0.0000 Tokens: new, 39; hammy, 146; neutral, 132; spammy,
-	4. spammytokens:0.999-1--tecnologies, 0.993-1--H*RU:67.18.68.12,
-	0.987-1--D*ascend.com, 0.987-1--H*r:34828 hammytokens:0.000-+--H*f:sk:2015050,
-	 0.000-+--3.8.0, 0.000-+--H*UA:31.0, 0.000-+--H*u:31.0,
-	0.000-+--H*f:sk:2015051
-Return-path: <kevin@vigor.nu>
-Received: from gateway15.websitewelcome.com ([67.18.68.12])
-	by buxtehude.debian.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:256)
-	(Exim 4.80)
-	(envelope-from <kevin@vigor.nu>)
-	id 1YuSgU-0005Jq-92
-	for 784565@bugs.debian.org; Mon, 18 May 2015 21:34:50 +0000
-Received: by gateway15.websitewelcome.com (Postfix, from userid 5007)
-	id 8BB94ED5E6912; Mon, 18 May 2015 16:11:44 -0500 (CDT)
-Received: from gator4058.hostgator.com (gator4058.hostgator.com [192.185.4.69])
-	by gateway15.websitewelcome.com (Postfix) with ESMTP id 84825ED5E68F2
-	for <784565@bugs.debian.org>; Mon, 18 May 2015 16:11:44 -0500 (CDT)
-Received: from [63.158.132.10] (port=34828 helo=[10.50.3.84])
-	by gator4058.hostgator.com with esmtpsa (UNKNOWN:DHE-RSA-AES128-SHA:128)
-	(Exim 4.82)
-	(envelope-from <kevin@vigor.nu>)
-	id 1YuSK7-00005R-B6; Mon, 18 May 2015 16:11:43 -0500
-Message-ID: <555A558E.1020703@vigor.nu>
-Date: Mon, 18 May 2015 15:11:42 -0600
-From: Kevin Vigor <kevin@vigor.nu>
-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0
-MIME-Version: 1.0
-To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 
- 784565@bugs.debian.org, Francesco Poli <invernomuto@paranoici.org>
-CC: nito.martinez@qindel.com, x2go-dev@lists.x2go.org, 
- opensource@gznianguan.com
-Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: nx-libs-lite: parts
- are derived from non-free code
-References: <20150506173532.7531.31389.reportbug@homebrew> <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de> <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org> <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de> <55521444.9090407@vigor.nu> <1431445315.4712.7.camel@Nokia-N900> <20150512234048.054319a449ffadcf87577425@paranoici.org> <20150514045809.Horde.-3NIZzBnA5V5B6a721F2kg2@mail.das-netzwerkteam.de> <20150516091912.Horde.W_1Szu5msccGYo-Ndwv3cg1@mail.das-netzwerkteam.de>
-In-Reply-To: <20150516091912.Horde.W_1Szu5msccGYo-Ndwv3cg1@mail.das-netzwerkteam.de>
-Content-Type: text/plain; charset=windows-1252; format=flowed
-Content-Transfer-Encoding: 7bit
-X-AntiAbuse: This header was added to track abuse, please include it with any abuse report
-X-AntiAbuse: Primary Hostname - gator4058.hostgator.com
-X-AntiAbuse: Original Domain - bugs.debian.org
-X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12]
-X-AntiAbuse: Sender Address Domain - vigor.nu
-X-BWhitelist: no
-X-Source-IP: 63.158.132.10
-X-Exim-ID: 1YuSK7-00005R-B6
-X-Source: 
-X-Source-Args: 
-X-Source-Dir: 
-X-Source-Sender: ([10.50.3.84]) [63.158.132.10]:34828
-X-Source-Auth: kevin@vigor.nu
-X-Email-Count: 2
-X-Source-Cap: a3ZpZ29yO2t2aWdvcjtnYXRvcjQwNTguaG9zdGdhdG9yLmNvbQ==
-X-Greylist: delayed 1383 seconds by postgrey-1.34 at buxtehude; Mon, 18 May 2015 21:34:50 UTC
-
-By the way, poking around the interwebs I find there is an archive of the old DXPC mailing list available at:
-
-http://marc.info/?l=dxpc&r=1&w=2
-
-I think you will find this of particular interest:
-
-
-http://marc.info/?l=dxpc&m=93093790813555&w=2
-
-
-List:       dxpc
-Subject:    Re: future tecnologies
-From:       Brian Pane <brianp () cnet ! com>
-Date:       1999-07-02 16:42:18
-[Download message RAW]
-
-Kevin Vigor <kvigor@eng.ascend.com> wrote:
-> On 01-Jul-99 dxpc@mcfeeley.cc.utexas.edu wrote:
-> > Speaking of licensing, are you putting your 3.8.0 changes to the dxpc
-> > code itself under GPL, or are they going to use the original dxpc's
-> > licensing?
->
-> No, as you can probably guess, I am no fan of the GPL. For stuff on
-> this level, where my hacking is pretty simple and probably devoid of
-> commercial value, I'll just release my changes to the public domain and
-> give up even a copyright interest in them.
->
-> Your and Zach's copyrights still stand, of course.
->
-> I *think* that fact that we use the LZO library and API, but do not
-> directly incorporate the code, allows us to escape the clutch of the GPL
-> virus.
->
-> btw, is there an original dxpc license? I haven't seen anything but a
-> copyright notice, which to my non-lawyerly mind translates as "free to
-> all the world as is, negotiate with copyright owner if modifying or
-> including in some other product".
-
-The copyright banner in the Readme is all the documentation there's ever
-been.  My intent was to allow _any_ distribution, use, and modification
-of the source, without imposing restrictions on the licensing style of
-any system into which others might incorporate the code.  We probably
-should start stating this clearly in the distributions.
-
--brian
-
-[prev in list] [next in list] [prev in thread] [next in thread]
-
-
-
-From mike.gabriel@das-netzwerkteam.de Mon May 18 21:49:10 2015
-Received: (at 784565) by bugs.debian.org; 18 May 2015 21:49:10 +0000
-X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
-	(2014-02-07) on buxtehude.debian.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-6.9 required=4.0 tests=BAYES_00,FOURLA,
-	HAS_BUG_NUMBER,T_RP_MATCHES_RCVD autolearn=ham autolearn_force=no
-	version=3.4.0-bugs.debian.org_2005_01_02
-X-Spam-Bayes: score:0.0000 Tokens: new, 35; hammy, 150; neutral, 281; spammy,
-	0. spammytokens: hammytokens:0.000-+--H*RU:sk:grimnir,
-	0.000-+--H*r:sk:grimnir, 0.000-+--H*RU:78.46.204.98,
-	0.000-+--H*RU:88.198.48.199, 0.000-+--H*RU:sk:freya.d
-Return-path: <mike.gabriel@das-netzwerkteam.de>
-Received: from freya.das-netzwerkteam.de ([88.198.48.199])
-	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
-	(Exim 4.80)
-	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
-	id 1YuSuK-0007oj-Hh
-	for 784565@bugs.debian.org; Mon, 18 May 2015 21:49:10 +0000
-Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
-	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id 253493049
-	for <784565@bugs.debian.org>; Mon, 18 May 2015 23:49:04 +0200 (CEST)
-Received: from localhost (localhost [127.0.0.1])
-	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id ACC2E3BD6C
-	for <784565@bugs.debian.org>; Mon, 18 May 2015 23:49:03 +0200 (CEST)
-X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
-Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
-	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
-	with ESMTP id Hh79XOiBkYIp for <784565@bugs.debian.org>;
-	Mon, 18 May 2015 23:49:03 +0200 (CEST)
-Received: from localhost (localhost [127.0.0.1])
-	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 6CC483BC0D
-	for <784565@bugs.debian.org>; Mon, 18 May 2015 23:49:03 +0200 (CEST)
-Received: from localhost (localhost [127.0.0.1])
-	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 2100C3BD6C
-	for <784565@bugs.debian.org>; Mon, 18 May 2015 23:49:03 +0200 (CEST)
-Received: from [10.139.193.227] (unknown [176.0.38.193])
-	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPSA id 453F63BB1E;
-	Mon, 18 May 2015 23:48:59 +0200 (CEST)
-From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Reply-To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-To: Kevin Vigor <kevin@vigor.nu>, 784565@bugs.debian.org, Francesco Poli <invernomuto@paranoici.org>
-Cc: nito.martinez@qindel.com, x2go-dev@lists.x2go.org,  opensource@gznianguan.com, zvonler@gmail.com
-Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: nx-libs-lite: parts
-	are derived from non-free code
-X-Mailer: Modest 3.2
-References: <20150506173532.7531.31389.reportbug@homebrew>
-	 <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
-	 <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
-	 <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
-	 <55521444.9090407@vigor.nu> <1431445315.4712.7.camel@Nokia-N900>
-	 <20150512234048.054319a449ffadcf87577425@paranoici.org>
-	 <20150514045809.Horde.-3NIZzBnA5V5B6a721F2kg2@mail.das-netzwerkteam.de>
-	 <20150516091912.Horde.W_1Szu5msccGYo-Ndwv3cg1@mail.das-netzwerkteam.de>
-	  <555A558E.1020703@vigor.nu>
-In-Reply-To: <555A558E.1020703@vigor.nu>
-Content-Type: text/plain; charset=utf-8
-Content-ID: <1431985731.1406.1.camel@Nokia-N900>
-Date: Mon, 18 May 2015 23:48:51 +0200
-Message-Id: <1431985731.1406.2.camel@Nokia-N900>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 8bit
-
-Hi Kevin, hi Zach, hi Francesco, hi all,
-
-@Francesco, please review the recent posts and sum up what to do next.
-
------ Original message -----
-> By the way, poking around the interwebs I find there is an archive of
-> the old DXPC mailing list available at:
-> 
-> http://marc.info/?l=dxpc&r=1&w=2
-> 
-> I think you will find this of particular interest:
-> 
-> 
-> http://marc.info/?l=dxpc&m=93093790813555&w=2
-
-
-> 
-> 
-> List:             dxpc
-> Subject:       Re: future tecnologies
-> From:             Brian Pane <brianp () cnet ! com>
-> Date:             1999-07-02 16:42:18
-> [Download message RAW]
-> 
-> Kevin Vigor <kvigor@eng.ascend.com> wrote:
-> > On 01-Jul-99 dxpc@mcfeeley.cc.utexas.edu wrote:
-> > > Speaking of licensing, are you putting your 3.8.0 changes to the dxpc
-> > > code itself under GPL, or are they going to use the original dxpc's
-> > > licensing?
-> > 
-> > No, as you can probably guess, I am no fan of the GPL. For stuff on
-> > this level, where my hacking is pretty simple and probably devoid of
-> > commercial value, I'll just release my changes to the public domain and
-> > give up even a copyright interest in them.
-> > 
-> > Your and Zach's copyrights still stand, of course.
-> > 
-> > I *think* that fact that we use the LZO library and API, but do not
-> > directly incorporate the code, allows us to escape the clutch of the
-> > GPL virus.
-> > 
-> > btw, is there an original dxpc license? I haven't seen anything but a
-> > copyright notice, which to my non-lawyerly mind translates as "free to
-> > all the world as is, negotiate with copyright owner if modifying or
-> > including in some other product".
-> 
-> The copyright banner in the Readme is all the documentation there's ever
-> been.   My intent was to allow _any_ distribution, use, and modification
-> of the source, without imposing restrictions on the licensing style of
-> any system into which others might incorporate the code.   We probably
-> should start stating this clearly in the distributions.
-> 
-> -brian
-> 
-> [prev in list] [next in list] [prev in thread] [next in thread]
-
-@Kevin: You are very awesome!
-
-@Francesco: that old post from Brian should be the statement we need, right? As Brian has not answered back, so far, does that post suffice?
-
-I also had a mail from Zach in my mailbox this morning. I managed to get hold of him via phone over the weekend. He posted his agreement to this Debian bug (as message #77) [1] earlier today. @Zach: thanks a lot for that!!!
-
-@Francesco: by looking at [2], I cannot see any hint for Gian Filippo Pinzari being a copyright holder of DXPC. This is stated in the NoMachine files at at least one place, but not in the latest DXPC upstream release. I am on my mobile right now, need to check old versions of DXPC, but if Gian Filippo Pinzari is not listed in the DXPC 3.7.0 release (where nxcomp obviously got forked from), then I think that we don't require his feedback, right?
-
-To my opinion, this issue can be settled. We have direct feedback from Kevin and Zach and Kevin dug out an old post from Brian stating the retroactive nature of the BSD-2-clause while Gian Filippo probably not being a real copyright holder of the original DXPC code. Right?
-
-light+love,
-Mike
-
-[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=77;att=0;bug=784565
-[2] http://www.vigor.nu/dxpc/README
-
-
--- 
-
-DAS-NETZWERKTEAM
-mike gabriel, herweg 7, 24357 fleckeby
-fon: +49 (1520) 1976148
-
-GnuPG Key ID 0x25771B13
-mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
-
-
-
-
-From invernomuto@paranoici.org Mon May 18 22:15:14 2015
-Received: (at 784565) by bugs.debian.org; 18 May 2015 22:15:14 +0000
-X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
-	(2014-02-07) on buxtehude.debian.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-12.0 required=4.0 tests=BAYES_00,DKIM_SIGNED,
-	DKIM_VALID,DKIM_VALID_AU,FOURLA,HAS_BUG_NUMBER,PGPSIGNATURE,SPF_HELO_PASS,
-	SPF_PASS autolearn=ham autolearn_force=no
-	version=3.4.0-bugs.debian.org_2005_01_02
-X-Spam-Bayes: score:0.0000 Tokens: new, 12; hammy, 150; neutral, 220; spammy,
-	0. spammytokens: hammytokens:0.000-+--H*UA:sk:x86_64-,
-	0.000-+--H*x:sk:x86_64-, 0.000-+--H*c:PGP-SHA256, 0.000-+--H*c:SignHturH,
-	0.000-+--H*c:pgp-signature
-Return-path: <invernomuto@paranoici.org>
-Received: from latitanza.investici.org ([82.94.249.234])
-	by buxtehude.debian.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256)
-	(Exim 4.80)
-	(envelope-from <invernomuto@paranoici.org>)
-	id 1YuTJa-0002xP-0G
-	for 784565@bugs.debian.org; Mon, 18 May 2015 22:15:14 +0000
-Received: from [82.94.249.234] (latitanza [82.94.249.234]) (Authenticated sender: invernomuto@paranoici.org) by localhost (Postfix) with ESMTPSA id 921B3120546;
-	Mon, 18 May 2015 22:15:05 +0000 (UTC)
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paranoici.org;
-	s=stigmate; t=1431987305;
-	bh=RQEA/1bkAQ71T0PpK/7XelDXEZBLyoVavVl9tpWLzWY=;
-	h=Date:From:To:Cc:Subject:In-Reply-To:References;
-	b=sO+MOEv4mZZNK2g5Om9IC7Og5k2qPAvFepN+ei+3/jCixgNBbvaLuRpMgJw6l1yjD
-	 hpqRYIxtNgyVywgpuiFVACFBuDn1ksfdFrEPNAcgRl//Sert2aOjetbZcKi1VouhXi
-	 eexR8IP81C0C1UjzjeC7zEmF5V+wSyhVs9jKvKfg=
-Received: from frx by homebrew with local (Exim 4.85)
-	(envelope-from <invernomuto@paranoici.org>)
-	id 1YuTIi-0002Se-TN; Tue, 19 May 2015 00:14:20 +0200
-Date: Tue, 19 May 2015 00:14:08 +0200
-From: Francesco Poli <invernomuto@paranoici.org>
-To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Cc: Kevin Vigor <kevin@vigor.nu>, 784565@bugs.debian.org,
- nito.martinez@qindel.com, x2go-dev@lists.x2go.org,
- opensource@gznianguan.com, zvonler@gmail.com
-Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: nx-libs-lite: parts
- are derived from non-free code
-Message-Id: <20150519001408.8e5452a098db48d6867af6cb@paranoici.org>
-In-Reply-To: <1431985731.1406.2.camel@Nokia-N900>
-References: <20150506173532.7531.31389.reportbug@homebrew>
-	<20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
-	<20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
-	<20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
-	<55521444.9090407@vigor.nu>
-	<1431445315.4712.7.camel@Nokia-N900>
-	<20150512234048.054319a449ffadcf87577425@paranoici.org>
-	<20150514045809.Horde.-3NIZzBnA5V5B6a721F2kg2@mail.das-netzwerkteam.de>
-	<20150516091912.Horde.W_1Szu5msccGYo-Ndwv3cg1@mail.das-netzwerkteam.de>
-	<555A558E.1020703@vigor.nu>
-	<1431985731.1406.2.camel@Nokia-N900>
-X-Mailer: Sylpheed 3.5.0beta1 (GTK+ 2.24.25; x86_64-pc-linux-gnu)
-Mime-Version: 1.0
-Content-Type: multipart/signed; protocol="application/pgp-signature";
- micalg="PGP-SHA256";
- boundary="Signature=_Tue__19_May_2015_00_14_08_+0200_Wl9eJ95DZcVokEvx"
-
---Signature=_Tue__19_May_2015_00_14_08_+0200_Wl9eJ95DZcVokEvx
-Content-Type: text/plain; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: quoted-printable
-
-On Mon, 18 May 2015 23:48:51 +0200 Mike Gabriel wrote:
-
-[...]
-> @Francesco: that old post from Brian should be the statement we need,
-> right? As Brian has not answered back, so far, does that post suffice?
-
-Yes, I am under the impression that it may be considered as evidence
-that Brian had always meant to grant permission to modify, despite not
-being overly clear until DXPC version 3.8.1.
-In other words, it seems that the re-licensing was more intended to be
-a clarification, rather than a change of mind.
-
->=20
-> I also had a mail from Zach in my mailbox this morning. I managed to
-> get hold of him via phone over the weekend. He posted his agreement
-> to this Debian bug (as message #77) [1] earlier today. @Zach: thanks
-> a lot for that!!!
-
-This is really great!
-
->=20
-> @Francesco: by looking at [2], I cannot see any hint for Gian Filippo
-> Pinzari being a copyright holder of DXPC. This is stated in the
-> NoMachine files at at least one place, but not in the latest DXPC
-> upstream release. I am on my mobile right now, need to check old
-> versions of DXPC, but if Gian Filippo Pinzari is not listed in
-> the DXPC 3.7.0 release (where nxcomp obviously got forked from),
-> then I think that we don't require his feedback, right?
-
-If it is confirmed that Gian Filippo contributed to the forking of DXPC
-within the NoMachine project, but not directly to DXPC, then I think
-that he made his contributions available under the terms of the GPL v2
-of the NoMachine project.
-If this is the case, no feedback should be required from his side.
-
->=20
-> To my opinion, this issue can be settled. We have direct feedback
-> from Kevin and Zach and Kevin dug out an old post from Brian stating
-> the retroactive nature of the BSD-2-clause while Gian Filippo probably
-> not being a real copyright holder of the original DXPC code. Right?
-
-Yes, I agree with this analysis.
-The only missing check is the one about Gian Filippo's involvement (as
-explained above).
-
-Thanks a lot to everyone involved in this license fixing effort!
-Bye.
-
->=20
-> [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=3D77;att=3D0;bug=3D=
-784565
-> [2] http://www.vigor.nu/dxpc/README
-
-
-
---=20
- http://www.inventati.org/frx/
- There's not a second to spare! To the laboratory!
-..................................................... Francesco Poli .
- GnuPG key fpr =3D=3D CA01 1147 9CD2 EFDF FB82  3925 3E1C 27E1 1F69 BFFE
-
---Signature=_Tue__19_May_2015_00_14_08_+0200_Wl9eJ95DZcVokEvx
-Content-Type: application/pgp-signature
-
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJVWmQ1AAoJED4cJ+Efab/+FowQALSZya0Xp8IXNA+d0gjQBLGQ
-7eDzaX+kPVKkbYdb7ZDlQF+ZVTwjOnqjf1dDLXWSHwcXYhFd3DeeFB11QfAKXptI
-GyzOt/vrh+w1K2zMb4rR9lxyUKIrKmVI6aOxyRTP7ojqkqqFvpF7ZVkDJZBFCSvx
-LXdAWTaz5NLIH5R4lzvTcTFYmC3JhBtf8m58l4jT3GC1pxoqlYQk0svWOrdlULQZ
-zh1dy6Sf0guwMuOH4pfreTKlNIizFj7BwanoN+tNvYG1sbQnyIwNRKUfG+v5/13P
-3tyjknNDTTE67T40qSv6pcZs46vqMTevL8E+s+wGfcvdKQ5Y2fPQ8Q9yxS6cVxH2
-DXsLV97RFCcdD+ys+7P9j7xYG0e38juu61sU42cNmrb5iU0woB3SJtFvABhioGZg
-TLFi/OxOT6ZTHcZtfwqozVyB1fOesqx3nvwCEE3pNuf58ErxRy1sIXwoChNL4+eo
-ET1kojXBXHER6W6EHno0yz600sJXHE8rco+fv5b5qGBHdLEJ0k80YXQI4FhJQT69
-I8FyASmNX4u6HvH6hRVm2BwE9WrZTUUQRb0m/pEfZVVroiRrqTl/ntvWchXvI2Tt
-IGfoDMtmVbSkh+2DQmsG9oDqiG1pCt3eNkLa1oftlQ7oIQem2MajCOS4QN20PMpU
-d/smtrrNvkmiWuQrjwDF
-=R0ou
------END PGP SIGNATURE-----
-
---Signature=_Tue__19_May_2015_00_14_08_+0200_Wl9eJ95DZcVokEvx--
-
-
-
-From kevin@vigor.nu Tue May 19 01:41:18 2015
-Received: (at 784565) by bugs.debian.org; 19 May 2015 01:41:18 +0000
-X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
-	(2014-02-07) on buxtehude.debian.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-6.9 required=4.0 tests=BAYES_00,FOURLA,
-	HAS_BUG_NUMBER,SPF_PASS autolearn=ham autolearn_force=no
-	version=3.4.0-bugs.debian.org_2005_01_02
-X-Spam-Bayes: score:0.0000 Tokens: new, 26; hammy, 131; neutral, 46; spammy,
-	0. spammytokens: hammytokens:0.000-+--H*UA:31.6.0, 0.000-+--H*u:31.6.0,
-	0.000-+--H*f:sk:2015050, 0.000-+--H*UA:31.0, 0.000-+--H*u:31.0
-Return-path: <kevin@vigor.nu>
-Received: from gateway32.websitewelcome.com ([192.185.145.107])
-	by buxtehude.debian.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256)
-	(Exim 4.80)
-	(envelope-from <kevin@vigor.nu>)
-	id 1YuWX0-0002lG-Du
-	for 784565@bugs.debian.org; Tue, 19 May 2015 01:41:18 +0000
-Received: by gateway32.websitewelcome.com (Postfix, from userid 500)
-	id 311BBD143B8C; Mon, 18 May 2015 20:16:29 -0500 (CDT)
-Received: from gator4058.hostgator.com (gator4058.hostgator.com [192.185.4.69])
-	by gateway32.websitewelcome.com (Postfix) with ESMTP id 2F036D143B72
-	for <784565@bugs.debian.org>; Mon, 18 May 2015 20:16:29 -0500 (CDT)
-Received: from [98.202.128.111] (port=49655 helo=[192.168.7.118])
-	by gator4058.hostgator.com with esmtpsa (UNKNOWN:DHE-RSA-AES128-SHA:128)
-	(Exim 4.82)
-	(envelope-from <kevin@vigor.nu>)
-	id 1YuW8y-0004Tt-DX; Mon, 18 May 2015 20:16:28 -0500
-Message-ID: <555A8EE9.9000503@vigor.nu>
-Date: Mon, 18 May 2015 19:16:25 -0600
-From: Kevin Vigor <kevin@vigor.nu>
-User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0
-MIME-Version: 1.0
-To: Francesco Poli <invernomuto@paranoici.org>, 
- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-CC: 784565@bugs.debian.org, nito.martinez@qindel.com, 
- x2go-dev@lists.x2go.org, opensource@gznianguan.com, zvonler@gmail.com
-Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: nx-libs-lite: parts
- are derived from non-free code
-References: <20150506173532.7531.31389.reportbug@homebrew>	<20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>	<20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>	<20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>	<55521444.9090407@vigor.nu>	<1431445315.4712.7.camel@Nokia-N900>	<20150512234048.054319a449ffadcf87577425@paranoici.org>	<20150514045809.Horde.-3NIZzBnA5V5B6a721F2kg2@mail.das-netzwerkteam.de>	<20150516091912.Horde.W_1Szu5msccGYo-Ndwv3cg1@mail.das-netzwerkteam.de>	<555A558E.1020703@vigor.nu>	<1431985731.1406.2.camel@Nokia-N900> <20150519001408.8e5452a098db48d6867af6cb@paranoici.org>
-In-Reply-To: <20150519001408.8e5452a098db48d6867af6cb@paranoici.org>
-Content-Type: text/plain; charset=windows-1252; format=flowed
-Content-Transfer-Encoding: 7bit
-X-AntiAbuse: This header was added to track abuse, please include it with any abuse report
-X-AntiAbuse: Primary Hostname - gator4058.hostgator.com
-X-AntiAbuse: Original Domain - bugs.debian.org
-X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12]
-X-AntiAbuse: Sender Address Domain - vigor.nu
-X-BWhitelist: no
-X-Source-IP: 98.202.128.111
-X-Exim-ID: 1YuW8y-0004Tt-DX
-X-Source: 
-X-Source-Args: 
-X-Source-Dir: 
-X-Source-Sender: ([192.168.7.118]) [98.202.128.111]:49655
-X-Source-Auth: kevin@vigor.nu
-X-Email-Count: 3
-X-Source-Cap: a3ZpZ29yO2t2aWdvcjtnYXRvcjQwNTguaG9zdGdhdG9yLmNvbQ==
-X-Greylist: delayed 1487 seconds by postgrey-1.34 at buxtehude; Tue, 19 May 2015 01:41:18 UTC
-
-On 5/18/2015 4:14 PM, Francesco Poli wrote:
-> If it is confirmed that Gian Filippo contributed to the forking of 
-> DXPC within the NoMachine project, but not directly to DXPC, then I 
-> think that he made his contributions available under the terms of the 
-> GPL v2 of the NoMachine project. If this is the case, no feedback 
-> should be required from his side.
-I can confirm that Gian Fillippo never contributed directly to DXPC. 
-You'll note his name does not appear in the DXPC README, and never has.
-
-
-
-From mike.gabriel@das-netzwerkteam.de Tue May 19 08:15:28 2015
-Received: (at 784565) by bugs.debian.org; 19 May 2015 08:15:28 +0000
-X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
-	(2014-02-07) on buxtehude.debian.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-11.9 required=4.0 tests=BAYES_00,FOURLA,
-	HAS_BUG_NUMBER,PGPSIGNATURE,T_RP_MATCHES_RCVD autolearn=ham
-	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
-X-Spam-Bayes: score:0.0000 Tokens: new, 24; hammy, 150; neutral, 195; spammy,
-	0. spammytokens: hammytokens:0.000-+--H*c:pgp-signature,
-	0.000-+--H*c:protocol, 0.000-+--H*c:micalg, 0.000-+--H*c:signed,
-	0.000-+--H*RU:sk:grimnir
-Return-path: <mike.gabriel@das-netzwerkteam.de>
-Received: from freya.das-netzwerkteam.de ([88.198.48.199])
-	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
-	(Exim 4.80)
-	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
-	id 1YucgR-0008T9-K0
-	for 784565@bugs.debian.org; Tue, 19 May 2015 08:15:28 +0000
-Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
-	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id 7D1773C96;
-	Tue, 19 May 2015 10:15:23 +0200 (CEST)
-Received: from localhost (localhost [127.0.0.1])
-	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 08FEE3BFD5;
-	Tue, 19 May 2015 10:15:23 +0200 (CEST)
-X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
-Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
-	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
-	with ESMTP id MW9pv+xO3WwY; Tue, 19 May 2015 10:15:22 +0200 (CEST)
-Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1])
-	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPS id 97FCC3C2AA;
-	Tue, 19 May 2015 10:15:12 +0200 (CEST)
-Received: from bifrost.das-netzwerkteam.de (bifrost.das-netzwerkteam.de
- [178.62.101.154]) by mail.das-netzwerkteam.de (Horde Framework) with HTTP;
- Tue, 19 May 2015 08:15:12 +0000
-Date: Tue, 19 May 2015 08:15:12 +0000
-Message-ID: <20150519081512.Horde.36QI-nOdkbpWsXrDE4E8Yw1@mail.das-netzwerkteam.de>
-From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-To: Kevin Vigor <kevin@vigor.nu>, 784565@bugs.debian.org, Francesco Poli
- <invernomuto@paranoici.org>
-Cc: opensource@gznianguan.com, zvonler@gmail.com, nito.martinez@qindel.com,
- x2go-dev@lists.x2go.org
-Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: Bug#784565:
- nx-libs-lite: parts are derived from non-free code
-References: <20150506173532.7531.31389.reportbug@homebrew>
- <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
- <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
- <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
- <55521444.9090407@vigor.nu> <1431445315.4712.7.camel@Nokia-N900>
- <20150512234048.054319a449ffadcf87577425@paranoici.org>
- <20150514045809.Horde.-3NIZzBnA5V5B6a721F2kg2@mail.das-netzwerkteam.de>
- <20150516091912.Horde.W_1Szu5msccGYo-Ndwv3cg1@mail.das-netzwerkteam.de>
- <555A558E.1020703@vigor.nu> <1431985731.1406.2.camel@Nokia-N900>
- <20150519001408.8e5452a098db48d6867af6cb@paranoici.org>
- <555A8EE9.9000503@vigor.nu>
-In-Reply-To: <555A8EE9.9000503@vigor.nu>
-User-Agent: Internet Messaging Program (IMP) H5 (6.2.2)
-Accept-Language: de,en
-Organization: DAS-NETZWERKTEAM
-X-Originating-IP: 178.62.101.154
-X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:32.0) Gecko/20100101
- Firefox/32.0 Iceweasel/32.0
-Content-Type: multipart/signed; boundary="=_AI4511z4pP7yPmTeeGgEoA6";
- protocol="application/pgp-signature"; micalg=pgp-sha1
-MIME-Version: 1.0
-
-This message is in MIME format and has been PGP signed.
-
---=_AI4511z4pP7yPmTeeGgEoA6
-Content-Type: text/plain; charset=us-ascii; format=flowed; DelSp=Yes
-Content-Disposition: inline
-Content-Transfer-Encoding: quoted-printable
-
-Hi Kevin, hi Frederico,
-
-On  Di 19 Mai 2015 03:16:25 CEST, Kevin Vigor wrote:
-
-> On 5/18/2015 4:14 PM, Francesco Poli wrote:
->> If it is confirmed that Gian Filippo contributed to the forking of=20=20
->>=20DXPC within the NoMachine project, but not directly to DXPC, then I=20=
-=20
->>=20think that he made his contributions available under the terms of=20=
-=20
->>=20the GPL v2 of the NoMachine project. If this is the case, no=20=20
->>=20feedback should be required from his side.
-
-> I can confirm that Gian Fillippo never contributed directly to DXPC.=20=
-=20
->=20You'll note his name does not appear in the DXPC README, and never=20=
-=20
->=20has.
-
-@Kevin: This is again good news for sorting out this issue. Thanks a=20=20
-lot=20for your help, Kevin.
-
-@Frederico: I guess we are through then. Thanks for helping with=20=20
-clarifying=20the situation (and bringing it up in the first place).
-
-For fixing this issue (in terms of closing the bug), I propose this=20=20
-for=20downstream (i.e., Debian):
-
-   o copy bug_784565.mbox [1] into the debian/ folder of the=20=20
-nx-libs-lite=20package
-   o upload some latest release of nx-libs-lite 3.5.0.x to unstable
-   o update debian/copyright accordingly
-   o close this bug via debian/changelog
-
-For upstream, I propose this:
-
-   o copy bug_784565.mbox into the docs/ folder
-   o update copyright information in nxcomp/ subfolder
-   o provide some README or such that shortly explains our last weeks' proc=
-ess
-   o this will be for the upcoming 3.6.x release series of nx-libs
-
-   o this should also be backported to the 3.5.x release series
-
-Once the mbox file and README are upstreamed, I will drop that content=20=
-=20
-from=20the debian/ folder in the Debian package nx-libs-lite (as it will=20=
-=20
-be=20in the upstream tarball of nx-libs-lite).
-
-Feedback (esp. from Frederico), concerns, other suggestions?
-
-Greets,
-Mike
-
-
-[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?mbox=3Dyes;bug=3D784565
---=20
-
-DAS-NETZWERKTEAM
-mike=20gabriel, herweg 7, 24357 fleckeby
-fon: +49 (1520) 1976 148
-
-GnuPG Key ID 0x25771B31
-mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
-
-freeBusy:
-https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x=
-fb
-
---=_AI4511z4pP7yPmTeeGgEoA6
-Content-Type: application/pgp-signature
-Content-Description: Digitale PGP-Signatur
-Content-Disposition: inline
-
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAABAgAGBQJVWvEQAAoJEJr0azAldxsxiZgP/1MhcK1h2or3zG3P9h3oOqFk
-rsknSn/0paY8HlzggWh5N4juLU9ET/VyO+xMCbVFDXb9jv5ryRI0MinPGwp6ujTl
-DxHAz5q5YrC/NYH9IU0PqL2Zja952xbjlVPgf64+iLT0kqFmY7L48bkxVXd4cKnJ
-flflATeaPTcVgIVcfFte2q/NJV7AAGjwb/tEOOMbqrRYOu1hKLozWnRSLZ/rdl5V
-OmktCjfAfw6Cvy4/IN6pCjG4uqFvsWvzjMofR53MLuy8cwQhtpvK9KPLCZlo9Efm
-KyrFNl866Egmc/HTLQkSaOJOKartANw+Ev7qsVi30OJOEWh9T1fDjnFvLn6hesKf
-9pAS/+mkuCUVNjLI/ATZAwY93bzBS+vo7fya2D/DxDk8FoLIe7XdI9GABdTE2U0H
-eyNLb/Lq485BEQEu9ThtvACZYH3F3UqA7OcFfLKyVw2lsOJV7SN3KCl76te4iNcf
-UlVzVr211lKhGTV9hLF3daKntu1H3jQku9zLK9ShJR6bYTpCAsGi2h2xzZm5PLDE
-9tbf+qUmDn3lp4uMaBtBdtq+yt47Wk95iS41x/qyvy0PK/RdnPxTpfdbriu4+1l2
-ij6Dq5bb7GckZDmpVjSsGSr4jjWtJ5QrnZbpv/u/v3+wliZL0c+CScrA+5I/qJeI
-eGXnQIwqcWE/2/AcAz2r
-=Q2/H
------END PGP SIGNATURE-----
-
---=_AI4511z4pP7yPmTeeGgEoA6--
-
-
-
-
-From invernomuto@paranoici.org Wed May 20 18:04:34 2015
-Received: (at 784565) by bugs.debian.org; 20 May 2015 18:04:34 +0000
-X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
-	(2014-02-07) on buxtehude.debian.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-12.0 required=4.0 tests=BAYES_00,DKIM_SIGNED,
-	DKIM_VALID,DKIM_VALID_AU,FOURLA,HAS_BUG_NUMBER,PGPSIGNATURE,SPF_HELO_PASS,
-	SPF_PASS autolearn=ham autolearn_force=no
-	version=3.4.0-bugs.debian.org_2005_01_02
-X-Spam-Bayes: score:0.0000 Tokens: new, 11; hammy, 150; neutral, 212; spammy,
-	0. spammytokens: hammytokens:0.000-+--H*UA:sk:x86_64-,
-	0.000-+--H*x:sk:x86_64-, 0.000-+--H*c:PGP-SHA256, 0.000-+--H*c:SignHturH,
-	0.000-+--H*c:pgp-signature
-Return-path: <invernomuto@paranoici.org>
-Received: from latitanza.investici.org ([82.94.249.234])
-	by buxtehude.debian.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256)
-	(Exim 4.80)
-	(envelope-from <invernomuto@paranoici.org>)
-	id 1Yv8M4-00011u-4i
-	for 784565@bugs.debian.org; Wed, 20 May 2015 18:04:34 +0000
-Received: from [82.94.249.234] (latitanza [82.94.249.234]) (Authenticated sender: invernomuto@paranoici.org) by localhost (Postfix) with ESMTPSA id C5F33121147;
-	Wed, 20 May 2015 18:04:24 +0000 (UTC)
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paranoici.org;
-	s=stigmate; t=1432145064;
-	bh=kDc9DoBw4hJZuuDTXyurpbInn9fdFF6IfH4jMVGqQB4=;
-	h=Date:From:To:Cc:Subject:In-Reply-To:References;
-	b=frjvhV6NrKV9TyZSGeK6evsHeI9sAgoPOPboFwSAIij0bPp1G5rCLaVWFjD1RtFsK
-	 j+6I/XZ60KTIjiXaQGqqznF3jU2dQ/lzPkj1VYKa9Kmt1pw4UhJvU+mbyrO6cX2mSi
-	 52Wi1of3M+l/UT9DYKjXgzMRuWkYoAq4tmsOe9jY=
-Received: from frx by homebrew with local (Exim 4.85)
-	(envelope-from <invernomuto@paranoici.org>)
-	id 1Yv8LB-0001gi-7y; Wed, 20 May 2015 20:03:37 +0200
-Date: Wed, 20 May 2015 20:03:25 +0200
-From: Francesco Poli <invernomuto@paranoici.org>
-To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Cc: Kevin Vigor <kevin@vigor.nu>, 784565@bugs.debian.org,
- opensource@gznianguan.com, zvonler@gmail.com, nito.martinez@qindel.com,
- x2go-dev@lists.x2go.org
-Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: Bug#784565:
- nx-libs-lite: parts are derived from non-free code
-Message-Id: <20150520200325.6641876f5b4b2f483bdaea7d@paranoici.org>
-In-Reply-To: <20150519081512.Horde.36QI-nOdkbpWsXrDE4E8Yw1@mail.das-netzwerkteam.de>
-References: <20150506173532.7531.31389.reportbug@homebrew>
-	<20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
-	<20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
-	<20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
-	<55521444.9090407@vigor.nu>
-	<1431445315.4712.7.camel@Nokia-N900>
-	<20150512234048.054319a449ffadcf87577425@paranoici.org>
-	<20150514045809.Horde.-3NIZzBnA5V5B6a721F2kg2@mail.das-netzwerkteam.de>
-	<20150516091912.Horde.W_1Szu5msccGYo-Ndwv3cg1@mail.das-netzwerkteam.de>
-	<555A558E.1020703@vigor.nu>
-	<1431985731.1406.2.camel@Nokia-N900>
-	<20150519001408.8e5452a098db48d6867af6cb@paranoici.org>
-	<555A8EE9.9000503@vigor.nu>
-	<20150519081512.Horde.36QI-nOdkbpWsXrDE4E8Yw1@mail.das-netzwerkteam.de>
-X-Mailer: Sylpheed 3.5.0beta1 (GTK+ 2.24.25; x86_64-pc-linux-gnu)
-Mime-Version: 1.0
-Content-Type: multipart/signed; protocol="application/pgp-signature";
- micalg="PGP-SHA256";
- boundary="Signature=_Wed__20_May_2015_20_03_25_+0200__3Vr7Ml7uHmX7EzV"
-
---Signature=_Wed__20_May_2015_20_03_25_+0200__3Vr7Ml7uHmX7EzV
-Content-Type: text/plain; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: quoted-printable
-
-On Tue, 19 May 2015 08:15:12 +0000 Mike Gabriel wrote:
-
-[...]
-> @Frederico: I guess we are through then.
-
-Yes, it seems so (I'm assuming you meant to direct this question to
-me...).
-
-> Thanks for helping with =20
-> clarifying the situation (and bringing it up in the first place).
-
-You're welcome!
-Thanks to you and all the involved people for helping to solve this
-issue.
-
->=20
-> For fixing this issue (in terms of closing the bug), I propose this =20
-> for downstream (i.e., Debian):
->=20
->    o copy bug_784565.mbox [1] into the debian/ folder of the =20
-> nx-libs-lite package
-
-Maybe the entire bug log is an overkill...
-I would include the relevant replies only. For instance:
-https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=3D40;mbox=3Dyes;bug=3D784=
-565
-https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=3D77;mbox=3Dyes;bug=3D784=
-565
-https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=3D87;mbox=3Dyes;bug=3D784=
-565
-https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=3D102;mbox=3Dyes;bug=3D78=
-4565
-
->    o upload some latest release of nx-libs-lite 3.5.0.x to unstable
->    o update debian/copyright accordingly
-
-In the debian/copyright file the license for the original DXPC code
-should be replaced with the 2-clause BSD license (currently adopted for
-DXPC) with a comment saying something like:
-
-  The original DXPC code used to be available under a license which
-  failed to explicitly grant the permission to modify, but was later
-  retroactively re-licensed under the 2-clause BSD license (see
-  debian/bug_784565_*.mbox for the copyright owners' statements; see
-  <https://bugs.debian.org/784565> for more details)
-
-Moreover, the copyright notice of Gian Filippo Pinzari should be
-documented in some more appropriate part of the debian/copyright file,
-associated with the NoMachine license (GPL v2 or later).
-
->    o close this bug via debian/changelog
->=20
-> For upstream, I propose this:
->=20
->    o copy bug_784565.mbox into the docs/ folder
-
-Again, I would not include the entire bug log, but only the relevant
-messages (see above)...
-
->    o update copyright information in nxcomp/ subfolder
->    o provide some README or such that shortly explains our last weeks' pr=
-ocess
->    o this will be for the upcoming 3.6.x release series of nx-libs
->=20
->    o this should also be backported to the 3.5.x release series
-
-
-Thanks to everyone involved!
-Bye.
-
---=20
- http://www.inventati.org/frx/
- There's not a second to spare! To the laboratory!
-..................................................... Francesco Poli .
- GnuPG key fpr =3D=3D CA01 1147 9CD2 EFDF FB82  3925 3E1C 27E1 1F69 BFFE
-
---Signature=_Wed__20_May_2015_20_03_25_+0200__3Vr7Ml7uHmX7EzV
-Content-Type: application/pgp-signature
-
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJVXMxyAAoJED4cJ+Efab/+yUsP/RWzC9NoVGF7UnEIEpJODu0u
-hVkX1zjpJ+iMByHVlatR90ulKwkvVb4d354YJqyI0VM2wUtif6XBoroB0K3i6vZE
-DsxugBlzhnH8jgpPVKbOyBKshpKKZsUbvDdEXM20ZkfI4xwokymiSdHOKoHH4ZHS
-WN9q+i6OezfWvZSKQ+VCbe7QiQABAcB+zCdVvUWevhNqMDKdhsDC03Ju+5YZQbse
-QbgYSazZvJouLPamivquh8nBdjGpPxqAJGrlUu3SR5slJxRojRvl2cl/CDFEQEQR
-gbLMnnr2nj1hF4JI2WaWCSX90NrGTfGxCN4IdNd7tmjtkg5lB+KFx63YjHbLmUl/
-k87XAyXxSWyGvc7M2xyIXBQQrHtRxtK0rdN+e7ht9PcXYyxUtQzr7vfPwvI+B2GV
-M23ZUoyV1rFp5JymbUL4Vk6pq/hLnv9FzwOySNVcj6Pt8eT+BcoSbwOI1AMq1P1S
-wCs/PhEGBA3TDWERXF0Fb7x24NEf7EdjmzKTGGdXTCfSkacxkGzsMaRpWb0D6IaV
-tSI6CmBQ9uOdkbiNDhGX4esosyJZJQ9GrnWX9d/lTs9wXUHHykvnYRbDzpkChZdI
-ICqc+IxnPmX6HU2kyq2ZAzfhx/drqLizcv0gQlyY6APjRu3EQ3tapR9kYB6BcuGU
-cMLlO0549ekk8/s3Zk0i
-=9Hew
------END PGP SIGNATURE-----
-
---Signature=_Wed__20_May_2015_20_03_25_+0200__3Vr7Ml7uHmX7EzV--
-
-
-
-From mike.gabriel@das-netzwerkteam.de Thu May 21 09:35:35 2015
-Received: (at 784565) by bugs.debian.org; 21 May 2015 09:35:35 +0000
-X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
-	(2014-02-07) on buxtehude.debian.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-11.9 required=4.0 tests=BAYES_00,FOURLA,
-	HAS_BUG_NUMBER,PGPSIGNATURE,T_RP_MATCHES_RCVD autolearn=ham
-	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
-X-Spam-Bayes: score:0.0000 Tokens: new, 15; hammy, 150; neutral, 222; spammy,
-	0. spammytokens: hammytokens:0.000-+--H*c:pgp-signature,
-	0.000-+--H*c:protocol, 0.000-+--H*c:micalg, 0.000-+--H*c:signed,
-	0.000-+--H*RU:sk:grimnir
-Return-path: <mike.gabriel@das-netzwerkteam.de>
-Received: from freya.das-netzwerkteam.de ([88.198.48.199])
-	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
-	(Exim 4.80)
-	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
-	id 1YvMt4-0006Ry-Ri
-	for 784565@bugs.debian.org; Thu, 21 May 2015 09:35:35 +0000
-Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
-	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id 89FD21F2;
-	Thu, 21 May 2015 11:35:31 +0200 (CEST)
-Received: from localhost (localhost [127.0.0.1])
-	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id C86AC3BAE9;
-	Thu, 21 May 2015 11:35:30 +0200 (CEST)
-X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
-Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
-	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
-	with ESMTP id GqfEjOoeH2CA; Thu, 21 May 2015 11:35:30 +0200 (CEST)
-Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1])
-	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPS id 615DC3BAB2;
-	Thu, 21 May 2015 11:35:30 +0200 (CEST)
-Received: from bifrost.das-netzwerkteam.de (bifrost.das-netzwerkteam.de
- [178.62.101.154]) by mail.das-netzwerkteam.de (Horde Framework) with HTTP;
- Thu, 21 May 2015 09:35:30 +0000
-Date: Thu, 21 May 2015 09:35:30 +0000
-Message-ID: <20150521093530.Horde.Oeys0xv-mTUN5U5IZtdeLA1@mail.das-netzwerkteam.de>
-From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-To: Francesco Poli <invernomuto@paranoici.org>, 784565@bugs.debian.org
-Cc: nito.martinez@qindel.com, opensource@gznianguan.com
-Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: Bug#784565:
- Bug#784565: nx-libs-lite: parts are derived from non-free code
-References: <20150506173532.7531.31389.reportbug@homebrew>
- <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
- <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
- <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
- <55521444.9090407@vigor.nu> <1431445315.4712.7.camel@Nokia-N900>
- <20150512234048.054319a449ffadcf87577425@paranoici.org>
- <20150514045809.Horde.-3NIZzBnA5V5B6a721F2kg2@mail.das-netzwerkteam.de>
- <20150516091912.Horde.W_1Szu5msccGYo-Ndwv3cg1@mail.das-netzwerkteam.de>
- <555A558E.1020703@vigor.nu> <1431985731.1406.2.camel@Nokia-N900>
- <20150519001408.8e5452a098db48d6867af6cb@paranoici.org>
- <555A8EE9.9000503@vigor.nu>
- <20150519081512.Horde.36QI-nOdkbpWsXrDE4E8Yw1@mail.das-netzwerkteam.de>
- <20150520200325.6641876f5b4b2f483bdaea7d@paranoici.org>
-In-Reply-To: <20150520200325.6641876f5b4b2f483bdaea7d@paranoici.org>
-User-Agent: Internet Messaging Program (IMP) H5 (6.2.2)
-Accept-Language: de,en
-Organization: DAS-NETZWERKTEAM
-X-Originating-IP: 178.62.101.154
-X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:32.0) Gecko/20100101
- Firefox/32.0 Iceweasel/32.0
-Content-Type: multipart/signed; boundary="=_5hM8_j7kivGPCYTZql9Fug5";
- protocol="application/pgp-signature"; micalg=pgp-sha1
-MIME-Version: 1.0
-
-This message is in MIME format and has been PGP signed.
-
---=_5hM8_j7kivGPCYTZql9Fug5
-Content-Type: text/plain; charset=us-ascii; format=flowed; DelSp=Yes
-Content-Disposition: inline
-Content-Transfer-Encoding: quoted-printable
-
-Control: forwarded -1 https://github.com/ArcticaProject/nx-libs/issues/30
-
-Hi Francesco,
-
-On  Mi 20 Mai 2015 20:03:25 CEST, Francesco Poli wrote:
-
-> On Tue, 19 May 2015 08:15:12 +0000 Mike Gabriel wrote:
->
-> [...]
->> @Frederico: I guess we are through then.
->
-> Yes, it seems so (I'm assuming you meant to direct this question to
-> me...).
-
-Yes. :-)
-
->> For fixing this issue (in terms of closing the bug), I propose this
->> for downstream (i.e., Debian):
->>
->>    o copy bug_784565.mbox [1] into the debian/ folder of the
->> nx-libs-lite package
->
-> Maybe the entire bug log is an overkill...
-> I would include the relevant replies only. For instance:
-> https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=3D40;mbox=3Dyes;bug=3D7=
-84565
-> https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=3D77;mbox=3Dyes;bug=3D7=
-84565
-> https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=3D87;mbox=3Dyes;bug=3D7=
-84565
-> https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=3D102;mbox=3Dyes;bug=3D=
-784565
-
-ACK.
-
->>    o upload some latest release of nx-libs-lite 3.5.0.x to unstable
->>    o update debian/copyright accordingly
->
-> In the debian/copyright file the license for the original DXPC code
-> should be replaced with the 2-clause BSD license (currently adopted for
-> DXPC) with a comment saying something like:
->
->   The original DXPC code used to be available under a license which
->   failed to explicitly grant the permission to modify, but was later
->   retroactively re-licensed under the 2-clause BSD license (see
->   debian/bug_784565_*.mbox for the copyright owners' statements; see
->   <https://bugs.debian.org/784565> for more details)
->
-> Moreover, the copyright notice of Gian Filippo Pinzari should be
-> documented in some more appropriate part of the debian/copyright file,
-> associated with the NoMachine license (GPL v2 or later).
->
->>    o close this bug via debian/changelog
->>
->> For upstream, I propose this:
->>
->>    o copy bug_784565.mbox into the docs/ folder
->
-> Again, I would not include the entire bug log, but only the relevant
-> messages (see above)...
->
->>    o update copyright information in nxcomp/ subfolder
->>    o provide some README or such that shortly explains our last=20=20
->>=20weeks' process
->>    o this will be for the upcoming 3.6.x release series of nx-libs
->>
->>    o this should also be backported to the 3.5.x release series
-
-Doing all the above now.
-
-Thanks to all,
-Mike
-
---=20
-
-DAS-NETZWERKTEAM
-mike=20gabriel, herweg 7, 24357 fleckeby
-fon: +49 (1520) 1976 148
-
-GnuPG Key ID 0x25771B31
-mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
-
-freeBusy:
-https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x=
-fb
-
---=_5hM8_j7kivGPCYTZql9Fug5
-Content-Type: application/pgp-signature
-Content-Description: Digitale PGP-Signatur
-Content-Disposition: inline
-
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAABAgAGBQJVXabiAAoJEJr0azAldxsxd4cP/in26lIPvdANMyDaqq3zQOMh
-n/Q+oZK5SYnHQP7vaS4mOWjTw5tCbfcUMcKwu1KpbgpUGOl9e1c/oKGxR3j5GWh3
-XiqQhPWEMf64OsM4vW5prJFrx0VNqfxykMWbGzQfs6Dz9ihJ6+HzVudOk3bfHwj2
-GahCflRo7xA1hJjwz5cIX1/WJaAF25TVSQ43jVpPu0pnAYOWvhOAZMpTJTZqRbgT
-peuFaiKE+NOb4C/WO9mkuO3wlEBZ5Ef/RinKQDlbV5/CZElEs1f42A4t5q909EVi
-U2PpaEis8BJAIKetl8g/bPoHh9u6X3tbeOKJlZBo5l2SMyLUG0sYsoAyhJKJtIvk
-gwdGdO71A7HLEJ6DfvE8vYXUPy9JEOQ6hhL2qeZOtJG2DZ2Qcoll9eK5scg2YutW
-ZXHRTYcCQeS4PQpvQPlCR5LuFTJeNBwJ0cWgtfXYPIrPMyeEZj/VP+Ypm82hBT+I
-JFjo80QjOEJ7uEM1wmn8nD0rbbP/NVf6ot/UcwlejC/XaYIlWDW5FrXf18UbGsvu
-VzaHkLbhbGUYedwsb50Uu6Nn4IX8IEcF3zbwnqmB5IlbPYV0UokjgtnKEIQbdmF4
-fQ5xe5u/p2aZTnQwt39vey2W/RxJVOHRjVVrYGv0eqgda8TYOWzI3UIjSYGfuLcU
-kDRest50Qfy4tmilPx3z
-=Cf5/
------END PGP SIGNATURE-----
-
---=_5hM8_j7kivGPCYTZql9Fug5--
-
-
-
-
diff --git a/doc/DXPC_re-licensed_debug_784565.mbox b/doc/DXPC_re-licensed_debug_784565.mbox
new file mode 100644
index 000000000..be813246c
--- /dev/null
+++ b/doc/DXPC_re-licensed_debug_784565.mbox
@@ -0,0 +1,3769 @@
+From invernomuto@paranoici.org Wed May 06 17:36:12 2015
+Received: (at submit) by bugs.debian.org; 6 May 2015 17:36:12 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-12.0 required=4.0 tests=BAYES_00,DKIM_SIGNED,
+	DKIM_VALID,DKIM_VALID_AU,FOURLA,HAS_PACKAGE,SPF_HELO_PASS,SPF_PASS,
+	XMAILER_REPORTBUG autolearn=ham autolearn_force=no
+	version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 12; hammy, 150; neutral, 79; spammy,
+	0. spammytokens: hammytokens:0.000-+--H*M:reportbug, 0.000-+--H*MI:reportbug,
+	0.000-+--H*x:reportbug, 0.000-+--H*UA:reportbug, 0.000-+--H*x:6.6.3
+Return-path: <invernomuto@paranoici.org>
+Received: from perdizione.investici.org ([94.23.50.208])
+	by buxtehude.debian.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256)
+	(Exim 4.80)
+	(envelope-from <invernomuto@paranoici.org>)
+	id 1Yq3Ex-0001dB-Ks
+	for submit@bugs.debian.org; Wed, 06 May 2015 17:36:11 +0000
+Received: from [94.23.50.208] (perdizione [94.23.50.208]) (Authenticated sender: invernomuto@paranoici.org) by localhost (Postfix) with ESMTPSA id 3987C120F77;
+	Wed,  6 May 2015 17:36:07 +0000 (UTC)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paranoici.org;
+	s=stigmate; t=1430933767;
+	bh=QAdaIheSnzoHI301+0HPUrAK62wjbKWg7iWEzGzlOTs=;
+	h=From:To:Subject:Date;
+	b=X/2YGWFWL2KRAVqONR2Q6Q6HuMii+1WfGCbSpf8XvQesaf7qWlvY2u1IVKgKVpN2m
+	 Baq+3OrQ1adlmdHQQJm7tLfv37vRZVNOUpP3lyKQX4v3B/Gos63+1GqfyJ7qGkvQha
+	 4qwytZrPI20VmUswHf7qhgSGIVQmy0COEZZX0PF8=
+Received: from frx by homebrew with local (Exim 4.85)
+	(envelope-from <invernomuto@paranoici.org>)
+	id 1Yq3EK-0001ye-Bx; Wed, 06 May 2015 19:35:32 +0200
+Content-Type: text/plain; charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+From: "Francesco Poli \(wintermute\)" <invernomuto@paranoici.org>
+To: Debian Bug Tracking System <submit@bugs.debian.org>
+Subject: nx-libs-lite: parts are derived from non-free code
+Message-ID: <20150506173532.7531.31389.reportbug@homebrew>
+X-Mailer: reportbug 6.6.3
+Date: Wed, 06 May 2015 19:35:32 +0200
+Delivered-To: submit@bugs.debian.org
+
+Package: nx-libs-lite
+Version: 3.5.0.27-1
+Severity: serious
+Justification: Policy 2.2.1
+
+Hello and thanks for maintaining this package in Debian!
+
+I noticed that the debian/copyright states:
+
+[...]
+| Parts of this software are derived from DXPC project. These copyright
+| notices apply to original DXPC code:
+| 
+|    Redistribution and use in source and binary forms are permitted provided
+|    that the above copyright notice and this paragraph are duplicated in all
+|    such forms.
+| 
+|    THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+|    WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+|    MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+| 
+|    Copyright (c) 1995,1996 Brian Pane
+|    Copyright (c) 1996,1997 Zachary Vonler and Brian Pane
+|    Copyright (c) 1999 Kevin Vigor and Brian Pane
+|    Copyright (c) 2000,2001 Gian Filippo Pinzari and Brian Pane
+[...]
+
+This license lacks the permission to modify the DXPC code.
+Hence, the original DXPC code does not appear to comply with the
+DFSG. And the nx-libs-lite is in part derived from DXPC code.
+
+This basically means that nx-libs-lite includes parts which are
+non-free (as they are derived from non-modifiable code) and
+are also possibly legally undistributable (as they are non-modifiable,
+but actually modified). The combination with the rest of nx-libs-lite
+(which is GPL-licensed) may also be legally undistributable (since
+the license with no permission to modify is GPL-incompatible).
+
+
+If there's anything I misunderstood, please clarify.
+
+Otherwise, please address this issue as soon as possible.
+The copyright owners for the original DXPC code should be
+contacted and persuaded to re-license under GPL-compatible
+terms.
+
+Thanks for your time.
+Bye.
+
+
+
+From mike.gabriel@das-netzwerkteam.de Mon May 11 09:07:54 2015
+Received: (at 784565) by bugs.debian.org; 11 May 2015 09:07:54 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-11.9 required=4.0 tests=BAYES_00,FOURLA,
+	HAS_BUG_NUMBER,PGPSIGNATURE,T_RP_MATCHES_RCVD autolearn=ham
+	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 24; hammy, 150; neutral, 203; spammy,
+	0. spammytokens: hammytokens:0.000-+--H*c:pgp-signature,
+	0.000-+--H*c:protocol, 0.000-+--H*c:micalg, 0.000-+--H*c:signed,
+	0.000-+--H*RU:sk:grimnir
+Return-path: <mike.gabriel@das-netzwerkteam.de>
+Received: from freya.das-netzwerkteam.de ([88.198.48.199])
+	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
+	(Exim 4.80)
+	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
+	id 1Yrjgn-0001o6-MP
+	for 784565@bugs.debian.org; Mon, 11 May 2015 09:07:54 +0000
+Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
+	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id 85F37E4B;
+	Mon, 11 May 2015 11:07:49 +0200 (CEST)
+Received: from localhost (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id F1CFF3C20D;
+	Mon, 11 May 2015 11:07:48 +0200 (CEST)
+X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
+Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
+	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id wKYnujH8-HJ8; Mon, 11 May 2015 11:07:48 +0200 (CEST)
+Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPS id 960E33C18A;
+	Mon, 11 May 2015 11:07:48 +0200 (CEST)
+Received: from bifrost.das-netzwerkteam.de (bifrost.das-netzwerkteam.de
+ [178.62.101.154]) by mail.das-netzwerkteam.de (Horde Framework) with HTTP;
+ Mon, 11 May 2015 09:07:48 +0000
+Date: Mon, 11 May 2015 09:07:48 +0000
+Message-ID: <20150511090748.Horde.Edus-FOfuc519TjISGi1vQ2@mail.das-netzwerkteam.de>
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+To: "Francesco Poli (wintermute)" <invernomuto@paranoici.org>,
+ 784565@bugs.debian.org
+Cc: x2go-dev@lists.x2go.org, Nito Martinez <nito.martinez@qindel.com>,
+ opensource@gznianguan.com, dktrkranz@debian.org
+Subject: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are derived
+ from non-free code
+In-Reply-To: <20150506173532.7531.31389.reportbug@homebrew>
+User-Agent: Internet Messaging Program (IMP) H5 (6.2.2)
+Accept-Language: de,en
+Organization: DAS-NETZWERKTEAM
+X-Originating-IP: 178.62.101.154
+X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:32.0) Gecko/20100101
+ Firefox/32.0 Iceweasel/32.0
+Content-Type: multipart/signed; boundary="=_ALb-1vQm6P3YAYx12TU2SQ1";
+ protocol="application/pgp-signature"; micalg=pgp-sha1
+MIME-Version: 1.0
+
+This message is in MIME format and has been PGP signed.
+
+--=_ALb-1vQm6P3YAYx12TU2SQ1
+Content-Type: text/plain; charset=us-ascii; format=flowed; DelSp=Yes
+Content-Disposition: inline
+Content-Transfer-Encoding: quoted-printable
+
+Hi Francesco,
+Cc:ing a couple of people/groups being affected by the below.
+
+On  Mi 06 Mai 2015 19:35:32 CEST, Francesco Poli (wintermute) wrote:
+
+> Package: nx-libs-lite
+> Version: 3.5.0.27-1
+> Severity: serious
+> Justification: Policy 2.2.1
+>
+> Hello and thanks for maintaining this package in Debian!
+>
+> I noticed that the debian/copyright states:
+>
+> [...]
+> | Parts of this software are derived from DXPC project. These copyright
+> | notices apply to original DXPC code:
+> |
+> |    Redistribution and use in source and binary forms are permitted prov=
+ided
+> |    that the above copyright notice and this paragraph are duplicated in=
+ all
+> |    such forms.
+> |
+> |    THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLI=
+ED
+> |    WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+> |    MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+> |
+> |    Copyright (c) 1995,1996 Brian Pane
+> |    Copyright (c) 1996,1997 Zachary Vonler and Brian Pane
+> |    Copyright (c) 1999 Kevin Vigor and Brian Pane
+> |    Copyright (c) 2000,2001 Gian Filippo Pinzari and Brian Pane
+> [...]
+>
+> This license lacks the permission to modify the DXPC code.
+> Hence, the original DXPC code does not appear to comply with the
+> DFSG. And the nx-libs-lite is in part derived from DXPC code.
+>
+> This basically means that nx-libs-lite includes parts which are
+> non-free (as they are derived from non-modifiable code) and
+> are also possibly legally undistributable (as they are non-modifiable,
+> but actually modified). The combination with the rest of nx-libs-lite
+> (which is GPL-licensed) may also be legally undistributable (since
+> the license with no permission to modify is GPL-incompatible).
+>
+>
+> If there's anything I misunderstood, please clarify.
+>
+> Otherwise, please address this issue as soon as possible.
+> The copyright owners for the original DXPC code should be
+> contacted and persuaded to re-license under GPL-compatible
+> terms.
+>
+> Thanks for your time.
+> Bye.
+
+I/we will investigate this asap. Thanks for bringing this up.
+
+Greets,
+Mike
+--=20
+
+DAS-NETZWERKTEAM
+mike=20gabriel, herweg 7, 24357 fleckeby
+fon: +49 (1520) 1976 148
+
+GnuPG Key ID 0x25771B31
+mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
+
+freeBusy:
+https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x=
+fb
+
+--=_ALb-1vQm6P3YAYx12TU2SQ1
+Content-Type: application/pgp-signature
+Content-Description: Digitale PGP-Signatur
+Content-Disposition: inline
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJVUHFkAAoJEJr0azAldxsxbNYP/jqxwacIBSYlAhaZEf62JFtt
+ObBSEqUQfjljkolnzeaf2K4lBT6dl1x9VxGvIM5S8y9H/qpbFW+XWNHIR1BpdAsw
+TgKuqb6giM+28V9pMaHuqwPwMQ7YnFsfSKf/YCEs0AvJJKsf5jSUbeHAJ/RHwC4Z
+iGOj/KRqQ3tqIZJbzV2TCMNYnPm4sttcvKcRIOnBLDEVn1CRhlYX93v/pP87iPok
+wvvnbPpM+D2oq1JjS6mR2JbVHspc9/ZGq5I100Cdo5r3Y3upunNyG4IRCL0ttBzg
+nRjEiktViU/hhBB2xjYRaDsEpRFSsOeItLWss2PNYER2uIYuimvUsJzhtj7IwsV8
+4J8wlvn0uRZRiQwSWI/UaL1r1eqI4AlMA4hzDnWR7cBB4nTNE6YWzTpYYhsqNVfJ
+jURTKIwGzDVVcpU5UZZhEtPcD5utkd8eYn4fA68pvkje3OFpLjfQnFWUcjIn5ywb
+mejuW08cnsdfB0he+NTFXpK4p4wiu92pqul/EqPKW3Dm1w7FZXPHpIkN6VQ03LdY
+kSXOOpITg8cHESsHlvyKIZITaLDrNAPB4RHkRxyWhRpZWgEM35FasE6hIRTbszQ9
+jpuXcrG11L7HbITi599U8ZAo4qK9OgWfzJEsBdQKXBHEqCjiv4GvdXvgJyR2Eukp
+OIldtig78B5JgGKDLKjY
+=G+R6
+-----END PGP SIGNATURE-----
+
+--=_ALb-1vQm6P3YAYx12TU2SQ1--
+
+
+
+
+From X2Go-ML-1@baur-itcs.de Mon May 11 09:21:13 2015
+Received: (at 784565) by bugs.debian.org; 11 May 2015 09:21:13 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-9.4 required=4.0 tests=BAYES_00,DIGITS_LETTERS,
+	FOURLA,FVGT_m_MULTI_ODD,HAS_BUG_NUMBER,MONEY,PGPSIGNATURE,RCVD_IN_DNSWL_NONE,
+	RCVD_IN_MSPIKE_H2,STOCKLIKE autolearn=ham autolearn_force=no
+	version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 67; hammy, 149; neutral, 240; spammy,
+	1. spammytokens:0.997-1--jjng hammytokens:0.000-+--sk:iqecbae,
+	0.000-+--sk:iQEcBAE, 0.000-+--sha256, 0.000-+--SHA256, 0.000-+--H*UA:31.6.0
+Return-path: <X2Go-ML-1@baur-itcs.de>
+Received: from mout.kundenserver.de ([212.227.17.10])
+	by buxtehude.debian.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256)
+	(Exim 4.80)
+	(envelope-from <X2Go-ML-1@baur-itcs.de>)
+	id 1Yrjtg-0003AA-Jy
+	for 784565@bugs.debian.org; Mon, 11 May 2015 09:21:13 +0000
+Received: from [192.168.0.171] ([78.43.125.82]) by mrelayeu.kundenserver.de
+ (mreue102) with ESMTPSA (Nemesis) id 0MBke7-1Z2Qat2SRz-00AqUz; Mon, 11 May
+ 2015 11:20:48 +0200
+Message-ID: <5550746E.1040707@baur-itcs.de>
+Date: Mon, 11 May 2015 11:20:46 +0200
+From: Stefan Baur <X2Go-ML-1@baur-itcs.de>
+User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0
+MIME-Version: 1.0
+To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 
+ "Francesco Poli (wintermute)" <invernomuto@paranoici.org>,
+ 784565@bugs.debian.org
+CC: opensource@gznianguan.com, Nito Martinez <nito.martinez@qindel.com>, 
+ dktrkranz@debian.org, x2go-dev@lists.x2go.org
+Subject: Re: [X2Go-Dev] [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are
+ derived from non-free code
+References: <20150511090748.Horde.Edus-FOfuc519TjISGi1vQ2@mail.das-netzwerkteam.de>
+In-Reply-To: <20150511090748.Horde.Edus-FOfuc519TjISGi1vQ2@mail.das-netzwerkteam.de>
+Content-Type: text/plain; charset=windows-1252
+Content-Transfer-Encoding: 8bit
+X-Provags-ID:  V03:K0:1hGpzbQ6YusgDW3LQNBHFEMw92BwlVIDUv6GGAN1bbqSykY6aoQ
+ ekoiYjWtMWz72yWg8Xd5/k/PEjXU7VxzZNBzxoyEx46ughI6kPZG/kS6r+aMsjf3KVXNi4U
+ da367A2ZowOeet1s6/LouBbblzzvjx7LF9SFO2TW4oakOyxhNCWEhVpveTV9FQPnavxZzhL
+ D5GN1YjxQGdnacFHIIuSQ==
+X-UI-Out-Filterresults: notjunk:1;
+
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+hi everyone,
+
+looking at the current homepage of DXPC, the following can be found in
+their changelog http://www.vigor.nu/dxpc/CHANGES:
+
+
+3.8.1 Release:
+
+[...]
+
+Changed license to BSD license.
+
+- -Stefan
+
+Am 11.05.2015 um 11:07 schrieb Mike Gabriel:
+> Hi Francesco, Cc:ing a couple of people/groups being affected by
+> the below.
+> 
+> On  Mi 06 Mai 2015 19:35:32 CEST, Francesco Poli (wintermute)
+> wrote:
+> 
+>> Package: nx-libs-lite Version: 3.5.0.27-1 Severity: serious 
+>> Justification: Policy 2.2.1
+>> 
+>> Hello and thanks for maintaining this package in Debian!
+>> 
+>> I noticed that the debian/copyright states:
+>> 
+>> [...] | Parts of this software are derived from DXPC project.
+>> These copyright | notices apply to original DXPC code: | |
+>> Redistribution and use in source and binary forms are permitted 
+>> provided |    that the above copyright notice and this paragraph
+>> are duplicated in all |    such forms. | |    THIS SOFTWARE IS
+>> PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED |
+>> WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES
+>> OF |    MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. | |
+>> Copyright (c) 1995,1996 Brian Pane |    Copyright (c) 1996,1997
+>> Zachary Vonler and Brian Pane |    Copyright (c) 1999 Kevin Vigor
+>> and Brian Pane |    Copyright (c) 2000,2001 Gian Filippo Pinzari
+>> and Brian Pane [...]
+>> 
+>> This license lacks the permission to modify the DXPC code. Hence,
+>> the original DXPC code does not appear to comply with the DFSG.
+>> And the nx-libs-lite is in part derived from DXPC code.
+>> 
+>> This basically means that nx-libs-lite includes parts which are 
+>> non-free (as they are derived from non-modifiable code) and are
+>> also possibly legally undistributable (as they are
+>> non-modifiable, but actually modified). The combination with the
+>> rest of nx-libs-lite (which is GPL-licensed) may also be legally
+>> undistributable (since the license with no permission to modify
+>> is GPL-incompatible).
+>> 
+>> 
+>> If there's anything I misunderstood, please clarify.
+>> 
+>> Otherwise, please address this issue as soon as possible. The
+>> copyright owners for the original DXPC code should be contacted
+>> and persuaded to re-license under GPL-compatible terms.
+>> 
+>> Thanks for your time. Bye.
+> 
+> I/we will investigate this asap. Thanks for bringing this up.
+> 
+> Greets, Mike
+> 
+> 
+> _______________________________________________ x2go-dev mailing
+> list x2go-dev@lists.x2go.org 
+> http://lists.x2go.org/listinfo/x2go-dev
+> 
+
+
+- -- 
+BAUR-ITCS UG (haftungsbeschränkt)
+Geschäftsführer: Stefan Baur
+Eichenäckerweg 10, 89081 Ulm | Registergericht Ulm, HRB 724364
+Fon/Fax 0731 40 34 66-36/-35 | USt-IdNr.: DE268653243
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJVUHRuAAoJEG7d9BjNvlEZsCYH/i0GArfIg0xNQ91srhMtMxVf
+NcaQ5uOJLLZ+e0WOcRMm5Kprg9f6uKQNFRo1dv9NCFNxjrpdR/5/LMmeSYxafIQA
+beoYbnuMMRBvcjoUN5ScGD/jjng/9VCiwviBVjUc6AhDebGjVone2OtaIXPoMELI
+ClKnDShC41qQpSUgEESUYHiIIptkkmSrIJS6Ostsby5rhT1mApv7ulBqVvADUKCX
+OtNZmG+O6Bvur63G2fBTrdQwZAed0+Q6/XlhfOkf5QNG4I9fd5KlrMDpSmO8w7Cm
+h4rVnveLS5+0afZXs9sImhNW4I7Ah8zh5sAUFNCGXEuO60XRRysUO4i1WjRgnZw=
+=sgsA
+-----END PGP SIGNATURE-----
+
+
+
+From mike.gabriel@das-netzwerkteam.de Mon May 11 09:26:40 2015
+Received: (at 784565) by bugs.debian.org; 11 May 2015 09:26:40 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-11.9 required=4.0 tests=BAYES_00,FOURLA,
+	HAS_BUG_NUMBER,PGPSIGNATURE,T_RP_MATCHES_RCVD autolearn=ham
+	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 15; hammy, 150; neutral, 246; spammy,
+	0. spammytokens: hammytokens:0.000-+--H*c:pgp-signature,
+	0.000-+--H*c:protocol, 0.000-+--H*c:micalg, 0.000-+--H*c:signed,
+	0.000-+--H*RU:sk:grimnir
+Return-path: <mike.gabriel@das-netzwerkteam.de>
+Received: from freya.das-netzwerkteam.de ([88.198.48.199])
+	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
+	(Exim 4.80)
+	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
+	id 1Yrjyx-0003n8-Sv
+	for 784565@bugs.debian.org; Mon, 11 May 2015 09:26:40 +0000
+Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
+	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id B938DE53;
+	Mon, 11 May 2015 11:26:37 +0200 (CEST)
+Received: from localhost (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 564F73C20D;
+	Mon, 11 May 2015 11:26:37 +0200 (CEST)
+X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
+Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
+	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id zA86M1U+gj03; Mon, 11 May 2015 11:26:37 +0200 (CEST)
+Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPS id E81223BF5A;
+	Mon, 11 May 2015 11:26:36 +0200 (CEST)
+Received: from bifrost.das-netzwerkteam.de (bifrost.das-netzwerkteam.de
+ [178.62.101.154]) by mail.das-netzwerkteam.de (Horde Framework) with HTTP;
+ Mon, 11 May 2015 09:26:36 +0000
+Date: Mon, 11 May 2015 09:26:36 +0000
+Message-ID: <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+To: "Francesco Poli (wintermute)" <invernomuto@paranoici.org>,
+ 784565@bugs.debian.org
+Cc: x2go-dev@lists.x2go.org, nito.martinez@qindel.com,
+ opensource@gznianguan.com
+Subject: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are derived
+ from non-free code
+In-Reply-To: <20150506173532.7531.31389.reportbug@homebrew>
+User-Agent: Internet Messaging Program (IMP) H5 (6.2.2)
+Accept-Language: de,en
+Organization: DAS-NETZWERKTEAM
+X-Originating-IP: 178.62.101.154
+X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:32.0) Gecko/20100101
+ Firefox/32.0 Iceweasel/32.0
+Content-Type: multipart/signed; boundary="=_8dL5yJABYXdTfUqhzQkNVg1";
+ protocol="application/pgp-signature"; micalg=pgp-sha1
+MIME-Version: 1.0
+
+This message is in MIME format and has been PGP signed.
+
+--=_8dL5yJABYXdTfUqhzQkNVg1
+Content-Type: text/plain; charset=us-ascii; format=flowed; DelSp=Yes
+Content-Disposition: inline
+Content-Transfer-Encoding: quoted-printable
+
+Hi Francesco,
+
+On  Mi 06 Mai 2015 19:35:32 CEST, Francesco Poli (wintermute) wrote:
+
+> Package: nx-libs-lite
+> Version: 3.5.0.27-1
+> Severity: serious
+> Justification: Policy 2.2.1
+>
+> Hello and thanks for maintaining this package in Debian!
+>
+> I noticed that the debian/copyright states:
+>
+> [...]
+> | Parts of this software are derived from DXPC project. These copyright
+> | notices apply to original DXPC code:
+> |
+> |    Redistribution and use in source and binary forms are permitted prov=
+ided
+> |    that the above copyright notice and this paragraph are duplicated in=
+ all
+> |    such forms.
+> |
+> |    THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLI=
+ED
+> |    WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+> |    MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+> |
+> |    Copyright (c) 1995,1996 Brian Pane
+> |    Copyright (c) 1996,1997 Zachary Vonler and Brian Pane
+> |    Copyright (c) 1999 Kevin Vigor and Brian Pane
+> |    Copyright (c) 2000,2001 Gian Filippo Pinzari and Brian Pane
+> [...]
+>
+> This license lacks the permission to modify the DXPC code.
+> Hence, the original DXPC code does not appear to comply with the
+> DFSG. And the nx-libs-lite is in part derived from DXPC code.
+>
+> This basically means that nx-libs-lite includes parts which are
+> non-free (as they are derived from non-modifiable code) and
+> are also possibly legally undistributable (as they are non-modifiable,
+> but actually modified). The combination with the rest of nx-libs-lite
+> (which is GPL-licensed) may also be legally undistributable (since
+> the license with no permission to modify is GPL-incompatible).
+>
+>
+> If there's anything I misunderstood, please clarify.
+>
+> Otherwise, please address this issue as soon as possible.
+> The copyright owners for the original DXPC code should be
+> contacted and persuaded to re-license under GPL-compatible
+> terms.
+>
+> Thanks for your time.
+> Bye.
+
+Please follow-up with reading [1].
+
+As it seems, dxpc has been long ago relicensed to BSD-2-clause (for=20=20
+v3.8.1=20in/around 2002).
+
+I have no exact clue, if NoMachine forked prior to that (if they quote=20=
+=20
+the=20old licensing terms, then probably they did).
+
+However, how do you see the situation considering that upstream=20=20
+changed=20to BSD-2-clause a long time ago. What approach do you propose=20=
+=20
+for=20nx-libs-lite to get the issue fully fixed?
+
+Mike
+
+[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=3D142028
+
+--=20
+
+DAS-NETZWERKTEAM
+mike=20gabriel, herweg 7, 24357 fleckeby
+fon: +49 (1520) 1976 148
+
+GnuPG Key ID 0x25771B31
+mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
+
+freeBusy:
+https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x=
+fb
+
+--=_8dL5yJABYXdTfUqhzQkNVg1
+Content-Type: application/pgp-signature
+Content-Description: Digitale PGP-Signatur
+Content-Disposition: inline
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJVUHXMAAoJEJr0azAldxsxls4P/RyFv6ghemJhfrHNbAUEDmNz
+kyY2Q4Jt6pIDXX3U3yThYCeyG1nVAwKJI2B/q7q/YWWdzea8RzTTXrj3DubYplOZ
+PatD30FhlKdL+rsohmLFrA5dHVcwFbJA4GqrR2Y8y6NSLEtifYE4EDIDKLqvX6Dy
+msvHyLl+3AXg2gR4Wmu9lOLC8MrPA3A7nwlw/wCa6kwf3i6FUsAB2nzUsj3yUX1f
+4iXzcZhjGCJli9otPLlYFjPuc0HjwBgoOx5tEOL1hgVYP+yiQCw24LOKwHTnDogZ
+ONio1VdS+VPUbhVTlBfYD29lSDO8pgBGk43325b7Bmo56Ica+HCr8TznMVASidvJ
+dbAXZQOMuHxBofP9sm89q2lIXjPmJFWspG76OEM8dAIMKo87gQNuOTNPuOK0Zj8T
+Ua+40fIc5/C7CyRgGO8wqb6dYjD4Q6HxbjSQJrlxsHdjKIozv+MXGV+if/bKSXM8
+tIAh9JzcwgYtRVlVQXCmpk+yP9DntWFs5WeOEGBqKZw+was5OSXSlpjukNn9us2a
+bWj0E84zMlIu61KVZ8ot14OMIzgUxzymIt/LzWHKiiSezb20S22LJGBaKLxbqplp
+9Gi8g9rEhjn5Pgpt9B3MlIWQTKhpAa71GCD9Okt9vhPsBiKE57fSjCYgQR83lhDy
+kbLoUbByjixBA+TXUYM8
+=NW/2
+-----END PGP SIGNATURE-----
+
+--=_8dL5yJABYXdTfUqhzQkNVg1--
+
+
+
+
+From invernomuto@paranoici.org Mon May 11 19:37:54 2015
+Received: (at 784565) by bugs.debian.org; 11 May 2015 19:37:54 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-11.5 required=4.0 tests=BAYES_00,DKIM_SIGNED,
+	DKIM_VALID,DKIM_VALID_AU,FOURLA,HAS_BUG_NUMBER,MDO_CABLE_TV3,PGPSIGNATURE,
+	SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no
+	version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 9; hammy, 150; neutral, 119; spammy,
+	0. spammytokens: hammytokens:0.000-+--H*UA:sk:x86_64-,
+	0.000-+--H*x:sk:x86_64-, 0.000-+--H*c:PGP-SHA256, 0.000-+--H*c:SignHturH,
+	0.000-+--H*c:pgp-signature
+Return-path: <invernomuto@paranoici.org>
+Received: from perdizione.investici.org ([94.23.50.208])
+	by buxtehude.debian.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256)
+	(Exim 4.80)
+	(envelope-from <invernomuto@paranoici.org>)
+	id 1YrtWT-0004t9-Ty
+	for 784565@bugs.debian.org; Mon, 11 May 2015 19:37:54 +0000
+Received: from [94.23.50.208] (perdizione [94.23.50.208]) (Authenticated sender: invernomuto@paranoici.org) by localhost (Postfix) with ESMTPSA id 9C4DF120408;
+	Mon, 11 May 2015 19:37:46 +0000 (UTC)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paranoici.org;
+	s=stigmate; t=1431373066;
+	bh=vGWv2ZFJgWpWShHOYFcPN0r6i8IFunsxG5IJHqxpdbk=;
+	h=Date:From:To:Cc:Subject:In-Reply-To:References;
+	b=JQRMmMDPSZFkJ21FEn1TdsCco0YtUFBII0CsMLxdl3mxM5SzGN9flVttwlZ+5RrgR
+	 a7/u/VUVPzv0ZcdVKwrC+Nq6imwd5hzUj80C+e6KLZQoovz6shmhuIdKtga2OIl7lm
+	 cF0ONDqjdq0pI158Ws5hz0MiwJkzF6V5VbIEk3SY=
+Received: from frx by homebrew with local (Exim 4.85)
+	(envelope-from <invernomuto@paranoici.org>)
+	id 1YrtVj-0001Cl-NV; Mon, 11 May 2015 21:37:07 +0200
+Date: Mon, 11 May 2015 21:36:59 +0200
+From: Francesco Poli <invernomuto@paranoici.org>
+To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Cc: 784565@bugs.debian.org, x2go-dev@lists.x2go.org,
+ nito.martinez@qindel.com, opensource@gznianguan.com
+Subject: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are derived
+ from non-free code
+Message-Id: <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
+In-Reply-To: <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
+References: <20150506173532.7531.31389.reportbug@homebrew>
+	<20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
+X-Mailer: Sylpheed 3.5.0beta1 (GTK+ 2.24.25; x86_64-pc-linux-gnu)
+Mime-Version: 1.0
+Content-Type: multipart/signed; protocol="application/pgp-signature";
+ micalg="PGP-SHA256";
+ boundary="Signature=_Mon__11_May_2015_21_36_59_+0200_DweA9EbdD2ISBmUH"
+
+--Signature=_Mon__11_May_2015_21_36_59_+0200_DweA9EbdD2ISBmUH
+Content-Type: text/plain; charset=US-ASCII
+Content-Disposition: inline
+Content-Transfer-Encoding: quoted-printable
+
+On Mon, 11 May 2015 09:26:36 +0000 Mike Gabriel wrote:
+
+[...]
+> As it seems, dxpc has been long ago relicensed to BSD-2-clause (for =20
+> v3.8.1 in/around 2002).
+
+This is great news, indeed!
+
+>=20
+> I have no exact clue, if NoMachine forked prior to that (if they quote =20
+> the old licensing terms, then probably they did).
+
+Yep, it's plausible...
+
+>=20
+> However, how do you see the situation considering that upstream =20
+> changed to BSD-2-clause a long time ago. What approach do you propose =20
+> for nx-libs-lite to get the issue fully fixed?
+
+If the fork has been performed before the DXPC re-licensing (as it's
+likely), I see two possible strategies:
+
+ (A) someone gets in touch with DXPC copyright owners and asks them
+whether the re-licensing may be considered retroactive (applicable to
+older versions of DXPC); in case the answer is negative, DXPC copyright
+owners should be persuaded to make the re-licensing retroactive
+
+ (B) nx-libs-lite upstream developers re-fork from scratch, basing the
+new code on a BSD-licensed version of DXPC (I suspect this may turn out
+to be somewhat painful...)
+
+
+Obviously, the optimal solution is (A). I hope it may work...
+
+Thanks for your time and for your prompt and kind replies.
+
+
+--=20
+ http://www.inventati.org/frx/
+ There's not a second to spare! To the laboratory!
+..................................................... Francesco Poli .
+ GnuPG key fpr =3D=3D CA01 1147 9CD2 EFDF FB82  3925 3E1C 27E1 1F69 BFFE
+
+--Signature=_Mon__11_May_2015_21_36_59_+0200_DweA9EbdD2ISBmUH
+Content-Type: application/pgp-signature
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVUQTgAAoJED4cJ+Efab/+Mx4QAMLmPwqnPYyI0Bl6sZgxP3nA
+Yfrf7m2+swTrNz3M2xNepx1KoylRNlz2DiCuG7QWABNupSK60ACtIuAvWIAPSYNt
+wlHDRGiVrpCKBKzB4N3zjB0MN1VELhdWqrap8Yw5nnwohJ2jXoAUaqorwEba6YBg
+VK1BsGvlqcwSYt8eWt+ugpaRR43DbZTCpAvBn3t9DdYe8LwtlJDTCatbJfovlTJ9
+P19TNbwxiEoj8uWbmpOO/kLvvMed0avTEsvgAROQKF/dnWCnB1dh5QGd06IHdAY7
+KfnoZc4HUM8BB/ylWsaV13Cd8UA/2B2FKp3xbab3ry8gWeMe6dnk/pFa+pv6TGeT
+I+6VxWOMT/hc4AwBOl+R7yqp2AkcNO+KP2o5i04+yENcbgrGxyCQU2aVsHkJsVYi
+N5myXypSZY3tF6TnAm/UYP2GgiMCo0FXptwVoLiGSJkBw0tn13I25pYSqjYZlq4q
+4RQYuTEHEkV16tCdEdy+DSuI0GsABYUkY3a3A3TLj9LjiPPEDwLOxHjZlLbeyXP+
+xtmC3d82YvMmLXUiqItuhiBYjCRFq8piGGCDRX7wp1B+t6xHUcR8UV5O4s554iMX
++r2m1mLzM285PoKwP/Smd6BXU5RfhT4svmxvaMSSvADNo8X4ddNd2Hiq/Gib2ftH
+mYKFpBE7IMwQqfrOpAW5
+=Bt09
+-----END PGP SIGNATURE-----
+
+--Signature=_Mon__11_May_2015_21_36_59_+0200_DweA9EbdD2ISBmUH--
+
+
+
+From mike.gabriel@das-netzwerkteam.de Tue May 12 03:59:27 2015
+Received: (at 784565) by bugs.debian.org; 12 May 2015 03:59:27 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-11.4 required=4.0 tests=BAYES_00,FOURLA,
+	HAS_BUG_NUMBER,MDO_CABLE_TV3,PGPSIGNATURE,T_RP_MATCHES_RCVD autolearn=ham
+	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 21; hammy, 150; neutral, 206; spammy,
+	0. spammytokens: hammytokens:0.000-+--H*c:pgp-signature,
+	0.000-+--H*c:protocol, 0.000-+--H*c:micalg, 0.000-+--H*c:signed,
+	0.000-+--H*RU:sk:grimnir
+Return-path: <mike.gabriel@das-netzwerkteam.de>
+Received: from freya.das-netzwerkteam.de ([88.198.48.199])
+	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
+	(Exim 4.80)
+	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
+	id 1Ys1Lq-0000j4-Sf
+	for 784565@bugs.debian.org; Tue, 12 May 2015 03:59:27 +0000
+Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
+	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id B4F9BAA3;
+	Tue, 12 May 2015 05:59:21 +0200 (CEST)
+Received: from localhost (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 299233C21D;
+	Tue, 12 May 2015 05:59:21 +0200 (CEST)
+X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
+Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
+	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id G2j6l6YtFs0q; Tue, 12 May 2015 05:59:21 +0200 (CEST)
+Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPS id C67023BF5A;
+	Tue, 12 May 2015 05:59:20 +0200 (CEST)
+Received: from p5B3B925B.dip0.t-ipconnect.de (p5B3B925B.dip0.t-ipconnect.de
+ [91.59.146.91]) by mail.das-netzwerkteam.de (Horde Framework) with HTTP;
+ Tue, 12 May 2015 03:59:20 +0000
+Date: Tue, 12 May 2015 03:59:20 +0000
+Message-ID: <20150512035920.Horde.JnI2DWx-AAFvzpbQFqakJw3@mail.das-netzwerkteam.de>
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+To: Francesco Poli <invernomuto@paranoici.org>
+Cc: 784565@bugs.debian.org, x2go-dev@lists.x2go.org,
+ nito.martinez@qindel.com, opensource@gznianguan.com
+Subject: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are derived
+ from non-free code
+References: <20150506173532.7531.31389.reportbug@homebrew>
+ <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
+ <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
+In-Reply-To: <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
+User-Agent: Internet Messaging Program (IMP) H5 (6.2.2)
+Accept-Language: de,en
+Organization: DAS-NETZWERKTEAM
+X-Originating-IP: 91.59.146.91
+X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:32.0) Gecko/20100101
+ Firefox/32.0 Iceweasel/32.0
+Content-Type: multipart/signed; boundary="=_kYZkQgyfaSLUTLVIkzgq8w1";
+ protocol="application/pgp-signature"; micalg=pgp-sha1
+MIME-Version: 1.0
+
+This message is in MIME format and has been PGP signed.
+
+--=_kYZkQgyfaSLUTLVIkzgq8w1
+Content-Type: text/plain; charset=us-ascii; format=flowed; DelSp=Yes
+Content-Disposition: inline
+Content-Transfer-Encoding: quoted-printable
+
+Hi Francesco,
+
+On  Mo 11 Mai 2015 21:36:59 CEST, Francesco Poli wrote:
+
+> On Mon, 11 May 2015 09:26:36 +0000 Mike Gabriel wrote:
+>
+> [...]
+>> As it seems, dxpc has been long ago relicensed to BSD-2-clause (for
+>> v3.8.1 in/around 2002).
+>
+> This is great news, indeed!
+>
+>>
+>> I have no exact clue, if NoMachine forked prior to that (if they quote
+>> the old licensing terms, then probably they did).
+>
+> Yep, it's plausible...
+>
+>>
+>> However, how do you see the situation considering that upstream
+>> changed to BSD-2-clause a long time ago. What approach do you propose
+>> for nx-libs-lite to get the issue fully fixed?
+>
+> If the fork has been performed before the DXPC re-licensing (as it's
+> likely), I see two possible strategies:
+>
+>  (A) someone gets in touch with DXPC copyright owners and asks them
+> whether the re-licensing may be considered retroactive (applicable to
+> older versions of DXPC); in case the answer is negative, DXPC copyright
+> owners should be persuaded to make the re-licensing retroactive
+
+This is the way to go, I will pull in Kevin Vigor (the upstream author=20=
+=20
+of=20DXPC) into this thread with my next email.
+
+>  (B) nx-libs-lite upstream developers re-fork from scratch, basing the
+> new code on a BSD-licensed version of DXPC (I suspect this may turn out
+> to be somewhat painful...)
+
+Yeah, indeed painful.
+
+> Obviously, the optimal solution is (A). I hope it may work...
+>
+> Thanks for your time and for your prompt and kind replies.
+
+Also, Michael DePaulo, one of the upstream NX maintainers noted that=20=20
+DXPC=20simply used a previous version of the BSD license, see [1]. The=20=
+=20
+weakness=20of that ancient license template is that modification is not=20=
+=20
+explictily=20allowed, but neither forbidden.
+
+I think, regarding the historical usage of the BSD license predecessor=20=
+=20
+and=20the switch to BSD-2-clause should be fine already (I am not a=20=20
+lawyer,=20though). I will contact DXPC upstream nonetheless and ask for=20=
+=20
+a=20statement.
+
+Greets,
+Mike
+
+[1] http://en.wikipedia.org/wiki/BSD_licenses#Previous_license
+
+--=20
+
+DAS-NETZWERKTEAM
+mike=20gabriel, herweg 7, 24357 fleckeby
+fon: +49 (1520) 1976 148
+
+GnuPG Key ID 0x25771B31
+mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
+
+freeBusy:
+https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x=
+fb
+
+--=_kYZkQgyfaSLUTLVIkzgq8w1
+Content-Type: application/pgp-signature
+Content-Description: Digitale PGP-Signatur
+Content-Disposition: inline
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIbBAABAgAGBQJVUXqYAAoJEJr0azAldxsxYVAP+Pg4A2zg6TEs+vk/mknbLwV2
+dOv/tQiarKfb6JJRcm1j6rzGBhGzO4iwj/Uk8wmbFvIJgxs6mM93kfOPa0lJYM1N
+D0YcKPPsHqgxcyVW8pIyawhnW5IsIDSaugjsandx1hbfl+J5SBCAtSovhz5F+Fkf
+fs1wvgYcGKtWGNTxV5Qy48EnzSzAVz2r4GKBYUdRiCNpXtl/M8jJFIfm/cmJ7PJq
+ycY8Diu6x3mVvPdvap/0pOOY0uqg256XX7dcFJUtTNZoai4oGOuwR1o4g9jztyd/
+4JJ2E1MigAjGSYPpTnQGhORA86yDLQrk/NlLG/2/J8meG7Nsky6xmf3zBhuG/0G0
+3TZYQcoFrFS3EWQs0uKiGKGylchODCfXHZgF0y5NT5iqr4DMT51AlUeQl3MWhxf8
+j8OMjK86jsPMrSjL0l4uYbs+znMdlVpgjBSYsKoXg3tIc3WJpj77qyPUbfwO8hys
+5Q2j4lDaGV5NAnSmZ//p9lPwRu8oAMwSkrMkRTaJwLVhcmDzgoujZEpEPj64lIEy
+HD3p/5dSJF+RsYT6286JkWAZm+XvXeFpEqGZ7xAVsrYSY1qFm3g0se1oHxxcVWyN
+PEsQBOt8WXgYmtz7RLaBDbBQVMmeRMxbPCkC1xCHCU+Vq3y9dW/3TyOW4Oz1YoZR
+3YATO+YehUKVdM5teyg=
+=884K
+-----END PGP SIGNATURE-----
+
+--=_kYZkQgyfaSLUTLVIkzgq8w1--
+
+
+
+
+From mike.gabriel@das-netzwerkteam.de Tue May 12 04:46:43 2015
+Received: (at 784565) by bugs.debian.org; 12 May 2015 04:46:44 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-11.4 required=4.0 tests=BAYES_00,FOURLA,
+	HAS_BUG_NUMBER,MDO_CABLE_TV3,PGPSIGNATURE,T_RP_MATCHES_RCVD autolearn=ham
+	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 27; hammy, 149; neutral, 375; spammy,
+	1. spammytokens:0.998-1--arctica hammytokens:0.000-+--IIRC,
+	0.000-+--H*c:pgp-signature, 0.000-+--H*c:protocol, 0.000-+--H*c:micalg,
+	0.000-+--H*c:signed
+Return-path: <mike.gabriel@das-netzwerkteam.de>
+Received: from freya.das-netzwerkteam.de ([88.198.48.199])
+	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
+	(Exim 4.80)
+	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
+	id 1Ys25b-0004lf-4r
+	for 784565@bugs.debian.org; Tue, 12 May 2015 04:46:43 +0000
+Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
+	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id 6AB7617F5;
+	Tue, 12 May 2015 06:46:40 +0200 (CEST)
+Received: from localhost (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 71D923BC0D;
+	Tue, 12 May 2015 06:46:38 +0200 (CEST)
+X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
+Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
+	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id TYvbPGLabTH7; Tue, 12 May 2015 06:46:38 +0200 (CEST)
+Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPS id 0669F3BA08;
+	Tue, 12 May 2015 06:46:38 +0200 (CEST)
+Received: from p5B3B925B.dip0.t-ipconnect.de (p5B3B925B.dip0.t-ipconnect.de
+ [91.59.146.91]) by mail.das-netzwerkteam.de (Horde Framework) with HTTP;
+ Tue, 12 May 2015 04:46:37 +0000
+Date: Tue, 12 May 2015 04:46:37 +0000
+Message-ID: <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+To: Kevin Vigor <kevin@vigor.nu>
+Cc: 784565@bugs.debian.org, x2go-dev@lists.x2go.org,
+ nito.martinez@qindel.com, opensource@gznianguan.com, Francesco Poli
+ <invernomuto@paranoici.org>
+Subject: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are derived
+ from non-free code
+References: <20150506173532.7531.31389.reportbug@homebrew>
+ <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
+ <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
+In-Reply-To: <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
+User-Agent: Internet Messaging Program (IMP) H5 (6.2.2)
+Accept-Language: de,en
+Organization: DAS-NETZWERKTEAM
+X-Originating-IP: 91.59.146.91
+X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:32.0) Gecko/20100101
+ Firefox/32.0 Iceweasel/32.0
+Content-Type: multipart/signed; boundary="=_9zX_XixEpAdR4NT64zJguA1";
+ protocol="application/pgp-signature"; micalg=pgp-sha1
+MIME-Version: 1.0
+
+This message is in MIME format and has been PGP signed.
+
+--=_9zX_XixEpAdR4NT64zJguA1
+Content-Type: text/plain; charset=us-ascii; format=flowed; DelSp=Yes
+Content-Disposition: inline
+Content-Transfer-Encoding: quoted-printable
+
+Dear Kevin,
+
+(I Cc: several people involved in this, also the X2Go development=20=20
+mailing=20list...)
+
+[If you feel unconfortable with discussing the details / the impact of=20=
+=20
+the=20below in public, feel free to answer to me directly first with=20=20
+questions=20and concerns, before answering to all people who are listed=20=
+=20
+in=20Cc:.]
+
+Someone from the Debian legal team recently brought up a license issue=20=
+=20
+discovered=20in nx-libs 3.x series.
+
+TL;DR; Suggested by Francesco Poli from the Debian legal team: """
+(A) someone gets in touch with DXPC copyright owners and asks them
+whether the re-licensing [in 2002] may be considered retroactive=20=20
+(applicable=20to
+older versions of DXPC); in case the answer is negative, DXPC copyright
+owners should be persuaded to make the re-licensing retroactive
+"""
+
+The person contacting you about the above question is me. Mike=20=20
+Gabriel,=20Debian Developer and one of the current upstream maintainers=20=
+=20
+of=20nx-libs 3.x (previously also know as  "NX redistributed" for X2Go)=20=
+=20
+[1].
+
+This=20issue requires some time of reading from you and (hopefully) a=20=20
+public=20statement, that the original DXPC code can be considered as=20=20
+BSD-2-clause=20(the current license) also for released versions prior=20=20
+2002=20when the ancient BSD license template [2] was still shipped with=20=
+=20
+DXPC.
+
+For=20a complete follow-up, please check Debian bug #784565 [3].
+
+We are aware that NoMachine forked DXPC at some early stage around the=20=
+=20
+year=202000 and wrote their own commercial product around it. Obviously,=20=
+=20
+this=20fork happened before 2002 (i.e., before DXPC release 3.8.1), as=20=
+=20
+libxcomp3=20in NoMachine's NX ships the previously used BSD license=20=20
+template.=20I am not sure, if that fork was easy for you or actually a=20=
+=20
+nuisance.=20I may only guess at this point. I'd be happy to know more=20=20
+(maybe=20not in this mail thread, though).
+
+NoMachine has stopped publishing NXv3 updates a couple of years ago=20=20
+(2011=20IIRC), now. The maintenance has been moved into the hands of the=20=
+=20
+currently=20available FLOSS projects "X2Go", "Arctica Project" [NEW] and=20=
+=20
+"TheQVD".=20Some of us are running a business model on top of that=20=20
+(consultancy,=20support contracts, feature development contracts), some=20=
+=20
+of=20us spend a lot of their free time on improving / maintaining=20=20
+nx-libs=20(as we call NoMachine's NXv3 at the moment).
+
+To outline the impact of my mail clearly: If you say that it was not=20=20
+legal=20by NoMachine to fork DXPC at the given time (before 2002), then=20=
+=20
+all=20FLOSS remote desktop / remote application would be in real=20=20
+trouble,=20because then the core component of their software projects=20=20
+could=20not be considered as free (as in DFSG, Debian free software=20=20
+guidelines[4])=20anymore. Also the code changes originally performed by=20=
+=20
+NoMachine=20might have been illegal in the first place. All current=20=20
+maintenance=20activities and also planned future development on nx-libs=20=
+=20
+would=20become questionable.
+
+Thus, I hope you can chime in on this: Dear developers of nx-libs,=20=20
+please=20assume the BSD-2-license as retroactive and applicable to DXPC=20=
+=20
+version=20earlier than 3.8.1. As the copyright holder, I agree with=20=20
+modifications=20of code bases that originate before the change to=20=20
+BSD-2-clause=20license got introduced in 3.8.1 of DXPC.
+
+And... I will bring up that question later (but it is burning under my=20=
+=20
+nails)...=20Be sure: The nx-libs maintainers would be happy to have the=20=
+=20
+original=20DXPC author on the nx-libs developer team. But I will bring=20=
+=20
+up=20that question later (when this very issue is settled). ;-)
+
+Greets,
+Mike
+
+[1] https://github.com/ArcticaProject/nx-libs
+[2] http://en.wikipedia.org/wiki/BSD_licenses#Previous_license
+[3] http://bugs.debian.org/784565
+[4] http://de.wikipedia.org/wiki/Debian_Free_Software_Guidelines
+
+On  Mo 11 Mai 2015 21:36:59 CEST, Francesco Poli wrote:
+
+> On Mon, 11 May 2015 09:26:36 +0000 Mike Gabriel wrote:
+>
+> [...]
+>> As it seems, dxpc has been long ago relicensed to BSD-2-clause (for
+>> v3.8.1 in/around 2002).
+>
+> This is great news, indeed!
+>
+>>
+>> I have no exact clue, if NoMachine forked prior to that (if they quote
+>> the old licensing terms, then probably they did).
+>
+> Yep, it's plausible...
+>
+>>
+>> However, how do you see the situation considering that upstream
+>> changed to BSD-2-clause a long time ago. What approach do you propose
+>> for nx-libs-lite to get the issue fully fixed?
+>
+> If the fork has been performed before the DXPC re-licensing (as it's
+> likely), I see two possible strategies:
+>
+>  (A) someone gets in touch with DXPC copyright owners and asks them
+> whether the re-licensing may be considered retroactive (applicable to
+> older versions of DXPC); in case the answer is negative, DXPC copyright
+> owners should be persuaded to make the re-licensing retroactive
+>
+>  (B) nx-libs-lite upstream developers re-fork from scratch, basing the
+> new code on a BSD-licensed version of DXPC (I suspect this may turn out
+> to be somewhat painful...)
+>
+>
+> Obviously, the optimal solution is (A). I hope it may work...
+>
+> Thanks for your time and for your prompt and kind replies.
+
+
+--=20
+
+DAS-NETZWERKTEAM
+mike=20gabriel, herweg 7, 24357 fleckeby
+fon: +49 (1520) 1976 148
+
+GnuPG Key ID 0x25771B31
+mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
+
+freeBusy:
+https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x=
+fb
+
+--=_9zX_XixEpAdR4NT64zJguA1
+Content-Type: application/pgp-signature
+Content-Description: Digitale PGP-Signatur
+Content-Disposition: inline
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJVUYWtAAoJEJr0azAldxsxEMcP/0mjNHW4k/IiNjSbrm1j7pIQ
+k6yVqJ8cMW/71H0/VLuzS6roL02JAXMzToMzAcbPGqeV5rjhLDJNjcOuuADhb8HI
+Izisai5ABzHiclnITalVTsF4i5+MsTXI+6eNez9sv3Es8pwFuLkvAlqKsheO33mP
+dz83ZqDmCGKcCCbZmhbhGHdhScS8GMSyU7cBm6xu0TMh8rOtcECBG/+wfohVeR2I
+vy0GeYR0ZF0yIxcBGXYvjiocStjsxaqnD9QCt8JAfewVO3jY/Ye6DIEI92moS/Nz
+6iTA9GspZyYNqL7QsOraG2HF6TmIfK5xBaUjDrLH+HfKm2K6Dxp0wo6Y6VDY9mIi
+svCFCoIQ3RBihcsOp7k1v1eZl+WJJ2XXilQr3SrtlOiZAK0/FtbkUwhk4DLu5o3R
+CBHwy6F14szo8F4ChFGqqbOlODGJOiCONfOShRZQLgAgHciRirrgTKF4b25cspNU
+v7ag47K4WN3YNtkA5DO5Bj2NKAP8oWyvlTpO0uIuUZo/pj+7sHnWG8QSDJiyunVt
+3VxMLM4h3C02k+EtR2uvtKKqVFf+JgiwRGDhFx2ldUwWFg0+3IeWKuuTxRt6NcR+
+ZdDN2tR0PWpe4v+jsUqSD3YJNRoK1oyj9kMYriTkHTvhr/XcKr5KYNsWMC6nvqps
+JDhKCpypB1iR9N13NpeX
+=HDe/
+-----END PGP SIGNATURE-----
+
+--=_9zX_XixEpAdR4NT64zJguA1--
+
+
+
+
+From kevin@vigor.nu Tue May 12 15:07:38 2015
+Received: (at 784565) by bugs.debian.org; 12 May 2015 15:07:38 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-6.4 required=4.0 tests=BAYES_00,FOURLA,
+	HAS_BUG_NUMBER,MDO_CABLE_TV3,SPF_PASS autolearn=ham autolearn_force=no
+	version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 34; hammy, 150; neutral, 395; spammy,
+	0. spammytokens: hammytokens:0.000-+--IIRC, 0.000-+--H*f:sk:2015050,
+	0.000-+--H*UA:31.0, 0.000-+--H*u:31.0, 0.000-+--H*u:x86_64
+Return-path: <kevin@vigor.nu>
+Received: from gateway30.websitewelcome.com ([192.185.184.48])
+	by buxtehude.debian.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256)
+	(Exim 4.80)
+	(envelope-from <kevin@vigor.nu>)
+	id 1YsBmT-0007o6-Qg
+	for 784565@bugs.debian.org; Tue, 12 May 2015 15:07:38 +0000
+Received: by gateway30.websitewelcome.com (Postfix, from userid 500)
+	id 69AEB573DA20; Tue, 12 May 2015 09:55:02 -0500 (CDT)
+Received: from gator4058.hostgator.com (gator4058.hostgator.com [192.185.4.69])
+	by gateway30.websitewelcome.com (Postfix) with ESMTP id 677E2573DA04
+	for <784565@bugs.debian.org>; Tue, 12 May 2015 09:55:02 -0500 (CDT)
+Received: from [63.158.132.10] (port=46206 helo=[10.50.3.84])
+	by gator4058.hostgator.com with esmtpsa (UNKNOWN:DHE-RSA-AES128-SHA:128)
+	(Exim 4.82)
+	(envelope-from <kevin@vigor.nu>)
+	id 1YsBaH-0003xr-Ii; Tue, 12 May 2015 09:55:01 -0500
+Message-ID: <55521444.9090407@vigor.nu>
+Date: Tue, 12 May 2015 08:55:00 -0600
+From: Kevin Vigor <kevin@vigor.nu>
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0
+MIME-Version: 1.0
+To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+CC: 784565@bugs.debian.org, x2go-dev@lists.x2go.org, 
+ nito.martinez@qindel.com, opensource@gznianguan.com, 
+ Francesco Poli <invernomuto@paranoici.org>
+Subject: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are derived
+ from non-free code
+References: <20150506173532.7531.31389.reportbug@homebrew> <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de> <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org> <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
+In-Reply-To: <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
+Content-Type: text/plain; charset=windows-1252; format=flowed
+Content-Transfer-Encoding: 7bit
+X-AntiAbuse: This header was added to track abuse, please include it with any abuse report
+X-AntiAbuse: Primary Hostname - gator4058.hostgator.com
+X-AntiAbuse: Original Domain - bugs.debian.org
+X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12]
+X-AntiAbuse: Sender Address Domain - vigor.nu
+X-BWhitelist: no
+X-Source-IP: 63.158.132.10
+X-Exim-ID: 1YsBaH-0003xr-Ii
+X-Source: 
+X-Source-Args: 
+X-Source-Dir: 
+X-Source-Sender: ([10.50.3.84]) [63.158.132.10]:46206
+X-Source-Auth: kevin@vigor.nu
+X-Email-Count: 2
+X-Source-Cap: a3ZpZ29yO2t2aWdvcjtnYXRvcjQwNTguaG9zdGdhdG9yLmNvbQ==
+X-Greylist: delayed 379 seconds by postgrey-1.34 at buxtehude; Tue, 12 May 2015 15:07:37 UTC
+
+Hi Mike, et al,
+
+    I am not the original author of dxpc, that being Brian Pane. However, I took over maintenance circa 1999 and am still the primary maintainer (though the project has effectively been dead for most of a decade now).
+
+    As you are aware, when I inherited the code, it was licensed under a variant of the BSD license that did not include the 'with modification' clause. To the best of my recollection, somebody from the FSF contacted me circa 2001 regarding this and as a result, subsequent releases were done under a standard 2-clause BSD license with the modification clause. Again, to the best of my recollection, I contacted Brian about this change and he offered no objection.
+
+    Further, I recall distinctly that NoMachine contacted me and explicitly asked permission before including DXPC code in NX, which I happily granted with no new conditions beyond the BSD license already in play.
+
+    It is possible, though by no means certain, that I could dig up ancient email to corroborate this account if necessary. However, I am more than willing to publicly state that I believe NoMachine's use of DXPC code to be both legal and ethical, and that my intent when changing the license to 2-clause BSD was simply to clarity the existing intent and that it ought therefore be considered retroactive.
+
+    Yours,
+       Kevin Vigor
+
+On 05/11/15 22:46, Mike Gabriel wrote:
+> Dear Kevin,
+>
+> (I Cc: several people involved in this, also the X2Go development mailing list...)
+>
+> [If you feel unconfortable with discussing the details / the impact of the below in public, feel free to answer to me directly first with questions and concerns, before answering to all people who are listed in Cc:.]
+>
+> Someone from the Debian legal team recently brought up a license issue discovered in nx-libs 3.x series.
+>
+> TL;DR; Suggested by Francesco Poli from the Debian legal team: """
+> (A) someone gets in touch with DXPC copyright owners and asks them
+> whether the re-licensing [in 2002] may be considered retroactive (applicable to
+> older versions of DXPC); in case the answer is negative, DXPC copyright
+> owners should be persuaded to make the re-licensing retroactive
+> """
+>
+> The person contacting you about the above question is me. Mike Gabriel, Debian Developer and one of the current upstream maintainers of nx-libs 3.x (previously also know as  "NX redistributed" for X2Go) [1].
+>
+> This issue requires some time of reading from you and (hopefully) a public statement, that the original DXPC code can be considered as BSD-2-clause (the current license) also for released versions prior 2002 when the ancient BSD license template [2] was still shipped with DXPC.
+>
+> For a complete follow-up, please check Debian bug #784565 [3].
+>
+> We are aware that NoMachine forked DXPC at some early stage around the year 2000 and wrote their own commercial product around it. Obviously, this fork happened before 2002 (i.e., before DXPC release 3.8.1), as libxcomp3 in NoMachine's NX ships the previously used BSD license template. I am not sure, if that fork was easy for you or actually a nuisance. I may only guess at this point. I'd be happy to know more (maybe not in this mail thread, though).
+>
+> NoMachine has stopped publishing NXv3 updates a couple of years ago (2011 IIRC), now. The maintenance has been moved into the hands of the currently available FLOSS projects "X2Go", "Arctica Project" [NEW] and "TheQVD". Some of us are running a business model on top of that (consultancy, support contracts, feature development contracts), some of us spend a lot of their free time on improving / maintaining nx-libs (as we call NoMachine's NXv3 at the moment).
+>
+> To outline the impact of my mail clearly: If you say that it was not legal by NoMachine to fork DXPC at the given time (before 2002), then all FLOSS remote desktop / remote application would be in real trouble, because then the core component of their software projects could not be considered as free (as in DFSG, Debian free software guidelines[4]) anymore. Also the code changes originally performed by NoMachine might have been illegal in the first place. All current maintenance activities and also planned future development on nx-libs would become questionable.
+>
+> Thus, I hope you can chime in on this: Dear developers of nx-libs, please assume the BSD-2-license as retroactive and applicable to DXPC version earlier than 3.8.1. As the copyright holder, I agree with modifications of code bases that originate before the change to BSD-2-clause license got introduced in 3.8.1 of DXPC.
+>
+> And... I will bring up that question later (but it is burning under my nails)... Be sure: The nx-libs maintainers would be happy to have the original DXPC author on the nx-libs developer team. But I will bring up that question later (when this very issue is settled). ;-)
+>
+> Greets,
+> Mike
+>
+> [1] https://github.com/ArcticaProject/nx-libs
+> [2] http://en.wikipedia.org/wiki/BSD_licenses#Previous_license
+> [3] http://bugs.debian.org/784565
+> [4] http://de.wikipedia.org/wiki/Debian_Free_Software_Guidelines
+>
+> On  Mo 11 Mai 2015 21:36:59 CEST, Francesco Poli wrote:
+>
+>> On Mon, 11 May 2015 09:26:36 +0000 Mike Gabriel wrote:
+>>
+>> [...]
+>>> As it seems, dxpc has been long ago relicensed to BSD-2-clause (for
+>>> v3.8.1 in/around 2002).
+>>
+>> This is great news, indeed!
+>>
+>>>
+>>> I have no exact clue, if NoMachine forked prior to that (if they quote
+>>> the old licensing terms, then probably they did).
+>>
+>> Yep, it's plausible...
+>>
+>>>
+>>> However, how do you see the situation considering that upstream
+>>> changed to BSD-2-clause a long time ago. What approach do you propose
+>>> for nx-libs-lite to get the issue fully fixed?
+>>
+>> If the fork has been performed before the DXPC re-licensing (as it's
+>> likely), I see two possible strategies:
+>>
+>>  (A) someone gets in touch with DXPC copyright owners and asks them
+>> whether the re-licensing may be considered retroactive (applicable to
+>> older versions of DXPC); in case the answer is negative, DXPC copyright
+>> owners should be persuaded to make the re-licensing retroactive
+>>
+>>  (B) nx-libs-lite upstream developers re-fork from scratch, basing the
+>> new code on a BSD-licensed version of DXPC (I suspect this may turn out
+>> to be somewhat painful...)
+>>
+>>
+>> Obviously, the optimal solution is (A). I hope it may work...
+>>
+>> Thanks for your time and for your prompt and kind replies.
+>
+>
+
+
+
+
+From mike.gabriel@das-netzwerkteam.de Tue May 12 15:42:13 2015
+Received: (at 784565) by bugs.debian.org; 12 May 2015 15:42:13 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-6.4 required=4.0 tests=BAYES_00,FOURLA,
+	HAS_BUG_NUMBER,MDO_CABLE_TV3,T_RP_MATCHES_RCVD autolearn=ham
+	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 28; hammy, 150; neutral, 444; spammy,
+	0. spammytokens: hammytokens:0.000-+--IIRC, 0.000-+--H*RU:sk:grimnir,
+	0.000-+--H*r:sk:grimnir, 0.000-+--H*RU:78.46.204.98,
+	0.000-+--H*RU:88.198.48.199
+Return-path: <mike.gabriel@das-netzwerkteam.de>
+Received: from freya.das-netzwerkteam.de ([88.198.48.199])
+	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
+	(Exim 4.80)
+	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
+	id 1YsCJx-0003Fj-12
+	for 784565@bugs.debian.org; Tue, 12 May 2015 15:42:13 +0000
+Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
+	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id AB2291F6
+	for <784565@bugs.debian.org>; Tue, 12 May 2015 17:42:08 +0200 (CEST)
+Received: from localhost (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 0899C3BFDA
+	for <784565@bugs.debian.org>; Tue, 12 May 2015 17:42:08 +0200 (CEST)
+X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
+Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
+	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id tKjFu527nUiq for <784565@bugs.debian.org>;
+	Tue, 12 May 2015 17:42:07 +0200 (CEST)
+Received: from localhost (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 558633C022
+	for <784565@bugs.debian.org>; Tue, 12 May 2015 17:42:07 +0200 (CEST)
+Received: from localhost (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 1F4393BFDA
+	for <784565@bugs.debian.org>; Tue, 12 May 2015 17:42:07 +0200 (CEST)
+Received: from [10.215.43.89] (unknown [46.115.20.43])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPSA id 867C23BA87;
+	Tue, 12 May 2015 17:42:02 +0200 (CEST)
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Reply-To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+To: Kevin Vigor <kevin@vigor.nu>
+Cc: 784565@bugs.debian.org, x2go-dev@lists.x2go.org, nito.martinez@qindel.com,  opensource@gznianguan.com, Francesco Poli <invernomuto@paranoici.org>
+Subject: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are derived
+	from non-free code
+X-Mailer: Modest 3.2
+References: <20150506173532.7531.31389.reportbug@homebrew>
+	 <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
+	 <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
+	 <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
+	  <55521444.9090407@vigor.nu>
+In-Reply-To: <55521444.9090407@vigor.nu>
+Content-Type: text/plain; charset=utf-8
+Content-ID: <1431445315.4712.6.camel@Nokia-N900>
+Date: Tue, 12 May 2015 17:41:55 +0200
+Message-Id: <1431445315.4712.7.camel@Nokia-N900>
+Mime-Version: 1.0
+Content-Transfer-Encoding: 8bit
+
+Hi Kevin,
+
+thanks for your feedback. Let us wait for Francesco, our expert on license issues, and see what he thinks about your feedback.
+
+Thank you very much for providing info and sharing pieces of nx-libs's history.
+
+As you sent your reply to the Debian bug tracker already, this will public statement enough, I guess.
+
+Thanks a lot,
+Mike
+
+-- 
+
+DAS-NETZWERKTEAM
+mike gabriel, herweg 7, 24357 fleckeby
+fon: +49 (1520) 1976148
+
+GnuPG Key ID 0x25771B13
+mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
+
+
+----- Original message -----
+> Hi Mike, et al,
+> 
+>         I am not the original author of dxpc, that being Brian Pane.
+> However, I took over maintenance circa 1999 and am still the primary
+> maintainer (though the project has effectively been dead for most of a
+> decade now).
+> 
+>         As you are aware, when I inherited the code, it was licensed under a
+> variant of the BSD license that did not include the 'with modification'
+> clause. To the best of my recollection, somebody from the FSF contacted
+> me circa 2001 regarding this and as a result, subsequent releases were
+> done under a standard 2-clause BSD license with the modification clause.
+> Again, to the best of my recollection, I contacted Brian about this
+> change and he offered no objection.
+> 
+>         Further, I recall distinctly that NoMachine contacted me and
+> explicitly asked permission before including DXPC code in NX, which I
+> happily granted with no new conditions beyond the BSD license already in
+> play.
+> 
+>         It is possible, though by no means certain, that I could dig up
+> ancient email to corroborate this account if necessary. However, I am
+> more than willing to publicly state that I believe NoMachine's use of
+> DXPC code to be both legal and ethical, and that my intent when changing
+> the license to 2-clause BSD was simply to clarity the existing intent
+> and that it ought therefore be considered retroactive.
+> 
+>         Yours,
+>               Kevin Vigor
+> 
+> On 05/11/15 22:46, Mike Gabriel wrote:
+> > Dear Kevin,
+> > 
+> > (I Cc: several people involved in this, also the X2Go development
+> > mailing list...)
+> > 
+> > [If you feel unconfortable with discussing the details / the impact of
+> > the below in public, feel free to answer to me directly first with
+> > questions and concerns, before answering to all people who are listed
+> > in Cc:.]
+> > 
+> > Someone from the Debian legal team recently brought up a license issue
+> > discovered in nx-libs 3.x series.
+> > 
+> > TL;DR; Suggested by Francesco Poli from the Debian legal team: """
+> > (A) someone gets in touch with DXPC copyright owners and asks them
+> > whether the re-licensing [in 2002] may be considered retroactive
+> > (applicable to older versions of DXPC); in case the answer is
+> > negative, DXPC copyright owners should be persuaded to make the
+> > re-licensing retroactive """
+> > 
+> > The person contacting you about the above question is me. Mike
+> > Gabriel, Debian Developer and one of the current upstream maintainers
+> > of nx-libs 3.x (previously also know as   "NX redistributed" for X2Go)
+> > [1].
+> > 
+> > This issue requires some time of reading from you and (hopefully) a
+> > public statement, that the original DXPC code can be considered as
+> > BSD-2-clause (the current license) also for released versions prior
+> > 2002 when the ancient BSD license template [2] was still shipped with
+> > DXPC.
+> > 
+> > For a complete follow-up, please check Debian bug #784565 [3].
+> > 
+> > We are aware that NoMachine forked DXPC at some early stage around the
+> > year 2000 and wrote their own commercial product around it. Obviously,
+> > this fork happened before 2002 (i.e., before DXPC release 3.8.1), as
+> > libxcomp3 in NoMachine's NX ships the previously used BSD license
+> > template. I am not sure, if that fork was easy for you or actually a
+> > nuisance. I may only guess at this point. I'd be happy to know more
+> > (maybe not in this mail thread, though).
+> > 
+> > NoMachine has stopped publishing NXv3 updates a couple of years ago
+> > (2011 IIRC), now. The maintenance has been moved into the hands of the
+> > currently available FLOSS projects "X2Go", "Arctica Project" [NEW] and
+> > "TheQVD". Some of us are running a business model on top of that
+> > (consultancy, support contracts, feature development contracts), some
+> > of us spend a lot of their free time on improving / maintaining
+> > nx-libs (as we call NoMachine's NXv3 at the moment).
+> > 
+> > To outline the impact of my mail clearly: If you say that it was not
+> > legal by NoMachine to fork DXPC at the given time (before 2002), then
+> > all FLOSS remote desktop / remote application would be in real
+> > trouble, because then the core component of their software projects
+> > could not be considered as free (as in DFSG, Debian free software
+> > guidelines[4]) anymore. Also the code changes originally performed by
+> > NoMachine might have been illegal in the first place. All current
+> > maintenance activities and also planned future development on nx-libs
+> > would become questionable.
+> > 
+> > Thus, I hope you can chime in on this: Dear developers of nx-libs,
+> > please assume the BSD-2-license as retroactive and applicable to DXPC
+> > version earlier than 3.8.1. As the copyright holder, I agree with
+> > modifications of code bases that originate before the change to
+> > BSD-2-clause license got introduced in 3.8.1 of DXPC.
+> > 
+> > And... I will bring up that question later (but it is burning under my
+> > nails)... Be sure: The nx-libs maintainers would be happy to have the
+> > original DXPC author on the nx-libs developer team. But I will bring
+> > up that question later (when this very issue is settled). ;-)
+> > 
+> > Greets,
+> > Mike
+> > 
+> > [1] https://github.com/ArcticaProject/nx-libs
+> > [2] http://en.wikipedia.org/wiki/BSD_licenses#Previous_license
+> > [3] http://bugs.debian.org/784565
+> > [4] http://de.wikipedia.org/wiki/Debian_Free_Software_Guidelines
+> > 
+> > On   Mo 11 Mai 2015 21:36:59 CEST, Francesco Poli wrote:
+> > 
+> > > On Mon, 11 May 2015 09:26:36 +0000 Mike Gabriel wrote:
+> > > 
+> > > [...]
+> > > > As it seems, dxpc has been long ago relicensed to BSD-2-clause (for
+> > > > v3.8.1 in/around 2002).
+> > > 
+> > > This is great news, indeed!
+> > > 
+> > > > 
+> > > > I have no exact clue, if NoMachine forked prior to that (if they
+> > > > quote the old licensing terms, then probably they did).
+> > > 
+> > > Yep, it's plausible...
+> > > 
+> > > > 
+> > > > However, how do you see the situation considering that upstream
+> > > > changed to BSD-2-clause a long time ago. What approach do you
+> > > > propose for nx-libs-lite to get the issue fully fixed?
+> > > 
+> > > If the fork has been performed before the DXPC re-licensing (as it's
+> > > likely), I see two possible strategies:
+> > > 
+> > > (A) someone gets in touch with DXPC copyright owners and asks them
+> > > whether the re-licensing may be considered retroactive (applicable to
+> > > older versions of DXPC); in case the answer is negative, DXPC
+> > > copyright owners should be persuaded to make the re-licensing
+> > > retroactive
+> > > 
+> > > (B) nx-libs-lite upstream developers re-fork from scratch, basing the
+> > > new code on a BSD-licensed version of DXPC (I suspect this may turn
+> > > out to be somewhat painful...)
+> > > 
+> > > 
+> > > Obviously, the optimal solution is (A). I hope it may work...
+> > > 
+> > > Thanks for your time and for your prompt and kind replies.
+> > 
+> > 
+> 
+
+
+
+
+From invernomuto@paranoici.org Tue May 12 21:42:01 2015
+Received: (at 784565) by bugs.debian.org; 12 May 2015 21:42:01 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-12.0 required=4.0 tests=BAYES_00,DKIM_SIGNED,
+	DKIM_VALID,DKIM_VALID_AU,FOURLA,HAS_BUG_NUMBER,PGPSIGNATURE,SPF_HELO_PASS,
+	SPF_PASS autolearn=ham autolearn_force=no
+	version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 15; hammy, 150; neutral, 119; spammy,
+	0. spammytokens: hammytokens:0.000-+--H*UA:sk:x86_64-,
+	0.000-+--H*x:sk:x86_64-, 0.000-+--H*c:PGP-SHA256, 0.000-+--H*c:SignHturH,
+	0.000-+--H*c:pgp-signature
+Return-path: <invernomuto@paranoici.org>
+Received: from perdizione.investici.org ([94.23.50.208])
+	by buxtehude.debian.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256)
+	(Exim 4.80)
+	(envelope-from <invernomuto@paranoici.org>)
+	id 1YsHw8-0008Hh-DT
+	for 784565@bugs.debian.org; Tue, 12 May 2015 21:42:01 +0000
+Received: from [94.23.50.208] (perdizione [94.23.50.208]) (Authenticated sender: invernomuto@paranoici.org) by localhost (Postfix) with ESMTPSA id 9E73512097E;
+	Tue, 12 May 2015 21:41:55 +0000 (UTC)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paranoici.org;
+	s=stigmate; t=1431466915;
+	bh=w0yVuJLtWq+0cj6zbjNb4THkJk0Xq3N9SMQ1+u0ZZnk=;
+	h=Date:From:To:Cc:Subject:In-Reply-To:References;
+	b=RRQcr33uMGnEaupGoWl0nXectE2hPbUghdie73/SnVp5Ax5QWxqK90ic5VPUE7RsN
+	 RsJ6HcYccQEzYLzm37W24u9eQZFa+Oc1CZaJBvFgOg9MAvh6tHaLUgOuFGkYXhn5R0
+	 Nlq5WHCpVKi9YvGfj/aAtfe84CJPt2HIKAqPXb5w=
+Received: from frx by homebrew with local (Exim 4.85)
+	(envelope-from <invernomuto@paranoici.org>)
+	id 1YsHvP-00019Q-D1; Tue, 12 May 2015 23:41:15 +0200
+Date: Tue, 12 May 2015 23:40:48 +0200
+From: Francesco Poli <invernomuto@paranoici.org>
+To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Cc: Kevin Vigor <kevin@vigor.nu>, 784565@bugs.debian.org,
+ x2go-dev@lists.x2go.org, nito.martinez@qindel.com,
+ opensource@gznianguan.com
+Subject: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are derived
+ from non-free code
+Message-Id: <20150512234048.054319a449ffadcf87577425@paranoici.org>
+In-Reply-To: <1431445315.4712.7.camel@Nokia-N900>
+References: <20150506173532.7531.31389.reportbug@homebrew>
+	<20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
+	<20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
+	<20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
+	<55521444.9090407@vigor.nu>
+	<1431445315.4712.7.camel@Nokia-N900>
+X-Mailer: Sylpheed 3.5.0beta1 (GTK+ 2.24.25; x86_64-pc-linux-gnu)
+Mime-Version: 1.0
+Content-Type: multipart/signed; protocol="application/pgp-signature";
+ micalg="PGP-SHA256";
+ boundary="Signature=_Tue__12_May_2015_23_40_48_+0200_KqpLAiCdvC+4zCCk"
+
+--Signature=_Tue__12_May_2015_23_40_48_+0200_KqpLAiCdvC+4zCCk
+Content-Type: text/plain; charset=US-ASCII
+Content-Disposition: inline
+Content-Transfer-Encoding: quoted-printable
+
+On Tue, 12 May 2015 17:41:55 +0200 Mike Gabriel wrote:
+
+> Hi Kevin,
+
+Hello Mike, hello Kevin, hello to all the other recipients.
+
+First of all, I wish to express my gratitude to Kevin for his prompt,
+kind and generous response.
+
+>=20
+> thanks for your feedback. Let us wait for Francesco, our expert on licens=
+e issues, and see what he thinks about your feedback.
+
+I think that this is an important first step to solve this issue for
+the best.
+Kevin Vigor is one of the copyright owners of the code that was forked
+before the re-licensing.
+We now know that he intended the re-licensing to be retroactive and
+this is really good.
+
+I think that now it would be useful to ascertain that the other
+copyright owners (Brian Pane, Zachary Vonler, Gian Filippo Pinzari) are
+also OK with this interpretation of the re-licensing operation.
+
+Maybe Kevin is able to dig the original conversations (assuming they
+were carried on by e-mail or similar archived means) or otherwise to
+get in touch with them and check? Or, alternatively, Kevin could help
+Mike to get in touch with them?
+
+I hope everything may be settled for the best soon.
+Thanks a lot to everyone involved.
+
+
+
+--=20
+ http://www.inventati.org/frx/
+ There's not a second to spare! To the laboratory!
+..................................................... Francesco Poli .
+ GnuPG key fpr =3D=3D CA01 1147 9CD2 EFDF FB82  3925 3E1C 27E1 1F69 BFFE
+
+--Signature=_Tue__12_May_2015_23_40_48_+0200_KqpLAiCdvC+4zCCk
+Content-Type: application/pgp-signature
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVUnNlAAoJED4cJ+Efab/+CBQP/33+SjLcIk2VZbjeeyCxhCAo
+kmgg9BDtqce1Dy22ONotywDNQ187suqlmkEa6yAAdglB0M3CYMFKSIsZHn2C0uGb
+B45HnzXE7PJd/j/WOXuCIvDe70iGJ7Ubk16DCjyRuKsF70cr2DcsbieiwZh8Wi4v
+GXNOxpm5Nv2bs1vQnRzYFc7GLWny3eCqcWF23XisqvxQecOHopoGWr9F6NuS5ymz
+NQ8Z7eanEPaqE86GYFIqJyt9Wcz+fM2r1d/IrNmYaTVBJPrqndQKnXJAViwYhtaM
+V8+CIKDuttcIYMto9dyE9+vr6wgtDyepVatQIHyVA2LpzR9jub8MGelXMdA7em3i
+/H3gz3H/tQti3T3HoHu+4CSAEWsXdtkHq2RWU9k3+HQuWB00z7WDr404xzs7k2Wg
+h6VR9c+VjV92KnMvDqWjE4VBYjrn6Ag5u/0Cf6HMx5RAGFNL8ROjOGbQSskfUogo
+GnWX2b8yLIe8ojg3AVowWV2oKVlWzsjZVHH9lp0M/lqGmnPVEJk0mh6DKbZPjK8O
+P2dpZ8IlSa18R2CvMWnf7HXKRR/s2ef7rUmBkT2sFnTwsT5PeDSU45/7ZuWbNIpw
+8/Y5q38c36Axeng1J0OCR8YX47dH0PubVnBzYEqoun3GucR1jifOiNzWLyM2ZxNe
+0JSSqn5ddFC8/iuGpFDI
+=ZqCl
+-----END PGP SIGNATURE-----
+
+--Signature=_Tue__12_May_2015_23_40_48_+0200_KqpLAiCdvC+4zCCk--
+
+
+
+From niels@thykier.net Wed May 13 16:04:21 2015
+Received: (at control) by bugs.debian.org; 13 May 2015 16:04:21 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-3.9 required=4.0 tests=BAYES_00,DKIM_SIGNED,
+	DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H4,
+	RCVD_IN_MSPIKE_WL autolearn=ham autolearn_force=no
+	version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 6; hammy, 61; neutral, 18; spammy, 0.
+	spammytokens: hammytokens:0.000-+--H*u:devscripts, 0.000-+--H*u:bts,
+	0.000-+--H*UA:bts, 0.000-+--H*UA:devscripts, 0.000-+--H*MI:thykier
+Return-path: <niels@thykier.net>
+Received: from mailrelay11.public.one.com ([195.47.247.189])
+	by buxtehude.debian.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256)
+	(Exim 4.80)
+	(envelope-from <niels@thykier.net>)
+	id 1YsZ8u-0002Ch-RD
+	for control@bugs.debian.org; Wed, 13 May 2015 16:04:21 +0000
+X-HalOne-Cookie: 4652f81fa62fa9da4dd9249e7484054c41bc782d
+X-HalOne-ID: b22b9887-f989-11e4-950a-b82a72d06996
+DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple;
+	d=thykier.net; s=20140924;
+	h=from:subject:date:message-id:to;
+	bh=EysymZxJFEX8N6fIBUIaFmFP7WdtVLf5PrmWzWVb22Y=;
+	b=Ur7nNbvtl3pu7O1YKIHwSM8MHIW+JPWJKM1GBE23FB4sLbENnBM2V0rmU5++qyolEv7hHAhvKkWFO
+	 lH4tbbHCyoYVdUE76nRT/1HEb5/X+pxjrsC1qTXWWXkekbuLNcDwIl0+WdVVEd5B4LYpW7igVWi4AH
+	 XncGXx/MNYDQvFiU=
+Received: from thykier.net (unknown [80.62.116.219])
+	by smtpfilter3.public.one.com (Halon Mail Gateway) with ESMTPSA
+	for <control@bugs.debian.org>; Wed, 13 May 2015 16:04:12 +0000 (GMT)
+Received: by thykier.net (Postfix, from userid 1000)
+	id 985EB4BB; Wed, 13 May 2015 18:04:10 +0200 (CEST)
+From: Niels Thykier <niels@thykier.net>
+To: control@bugs.debian.org
+Subject: tagging 784565
+Date: Wed, 13 May 2015 18:04:10 +0200
+User-Agent: devscripts bts/2.15.4
+Message-ID: <1431533050-371-bts-niels@thykier.net>
+Delivered-To: control@bugs.debian.org
+
+# distributable
+tags 784565 + jessie-ignore
+thanks
+
+
+
+
+From mike.gabriel@das-netzwerkteam.de Thu May 14 04:58:16 2015
+Received: (at 784565) by bugs.debian.org; 14 May 2015 04:58:16 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-11.9 required=4.0 tests=BAYES_00,FOURLA,
+	HAS_BUG_NUMBER,PGPSIGNATURE,T_RP_MATCHES_RCVD autolearn=ham
+	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 22; hammy, 150; neutral, 339; spammy,
+	0. spammytokens: hammytokens:0.000-+--H*c:pgp-signature,
+	0.000-+--H*c:protocol, 0.000-+--H*c:micalg, 0.000-+--H*c:signed,
+	0.000-+--H*RU:sk:grimnir
+Return-path: <mike.gabriel@das-netzwerkteam.de>
+Received: from freya.das-netzwerkteam.de ([88.198.48.199])
+	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
+	(Exim 4.80)
+	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
+	id 1YslDr-0000NV-Ur
+	for 784565@bugs.debian.org; Thu, 14 May 2015 04:58:16 +0000
+Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
+	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id A03C82B5;
+	Thu, 14 May 2015 06:58:11 +0200 (CEST)
+Received: from localhost (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id E89E93BD2E;
+	Thu, 14 May 2015 06:58:10 +0200 (CEST)
+X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
+Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
+	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id 5m6G8sqwjlfJ; Thu, 14 May 2015 06:58:10 +0200 (CEST)
+Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPS id 5713E3BB3A;
+	Thu, 14 May 2015 06:58:10 +0200 (CEST)
+Received: from bifrost.das-netzwerkteam.de (bifrost.das-netzwerkteam.de
+ [178.62.101.154]) by mail.das-netzwerkteam.de (Horde Framework) with HTTP;
+ Thu, 14 May 2015 04:58:10 +0000
+Date: Thu, 14 May 2015 04:58:09 +0000
+Message-ID: <20150514045809.Horde.-3NIZzBnA5V5B6a721F2kg2@mail.das-netzwerkteam.de>
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+To: Francesco Poli <invernomuto@paranoici.org>
+Cc: Kevin Vigor <kevin@vigor.nu>, 784565@bugs.debian.org,
+ x2go-dev@lists.x2go.org, nito.martinez@qindel.com, opensource@gznianguan.com
+Subject: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are derived
+ from non-free code
+References: <20150506173532.7531.31389.reportbug@homebrew>
+ <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
+ <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
+ <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
+ <55521444.9090407@vigor.nu> <1431445315.4712.7.camel@Nokia-N900>
+ <20150512234048.054319a449ffadcf87577425@paranoici.org>
+In-Reply-To: <20150512234048.054319a449ffadcf87577425@paranoici.org>
+User-Agent: Internet Messaging Program (IMP) H5 (6.2.2)
+Accept-Language: de,en
+Organization: DAS-NETZWERKTEAM
+X-Originating-IP: 178.62.101.154
+X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:32.0) Gecko/20100101
+ Firefox/32.0 Iceweasel/32.0
+Content-Type: multipart/signed; boundary="=_SHoEHYV8bfary9lJHYP1lQ1";
+ protocol="application/pgp-signature"; micalg=pgp-sha1
+MIME-Version: 1.0
+
+This message is in MIME format and has been PGP signed.
+
+--=_SHoEHYV8bfary9lJHYP1lQ1
+Content-Type: text/plain; charset=us-ascii; format=flowed; DelSp=Yes
+Content-Disposition: inline
+Content-Transfer-Encoding: quoted-printable
+
+Hi all,
+
+there has been an off-list mail exchange between Francesco and Kevin=20=20
+(and=20me in Cc:) which I will quote at the end of this mail (as it was=20=
+=20
+not=20meant to be private and we should fully document the flow on this=20=
+=20
+issue).
+
+@Kevin:=20I will take you off this mail thread's Cc: field with my next=20=
+=20
+post.=20Feel free to follow-up via #784565 [1] on the Debian bug=20=20
+tracker.=20Thanks a lot for being so responsive and generous with=20=20
+providing=20information.
+
+On  Di 12 Mai 2015 23:40:48 CEST, Francesco Poli wrote:
+
+> On Tue, 12 May 2015 17:41:55 +0200 Mike Gabriel wrote:
+
+> I think that now it would be useful to ascertain that the other
+> copyright owners (Brian Pane, Zachary Vonler, Gian Filippo Pinzari) are
+> also OK with this interpretation of the re-licensing operation.
+
+As stated by Kevin, Gian Filippo worked/works on the NoMachine side. I=20=
+=20
+will=20include him in Cc:.
+
+For Brian Pane we also found and e-Mail address, for Zach Vonler, I=20=20
+will=20use the mail address provided in DXPC code (which might be=20=20
+outdated),=20but I think I actually have found his phone number on the=20=
+=20
+web,=20so if that mail address bounces I will give him a ring.
+
+> Maybe Kevin is able to dig the original conversations (assuming they
+> were carried on by e-mail or similar archived means) or otherwise to
+> get in touch with them and check? Or, alternatively, Kevin could help
+
+As stated in the forwarded messages below, Kevin was unable to dig out=20=
+=20
+any=20mails from backups. So we switch to plan B: contact Brian, Zach=20=20
+and=20Gian Filippo.
+
+> Mike to get in touch with them?
+
+I will do that.
+
+> I hope everything may be settled for the best soon.
+> Thanks a lot to everyone involved.
+
+/me, too.
+
+light+love
+Mike
+
+[1] http://bugs.debian.org/784565
+
+
+----- Weitergeleitete Nachricht von Kevin Vigor <kevin@vigor.nu> -----
+   Datum: Wed, 13 May 2015 09:01:27 -0600
+     Von: Kevin Vigor <kevin@vigor.nu>
+Betreff: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are=20=20
+derived=20from non-free code
+      An: Francesco Poli <invernomuto@paranoici.org>
+      Cc: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+On 05/12/15 15:40, Francesco Poli wrote:
+
+> Maybe Kevin is able to dig the original conversations (assuming they
+> were carried on by e-mail or similar archived means) or otherwise to
+> get in touch with them and check? Or, alternatively, Kevin could help
+> Mike to get in touch with them?
+
+I'm afraid I was not able to dig anything out of old backups last=20=20
+night.=20I still have a stack of CDs to look through, but don't hold=20=20
+your=20breath. Sorry about that.
+
+I have never had any contact with Zachary Vonler or Gian Filippo=20=20
+Pinzari,=20and have not spoken with Brian Pane in many years, so I have=20=
+=20
+no=20recent contact information for any of them. However, a quick google=20=
+=20
+turns=20up:
+
+https://www.linkedin.com/profile/view?id=3D728859
+http://www.brianp.net/contact/
+
+which is almost certainly the right Brian Pane (he was at CNet at the=20=20
+proper=20time).
+
+
+    Good luck,
+          Kevin
+
+----- Ende der weitergeleiteten Nachricht -----
+
+----- Weitergeleitete Nachricht von Francesco Poli=20=20
+<invernomuto@paranoici.org>=20-----
+   Datum: Wed, 13 May 2015 19:43:44 +0200
+     Von: Francesco Poli <invernomuto@paranoici.org>
+Betreff: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are=20=20
+derived=20from non-free code
+      An: Kevin Vigor <kevin@vigor.nu>
+      Cc: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+On Wed, 13 May 2015 09:01:27 -0600 Kevin Vigor wrote:
+
+> On 05/12/15 15:40, Francesco Poli wrote:
+>
+> > Maybe Kevin is able to dig the original conversations (assuming they
+> > were carried on by e-mail or similar archived means) or otherwise to
+> > get in touch with them and check? Or, alternatively, Kevin could help
+> > Mike to get in touch with them?
+>
+> I'm afraid I was not able to dig anything out of old backups last=20=20
+>=20night. I still have a stack of CDs to look through, but don't hold=20=
+=20
+>=20your breath. Sorry about that.
+
+Thanks a lot for searching: this is really appreciated, at least from
+my side.
+
+>
+> I have never had any contact with Zachary Vonler or Gian Filippo Pinzari,
+
+Then I wonder how it was possible to re-license DXPC in 2002...
+:-|
+
+> and have not spoken with Brian Pane in many years, so I have no recent
+contact information for any of them. However, a quick google turns up:
+>
+> https://www.linkedin.com/profile/view?id=3D728859
+> http://www.brianp.net/contact/
+>
+> which is almost certainly the right Brian Pane (he was at CNet at=20=20
+>=20the proper time).
+
+This could be really useful, thank you very much!
+
+Mike, I hope the search may go on from there: Brian should be asked
+about the retroactive nature of the re-licensing of DXPC and maybe he
+also knows how to get in touch with Zachary and/or Gian Filippo...
+
+
+P.S.: Kevin, any special reason why you dropped several addresses from
+the Cc list? Should this part of our conversation be kept private for
+the time being? Please clarify. Thanks!
+
+----- Ende der weitergeleiteten Nachricht -----
+
+----- Weitergeleitete Nachricht von Kevin Vigor <kevin@vigor.nu> -----
+   Datum: Wed, 13 May 2015 14:08:48 -0600
+     Von: Kevin Vigor <kevin@vigor.nu>
+Betreff: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are=20=20
+derived=20from non-free code
+      An: Francesco Poli <invernomuto@paranoici.org>
+      Cc: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+On 05/13/15 11:43, Francesco Poli wrote:
+> On Wed, 13 May 2015 09:01:27 -0600 Kevin Vigor wrote:
+
+>> I have never had any contact with Zachary Vonler or Gian Filippo Pinzari=
+,
+>
+> Then I wonder how it was possible to re-license DXPC in 2002...
+> :-|
+>
+
+I believe Gian worked on the NoMachine code; he has never contributed=20=20
+to=20DXPC directly.
+
+Zachary Vonler was allegedly the maintainer of DXPC for a while circa=20=20
+1999,=20but never responded to any email when I attempted to contact=20=20
+him,=20which is how I came to take over maintenance.
+
+
+> P.S.: Kevin, any special reason why you dropped several addresses from
+> the Cc list? Should this part of our conversation be kept private for
+> the time being? Please clarify. Thanks!
+
+No, I was just trying to keep from spamming email lists unnecessarily.=20=
+=20
+I=20do not consider any part of this conversation private.
+
+----- Ende der weitergeleiteten Nachricht -----
+
+----- Weitergeleitete Nachricht von Francesco Poli=20=20
+<invernomuto@paranoici.org>=20-----
+   Datum: Wed, 13 May 2015 22:50:32 +0200
+     Von: Francesco Poli <invernomuto@paranoici.org>
+Betreff: Re: [pkg-x2go-devel] Bug#784565: nx-libs-lite: parts are=20=20
+derived=20from non-free code
+      An: Kevin Vigor <kevin@vigor.nu>
+      Cc: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+On Wed, 13 May 2015 14:08:48 -0600 Kevin Vigor wrote:
+
+> On 05/13/15 11:43, Francesco Poli wrote:
+> > On Wed, 13 May 2015 09:01:27 -0600 Kevin Vigor wrote:
+>
+> >> I have never had any contact with Zachary Vonler or Gian Filippo Pinza=
+ri,
+> >
+> > Then I wonder how it was possible to re-license DXPC in 2002...
+> > :-|
+> >
+>
+> I believe Gian worked on the NoMachine code; he has never=20=20
+>=20contributed to DXPC directly.
+
+Good, then only Zachary has to be tracked down.
+
+>
+> Zachary Vonler was allegedly the maintainer of DXPC for a while=20=20
+>=20circa 1999, but never responded to any email when I attempted to=20=20
+>=20contact him, which is how I came to take over maintenance.
+
+Let's hope Brian is able to help Mike in getting in touch with
+Zachary...
+
+>
+>
+> > P.S.: Kevin, any special reason why you dropped several addresses from
+> > the Cc list? Should this part of our conversation be kept private for
+> > the time being? Please clarify. Thanks!
+>
+> No, I was just trying to keep from spamming email lists=20=20
+>=20unnecessarily. I do not consider any part of this conversation=20=20
+>=20private.
+>
+
+OK, thanks for clarifying.
+
+----- Ende der weitergeleiteten Nachricht -----
+
+--=20
+
+DAS-NETZWERKTEAM
+mike gabriel, herweg 7, 24357 fleckeby
+fon: +49 (1520) 1976 148
+
+GnuPG Key ID 0x25771B31
+mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
+
+freeBusy:
+https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x=
+fb
+
+--=_SHoEHYV8bfary9lJHYP1lQ1
+Content-Type: application/pgp-signature
+Content-Description: Digitale PGP-Signatur
+Content-Disposition: inline
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJVVCthAAoJEJr0azAldxsx3KUP/2997X9KnhVEedREGxsuqvQn
+Dp5oGK2JPf0Z2MZui1FVehvakoHQD0MuhpVs7ZktnshwNvAgxyhW5esC617a9gsz
+jJvaJz0S0MPHfSM4Dz8Yg2t0u0DpueVZBpOeDOlt9W9ECXkpe2YPk5AOialHwTPX
+OP5KKfMSLEGFreUL7U0WeetC/To5zm54Ivx1a0wx2I+HdPJ0YXTxIC7JvUSNejFE
+0+yhK1thXf38juOeb2pxTvRQXcj1IoDMRSc0k7KHeNGmP1NF38fh1illPlBABG1u
+wa3hn+1uMe3+On8LJkDtIHtsXrR2RUuOP+0FbI4rTRo5SOeVFNRSl1ldp2ywl8rQ
+9WkK623cuurOydsHjj+fIlcb7GN/OgrTay8VRS3jUjy9tlQ7PCpF5W1m7kMPHrCP
+nh6/hUa6ep8qE+86dosQS4FxvOgSHOEpbNZ8ulEib/ClHr9wsnWpjxQtvRnZsBTl
+PAIXKvdiHUCgyfs4efSWYtR8QUJTYmPDrGr2V8jWAtzZOo6NSa09c2Yc2OxLRDpP
+HBGVSLUOrocvbb3wPAgnsogxtYCpzo/ga1Rnx2LdIfLNaTv62sek+nHqJzICqtcH
+SdMajeJTVksKQCmHqIQS7C2V44cDYizTe9exZIl75OKT6TDujuW/KZiPQK6VCCNv
+eEgOxmCOHlc8YLLz0dEP
+=N9IW
+-----END PGP SIGNATURE-----
+
+--=_SHoEHYV8bfary9lJHYP1lQ1--
+
+
+
+
+From mike.gabriel@das-netzwerkteam.de Thu May 14 05:55:46 2015
+Received: (at 784565) by bugs.debian.org; 14 May 2015 05:55:46 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-11.9 required=4.0 tests=BAYES_00,FOURLA,
+	HAS_BUG_NUMBER,PGPSIGNATURE,T_RP_MATCHES_RCVD autolearn=ham
+	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 23; hammy, 150; neutral, 392; spammy,
+	0. spammytokens: hammytokens:0.000-+--H*c:pgp-signature,
+	0.000-+--H*c:protocol, 0.000-+--H*c:micalg, 0.000-+--H*c:signed,
+	0.000-+--H*RU:sk:grimnir
+Return-path: <mike.gabriel@das-netzwerkteam.de>
+Received: from freya.das-netzwerkteam.de ([88.198.48.199])
+	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
+	(Exim 4.80)
+	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
+	id 1Ysm7W-0005fv-3I
+	for 784565@bugs.debian.org; Thu, 14 May 2015 05:55:46 +0000
+Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
+	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id BDB433282;
+	Thu, 14 May 2015 07:55:43 +0200 (CEST)
+Received: from localhost (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 20DC03BD2E;
+	Thu, 14 May 2015 07:55:43 +0200 (CEST)
+X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
+Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
+	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id 3Dt4TKuxIMPh; Thu, 14 May 2015 07:55:43 +0200 (CEST)
+Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPS id 871AB3B9EA;
+	Thu, 14 May 2015 07:55:42 +0200 (CEST)
+Received: from bifrost.das-netzwerkteam.de (bifrost.das-netzwerkteam.de
+ [178.62.101.154]) by mail.das-netzwerkteam.de (Horde Framework) with HTTP;
+ Thu, 14 May 2015 05:55:42 +0000
+Date: Thu, 14 May 2015 05:55:42 +0000
+Message-ID: <20150514055542.Horde.LWDaJ7sgQHr-LCJySXbtvQ3@mail.das-netzwerkteam.de>
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+To: Zach Vonler <lightborn@mail.utexas.edu>, Brian Pane <brianp@brianp.net>,
+ Gian Filippo Pinzari <pinzari@nomachine.com>
+Cc: nito.martinez@qindel.com, x2go-dev@lists.x2go.org,
+ opensource@gznianguan.com, 784565@bugs.debian.org, Francesco Poli
+ <invernomuto@paranoici.org>
+Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: nx-libs-lite: parts
+ are derived from non-free code
+References: <20150506173532.7531.31389.reportbug@homebrew>
+ <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
+ <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
+ <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
+ <55521444.9090407@vigor.nu> <1431445315.4712.7.camel@Nokia-N900>
+ <20150512234048.054319a449ffadcf87577425@paranoici.org>
+In-Reply-To: <20150512234048.054319a449ffadcf87577425@paranoici.org>
+User-Agent: Internet Messaging Program (IMP) H5 (6.2.2)
+Accept-Language: de,en
+Organization: DAS-NETZWERKTEAM
+X-Originating-IP: 178.62.101.154
+X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:32.0) Gecko/20100101
+ Firefox/32.0 Iceweasel/32.0
+Content-Type: multipart/signed; boundary="=_whjzG6t3RqUoHnRlD0aGiA1";
+ protocol="application/pgp-signature"; micalg=pgp-sha1
+MIME-Version: 1.0
+
+This message is in MIME format and has been PGP signed.
+
+--=_whjzG6t3RqUoHnRlD0aGiA1
+Content-Type: text/plain; charset=us-ascii; format=flowed; DelSp=Yes
+Content-Disposition: inline
+Content-Transfer-Encoding: quoted-printable
+
+Dear Brian, dear Zachary, dear Gian Filippo,
+
+(Find a TL;DR; at the end of this mail...)
+
+I am contacting you on a licensing issue related to the DXPC code that=20=
+=20
+you=20worked on at the end of the nineties. I'd highly appreciate it if=20=
+=20
+you=20could take a little time to read this mail and get back to me,=20=20
+either=20privately or in public.
+[I have actually Cc:ed quite a number of people in this mail (thread).=20=
+=20
+All=20of them will be affected by the outcome of this license issue to=20=
+=20
+some=20lesser or greater extent. If you feel inconvenient with replying=20=
+=20
+to=20so many people you don't know, really don't hesitate to get back to=20=
+=20
+me=20in private first, so that we can sort things out. Thank you.]
+
+Before I continue, let me shortly introduce myself. My name is Mike=20=20
+Gabriel,=20I work for the Debian project [1.1, 1.2] (which brings forth=20=
+=20
+one=20of the major GNU/Linux distributions world-wide. I am also the=20=20
+upstream=20code maintainer of a software project called nx-libs [2]. The=20=
+=20
+nx-libs=20code has been derived from several of NoMachine's NXv3 [11]=20=20
+components=20(namely: nx-X11, nxagent, nxcomp, nxcompext and nxcompshad).
+
+A member of the Debian legal team [3] (Francesco Poli) made us (i.e.,=20=20
+the=20nx-libs developers, users, package maintainers) aware of an issue=20=
+=20
+[4]=20in the nx-libs component NXCOMP (which has been derived from DXPC=20=
+=20
+[5]).=20Please read Message #5 of the brought up issue on the Debian bug=20=
+=20
+tracker=20(#784565) [4] before you continue reading. Thanks.
+
+I will now jump into the below quoted mail and continue inline...
+
+On  Di 12 Mai 2015 23:40:48 CEST, Francesco Poli wrote:
+
+> On Tue, 12 May 2015 17:41:55 +0200 Mike Gabriel wrote:
+>
+>> Hi Kevin,
+>
+> Hello Mike, hello Kevin, hello to all the other recipients.
+>
+> First of all, I wish to express my gratitude to Kevin for his prompt,
+> kind and generous response.
+
+>> thanks for your feedback. Let us wait for Francesco, our expert on=20=20
+>>=20license issues, and see what he thinks about your feedback.
+>
+> I think that this is an important first step to solve this issue for
+> the best.
+> Kevin Vigor is one of the copyright owners of the code that was forked
+> before the re-licensing.
+> We now know that he intended the re-licensing to be retroactive and
+> this is really good.
+
+We are currently in the process of contacting all DXPC related=20=20
+copyright=20holders mentioned in the NXCOMP license file [6]. We already=20=
+=20
+received=20some feedback from Kevin Vigor [7], but we also need to=20=20
+address=20you (Brian, Zachary, Gian Filippo) with this. (The mail=20=20
+address=20I have from Zachary may be outdated, so any current contact=20=20
+address=20is highly welcome, in case the mail address being used will=20=20
+bounce=20back).
+
+At the moment, NXCOMP (and thus nx-libs, but also NoMachine's NXv3=20=20
+code)=20cannot be considered as fully free software, until this issue is=20=
+=20
+settled.=20The DXPC license before DXPC v3.8.1 was an ancient BSD style=20=
+=20
+license=20that failed in explicitly mentioning, that it is allowed to=20=20
+modify=20the DXPC code in derivative works. In 2002, DXPC 3.8.1 got=20=20
+released=20[12], using a more compliant license (BSD-2-clause). As Kevin=20=
+=20
+told=20us, this license change [8,9] was done after the FSF [10] had=20=20
+contacted=20the DXPC developers.
+
+However, the NXCOMP code in NXv3 got forked from DXPC before 2002, as=20=20
+it=20seems. So unfortunately, the modifications of DXPC as found in=20=20
+NoMachine's=20NXCOMP product are not compliant with the pre-3.8.1=20=20
+license=20of DXPC.
+
+> I think that now it would be useful to ascertain that the other
+> copyright owners (Brian Pane, Zachary Vonler, Gian Filippo Pinzari) are
+> also OK with this interpretation of the re-licensing operation.
+
+TL;DR; So here comes my actual question: are you (Brian Pane, Zachary=20=20
+Vonler,=20Gian Filippo Pinzari) ok with retroactively regarding=20=20
+pre-3.8.1=20code of DXPC (that you probably all worked on at that time)=20=
+=20
+as=20BSD-2-clause? Are you ok with others having taken or taking the=20=20
+pre-3.8.1=20DXPC code and distribute it in a modified form?
+
+A yes from all of you as DXPC copyright holders is essential for the=20=20
+continuation=20of nx-libs development under a free license. This may=20=20
+also=20possibly be an issue for NXv4 in case parts of it have been=20=20
+derived=20from DXPC.
+
+Thanks to all of you for taking your time.
+
+light+love
+Mike
+
+[1.1] http://www.debian.org
+[1.2] https://qa.debian.org/developer.php?login=3Dsunweaver%40debian.org
+[2] https://github.com/ArcticaProject/nx-libs
+[3] https://www.debian.org/legal/
+[4] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=3D784565#5
+[5] http://www.vigor.nu/dxpc/
+[6] https://github.com/ArcticaProject/nx-libs/blob/3.6.x/nxcomp/LICENSE#L32
+[7] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=3D784565#40
+[8] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=3D72020
+[9] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=3D142028
+[10] http://www.fsf.org/
+[11] https://www.nomachine.com/version-3
+[12] http://www.vigor.nu/dxpc/CHANGES
+--=20
+
+DAS-NETZWERKTEAM
+mike=20gabriel, herweg 7, 24357 fleckeby
+fon: +49 (1520) 1976 148
+
+GnuPG Key ID 0x25771B31
+mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
+
+freeBusy:
+https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x=
+fb
+
+--=_whjzG6t3RqUoHnRlD0aGiA1
+Content-Type: application/pgp-signature
+Content-Description: Digitale PGP-Signatur
+Content-Disposition: inline
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJVVDjeAAoJEJr0azAldxsx1JUP/RdzhmQ3HU+6x479AoGBTKxV
+onR3XPlq8Iw9f6dU0TjqlAHCOGeftJ+X7A3HamiTFsr5wUqlrTuKeYnVd4hTa08e
+ge9WIODczQfnoHm47siTjlMfQuHFIGDnHuJ+3GbvojMI7QXWrM9wgxGo2B/2UUQS
+tFlYPbvfAGhCyUVx/zLRFqDVzzdo+UCVoLLYKE1pkwjhpnGGamY1xd/KFjCgi0Vx
+f/Nx9w28EqmRFZCTmxghLngkTlQwrtBkSUAhLS3ntxV12RrrQQ2verXPWbW1DU9C
+3TZypNZSMc4O8etJ244YUk7wAvspUtJnXyvxoQ2Padw0ogGFayIdLtC8HStCy+Mx
+Q/FIND8+aGdYALNTbQfTCpJ1fmg06Id4hn96rdZOhpT80M3vTuY9HpIyf2dDCdHu
+OmHEjUKnMRgjPbVoIU5lz8s4X/ET7hzxb2psXSwscxI+qqlSrADzC98QB23djJii
+O9qPVB/HqJXwNNXlwiScrLC/q4ro0QgdurKmIDQq1zjdFXyBDEwMzxLNlVSJiEeG
+gMSiXD9lD8J1KBDp35P4wxmOcCSymILU11Lpvf5N22ID7cfk8x58+Fsik+RkQZcm
+94ll8p4XU0xOt8pgzGOVL4rLBsjcPGzuTjUoDsB8zmZLSgEgrISZNQC7pRhEXTRW
+3g7fQuF635IMObwgVJJB
+=c1td
+-----END PGP SIGNATURE-----
+
+--=_whjzG6t3RqUoHnRlD0aGiA1--
+
+
+
+
+From mike.gabriel@das-netzwerkteam.de Thu May 14 06:20:24 2015
+Received: (at 784565) by bugs.debian.org; 14 May 2015 06:20:24 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-11.9 required=4.0 tests=BAYES_00,FOURLA,
+	HAS_BUG_NUMBER,PGPSIGNATURE,T_RP_MATCHES_RCVD autolearn=ham
+	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 15; hammy, 149; neutral, 94; spammy,
+	1. spammytokens:0.997-1--sk:austin. hammytokens:0.000-+--H*c:pgp-signature,
+	0.000-+--H*c:protocol, 0.000-+--H*c:micalg, 0.000-+--H*c:signed,
+	0.000-+--H*RU:sk:grimnir
+Return-path: <mike.gabriel@das-netzwerkteam.de>
+Received: from freya.das-netzwerkteam.de ([88.198.48.199])
+	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
+	(Exim 4.80)
+	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
+	id 1YsmVL-0008TY-AE
+	for 784565@bugs.debian.org; Thu, 14 May 2015 06:20:24 +0000
+Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
+	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id AA82B3282;
+	Thu, 14 May 2015 08:20:19 +0200 (CEST)
+Received: from localhost (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id A8B823BD2E;
+	Thu, 14 May 2015 08:20:18 +0200 (CEST)
+X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
+Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
+	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id LyPILriO4mkm; Thu, 14 May 2015 08:20:18 +0200 (CEST)
+Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPS id 4BB463BB3A;
+	Thu, 14 May 2015 08:20:18 +0200 (CEST)
+Received: from bifrost.das-netzwerkteam.de (bifrost.das-netzwerkteam.de
+ [178.62.101.154]) by mail.das-netzwerkteam.de (Horde Framework) with HTTP;
+ Thu, 14 May 2015 06:20:18 +0000
+Date: Thu, 14 May 2015 06:20:18 +0000
+Message-ID: <20150514062018.Horde.T6fBfDEHTv_IkVi4n506ew5@mail.das-netzwerkteam.de>
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+To: Brian Pane <brianp@brianp.net>, Gian Filippo Pinzari
+ <pinzari@nomachine.com>
+Cc: opensource@gznianguan.com, 784565@bugs.debian.org,
+ nito.martinez@qindel.com, Francesco Poli <invernomuto@paranoici.org>,
+ x2go-dev@lists.x2go.org
+Subject: Re: [X2Go-Dev] [pkg-x2go-devel] Bug#784565: Bug#784565:
+ nx-libs-lite: parts are derived from non-free code
+References: <20150506173532.7531.31389.reportbug@homebrew>
+ <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
+ <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
+ <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
+ <55521444.9090407@vigor.nu> <1431445315.4712.7.camel@Nokia-N900>
+ <20150512234048.054319a449ffadcf87577425@paranoici.org>
+ <20150514055542.Horde.LWDaJ7sgQHr-LCJySXbtvQ3@mail.das-netzwerkteam.de>
+In-Reply-To: <20150514055542.Horde.LWDaJ7sgQHr-LCJySXbtvQ3@mail.das-netzwerkteam.de>
+User-Agent: Internet Messaging Program (IMP) H5 (6.2.2)
+Accept-Language: de,en
+Organization: DAS-NETZWERKTEAM
+X-Originating-IP: 178.62.101.154
+X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:32.0) Gecko/20100101
+ Firefox/32.0 Iceweasel/32.0
+Content-Type: multipart/signed; boundary="=_FXxC2VoubfzELdkXQu84zQ1";
+ protocol="application/pgp-signature"; micalg=pgp-sha1
+MIME-Version: 1.0
+
+This message is in MIME format and has been PGP signed.
+
+--=_FXxC2VoubfzELdkXQu84zQ1
+Content-Type: text/plain; charset=us-ascii; format=flowed; DelSp=Yes
+Content-Disposition: inline
+Content-Transfer-Encoding: quoted-printable
+
+Hi again,
+
+On  Do 14 Mai 2015 07:55:42 CEST, Mike Gabriel wrote:
+
+> [...] (The mail address I have from Zachary may be outdated, so any=20=20
+>=20current contact address is highly welcome, in case the mail address=20=
+=20
+>=20being used will bounce back).
+
+As it seems, the publicly known mail address of Zachary Vonler at=20=20
+austin.utexas.edu=20is outdated.
+
+@Brian: if you happen to have a recent mail address of Zachary, could=20=20
+you=20please provide it to me privately? Thanks.
+
+Mike
+--=20
+
+DAS-NETZWERKTEAM
+mike=20gabriel, herweg 7, 24357 fleckeby
+fon: +49 (1520) 1976 148
+
+GnuPG Key ID 0x25771B31
+mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
+
+freeBusy:
+https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x=
+fb
+
+--=_FXxC2VoubfzELdkXQu84zQ1
+Content-Type: application/pgp-signature
+Content-Description: Digitale PGP-Signatur
+Content-Disposition: inline
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJVVD6iAAoJEJr0azAldxsx4+8QAI9fbkDu0G/1NpC4+MDJ3HtH
+wzfUUIIoBAPTahr1ZGrGK4ZMH5+RvXtwX2OBTwRRgKlZOqsdU35bj2HKi01KNLGx
+9NXXnLz97CuTrXJrzis3C+pzCIpR6cR/SPhDdExdhjR8nawXcejfFhPUnbVvPvxY
+jYN43cYFScovk5f5bUtIAybVZZCpdRZwDRevD+1qTTs+WtDf/9PXL7CX9A7j7r6T
+XQIURSVQq/FVXcJHSdZcYZza/4JHIZbEQTeX3FaUK+zkdHlBbbmRwzN0YLP/XQiY
+06tQXFjgjqjjkoxTE5gQrlN3kyxNH2WpXj2eeAqQarkCOnKgiuFEYxhTCYnZHCmk
+WVYhb2/78VbRlRbDJH0jJ0KKNOi9fbXGcVa36IOgV2dLN+tnNorAQjHm7LkBDhyi
+c3EmzEPtDTmcb5XuPYwwbNGn2EE47UsTx3UjPFWAQVQ2LwMXoFb+iH+WWSQ8KW1b
+xKRDOtarACd06rbW/sKQVdzNytydvFkZZn//AHHA7KP7jmqhl/bub8EyEf9cCTVr
+92XB5bbI1rLfEo1D3FTUaCt1tUEumhgRzwlJteX5/vbpf0fJ3QcWMUQSQWYqbhEm
+LnlGOM44jZDtQ7QonezcB/+lQDu2/0Q7fZtgqtr9bxkJ5URr8/ByTI+E3K2bxdme
+jQAQL6yyRC5s419MIJTr
+=6/Dc
+-----END PGP SIGNATURE-----
+
+--=_FXxC2VoubfzELdkXQu84zQ1--
+
+
+
+
+From mike.gabriel@das-netzwerkteam.de Sat May 16 09:19:18 2015
+Received: (at 784565) by bugs.debian.org; 16 May 2015 09:19:18 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-10.9 required=4.0 tests=BAYES_00,DIGITS_LETTERS,
+	FOURLA,HAS_BUG_NUMBER,PGPSIGNATURE,T_RP_MATCHES_RCVD autolearn=ham
+	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 31; hammy, 150; neutral, 208; spammy,
+	0. spammytokens: hammytokens:0.000-+--tarballs, 0.000-+--H*c:pgp-signature,
+	0.000-+--H*c:protocol, 0.000-+--H*c:micalg, 0.000-+--H*c:signed
+Return-path: <mike.gabriel@das-netzwerkteam.de>
+Received: from freya.das-netzwerkteam.de ([88.198.48.199])
+	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
+	(Exim 4.80)
+	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
+	id 1YtYFZ-0006BP-Mo
+	for 784565@bugs.debian.org; Sat, 16 May 2015 09:19:18 +0000
+Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
+	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id 434CF3D4F;
+	Sat, 16 May 2015 11:19:13 +0200 (CEST)
+Received: from localhost (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 9294C3BB55;
+	Sat, 16 May 2015 11:19:12 +0200 (CEST)
+X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
+Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
+	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id a-GW73-71I6N; Sat, 16 May 2015 11:19:12 +0200 (CEST)
+Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPS id 224123BB3B;
+	Sat, 16 May 2015 11:19:12 +0200 (CEST)
+Received: from 176.4.79.4 ([176.4.79.4]) by mail.das-netzwerkteam.de (Horde
+ Framework) with HTTP; Sat, 16 May 2015 09:19:12 +0000
+Date: Sat, 16 May 2015 09:19:12 +0000
+Message-ID: <20150516091912.Horde.W_1Szu5msccGYo-Ndwv3cg1@mail.das-netzwerkteam.de>
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+To: 784565@bugs.debian.org, Francesco Poli <invernomuto@paranoici.org>
+Cc: Kevin Vigor <kevin@vigor.nu>, nito.martinez@qindel.com,
+ x2go-dev@lists.x2go.org, opensource@gznianguan.com
+Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: nx-libs-lite: parts
+ are derived from non-free code
+References: <20150506173532.7531.31389.reportbug@homebrew>
+ <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
+ <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
+ <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
+ <55521444.9090407@vigor.nu> <1431445315.4712.7.camel@Nokia-N900>
+ <20150512234048.054319a449ffadcf87577425@paranoici.org>
+ <20150514045809.Horde.-3NIZzBnA5V5B6a721F2kg2@mail.das-netzwerkteam.de>
+In-Reply-To: <20150514045809.Horde.-3NIZzBnA5V5B6a721F2kg2@mail.das-netzwerkteam.de>
+User-Agent: Internet Messaging Program (IMP) H5 (6.2.2)
+Accept-Language: de,en
+Organization: DAS-NETZWERKTEAM
+X-Originating-IP: 176.4.79.4
+X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:32.0) Gecko/20100101
+ Firefox/32.0 Iceweasel/32.0
+Content-Type: multipart/signed; boundary="=_n6jEwcfiXkrvf2B-ZGaJrw3";
+ protocol="application/pgp-signature"; micalg=pgp-sha1
+MIME-Version: 1.0
+
+This message is in MIME format and has been PGP signed.
+
+--=_n6jEwcfiXkrvf2B-ZGaJrw3
+Content-Type: text/plain; charset=us-ascii; format=flowed; DelSp=Yes
+Content-Disposition: inline
+Content-Transfer-Encoding: quoted-printable
+
+Hi all, esp. Kevin,
+
+On  Do 14 Mai 2015 06:58:09 CEST, Mike Gabriel wrote:
+
+I looked at dxpc releases (I obtained upstream tarballs from=20=20
+snapshot.debian.org).
+
+I=20currently have:
+
+"""
+[mike@minobo dxpc.nxrebase (upstream-nxrebase)]$ git log
+commit 0676a768a96383641a73a72ecd2e1083322e6abe
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Date:   Sat May 16 10:52:24 2015 +0200
+
+     Imported Upstream version 3.9.2
+
+commit 4ccf34b2c4763dfb01dceb8588b204b0d029cc3d
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Date:   Sat May 16 10:51:04 2015 +0200
+
+     Imported Upstream version 3.9.1
+
+commit dd8f60ce63c70ed605a2e1717feb7128e59fb8e6
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Date:   Sat May 16 10:49:19 2015 +0200
+
+     Imported Upstream version 3.9.0
+
+commit 01c990099aea802405f8d39c0b819ee1742c185c
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Date:   Sat May 16 10:32:06 2015 +0200
+
+     Imported Upstream version 3.8.2
+
+commit 48df60b3b946a08541ee48371634f074e875adda
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Date:   Sat May 16 10:31:57 2015 +0200
+
+     Imported Upstream version 3.8.0
+
+commit 11d81444d0f86a67f9b8483cbfa33343714b26e9
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Date:   Sat May 16 10:31:53 2015 +0200
+
+     Imported Upstream version 3.7.0
+
+commit e4f550abd4cd49ecc2381e717a55a9940087a376
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Date:   Sat May 16 10:31:44 2015 +0200
+
+     Imported Upstream version 3.5.0
+"""
+
+> @Kevin: I will take you off this mail thread's Cc: field with my=20=20
+>=20next post. Feel free to follow-up via #784565 [1] on the Debian bug=20=
+=20
+>=20tracker. Thanks a lot for being so responsive and generous with=20=20
+>=20providing information.
+
+With this post I actually reincluded you because it becomes technical=20=20
+from=20here on and I probably will need your expertise on DXPC. Not sure=20=
+=20
+if=20you have time or prio or are willing to provide that. Would you be=20=
+=20
+open=20for answering technical questions on DXPC and esp. the changes=20=20
+between=203.7.0 and 3.8.1/3.8.2? I'd highly appreciate that.
+
+As I have not heard back neither from Brian Pane, Zachary Vonler nor=20=20
+Gian=20Filippo Pinzari (we had Ascension Day and maybe a prolonged=20=20
+weekend=20that people used for going on VAC), I will try looking at the=20=
+=20
+DXPC=20changes between 3.7.0 and 3.8.1. Obviously, NoMachine forked=20=20
+NXCOMP=20from DXPC some time between DXPC 3.7.0 and DXPC 3.8.0.
+
+Questions to Kevin:
+
+   o Is there any SVN upstream repo still online
+     (I saw it in one of the tarballs, that SVN was
+     used for 3.9.0).
+   o Do you have any tarballs documenting the
+     changes between 3.7.0 and 3.8.0? Do you also
+     have the 3.8.1 tarball?
+   o Did the 3.8.0 version of DXPC break proto
+     compatibility (i.e., you could not use client
+     3.7.0 and server 3.8.0 and vice versa with
+     each other)?
+
+Any help on this is appreciated. Thanks.
+
+Mike
+
+
+--=20
+
+DAS-NETZWERKTEAM
+mike=20gabriel, herweg 7, 24357 fleckeby
+fon: +49 (1520) 1976 148
+
+GnuPG Key ID 0x25771B31
+mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
+
+freeBusy:
+https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x=
+fb
+
+--=_n6jEwcfiXkrvf2B-ZGaJrw3
+Content-Type: application/pgp-signature
+Content-Description: Digitale PGP-Signatur
+Content-Disposition: inline
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJVVwuPAAoJEJr0azAldxsxAqoQAI1IOApnU8WLZH+VT1GIgtvx
+XxuBALPeR8KobmGRfJd4bSzeIpAqw+JSGa0/XApTwjYbpsIUKnMrEfoHfS0wt4Tb
+ZmSiHL4XCYa6SCGOAbSe89QXNA8kS4ewQMSaPTZhGvoR6wIjdNfxXDN5aO6TkUlw
+qw786fMKYcj9htNnshlq264uSfkrMusFEw614dnfKEVnx8YrIUU5lNY9AInShO9S
+K0vy1vn53/Ie5Fec1FK0WUsT4xTu7NW80Ch0+IgopURIl9NmlomJVRwoDLbR47Ox
+6dFVGJ5VKmOt+oW2g4YAdti8YNhSYteyPgTAPMdtU4XqkHV5/RepCoV/6gr3/YR1
+To63WGpt2B+jl2d4OAPuWWdTRucB2QYsCz/jCvLKeLcg2ODHZJXhSzVYlIie0uFY
+SRvqM8qW+WyuYek2vZDneKvDB2eUqMhRb5dmSeod9UR+3RYTq+JrFUoDq65PONbM
+A0QZ+cG0EkQdxG/1V8yZoMRgxPOtb+AZcMIjC5NikWUsyIkGjMHNHSbJCboJBlyM
+DdyRCTxuM09cpzNxS7Ph0z0iSdQZAl2D7vPCAY1jwyLdu7Xra/p3aM6pqeYuIaWh
+OpoF/sRq08CjWmgVe7MdfkgxZQxW4qIdOeNYGUDIADzzj6cHdNV+WP13ISizeoyO
+u4cspyl/6lFu3TyMWkh8
+=fu9u
+-----END PGP SIGNATURE-----
+
+--=_n6jEwcfiXkrvf2B-ZGaJrw3--
+
+
+
+
+From zvonler@gmail.com Mon May 18 15:05:45 2015
+Received: (at 784565) by bugs.debian.org; 18 May 2015 15:05:46 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-5.3 required=4.0 tests=BAYES_00,DKIM_SIGNED,
+	DKIM_VALID,DKIM_VALID_AU,FOURLA,FREEMAIL_FROM,HAS_BUG_NUMBER,HTML_MESSAGE,
+	MULTALT,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_PASS
+	autolearn=ham autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 14; hammy, 104; neutral, 41; spammy,
+	1. spammytokens:0.940-+--H*c:alternative
+	hammytokens:0.000-+--D*das-netzwerkteam.de, 0.000-+--sk:mikega,
+	0.000-+--sk:mike.ga, 0.000-+--U*mike.gabriel,
+	0.000-+--mike.gabriel@das-netzwerkteam.de
+Return-path: <zvonler@gmail.com>
+Received: from mail-ob0-f181.google.com ([209.85.214.181])
+	by buxtehude.debian.org with esmtps (TLS1.2:RSA_ARCFOUR_SHA1:128)
+	(Exim 4.80)
+	(envelope-from <zvonler@gmail.com>)
+	id 1YuMbx-0004SF-RZ
+	for 784565@bugs.debian.org; Mon, 18 May 2015 15:05:45 +0000
+Received: by obblk2 with SMTP id lk2so127830096obb.0
+        for <784565@bugs.debian.org>; Mon, 18 May 2015 08:05:39 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+        d=gmail.com; s=20120113;
+        h=mime-version:date:message-id:subject:from:to:content-type;
+        bh=nHgAzYNhWTJXAXb1d3jfmZVOFHEEaolqyRCNmCThusM=;
+        b=ilsboi8m+iXF7pVv2MVsvJqi8Es4/o3Awnfg5nSzWVB34kDB0g7zczoEfC4d9km/Bn
+         WDerLV30mJ+OfaRA5elHld2CsY9ByX2MuU73jj2kNenlEV15s7LdJxYsWiZeKM4AEeOw
+         gGF3oU3A/FfhVUrhoPjcGXiF7xjXh1kkPGjkmXFJgthTnyJQjrL6Kw6jfsqhQtbEpqnc
+         5hsWFCNR7O780T1pkf+MisASrWFXI3oolY4EV8/P6OeEWmmKd7L9h8YHPegOdFq543qZ
+         na9coEvmwpnReWORK79ycOgZa1DwiX1h2SvS+wgigQx8j9ZlJld5SpJFTcV3vSJxmICQ
+         i7Wg==
+MIME-Version: 1.0
+X-Received: by 10.202.89.131 with SMTP id n125mr19222614oib.91.1431961538959;
+ Mon, 18 May 2015 08:05:38 -0700 (PDT)
+Received: by 10.202.212.10 with HTTP; Mon, 18 May 2015 08:05:38 -0700 (PDT)
+Date: Mon, 18 May 2015 10:05:38 -0500
+Message-ID: <CAAnzQj-6Tgiar-GOxXx9FXU21cU4Be05Yo3zUSgr094sYXZP+w@mail.gmail.com>
+Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: nx-libs-lite: parts are
+ derived from non-free code
+From: Zach Vonler <zvonler@gmail.com>
+To: 784565@bugs.debian.org
+Content-Type: multipart/alternative; boundary=001a113d381edcb3e205165c863b
+
+--001a113d381edcb3e205165c863b
+Content-Type: text/plain; charset=UTF-8
+
+On Thu, 14 May 2015 05:55:42 +0000 Mike Gabriel <
+mike.gabriel@das-netzwerkteam.de> wrote:
+
+>
+> TL;DR; So here comes my actual question: are you (Brian Pane, Zachary
+> Vonler, Gian Filippo Pinzari) ok with retroactively regarding
+> pre-3.8.1 code of DXPC (that you probably all worked on at that time)
+> as BSD-2-clause? Are you ok with others having taken or taking the
+> pre-3.8.1 DXPC code and distribute it in a modified form?
+>
+
+
+> A yes from all of you as DXPC copyright holders is essential for the
+> continuation of nx-libs development under a free license. This may
+> also possibly be an issue for NXv4 in case parts of it have been
+> derived from DXPC.
+
+
+Yes, I am fine with considering the license change to be retroactive to
+cover the time I was the maintainer.
+
+I have no objections to others distributing modified versions of that code.
+
+Zach
+
+--001a113d381edcb3e205165c863b
+Content-Type: text/html; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+
+<div dir=3D"ltr">On Thu, 14 May 2015 05:55:42 +0000 Mike Gabriel &lt;<a hre=
+f=3D"mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel@das-netzwerkteam=
+.de</a>&gt; wrote:<br><div><blockquote class=3D"gmail_quote" style=3D"margi=
+n:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204=
+);border-left-style:solid;padding-left:1ex"><br>TL;DR; So here comes my act=
+ual question: are you (Brian Pane, Zachary =C2=A0<br>Vonler, Gian Filippo P=
+inzari) ok with retroactively regarding =C2=A0<br>pre-3.8.1 code of DXPC (t=
+hat you probably all worked on at that time) =C2=A0<br>as BSD-2-clause? Are=
+ you ok with others having taken or taking the =C2=A0<br>pre-3.8.1 DXPC cod=
+e and distribute it in a modified form?<br></blockquote><div>=C2=A0</div><b=
+lockquote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-le=
+ft-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;pad=
+ding-left:1ex">A yes from all of you as DXPC copyright holders is essential=
+ for the =C2=A0<br>continuation of nx-libs development under a free license=
+. This may =C2=A0<br>also possibly be an issue for NXv4 in case parts of it=
+ have been =C2=A0<br>derived from DXPC.</blockquote><div>=C2=A0</div></div>=
+<div>Yes, I am fine with considering the license change to be retroactive t=
+o cover the time I was the maintainer.</div><div><br></div><div>I have no o=
+bjections to others distributing modified versions of that code.</div><div>=
+<br></div><div>Zach</div></div>
+
+--001a113d381edcb3e205165c863b--
+
+
+
+From kevin@vigor.nu Mon May 18 21:26:12 2015
+Received: (at 784565) by bugs.debian.org; 18 May 2015 21:26:12 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-8.0 required=4.0 tests=BAYES_00,FOURLA,
+	HAS_BUG_NUMBER,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=ham
+	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 16; hammy, 150; neutral, 121; spammy,
+	0. spammytokens: hammytokens:0.000-+--tarballs, 0.000-+--H*f:sk:2015050,
+	0.000-+--3.9.0, 0.000-+--3.8.0, 0.000-+--H*UA:31.0
+Return-path: <kevin@vigor.nu>
+Received: from gateway13.websitewelcome.com ([69.56.148.12])
+	by buxtehude.debian.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:256)
+	(Exim 4.80)
+	(envelope-from <kevin@vigor.nu>)
+	id 1YuSY8-0004Mq-9I
+	for 784565@bugs.debian.org; Mon, 18 May 2015 21:26:12 +0000
+Received: by gateway13.websitewelcome.com (Postfix, from userid 5007)
+	id 248D59C09927E; Mon, 18 May 2015 15:38:28 -0500 (CDT)
+Received: from gator4058.hostgator.com (gator4058.hostgator.com [192.185.4.69])
+	by gateway13.websitewelcome.com (Postfix) with ESMTP id 1EB399C099246
+	for <784565@bugs.debian.org>; Mon, 18 May 2015 15:38:28 -0500 (CDT)
+Received: from [63.158.132.10] (port=43192 helo=[10.50.3.84])
+	by gator4058.hostgator.com with esmtpsa (UNKNOWN:DHE-RSA-AES128-SHA:128)
+	(Exim 4.82)
+	(envelope-from <kevin@vigor.nu>)
+	id 1YuRnv-0001VU-8i; Mon, 18 May 2015 15:38:27 -0500
+Message-ID: <555A4DC1.2040900@vigor.nu>
+Date: Mon, 18 May 2015 14:38:25 -0600
+From: Kevin Vigor <kevin@vigor.nu>
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0
+MIME-Version: 1.0
+To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 
+ 784565@bugs.debian.org, Francesco Poli <invernomuto@paranoici.org>
+CC: nito.martinez@qindel.com, x2go-dev@lists.x2go.org, 
+ opensource@gznianguan.com
+Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: nx-libs-lite: parts
+ are derived from non-free code
+References: <20150506173532.7531.31389.reportbug@homebrew> <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de> <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org> <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de> <55521444.9090407@vigor.nu> <1431445315.4712.7.camel@Nokia-N900> <20150512234048.054319a449ffadcf87577425@paranoici.org> <20150514045809.Horde.-3NIZzBnA5V5B6a721F2kg2@mail.das-netzwerkteam.de> <20150516091912.Horde.W_1Szu5msccGYo-Ndwv3cg1@mail.das-netzwerkteam.de>
+In-Reply-To: <20150516091912.Horde.W_1Szu5msccGYo-Ndwv3cg1@mail.das-netzwerkteam.de>
+Content-Type: text/plain; charset=windows-1252; format=flowed
+Content-Transfer-Encoding: 7bit
+X-AntiAbuse: This header was added to track abuse, please include it with any abuse report
+X-AntiAbuse: Primary Hostname - gator4058.hostgator.com
+X-AntiAbuse: Original Domain - bugs.debian.org
+X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12]
+X-AntiAbuse: Sender Address Domain - vigor.nu
+X-BWhitelist: no
+X-Source-IP: 63.158.132.10
+X-Exim-ID: 1YuRnv-0001VU-8i
+X-Source: 
+X-Source-Args: 
+X-Source-Dir: 
+X-Source-Sender: ([10.50.3.84]) [63.158.132.10]:43192
+X-Source-Auth: kevin@vigor.nu
+X-Email-Count: 2
+X-Source-Cap: a3ZpZ29yO2t2aWdvcjtnYXRvcjQwNTguaG9zdGdhdG9yLmNvbQ==
+X-Greylist: delayed 1495 seconds by postgrey-1.34 at buxtehude; Mon, 18 May 2015 21:26:12 UTC
+
+On 05/16/15 03:19, Mike Gabriel wrote:
+  As I have not heard back neither from Brian Pane, Zachary Vonler nor Gian Filippo Pinzari (we had Ascension Day and maybe a prolonged weekend that people used for going on VAC), I will try looking at the DXPC changes between 3.7.0 and 3.8.1. Obviously, NoMachine forked NXCOMP from DXPC some time between DXPC 3.7.0 and DXPC 3.8.0.
+>
+> Questions to Kevin:
+>
+>    o Is there any SVN upstream repo still online
+>      (I saw it in one of the tarballs, that SVN was
+>      used for 3.9.0).
+
+I'm afraid not. There was never an online repo available, and if I used one personally it is lost to the mists of time.
+
+>    o Do you have any tarballs documenting the
+>      changes between 3.7.0 and 3.8.0? Do you also
+>      have the 3.8.1 tarball?
+
+I have the source tarballs to each of those (including the 3.8.1 version). The 3.8.0 release includes a README-3.8.0 file which documents the changes between 3.7.0 and 3.8.0 reasonably well.
+
+As will be (unfortunately) obvious from examining the deltas between 3.7.0 (the last release by Brian and/or Zachary) and 3.8.0 (the first release by me), I inherited a significant majority of the code.
+
+>    o Did the 3.8.0 version of DXPC break proto
+>      compatibility (i.e., you could not use client
+>      3.7.0 and server 3.8.0 and vice versa with
+>      each other)?
+
+Yes, minor version number bumps were used to indicate compatibility. 3.8.x was incompatible with 3.7.x (and also with 3.9.x).
+
+
+
+
+From kevin@vigor.nu Mon May 18 21:34:50 2015
+Received: (at 784565) by bugs.debian.org; 18 May 2015 21:34:50 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-8.0 required=4.0 tests=BAYES_00,FOURLA,
+	HAS_BUG_NUMBER,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=ham
+	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 39; hammy, 146; neutral, 132; spammy,
+	4. spammytokens:0.999-1--tecnologies, 0.993-1--H*RU:67.18.68.12,
+	0.987-1--D*ascend.com, 0.987-1--H*r:34828 hammytokens:0.000-+--H*f:sk:2015050,
+	 0.000-+--3.8.0, 0.000-+--H*UA:31.0, 0.000-+--H*u:31.0,
+	0.000-+--H*f:sk:2015051
+Return-path: <kevin@vigor.nu>
+Received: from gateway15.websitewelcome.com ([67.18.68.12])
+	by buxtehude.debian.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:256)
+	(Exim 4.80)
+	(envelope-from <kevin@vigor.nu>)
+	id 1YuSgU-0005Jq-92
+	for 784565@bugs.debian.org; Mon, 18 May 2015 21:34:50 +0000
+Received: by gateway15.websitewelcome.com (Postfix, from userid 5007)
+	id 8BB94ED5E6912; Mon, 18 May 2015 16:11:44 -0500 (CDT)
+Received: from gator4058.hostgator.com (gator4058.hostgator.com [192.185.4.69])
+	by gateway15.websitewelcome.com (Postfix) with ESMTP id 84825ED5E68F2
+	for <784565@bugs.debian.org>; Mon, 18 May 2015 16:11:44 -0500 (CDT)
+Received: from [63.158.132.10] (port=34828 helo=[10.50.3.84])
+	by gator4058.hostgator.com with esmtpsa (UNKNOWN:DHE-RSA-AES128-SHA:128)
+	(Exim 4.82)
+	(envelope-from <kevin@vigor.nu>)
+	id 1YuSK7-00005R-B6; Mon, 18 May 2015 16:11:43 -0500
+Message-ID: <555A558E.1020703@vigor.nu>
+Date: Mon, 18 May 2015 15:11:42 -0600
+From: Kevin Vigor <kevin@vigor.nu>
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0
+MIME-Version: 1.0
+To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 
+ 784565@bugs.debian.org, Francesco Poli <invernomuto@paranoici.org>
+CC: nito.martinez@qindel.com, x2go-dev@lists.x2go.org, 
+ opensource@gznianguan.com
+Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: nx-libs-lite: parts
+ are derived from non-free code
+References: <20150506173532.7531.31389.reportbug@homebrew> <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de> <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org> <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de> <55521444.9090407@vigor.nu> <1431445315.4712.7.camel@Nokia-N900> <20150512234048.054319a449ffadcf87577425@paranoici.org> <20150514045809.Horde.-3NIZzBnA5V5B6a721F2kg2@mail.das-netzwerkteam.de> <20150516091912.Horde.W_1Szu5msccGYo-Ndwv3cg1@mail.das-netzwerkteam.de>
+In-Reply-To: <20150516091912.Horde.W_1Szu5msccGYo-Ndwv3cg1@mail.das-netzwerkteam.de>
+Content-Type: text/plain; charset=windows-1252; format=flowed
+Content-Transfer-Encoding: 7bit
+X-AntiAbuse: This header was added to track abuse, please include it with any abuse report
+X-AntiAbuse: Primary Hostname - gator4058.hostgator.com
+X-AntiAbuse: Original Domain - bugs.debian.org
+X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12]
+X-AntiAbuse: Sender Address Domain - vigor.nu
+X-BWhitelist: no
+X-Source-IP: 63.158.132.10
+X-Exim-ID: 1YuSK7-00005R-B6
+X-Source: 
+X-Source-Args: 
+X-Source-Dir: 
+X-Source-Sender: ([10.50.3.84]) [63.158.132.10]:34828
+X-Source-Auth: kevin@vigor.nu
+X-Email-Count: 2
+X-Source-Cap: a3ZpZ29yO2t2aWdvcjtnYXRvcjQwNTguaG9zdGdhdG9yLmNvbQ==
+X-Greylist: delayed 1383 seconds by postgrey-1.34 at buxtehude; Mon, 18 May 2015 21:34:50 UTC
+
+By the way, poking around the interwebs I find there is an archive of the old DXPC mailing list available at:
+
+http://marc.info/?l=dxpc&r=1&w=2
+
+I think you will find this of particular interest:
+
+
+http://marc.info/?l=dxpc&m=93093790813555&w=2
+
+
+List:       dxpc
+Subject:    Re: future tecnologies
+From:       Brian Pane <brianp () cnet ! com>
+Date:       1999-07-02 16:42:18
+[Download message RAW]
+
+Kevin Vigor <kvigor@eng.ascend.com> wrote:
+> On 01-Jul-99 dxpc@mcfeeley.cc.utexas.edu wrote:
+> > Speaking of licensing, are you putting your 3.8.0 changes to the dxpc
+> > code itself under GPL, or are they going to use the original dxpc's
+> > licensing?
+>
+> No, as you can probably guess, I am no fan of the GPL. For stuff on
+> this level, where my hacking is pretty simple and probably devoid of
+> commercial value, I'll just release my changes to the public domain and
+> give up even a copyright interest in them.
+>
+> Your and Zach's copyrights still stand, of course.
+>
+> I *think* that fact that we use the LZO library and API, but do not
+> directly incorporate the code, allows us to escape the clutch of the GPL
+> virus.
+>
+> btw, is there an original dxpc license? I haven't seen anything but a
+> copyright notice, which to my non-lawyerly mind translates as "free to
+> all the world as is, negotiate with copyright owner if modifying or
+> including in some other product".
+
+The copyright banner in the Readme is all the documentation there's ever
+been.  My intent was to allow _any_ distribution, use, and modification
+of the source, without imposing restrictions on the licensing style of
+any system into which others might incorporate the code.  We probably
+should start stating this clearly in the distributions.
+
+-brian
+
+[prev in list] [next in list] [prev in thread] [next in thread]
+
+
+
+From mike.gabriel@das-netzwerkteam.de Mon May 18 21:49:10 2015
+Received: (at 784565) by bugs.debian.org; 18 May 2015 21:49:10 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-6.9 required=4.0 tests=BAYES_00,FOURLA,
+	HAS_BUG_NUMBER,T_RP_MATCHES_RCVD autolearn=ham autolearn_force=no
+	version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 35; hammy, 150; neutral, 281; spammy,
+	0. spammytokens: hammytokens:0.000-+--H*RU:sk:grimnir,
+	0.000-+--H*r:sk:grimnir, 0.000-+--H*RU:78.46.204.98,
+	0.000-+--H*RU:88.198.48.199, 0.000-+--H*RU:sk:freya.d
+Return-path: <mike.gabriel@das-netzwerkteam.de>
+Received: from freya.das-netzwerkteam.de ([88.198.48.199])
+	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
+	(Exim 4.80)
+	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
+	id 1YuSuK-0007oj-Hh
+	for 784565@bugs.debian.org; Mon, 18 May 2015 21:49:10 +0000
+Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
+	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id 253493049
+	for <784565@bugs.debian.org>; Mon, 18 May 2015 23:49:04 +0200 (CEST)
+Received: from localhost (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id ACC2E3BD6C
+	for <784565@bugs.debian.org>; Mon, 18 May 2015 23:49:03 +0200 (CEST)
+X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
+Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
+	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id Hh79XOiBkYIp for <784565@bugs.debian.org>;
+	Mon, 18 May 2015 23:49:03 +0200 (CEST)
+Received: from localhost (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 6CC483BC0D
+	for <784565@bugs.debian.org>; Mon, 18 May 2015 23:49:03 +0200 (CEST)
+Received: from localhost (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 2100C3BD6C
+	for <784565@bugs.debian.org>; Mon, 18 May 2015 23:49:03 +0200 (CEST)
+Received: from [10.139.193.227] (unknown [176.0.38.193])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPSA id 453F63BB1E;
+	Mon, 18 May 2015 23:48:59 +0200 (CEST)
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Reply-To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+To: Kevin Vigor <kevin@vigor.nu>, 784565@bugs.debian.org, Francesco Poli <invernomuto@paranoici.org>
+Cc: nito.martinez@qindel.com, x2go-dev@lists.x2go.org,  opensource@gznianguan.com, zvonler@gmail.com
+Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: nx-libs-lite: parts
+	are derived from non-free code
+X-Mailer: Modest 3.2
+References: <20150506173532.7531.31389.reportbug@homebrew>
+	 <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
+	 <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
+	 <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
+	 <55521444.9090407@vigor.nu> <1431445315.4712.7.camel@Nokia-N900>
+	 <20150512234048.054319a449ffadcf87577425@paranoici.org>
+	 <20150514045809.Horde.-3NIZzBnA5V5B6a721F2kg2@mail.das-netzwerkteam.de>
+	 <20150516091912.Horde.W_1Szu5msccGYo-Ndwv3cg1@mail.das-netzwerkteam.de>
+	  <555A558E.1020703@vigor.nu>
+In-Reply-To: <555A558E.1020703@vigor.nu>
+Content-Type: text/plain; charset=utf-8
+Content-ID: <1431985731.1406.1.camel@Nokia-N900>
+Date: Mon, 18 May 2015 23:48:51 +0200
+Message-Id: <1431985731.1406.2.camel@Nokia-N900>
+Mime-Version: 1.0
+Content-Transfer-Encoding: 8bit
+
+Hi Kevin, hi Zach, hi Francesco, hi all,
+
+@Francesco, please review the recent posts and sum up what to do next.
+
+----- Original message -----
+> By the way, poking around the interwebs I find there is an archive of
+> the old DXPC mailing list available at:
+> 
+> http://marc.info/?l=dxpc&r=1&w=2
+> 
+> I think you will find this of particular interest:
+> 
+> 
+> http://marc.info/?l=dxpc&m=93093790813555&w=2
+
+
+> 
+> 
+> List:             dxpc
+> Subject:       Re: future tecnologies
+> From:             Brian Pane <brianp () cnet ! com>
+> Date:             1999-07-02 16:42:18
+> [Download message RAW]
+> 
+> Kevin Vigor <kvigor@eng.ascend.com> wrote:
+> > On 01-Jul-99 dxpc@mcfeeley.cc.utexas.edu wrote:
+> > > Speaking of licensing, are you putting your 3.8.0 changes to the dxpc
+> > > code itself under GPL, or are they going to use the original dxpc's
+> > > licensing?
+> > 
+> > No, as you can probably guess, I am no fan of the GPL. For stuff on
+> > this level, where my hacking is pretty simple and probably devoid of
+> > commercial value, I'll just release my changes to the public domain and
+> > give up even a copyright interest in them.
+> > 
+> > Your and Zach's copyrights still stand, of course.
+> > 
+> > I *think* that fact that we use the LZO library and API, but do not
+> > directly incorporate the code, allows us to escape the clutch of the
+> > GPL virus.
+> > 
+> > btw, is there an original dxpc license? I haven't seen anything but a
+> > copyright notice, which to my non-lawyerly mind translates as "free to
+> > all the world as is, negotiate with copyright owner if modifying or
+> > including in some other product".
+> 
+> The copyright banner in the Readme is all the documentation there's ever
+> been.   My intent was to allow _any_ distribution, use, and modification
+> of the source, without imposing restrictions on the licensing style of
+> any system into which others might incorporate the code.   We probably
+> should start stating this clearly in the distributions.
+> 
+> -brian
+> 
+> [prev in list] [next in list] [prev in thread] [next in thread]
+
+@Kevin: You are very awesome!
+
+@Francesco: that old post from Brian should be the statement we need, right? As Brian has not answered back, so far, does that post suffice?
+
+I also had a mail from Zach in my mailbox this morning. I managed to get hold of him via phone over the weekend. He posted his agreement to this Debian bug (as message #77) [1] earlier today. @Zach: thanks a lot for that!!!
+
+@Francesco: by looking at [2], I cannot see any hint for Gian Filippo Pinzari being a copyright holder of DXPC. This is stated in the NoMachine files at at least one place, but not in the latest DXPC upstream release. I am on my mobile right now, need to check old versions of DXPC, but if Gian Filippo Pinzari is not listed in the DXPC 3.7.0 release (where nxcomp obviously got forked from), then I think that we don't require his feedback, right?
+
+To my opinion, this issue can be settled. We have direct feedback from Kevin and Zach and Kevin dug out an old post from Brian stating the retroactive nature of the BSD-2-clause while Gian Filippo probably not being a real copyright holder of the original DXPC code. Right?
+
+light+love,
+Mike
+
+[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=77;att=0;bug=784565
+[2] http://www.vigor.nu/dxpc/README
+
+
+-- 
+
+DAS-NETZWERKTEAM
+mike gabriel, herweg 7, 24357 fleckeby
+fon: +49 (1520) 1976148
+
+GnuPG Key ID 0x25771B13
+mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
+
+
+
+
+From invernomuto@paranoici.org Mon May 18 22:15:14 2015
+Received: (at 784565) by bugs.debian.org; 18 May 2015 22:15:14 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-12.0 required=4.0 tests=BAYES_00,DKIM_SIGNED,
+	DKIM_VALID,DKIM_VALID_AU,FOURLA,HAS_BUG_NUMBER,PGPSIGNATURE,SPF_HELO_PASS,
+	SPF_PASS autolearn=ham autolearn_force=no
+	version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 12; hammy, 150; neutral, 220; spammy,
+	0. spammytokens: hammytokens:0.000-+--H*UA:sk:x86_64-,
+	0.000-+--H*x:sk:x86_64-, 0.000-+--H*c:PGP-SHA256, 0.000-+--H*c:SignHturH,
+	0.000-+--H*c:pgp-signature
+Return-path: <invernomuto@paranoici.org>
+Received: from latitanza.investici.org ([82.94.249.234])
+	by buxtehude.debian.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256)
+	(Exim 4.80)
+	(envelope-from <invernomuto@paranoici.org>)
+	id 1YuTJa-0002xP-0G
+	for 784565@bugs.debian.org; Mon, 18 May 2015 22:15:14 +0000
+Received: from [82.94.249.234] (latitanza [82.94.249.234]) (Authenticated sender: invernomuto@paranoici.org) by localhost (Postfix) with ESMTPSA id 921B3120546;
+	Mon, 18 May 2015 22:15:05 +0000 (UTC)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paranoici.org;
+	s=stigmate; t=1431987305;
+	bh=RQEA/1bkAQ71T0PpK/7XelDXEZBLyoVavVl9tpWLzWY=;
+	h=Date:From:To:Cc:Subject:In-Reply-To:References;
+	b=sO+MOEv4mZZNK2g5Om9IC7Og5k2qPAvFepN+ei+3/jCixgNBbvaLuRpMgJw6l1yjD
+	 hpqRYIxtNgyVywgpuiFVACFBuDn1ksfdFrEPNAcgRl//Sert2aOjetbZcKi1VouhXi
+	 eexR8IP81C0C1UjzjeC7zEmF5V+wSyhVs9jKvKfg=
+Received: from frx by homebrew with local (Exim 4.85)
+	(envelope-from <invernomuto@paranoici.org>)
+	id 1YuTIi-0002Se-TN; Tue, 19 May 2015 00:14:20 +0200
+Date: Tue, 19 May 2015 00:14:08 +0200
+From: Francesco Poli <invernomuto@paranoici.org>
+To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Cc: Kevin Vigor <kevin@vigor.nu>, 784565@bugs.debian.org,
+ nito.martinez@qindel.com, x2go-dev@lists.x2go.org,
+ opensource@gznianguan.com, zvonler@gmail.com
+Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: nx-libs-lite: parts
+ are derived from non-free code
+Message-Id: <20150519001408.8e5452a098db48d6867af6cb@paranoici.org>
+In-Reply-To: <1431985731.1406.2.camel@Nokia-N900>
+References: <20150506173532.7531.31389.reportbug@homebrew>
+	<20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
+	<20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
+	<20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
+	<55521444.9090407@vigor.nu>
+	<1431445315.4712.7.camel@Nokia-N900>
+	<20150512234048.054319a449ffadcf87577425@paranoici.org>
+	<20150514045809.Horde.-3NIZzBnA5V5B6a721F2kg2@mail.das-netzwerkteam.de>
+	<20150516091912.Horde.W_1Szu5msccGYo-Ndwv3cg1@mail.das-netzwerkteam.de>
+	<555A558E.1020703@vigor.nu>
+	<1431985731.1406.2.camel@Nokia-N900>
+X-Mailer: Sylpheed 3.5.0beta1 (GTK+ 2.24.25; x86_64-pc-linux-gnu)
+Mime-Version: 1.0
+Content-Type: multipart/signed; protocol="application/pgp-signature";
+ micalg="PGP-SHA256";
+ boundary="Signature=_Tue__19_May_2015_00_14_08_+0200_Wl9eJ95DZcVokEvx"
+
+--Signature=_Tue__19_May_2015_00_14_08_+0200_Wl9eJ95DZcVokEvx
+Content-Type: text/plain; charset=US-ASCII
+Content-Disposition: inline
+Content-Transfer-Encoding: quoted-printable
+
+On Mon, 18 May 2015 23:48:51 +0200 Mike Gabriel wrote:
+
+[...]
+> @Francesco: that old post from Brian should be the statement we need,
+> right? As Brian has not answered back, so far, does that post suffice?
+
+Yes, I am under the impression that it may be considered as evidence
+that Brian had always meant to grant permission to modify, despite not
+being overly clear until DXPC version 3.8.1.
+In other words, it seems that the re-licensing was more intended to be
+a clarification, rather than a change of mind.
+
+>=20
+> I also had a mail from Zach in my mailbox this morning. I managed to
+> get hold of him via phone over the weekend. He posted his agreement
+> to this Debian bug (as message #77) [1] earlier today. @Zach: thanks
+> a lot for that!!!
+
+This is really great!
+
+>=20
+> @Francesco: by looking at [2], I cannot see any hint for Gian Filippo
+> Pinzari being a copyright holder of DXPC. This is stated in the
+> NoMachine files at at least one place, but not in the latest DXPC
+> upstream release. I am on my mobile right now, need to check old
+> versions of DXPC, but if Gian Filippo Pinzari is not listed in
+> the DXPC 3.7.0 release (where nxcomp obviously got forked from),
+> then I think that we don't require his feedback, right?
+
+If it is confirmed that Gian Filippo contributed to the forking of DXPC
+within the NoMachine project, but not directly to DXPC, then I think
+that he made his contributions available under the terms of the GPL v2
+of the NoMachine project.
+If this is the case, no feedback should be required from his side.
+
+>=20
+> To my opinion, this issue can be settled. We have direct feedback
+> from Kevin and Zach and Kevin dug out an old post from Brian stating
+> the retroactive nature of the BSD-2-clause while Gian Filippo probably
+> not being a real copyright holder of the original DXPC code. Right?
+
+Yes, I agree with this analysis.
+The only missing check is the one about Gian Filippo's involvement (as
+explained above).
+
+Thanks a lot to everyone involved in this license fixing effort!
+Bye.
+
+>=20
+> [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=3D77;att=3D0;bug=3D=
+784565
+> [2] http://www.vigor.nu/dxpc/README
+
+
+
+--=20
+ http://www.inventati.org/frx/
+ There's not a second to spare! To the laboratory!
+..................................................... Francesco Poli .
+ GnuPG key fpr =3D=3D CA01 1147 9CD2 EFDF FB82  3925 3E1C 27E1 1F69 BFFE
+
+--Signature=_Tue__19_May_2015_00_14_08_+0200_Wl9eJ95DZcVokEvx
+Content-Type: application/pgp-signature
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVWmQ1AAoJED4cJ+Efab/+FowQALSZya0Xp8IXNA+d0gjQBLGQ
+7eDzaX+kPVKkbYdb7ZDlQF+ZVTwjOnqjf1dDLXWSHwcXYhFd3DeeFB11QfAKXptI
+GyzOt/vrh+w1K2zMb4rR9lxyUKIrKmVI6aOxyRTP7ojqkqqFvpF7ZVkDJZBFCSvx
+LXdAWTaz5NLIH5R4lzvTcTFYmC3JhBtf8m58l4jT3GC1pxoqlYQk0svWOrdlULQZ
+zh1dy6Sf0guwMuOH4pfreTKlNIizFj7BwanoN+tNvYG1sbQnyIwNRKUfG+v5/13P
+3tyjknNDTTE67T40qSv6pcZs46vqMTevL8E+s+wGfcvdKQ5Y2fPQ8Q9yxS6cVxH2
+DXsLV97RFCcdD+ys+7P9j7xYG0e38juu61sU42cNmrb5iU0woB3SJtFvABhioGZg
+TLFi/OxOT6ZTHcZtfwqozVyB1fOesqx3nvwCEE3pNuf58ErxRy1sIXwoChNL4+eo
+ET1kojXBXHER6W6EHno0yz600sJXHE8rco+fv5b5qGBHdLEJ0k80YXQI4FhJQT69
+I8FyASmNX4u6HvH6hRVm2BwE9WrZTUUQRb0m/pEfZVVroiRrqTl/ntvWchXvI2Tt
+IGfoDMtmVbSkh+2DQmsG9oDqiG1pCt3eNkLa1oftlQ7oIQem2MajCOS4QN20PMpU
+d/smtrrNvkmiWuQrjwDF
+=R0ou
+-----END PGP SIGNATURE-----
+
+--Signature=_Tue__19_May_2015_00_14_08_+0200_Wl9eJ95DZcVokEvx--
+
+
+
+From kevin@vigor.nu Tue May 19 01:41:18 2015
+Received: (at 784565) by bugs.debian.org; 19 May 2015 01:41:18 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-6.9 required=4.0 tests=BAYES_00,FOURLA,
+	HAS_BUG_NUMBER,SPF_PASS autolearn=ham autolearn_force=no
+	version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 26; hammy, 131; neutral, 46; spammy,
+	0. spammytokens: hammytokens:0.000-+--H*UA:31.6.0, 0.000-+--H*u:31.6.0,
+	0.000-+--H*f:sk:2015050, 0.000-+--H*UA:31.0, 0.000-+--H*u:31.0
+Return-path: <kevin@vigor.nu>
+Received: from gateway32.websitewelcome.com ([192.185.145.107])
+	by buxtehude.debian.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256)
+	(Exim 4.80)
+	(envelope-from <kevin@vigor.nu>)
+	id 1YuWX0-0002lG-Du
+	for 784565@bugs.debian.org; Tue, 19 May 2015 01:41:18 +0000
+Received: by gateway32.websitewelcome.com (Postfix, from userid 500)
+	id 311BBD143B8C; Mon, 18 May 2015 20:16:29 -0500 (CDT)
+Received: from gator4058.hostgator.com (gator4058.hostgator.com [192.185.4.69])
+	by gateway32.websitewelcome.com (Postfix) with ESMTP id 2F036D143B72
+	for <784565@bugs.debian.org>; Mon, 18 May 2015 20:16:29 -0500 (CDT)
+Received: from [98.202.128.111] (port=49655 helo=[192.168.7.118])
+	by gator4058.hostgator.com with esmtpsa (UNKNOWN:DHE-RSA-AES128-SHA:128)
+	(Exim 4.82)
+	(envelope-from <kevin@vigor.nu>)
+	id 1YuW8y-0004Tt-DX; Mon, 18 May 2015 20:16:28 -0500
+Message-ID: <555A8EE9.9000503@vigor.nu>
+Date: Mon, 18 May 2015 19:16:25 -0600
+From: Kevin Vigor <kevin@vigor.nu>
+User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0
+MIME-Version: 1.0
+To: Francesco Poli <invernomuto@paranoici.org>, 
+ Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+CC: 784565@bugs.debian.org, nito.martinez@qindel.com, 
+ x2go-dev@lists.x2go.org, opensource@gznianguan.com, zvonler@gmail.com
+Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: nx-libs-lite: parts
+ are derived from non-free code
+References: <20150506173532.7531.31389.reportbug@homebrew>	<20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>	<20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>	<20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>	<55521444.9090407@vigor.nu>	<1431445315.4712.7.camel@Nokia-N900>	<20150512234048.054319a449ffadcf87577425@paranoici.org>	<20150514045809.Horde.-3NIZzBnA5V5B6a721F2kg2@mail.das-netzwerkteam.de>	<20150516091912.Horde.W_1Szu5msccGYo-Ndwv3cg1@mail.das-netzwerkteam.de>	<555A558E.1020703@vigor.nu>	<1431985731.1406.2.camel@Nokia-N900> <20150519001408.8e5452a098db48d6867af6cb@paranoici.org>
+In-Reply-To: <20150519001408.8e5452a098db48d6867af6cb@paranoici.org>
+Content-Type: text/plain; charset=windows-1252; format=flowed
+Content-Transfer-Encoding: 7bit
+X-AntiAbuse: This header was added to track abuse, please include it with any abuse report
+X-AntiAbuse: Primary Hostname - gator4058.hostgator.com
+X-AntiAbuse: Original Domain - bugs.debian.org
+X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12]
+X-AntiAbuse: Sender Address Domain - vigor.nu
+X-BWhitelist: no
+X-Source-IP: 98.202.128.111
+X-Exim-ID: 1YuW8y-0004Tt-DX
+X-Source: 
+X-Source-Args: 
+X-Source-Dir: 
+X-Source-Sender: ([192.168.7.118]) [98.202.128.111]:49655
+X-Source-Auth: kevin@vigor.nu
+X-Email-Count: 3
+X-Source-Cap: a3ZpZ29yO2t2aWdvcjtnYXRvcjQwNTguaG9zdGdhdG9yLmNvbQ==
+X-Greylist: delayed 1487 seconds by postgrey-1.34 at buxtehude; Tue, 19 May 2015 01:41:18 UTC
+
+On 5/18/2015 4:14 PM, Francesco Poli wrote:
+> If it is confirmed that Gian Filippo contributed to the forking of 
+> DXPC within the NoMachine project, but not directly to DXPC, then I 
+> think that he made his contributions available under the terms of the 
+> GPL v2 of the NoMachine project. If this is the case, no feedback 
+> should be required from his side.
+I can confirm that Gian Fillippo never contributed directly to DXPC. 
+You'll note his name does not appear in the DXPC README, and never has.
+
+
+
+From mike.gabriel@das-netzwerkteam.de Tue May 19 08:15:28 2015
+Received: (at 784565) by bugs.debian.org; 19 May 2015 08:15:28 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-11.9 required=4.0 tests=BAYES_00,FOURLA,
+	HAS_BUG_NUMBER,PGPSIGNATURE,T_RP_MATCHES_RCVD autolearn=ham
+	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 24; hammy, 150; neutral, 195; spammy,
+	0. spammytokens: hammytokens:0.000-+--H*c:pgp-signature,
+	0.000-+--H*c:protocol, 0.000-+--H*c:micalg, 0.000-+--H*c:signed,
+	0.000-+--H*RU:sk:grimnir
+Return-path: <mike.gabriel@das-netzwerkteam.de>
+Received: from freya.das-netzwerkteam.de ([88.198.48.199])
+	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
+	(Exim 4.80)
+	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
+	id 1YucgR-0008T9-K0
+	for 784565@bugs.debian.org; Tue, 19 May 2015 08:15:28 +0000
+Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
+	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id 7D1773C96;
+	Tue, 19 May 2015 10:15:23 +0200 (CEST)
+Received: from localhost (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 08FEE3BFD5;
+	Tue, 19 May 2015 10:15:23 +0200 (CEST)
+X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
+Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
+	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id MW9pv+xO3WwY; Tue, 19 May 2015 10:15:22 +0200 (CEST)
+Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPS id 97FCC3C2AA;
+	Tue, 19 May 2015 10:15:12 +0200 (CEST)
+Received: from bifrost.das-netzwerkteam.de (bifrost.das-netzwerkteam.de
+ [178.62.101.154]) by mail.das-netzwerkteam.de (Horde Framework) with HTTP;
+ Tue, 19 May 2015 08:15:12 +0000
+Date: Tue, 19 May 2015 08:15:12 +0000
+Message-ID: <20150519081512.Horde.36QI-nOdkbpWsXrDE4E8Yw1@mail.das-netzwerkteam.de>
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+To: Kevin Vigor <kevin@vigor.nu>, 784565@bugs.debian.org, Francesco Poli
+ <invernomuto@paranoici.org>
+Cc: opensource@gznianguan.com, zvonler@gmail.com, nito.martinez@qindel.com,
+ x2go-dev@lists.x2go.org
+Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: Bug#784565:
+ nx-libs-lite: parts are derived from non-free code
+References: <20150506173532.7531.31389.reportbug@homebrew>
+ <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
+ <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
+ <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
+ <55521444.9090407@vigor.nu> <1431445315.4712.7.camel@Nokia-N900>
+ <20150512234048.054319a449ffadcf87577425@paranoici.org>
+ <20150514045809.Horde.-3NIZzBnA5V5B6a721F2kg2@mail.das-netzwerkteam.de>
+ <20150516091912.Horde.W_1Szu5msccGYo-Ndwv3cg1@mail.das-netzwerkteam.de>
+ <555A558E.1020703@vigor.nu> <1431985731.1406.2.camel@Nokia-N900>
+ <20150519001408.8e5452a098db48d6867af6cb@paranoici.org>
+ <555A8EE9.9000503@vigor.nu>
+In-Reply-To: <555A8EE9.9000503@vigor.nu>
+User-Agent: Internet Messaging Program (IMP) H5 (6.2.2)
+Accept-Language: de,en
+Organization: DAS-NETZWERKTEAM
+X-Originating-IP: 178.62.101.154
+X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:32.0) Gecko/20100101
+ Firefox/32.0 Iceweasel/32.0
+Content-Type: multipart/signed; boundary="=_AI4511z4pP7yPmTeeGgEoA6";
+ protocol="application/pgp-signature"; micalg=pgp-sha1
+MIME-Version: 1.0
+
+This message is in MIME format and has been PGP signed.
+
+--=_AI4511z4pP7yPmTeeGgEoA6
+Content-Type: text/plain; charset=us-ascii; format=flowed; DelSp=Yes
+Content-Disposition: inline
+Content-Transfer-Encoding: quoted-printable
+
+Hi Kevin, hi Frederico,
+
+On  Di 19 Mai 2015 03:16:25 CEST, Kevin Vigor wrote:
+
+> On 5/18/2015 4:14 PM, Francesco Poli wrote:
+>> If it is confirmed that Gian Filippo contributed to the forking of=20=20
+>>=20DXPC within the NoMachine project, but not directly to DXPC, then I=20=
+=20
+>>=20think that he made his contributions available under the terms of=20=
+=20
+>>=20the GPL v2 of the NoMachine project. If this is the case, no=20=20
+>>=20feedback should be required from his side.
+
+> I can confirm that Gian Fillippo never contributed directly to DXPC.=20=
+=20
+>=20You'll note his name does not appear in the DXPC README, and never=20=
+=20
+>=20has.
+
+@Kevin: This is again good news for sorting out this issue. Thanks a=20=20
+lot=20for your help, Kevin.
+
+@Frederico: I guess we are through then. Thanks for helping with=20=20
+clarifying=20the situation (and bringing it up in the first place).
+
+For fixing this issue (in terms of closing the bug), I propose this=20=20
+for=20downstream (i.e., Debian):
+
+   o copy bug_784565.mbox [1] into the debian/ folder of the=20=20
+nx-libs-lite=20package
+   o upload some latest release of nx-libs-lite 3.5.0.x to unstable
+   o update debian/copyright accordingly
+   o close this bug via debian/changelog
+
+For upstream, I propose this:
+
+   o copy bug_784565.mbox into the docs/ folder
+   o update copyright information in nxcomp/ subfolder
+   o provide some README or such that shortly explains our last weeks' proc=
+ess
+   o this will be for the upcoming 3.6.x release series of nx-libs
+
+   o this should also be backported to the 3.5.x release series
+
+Once the mbox file and README are upstreamed, I will drop that content=20=
+=20
+from=20the debian/ folder in the Debian package nx-libs-lite (as it will=20=
+=20
+be=20in the upstream tarball of nx-libs-lite).
+
+Feedback (esp. from Frederico), concerns, other suggestions?
+
+Greets,
+Mike
+
+
+[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?mbox=3Dyes;bug=3D784565
+--=20
+
+DAS-NETZWERKTEAM
+mike=20gabriel, herweg 7, 24357 fleckeby
+fon: +49 (1520) 1976 148
+
+GnuPG Key ID 0x25771B31
+mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
+
+freeBusy:
+https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x=
+fb
+
+--=_AI4511z4pP7yPmTeeGgEoA6
+Content-Type: application/pgp-signature
+Content-Description: Digitale PGP-Signatur
+Content-Disposition: inline
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJVWvEQAAoJEJr0azAldxsxiZgP/1MhcK1h2or3zG3P9h3oOqFk
+rsknSn/0paY8HlzggWh5N4juLU9ET/VyO+xMCbVFDXb9jv5ryRI0MinPGwp6ujTl
+DxHAz5q5YrC/NYH9IU0PqL2Zja952xbjlVPgf64+iLT0kqFmY7L48bkxVXd4cKnJ
+flflATeaPTcVgIVcfFte2q/NJV7AAGjwb/tEOOMbqrRYOu1hKLozWnRSLZ/rdl5V
+OmktCjfAfw6Cvy4/IN6pCjG4uqFvsWvzjMofR53MLuy8cwQhtpvK9KPLCZlo9Efm
+KyrFNl866Egmc/HTLQkSaOJOKartANw+Ev7qsVi30OJOEWh9T1fDjnFvLn6hesKf
+9pAS/+mkuCUVNjLI/ATZAwY93bzBS+vo7fya2D/DxDk8FoLIe7XdI9GABdTE2U0H
+eyNLb/Lq485BEQEu9ThtvACZYH3F3UqA7OcFfLKyVw2lsOJV7SN3KCl76te4iNcf
+UlVzVr211lKhGTV9hLF3daKntu1H3jQku9zLK9ShJR6bYTpCAsGi2h2xzZm5PLDE
+9tbf+qUmDn3lp4uMaBtBdtq+yt47Wk95iS41x/qyvy0PK/RdnPxTpfdbriu4+1l2
+ij6Dq5bb7GckZDmpVjSsGSr4jjWtJ5QrnZbpv/u/v3+wliZL0c+CScrA+5I/qJeI
+eGXnQIwqcWE/2/AcAz2r
+=Q2/H
+-----END PGP SIGNATURE-----
+
+--=_AI4511z4pP7yPmTeeGgEoA6--
+
+
+
+
+From invernomuto@paranoici.org Wed May 20 18:04:34 2015
+Received: (at 784565) by bugs.debian.org; 20 May 2015 18:04:34 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-12.0 required=4.0 tests=BAYES_00,DKIM_SIGNED,
+	DKIM_VALID,DKIM_VALID_AU,FOURLA,HAS_BUG_NUMBER,PGPSIGNATURE,SPF_HELO_PASS,
+	SPF_PASS autolearn=ham autolearn_force=no
+	version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 11; hammy, 150; neutral, 212; spammy,
+	0. spammytokens: hammytokens:0.000-+--H*UA:sk:x86_64-,
+	0.000-+--H*x:sk:x86_64-, 0.000-+--H*c:PGP-SHA256, 0.000-+--H*c:SignHturH,
+	0.000-+--H*c:pgp-signature
+Return-path: <invernomuto@paranoici.org>
+Received: from latitanza.investici.org ([82.94.249.234])
+	by buxtehude.debian.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256)
+	(Exim 4.80)
+	(envelope-from <invernomuto@paranoici.org>)
+	id 1Yv8M4-00011u-4i
+	for 784565@bugs.debian.org; Wed, 20 May 2015 18:04:34 +0000
+Received: from [82.94.249.234] (latitanza [82.94.249.234]) (Authenticated sender: invernomuto@paranoici.org) by localhost (Postfix) with ESMTPSA id C5F33121147;
+	Wed, 20 May 2015 18:04:24 +0000 (UTC)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paranoici.org;
+	s=stigmate; t=1432145064;
+	bh=kDc9DoBw4hJZuuDTXyurpbInn9fdFF6IfH4jMVGqQB4=;
+	h=Date:From:To:Cc:Subject:In-Reply-To:References;
+	b=frjvhV6NrKV9TyZSGeK6evsHeI9sAgoPOPboFwSAIij0bPp1G5rCLaVWFjD1RtFsK
+	 j+6I/XZ60KTIjiXaQGqqznF3jU2dQ/lzPkj1VYKa9Kmt1pw4UhJvU+mbyrO6cX2mSi
+	 52Wi1of3M+l/UT9DYKjXgzMRuWkYoAq4tmsOe9jY=
+Received: from frx by homebrew with local (Exim 4.85)
+	(envelope-from <invernomuto@paranoici.org>)
+	id 1Yv8LB-0001gi-7y; Wed, 20 May 2015 20:03:37 +0200
+Date: Wed, 20 May 2015 20:03:25 +0200
+From: Francesco Poli <invernomuto@paranoici.org>
+To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Cc: Kevin Vigor <kevin@vigor.nu>, 784565@bugs.debian.org,
+ opensource@gznianguan.com, zvonler@gmail.com, nito.martinez@qindel.com,
+ x2go-dev@lists.x2go.org
+Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: Bug#784565:
+ nx-libs-lite: parts are derived from non-free code
+Message-Id: <20150520200325.6641876f5b4b2f483bdaea7d@paranoici.org>
+In-Reply-To: <20150519081512.Horde.36QI-nOdkbpWsXrDE4E8Yw1@mail.das-netzwerkteam.de>
+References: <20150506173532.7531.31389.reportbug@homebrew>
+	<20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
+	<20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
+	<20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
+	<55521444.9090407@vigor.nu>
+	<1431445315.4712.7.camel@Nokia-N900>
+	<20150512234048.054319a449ffadcf87577425@paranoici.org>
+	<20150514045809.Horde.-3NIZzBnA5V5B6a721F2kg2@mail.das-netzwerkteam.de>
+	<20150516091912.Horde.W_1Szu5msccGYo-Ndwv3cg1@mail.das-netzwerkteam.de>
+	<555A558E.1020703@vigor.nu>
+	<1431985731.1406.2.camel@Nokia-N900>
+	<20150519001408.8e5452a098db48d6867af6cb@paranoici.org>
+	<555A8EE9.9000503@vigor.nu>
+	<20150519081512.Horde.36QI-nOdkbpWsXrDE4E8Yw1@mail.das-netzwerkteam.de>
+X-Mailer: Sylpheed 3.5.0beta1 (GTK+ 2.24.25; x86_64-pc-linux-gnu)
+Mime-Version: 1.0
+Content-Type: multipart/signed; protocol="application/pgp-signature";
+ micalg="PGP-SHA256";
+ boundary="Signature=_Wed__20_May_2015_20_03_25_+0200__3Vr7Ml7uHmX7EzV"
+
+--Signature=_Wed__20_May_2015_20_03_25_+0200__3Vr7Ml7uHmX7EzV
+Content-Type: text/plain; charset=US-ASCII
+Content-Disposition: inline
+Content-Transfer-Encoding: quoted-printable
+
+On Tue, 19 May 2015 08:15:12 +0000 Mike Gabriel wrote:
+
+[...]
+> @Frederico: I guess we are through then.
+
+Yes, it seems so (I'm assuming you meant to direct this question to
+me...).
+
+> Thanks for helping with =20
+> clarifying the situation (and bringing it up in the first place).
+
+You're welcome!
+Thanks to you and all the involved people for helping to solve this
+issue.
+
+>=20
+> For fixing this issue (in terms of closing the bug), I propose this =20
+> for downstream (i.e., Debian):
+>=20
+>    o copy bug_784565.mbox [1] into the debian/ folder of the =20
+> nx-libs-lite package
+
+Maybe the entire bug log is an overkill...
+I would include the relevant replies only. For instance:
+https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=3D40;mbox=3Dyes;bug=3D784=
+565
+https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=3D77;mbox=3Dyes;bug=3D784=
+565
+https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=3D87;mbox=3Dyes;bug=3D784=
+565
+https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=3D102;mbox=3Dyes;bug=3D78=
+4565
+
+>    o upload some latest release of nx-libs-lite 3.5.0.x to unstable
+>    o update debian/copyright accordingly
+
+In the debian/copyright file the license for the original DXPC code
+should be replaced with the 2-clause BSD license (currently adopted for
+DXPC) with a comment saying something like:
+
+  The original DXPC code used to be available under a license which
+  failed to explicitly grant the permission to modify, but was later
+  retroactively re-licensed under the 2-clause BSD license (see
+  debian/bug_784565_*.mbox for the copyright owners' statements; see
+  <https://bugs.debian.org/784565> for more details)
+
+Moreover, the copyright notice of Gian Filippo Pinzari should be
+documented in some more appropriate part of the debian/copyright file,
+associated with the NoMachine license (GPL v2 or later).
+
+>    o close this bug via debian/changelog
+>=20
+> For upstream, I propose this:
+>=20
+>    o copy bug_784565.mbox into the docs/ folder
+
+Again, I would not include the entire bug log, but only the relevant
+messages (see above)...
+
+>    o update copyright information in nxcomp/ subfolder
+>    o provide some README or such that shortly explains our last weeks' pr=
+ocess
+>    o this will be for the upcoming 3.6.x release series of nx-libs
+>=20
+>    o this should also be backported to the 3.5.x release series
+
+
+Thanks to everyone involved!
+Bye.
+
+--=20
+ http://www.inventati.org/frx/
+ There's not a second to spare! To the laboratory!
+..................................................... Francesco Poli .
+ GnuPG key fpr =3D=3D CA01 1147 9CD2 EFDF FB82  3925 3E1C 27E1 1F69 BFFE
+
+--Signature=_Wed__20_May_2015_20_03_25_+0200__3Vr7Ml7uHmX7EzV
+Content-Type: application/pgp-signature
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVXMxyAAoJED4cJ+Efab/+yUsP/RWzC9NoVGF7UnEIEpJODu0u
+hVkX1zjpJ+iMByHVlatR90ulKwkvVb4d354YJqyI0VM2wUtif6XBoroB0K3i6vZE
+DsxugBlzhnH8jgpPVKbOyBKshpKKZsUbvDdEXM20ZkfI4xwokymiSdHOKoHH4ZHS
+WN9q+i6OezfWvZSKQ+VCbe7QiQABAcB+zCdVvUWevhNqMDKdhsDC03Ju+5YZQbse
+QbgYSazZvJouLPamivquh8nBdjGpPxqAJGrlUu3SR5slJxRojRvl2cl/CDFEQEQR
+gbLMnnr2nj1hF4JI2WaWCSX90NrGTfGxCN4IdNd7tmjtkg5lB+KFx63YjHbLmUl/
+k87XAyXxSWyGvc7M2xyIXBQQrHtRxtK0rdN+e7ht9PcXYyxUtQzr7vfPwvI+B2GV
+M23ZUoyV1rFp5JymbUL4Vk6pq/hLnv9FzwOySNVcj6Pt8eT+BcoSbwOI1AMq1P1S
+wCs/PhEGBA3TDWERXF0Fb7x24NEf7EdjmzKTGGdXTCfSkacxkGzsMaRpWb0D6IaV
+tSI6CmBQ9uOdkbiNDhGX4esosyJZJQ9GrnWX9d/lTs9wXUHHykvnYRbDzpkChZdI
+ICqc+IxnPmX6HU2kyq2ZAzfhx/drqLizcv0gQlyY6APjRu3EQ3tapR9kYB6BcuGU
+cMLlO0549ekk8/s3Zk0i
+=9Hew
+-----END PGP SIGNATURE-----
+
+--Signature=_Wed__20_May_2015_20_03_25_+0200__3Vr7Ml7uHmX7EzV--
+
+
+
+From mike.gabriel@das-netzwerkteam.de Thu May 21 09:35:35 2015
+Received: (at 784565) by bugs.debian.org; 21 May 2015 09:35:35 +0000
+X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
+	(2014-02-07) on buxtehude.debian.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-11.9 required=4.0 tests=BAYES_00,FOURLA,
+	HAS_BUG_NUMBER,PGPSIGNATURE,T_RP_MATCHES_RCVD autolearn=ham
+	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
+X-Spam-Bayes: score:0.0000 Tokens: new, 15; hammy, 150; neutral, 222; spammy,
+	0. spammytokens: hammytokens:0.000-+--H*c:pgp-signature,
+	0.000-+--H*c:protocol, 0.000-+--H*c:micalg, 0.000-+--H*c:signed,
+	0.000-+--H*RU:sk:grimnir
+Return-path: <mike.gabriel@das-netzwerkteam.de>
+Received: from freya.das-netzwerkteam.de ([88.198.48.199])
+	by buxtehude.debian.org with esmtps (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256)
+	(Exim 4.80)
+	(envelope-from <mike.gabriel@das-netzwerkteam.de>)
+	id 1YvMt4-0006Ry-Ri
+	for 784565@bugs.debian.org; Thu, 21 May 2015 09:35:35 +0000
+Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98])
+	by freya.das-netzwerkteam.de (Postfix) with ESMTPS id 89FD21F2;
+	Thu, 21 May 2015 11:35:31 +0200 (CEST)
+Received: from localhost (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id C86AC3BAE9;
+	Thu, 21 May 2015 11:35:30 +0200 (CEST)
+X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de
+Received: from grimnir.das-netzwerkteam.de ([127.0.0.1])
+	by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id GqfEjOoeH2CA; Thu, 21 May 2015 11:35:30 +0200 (CEST)
+Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1])
+	by grimnir.das-netzwerkteam.de (Postfix) with ESMTPS id 615DC3BAB2;
+	Thu, 21 May 2015 11:35:30 +0200 (CEST)
+Received: from bifrost.das-netzwerkteam.de (bifrost.das-netzwerkteam.de
+ [178.62.101.154]) by mail.das-netzwerkteam.de (Horde Framework) with HTTP;
+ Thu, 21 May 2015 09:35:30 +0000
+Date: Thu, 21 May 2015 09:35:30 +0000
+Message-ID: <20150521093530.Horde.Oeys0xv-mTUN5U5IZtdeLA1@mail.das-netzwerkteam.de>
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+To: Francesco Poli <invernomuto@paranoici.org>, 784565@bugs.debian.org
+Cc: nito.martinez@qindel.com, opensource@gznianguan.com
+Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: Bug#784565:
+ Bug#784565: nx-libs-lite: parts are derived from non-free code
+References: <20150506173532.7531.31389.reportbug@homebrew>
+ <20150511092636.Horde.oj6sHKnvQDt85T3EW1WhVA1@mail.das-netzwerkteam.de>
+ <20150511213659.34dce0505c493c1e23d2c3ee@paranoici.org>
+ <20150512044637.Horde.8WHdvRpU7GS9Szy323gv_Q2@mail.das-netzwerkteam.de>
+ <55521444.9090407@vigor.nu> <1431445315.4712.7.camel@Nokia-N900>
+ <20150512234048.054319a449ffadcf87577425@paranoici.org>
+ <20150514045809.Horde.-3NIZzBnA5V5B6a721F2kg2@mail.das-netzwerkteam.de>
+ <20150516091912.Horde.W_1Szu5msccGYo-Ndwv3cg1@mail.das-netzwerkteam.de>
+ <555A558E.1020703@vigor.nu> <1431985731.1406.2.camel@Nokia-N900>
+ <20150519001408.8e5452a098db48d6867af6cb@paranoici.org>
+ <555A8EE9.9000503@vigor.nu>
+ <20150519081512.Horde.36QI-nOdkbpWsXrDE4E8Yw1@mail.das-netzwerkteam.de>
+ <20150520200325.6641876f5b4b2f483bdaea7d@paranoici.org>
+In-Reply-To: <20150520200325.6641876f5b4b2f483bdaea7d@paranoici.org>
+User-Agent: Internet Messaging Program (IMP) H5 (6.2.2)
+Accept-Language: de,en
+Organization: DAS-NETZWERKTEAM
+X-Originating-IP: 178.62.101.154
+X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:32.0) Gecko/20100101
+ Firefox/32.0 Iceweasel/32.0
+Content-Type: multipart/signed; boundary="=_5hM8_j7kivGPCYTZql9Fug5";
+ protocol="application/pgp-signature"; micalg=pgp-sha1
+MIME-Version: 1.0
+
+This message is in MIME format and has been PGP signed.
+
+--=_5hM8_j7kivGPCYTZql9Fug5
+Content-Type: text/plain; charset=us-ascii; format=flowed; DelSp=Yes
+Content-Disposition: inline
+Content-Transfer-Encoding: quoted-printable
+
+Control: forwarded -1 https://github.com/ArcticaProject/nx-libs/issues/30
+
+Hi Francesco,
+
+On  Mi 20 Mai 2015 20:03:25 CEST, Francesco Poli wrote:
+
+> On Tue, 19 May 2015 08:15:12 +0000 Mike Gabriel wrote:
+>
+> [...]
+>> @Frederico: I guess we are through then.
+>
+> Yes, it seems so (I'm assuming you meant to direct this question to
+> me...).
+
+Yes. :-)
+
+>> For fixing this issue (in terms of closing the bug), I propose this
+>> for downstream (i.e., Debian):
+>>
+>>    o copy bug_784565.mbox [1] into the debian/ folder of the
+>> nx-libs-lite package
+>
+> Maybe the entire bug log is an overkill...
+> I would include the relevant replies only. For instance:
+> https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=3D40;mbox=3Dyes;bug=3D7=
+84565
+> https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=3D77;mbox=3Dyes;bug=3D7=
+84565
+> https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=3D87;mbox=3Dyes;bug=3D7=
+84565
+> https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=3D102;mbox=3Dyes;bug=3D=
+784565
+
+ACK.
+
+>>    o upload some latest release of nx-libs-lite 3.5.0.x to unstable
+>>    o update debian/copyright accordingly
+>
+> In the debian/copyright file the license for the original DXPC code
+> should be replaced with the 2-clause BSD license (currently adopted for
+> DXPC) with a comment saying something like:
+>
+>   The original DXPC code used to be available under a license which
+>   failed to explicitly grant the permission to modify, but was later
+>   retroactively re-licensed under the 2-clause BSD license (see
+>   debian/bug_784565_*.mbox for the copyright owners' statements; see
+>   <https://bugs.debian.org/784565> for more details)
+>
+> Moreover, the copyright notice of Gian Filippo Pinzari should be
+> documented in some more appropriate part of the debian/copyright file,
+> associated with the NoMachine license (GPL v2 or later).
+>
+>>    o close this bug via debian/changelog
+>>
+>> For upstream, I propose this:
+>>
+>>    o copy bug_784565.mbox into the docs/ folder
+>
+> Again, I would not include the entire bug log, but only the relevant
+> messages (see above)...
+>
+>>    o update copyright information in nxcomp/ subfolder
+>>    o provide some README or such that shortly explains our last=20=20
+>>=20weeks' process
+>>    o this will be for the upcoming 3.6.x release series of nx-libs
+>>
+>>    o this should also be backported to the 3.5.x release series
+
+Doing all the above now.
+
+Thanks to all,
+Mike
+
+--=20
+
+DAS-NETZWERKTEAM
+mike=20gabriel, herweg 7, 24357 fleckeby
+fon: +49 (1520) 1976 148
+
+GnuPG Key ID 0x25771B31
+mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
+
+freeBusy:
+https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x=
+fb
+
+--=_5hM8_j7kivGPCYTZql9Fug5
+Content-Type: application/pgp-signature
+Content-Description: Digitale PGP-Signatur
+Content-Disposition: inline
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJVXabiAAoJEJr0azAldxsxd4cP/in26lIPvdANMyDaqq3zQOMh
+n/Q+oZK5SYnHQP7vaS4mOWjTw5tCbfcUMcKwu1KpbgpUGOl9e1c/oKGxR3j5GWh3
+XiqQhPWEMf64OsM4vW5prJFrx0VNqfxykMWbGzQfs6Dz9ihJ6+HzVudOk3bfHwj2
+GahCflRo7xA1hJjwz5cIX1/WJaAF25TVSQ43jVpPu0pnAYOWvhOAZMpTJTZqRbgT
+peuFaiKE+NOb4C/WO9mkuO3wlEBZ5Ef/RinKQDlbV5/CZElEs1f42A4t5q909EVi
+U2PpaEis8BJAIKetl8g/bPoHh9u6X3tbeOKJlZBo5l2SMyLUG0sYsoAyhJKJtIvk
+gwdGdO71A7HLEJ6DfvE8vYXUPy9JEOQ6hhL2qeZOtJG2DZ2Qcoll9eK5scg2YutW
+ZXHRTYcCQeS4PQpvQPlCR5LuFTJeNBwJ0cWgtfXYPIrPMyeEZj/VP+Ypm82hBT+I
+JFjo80QjOEJ7uEM1wmn8nD0rbbP/NVf6ot/UcwlejC/XaYIlWDW5FrXf18UbGsvu
+VzaHkLbhbGUYedwsb50Uu6Nn4IX8IEcF3zbwnqmB5IlbPYV0UokjgtnKEIQbdmF4
+fQ5xe5u/p2aZTnQwt39vey2W/RxJVOHRjVVrYGv0eqgda8TYOWzI3UIjSYGfuLcU
+kDRest50Qfy4tmilPx3z
+=Cf5/
+-----END PGP SIGNATURE-----
+
+--=_5hM8_j7kivGPCYTZql9Fug5--
+
+
+
+
diff --git a/nxcomp/README.on-retroactive-DXPC-license b/nxcomp/README.on-retroactive-DXPC-license
index 9ff3c1db6..563c82b69 100644
--- a/nxcomp/README.on-retroactive-DXPC-license
+++ b/nxcomp/README.on-retroactive-DXPC-license
@@ -8,7 +8,7 @@ of DXPC as BSD-2-clause.
 This README file gives an overview of the discussion thread that lead to
 the retroactive re-licensing of DXPC.
 
-For the full discussion, see doc/DXPC_re-licensed::debbug_784565.mbox in
+For the full discussion, see doc/DXPC_re-licensed_debug_784565.mbox in
 this source project or #784565 on the Debian bug tracker [1].
 
 light+love,
-- 
cgit v1.2.3


From 2ffe52c5ecb7cf6af111c685eee7f8fcfd1139a9 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 22 Mar 2016 20:03:42 +0100
Subject: nxcomp: Properly define NX*Version(void) prototypes in NX.h.

Fixes ArcticaProject/nx-libs#104
---
 nxcomp/NX.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/NX.h b/nxcomp/NX.h
index 0e4734e5f..1ed8cb62d 100644
--- a/nxcomp/NX.h
+++ b/nxcomp/NX.h
@@ -450,11 +450,11 @@ extern void NXTransCleanup(void) __attribute__((noreturn));
  */
 extern void NXTransCleanupForReconnect(void);
 
-extern const char* NXVersion();
-extern int NXMajorVersion();
-extern int NXMinorVersion();
-extern int NXPatchVersion();
-extern int NXMaintenancePatchVersion();
+extern const char* NXVersion(void);
+extern int NXMajorVersion(void);
+extern int NXMinorVersion(void);
+extern int NXPatchVersion(void);
+extern int NXMaintenancePatchVersion(void);
 
 #ifdef __cplusplus
 }
-- 
cgit v1.2.3


From a9be6f59105b7cf29bb799556274dc2c3b3d2af8 Mon Sep 17 00:00:00 2001
From: Fernando Carvajal <fcarvajal@qindel.com>
Date: Tue, 12 Apr 2016 11:52:22 +0200
Subject: Remove compatibility code for nxcomp before 3.5.0

As a part of nxcomp's clean-up process, compatibility with old protocol
versions has been set now at 3.5.0.

This commit removes compatibility code from nxcomp so the minimum supported
version changes from 1.5.0 (protocol step 6) to 3.5.0 (protocol step 10).

At this moment the removal is not complete and it will be followed by some
other commits, in order to get rid of several components and files that are
no longer used as they were only needed to work with old protocol versions.

Refs: ArcticaProject/nx-libs#108
---
 nxcomp/Channel.cpp               | 186 +++---------
 nxcomp/ClientCache.cpp           |   7 -
 nxcomp/ClientCache.h             |  15 -
 nxcomp/ClientChannel.cpp         | 525 +++++----------------------------
 nxcomp/ClientChannel.h           |  40 ---
 nxcomp/ClientProxy.h             |  10 +-
 nxcomp/ClientStore.cpp           |  24 +-
 nxcomp/Control.cpp               | 107 ++-----
 nxcomp/Control.h                 |  50 ++--
 nxcomp/CreateGC.cpp              |  80 ++---
 nxcomp/DecodeBuffer.cpp          |  95 +-----
 nxcomp/DecodeBuffer.h            |  12 -
 nxcomp/EncodeBuffer.cpp          |  67 +----
 nxcomp/EncodeBuffer.h            |  12 -
 nxcomp/FillPoly.cpp              |  16 +-
 nxcomp/FillPoly.h                |  16 +-
 nxcomp/GenericChannel.h          |  24 +-
 nxcomp/GenericReply.cpp          |   7 +-
 nxcomp/GenericReply.h            |   1 -
 nxcomp/GenericRequest.cpp        |   9 +-
 nxcomp/GenericRequest.h          |   1 -
 nxcomp/GetImageReply.cpp         |   7 +-
 nxcomp/GetImageReply.h           |   1 -
 nxcomp/GetPropertyReply.cpp      |   7 +-
 nxcomp/GetPropertyReply.h        |   1 -
 nxcomp/ListFontsReply.cpp        |   7 +-
 nxcomp/ListFontsReply.h          |   1 -
 nxcomp/Loop.cpp                  | 264 +++++------------
 nxcomp/Message.cpp               |  14 -
 nxcomp/Message.h                 |  21 --
 nxcomp/PolyLine.cpp              |  18 +-
 nxcomp/PolyPoint.cpp             |  18 +-
 nxcomp/PositionCacheCompat.cpp   |  17 --
 nxcomp/Proxy.cpp                 | 280 +++++-------------
 nxcomp/Proxy.h                   |   5 -
 nxcomp/PutImage.cpp              |  14 +-
 nxcomp/PutImage.h                |   2 -
 nxcomp/PutPackedImage.cpp        |   7 +-
 nxcomp/PutPackedImage.h          |   1 -
 nxcomp/QueryFontReply.cpp        |   7 +-
 nxcomp/QueryFontReply.h          |   1 -
 nxcomp/RenderCompositeGlyphs.cpp | 166 ++++-------
 nxcomp/RenderCompositeGlyphs.h   |   5 +-
 nxcomp/RenderExtension.cpp       | 258 ++++------------
 nxcomp/RenderExtension.h         |   1 -
 nxcomp/ServerCache.cpp           |   5 +-
 nxcomp/ServerCache.h             |   8 -
 nxcomp/ServerChannel.cpp         | 614 ++++++++-------------------------------
 nxcomp/ServerChannel.h           |  15 -
 nxcomp/ServerProxy.h             |  10 +-
 nxcomp/SetUnpackAlpha.cpp        |   7 +-
 nxcomp/SetUnpackAlpha.h          |   4 -
 nxcomp/SetUnpackColormap.cpp     |   7 +-
 nxcomp/SetUnpackColormap.h       |   3 -
 nxcomp/ShapeExtension.cpp        |   7 +-
 nxcomp/ShapeExtension.h          |   1 -
 nxcomp/Split.cpp                 |  23 +-
 nxcomp/Types.h                   |  10 +-
 58 files changed, 649 insertions(+), 2492 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Channel.cpp b/nxcomp/Channel.cpp
index 71b556b0d..93efa6343 100644
--- a/nxcomp/Channel.cpp
+++ b/nxcomp/Channel.cpp
@@ -386,16 +386,14 @@ int Channel::handleDecode(DecodeBuffer &decodeBuffer, ChannelCache *channelCache
 
     if (store -> enableSplit == 1)
     {
-      if (control -> isProtoStep7() == 1)
-      {
-        #ifdef DEBUG
-        *logofs << "handleDecode: " << store -> name() 
-                << ": Checking if the message was split.\n" 
-                << logofs_flush;
-        #endif
+      // Since ProtoStep7 (#issue 108)
+      #ifdef DEBUG
+      *logofs << "handleDecode: " << store -> name()
+              << ": Checking if the message was split.\n"
+              << logofs_flush;
+      #endif
 
-        decodeBuffer.decodeBoolValue(split);
-      }
+      decodeBuffer.decodeBoolValue(split);
 
       if (split == 1)
       {
@@ -537,16 +535,9 @@ int Channel::handleEncodeCached(EncodeBuffer &encodeBuffer, ChannelCache *channe
   if (control -> LocalDeltaCompression == 0 ||
           enableCache_ ==  0 || store -> enableCache == 0)
   {
-    if (control -> isProtoStep7() == 1)
-    {
-      encodeBuffer.encodeActionValue(is_discarded,
-                         store -> lastActionCache);
-    }
-    else
-    {
-      encodeBuffer.encodeActionValueCompat(is_discarded,
-                         store -> lastActionCacheCompat);
-    }
+    // Since ProtoStep7 (#issue 108)
+    encodeBuffer.encodeActionValue(is_discarded,
+                       store -> lastActionCache);
 
     store -> lastAction = is_discarded;
 
@@ -601,19 +592,9 @@ int Channel::handleEncodeCached(EncodeBuffer &encodeBuffer, ChannelCache *channe
 
     store -> lastRemoved = position;
 
-    if (control -> isProtoStep7() == 1)
-    {
-      encodeBuffer.encodeActionValue(is_removed, store -> lastRemoved,
-                         store -> lastActionCache);
-    }
-    else
-    {
-      encodeBuffer.encodeActionValueCompat(is_removed,
-                         store -> lastActionCacheCompat);
-
-      encodeBuffer.encodePositionValueCompat(store -> lastRemoved,
-                         store -> lastRemovedCacheCompat);
-    }
+    // Since ProtoStep7 (#issue 108)
+    encodeBuffer.encodeActionValue(is_removed, store -> lastRemoved,
+                       store -> lastActionCache);
 
     #ifdef DEBUG
     *logofs << "handleEncodeCached: " << store -> name() << ": Going to "
@@ -679,16 +660,9 @@ int Channel::handleEncodeCached(EncodeBuffer &encodeBuffer, ChannelCache *channe
             << logofs_flush;
     #endif
 
-    if (control -> isProtoStep7() == 1)
-    {
-      encodeBuffer.encodeActionValue(is_discarded,
-                         store -> lastActionCache);
-    }
-    else
-    {
-      encodeBuffer.encodeActionValueCompat(is_discarded,
-                         store -> lastActionCacheCompat);
-    }
+    // Since ProtoStep7 (#issue 108)
+    encodeBuffer.encodeActionValue(is_discarded,
+                       store -> lastActionCache);
 
     store -> lastAction = is_discarded;
 
@@ -759,16 +733,9 @@ int Channel::handleEncodeCached(EncodeBuffer &encodeBuffer, ChannelCache *channe
             << logofs_flush;
     #endif
 
-    if (control -> isProtoStep7() == 1)
-    {
-      encodeBuffer.encodeActionValue(is_discarded,
-                         store -> lastActionCache);
-    }
-    else
-    {
-      encodeBuffer.encodeActionValueCompat(is_discarded,
-                         store -> lastActionCacheCompat);
-    }
+    // Since ProtoStep7 (#issue 108)
+    encodeBuffer.encodeActionValue(is_discarded,
+                       store -> lastActionCache);
 
     store -> lastAction = is_discarded;
 
@@ -793,16 +760,9 @@ int Channel::handleEncodeCached(EncodeBuffer &encodeBuffer, ChannelCache *channe
     cerr << "Warning" << ": Message of size " << store -> plainSize(position)
          << " at position " << position << " is locked.\n";
 
-    if (control -> isProtoStep7() == 1)
-    {
-      encodeBuffer.encodeActionValue(is_discarded,
-                         store -> lastActionCache);
-    }
-    else
-    {
-      encodeBuffer.encodeActionValueCompat(is_discarded,
-                         store -> lastActionCacheCompat);
-    }
+    // Since ProtoStep7 (#issue 108)
+    encodeBuffer.encodeActionValue(is_discarded,
+                       store -> lastActionCache);
 
     store -> lastAction = is_discarded;
 
@@ -843,20 +803,9 @@ int Channel::handleEncodeCached(EncodeBuffer &encodeBuffer, ChannelCache *channe
 
     store -> lastAdded = position;
 
-    if (control -> isProtoStep7() == 1)
-    {
-      encodeBuffer.encodeActionValue(IS_ADDED, store -> lastAdded,
-                         store -> lastActionCache);
-
-    }
-    else
-    {
-      encodeBuffer.encodeActionValueCompat(IS_ADDED,
-                         store -> lastActionCacheCompat);
-
-      encodeBuffer.encodePositionValueCompat(store -> lastAdded,
-                         store -> lastAddedCacheCompat);
-    }
+    // Since ProtoStep7 (#issue 108)
+    encodeBuffer.encodeActionValue(IS_ADDED, store -> lastAdded,
+                       store -> lastActionCache);
 
     return 0;
   }
@@ -898,19 +847,9 @@ int Channel::handleEncodeCached(EncodeBuffer &encodeBuffer, ChannelCache *channe
 
     store -> lastHit = position;
 
-    if (control -> isProtoStep7() == 1)
-    {
-      encodeBuffer.encodeActionValue(IS_HIT, store -> lastHit,
-                         store -> lastActionCache);
-    }
-    else
-    {
-      encodeBuffer.encodeActionValueCompat(IS_HIT,
-                         store -> lastActionCacheCompat);
-
-      encodeBuffer.encodePositionValueCompat(store -> lastHit,
-                         store -> lastHitCacheCompat);
-    }
+    // Since ProtoStep7 (#issue 108)
+    encodeBuffer.encodeActionValue(IS_HIT, store -> lastHit,
+                       store -> lastActionCache);
 
     //
     // Send the field by field differences in
@@ -997,16 +936,9 @@ int Channel::handleDecodeCached(DecodeBuffer &decodeBuffer, ChannelCache *channe
   unsigned char action;
   unsigned short int position;
 
-  if (control -> isProtoStep7() == 1)
-  {
-    decodeBuffer.decodeActionValue(action, position,
-                       store -> lastActionCache);
-  }
-  else
-  {
-    decodeBuffer.decodeActionValueCompat(action,
-                       store -> lastActionCacheCompat);
-  }
+  // Since ProtoStep7 (#issue 108)
+  decodeBuffer.decodeActionValue(action, position,
+                     store -> lastActionCache);
 
   //
   // Clean operations must always come 
@@ -1015,15 +947,8 @@ int Channel::handleDecodeCached(DecodeBuffer &decodeBuffer, ChannelCache *channe
 
   while (action == is_removed)
   {
-    if (control -> isProtoStep7() == 1)
-    {
-      store -> lastRemoved = position;
-    }
-    else
-    {
-      decodeBuffer.decodePositionValueCompat(store -> lastRemoved,
-                         store -> lastRemovedCacheCompat);
-    }
+    // Since ProtoStep7 (#issue 108)
+    store -> lastRemoved = position;
 
     #ifdef DEBUG
 
@@ -1046,16 +971,9 @@ int Channel::handleDecodeCached(DecodeBuffer &decodeBuffer, ChannelCache *channe
 
     store -> remove(store -> lastRemoved, discard_checksum, use_data);
 
-    if (control -> isProtoStep7() == 1)
-    {
-      decodeBuffer.decodeActionValue(action, position,
-                         store -> lastActionCache);
-    }
-    else
-    {
-      decodeBuffer.decodeActionValueCompat(action,
-                         store -> lastActionCacheCompat);
-    }
+    // Since ProtoStep7 (#issue 108)
+    decodeBuffer.decodeActionValue(action, position,
+                       store -> lastActionCache);
   }
 
   //
@@ -1065,15 +983,8 @@ int Channel::handleDecodeCached(DecodeBuffer &decodeBuffer, ChannelCache *channe
 
   if ((T_store_action) action == IS_HIT)
   {
-    if (control -> isProtoStep7() == 1)
-    {
-      store -> lastHit = position;
-    }
-    else
-    {
-      decodeBuffer.decodePositionValueCompat(store -> lastHit,
-                         store -> lastHitCacheCompat);
-    }
+    // Since ProtoStep7 (#issue 108)
+    store -> lastHit = position;
 
     //
     // Get data from the cache at given position.
@@ -1139,15 +1050,8 @@ int Channel::handleDecodeCached(DecodeBuffer &decodeBuffer, ChannelCache *channe
   }
   else if ((T_store_action) action == IS_ADDED)
   {
-    if (control -> isProtoStep7() == 1)
-    {
-      store -> lastAdded = position;
-    }
-    else
-    {
-      decodeBuffer.decodePositionValueCompat(store -> lastAdded,
-                         store -> lastAddedCacheCompat);
-    }
+    // Since ProtoStep7 (#issue 108)
+    store -> lastAdded = position;
 
     #ifdef DEBUG
     *logofs << "handleDecodeCached: " << store -> name() 
@@ -2037,12 +1941,10 @@ Split *Channel::handleSplitCommitRemove(int request, int resource, int position)
           << ".\n" << logofs_flush;
   #endif
 
-  if ((control -> isProtoStep7() == 1 &&
-          (resource != split -> getResource() ||
-               request != split -> getRequest() ||
-                   position != split -> getPosition())) ||
-                       (request != split -> getRequest() ||
-                           position != split -> getPosition()))
+  // Since ProtoStep7 (#issue 108)
+  if (resource != split -> getResource() ||
+           request != split -> getRequest() ||
+               position != split -> getPosition())
   {
     #ifdef PANIC
     *logofs << "handleSplitCommitRemove: PANIC! The data in "
diff --git a/nxcomp/ClientCache.cpp b/nxcomp/ClientCache.cpp
index 2a82009a3..ec37c69f6 100644
--- a/nxcomp/ClientCache.cpp
+++ b/nxcomp/ClientCache.cpp
@@ -25,7 +25,6 @@ ClientCache::ClientCache() :
 
   changePropertyPropertyCache(16), changePropertyTypeCache(16),
   changePropertyData32Cache(16),
-  changePropertyTextCompressor(textCache, CLIENT_TEXT_CACHE_SIZE),
 
   configureWindowBitmaskCache(4),
 
@@ -53,17 +52,11 @@ ClientCache::ClientCache() :
   imageTextLengthCache(8),
   imageTextLastX(0), imageTextLastY(0),
   imageTextCacheX(8), imageTextCacheY(8),
-  imageTextTextCompressor(textCache, CLIENT_TEXT_CACHE_SIZE),
-
-  internAtomTextCompressor(textCache, CLIENT_TEXT_CACHE_SIZE),
-
-  openFontTextCompressor(textCache, CLIENT_TEXT_CACHE_SIZE),
 
   polySegmentCacheX(8), polySegmentCacheY(8), polySegmentCacheIndex(0),
 
   polyTextLastX(0), polyTextLastY(0), polyTextCacheX(8),
   polyTextCacheY(8), polyTextFontCache(8),
-  polyTextTextCompressor(textCache, CLIENT_TEXT_CACHE_SIZE),
 
   putImageWidthCache(8), putImageHeightCache(8), putImageLastX(0),
   putImageLastY(0), putImageXCache(8), putImageYCache(8),
diff --git a/nxcomp/ClientCache.h b/nxcomp/ClientCache.h
index 6702e5b66..3fa59f642 100644
--- a/nxcomp/ClientCache.h
+++ b/nxcomp/ClientCache.h
@@ -85,7 +85,6 @@ class ClientCache : public ChannelCache
   IntCache changePropertyPropertyCache;
   IntCache changePropertyTypeCache;
   IntCache changePropertyData32Cache;
-  TextCompressor changePropertyTextCompressor;
 
   //
   // ClearArea request.
@@ -188,19 +187,6 @@ class ClientCache : public ChannelCache
   unsigned int imageTextLastY;
   IntCache imageTextCacheX;
   IntCache imageTextCacheY;
-  TextCompressor imageTextTextCompressor;
-
-  //
-  // InternAtom request.
-  //
-
-  TextCompressor internAtomTextCompressor;
-
-  //
-  // OpenFont request.
-  //
-
-  TextCompressor openFontTextCompressor;
 
   //
   // PolyFillRectangle request.
@@ -251,7 +237,6 @@ class ClientCache : public ChannelCache
   IntCache polyTextCacheY;
   IntCache polyTextFontCache;
   CharCache polyTextDeltaCache;
-  TextCompressor polyTextTextCompressor;
 
   //
   // PutImage request.
diff --git a/nxcomp/ClientChannel.cpp b/nxcomp/ClientChannel.cpp
index 31d6d125a..813e83bee 100644
--- a/nxcomp/ClientChannel.cpp
+++ b/nxcomp/ClientChannel.cpp
@@ -154,13 +154,6 @@ ClientChannel::ClientChannel(Transport *transport, StaticCompressor *compressor)
   splitState_.commit   = 0;
   splitState_.mode     = split_none;
 
-  //
-  // Disable image streaming if the remote
-  // doesn't support our proxy version.
-  //
-
-  handleSplitEnable();
-
   //
   // Number of outstanding tainted replies.
   //
@@ -342,10 +335,8 @@ int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
       // previous versions.
       //
 
-      if (control -> isProtoStep7() == 1)
-      {
-        encodeBuffer.encodeValue(inputLength, 8);
-      }
+      // Since ProtoStep7 (#issue 108)
+      encodeBuffer.encodeValue(inputLength, 8);
 
       for (unsigned int i = 0; i < inputLength; i++)
       {
@@ -364,20 +355,6 @@ int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
       #endif
 
       priority_++;
-
-      //
-      // Due to the way the loop was implemented
-      // we can't encode multiple messages if we
-      // are encoding the first request.
-      //
-
-      if (control -> isProtoStep7() == 0)
-      {
-        if (proxy -> handleAsyncInit() < 0)
-        {
-          return -1;
-        }
-      }
     }
     else
     {
@@ -512,17 +489,8 @@ int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
           const unsigned char *nextSrc = inputMessage + 24;
           if (format == 8)
           {
-            if (control -> isProtoStep7() == 1)
-            {
-              encodeBuffer.encodeTextData(nextSrc, dataLength);
-            }
-            else
-            {
-              clientCache_ -> changePropertyTextCompressor.reset();
-              for (unsigned int i = 0; i < dataLength; i++)
-                clientCache_ -> changePropertyTextCompressor.
-                                      encodeChar(*nextSrc++, encodeBuffer);
-            }
+            // Since ProtoStep7 (#issue 108)
+            encodeBuffer.encodeTextData(nextSrc, dataLength);
           }
           else if (format == 32)
           {
@@ -872,18 +840,11 @@ int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
             break;
           }
 
-          if (control -> isProtoStep7() == 1)
-          {
-            encodeBuffer.encodeNewXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                               clientCache_ -> lastId, clientCache_ -> lastIdCache,
-                                   clientCache_ -> gcCache,
-                                       clientCache_ -> freeGCCache);
-          }
-          else
-          {
-            encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
-                               bigEndian_), clientCache_ -> gcCache);
-          }
+          // Since ProtoStep7 (#issue 108)
+          encodeBuffer.encodeNewXidValue(GetULONG(inputMessage + 4, bigEndian_),
+                             clientCache_ -> lastId, clientCache_ -> lastIdCache,
+                                 clientCache_ -> gcCache,
+                                     clientCache_ -> freeGCCache);
 
           const unsigned char *nextSrc = inputMessage + 8;
           encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8,
@@ -1059,18 +1020,12 @@ int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
           encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8, bigEndian_),
                              clientCache_ -> windowCache);
 
-          if (control -> isProtoStep7() == 1)
-          {
-            encodeBuffer.encodeNewXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                               clientCache_ -> lastId, clientCache_ -> lastIdCache,
-                                   clientCache_ -> windowCache,
-                                       clientCache_ -> freeWindowCache);
-          }
-          else
-          {
-            encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                               clientCache_ -> windowCache);
-          }
+          // Since ProtoStep7 (#issue 108)
+          encodeBuffer.encodeNewXidValue(GetULONG(inputMessage + 4, bigEndian_),
+                             clientCache_ -> lastId, clientCache_ -> lastIdCache,
+                                 clientCache_ -> windowCache,
+                                     clientCache_ -> freeWindowCache);
+
           const unsigned char *nextSrc = inputMessage + 12;
           for (unsigned int i = 0; i < 6; i++)
           {
@@ -1140,16 +1095,9 @@ int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
 
           unsigned int numPoints = ((inputLength - 16) >> 2);
 
-          if (control -> isProtoStep10() == 1)
-          {
-            encodeBuffer.encodeCachedValue(numPoints, 16,
-                               clientCache_ -> fillPolyNumPointsCache, 4);
-          }
-          else
-          {
-            encodeBuffer.encodeCachedValue(numPoints, 14,
-                               clientCache_ -> fillPolyNumPointsCache, 4);
-          }
+          // Since ProtoStep10 (#issue 108)
+          encodeBuffer.encodeCachedValue(numPoints, 16,
+                             clientCache_ -> fillPolyNumPointsCache, 4);
 
           encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
                              clientCache_ -> drawableCache);
@@ -1270,16 +1218,9 @@ int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
 
           #endif
 
-          if (control -> isProtoStep7() == 1)
-          {
-            encodeBuffer.encodeFreeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                               clientCache_ -> freeGCCache);
-          }
-          else
-          {
-            encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                               clientCache_ -> gcCache);
-          }
+          // Since ProtoStep7 (#issue 108)
+          encodeBuffer.encodeFreeXidValue(GetULONG(inputMessage + 4, bigEndian_),
+                             clientCache_ -> freeGCCache);
         }
         break;
       case X_FreePixmap:
@@ -1294,26 +1235,9 @@ int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
 
           #endif
 
-          if (control -> isProtoStep7() == 1)
-          {
-            encodeBuffer.encodeFreeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                               clientCache_ -> freeDrawableCache);
-          }
-          else
-          {
-            unsigned int pixmap = GetULONG(inputMessage + 4, bigEndian_);
-            unsigned int diff = pixmap - clientCache_ -> createPixmapLastId;
-            if (diff == 0)
-            {
-              encodeBuffer.encodeBoolValue(1);
-            }
-            else
-            {
-              encodeBuffer.encodeBoolValue(0);
-              clientCache_ -> createPixmapLastId = pixmap;
-              encodeBuffer.encodeValue(diff, 29, 4);
-            }
-          }
+          // Since ProtoStep7 (#issue 108)
+          encodeBuffer.encodeFreeXidValue(GetULONG(inputMessage + 4, bigEndian_),
+                             clientCache_ -> freeDrawableCache);
         }
         break;
       case X_GetAtomName:
@@ -1536,18 +1460,9 @@ int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
               encodeBuffer.encodeCachedValue(*nextSrc++, 8,
                                  clientCache_ -> polyTextDeltaCache);
 
-              if (control -> isProtoStep7() == 1)
-              {
-                encodeBuffer.encodeTextData(nextSrc, textLength);
-
-                nextSrc += textLength;
-              }
-              else
-              {
-                clientCache_ -> polyTextTextCompressor.reset();
-                for (unsigned int i = 0; i < textLength; i++)
-                  clientCache_ -> polyTextTextCompressor.encodeChar(*nextSrc++, encodeBuffer);
-              }
+              // Since ProtoStep7 (#issue 108)
+              encodeBuffer.encodeTextData(nextSrc, textLength);
+              nextSrc += textLength;
             }
           }
           encodeBuffer.encodeBoolValue(0);
@@ -1620,18 +1535,9 @@ int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
               encodeBuffer.encodeCachedValue(*nextSrc++, 8,
                                  clientCache_ -> polyTextDeltaCache);
 
-              if (control -> isProtoStep7() == 1)
-              {
-                encodeBuffer.encodeTextData(nextSrc, textLength * 2);
-
-                nextSrc += textLength * 2;
-              }
-              else
-              {
-                clientCache_ -> polyTextTextCompressor.reset();
-                for (unsigned int i = 0; i < textLength * 2; i++)
-                  clientCache_ -> polyTextTextCompressor.encodeChar(*nextSrc++, encodeBuffer);
-              }
+              // Since ProtoStep7 (#issue 108)
+              encodeBuffer.encodeTextData(nextSrc, textLength * 2);
+              nextSrc += textLength * 2;
             }
           }
           encodeBuffer.encodeBoolValue(0);
@@ -1692,16 +1598,8 @@ int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
                              clientCache_ -> imageTextCacheY);
           const unsigned char *nextSrc = inputMessage + 16;
 
-          if (control -> isProtoStep7() == 1)
-          {
-            encodeBuffer.encodeTextData(nextSrc, textLength);
-          }
-          else
-          {
-            clientCache_ -> imageTextTextCompressor.reset();
-            for (unsigned int j = 0; j < textLength; j++)
-              clientCache_ -> imageTextTextCompressor.encodeChar(*nextSrc++, encodeBuffer);
-          }
+          // Since ProtoStep7 (#issue 108)
+          encodeBuffer.encodeTextData(nextSrc, textLength);
         }
         break;
       case X_ImageText16:
@@ -1759,16 +1657,8 @@ int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
                              clientCache_ -> imageTextCacheY);
           const unsigned char *nextSrc = inputMessage + 16;
 
-          if (control -> isProtoStep7() == 1)
-          {
-            encodeBuffer.encodeTextData(nextSrc, textLength * 2);
-          }
-          else
-          {
-            clientCache_ -> imageTextTextCompressor.reset();
-            for (unsigned int j = 0; j < textLength * 2; j++)
-              clientCache_ -> imageTextTextCompressor.encodeChar(*nextSrc++, encodeBuffer);
-          }
+          // Since ProtoStep7 (#issue 108)
+          encodeBuffer.encodeTextData(nextSrc, textLength * 2);
         }
         break;
       case X_InternAtom:
@@ -1800,18 +1690,8 @@ int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
           encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]);
           const unsigned char *nextSrc = inputMessage + 8;
 
-          if (control -> isProtoStep7() == 1)
-          {
-            encodeBuffer.encodeTextData(nextSrc, nameLength);
-          }
-          else
-          {
-            clientCache_ -> internAtomTextCompressor.reset();
-            for (unsigned int i = 0; i < nameLength; i++)
-            {
-              clientCache_ -> internAtomTextCompressor.encodeChar(*nextSrc++, encodeBuffer);
-            }
-          }
+          // Since ProtoStep7 (#issue 108)
+          encodeBuffer.encodeTextData(nextSrc, nameLength);
 
           sequenceQueue_.push(clientSequence_, inputOpcode);
 
@@ -1832,18 +1712,8 @@ int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
           encodeBuffer.encodeValue(GetUINT(inputMessage + 4, bigEndian_), 16, 6);
           const unsigned char* nextSrc = inputMessage + 8;
 
-          if (control -> isProtoStep7() == 1)
-          {
-            encodeBuffer.encodeTextData(nextSrc, textLength);
-          }
-          else
-          {
-            clientCache_ -> polyTextTextCompressor.reset();
-            for (unsigned int i = 0; i < textLength; i++)
-            {
-              clientCache_ -> polyTextTextCompressor.encodeChar(*nextSrc++, encodeBuffer);
-            }
-          }
+          // Since ProtoStep7 (#issue 108)
+          encodeBuffer.encodeTextData(nextSrc, textLength);
 
           sequenceQueue_.push(clientSequence_, inputOpcode);
 
@@ -1859,18 +1729,8 @@ int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
                                          29, clientCache_ -> colormapCache);
           const unsigned char *nextSrc = inputMessage + 12;
 
-          if (control -> isProtoStep7() == 1)
-          {
-            encodeBuffer.encodeTextData(nextSrc, textLength);
-          }
-          else
-          {
-            clientCache_ -> polyTextTextCompressor.reset();
-            for (unsigned int i = 0; i < textLength; i++)
-            {
-              clientCache_ -> polyTextTextCompressor.encodeChar(*nextSrc++, encodeBuffer);
-            }
-          }
+          // Since ProtoStep7 (#issue 108)
+          encodeBuffer.encodeTextData(nextSrc, textLength);
 
           sequenceQueue_.push(clientSequence_, inputOpcode);
 
@@ -1900,8 +1760,9 @@ int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
 
           #endif
 
-          if (inputOpcode == X_DestroyWindow && control -> isProtoStep7() == 1)
+          if (inputOpcode == X_DestroyWindow)
           {
+            // Since ProtoStep7 (#issue 108)
             encodeBuffer.encodeFreeXidValue(GetULONG(inputMessage + 4, bigEndian_),
                                clientCache_ -> freeWindowCache);
           }
@@ -1930,19 +1791,8 @@ int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
           clientCache_ -> lastFont = font;
           const unsigned char *nextSrc = inputMessage + 12;
 
-          if (control -> isProtoStep7() == 1)
-          {
-            encodeBuffer.encodeTextData(nextSrc, nameLength);
-          }
-          else
-          {
-            clientCache_ -> openFontTextCompressor.reset();
-            for (; nameLength; nameLength--)
-            {
-              clientCache_ -> openFontTextCompressor.
-                    encodeChar(*nextSrc++, encodeBuffer);
-            }
-          }
+          // Since ProtoStep7 (#issue 108)
+          encodeBuffer.encodeTextData(nextSrc, nameLength);
         }
         break;
       case X_PolyFillRectangle:
@@ -2638,14 +2488,8 @@ int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
 
           unsigned int numRectangles = ((inputLength - 12) >> 3);
 
-          if (control -> isProtoStep9() == 1)
-          {
-            encodeBuffer.encodeValue(numRectangles, 15, 4);
-          }
-          else
-          {
-            encodeBuffer.encodeValue(numRectangles, 13, 4);
-          }
+          // Since ProtoStep9 (#issue 108)
+          encodeBuffer.encodeValue(numRectangles, 15, 4);
 
           encodeBuffer.encodeValue((unsigned int) inputMessage[1], 2);
           encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
@@ -3544,19 +3388,8 @@ int ClientChannel::handleWrite(const unsigned char *message, unsigned int length
               PutUINT(nameLength, outputMessage + 8, bigEndian_);
               unsigned char* nextDest = outputMessage + 32;
 
-              if (control -> isProtoStep7() == 1)
-              {
-                decodeBuffer.decodeTextData(nextDest, nameLength);
-              }
-              else
-              {
-                serverCache_ -> getAtomNameTextCompressor.reset();
-                for (unsigned int i = 0; i < nameLength; i++)
-                {
-                  *nextDest++ = serverCache_ -> getAtomNameTextCompressor.
-                                      decodeChar(decodeBuffer);
-                }
-              }
+              // Since ProtoStep7 (#issue 108)
+              decodeBuffer.decodeTextData(nextDest, nameLength);
             }
             break;
           case X_GetGeometry:
@@ -3814,21 +3647,9 @@ int ClientChannel::handleWrite(const unsigned char *message, unsigned int length
                   decodeBuffer.decodeValue(length, 8);
                   *nextDest++ = (unsigned char)length;
 
-                  if (control -> isProtoStep7() == 1)
-                  {
-                    decodeBuffer.decodeTextData(nextDest, length);
-
-                    nextDest += length;
-                  }
-                  else
-                  {
-                    serverCache_ -> getPropertyTextCompressor.reset();
-                    for (; length; length--)
-                    {
-                      *nextDest++ = serverCache_ -> getPropertyTextCompressor.
-                                                       decodeChar(decodeBuffer);
-                    }
-                  }
+                  // Since ProtoStep7 (#issue 108)
+                  decodeBuffer.decodeTextData(nextDest, length);
+                  nextDest += length;
                 }
 
                 handleSave(messageStore, outputMessage, outputLength);
@@ -4243,35 +4064,11 @@ int ClientChannel::handleWrite(const unsigned char *message, unsigned int length
                                  serverCache_ -> visualCache);
               PutULONG(visual, outputMessage + 8, bigEndian_);
 
-              if (control -> isProtoStep8() == 0)
-              {
-                const unsigned char *compressedData = NULL;
-                unsigned int compressedDataSize = 0;
+              // Since ProtoStep8 (#issue 108)
+              handleCopy(decodeBuffer, requestOpcode, messageStore ->
+                             dataOffset, outputMessage, outputLength);
 
-                int decompressed = handleDecompress(decodeBuffer, requestOpcode, messageStore -> dataOffset,
-                                                        outputMessage, outputLength, compressedData,
-                                                            compressedDataSize);
-                if (decompressed < 0)
-                {
-                  return -1;
-                }
-                else if (decompressed > 0)
-                {
-                  handleSave(messageStore, outputMessage, outputLength,
-                                 compressedData, compressedDataSize);
-                }
-                else
-                {
-                  handleSave(messageStore, outputMessage, outputLength);
-                }
-              }
-              else
-              {
-                handleCopy(decodeBuffer, requestOpcode, messageStore ->
-                               dataOffset, outputMessage, outputLength);
-
-                handleSave(messageStore, outputMessage, outputLength);
-              }
+              handleSave(messageStore, outputMessage, outputLength);
             }
             break;
           case X_GetPointerMapping:
@@ -5090,40 +4887,23 @@ int ClientChannel::handleSplit(EncodeBuffer &encodeBuffer, MessageStore *store,
 {
   #if defined(TEST) || defined(SPLIT)
 
-  if (control -> isProtoStep8() == 1)
-  {
-    *logofs << "handleSplit: PANIC! SPLIT! Split should "
-            << "not be enabled for message " << "OPCODE#"
-            << (unsigned int) store -> opcode() << ".\n"
-            << logofs_flush;
+  // Since ProtoStep8 (#issue 108)
+  *logofs << "handleSplit: PANIC! SPLIT! Split should "
+          << "not be enabled for message " << "OPCODE#"
+          << (unsigned int) store -> opcode() << ".\n"
+          << logofs_flush;
 
-    HandleCleanup();
-  }
+  HandleCleanup();
 
   #endif
 
   //
-  // Never split the message if connected to
-  // an old proxy version. Also refuse the
-  // split if we it is not introduced by a
-  // start split.
+  // Refuse the split if it is not introduced
+  // by a start split.
   //
 
-  if (control -> isProtoStep7() == 0)
-  {
-    #if defined(TEST) || defined(SPLIT)
-    *logofs << "handleSplit: SPLIT! Ignoring the split with "
-            << "an old proxy version.\n" << logofs_flush;
-    #endif
-
-    if (action == IS_ADDED || action == is_discarded)
-    {
-      encodeBuffer.encodeBoolValue(0);
-    }
-
-    return 0;
-  }
-  else if (splitState_.resource == nothing || enableSplit_ == 0)
+  // Since ProtoStep7 (#issue 108)
+  if (splitState_.resource == nothing || enableSplit_ == 0)
   {
     #if defined(TEST) || defined(SPLIT)
     *logofs << "handleSplit: SPLIT! Nothing to do for message "
@@ -5875,16 +5655,7 @@ int ClientChannel::handleSplitEvent(DecodeBuffer &decodeBuffer)
           << strMsTimestamp() << ".\n" << logofs_flush;
   #endif
 
-  if (control -> isProtoStep7() == 0)
-  {
-    #ifdef PANIC
-    *logofs << "handleSplitEvent: PANIC! The split can't "
-            << "be aborted when connected to an old "
-            << "proxy version.\n" << logofs_flush;
-    #endif
-
-    HandleCleanup();
-  }
+  // Since ProtoStep7 (#issue 108)
 
   //
   // Decode the information about the
@@ -6512,146 +6283,6 @@ int ClientChannel::handleRestart(T_sequence_mode mode, int resource)
   return 1;
 }
 
-int ClientChannel::handleTaintCacheRequest(unsigned char &opcode, const unsigned char *&buffer,
-                                               unsigned int &size)
-{
-  #ifdef TEST
-  *logofs << "handleTaintCacheRequest: Tainting cache request "
-          << "for FD#" << fd_ << ".\n" << logofs_flush;
-  #endif
-
-  //
-  // The save and load flags would affect
-  // the decoding side but the decoding
-  // side doesn't support the request.
-  //
-
-  enableCache_ = *(buffer + 4);
-  enableSplit_ = *(buffer + 5);
-
-  handleSplitEnable();
-
-  #ifdef TEST
-  *logofs << "handleTaintCacheRequest: Set cache parameters to "
-          << "cache " << enableCache_ << " split " << enableSplit_
-          << " load " << enableLoad_ << " save " << enableSave_
-          << ".\n" << logofs_flush;
-  #endif
-
-  //
-  // Taint the request to a X_NoOperation.
-  //
-
-  opcode = X_NoOperation;
-
-  return 0;
-}
-
-int ClientChannel::handleTaintFontRequest(unsigned char &opcode, const unsigned char *&buffer,
-                                              unsigned int &size)
-{
-  //
-  // The remote end doesn't support this
-  // request so generate an empty reply
-  // at the local side.
-  //
-
-  #ifdef TEST
-  *logofs << "handleTaintFontRequest: Suppressing font "
-          << "request for FD#" << fd_ << ".\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // The client sequence number has not
-  // been incremented yet in the loop.
-  //
-
-  unsigned int sequence = (clientSequence_ + 1) & 0xffff;
-
-  #ifdef TEST
-  *logofs << "handleTaintFontRequest: Opcode is " << (unsigned) opcode
-          << " expected client sequence is " << sequence
-          << ".\n" << logofs_flush;
-  #endif
-
-  unsigned char *reply = writeBuffer_.addMessage(36);
-
-  *(reply + 0) = X_Reply;
-
-  PutUINT(sequence, reply + 2, bigEndian_);
-
-  PutULONG(1, reply + 4, bigEndian_);
-
-  //
-  // Set the length of the returned
-  // path to 0.
-  //
-
-  *(reply + 32) = 0;
-
-  //
-  // Save the sequence number, not incremented
-  // yet, we used to auto-generate this reply.
-  //
-
-  lastSequence_ = clientSequence_ + 1;
-
-  #ifdef TEST
-  *logofs << "handleTaintFontRequest: Registered " << lastSequence_
-          << " as last auto-generated sequence number.\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // Taint the request to a X_NoOperation.
-  //
-
-  opcode = X_NoOperation;
-
-  if (handleFlush(flush_if_any) < 0)
-  {
-    return -1;
-  }
-
-  return 1;
-}
-
-int ClientChannel::handleTaintSplitRequest(unsigned char &opcode, const unsigned char *&buffer,
-                                               unsigned int &size)
-{
-  #ifdef TEST
-
-  if (opcode == opcodeStore_ -> abortSplit)
-  {
-    *logofs << "handleTaintSplitRequest: Tainting abort split "
-            << "request for FD#" << fd_ << ".\n"
-            << logofs_flush;
-  }
-  else if (opcode == opcodeStore_ -> finishSplit)
-  {
-    *logofs << "handleTaintSplitRequest: Tainting finish split "
-            << "request for FD#" << fd_ << ".\n"
-            << logofs_flush;
-  }
-  else
-  {
-    *logofs << "handleTaintSplitRequest: Tainting free split "
-            << "request for FD#" << fd_ << ".\n"
-            << logofs_flush;
-  }
-
-  #endif
-
-  //
-  // Taint the request to a X_NoOperation.
-  //
-
-  opcode = X_NoOperation;
-
-  return 1;
-}
-
 int ClientChannel::handleTaintLameRequest(unsigned char &opcode, const unsigned char *&buffer,
                                               unsigned int &size)
 {
@@ -7485,12 +7116,12 @@ int ClientChannel::handleFastReadRequest(EncodeBuffer &encodeBuffer, const unsig
   // All the NX requests are handled in the
   // main message loop. The X_PutImage can
   // be handled here only if the split was
-  // not requested.
+  // not requested (since ProtoStep7 #issue 108).
   //
 
   if ((opcode >= X_NXFirstOpcode && opcode <= X_NXLastOpcode) ||
-           (control -> isProtoStep7() == 1 && opcode == X_PutImage &&
-               splitState_.resource != nothing) || opcode == X_ListExtensions ||
+           (opcode == X_PutImage && splitState_.resource != nothing) ||
+               opcode == X_ListExtensions ||
                    opcode == X_QueryExtension)
   {
     return 0;
@@ -7977,8 +7608,6 @@ int ClientChannel::handleCacheRequest(EncodeBuffer &encodeBuffer, const unsigned
   enableSave_  = *(buffer + 6);
   enableLoad_  = *(buffer + 7);
 
-  handleSplitEnable();
-
   #ifdef TEST
   *logofs << "handleCacheRequest: Set cache parameters to "
           << " cache " << enableCache_ << " split " << enableSplit_
@@ -8068,11 +7697,9 @@ int ClientChannel::handleStartSplitRequest(EncodeBuffer &encodeBuffer, const uns
   // Send the selected resource to the remote.
   //
 
-  if (control -> isProtoStep7() == 1)
-  {
-    encodeBuffer.encodeCachedValue(splitState_.resource, 8,
-                       clientCache_ -> resourceCache);
-  }
+  // Since ProtoStep7 (#issue 108)
+  encodeBuffer.encodeCachedValue(splitState_.resource, 8,
+                     clientCache_ -> resourceCache);
 
   splitState_.mode = (T_split_mode) *(buffer + 4);
 
@@ -8157,11 +7784,9 @@ int ClientChannel::handleEndSplitRequest(EncodeBuffer &encodeBuffer, const unsig
   // Send the selected resource to the remote.
   //
 
-  if (control -> isProtoStep7() == 1)
-  {
-    encodeBuffer.encodeCachedValue(splitState_.resource, 8,
-                       clientCache_ -> resourceCache);
-  }
+  // Since ProtoStep7 (#issue 108)
+  encodeBuffer.encodeCachedValue(splitState_.resource, 8,
+                     clientCache_ -> resourceCache);
 
   //
   // Send the split notification events
diff --git a/nxcomp/ClientChannel.h b/nxcomp/ClientChannel.h
index 9924bb263..5ec55595c 100644
--- a/nxcomp/ClientChannel.h
+++ b/nxcomp/ClientChannel.h
@@ -158,23 +158,6 @@ class ClientChannel : public Channel
   int handleTaintRequest(unsigned char &opcode, const unsigned char *&buffer,
                              unsigned int &size)
   {
-    if (control -> isProtoStep7() == 0)
-    {
-      if (opcode == X_NXFreeSplit || opcode == X_NXAbortSplit ||
-              opcode == X_NXFinishSplit)
-      {
-        return handleTaintSplitRequest(opcode, buffer, size);
-      }
-      else if (opcode == X_NXSetCacheParameters)
-      {
-        return handleTaintCacheRequest(opcode, buffer, size);
-      }
-      else if (opcode == X_NXGetFontParameters)
-      {
-        return handleTaintFontRequest(opcode, buffer, size);
-      }
-    }
-
     if (control -> TaintReplies > 0 &&
             opcode == X_GetInputFocus)
     {
@@ -190,15 +173,6 @@ class ClientChannel : public Channel
     return 0;
   }
 
-  int handleTaintCacheRequest(unsigned char &opcode, const unsigned char *&buffer,
-                                  unsigned int &size);
-
-  int handleTaintFontRequest(unsigned char &opcode, const unsigned char *&buffer,
-                                 unsigned int &size);
-
-  int handleTaintSplitRequest(unsigned char &opcode, const unsigned char *&buffer,
-                                  unsigned int &size);
-
   int handleTaintLameRequest(unsigned char &opcode, const unsigned char *&buffer,
                                  unsigned int &size);
 
@@ -261,20 +235,6 @@ class ClientChannel : public Channel
 
   int handleSplitChecksum(EncodeBuffer &encodeBuffer, T_checksum checksum);
 
-  void handleSplitEnable()
-  {
-    if (control -> isProtoStep7() == 0)
-    {
-      #if defined(TEST) || defined(SPLIT)
-      *logofs << "handleSplitEnable: WARNING! Disabling split "
-              << "with an old proxy version.\n"
-              << logofs_flush;
-      #endif
-
-      enableSplit_ = 0;
-    }
-  }
-
   void handleSplitPending(int resource)
   {
     if (splitState_.pending == 0)
diff --git a/nxcomp/ClientProxy.h b/nxcomp/ClientProxy.h
index 2b669ba2d..88d345f00 100644
--- a/nxcomp/ClientProxy.h
+++ b/nxcomp/ClientProxy.h
@@ -84,14 +84,8 @@ class ClientProxy : public Proxy
 
   virtual int checkLocalChannelMap(int channelId)
   {
-    if (control -> isProtoStep7() == 1)
-    {
-      return ((channelId & control -> ChannelMask) != 0);
-    }
-    else
-    {
-      return 1;
-    }
+    // Since ProtoStep7 (#issue 108)
+    return ((channelId & control -> ChannelMask) != 0);
   }
 
   //
diff --git a/nxcomp/ClientStore.cpp b/nxcomp/ClientStore.cpp
index be0e892b4..d56019258 100644
--- a/nxcomp/ClientStore.cpp
+++ b/nxcomp/ClientStore.cpp
@@ -54,11 +54,6 @@
 #include "PutPackedImage.h"
 #include "GenericRequest.h"
 
-#include "ChangeGCCompat.h"
-#include "CreatePixmapCompat.h"
-#include "SetUnpackColormapCompat.h"
-#include "SetUnpackAlphaCompat.h"
-
 //
 // Set the verbosity level.
 //
@@ -111,20 +106,11 @@ ClientStore::ClientStore(StaticCompressor *compressor)
   requests_[X_NXSetUnpackGeometry]       = new SetUnpackGeometryStore(compressor);
   requests_[X_NXPutPackedImage]          = new PutPackedImageStore(compressor);
 
-  if (control -> isProtoStep7() == 1)
-  {
-    requests_[X_ChangeGC]            = new ChangeGCStore();
-    requests_[X_CreatePixmap]        = new CreatePixmapStore();
-    requests_[X_NXSetUnpackColormap] = new SetUnpackColormapStore(compressor);
-    requests_[X_NXSetUnpackAlpha]    = new SetUnpackAlphaStore(compressor);
-  }
-  else
-  {
-    requests_[X_ChangeGC]            = new ChangeGCCompatStore();
-    requests_[X_CreatePixmap]        = new CreatePixmapCompatStore();
-    requests_[X_NXSetUnpackColormap] = new SetUnpackColormapCompatStore(compressor);
-    requests_[X_NXSetUnpackAlpha]    = new SetUnpackAlphaCompatStore(compressor);
-  }
+  // Since ProtoStep7 (#issue 108)
+  requests_[X_ChangeGC]            = new ChangeGCStore();
+  requests_[X_CreatePixmap]        = new CreatePixmapStore();
+  requests_[X_NXSetUnpackColormap] = new SetUnpackColormapStore(compressor);
+  requests_[X_NXSetUnpackAlpha]    = new SetUnpackAlphaStore(compressor);
 
   for (int i = 0; i < CHANNEL_STORE_RESOURCE_LIMIT; i++)
   {
diff --git a/nxcomp/Control.cpp b/nxcomp/Control.cpp
index 062654235..1bf2dbdd2 100644
--- a/nxcomp/Control.cpp
+++ b/nxcomp/Control.cpp
@@ -348,6 +348,14 @@
 
 #define FILE_SIZE_CHECK_TIMEOUT                  60000
 
+//
+// Protocol version compatibility values
+//
+
+const int Control::NX_MIN_PROTO_STEP = 10;
+const int Control::NX_MAX_PROTO_STEP = 10;
+const char* const Control::NXPROXY_COMPATIBILITY_VERSION = "3.5.0";
+
 //
 // Set defaults for control. They should be what
 // you get in case of 'local' connection.
@@ -633,11 +641,7 @@ Control::Control()
   // time the session is negotiated.
   //
 
-  protoStep6_  = 0;
-  protoStep7_  = 0;
-  protoStep8_  = 0;
-  protoStep9_  = 0;
-  protoStep10_ = 0;
+  protoStep_ = 0;
 }
 
 Control::~Control()
@@ -705,92 +709,27 @@ Control::~Control()
 
 void Control::setProtoStep(int step)
 {
-  switch (step)
+  if (isValidProtoStep(step))
   {
-    case 6:
-    {
-      protoStep6_  = 1;
-      protoStep7_  = 0;
-      protoStep8_  = 0;
-      protoStep9_  = 0;
-      protoStep10_ = 0;
-
-      break;
-    }
-    case 7:
-    {
-      protoStep6_  = 1;
-      protoStep7_  = 1;
-      protoStep8_  = 0;
-      protoStep9_  = 0;
-      protoStep10_ = 0;
-
-      break;
-    }
-    case 8:
-    {
-      protoStep6_  = 1;
-      protoStep7_  = 1;
-      protoStep8_  = 1;
-      protoStep9_  = 0;
-      protoStep10_ = 0;
-
-      break;
-    }
-    case 9:
-    {
-      protoStep6_  = 1;
-      protoStep7_  = 1;
-      protoStep8_  = 1;
-      protoStep9_  = 1;
-      protoStep10_ = 0;
-
-      break;
-    }
-    case 10:
-    {
-      protoStep6_  = 1;
-      protoStep7_  = 1;
-      protoStep8_  = 1;
-      protoStep9_  = 1;
-      protoStep10_ = 1;
-
-      break;
-    }
-    default:
-    {
-      #ifdef PANIC
-      *logofs << "Control: PANIC! Invalid protocol step "
-              << "with value " << step << ".\n"
-              << logofs_flush;
-      #endif
-
-      HandleCleanup();
-    }
+    protoStep_ = step;
+  }
+  else
+  {
+    #ifdef PANIC
+    *logofs << "Control: PANIC! Invalid protocol step "
+            << "with value " << step << ".\n"
+            << logofs_flush;
+    #endif
+
+    HandleCleanup();
   }
 }
 
 int Control::getProtoStep()
 {
-  if (protoStep10_ == 1)
-  {
-    return 10;
-  }
-  else if (protoStep9_ == 1)
-  {
-    return 9;
-  }
-  else if (protoStep8_ == 1)
-  {
-    return 8;
-  }
-  else if (protoStep7_ == 1)
-  {
-    return 7;
-  }
-  else if (protoStep6_ == 1)
+  if (isValidProtoStep(protoStep_))
   {
-    return 6;
+    return protoStep_;
   }
   else
   {
diff --git a/nxcomp/Control.h b/nxcomp/Control.h
index 71f357c4a..b3552e091 100644
--- a/nxcomp/Control.h
+++ b/nxcomp/Control.h
@@ -320,6 +320,12 @@ class Control
   int CompatVersionPatch;
   int CompatVersionMaintenancePatch;
 
+  //
+  // Compatibility version for the proxy
+  //
+
+  static const char* const NXPROXY_COMPATIBILITY_VERSION;
+
   //
   // Which unpack methods are implemented in proxy?
   //
@@ -713,26 +719,6 @@ class Control
 
   int getProtoStep();
 
-  int isProtoStep7()
-  {
-    return protoStep7_;
-  }
-
-  int isProtoStep8()
-  {
-    return protoStep8_;
-  }
-
-  int isProtoStep9()
-  {
-    return protoStep9_;
-  }
-
-  int isProtoStep10()
-  {
-    return protoStep10_;
-  }
-
   private:
 
   //
@@ -746,11 +732,25 @@ class Control
   // to the protocol version.
   //
 
-  int protoStep6_;
-  int protoStep7_;
-  int protoStep8_;
-  int protoStep9_;
-  int protoStep10_;
+  int protoStep_;
+
+  //
+  // Min and max values allowed for protocol step
+  // depending on protocol version compatibility
+  //
+
+  static const int NX_MIN_PROTO_STEP;
+  static const int NX_MAX_PROTO_STEP;
+
+  //
+  // Check the validity of protocol step
+  //
+
+  bool isValidProtoStep(int step)
+  {
+    return ((step >= NX_MIN_PROTO_STEP) && (step <= NX_MAX_PROTO_STEP));
+  }
+
 };
 
 #endif /* Control_H */
diff --git a/nxcomp/CreateGC.cpp b/nxcomp/CreateGC.cpp
index f1c10e69b..fab8bba10 100644
--- a/nxcomp/CreateGC.cpp
+++ b/nxcomp/CreateGC.cpp
@@ -146,39 +146,17 @@ void CreateGCStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *me
 
   ClientCache *clientCache = (ClientCache *) channelCache;
 
-  if (control -> isProtoStep7() == 1)
-  {
-    #ifdef TEST
-    *logofs << name() << ": Encoding value " << createGC -> gcontext
-            << " as gcontext field.\n" << logofs_flush;
-    #endif
-
-    encodeBuffer.encodeNewXidValue(createGC -> gcontext, clientCache -> lastId,
-                       clientCache -> lastIdCache, clientCache -> gcCache,
-                           clientCache -> freeGCCache);
-
-    cachedCreateGC -> gcontext = createGC -> gcontext;
-  }
-  else
-  {
-    #ifdef TEST
-    *logofs << name() << ": Encoding value " << createGC -> drawable
-            << " as drawable field.\n" << logofs_flush;
-    #endif
-
-    encodeBuffer.encodeXidValue(createGC -> drawable, clientCache -> drawableCache);
-
-    cachedCreateGC -> drawable = createGC -> drawable;
-
-    #ifdef TEST
-    *logofs << name() << ": Encoding value " << createGC -> gcontext
-            << " as gcontext field.\n" << logofs_flush;
-    #endif
+  // Since ProtoStep7 (#issue 108)
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << createGC -> gcontext
+          << " as gcontext field.\n" << logofs_flush;
+  #endif
 
-    encodeBuffer.encodeXidValue(createGC -> gcontext, clientCache -> gcCache);
+  encodeBuffer.encodeNewXidValue(createGC -> gcontext, clientCache -> lastId,
+                     clientCache -> lastIdCache, clientCache -> gcCache,
+                         clientCache -> freeGCCache);
 
-    cachedCreateGC -> gcontext = createGC -> gcontext;
-  }
+  cachedCreateGC -> gcontext = createGC -> gcontext;
 }
 
 void CreateGCStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
@@ -190,37 +168,15 @@ void CreateGCStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *me
 
   unsigned int value;
 
-  if (control -> isProtoStep7() == 1)
-  {
-    decodeBuffer.decodeNewXidValue(value, clientCache -> lastId,
-                       clientCache -> lastIdCache, clientCache -> gcCache,
-                           clientCache -> freeGCCache);
+  // Since ProtoStep7 (#issue 108)
+  decodeBuffer.decodeNewXidValue(value, clientCache -> lastId,
+                     clientCache -> lastIdCache, clientCache -> gcCache,
+                         clientCache -> freeGCCache);
 
-    createGC -> gcontext = value;
+  createGC -> gcontext = value;
 
-    #ifdef TEST
-    *logofs << name() << ": Decoded value " << createGC -> gcontext
-            << " as gcontext field.\n" << logofs_flush;
-    #endif
-  }
-  else
-  {
-    decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
-
-    createGC -> drawable = value;
-
-    #ifdef TEST
-    *logofs << name() << ": Decoded value " << createGC -> drawable
-            << " as drawable field.\n" << logofs_flush;
-    #endif
-
-    decodeBuffer.decodeXidValue(value, clientCache -> gcCache);
-
-    createGC -> gcontext = value;
-
-    #ifdef TEST
-    *logofs << name() << ": Decoded value " << createGC -> gcontext
-            << " as gcontext field.\n" << logofs_flush;
-    #endif
-  }
+  #ifdef TEST
+  *logofs << name() << ": Decoded value " << createGC -> gcontext
+          << " as gcontext field.\n" << logofs_flush;
+  #endif
 }
diff --git a/nxcomp/DecodeBuffer.cpp b/nxcomp/DecodeBuffer.cpp
index 077bfdfc0..28c656cb2 100644
--- a/nxcomp/DecodeBuffer.cpp
+++ b/nxcomp/DecodeBuffer.cpp
@@ -34,10 +34,8 @@ DecodeBuffer::DecodeBuffer(const unsigned char *data, unsigned int length)
 
   : buffer_(data), end_(buffer_ + length), nextSrc_(buffer_), srcMask_(0x80)
 {
-  if (control -> isProtoStep7() == 1)
-  {
-    end_ = buffer_ + length - DECODE_BUFFER_POSTFIX_SIZE;
-  }
+  // Since ProtoStep7 (#issue 108)
+  end_ = buffer_ + length - DECODE_BUFFER_POSTFIX_SIZE;
 }
 
 int DecodeBuffer::decodeValue(unsigned int &value, unsigned int numBits,
@@ -277,63 +275,25 @@ int DecodeBuffer::decodeCachedValue(unsigned int &value, unsigned int numBits,
 
   if (index == 2)
   {
-    if (control -> isProtoStep8() == 1)
-    {
-      blockSize = cache.getBlockSize(blockSize);
-
-      if (decodeValue(value, numBits, blockSize, endOkay))
-      {
-        cache.insert(value, IntMask[numBits]);
-
-        return 1;
-      }
+    // Since ProtoStep8 (#issue 108)
+    blockSize = cache.getBlockSize(blockSize);
 
-      #ifdef PANIC
-      *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [H] "
-              << "in decodeCacheValue() with no value found.\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Failure decoding data in context [H].\n";
-
-      HandleAbort();
-    }
-    else
+    if (decodeValue(value, numBits, blockSize, endOkay))
     {
-      unsigned int sameDiff;
-
-      decodeBoolValue(sameDiff);
-
-      if (sameDiff)
-      {
-        value = cache.getLastDiff(IntMask[numBits]);
+      cache.insert(value, IntMask[numBits]);
 
-        cache.insert(value, IntMask[numBits]);
-
-        return 1;
-      }
-      else
-      {
-        blockSize = cache.getBlockSize(blockSize);
-
-        if (decodeValue(value, numBits, blockSize, endOkay))
-        {
-          cache.insert(value, IntMask[numBits]);
-
-          return 1;
-        }
+      return 1;
+    }
 
-        #ifdef PANIC
-        *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [H] "
-                << "in decodeCacheValue() with no value found.\n"
-                << logofs_flush;
-        #endif
+    #ifdef PANIC
+    *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [H] "
+            << "in decodeCacheValue() with no value found.\n"
+            << logofs_flush;
+    #endif
 
-        cerr << "Error" << ": Failure decoding data in context [H].\n";
+    cerr << "Error" << ": Failure decoding data in context [H].\n";
 
-        HandleAbort();
-      }
-    }
+    HandleAbort();
   }
   else
   {
@@ -665,28 +625,3 @@ void DecodeBuffer::decodeFreeXidValue(unsigned int &value, FreeCache &cache)
   decodeCachedValue(value, 29, cache);
 }
 
-void DecodeBuffer::decodePositionValueCompat(short int &value, PositionCacheCompat &cache)
-{
-  unsigned int t;
-
-  decodeCachedValue(t, 13, *(cache.base_[cache.slot_]));
-
-  cache.last_ += t;
-  cache.last_ &= 0x1fff;
-
-  value = cache.last_;
-
-  #ifdef DEBUG
-  *logofs << "DecodeBuffer: Decoded position "
-          << value << " with base " << cache.slot_
-          << ".\n" << logofs_flush;
-  #endif
-
-  #ifdef DEBUG
-  *logofs << "DecodeBuffer: Position block prediction is "
-          << (*(cache.base_[cache.slot_])).getBlockSize(13)
-          << ".\n" << logofs_flush;
-  #endif
-
-  cache.slot_ = (value & 0x1f);
-}
diff --git a/nxcomp/DecodeBuffer.h b/nxcomp/DecodeBuffer.h
index 9345f4e23..98f7bf35f 100644
--- a/nxcomp/DecodeBuffer.h
+++ b/nxcomp/DecodeBuffer.h
@@ -27,9 +27,6 @@
 #include "OpcodeCache.h"
 #include "ActionCache.h"
 
-#include "ActionCacheCompat.h"
-#include "PositionCacheCompat.h"
-
 #define DECODE_BUFFER_OVERFLOW_SIZE        4194304
 
 #define DECODE_BUFFER_POSTFIX_SIZE         1
@@ -99,15 +96,6 @@ class DecodeBuffer
 
   void decodeFreeXidValue(unsigned int &value, FreeCache &cache);
 
-  void decodeActionValueCompat(unsigned char &value, ActionCacheCompat &cache)
-  {
-    decodeCachedValue(value, 2, cache.base_[cache.slot_]);
-
-    cache.slot_ = value;
-  }
-
-  void decodePositionValueCompat(short int &value, PositionCacheCompat &cache);
-
   void decodeTextData(unsigned char *buffer, unsigned int numBytes)
   {
     decodeMemory(buffer, numBytes);
diff --git a/nxcomp/EncodeBuffer.cpp b/nxcomp/EncodeBuffer.cpp
index 12a57180e..afcf60a9e 100644
--- a/nxcomp/EncodeBuffer.cpp
+++ b/nxcomp/EncodeBuffer.cpp
@@ -261,47 +261,14 @@ void EncodeBuffer::encodeCachedValue(unsigned int value, unsigned int numBits,
     // Avoid to encode the additional bool.
     //
 
-    if (control -> isProtoStep8() == 1)
-    {
-      #ifdef DUMP
-      *logofs << "EncodeBuffer: Encoded missed int using "
-              << diffBits() << " bits out of " << numBits
-              << ".\n" << logofs_flush;
-      #endif
-
-      encodeValue(value, numBits, blockSize);
-    }
-    else
-    {
-      if (sameDiff)
-      {
-        #ifdef DUMP
-        *logofs << "EncodeBuffer: Matched difference with block size "
-                << cache.getBlockSize(blockSize) << ".\n"
-                << logofs_flush;
-        #endif
-
-        encodeBoolValue(1);
-      }
-      else
-      {
-        #ifdef DUMP
-        *logofs << "EncodeBuffer: Missed difference with block size "
-                << cache.getBlockSize(blockSize) << ".\n"
-                << logofs_flush;
-        #endif
-
-        encodeBoolValue(0);
-
-        encodeValue(value, numBits, blockSize);
-      }
+    // Since ProtoStep8 (#issue 108)
+    #ifdef DUMP
+    *logofs << "EncodeBuffer: Encoded missed int using "
+            << diffBits() << " bits out of " << numBits
+            << ".\n" << logofs_flush;
+    #endif
 
-      #ifdef DUMP
-      *logofs << "EncodeBuffer: Encoded missed int using "
-              << diffBits() << " bits out of " << numBits
-              << ".\n" << logofs_flush;
-      #endif
-    }
+    encodeValue(value, numBits, blockSize);
   }
 }
 
@@ -454,7 +421,8 @@ unsigned int EncodeBuffer::getLength() const
     length++;
   }
 
-  if (length > 0 && control -> isProtoStep7() == 1)
+  // Since ProtoStep7 (#issue 108)
+  if (length > 0)
   {
     return length + ENCODE_BUFFER_POSTFIX_SIZE;
   }
@@ -641,20 +609,3 @@ void EncodeBuffer::encodeFreeXidValue(unsigned int value, FreeCache &cache)
 {
   encodeCachedValue(value, 29, cache);
 }
-
-void EncodeBuffer::encodePositionValueCompat(short int value, PositionCacheCompat &cache)
-{
-  unsigned int t = (value - cache.last_);
-
-  encodeCachedValue(t, 13, *(cache.base_[cache.slot_]));
-
-  cache.last_ = value;
-
-  #ifdef DEBUG
-  *logofs << "EncodeBuffer: Encoded position "
-          << value << " with base " << cache.slot_
-          << ".\n" << logofs_flush;
-  #endif
-
-  cache.slot_ = (value & 0x1f);
-}
diff --git a/nxcomp/EncodeBuffer.h b/nxcomp/EncodeBuffer.h
index 9f5ac5352..c7ee0a3b0 100644
--- a/nxcomp/EncodeBuffer.h
+++ b/nxcomp/EncodeBuffer.h
@@ -25,9 +25,6 @@
 #include "OpcodeCache.h"
 #include "ActionCache.h"
 
-#include "ActionCacheCompat.h"
-#include "PositionCacheCompat.h"
-
 #define ENCODE_BUFFER_DEFAULT_SIZE        16384
 
 //
@@ -117,15 +114,6 @@ class EncodeBuffer
 
   void encodeFreeXidValue(unsigned int value, FreeCache &cache);
 
-  void encodeActionValueCompat(unsigned char value, ActionCacheCompat &cache)
-  {
-    encodeCachedValue(value, 2, cache.base_[cache.slot_]);
-
-    cache.slot_ = value;
-  }
-
-  void encodePositionValueCompat(short int value, PositionCacheCompat &cache);
-
   void encodeTextData(const unsigned char *buffer, unsigned int numBytes)
   {
     encodeMemory(buffer, numBytes);
diff --git a/nxcomp/FillPoly.cpp b/nxcomp/FillPoly.cpp
index 37df3772b..291cc2a4b 100644
--- a/nxcomp/FillPoly.cpp
+++ b/nxcomp/FillPoly.cpp
@@ -51,8 +51,8 @@ int FillPolyStore::parseIdentity(Message *message, const unsigned char *buffer,
   fillPoly -> shape = *(buffer + 12);
   fillPoly -> mode  = *(buffer + 13);
 
-  if (control -> isProtoStep8() == 1 &&
-          size >= (unsigned int) dataOffset)
+  // Since ProtoStep8 (#issue 108)
+  if (size >= (unsigned int) dataOffset)
   {
     fillPoly -> x_origin = GetUINT(buffer + 16, bigEndian);
     fillPoly -> y_origin = GetUINT(buffer + 18, bigEndian);
@@ -85,8 +85,8 @@ int FillPolyStore::unparseIdentity(const Message *message, unsigned char *buffer
   *(buffer + 12) = fillPoly -> shape;
   *(buffer + 13) = fillPoly -> mode;
 
-  if (control -> isProtoStep8() == 1 &&
-          size >= (unsigned int) dataOffset)
+  // Since ProtoStep8 (#issue 108)
+  if (size >= (unsigned int) dataOffset)
   {
     PutUINT(fillPoly -> x_origin, buffer + 16, bigEndian);
     PutUINT(fillPoly -> y_origin, buffer + 18, bigEndian);
@@ -151,8 +151,8 @@ void FillPolyStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *me
 
   cachedFillPoly -> gcontext = fillPoly -> gcontext;
 
-  if (control -> isProtoStep8() == 1 &&
-          fillPoly -> size_ >= dataOffset)
+  // Since ProtoStep8 (#issue 108)
+  if (fillPoly -> size_ >= dataOffset)
   {
     #ifdef TEST
     *logofs << name() << ": Encoding value " << fillPoly -> x_origin
@@ -197,8 +197,8 @@ void FillPolyStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *me
           << " as gcontext field.\n" << logofs_flush;
   #endif
 
-  if (control -> isProtoStep8() == 1 &&
-          fillPoly -> size_ >= dataOffset)
+  // Since ProtoStep8 (#issue 108)
+  if (fillPoly -> size_ >= dataOffset)
   {
     unsigned int value;
 
diff --git a/nxcomp/FillPoly.h b/nxcomp/FillPoly.h
index f33968494..d926b6dee 100644
--- a/nxcomp/FillPoly.h
+++ b/nxcomp/FillPoly.h
@@ -40,7 +40,6 @@
 #define FILLPOLY_ENABLE_COMPRESS            0
 
 #define FILLPOLY_DATA_LIMIT                 512
-#define FILLPOLY_DATA_OFFSET                16
 
 #define FILLPOLY_CACHE_SLOTS                2000
 #define FILLPOLY_CACHE_THRESHOLD            3
@@ -98,12 +97,9 @@ class FillPolyStore : public MessageStore
     enableCompress = FILLPOLY_ENABLE_COMPRESS;
 
     dataLimit  = FILLPOLY_DATA_LIMIT;
-    dataOffset = FILLPOLY_DATA_OFFSET;
 
-    if (control -> isProtoStep8() == 1)
-    {
-      dataOffset = FILLPOLY_DATA_OFFSET_IF_PROTO_STEP_8;
-    }
+    // Since ProtoStep8 (#issue 108)
+    dataOffset = FILLPOLY_DATA_OFFSET_IF_PROTO_STEP_8;
 
     cacheSlots          = FILLPOLY_CACHE_SLOTS;
     cacheThreshold      = FILLPOLY_CACHE_THRESHOLD;
@@ -169,11 +165,9 @@ class FillPolyStore : public MessageStore
 
   virtual int identitySize(const unsigned char *buffer, unsigned int size)
   {
-    unsigned int offset = (control -> isProtoStep8() == 1 ?
-                               FILLPOLY_DATA_OFFSET_IF_PROTO_STEP_8 :
-                                   FILLPOLY_DATA_OFFSET);
-
-    return (size >= offset ? offset : size);
+    // Since ProtoStep8 (#issue 108)
+    return (size >= FILLPOLY_DATA_OFFSET_IF_PROTO_STEP_8 ?
+                        FILLPOLY_DATA_OFFSET_IF_PROTO_STEP_8 : size);
   }
 
   virtual int parseIdentity(Message *message, const unsigned char *buffer,
diff --git a/nxcomp/GenericChannel.h b/nxcomp/GenericChannel.h
index ba4f1e7e8..10ae794bb 100644
--- a/nxcomp/GenericChannel.h
+++ b/nxcomp/GenericChannel.h
@@ -209,11 +209,7 @@ class CupsChannel : public GenericChannel
 
   virtual int isCompressed()
   {
-    if (control -> isProtoStep8() == 0)
-    {
-      return 1;
-    }
-
+    // Since ProtoStep8 (#issue 108)
     return 0;
   }
 
@@ -252,11 +248,7 @@ class SmbChannel : public GenericChannel
 
   virtual int isCompressed()
   {
-    if (control -> isProtoStep8() == 0)
-    {
-      return 1;
-    }
-
+    // Since ProtoStep8 (#issue 108)
     return 0;
   }
 
@@ -344,11 +336,7 @@ class HttpChannel : public GenericChannel
 
   virtual int isCompressed()
   {
-    if (control -> isProtoStep8() == 0)
-    {
-      return 1;
-    }
-
+    // Since ProtoStep8 (#issue 108)
     return 0;
   }
 
@@ -387,11 +375,7 @@ class FontChannel : public GenericChannel
 
   virtual int isCompressed()
   {
-    if (control -> isProtoStep8() == 0)
-    {
-      return 1;
-    }
-
+    // Since ProtoStep8 (#issue 108)
     return 0;
   }
 
diff --git a/nxcomp/GenericReply.cpp b/nxcomp/GenericReply.cpp
index 9daccc566..f7ffe83dd 100644
--- a/nxcomp/GenericReply.cpp
+++ b/nxcomp/GenericReply.cpp
@@ -45,12 +45,9 @@ GenericReplyStore::GenericReplyStore(StaticCompressor *compressor)
   enableCache    = GENERICREPLY_ENABLE_CACHE;
   enableData     = GENERICREPLY_ENABLE_DATA;
   enableSplit    = GENERICREPLY_ENABLE_SPLIT;
-  enableCompress = GENERICREPLY_ENABLE_COMPRESS;
 
-  if (control -> isProtoStep7() == 1)
-  {
-    enableCompress = GENERICREPLY_ENABLE_COMPRESS_IF_PROTO_STEP_7;
-  }
+  // Since ProtoStep7 (#issue 108)
+  enableCompress = GENERICREPLY_ENABLE_COMPRESS_IF_PROTO_STEP_7;
 
   dataLimit  = GENERICREPLY_DATA_LIMIT;
   dataOffset = GENERICREPLY_DATA_OFFSET;
diff --git a/nxcomp/GenericReply.h b/nxcomp/GenericReply.h
index de97b86d0..20786a8d2 100644
--- a/nxcomp/GenericReply.h
+++ b/nxcomp/GenericReply.h
@@ -37,7 +37,6 @@
 #define GENERICREPLY_ENABLE_CACHE                       1
 #define GENERICREPLY_ENABLE_DATA                        1
 #define GENERICREPLY_ENABLE_SPLIT                       0
-#define GENERICREPLY_ENABLE_COMPRESS                    1
 
 #define GENERICREPLY_DATA_LIMIT                         1048576 - 32
 #define GENERICREPLY_DATA_OFFSET                        32
diff --git a/nxcomp/GenericRequest.cpp b/nxcomp/GenericRequest.cpp
index 40077291b..fa34b89d2 100644
--- a/nxcomp/GenericRequest.cpp
+++ b/nxcomp/GenericRequest.cpp
@@ -45,14 +45,9 @@ GenericRequestStore::GenericRequestStore(StaticCompressor *compressor)
   enableCache    = GENERICREQUEST_ENABLE_CACHE;
   enableData     = GENERICREQUEST_ENABLE_DATA;
   enableSplit    = GENERICREQUEST_ENABLE_SPLIT;
-  enableCompress = GENERICREQUEST_ENABLE_COMPRESS;
 
-  if (control -> isProtoStep7() == 1)
-  {
-    enableCompress = GENERICREQUEST_ENABLE_COMPRESS_IF_PROTO_STEP_7;
-
-    enableCompress = 0;
-  }
+  // Since ProtoStep7 (#issue 108)
+  enableCompress = GENERICREQUEST_ENABLE_COMPRESS_IF_PROTO_STEP_7;
 
   dataLimit  = GENERICREQUEST_DATA_LIMIT;
   dataOffset = GENERICREQUEST_DATA_OFFSET;
diff --git a/nxcomp/GenericRequest.h b/nxcomp/GenericRequest.h
index 3175fc2ba..4f164523e 100644
--- a/nxcomp/GenericRequest.h
+++ b/nxcomp/GenericRequest.h
@@ -37,7 +37,6 @@
 #define GENERICREQUEST_ENABLE_CACHE                      1
 #define GENERICREQUEST_ENABLE_DATA                       1
 #define GENERICREQUEST_ENABLE_SPLIT                      0
-#define GENERICREQUEST_ENABLE_COMPRESS                   1
 
 #define GENERICREQUEST_DATA_LIMIT                        262144 - 20
 #define GENERICREQUEST_DATA_OFFSET                       20
diff --git a/nxcomp/GetImageReply.cpp b/nxcomp/GetImageReply.cpp
index d4bc21b5a..bea3ee84d 100644
--- a/nxcomp/GetImageReply.cpp
+++ b/nxcomp/GetImageReply.cpp
@@ -43,12 +43,9 @@ GetImageReplyStore::GetImageReplyStore(StaticCompressor *compressor)
   enableCache    = GETIMAGEREPLY_ENABLE_CACHE;
   enableData     = GETIMAGEREPLY_ENABLE_DATA;
   enableSplit    = GETIMAGEREPLY_ENABLE_SPLIT;
-  enableCompress = GETIMAGEREPLY_ENABLE_COMPRESS;
 
-  if (control -> isProtoStep7() == 1)
-  {
-    enableCompress = GETIMAGEREPLY_ENABLE_COMPRESS_IF_PROTO_STEP_7;
-  }
+  // Since ProtoStep7 (#issue 108)
+  enableCompress = GETIMAGEREPLY_ENABLE_COMPRESS_IF_PROTO_STEP_7;
 
   dataLimit  = GETIMAGEREPLY_DATA_LIMIT;
   dataOffset = GETIMAGEREPLY_DATA_OFFSET;
diff --git a/nxcomp/GetImageReply.h b/nxcomp/GetImageReply.h
index ee7b0bfa3..0fd152122 100644
--- a/nxcomp/GetImageReply.h
+++ b/nxcomp/GetImageReply.h
@@ -37,7 +37,6 @@
 #define GETIMAGEREPLY_ENABLE_CACHE                       1
 #define GETIMAGEREPLY_ENABLE_DATA                        1
 #define GETIMAGEREPLY_ENABLE_SPLIT                       0
-#define GETIMAGEREPLY_ENABLE_COMPRESS                    1
 
 #define GETIMAGEREPLY_DATA_LIMIT                         1048576 - 32
 #define GETIMAGEREPLY_DATA_OFFSET                        32
diff --git a/nxcomp/GetPropertyReply.cpp b/nxcomp/GetPropertyReply.cpp
index 223131803..4a906e70a 100644
--- a/nxcomp/GetPropertyReply.cpp
+++ b/nxcomp/GetPropertyReply.cpp
@@ -45,12 +45,9 @@ GetPropertyReplyStore::GetPropertyReplyStore(StaticCompressor *compressor)
   enableCache    = GETPROPERTYREPLY_ENABLE_CACHE;
   enableData     = GETPROPERTYREPLY_ENABLE_DATA;
   enableSplit    = GETPROPERTYREPLY_ENABLE_SPLIT;
-  enableCompress = GETPROPERTYREPLY_ENABLE_COMPRESS;
 
-  if (control -> isProtoStep7() == 1)
-  {
-    enableCompress = GETPROPERTYREPLY_ENABLE_COMPRESS_IF_PROTO_STEP_7;
-  }
+  // Since ProtoStep7 (#issue 108)
+  enableCompress = GETPROPERTYREPLY_ENABLE_COMPRESS_IF_PROTO_STEP_7;
 
   dataLimit  = GETPROPERTYREPLY_DATA_LIMIT;
   dataOffset = GETPROPERTYREPLY_DATA_OFFSET;
diff --git a/nxcomp/GetPropertyReply.h b/nxcomp/GetPropertyReply.h
index 0f6b19508..f8d53ba0f 100644
--- a/nxcomp/GetPropertyReply.h
+++ b/nxcomp/GetPropertyReply.h
@@ -37,7 +37,6 @@
 #define GETPROPERTYREPLY_ENABLE_CACHE                       1
 #define GETPROPERTYREPLY_ENABLE_DATA                        1
 #define GETPROPERTYREPLY_ENABLE_SPLIT                       0
-#define GETPROPERTYREPLY_ENABLE_COMPRESS                    1
 
 #define GETPROPERTYREPLY_DATA_LIMIT                         1048576 - 32
 #define GETPROPERTYREPLY_DATA_OFFSET                        32
diff --git a/nxcomp/ListFontsReply.cpp b/nxcomp/ListFontsReply.cpp
index 5bace82f2..84acaba25 100644
--- a/nxcomp/ListFontsReply.cpp
+++ b/nxcomp/ListFontsReply.cpp
@@ -39,12 +39,9 @@ ListFontsReplyStore::ListFontsReplyStore(StaticCompressor *compressor)
   enableCache    = LISTFONTSREPLY_ENABLE_CACHE;
   enableData     = LISTFONTSREPLY_ENABLE_DATA;
   enableSplit    = LISTFONTSREPLY_ENABLE_SPLIT;
-  enableCompress = LISTFONTSREPLY_ENABLE_COMPRESS;
 
-  if (control -> isProtoStep7() == 1)
-  {
-    enableCompress = LISTFONTSREPLY_ENABLE_COMPRESS_IF_PROTO_STEP_7;
-  }
+  // Since ProtoStep7 (#issue 108)
+  enableCompress = LISTFONTSREPLY_ENABLE_COMPRESS_IF_PROTO_STEP_7;
 
   dataLimit  = LISTFONTSREPLY_DATA_LIMIT;
   dataOffset = LISTFONTSREPLY_DATA_OFFSET;
diff --git a/nxcomp/ListFontsReply.h b/nxcomp/ListFontsReply.h
index 078fd7ebc..549b7d1c1 100644
--- a/nxcomp/ListFontsReply.h
+++ b/nxcomp/ListFontsReply.h
@@ -37,7 +37,6 @@
 #define LISTFONTSREPLY_ENABLE_CACHE                       1
 #define LISTFONTSREPLY_ENABLE_DATA                        1
 #define LISTFONTSREPLY_ENABLE_SPLIT                       0
-#define LISTFONTSREPLY_ENABLE_COMPRESS                    1
 
 #define LISTFONTSREPLY_DATA_LIMIT                         1048576 - 32
 #define LISTFONTSREPLY_DATA_OFFSET                        32
diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 79d753dea..0f9fec6ef 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -4466,32 +4466,16 @@ int SetupServiceSockets()
   else
   {
     //
-    // Disable the font server connections if
-    // they are not supported by the remote
-    // proxy.
+    // Get ready to listen for the font server connections
     //
 
     if (useFontSocket)
     {
-      if (control -> isProtoStep7() == 1)
-      {
-        int port = atoi(fontPort);
+      // Since ProtoStep7 (#issue 108)
+      int port = atoi(fontPort);
 
-        if ((fontFD = ListenConnection(port, "font")) < 0)
-        {
-          useFontSocket = 0;
-        }
-      }
-      else
+      if ((fontFD = ListenConnection(port, "font")) < 0)
       {
-        #ifdef WARNING
-        *logofs << "Loop: WARNING! Font server connections not supported "
-                << "by the remote proxy.\n" << logofs_flush;
-        #endif
-
-        cerr << "Warning" << ": Font server connections not supported "
-             << "by the remote proxy.\n";
-
         useFontSocket = 0;
       }
     }
@@ -4510,23 +4494,9 @@ int SetupServiceSockets()
 
   if (useSlaveSocket)
   {
-    if (control -> isProtoStep7() == 1)
-    {
-      if ((slaveFD = ListenConnection(slavePort, "slave")) < 0)
-      {
-        useSlaveSocket = 0;
-      }
-    }
-    else
+    // Since ProtoStep7 (#issue 108)
+    if ((slaveFD = ListenConnection(slavePort, "slave")) < 0)
     {
-      #ifdef WARNING
-      *logofs << "Loop: WARNING! Slave connections not supported "
-                << "by the remote proxy.\n" << logofs_flush;
-      #endif
-
-      cerr << "Warning" << ": Slave connections not supported "
-           << "by the remote proxy.\n";
-
       useSlaveSocket = 0;
     }
   }
@@ -7226,8 +7196,11 @@ int SendProxyOptions(int fd)
   // value and ignore the second.
   //
 
-  sprintf(options, "NXPROXY-1.5.0-%i.%i.%i", control -> LocalVersionMajor,
-              control -> LocalVersionMinor, control -> LocalVersionPatch);
+  sprintf(options, "NXPROXY-%s-%i.%i.%i",
+              control -> NXPROXY_COMPATIBILITY_VERSION,
+                  control -> LocalVersionMajor,
+                      control -> LocalVersionMinor,
+                          control -> LocalVersionPatch);
 
   //
   // If you want to send options from proxy
@@ -7306,8 +7279,8 @@ int SendProxyOptions(int fd)
     // Add the 'strict' option, if needed.
     //
 
-    if (control -> isProtoStep7() == 1 &&
-            useStrict != -1)
+    // Since ProtoStep7 (#issue 108)
+    if (useStrict != -1)
     {
       sprintf(options + strlen(options), "strict=%d,", useStrict);
     }
@@ -7317,8 +7290,8 @@ int SendProxyOptions(int fd)
     // memory segment.
     //
 
-    if (control -> isProtoStep7() == 1 &&
-            *shsegSizeName != '\0')
+    // Since ProtoStep7 (#issue 108)
+    if (*shsegSizeName != '\0')
     {
       sprintf(options + strlen(options), "shseg=%s,", shsegSizeName);
     }
@@ -12064,9 +12037,12 @@ int SetSession()
     // to the agent.
     //
 
-    if (*sessionType != '\0' &&
-            (control -> isProtoStep8() == 1 ||
-                strncmp(sessionType, "unix-", strlen("unix-")) != 0))
+    //
+    // Since ProtoStep8 (#issue 108) and also
+    // with older "unix-" sessions
+    //
+
+    if (*sessionType != '\0')
     {
       #ifdef WARNING
       *logofs << "Loop: WARNING! Unrecognized session type '"
@@ -12599,37 +12575,18 @@ int SetVersion()
   }
 
   //
-  // Handle the 1.5.0 versions. The protocol
-  // step 6 is the minimum supported version.
+  // Handle versions from 3.5.0. The protocol
+  // step 10 is the minimum supported version.
   //
 
   int step = 0;
 
-  if (major == 1)
-  {
-    if (minor == 5)
-    {
-      step = 6;
-    }
-  }
-  else if (major == 2)
-  {
-    step = 7;
-  }
-  else if (major == 3)
+  if (major == 3)
   {
-    if (minor >= 2)
+    if (minor >= 5)
     {
       step = 10;
     }
-    else if (minor > 0 || patch > 0)
-    {
-      step = 9;
-    }
-    else
-    {
-      step = 8;
-    }
   }
   else if (major > 3)
   {
@@ -12638,6 +12595,16 @@ int SetVersion()
 
   if (step == 0)
   {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Unable to set the protocol step value from "
+         << "the negotiated protocol version " << major << "." << minor
+         << "." << patch << ".\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Unable to set the protocol step value from "
+         << "the negotiated protocol version " << major << "." << minor
+         << "." << patch << ".\n";
+
     #ifdef PANIC
     *logofs << "Loop: PANIC! Incompatible remote version "
             << control -> RemoteVersionMajor << "." << control -> RemoteVersionMinor
@@ -12702,97 +12669,21 @@ int SetVersion()
 
   if (control -> ProxyMode == proxy_client)
   {
-    if (control -> isProtoStep8() == 0)
-    {
-      if (strncmp(sessionType, "shadow", strlen("shadow")) == 0 ||
-              strncmp(sessionType, "application", strlen("application")) == 0 ||
-                  strncmp(sessionType, "console", strlen("console")) == 0 ||
-                      strncmp(sessionType, "default", strlen("default")) == 0 ||
-                          strncmp(sessionType, "gnome", strlen("gnome")) == 0 ||
-                              strncmp(sessionType, "kde", strlen("kde")) == 0 ||
-                                  strncmp(sessionType, "cde", strlen("cde")) == 0 ||
-                                      strncmp(sessionType, "xdm", strlen("xdm")) == 0)
-
-      {
-        #if defined(TEST) || defined(INFO)
-        *logofs << "Loop: WARNING! Prepending 'unix-' to the "
-                << "name of the session.\n" << logofs_flush;
-        #endif
-
-        char buffer[DEFAULT_STRING_LENGTH];
-
-        snprintf(buffer, DEFAULT_STRING_LENGTH - 1, "unix-%s", sessionType);
-
-        strcpy(sessionType, buffer);
-      }
-    }
-
     //
-    // Check if the remote is able to handle
-    // the selected pack method.
+    // Since ProtoStep8 (#issue 108)
     //
-
-    if (control -> isProtoStep8() == 0)
-    {
-      if (packMethod == PACK_ADAPTIVE || packMethod == PACK_LOSSY)
-      {
-        #ifdef TEST
-        *logofs << "Loop: WARNING! Assuming a lossy encoding with "
-                << "an old proxy version.\n" << logofs_flush;
-        #endif
-
-        packMethod = PACK_JPEG_16M_COLORS;
-      }
-      else if (packMethod == PACK_LOSSLESS)
-      {
-        #ifdef TEST
-        *logofs << "Loop: WARNING! Assuming a lossless encoding with "
-                << "an old proxy version.\n" << logofs_flush;
-        #endif
-
-        if (control -> isProtoStep7() == 1)
-        {
-          packMethod = PACK_RLE_16M_COLORS;
-        }
-        else
-        {
-          packMethod = PACK_PNG_16M_COLORS;
-        }
-      }
-    }
-
-    //
-    // If the remote doesn't support the
-    // selected method use something that
-    // is compatible.
+    // Now it's assumed that the remote is
+    // able to handle the selected pack
+    // method
     //
 
-    if ((packMethod == PACK_RGB_16M_COLORS ||
-            packMethod == PACK_RLE_16M_COLORS ||
-                packMethod == PACK_BITMAP_16M_COLORS) &&
-                    control -> isProtoStep7() == 0)
-    {
-      #ifdef TEST
-      *logofs << "Loop: WARNING! Setting the pack method to '"
-              << PACK_PNG_16M_COLORS << "' with '" << packMethod
-              << "' unsupported.\n" << logofs_flush;
-      #endif
-
-      packMethod  = PACK_PNG_16M_COLORS;
-      packQuality = 9;
-    }
-    else if (packMethod == PACK_BITMAP_16M_COLORS &&
-                 control -> isProtoStep8() == 0)
-    {
-      #ifdef TEST
-      *logofs << "Loop: WARNING! Setting the pack method to '"
-              << PACK_RLE_16M_COLORS << "' with '" << packMethod
-              << "' unsupported.\n" << logofs_flush;
-      #endif
-
-      packMethod  = PACK_RLE_16M_COLORS;
-      packQuality = 9;
-    }
+    #ifdef TEST
+    *logofs << __FILE__ << " : " << __LINE__ << " - "
+            << "step = " << control -> getProtoStep()
+            << " packMethod = " << packMethod
+            << " packQuality = " << packQuality
+            << ".\n"  << logofs_flush;
+    #endif
 
     //
     // Update the pack method name.
@@ -12803,29 +12694,32 @@ int SetVersion()
 
   //
   // At the moment the image cache is not used by the
-  // agent but we need to take care of the compatibi-
-  // lity with old versions. Proxy versions older than
-  // the 3.0.0 assume that it is enabled and will send
-  // specific bits as part of the encoding. Conversely,
-  // it is advisable to disable the cache right now.
-  // By not enabling the image cache, the house-keep-
-  // ing process will only take care of cleaning up
-  // the "cache-" directories.
+  // agent. Proxy versions older than 3.0.0 assumed
+  // that it was enabled and sent specific bits as part
+  // of the encoding. Conversely, it is advisable to
+  // disable the cache right now. By not enabling the
+  // the image cache, the house-keeping process will
+  // only take care of cleaning up the "cache-" direc-
+  // tories.
   //
 
-  if (control -> isProtoStep8() == 1)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Disabling image cache with protocol "
-            << "step '" << control -> getProtoStep()
-            << "'.\n"  << logofs_flush;
-    #endif
+  //
+  // Considering that compatibility with older versions
+  // has been set to cover as far as 3.5.0, the cache can
+  // be disabled at this point without any concern
+  //
 
-    sprintf(imagesSizeName, "0");
+  // Since ProtoStep8 (#issue 108)
+  #ifdef TEST
+  *logofs << "Loop: Disabling image cache with protocol "
+          << "step '" << control -> getProtoStep()
+          << "'.\n"  << logofs_flush;
+  #endif
 
-    control -> ImageCacheEnableLoad = 0;
-    control -> ImageCacheEnableSave = 0;
-  }
+  sprintf(imagesSizeName, "0");
+
+  control -> ImageCacheEnableLoad = 0;
+  control -> ImageCacheEnableSave = 0;
 
   return 1;
 }
@@ -15805,22 +15699,14 @@ static void handleAlertInLoop()
     return;
   }
 
-  if (lastAlert.local == 0 &&
-          (lastAlert.code > LAST_PROTO_STEP_6_ALERT &&
-               control -> isProtoStep7() == 0))
-  {
-    //
-    // The remote proxy would be unable
-    // to handle the alert.
-    //
+  //
+  // Since ProtoStep7 (#issue 108)
+  //
+  // Now the remote proxy should always
+  // be able to handle the alert
+  //
 
-    #ifdef WARNING
-    *logofs << "Loop: WARNING! Ignoring unsupported alert "
-            << "with code '" << lastAlert.code << "'.\n"
-            << logofs_flush;
-    #endif
-  }
-  else if (lastAlert.local == 0)
+  if (lastAlert.local == 0)
   {
     if (proxy != NULL)
     {
diff --git a/nxcomp/Message.cpp b/nxcomp/Message.cpp
index 188ed9a0e..ccafa9963 100644
--- a/nxcomp/Message.cpp
+++ b/nxcomp/Message.cpp
@@ -112,20 +112,6 @@ MessageStore::MessageStore(StaticCompressor *compressor)
   lastRated   = nothing;
   lastAction  = is_discarded;
 
-  //
-  // This is used only for compatibility
-  // with older proxies.
-  //
-
-  if (control -> isProtoStep7() == 1)
-  {
-    lastResize = -1;
-  }
-  else
-  {
-    lastResize = 0;
-  }
-
   //
   // Private members.
   //
diff --git a/nxcomp/Message.h b/nxcomp/Message.h
index dcfff7cb6..c10cb266f 100644
--- a/nxcomp/Message.h
+++ b/nxcomp/Message.h
@@ -30,9 +30,6 @@
 
 #include "ActionCache.h"
 
-#include "ActionCacheCompat.h"
-#include "PositionCacheCompat.h"
-
 #include "StaticCompressor.h"
 
 //
@@ -345,16 +342,6 @@ class MessageStore
 
   ActionCache lastActionCache;
 
-  //
-  // Used in old protocol versions.
-  //
-
-  ActionCacheCompat lastActionCacheCompat;
-
-  PositionCacheCompat lastAddedCacheCompat;
-  PositionCacheCompat lastHitCacheCompat;
-  PositionCacheCompat lastRemovedCacheCompat;
-
   //
   // Position in cache where next insertion
   // is going to take place.
@@ -362,14 +349,6 @@ class MessageStore
 
   short int lastRated;
 
-  //
-  // Size of data part of last split message
-  // once compressed. This is used only for
-  // compatibility with older proxies.
-  //
-
-  int lastResize;
-
   //
   // Constructors and destructors.
   //
diff --git a/nxcomp/PolyLine.cpp b/nxcomp/PolyLine.cpp
index 4d285e0b1..9f2d82a5d 100644
--- a/nxcomp/PolyLine.cpp
+++ b/nxcomp/PolyLine.cpp
@@ -93,10 +93,8 @@ void PolyLineStore::dumpIdentity(const Message *message) const
 void PolyLineStore::identityChecksum(const Message *message, const unsigned char *buffer,
                                          unsigned int size, int bigEndian) const
 {
-  if (control -> isProtoStep8() == 1)
-  {
-    md5_append(md5_state_, buffer + 1, 1);
-  }
+  // Since ProtoStep8 (#issue 108)
+  md5_append(md5_state_, buffer + 1, 1);
 }
 
 void PolyLineStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
@@ -108,11 +106,6 @@ void PolyLineStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *me
 
   ClientCache *clientCache = (ClientCache *) channelCache;
 
-  if (control -> isProtoStep8() == 0)
-  {
-    encodeBuffer.encodeBoolValue((unsigned int) polyLine -> mode);
-  }
-
   #ifdef TEST
   *logofs << name() << ": Encoding value " << polyLine -> drawable
           << " as drawable field.\n" << logofs_flush;
@@ -141,13 +134,6 @@ void PolyLineStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *me
 
   unsigned int value;
 
-  if (control -> isProtoStep8() == 0)
-  {
-    decodeBuffer.decodeBoolValue(value);
-
-    polyLine -> mode = value;
-  }
-
   decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
 
   polyLine -> drawable = value;
diff --git a/nxcomp/PolyPoint.cpp b/nxcomp/PolyPoint.cpp
index 847300f78..cae4b80a0 100644
--- a/nxcomp/PolyPoint.cpp
+++ b/nxcomp/PolyPoint.cpp
@@ -93,10 +93,8 @@ void PolyPointStore::dumpIdentity(const Message *message) const
 void PolyPointStore::identityChecksum(const Message *message, const unsigned char *buffer,
                                           unsigned int size, int bigEndian) const
 {
-  if (control -> isProtoStep8() == 1)
-  {
-    md5_append(md5_state_, buffer + 1, 1);
-  }
+  // Since ProtoStep8 (#issue 108)
+  md5_append(md5_state_, buffer + 1, 1);
 }
 
 void PolyPointStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
@@ -108,11 +106,6 @@ void PolyPointStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *m
 
   ClientCache *clientCache = (ClientCache *) channelCache;
 
-  if (control -> isProtoStep8() == 0)
-  {
-    encodeBuffer.encodeBoolValue((unsigned int) polyPoint -> mode);
-  }
-
   #ifdef TEST
   *logofs << name() << ": Encoding value " << polyPoint -> drawable
           << " as drawable field.\n" << logofs_flush;
@@ -141,13 +134,6 @@ void PolyPointStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *m
 
   unsigned int value;
 
-  if (control -> isProtoStep8() == 0)
-  {
-    decodeBuffer.decodeBoolValue(value);
-
-    polyPoint -> mode = value;
-  }
-
   decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
 
   polyPoint -> drawable = value;
diff --git a/nxcomp/PositionCacheCompat.cpp b/nxcomp/PositionCacheCompat.cpp
index 4a6a2cd63..dd301a0a4 100644
--- a/nxcomp/PositionCacheCompat.cpp
+++ b/nxcomp/PositionCacheCompat.cpp
@@ -21,25 +21,8 @@
 
 PositionCacheCompat::PositionCacheCompat()
 {
-  if (control -> isProtoStep7() == 0)
-  {
-    for (int i = 0; i < 32; i++)
-    {
-      base_[i] = new IntCache(8);
-    }
-
-    slot_ = 0;
-    last_ = 0;
-  }
 }
 
 PositionCacheCompat::~PositionCacheCompat()
 {
-  if (control -> isProtoStep7() == 0)
-  {
-    for (int i = 0; i < 32; i++)
-    {
-      delete base_[i];
-    }
-  }
 }
diff --git a/nxcomp/Proxy.cpp b/nxcomp/Proxy.cpp
index 4eb99cf45..ae115fede 100644
--- a/nxcomp/Proxy.cpp
+++ b/nxcomp/Proxy.cpp
@@ -244,22 +244,6 @@ Proxy::Proxy(int fd)
   clientStore_ = new ClientStore(compressor_);
   serverStore_ = new ServerStore(compressor_);
 
-  //
-  // Older proxies will refuse to store
-  // messages bigger than 262144 bytes.
-  //
-
-  if (control -> isProtoStep7() == 0)
-  {
-    #ifdef TEST
-    *logofs << "Proxy: WARNING! Limiting the maximum "
-            << "message size to " << 262144 << ".\n"
-            << logofs_flush;
-    #endif
-
-    control -> MaximumMessageSize = 262144;
-  }
-
   clientCache_ = new ClientCache();
   serverCache_ = new ServerCache();
 
@@ -3049,31 +3033,19 @@ int Proxy::handleCloseAllXConnections()
 
 int Proxy::handleCloseAllListeners()
 {
-  if (control -> isProtoStep7() == 1)
-  {
-    if (finish_ == 0)
-    {
-      #ifdef TEST
-      *logofs << "Proxy: Closing down all remote listeners.\n"
-              << logofs_flush;
-      #endif
-
-      if (handleControl(code_finish_listeners) < 0)
-      {
-        return -1;
-      }
-
-      finish_ = 1;
-    }
-  }
-  else
+  // Since ProtoStep7 (#issue 108)
+  if (finish_ == 0)
   {
     #ifdef TEST
-    *logofs << "Proxy: WARNING! Not sending unsupported "
-            << "'code_finish_listeners' message.\n"
+    *logofs << "Proxy: Closing down all remote listeners.\n"
             << logofs_flush;
     #endif
 
+    if (handleControl(code_finish_listeners) < 0)
+    {
+      return -1;
+    }
+
     finish_ = 1;
   }
 
@@ -4546,15 +4518,8 @@ int Proxy::addTokenCodes(T_proxy_token &token)
 
   int count = 0;
 
-  if (control -> isProtoStep7() == 1)
-  {
-    count = token.bytes / token.size;
-
-    if (count > 255)
-    {
-      count = 255;
-    }
-  }
+  // Since ProtoStep7 (#issue 108)
+  count = token.bytes / token.size;
 
   //
   // Force a count of 1, for example
@@ -4569,6 +4534,12 @@ int Proxy::addTokenCodes(T_proxy_token &token)
   }
   else
   {
+    // Since ProtoStep7 (#issue 108)
+    if (count > 255)
+    {
+      count = 255;
+    }
+
     //
     // Let the next token account for the
     // remaining bytes.
@@ -4609,73 +4580,52 @@ int Proxy::handleToken(T_frame_type type)
 
   if (type == frame_data)
   {
-    if (control -> isProtoStep7() == 1)
+    //
+    // Since ProtoStep7 (#issue 108)
+    //
+
+    // Send a distinct token for each data type.
+    // We don't want to slow down the sending of
+    // the X events, X replies and split confir-
+    // mation events on the X server side, so
+    // take care only of the generic data token.
+    //
+
+    if (control -> ProxyMode == proxy_client)
     {
-      //
-      // Send a distinct token for each data type.
-      // We don't want to slow down the sending of
-      // the X events, X replies and split confir-
-      // mation events on the X server side, so
-      // take care only of the generic data token.
-      //
+      statistics -> updateControlToken(tokens_[token_control].bytes);
 
-      if (control -> ProxyMode == proxy_client)
+      if (tokens_[token_control].bytes > tokens_[token_control].size)
       {
-        statistics -> updateControlToken(tokens_[token_control].bytes);
-
-        if (tokens_[token_control].bytes > tokens_[token_control].size)
+        if (addTokenCodes(tokens_[token_control]) < 0)
         {
-          if (addTokenCodes(tokens_[token_control]) < 0)
-          {
-            return -1;
-          }
-
-          #if defined(TEST) || defined(INFO) || defined(TOKEN)
-
-          T_proxy_token &token = tokens_[token_control];
-
-          *logofs << "Proxy: TOKEN! Token class ["
-                  << DumpToken(token.type) << "] has now "
-                  << token.bytes << " bytes accumulated and "
-                  << token.remaining << " tokens remaining.\n"
-                  << logofs_flush;
-          #endif
+          return -1;
         }
 
-        statistics -> updateSplitToken(tokens_[token_split].bytes);
-
-        if (tokens_[token_split].bytes > tokens_[token_split].size)
-        {
-          if (addTokenCodes(tokens_[token_split]) < 0)
-          {
-            return -1;
-          }
-
-          #if defined(TEST) || defined(INFO) || defined(TOKEN)
+        #if defined(TEST) || defined(INFO) || defined(TOKEN)
 
-          T_proxy_token &token = tokens_[token_split];
+        T_proxy_token &token = tokens_[token_control];
 
-          *logofs << "Proxy: TOKEN! Token class ["
-                  << DumpToken(token.type) << "] has now "
-                  << token.bytes << " bytes accumulated and "
-                  << token.remaining << " tokens remaining.\n"
-                  << logofs_flush;
-          #endif
-        }
+        *logofs << "Proxy: TOKEN! Token class ["
+                << DumpToken(token.type) << "] has now "
+                << token.bytes << " bytes accumulated and "
+                << token.remaining << " tokens remaining.\n"
+                << logofs_flush;
+        #endif
       }
 
-      statistics -> updateDataToken(tokens_[token_data].bytes);
+      statistics -> updateSplitToken(tokens_[token_split].bytes);
 
-      if (tokens_[token_data].bytes > tokens_[token_data].size)
+      if (tokens_[token_split].bytes > tokens_[token_split].size)
       {
-        if (addTokenCodes(tokens_[token_data]) < 0)
+        if (addTokenCodes(tokens_[token_split]) < 0)
         {
           return -1;
         }
 
         #if defined(TEST) || defined(INFO) || defined(TOKEN)
 
-        T_proxy_token &token = tokens_[token_data];
+        T_proxy_token &token = tokens_[token_split];
 
         *logofs << "Proxy: TOKEN! Token class ["
                 << DumpToken(token.type) << "] has now "
@@ -4685,37 +4635,26 @@ int Proxy::handleToken(T_frame_type type)
         #endif
       }
     }
-    else
-    {
-      //
-      // Sum everything to the control token.
-      //
 
-      if (control -> ProxyMode == proxy_client)
-      {
-        statistics -> updateControlToken(tokens_[token_control].bytes);
-        statistics -> updateSplitToken(tokens_[token_control].bytes);
-        statistics -> updateDataToken(tokens_[token_control].bytes);
+    statistics -> updateDataToken(tokens_[token_data].bytes);
 
-        if (tokens_[token_control].bytes > tokens_[token_control].size)
-        {
-          if (addTokenCodes(tokens_[token_control]) < 0)
-          {
-            return -1;
-          }
+    if (tokens_[token_data].bytes > tokens_[token_data].size)
+    {
+      if (addTokenCodes(tokens_[token_data]) < 0)
+      {
+        return -1;
+      }
 
-          #if defined(TEST) || defined(INFO) || defined(TOKEN)
+      #if defined(TEST) || defined(INFO) || defined(TOKEN)
 
-          T_proxy_token &token = tokens_[token_control];
+      T_proxy_token &token = tokens_[token_data];
 
-          *logofs << "Proxy: TOKEN! Token class ["
-                  << DumpToken(token.type) << "] has now "
-                  << token.bytes << " bytes accumulated and "
-                  << token.remaining << " tokens remaining.\n"
-                  << logofs_flush;
-          #endif
-        }
-      }
+      *logofs << "Proxy: TOKEN! Token class ["
+              << DumpToken(token.type) << "] has now "
+              << token.bytes << " bytes accumulated and "
+              << token.remaining << " tokens remaining.\n"
+              << logofs_flush;
+      #endif
     }
   }
   else
@@ -4777,21 +4716,10 @@ int Proxy::handleTokenFromProxy(T_proxy_token &token, int count)
           << count << ".\n" << logofs_flush;
   #endif
 
-  if (control -> isProtoStep7() == 0)
-  {
-    if (control -> ProxyMode == proxy_client ||
-            token.request != code_control_token_request)
-    {
-      #ifdef PANIC
-      *logofs << "Proxy: PANIC! Invalid token request received from remote.\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Invalid token request received from remote.\n";
-
-      HandleCleanup();
-    }
-  }
+  //
+  // Since ProtoStep7 (#issue 108) with no limitations
+  // concerning invalid token requests at this point
+  //
 
   //
   // Add our token reply.
@@ -4815,25 +4743,13 @@ int Proxy::handleTokenReplyFromProxy(T_proxy_token &token, int count)
   #endif
 
   //
-  // Increment the available tokens.
+  // Since ProtoStep7 (#issue 108) with no limitations
+  // concerning invalid token requests at this point
   //
 
-  if (control -> isProtoStep7() == 0)
-  {
-    if (token.reply != code_control_token_reply)
-    {
-      #ifdef PANIC
-      *logofs << "Proxy: PANIC! Invalid token reply received from remote.\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Invalid token reply received from remote.\n";
-
-      HandleCleanup();
-    }
-
-    count = 1;
-  }
+  //
+  // Increment the available tokens.
+  //
 
   token.remaining += count;
 
@@ -4924,24 +4840,10 @@ void Proxy::handleFailOnLoad(const char *fullName, const char *failContext) cons
 int Proxy::handleSaveVersion(unsigned char *buffer, int &major,
                                  int &minor, int &patch) const
 {
-  if (control -> isProtoStep8() == 1)
-  {
-    major = 3;
-    minor = 0;
-    patch = 0;
-  }
-  else if (control -> isProtoStep7() == 1)
-  {
-    major = 2;
-    minor = 0;
-    patch = 0;
-  }
-  else
-  {
-    major = 1;
-    minor = 4;
-    patch = 0;
-  }
+  // Since ProtoStep8 (#issue 108)
+  major = 3;
+  minor = 0;
+  patch = 0;
 
   *(buffer + 0) = major;
   *(buffer + 1) = minor;
@@ -4964,26 +4866,10 @@ int Proxy::handleLoadVersion(const unsigned char *buffer, int &major,
   // incompatible caches.
   // 
 
-  if (control -> isProtoStep8() == 1)
-  {
-    if (major < 3)
-    {
-      return -1;
-    }
-  }
-  else if (control -> isProtoStep7() == 1)
-  {
-    if (major < 2)
-    {
-      return -1;
-    }
-  }
-  else
+  // Since ProtoStep8 (#issue 108)
+  if (major < 3)
   {
-    if (major != 1 && minor != 4)
-    {
-      return -1;
-    }
+    return -1;
   }
 
   return 1;
@@ -6109,20 +5995,8 @@ int Proxy::handleNewGenericConnection(int clientFd, T_channel_type type, const c
 
 int Proxy::handleNewSlaveConnection(int clientFd)
 {
-  if (control -> isProtoStep7() == 1)
-  {
-    return handleNewGenericConnection(clientFd, channel_slave, "slave");
-  }
-  else
-  {
-    #ifdef TEST
-    *logofs << "Proxy: WARNING! Not sending unsupported "
-            << "'code_new_slave_connection' message.\n"
-            << logofs_flush;
-    #endif
-
-    return -1;
-  }
+  // Since ProtoStep7 (#issue 108)
+  return handleNewGenericConnection(clientFd, channel_slave, "slave");
 }
 
 int Proxy::handleNewGenericConnectionFromProxy(int channelId, T_channel_type type,
diff --git a/nxcomp/Proxy.h b/nxcomp/Proxy.h
index 3d6c62c54..2f3be7596 100644
--- a/nxcomp/Proxy.h
+++ b/nxcomp/Proxy.h
@@ -767,11 +767,6 @@ class Proxy
                handleSplitEvent(encodeBuffer_, split);
   }
 
-  int handleAsyncInit()
-  {
-    return handleFlush();
-  }
-
   int handleAsyncPriority()
   {
     if (control -> FlushPriority == 1)
diff --git a/nxcomp/PutImage.cpp b/nxcomp/PutImage.cpp
index 325a4aa66..af170463d 100644
--- a/nxcomp/PutImage.cpp
+++ b/nxcomp/PutImage.cpp
@@ -44,13 +44,9 @@ PutImageStore::PutImageStore(StaticCompressor *compressor)
 {
   enableCache    = PUTIMAGE_ENABLE_CACHE;
   enableData     = PUTIMAGE_ENABLE_DATA;
-  enableSplit    = PUTIMAGE_ENABLE_SPLIT;
-  enableCompress = PUTIMAGE_ENABLE_COMPRESS;
 
-  if (control -> isProtoStep7() == 1)
-  {
-    enableCompress = PUTIMAGE_ENABLE_COMPRESS_IF_PROTO_STEP_7;
-  }
+  // Since ProtoStep7 (#issue 108)
+  enableCompress = PUTIMAGE_ENABLE_COMPRESS_IF_PROTO_STEP_7;
 
   dataLimit  = PUTIMAGE_DATA_LIMIT;
   dataOffset = PUTIMAGE_DATA_OFFSET;
@@ -59,10 +55,8 @@ PutImageStore::PutImageStore(StaticCompressor *compressor)
   cacheThreshold      = PUTIMAGE_CACHE_THRESHOLD;
   cacheLowerThreshold = PUTIMAGE_CACHE_LOWER_THRESHOLD;
 
-  if (control -> isProtoStep8() == 1)
-  {
-    enableSplit = PUTIMAGE_ENABLE_SPLIT_IF_PROTO_STEP_8;
-  }
+  // Since ProtoStep8 (#issue 108)
+  enableSplit = PUTIMAGE_ENABLE_SPLIT_IF_PROTO_STEP_8;
 
   messages_ -> resize(cacheSlots);
 
diff --git a/nxcomp/PutImage.h b/nxcomp/PutImage.h
index e9535cb29..9e438fc84 100644
--- a/nxcomp/PutImage.h
+++ b/nxcomp/PutImage.h
@@ -36,8 +36,6 @@
 
 #define PUTIMAGE_ENABLE_CACHE                            1
 #define PUTIMAGE_ENABLE_DATA                             1
-#define PUTIMAGE_ENABLE_SPLIT                            1
-#define PUTIMAGE_ENABLE_COMPRESS                         1
 
 #define PUTIMAGE_DATA_LIMIT                              262144 - 24
 #define PUTIMAGE_DATA_OFFSET                             24
diff --git a/nxcomp/PutPackedImage.cpp b/nxcomp/PutPackedImage.cpp
index eae16a16f..af962c703 100644
--- a/nxcomp/PutPackedImage.cpp
+++ b/nxcomp/PutPackedImage.cpp
@@ -44,7 +44,6 @@ PutPackedImageStore::PutPackedImageStore(StaticCompressor *compressor)
 {
   enableCache    = PUTPACKEDIMAGE_ENABLE_CACHE;
   enableData     = PUTPACKEDIMAGE_ENABLE_DATA;
-  enableSplit    = PUTPACKEDIMAGE_ENABLE_SPLIT;
   enableCompress = PUTPACKEDIMAGE_ENABLE_COMPRESS;
 
   dataLimit  = PUTPACKEDIMAGE_DATA_LIMIT;
@@ -54,10 +53,8 @@ PutPackedImageStore::PutPackedImageStore(StaticCompressor *compressor)
   cacheThreshold      = PUTPACKEDIMAGE_CACHE_THRESHOLD;
   cacheLowerThreshold = PUTPACKEDIMAGE_CACHE_LOWER_THRESHOLD;
 
-  if (control -> isProtoStep8() == 1)
-  {
-    enableSplit = PUTPACKEDIMAGE_ENABLE_SPLIT_IF_PROTO_STEP_8;
-  }
+  // Since ProtoStep8 (#issue 108)
+  enableSplit = PUTPACKEDIMAGE_ENABLE_SPLIT_IF_PROTO_STEP_8;
 
   messages_ -> resize(cacheSlots);
 
diff --git a/nxcomp/PutPackedImage.h b/nxcomp/PutPackedImage.h
index 5287a5b57..7427499b8 100644
--- a/nxcomp/PutPackedImage.h
+++ b/nxcomp/PutPackedImage.h
@@ -36,7 +36,6 @@
 
 #define PUTPACKEDIMAGE_ENABLE_CACHE                            1
 #define PUTPACKEDIMAGE_ENABLE_DATA                             1
-#define PUTPACKEDIMAGE_ENABLE_SPLIT                            1
 #define PUTPACKEDIMAGE_ENABLE_COMPRESS                         0
 
 //
diff --git a/nxcomp/QueryFontReply.cpp b/nxcomp/QueryFontReply.cpp
index 2d42587f7..d723f9127 100644
--- a/nxcomp/QueryFontReply.cpp
+++ b/nxcomp/QueryFontReply.cpp
@@ -39,12 +39,9 @@ QueryFontReplyStore::QueryFontReplyStore(StaticCompressor *compressor)
   enableCache    = QUERYFONTREPLY_ENABLE_CACHE;
   enableData     = QUERYFONTREPLY_ENABLE_DATA;
   enableSplit    = QUERYFONTREPLY_ENABLE_SPLIT;
-  enableCompress = QUERYFONTREPLY_ENABLE_COMPRESS;
 
-  if (control -> isProtoStep7() == 1)
-  {
-    enableCompress = QUERYFONTREPLY_ENABLE_COMPRESS_IF_PROTO_STEP_7;
-  }
+  // Since ProtoStep7 (#issue 108)
+  enableCompress = QUERYFONTREPLY_ENABLE_COMPRESS_IF_PROTO_STEP_7;
 
   dataLimit  = QUERYFONTREPLY_DATA_LIMIT;
   dataOffset = QUERYFONTREPLY_DATA_OFFSET;
diff --git a/nxcomp/QueryFontReply.h b/nxcomp/QueryFontReply.h
index 537da4e63..e89720ffe 100644
--- a/nxcomp/QueryFontReply.h
+++ b/nxcomp/QueryFontReply.h
@@ -36,7 +36,6 @@
 #define QUERYFONTREPLY_ENABLE_CACHE                       1
 #define QUERYFONTREPLY_ENABLE_DATA                        1
 #define QUERYFONTREPLY_ENABLE_SPLIT                       0
-#define QUERYFONTREPLY_ENABLE_COMPRESS                    1
 
 #define QUERYFONTREPLY_DATA_LIMIT                         1048576 - 32
 #define QUERYFONTREPLY_DATA_OFFSET                        8
diff --git a/nxcomp/RenderCompositeGlyphs.cpp b/nxcomp/RenderCompositeGlyphs.cpp
index 1135633ff..752dedb2b 100644
--- a/nxcomp/RenderCompositeGlyphs.cpp
+++ b/nxcomp/RenderCompositeGlyphs.cpp
@@ -102,26 +102,14 @@ MESSAGE_BEGIN_ENCODE_MESSAGE
   unsigned int src_x = GetUINT(buffer + 24, bigEndian);
   unsigned int src_y = GetUINT(buffer + 26, bigEndian);
 
-  if (control -> isProtoStep8() == 1)
-  {
-    encodeBuffer.encodeDiffCachedValue(src_x,
-                       clientCache -> renderGlyphX, 16,
-                           clientCache -> renderGlyphXCache, 11);
-
-    encodeBuffer.encodeDiffCachedValue(src_y,
-                       clientCache -> renderGlyphY, 16,
-                           clientCache -> renderGlyphYCache, 11);
-  }
-  else
-  {
-    encodeBuffer.encodeDiffCachedValue(src_x,
-                       clientCache -> renderLastX, 16,
-                           clientCache -> renderXCache, 11);
+  // Since ProtoStep8 (#issue 108)
+  encodeBuffer.encodeDiffCachedValue(src_x,
+                     clientCache -> renderGlyphX, 16,
+                         clientCache -> renderGlyphXCache, 11);
 
-    encodeBuffer.encodeDiffCachedValue(src_y,
-                       clientCache -> renderLastY, 16,
-                           clientCache -> renderYCache, 11);
-  }
+  encodeBuffer.encodeDiffCachedValue(src_y,
+                     clientCache -> renderGlyphY, 16,
+                         clientCache -> renderGlyphYCache, 11);
 
   #ifdef TEST
   *logofs << name() << ": Encoded source X "
@@ -147,8 +135,8 @@ MESSAGE_BEGIN_ENCODE_MESSAGE
   // tive to the first offset coordinates.
   //
 
-  if (control -> isProtoStep8() == 1 &&
-          size >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
+  // Since ProtoStep8 (#issue 108)
+  if (size >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
   {
     unsigned int numGlyphs = *(buffer + 28);
 
@@ -232,32 +220,20 @@ MESSAGE_BEGIN_DECODE_MESSAGE
   unsigned int src_x;
   unsigned int src_y;
 
-  if (control -> isProtoStep8() == 1)
-  {
-    decodeBuffer.decodeDiffCachedValue(src_x,
-                       clientCache -> renderGlyphX, 16,
-                           clientCache -> renderGlyphXCache, 11);
-
-    decodeBuffer.decodeDiffCachedValue(src_y,
-                       clientCache -> renderGlyphY, 16,
-                           clientCache -> renderGlyphYCache, 11);
-  }
-  else
-  {
-    decodeBuffer.decodeDiffCachedValue(src_x,
-                       clientCache -> renderLastX, 16,
-                           clientCache -> renderXCache, 11);
+  // Since ProtoStep8 (#issue 108)
+  decodeBuffer.decodeDiffCachedValue(src_x,
+                     clientCache -> renderGlyphX, 16,
+                         clientCache -> renderGlyphXCache, 11);
 
-    decodeBuffer.decodeDiffCachedValue(src_y,
-                       clientCache -> renderLastY, 16,
-                           clientCache -> renderYCache, 11);
-  }
+  decodeBuffer.decodeDiffCachedValue(src_y,
+                     clientCache -> renderGlyphY, 16,
+                         clientCache -> renderGlyphYCache, 11);
 
   PutUINT(src_x, buffer + 24, bigEndian);
   PutUINT(src_y, buffer + 26, bigEndian);
 
-  if (control -> isProtoStep8() == 1 &&
-          size >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
+  // Since ProtoStep8 (#issue 108)
+  if (size >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
   {
     decodeBuffer.decodeCachedValue(value, 8,
                        clientCache -> renderNumGlyphsCache);
@@ -297,8 +273,8 @@ MESSAGE_END_DECODE_MESSAGE
 
 MESSAGE_BEGIN_ENCODE_DATA
 {
-  if (control -> isProtoStep8() == 1 &&
-          size >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
+  // Since ProtoStep8 (#issue 108)
+  if (size >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
   {
     encodeCharData(encodeBuffer, buffer, MESSAGE_OFFSET_IF_PROTO_STEP_8,
                        size, bigEndian, channelCache);
@@ -318,8 +294,8 @@ MESSAGE_END_ENCODE_DATA
 
 MESSAGE_BEGIN_DECODE_DATA
 {
-  if (control -> isProtoStep8() == 1 &&
-          size >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
+  // Since ProtoStep8 (#issue 108)
+  if (size >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
   {
     decodeCharData(decodeBuffer, buffer, MESSAGE_OFFSET_IF_PROTO_STEP_8,
                        size, bigEndian, channelCache);
@@ -353,8 +329,8 @@ MESSAGE_BEGIN_PARSE_IDENTITY
   renderExtension -> data.composite_glyphs.src_x = GetUINT(buffer + 24, bigEndian);
   renderExtension -> data.composite_glyphs.src_y = GetUINT(buffer + 26, bigEndian);
 
-  if (control -> isProtoStep8() == 1 &&
-          size >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
+  // Since ProtoStep8 (#issue 108)
+  if (size >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
   {
     renderExtension -> data.composite_glyphs.num_elm = *(buffer + 28);
 
@@ -387,8 +363,8 @@ MESSAGE_BEGIN_UNPARSE_IDENTITY
   PutUINT(renderExtension -> data.composite_glyphs.src_x, buffer + 24, bigEndian);
   PutUINT(renderExtension -> data.composite_glyphs.src_y, buffer + 26, bigEndian);
 
-  if (control -> isProtoStep8() == 1 &&
-          size >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
+  // Since ProtoStep8 (#issue 108)
+  if (size >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
   {
     *(buffer + 28) = renderExtension -> data.composite_glyphs.num_elm;
 
@@ -426,8 +402,8 @@ MESSAGE_BEGIN_IDENTITY_CHECKSUM
   // first string.
   //
 
-  if (control -> isProtoStep8() == 1 &&
-          size >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
+  // Since ProtoStep8 (#issue 108)
+  if (size >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
   {
     md5_append(md5_state, buffer + 28, 1);
   }
@@ -470,42 +446,22 @@ MESSAGE_BEGIN_ENCODE_UPDATE
   unsigned int value;
   unsigned int previous;
 
-  if (control -> isProtoStep8() == 1)
-  {
-    value    = renderExtension -> data.composite_glyphs.src_x;
-    previous = cachedRenderExtension -> data.composite_glyphs.src_x;
-
-    encodeBuffer.encodeDiffCachedValue(value, previous, 16,
-                       clientCache -> renderGlyphXCache, 11);
+  // Since ProtoStep8 (#issue 108)
+  value    = renderExtension -> data.composite_glyphs.src_x;
+  previous = cachedRenderExtension -> data.composite_glyphs.src_x;
 
-    cachedRenderExtension -> data.composite_glyphs.src_x = value;
+  encodeBuffer.encodeDiffCachedValue(value, previous, 16,
+                     clientCache -> renderGlyphXCache, 11);
 
-    value    = renderExtension -> data.composite_glyphs.src_y;
-    previous = cachedRenderExtension -> data.composite_glyphs.src_y;
+  cachedRenderExtension -> data.composite_glyphs.src_x = value;
 
-    encodeBuffer.encodeDiffCachedValue(value, previous, 16,
-                       clientCache -> renderGlyphYCache, 11);
+  value    = renderExtension -> data.composite_glyphs.src_y;
+  previous = cachedRenderExtension -> data.composite_glyphs.src_y;
 
-    cachedRenderExtension -> data.composite_glyphs.src_y = value;
-  }
-  else
-  {
-    value    = renderExtension -> data.composite_glyphs.src_x;
-    previous = cachedRenderExtension -> data.composite_glyphs.src_x;
-
-    encodeBuffer.encodeDiffCachedValue(value, previous, 16,
-                       clientCache -> renderXCache, 11);
-
-    cachedRenderExtension -> data.composite_glyphs.src_x = value;
+  encodeBuffer.encodeDiffCachedValue(value, previous, 16,
+                     clientCache -> renderGlyphYCache, 11);
 
-    value    = renderExtension -> data.composite_glyphs.src_y;
-    previous = cachedRenderExtension -> data.composite_glyphs.src_y;
-
-    encodeBuffer.encodeDiffCachedValue(value, previous, 16,
-                       clientCache -> renderYCache, 11);
-
-    cachedRenderExtension -> data.composite_glyphs.src_y = value;
-  }
+  cachedRenderExtension -> data.composite_glyphs.src_y = value;
 
   #ifdef TEST
   *logofs << name() << ": Encoded source X "
@@ -514,8 +470,8 @@ MESSAGE_BEGIN_ENCODE_UPDATE
           << logofs_flush;
   #endif
 
-  if (control -> isProtoStep8() == 1 &&
-          renderExtension -> size_ >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
+  // Since ProtoStep8 (#issue 108)
+  if (renderExtension -> size_ >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
   {
     //
     // Offset X and Y.
@@ -601,41 +557,23 @@ MESSAGE_BEGIN_DECODE_UPDATE
   unsigned int value;
   unsigned int previous;
 
-  if (control -> isProtoStep8() == 1)
-  {
-    previous = renderExtension -> data.composite_glyphs.src_x;
-
-    decodeBuffer.decodeDiffCachedValue(value, previous, 16,
-                       clientCache -> renderGlyphXCache, 11);
-
-    renderExtension -> data.composite_glyphs.src_x = value;
-
-    previous = renderExtension -> data.composite_glyphs.src_y;
-
-    decodeBuffer.decodeDiffCachedValue(value, previous, 16,
-                       clientCache -> renderGlyphYCache, 11);
+  // Since ProtoStep8 (#issue 108)
+  previous = renderExtension -> data.composite_glyphs.src_x;
 
-    renderExtension -> data.composite_glyphs.src_y = value;
-  }
-  else
-  {
-    previous = renderExtension -> data.composite_glyphs.src_x;
+  decodeBuffer.decodeDiffCachedValue(value, previous, 16,
+                     clientCache -> renderGlyphXCache, 11);
 
-    decodeBuffer.decodeDiffCachedValue(value, previous, 16,
-                       clientCache -> renderXCache, 11);
+  renderExtension -> data.composite_glyphs.src_x = value;
 
-    renderExtension -> data.composite_glyphs.src_x = value;
+  previous = renderExtension -> data.composite_glyphs.src_y;
 
-    previous = renderExtension -> data.composite_glyphs.src_y;
+  decodeBuffer.decodeDiffCachedValue(value, previous, 16,
+                     clientCache -> renderGlyphYCache, 11);
 
-    decodeBuffer.decodeDiffCachedValue(value, previous, 16,
-                       clientCache -> renderYCache, 11);
-
-    renderExtension -> data.composite_glyphs.src_y = value;
-  }
+  renderExtension -> data.composite_glyphs.src_y = value;
 
-  if (control -> isProtoStep8() == 1 &&
-          renderExtension -> size_ >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
+  // Since ProtoStep8 (#issue 108)
+  if (renderExtension -> size_ >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
   {
     //
     // Offset X and Y.
diff --git a/nxcomp/RenderCompositeGlyphs.h b/nxcomp/RenderCompositeGlyphs.h
index 527fd3d12..9458ecb14 100644
--- a/nxcomp/RenderCompositeGlyphs.h
+++ b/nxcomp/RenderCompositeGlyphs.h
@@ -80,9 +80,8 @@ class MESSAGE_STORE : public MESSAGE_CLASS
   virtual int identitySize(const unsigned char *buffer,
                                unsigned int size)
   {
-    unsigned int offset = (control -> isProtoStep8() == 1 ?
-                               MESSAGE_OFFSET_IF_PROTO_STEP_8 :
-                                   MESSAGE_OFFSET);
+    // Since ProtoStep8 (#issue 108)
+    unsigned int offset = MESSAGE_OFFSET_IF_PROTO_STEP_8;
 
     return (size >= offset ? offset : size);
   }
diff --git a/nxcomp/RenderExtension.cpp b/nxcomp/RenderExtension.cpp
index 79c26e64e..43933748c 100644
--- a/nxcomp/RenderExtension.cpp
+++ b/nxcomp/RenderExtension.cpp
@@ -42,13 +42,6 @@
 #include "RenderTrapezoids.h"
 #include "RenderTriangles.h"
 
-#include "RenderCreatePictureCompat.h"
-#include "RenderFreePictureCompat.h"
-#include "RenderPictureClipCompat.h"
-#include "RenderCreateGlyphSetCompat.h"
-#include "RenderCompositeCompat.h"
-#include "RenderCompositeGlyphsCompat.h"
-
 //
 // Set the verbosity level.
 //
@@ -82,46 +75,27 @@ RenderExtensionStore::RenderExtensionStore(StaticCompressor *compressor)
   minors_[X_RenderFillRectangles] = new RenderFillRectanglesStore();
   minors_[X_RenderAddGlyphs]      = new RenderAddGlyphsStore();
 
-  if (control -> isProtoStep7() == 1)
-  {
-    minors_[X_RenderCreatePicture]            = new RenderCreatePictureStore();
-    minors_[X_RenderFreePicture]              = new RenderFreePictureStore();
-    minors_[X_RenderSetPictureClipRectangles] = new RenderPictureClipStore();
-    minors_[X_RenderCreateGlyphSet]           = new RenderCreateGlyphSetStore();
-    minors_[X_RenderComposite]                = new RenderCompositeStore();
-    minors_[X_RenderCompositeGlyphs8]         = new RenderCompositeGlyphsStore();
-    minors_[X_RenderCompositeGlyphs16]        = new RenderCompositeGlyphsStore();
-    minors_[X_RenderCompositeGlyphs32]        = new RenderCompositeGlyphsStore();
-
-    minors_[X_RenderSetPictureTransform] = new RenderPictureTransformStore();
-    minors_[X_RenderSetPictureFilter]    = new RenderPictureFilterStore();
-    minors_[X_RenderFreeGlyphSet]        = new RenderFreeGlyphSetStore();
-    minors_[X_RenderTrapezoids]          = new RenderTrapezoidsStore();
-    minors_[X_RenderTriangles]           = new RenderTrianglesStore();
-  }
-  else
-  {
-    minors_[X_RenderCreatePicture]            = new RenderCreatePictureCompatStore();
-    minors_[X_RenderFreePicture]              = new RenderFreePictureCompatStore();
-    minors_[X_RenderSetPictureClipRectangles] = new RenderPictureClipCompatStore();
-    minors_[X_RenderCreateGlyphSet]           = new RenderCreateGlyphSetCompatStore();
-    minors_[X_RenderComposite]                = new RenderCompositeCompatStore();
-    minors_[X_RenderCompositeGlyphs8]         = new RenderCompositeGlyphsCompatStore();
-    minors_[X_RenderCompositeGlyphs16]        = new RenderCompositeGlyphsCompatStore();
-    minors_[X_RenderCompositeGlyphs32]        = new RenderCompositeGlyphsCompatStore();
-  }
+  // Since ProtoStep7 (#issue 108)
+  minors_[X_RenderCreatePicture]            = new RenderCreatePictureStore();
+  minors_[X_RenderFreePicture]              = new RenderFreePictureStore();
+  minors_[X_RenderSetPictureClipRectangles] = new RenderPictureClipStore();
+  minors_[X_RenderCreateGlyphSet]           = new RenderCreateGlyphSetStore();
+  minors_[X_RenderComposite]                = new RenderCompositeStore();
+  minors_[X_RenderCompositeGlyphs8]         = new RenderCompositeGlyphsStore();
+  minors_[X_RenderCompositeGlyphs16]        = new RenderCompositeGlyphsStore();
+  minors_[X_RenderCompositeGlyphs32]        = new RenderCompositeGlyphsStore();
+
+  minors_[X_RenderSetPictureTransform] = new RenderPictureTransformStore();
+  minors_[X_RenderSetPictureFilter]    = new RenderPictureFilterStore();
+  minors_[X_RenderFreeGlyphSet]        = new RenderFreeGlyphSetStore();
+  minors_[X_RenderTrapezoids]          = new RenderTrapezoidsStore();
+  minors_[X_RenderTriangles]           = new RenderTrianglesStore();
 
   dataLimit  = RENDEREXTENSION_DATA_LIMIT;
   dataOffset = RENDEREXTENSION_DATA_OFFSET;
 
-  if (control -> isProtoStep7() == 1)
-  {
-    cacheSlots = RENDEREXTENSION_CACHE_SLOTS_IF_PROTO_STEP_7;
-  }
-  else
-  {
-    cacheSlots = RENDEREXTENSION_CACHE_SLOTS;
-  }
+  // Since ProtoStep7 (#issue 108)
+  cacheSlots = RENDEREXTENSION_CACHE_SLOTS_IF_PROTO_STEP_7;
 
   cacheThreshold      = RENDEREXTENSION_CACHE_THRESHOLD;
   cacheLowerThreshold = RENDEREXTENSION_CACHE_LOWER_THRESHOLD;
@@ -268,204 +242,78 @@ void RenderMinorExtensionStore::encodeLongData(EncodeBuffer &encodeBuffer, const
                                                    unsigned int offset, unsigned int size, int bigEndian,
                                                        ChannelCache *channelCache) const
 {
-  if (control -> isProtoStep7() == 1)
-  {
-    encodeBuffer.encodeLongData(buffer + offset, size - offset);
-
-    #ifdef TEST
-    *logofs << name() << ": Encoded " << size - offset
-            << " bytes of long data.\n" << logofs_flush;
-    #endif
-
-    return;
-  }
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  for (unsigned int i = offset, c = (offset - 4) % 16; i < size; i += 4)
-  {
-    #ifdef DEBUG
-    *logofs << name() << ": Encoding int with i = " << i << " c = "
-            << c << ".\n" << logofs_flush;
-    #endif
-
-    encodeBuffer.encodeCachedValue(GetULONG(buffer + i, bigEndian), 32,
-                       *clientCache -> renderDataCache[c]);
+  // Since ProtoStep7 (#issue 108)
+  encodeBuffer.encodeLongData(buffer + offset, size - offset);
 
-    if (++c == 16) c = 0;
-  }
+  #ifdef TEST
+  *logofs << name() << ": Encoded " << size - offset
+          << " bytes of long data.\n" << logofs_flush;
+  #endif
 }
 
 void RenderMinorExtensionStore::encodeIntData(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
                                                   unsigned int offset, unsigned int size, int bigEndian,
                                                       ChannelCache *channelCache) const
 {
-  if (control -> isProtoStep7() == 1)
-  {
-    encodeBuffer.encodeIntData(buffer + offset, size - offset);
-
-    #ifdef TEST
-    *logofs << name() << ": Encoded " << size - offset
-            << " bytes of int data.\n" << logofs_flush;
-    #endif
+  // Since ProtoStep7 (#issue 108)
+  encodeBuffer.encodeIntData(buffer + offset, size - offset);
 
-    return;
-  }
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  for (unsigned int i = offset, c = (offset - 4) % 16; i < size; i += 2)
-  {
-    #ifdef DEBUG
-    *logofs << name() << ": Encoding int with i = " << i << " c = "
-            << c << ".\n" << logofs_flush;
-    #endif
-
-    encodeBuffer.encodeCachedValue(GetUINT(buffer + i, bigEndian), 16,
-                       *clientCache -> renderDataCache[c]);
-
-    if (++c == 16) c = 0;
-  }
+  #ifdef TEST
+  *logofs << name() << ": Encoded " << size - offset
+          << " bytes of int data.\n" << logofs_flush;
+  #endif
 }
 
 void RenderMinorExtensionStore::encodeCharData(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
                                                    unsigned int offset, unsigned int size, int bigEndian,
                                                        ChannelCache *channelCache) const
 {
-  if (control -> isProtoStep7() == 1)
-  {
-    encodeBuffer.encodeTextData(buffer + offset, size - offset);
-
-    #ifdef TEST
-    *logofs << name() << ": Encoded " << size - offset
-            << " bytes of text data.\n" << logofs_flush;
-    #endif
-
-    return;
-  }
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  clientCache -> renderTextCompressor.reset();
+  // Since ProtoStep7 (#issue 108)
+  encodeBuffer.encodeTextData(buffer + offset, size - offset);
 
-  const unsigned char *next = buffer + offset;
-
-  for (unsigned int i = offset; i < size; i++)
-  {
-    #ifdef DEBUG
-    *logofs << name() << ": Encoding char with i = " << i
-            << ".\n" << logofs_flush;
-    #endif
-
-    clientCache -> renderTextCompressor.
-          encodeChar(*next++, encodeBuffer);
-  }
+  #ifdef TEST
+  *logofs << name() << ": Encoded " << size - offset
+          << " bytes of text data.\n" << logofs_flush;
+  #endif
 }
 
 void RenderMinorExtensionStore::decodeLongData(DecodeBuffer &decodeBuffer, unsigned char *buffer,
                                                    unsigned int offset, unsigned int size, int bigEndian,
                                                        ChannelCache *channelCache) const
 {
-  if (control -> isProtoStep7() == 1)
-  {
-    decodeBuffer.decodeLongData(buffer + offset, size - offset);
-
-    #ifdef TEST
-    *logofs << name() << ": Decoded " << size - offset
-            << " bytes of long data.\n" << logofs_flush;
-    #endif
-
-    return;
-  }
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  for (unsigned int i = offset, c = (offset - 4) % 16; i < size; i += 4)
-  {
-    #ifdef DEBUG
-    *logofs << name() << ": Decoding int with i = " << i << " c = "
-            << c << ".\n" << logofs_flush;
-    #endif
+  // Since ProtoStep7 (#issue 108)
+  decodeBuffer.decodeLongData(buffer + offset, size - offset);
 
-    decodeBuffer.decodeCachedValue(value, 32,
-                       *clientCache -> renderDataCache[c]);
-
-    PutULONG(value, buffer + i, bigEndian);
-
-    if (++c == 16) c = 0;
-  }
+  #ifdef TEST
+  *logofs << name() << ": Decoded " << size - offset
+          << " bytes of long data.\n" << logofs_flush;
+  #endif
 }
 
 void RenderMinorExtensionStore::decodeIntData(DecodeBuffer &decodeBuffer, unsigned char *buffer,
                                                   unsigned int offset, unsigned int size, int bigEndian,
                                                       ChannelCache *channelCache) const
 {
-  if (control -> isProtoStep7() == 1)
-  {
-    decodeBuffer.decodeIntData(buffer + offset, size - offset);
-
-    #ifdef TEST
-    *logofs << name() << ": Decoded " << size - offset
-            << " bytes of int data.\n" << logofs_flush;
-    #endif
-
-    return;
-  }
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  for (unsigned int i = offset, c = (offset - 4) % 16; i < size; i += 2)
-  {
-    #ifdef DEBUG
-    *logofs << name() << ": Decoding int with i = " << i << " c = "
-            << c << ".\n" << logofs_flush;
-    #endif
+  // Since ProtoStep7 (#issue 108)
+  decodeBuffer.decodeIntData(buffer + offset, size - offset);
 
-    decodeBuffer.decodeCachedValue(value, 16,
-                       *clientCache -> renderDataCache[c]);
-
-    PutUINT(value, buffer + i, bigEndian);
-
-    if (++c == 16) c = 0;
-  }
+  #ifdef TEST
+  *logofs << name() << ": Decoded " << size - offset
+          << " bytes of int data.\n" << logofs_flush;
+  #endif
 }
 
 void RenderMinorExtensionStore::decodeCharData(DecodeBuffer &decodeBuffer, unsigned char *buffer,
                                                    unsigned int offset, unsigned int size, int bigEndian,
                                                        ChannelCache *channelCache) const
 {
-  if (control -> isProtoStep7() == 1)
-  {
-    decodeBuffer.decodeTextData(buffer + offset, size - offset);
+  // Since ProtoStep7 (#issue 108)
+  decodeBuffer.decodeTextData(buffer + offset, size - offset);
 
-    #ifdef TEST
-    *logofs << name() << ": Decoded " << size - offset
-            << " bytes of text data.\n" << logofs_flush;
-    #endif
-
-    return;
-  }
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  clientCache -> renderTextCompressor.reset();
-
-  unsigned char *next = buffer + offset;
-
-  for (unsigned int i = offset; i < size; i++)
-  {
-    #ifdef DEBUG
-    *logofs << name() << ": Decoding char with i = " << i
-            << ".\n" << logofs_flush;
-    #endif
-
-    *next++ = clientCache -> renderTextCompressor.
-                    decodeChar(decodeBuffer);
-  }
+  #ifdef TEST
+  *logofs << name() << ": Decoded " << size - offset
+          << " bytes of text data.\n" << logofs_flush;
+  #endif
 }
 
 void RenderMinorExtensionStore::parseIntData(const Message *message, const unsigned char *buffer,
diff --git a/nxcomp/RenderExtension.h b/nxcomp/RenderExtension.h
index 275ef1c1d..2b616e1e5 100644
--- a/nxcomp/RenderExtension.h
+++ b/nxcomp/RenderExtension.h
@@ -44,7 +44,6 @@
 #define RENDEREXTENSION_DATA_LIMIT                 6144
 #define RENDEREXTENSION_DATA_OFFSET                36
 
-#define RENDEREXTENSION_CACHE_SLOTS                6000
 #define RENDEREXTENSION_CACHE_THRESHOLD            20
 #define RENDEREXTENSION_CACHE_LOWER_THRESHOLD      10
 
diff --git a/nxcomp/ServerCache.cpp b/nxcomp/ServerCache.cpp
index f0cc6f825..104ac4728 100644
--- a/nxcomp/ServerCache.cpp
+++ b/nxcomp/ServerCache.cpp
@@ -71,7 +71,6 @@ ServerCache::ServerCache() :
   getKeyboardMappingKeysymCache(8),
 
   getPropertyTypeCache(8),
-  getPropertyTextCompressor(textCache, SERVER_TEXT_CACHE_SIZE),
 
   getSelectionOwnerCache(8),
 
@@ -85,9 +84,7 @@ ServerCache::ServerCache() :
   translateCoordsChildCache(8), translateCoordsXCache(8),
   translateCoordsYCache(8),
 
-  queryTreeWindowCache(8),
-
-  getAtomNameTextCompressor(textCache, SERVER_TEXT_CACHE_SIZE)
+  queryTreeWindowCache(8)
 
 {
   unsigned int i;
diff --git a/nxcomp/ServerCache.h b/nxcomp/ServerCache.h
index ec213b89f..0968e235c 100644
--- a/nxcomp/ServerCache.h
+++ b/nxcomp/ServerCache.h
@@ -215,7 +215,6 @@ class ServerCache : public ChannelCache
 
   CharCache getPropertyFormatCache;
   IntCache getPropertyTypeCache;
-  TextCompressor getPropertyTextCompressor;
   static BlockCache xResources;
 
   //
@@ -272,13 +271,6 @@ class ServerCache : public ChannelCache
 
   IntCache queryTreeWindowCache;
 
-  //
-  // GetAtomName reply in protocol
-  // versions >= 3.
-  //
-
-  TextCompressor getAtomNameTextCompressor;
-
   //
   // Generic reply. Use short data
   // in protocol versions >= 3.
diff --git a/nxcomp/ServerChannel.cpp b/nxcomp/ServerChannel.cpp
index 0f3a3e552..e0bd2132f 100644
--- a/nxcomp/ServerChannel.cpp
+++ b/nxcomp/ServerChannel.cpp
@@ -199,8 +199,6 @@ ServerChannel::ServerChannel(Transport *transport, StaticCompressor *compressor)
   splitState_.load     = 1;
   splitState_.commit   = 0;
 
-  handleSplitEnable();
-
   //
   // It will be eventually set by
   // the server proxy.
@@ -394,19 +392,6 @@ int ServerChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
 
       priority_++;
 
-      //
-      // Due to the way the loop was implemented
-      // we can't encode multiple messages if we
-      // are encoding the first request.
-      //
-
-      if (control -> isProtoStep7() == 0)
-      {
-        if (proxy -> handleAsyncInit() < 0)
-        {
-          return -1;
-        }
-      }
     }
     else
     {
@@ -545,19 +530,8 @@ int ServerChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
               encodeBuffer.encodeValue(nameLength, 16, 6);
               const unsigned char *nextSrc = inputMessage + 32;
 
-              if (control -> isProtoStep7() == 1)
-              {
-                encodeBuffer.encodeTextData(nextSrc, nameLength);
-              }
-              else
-              {
-                serverCache_ -> getAtomNameTextCompressor.reset();
-                for (unsigned int i = 0; i < nameLength; i++)
-                {
-                  serverCache_ -> getAtomNameTextCompressor.
-                        encodeChar(*nextSrc++, encodeBuffer);
-                }
-              }
+              // Since ProtoStep7 (#issue 108)
+              encodeBuffer.encodeTextData(nextSrc, nameLength);
 
               priority_++;
             }
@@ -930,21 +904,10 @@ int ServerChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
                 unsigned int length = (unsigned int) (*nextSrc++);
                 encodeBuffer.encodeValue(length, 8);
 
-                if (control -> isProtoStep7() == 1)
-                {
-                  encodeBuffer.encodeTextData(nextSrc, length);
+                // Since ProtoStep7 (#issue 108)
+                encodeBuffer.encodeTextData(nextSrc, length);
 
-                  nextSrc += length;
-                }
-                else
-                {
-                  serverCache_ -> getPropertyTextCompressor.reset();
-                  for (; length; length--)
-                  {
-                    serverCache_ -> getPropertyTextCompressor.encodeChar(
-                                       *nextSrc++, encodeBuffer);
-                  }
-                }
+                nextSrc += length;
               }
 
               priority_++;
@@ -1253,33 +1216,9 @@ int ServerChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
               encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_), 29,
                                  serverCache_ -> visualCache);
 
-              if (control -> isProtoStep8() == 0)
-              {
-                unsigned int compressedDataSize = 0;
-                unsigned char *compressedData   = NULL;
-
-                int compressed = handleCompress(encodeBuffer, requestOpcode, messageStore -> dataOffset,
-                                                    inputMessage, inputLength, compressedData,
-                                                        compressedDataSize);
-                if (compressed < 0)
-                {
-                  return -1;
-                }
-                else if (compressed > 0)
-                {
-                  //
-                  // Update size according to result of image compression.
-                  //
-
-                  handleUpdate(messageStore, inputLength - messageStore ->
-                                   dataOffset, compressedDataSize);
-                }
-              }
-              else
-              {
-                handleCopy(encodeBuffer, requestOpcode, messageStore ->
-                              dataOffset, inputMessage, inputLength);
-              }
+              // Since ProtoStep8 (#issue 108)
+              handleCopy(encodeBuffer, requestOpcode, messageStore ->
+                            dataOffset, inputMessage, inputLength);
 
               priority_++;
             }
@@ -2069,10 +2008,8 @@ int ServerChannel::handleWrite(const unsigned char *message, unsigned int length
     // encoding is used.
     //
 
-    if (control -> isProtoStep7() == 1)
-    {
-      decodeBuffer.decodeValue(length, 8);
-    }
+    // Since ProtoStep7 (#issue 108)
+    decodeBuffer.decodeValue(length, 8);
 
     unsigned int nextByte;
     unsigned char *outputMessage = writeBuffer_.addMessage(length);
@@ -2285,19 +2222,8 @@ int ServerChannel::handleWrite(const unsigned char *message, unsigned int length
 
           if (format == 8)
           {
-            if (control -> isProtoStep7() == 1)
-            {
-              decodeBuffer.decodeTextData(nextDest, dataLength);
-            }
-            else
-            {
-              clientCache_ -> changePropertyTextCompressor.reset();
-              for (unsigned int i = 0; i < dataLength; i++)
-              {
-                *nextDest++ = clientCache_ -> changePropertyTextCompressor.
-                                                    decodeChar(decodeBuffer);
-              }
-            }
+            // Since ProtoStep7 (#issue 108)
+            decodeBuffer.decodeTextData(nextDest, dataLength);
           }
           else if (format == 32)
           {
@@ -2584,16 +2510,10 @@ int ServerChannel::handleWrite(const unsigned char *message, unsigned int length
           outputMessage = writeBuffer_.addMessage(outputLength);
           writeBuffer_.registerPointer(&outputMessage);
 
-          if (control -> isProtoStep7() == 1)
-          {
-            decodeBuffer.decodeNewXidValue(value, clientCache_ -> lastId,
-                               clientCache_ -> lastIdCache, clientCache_ -> gcCache,
-                                   clientCache_ -> freeGCCache);
-          }
-          else
-          {
-            decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
-          }
+          // Since ProtoStep7 (#issue 108)
+          decodeBuffer.decodeNewXidValue(value, clientCache_ -> lastId,
+                             clientCache_ -> lastIdCache, clientCache_ -> gcCache,
+                                 clientCache_ -> freeGCCache);
 
           PutULONG(value, outputMessage + 4, bigEndian_);
           unsigned int offset = 8;
@@ -2688,16 +2608,10 @@ int ServerChannel::handleWrite(const unsigned char *message, unsigned int length
           decodeBuffer.decodeXidValue(value, clientCache_ -> windowCache);
           PutULONG(value, outputMessage + 8, bigEndian_);
 
-          if (control -> isProtoStep7() == 1)
-          {
-            decodeBuffer.decodeNewXidValue(value, clientCache_ -> lastId,
-                               clientCache_ -> lastIdCache, clientCache_ -> windowCache,
-                                   clientCache_ -> freeWindowCache);
-          }
-          else
-          {
-            decodeBuffer.decodeXidValue(value, clientCache_ -> windowCache);
-          }
+          // Since ProtoStep7 (#issue 108)
+          decodeBuffer.decodeNewXidValue(value, clientCache_ -> lastId,
+                             clientCache_ -> lastIdCache, clientCache_ -> windowCache,
+                                 clientCache_ -> freeWindowCache);
 
           PutULONG(value, outputMessage + 4, bigEndian_);
           unsigned char *nextDest = outputMessage + 12;
@@ -2754,16 +2668,9 @@ int ServerChannel::handleWrite(const unsigned char *message, unsigned int length
 
           unsigned int numPoints;
 
-          if (control -> isProtoStep10() == 1)
-          {
-            decodeBuffer.decodeCachedValue(numPoints, 16,
-                               clientCache_ -> fillPolyNumPointsCache, 4);
-          }
-          else
-          {
-            decodeBuffer.decodeCachedValue(numPoints, 14,
-                               clientCache_ -> fillPolyNumPointsCache, 4);
-          }
+          // Since ProtoStep10 (#issue 108)
+          decodeBuffer.decodeCachedValue(numPoints, 16,
+                             clientCache_ -> fillPolyNumPointsCache, 4);
 
           outputLength = 16 + (numPoints << 2);
           outputMessage = writeBuffer_.addMessage(outputLength);
@@ -2859,14 +2766,8 @@ int ServerChannel::handleWrite(const unsigned char *message, unsigned int length
           outputLength = 8;
           outputMessage = writeBuffer_.addMessage(outputLength);
 
-          if (control -> isProtoStep7() == 1)
-          {
-            decodeBuffer.decodeFreeXidValue(value, clientCache_ -> freeGCCache);
-          }
-          else
-          {
-            decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
-          }
+          // Since ProtoStep7 (#issue 108)
+          decodeBuffer.decodeFreeXidValue(value, clientCache_ -> freeGCCache);
 
           PutULONG(value, outputMessage + 4, bigEndian_);
         }
@@ -2876,23 +2777,10 @@ int ServerChannel::handleWrite(const unsigned char *message, unsigned int length
           outputLength = 8;
           outputMessage = writeBuffer_.addMessage(outputLength);
 
-          if (control -> isProtoStep7() == 1)
-          {
-            decodeBuffer.decodeFreeXidValue(value, clientCache_ -> freeDrawableCache);
+          // Since ProtoStep7 (#issue 108)
+          decodeBuffer.decodeFreeXidValue(value, clientCache_ -> freeDrawableCache);
 
-            PutULONG(value, outputMessage + 4, bigEndian_);
-          }
-          else
-          {
-            decodeBuffer.decodeBoolValue(value);
-            if (!value)
-            {
-              decodeBuffer.decodeValue(value, 29, 4);
-              clientCache_ -> createPixmapLastId += value;
-              clientCache_ -> createPixmapLastId &= 0x1fffffff;
-            }
-            PutULONG(clientCache_ -> createPixmapLastId, outputMessage + 4, bigEndian_);
-          }
+          PutULONG(value, outputMessage + 4, bigEndian_);
         }
         break;
       case X_GetAtomName:
@@ -3125,21 +3013,10 @@ int ServerChannel::handleWrite(const unsigned char *message, unsigned int length
                                  clientCache_ -> polyTextDeltaCache);
               *nextDest++ = cValue;
 
-              if (control -> isProtoStep7() == 1)
-              {
-                decodeBuffer.decodeTextData(nextDest, textLength);
+              // Since ProtoStep7 (#issue 108)
+              decodeBuffer.decodeTextData(nextDest, textLength);
 
-                nextDest += textLength;
-              }
-              else
-              {
-                clientCache_ -> polyTextTextCompressor.reset();
-                while (textLength)
-                {
-                  *nextDest++ = clientCache_ -> polyTextTextCompressor.decodeChar(decodeBuffer);
-                  textLength--;
-                }
-              }
+              nextDest += textLength;
             }
           }
           outputLength += addedLength;
@@ -3211,23 +3088,10 @@ int ServerChannel::handleWrite(const unsigned char *message, unsigned int length
               decodeBuffer.decodeCachedValue(cValue, 8, clientCache_ -> polyTextDeltaCache);
               *nextDest++ = cValue;
 
-              if (control -> isProtoStep7() == 1)
-              {
-                decodeBuffer.decodeTextData(nextDest, textLength * 2);
+              // Since ProtoStep7 (#issue 108)
+              decodeBuffer.decodeTextData(nextDest, textLength * 2);
 
-                nextDest += textLength * 2;
-              }
-              else
-              {
-                clientCache_ -> polyTextTextCompressor.reset();
-                textLength <<= 1;
-                while (textLength)
-                {
-                  *nextDest++ =
-                    clientCache_ -> polyTextTextCompressor.decodeChar(decodeBuffer);
-                  textLength--;
-                }
-              }
+              nextDest += textLength * 2;
             }
           }
           outputLength += addedLength;
@@ -3279,16 +3143,8 @@ int ServerChannel::handleWrite(const unsigned char *message, unsigned int length
           PutUINT(clientCache_ -> imageTextLastY, outputMessage + 14, bigEndian_);
           unsigned char *nextDest = outputMessage + 16;
 
-          if (control -> isProtoStep7() == 1)
-          {
-            decodeBuffer.decodeTextData(nextDest, textLength);
-          }
-          else
-          {
-            clientCache_ -> imageTextTextCompressor.reset();
-            for (unsigned int j = 0; j < textLength; j++)
-              *nextDest++ = clientCache_ -> imageTextTextCompressor.decodeChar(decodeBuffer);
-          }
+          // Since ProtoStep7 (#issue 108)
+          decodeBuffer.decodeTextData(nextDest, textLength);
 
           handleSave(messageStore, outputMessage, outputLength);
         }
@@ -3326,16 +3182,8 @@ int ServerChannel::handleWrite(const unsigned char *message, unsigned int length
           PutUINT(clientCache_ -> imageTextLastY, outputMessage + 14, bigEndian_);
           unsigned char *nextDest = outputMessage + 16;
 
-          if (control -> isProtoStep7() == 1)
-          {
-            decodeBuffer.decodeTextData(nextDest, textLength * 2);
-          }
-          else
-          {
-            clientCache_ -> imageTextTextCompressor.reset();
-            for (unsigned int j = 0; j < textLength * 2; j++)
-              *nextDest++ = clientCache_ -> imageTextTextCompressor.decodeChar(decodeBuffer);
-          }
+          // Since ProtoStep7 (#issue 108)
+          decodeBuffer.decodeTextData(nextDest, textLength * 2);
 
           handleSave(messageStore, outputMessage, outputLength);
         }
@@ -3362,18 +3210,8 @@ int ServerChannel::handleWrite(const unsigned char *message, unsigned int length
           outputMessage[1] = (unsigned char) value;
           unsigned char *nextDest = outputMessage + 8;
 
-          if (control -> isProtoStep7() == 1)
-          {
-            decodeBuffer.decodeTextData(nextDest, nameLength);
-          }
-          else
-          {
-            clientCache_ -> internAtomTextCompressor.reset();
-            for (unsigned int i = 0; i < nameLength; i++)
-            {
-              *nextDest++ = clientCache_ -> internAtomTextCompressor.decodeChar(decodeBuffer);
-            }
-          }
+          // Since ProtoStep7 (#issue 108)
+          decodeBuffer.decodeTextData(nextDest, nameLength);
 
           sequenceQueue_.push(clientSequence_, outputOpcode);
 
@@ -3399,18 +3237,8 @@ int ServerChannel::handleWrite(const unsigned char *message, unsigned int length
           PutUINT(value, outputMessage + 4, bigEndian_);
           unsigned char* nextDest = outputMessage + 8;
 
-          if (control -> isProtoStep7() == 1)
-          {
-            decodeBuffer.decodeTextData(nextDest, textLength);
-          }
-          else
-          {
-            clientCache_ -> polyTextTextCompressor.reset();
-            for (unsigned int i = 0; i < textLength; i++)
-            {
-              *nextDest++ = clientCache_ -> polyTextTextCompressor.decodeChar(decodeBuffer);
-            }
-          }
+          // Since ProtoStep7 (#issue 108)
+          decodeBuffer.decodeTextData(nextDest, textLength);
 
           sequenceQueue_.push(clientSequence_, outputOpcode);
         }
@@ -3428,18 +3256,8 @@ int ServerChannel::handleWrite(const unsigned char *message, unsigned int length
           PutUINT(textLength, outputMessage + 8, bigEndian_);
           unsigned char *nextDest = outputMessage + 12;
 
-          if (control -> isProtoStep7() == 1)
-          {
-            decodeBuffer.decodeTextData(nextDest, textLength);
-          }
-          else
-          {
-            clientCache_ -> polyTextTextCompressor.reset();
-            for (unsigned int i = 0; i < textLength; i++)
-            {
-              *nextDest++ = clientCache_ -> polyTextTextCompressor.decodeChar(decodeBuffer);
-            }
-          }
+          // Since ProtoStep7 (#issue 108)
+          decodeBuffer.decodeTextData(nextDest, textLength);
 
           sequenceQueue_.push(clientSequence_, outputOpcode);
         }
@@ -3456,7 +3274,7 @@ int ServerChannel::handleWrite(const unsigned char *message, unsigned int length
           outputLength = 8;
           outputMessage = writeBuffer_.addMessage(outputLength);
 
-          if (outputOpcode == X_DestroyWindow && control -> isProtoStep7() == 1)
+          if (outputOpcode == X_DestroyWindow) // Since ProtoStep7 (#issue 108)
           {
             decodeBuffer.decodeFreeXidValue(value, clientCache_ -> freeWindowCache);
           }
@@ -3487,19 +3305,8 @@ int ServerChannel::handleWrite(const unsigned char *message, unsigned int length
           PutULONG(clientCache_ -> lastFont, outputMessage + 4, bigEndian_);
           unsigned char *nextDest = outputMessage + 12;
 
-          if (control -> isProtoStep7() == 1)
-          {
-            decodeBuffer.decodeTextData(nextDest, nameLength);
-          }
-          else
-          {
-            clientCache_ -> openFontTextCompressor.reset();
-            for (; nameLength; nameLength--)
-            {
-              *nextDest++ = clientCache_ -> openFontTextCompressor.
-                                  decodeChar(decodeBuffer);
-            }
-          }
+          // Since ProtoStep7 (#issue 108)
+          decodeBuffer.decodeTextData(nextDest, nameLength);
         }
         break;
       case X_PolyFillRectangle:
@@ -4137,14 +3944,8 @@ int ServerChannel::handleWrite(const unsigned char *message, unsigned int length
 
           unsigned int numRectangles;
 
-          if (control -> isProtoStep9() == 1)
-          {
-            decodeBuffer.decodeValue(numRectangles, 15, 4);
-          }
-          else
-          {
-            decodeBuffer.decodeValue(numRectangles, 13, 4);
-          }
+          // Since ProtoStep9 (#issue 108)
+          decodeBuffer.decodeValue(numRectangles, 15, 4);
 
           outputLength = (numRectangles << 3) + 12;
           outputMessage = writeBuffer_.addMessage(outputLength);
@@ -4669,10 +4470,8 @@ int ServerChannel::handleSplit(DecodeBuffer &decodeBuffer, MessageStore *store,
                                    T_store_action action, int position, unsigned char &opcode,
                                        unsigned char *&buffer, unsigned int &size)
 {
-  if (control -> isProtoStep7() == 1)
-  {
-    splitState_.current = splitState_.resource;
-  }
+  // Since ProtoStep7 (#issue 108)
+  splitState_.current = splitState_.resource;
 
   handleSplitStoreAlloc(&splitResources_, splitState_.current);
 
@@ -4707,14 +4506,12 @@ int ServerChannel::handleSplit(DecodeBuffer &decodeBuffer, MessageStore *store,
                                       action, checksum, buffer, size);
 
   //
-  // If we are connected to an old proxy
-  // version or the encoding side didn't
-  // provide a checksum, then don't send
-  // the split report.
+  // If the encoding side didn't provide
+  // a checksum, then don't send the split
+  // report.
   //
 
-  if (control -> isProtoStep7() == 0 ||
-          checksum == NULL)
+  if (checksum == NULL)
   {
     if (action == IS_HIT)
     {
@@ -4736,8 +4533,6 @@ int ServerChannel::handleSplit(DecodeBuffer &decodeBuffer, MessageStore *store,
 
     #endif
 
-    delete [] checksum;
-
     return 1;
   }
 
@@ -4829,13 +4624,11 @@ int ServerChannel::handleSplit(DecodeBuffer &decodeBuffer)
 
   unsigned char resource;
 
-  if (control -> isProtoStep7() == 1)
-  {
-    decodeBuffer.decodeCachedValue(resource, 8,
-                       clientCache_ -> resourceCache);
+  // Since ProtoStep7 (#issue 108)
+  decodeBuffer.decodeCachedValue(resource, 8,
+                     clientCache_ -> resourceCache);
 
-    splitState_.current = resource;
-  }
+  splitState_.current = resource;
 
   handleSplitStoreAlloc(&splitResources_, splitState_.current);
 
@@ -5391,8 +5184,11 @@ int ServerChannel::handleColormap(unsigned char &opcode, unsigned char *&buffer,
   // data in compressed form.
   //
 
-  if (control -> isProtoStep7() == 1)
-  {
+  //
+  // Since ProtoStep7 (#issue 108)
+  //
+
+  { // An anonymous block is used here to limit the scope of local variables
     unsigned int packed   = GetULONG(buffer + 8, bigEndian_);
     unsigned int unpacked = GetULONG(buffer + 12, bigEndian_);
 
@@ -5486,85 +5282,7 @@ int ServerChannel::handleColormap(unsigned char &opcode, unsigned char *&buffer,
     }
 
     #endif
-  }
-  else
-  {
-    unsigned int entries = GetULONG(buffer + 4, bigEndian_);
-
-    if (size == entries * 4 + 8)
-    {
-      if (unpackState_[resource] -> colormap -> entries != entries &&
-              unpackState_[resource] -> colormap -> data != NULL)
-      {
-        #ifdef TEST
-        *logofs << "handleColormap: Freeing previously "
-                << "allocated unpack colormap.\n"
-                << logofs_flush;
-        #endif
-
-        delete [] unpackState_[resource] -> colormap -> data;
-
-        unpackState_[resource] -> colormap -> data    = NULL;
-        unpackState_[resource] -> colormap -> entries = 0;
-      }
-
-      if (entries > 0)
-      {
-        if (unpackState_[resource] -> colormap -> data == NULL)
-        {
-          unpackState_[resource] ->
-                colormap -> data = new unsigned int[entries];
-        }
-
-        if (unpackState_[resource] -> colormap -> data != NULL)
-        {
-          unpackState_[resource] -> colormap -> entries = entries;
-
-          #ifdef DEBUG
-          *logofs << "handleColormap: Size of new colormap "
-                  << "data is " << (entries << 2) << ".\n"
-                  << logofs_flush;
-          #endif
-
-          memcpy((unsigned char *) unpackState_[resource] ->
-                     colormap -> data, buffer + 8, entries << 2);
-
-          #if defined(DEBUG) && defined(DUMP)
-
-          *logofs << "handleColormap: Dumping colormap entries:\n"
-                  << logofs_flush;
-
-          const unsigned int *p = (unsigned int *) buffer + 8;
-
-          for (unsigned int i = 0; i < entries; i++)
-          {
-            *logofs << "handleColormap: [" << i << "] ["
-                    << (void *) p[i] << "].\n"
-                    << logofs_flush;
-          }
-
-          #endif
-        }
-        else
-        {
-          #ifdef PANIC
-          *logofs << "handleColormap: PANIC! Can't allocate "
-                  << entries << " entries for unpack colormap "
-                  << "for FD#" << fd_ << ".\n" << logofs_flush;
-          #endif
-        }
-      }
-    }
-    else
-    {
-      #ifdef PANIC
-      *logofs << "handleColormap: PANIC! Bad size " << size
-              << " for set unpack colormap message for FD#"
-              << fd_ << " with " << entries << " entries.\n"
-              << logofs_flush;
-      #endif
-    }
-  }
+  } // end anonymous block
 
 handleColormapEnd:
 
@@ -5593,8 +5311,11 @@ int ServerChannel::handleAlpha(unsigned char &opcode, unsigned char *&buffer,
   // data in compressed form.
   //
 
-  if (control -> isProtoStep7() == 1)
-  {
+  //
+  // Since ProtoStep7 (#issue 108)
+  //
+
+  {  // An anonymous block is used here to limit the scope of local variables
     unsigned int packed   = GetULONG(buffer + 8, bigEndian_);
     unsigned int unpacked = GetULONG(buffer + 12, bigEndian_);
 
@@ -5687,82 +5408,7 @@ int ServerChannel::handleAlpha(unsigned char &opcode, unsigned char *&buffer,
     }
 
     #endif
-  }
-  else
-  {
-    unsigned int entries = GetULONG(buffer + 4, bigEndian_);
-
-    if (size == RoundUp4(entries) + 8)
-    {
-      if (unpackState_[resource] -> alpha -> entries != entries &&
-              unpackState_[resource] -> alpha -> data != NULL)
-      {
-        #ifdef TEST
-        *logofs << "handleAlpha: Freeing previously allocated "
-                << "unpack alpha data.\n" << logofs_flush;
-        #endif
-
-        delete [] unpackState_[resource] -> alpha -> data;
-
-        unpackState_[resource] -> alpha -> data    = NULL;
-        unpackState_[resource] -> alpha -> entries = 0;
-      }
-
-      if (entries > 0)
-      {
-        if (unpackState_[resource] -> alpha -> data == NULL)
-        {
-          unpackState_[resource] -> alpha -> data = new unsigned char[entries];
-        }
-
-        if (unpackState_[resource] -> alpha -> data != NULL)
-        {
-          unpackState_[resource] -> alpha -> entries = entries;
-
-          #ifdef DEBUG
-          *logofs << "handleAlpha: Size of new alpha data is "
-                  << entries << ".\n" << logofs_flush;
-          #endif
-
-          memcpy((unsigned char *) unpackState_[resource] ->
-                     alpha -> data, buffer + 8, entries);
-
-          #if defined(DEBUG) && defined(DUMP)
-
-          *logofs << "handleAlpha: Dumping alpha entries:\n"
-                  << logofs_flush;
-
-          const unsigned char *p = buffer + 8;
-
-          for (unsigned int i = 0; i < entries; i++)
-          {
-            *logofs << "handleAlpha: [" << i << "] ["
-                    << (void *) ((int) p[i]) << "].\n"
-                    << logofs_flush;
-          }
-
-          #endif
-        }
-        else
-        {
-          #ifdef PANIC
-          *logofs << "handleAlpha: PANIC! Can't allocate "
-                  << entries << " entries for unpack alpha data "
-                  << "for FD#" << fd_ << ".\n" << logofs_flush;
-          #endif
-        }
-      }
-    }
-    #ifdef PANIC
-    else
-    {
-      *logofs << "handleAlpha: PANIC! Bad size " << size
-              << " for set unpack alpha message for FD#"
-              << fd_ << " with " << entries << " entries.\n"
-              << logofs_flush;
-    }
-    #endif
-  }
+  } //end anonymous block
 
 handleAlphaEnd:
 
@@ -6680,15 +6326,20 @@ int ServerChannel::handleFastWriteRequest(DecodeBuffer &decodeBuffer, unsigned c
 {
   //
   // All the NX requests are handled in the
-  // main message loop. The X_PutImage can
-  // be handled here only if a split was
-  // not requested.
+  // main message loop.
+  //
+
+  //
+  // Since ProtoStep7 (#issue 108)
+  //
+  // The X_PutImage can be handled here only
+  // if a split was not requested.
   //
 
   if ((opcode >= X_NXFirstOpcode && opcode <= X_NXLastOpcode) ||
-          (control -> isProtoStep7() == 1 && opcode == X_PutImage &&
-               splitState_.resource != nothing) || opcode == X_ListExtensions ||
-                   opcode == X_QueryExtension)
+          (opcode == X_PutImage && splitState_.resource != nothing) ||
+              opcode == X_ListExtensions ||
+                  opcode == X_QueryExtension)
   {
     return 0;
   }
@@ -7896,14 +7547,6 @@ int ServerChannel::handleCacheRequest(DecodeBuffer &decodeBuffer, unsigned char
   splitState_.save = (mask >> 8) & 0xff;
   splitState_.load = mask & 0xff;
 
-  //
-  // Just to be sure. We should never
-  // receive this request if connected
-  // to an old proxy version.
-  //
-
-  handleSplitEnable();
-
   #ifdef TEST
   *logofs << "handleCacheRequest: Set cache parameters to "
           << "save " << splitState_.save << " load "
@@ -7920,34 +7563,24 @@ int ServerChannel::handleStartSplitRequest(DecodeBuffer &decodeBuffer, unsigned
 {
   //
   // Prepare for the split for the selected
-  // resource. Old proxy versions only use
+  // resource. Old proxy versions only used
   // the split store at position 0.
   //
 
-  if (control -> isProtoStep7() == 1)
-  {
-    unsigned char resource;
+  // Since ProtoStep7 (#issue 108)
+  unsigned char resource;
 
-    decodeBuffer.decodeCachedValue(resource, 8,
-                       clientCache_ -> resourceCache);
+  decodeBuffer.decodeCachedValue(resource, 8,
+                     clientCache_ -> resourceCache);
 
-    splitState_.resource = resource;
+  splitState_.resource = resource;
 
-    splitState_.current = splitState_.resource;
+  splitState_.current = splitState_.resource;
 
-    #if defined(TEST) || defined(SPLIT)
-    *logofs << "handleStartSplitRequest: SPLIT! Registered id "
-            << splitState_.resource << " as resource "
-            << "waiting for a split.\n" << logofs_flush;
-    #endif
-  }
   #if defined(TEST) || defined(SPLIT)
-  else
-  {
-    *logofs << "handleStartSplitRequest: SPLIT! Assuming fake id "
-            << splitState_.current << " as resource "
-            << "waiting for a split.\n" << logofs_flush;
-  }
+  *logofs << "handleStartSplitRequest: SPLIT! Registered id "
+          << splitState_.resource << " as resource "
+          << "waiting for a split.\n" << logofs_flush;
   #endif
 
   handleNullRequest(opcode, buffer, size);
@@ -7962,40 +7595,38 @@ int ServerChannel::handleEndSplitRequest(DecodeBuffer &decodeBuffer, unsigned ch
   // Verify that the agent resource matches.
   //
 
-  if (control -> isProtoStep7() == 1)
-  {
-    unsigned char resource;
-
-    decodeBuffer.decodeCachedValue(resource, 8,
-                       clientCache_ -> resourceCache);
-
-    #ifdef TEST
+  // Since ProtoStep7 (#issue 108)
+  unsigned char resource;
 
-    if (splitState_.resource == nothing)
-    {
-      #ifdef PANIC
-      *logofs << "handleEndSplitRequest: PANIC! SPLIT! Received an end of "
-              << "split for resource id " << (unsigned int) *(buffer + 1)
-              << " without a previous start.\n"
-              << logofs_flush;
-      #endif
+  decodeBuffer.decodeCachedValue(resource, 8,
+                     clientCache_ -> resourceCache);
 
-      HandleCleanup();
-    }
-    else if (resource != splitState_.resource)
-    {
-      #ifdef PANIC
-      *logofs << "handleEndSplitRequest: PANIC! SPLIT! Invalid resource id "
-              << resource << " received while waiting for resource id "
-              << splitState_.resource << ".\n" << logofs_flush;
-      #endif
+  #ifdef TEST
 
-      HandleCleanup();
-    }
+  if (splitState_.resource == nothing)
+  {
+    #ifdef PANIC
+    *logofs << "handleEndSplitRequest: PANIC! SPLIT! Received an end of "
+            << "split for resource id " << (unsigned int) *(buffer + 1)
+            << " without a previous start.\n"
+            << logofs_flush;
+    #endif
 
+    HandleCleanup();
+  }
+  else if (resource != splitState_.resource)
+  {
+    #ifdef PANIC
+    *logofs << "handleEndSplitRequest: PANIC! SPLIT! Invalid resource id "
+            << resource << " received while waiting for resource id "
+            << splitState_.resource << ".\n" << logofs_flush;
     #endif
+
+    HandleCleanup();
   }
 
+  #endif
+
   #if defined(TEST) || defined(SPLIT)
   *logofs << "handleEndSplitRequest: SPLIT! Reset id "
           << splitState_.resource << " as resource "
@@ -8013,15 +7644,8 @@ int ServerChannel::handleSplitChecksum(DecodeBuffer &decodeBuffer, T_checksum &c
 {
   unsigned int receive;
 
-  if (control -> isProtoStep7() == 1)
-  {
-    decodeBuffer.decodeBoolValue(receive);
-  }
-  else
-  {
-    receive = (control -> ImageCacheEnableLoad == 1 ||
-                   control -> ImageCacheEnableSave == 1);
-  }
+  // Since ProtoStep7 (#issue 108)
+  decodeBuffer.decodeBoolValue(receive);
 
   if (receive == 1)
   {
diff --git a/nxcomp/ServerChannel.h b/nxcomp/ServerChannel.h
index 6536db829..28d5efb3e 100644
--- a/nxcomp/ServerChannel.h
+++ b/nxcomp/ServerChannel.h
@@ -312,21 +312,6 @@ class ServerChannel : public Channel
 
   int handleSplitChecksum(DecodeBuffer &decodeBuffer, T_checksum &checksum);
 
-  void handleSplitEnable()
-  {
-    if (control -> isProtoStep7() == 0)
-    {
-      #if defined(TEST) || defined(SPLIT)
-      *logofs << "handleSplitEnable: WARNING! Disabling load "
-              << "and save with an old proxy version.\n"
-              << logofs_flush;
-      #endif
-
-      splitState_.save = 0;
-      splitState_.load = 0;
-    }
-  }
-
   //
   // Allocate and free the shared memory
   // support resources.
diff --git a/nxcomp/ServerProxy.h b/nxcomp/ServerProxy.h
index 8c4a88410..54bc0f748 100644
--- a/nxcomp/ServerProxy.h
+++ b/nxcomp/ServerProxy.h
@@ -102,14 +102,8 @@ class ServerProxy : public Proxy
 
   virtual int checkLocalChannelMap(int channelId)
   {
-    if (control -> isProtoStep7() == 1)
-    {
-      return ((channelId & control -> ChannelMask) == 0);
-    }
-    else
-    {
-      return 0;
-    }
+    // Since ProtoStep7 (#issue 108)
+    return ((channelId & control -> ChannelMask) == 0);
   }
 
   private:
diff --git a/nxcomp/SetUnpackAlpha.cpp b/nxcomp/SetUnpackAlpha.cpp
index a0dd1fc2e..792aa33d7 100644
--- a/nxcomp/SetUnpackAlpha.cpp
+++ b/nxcomp/SetUnpackAlpha.cpp
@@ -44,7 +44,6 @@ SetUnpackAlphaStore::SetUnpackAlphaStore(StaticCompressor *compressor)
 {
   enableCache    = SETUNPACKALPHA_ENABLE_CACHE;
   enableData     = SETUNPACKALPHA_ENABLE_DATA;
-  enableSplit    = SETUNPACKALPHA_ENABLE_SPLIT_IF_PROTO_STEP_7;
   enableCompress = SETUNPACKALPHA_ENABLE_COMPRESS_IF_PROTO_STEP_7;
 
   dataLimit  = SETUNPACKALPHA_DATA_LIMIT;
@@ -54,10 +53,8 @@ SetUnpackAlphaStore::SetUnpackAlphaStore(StaticCompressor *compressor)
   cacheThreshold      = SETUNPACKALPHA_CACHE_THRESHOLD;
   cacheLowerThreshold = SETUNPACKALPHA_CACHE_LOWER_THRESHOLD;
 
-  if (control -> isProtoStep8() == 1)
-  {
-    enableSplit = SETUNPACKALPHA_ENABLE_SPLIT_IF_PROTO_STEP_8;
-  }
+  // Since ProtoStep8 (#issue 108)
+  enableSplit    = SETUNPACKALPHA_ENABLE_SPLIT_IF_PROTO_STEP_8;
 
   messages_ -> resize(cacheSlots);
 
diff --git a/nxcomp/SetUnpackAlpha.h b/nxcomp/SetUnpackAlpha.h
index 2e32a6590..4c4306d8d 100644
--- a/nxcomp/SetUnpackAlpha.h
+++ b/nxcomp/SetUnpackAlpha.h
@@ -36,18 +36,14 @@
 
 #define SETUNPACKALPHA_ENABLE_CACHE                       1
 #define SETUNPACKALPHA_ENABLE_DATA                        1
-#define SETUNPACKALPHA_ENABLE_SPLIT                       0
-#define SETUNPACKALPHA_ENABLE_COMPRESS                    1
 
 #define SETUNPACKALPHA_DATA_LIMIT                         16384
-#define SETUNPACKALPHA_DATA_OFFSET                        8
 
 #define SETUNPACKALPHA_CACHE_SLOTS                        2000
 #define SETUNPACKALPHA_CACHE_THRESHOLD                    10
 #define SETUNPACKALPHA_CACHE_LOWER_THRESHOLD              5
 
 #define SETUNPACKALPHA_DATA_OFFSET_IF_PROTO_STEP_7        16
-#define SETUNPACKALPHA_ENABLE_SPLIT_IF_PROTO_STEP_7       1
 #define SETUNPACKALPHA_ENABLE_COMPRESS_IF_PROTO_STEP_7    0
 
 #define SETUNPACKALPHA_ENABLE_SPLIT_IF_PROTO_STEP_8       0
diff --git a/nxcomp/SetUnpackColormap.cpp b/nxcomp/SetUnpackColormap.cpp
index d522d328e..8fb8b3ce7 100644
--- a/nxcomp/SetUnpackColormap.cpp
+++ b/nxcomp/SetUnpackColormap.cpp
@@ -44,7 +44,6 @@ SetUnpackColormapStore::SetUnpackColormapStore(StaticCompressor *compressor)
 {
   enableCache    = SETUNPACKCOLORMAP_ENABLE_CACHE;
   enableData     = SETUNPACKCOLORMAP_ENABLE_DATA;
-  enableSplit    = SETUNPACKCOLORMAP_ENABLE_SPLIT;
   enableCompress = SETUNPACKCOLORMAP_ENABLE_COMPRESS_IF_PROTO_STEP_7;
 
   dataLimit  = SETUNPACKCOLORMAP_DATA_LIMIT;
@@ -54,10 +53,8 @@ SetUnpackColormapStore::SetUnpackColormapStore(StaticCompressor *compressor)
   cacheThreshold      = SETUNPACKCOLORMAP_CACHE_THRESHOLD;
   cacheLowerThreshold = SETUNPACKCOLORMAP_CACHE_LOWER_THRESHOLD;
 
-  if (control -> isProtoStep8() == 1)
-  {
-    enableSplit = SETUNPACKCOLORMAP_ENABLE_SPLIT_IF_PROTO_STEP_8;
-  }
+  // Since ProtoStep8 (#issue 108)
+  enableSplit = SETUNPACKCOLORMAP_ENABLE_SPLIT_IF_PROTO_STEP_8;
 
   messages_ -> resize(cacheSlots);
 
diff --git a/nxcomp/SetUnpackColormap.h b/nxcomp/SetUnpackColormap.h
index 53277b3f0..fda7fa16d 100644
--- a/nxcomp/SetUnpackColormap.h
+++ b/nxcomp/SetUnpackColormap.h
@@ -36,11 +36,8 @@
 
 #define SETUNPACKCOLORMAP_ENABLE_CACHE                       1
 #define SETUNPACKCOLORMAP_ENABLE_DATA                        1
-#define SETUNPACKCOLORMAP_ENABLE_SPLIT                       1
-#define SETUNPACKCOLORMAP_ENABLE_COMPRESS                    1
 
 #define SETUNPACKCOLORMAP_DATA_LIMIT                         4096
-#define SETUNPACKCOLORMAP_DATA_OFFSET                        8
 
 #define SETUNPACKCOLORMAP_CACHE_SLOTS                        2000
 #define SETUNPACKCOLORMAP_CACHE_THRESHOLD                    5
diff --git a/nxcomp/ShapeExtension.cpp b/nxcomp/ShapeExtension.cpp
index daa19fbb4..34fad27c9 100644
--- a/nxcomp/ShapeExtension.cpp
+++ b/nxcomp/ShapeExtension.cpp
@@ -45,12 +45,9 @@ ShapeExtensionStore::ShapeExtensionStore(StaticCompressor *compressor)
   enableCache    = SHAPEEXTENSION_ENABLE_CACHE;
   enableData     = SHAPEEXTENSION_ENABLE_DATA;
   enableSplit    = SHAPEEXTENSION_ENABLE_SPLIT;
-  enableCompress = SHAPEEXTENSION_ENABLE_COMPRESS;
 
-  if (control -> isProtoStep7() == 1)
-  {
-    enableCompress = SHAPEEXTENSION_ENABLE_COMPRESS_IF_PROTO_STEP_7;
-  }
+  // Since ProtoStep7 (#issue 108)
+  enableCompress = SHAPEEXTENSION_ENABLE_COMPRESS_IF_PROTO_STEP_7;
 
   dataLimit  = SHAPEEXTENSION_DATA_LIMIT;
   dataOffset = SHAPEEXTENSION_DATA_OFFSET;
diff --git a/nxcomp/ShapeExtension.h b/nxcomp/ShapeExtension.h
index 32c3b55ef..41fe48113 100644
--- a/nxcomp/ShapeExtension.h
+++ b/nxcomp/ShapeExtension.h
@@ -37,7 +37,6 @@
 #define SHAPEEXTENSION_ENABLE_CACHE                       1
 #define SHAPEEXTENSION_ENABLE_DATA                        1
 #define SHAPEEXTENSION_ENABLE_SPLIT                       0
-#define SHAPEEXTENSION_ENABLE_COMPRESS                    1
 
 #define SHAPEEXTENSION_DATA_LIMIT                         3200
 #define SHAPEEXTENSION_DATA_OFFSET                        20
diff --git a/nxcomp/Split.cpp b/nxcomp/Split.cpp
index 35a4ed4a2..607544312 100644
--- a/nxcomp/Split.cpp
+++ b/nxcomp/Split.cpp
@@ -748,27 +748,8 @@ int SplitStore::start(DecodeBuffer &decodeBuffer)
       // Get the compressed size.
       //
 
-      if (control -> isProtoStep7() == 1)
-      {
-        decodeBuffer.decodeValue(compressedSize, 32, 14);
-      }
-      else
-      {
-        //
-        // As we can't refuse to handle the decoding
-        // of the split message when connected to an
-        // old proxy version, we need to decode this
-        // in a way that is compatible.
-        //
-
-        unsigned int diffSize;
-
-        decodeBuffer.decodeValue(diffSize, 32, 14);
-
-        split -> store_ -> lastResize += diffSize;
-
-        compressedSize = split -> store_ -> lastResize;
-      }
+      // Since ProtoStep7 (#issue 108)
+      decodeBuffer.decodeValue(compressedSize, 32, 14);
 
       split -> store_ -> validateSize(split -> d_size_, compressedSize);
 
diff --git a/nxcomp/Types.h b/nxcomp/Types.h
index b7506124e..f4a3eb399 100644
--- a/nxcomp/Types.h
+++ b/nxcomp/Types.h
@@ -199,18 +199,18 @@ T_buffer;
 // received at the decoding side.
 //
 
+// Since ProtoStep8 (#issue 108)
 enum T_store_action
 {
   is_hit,
   is_added,
   is_discarded,
-  is_removed,
-  is_added_compat = 0,
-  is_hit_compat = 1
+  is_removed
 };
 
-#define IS_HIT   (control -> isProtoStep8() == 1 ? is_hit   : is_hit_compat)
-#define IS_ADDED (control -> isProtoStep8() == 1 ? is_added : is_added_compat)
+// Since ProtoStep8 (#issue 108)
+#define IS_HIT is_hit
+#define IS_ADDED is_added
 
 enum T_checksum_action
 {
-- 
cgit v1.2.3


From 134648169cd0a9359e1a8a31a5bb55a307b0a801 Mon Sep 17 00:00:00 2001
From: Fernando Carvajal <fcarvajal@qindel.com>
Date: Tue, 12 Apr 2016 16:03:37 +0200
Subject: Remove obsolete compatibility files from nxcomp

This commit removes obsolete compatibility files whose components were
only used to handle compatibility with old protocol versions that are
no longer supported.

Refs: ArcticaProject/nx-libs#108
---
 debian/copyright.in                    |  23 --
 nxcomp/ActionCacheCompat.h             |  45 ---
 nxcomp/ChangeGCCompat.cpp              | 131 -------
 nxcomp/ChangeGCCompat.h                | 170 ----------
 nxcomp/CreatePixmapCompat.cpp          | 272 ---------------
 nxcomp/CreatePixmapCompat.h            | 154 ---------
 nxcomp/Makefile.in                     |  13 +-
 nxcomp/PositionCacheCompat.cpp         |  28 --
 nxcomp/PositionCacheCompat.h           |  41 ---
 nxcomp/RenderCompositeCompat.cpp       | 320 ------------------
 nxcomp/RenderCompositeCompat.h         |  80 -----
 nxcomp/RenderCompositeGlyphsCompat.cpp | 602 ---------------------------------
 nxcomp/RenderCompositeGlyphsCompat.h   |  80 -----
 nxcomp/RenderCreateGlyphSetCompat.cpp  | 231 -------------
 nxcomp/RenderCreateGlyphSetCompat.h    |  80 -----
 nxcomp/RenderCreatePictureCompat.cpp   | 262 --------------
 nxcomp/RenderCreatePictureCompat.h     |  80 -----
 nxcomp/RenderExtension.h               |   7 -
 nxcomp/RenderFreePictureCompat.cpp     | 158 ---------
 nxcomp/RenderFreePictureCompat.h       |  80 -----
 nxcomp/RenderPictureClipCompat.cpp     | 237 -------------
 nxcomp/RenderPictureClipCompat.h       |  80 -----
 nxcomp/SetUnpackAlphaCompat.cpp        | 250 --------------
 nxcomp/SetUnpackAlphaCompat.h          | 149 --------
 nxcomp/SetUnpackColormapCompat.cpp     | 262 --------------
 nxcomp/SetUnpackColormapCompat.h       | 149 --------
 26 files changed, 1 insertion(+), 3983 deletions(-)
 delete mode 100644 nxcomp/ActionCacheCompat.h
 delete mode 100644 nxcomp/ChangeGCCompat.cpp
 delete mode 100644 nxcomp/ChangeGCCompat.h
 delete mode 100644 nxcomp/CreatePixmapCompat.cpp
 delete mode 100644 nxcomp/CreatePixmapCompat.h
 delete mode 100644 nxcomp/PositionCacheCompat.cpp
 delete mode 100644 nxcomp/PositionCacheCompat.h
 delete mode 100644 nxcomp/RenderCompositeCompat.cpp
 delete mode 100644 nxcomp/RenderCompositeCompat.h
 delete mode 100644 nxcomp/RenderCompositeGlyphsCompat.cpp
 delete mode 100644 nxcomp/RenderCompositeGlyphsCompat.h
 delete mode 100644 nxcomp/RenderCreateGlyphSetCompat.cpp
 delete mode 100644 nxcomp/RenderCreateGlyphSetCompat.h
 delete mode 100644 nxcomp/RenderCreatePictureCompat.cpp
 delete mode 100644 nxcomp/RenderCreatePictureCompat.h
 delete mode 100644 nxcomp/RenderFreePictureCompat.cpp
 delete mode 100644 nxcomp/RenderFreePictureCompat.h
 delete mode 100644 nxcomp/RenderPictureClipCompat.cpp
 delete mode 100644 nxcomp/RenderPictureClipCompat.h
 delete mode 100644 nxcomp/SetUnpackAlphaCompat.cpp
 delete mode 100644 nxcomp/SetUnpackAlphaCompat.h
 delete mode 100644 nxcomp/SetUnpackColormapCompat.cpp
 delete mode 100644 nxcomp/SetUnpackColormapCompat.h

(limited to 'nxcomp')

diff --git a/debian/copyright.in b/debian/copyright.in
index 854ab4e73..8f85b292f 100644
--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -923,7 +923,6 @@ Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h
  nx-X11/programs/Xserver/hw/nxagent/Windows.h
  nxcomp/ActionCache.cpp
  nxcomp/ActionCache.h
- nxcomp/ActionCacheCompat.h
  nxcomp/Agent.cpp
  nxcomp/Agent.h
  nxcomp/Alpha.cpp
@@ -938,8 +937,6 @@ Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h
  nxcomp/BlockCacheSet.h
  nxcomp/ChangeGC.cpp
  nxcomp/ChangeGC.h
- nxcomp/ChangeGCCompat.cpp
- nxcomp/ChangeGCCompat.h
  nxcomp/ChangeProperty.cpp
  nxcomp/ChangeProperty.h
  nxcomp/Channel.cpp
@@ -974,8 +971,6 @@ Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h
  nxcomp/CreateGC.h
  nxcomp/CreatePixmap.cpp
  nxcomp/CreatePixmap.h
- nxcomp/CreatePixmapCompat.cpp
- nxcomp/CreatePixmapCompat.h
  nxcomp/DecodeBuffer.cpp
  nxcomp/DecodeBuffer.h
  nxcomp/EncodeBuffer.cpp
@@ -1053,8 +1048,6 @@ Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h
  nxcomp/PolyText16.h
  nxcomp/PolyText8.cpp
  nxcomp/PolyText8.h
- nxcomp/PositionCacheCompat.cpp
- nxcomp/PositionCacheCompat.h
  nxcomp/Proxy.cpp
  nxcomp/Proxy.h
  nxcomp/ProxyReadBuffer.cpp
@@ -1073,20 +1066,12 @@ Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h
  nxcomp/RenderChangePicture.h
  nxcomp/RenderComposite.cpp
  nxcomp/RenderComposite.h
- nxcomp/RenderCompositeCompat.cpp
- nxcomp/RenderCompositeCompat.h
  nxcomp/RenderCompositeGlyphs.cpp
  nxcomp/RenderCompositeGlyphs.h
- nxcomp/RenderCompositeGlyphsCompat.cpp
- nxcomp/RenderCompositeGlyphsCompat.h
  nxcomp/RenderCreateGlyphSet.cpp
  nxcomp/RenderCreateGlyphSet.h
- nxcomp/RenderCreateGlyphSetCompat.cpp
- nxcomp/RenderCreateGlyphSetCompat.h
  nxcomp/RenderCreatePicture.cpp
  nxcomp/RenderCreatePicture.h
- nxcomp/RenderCreatePictureCompat.cpp
- nxcomp/RenderCreatePictureCompat.h
  nxcomp/RenderExtension.cpp
  nxcomp/RenderExtension.h
  nxcomp/RenderFillRectangles.cpp
@@ -1095,8 +1080,6 @@ Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h
  nxcomp/RenderFreeGlyphSet.h
  nxcomp/RenderFreePicture.cpp
  nxcomp/RenderFreePicture.h
- nxcomp/RenderFreePictureCompat.cpp
- nxcomp/RenderFreePictureCompat.h
  nxcomp/RenderGenericRequest.cpp
  nxcomp/RenderGenericRequest.h
  nxcomp/RenderMinorExtensionHeaders.h
@@ -1104,8 +1087,6 @@ Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h
  nxcomp/RenderMinorExtensionTags.h
  nxcomp/RenderPictureClip.cpp
  nxcomp/RenderPictureClip.h
- nxcomp/RenderPictureClipCompat.cpp
- nxcomp/RenderPictureClipCompat.h
  nxcomp/RenderPictureFilter.cpp
  nxcomp/RenderPictureFilter.h
  nxcomp/RenderPictureTransform.cpp
@@ -1136,12 +1117,8 @@ Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h
  nxcomp/SetClipRectangles.h
  nxcomp/SetUnpackAlpha.cpp
  nxcomp/SetUnpackAlpha.h
- nxcomp/SetUnpackAlphaCompat.cpp
- nxcomp/SetUnpackAlphaCompat.h
  nxcomp/SetUnpackColormap.cpp
  nxcomp/SetUnpackColormap.h
- nxcomp/SetUnpackColormapCompat.cpp
- nxcomp/SetUnpackColormapCompat.h
  nxcomp/SetUnpackGeometry.cpp
  nxcomp/SetUnpackGeometry.h
  nxcomp/ShapeExtension.cpp
diff --git a/nxcomp/ActionCacheCompat.h b/nxcomp/ActionCacheCompat.h
deleted file mode 100644
index 8281db826..000000000
--- a/nxcomp/ActionCacheCompat.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2010 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      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef ActionCacheCompat_H
-#define ActionCacheCompat_H
-
-#include "CharCache.h"
-
-class ActionCacheCompat
-{
-  friend class EncodeBuffer;
-  friend class DecodeBuffer;
-  
-  public:
-
-  ActionCacheCompat()
-  {
-    slot_ = 0;
-  }
-
-  ~ActionCacheCompat()
-  {
-  }
-
-  private:
-
-  CharCache base_[4];
-  unsigned char slot_;
-};
-
-#endif /* ActionCacheCompat_H */
diff --git a/nxcomp/ChangeGCCompat.cpp b/nxcomp/ChangeGCCompat.cpp
deleted file mode 100644
index ca2973774..000000000
--- a/nxcomp/ChangeGCCompat.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2010 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      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
-#include "ChangeGCCompat.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int ChangeGCCompatStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                           unsigned int size, int bigEndian) const
-{
-  ChangeGCCompatMessage *changeGC = (ChangeGCCompatMessage *) message;
-
-  //
-  // Here is the fingerprint.
-  //
-
-  changeGC -> gcontext   = GetULONG(buffer + 4, bigEndian);
-  changeGC -> value_mask = GetULONG(buffer + 8, bigEndian);
-
-  //
-  // Clear the unused bytes carried in the
-  // payload to increase the effectiveness
-  // of the caching algorithm.
-  //
-
-  if ((int) size > dataOffset)
-  {
-    #ifdef DEBUG
-    *logofs << name() << ": Removing unused bytes from the "
-            << "data payload.\n" << logofs_flush;
-    #endif
-
-    changeGC -> value_mask &= (1 << 23) - 1;
-
-    unsigned int mask = 0x1;
-    unsigned char *source = (unsigned char *) buffer + CHANGEGC_DATA_OFFSET;
-    unsigned long value = 0;
-
-    for (unsigned int i = 0; i < 23; i++)
-    {
-      if (changeGC -> value_mask & mask)
-      {
-        value = GetULONG(source, bigEndian);
-
-        value &= (0xffffffff >> (32 - CREATEGC_FIELD_WIDTH[i]));
-
-        PutULONG(value, source, bigEndian);
-
-        source += 4;
-      }
-
-      mask <<= 1;
-    }
-  }
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed Identity for message at "
-          << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int ChangeGCCompatStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                             unsigned int size, int bigEndian) const
-{
-  ChangeGCCompatMessage *changeGC = (ChangeGCCompatMessage *) message;
-
-  //
-  // Fill all the message's fields.
-  //
-
-  PutULONG(changeGC -> gcontext,   buffer + 4, bigEndian);
-  PutULONG(changeGC -> value_mask, buffer + 8, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at "
-          << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void ChangeGCCompatStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  ChangeGCCompatMessage *changeGC = (ChangeGCCompatMessage *) message;
-
-  *logofs << name() << ": Identity gcontext " << changeGC -> gcontext 
-                    << ", mask " << changeGC -> value_mask << ", size "
-                    << changeGC -> size_ << ".\n" << logofs_flush;
-  #endif
-}
-
-void ChangeGCCompatStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                               unsigned int size, int bigEndian) const
-{
-  md5_append(md5_state_, buffer + 4, 8);
-}
diff --git a/nxcomp/ChangeGCCompat.h b/nxcomp/ChangeGCCompat.h
deleted file mode 100644
index 3a7b0c0a9..000000000
--- a/nxcomp/ChangeGCCompat.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2010 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      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef ChangeGCCompat_H
-#define ChangeGCCompat_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define CHANGEGC_ENABLE_CACHE                           1
-#define CHANGEGC_ENABLE_DATA                            0
-#define CHANGEGC_ENABLE_SPLIT                           0
-#define CHANGEGC_ENABLE_COMPRESS                        0
-
-#define CHANGEGC_DATA_LIMIT                             144
-#define CHANGEGC_DATA_OFFSET                            12
-
-#define CHANGEGC_CACHE_SLOTS                            3000
-#define CHANGEGC_CACHE_THRESHOLD                        3
-#define CHANGEGC_CACHE_LOWER_THRESHOLD                  1
-
-//
-// The message class.
-//
-
-class ChangeGCCompatMessage : public Message
-{
-  friend class ChangeGCCompatStore;
-
-  public:
-
-  ChangeGCCompatMessage()
-  {
-  }
-
-  ~ChangeGCCompatMessage()
-  {
-  }
-
-  //
-  // Put here the fields which constitute 
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned int gcontext;
-  unsigned int value_mask;
-};
-
-class ChangeGCCompatStore : public MessageStore
-{
-  //
-  // Constructors and destructors.
-  //
-
-  public:
-
-  ChangeGCCompatStore() : MessageStore()
-  {
-    enableCache    = CHANGEGC_ENABLE_CACHE;
-    enableData     = CHANGEGC_ENABLE_DATA;
-    enableSplit    = CHANGEGC_ENABLE_SPLIT;
-    enableCompress = CHANGEGC_ENABLE_COMPRESS;
-
-    dataLimit  = CHANGEGC_DATA_LIMIT;
-    dataOffset = CHANGEGC_DATA_OFFSET;
-
-    cacheSlots          = CHANGEGC_CACHE_SLOTS;
-    cacheThreshold      = CHANGEGC_CACHE_THRESHOLD;
-    cacheLowerThreshold = CHANGEGC_CACHE_LOWER_THRESHOLD;
-
-    messages_ -> resize(cacheSlots);
-
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      *i = NULL;
-    }
-
-    temporary_ = NULL;
-  }
-
-  virtual ~ChangeGCCompatStore()
-  {
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      destroy(*i);
-    }
-
-    destroy(temporary_);
-  }
-
-  virtual const char *name() const
-  {
-    return "ChangeGCCompat";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_ChangeGC;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(ChangeGCCompatMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  public:
-
-  virtual Message *create() const
-  {
-    return new ChangeGCCompatMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new ChangeGCCompatMessage((const ChangeGCCompatMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (ChangeGCCompatMessage *) message;
-  }
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* ChangeGCCompat_H */
diff --git a/nxcomp/CreatePixmapCompat.cpp b/nxcomp/CreatePixmapCompat.cpp
deleted file mode 100644
index 6ea346ee1..000000000
--- a/nxcomp/CreatePixmapCompat.cpp
+++ /dev/null
@@ -1,272 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2010 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      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
-#include "CreatePixmapCompat.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-#include "WriteBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-//
-// Constructors and destructors.
-//
-
-CreatePixmapCompatStore::CreatePixmapCompatStore()
-
-  : MessageStore()
-{
-  enableCache    = CREATEPIXMAP_ENABLE_CACHE;
-  enableData     = CREATEPIXMAP_ENABLE_DATA;
-  enableSplit    = CREATEPIXMAP_ENABLE_SPLIT;
-  enableCompress = CREATEPIXMAP_ENABLE_COMPRESS;
-
-  dataLimit  = CREATEPIXMAP_DATA_LIMIT;
-  dataOffset = CREATEPIXMAP_DATA_OFFSET;
-
-  cacheSlots          = CREATEPIXMAP_CACHE_SLOTS;
-  cacheThreshold      = CREATEPIXMAP_CACHE_THRESHOLD;
-  cacheLowerThreshold = CREATEPIXMAP_CACHE_LOWER_THRESHOLD;
-
-  messages_ -> resize(cacheSlots);
-
-  for (T_messages::iterator i = messages_ -> begin();
-           i < messages_ -> end(); i++)
-  {
-    *i = NULL;
-  }
-
-  temporary_ = NULL;
-}
-
-CreatePixmapCompatStore::~CreatePixmapCompatStore()
-{
-  for (T_messages::iterator i = messages_ -> begin();
-           i < messages_ -> end(); i++)
-  {
-    destroy(*i);
-  }
-
-  destroy(temporary_);
-}
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int CreatePixmapCompatStore::encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                                const unsigned int size, int bigEndian,
-                                                    ChannelCache *channelCache) const
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeCachedValue(*(buffer + 1), 8,
-                     clientCache -> depthCache);
-
-  encodeBuffer.encodeDiffCachedValue(GetULONG(buffer + 4, bigEndian),
-                     clientCache -> createPixmapLastId, 29,
-                         clientCache -> createPixmapIdCache, 4);
-
-  encodeBuffer.encodeXidValue(GetULONG(buffer + 8, bigEndian),
-                     clientCache -> drawableCache);
-
-  encodeBuffer.encodeCachedValue(GetUINT(buffer + 12, bigEndian), 16,
-                     clientCache -> createPixmapXCache, 8);
-
-  encodeBuffer.encodeCachedValue(GetUINT(buffer + 14, bigEndian), 16,
-                     clientCache -> createPixmapYCache, 8);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded message. Size is "
-          << size << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int CreatePixmapCompatStore::decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                                                unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
-                                                    ChannelCache *channelCache) const
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned char cValue;
-  unsigned int  value;
-
-  size = 16;
-
-  buffer = writeBuffer -> addMessage(size);
-
-  decodeBuffer.decodeCachedValue(cValue, 8,
-                     clientCache -> depthCache);
-
-  *(buffer + 1) = cValue;
-
-  decodeBuffer.decodeDiffCachedValue(value,
-                     clientCache -> createPixmapLastId, 29,
-                         clientCache -> createPixmapIdCache, 4);
-
-  PutULONG(value, buffer + 4, bigEndian);
-
-  decodeBuffer.decodeXidValue(value,
-                     clientCache -> drawableCache);
-
-  PutULONG(value, buffer + 8, bigEndian);
-
-  decodeBuffer.decodeCachedValue(value, 16,
-                     clientCache -> createPixmapXCache, 8);
-
-  PutUINT(value, buffer + 12, bigEndian);
-
-  decodeBuffer.decodeCachedValue(value, 16,
-                     clientCache -> createPixmapYCache, 8);
-
-  PutUINT(value, buffer + 14, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded message. Size is "
-          << size << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int CreatePixmapCompatStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                               unsigned int size, int bigEndian) const
-{
-  CreatePixmapCompatMessage *createPixmap = (CreatePixmapCompatMessage *) message;
-
-  createPixmap -> depth = *(buffer + 1);
-
-  createPixmap -> id       = GetULONG(buffer + 4, bigEndian);
-  createPixmap -> drawable = GetULONG(buffer + 8, bigEndian);
-
-  createPixmap -> width  = GetUINT(buffer + 12, bigEndian);
-  createPixmap -> height = GetUINT(buffer + 14, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Parsed identity. Size is "
-          << createPixmap -> size_ << " identity is "
-          << createPixmap -> i_size_ << ".\n"
-          << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int CreatePixmapCompatStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                                 unsigned int size, int bigEndian) const
-{
-  CreatePixmapCompatMessage *createPixmap = (CreatePixmapCompatMessage *) message;
-
-  *(buffer + 1) = createPixmap -> depth;
-
-  PutULONG(createPixmap -> id,       buffer + 4, bigEndian);
-  PutULONG(createPixmap -> drawable, buffer + 8, bigEndian);
-
-  PutUINT(createPixmap -> width,  buffer + 12, bigEndian);
-  PutUINT(createPixmap -> height, buffer + 14, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Unparsed identity. Size is "
-          << createPixmap -> size_ << " identity is "
-          << createPixmap -> i_size_ << ".\n"
-          << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void CreatePixmapCompatStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  #ifdef WARNING
-  *logofs << name() << ": WARNING! Dump of identity not implemented.\n"
-          << logofs_flush;
-  #endif
-
-  #endif
-}
-
-void CreatePixmapCompatStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                                   unsigned int size, int bigEndian) const
-{
-  md5_append(md5_state_, buffer + 1, 1);
-  md5_append(md5_state_, buffer + 8, 8);
-}
-
-void CreatePixmapCompatStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                                 const Message *cachedMessage,
-                                                     ChannelCache *channelCache) const
-{
-  CreatePixmapCompatMessage *createPixmap       = (CreatePixmapCompatMessage *) message;
-  CreatePixmapCompatMessage *cachedCreatePixmap = (CreatePixmapCompatMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeDiffCachedValue(createPixmap -> id,
-                     clientCache -> createPixmapLastId, 29,
-                         clientCache -> createPixmapIdCache, 4);
-
-  cachedCreatePixmap -> id = createPixmap -> id;
-
-  encodeBuffer.encodeXidValue(createPixmap -> drawable,
-                     clientCache -> drawableCache);
-
-  cachedCreatePixmap -> drawable = createPixmap -> drawable;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded update. Size is "
-          << createPixmap -> size_ << " identity is "
-          << createPixmap -> i_size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-
-void CreatePixmapCompatStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                                 ChannelCache *channelCache) const
-{
-  CreatePixmapCompatMessage *createPixmap = (CreatePixmapCompatMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeDiffCachedValue(createPixmap -> id,
-                     clientCache -> createPixmapLastId, 29,
-                         clientCache -> createPixmapIdCache, 4);
-
-  decodeBuffer.decodeXidValue(createPixmap -> drawable,
-                     clientCache -> drawableCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded update. Size is "
-          << createPixmap -> size_ << " identity is "
-          << createPixmap -> i_size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
diff --git a/nxcomp/CreatePixmapCompat.h b/nxcomp/CreatePixmapCompat.h
deleted file mode 100644
index e8cf8d99f..000000000
--- a/nxcomp/CreatePixmapCompat.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2010 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      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef CreatePixmapCompat_H
-#define CreatePixmapCompat_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define CREATEPIXMAP_ENABLE_CACHE               1
-#define CREATEPIXMAP_ENABLE_DATA                0
-#define CREATEPIXMAP_ENABLE_SPLIT               0
-#define CREATEPIXMAP_ENABLE_COMPRESS            0
-
-#define CREATEPIXMAP_DATA_LIMIT                 16
-#define CREATEPIXMAP_DATA_OFFSET                16
-
-#define CREATEPIXMAP_CACHE_SLOTS                1000
-#define CREATEPIXMAP_CACHE_THRESHOLD            2
-#define CREATEPIXMAP_CACHE_LOWER_THRESHOLD      1
-
-//
-// The message class.
-//
-
-class CreatePixmapCompatMessage : public Message
-{
-  friend class CreatePixmapCompatStore;
-
-  public:
-
-  CreatePixmapCompatMessage()
-  {
-  }
-
-  ~CreatePixmapCompatMessage()
-  {
-  }
-
-  //
-  // Put here the fields which constitute 
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned char depth;
-
-  unsigned int id;
-  unsigned int drawable;
-
-  unsigned short width;
-  unsigned short height;
-};
-
-class CreatePixmapCompatStore : public MessageStore
-{
-  public:
-
-  CreatePixmapCompatStore();
-
-  virtual ~CreatePixmapCompatStore();
-
-  virtual const char *name() const
-  {
-    return "CreatePixmapCompat";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_CreatePixmap;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(CreatePixmapCompatMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  protected:
-
-  virtual Message *create() const
-  {
-    return new CreatePixmapCompatMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new CreatePixmapCompatMessage((const CreatePixmapCompatMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (CreatePixmapCompatMessage *) message;
-  }
-
-  virtual int encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                 const unsigned int size, int bigEndian,
-                                     ChannelCache *channelCache) const;
-
-  virtual int decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                                 unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
-                                     ChannelCache *channelCache) const;
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer, 
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer, 
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer, 
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* CreatePixmapCompat_H */
diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in
index d309c4949..93b644079 100644
--- a/nxcomp/Makefile.in
+++ b/nxcomp/Makefile.in
@@ -226,18 +226,7 @@ CXXSRC = Loop.cpp 				\
 	 RenderCompositeGlyphs.cpp		\
 	 RenderFillRectangles.cpp		\
 	 RenderTrapezoids.cpp			\
-	 RenderTriangles.cpp			\
-	 PositionCacheCompat.cpp		\
-	 ChangeGCCompat.cpp			\
-	 CreatePixmapCompat.cpp			\
-	 SetUnpackColormapCompat.cpp		\
-	 SetUnpackAlphaCompat.cpp		\
-	 RenderCreatePictureCompat.cpp		\
-	 RenderFreePictureCompat.cpp		\
-	 RenderPictureClipCompat.cpp		\
-	 RenderCreateGlyphSetCompat.cpp		\
-	 RenderCompositeCompat.cpp		\
-	 RenderCompositeGlyphsCompat.cpp
+	 RenderTriangles.cpp
 
 MOBJ   = $(MSRC:.c=.o)
 COBJ   = $(CSRC:.c=.o)
diff --git a/nxcomp/PositionCacheCompat.cpp b/nxcomp/PositionCacheCompat.cpp
deleted file mode 100644
index dd301a0a4..000000000
--- a/nxcomp/PositionCacheCompat.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2010 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      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
-#include "Control.h"
-
-#include "PositionCacheCompat.h"
-
-PositionCacheCompat::PositionCacheCompat()
-{
-}
-
-PositionCacheCompat::~PositionCacheCompat()
-{
-}
diff --git a/nxcomp/PositionCacheCompat.h b/nxcomp/PositionCacheCompat.h
deleted file mode 100644
index 983e45382..000000000
--- a/nxcomp/PositionCacheCompat.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2010 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      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef PositionCacheCompat_H
-#define PositionCacheCompat_H
-
-#include "IntCache.h"
-
-class PositionCacheCompat
-{
-  friend class EncodeBuffer;
-  friend class DecodeBuffer;
-  
-  public:
-
-  PositionCacheCompat();
-  ~PositionCacheCompat();
-
-  private:
-
-  IntCache *base_[32];
-
-  unsigned int slot_;
-  short int last_;
-};
-
-#endif /* PositionCacheCompat_H */
diff --git a/nxcomp/RenderCompositeCompat.cpp b/nxcomp/RenderCompositeCompat.cpp
deleted file mode 100644
index 5a1eff213..000000000
--- a/nxcomp/RenderCompositeCompat.cpp
+++ /dev/null
@@ -1,320 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2010 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      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
-//
-// Include the template for
-// this message class.
-//
-
-#include "RenderCompositeCompat.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-#include MESSAGE_TAGS
-
-//
-// Message handling methods.
-//
-
-MESSAGE_BEGIN_ENCODE_SIZE
-{
-  //
-  // Strictly speaking this request doesn't have
-  // a data part. We just encode the field from
-  // offset 24 to 36 as they were data using an
-  // int cache.
-  //
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded size with value "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_SIZE
-
-MESSAGE_BEGIN_DECODE_SIZE
-{
-  size = MESSAGE_OFFSET + 12;
-
-  buffer = writeBuffer -> addMessage(size);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded size with value "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_SIZE
-
-MESSAGE_BEGIN_ENCODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeCachedValue(*(buffer + 4), 8,
-                     clientCache -> renderOpCache);
-
-  encodeBuffer.encodeXidValue(GetULONG(buffer + 8, bigEndian),
-                     clientCache -> renderSrcPictureCache);
-
-  encodeBuffer.encodeXidValue(GetULONG(buffer + 12, bigEndian),
-                     clientCache -> renderSrcPictureCache);
-
-  encodeBuffer.encodeXidValue(GetULONG(buffer + 16, bigEndian),
-                     clientCache -> renderSrcPictureCache);
-
-  encodeBuffer.encodeDiffCachedValue(GetUINT(buffer + 20, bigEndian),
-                     clientCache -> renderLastX, 16,
-                         clientCache -> renderXCache, 11);
-
-  encodeBuffer.encodeDiffCachedValue(GetUINT(buffer + 22, bigEndian),
-                     clientCache -> renderLastY, 16,
-                         clientCache -> renderYCache, 11);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded message. Type is "
-          << (unsigned int) *(buffer + 1) << " size is "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_MESSAGE
-
-MESSAGE_BEGIN_DECODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  *(buffer + 1) = type;
-
-  decodeBuffer.decodeCachedValue(*(buffer + 4), 8,
-                     clientCache -> renderOpCache);
-
-  decodeBuffer.decodeXidValue(value, clientCache -> renderSrcPictureCache);
-
-  PutULONG(value, buffer + 8, bigEndian);
-
-  decodeBuffer.decodeXidValue(value, clientCache -> renderSrcPictureCache);
-
-  PutULONG(value, buffer + 12, bigEndian);
-
-  decodeBuffer.decodeXidValue(value, clientCache -> renderSrcPictureCache);
-
-  PutULONG(value, buffer + 16, bigEndian);
-
-  decodeBuffer.decodeDiffCachedValue(value,
-                     clientCache -> renderLastX, 16,
-                         clientCache -> renderXCache, 11);
-
-  PutUINT(clientCache -> renderLastX, buffer + 20, bigEndian);
-
-  decodeBuffer.decodeDiffCachedValue(value,
-                     clientCache -> renderLastY, 16,
-                         clientCache -> renderYCache, 11);
-
-  PutUINT(clientCache -> renderLastY, buffer + 22, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded message. Type is "
-          << (unsigned int) type << " size is " << size
-          << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_MESSAGE
-
-MESSAGE_BEGIN_ENCODE_DATA
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  for (unsigned int i = MESSAGE_OFFSET, c = 0; i < size; i += 4)
-  {
-    #ifdef DEBUG
-    *logofs << name() << ": Encoding long value "
-            << GetULONG(buffer + i, bigEndian) << " with i = "
-            << i << " c = "  << c << ".\n" << logofs_flush;
-    #endif
-
-    encodeBuffer.encodeCachedValue(GetULONG(buffer + i, bigEndian), 32,
-                       *clientCache -> renderCompositeDataCache[c]);
-
-    if (++c == 3) c = 0;
-  }
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded " << size - MESSAGE_OFFSET
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_DATA
-
-MESSAGE_BEGIN_DECODE_DATA
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  for (unsigned int i = MESSAGE_OFFSET, c = 0; i < size; i += 4)
-  {
-    decodeBuffer.decodeCachedValue(value, 32,
-                       *clientCache -> renderCompositeDataCache[c]);
-
-    #ifdef DEBUG
-    *logofs << name() << ": Decoded long value " << value
-            << " with i = " << i << " c = " << c << ".\n"
-            << logofs_flush;
-    #endif
-
-    PutULONG(value, buffer + i, bigEndian);
-
-    if (++c == 3) c = 0;
-  }
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded " << size - MESSAGE_OFFSET
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_DATA
-
-MESSAGE_BEGIN_PARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  renderExtension -> data.composite.type = *(buffer + 1);
-  renderExtension -> data.composite.op   = *(buffer + 4);
-
-  renderExtension -> data.composite.src_id = GetULONG(buffer + 8,  bigEndian);
-  renderExtension -> data.composite.msk_id = GetULONG(buffer + 12, bigEndian);
-  renderExtension -> data.composite.dst_id = GetULONG(buffer + 16, bigEndian);
-
-  renderExtension -> data.composite.src_x = GetUINT(buffer + 20, bigEndian);
-  renderExtension -> data.composite.src_y = GetUINT(buffer + 22, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Parsed identity. Type is "
-          << (unsigned int) renderExtension -> data.composite.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_PARSE_IDENTITY
-
-MESSAGE_BEGIN_UNPARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  *(buffer + 1) = renderExtension -> data.composite.type;
-  *(buffer + 4) = renderExtension -> data.composite.op;
-
-  PutULONG(renderExtension -> data.composite.src_id, buffer + 8,  bigEndian);
-  PutULONG(renderExtension -> data.composite.msk_id, buffer + 12, bigEndian);
-  PutULONG(renderExtension -> data.composite.dst_id, buffer + 16, bigEndian);
-
-  PutUINT(renderExtension -> data.composite.src_x, buffer + 20, bigEndian);
-  PutUINT(renderExtension -> data.composite.src_y, buffer + 22, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Unparsed identity. Type is "
-          << (unsigned int) renderExtension -> data.composite.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_UNPARSE_IDENTITY
-
-MESSAGE_BEGIN_IDENTITY_CHECKSUM
-{
-  //
-  // Include minor opcode, size and
-  // operator in the identity, plus
-  // the x and y of the source.
-  //
-
-  md5_append(md5_state, buffer + 1,  4);
-  md5_append(md5_state, buffer + 20, 4);
-}
-MESSAGE_END_IDENTITY_CHECKSUM
-
-MESSAGE_BEGIN_ENCODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
-  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Source " << renderExtension ->
-             data.composite.src_id << " mask " << renderExtension ->
-             data.composite.msk_id << " destination " << renderExtension ->
-             data.composite.msk_id << ".\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeXidValue(renderExtension -> data.composite.src_id,
-                     clientCache -> renderSrcPictureCache);
-
-  cachedRenderExtension -> data.composite.src_id =
-              renderExtension -> data.composite.src_id;
-
-  encodeBuffer.encodeXidValue(renderExtension -> data.composite.msk_id,
-                     clientCache -> renderSrcPictureCache);
-
-  cachedRenderExtension -> data.composite.msk_id =
-              renderExtension -> data.composite.msk_id;
-
-  encodeBuffer.encodeXidValue(renderExtension -> data.composite.dst_id,
-                     clientCache -> renderSrcPictureCache);
-
-  cachedRenderExtension -> data.composite.dst_id =
-              renderExtension -> data.composite.dst_id;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded update. Type is "
-          << (unsigned int) renderExtension -> data.composite.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_UPDATE
-
-MESSAGE_BEGIN_DECODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeXidValue(renderExtension -> data.composite.src_id,
-                     clientCache -> renderSrcPictureCache);
-
-  decodeBuffer.decodeXidValue(renderExtension -> data.composite.msk_id,
-                     clientCache -> renderSrcPictureCache);
-
-  decodeBuffer.decodeXidValue(renderExtension -> data.composite.dst_id,
-                     clientCache -> renderSrcPictureCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded update. Type is "
-          << (unsigned int) renderExtension -> data.composite.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_UPDATE
diff --git a/nxcomp/RenderCompositeCompat.h b/nxcomp/RenderCompositeCompat.h
deleted file mode 100644
index a26db35ba..000000000
--- a/nxcomp/RenderCompositeCompat.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2010 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      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef RenderCompositeCompat_H
-#define RenderCompositeCompat_H
-
-//
-// Define the characteristics
-// of this message class here.
-//
-
-#undef  MESSAGE_NAME
-#define MESSAGE_NAME          "RenderCompositeCompat"
-
-#undef  MESSAGE_STORE
-#define MESSAGE_STORE         RenderCompositeCompatStore
-
-#undef  MESSAGE_CLASS
-#define MESSAGE_CLASS         RenderMinorExtensionStore
-
-#undef  MESSAGE_METHODS
-#define MESSAGE_METHODS       "RenderMinorExtensionMethods.h"
-
-#undef  MESSAGE_HEADERS
-#define MESSAGE_HEADERS       "RenderMinorExtensionHeaders.h"
-
-#undef  MESSAGE_TAGS
-#define MESSAGE_TAGS          "RenderMinorExtensionTags.h"
-
-#undef  MESSAGE_OFFSET
-#define MESSAGE_OFFSET        24
-
-#undef  MESSAGE_HAS_SIZE
-#define MESSAGE_HAS_SIZE      1
-
-#undef  MESSAGE_HAS_DATA
-#define MESSAGE_HAS_DATA      1
-
-#undef  MESSAGE_HAS_FILTER
-#define MESSAGE_HAS_FILTER    0
-
-//
-// Declare the message class.
-//
-
-#include MESSAGE_HEADERS
-
-class MESSAGE_STORE : public MESSAGE_CLASS
-{
-  public:
-
-  virtual const char *name() const
-  {
-    return MESSAGE_NAME;
-  }
-
-  virtual int identitySize(const unsigned char *buffer,
-                               unsigned int size)
-  {
-    return MESSAGE_OFFSET;
-  }
-
-  #include MESSAGE_METHODS
-};
-
-#endif /* RenderCompositeCompat_H */
diff --git a/nxcomp/RenderCompositeGlyphsCompat.cpp b/nxcomp/RenderCompositeGlyphsCompat.cpp
deleted file mode 100644
index 3fe10fafb..000000000
--- a/nxcomp/RenderCompositeGlyphsCompat.cpp
+++ /dev/null
@@ -1,602 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2010 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      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
-//
-// Include the template for
-// this message class.
-//
-
-#include "RenderCompositeGlyphsCompat.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-#include MESSAGE_TAGS
-
-//
-// Message handling methods.
-//
-
-MESSAGE_BEGIN_ENCODE_SIZE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  //
-  // The offset points 8 bytes after
-  // the beginning of the data part.
-  //
-
-  #ifdef DEBUG
-  *logofs << name() << ": Encoding value "
-          << ((size - (MESSAGE_OFFSET - 8)) >> 2)
-          << ".\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeCachedValue((size - (MESSAGE_OFFSET - 8)) >> 2, 16,
-                     clientCache -> renderLengthCache, 5);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded size with value "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_SIZE
-
-MESSAGE_BEGIN_DECODE_SIZE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeCachedValue(size, 16,
-                     clientCache -> renderLengthCache, 5);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << size
-          << ".\n" << logofs_flush;
-  #endif
-
-  size = (MESSAGE_OFFSET - 8) + (size << 2);
-
-  buffer = writeBuffer -> addMessage(size);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded size with value "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_SIZE
-
-MESSAGE_BEGIN_ENCODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeCachedValue(*(buffer + 4), 8,
-                     clientCache -> renderOpCache);
-
-  encodeBuffer.encodeXidValue(GetULONG(buffer + 8, bigEndian),
-                     clientCache -> renderSrcPictureCache);
-
-  encodeBuffer.encodeXidValue(GetULONG(buffer + 12, bigEndian),
-                     clientCache -> renderSrcPictureCache);
-
-  encodeBuffer.encodeCachedValue(GetULONG(buffer + 16, bigEndian), 32,
-                     clientCache -> renderFormatCache);
-
-  encodeBuffer.encodeCachedValue(GetULONG(buffer + 20, bigEndian), 29,
-                     clientCache -> renderGlyphSetCache);
-
-  encodeBuffer.encodeDiffCachedValue(GetUINT(buffer + 24, bigEndian),
-                     clientCache -> renderLastX, 16,
-                         clientCache -> renderXCache, 11);
-
-  encodeBuffer.encodeDiffCachedValue(GetUINT(buffer + 26, bigEndian),
-                     clientCache -> renderLastY, 16,
-                         clientCache -> renderYCache, 11);
-
-  //
-  // Try to save as many bits as possible by
-  // encoding the information about the first
-  // set of glyphs.
-  //
-
-  if (size >= MESSAGE_OFFSET)
-  {
-    unsigned int numGlyphs = *(buffer + 28);
-
-    encodeBuffer.encodeCachedValue(numGlyphs, 8,
-                       clientCache -> renderNumGlyphsCache);
-
-    encodeBuffer.encodeCachedValue(GetUINT(buffer + 32, bigEndian), 16,
-                       clientCache -> renderWidthCache, 11);
-
-    encodeBuffer.encodeCachedValue(GetUINT(buffer + 34, bigEndian), 16,
-                       clientCache -> renderHeightCache, 11);
-
-    //
-    // Only manage the first set of glyphs,
-    // that is in most cases the only one.
-    //
-
-    switch (*(buffer + 1))
-    {
-      case X_RenderCompositeGlyphs8:
-      {
-        if (numGlyphs & 0x03)
-        {
-          memset((unsigned char *) buffer + MESSAGE_OFFSET + numGlyphs, '\0',
-                     RoundUp4(numGlyphs) - numGlyphs);
-        }
-
-        break;
-      }
-      case X_RenderCompositeGlyphs16:
-      {
-        if (numGlyphs & 0x01)
-        {
-          memset((unsigned char *) buffer + MESSAGE_OFFSET + (numGlyphs * 2), '\0',
-                     RoundUp4(numGlyphs * 2) - numGlyphs * 2);
-        }
-
-        break;
-      }
-    }
-
-    #ifdef TEST
-    if (*(buffer + (size - 1)) != '\0')
-    {
-      *logofs << name() << ": WARNING! Final byte is non-zero with size "
-              << size << " and " << (unsigned int) *(buffer + 28)
-              << " glyphs.\n" << logofs_flush;
-    }
-    else
-    {
-      *logofs << name() << ": Final byte is zero with size "
-              << size << " and " << (unsigned int) *(buffer + 28)
-              << " glyphs.\n" << logofs_flush;
-    }
-    #endif
-  }
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded message. Type is "
-          << (unsigned int) *(buffer + 1) << " size is "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_MESSAGE
-
-MESSAGE_BEGIN_DECODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  *(buffer + 1) = type;
-
-  decodeBuffer.decodeCachedValue(*(buffer + 4), 8,
-                     clientCache -> renderOpCache);
-
-  decodeBuffer.decodeXidValue(value,
-                     clientCache -> renderSrcPictureCache);
-
-  PutULONG(value, buffer + 8, bigEndian);
-
-  decodeBuffer.decodeXidValue(value,
-                     clientCache -> renderSrcPictureCache);
-
-  PutULONG(value, buffer + 12, bigEndian);
-
-  decodeBuffer.decodeCachedValue(value, 32,
-                     clientCache -> renderFormatCache);
-
-  PutULONG(value, buffer + 16, bigEndian);
-
-  decodeBuffer.decodeCachedValue(value, 29,
-                     clientCache -> renderGlyphSetCache);
-
-  PutULONG(value, buffer + 20, bigEndian);
-
-  decodeBuffer.decodeDiffCachedValue(value,
-                     clientCache -> renderLastX, 16,
-                         clientCache -> renderXCache, 11);
-
-  PutUINT(clientCache -> renderLastX, buffer + 24, bigEndian);
-
-  decodeBuffer.decodeDiffCachedValue(value,
-                     clientCache -> renderLastY, 16,
-                         clientCache -> renderYCache, 11);
-
-  PutUINT(clientCache -> renderLastY, buffer + 26, bigEndian);
-
-  if (size >= MESSAGE_OFFSET)
-  {
-    decodeBuffer.decodeCachedValue(value, 8,
-                       clientCache -> renderNumGlyphsCache);
-
-    *(buffer + 28) = value;
-
-    decodeBuffer.decodeCachedValue(value, 16,
-                       clientCache -> renderWidthCache, 11);
-
-    PutUINT(value, buffer + 32, bigEndian);
-
-    decodeBuffer.decodeCachedValue(value, 16,
-                       clientCache -> renderHeightCache, 11);
-
-    PutUINT(value, buffer + 34, bigEndian);
-  }
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded message. Type is "
-          << (unsigned int) type << " size is " << size
-          << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_MESSAGE
-
-MESSAGE_BEGIN_ENCODE_DATA
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  switch (*(buffer + 1))
-  {
-    case X_RenderCompositeGlyphs8:
-    {
-      clientCache -> renderTextCompressor.reset();
-
-      const unsigned char *next = buffer + MESSAGE_OFFSET;
-
-      for (unsigned int i = MESSAGE_OFFSET; i < size; i++)
-      {
-        #ifdef DEBUG
-        *logofs << name() << ": Encoding char with i = " << i
-                << ".\n" << logofs_flush;
-        #endif
-
-        clientCache -> renderTextCompressor.
-              encodeChar(*next++, encodeBuffer);
-      }
-
-      break;
-    }
-    case X_RenderCompositeGlyphs16:
-    {
-      for (unsigned int i = MESSAGE_OFFSET; i < size; i += 2)
-      {
-        value = GetUINT(buffer + i, bigEndian);
-
-        #ifdef DEBUG
-        *logofs << name() << ": Encoding short with i = " << i
-                << ".\n" << logofs_flush;
-        #endif
-
-        encodeBuffer.encodeCachedValue(value, 16,
-                           *clientCache -> renderCompositeGlyphsDataCache[clientCache ->
-                                renderLastCompositeGlyphsData]);
-
-        clientCache -> renderLastCompositeGlyphsData = value % 16;
-      }
-
-      break;
-    }
-    default:
-    {
-      for (unsigned int i = MESSAGE_OFFSET; i < size; i += 4)
-      {
-        value = GetULONG(buffer + i, bigEndian);
-
-        #ifdef DEBUG
-        *logofs << name() << ": Encoding long with i = " << i
-                << ".\n" << logofs_flush;
-        #endif
-
-        encodeBuffer.encodeCachedValue(value, 32,
-                           *clientCache -> renderCompositeGlyphsDataCache[clientCache ->
-                                renderLastCompositeGlyphsData]);
-
-        clientCache -> renderLastCompositeGlyphsData = value % 16;
-      }
-
-      break;
-    }
-  }
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded " << size - MESSAGE_OFFSET
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_DATA
-
-MESSAGE_BEGIN_DECODE_DATA
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  switch (*(buffer + 1))
-  {
-    case X_RenderCompositeGlyphs8:
-    {
-      clientCache -> renderTextCompressor.reset();
-
-      unsigned char *next = buffer + MESSAGE_OFFSET;
-
-      for (unsigned int i = MESSAGE_OFFSET; i < size; i++)
-      {
-        #ifdef DEBUG
-        *logofs << name() << ": Decoding char with i = " << i
-                << ".\n" << logofs_flush;
-        #endif
-
-        *next++ = clientCache -> renderTextCompressor.
-                        decodeChar(decodeBuffer);
-      }
-
-      break;
-    }
-    case X_RenderCompositeGlyphs16:
-    {
-      for (unsigned int i = MESSAGE_OFFSET; i < size; i += 2)
-      {
-        #ifdef DEBUG
-        *logofs << name() << ": Decoding short with i = " << i
-                << ".\n" << logofs_flush;
-        #endif
-
-        decodeBuffer.decodeCachedValue(value, 16,
-                           *clientCache -> renderCompositeGlyphsDataCache[clientCache ->
-                                  renderLastCompositeGlyphsData]);
-
-        PutUINT(value, buffer + i, bigEndian);
-
-        clientCache -> renderLastCompositeGlyphsData = value % 16;
-      }
-
-      break;
-    }
-    default:
-    {
-      for (unsigned int i = MESSAGE_OFFSET; i < size; i += 4)
-      {
-        #ifdef DEBUG
-        *logofs << name() << ": Decoding long with i = " << i
-                << ".\n" << logofs_flush;
-        #endif
-
-        decodeBuffer.decodeCachedValue(value, 32,
-                           *clientCache -> renderCompositeGlyphsDataCache[clientCache ->
-                                  renderLastCompositeGlyphsData]);
-
-        PutULONG(value, buffer + i, bigEndian);
-
-        clientCache -> renderLastCompositeGlyphsData = value % 16;
-      }
-
-      break;
-    }
-  }
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded " << size - MESSAGE_OFFSET
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_DATA
-
-MESSAGE_BEGIN_PARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  renderExtension -> data.composite_glyphs_compat.type = *(buffer + 1);
-  renderExtension -> data.composite_glyphs_compat.op   = *(buffer + 4);
-
-  renderExtension -> data.composite_glyphs_compat.src_id = GetULONG(buffer + 8,  bigEndian);
-  renderExtension -> data.composite_glyphs_compat.dst_id = GetULONG(buffer + 12, bigEndian);
-
-  renderExtension -> data.composite_glyphs_compat.format = GetULONG(buffer + 16, bigEndian);
-  renderExtension -> data.composite_glyphs_compat.set_id = GetULONG(buffer + 20, bigEndian);
-
-  renderExtension -> data.composite_glyphs_compat.src_x = GetUINT(buffer + 24, bigEndian);
-  renderExtension -> data.composite_glyphs_compat.src_y = GetUINT(buffer + 26, bigEndian);
-
-  if (size >= MESSAGE_OFFSET)
-  {
-    renderExtension -> data.composite_glyphs_compat.num_elm = *(buffer + 28);
-
-    renderExtension -> data.composite_glyphs_compat.delta_x = GetUINT(buffer + 32, bigEndian);
-    renderExtension -> data.composite_glyphs_compat.delta_y = GetUINT(buffer + 34, bigEndian);
-  }
-
-  #ifdef TEST
-  *logofs << name() << ": Parsed identity. Type is "
-          << (unsigned int) renderExtension -> data.composite_glyphs_compat.type
-          << " size is " << renderExtension -> size_ << " identity size "
-          << renderExtension -> i_size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_PARSE_IDENTITY
-
-MESSAGE_BEGIN_UNPARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  *(buffer + 1) = renderExtension -> data.composite_glyphs_compat.type;
-  *(buffer + 4) = renderExtension -> data.composite_glyphs_compat.op;
-
-  PutULONG(renderExtension -> data.composite_glyphs_compat.src_id, buffer + 8,  bigEndian);
-  PutULONG(renderExtension -> data.composite_glyphs_compat.dst_id, buffer + 12, bigEndian);
-
-  PutULONG(renderExtension -> data.composite_glyphs_compat.format, buffer + 16, bigEndian);
-  PutULONG(renderExtension -> data.composite_glyphs_compat.set_id, buffer + 20, bigEndian);
-
-  PutUINT(renderExtension -> data.composite_glyphs_compat.src_x, buffer + 24, bigEndian);
-  PutUINT(renderExtension -> data.composite_glyphs_compat.src_y, buffer + 26, bigEndian);
-
-  if (size >= MESSAGE_OFFSET)
-  {
-    *(buffer + 28) = renderExtension -> data.composite_glyphs_compat.num_elm;
-
-    PutUINT(renderExtension -> data.composite_glyphs_compat.delta_x, buffer + 32, bigEndian);
-    PutUINT(renderExtension -> data.composite_glyphs_compat.delta_y, buffer + 34, bigEndian);
-
-    #ifdef DEBUG
-    *logofs << name() << ": Len is " << (unsigned int) *(buffer + 28)
-            << " delta X is " << GetUINT(buffer + 32, bigEndian)
-            << " delta Y is " << GetUINT(buffer + 34, bigEndian)
-            << ".\n" << logofs_flush;
-
-    *logofs << name() << ": Pad 1 is " << (unsigned int) *(buffer + 29)
-            << " pad 2 and 3 are " << GetUINT(buffer + 30, bigEndian)
-            << ".\n" << logofs_flush;
-    #endif
-  }
-
-  #ifdef TEST
-  *logofs << name() << ": Unparsed identity. Type is "
-          << (unsigned int) renderExtension -> data.composite_glyphs_compat.type
-          << " size is " << renderExtension -> size_  << " identity size "
-          << renderExtension -> i_size_ << ".\n" << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_UNPARSE_IDENTITY
-
-MESSAGE_BEGIN_IDENTITY_CHECKSUM
-{
-  //
-  // Include minor opcode, size and
-  // the composite operator in the
-  // identity.
-  //
-
-  md5_append(md5_state, buffer + 1, 4);
-
-  //
-  // Include the format and the source
-  // x and y fields.
-  //
-
-  md5_append(md5_state, buffer + 16, 4);
-  md5_append(md5_state, buffer + 24, 4);
-
-  //
-  // Include the number of glyphs.
-  //
-
-  if (size >= MESSAGE_OFFSET)
-  {
-    md5_append(md5_state, buffer + 28, 1);
-  }
-}
-MESSAGE_END_IDENTITY_CHECKSUM
-
-MESSAGE_BEGIN_ENCODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
-  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeXidValue(renderExtension -> data.composite_glyphs_compat.src_id,
-                     clientCache -> renderSrcPictureCache);
-
-  cachedRenderExtension -> data.composite_glyphs_compat.src_id =
-              renderExtension -> data.composite_glyphs_compat.src_id;
-
-  encodeBuffer.encodeXidValue(renderExtension -> data.composite_glyphs_compat.dst_id,
-                     clientCache -> renderSrcPictureCache);
-
-  cachedRenderExtension -> data.composite_glyphs_compat.dst_id =
-              renderExtension -> data.composite_glyphs_compat.dst_id;
-
-  encodeBuffer.encodeCachedValue(renderExtension -> data.composite_glyphs_compat.set_id, 29,
-                     clientCache -> renderGlyphSetCache);
-
-  cachedRenderExtension -> data.composite_glyphs_compat.set_id =
-              renderExtension -> data.composite_glyphs_compat.set_id;
-
-  if (renderExtension -> size_ >= MESSAGE_OFFSET)
-  {
-    encodeBuffer.encodeCachedValue(renderExtension -> data.composite_glyphs_compat.delta_x, 16,
-                       clientCache -> renderWidthCache, 11);
-
-    cachedRenderExtension -> data.composite_glyphs_compat.delta_x =
-                renderExtension -> data.composite_glyphs_compat.delta_x;
-
-    encodeBuffer.encodeCachedValue(renderExtension -> data.composite_glyphs_compat.delta_y, 16,
-                       clientCache -> renderHeightCache, 11);
-
-    cachedRenderExtension -> data.composite_glyphs_compat.delta_y =
-                renderExtension -> data.composite_glyphs_compat.delta_y;
-  }
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded update. Type is "
-          << (unsigned int) renderExtension -> data.composite_glyphs_compat.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_UPDATE
-
-MESSAGE_BEGIN_DECODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeXidValue(renderExtension -> data.composite_glyphs_compat.src_id,
-                     clientCache -> renderSrcPictureCache);
-
-  decodeBuffer.decodeXidValue(renderExtension -> data.composite_glyphs_compat.dst_id,
-                     clientCache -> renderSrcPictureCache);
-
-  decodeBuffer.decodeCachedValue(renderExtension -> data.composite_glyphs_compat.set_id, 29,
-                     clientCache -> renderGlyphSetCache);
-
-  if (renderExtension -> size_ >= MESSAGE_OFFSET)
-  {
-    unsigned int value;
-
-    decodeBuffer.decodeCachedValue(value, 16,
-                       clientCache -> renderWidthCache, 11);
-
-    renderExtension -> data.composite_glyphs_compat.delta_x = value;
-
-    decodeBuffer.decodeCachedValue(value, 16,
-                       clientCache -> renderHeightCache, 11);
-
-    renderExtension -> data.composite_glyphs_compat.delta_y = value;
-  }
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded update. Type is "
-          << (unsigned int) renderExtension -> data.composite_glyphs_compat.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_UPDATE
diff --git a/nxcomp/RenderCompositeGlyphsCompat.h b/nxcomp/RenderCompositeGlyphsCompat.h
deleted file mode 100644
index 7a00608c2..000000000
--- a/nxcomp/RenderCompositeGlyphsCompat.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2010 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      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef RenderCompositeGlyphsCompat_H
-#define RenderCompositeGlyphsCompat_H
-
-//
-// Define the characteristics
-// of this message class here.
-//
-
-#undef  MESSAGE_NAME
-#define MESSAGE_NAME          "RenderCompositeGlyphsCompat"
-
-#undef  MESSAGE_STORE
-#define MESSAGE_STORE         RenderCompositeGlyphsCompatStore
-
-#undef  MESSAGE_CLASS
-#define MESSAGE_CLASS         RenderMinorExtensionStore
-
-#undef  MESSAGE_METHODS
-#define MESSAGE_METHODS       "RenderMinorExtensionMethods.h"
-
-#undef  MESSAGE_HEADERS
-#define MESSAGE_HEADERS       "RenderMinorExtensionHeaders.h"
-
-#undef  MESSAGE_TAGS
-#define MESSAGE_TAGS          "RenderMinorExtensionTags.h"
-
-#undef  MESSAGE_OFFSET
-#define MESSAGE_OFFSET        36
-
-#undef  MESSAGE_HAS_SIZE
-#define MESSAGE_HAS_SIZE      1
-
-#undef  MESSAGE_HAS_DATA
-#define MESSAGE_HAS_DATA      1
-
-#undef  MESSAGE_HAS_FILTER
-#define MESSAGE_HAS_FILTER    0
-
-//
-// Declare the message class.
-//
-
-#include MESSAGE_HEADERS
-
-class MESSAGE_STORE : public MESSAGE_CLASS
-{
-  public:
-
-  virtual const char *name() const
-  {
-    return MESSAGE_NAME;
-  }
-
-  virtual int identitySize(const unsigned char *buffer,
-                               unsigned int size)
-  {
-    return (size >= MESSAGE_OFFSET ? MESSAGE_OFFSET : size);
-  }
-
-  #include MESSAGE_METHODS
-};
-
-#endif /* RenderCompositeGlyphsCompat_H */
diff --git a/nxcomp/RenderCreateGlyphSetCompat.cpp b/nxcomp/RenderCreateGlyphSetCompat.cpp
deleted file mode 100644
index 49e9f741d..000000000
--- a/nxcomp/RenderCreateGlyphSetCompat.cpp
+++ /dev/null
@@ -1,231 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2010 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      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
-//
-// Include the template for
-// this message class.
-//
-
-#include "RenderCreateGlyphSetCompat.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-#include MESSAGE_TAGS
-
-//
-// Message handling methods.
-//
-
-MESSAGE_BEGIN_ENCODE_SIZE
-{
-  //
-  // Strictly speaking this request doesn't have
-  // a data part. We encode the fields past the
-  // offset as they were data. An improvement
-  // would be to encode the format field using
-  // the cache.
-  //
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded size with value "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_SIZE
-
-MESSAGE_BEGIN_DECODE_SIZE
-{
-  size = MESSAGE_OFFSET + 4;
-
-  buffer = writeBuffer -> addMessage(size);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded size with value "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_SIZE
-
-MESSAGE_BEGIN_ENCODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeDiffCachedValue(GetULONG(buffer + 4, bigEndian),
-                     clientCache -> renderLastId, 29,
-                         clientCache -> renderIdCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded message. Type is "
-          << (unsigned int) *(buffer + 1) << " size is "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_MESSAGE
-
-MESSAGE_BEGIN_DECODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  *(buffer + 1) = type;
-
-  decodeBuffer.decodeDiffCachedValue(value,
-                     clientCache -> renderLastId, 29,
-                         clientCache -> renderIdCache);
-
-  PutULONG(value, buffer + 4, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded message. Type is "
-          << (unsigned int) type << " size is " << size
-          << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_MESSAGE
-
-MESSAGE_BEGIN_ENCODE_DATA
-{
-  #ifdef DEBUG
-
-  *logofs << name() << ": Glyphset is " << GetULONG(buffer + 4, bigEndian)
-          << ".\n" << logofs_flush;
-
-  if (size > MESSAGE_OFFSET)
-  {
-    *logofs << name() << ": Format is " << GetULONG(buffer + 8, bigEndian)
-            << ".\n" << logofs_flush;
-  }
-
-  if (size > MESSAGE_OFFSET + 4)
-  {
-    *logofs << name() << ": WARNING! Unexpected size " << size
-            << ".\n" << logofs_flush;
-  }
-
-  #endif
-
-  encodeLongData(encodeBuffer, buffer, MESSAGE_OFFSET,
-                     size, bigEndian, channelCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded " << size - MESSAGE_OFFSET
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_DATA
-
-MESSAGE_BEGIN_DECODE_DATA
-{
-  decodeLongData(decodeBuffer, buffer, MESSAGE_OFFSET,
-                     size, bigEndian, channelCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded " << size - MESSAGE_OFFSET
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_DATA
-
-MESSAGE_BEGIN_PARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  renderExtension -> data.create_set.type = *(buffer + 1);
-
-  renderExtension -> data.create_set.set_id = GetULONG(buffer + 4, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Parsed identity. Type is "
-          << (unsigned int) renderExtension -> data.create_set.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_PARSE_IDENTITY
-
-MESSAGE_BEGIN_UNPARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  *(buffer + 1) = renderExtension -> data.create_set.type;
-
-  PutULONG(renderExtension -> data.create_set.set_id, buffer + 4,  bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Unparsed identity. Type is "
-          << (unsigned int) renderExtension -> data.create_set.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_UNPARSE_IDENTITY
-
-MESSAGE_BEGIN_IDENTITY_CHECKSUM
-{
-  md5_append(md5_state, buffer + 1, 3);
-}
-MESSAGE_END_IDENTITY_CHECKSUM
-
-MESSAGE_BEGIN_ENCODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
-  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeDiffCachedValue(renderExtension -> data.create_set.set_id,
-                     clientCache -> renderLastId, 29,
-                         clientCache -> renderIdCache);
-
-  cachedRenderExtension -> data.create_set.set_id =
-              renderExtension -> data.create_set.set_id;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded update. Type is "
-          << (unsigned int) renderExtension -> data.create_set.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_UPDATE
-
-MESSAGE_BEGIN_DECODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeDiffCachedValue(renderExtension -> data.create_set.set_id,
-                     clientCache -> renderLastId, 29,
-                         clientCache -> renderIdCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded update. Type is "
-          << (unsigned int) renderExtension -> data.create_set.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_UPDATE
diff --git a/nxcomp/RenderCreateGlyphSetCompat.h b/nxcomp/RenderCreateGlyphSetCompat.h
deleted file mode 100644
index 174313e10..000000000
--- a/nxcomp/RenderCreateGlyphSetCompat.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2010 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      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef RenderCreateGlyphSetCompat_H
-#define RenderCreateGlyphSetCompat_H
-
-//
-// Define the characteristics
-// of this message class here.
-//
-
-#undef  MESSAGE_NAME
-#define MESSAGE_NAME          "RenderCreateGlyphSetCompat"
-
-#undef  MESSAGE_STORE
-#define MESSAGE_STORE         RenderCreateGlyphSetCompatStore
-
-#undef  MESSAGE_CLASS
-#define MESSAGE_CLASS         RenderMinorExtensionStore
-
-#undef  MESSAGE_METHODS
-#define MESSAGE_METHODS       "RenderMinorExtensionMethods.h"
-
-#undef  MESSAGE_HEADERS
-#define MESSAGE_HEADERS       "RenderMinorExtensionHeaders.h"
-
-#undef  MESSAGE_TAGS
-#define MESSAGE_TAGS          "RenderMinorExtensionTags.h"
-
-#undef  MESSAGE_OFFSET
-#define MESSAGE_OFFSET        8
-
-#undef  MESSAGE_HAS_SIZE
-#define MESSAGE_HAS_SIZE      1
-
-#undef  MESSAGE_HAS_DATA
-#define MESSAGE_HAS_DATA      1
-
-#undef  MESSAGE_HAS_FILTER
-#define MESSAGE_HAS_FILTER    0
-
-//
-// Declare the message class.
-//
-
-#include MESSAGE_HEADERS
-
-class MESSAGE_STORE : public MESSAGE_CLASS
-{
-  public:
-
-  virtual const char *name() const
-  {
-    return MESSAGE_NAME;
-  }
-
-  virtual int identitySize(const unsigned char *buffer,
-                               unsigned int size)
-  {
-    return MESSAGE_OFFSET;
-  }
-
-  #include MESSAGE_METHODS
-};
-
-#endif /* RenderCreateGlyphSetCompat_H */
diff --git a/nxcomp/RenderCreatePictureCompat.cpp b/nxcomp/RenderCreatePictureCompat.cpp
deleted file mode 100644
index fa4dcb400..000000000
--- a/nxcomp/RenderCreatePictureCompat.cpp
+++ /dev/null
@@ -1,262 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2010 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      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
-//
-// Include the template for
-// this message class.
-//
-
-#include "RenderCreatePictureCompat.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-#include MESSAGE_TAGS
-
-//
-// Message handling methods.
-//
-
-MESSAGE_BEGIN_ENCODE_SIZE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeCachedValue((size - MESSAGE_OFFSET) >> 2, 16,
-                     clientCache -> renderLengthCache, 5);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded size with value "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_SIZE
-
-MESSAGE_BEGIN_DECODE_SIZE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeCachedValue(size, 16,
-                     clientCache -> renderLengthCache, 5);
-
-  size = MESSAGE_OFFSET + (size << 2);
-
-  buffer = writeBuffer -> addMessage(size);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded size with value "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_SIZE
-
-MESSAGE_BEGIN_ENCODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeDiffCachedValue(GetULONG(buffer + 4, bigEndian),
-                     clientCache -> renderLastId, 29,
-                         clientCache -> renderIdCache);
-
-  encodeBuffer.encodeXidValue(GetULONG(buffer + 8, bigEndian),
-                     clientCache -> drawableCache);
-
-  encodeBuffer.encodeCachedValue(GetULONG(buffer + 12, bigEndian), 32,
-                     clientCache -> renderFormatCache);
-
-  encodeBuffer.encodeCachedValue(GetULONG(buffer + 16, bigEndian), 32,
-                     clientCache -> renderValueMaskCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded message. Type is "
-          << (unsigned int) *(buffer + 1) << " size is "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_MESSAGE
-
-MESSAGE_BEGIN_DECODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  *(buffer + 1) = type;
-
-  decodeBuffer.decodeDiffCachedValue(value,
-                     clientCache -> renderLastId, 29,
-                         clientCache -> renderIdCache);
-
-  PutULONG(value, buffer + 4, bigEndian);
-
-  decodeBuffer.decodeXidValue(value,
-                     clientCache -> drawableCache);
-
-  PutULONG(value, buffer + 8, bigEndian);
-
-  decodeBuffer.decodeCachedValue(value, 32,
-                     clientCache -> renderFormatCache);
-
-  PutULONG(value, buffer + 12, bigEndian);
-
-  decodeBuffer.decodeCachedValue(value, 32,
-                     clientCache -> renderValueMaskCache);
-
-  PutULONG(value, buffer + 16, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded message. Type is "
-          << (unsigned int) type << " size is " << size
-          << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_MESSAGE
-
-MESSAGE_BEGIN_ENCODE_DATA
-{
-  encodeLongData(encodeBuffer, buffer, MESSAGE_OFFSET,
-                     size, bigEndian, channelCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded " << size - MESSAGE_OFFSET
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_DATA
-
-MESSAGE_BEGIN_DECODE_DATA
-{
-  decodeLongData(decodeBuffer, buffer, MESSAGE_OFFSET,
-                     size, bigEndian, channelCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded " << size - MESSAGE_OFFSET
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_DATA
-
-MESSAGE_BEGIN_PARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  renderExtension -> data.create_picture.type = *(buffer + 1);
-
-  renderExtension -> data.create_picture.src_id = GetULONG(buffer + 4,  bigEndian);
-  renderExtension -> data.create_picture.dst_id = GetULONG(buffer + 8,  bigEndian);
-
-  renderExtension -> data.create_picture.format = GetULONG(buffer + 12,  bigEndian);
-  renderExtension -> data.create_picture.mask   = GetULONG(buffer + 16,  bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Parsed identity. Type is "
-          << (unsigned int) renderExtension -> data.create_picture.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_PARSE_IDENTITY
-
-MESSAGE_BEGIN_UNPARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  *(buffer + 1) = renderExtension -> data.create_picture.type;
-
-  PutULONG(renderExtension -> data.create_picture.src_id, buffer + 4,  bigEndian);
-  PutULONG(renderExtension -> data.create_picture.dst_id, buffer + 8, bigEndian);
-
-  PutULONG(renderExtension -> data.create_picture.format, buffer + 12, bigEndian);
-  PutULONG(renderExtension -> data.create_picture.mask,   buffer + 16, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Unparsed identity. Type is "
-          << (unsigned int) renderExtension -> data.create_picture.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_UNPARSE_IDENTITY
-
-MESSAGE_BEGIN_IDENTITY_CHECKSUM
-{
-  md5_append(md5_state, buffer + 1,  3);
-  md5_append(md5_state, buffer + 12, 8);
-}
-MESSAGE_END_IDENTITY_CHECKSUM
-
-MESSAGE_BEGIN_ENCODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
-  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Encoding new id value "
-          << renderExtension -> data.create_picture.src_id -
-             clientCache -> renderLastId << ".\n";
-  #endif
-
-  encodeBuffer.encodeDiffCachedValue(renderExtension -> data.create_picture.src_id,
-                     clientCache -> renderLastId, 29,
-                         clientCache -> renderIdCache);
-
-  cachedRenderExtension -> data.create_picture.src_id =
-              renderExtension -> data.create_picture.src_id;
-
-  encodeBuffer.encodeXidValue(renderExtension -> data.create_picture.dst_id,
-                     clientCache -> drawableCache);
-
-  cachedRenderExtension -> data.create_picture.dst_id =
-              renderExtension -> data.create_picture.dst_id;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded update. Type is "
-          << (unsigned int) renderExtension -> data.create_picture.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_UPDATE
-
-MESSAGE_BEGIN_DECODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeDiffCachedValue(renderExtension -> data.create_picture.src_id,
-                     clientCache -> renderLastId, 29,
-                         clientCache -> renderIdCache);
-
-  decodeBuffer.decodeXidValue(renderExtension -> data.create_picture.dst_id,
-                     clientCache -> drawableCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded update. Type is "
-          << (unsigned int) renderExtension -> data.create_picture.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_UPDATE
diff --git a/nxcomp/RenderCreatePictureCompat.h b/nxcomp/RenderCreatePictureCompat.h
deleted file mode 100644
index 15c8c85b3..000000000
--- a/nxcomp/RenderCreatePictureCompat.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2010 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      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef RenderCreatePictureCompat_H
-#define RenderCreatePictureCompat_H
-
-//
-// Define the characteristics
-// of this message class here.
-//
-
-#undef  MESSAGE_NAME
-#define MESSAGE_NAME          "RenderCreatePictureCompat"
-
-#undef  MESSAGE_STORE
-#define MESSAGE_STORE         RenderCreatePictureCompatStore
-
-#undef  MESSAGE_CLASS
-#define MESSAGE_CLASS         RenderMinorExtensionStore
-
-#undef  MESSAGE_METHODS
-#define MESSAGE_METHODS       "RenderMinorExtensionMethods.h"
-
-#undef  MESSAGE_HEADERS
-#define MESSAGE_HEADERS       "RenderMinorExtensionHeaders.h"
-
-#undef  MESSAGE_TAGS
-#define MESSAGE_TAGS          "RenderMinorExtensionTags.h"
-
-#undef  MESSAGE_OFFSET
-#define MESSAGE_OFFSET        20
-
-#undef  MESSAGE_HAS_SIZE
-#define MESSAGE_HAS_SIZE      1
-
-#undef  MESSAGE_HAS_DATA
-#define MESSAGE_HAS_DATA      1
-
-#undef  MESSAGE_HAS_FILTER
-#define MESSAGE_HAS_FILTER    0
-
-//
-// Declare the message class.
-//
-
-#include MESSAGE_HEADERS
-
-class MESSAGE_STORE : public MESSAGE_CLASS
-{
-  public:
-
-  virtual const char *name() const
-  {
-    return MESSAGE_NAME;
-  }
-
-  virtual int identitySize(const unsigned char *buffer,
-                               unsigned int size)
-  {
-    return MESSAGE_OFFSET;
-  }
-
-  #include MESSAGE_METHODS
-};
-
-#endif /* RenderCreatePictureCompat_H */
diff --git a/nxcomp/RenderExtension.h b/nxcomp/RenderExtension.h
index 2b616e1e5..7ccf54068 100644
--- a/nxcomp/RenderExtension.h
+++ b/nxcomp/RenderExtension.h
@@ -82,13 +82,6 @@ class RenderExtensionMessage : public Message
   friend class RenderTrapezoidsStore;
   friend class RenderTrianglesStore;
 
-  friend class RenderCreatePictureCompatStore;
-  friend class RenderFreePictureCompatStore;
-  friend class RenderPictureClipCompatStore;
-  friend class RenderCreateGlyphSetCompatStore;
-  friend class RenderCompositeCompatStore;
-  friend class RenderCompositeGlyphsCompatStore;
-
   public:
 
   RenderExtensionMessage()
diff --git a/nxcomp/RenderFreePictureCompat.cpp b/nxcomp/RenderFreePictureCompat.cpp
deleted file mode 100644
index fb4c7ac54..000000000
--- a/nxcomp/RenderFreePictureCompat.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2010 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      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
-//
-// Include the template for
-// this message class.
-//
-
-#include "RenderFreePictureCompat.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-#include MESSAGE_TAGS
-
-//
-// Message handling methods.
-//
-
-MESSAGE_BEGIN_ENCODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeDiffCachedValue(GetULONG(buffer + 4, bigEndian),
-                     clientCache -> renderLastId, 29,
-                         clientCache -> renderIdCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded message. Type is "
-          << (unsigned int) *(buffer + 1) << " size is "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_MESSAGE
-
-MESSAGE_BEGIN_DECODE_MESSAGE
-{
-  unsigned int value;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  *(buffer + 1) = type;
-
-  decodeBuffer.decodeDiffCachedValue(value,
-                     clientCache -> renderLastId, 29,
-                         clientCache -> renderIdCache);
-
-  PutULONG(value, buffer + 4, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded message. Type is "
-          << (unsigned int) type << " size is " << size
-          << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_MESSAGE
-
-MESSAGE_BEGIN_PARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  renderExtension -> data.free_picture.type = *(buffer + 1);
-
-  renderExtension -> data.free_picture.src_id = GetULONG(buffer + 4, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Parsed identity. Type is "
-          << (unsigned int) renderExtension -> data.free_picture.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_PARSE_IDENTITY
-
-MESSAGE_BEGIN_UNPARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  *(buffer + 1) = renderExtension -> data.free_picture.type;
-
-  PutULONG(renderExtension -> data.free_picture.src_id, buffer + 4, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Unparsed identity. Type is "
-          << (unsigned int) renderExtension -> data.free_picture.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_UNPARSE_IDENTITY
-
-MESSAGE_BEGIN_IDENTITY_CHECKSUM
-{
-  md5_append(md5_state, buffer + 1, 3);
-}
-MESSAGE_END_IDENTITY_CHECKSUM
-
-MESSAGE_BEGIN_ENCODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
-  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeDiffCachedValue(renderExtension -> data.free_picture.src_id,
-                     clientCache -> renderLastId, 29,
-                         clientCache -> renderIdCache);
-
-  cachedRenderExtension -> data.free_picture.src_id =
-              renderExtension -> data.free_picture.src_id;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded update. Type is "
-          << (unsigned int) renderExtension -> data.free_picture.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_UPDATE
-
-MESSAGE_BEGIN_DECODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeDiffCachedValue(renderExtension -> data.free_picture.src_id,
-                     clientCache -> renderLastId, 29,
-                         clientCache -> renderIdCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded update. Type is "
-          << (unsigned int) renderExtension -> data.free_picture.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_UPDATE
diff --git a/nxcomp/RenderFreePictureCompat.h b/nxcomp/RenderFreePictureCompat.h
deleted file mode 100644
index 32d613ae0..000000000
--- a/nxcomp/RenderFreePictureCompat.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2010 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      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef RenderFreePictureCompat_H
-#define RenderFreePictureCompat_H
-
-//
-// Define the characteristics
-// of this message class here.
-//
-
-#undef  MESSAGE_NAME
-#define MESSAGE_NAME          "RenderFreePictureCompat"
-
-#undef  MESSAGE_STORE
-#define MESSAGE_STORE         RenderFreePictureCompatStore
-
-#undef  MESSAGE_CLASS
-#define MESSAGE_CLASS         RenderMinorExtensionStore
-
-#undef  MESSAGE_METHODS
-#define MESSAGE_METHODS       "RenderMinorExtensionMethods.h"
-
-#undef  MESSAGE_HEADERS
-#define MESSAGE_HEADERS       "RenderMinorExtensionHeaders.h"
-
-#undef  MESSAGE_TAGS
-#define MESSAGE_TAGS          "RenderMinorExtensionTags.h"
-
-#undef  MESSAGE_OFFSET
-#define MESSAGE_OFFSET        8
-
-#undef  MESSAGE_HAS_SIZE
-#define MESSAGE_HAS_SIZE      0
-
-#undef  MESSAGE_HAS_DATA
-#define MESSAGE_HAS_DATA      0
-
-#undef  MESSAGE_HAS_FILTER
-#define MESSAGE_HAS_FILTER    0
-
-//
-// Declare the message class.
-//
-
-#include MESSAGE_HEADERS
-
-class MESSAGE_STORE : public MESSAGE_CLASS
-{
-  public:
-
-  virtual const char *name() const
-  {
-    return MESSAGE_NAME;
-  }
-
-  virtual int identitySize(const unsigned char *buffer,
-                               unsigned int size)
-  {
-    return MESSAGE_OFFSET;
-  }
-
-  #include MESSAGE_METHODS
-};
-
-#endif /* RenderFreePictureCompat_H */
diff --git a/nxcomp/RenderPictureClipCompat.cpp b/nxcomp/RenderPictureClipCompat.cpp
deleted file mode 100644
index 67d873008..000000000
--- a/nxcomp/RenderPictureClipCompat.cpp
+++ /dev/null
@@ -1,237 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2010 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      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
-//
-// Include the template for
-// this message class.
-//
-
-#include "RenderPictureClipCompat.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-#include MESSAGE_TAGS
-
-//
-// Message handling methods.
-//
-
-MESSAGE_BEGIN_ENCODE_SIZE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeCachedValue((size - MESSAGE_OFFSET) >> 2, 16,
-                     clientCache -> renderLengthCache, 5);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded size with value "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_SIZE
-
-MESSAGE_BEGIN_DECODE_SIZE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeCachedValue(size, 16,
-                     clientCache -> renderLengthCache, 5);
-
-  size = MESSAGE_OFFSET + (size << 2);
-
-  buffer = writeBuffer -> addMessage(size);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded size with value "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_SIZE
-
-MESSAGE_BEGIN_ENCODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeXidValue(GetULONG(buffer + 4, bigEndian),
-                     clientCache -> renderSrcPictureCache);
-
-  encodeBuffer.encodeDiffCachedValue(GetUINT(buffer + 8, bigEndian),
-                     clientCache -> renderLastX, 16,
-                         clientCache -> renderXCache, 11);
-
-  encodeBuffer.encodeDiffCachedValue(GetUINT(buffer + 10, bigEndian),
-                     clientCache -> renderLastY, 16,
-                         clientCache -> renderYCache, 11);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded message. Type is "
-          << (unsigned int) *(buffer + 1) << " size is "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_MESSAGE
-
-MESSAGE_BEGIN_DECODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  *(buffer + 1) = type;
-
-  decodeBuffer.decodeXidValue(value,
-                     clientCache -> renderSrcPictureCache);
-
-  PutULONG(value, buffer + 4, bigEndian);
-
-  decodeBuffer.decodeDiffCachedValue(value,
-                     clientCache -> renderLastX, 16,
-                         clientCache -> renderXCache, 11);
-
-  PutUINT(clientCache -> renderLastX, buffer + 8, bigEndian);
-
-  decodeBuffer.decodeDiffCachedValue(value,
-                     clientCache -> renderLastY, 16,
-                         clientCache -> renderYCache, 11);
-
-  PutUINT(clientCache -> renderLastY, buffer + 10, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded message. Type is "
-          << (unsigned int) type << " size is " << size
-          << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_MESSAGE
-
-MESSAGE_BEGIN_ENCODE_DATA
-{
-  encodeIntData(encodeBuffer, buffer, MESSAGE_OFFSET,
-                    size, bigEndian, channelCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded " << size - MESSAGE_OFFSET
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_DATA
-
-MESSAGE_BEGIN_DECODE_DATA
-{
-  decodeIntData(decodeBuffer, buffer, MESSAGE_OFFSET,
-                    size, bigEndian, channelCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded " << size - MESSAGE_OFFSET
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_DATA
-
-MESSAGE_BEGIN_PARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  renderExtension -> data.picture_clip.type = *(buffer + 1);
-
-  renderExtension -> data.picture_clip.src_id = GetULONG(buffer + 4,  bigEndian);
-
-  renderExtension -> data.picture_clip.src_x = GetUINT(buffer + 8,  bigEndian);
-  renderExtension -> data.picture_clip.src_y = GetUINT(buffer + 10, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Parsed identity. Type is "
-          << (unsigned int) renderExtension -> data.picture_clip.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_PARSE_IDENTITY
-
-MESSAGE_BEGIN_UNPARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  *(buffer + 1) = renderExtension -> data.picture_clip.type;
-
-  PutULONG(renderExtension -> data.picture_clip.src_id, buffer + 4,  bigEndian);
-
-  PutUINT(renderExtension -> data.picture_clip.src_x, buffer + 8,  bigEndian);
-  PutUINT(renderExtension -> data.picture_clip.src_y, buffer + 10, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Unparsed identity. Type is "
-          << (unsigned int) renderExtension -> data.picture_clip.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_UNPARSE_IDENTITY
-
-MESSAGE_BEGIN_IDENTITY_CHECKSUM
-{
-  md5_append(md5_state, buffer + 1,  3);
-  md5_append(md5_state, buffer + 8,  4);
-}
-MESSAGE_END_IDENTITY_CHECKSUM
-
-MESSAGE_BEGIN_ENCODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
-  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeXidValue(renderExtension -> data.picture_clip.src_id,
-                     clientCache -> renderSrcPictureCache);
-
-  cachedRenderExtension -> data.picture_clip.src_id =
-              renderExtension -> data.picture_clip.src_id;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded update. Type is "
-          << (unsigned int) renderExtension -> data.picture_clip.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_UPDATE
-
-MESSAGE_BEGIN_DECODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeXidValue(renderExtension -> data.picture_clip.src_id,
-                     clientCache -> renderSrcPictureCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded update. Type is "
-          << (unsigned int) renderExtension -> data.picture_clip.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_UPDATE
diff --git a/nxcomp/RenderPictureClipCompat.h b/nxcomp/RenderPictureClipCompat.h
deleted file mode 100644
index 05fc5cda8..000000000
--- a/nxcomp/RenderPictureClipCompat.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2010 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      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef RenderPictureClipCompat_H
-#define RenderPictureClipCompat_H
-
-//
-// Define the characteristics
-// of this message class here.
-//
-
-#undef  MESSAGE_NAME
-#define MESSAGE_NAME          "RenderPictureClipCompat"
-
-#undef  MESSAGE_STORE
-#define MESSAGE_STORE         RenderPictureClipCompatStore
-
-#undef  MESSAGE_CLASS
-#define MESSAGE_CLASS         RenderMinorExtensionStore
-
-#undef  MESSAGE_METHODS
-#define MESSAGE_METHODS       "RenderMinorExtensionMethods.h"
-
-#undef  MESSAGE_HEADERS
-#define MESSAGE_HEADERS       "RenderMinorExtensionHeaders.h"
-
-#undef  MESSAGE_TAGS
-#define MESSAGE_TAGS          "RenderMinorExtensionTags.h"
-
-#undef  MESSAGE_OFFSET
-#define MESSAGE_OFFSET        12
-
-#undef  MESSAGE_HAS_SIZE
-#define MESSAGE_HAS_SIZE      1
-
-#undef  MESSAGE_HAS_DATA
-#define MESSAGE_HAS_DATA      1
-
-#undef  MESSAGE_HAS_FILTER
-#define MESSAGE_HAS_FILTER    0
-
-//
-// Declare the message class.
-//
-
-#include MESSAGE_HEADERS
-
-class MESSAGE_STORE : public MESSAGE_CLASS
-{
-  public:
-
-  virtual const char *name() const
-  {
-    return MESSAGE_NAME;
-  }
-
-  virtual int identitySize(const unsigned char *buffer,
-                               unsigned int size)
-  {
-    return MESSAGE_OFFSET;
-  }
-
-  #include MESSAGE_METHODS
-};
-
-#endif /* RenderPictureClipCompat_H */
diff --git a/nxcomp/SetUnpackAlphaCompat.cpp b/nxcomp/SetUnpackAlphaCompat.cpp
deleted file mode 100644
index a8fcabdeb..000000000
--- a/nxcomp/SetUnpackAlphaCompat.cpp
+++ /dev/null
@@ -1,250 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2010 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      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
-#include "SetUnpackAlphaCompat.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-#include "WriteBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Constructors and destructors.
-//
-
-SetUnpackAlphaCompatStore::SetUnpackAlphaCompatStore(StaticCompressor *compressor)
-
-  : MessageStore(compressor)
-{
-  enableCache    = SETUNPACKALPHA_ENABLE_CACHE;
-  enableData     = SETUNPACKALPHA_ENABLE_DATA;
-  enableSplit    = SETUNPACKALPHA_ENABLE_SPLIT;
-  enableCompress = SETUNPACKALPHA_ENABLE_COMPRESS;
-
-  dataLimit  = SETUNPACKALPHA_DATA_LIMIT;
-  dataOffset = SETUNPACKALPHA_DATA_OFFSET;
-
-  cacheSlots          = SETUNPACKALPHA_CACHE_SLOTS;
-  cacheThreshold      = SETUNPACKALPHA_CACHE_THRESHOLD;
-  cacheLowerThreshold = SETUNPACKALPHA_CACHE_LOWER_THRESHOLD;
-
-  messages_ -> resize(cacheSlots);
-
-  for (T_messages::iterator i = messages_ -> begin();
-           i < messages_ -> end(); i++)
-  {
-    *i = NULL;
-  }
-
-  temporary_ = NULL;
-}
-
-SetUnpackAlphaCompatStore::~SetUnpackAlphaCompatStore()
-{
-  for (T_messages::iterator i = messages_ -> begin();
-           i < messages_ -> end(); i++)
-  {
-    destroy(*i);
-  }
-
-  destroy(temporary_);
-}
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int SetUnpackAlphaCompatStore::encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                                  const unsigned int size, int bigEndian,
-                                                      ChannelCache *channelCache) const
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Encoding full message identity.\n" << logofs_flush;
-  #endif
-
-  // Client.
-  encodeBuffer.encodeCachedValue(*(buffer + 1), 8,
-                     clientCache -> resourceCache);
-  // Entries.
-  encodeBuffer.encodeValue(GetULONG(buffer + 4, bigEndian), 32, 9);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Encoded full message identity.\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int SetUnpackAlphaCompatStore::decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                                                  unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
-                                                      ChannelCache *channelCache) const
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoding full message identity.\n" << logofs_flush;
-  #endif
-
-  unsigned int  value;
-  unsigned char cValue;
-
-  // Client.
-  decodeBuffer.decodeCachedValue(cValue, 8,
-                     clientCache -> resourceCache);
-  // Entries.
-  decodeBuffer.decodeValue(value, 32, 9);
-
-  size = RoundUp4(value) + 8;
-
-  buffer = writeBuffer -> addMessage(size);
-
-  *(buffer + 1) = cValue;
-
-  PutULONG(value, buffer + 4, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded full message identity.\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int SetUnpackAlphaCompatStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                                 unsigned int size, int bigEndian) const
-{
-  SetUnpackAlphaCompatMessage *setUnpackAlpha = (SetUnpackAlphaCompatMessage *) message;
-
-  setUnpackAlpha -> client = *(buffer + 1);
-
-  setUnpackAlpha -> entries = GetULONG(buffer + 4, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed identity for message at " << message << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int SetUnpackAlphaCompatStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                                   unsigned int size, int bigEndian) const
-{
-  SetUnpackAlphaCompatMessage *setUnpackAlpha = (SetUnpackAlphaCompatMessage *) message;
-
-  *(buffer + 1) = setUnpackAlpha -> client;
-
-  PutULONG(setUnpackAlpha -> entries, buffer + 4, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at " << message << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void SetUnpackAlphaCompatStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  SetUnpackAlphaCompatMessage *setUnpackAlpha = (SetUnpackAlphaCompatMessage *) message;
-
-  *logofs << name() << ": Identity client "
-          << (unsigned int) setUnpackAlpha -> client << " entries "
-          << setUnpackAlpha -> entries << " size "
-          << setUnpackAlpha -> size_ << ".\n";
-
-  #endif
-}
-
-void SetUnpackAlphaCompatStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                                     unsigned int size, int bigEndian) const
-{
-  md5_append(md5_state_, buffer + 4, 4);
-}
-
-void SetUnpackAlphaCompatStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                                   const Message *cachedMessage,
-                                                       ChannelCache *channelCache) const
-{
-  SetUnpackAlphaCompatMessage *setUnpackAlpha       = (SetUnpackAlphaCompatMessage *) message;
-  SetUnpackAlphaCompatMessage *cachedSetUnpackAlpha = (SetUnpackAlphaCompatMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeCachedValue(setUnpackAlpha -> client, 8,
-                     clientCache -> resourceCache);
-
-  cachedSetUnpackAlpha -> client = setUnpackAlpha -> client;
-
-  if (cachedSetUnpackAlpha -> entries != setUnpackAlpha -> entries)
-  {
-    #ifdef TEST
-    *logofs << name() << ": Encoding value " << setUnpackAlpha -> entries
-            << " as entries field.\n" << logofs_flush;
-    #endif
-
-    encodeBuffer.encodeBoolValue(1);
-
-    encodeBuffer.encodeValue(setUnpackAlpha -> entries, 32, 9);
-
-    cachedSetUnpackAlpha -> entries = setUnpackAlpha -> entries;
-  }
-  else
-  {
-    encodeBuffer.encodeBoolValue(0);
-  }
-}
-
-void SetUnpackAlphaCompatStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                                   ChannelCache *channelCache) const
-{
-  SetUnpackAlphaCompatMessage *setUnpackAlpha = (SetUnpackAlphaCompatMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  decodeBuffer.decodeCachedValue(setUnpackAlpha -> client, 8,
-                     clientCache -> resourceCache);
-
-  decodeBuffer.decodeBoolValue(value);
-
-  if (value)
-  {
-    decodeBuffer.decodeValue(value, 32, 9);
-
-    setUnpackAlpha -> entries = value;
-
-    #ifdef DEBUG
-    *logofs << name() << ": Decoded value " << setUnpackAlpha -> entries
-            << " as entries field.\n" << logofs_flush;
-    #endif
-  }
-}
diff --git a/nxcomp/SetUnpackAlphaCompat.h b/nxcomp/SetUnpackAlphaCompat.h
deleted file mode 100644
index 80d1522c0..000000000
--- a/nxcomp/SetUnpackAlphaCompat.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2010 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      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef SetUnpackAlphaCompat_H
-#define SetUnpackAlphaCompat_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define SETUNPACKALPHA_ENABLE_CACHE                       1
-#define SETUNPACKALPHA_ENABLE_DATA                        1
-#define SETUNPACKALPHA_ENABLE_SPLIT                       0
-#define SETUNPACKALPHA_ENABLE_COMPRESS                    1
-
-#define SETUNPACKALPHA_DATA_LIMIT                         16384
-#define SETUNPACKALPHA_DATA_OFFSET                        8
-
-#define SETUNPACKALPHA_CACHE_SLOTS                        2000
-#define SETUNPACKALPHA_CACHE_THRESHOLD                    10
-#define SETUNPACKALPHA_CACHE_LOWER_THRESHOLD              5
-
-//
-// The message class.
-//
-
-class SetUnpackAlphaCompatMessage : public Message
-{
-  friend class SetUnpackAlphaCompatStore;
-
-  public:
-
-  SetUnpackAlphaCompatMessage()
-  {
-  }
-
-  ~SetUnpackAlphaCompatMessage()
-  {
-  }
-
-  //
-  // Put here the fields which constitute 
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned char client;
-  unsigned int  entries;
-};
-
-class SetUnpackAlphaCompatStore : public MessageStore
-{
-  public:
-
-  SetUnpackAlphaCompatStore(StaticCompressor *compressor);
-
-  virtual ~SetUnpackAlphaCompatStore();
-
-  virtual const char *name() const
-  {
-    return "SetUnpackAlphaCompat";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_NXSetUnpackAlpha;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(SetUnpackAlphaCompatMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  protected:
-
-  virtual Message *create() const
-  {
-    return new SetUnpackAlphaCompatMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new SetUnpackAlphaCompatMessage((const SetUnpackAlphaCompatMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (SetUnpackAlphaCompatMessage *) message;
-  }
-
-  virtual int encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                 const unsigned int size, int bigEndian,
-                                     ChannelCache *channelCache) const;
-
-  virtual int decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                                 unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
-                                     ChannelCache *channelCache) const;
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* SetUnpackAlphaCompat_H */
diff --git a/nxcomp/SetUnpackColormapCompat.cpp b/nxcomp/SetUnpackColormapCompat.cpp
deleted file mode 100644
index 65b108a82..000000000
--- a/nxcomp/SetUnpackColormapCompat.cpp
+++ /dev/null
@@ -1,262 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2010 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      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
-#include "SetUnpackColormapCompat.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-#include "WriteBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Constructors and destructors.
-//
-
-SetUnpackColormapCompatStore::SetUnpackColormapCompatStore(StaticCompressor *compressor)
-
-  : MessageStore(compressor)
-{
-  enableCache    = SETUNPACKCOLORMAP_ENABLE_CACHE;
-  enableData     = SETUNPACKCOLORMAP_ENABLE_DATA;
-  enableSplit    = SETUNPACKCOLORMAP_ENABLE_SPLIT;
-  enableCompress = SETUNPACKCOLORMAP_ENABLE_COMPRESS;
-
-  dataLimit  = SETUNPACKCOLORMAP_DATA_LIMIT;
-  dataOffset = SETUNPACKCOLORMAP_DATA_OFFSET;
-
-  cacheSlots          = SETUNPACKCOLORMAP_CACHE_SLOTS;
-  cacheThreshold      = SETUNPACKCOLORMAP_CACHE_THRESHOLD;
-  cacheLowerThreshold = SETUNPACKCOLORMAP_CACHE_LOWER_THRESHOLD;
-
-  messages_ -> resize(cacheSlots);
-
-  for (T_messages::iterator i = messages_ -> begin();
-           i < messages_ -> end(); i++)
-  {
-    *i = NULL;
-  }
-
-  temporary_ = NULL;
-}
-
-SetUnpackColormapCompatStore::~SetUnpackColormapCompatStore()
-{
-  for (T_messages::iterator i = messages_ -> begin();
-           i < messages_ -> end(); i++)
-  {
-    destroy(*i);
-  }
-
-  destroy(temporary_);
-}
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int SetUnpackColormapCompatStore::encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                                     const unsigned int size, int bigEndian,
-                                                         ChannelCache *channelCache) const
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Encoding full message identity.\n" << logofs_flush;
-  #endif
-
-  // Client.
-  encodeBuffer.encodeCachedValue(*(buffer + 1), 8,
-                     clientCache -> resourceCache);
-  // Entries.
-  encodeBuffer.encodeValue(GetULONG(buffer + 4, bigEndian), 32, 9);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Encoded full message identity.\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int SetUnpackColormapCompatStore::decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                                                     unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
-                                                         ChannelCache *channelCache) const
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoding full message identity.\n" << logofs_flush;
-  #endif
-
-  unsigned int  value;
-  unsigned char cValue;
-
-  // Client.
-  decodeBuffer.decodeCachedValue(cValue, 8,
-                     clientCache -> resourceCache);
-  // Entries.
-  decodeBuffer.decodeValue(value, 32, 9);
-
-  size = (value << 2) + 8;
-
-  buffer = writeBuffer -> addMessage(size);
-
-  *(buffer + 1) = cValue;
-
-  PutULONG(value, buffer + 4, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded full message identity.\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int SetUnpackColormapCompatStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                                    unsigned int size, int bigEndian) const
-{
-  SetUnpackColormapCompatMessage *setUnpackColormap = (SetUnpackColormapCompatMessage *) message;
-
-  setUnpackColormap -> client = *(buffer + 1);
-
-  setUnpackColormap -> entries = GetULONG(buffer + 4, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed identity for message at " << message << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int SetUnpackColormapCompatStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                                      unsigned int size, int bigEndian) const
-{
-  SetUnpackColormapCompatMessage *setUnpackColormap = (SetUnpackColormapCompatMessage *) message;
-
-  *(buffer + 1) = setUnpackColormap -> client;
-
-  PutULONG(setUnpackColormap -> entries, buffer + 4, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at " << message << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void SetUnpackColormapCompatStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  SetUnpackColormapCompatMessage *setUnpackColormap = (SetUnpackColormapCompatMessage *) message;
-
-  *logofs << name() << ": Identity client "
-          << (unsigned int) setUnpackColormap -> client << " entries "
-          << setUnpackColormap -> entries << " size "
-          << setUnpackColormap -> size_ << ".\n";
-
-  #endif
-}
-
-void SetUnpackColormapCompatStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                                        unsigned int size, int bigEndian) const
-{
-  md5_append(md5_state_, buffer + 4, 4);
-}
-
-void SetUnpackColormapCompatStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                                      const Message *cachedMessage,
-                                                          ChannelCache *channelCache) const
-{
-  SetUnpackColormapCompatMessage *setUnpackColormap       = (SetUnpackColormapCompatMessage *) message;
-  SetUnpackColormapCompatMessage *cachedSetUnpackColormap = (SetUnpackColormapCompatMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value "
-          << (unsigned int) setUnpackColormap -> client
-          << " as client field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeCachedValue(setUnpackColormap -> client, 8,
-                     clientCache -> resourceCache);
-
-  cachedSetUnpackColormap -> client = setUnpackColormap -> client;
-
-  if (cachedSetUnpackColormap -> entries != setUnpackColormap -> entries)
-  {
-    #ifdef TEST
-    *logofs << name() << ": Encoding value " << setUnpackColormap -> entries
-            << " as entries field.\n" << logofs_flush;
-    #endif
-
-    encodeBuffer.encodeBoolValue(1);
-
-    encodeBuffer.encodeValue(setUnpackColormap -> entries, 32, 9);
-
-    cachedSetUnpackColormap -> entries = setUnpackColormap -> entries;
-  }
-  else
-  {
-    encodeBuffer.encodeBoolValue(0);
-  }
-}
-
-void SetUnpackColormapCompatStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                                      ChannelCache *channelCache) const
-{
-  SetUnpackColormapCompatMessage *setUnpackColormap = (SetUnpackColormapCompatMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  decodeBuffer.decodeCachedValue(setUnpackColormap -> client, 8,
-                     clientCache -> resourceCache);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value "
-          << (unsigned int) setUnpackColormap -> client
-          << " as client field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeBoolValue(value);
-
-  if (value)
-  {
-    decodeBuffer.decodeValue(value, 32, 9);
-
-    setUnpackColormap -> entries = value;
-
-    #ifdef DEBUG
-    *logofs << name() << ": Decoded value " << setUnpackColormap -> entries
-            << " as entries field.\n" << logofs_flush;
-    #endif
-  }
-}
diff --git a/nxcomp/SetUnpackColormapCompat.h b/nxcomp/SetUnpackColormapCompat.h
deleted file mode 100644
index d1ffad876..000000000
--- a/nxcomp/SetUnpackColormapCompat.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2010 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      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef SetUnpackColormapCompat_H
-#define SetUnpackColormapCompat_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define SETUNPACKCOLORMAP_ENABLE_CACHE                       1
-#define SETUNPACKCOLORMAP_ENABLE_DATA                        1
-#define SETUNPACKCOLORMAP_ENABLE_SPLIT                       1
-#define SETUNPACKCOLORMAP_ENABLE_COMPRESS                    1
-
-#define SETUNPACKCOLORMAP_DATA_LIMIT                         4096
-#define SETUNPACKCOLORMAP_DATA_OFFSET                        8
-
-#define SETUNPACKCOLORMAP_CACHE_SLOTS                        2000
-#define SETUNPACKCOLORMAP_CACHE_THRESHOLD                    5
-#define SETUNPACKCOLORMAP_CACHE_LOWER_THRESHOLD              0
-
-//
-// The message class.
-//
-
-class SetUnpackColormapCompatMessage : public Message
-{
-  friend class SetUnpackColormapCompatStore;
-
-  public:
-
-  SetUnpackColormapCompatMessage()
-  {
-  }
-
-  ~SetUnpackColormapCompatMessage()
-  {
-  }
-
-  //
-  // Put here the fields which constitute 
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned char client;
-  unsigned int  entries;
-};
-
-class SetUnpackColormapCompatStore : public MessageStore
-{
-  public:
-
-  SetUnpackColormapCompatStore(StaticCompressor *compressor);
-
-  virtual ~SetUnpackColormapCompatStore();
-
-  virtual const char *name() const
-  {
-    return "SetUnpackColormapCompat";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_NXSetUnpackColormap;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(SetUnpackColormapCompatMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  protected:
-
-  virtual Message *create() const
-  {
-    return new SetUnpackColormapCompatMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new SetUnpackColormapCompatMessage((const SetUnpackColormapCompatMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (SetUnpackColormapCompatMessage *) message;
-  }
-
-  virtual int encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                 const unsigned int size, int bigEndian,
-                                     ChannelCache *channelCache) const;
-
-  virtual int decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                                 unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
-                                     ChannelCache *channelCache) const;
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* SetUnpackColormapCompat_H */
-- 
cgit v1.2.3


From 5c495241069708e9b1bbf6e57fd49599be540b63 Mon Sep 17 00:00:00 2001
From: Fernando Carvajal <fcarvajal@qindel.com>
Date: Fri, 15 Apr 2016 09:49:09 +0200
Subject: Remove TextCompressor class and files from nxcomp

This commit removes TextCompressor class references from ClientCache
and ServerCache as it's no longer used after removing old protocol's
compatibility code from nxcomp. It also removes the attribute textCache
from both classes as it's no longer used either.

Finally the header and source files associated with the TextCompressor
class are also deleted and removed from the compilation process.

Refs: ArcticaProject/nx-libs#108
---
 debian/copyright.in       |  2 --
 nxcomp/ChannelCache.h     |  7 -----
 nxcomp/ClientCache.cpp    |  2 --
 nxcomp/ClientCache.h      |  5 ---
 nxcomp/Makefile.in        |  1 -
 nxcomp/ServerCache.h      |  2 --
 nxcomp/TextCompressor.cpp | 77 -----------------------------------------------
 nxcomp/TextCompressor.h   | 49 ------------------------------
 8 files changed, 145 deletions(-)
 delete mode 100644 nxcomp/TextCompressor.cpp
 delete mode 100644 nxcomp/TextCompressor.h

(limited to 'nxcomp')

diff --git a/debian/copyright.in b/debian/copyright.in
index 8f85b292f..4ffde0ba0 100644
--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -1131,8 +1131,6 @@ Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h
  nxcomp/StaticCompressor.h
  nxcomp/Statistics.cpp
  nxcomp/Statistics.h
- nxcomp/TextCompressor.cpp
- nxcomp/TextCompressor.h
  nxcomp/Timestamp.cpp
  nxcomp/Timestamp.h
  nxcomp/TranslateCoords.cpp
diff --git a/nxcomp/ChannelCache.h b/nxcomp/ChannelCache.h
index 7b94893b6..c810a0b96 100644
--- a/nxcomp/ChannelCache.h
+++ b/nxcomp/ChannelCache.h
@@ -18,13 +18,6 @@
 #ifndef ChannelCache_H
 #define ChannelCache_H
 
-//
-// Elements in array of caches used in TextCompressor.
-//
-
-const unsigned int CLIENT_TEXT_CACHE_SIZE = 9999;
-const unsigned int SERVER_TEXT_CACHE_SIZE = 9999;
-
 //
 // Sizes of optional fields for ConfigureWindow
 // request.
diff --git a/nxcomp/ClientCache.cpp b/nxcomp/ClientCache.cpp
index ec37c69f6..49dc4ece5 100644
--- a/nxcomp/ClientCache.cpp
+++ b/nxcomp/ClientCache.cpp
@@ -100,8 +100,6 @@ ClientCache::ClientCache() :
 
   renderLastId(0),
 
-  renderTextCompressor(textCache, CLIENT_TEXT_CACHE_SIZE),
-
   renderGlyphXCache(16), renderGlyphYCache(16),
   renderGlyphX(0), renderGlyphY(0),
 
diff --git a/nxcomp/ClientCache.h b/nxcomp/ClientCache.h
index 3fa59f642..9ac263c71 100644
--- a/nxcomp/ClientCache.h
+++ b/nxcomp/ClientCache.h
@@ -26,8 +26,6 @@
 #include "XidCache.h"
 #include "FreeCache.h"
 
-#include "TextCompressor.h"
-
 #include "ChannelCache.h"
 
 class ClientCache : public ChannelCache
@@ -61,7 +59,6 @@ class ClientCache : public ChannelCache
   // General-purpose caches.
   //
 
-  CharCache textCache[CLIENT_TEXT_CACHE_SIZE];
   IntCache cursorCache;
   IntCache colormapCache;
   IntCache visualCache;
@@ -383,8 +380,6 @@ class ClientCache : public ChannelCache
 
   IntCache *renderDataCache[16];
 
-  TextCompressor renderTextCompressor;
-
   IntCache renderGlyphXCache;
   IntCache renderGlyphYCache;
 
diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in
index 93b644079..c2cdceead 100644
--- a/nxcomp/Makefile.in
+++ b/nxcomp/Makefile.in
@@ -165,7 +165,6 @@ CXXSRC = Loop.cpp 				\
 	 BlockCache.cpp				\
 	 BlockCacheSet.cpp			\
 	 StaticCompressor.cpp			\
-	 TextCompressor.cpp			\
 	 Unpack.cpp				\
 	 Alpha.cpp				\
 	 Colormap.cpp				\
diff --git a/nxcomp/ServerCache.h b/nxcomp/ServerCache.h
index 0968e235c..2287501bf 100644
--- a/nxcomp/ServerCache.h
+++ b/nxcomp/ServerCache.h
@@ -23,7 +23,6 @@
 #include "IntCache.h"
 #include "CharCache.h"
 #include "OpcodeCache.h"
-#include "TextCompressor.h"
 #include "BlockCache.h"
 #include "BlockCacheSet.h"
 
@@ -47,7 +46,6 @@ class ServerCache : public ChannelCache
   // General-purpose caches.
   //
 
-  CharCache textCache[SERVER_TEXT_CACHE_SIZE];
   IntCache replySequenceCache;
   IntCache eventSequenceCache;
   unsigned int lastTimestamp;
diff --git a/nxcomp/TextCompressor.cpp b/nxcomp/TextCompressor.cpp
deleted file mode 100644
index 16131222c..000000000
--- a/nxcomp/TextCompressor.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2010 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      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
-#include "TextCompressor.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-//
-// The compression obtained by this class is
-// very poor. In newer versions the text is
-// simply appended to the encode buffer and
-// compressed by leveraging the final stream
-// compression.
-//
-
-void
-TextCompressor::encodeChar(unsigned char ch, EncodeBuffer& encodeBuffer)
-{
-  // encode each successive character of text using
-  // a predictive model where most of the last 3 characters
-  // (low order 7 bits of the previous character, plus the
-  // low order 5 bits of the character before that, plus
-  // the low order 3 bits of the character before that)
-  // are used to find the right cache...
-
-  CharCache& cache =  cache_[key_ % cacheSize_];
-  if ((key_ >= 128) && (cache.getSize() == 0))
-  {
-    // 3rd-order model doesn't have any statistics yet,
-    // so use the 1st-order one instead
-    CharCache& cache2 =  cache_[(key_ & 0x7f) % cacheSize_];
-    encodeBuffer.encodeCachedValue((unsigned int) ch, 8, cache2);
-    cache.insert(ch);
-  }
-  else
-  {
-    encodeBuffer.encodeCachedValue((unsigned int) ch, 8, cache);
-  }
-
-  key_ = (((key_ & 0x1f) << 7) | ((key_ & 0x380) << 5) | (ch & 0x7f));
-}
-
-
-unsigned char
-TextCompressor::decodeChar(DecodeBuffer& decodeBuffer)
-{
-  unsigned char nextChar;
-  CharCache& cache =  cache_[key_ % cacheSize_];
-  if ((key_ >= 128) && (cache.getSize() == 0))
-  {
-    CharCache& cache2 =  cache_[(key_ & 0x7f) % cacheSize_];
-    decodeBuffer.decodeCachedValue(nextChar, 8, cache2);
-    cache.insert(nextChar);
-  }
-  else
-  {
-    decodeBuffer.decodeCachedValue(nextChar, 8, cache);
-  }
-
-  key_ = (((key_ & 0x1f) << 7) | ((key_ & 0x380) << 5) | (nextChar & 0x7f));
-  return nextChar;
-}
diff --git a/nxcomp/TextCompressor.h b/nxcomp/TextCompressor.h
deleted file mode 100644
index b373b98b8..000000000
--- a/nxcomp/TextCompressor.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2010 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      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef TextCompressor_H
-#define TextCompressor_H
-
-#include "CharCache.h"
-
-class EncodeBuffer;
-class DecodeBuffer;
-
-class TextCompressor
-{
- public:
-  TextCompressor(CharCache* cache, unsigned int cacheSize):
-    cache_(cache),
-    cacheSize_(cacheSize),
-    key_(0)
-  {
-  }
-
-  void encodeChar(unsigned char ch, EncodeBuffer &);
-  unsigned char decodeChar(DecodeBuffer &);
-  void reset(unsigned int newKey = 0)
-  {
-    key_ = newKey;
-  }
-
- private:
-  CharCache* cache_;
-  unsigned int cacheSize_;
-  unsigned int key_;
-};
-
-#endif /* TextCompressor_H */
-- 
cgit v1.2.3


From 7d053959f6ce971d15914dab32de5e145e0f10dc Mon Sep 17 00:00:00 2001
From: Salvador Fandino <sfandino@yahoo.com>
Date: Wed, 20 Apr 2016 15:46:16 +0200
Subject: Fix copyright notice in nxcomp/Version.c

It was GPL3 instead of GPL2!

Fixes ArcticaProject/nx-libs#112
---
 nxcomp/Version.c | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Version.c b/nxcomp/Version.c
index 2b431532b..ff1793434 100644
--- a/nxcomp/Version.c
+++ b/nxcomp/Version.c
@@ -1,31 +1,22 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (C) 2014 Qindel http://qindel.com and QVD http://theqvd.com  */
+/* Copyright (c) 2015 Qindel Formacion y Servicios SL.                    */
 /*                                                                        */
 /* This program is free software; you can redistribute it and/or modify   */
-/* it under the terms of the GNU General Public License as published by   */
-/* the Free Software Foundation; either version 3 of the License, or (at  */
-/* your option) any later version.                                        */
+/* it under the terms of the GNU General Public License Version 2, as     */
+/* published by the Free Software Foundation.                             */
 /*                                                                        */
 /* This program is distributed in the hope that it will be useful, but    */
-/* WITHOUT ANY WARRANTY; without even the implied warranty of             */
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                   */
-/* See the GNU General Public License for more details.                   */
+/* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTA-  */
+/* BILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General       */
+/* Public License for more details.                                       */
 /*                                                                        */
 /* You should have received a copy of the GNU General Public License      */
-/* along with this program; if not, see <http://www.gnu.org/licenses>.    */
-/*                                                                        */
-/* Additional permission under GNU GPL version 3 section 7                */
-/*                                                                        */
-/* If you modify this Program, or any covered work, by linking or         */
-/* combining it with [name of library] (or a modified version of that     */
-/* library), containing parts covered by the terms of [name of library's  */
-/* license], the licensors of this Program grant you additional           */
-/* permission to convey the resulting work. {Corresponding Source for a   */
-/* non-source form of such a combination shall include the source code    */
-/* for the parts of [name of library] used as well as that of the covered */
-/* work.}                                                                 */
+/* along with this program; if not, you can request a copy from Qindel    */
+/* or write to the Free Software Foundation, Inc., 51 Franklin Street,    */
+/* Fifth Floor, Boston, MA 02110-1301 USA.                                */
 /*                                                                        */
+/* All rights reserved.                                                   */
 /*                                                                        */
 /**************************************************************************/
 
-- 
cgit v1.2.3


From a436cba04834da945d4a2be5335d1d7e95c6bf08 Mon Sep 17 00:00:00 2001
From: Fernando Carvajal <fcarvajal@qindel.com>
Date: Mon, 25 Apr 2016 12:53:00 +0200
Subject: Clean up compiler warnings in nxcomp
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit removes several warnings in nxcomp related to unused but
set variables. It also replaces tempnam function with the more secure
one mkstemp and there has been removed another warning related to
setgid and setuid returning values not being checked.

So these were the compiler warnings in nxcomp that have been fixed:

Loop.cpp: In function ‘int ParseRemoteOptions(char*)’:
Loop.cpp:9423:7: warning: variable ‘hasLimit’ set but not used [-Wunused-but-set-variable]
   int hasLimit  = 0;
       ^
Loop.cpp:9424:7: warning: variable ‘hasRender’ set but not used [-Wunused-but-set-variable]
   int hasRender = 0;
       ^
Loop.cpp:9425:7: warning: variable ‘hasTaint’ set but not used [-Wunused-but-set-variable]
   int hasTaint  = 0;
       ^
Loop.cpp:9427:7: warning: variable ‘hasStrict’ set but not used [-Wunused-but-set-variable]
   int hasStrict = 0;
       ^
Loop.cpp:9428:7: warning: variable ‘hasShseg’ set but not used [-Wunused-but-set-variable]
   int hasShseg  = 0;
       ^
ServerChannel.cpp: In member function ‘virtual int ServerChannel::handleWrite(const unsigned char*, unsigned int)’:
ServerChannel.cpp:2132:9: warning: variable ‘hit’ set but not used [-Wunused-but-set-variable]
     int hit;
         ^
Proxy.o: In function `Proxy::handleSaveAllStores(char const*) const':
Proxy.cpp:(.text+0x2cac): warning: the use of `tempnam' is dangerous, better use `mkstemp'

Pipe.cpp: In function ‘FILE* Popen(char* const*, const char*)’:
Pipe.cpp:240:23: warning: ignoring return value of ‘int setgid(__gid_t)’,
declared with attribute warn_unused_result [-Wunused-result]
       setgid(getgid());
                       ^
Pipe.cpp:241:23: warning: ignoring return value of ‘int setuid(__uid_t)’,
declared with attribute warn_unused_result [-Wunused-result]
       setuid(getuid());
                       ^

There was also a hidden problem in the way Proxy::handleSaveAllStores was
checking for an error in the returning value from the call to the virtual
method handleSaveAllStores of the specific proxy class really being used
(ClientProxy or ServerProxy).

Former code was considering the value 0 as the returning value in case of
an error whereas both subclasses return the value -1 when there is an error
in their handleSaveAllStores method.

This bug has been fixed in this commit taking advantage of the modification
that was already being made to this method in order to replace tempnam
function with the more secure one mkstemp.

Fixes: ArcticaProject/nx-libs#103
---
 nxcomp/Loop.cpp          |  10 ----
 nxcomp/Pipe.cpp          |  10 +++-
 nxcomp/Proxy.cpp         | 150 ++++++++++++++++++++++++++++++++---------------
 nxcomp/Proxy.h           |   2 +-
 nxcomp/ServerChannel.cpp |  18 ++++++
 5 files changed, 129 insertions(+), 61 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 0f9fec6ef..a60bfc9ae 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -9393,12 +9393,7 @@ int ParseRemoteOptions(char *opts)
   int hasDelta  = 0;
   int hasStream = 0;
   int hasData   = 0;
-  int hasLimit  = 0;
-  int hasRender = 0;
-  int hasTaint  = 0;
   int hasType   = 0;
-  int hasStrict = 0;
-  int hasShseg  = 0;
 
   //
   // Get rid of the terminating space.
@@ -9623,7 +9618,6 @@ int ParseRemoteOptions(char *opts)
         }
       }
 
-      hasLimit = 1;
     }
     else if (strcasecmp(name, "render") == 0)
     {
@@ -9636,7 +9630,6 @@ int ParseRemoteOptions(char *opts)
         useRender = ValidateArg("remote", name, value);
       }
 
-      hasRender = 1;
     }
     else if (strcasecmp(name, "taint") == 0)
     {
@@ -9649,7 +9642,6 @@ int ParseRemoteOptions(char *opts)
         useTaint = ValidateArg("remote", name, value);
       }
 
-      hasTaint = 1;
     }
     else if (strcasecmp(name, "type") == 0)
     {
@@ -9682,7 +9674,6 @@ int ParseRemoteOptions(char *opts)
         useStrict = ValidateArg("remote", name, value);
       }
 
-      hasStrict = 1;
     }
     else if (strcasecmp(name, "shseg") == 0)
     {
@@ -9704,7 +9695,6 @@ int ParseRemoteOptions(char *opts)
         return -1;
       }
 
-      hasShseg = 1;
     }
     else if (strcasecmp(name, "delta") == 0)
     {
diff --git a/nxcomp/Pipe.cpp b/nxcomp/Pipe.cpp
index aacbbaeb3..15c7a31b3 100644
--- a/nxcomp/Pipe.cpp
+++ b/nxcomp/Pipe.cpp
@@ -237,8 +237,14 @@ FILE *Popen(char * const parameters[], const char *type)
 
       struct passwd *pwent = getpwuid(getuid());
       if (pwent) initgroups(pwent->pw_name,getgid());
-      setgid(getgid());
-      setuid(getuid());
+      if (setgid(getgid()) == -1)
+      {
+        _exit(127);
+      }
+      if (setuid(getuid()) == -1)
+      {
+        _exit(127);
+      }
 
       if (*type == 'r')
       {
diff --git a/nxcomp/Proxy.cpp b/nxcomp/Proxy.cpp
index ae115fede..7655ccb40 100644
--- a/nxcomp/Proxy.cpp
+++ b/nxcomp/Proxy.cpp
@@ -18,6 +18,7 @@
 #include <cstdio>
 #include <unistd.h>
 #include <cstdlib>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #ifdef ANDROID
@@ -4194,6 +4195,12 @@ int Proxy::handleSaveStores()
 
   char *cacheToAdopt = NULL;
 
+  //
+  // Set to false the indicator for cumulative store
+  // size too small
+  //
+  bool isTooSmall = false;
+
   if (control -> PersistentCacheEnableSave)
   {
     #ifdef TEST
@@ -4201,7 +4208,7 @@ int Proxy::handleSaveStores()
             << logofs_flush;
     #endif
 
-    cacheToAdopt = handleSaveAllStores(control -> PersistentCachePath);
+    cacheToAdopt = handleSaveAllStores(control -> PersistentCachePath, isTooSmall);
   }
   #ifdef TEST
   else
@@ -4253,21 +4260,28 @@ int Proxy::handleSaveStores()
 
     return 1;
   }
-  #ifdef TEST
   else
   {
-    *logofs << "Proxy: No cache file produced from message stores.\n"
-            << logofs_flush;
-  }
-  #endif
+    #ifdef TEST
+      *logofs << "Proxy: No cache file produced from message stores.\n"
+              << logofs_flush;
+    #endif
 
-  //
-  // It can be that we didn't generate a new cache
-  // because store was too small or persistent cache
-  // was disabled. This is not an error.
-  //
+    //
+    // It can be that we didn't generate a new cache
+    // because store was too small or persistent cache
+    // was disabled. This is not an error.
+    //
 
-  return 0;
+    if (control -> PersistentCacheEnableSave && !isTooSmall)
+    {
+      return -1;
+    }
+    else
+    {
+      return 0;
+    }
+  }
 }
 
 int Proxy::handleLoadStores()
@@ -4875,8 +4889,10 @@ int Proxy::handleLoadVersion(const unsigned char *buffer, int &major,
   return 1;
 }
 
-char *Proxy::handleSaveAllStores(const char *savePath) const
+char *Proxy::handleSaveAllStores(const char *savePath, bool & isTooSmall) const
 {
+  isTooSmall = false;
+
   int cumulativeSize = MessageStore::getCumulativeTotalStorageSize();
 
   if (cumulativeSize < control -> PersistentCacheThreshold)
@@ -4888,6 +4904,13 @@ char *Proxy::handleSaveAllStores(const char *savePath) const
             << ".\n" << logofs_flush;
     #endif
 
+    //
+    // Cumulative store size is smaller than threshold
+    // so the indicator is set to true
+    //
+
+    isTooSmall = true;
+
     return NULL;
   }
   else if (savePath == NULL)
@@ -4923,20 +4946,28 @@ char *Proxy::handleSaveAllStores(const char *savePath) const
   md5_state_t *md5StateClient = NULL;
   md5_byte_t  *md5DigestClient = NULL;
 
-  char *tempName = NULL;
-
   char md5String[MD5_LENGTH * 2 + 2];
 
   char fullName[strlen(savePath) + MD5_LENGTH * 2 + 4];
 
-  if (control -> ProxyMode == proxy_client)
-  {
-    tempName = tempnam(savePath, "Z-C-");
-  }
-  else
-  {
-    tempName = tempnam(savePath, "Z-S-");
-  }
+  //
+  // Prepare the template for the temporary file
+  //
+
+  const char* const uniqueTemplate = "XXXXXX";
+  char tempName[strlen(savePath) + strlen("/") + 4 + strlen(uniqueTemplate) + 1];
+
+  snprintf(tempName, sizeof tempName, "%s/%s%s",
+               savePath,
+               control -> ProxyMode == proxy_client ?
+                   "Z-C-" :
+                   "Z-S-",
+               uniqueTemplate);
+
+  #ifdef TEST
+  *logofs << "Proxy: Generating temporary file with template '"
+          << tempName << "'.\n" << logofs_flush;
+  #endif
 
   //
   // Change the mask to make the file only
@@ -4946,35 +4977,68 @@ char *Proxy::handleSaveAllStores(const char *savePath) const
 
   mode_t fileMode = umask(0077);
 
-  cachefs = new ofstream(tempName, ios::out | ios::binary);
-
-  umask(fileMode);
+  //
+  // Generate a unique temporary filename from tempName
+  // and then create and open the file
+  //
 
-  if (tempName == NULL || cachefs == NULL)
+  int fdTemp = mkstemp(tempName);
+  if (fdTemp == -1)
   {
     #ifdef PANIC
     *logofs << "Proxy: PANIC! Can't create temporary file in '"
-            << savePath << "'.\n" << logofs_flush;
+            << savePath << "'. Cause = " << strerror(errno) << ".\n" << logofs_flush;
     #endif
 
     cerr << "Error" << ": Can't create temporary file in '"
-         << savePath << "'.\n";
+         << savePath << "'. Cause = " << strerror(errno) << ".\n";
 
-    if (tempName != NULL)
-    {
-      free(tempName);
-    }
+    umask(fileMode);
 
-    if (cachefs != NULL)
-    {
-      delete cachefs;
-    }
+    EnableSignals();
+
+    return NULL;
+  }
+
+  #ifdef TEST
+  *logofs << "Proxy: Saving cache to file '"
+          << tempName << "'.\n" << logofs_flush;
+  #endif
+
+  //
+  // Create and open the output stream for the new temporary
+  // file
+  //
+
+  cachefs = new (std::nothrow) ofstream(tempName, ios::out | ios::binary);
+  if ((cachefs == NULL) || cachefs->fail())
+  {
+    #ifdef PANIC
+    *logofs << "Proxy: PANIC! Can't create stream for temporary file '"
+            << tempName << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Can't create stream for temporary file '"
+         << tempName << "'.\n";
+
+    close(fdTemp);
+    unlink(tempName);
+
+    umask(fileMode);
 
     EnableSignals();
 
     return NULL;
   }
 
+  //
+  // Close the file descriptor returned by mkstemp
+  // and restore the old mask
+  //
+
+  close(fdTemp);
+  umask(fileMode);
+
   md5StateStream  = new md5_state_t();
   md5DigestStream = new md5_byte_t[MD5_LENGTH];
 
@@ -5007,8 +5071,6 @@ char *Proxy::handleSaveAllStores(const char *savePath) const
     delete md5StateStream;
     delete [] md5DigestStream;
 
-    free(tempName);
-
     EnableSignals();
 
     return NULL;
@@ -5029,8 +5091,6 @@ char *Proxy::handleSaveAllStores(const char *savePath) const
     delete md5StateStream;
     delete [] md5DigestStream;
 
-    free(tempName);
-
     EnableSignals();
 
     return NULL;
@@ -5086,7 +5146,7 @@ char *Proxy::handleSaveAllStores(const char *savePath) const
 
   #endif
 
-  if (allSaved == 0)
+  if (allSaved == -1)
   {
     handleFailOnSave(tempName, "C");
 
@@ -5098,8 +5158,6 @@ char *Proxy::handleSaveAllStores(const char *savePath) const
     delete md5StateClient;
     delete [] md5DigestClient;
 
-    free(tempName);
-
     EnableSignals();
 
     return NULL;
@@ -5139,8 +5197,6 @@ char *Proxy::handleSaveAllStores(const char *savePath) const
     delete md5StateClient;
     delete [] md5DigestClient;
 
-    free(tempName);
-
     EnableSignals();
 
     return NULL;
@@ -5181,8 +5237,6 @@ char *Proxy::handleSaveAllStores(const char *savePath) const
   delete md5StateClient;
   delete [] md5DigestClient;
 
-  free(tempName);
-
   //
   // Restore the original handlers.
   //
diff --git a/nxcomp/Proxy.h b/nxcomp/Proxy.h
index 2f3be7596..c0fdfcce9 100644
--- a/nxcomp/Proxy.h
+++ b/nxcomp/Proxy.h
@@ -985,7 +985,7 @@ class Proxy
   int handleLoadStores();
   int handleSaveStores();
 
-  char *handleSaveAllStores(const char *savePath) const;
+  char *handleSaveAllStores(const char *savePath, bool & isTooSmall) const;
 
   virtual int handleSaveAllStores(ostream *cachefs, md5_state_t *md5StateStream,
                                       md5_state_t *md5StateClient) const = 0;
diff --git a/nxcomp/ServerChannel.cpp b/nxcomp/ServerChannel.cpp
index e0bd2132f..ee39903a7 100644
--- a/nxcomp/ServerChannel.cpp
+++ b/nxcomp/ServerChannel.cpp
@@ -4373,6 +4373,24 @@ int ServerChannel::handleWrite(const unsigned char *message, unsigned int length
         }
       } // End of switch on opcode.
 
+      //
+      // TODO: at the moment the variable hit was being set
+      // but no used, so to avoid the corresponding warning
+      // it has been added this block with a logging command.
+      // This code will be probably optimized away when none
+      // of the defines is set, but if there is no additional
+      // use for the hit variable in the future, then maybe
+      // it could be removed completely.
+      //
+
+      if (hit)
+      {
+        #if defined(TEST) || defined(OPCODES)
+        *logofs << "handleWrite: Cached flag enabled in handled request.\n"
+                << logofs_flush;
+        #endif
+      }
+
       //
       // A packed image request can generate more than just
       // a single X_PutImage. Write buffer is handled inside
-- 
cgit v1.2.3


From b326eda7328e95200f7d70efde35ce51a14bab3d Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 27 Apr 2016 13:56:55 +0200
Subject: nxcomp: Rephrase comment in previous commit.

---
 nxcomp/ServerChannel.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/ServerChannel.cpp b/nxcomp/ServerChannel.cpp
index ee39903a7..ed2f472c7 100644
--- a/nxcomp/ServerChannel.cpp
+++ b/nxcomp/ServerChannel.cpp
@@ -4375,9 +4375,9 @@ int ServerChannel::handleWrite(const unsigned char *message, unsigned int length
 
       //
       // TODO: at the moment the variable hit was being set
-      // but no used, so to avoid the corresponding warning
-      // it has been added this block with a logging command.
-      // This code will be probably optimized away when none
+      // but not used, so to avoid the corresponding warning
+      // this logging block has been added.
+      // This code will probably be optimized away when none
       // of the defines is set, but if there is no additional
       // use for the hit variable in the future, then maybe
       // it could be removed completely.
-- 
cgit v1.2.3


From 3713346f3959782c5e5d1ddd0252f25fb319d732 Mon Sep 17 00:00:00 2001
From: Salvador Fandino <sfandino@yahoo.com>
Date: Wed, 20 Apr 2016 16:22:56 +0200
Subject: Provide support for channel endpoints being UNIX file sockets in
 addition to being TCP/IP sockets.

---
 nxcomp/ChannelEndPoint.cpp | 245 +++++++++++++++++++++
 nxcomp/ChannelEndPoint.h   |  61 ++++++
 nxcomp/ClientProxy.cpp     |  13 +-
 nxcomp/ClientProxy.h       |   7 +-
 nxcomp/Loop.cpp            | 528 +++++++++++++++++++++------------------------
 nxcomp/Makefile.in         |   1 +
 nxcomp/Proxy.cpp           |  35 ++-
 nxcomp/Proxy.h             |  17 +-
 nxcomp/ServerProxy.cpp     |  25 ++-
 nxcomp/ServerProxy.h       |  17 +-
 10 files changed, 634 insertions(+), 315 deletions(-)
 create mode 100644 nxcomp/ChannelEndPoint.cpp
 create mode 100644 nxcomp/ChannelEndPoint.h

(limited to 'nxcomp')

diff --git a/nxcomp/ChannelEndPoint.cpp b/nxcomp/ChannelEndPoint.cpp
new file mode 100644
index 000000000..cb35e52d2
--- /dev/null
+++ b/nxcomp/ChannelEndPoint.cpp
@@ -0,0 +1,245 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2015 Qindel Formacion y Servicios SL.                    */
+/*                                                                        */
+/* This program is free software; you can redistribute it and/or modify   */
+/* it under the terms of the GNU General Public License Version 2, as     */
+/* published by the Free Software Foundation.                             */
+/*                                                                        */
+/* This program is distributed in the hope that it will be useful, but    */
+/* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTA-  */
+/* BILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General       */
+/* Public License for more details.                                       */
+/*                                                                        */
+/* You should have received a copy of the GNU General Public License      */
+/* along with this program; if not, you can request a copy to Qindel      */
+/* or write to the Free Software Foundation, Inc., 59 Temple Place, Suite */
+/* 330, Boston, MA  02111-1307 USA                                        */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/**************************************************************************/
+
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "ChannelEndPoint.h"
+
+#include "NXalert.h"
+
+ChannelEndPoint::ChannelEndPoint(const char *spec)
+  : defaultTCPPort_(0), defaultTCPInterface_(0),
+    defaultUnixPath_(NULL) {
+  spec_ = (spec ? strdup(spec) : NULL);
+}
+
+void
+ChannelEndPoint::setSpec(const char *spec) {
+  if (spec_) free(spec_);
+
+  if (spec && strlen(spec))
+    spec_ = strdup(spec);
+  else
+    spec_ = NULL;
+}
+
+void
+ChannelEndPoint::setSpec(int port) {
+  if (port >= 0) {
+    char tmp[20];
+    sprintf(tmp, "%d", port);
+    setSpec(tmp);
+  }
+  else setSpec((char*)NULL);
+}
+
+void
+ChannelEndPoint::setDefaultTCPPort(long port) {
+  defaultTCPPort_ = port;
+}
+
+void
+ChannelEndPoint::setDefaultTCPInterface(int publicInterface) {
+  defaultTCPInterface_ = publicInterface;
+}
+
+void
+ChannelEndPoint::setDefaultUnixPath(char *path) {
+  if (defaultUnixPath_) free(defaultUnixPath_);
+
+  if (path && strlen(path))
+    defaultUnixPath_ = strdup(path);
+  else
+    defaultUnixPath_ = NULL;
+}
+
+void
+ChannelEndPoint::disable() { setSpec("0"); }
+
+bool
+ChannelEndPoint::specIsPort(long *port) const {
+  if (port) *port = 0;
+  long p = -1;
+  if (spec_) {
+    char *end;
+    p = strtol(spec_, &end, 10);
+    if ((end == spec_) || (*end != '\0'))
+      return false;
+  }
+
+  if (port) *port = p;
+  return true;
+}
+
+bool
+ChannelEndPoint::getUnixPath(char **unixPath) const {
+
+  if (unixPath) *unixPath = 0;
+
+  long p;
+  char *path = NULL;
+
+  if (specIsPort(&p)) {
+    if (p != 1) return false;
+  }
+  else if (spec_ && (strncmp("unix:", spec_, 5) == 0)) {
+    path = spec_ + 5;
+  }
+  else
+    return false;
+
+  if (!path || (*path == '\0')) {
+    path = defaultUnixPath_;
+    if (!path)
+      return false;
+  }
+
+  if (unixPath)
+    *unixPath = strdup(path);
+
+  return true;
+}
+
+// FIXME!!!
+static const char *
+getComputerName() {
+  //
+  // Strangely enough, under some Windows OSes SMB
+  // service doesn't bind to localhost. Fall back
+  // to localhost if can't find computer name in
+  // the environment. In future we should try to
+  // bind to localhost and then try the other IPs.
+  //
+
+  const char *hostname = NULL;
+
+  #ifdef __CYGWIN32__
+
+  hostname = getenv("COMPUTERNAME");
+
+  #endif
+
+  if (hostname == NULL)
+  {
+    hostname = "localhost";
+  }
+
+  return hostname;
+}
+
+bool
+ChannelEndPoint::getTCPHostAndPort(char **host, long *port) const {
+  long p;
+  char *h = NULL;
+  ssize_t h_len;
+
+  if (host) *host = NULL;
+  if (port) *port = 0;
+
+  if (specIsPort(&p)) {
+    h_len = 0;
+  }
+  else if (spec_ && (strncmp("tcp:", spec_, 4) == 0)) {
+    h = spec_ + 4;
+    char *colon = strrchr(h, ':');
+    if (colon) {
+      char *end;
+      h_len = colon++ - h;
+      p = strtol(colon, &end, 10);
+      if ((end == colon) || (*end != '\0'))
+        return false;
+    }
+    else {
+      h_len = strlen(h);
+      p = 1;
+    }
+  }
+  else
+    return false;
+
+  if (p == 1) p = defaultTCPPort_;
+  if (p < 1) return false;
+
+  if (port)
+    *port = p;
+
+  if (host)
+    *host = ( h_len
+              ? strndup(h, h_len)
+              : strdup(defaultTCPInterface_ ? getComputerName() : "localhost"));
+
+  return true;
+}
+
+bool
+ChannelEndPoint::enabled() const {
+  return (getUnixPath() || getTCPHostAndPort());
+}
+
+long ChannelEndPoint::getTCPPort() const {
+  long port;
+  if (getTCPHostAndPort(NULL, &port)) return port;
+  return -1;
+}
+
+bool
+ChannelEndPoint::validateSpec() {
+  return (specIsPort() || getUnixPath() || getTCPHostAndPort());
+}
+
+ChannelEndPoint &ChannelEndPoint::operator=(const ChannelEndPoint &other) {
+  char *old;
+  defaultTCPPort_ = other.defaultTCPPort_;
+  defaultTCPInterface_ = other.defaultTCPInterface_;
+  old = defaultUnixPath_;
+  defaultUnixPath_ = (other.defaultUnixPath_ ? strdup(other.defaultUnixPath_) : NULL);
+  free(old);
+  old = spec_;
+  spec_ = (other.spec_ ? strdup(other.spec_) : NULL);
+  free(old);
+  return *this;
+}
+
+std::ostream& operator<<(std::ostream& os, const ChannelEndPoint& endPoint) {
+  if (endPoint.enabled()) {
+    char *unixPath, *host;
+    long port;
+    if (endPoint.getUnixPath(&unixPath)) {
+      os << "unix:" << unixPath;
+      free(unixPath);
+    }
+    else if (endPoint.getTCPHostAndPort(&host, &port)) {
+      os << "tcp:" << host << ":" << port;
+      free(host);
+    }
+    else {
+      os << "(invalid)";
+    }
+  }
+  else {
+    os << "(disabled)";
+  }
+  return os;
+}
diff --git a/nxcomp/ChannelEndPoint.h b/nxcomp/ChannelEndPoint.h
new file mode 100644
index 000000000..5b4e75345
--- /dev/null
+++ b/nxcomp/ChannelEndPoint.h
@@ -0,0 +1,61 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2015 Qindel Formacion y Servicios SL.                    */
+/*                                                                        */
+/* This program is free software; you can redistribute it and/or modify   */
+/* it under the terms of the GNU General Public License Version 2, as     */
+/* published by the Free Software Foundation.                             */
+/*                                                                        */
+/* This program is distributed in the hope that it will be useful, but    */
+/* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTA-  */
+/* BILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General       */
+/* Public License for more details.                                       */
+/*                                                                        */
+/* You should have received a copy of the GNU General Public License      */
+/* along with this program; if not, you can request a copy to Qindel      */
+/* or write to the Free Software Foundation, Inc., 59 Temple Place, Suite */
+/* 330, Boston, MA  02111-1307 USA                                        */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef ChannelEndPoint_H
+#define ChannelEndPoint_H
+
+#include <iostream>
+#include <sys/un.h>
+
+class ChannelEndPoint
+{
+ private:
+  long defaultTCPPort_;
+  int defaultTCPInterface_; // 0=localhost, otherwise IP of public interface.
+  char *defaultUnixPath_;
+  char *spec_;
+
+  bool specIsPort(long *port = NULL) const;
+
+ public:
+  ChannelEndPoint(const char *spec = NULL);
+  ChannelEndPoint &operator=(const ChannelEndPoint &other);
+
+  bool enabled() const;
+  bool disabled() { return !enabled(); }
+  void disable();
+  void setSpec(const char *spec);
+  void setSpec(int port);
+  void setDefaultTCPPort(long port);
+  void setDefaultTCPInterface(int publicInterface);
+  void setDefaultUnixPath(char *path);
+
+  bool getUnixPath(char **path = NULL) const;
+  bool getTCPHostAndPort(char **hostname = NULL, long *port = NULL) const;
+  long getTCPPort() const;
+
+  bool validateSpec();
+};
+
+std::ostream& operator<<(std::ostream& os, const ChannelEndPoint& endPoint);
+
+#endif
diff --git a/nxcomp/ClientProxy.cpp b/nxcomp/ClientProxy.cpp
index ef63bb0eb..7dd3dbbc6 100644
--- a/nxcomp/ClientProxy.cpp
+++ b/nxcomp/ClientProxy.cpp
@@ -68,8 +68,11 @@ void ClientProxy::handleDisplayConfiguration(const char *xServerDisplay, int xSe
   #endif
 }
 
-void ClientProxy::handlePortConfiguration(int cupsServerPort, int smbServerPort, int mediaServerPort,
-                                              int httpServerPort, const char *fontServerPort)
+void ClientProxy::handlePortConfiguration(ChannelEndPoint &cupsServerPort,
+                                          ChannelEndPoint &smbServerPort,
+                                          ChannelEndPoint &mediaServerPort,
+                                          ChannelEndPoint &httpServerPort,
+                                          const char *fontServerPort)
 {
   delete [] fontServerPort_;
 
@@ -141,8 +144,8 @@ int ClientProxy::handleNewConnectionFromProxy(T_channel_type type, int channelId
         // Connect on the TCP port number.
         //
 
-        return handleNewGenericConnectionFromProxy(channelId, channel_font, "localhost",
-                                                       port, "font");
+        return handleNewGenericConnectionFromProxyTCP(channelId, channel_font, "localhost",
+                                                      port, "font");
       }
       else
       {
@@ -150,7 +153,7 @@ int ClientProxy::handleNewConnectionFromProxy(T_channel_type type, int channelId
         // Connect to the Unix path.
         //
 
-        return handleNewGenericConnectionFromProxy(channelId, channel_font, "localhost",
+        return handleNewGenericConnectionFromProxyUnix(channelId, channel_font,
                                                        fontServerPort_, "font");
       }
     }
diff --git a/nxcomp/ClientProxy.h b/nxcomp/ClientProxy.h
index 88d345f00..d58fae77b 100644
--- a/nxcomp/ClientProxy.h
+++ b/nxcomp/ClientProxy.h
@@ -38,8 +38,11 @@ class ClientProxy : public Proxy
   virtual void handleDisplayConfiguration(const char *xServerDisplay, int xServerAddrFamily,
                                               sockaddr *xServerAddr, unsigned int xServerAddrLength);
 
-  virtual void handlePortConfiguration(int cupsServerPort, int smbServerPort, int mediaServerPort,
-                                           int httpServerPort, const char *fontServerPort);
+  virtual void handlePortConfiguration(ChannelEndPoint &cupsServerPort,
+                                       ChannelEndPoint &smbServerPort,
+                                       ChannelEndPoint &mediaServerPort,
+                                       ChannelEndPoint &httpServerPort,
+                                       const char *fontServerPort);
 
   protected:
 
diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index a60bfc9ae..97020d162 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -36,7 +36,7 @@
 #include <sys/wait.h>
 #include <sys/resource.h>
 #include <sys/utsname.h>
-
+#include <sys/un.h>
 #include <netdb.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -89,6 +89,7 @@ typedef int socklen_t;
 #include "ServerProxy.h"
 
 #include "Message.h"
+#include "ChannelEndPoint.h"
 
 //
 // System specific defines.
@@ -437,7 +438,10 @@ static int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
 // a new connection.
 //
 
-static int ListenConnection(int port, const char *label);
+static int ListenConnection(ChannelEndPoint &endPoint, const char *label);
+static int ListenConnectionTCP(const char *host, long port, const char *label);
+static int ListenConnectionUnix(const char *unixPath, const char *label);
+static int ListenConnectionAny(sockaddr *addr, socklen_t addrlen, const char *label);
 static int AcceptConnection(int fd, int domain, const char *label);
 
 //
@@ -475,6 +479,8 @@ static const char *GetArg(int &argi, int argc, const char **argv);
 static int CheckArg(const char *type, const char *name, const char *value);
 static int ParseArg(const char *type, const char *name, const char *value);
 static int ValidateArg(const char *type, const char *name, const char *value);
+static void SetAndValidateChannelEndPointArg(const char *type, const char *name, const char *value,
+                                             ChannelEndPoint &endPoint);
 static int LowercaseArg(const char *type, const char *name, char *value);
 static int CheckSignal(int signal);
 
@@ -978,12 +984,12 @@ static int connectPort = -1;
 // Helper channels are disabled by default.
 //
 
-static int cupsPort  = -1;
-static int auxPort   = -1;
-static int smbPort   = -1;
-static int mediaPort = -1;
-static int httpPort  = -1;
-static int slavePort = -1;
+static ChannelEndPoint cupsPort;
+static ChannelEndPoint auxPort;
+static ChannelEndPoint smbPort;
+static ChannelEndPoint mediaPort;
+static ChannelEndPoint httpPort;
+static ChannelEndPoint slavePort;
 
 //
 // Can be either a port number or a Unix
@@ -4474,7 +4480,7 @@ int SetupServiceSockets()
       // Since ProtoStep7 (#issue 108)
       int port = atoi(fontPort);
 
-      if ((fontFD = ListenConnection(port, "font")) < 0)
+      if ((fontFD = ListenConnectionTCP("localhost", port, "font")) < 0)
       {
         useFontSocket = 0;
       }
@@ -4504,56 +4510,41 @@ int SetupServiceSockets()
   return 1;
 }
 
-int ListenConnection(int port, const char *label)
+int ListenConnectionAny(sockaddr *addr, socklen_t addrlen, const char *label)
 {
-  sockaddr_in tcpAddr;
-
-  unsigned int portTCP = port;
-
-  int newFD = socket(AF_INET, SOCK_STREAM, PF_UNSPEC);
+  int newFD = socket(addr->sa_family, SOCK_STREAM, PF_UNSPEC);
 
   if (newFD == -1)
   {
     #ifdef PANIC
     *logofs << "Loop: PANIC! Call to socket failed for " << label
-            << " TCP socket. Error is " << EGET() << " '"
+            << " socket. Error is " << EGET() << " '"
             << ESTR() << "'.\n" << logofs_flush;
     #endif
 
     cerr << "Error" << ": Call to socket failed for " << label
-         << " TCP socket. Error is " << EGET() << " '"
+         << " socket. Error is " << EGET() << " '"
          << ESTR() << "'.\n";
 
     goto SetupSocketError;
   }
-  else if (SetReuseAddress(newFD) < 0)
+  if (SetReuseAddress(newFD) < 0)
   {
+    // SetReuseAddress already warns with an error
     goto SetupSocketError;
   }
 
-  tcpAddr.sin_family = AF_INET;
-  tcpAddr.sin_port = htons(portTCP);
-  if ( loopbackBind )
-  {
-    tcpAddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-  }
-  else
-  {
-    tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-  }
-
-  if (bind(newFD, (sockaddr *) &tcpAddr, sizeof(tcpAddr)) == -1)
+  if (bind(newFD, addr, addrlen) == -1)
   {
     #ifdef PANIC
     *logofs << "Loop: PANIC! Call to bind failed for " << label
-            << " TCP port " << port << ". Error is " << EGET()
+            << ". Error is " << EGET()
             << " '" << ESTR() << "'.\n" << logofs_flush;
     #endif
 
     cerr << "Error" << ": Call to bind failed for " << label
-         << " TCP port " << port << ". Error is " << EGET()
+         << ". Error is " << EGET()
          << " '" << ESTR() << "'.\n";
-
     goto SetupSocketError;
   }
 
@@ -4561,12 +4552,12 @@ int ListenConnection(int port, const char *label)
   {
     #ifdef PANIC
     *logofs << "Loop: PANIC! Call to bind failed for " << label
-            << " TCP port " << port << ". Error is " << EGET()
+            << ". Error is " << EGET()
             << " '" << ESTR() << "'.\n" << logofs_flush;
     #endif
 
     cerr << "Error" << ": Call to bind failed for " << label
-         << " TCP port " << port << ". Error is " << EGET()
+         << ". Error is " << EGET()
          << " '" << ESTR() << "'.\n";
 
     goto SetupSocketError;
@@ -4590,6 +4581,82 @@ SetupSocketError:
   //
 
   HandleCleanup();
+  return -1;
+}
+
+int ListenConnectionUnix(const char *path, const char *label)
+{
+
+  sockaddr_un unixAddr;
+  unixAddr.sun_family = AF_UNIX;
+#ifdef UNIX_PATH_MAX
+  if (strlen(path) >= UNIX_PATH_MAX)
+#else
+  if (strlen(path) >= sizeof(unixAddr.sun_path))
+#endif
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Socket path \"" << path << "\" for "
+            << label << " is too long.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Socket path \"" << path << "\" for "
+         << label << " is too long.\n";
+
+    HandleCleanup();
+    return -1;
+  }
+
+  strcpy(unixAddr.sun_path, path);
+  return ListenConnectionAny((sockaddr *)&unixAddr, sizeof(unixAddr), label);
+}
+
+int ListenConnectionTCP(const char *host, long port, const char *label)
+{
+  sockaddr_in tcpAddr;
+  tcpAddr.sin_family = AF_INET;
+  tcpAddr.sin_port = htons(port);
+
+  if (loopbackBind ||
+      !host ||
+      !strcmp(host, "") ||
+      !strcmp(host, "localhost")) {
+    tcpAddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+  }
+  else if(strcmp(host, "*") == 0) {
+    tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY);
+  }
+  else {
+    int ip = tcpAddr.sin_addr.s_addr = GetHostAddress(host);
+    if (ip == 0)
+    {
+      #ifdef PANIC
+      *logofs << "Loop: PANIC! Unknown " << label << " host '" << host
+              << "'.\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Unknown " << label << " host '" << host
+           << "'.\n";
+
+      HandleCleanup();
+      return -1;
+    }
+  }
+
+  return ListenConnectionAny((sockaddr *)&tcpAddr, sizeof(tcpAddr), label);
+}
+
+int ListenConnection(ChannelEndPoint &endpoint, const char *label)
+{
+  char *unixPath, *host;
+  long port;
+  if (endpoint.getUnixPath(&unixPath)) {
+    return ListenConnectionUnix(unixPath, label);
+  }
+  else if (endpoint.getTCPHostAndPort(&host, &port)) {
+    return ListenConnectionTCP(host, port, label);
+  }
+  return -1;
 }
 
 static int AcceptConnection(int fd, int domain, const char *label)
@@ -5521,12 +5588,12 @@ void CleanupLocal()
   listenPort  = -1;
   connectPort = -1;
 
-  cupsPort  = -1;
-  auxPort   = -1;
-  smbPort   = -1;
-  mediaPort = -1;
-  httpPort  = -1;
-  slavePort = -1;
+  cupsPort.disable();
+  auxPort.disable();
+  smbPort.disable();
+  mediaPort.disable();
+  httpPort.disable();
+  slavePort.disable();
 
   *fontPort = '\0';
 
@@ -8070,6 +8137,35 @@ int ReadRemoteData(int fd, char *buffer, int size, char stop)
   return -1;
 }
 
+static int
+hexval(char c) {
+  if ((c >= '0') && (c <= '9'))
+    return c - '0';
+  if ((c >= 'a') && (c <= 'f'))
+    return c - 'a' + 10;
+  if ((c >= 'A') && (c <= 'F'))
+    return c - 'A' + 10;
+  return -1;
+}
+
+static void
+URLDecodeInPlace(char *str) {
+  if (str) {
+    char *to = str;
+    while (str[0]) {
+      if ((str[0] == '%') &&
+          (hexval(str[1]) >= 0) &&
+          (hexval(str[2]) >= 0)) {
+        *(to++) = hexval(str[1]) * 16 + hexval(str[2]);
+        str += 3;
+      }
+      else
+        *(to++) = *(str++);
+    }
+    *to = '\0';
+  }
+}
+
 int WriteLocalData(int fd, const char *buffer, int size)
 {
   int position = 0;
@@ -8357,6 +8453,7 @@ int ParseEnvironmentOptions(const char *env, int force)
   while (name)
   {
     value = strtok(NULL, ",");
+    URLDecodeInPlace(value);
 
     if (CheckArg("environment", name, value) < 0)
     {
@@ -8750,7 +8847,7 @@ int ParseEnvironmentOptions(const char *env, int force)
     }
     else if (strcasecmp(name, "cups") == 0)
     {
-      cupsPort = ValidateArg("local", name, value);
+      SetAndValidateChannelEndPointArg("local", name, value, cupsPort);
     }
     else if (strcasecmp(name, "sync") == 0)
     {
@@ -8762,25 +8859,25 @@ int ParseEnvironmentOptions(const char *env, int force)
       cerr << "Warning" << ": No 'sync' channel in current version. "
            << "Assuming 'cups' channel.\n";
 
-      cupsPort = ValidateArg("local", name, value);
+      SetAndValidateChannelEndPointArg("local", name, value, cupsPort);
     }
     else if (strcasecmp(name, "keybd") == 0 ||
                  strcasecmp(name, "aux") == 0)
     {
-      auxPort = ValidateArg("local", name, value);
+      SetAndValidateChannelEndPointArg("local", name, value, auxPort);
     }
     else if (strcasecmp(name, "samba") == 0 ||
                  strcasecmp(name, "smb") == 0)
     {
-      smbPort = ValidateArg("local", name, value);
+      SetAndValidateChannelEndPointArg("local", name, value, smbPort);
     }
     else if (strcasecmp(name, "media") == 0)
     {
-      mediaPort = ValidateArg("local", name, value);
+      SetAndValidateChannelEndPointArg("local", name, value, mediaPort);
     }
     else if (strcasecmp(name, "http") == 0)
     {
-      httpPort = ValidateArg("local", name, value);
+      SetAndValidateChannelEndPointArg("local", name, value, httpPort);
     }
     else if (strcasecmp(name, "font") == 0)
     {
@@ -8788,7 +8885,7 @@ int ParseEnvironmentOptions(const char *env, int force)
     }
     else if (strcasecmp(name, "slave") == 0)
     {
-      slavePort = ValidateArg("local", name, value);
+      SetAndValidateChannelEndPointArg("local", name, value, slavePort);
     }
     else if (strcasecmp(name, "mask") == 0)
     {
@@ -11515,237 +11612,105 @@ int SetPorts()
   // ing, causing a loop.
   //
 
-  if (cupsPort <= 0)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Disabling cups connections.\n"
-            << logofs_flush;
-    #endif
-
-    cupsPort = 0;
-
-    useCupsSocket = 0;
-  }
-  else
-  {
-    if (control -> ProxyMode == proxy_client)
-    {
-      if (cupsPort == 1)
-      {
-        cupsPort = DEFAULT_NX_CUPS_PORT_OFFSET + proxyPort;
-      }
-
+  useCupsSocket = 0;
+  if (cupsPort.enabled()) {
+    if (control -> ProxyMode == proxy_client) {
+      cupsPort.setDefaultTCPPort(DEFAULT_NX_CUPS_PORT_OFFSET + proxyPort);
       useCupsSocket = 1;
     }
     else
-    {
-      if (cupsPort == 1)
-      {
-        //
-        // Use the well-known 631/tcp port of the
-        // Internet Printing Protocol.
-        //
-
-        cupsPort = 631;
-      }
-
-      useCupsSocket = 0;
-    }
-
-    #ifdef TEST
-    *logofs << "Loop: Using cups port '" << cupsPort
-            << "'.\n" << logofs_flush;
-    #endif
+      cupsPort.setDefaultTCPPort(631);
   }
 
-  if (auxPort <= 0)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Disabling auxiliary X11 connections.\n"
+#ifdef TEST
+  *logofs << "Loop: cups port: " << cupsPort->getDebugSpec() << "\n"
             << logofs_flush;
-    #endif
-
-    auxPort = 0;
-
-    useAuxSocket = 0;
-  }
-  else
-  {
-    if (control -> ProxyMode == proxy_client)
-    {
-      if (auxPort == 1)
-      {
-        auxPort = DEFAULT_NX_AUX_PORT_OFFSET + proxyPort;
-      }
+#endif
 
+  useAuxSocket = 0;
+  if (auxPort.enabled()) {
+    if (control -> ProxyMode == proxy_client) {
+      auxPort.setDefaultTCPPort(DEFAULT_NX_AUX_PORT_OFFSET + proxyPort);
       useAuxSocket = 1;
     }
-    else
-    {
-      //
-      // Auxiliary X connections are always forwarded
-      // to the display where the session is running.
-      // The only value accepted is 1.
-      //
+    else {
+      auxPort.setDefaultTCPPort(1);
 
-      if (auxPort != 1)
-      {
-        #ifdef WARNING
+      if (auxPort.getTCPPort() != 1) {
+
+#ifdef WARNING
         *logofs << "Loop: WARNING! Overriding auxiliary X11 "
                 << "port with new value '" << 1 << "'.\n"
                 << logofs_flush;
-        #endif
+#endif
 
         cerr << "Warning" << ": Overriding auxiliary X11 "
              << "port with new value '" << 1 << "'.\n";
 
-        auxPort = 1;
+	auxPort.setSpec("1");
       }
-
-      useAuxSocket = 0;
     }
-
-    #ifdef TEST
-    *logofs << "Loop: Using auxiliary X11 port '" << auxPort
-            << "'.\n" << logofs_flush;
-    #endif
   }
 
-  if (smbPort <= 0)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Disabling SMB connections.\n"
-            << logofs_flush;
-    #endif
-
-    smbPort = 0;
-
-    useSmbSocket = 0;
-  }
-  else
-  {
-    if (control -> ProxyMode == proxy_client)
-    {
-      if (smbPort == 1)
-      {
-        smbPort = DEFAULT_NX_SMB_PORT_OFFSET + proxyPort;
-      }
+#ifdef TEST
+  *logofs << "Loop: aux port: " << auxPort->getDebugSpec() << "\n"
+	  << logofs_flush;
+#endif
 
-      useSmbSocket = 1;
+  useSmbSocket = 0;
+  if (smbPort.enabled()) {
+    if (control -> ProxyMode == proxy_client) {
+      auxPort.setDefaultTCPPort(DEFAULT_NX_SMB_PORT_OFFSET + proxyPort);
+      useAuxSocket = 1;
     }
     else
-    {
-      if (smbPort == 1)
-      {
-        //
-        // Assume the 139/tcp port used for SMB
-        // over NetBIOS over TCP.
-        //
-
-        smbPort = 139;
-      }
-
-      useSmbSocket = 0;
-    }
-
-    #ifdef TEST
-    *logofs << "Loop: Using SMB port '" << smbPort
-            << "'.\n" << logofs_flush;
-    #endif
+      auxPort.setDefaultTCPPort(139);
   }
 
-  if (mediaPort <= 0)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Disabling multimedia connections.\n"
-            << logofs_flush;
-    #endif
-
-    mediaPort = 0;
 
-    useMediaSocket = 0;
-  }
-  else
-  {
-    if (control -> ProxyMode == proxy_client)
-    {
-      if (mediaPort == 1)
-      {
-        mediaPort = DEFAULT_NX_MEDIA_PORT_OFFSET + proxyPort;
-      }
+#ifdef TEST
+  *logofs << "Loop: smb port: " << smbPort->getDebugSpec() << "\n"
+	  << logofs_flush;
+#endif
 
+  useMediaSocket = 0;
+  if (mediaPort.enabled()) {
+    if (control -> ProxyMode == proxy_client) {
+      mediaPort.setDefaultTCPPort(DEFAULT_NX_MEDIA_PORT_OFFSET + proxyPort);
       useMediaSocket = 1;
     }
-    else
-    {
-      if (mediaPort == 1)
-      {
-        //
-        // We don't have a well-known port to
-        // be used for media connections.
-        //
-
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! No port specified for multimedia connections.\n"
-                << logofs_flush;
-        #endif
+    else if (mediaPort.getTCPPort() == 1) {
+#ifdef PANIC
+      *logofs << "Loop: PANIC! No port specified for multimedia connections.\n"
+              << logofs_flush;
+#endif
 
-        cerr << "Error" << ": No port specified for multimedia connections.\n";
+      cerr << "Error" << ": No port specified for multimedia connections.\n";
 
-        HandleCleanup();
-      }
-
-      useMediaSocket = 0;
+      HandleCleanup();
     }
-
-    #ifdef TEST
-    *logofs << "Loop: Using multimedia port '" << mediaPort
-            << "'.\n" << logofs_flush;
-    #endif
   }
 
-  if (httpPort <= 0)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Disabling HTTP connections.\n"
-            << logofs_flush;
-    #endif
-
-    httpPort = 0;
-
-    useHttpSocket = 0;
-  }
-  else
-  {
-    if (control -> ProxyMode == proxy_client)
-    {
-      if (httpPort == 1)
-      {
-        httpPort = DEFAULT_NX_HTTP_PORT_OFFSET + proxyPort;
-      }
+#ifdef TEST
+  *logofs << "Loop: Using multimedia port '" << mediaPort->getDebugSpec()
+	  << "'.\n" << logofs_flush;
+#endif
 
+  useHttpSocket = 0;
+  if (httpPort.enabled()) {
+    if (control -> ProxyMode == proxy_client) {
+      httpPort.setDefaultTCPPort(DEFAULT_NX_HTTP_PORT_OFFSET + proxyPort);
       useHttpSocket = 1;
     }
     else
-    {
-      if (httpPort == 1)
-      {
-        //
-        // Use the well-known 80/tcp port.
-        //
-
-        httpPort = 80;
-      }
-
-      useHttpSocket = 0;
-    }
-
-    #ifdef TEST
-    *logofs << "Loop: Using HTTP port '" << httpPort
-            << "'.\n" << logofs_flush;
-    #endif
+      httpPort.setDefaultTCPPort(80);
   }
 
+#ifdef TEST
+  *logofs << "Loop: Using HTTP port '" << httpPort->getDebugSpec()
+	  << "'.\n" << logofs_flush;
+#endif
+
   if (ParseFontPath(fontPort) <= 0)
   {
     #ifdef TEST
@@ -11781,44 +11746,20 @@ int SetPorts()
     #endif
   }
 
-  if (slavePort <= 0)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Disabling slave connections.\n"
-            << logofs_flush;
-    #endif
-
-    slavePort = 0;
-
-    useSlaveSocket = 0;
-  }
-  else
-  {
-    //
-    // File transfer connections can
-    // be originated by both sides.
-    //
-
-    if (slavePort == 1)
-    {
-      if (control -> ProxyMode == proxy_client)
-      {
-        slavePort = DEFAULT_NX_SLAVE_PORT_CLIENT_OFFSET + proxyPort;
-      }
-      else
-      {
-        slavePort = DEFAULT_NX_SLAVE_PORT_SERVER_OFFSET + proxyPort;
-      }
-    }
-
+  useSlaveSocket = 0;
+  if (slavePort.enabled()) {
     useSlaveSocket = 1;
-
-    #ifdef TEST
-    *logofs << "Loop: Using slave port '" << slavePort
-            << "'.\n" << logofs_flush;
-    #endif
+    if (control -> ProxyMode == proxy_client)
+      slavePort.setDefaultTCPPort(DEFAULT_NX_SLAVE_PORT_CLIENT_OFFSET + proxyPort);
+    else
+      slavePort.setDefaultTCPPort(DEFAULT_NX_SLAVE_PORT_SERVER_OFFSET + proxyPort);
   }
 
+#ifdef TEST
+  *logofs << "Loop: Using slave port '" << slavePort->getDebugSpec()
+	  << "'.\n" << logofs_flush;
+#endif
+
   return 1;
 }
 
@@ -14109,65 +14050,65 @@ void PrintConnectionInfo()
   }
 
   if (control -> ProxyMode == proxy_client &&
-          useCupsSocket > 0 && cupsPort > 0)
+      useCupsSocket > 0 && cupsPort.enabled())
   {
     cerr << "Info" << ": Listening to CUPS connections "
          << "on port '" << cupsPort << "'.\n";
   }
   else if (control -> ProxyMode == proxy_server &&
-               cupsPort > 0)
+           cupsPort.enabled())
   {
     cerr << "Info" << ": Forwarding CUPS connections "
          << "to port '" << cupsPort << "'.\n";
   }
 
   if (control -> ProxyMode == proxy_client &&
-          useAuxSocket > 0 && auxPort > 0)
+      useAuxSocket > 0 && auxPort.enabled())
   {
     cerr << "Info" << ": Listening to auxiliary X11 connections "
          << "on port '" << auxPort << "'.\n";
   }
   else if (control -> ProxyMode == proxy_server &&
-               auxPort > 0)
+           auxPort.enabled())
   {
     cerr << "Info" << ": Forwarding auxiliary X11 connections "
          << "to display '" << displayHost << "'.\n";
   }
 
   if (control -> ProxyMode == proxy_client &&
-          useSmbSocket > 0 && smbPort > 0)
+      useSmbSocket > 0 && smbPort.enabled())
   {
     cerr << "Info" << ": Listening to SMB connections "
          << "on port '" << smbPort << "'.\n";
   }
   else if (control -> ProxyMode == proxy_server &&
-               smbPort > 0)
+           smbPort.enabled())
   {
     cerr << "Info" << ": Forwarding SMB connections "
          << "to port '" << smbPort << "'.\n";
   }
 
   if (control -> ProxyMode == proxy_client &&
-          useMediaSocket > 0 && mediaPort > 0)
+      useMediaSocket > 0 && mediaPort.enabled())
   {
     cerr << "Info" << ": Listening to multimedia connections "
          << "on port '" << mediaPort << "'.\n";
   }
   else if (control -> ProxyMode == proxy_server &&
-               mediaPort > 0)
+           mediaPort.enabled())
   {
     cerr << "Info" << ": Forwarding multimedia connections "
          << "to port '" << mediaPort << "'.\n";
   }
 
   if (control -> ProxyMode == proxy_client &&
-          useHttpSocket > 0 && httpPort > 0)
+      useHttpSocket > 0 && httpPort.enabled())
   {
     cerr << "Info" << ": Listening to HTTP connections "
          << "on port '" << httpPort << "'.\n";
   }
   else if (control -> ProxyMode == proxy_server &&
-               httpPort > 0)
+           httpPort.enabled())
   {
     cerr << "Info" << ": Forwarding HTTP connections "
          << "to port '" << httpPort << "'.\n";
@@ -14186,7 +14127,7 @@ void PrintConnectionInfo()
          << "to port '" << fontPort << "'.\n";
   }
 
-  if (useSlaveSocket > 0 && slavePort > 0)
+  if (useSlaveSocket > 0 && slavePort.enabled())
   {
     cerr << "Info" << ": Listening to slave connections "
          << "on port '" << slavePort << "'.\n";
@@ -14443,6 +14384,25 @@ int ParseArg(const char *type, const char *name, const char *value)
   return (int) result;
 }
 
+void SetAndValidateChannelEndPointArg(const char *type, const char *name, const char *value,
+                                      ChannelEndPoint &endPoint) {
+  endPoint.setSpec(value);
+  if (!endPoint.validateSpec()) {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Invalid " << type
+            << " option '" << name << "' with value '"
+            << value << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Invalid " << type
+         << " option '" << name << "' with value '"
+         << value << "'.\n";
+
+    HandleCleanup();
+  }
+}
+
+
 int ValidateArg(const char *type, const char *name, const char *value)
 {
   int number = atoi(value);
diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in
index c2cdceead..8fc37407f 100644
--- a/nxcomp/Makefile.in
+++ b/nxcomp/Makefile.in
@@ -149,6 +149,7 @@ CXXSRC = Loop.cpp 				\
 	 ClientChannel.cpp			\
 	 ServerChannel.cpp			\
 	 GenericChannel.cpp			\
+	 ChannelEndPoint.cpp			\
 	 ReadBuffer.cpp				\
 	 ProxyReadBuffer.cpp			\
 	 ClientReadBuffer.cpp			\
diff --git a/nxcomp/Proxy.cpp b/nxcomp/Proxy.cpp
index 7655ccb40..1693590db 100644
--- a/nxcomp/Proxy.cpp
+++ b/nxcomp/Proxy.cpp
@@ -65,6 +65,7 @@ struct sockaddr_un
 #include "ClientChannel.h"
 #include "ServerChannel.h"
 #include "GenericChannel.h"
+#include "ChannelEndPoint.h"
 
 //
 // We need to adjust some values related
@@ -6053,8 +6054,36 @@ int Proxy::handleNewSlaveConnection(int clientFd)
   return handleNewGenericConnection(clientFd, channel_slave, "slave");
 }
 
+
+
 int Proxy::handleNewGenericConnectionFromProxy(int channelId, T_channel_type type,
-                                                   const char *hostname, int port, const char *label)
+                                               ChannelEndPoint &endPoint, const char *label)
+{
+  char *unixPath, *host;
+  long port;
+
+  if (endPoint.getUnixPath(&unixPath)) {
+    return handleNewGenericConnectionFromProxyUnix(channelId, type, unixPath, label);
+  }
+
+  if (endPoint.getTCPHostAndPort(&host, &port)) {
+    return handleNewGenericConnectionFromProxyTCP(channelId, type, host, port, label);
+  }
+
+  #ifdef WARNING
+  *logofs << "Proxy: WARNING! Refusing attempted connection "
+      << "to " << label << " server.\n" << logofs_flush;
+  #endif
+
+  cerr << "Warning" << ": Refusing attempted connection "
+      << "to " << label << " server.\n";
+
+  return -1;
+}
+
+int Proxy::handleNewGenericConnectionFromProxyTCP(int channelId, T_channel_type type,
+                                                  const char *hostname, long port, const char *label)
+
 {
   if (port <= 0)
   {
@@ -6173,8 +6202,8 @@ int Proxy::handleNewGenericConnectionFromProxy(int channelId, T_channel_type typ
   return 1;
 }
 
-int Proxy::handleNewGenericConnectionFromProxy(int channelId, T_channel_type type,
-                                                   const char *hostname, const char *path, const char *label)
+int Proxy::handleNewGenericConnectionFromProxyUnix(int channelId, T_channel_type type,
+                                                   const char *path, const char *label)
 {
   if (path == NULL || *path == '\0' )
   {
diff --git a/nxcomp/Proxy.h b/nxcomp/Proxy.h
index c0fdfcce9..87ea1ce8a 100644
--- a/nxcomp/Proxy.h
+++ b/nxcomp/Proxy.h
@@ -32,6 +32,7 @@
 #include "Transport.h"
 #include "EncodeBuffer.h"
 #include "ProxyReadBuffer.h"
+#include "ChannelEndPoint.h"
 
 //
 // Forward declaration as we
@@ -258,8 +259,11 @@ class Proxy
   virtual void handleDisplayConfiguration(const char *xServerDisplay, int xServerAddrFamily,
                                               sockaddr * xServerAddr, unsigned int xServerAddrLength) = 0;
 
-  virtual void handlePortConfiguration(int cupsServerPort, int smbServerPort, int mediaServerPort,
-                                           int httpServerPort, const char *fontServerPort) = 0;
+  virtual void handlePortConfiguration(ChannelEndPoint &cupsServerPort,
+                                       ChannelEndPoint &smbServerPort,
+                                       ChannelEndPoint &mediaServerPort,
+                                       ChannelEndPoint &httpServerPort,
+                                       const char *fontServerPort) = 0;
 
   //
   // Create new tunneled channels.
@@ -278,10 +282,13 @@ class Proxy
   int handleNewGenericConnection(int clientFd, T_channel_type type, const char *label);
 
   int handleNewGenericConnectionFromProxy(int channelId, T_channel_type type,
-                                              const char *hostname, int port, const char *label);
+                                          ChannelEndPoint &endpoint, const char *label);
 
-  int handleNewGenericConnectionFromProxy(int channelId, T_channel_type type,
-                                              const char *hostname, const char *path, const char *label);
+  int handleNewGenericConnectionFromProxyUnix(int channelId, T_channel_type type,
+                                              const char *path, const char *label);
+
+  int handleNewGenericConnectionFromProxyTCP(int channelId, T_channel_type type,
+                                             const char *hostname, long port, const char *label);
 
   int handleNewSlaveConnection(int clientFd);
 
diff --git a/nxcomp/ServerProxy.cpp b/nxcomp/ServerProxy.cpp
index 0a72fc301..3060e829d 100644
--- a/nxcomp/ServerProxy.cpp
+++ b/nxcomp/ServerProxy.cpp
@@ -1,6 +1,7 @@
 /**************************************************************************/
 /*                                                                        */
 /* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2015 Qindel Formacion y Servicios S.L.                   */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -51,10 +52,10 @@ ServerProxy::ServerProxy(int proxyFd) : Proxy(proxyFd)
   xServerAddr_    = NULL;
   xServerDisplay_ = NULL;
 
-  cupsServerPort_  = -1;
-  smbServerPort_   = -1;
-  mediaServerPort_ = -1;
-  httpServerPort_  = -1;
+  cupsServerPort_  = NULL;
+  smbServerPort_   = NULL;
+  mediaServerPort_ = NULL;
+  httpServerPort_  = NULL;
 
   fontServerPort_ = NULL;
 
@@ -101,8 +102,11 @@ void ServerProxy::handleDisplayConfiguration(const char *xServerDisplay, int xSe
   #endif
 }
 
-void ServerProxy::handlePortConfiguration(int cupsServerPort, int smbServerPort, int mediaServerPort,
-                                              int httpServerPort, const char *fontServerPort)
+void ServerProxy::handlePortConfiguration(ChannelEndPoint &cupsServerPort,
+                                          ChannelEndPoint &smbServerPort,
+                                          ChannelEndPoint &mediaServerPort,
+                                          ChannelEndPoint &httpServerPort,
+                                          const char *fontServerPort)
 {
   cupsServerPort_  = cupsServerPort;
   smbServerPort_   = smbServerPort;
@@ -161,22 +165,23 @@ int ServerProxy::handleNewConnectionFromProxy(T_channel_type type, int channelId
     }
     case channel_cups:
     {
-      return handleNewGenericConnectionFromProxy(channelId, channel_cups, "localhost",
+      return handleNewGenericConnectionFromProxy(channelId, channel_cups,
                                                      cupsServerPort_, "CUPS");
     }
     case channel_smb:
     {
-      return handleNewGenericConnectionFromProxy(channelId, channel_smb, getComputerName(),
+      smbServerPort_.setDefaultTCPInterface(1);
+      return handleNewGenericConnectionFromProxy(channelId, channel_smb,
                                                      smbServerPort_, "SMB");
     }
     case channel_media:
     {
-      return handleNewGenericConnectionFromProxy(channelId, channel_media, "localhost",
+      return handleNewGenericConnectionFromProxy(channelId, channel_media,
                                                      mediaServerPort_, "media");
     }
     case channel_http:
     {
-      return handleNewGenericConnectionFromProxy(channelId, channel_http, getComputerName(),
+      return handleNewGenericConnectionFromProxy(channelId, channel_http,
                                                      httpServerPort_, "HTTP");
     }
     case channel_slave:
diff --git a/nxcomp/ServerProxy.h b/nxcomp/ServerProxy.h
index 54bc0f748..cc8191795 100644
--- a/nxcomp/ServerProxy.h
+++ b/nxcomp/ServerProxy.h
@@ -24,6 +24,7 @@
 #include "Proxy.h"
 
 #include "Misc.h"
+#include "ChannelEndPoint.h"
 
 //
 // Set the verbosity level.
@@ -43,8 +44,11 @@ class ServerProxy : public Proxy
   virtual void handleDisplayConfiguration(const char *xServerDisplay, int xServerAddrFamily,
                                               sockaddr *xServerAddr, unsigned int xServerAddrLength);
 
-  virtual void handlePortConfiguration(int cupsServerPort, int smbServerPort, int mediaServerPort,
-                                           int httpServerPort, const char *fontServerPort);
+  virtual void handlePortConfiguration(ChannelEndPoint &cupsServerPort,
+                                       ChannelEndPoint &smbServerPort,
+                                       ChannelEndPoint &mediaServerPort,
+                                       ChannelEndPoint &httpServerPort,
+                                       const char *fontServerPort);
 
   protected:
 
@@ -108,6 +112,7 @@ class ServerProxy : public Proxy
 
   private:
 
+  // FIXME: Use a ChannelEndPoint object also for the X server!
   int xServerAddrFamily_;
   sockaddr *xServerAddr_;
   unsigned int xServerAddrLength_;
@@ -124,10 +129,10 @@ class ServerProxy : public Proxy
   // TCP connections.
   //
 
-  int cupsServerPort_;
-  int smbServerPort_;
-  int mediaServerPort_;
-  int httpServerPort_;
+  ChannelEndPoint cupsServerPort_;
+  ChannelEndPoint smbServerPort_;
+  ChannelEndPoint mediaServerPort_;
+  ChannelEndPoint httpServerPort_;
 
   //
   // It will have to be passed to the channel
-- 
cgit v1.2.3


From 035995a8c16e8867f209100330653b33de06f458 Mon Sep 17 00:00:00 2001
From: Nito Martinez <Nito@Qindel.ES>
Date: Tue, 31 May 2016 11:23:40 +0200
Subject: display version number in nxcomp log, fixes #127

---
 nxcomp/Control.cpp | 3 ++-
 nxcomp/Loop.cpp    | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Control.cpp b/nxcomp/Control.cpp
index 1bf2dbdd2..93b3ff277 100644
--- a/nxcomp/Control.cpp
+++ b/nxcomp/Control.cpp
@@ -618,7 +618,8 @@ Control::Control()
   #ifdef TEST
   *logofs << "Control: Major version is " << LocalVersionMajor
           << " minor is " << LocalVersionMinor << " patch is "
-          << LocalVersionPatch << ".\n" << logofs_flush;
+          << LocalVersionPatch << " Maintenance version is "
+	  << LocalVersionMaintenancePatch << ".\n" << logofs_flush;
   #endif
 
   //
diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 97020d162..436713761 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -7508,7 +7508,6 @@ int ReadProxyVersion(int fd)
                        &(control -> RemoteVersionPatch));
   }
 
-  #ifdef TEST
   *logofs << "Loop: Identified remote version '" << control -> RemoteVersionMajor
           << "." << control -> RemoteVersionMinor << "." << control -> RemoteVersionPatch
           << "'.\n" << logofs_flush;
@@ -7520,7 +7519,6 @@ int ReadProxyVersion(int fd)
   *logofs << "Loop: Local version '" << control -> LocalVersionMajor
           << "." << control -> LocalVersionMinor << "." << control -> LocalVersionPatch
           << "'.\n" << logofs_flush;
-  #endif
 
   if (SetVersion() < 0)
   {
-- 
cgit v1.2.3


From c646808bcb0fe95e9794409231a9fa8b51990971 Mon Sep 17 00:00:00 2001
From: Nito Martinez <Nito@Qindel.ES>
Date: Tue, 31 May 2016 12:44:02 +0200
Subject: Fix debugging function for Loop.cpp. getDebugSpec was replaced by <<
 operand in ChannelEndPoint.{h|cpp}, fixes #130

---
 nxcomp/Loop.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 436713761..473488593 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -11621,7 +11621,7 @@ int SetPorts()
   }
 
 #ifdef TEST
-  *logofs << "Loop: cups port: " << cupsPort->getDebugSpec() << "\n"
+  *logofs << "Loop: cups port: " << cupsPort << "\n"
             << logofs_flush;
 #endif
 
@@ -11651,7 +11651,7 @@ int SetPorts()
   }
 
 #ifdef TEST
-  *logofs << "Loop: aux port: " << auxPort->getDebugSpec() << "\n"
+  *logofs << "Loop: aux port: " << auxPort << "\n"
 	  << logofs_flush;
 #endif
 
@@ -11667,7 +11667,7 @@ int SetPorts()
 
 
 #ifdef TEST
-  *logofs << "Loop: smb port: " << smbPort->getDebugSpec() << "\n"
+  *logofs << "Loop: smb port: " << smbPort << "\n"
 	  << logofs_flush;
 #endif
 
@@ -11690,7 +11690,7 @@ int SetPorts()
   }
 
 #ifdef TEST
-  *logofs << "Loop: Using multimedia port '" << mediaPort->getDebugSpec()
+  *logofs << "Loop: Using multimedia port '" << mediaPort
 	  << "'.\n" << logofs_flush;
 #endif
 
@@ -11705,7 +11705,7 @@ int SetPorts()
   }
 
 #ifdef TEST
-  *logofs << "Loop: Using HTTP port '" << httpPort->getDebugSpec()
+  *logofs << "Loop: Using HTTP port '" << httpPort
 	  << "'.\n" << logofs_flush;
 #endif
 
@@ -11754,7 +11754,7 @@ int SetPorts()
   }
 
 #ifdef TEST
-  *logofs << "Loop: Using slave port '" << slavePort->getDebugSpec()
+  *logofs << "Loop: Using slave port '" << slavePort
 	  << "'.\n" << logofs_flush;
 #endif
 
-- 
cgit v1.2.3


From 2f706cbeb5f077c9d1f01256bdf978a58769db43 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 5 Apr 2016 14:29:02 +0200
Subject: nxcomp/Makefile.in: Only install MD5.h, NX.h, NXalert.h, NXpack.h,
 NXproto.h and NXvars.h as publicly available header files.

 * Also adapt debian/libxcomp-dev.install.in accordingly.
 * Also adapt nx-libs.spec accordingly.
---
 debian/libxcomp-dev.install.in | 2 --
 nx-libs.spec                   | 2 --
 nxcomp/Makefile.in             | 8 +++++---
 3 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'nxcomp')

diff --git a/debian/libxcomp-dev.install.in b/debian/libxcomp-dev.install.in
index f0faa49e3..e27e6ecf0 100644
--- a/debian/libxcomp-dev.install.in
+++ b/debian/libxcomp-dev.install.in
@@ -1,10 +1,8 @@
 usr/lib/*/libXcomp.so
 usr/include/*/nx/NX.h
 usr/include/*/nx/NXalert.h
-usr/include/*/nx/NXmitshm.h
 usr/include/*/nx/NXpack.h
 usr/include/*/nx/NXproto.h
-usr/include/*/nx/NXrender.h
 usr/include/*/nx/NXvars.h
 usr/include/*/nx/MD5.h
 usr/lib/*/pkgconfig/nxcomp.pc
\ No newline at end of file
diff --git a/nx-libs.spec b/nx-libs.spec
index 5ce1d2145..111e98b3d 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -580,10 +580,8 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans
 %{_includedir}/nx/MD5.h
 %{_includedir}/nx/NX.h
 %{_includedir}/nx/NXalert.h
-%{_includedir}/nx/NXmitshm.h
 %{_includedir}/nx/NXpack.h
 %{_includedir}/nx/NXproto.h
-%{_includedir}/nx/NXrender.h
 %{_includedir}/nx/NXvars.h
 %{_libdir}/pkgconfig/nxcomp.pc
 
diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in
index 8fc37407f..759ab6a4f 100644
--- a/nxcomp/Makefile.in
+++ b/nxcomp/Makefile.in
@@ -283,8 +283,12 @@ install.lib: all
 	$(INSTALL_LINK) $(LIBLOAD)              $(DESTDIR)${libdir}
 	$(INSTALL_LINK) $(LIBSHARED)            $(DESTDIR)${libdir}
 	$(INSTALL_DATA) $(LIBARCHIVE)           $(DESTDIR)${libdir}
-	$(INSTALL_DATA) NX*.h                   $(DESTDIR)${includedir}/nx
 	$(INSTALL_DATA) MD5.h                   $(DESTDIR)${includedir}/nx
+	$(INSTALL_DATA) NX.h                    $(DESTDIR)${includedir}/nx
+	$(INSTALL_DATA) NXalert.h               $(DESTDIR)${includedir}/nx
+	$(INSTALL_DATA) NXpack.h                $(DESTDIR)${includedir}/nx
+	$(INSTALL_DATA) NXproto.h               $(DESTDIR)${includedir}/nx
+	$(INSTALL_DATA) NXvars.h                $(DESTDIR)${includedir}/nx
 	$(INSTALL_DATA) nxcomp.pc               $(DESTDIR)${pkgconfigdir}
 	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
 
@@ -301,10 +305,8 @@ uninstall.lib:
 	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBARCHIVE)
 	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXalert.h
 	$(RM_FILE) $(DESTDIR)${includedir}/nx/NX.h
-	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXmitshm.h
 	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXpack.h
 	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXproto.h
-	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXrender.h
 	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXvars.h
 	$(RM_FILE) $(DESTDIR)${includedir}/nx/MD5.h
 	$(RM_FILE) $(DESTDIR)${pkgconfigdir}/nxcomp.pc
-- 
cgit v1.2.3


From f5eff9bc0a1134a16b1a6e67bfe3d0b4d7cd49e9 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 6 Apr 2016 22:09:31 +0200
Subject: nx-X11/programs/Xserver: Include nxcomp{,ext,shad} headers like one
 would do with system-wide shared libraries.

---
 nx-X11/lib/X11/XlibInt.c                        |  6 +++---
 nx-X11/lib/X11/Xlibint.h                        |  2 +-
 nx-X11/lib/xtrans/Xtranssock.c                  |  2 +-
 nx-X11/programs/Xserver/Imakefile               | 21 +++++++++++++++++++++
 nx-X11/programs/Xserver/hw/nxagent/Args.c       |  4 ++--
 nx-X11/programs/Xserver/hw/nxagent/Atoms.c      |  2 +-
 nx-X11/programs/Xserver/hw/nxagent/Binder.c     |  2 +-
 nx-X11/programs/Xserver/hw/nxagent/Client.c     |  4 ++--
 nx-X11/programs/Xserver/hw/nxagent/Clipboard.c  |  2 +-
 nx-X11/programs/Xserver/hw/nxagent/Cursor.c     |  2 +-
 nx-X11/programs/Xserver/hw/nxagent/Dialog.c     |  6 +++---
 nx-X11/programs/Xserver/hw/nxagent/Display.c    |  6 +++---
 nx-X11/programs/Xserver/hw/nxagent/Drawable.c   |  2 +-
 nx-X11/programs/Xserver/hw/nxagent/Events.c     | 10 +++++-----
 nx-X11/programs/Xserver/hw/nxagent/Font.c       |  4 ++--
 nx-X11/programs/Xserver/hw/nxagent/GCOps.c      |  2 +-
 nx-X11/programs/Xserver/hw/nxagent/Handlers.c   |  4 ++--
 nx-X11/programs/Xserver/hw/nxagent/Image.c      |  4 ++--
 nx-X11/programs/Xserver/hw/nxagent/Imakefile    |  4 ++--
 nx-X11/programs/Xserver/hw/nxagent/Init.c       |  4 ++--
 nx-X11/programs/Xserver/hw/nxagent/Keyboard.c   |  4 ++--
 nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c |  2 +-
 nx-X11/programs/Xserver/hw/nxagent/NXevents.c   |  2 +-
 nx-X11/programs/Xserver/hw/nxagent/Pixmap.c     |  4 ++--
 nx-X11/programs/Xserver/hw/nxagent/Pointer.c    |  2 +-
 nx-X11/programs/Xserver/hw/nxagent/Reconnect.c  |  6 +++---
 nx-X11/programs/Xserver/hw/nxagent/Render.c     |  2 +-
 nx-X11/programs/Xserver/hw/nxagent/Rootless.c   |  2 +-
 nx-X11/programs/Xserver/hw/nxagent/Screen.c     |  4 ++--
 nx-X11/programs/Xserver/hw/nxagent/Splash.h     |  2 +-
 nx-X11/programs/Xserver/hw/nxagent/Split.c      |  2 +-
 nx-X11/programs/Xserver/hw/nxagent/Window.c     |  4 ++--
 nx-X11/programs/Xserver/os/log.c                |  2 +-
 nx-X11/programs/Xserver/os/utils.c              |  4 ++--
 nxcomp/nxcomp.pc.in                             |  2 +-
 nxcompext/nxcompext.pc.in                       |  2 +-
 nxcompshad/nxcompshad.pc.in                     |  2 +-
 37 files changed, 81 insertions(+), 60 deletions(-)

(limited to 'nxcomp')

diff --git a/nx-X11/lib/X11/XlibInt.c b/nx-X11/lib/X11/XlibInt.c
index 0aa890bbb..49535fe18 100644
--- a/nx-X11/lib/X11/XlibInt.c
+++ b/nx-X11/lib/X11/XlibInt.c
@@ -118,12 +118,12 @@ xthread_t (*_Xthread_self_fn)(void) = NULL;
 
 #endif /* XTHREADS else */ 
 
-#include "NX.h"
+#include <nx/NX.h>
 
 #ifdef NX_TRANS_SOCKET
 
-#include "NX.h"
-#include "NXvars.h"
+#include <nx/NX.h>
+#include <nx/NXvars.h>
 
 static struct timeval retry;
 
diff --git a/nx-X11/lib/X11/Xlibint.h b/nx-X11/lib/X11/Xlibint.h
index 854b64b22..474b77349 100644
--- a/nx-X11/lib/X11/Xlibint.h
+++ b/nx-X11/lib/X11/Xlibint.h
@@ -64,7 +64,7 @@ from The Open Group.
 
 #ifdef NX_TRANS_SOCKET
 
-#include "NXvars.h"
+#include <nx/NXvars.h>
 
 #define _XGetIOError(dpy) \
     (dpy -> flags & XlibDisplayIOError)
diff --git a/nx-X11/lib/xtrans/Xtranssock.c b/nx-X11/lib/xtrans/Xtranssock.c
index b08cd9f0a..5c57fc5ba 100644
--- a/nx-X11/lib/xtrans/Xtranssock.c
+++ b/nx-X11/lib/xtrans/Xtranssock.c
@@ -344,7 +344,7 @@ static int haveIPv6 = 1;
 
 #ifdef TRANS_CLIENT
 
-#include "NX.h"
+#include <nx/NX.h>
 
 typedef struct
 {
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index 379a70004..d1f2ff335 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -318,6 +318,27 @@ NXAGENTDDXDIR = hw
 
 NXAGENTDIRS = $(STDDIRS) $(MFBDIR) $(FBDIR) $(MIDAMAGEDIR) $(NXAGENTDDXDIR) $(DEPDIRS)
 
+NX_XCOMP_HEADERS = \
+              ../../../nxcomp/NXalert.h         \
+              ../../../nxcomp/NX.h              \
+              ../../../nxcomp/NXpack.h          \
+              ../../../nxcomp/NXproto.h         \
+              ../../../nxcomp/NXvars.h
+
+NX_XCOMPEXT_HEADERS =                           \
+              ../../../nxcompext/NXlib.h        \
+              ../../../nxcompext/NXlibint.h
+
+NX_XCOMPSHAD_HEADERS =                          \
+              ../../../nxcompshad/Shadow.h
+
+NX_HEADERS =                                    \
+             $(NX_XCOMP_HEADERS)                \
+             $(NX_XCOMPEXT_HEADERS)             \
+             $(NX_XCOMPSHAD_HEADERS)
+
+BuildIncludes($(NX_HEADERS),nx,..)
+
 #if defined(SunArchitecture) || \
     defined(SparcArchitecture)
 NXAGENTOBJS = hw/nxagent/miinitext.o     \
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c
index 3442c3789..59d3deb63 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
@@ -67,8 +67,8 @@ is" without express or implied warranty.
  * NX includes and definitions.
  */
 
-#include "NXlib.h"
-#include "NXpack.h"
+#include <nx/NXlib.h>
+#include <nx/NXpack.h>
 
 /*
  * Set here the required log level.
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c
index 578731f07..00411c65e 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c
@@ -26,7 +26,7 @@
 #include "scrnintstr.h"
 #include "resource.h"
 
-#include "NXpack.h"
+#include <nx/NXpack.h>
 
 #include "Atoms.h"
 #include "Args.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Binder.c b/nx-X11/programs/Xserver/hw/nxagent/Binder.c
index d40aaebe6..f69d23f4f 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Binder.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Binder.c
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "NX.h"
+#include <nx/NX.h>
 
 #include "Binder.h"
 #include "Options.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Client.c b/nx-X11/programs/Xserver/hw/nxagent/Client.c
index cba47981d..eaa216e20 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Client.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Client.c
@@ -23,7 +23,7 @@
 #include <time.h>
 #include <errno.h>
 
-#include "NX.h"
+#include <nx/NX.h>
 
 #include "Xatom.h"
 #include "dixstruct.h"
@@ -49,7 +49,7 @@
  * definition of GC in Agent.h.
  */
 
-#include "NXlib.h"
+#include <nx/NXlib.h>
 
 /*
  * Set here the required log level.
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
index 82a1ed77e..f3656d2c0 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
@@ -39,7 +39,7 @@
  * Use asyncronous get property replies.
  */
 
-#include "NXlib.h"
+#include <nx/NXlib.h>
 
 /*
  * Set here the required log level.
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Cursor.c b/nx-X11/programs/Xserver/hw/nxagent/Cursor.c
index c0015a831..62095d5b3 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Cursor.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Cursor.c
@@ -57,7 +57,7 @@ is" without express or implied warranty.
 #include "windowstr.h"
 #include "resource.h"
 
-#include "NXlib.h"
+#include <nx/NXlib.h>
 
 /*
  * Set here the required log level.
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Dialog.c b/nx-X11/programs/Xserver/hw/nxagent/Dialog.c
index 63c3b73c1..354f04120 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Dialog.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Dialog.c
@@ -33,9 +33,9 @@
 #include "Display.h"
 #include "Dialog.h"
 
-#include "NX.h"
-#include "NXlib.h"
-#include "NXalert.h"
+#include <nx/NX.h>
+#include <nx/NXlib.h>
+#include <nx/NXalert.h>
 
 /*
  * Set here the required log level.
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c
index 628c4c495..31ea7c2a0 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Display.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c
@@ -52,7 +52,7 @@ is" without express or implied warranty.
 #include "unistd.h"
 #endif
 
-#include "NXalert.h"
+#include <nx/NXalert.h>
 
 #include "Agent.h"
 #include "Display.h"
@@ -77,8 +77,8 @@ is" without express or implied warranty.
 #include "Screen.h"
 #include "Handlers.h"
 
-#include "NX.h"
-#include "NXlib.h"
+#include <nx/NX.h>
+#include <nx/NXlib.h>
 
 #include NXAGENT_ICON_NAME
 #include X2GOAGENT_ICON_NAME
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
index 51d41db23..9dac8066a 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
@@ -34,7 +34,7 @@
 #include "Reconnect.h"
 #include "GCOps.h"
 
-#include "NXlib.h"
+#include <nx/NXlib.h>
 
 #include "mibstorest.h"
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c
index 5ad81f781..ffb593750 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Events.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c
@@ -58,9 +58,9 @@
 #include "Utils.h"
 #include "Error.h"
 
-#include "NX.h"
-#include "NXvars.h"
-#include "NXproto.h"
+#include <nx/NX.h>
+#include <nx/NXvars.h>
+#include <nx/NXproto.h>
 
 #include "xfixesproto.h"
 #define Window     XlibWindow
@@ -92,10 +92,10 @@
 
 #include <nx-X11/cursorfont.h>
 
-#include "Shadow.h"
+#include <nx/Shadow.h>
 #include "X11/include/Xrandr_nxagent.h"
 
-#include "NXlib.h"
+#include <nx/NXlib.h>
 
 /*
  * Set here the required log level. Please note
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.c b/nx-X11/programs/Xserver/hw/nxagent/Font.c
index 9123f4bbe..8f692eb85 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Font.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Font.c
@@ -50,8 +50,8 @@ is" without express or implied warranty.
 
 #include "Args.h"
 
-#include "NXlib.h"
-#include "NXalert.h"
+#include <nx/NXlib.h>
+#include <nx/NXalert.h>
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c
index 5f753ffe4..634bbf2ce 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c
@@ -50,7 +50,7 @@ is" without express or implied warranty.
 #include "Args.h"
 #include "Screen.h"
 
-#include "NXlib.h"
+#include <nx/NXlib.h>
 
 /*
  * Set here the required log level.
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
index aee983253..cadb8e58a 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
@@ -32,8 +32,8 @@
 #include "Screen.h"
 #include "Millis.h"
 
-#include "NXlib.h"
-#include "Shadow.h"
+#include <nx/NXlib.h>
+#include <nx/Shadow.h>
 
 /*
  * Set here the required log level.
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Image.c b/nx-X11/programs/Xserver/hw/nxagent/Image.c
index c84d3b7ed..6a7d46c35 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Image.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Image.c
@@ -37,8 +37,8 @@
 #include "Pixels.h"
 #include "Utils.h"
 
-#include "NXlib.h"
-#include "NXpack.h"
+#include <nx/NXlib.h>
+#include <nx/NXpack.h>
 
 /*
  * Set here the required log level.
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
index b0aff4b07..e9cef5ae3 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile
+++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
@@ -133,7 +133,7 @@ OBJS =  NXwindow.o \
 
 VFBINCLUDES = -I../../fb -I../../mfb -I../../render
 
-INCLUDES = -I. -I../../../../../nxcomp -I../../../../../nxcompext -I../../../../../nxcompshad \
+INCLUDES = -I. \
            -I../../../../extras/Mesa/include \
 	   -I$(XBUILDINCDIR) \
 	   -I../../mi -I../../include -I../../os \
@@ -144,7 +144,7 @@ INCLUDES = -I. -I../../../../../nxcomp -I../../../../../nxcompext -I../../../../
            `pkg-config --cflags-only-I libxml-2.0` \
            `pkg-config --cflags-only-I pixman-1`
 #ifdef SunArchitecture
-INCLUDES = -I. -I../../../../../nxcomp -I../../../../../nxcompext -I../../../../../nxcompshad \
+INCLUDES = -I. \
            -I../../../../extras/Mesa/include \
 	   -I$(XBUILDINCDIR) \
 	   -I/usr/sfw/include \
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c
index 0b25aa57d..3ec9fa14a 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Init.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c
@@ -61,8 +61,8 @@ is" without express or implied warranty.
 #include "Millis.h"
 #include "Error.h"
 
-#include "NX.h"
-#include "NXlib.h"
+#include <nx/NX.h>
+#include <nx/NXlib.h>
 #include "Reconnect.h"
 /*
  * Set here the required log level.
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
index 8d1fbd4c1..852771492 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
@@ -54,9 +54,9 @@ is" without express or implied warranty.
 #include "Options.h"
 #include "Error.h"
 
-#include "NXlib.h"
+#include <nx/NXlib.h>
 
-#include "Shadow.h"
+#include <nx/Shadow.h>
 
 #ifdef XKB
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
index 6a1f2ac6a..adeaff870 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
@@ -154,7 +154,7 @@ int ProcInitialConnection();
 #include "Reconnect.h"
 #include "Millis.h"
 #include "Font.h"
-#include "Shadow.h"
+#include <nx/Shadow.h>
 #include "Handlers.h"
 #include "Keyboard.h"
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXevents.c b/nx-X11/programs/Xserver/hw/nxagent/NXevents.c
index f871cad13..89c5c0b19 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXevents.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXevents.c
@@ -183,7 +183,7 @@ xEvent *xeviexE;
 #include "dixgrabs.h"
 #include "../../dix/dispatch.h"
 
-#include "NXlib.h"
+#include <nx/NXlib.h>
 
 #include "Events.h"
 #include "Windows.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
index 67c514714..c9f62b1fe 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
@@ -42,8 +42,8 @@
 #include "Holder.h"
 #include "Args.h"
 
-#include "NXlib.h"
-#include "NXpack.h"
+#include <nx/NXlib.h>
+#include <nx/NXpack.h>
 
 RESTYPE  RT_NX_PIXMAP;
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pointer.c b/nx-X11/programs/Xserver/hw/nxagent/Pointer.c
index a751974af..ce2b37a90 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Pointer.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Pointer.c
@@ -46,7 +46,7 @@ is" without express or implied warranty.
 #include "Events.h"
 #include "Options.h"
 
-#include "NXlib.h"
+#include <nx/NXlib.h>
 
 /*
  * Set here the required log level.
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
index 660d30863..00d434bf4 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
@@ -49,9 +49,9 @@
 #include "XKBsrv.h"
 #endif
 
-#include "NX.h"
-#include "NXlib.h"
-#include "NXalert.h"
+#include <nx/NX.h>
+#include <nx/NXlib.h>
+#include <nx/NXalert.h>
 
 /*
  * Set here the required log level.
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/Render.c
index de1ad1207..d5f64d05b 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Render.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c
@@ -54,7 +54,7 @@
 #include "Pixels.h"
 #include "Handlers.h"
 
-#include "NXproto.h"
+#include <nx/NXproto.h>
 
 #define MAX_FORMATS 255
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c
index 4cf4afcad..a725e20e7 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c
@@ -30,7 +30,7 @@
 #include "Atoms.h"
 #include "Trap.h"
 
-#include "NXlib.h"
+#include <nx/NXlib.h>
 
 /*
  * Set here the required log level.
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index 83bcc01fd..20ec3672a 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -74,7 +74,7 @@ is" without express or implied warranty.
 #include "Pointer.h"
 #include "Reconnect.h"
 #include "Composite.h"
-#include "Shadow.h"
+#include <nx/Shadow.h>
 #include "Utils.h"
 
 #include "X11/include/Xrandr_nxagent.h"
@@ -96,7 +96,7 @@ is" without express or implied warranty.
 #include "Xatom.h"
 #include "Xproto.h"
 
-#include "NXlib.h"
+#include <nx/NXlib.h>
 
 #include "mibstorest.h"
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Splash.h b/nx-X11/programs/Xserver/hw/nxagent/Splash.h
index 39becaa3d..7a987d17e 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Splash.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.h
@@ -20,7 +20,7 @@
 
 #include "Windows.h"
 #include "X11/Xdmcp.h"
-#include "NXalert.h"
+#include <nx/NXalert.h>
 
 #define XDM_TIMEOUT       20000
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Split.c b/nx-X11/programs/Xserver/hw/nxagent/Split.c
index 1840328e4..3b7961c9c 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Split.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Split.c
@@ -26,7 +26,7 @@
 #include "Events.h"
 #include "GCs.h"
 
-#include "NXlib.h"
+#include <nx/NXlib.h>
 
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c
index fb26b8242..b553627dd 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Window.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c
@@ -56,8 +56,8 @@
 #include "Composite.h"
 #include "Events.h"
 
-#include "NX.h"
-#include "NXlib.h"
+#include <nx/NX.h>
+#include <nx/NXlib.h>
 
 #include "Xatom.h"
 
diff --git a/nx-X11/programs/Xserver/os/log.c b/nx-X11/programs/Xserver/os/log.c
index 2444cd333..84381dbf2 100644
--- a/nx-X11/programs/Xserver/os/log.c
+++ b/nx-X11/programs/Xserver/os/log.c
@@ -117,7 +117,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
 
 #ifdef NX_TRANS_SOCKET
 
-#include "NX.h"
+#include <nx/NX.h>
 
 #endif
 
diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c
index 3f58b6fc5..13889ed9a 100644
--- a/nx-X11/programs/Xserver/os/utils.c
+++ b/nx-X11/programs/Xserver/os/utils.c
@@ -229,8 +229,8 @@ Bool noXvExtension = FALSE;
 
 #ifdef NX_TRANS_SOCKET
 
-#include "NX.h"
-#include "NXvars.h"
+#include <nx/NX.h>
+#include <nx/NXvars.h>
 
 #endif
 
diff --git a/nxcomp/nxcomp.pc.in b/nxcomp/nxcomp.pc.in
index f4d3a7efb..f0963aa17 100644
--- a/nxcomp/nxcomp.pc.in
+++ b/nxcomp/nxcomp.pc.in
@@ -10,6 +10,6 @@ Version: @VERSION@
 #Requires: libjpeg zlib
 Requires: libpng
 Requires.private: x11
-Cflags: -I${includedir} -I${includedir}/nx
+Cflags: -I${includedir}
 Libs: -L${libdir} -lXcomp
 
diff --git a/nxcompext/nxcompext.pc.in b/nxcompext/nxcompext.pc.in
index 669397af6..6bd0773b1 100644
--- a/nxcompext/nxcompext.pc.in
+++ b/nxcompext/nxcompext.pc.in
@@ -8,6 +8,6 @@ Description: Extension for NX Compression Library
 Version: @VERSION@
 Requires: nxcomp
 Requires.private: x11
-Cflags: -I${includedir} -I${includedir}/nx
+Cflags: -I${includedir}
 Libs: -L${libdir} -lXcompext
 
diff --git a/nxcompshad/nxcompshad.pc.in b/nxcompshad/nxcompshad.pc.in
index 4d4265c76..80b75e3f5 100644
--- a/nxcompshad/nxcompshad.pc.in
+++ b/nxcompshad/nxcompshad.pc.in
@@ -8,6 +8,6 @@ Description: Shadow Session Support for NX Compression Library
 Version: @VERSION@
 Requires: nxcomp
 Requires.private: x11
-Cflags: -I${includedir} -I${includedir}/nx
+Cflags: -I${includedir}
 Libs: -L${libdir} -lXcompshad
 
-- 
cgit v1.2.3


From 6051dec4a1ae6decd9123a3310098baf43f45c49 Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ïonic@ionic.de>
Date: Fri, 17 Jun 2016 01:45:40 +0000
Subject: 
 {nx-X11/programs/Xserver/hw/nxagent/{{Args,Handlers,Image,Options}.c,Options.h},nxcomp/{Loop,Misc}.cpp}:
 add configurable sleep delay if session is suspended.

---
 nx-X11/programs/Xserver/hw/nxagent/Args.c     | 38 ++++++++++++++++++++++
 nx-X11/programs/Xserver/hw/nxagent/Handlers.c | 46 +++++++++++++++++++--------
 nx-X11/programs/Xserver/hw/nxagent/Image.c    | 14 ++------
 nx-X11/programs/Xserver/hw/nxagent/Options.c  |  2 ++
 nx-X11/programs/Xserver/hw/nxagent/Options.h  |  7 ++++
 nxcomp/Loop.cpp                               |  3 +-
 nxcomp/Misc.cpp                               |  3 +-
 7 files changed, 87 insertions(+), 26 deletions(-)

(limited to 'nxcomp')

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c
index 59d3deb63..2590dd6c3 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
@@ -1339,6 +1339,44 @@ static void nxagentParseOptions(char *name, char *value)
       nxagentChangeOption(Clipboard, ClipboardBoth);
     }
   }
+  else if (!strcmp(name, "sleep"))
+  {
+    long sleep_parse = 0;
+
+    errno = 0;
+    sleep_parse = strtol(value, NULL, 10);
+
+    if ((errno) && (0 == sleep_parse))
+    {
+      fprintf(stderr, "nxagentParseOptions: Unable to convert value [%s] of option [%s]. "
+                      "Ignoring option.\n",
+                      validateString(value), validateString(name));
+
+      return;
+    }
+
+    if ((long) UINT_MAX < sleep_parse)
+    {
+      sleep_parse = UINT_MAX;
+
+      fprintf(stderr, "nxagentParseOptions: Warning: value [%s] of option [%s] "
+                      "out of range, clamped to [%u].\n",
+                      validateString(value), validateString(name), sleep_parse);
+    }
+
+    if (0 > sleep_parse)
+    {
+      sleep_parse = 0;
+
+      fprintf(stderr, "nxagentParseOptions: Warning: value [%s] of option [%s] "
+                      "out of range, clamped to [%u].\n",
+                      validateString(value), validateString(name), sleep_parse);
+    }
+
+    nxagentChangeOption(SleepTime, sleep_parse);
+
+    return;
+  }
   else
   {
     #ifdef DEBUG
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
index 1beff090b..ba4034255 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
@@ -62,14 +62,6 @@
 
 #define FLUSH_AFTER_MULTIPLE_READS
 
-/*
- * Introduce a small delay after each
- * loop if the session is down. The
- * value is in milliseconds.
- */
-
-#define LOOP_DELAY_IF_DOWN       50
-
 /*
  * The soft limit should roughly match
  * the size of the Xlib I/O buffer.
@@ -246,12 +238,21 @@ void nxagentBlockHandler(void * data, struct timeval **timeout, void * mask)
    * not connected to a valid display.
    */
 
-  if (NXDisplayError(nxagentDisplay) == 1 && nxagentShadowCounter == 0)
+  if (NXDisplayError(nxagentDisplay) == 1 && nxagentShadowCounter == 0 && nxagentOption(SleepTime) > 0)
   {
-    usleep(LOOP_DELAY_IF_DOWN * 1000);
+#ifdef TEST
+    fprintf(stderr, "nxagentBlockHandler: sleeping for %d milliseconds for slowdown.\n",
+                    nxagentOption(SleepTime));
+#endif
+    usleep(nxagentOption(SleepTime) * 1000);
 
     now = GetTimeInMillis();
   }
+#ifdef TEST
+  else if (0 == nxagentOption(SleepTime)) {
+    fprintf(stderr, "nxagentBlockHandler: not sleeping for slowdown.\n");
+  }
+#endif
 
   /*
    * Update the shadow display. This is
@@ -743,9 +744,17 @@ void nxagentShadowBlockHandler(void * data, struct timeval **timeout, void * mas
     nxagentHandleConnectionChanges();
   }
 
-  if (nxagentSessionState == SESSION_DOWN)
+  if (nxagentSessionState == SESSION_DOWN && nxagentOption(SleepTime) > 0)
   {
-    usleep(50 * 1000);
+#ifdef TEST
+    fprintf(stderr, "nxagentBlockHandler: sleeping for %d milliseconds for slowdown.\n",
+                    nxagentOption(SleepTime));
+#endif
+    usleep(nxagentOption(SleepTime) * 1000);
+  }
+#ifdef TEST
+  else if (0 == nxagentOption(SleepTime)) {
+    fprintf(stderr, "nxagentBlockHandler: not sleeping for slowdown.\n");
   }
 
   #ifndef __CYGWIN32__
@@ -826,7 +835,18 @@ FIXME: Must queue multiple writes and handle
 
   #ifdef __CYGWIN32__
 
-  usleep(50 * 1000);
+  if (nxagentOption(SleepTime) > 0) {
+#ifdef TEST
+    fprintf(stderr, "nxagentShadowBlockHandler: sleeping for %d milliseconds for slowdown.\n",
+                    nxagentOption(SleepTime));
+#endif
+    usleep(nxagentOption(SleepTime) * 1000);
+  }
+#ifdef TEST
+  else if (0 == nxagentOption(SleepTime)) {
+    fprintf(stderr, "nxagentShadowBlockHandler: not sleeping for slowdown.\n");
+  }
+#endif
 
   (*timeout) -> tv_sec  = 0;
   (*timeout) -> tv_usec = 50 * 1000;
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Image.c b/nx-X11/programs/Xserver/hw/nxagent/Image.c
index 6a7d46c35..a158a11db 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Image.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Image.c
@@ -68,15 +68,6 @@
 
 #define IMAGE_UNIQUE_RATIO   10
 
-/*
- * Introduce a small delay after each image
- * operation if the session is down. Value
- * is in microseconds and is multiplied by
- * the image data size in kilobytes.
- */
-
-#define IMAGE_DELAY_IF_DOWN  250
-
 /*
  * Preferred pack and split parameters we
  * got from the NX transport.
@@ -521,11 +512,12 @@ void nxagentPutImage(DrawablePtr pDrawable, GCPtr pGC, int depth,
   length = nxagentImageLength(dstWidth, dstHeight, format, leftPad, depth);
 
   if (nxagentShadowCounter == 0 &&
-          NXDisplayError(nxagentDisplay) == 1)
+          NXDisplayError(nxagentDisplay) == 1 &&
+              nxagentOption(SleepTime) > 0)
   {
     int us;
 
-    us = IMAGE_DELAY_IF_DOWN * (length / 1024);
+    us = nxagentOption(SleepTime) * 4 * (length / 1024);
 
     us = (us < 10000 ? 10000 : (us > 1000000 ? 1000000 : us));
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Options.c b/nx-X11/programs/Xserver/hw/nxagent/Options.c
index dbe200273..8a3275c64 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Options.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Options.c
@@ -156,6 +156,8 @@ void nxagentInitOptions()
   nxagentOptions.ImageRateLimit = 0;
 
   nxagentOptions.Xinerama = 0;
+
+  nxagentOptions.SleepTime = DEFAULT_SLEEP_TIME;
 }
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Options.h b/nx-X11/programs/Xserver/hw/nxagent/Options.h
index 5bf1597d5..02b886242 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Options.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Options.h
@@ -28,6 +28,7 @@
 
 #define UNDEFINED -1
 #define COPY_UNLIMITED -1
+#define DEFAULT_SLEEP_TIME 50
 
 extern unsigned int nxagentPrintGeometryFlags;
 
@@ -399,6 +400,12 @@ typedef struct _AgentOptions
 
   int Xinerama;
 
+  /*
+   * Sleep delay in microseconds.
+   */
+
+  unsigned int SleepTime;
+
 } AgentOptionsRec;
 
 typedef AgentOptionsRec *AgentOptionsPtr;
diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 473488593..5086db012 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -9003,7 +9003,8 @@ int ParseEnvironmentOptions(const char *env, int force)
                              strcasecmp(name, "keyboard") == 0 ||
                                  strcasecmp(name, "clipboard") == 0 ||
                                      strcasecmp(name, "streaming") == 0 ||
-                                         strcasecmp(name, "backingstore") == 0)
+                                         strcasecmp(name, "backingstore") == 0 ||
+                                             strcasecmp(name, "sleep") == 0)
     {
       #ifdef DEBUG
       *logofs << "Loop: Ignoring agent option '" << name
diff --git a/nxcomp/Misc.cpp b/nxcomp/Misc.cpp
index ee73f19d8..05794bded 100644
--- a/nxcomp/Misc.cpp
+++ b/nxcomp/Misc.cpp
@@ -316,7 +316,8 @@ shadowuid=n\n\
 shadowmode=s\n\
 defer=n\n\
 tile=s\n\
-menu=n         These options are interpreted by the NX agent. They\n\
+menu=n\n\
+sleep=n        These options are interpreted by the NX agent. They\n\
                are ignored by the proxy.\n\
 \n\
   Environment:\n\
-- 
cgit v1.2.3


From 2f3d394e87c61369ed1308c6b3bc53cf0295146c Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 22 Jun 2016 12:41:50 +0200
Subject: nx-X11/config/{imake,makedepend}: Use system-wide available imake and
 makedepend tools.

---
 debian/control                        |    1 +
 nx-X11/Imakefile                      |   12 -
 nx-X11/Makefile                       |   71 +-
 nx-X11/config/Imakefile               |    7 +-
 nx-X11/config/cf/Imake.rules          |   16 +-
 nx-X11/config/cf/Imake.tmpl           |   22 -
 nx-X11/config/cf/Imakefile            |    3 -
 nx-X11/config/imake/Imakefile         |   84 --
 nx-X11/config/imake/Makefile.ini      |   85 --
 nx-X11/config/imake/ccimake.c         |   62 -
 nx-X11/config/imake/imake.c           | 2190 ---------------------------------
 nx-X11/config/imake/imake.man         |  262 ----
 nx-X11/config/imake/imakemdep.h       | 1514 -----------------------
 nx-X11/config/imake/imakesvc.cmd      |  302 -----
 nx-X11/config/makedepend/Imakefile    |  101 --
 nx-X11/config/makedepend/cpp.ed       |   75 --
 nx-X11/config/makedepend/cppsetup.c   |  233 ----
 nx-X11/config/makedepend/def.h        |  188 ---
 nx-X11/config/makedepend/ifparser.c   |  553 ---------
 nx-X11/config/makedepend/ifparser.h   |   83 --
 nx-X11/config/makedepend/include.c    |  318 -----
 nx-X11/config/makedepend/main.c       |  865 -------------
 nx-X11/config/makedepend/mkdepend.man |  382 ------
 nx-X11/config/makedepend/parse.c      |  686 -----------
 nx-X11/config/makedepend/pr.c         |  124 --
 nxcomp/configure.in                   |   10 -
 nxcompext/configure.in                |   10 -
 nxcompshad/configure.in               |   10 -
 28 files changed, 12 insertions(+), 8257 deletions(-)
 delete mode 100644 nx-X11/config/imake/Imakefile
 delete mode 100644 nx-X11/config/imake/Makefile.ini
 delete mode 100644 nx-X11/config/imake/ccimake.c
 delete mode 100644 nx-X11/config/imake/imake.c
 delete mode 100644 nx-X11/config/imake/imake.man
 delete mode 100644 nx-X11/config/imake/imakemdep.h
 delete mode 100644 nx-X11/config/imake/imakesvc.cmd
 delete mode 100644 nx-X11/config/makedepend/Imakefile
 delete mode 100644 nx-X11/config/makedepend/cpp.ed
 delete mode 100644 nx-X11/config/makedepend/cppsetup.c
 delete mode 100644 nx-X11/config/makedepend/def.h
 delete mode 100644 nx-X11/config/makedepend/ifparser.c
 delete mode 100644 nx-X11/config/makedepend/ifparser.h
 delete mode 100644 nx-X11/config/makedepend/include.c
 delete mode 100644 nx-X11/config/makedepend/main.c
 delete mode 100644 nx-X11/config/makedepend/mkdepend.man
 delete mode 100644 nx-X11/config/makedepend/parse.c
 delete mode 100644 nx-X11/config/makedepend/pr.c

(limited to 'nxcomp')

diff --git a/debian/control b/debian/control
index 2344dd37f..e9e7f7d18 100644
--- a/debian/control
+++ b/debian/control
@@ -28,6 +28,7 @@ Build-Depends:
  x11proto-core-dev,
  expat,
  libpixman-1-dev (>= 0.13.2),
+ xutils-dev,
 Standards-Version: 3.9.6
 Homepage: https://github.com/ArcticaProject/nx-libs/
 Vcs-Git: https://github.com/ArcticaProject/nx-libs/
diff --git a/nx-X11/Imakefile b/nx-X11/Imakefile
index 46ca9e70c..45948d2af 100644
--- a/nx-X11/Imakefile
+++ b/nx-X11/Imakefile
@@ -105,11 +105,6 @@ Everything::
 	@echo ""
 	@date
 	@echo ""
-	cd $(IMAKESRC) && if [ -f Makefile ]; then \
-	    $(MAKE) $(MFLAGS) BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; \
-	else \
-	    $(MAKE) $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; \
-	fi
 	-$(RM) xmakefile.bak; $(MV) xmakefile xmakefile.bak
 	$(MAKE) $(MFLAGS) xmakefile
 	$(MAKE) $(MFLAGS) $(MAKE_OPTS) Makefiles
@@ -149,9 +144,6 @@ Everything::
 	@echo Rebuilding $(RELEASE) of the X Window System.
 	@echo :
 	@echo :
-	cd $(IMAKESRC)
-	$(MAKE) $(MFLAGS) -f Makefile.ini imake.exe
-	cd ..\..
 	RMoveToBakFile(xmakefile)
 	$(MAKE) $(MFLAGS) xmakefile
 	$(MAKE) $(MFLAGS) $(MAKE_OPTS) Makefiles
@@ -186,7 +178,3 @@ xmakefile-exists::
 #ifndef MakeHtmlManIndex
 #define MakeHtmlManIndex YES	/* install.man generates HTML man page index */
 #endif
-
-#undef BootstrapCleanSubdirs
-#define BootstrapCleanSubdirs BOOTSTRAPSUBDIRS="$(BOOTSTRAPSUBDIRS)"
-BOOTSTRAPSUBDIRS = imake makedepend
diff --git a/nx-X11/Makefile b/nx-X11/Makefile
index e6b2f77ab..7a3ece799 100644
--- a/nx-X11/Makefile
+++ b/nx-X11/Makefile
@@ -8,7 +8,7 @@
 # Luna users will need to either run make as "make MAKE=make"
 # or add "MAKE = make" to this file.
 
-RELEASE = "Release 6.9"
+RELEASE = "Release $(shell cat ../VERSION)"
 SHELL = /bin/sh
 RM = rm -f
 MV = mv
@@ -17,16 +17,11 @@ WIN32WORLDOPTS = -i
 TOP = .
 CURRENT_DIR = .
 CONFIGSRC = $(TOP)/config
-IMAKESRC = $(CONFIGSRC)/imake
-DEPENDSRC = $(CONFIGSRC)/makedepend
-DEPENDTOP = ../..
-IMAKETOP = ../..
 IRULESRC = $(CONFIGSRC)/cf
-IMAKE = $(IMAKESRC)/imake
+IMAKE = imake
 IMAKE_CMD = $(IMAKE) -I$(IRULESRC) $(IMAKE_DEFINES)
 MAKE_OPTS = -f xmakefile
 MAKE_CMD = $(MAKE) $(MAKE_OPTS)
-FLAGS = $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)" CC="$(CC)"
 
 all:
 	@${MAKE} ${MAKE_OPTS} xmakefile-exists || $(MAKE) all-initial
@@ -34,8 +29,7 @@ all:
 
 all-initial:
 	@echo Please use make World, or on NT use nmake World.Win32.
-	@echo Check the configuration parameters in the $(IRULESRC) directory,
-	@echo and pass BOOTSTRAPCFLAGS if necessary.
+	@echo
 	@echo Read the release notes carefully before proceeding.
 	@echo Do not name your log file make.log or it will be deleted.
 
@@ -43,11 +37,6 @@ World:
 	@echo ""
 	@echo Building $(RELEASE).
 	@echo ""
-	@case "x$(BOOTSTRAPCFLAGS)" in x) \
-	echo I hope you checked the configuration parameters in $(IRULESRC) ; \
-	echo to see if you need to pass BOOTSTRAPCFLAGS. ; \
-	echo "" ; \
-	;; esac;
 	@date
 	@echo ""
 	@if [ -f xmakefile ]; then \
@@ -55,31 +44,9 @@ World:
 	    ${MAKE} ${MAKE_OPTS} -k clean || \
 	    $(RM) xmakefile; \
 	fi
-	@if [ ! -f $(IRULESRC)/host.def ]; then \
-	    if [ ! -f $(TOP)/lib/Xt/Imakefile ]; then \
-		echo "#define BuildServersOnly YES" > $(IRULESRC)/host.def; \
-	    else \
-		if [ ! -f $(TOP)/fonts/Imakefile ]; then \
-		    echo "#define BuildFonts NO" > $(IRULESRC)/host.def; \
-		else \
-		    echo "" > $(IRULESRC)/host.def; \
-		fi; \
-	    fi; \
-	fi
-#	@rm -f $(IRULESRC)/version.def; echo "" > $(IRULESRC)/version.def;
 	@rm -f $(IRULESRC)/date.def; echo "" > $(IRULESRC)/date.def;
-#	@if [ ! -f $(IRULESRC)/version.def ]; then \
-#	    rm -f $(IRULESRC)/version.def; \
-#	    echo "" > $(IRULESRC)/version.def; \
-#	fi
-#	@if [ ! -f $(IRULESRC)/date.def ]; then \
-#	    rm -f $(IRULESRC)/date.def; \
-#	    echo "" > $(IRULESRC)/date.def; \
-#	fi
-	cd $(IMAKESRC) && $(MAKE) $(FLAGS) clean
-	$(MAKE) $(MFLAGS) Makefile.boot
+	${MAKE} $(MFLAGS) xmakefile
 	${MAKE} ${MAKE_OPTS} $(MFLAGS) version.def
-	$(MAKE) $(MFLAGS) Makefile.boot
 	${MAKE} ${MAKE_OPTS} $(MFLAGS) VerifyOS
 	${MAKE} ${MAKE_OPTS} $(MFLAGS) Makefiles
 	${MAKE} ${MAKE_OPTS} $(MFLAGS) BOOTSTRAPSUBDIRS= clean
@@ -98,37 +65,13 @@ World:
 # The steps are listed as separate targets so clearmake can wink in
 # the Makefile.proto files.
 
-Makefile.boot: imake.bootstrap
-	$(RM) $(IMAKESRC)/Makefile.proto
-
-imake.proto:
-	cd $(IMAKESRC) && $(MAKE) $(FLAGS)
-	$(RM) $(DEPENDSRC)/Makefile.proto
-
-$(DEPENDSRC)/Makefile.proto: imake.proto
-	$(IMAKE_CMD) -s $(DEPENDSRC)/Makefile.proto -f $(DEPENDSRC)/Imakefile -DTOPDIR=$(DEPENDTOP) -DCURDIR=$(DEPENDSRC)
-
-depend.bootstrap: $(DEPENDSRC)/Makefile.proto
-	cd $(DEPENDSRC) && $(RM) -r Makefile Makefile.dep makedepend *.o bootstrap
-	cd $(DEPENDSRC) && $(MAKE) -f Makefile.proto bootstrap
-
-$(IMAKESRC)/Makefile.proto: depend.bootstrap
-	$(IMAKE_CMD) -s $(IMAKESRC)/Makefile.proto -f $(IMAKESRC)/Imakefile -DTOPDIR=$(IMAKETOP) -DCURDIR=$(IMAKESRC) -DBootStrap
-
-imake.bootstrap: $(IMAKESRC)/Makefile.proto
-	cd $(IMAKESRC) && $(MAKE) -f Makefile.proto bootstrapdepend
-	cd $(IMAKESRC) && $(MAKE) $(FLAGS) bootstrap
-	cd $(IMAKESRC) && $(MAKE) -f Makefile.proto imakeonly
-	-@if [ -f xmakefile ]; then set -x; \
-	  $(RM) xmakefile.bak; $(MV) xmakefile xmakefile.bak; \
-	  else exit 0; fi
-	$(MAKE) $(MFLAGS) xmakefile
-
 Makefile::
 	$(MAKE) $(MFLAGS) xmakefile
 
 xmakefile: Imakefile
-	$(RM) xmakefile
+	@if [ -f xmakefile ]; then set -x; \
+	 $(RM) xmakefile.bak; $(MV) xmakefile xmakefile.bak; \
+	 else exit 0; fi
 	@rm -f $(IRULESRC)/date.def; echo "" > $(IRULESRC)/date.def;
 	$(IMAKE_CMD) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
 
diff --git a/nx-X11/config/Imakefile b/nx-X11/config/Imakefile
index 03b9f5b94..7d1217a46 100644
--- a/nx-X11/config/Imakefile
+++ b/nx-X11/config/Imakefile
@@ -8,12 +8,7 @@ XCOMM $XFree86: xc/config/Imakefile,v 1.3 2001/01/17 16:22:29 dawes Exp $
 
 NULL =
 
-BOOTSTRAPSUBDIRS = \
-	imake \
-	makedepend \
-	$(NULL)
-
-SUBDIRS = cf $(BOOTSTRAPSUBDIRS)
+SUBDIRS = cf
 
 #if defined(XorgVersionString) \
 	&& defined(ProjectRoot) && \
diff --git a/nx-X11/config/cf/Imake.rules b/nx-X11/config/cf/Imake.rules
index e023b6d26..f782f964b 100644
--- a/nx-X11/config/cf/Imake.rules
+++ b/nx-X11/config/cf/Imake.rules
@@ -1930,9 +1930,7 @@ DependDependencyStatement()						@@\
 NoCmpScript(ProgramTargetName($(DEPEND)))				@@\
 									@@\
 ProgramTargetName($(DEPEND)):						@@\
-	@echo "checking $@ over in $(DEPENDSRC) first..."; \		@@\
-	cd $(DEPENDSRC) && $(MAKE) makedependonly; \			@@\
-	echo "okay, continuing in $(CURRENT_DIR)"
+	echo "using system-wide depend, continuing in $(CURRENT_DIR)"
 
 #endif /* UseInstalled */
 #endif /* DependDependency */
@@ -2025,11 +2023,7 @@ target:: ProgramTargetName($(IMAKE))					@@\
 NoCmpScript(ProgramTargetName($(IMAKE)) $(IMAKE).Osuf)			@@\
 									@@\
 ProgramTargetName($(IMAKE)) $(IMAKE).Osuf:				@@\
-	-@(cd $(IMAKESRC) && if [ -f Makefile ]; then \			@@\
-	echo "checking $@ in $(IMAKESRC) first..."; $(MAKE) imakeonly; else \	@@\
-	echo "bootstrapping $@ from Makefile.ini in $(IMAKESRC) first..."; \	@@\
-	$(MAKE) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; fi; \	@@\
-	echo "okay, continuing in $(CURRENT_DIR)")
+	echo "using system-wide imake, continuing in $(CURRENT_DIR)"
 #endif /* UseInstalled */
 #endif /* ImakeDependency */
 
@@ -3226,12 +3220,8 @@ target::								@@\
 		fi; \							@@\
 	done
 
-#ifdef UseInstalled
-#define ImakeSubCmdHelper $(IMAKE_CMD)
-#else
-#define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) \
+#define ImakeSubCmdHelper $(IMAKE_CMD) -I$(IMAKEPREFIX)$(IRULESRC) \
 			  $(IMAKE_DEFINES) $(IMAKE_WARNINGS)
-#endif
 
 #endif /* MakeMakeSubdirs */
 
diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl
index 30a0dc73b..f40864ced 100644
--- a/nx-X11/config/cf/Imake.tmpl
+++ b/nx-X11/config/cf/Imake.tmpl
@@ -1386,35 +1386,13 @@ TCLIBDIR = TclLibDir
 #define LoaderLibPrefix /**/
 #endif
 #ifndef ImakeCmd
-#ifdef UseInstalled		/* assume BINDIR in path */
 #define ImakeCmd imake
-#else
-#define ImakeCmd $(IMAKESRC)/imake
-#endif
 #endif
 #ifndef ImakeWarningFlags
 #define ImakeWarningFlags	/* Nothing */
 #endif
 #ifndef DependCmd
-#if UseGccMakeDepend
-#ifdef UseInstalled		/* assume BINDIR in path */
-#define DependCmd gccmakedep
-#else
-#define DependCmd $(DEPENDSRC)/gccmakedep
-#endif
-#elif UseCCMakeDepend
-#ifdef UseInstalled		/* assume BINDIR in path */
-#define DependCmd ccmakedep
-#else
-#define DependCmd $(DEPENDSRC)/ccmakedep
-#endif
-#else
-#ifdef UseInstalled		/* assume BINDIR in path */
 #define DependCmd makedepend
-#else
-#define DependCmd $(DEPENDSRC)/makedepend
-#endif
-#endif
 #endif
 #ifndef DependDefines
 # if UseCCMakeDepend || UseGccMakeDepend
diff --git a/nx-X11/config/cf/Imakefile b/nx-X11/config/cf/Imakefile
index b7626590d..22eb09216 100644
--- a/nx-X11/config/cf/Imakefile
+++ b/nx-X11/config/cf/Imakefile
@@ -30,14 +30,12 @@ xorgversion.def \
 nxversion.def
 
 RULEFILES = \
-Imake.rules \
 X11.rules \
 lnxLib.rules \
 noop.rules \
 xf86.rules
 
 TMPLFILES = \
-Imake.tmpl \
 Library.tmpl \
 Server.tmpl \
 ServerLib.tmpl \
@@ -47,7 +45,6 @@ lnxLib.tmpl \
 xorg.tmpl
 
 CFFILES = \
-Imake.cf \
 linux.cf \
 xorg.cf
 
diff --git a/nx-X11/config/imake/Imakefile b/nx-X11/config/imake/Imakefile
deleted file mode 100644
index 13645443b..000000000
--- a/nx-X11/config/imake/Imakefile
+++ /dev/null
@@ -1,84 +0,0 @@
-XCOMM $XdotOrg: xc/config/imake/Imakefile,v 1.3 2005/10/10 23:49:09 kem Exp $
-XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:50 cpqbld Exp $
-XCOMM
-XCOMM
-XCOMM
-XCOMM
-XCOMM $XFree86: xc/config/imake/Imakefile,v 3.18 2003/10/21 17:41:44 tsi Exp $
-
-XCOMM Some compilers generate fatal errors if an -L directory does
-XCOMM not exist.  Since BUILDLIBDIR may not exist yet suppress its use.
-         LDPRELIB =
-        LDPRELIBS =
-
-DEPLIBS =
-
-INCLUDES = -I$(TOP)/include $(TOP_X_INCLUDES)/X11
-CPP_PROGRAM = CppCmd
-CPP_DEFINES = -DCPP_PROGRAM="\"$(CPP_PROGRAM)\""
-GCC_COMMAND = $(CC) -fmerge-constants -xc /dev/null -S -o /dev/null 2> /dev/null 1> /dev/null
-GCC_DEFINES = -DHAS_MERGE_CONSTANTS=`if $(GCC_COMMAND); then echo 1; else echo 0; fi`
-
-EXTRA_DEFINES=-DMONOLITH
-
-#ifdef CrossCompileDir
-CROSSCOMPILEDIR = CrossCompileDir
-CROSSCOMPILEDEFINES=-DCROSSCOMPILE -DCROSSCOMPILEDIR=\"$(CROSSCOMPILEDIR)\"
-#else
-CROSSCOMPILEDIR =
-CROSSCOMPILEDEFINES=
-BOOTSTRAPDEFINES =
-#endif
-
-DEFINES = $(SIGNAL_DEFINES) $(BOOTSTRAPCFLAGS) $(CPP_DEFINES) $(GCC_DEFINES) \
-	 $(CROSSCOMPILEDEFINES)
-
-EXTRAMANDEFS = -D__cpp__="\"$(CPP_PROGRAM)\""
-
-#if defined(MacIIArchitecture) || defined(SequentArchitecture) || defined(i386ScoArchitecture)
-XBSDLIB = /**/
-#endif
-
-#ifdef CrossCompileDir
-# ifdef TargetPreProcessCmd
-CPP = TargetPreProcessCmd
-# else
-CPP = CrossCompileDir/cc -E -
-# endif
-IMAKEMDEFS_CPPDEFINES = $(DEFINES) -DCROSSCOMPILE_CPP
-CppFileTarget(imakemdep_cpp.h,imakemdep.h,$(IMAKEMDEFS_CPPDEFINES),\
-	NullParameter)
-#endif
-
-#undef ImakeDependency
-#define ImakeDependency(dummy) @@\
-imake.o: imakemdep_cpp.h @@\
-Makefile::  ProgramTargetName(imake)
-
-#if CrossCompiling
-SimpleHostProgramTarget(imake)
-#else
-SimpleProgramTarget(imake)
-#endif
-
-imakeonly:: $(PROGRAM)
-
-InstallDriverSDKNamedProg(imake,imake,$(DRIVERSDKDIR)/config/imake)
-
-#if HasClearmake
-bootstrapdepend: depend
-#else
-bootstrapdepend:
-#endif
-
-clean::
-	RemoveFile(ProgramTargetName(ccimake))
-	RemoveFile(Makefile.proto)
-	RemoveFile(imakemdep_cpp.h)
-	$(RM) -r bootstrap
-
-#ifdef OS2Architecture
-clean::
-	RemoveFiles(imake ccimake)
-
-#endif
diff --git a/nx-X11/config/imake/Makefile.ini b/nx-X11/config/imake/Makefile.ini
deleted file mode 100644
index 93dca8584..000000000
--- a/nx-X11/config/imake/Makefile.ini
+++ /dev/null
@@ -1,85 +0,0 @@
-# $Xorg: Makefile.ini,v 1.3 2000/08/17 19:41:50 cpqbld Exp $
-#
-#   WARNING    WARNING    WARNING    WARNING    WARNING    WARNING    WARNING
-#
-# This is NOT an automatically generated Makefile!  It is hand-crafted as a 
-# bootstrap, may need editing for your system.  The BOOTSTRAPCFLAGS variable
-# may be given at the top of the build tree for systems that do not define
-# any machine-specific preprocessor symbols.
-#
-# $XFree86: xc/config/imake/Makefile.ini,v 3.9 2000/10/26 17:57:45 dawes Exp $
-
-CROSSCOMPILEDIR =
-CROSSCOMPILEFLAGS = -DCROSSCOMPILEDIR=\"$(CROSSCOMPILEDIR)\"
-BOOTSTRAPCFLAGS = 
-CC = cc
-PREPROCESS_CMD = cc -E
-CDEBUGFLAGS = -O
-INCLUDES = -I../../include -I../../imports/x11/include/X11
-CFLAGS = $(BOOTSTRAPCFLAGS) $(CDEBUGFLAGS) $(INCLUDES) -DMONOLITH
-IMAKEMDEP_CROSSCOMPILE = -DCROSSCOMPILE_CPP
-SHELL = /bin/sh
-RM = rm -f
-MV = mv
-RM_CMD = $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a \
-	 tags TAGS make.log
-NPROC = 1
-
-imake::
-	@echo "making imake with BOOTSTRAPCFLAGS=$(BOOTSTRAPCFLAGS) and CROSSCOMPILEFLAGS=$(CROSSCOMPILEFLAGS) in config/imake"
-
-imake:: imake.o
-	$(CC) -o imake $(CFLAGS) imake.o
-
-imake.o: ccimake imake.c imakemdep_cpp.h
-	$(CC) -c $(CFLAGS) `./ccimake` imake.c
-
-ccimake: ccimake.c
-	$(CC) -o ccimake $(CROSSCOMPILEFLAGS) $(CFLAGS) ccimake.c
-
-imakemdep_cpp.h: ccimake imakemdep.h
-	if [ -n "$(CROSSCOMPILEDIR)" ] ; then \
-	$(CROSSCOMPILEDIR)/$(PREPROCESS_CMD) `./ccimake` \
-	$(IMAKEMDEP_CROSSCOMPILE) imakemdep.h > imakemdep_cpp.h; \
-	else touch imakemdep_cpp.h; fi
-
-# a derived object erroneously would get shared across platforms by clearmake
-.NO_CONFIG_REC: ccimake
-
-bootstrap:
-	-@if [ -d bootstrap ]; then exit 0; else set -x; mkdir bootstrap; fi
-	$(MV) *.o bootstrap
-	@if [ -f imake.exe ]; then set -x; $(MV) imake.exe bootstrap; \
-	 elif [ -f imake ]; then set -x; $(MV) imake bootstrap; else exit 0; fi
-
-relink:
-	$(RM) imake
-	$(MAKE) $(MFLAGS) imake
-
-clean:
-	$(RM) ccimake imake.o imake
-	$(RM_CMD) \#*
-	$(RM) -r Makefile.proto Makefile Makefile.dep bootstrap
-	$(RM) imakemdep_cpp.h
-
-depend:
-
-imake.exe::
-	@echo making imake with BOOTSTRAPCFLAGS=-DWIN32
-
-imake.exe:: imake.obj
-	cl -nologo imake.obj libc.lib kernel32.lib
-
-imake.obj: imake.c
-	cl -nologo -W2 -D__STDC__ -c -DWIN32 $(CFLAGS) imake.c
-
-clean.Win32:
-	if exist imake.exe del imake.exe
-	if exist imake.obj del imake.obj
-
-clean.os2:
-	imakesvc 4 imake imake.exe imake.o /imake.exe
-
-imake.os2: imake.c
-	$(CC) -DBSD43 $(CFLAGS) -o imake.exe imake.c
-	copy imake.exe \\ 
diff --git a/nx-X11/config/imake/ccimake.c b/nx-X11/config/imake/ccimake.c
deleted file mode 100644
index 30524d55f..000000000
--- a/nx-X11/config/imake/ccimake.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* $Xorg: ccimake.c,v 1.4 2001/02/09 02:03:15 xorgcvs Exp $ */
-/*
-
-Copyright (c) 1993, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group .
-
-*/
-/* $XFree86: xc/config/imake/ccimake.c,v 1.2 2001/04/01 13:59:56 tsi Exp $ */
-
-/* 
- * Warning:  This file must be kept as simple as possible so that it can 
- * compile without any special flags on all systems.  Do not touch it unless
- * you *really* know what you're doing.  Make changes in imakemdep.h, not here.
- */
-
-#define CCIMAKE			/* only get imake_ccflags definitions */
-#include "imakemdep.h"		/* things to set when porting imake */
-
-#ifndef imake_ccflags
-# define imake_ccflags "-O"
-#endif
-
-#ifndef CROSSCOMPILEDIR
-# define CROSSCOMPILEDIR "" 
-#endif
-
-#define crosscompile_ccflags " -DCROSSCOMPILE "
-#define crosscompiledir_str "-DCROSSCOMPILEDIR="
-
-int
-main()
-{
-        if (CROSSCOMPILEDIR[0] != '\0') {
-	    write(1, crosscompiledir_str, sizeof(crosscompiledir_str) - 1);
-	    write(1,"\"",1);
-	    write(1, CROSSCOMPILEDIR, sizeof(CROSSCOMPILEDIR) - 1);
-	    write(1,"\"",1);
-	    write(1, crosscompile_ccflags, sizeof(crosscompile_ccflags) - 1);
-	}
-	write(1, imake_ccflags, sizeof(imake_ccflags) - 1);
-	return 0;
-}
-
diff --git a/nx-X11/config/imake/imake.c b/nx-X11/config/imake/imake.c
deleted file mode 100644
index 86b9ad6c1..000000000
--- a/nx-X11/config/imake/imake.c
+++ /dev/null
@@ -1,2190 +0,0 @@
-
-/***************************************************************************
- *                                                                         *
- *                                Porting Note                             *
- *                                                                         *
- * Add the value of BOOTSTRAPCFLAGS to the cpp_argv table so that it will  *
- * be passed to the template file.                                         *
- *                                                                         *
- ***************************************************************************/
-/*
- *
-Copyright (c) 1985, 1986, 1987, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- *
- * Original Author:
- *	Todd Brunhoff
- *	Tektronix, inc.
- *	While a guest engineer at Project Athena, MIT
- *
- * imake: the include-make program.
- *
- * Usage: imake [-Idir] [-Ddefine] [-T template] [-f imakefile ] [-C Imakefile.c ] [-s] [-e] [-v] [make flags]
- *
- * Imake takes a template file (Imake.tmpl) and a prototype (Imakefile)
- * and runs cpp on them producing a Makefile.  It then optionally runs make
- * on the Makefile.
- * Options:
- *		-D	define.  Same as cpp -D argument.
- *		-U	undefine.  Same as cpp -U argument.
- *		-W	warning.  Same as cpp -W argument.
- *		-I	Include directory.  Same as cpp -I argument.
- *		-T	template.  Designate a template other
- *			than Imake.tmpl
- *		-f	specify the Imakefile file
- *		-C	specify the name to use instead of Imakefile.c
- *		-s[F]	show.  Show the produced makefile on the standard
- *			output.  Make is not run is this case.  If a file
- *			argument is provided, the output is placed there.
- *		-e[F]	execute instead of show; optionally name Makefile F
- *		-v	verbose.  Show the make command line executed.
- *
- * Environment variables:
- *
- *		IMAKEINCLUDE	Include directory to use in addition to "."
- *		IMAKECPP	Cpp to use instead of /lib/cpp
- *		IMAKEMAKE	make program to use other than what is
- *				found by searching the $PATH variable.
- * Other features:
- *	imake reads the entire cpp output into memory and then scans it
- *	for occurences of "@@".  If it encounters them, it replaces it with
- *	a newline.  It also trims any trailing white space on output lines
- *	(because make gets upset at them).  This helps when cpp expands
- *	multi-line macros but you want them to appear on multiple lines.
- *	It also changes occurences of "XCOMM" to "#", to avoid problems
- *	with treating commands as invalid preprocessor commands.
- *
- *	The macros MAKEFILE and MAKE are provided as macros
- *	to make.  MAKEFILE is set to imake's makefile (not the constructed,
- *	preprocessed one) and MAKE is set to argv[0], i.e. the name of
- *	the imake program.
- *
- * Theory of operation:
- *   1. Determine the name of the imakefile from the command line (-f)
- *	or from the content of the current directory (Imakefile or imakefile).
- *	Call this <imakefile>.  This gets added to the arguments for
- *	make as MAKEFILE=<imakefile>.
- *   2. Determine the name of the template from the command line (-T)
- *	or the default, Imake.tmpl.  Call this <template>
- *   3. Determine the name of the imakeCfile from the command line (-C)
- *	or the default, Imakefile.c.  Call this <imakeCfile>
- *   4. Store lines of input into <imakeCfile>:
- *	- A c-style comment header (see ImakefileCHeader below), used
- *	  to recognize temporary files generated by imake.
- *	- If DEFAULT_OS_NAME is defined, format the utsname struct and
- *	  call the result <defaultOsName>.  Add:
- *		#define DefaultOSName <defaultOsName>
- *	- If DEFAULT_OS_MAJOR_REV is defined, format the utsname struct
- *	  and call the result <defaultOsMajorVersion>.  Add:
- *		#define DefaultOSMajorVersion <defaultOsMajorVersion>
- *	- If DEFAULT_OS_MINOR_REV is defined, format the utsname struct
- *	  and call the result <defaultOsMinorVersion>.  Add:
- *		#define DefaultOSMinorVersion <defaultOsMinorVersion>
- *	- If DEFAULT_OS_TEENY_REV is defined, format the utsname struct
- *	  and call the result <defaultOsTeenyVersion>.  Add:
- *		#define DefaultOSTeenyVersion <defaultOsTeenyVersion>
- *	- If DEFAULT_MACHINE_ARCITECTURE is defined, format the utsname struct
- *	  and define the corresponding macro.  (For example on the amiga,
- *	  this will define amiga in addition to m68k).
- *	- If the file "localdefines" is readable in the current
- *	  directory, print a warning message to stderr and add:
- *		#define IMAKE_LOCAL_DEFINES	"localdefines"
- *		#include IMAKE_LOCAL_DEFINES
- *	- If the file "admindefines" is readable in the current
- *	  directory, print a warning message to stderr and add:
- *		#define IMAKE_ADMIN_DEFINES	"admindefines"
- *		#include IMAKE_ADMIN_DEFINES
- *	- The following lines:
- *		#define INCLUDE_IMAKEFILE	< <imakefile> >
- *		#define IMAKE_TEMPLATE		" <template> "
- *		#include IMAKE_TEMPLATE
- *	- If the file "adminmacros" is readable in the current
- *	  directory, print a warning message to stderr and add:
- *		#define IMAKE_ADMIN_MACROS	"adminmacros"
- *		#include IMAKE_ADMIN_MACROS
- *	- If the file "localmacros" is readable in the current
- *	  directory, print a warning message to stderr and add:
- *		#define IMAKE_LOCAL_MACROS	"localmacros"
- *		#include IMAKE_LOCAL_MACROS
- *   5. Start up cpp and provide it with this file.
- *	Note that the define for INCLUDE_IMAKEFILE is intended for
- *	use in the template file.  This implies that the imake is
- *	useless unless the template file contains at least the line
- *		#include INCLUDE_IMAKEFILE
- *   6. Gather the output from cpp, and clean it up, expanding @@ to
- *	newlines, stripping trailing white space, cpp control lines,
- *	and extra blank lines, and changing XCOMM to #.  This cleaned
- *	output is placed in a new file, default "Makefile", but can
- *	be specified with -s or -e options.
- *   7. Optionally start up make on the resulting file.
- *
- * The design of the template makefile should therefore be:
- *	<set global macros like CFLAGS, etc.>
- *	<include machine dependent additions>
- *	#include INCLUDE_IMAKEFILE
- *	<add any global targets like 'clean' and long dependencies>
- */
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
-/* This needs to be before _POSIX_SOURCE gets defined */
-# include <sys/param.h>
-# include <sys/types.h>
-# include <sys/sysctl.h>
-#endif
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <X11/Xfuncproto.h>
-#include <X11/Xosdefs.h>
-#include <string.h>
-#include <ctype.h>
-#ifdef WIN32
-# include "Xw32defs.h"
-#endif
-#include <sys/types.h>
-#include <fcntl.h>
-#ifdef X_NOT_POSIX
-# ifndef WIN32
-#  include <sys/file.h>
-# endif
-#else
-# include <unistd.h>
-#endif
-#ifdef ISC
-# include <unistd.h>
-#endif
-#if defined(X_NOT_POSIX) || defined(_POSIX_SOURCE)
-# include <signal.h>
-#else
-# define _POSIX_SOURCE
-# include <signal.h>
-# undef _POSIX_SOURCE
-#endif
-#if !defined(SIGCHLD) && defined(SIGCLD)
-# define SIGCHLD		SIGCLD
-#endif
-#include <sys/stat.h>
-#ifndef X_NOT_POSIX
-# ifdef _POSIX_SOURCE
-#  ifdef __SCO__
-#   include <sys/procset.h>
-#   include <sys/siginfo.h>
-#  endif
-#  include <sys/wait.h>
-# else
-#  define _POSIX_SOURCE
-#  include <sys/wait.h>
-#  undef _POSIX_SOURCE
-# endif
-# define waitCode(w)	WEXITSTATUS(w)
-# define waitSig(w)	WTERMSIG(w)
-typedef int		waitType;
-#else /* X_NOT_POSIX */
-# ifdef SYSV
-#  define waitCode(w)	(((w) >> 8) & 0x7f)
-#  define waitSig(w)	((w) & 0xff)
-typedef int		waitType;
-# else /* SYSV */
-#  ifdef WIN32
-#   include <process.h>
-typedef int		waitType;
-#  else
-#   include <sys/wait.h>
-#   define waitCode(w)	((w).w_T.w_Retcode)
-#   define waitSig(w)	((w).w_T.w_Termsig)
-typedef union wait	waitType;
-#  endif
-# endif
-# ifndef WIFSIGNALED
-#  define WIFSIGNALED(w) waitSig(w)
-# endif
-# ifndef WIFEXITED
-#  define WIFEXITED(w) waitCode(w)
-# endif
-#endif /* X_NOT_POSIX */
-#include <stdlib.h>
-#include <errno.h>
-#ifdef __minix_vmd
-# define USE_FREOPEN		1
-#endif
-
-#ifndef WIN32
-# include <sys/utsname.h>
-#else
-# include <windows.h>
-#endif
-#ifndef SYS_NMLN
-# ifdef _SYS_NMLN
-#  define SYS_NMLN _SYS_NMLN
-# else
-#  define SYS_NMLN 257
-# endif
-#endif
-#if defined(linux) || defined(__GNU__) || defined(__GLIBC__)
-# include <limits.h>
-# include <stdio.h>
-#endif
-#ifdef __QNX__
-# include <unix.h>
-#endif
-
-#if defined(__NetBSD__)		/* see code clock in init() below */
-# include <sys/utsname.h>
-#endif
-
-typedef unsigned char boolean;
-#define TRUE		1
-#define FALSE		0
-
-#include "imakemdep.h"
-#ifdef CROSSCOMPILE
-# include "imakemdep_cpp.h"
-#endif
-
-#if defined CROSSCOMPILE || defined FIXUP_CPP_WHITESPACE
-int InRule = FALSE;
-#endif
-#if defined CROSSCOMPILE || defined INLINE_SYNTAX
-int InInline = 0;
-#endif
-#if defined CROSSCOMPILE || defined MAGIC_MAKE_VARS
-int xvariable = 0;
-int xvariables[10];
-#endif
-
-#ifndef PATH_MAX
-# define PATH_MAX 1024
-#endif
-
-/*
- * Some versions of cpp reduce all tabs in macro expansion to a single
- * space.  In addition, the escaped newline may be replaced with a
- * space instead of being deleted.  Blech.
- */
-void KludgeOutputLine(char **), KludgeResetRule(void);
-
-#ifndef CROSSCOMPILE
-# ifdef USE_CC_E
-#  ifndef DEFAULT_CC
-#   define DEFAULT_CC "cc"
-#  endif
-# else
-#  ifndef DEFAULT_CPP
-#   ifdef CPP_PROGRAM
-#    define DEFAULT_CPP CPP_PROGRAM
-#   else
-#    define DEFAULT_CPP "/lib/cpp"
-#   endif
-#  endif
-# endif
-#endif
-
-const char *cpp = NULL;
-
-const char	*tmpMakefile;
-const char	*tmpMakefileTemplate = "/tmp/Imf.XXXXXX";
-const char	*tmpImakefile;
-const char	*tmpImakefileTemplate = "/tmp/IIf.XXXXXX";
-const char	*make_argv[ ARGUMENTS ] = {
-#ifdef WIN32
-    "nmake"
-#else
-    "make"
-#endif
-};
-
-int	make_argindex;
-int	cpp_argindex;
-const char	*Imakefile = NULL;
-const char	*Makefile = "Makefile";
-const char	*Template = "Imake.tmpl";
-const char	*ImakefileC = "Imakefile.c";
-boolean haveImakefileC = FALSE;
-const char	*cleanedImakefile = NULL;
-const char	*program;
-const char	*FindImakefile(const char *Imakefile);
-char	*ReadLine(FILE *tmpfd, const char *tmpfname);
-const char	*CleanCppInput(const char *imakefile);
-char	*Strdup(const char *cp);
-char	*Emalloc(int size);
-void	LogFatal(const char *x0, ...) _X_ATTRIBUTE_PRINTF(1, 2);
-void	LogMsg(const char *x0, ...) _X_ATTRIBUTE_PRINTF(1, 2);
-
-void	showit(FILE *fd);
-void	wrapup(void);
-void	init(void);
-void	AddMakeArg(const char *arg);
-void	AddCppArg(const char *arg);
-#ifdef CROSSCOMPILE
-char	*CrossCompileCPP(void);
-#endif
-void	SetOpts(int argc, char **argv);
-void	CheckImakefileC(const char *masterc);
-void	cppit(const char *imakefile, const char *template, const char *masterc,
-	      FILE *outfd, const char *outfname);
-void	makeit(void);
-void	CleanCppOutput(FILE *tmpfd, const char *tmpfname);
-boolean isempty(char *line);
-void	writetmpfile(FILE *fd, const char *buf, int cnt, const char *fname);
-#ifdef SIGNALRETURNSINT
-int	catch(int sig);
-#else
-void	catch(int sig);
-#endif
-void	showargs(const char **argv);
-boolean optional_include(FILE *inFile, const char *defsym, const char *fname);
-void	  doit(FILE *outfd, const char *cmd, const char **argv);
-boolean define_os_defaults(FILE *inFile);
-#ifdef CROSSCOMPILE
-static void get_cross_compile_dir(FILE *inFile);
-#endif
-#ifdef CROSSCOMPILEDIR
-const char *CrossCompileDir = CROSSCOMPILEDIR;
-#else
-const char *CrossCompileDir = "";
-#endif
-boolean CrossCompiling = FALSE;
-
-
-
-boolean verbose = FALSE;
-boolean show = TRUE;
-
-int
-main(int argc, char *argv[])
-{
-	FILE	*tmpfd = NULL;
-	char	makeMacro[ BUFSIZ ];
-	char	makefileMacro[ BUFSIZ ];
-	int	lenCrossCompileDir = 0;
-
-	program = argv[0];
-	init();
-
-	lenCrossCompileDir = strlen(CrossCompileDir);
-	if (lenCrossCompileDir) {
-	    if (lenCrossCompileDir > (PATH_MAX - 20))
-	      LogFatal("Cross compile directory path too long %s\n",
-		       CrossCompileDir);
-	    else
-		CrossCompiling = TRUE;
-	}
-
-	SetOpts(argc, argv);
-	Imakefile = FindImakefile(Imakefile);
-	CheckImakefileC(ImakefileC);
-	if (Makefile) {
-		tmpMakefile = Makefile;
-		if ((tmpfd = fopen(tmpMakefile, "w+")) == NULL)
-		   LogFatal("Cannot create temporary file %s.", tmpMakefile);
-	} else {
-#ifdef HAVE_MKSTEMP
-		int fd;
-#endif
-		char *tmpMakefileName = Strdup(tmpMakefileTemplate);
-#ifndef HAVE_MKSTEMP
-		if (mktemp(tmpMakefileName) == NULL ||
-		    (tmpfd = fopen(tmpMakefileName, "w+")) == NULL) {
-		   LogFatal("Cannot create temporary file %s.", tmpMakefileName);
-		}
-#else
-		fd = mkstemp(tmpMakefileName);
-		if (fd == -1 || (tmpfd = fdopen(fd, "w+")) == NULL) {
-		   if (fd != -1) {
-		      unlink(tmpMakefileName); close(fd);
-		   }
-		   LogFatal("Cannot create temporary file %s.", tmpMakefileName);
-		}
-#endif
-		tmpMakefile = tmpMakefileName;
-	}
-	AddMakeArg("-f");
-	AddMakeArg( tmpMakefile );
-	sprintf(makeMacro, "MAKE=%s", program);
-	AddMakeArg( makeMacro );
-	sprintf(makefileMacro, "MAKEFILE=%s", Imakefile);
-	AddMakeArg( makefileMacro );
-
-	cleanedImakefile = CleanCppInput(Imakefile);
-	cppit(cleanedImakefile, Template, ImakefileC, tmpfd, tmpMakefile);
-
-	if (show) {
-		if (Makefile == NULL)
-			showit(tmpfd);
-	} else
-		makeit();
-	wrapup();
-	exit(0);
-}
-
-void
-showit(FILE *fd)
-{
-	char	buf[ BUFSIZ ];
-	int	red;
-
-	fseek(fd, 0, 0);
-	while ((red = fread(buf, 1, BUFSIZ, fd)) > 0)
-		writetmpfile(stdout, buf, red, "stdout");
-	if (red < 0)
-	    LogFatal("Cannot read %s.", tmpMakefile);
-}
-
-void
-wrapup(void)
-{
-	if (tmpMakefile != Makefile)
-		unlink(tmpMakefile);
-	if (cleanedImakefile && cleanedImakefile != Imakefile)
-		unlink(cleanedImakefile);
-	if (haveImakefileC)
-		unlink(ImakefileC);
-}
-
-#ifdef SIGNALRETURNSINT
-int
-#else
-void
-#endif
-catch(int sig)
-{
-	errno = 0;
-	LogFatal("Signal %d.", sig);
-}
-
-/*
- * Initialize some variables.
- */
-void
-init(void)
-{
-	register char	*p;
-
-	make_argindex=0;
-	while (make_argv[ make_argindex ] != NULL)
-		make_argindex++;
-	cpp_argindex = 0;
-	while (cpp_argv[ cpp_argindex ] != NULL)
-		cpp_argindex++;
-
-#if defined CROSSCOMPILE
-	if (sys == netBSD)
-	  if (CrossCompiling) {
-	    LogFatal("fix imake to do crosscompiling for NetBSD\n","");
-	  } else
-#endif
-#if defined(__NetBSD__) || defined CROSSCOMPILE
-	{
-		struct utsname uts;
-		static char argument[512];
-
-		/*
-		 * Sharable imake configurations require a
-		 * machine identifier.
-		 */
-		if (uname(&uts) != 0)
-			LogFatal("uname(3) failed; can't tell what %s",
-			    "kind of machine you have.");
-
-		memset(argument, 0, sizeof(argument));
-		(void)snprintf(argument, sizeof(argument) - 1,
-		    "-D__%s__", uts.machine);
-
-		AddCppArg(argument);
-	}
-#endif /* __NetBSD__ */
-
-	/*
-	 * See if the standard include directory is different than
-	 * the default.  Or if cpp is not the default.  Or if the make
-	 * found by the PATH variable is not the default.
-	 */
-	if ((p = getenv("IMAKEINCLUDE"))) {
-		if (*p != '-' || *(p+1) != 'I')
-			LogFatal("Environment var IMAKEINCLUDE %s",
-				"must begin with -I");
-		AddCppArg(p);
-		for (; *p; p++)
-			if (*p == ' ') {
-				*p++ = '\0';
-				AddCppArg(p);
-			}
-	}
-	if ((p = getenv("IMAKECPP")))
-		cpp = p;
-	if ((p = getenv("IMAKEMAKE")))
-		make_argv[0] = p;
-
-	if (signal(SIGINT, SIG_IGN) != SIG_IGN)
-		signal(SIGINT, catch);
-#ifdef SIGCHLD
-	signal(SIGCHLD, SIG_DFL);
-#endif
-}
-
-void
-AddMakeArg(const char *arg)
-{
-	errno = 0;
-	if (make_argindex >= ARGUMENTS-1)
-		LogFatal("Out of internal storage.");
-	make_argv[ make_argindex++ ] = arg;
-	make_argv[ make_argindex ] = NULL;
-}
-
-void
-AddCppArg(const char *arg)
-{
-	errno = 0;
-	if (cpp_argindex >= ARGUMENTS-1)
-		LogFatal("Out of internal storage.");
-	cpp_argv[ cpp_argindex++ ] = arg;
-	cpp_argv[ cpp_argindex ] = NULL;
-}
-
-void
-SetOpts(int argc, char **argv)
-{
-
-	errno = 0;
-	/*
-	 * Now gather the arguments for make
-	 */
-	for(argc--, argv++; argc; argc--, argv++) {
-	    /*
-	     * We intercept these flags.
-	     */
-	    if (argv[0][0] == '-') {
-		if (argv[0][1] == 'D') {
-		    AddCppArg(argv[0]);
-		} else if (argv[0][1] == 'I') {
-		    AddCppArg(argv[0]);
-		} else if (argv[0][1] == 'U') {
-		    AddCppArg(argv[0]);
-		} else if (argv[0][1] == 'W') {
-		    AddCppArg(argv[0]);
-		} else if (argv[0][1] == 'f') {
-		    if (argv[0][2])
-			Imakefile = argv[0]+2;
-		    else {
-			argc--, argv++;
-			if (! argc)
-			    LogFatal("No description arg after -f flag");
-			Imakefile = argv[0];
-		    }
-		} else if (argv[0][1] == 's') {
-		    if (argv[0][2])
-			Makefile = ((argv[0][2] == '-') && !argv[0][3]) ?
-			    NULL : argv[0]+2;
-		    else {
-			argc--, argv++;
-			if (!argc)
-			    LogFatal("No description arg after -s flag");
-			Makefile = ((argv[0][0] == '-') && !argv[0][1]) ?
-			    NULL : argv[0];
-		    }
-		    show = TRUE;
-		} else if (argv[0][1] == 'e') {
-		   Makefile = (argv[0][2] ? argv[0]+2 : NULL);
-		   show = FALSE;
-		} else if (argv[0][1] == 'T') {
-		    if (argv[0][2])
-			Template = argv[0]+2;
-		    else {
-			argc--, argv++;
-			if (! argc)
-			    LogFatal("No description arg after -T flag");
-			Template = argv[0];
-		    }
-		} else if (argv[0][1] == 'C') {
-		    if (argv[0][2])
-			ImakefileC = argv[0]+2;
-		    else {
-			argc--, argv++;
-			if (! argc)
-			    LogFatal("No imakeCfile arg after -C flag");
-			ImakefileC = argv[0];
-		    }
-		} else if (argv[0][1] == 'v') {
-		    verbose = TRUE;
-		} else
-		    AddMakeArg(argv[0]);
-	    } else
-		AddMakeArg(argv[0]);
-	}
-
-#ifndef CROSSCOMPILE
-# ifdef USE_CC_E
-	    if (!cpp)
-	    {
-		AddCppArg("-E");
-#  ifdef __GNUC__
-		if (verbose)
-		    AddCppArg("-v");
-#  endif
-		cpp = DEFAULT_CC;
-	    }
-# else
-	    if (!cpp)
-		cpp = DEFAULT_CPP;
-# endif
-#else
-	    if (!cpp)
-		cpp = CrossCompileCPP();
-#endif
-
-	cpp_argv[0] = cpp;
-	AddCppArg(ImakefileC);
-}
-
-const char *
-FindImakefile(const char *Imakefile)
-{
-	if (Imakefile) {
-		if (access(Imakefile, R_OK) < 0)
-			LogFatal("Cannot find %s.", Imakefile);
-	} else {
-		if (access("Imakefile", R_OK) < 0) {
-			if (access("imakefile", R_OK) < 0)
-				LogFatal("No description file.");
-			else
-				Imakefile = "imakefile";
-		} else
-			Imakefile = "Imakefile";
-	}
-	return(Imakefile);
-}
-
-static void _X_ATTRIBUTE_PRINTF(1, 0)
-vLogMsg(const char *fmt, va_list args)
-{
-	int error_number = errno;
-
-	if (error_number) {
-		fprintf(stderr, "%s: ", program);
-		fprintf(stderr, "%s\n", strerror(error_number));
-	}
-	fprintf(stderr, "%s: ", program);
-	vfprintf(stderr, fmt, args);
-	fprintf(stderr, "\n");
-}
-
-void
-LogFatal(const char *fmt, ...)
-{
-	static boolean entered = FALSE;
-	va_list args;
-
-	if (entered)
-		return;
-	entered = TRUE;
-
-	va_start(args, fmt);
-	vLogMsg(fmt, args);
-	va_end(args);
-	fprintf(stderr, "  Stop.\n");
-	wrapup();
-	exit(1);
-}
-
-void
-LogMsg(const char *fmt, ...)
-{
-	va_list args;
-
-	va_start(args, fmt);
-	vLogMsg(fmt, args);
-	va_end(args);
-}
-
-void
-showargs(const char **argv)
-{
-	for (; *argv; argv++)
-		fprintf(stderr, "%s ", *argv);
-	fprintf(stderr, "\n");
-}
-
-#define ImakefileCHeader "/* imake - temporary file */"
-
-void
-CheckImakefileC(const char *masterc)
-{
-	char mkcbuf[1024];
-	FILE *inFile;
-
-	if (access(masterc, F_OK) == 0) {
-		inFile = fopen(masterc, "r");
-		if (inFile == NULL)
-			LogFatal("Refuse to overwrite: %s", masterc);
-		if ((fgets(mkcbuf, sizeof(mkcbuf), inFile) &&
-		     strncmp(mkcbuf, ImakefileCHeader,
-			     sizeof(ImakefileCHeader)-1)))
-		{
-			fclose(inFile);
-			LogFatal("Refuse to overwrite: %s", masterc);
-		}
-		else
-			fclose(inFile);
-	}
-}
-
-#define LocalDefineFmt	"#define %s \"%s\"\n"
-#define IncludeFmt	"#include %s\n"
-#define ImakeDefSym	"INCLUDE_IMAKEFILE"
-#define ImakeTmplSym	"IMAKE_TEMPLATE"
-#define OverrideWarning "Warning: local file \"%s\" overrides global macros."
-
-boolean
-optional_include(FILE *inFile, const char *defsym, const char *fname)
-{
-	errno = 0;
-	if (access(fname, R_OK) == 0) {
-		LogMsg(OverrideWarning, fname);
-		return (fprintf(inFile, LocalDefineFmt, defsym, fname) < 0 ||
-			fprintf(inFile, IncludeFmt, defsym) < 0);
-	}
-	return FALSE;
-}
-
-void
-doit(FILE *outfd, const char *cmd, const char **argv)
-{
-	int		pid;
-	waitType	status;
-
-	/*
-	 * Fork and exec the command.
-	 */
-#ifdef WIN32
-	if (outfd)
-		dup2(fileno(outfd), 1);
-	status = _spawnvp(_P_WAIT, cmd, argv);
-	if (status < 0)
-		LogFatal("Cannot spawn %s.", cmd);
-	if (status > 0)
-		LogFatal("Exit code %d.", status);
-#else
-	pid = fork();
-	if (pid < 0)
-		LogFatal("Cannot fork.");
-	if (pid) {	/* parent... simply wait */
-		while (wait(&status) > 0) {
-			errno = 0;
-			if (WIFSIGNALED(status))
-				LogFatal("Signal %d.", waitSig(status));
-			if (WIFEXITED(status) && waitCode(status))
-				LogFatal("Exit code %d.", waitCode(status));
-		}
-	}
-	else {	/* child... dup and exec cmd */
-		if (verbose)
-			showargs(argv);
-		if (outfd)
-			dup2(fileno(outfd), 1);
-		execvp(cmd, argv);
-		LogFatal("Cannot exec %s.", cmd);
-	}
-#endif
-}
-
-#if !defined WIN32
-static void
-parse_utsname(struct utsname *name, const char *fmt, char *result, const char *msg)
-{
-  char buf[SYS_NMLN * 5 + 1];
-  char *ptr = buf;
-  int arg;
-
-  if (!name)
-      LogFatal(msg,fmt);
-
-  /* Assemble all the pieces into a buffer. */
-  for (arg = 0; fmt[arg] != ' '; arg++)
-    {
-      /* Our buffer is only guaranteed to hold 5 arguments. */
-      if (arg >= 5)
-	LogFatal(msg, fmt);
-
-      switch (fmt[arg])
-	{
-	case 's':
-	  if (arg > 0)
-	    *ptr++ = ' ';
-	  strcpy(ptr, name->sysname);
-	  ptr += strlen(ptr);
-	  break;
-
-	case 'n':
-	  if (arg > 0)
-	    *ptr++ = ' ';
-	  strcpy(ptr, name->nodename);
-	  ptr += strlen(ptr);
-	  break;
-
-	case 'r':
-	  if (arg > 0)
-	    *ptr++ = ' ';
-	  strcpy(ptr, name->release);
-	  ptr += strlen(ptr);
-	  break;
-
-	case 'v':
-	  if (arg > 0)
-	    *ptr++ = ' ';
-	  strcpy(ptr, name->version);
-	  ptr += strlen(ptr);
-	  break;
-
-	case 'm':
-	  if (arg > 0)
-	    *ptr++ = ' ';
-	  strcpy(ptr, name->machine);
-	  ptr += strlen(ptr);
-	  break;
-
-	default:
-	  LogFatal(msg, fmt);
-	}
-    }
-
-  /* Just in case... */
-  if (strlen(buf) >= sizeof(buf))
-    LogFatal("Buffer overflow parsing uname.");
-
-  /* Parse the buffer.  The sscanf() return value is rarely correct. */
-  *result = '\0';
-  (void) sscanf(buf, fmt + arg + 1, result);
-}
-
-/* Trim leading 0's and periods from version names.  The 0's cause
-   the number to be interpreted as octal numbers.  Some version strings
-   have the potential for different numbers of .'s in them.
- */
-
-static char *
-trim_version(char *p)
-{
-
-	if (p != 0 && *p != '\0')
-	{
-		while ((*p == '0' || *p == '.') && *(p + 1) != '\0')
-			++p;
-	}
-	return (p);
-}
-#endif
-
-#if defined(linux) || defined(__GLIBC__)
-const char *libc_c=
-"#include <stdio.h>\n"
-"#include <ctype.h>\n"
-"\n"
-"#if 1\n"
-"#pragma weak gnu_get_libc_version\n"
-"#pragma weak __libc_version\n"
-"#pragma weak __linux_C_lib_version\n"
-"#endif\n"
-"\n"
-"extern const char * gnu_get_libc_version (void);\n"
-"extern const char * __linux_C_lib_version;\n"
-"extern const char __libc_version [];\n"
-"\n"
-"int\n"
-"main ()\n"
-"{\n"
-"  int libcmajor = 0, libcminor = 0, libcteeny = 0;\n"
-"  const char * ptr = NULL;\n"
-"  int glibcmajor = 0;\n"
-"\n"
-"  if (gnu_get_libc_version != 0)\n"
-"  {\n"
-"    ptr = gnu_get_libc_version ();\n"
-"    glibcmajor = 4;\n"
-"  }\n"
-"  else if (&__libc_version != 0)\n"
-"  {\n"
-"    ptr = __libc_version;\n"
-"    glibcmajor = 4;\n"
-"  }\n"
-"  else if (&__linux_C_lib_version != 0)\n"
-"  {\n"
-"    ptr = __linux_C_lib_version;\n"
-"  }\n"
-"  else\n"
-"  {\n"
-"    libcmajor = 0; libcminor = 0; libcteeny = 0;\n"
-"  }\n"
-"\n"
-"  if (ptr)\n"
-"  {\n"
-"    while (!isdigit (*ptr))\n"
-"      ptr++;\n"
-"\n"
-"    sscanf (ptr, \"%d.%d.%d\", &libcmajor, &libcminor, &libcteeny);\n"
-"    libcmajor += glibcmajor;\n"
-"  }\n"
-"\n"
-"  printf(\"#define DefaultLinuxCLibMajorVersion %d\\n\", libcmajor);\n"
-"  printf(\"#define DefaultLinuxCLibMinorVersion %d\\n\", libcminor);\n"
-"  printf(\"#define DefaultLinuxCLibTeenyVersion %d\\n\", libcteeny);\n"
-"\n"
-"  return 0;\n"
-"}\n"
-;
-
-static void
-get_libc_version(FILE *inFile)
-{
-  char aout[4096], *tmpdir;
-  FILE *fp;
-  const char *format = "%s -o %s -x c -";
-  char *cc;
-  int len;
-  char *command;
-
-  /* If $TMPDIR is defined and has an acceptable length,
-   * use that as tmp dir, else use /tmp.  That fixes
-   * problems with /tmp mounted "noexec".
-   */
-  if((tmpdir = getenv("TMPDIR")) != NULL && strlen(tmpdir) < (4096-13))
-    strcpy(aout, tmpdir);
-  else
-    strcpy(aout, "/tmp");
-  strcat(aout, "/imakeXXXXXX");
-
-  /* Pre-create temp file safely */
-  {
-    /* Linux + ELF has mkstemp() */
-    int tmpfd;
-    if ((tmpfd = mkstemp(aout)) == -1) {
-      perror("mkstemp");
-      abort();
-    }
-    close(tmpfd);
-  }
-  cc = getenv ("CC");
-  if (cc == NULL)
-    cc = "gcc";
-  len = strlen (aout) + strlen (format) + strlen (cc);
-  if (len < 128) len = 128;
-  if((command = alloca (len)) == NULL)
-    abort();
-
-  if (snprintf (command , len, format, cc, aout) == len)
-    abort ();
-
-  fp = popen (command, "w");
-  if (fp == NULL || fprintf (fp, "%s\n", libc_c) < 0
-      || pclose (fp) != 0)
-    abort ();
-
-  fp = popen (aout, "r");
-  if (fp == NULL)
-    abort ();
-
-  while (fgets (command, len, fp))
-    fputs (command, inFile);
-
-  len = pclose (fp);
-  remove (aout);
-  if (len) {
-      /* handwave furiously */
-      printf("#define DefaultLinuxCLibMajorVersion 6\n");
-      printf("#define DefaultLinuxCLibMinorVersion 12\n");
-      printf("#define DefaultLinuxCLibTeenyVersion 0\n");
-  }
-}
-#endif
-
-#if defined(__OpenBSD__) || defined(__DragonFly__)
-static void
-get_stackprotector(FILE *inFile)
-{
-  FILE *fp;
-  char *cc;
-  char command[1024], buf[1024];
-
-  cc = getenv("CC");
-  if (cc == NULL) {
-    cc = "cc";
-  }
-  snprintf(command, sizeof(command), "%s -v 2>&1", cc);
-  fp = popen(command, "r");
-  if (fp == NULL)
-    abort();
-  while (fgets(buf, sizeof(buf), fp)) {
-    if (strstr(buf, "propolice") != NULL) {
-      fprintf(inFile, "#define ProPoliceSupport YES\n");
-      break;
-    }
-  }
-  pclose(fp);
-}
-#endif
-
-
-#if defined CROSSCOMPILE || defined linux || defined(__GLIBC__)
-static void
-get_distrib(FILE *inFile)
-{
-  struct stat sb;
-
-  static const char*   suse = "/etc/SuSE-release";
-  static const char* redhat = "/etc/redhat-release";
-  static const char* debian = "/etc/debian_version";
-
-  fprintf (inFile, "%s\n", "#define LinuxUnknown    0");
-  fprintf (inFile, "%s\n", "#define LinuxSuSE       1");
-  fprintf (inFile, "%s\n", "#define LinuxCaldera    2");
-  fprintf (inFile, "%s\n", "#define LinuxCraftworks 3");
-  fprintf (inFile, "%s\n", "#define LinuxDebian     4");
-  fprintf (inFile, "%s\n", "#define LinuxInfoMagic  5");
-  fprintf (inFile, "%s\n", "#define LinuxKheops     6");
-  fprintf (inFile, "%s\n", "#define LinuxPro        7");
-  fprintf (inFile, "%s\n", "#define LinuxRedHat     8");
-  fprintf (inFile, "%s\n", "#define LinuxSlackware  9");
-  fprintf (inFile, "%s\n", "#define LinuxTurbo      10");
-  fprintf (inFile, "%s\n", "#define LinuxWare       11");
-  fprintf (inFile, "%s\n", "#define LinuxYggdrasil  12");
-
-# ifdef CROSSCOMPILE
-  if (CrossCompiling) {
-      fprintf (inFile, "%s\n",
-	       "#define DefaultLinuxDistribution LinuxUnknown");
-      fprintf (inFile, "%s\n", "#define DefaultLinuxDistName Unknown");
-      return;
-  }
-# endif
-  if (lstat (suse, &sb) == 0) {
-    fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxSuSE");
-    fprintf (inFile, "%s\n", "#define DefaultLinuxDistName SuSE");
-    return;
-  }
-  if (lstat (redhat, &sb) == 0) {
-    fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxRedHat");
-    fprintf (inFile, "%s\n", "#define DefaultLinuxDistName RedHat");
-    return;
-  }
-  if (lstat (debian, &sb) == 0) {
-    fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxDebian");
-    fprintf (inFile, "%s\n", "#define DefaultLinuxDistName Debian");
-    /* You could also try to get the version of the Debian distrib by looking
-     * at the content of /etc/debian_version */
-    return;
-  }
-  /* what's the definitive way to tell what any particular distribution is? */
-
-  fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown");
-  fprintf (inFile, "%s\n", "#define DefaultLinuxDistName Unknown");
-  /* would like to know what version of the distribution it is */
-}
-
-static void
-get_ld_version(FILE *inFile)
-{
-  FILE* ldprog;
-  signed char c;
-  int ldmajor, ldminor;
-  const char *ld = "ld -v";
-
-# ifdef CROSSCOMPILE
-  if (CrossCompiling) {
-      char cmd[PATH_MAX];
-      strcpy (cmd, CrossCompileDir);
-      strcat (cmd,"/");
-      strcat (cmd,ld);
-      ldprog = popen (cmd, "r");
-  } else
-# endif
-      ldprog = popen (ld, "r");
-
-  if (ldprog) {
-    do {
-      c = fgetc (ldprog);
-    } while (c != EOF && !isdigit (c));
-    ungetc (c, ldprog);
-    (void) fscanf (ldprog, "%d.%d", &ldmajor, &ldminor);
-    /* Start conversion to a more rational number */
-    if ((ldmajor > 2) || ((ldmajor == 2) && (ldminor > 9)))
-	ldmajor *= 100;
-    else
-	ldmajor *= 10;
-
-    fprintf(inFile, "#define DefaultLinuxBinUtilsMajorVersion %d\n",
-	    ldmajor + ldminor);
-    pclose (ldprog);
-  }
-}
-#endif
-
-#if defined __FreeBSD__
-static void
-get_binary_format(FILE *inFile)
-{
-  int mib[2];
-  size_t len;
-  int osrel = 0;
-  FILE *objprog = NULL;
-  int iself = 0;
-  char buf[10];
-  char cmd[PATH_MAX];
-
-  mib[0] = CTL_KERN;
-  mib[1] = KERN_OSRELDATE;
-  len = sizeof(osrel);
-  sysctl(mib, 2, &osrel, &len, NULL, 0);
-  if (CrossCompiling) {
-      strcpy (cmd, CrossCompileDir);
-      strcat (cmd, "/");
-      strcat (cmd,"objformat");
-  } else
-      strcpy (cmd, "objformat");
-
-  if (osrel >= 300004 &&
-      (objprog = popen(cmd, "r")) != NULL &&
-      fgets(buf, sizeof(buf), objprog) != NULL &&
-      strncmp(buf, "elf", 3) == 0)
-    iself = 1;
-  if (objprog)
-    pclose(objprog);
-
-  fprintf(inFile, "#define DefaultToElfFormat %s\n", iself ? "YES" : "NO");
-}
-#endif
-
-#if defined(sun) && defined(__SVR4)
-/* Runs Sun compiler command and parses output - this is a bit of a hack
- * as it depends on the particular output format of the -V flag, but it's
- * worked for many releases.
- *
- * Input : cmd - command to run (called with -V flag)
- *	   path - path to command to run (use $PATH if NULL)
- * Output: cmajor & cminor - major and minor versions if found
- * Returns: 0 if successful, -1 if not.
- */
-static int
-ask_sun_compiler_for_versions(const char *cmd, const char *path,
-  int *cmajor, int *cminor)
-{
-  char buf[BUFSIZ];
-  char cmdtorun[PATH_MAX];
-  char* vptr;
-  FILE* ccproc;
-  const char vflag[] = " -V 2>&1";
-  int retval = -1;
-
-  int len = strlen(cmd) + sizeof(vflag);
-
-  if (path != NULL) {
-      len += strlen(path) + 1;
-  }
-
-  if (len < sizeof(cmdtorun)) {
-      if (path != NULL) {
-	  sprintf(cmdtorun, "%s/%s %s", path, cmd, vflag);
-      } else {
-	  sprintf(cmdtorun, "%s %s", cmd, vflag);
-      }
-
-      if ((ccproc = popen (cmdtorun, "r")) != NULL) {
-	  if (fgets (buf, sizeof(buf), ccproc) != NULL) {
-	      vptr = strrchr (buf, 'C');
-	      if (vptr) {
-		  for (; (*vptr != '\0') && !isdigit(*vptr); vptr++) {
-		      /* Do nothing - just scanning for first digit */
-		  }
-		  if (*vptr != '\0') {
-		      if (sscanf (vptr, "%d.%d", cmajor, cminor) == 2) {
-			  retval = 0;
-		      }
-		  }
-	      }
-	      if (retval != 0) {
-		  fprintf(stderr,
-		    "warning: could not parse version number in output of:\n"
-		    "         %s\n", cmdtorun);
-	      }
-	      while (fgets (buf, sizeof(buf), ccproc) != NULL) {};
-	  }
-	  pclose (ccproc);
-      }
-  }
-  return retval;
-}
-
-/* Find Sun compilers and their versions if present */
-static void
-get_sun_compiler_versions (FILE *inFile)
-{
-  const char* sunpro_path = "/opt/SUNWspro/bin";
-  int cmajor, cminor, found = 0;
-
-  /* If cross-compiling, only check CrossCompilerDir for compilers.
-   * If not cross-compiling, first check cc in users $PATH,
-   * then try /opt/SUNWspro if not found in the users $PATH
-   */
-
-# if defined CROSSCOMPILE
-  if (CrossCompiling) {
-      if (ask_sun_compiler_for_versions("cc", CrossCompileDir,
-	&cmajor, &cminor) == 0) {
-	      found = 1;
-      }
-  }
-  else
-# endif
-  {
-      if (ask_sun_compiler_for_versions("cc", NULL, &cmajor, &cminor) == 0) {
-	  found = 1;
-      } else if (ask_sun_compiler_for_versions("cc", sunpro_path,
-	&cmajor, &cminor) == 0) {
-	  found = 1;
-	  fprintf(inFile, "#define DefaultSunProCCompilerDir %s", sunpro_path);
-      }
-  }
-
-  if (found) {
-      fprintf (inFile,
-	"#define DefaultSunProCCompilerMajorVersion %d\n", cmajor);
-      fprintf (inFile,
-	"#define DefaultSunProCCompilerMinorVersion %d\n", cminor);
-  }
-
-  /* Now do it again for C++ compiler (CC) */
-  found = 0;
-# if defined CROSSCOMPILE
-  if (CrossCompiling) {
-      if (ask_sun_compiler_for_versions("CC", CrossCompileDir,
-	&cmajor, &cminor) == 0) {
-	      found = 1;
-      }
-  }
-  else
-# endif
-  {
-      if (ask_sun_compiler_for_versions("CC", NULL, &cmajor, &cminor) == 0) {
-	  found = 1;
-      } else if (ask_sun_compiler_for_versions("CC", sunpro_path,
-	&cmajor, &cminor) == 0) {
-	  found = 1;
-	  fprintf(inFile,
-		"#define DefaultSunProCplusplusCompilerDir %s", sunpro_path);
-      }
-  }
-
-  if (found) {
-      fprintf (inFile,
-	"#define DefaultSunProCplusplusCompilerMajorVersion %d\n",
-	cmajor);
-      fprintf (inFile,
-	"#define DefaultSunProCplusplusCompilerMinorVersion %d\n",
-	cminor);
-  }
-}
-#endif
-
-#if defined CROSSCOMPILE || defined  __GNUC__
-static void
-get_gcc_version(FILE *inFile, char *name)
-{
-    fprintf (inFile, "#define HasGcc 1\n");
-# ifdef CROSSCOMPILE
-    if (CrossCompiling)
-    {
-	if (gnu_c > 1) {
-	    fprintf (inFile, "#define HasGcc2 1\n");
-	    if (gnu_c > 2)
-		fprintf (inFile, "#define HasGcc3 1\n");
-	}
-	fprintf (inFile, "#define GccMajorVersion %d\n", gnu_c);
-	fprintf (inFile, "#define GccMinorVersion %d\n", gnu_c_minor);
-    } else
-# endif
-    {
-# if __GNUC__ > 1
-	fprintf (inFile, "#define HasGcc2 1\n");
-#  if __GNUC__ > 2
-	fprintf (inFile, "#define HasGcc3 1\n");
-#  endif
-# endif
-	fprintf (inFile, "#define GccMajorVersion %d\n", __GNUC__);
-	fprintf (inFile, "#define GccMinorVersion %d\n", __GNUC_MINOR__);
-    }
-# if defined(HAS_MERGE_CONSTANTS)
-    fprintf (inFile, "#define HasGccMergeConstants %d\n", HAS_MERGE_CONSTANTS);
-# endif
-}
-#endif
-
-static boolean
-get_gcc(char *cmd)
-{
-  struct stat sb;
-    static const char* gcc_path[] = {
-#if defined(linux) || \
-     defined(__NetBSD__) || \
-     defined(__OpenBSD__) || \
-     defined(__FreeBSD__) || \
-     defined(__DragonFly__) || \
-     defined(__APPLE__) || \
-     defined(__CYGWIN__) || \
-     defined(__MINGW32__) || \
-     defined(__GNU__) || \
-     defined(__GLIBC__)
-	"/usr/bin/cc",	/* for Linux PostIncDir */
-#endif
-	"/usr/local/bin/gcc",
-	"/opt/gnu/bin/gcc",
-	"/usr/pkg/bin/gcc"
-    };
-
-#ifdef CROSSCOMPILE
-    static const char* cross_cc_name[] = {
-	"cc",
-	"gcc"
-    };
-
-    if (CrossCompiling) {
-	int i;
-	for (i = 0; i < sizeof (cross_cc_name) / sizeof cross_cc_name[0]; i++){
-	    strcpy (cmd, CrossCompileDir);
-	    strcat (cmd, "/");
-	    strcat (cmd, cross_cc_name[i]);
-	    if (lstat (cmd, &sb) == 0) {
-		return TRUE;
-		break;
-	    }
-	}
-    } else
-#endif
-      {
-	int i;
-	for (i = 0; i < sizeof (gcc_path) / sizeof gcc_path[0]; i++) {
-	    if (lstat (gcc_path[i], &sb) == 0) {
-		strcpy (cmd, gcc_path[i]);
-		return TRUE;
-	    }
-	}
-      }
-    return FALSE;
-}
-
-#ifdef CROSSCOMPILE
-static void
-get_gcc_incdir(FILE *inFile, char* name)
-{
-  FILE* gccproc;
-  char buf[PATH_MAX];
-  char cmd[PATH_MAX];
-  char* ptr;
-
-  strcpy(cmd,name);
-
-  buf[0] = '\0';
-  strcat (cmd, " --print-libgcc-file-name");
-  if ((gccproc = popen (cmd, "r")) != NULL) {
-      if (fgets (buf, PATH_MAX, gccproc) != NULL) {
-	  ptr = strstr (buf, "libgcc.a");
-	  if (ptr) strcpy (ptr, "include");
-      }
-      (void) pclose (gccproc);
-  }
-
-  if (buf[0])
-      fprintf (inFile, "#define DefaultGccIncludeDir \"%s\"\n", buf);
-}
-#endif
-
-boolean
-define_os_defaults(FILE *inFile)
-{
-#if defined CROSSCOMPILE || !defined(WIN32)
-# ifdef CROSSCOMPILE
-#  ifdef __GNUC__
-  if (1)
-#  else
-  if ((sys != win32) && (sys != emx))
-#  endif
-# endif
-    {
-# if (defined(DEFAULT_OS_NAME) || defined(DEFAULT_OS_MAJOR_REV) || \
-     defined(DEFAULT_OS_MINOR_REV) || defined(DEFAULT_OS_TEENY_REV))
-	struct utsname *name = NULL;
-	struct utsname uts_name;
-	char buf[SYS_NMLN * 5 + 1];
-
-	/* Obtain the system information. */
-#  ifdef CROSSCOMPILE
-      if (!CrossCompiling)
-#  endif
-      {
-	  if (uname(&uts_name) < 0)
-	      LogFatal("Cannot invoke uname");
-	  else
-	      name = &uts_name;
-      }
-#  if defined CROSSCOMPILE && (defined linux || defined(__GLIBC__))
-      else {
-	  strncpy(uts_name.sysname,cross_uts_sysname,SYS_NMLN);
-	  strncpy(uts_name.release,cross_uts_release,SYS_NMLN);
-	  strncpy(uts_name.version,cross_uts_version,SYS_NMLN);
-	  strncpy(uts_name.machine,cross_uts_machine,SYS_NMLN);
-	  name = &uts_name;
-      }
-#  endif
-#  ifdef __FreeBSD__
-       /* Override for compiling in chroot of other OS version, such as
-        * in the bento build cluster.
-        */
-       {
-	 char *e;
-	 if ((e = getenv("OSREL")) != NULL &&
-	     strlen(name->sysname) + strlen(e) + 1 < SYS_NMLN) {
-	  strcpy(name->release, e);
-	  strcpy(name->version, name->sysname);
-	  strcat(name->version, " ");
-	  strcat(name->version, e);
-	 }
-       }
-#  endif
-
-#  if defined DEFAULT_OS_NAME
-#   if defined CROSSCOMPILE
-      if (!CrossCompiling)
-#   endif
-	{
-	  parse_utsname(name, DEFAULT_OS_NAME, buf,
-			"Bad DEFAULT_OS_NAME syntax %s");
-#   ifdef DEFAULT_OS_NAME_FROB
-	  DEFAULT_OS_NAME_FROB(buf, sizeof buf);
-#   endif
-	  if (buf[0] != '\0')
-	    fprintf(inFile, "#define DefaultOSName %s\n", buf);
-	}
-#  endif
-
-#  if defined CROSSCOMPILE
-	if (CrossCompiling && defaultOsName) {
-	  parse_utsname(name, defaultOsName, buf,
-			"Bad DEFAULT_OS_NAME syntax %s");
-	  if (defaultOsNameFrob)
-	    defaultOsNameFrob(buf, sizeof buf);
-	  if (buf[0] != '\0')
-	    fprintf(inFile, "#define DefaultOSName %s\n", buf);
-	}
-#  endif
-
-#  ifdef DEFAULT_OS_MAJOR_REV
-#   if defined CROSSCOMPILE
-	if (!CrossCompiling)
-#   endif
-	  {
-	    parse_utsname(name, DEFAULT_OS_MAJOR_REV, buf,
-			  "Bad DEFAULT_OS_MAJOR_REV syntax %s");
-#   ifdef DEFAULT_OS_MAJOR_REV_FROB
-	    DEFAULT_OS_MAJOR_REV_FROB(buf, sizeof buf);
-#   endif
-	    fprintf(inFile, "#define DefaultOSMajorVersion %s\n",
-		    *buf ? trim_version(buf) : "0");
-	  }
-#  endif
-
-#  if defined CROSSCOMPILE
-	if (CrossCompiling && defaultOsMajorRev) {
-	  parse_utsname(name, defaultOsMajorRev, buf,
-			"Bad defaultOsMajorRev syntax %s");
-	  if (defaultOsMajorRevFrob)
-	    defaultOsMajorRevFrob(buf, sizeof buf);
-	  fprintf(inFile, "#define DefaultOSMajorVersion %s\n",
-		  *buf ? trim_version(buf) : "0");
-	}
-#  endif
-
-#  ifdef DEFAULT_OS_MINOR_REV
-#   if defined CROSSCOMPILE
-	if (!CrossCompiling)
-#   endif
-	  {
-	    parse_utsname(name, DEFAULT_OS_MINOR_REV, buf,
-			  "Bad DEFAULT_OS_MINOR_REV syntax %s");
-#   ifdef DEFAULT_OS_MINOR_REV_FROB
-	    DEFAULT_OS_MINOR_REV_FROB(buf, sizeof buf);
-#   endif
-	    fprintf(inFile, "#define DefaultOSMinorVersion %s\n",
-		    *buf ? trim_version(buf) : "0");
-	  }
-#  endif
-
-#  if defined CROSSCOMPILE
-	if (CrossCompiling && defaultOsMinorRev) {
-	  parse_utsname(name, defaultOsMinorRev, buf,
-			"Bad defaultOsMinorRev syntax %s");
-	  if (defaultOsMinorRevFrob)
-	    defaultOsMinorRevFrob(buf, sizeof buf);
-	  fprintf(inFile, "#define DefaultOSMinorVersion %s\n",
-		  *buf ? trim_version(buf) : "0");
-	}
-#  endif
-
-#  ifdef DEFAULT_OS_TEENY_REV
-#   if defined CROSSCOMPILE
-	if (!CrossCompiling)
-#   endif
-	  {
-	    parse_utsname(name, DEFAULT_OS_TEENY_REV, buf,
-			  "Bad DEFAULT_OS_TEENY_REV syntax %s");
-#   ifdef DEFAULT_OS_TEENY_REV_FROB
-	    DEFAULT_OS_TEENY_REV_FROB(buf, sizeof buf);
-#   endif
-	    fprintf(inFile, "#define DefaultOSTeenyVersion %s\n",
-		    *buf ? trim_version(buf) : "0");
-	  }
-#  endif
-
-#  if defined CROSSCOMPILE
-	if (CrossCompiling && defaultOsTeenyRev) {
-	  parse_utsname(name, defaultOsTeenyRev, buf,
-			"Bad defaultOsTeenyRev syntax %s");
-	  if (defaultOsTeenyRevFrob)
-	    defaultOsTeenyRevFrob(buf, sizeof buf);
-	  fprintf(inFile, "#define DefaultOSTeenyVersion %s\n",
-		  *buf ? trim_version(buf) : "0");
-	}
-#  endif
-
-#  ifdef DEFAULT_MACHINE_ARCHITECTURE
-#   if defined CROSSCOMPILE
-	if (!CrossCompiling)
-#   endif
-	  {
-	    parse_utsname(name, DEFAULT_MACHINE_ARCHITECTURE, buf,
-			  "Bad DEFAULT_MACHINE_ARCHITECTURE %s");
-	    fprintf(inFile, "#ifndef %s\n# define %s\n#endif\n", buf, buf);
-	  }
-#  endif
-
-#  if defined CROSSCOMPILE
-	if (CrossCompiling && defaultMachineArchitecture) {
-	  parse_utsname(name, defaultMachineArchitecture, buf,
-			"Bad defaultMachineArchitecture syntax %s");
-	  fprintf(inFile, "#ifndef %s\n# define %s\n#endif\n", buf, buf);
-	}
-#  endif
-# endif
-# if defined CROSSCOMPILE
-      if (CrossCompiling)
-	get_cross_compile_dir(inFile);
-      else
-# endif
-	  fprintf(inFile, "#define CrossCompiling NO\n");
-# if defined CROSSCOMPILE
-      if (CrossCompiling && sys == LinuX)
-# endif
-# if defined CROSSCOMPILE || defined linux || defined(__GLIBC__)
-#  if defined(CROSSCOMPILE) && defined(__linux__)
-	if (sys == LinuX)
-#  endif
-	  get_distrib (inFile);
-# endif
-# if defined linux || defined(__GLIBC__)
-#  if defined CROSSCOMPILE
-      if (!CrossCompiling)
-#  endif
-	  get_libc_version (inFile);
-#  if defined CROSSCOMPILE
-      else {
-	  fprintf(inFile,"#define DefaultLinuxCLibMajorVersion %d\n",
-		  glibc_major);
-	  fprintf(inFile,"#define DefaultLinuxCLibMinorVersion %d\n",
-		  glibc_minor);
-	  fprintf(inFile,"#define DefaultLinuxCLibTeenyVersion 0\n");
-      }
-#  endif
-# endif /* linux || __GLIBC__ */
-# if defined CROSSCOMPILE || defined linux || defined(__GLIBC__)
-#  if defined CROSSCOMPILE && defined(__linux__)
-      if (sys == LinuX)
-#  endif
-	  get_ld_version(inFile);
-# endif
-# if defined (sun) && defined(SVR4)
-      get_sun_compiler_versions (inFile);
-# endif
-# if defined CROSSCOMPILE || defined __GNUC__
-#  if defined CROSSCOMPILE
-      if (gnu_c)
-#  endif
-	{
-	  char name[PATH_MAX];
-	  if (get_gcc(name)) {
-	      get_gcc_version (inFile,name);
-#  if defined CROSSCOMPILE
-	      if (sys != emx)
-		  get_gcc_incdir(inFile,name);
-#  endif
-	  }
-	}
-# endif
-# if defined __FreeBSD__
-#  if defined CROSSCOMPILE
-      if (sys == freeBSD)
-#  endif
-	  get_binary_format(inFile);
-# endif
-    }
-#endif /* !WIN32 */
-#if defined WIN32
-# ifdef CROSSCOMPILE
-  else if (sys == win32 && !CrossCompiling)
-# endif
-    {
-      OSVERSIONINFO osvi;
-      static char* os_names[] = { "Win32s", "Windows 95", "Windows NT" };
-
-      memset(&osvi, 0, sizeof(OSVERSIONINFO));
-      osvi.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
-      GetVersionEx (&osvi);
-
-      fprintf (inFile, "#define DefaultOSName Microsoft %s\n",
-	       os_names[osvi.dwPlatformId]);
-
-      fprintf(inFile, "#define DefaultOSMajorVersion %d\n", osvi.dwMajorVersion);
-      fprintf(inFile, "#define DefaultOSMinorVersion %d\n", osvi.dwMinorVersion);
-      fprintf(inFile, "#define DefaultOSTeenyVersion %d\n",
-	      osvi.dwBuildNumber & 0xFFFF);
-    }
-#endif /* WIN32 */
-#ifdef CROSSCOMPILE
-  else if (sys == emx)
-    {
-      fprintf(inFile, "#define DefaultOSMajorVersion 4\n");
-      fprintf(inFile, "#define DefaultOSMinorVersion 0\n");
-      fprintf(inFile, "#define DefaultOSTeenyVersion 0\n");
-    }
-#endif /* EMX */
-#if defined(__OpenBSD__) || defined(__DragonFly__)
-  get_stackprotector(inFile);
-#endif
-  return FALSE;
-}
-
-void
-cppit(const char *imakefile, const char *template, const char *masterc,
-      FILE *outfd, const char *outfname)
-{
-	FILE	*inFile;
-
-	haveImakefileC = TRUE;
-	inFile = fopen(masterc, "w");
-	if (inFile == NULL)
-		LogFatal("Cannot open %s for output.", masterc);
-	if (fprintf(inFile, "%s\n", ImakefileCHeader) < 0 ||
-	    define_os_defaults(inFile) ||
-	    optional_include(inFile, "IMAKE_LOCAL_DEFINES", "localdefines") ||
-	    optional_include(inFile, "IMAKE_ADMIN_DEFINES", "admindefines") ||
-	    fprintf(inFile, "#define %s <%s>\n", ImakeDefSym, imakefile) < 0 ||
-	    fprintf(inFile, LocalDefineFmt, ImakeTmplSym, template) < 0 ||
-	    fprintf(inFile, IncludeFmt, ImakeTmplSym) < 0 ||
-	    optional_include(inFile, "IMAKE_ADMIN_MACROS", "adminmacros") ||
-	    optional_include(inFile, "IMAKE_LOCAL_MACROS", "localmacros") ||
-	    fflush(inFile)) {
-		fclose(inFile);
-		LogFatal("Cannot write to %s.", masterc);
-	}
-	else if (fclose(inFile))
-		LogFatal("Cannot write to %s.", masterc);
-	/*
-	 * Fork and exec cpp
-	 */
-	doit(outfd, cpp, cpp_argv);
-	CleanCppOutput(outfd, outfname);
-}
-
-void
-makeit(void)
-{
-	doit(NULL, make_argv[0], make_argv);
-}
-
-const char *
-CleanCppInput(const char *imakefile)
-{
-	FILE	*outFile = NULL;
-	FILE	*inFile;
-	char	*buf,		/* buffer for file content */
-		*pbuf,		/* walking pointer to buf */
-		*punwritten,	/* pointer to unwritten portion of buf */
-		*ptoken,	/* pointer to # token */
-		*pend,		/* pointer to end of # token */
-		savec;		/* temporary character holder */
-	int	count;
-	struct stat	st;
-
-	/*
-	 * grab the entire file.
-	 */
-	if (!(inFile = fopen(imakefile, "r")))
-		LogFatal("Cannot open %s for input.", imakefile);
-	if (fstat(fileno(inFile), &st) < 0)
-		LogFatal("Cannot stat %s for size.", imakefile);
-	buf = Emalloc((int)st.st_size+3);
-	count = fread(buf + 2, 1, st.st_size, inFile);
-	if (count == 0 && st.st_size != 0)
-		LogFatal("Cannot read %s:", imakefile);
-	fclose(inFile);
-	buf[0] = '\n';
-	buf[1] = '\n';
-	buf[count + 2] = '\0';
-
-	punwritten = pbuf = buf + 2;
-	while (*pbuf) {
-	    /* for compatibility, replace make comments for cpp */
-	    if (*pbuf == '#' && pbuf[-1] == '\n' && pbuf[-2] != '\\') {
-		ptoken = pbuf+1;
-		while (*ptoken == ' ' || *ptoken == '\t')
-			ptoken++;
-		pend = ptoken;
-		while (*pend && *pend != ' ' && *pend != '\t' && *pend != '\n' && *pend != '\r')
-			pend++;
-		savec = *pend;
-		*pend = '\0';
-		if (strcmp(ptoken, "define") &&
-		    strcmp(ptoken, "if") &&
-		    strcmp(ptoken, "ifdef") &&
-		    strcmp(ptoken, "ifndef") &&
-		    strcmp(ptoken, "include") &&
-		    strcmp(ptoken, "line") &&
-		    strcmp(ptoken, "else") &&
-		    strcmp(ptoken, "elif") &&
-		    strcmp(ptoken, "endif") &&
-		    strcmp(ptoken, "error") &&
-		    strcmp(ptoken, "pragma") &&
-		    strcmp(ptoken, "undef")) {
-		    if (outFile == NULL) {
-#ifdef HAVE_MKSTEMP
-			int fd;
-#endif
-			char *tmpImakefileName = Strdup(tmpImakefileTemplate);
-#ifndef HAVE_MKSTEMP
-			if (mktemp(tmpImakefileName) == NULL ||
-			    (outFile = fopen(tmpImakefileName, "w+")) == NULL) {
-			    LogFatal("Cannot open %s for write.",
-				tmpImakefileName);
-			}
-#else
-			fd=mkstemp(tmpImakefileName);
-			if (fd != -1)
-			    outFile = fdopen(fd, "w");
-			if (outFile == NULL) {
-			    if (fd != -1) {
-			       unlink(tmpImakefileName); close(fd);
-			    }
-			    LogFatal("Cannot open %s for write.",
-				tmpImakefileName);
-			}
-#endif
-			tmpImakefile = tmpImakefileName;
-		    }
-		    writetmpfile(outFile, punwritten, pbuf-punwritten,
-				 tmpImakefile);
-		    if (ptoken > pbuf + 1)
-			writetmpfile(outFile, "XCOMM", 5, tmpImakefile);
-		    else
-			writetmpfile(outFile, "XCOMM ", 6, tmpImakefile);
-		    punwritten = pbuf + 1;
-		}
-		*pend = savec;
-	    }
-	    pbuf++;
-	}
-	if (outFile) {
-	    writetmpfile(outFile, punwritten, pbuf-punwritten, tmpImakefile);
-	    fclose(outFile);
-
-	    return tmpImakefile;
-	}
-
-	return(imakefile);
-}
-
-void
-CleanCppOutput(FILE *tmpfd, const char *tmpfname)
-{
-	char	*input;
-	int	blankline = 0;
-
-	while((input = ReadLine(tmpfd, tmpfname))) {
-		if (isempty(input)) {
-			if (blankline++)
-				continue;
-#ifdef CROSSCOMPILE
-			if (fixup_whitespace)
-#endif
-#if defined CROSSCOMPILE || defined FIXUP_CPP_WHITESPACE
-			    KludgeResetRule();
-#endif
-		} else {
-			blankline = 0;
-#ifdef CROSSCOMPILE
-			if (fixup_whitespace)
-#endif
-#if defined CROSSCOMPILE || defined FIXUP_CPP_WHITESPACE
-			    KludgeOutputLine(&input);
-#endif
-			writetmpfile(tmpfd, input, strlen(input), tmpfname);
-		}
-		writetmpfile(tmpfd, "\n", 1, tmpfname);
-	}
-	fflush(tmpfd);
-#ifdef NFS_STDOUT_BUG
-	/*
-	 * On some systems, NFS seems to leave a large number of nulls at
-	 * the end of the file.  Ralph Swick says that this kludge makes the
-	 * problem go away.
-	 */
-	ftruncate (fileno(tmpfd), (off_t)ftell(tmpfd));
-#endif
-}
-
-/*
- * Determine if a line has nothing in it.  As a side effect, we trim white
- * space from the end of the line.  Cpp magic cookies are also thrown away.
- * "XCOMM" token is transformed to "#".
- */
-boolean
-isempty(char *line)
-{
-	char	*pend;
-
-	/*
-	 * Check for lines of the form
-	 *	# n "...
-	 * or
-	 *	# line n "...
-	 */
-	if (*line == '#') {
-		pend = line+1;
-		if (*pend == ' ')
-			pend++;
-		if (*pend == 'l' && pend[1] == 'i' && pend[2] == 'n' &&
-		    pend[3] == 'e' && pend[4] == ' ')
-			pend += 5;
-		if (isdigit(*pend)) {
-			do {
-			    pend++;
-			} while (isdigit(*pend));
-			if (*pend == '\n' || *pend == '\0')
-				return(TRUE);
-			if (*pend++ == ' ' && *pend == '"')
-				return(TRUE);
-		}
-		while (*pend)
-		    pend++;
-	} else {
-	    for (pend = line; *pend; pend++) {
-		if (*pend == 'X' && pend[1] == 'C' && pend[2] == 'O' &&
-		    pend[3] == 'M' && pend[4] == 'M' &&
-		    (pend == line || pend[-1] == ' ' || pend[-1] == '\t' || pend[-1] == '\r') &&
-		    (pend[5] == ' ' || pend[5] == '\t' || pend[5] == '\r' || pend[5] == '\0'))
-		{
-		    *pend = '#';
-		    memmove(pend+1, pend+5, strlen(pend+5)+1);
-		}
-#ifdef CROSSCOMPILE
-		if (magic_make_vars)
-#endif
-		  {
-#if defined CROSSCOMPILE || defined MAGIC_MAKE_VARS
-		    if (*pend == 'X' && pend[1] == 'V' && pend[2] == 'A' &&
-			pend[3] == 'R')
-		    {
-			char varbuf[5];
-			int i;
-
-			if (pend[4] == 'd' && pend[5] == 'e' && pend[6] == 'f' &&
-			    pend[7] >= '0' && pend[7] <= '9')
-			{
-			    i = pend[7] - '0';
-			    sprintf(varbuf, "%0.4d", xvariable);
-			    strncpy(pend+4, varbuf, 4);
-			    xvariables[i] = xvariable;
-			    xvariable = (xvariable + 1) % 10000;
-			}
-			else if (pend[4] == 'u' && pend[5] == 's' &&
-				 pend[6] == 'e' && pend[7] >= '0' &&
-				 pend[7] <= '9')
-			{
-			    i = pend[7] - '0';
-			    sprintf(varbuf, "%0.4d", xvariables[i]);
-			    strncpy(pend+4, varbuf, 4);
-			}
-		    }
-#endif
-		}
-	    }
-	}
-	while (--pend >= line && (*pend == ' ' || *pend == '\t' || *pend == '\r')) ;
-	pend[1] = '\0';
-	return (*line == '\0');
-}
-
-/*ARGSUSED*/
-char *
-ReadLine(FILE *tmpfd, const char *tmpfname)
-{
-	static boolean	initialized = FALSE;
-	static char	*buf, *pline, *end;
-	register char	*p1, *p2;
-
-	if (! initialized) {
-#ifdef WIN32
-		FILE *fp = tmpfd;
-#endif
-		int total_red;
-		struct stat st;
-
-		/*
-		 * Slurp it all up.
-		 */
-		fseek(tmpfd, 0, 0);
-		if (fstat(fileno(tmpfd), &st) < 0)
-			LogFatal("cannot stat %s for size", tmpMakefile);
-		pline = buf = Emalloc((int)st.st_size+1);
-		total_red = fread(buf, 1, st.st_size, tmpfd);
-		if (total_red == 0 && st.st_size != 0)
-			LogFatal("cannot read %s", tmpMakefile);
-		end = buf + total_red;
-		*end = '\0';
-		fseek(tmpfd, 0, 0);
-#if defined(SYSV) || defined(WIN32) || defined(USE_FREOPEN)
-		tmpfd = freopen(tmpfname, "w+", tmpfd);
-# ifdef WIN32
-		if (! tmpfd) /* if failed try again */
-			tmpfd = freopen(tmpfname, "w+", fp);
-# endif
-		if (! tmpfd)
-			LogFatal("cannot reopen %s\n", tmpfname);
-#else	/* !SYSV */
-		ftruncate(fileno(tmpfd), (off_t) 0);
-#endif	/* !SYSV */
-		initialized = TRUE;
-	    fprintf (tmpfd, "# Makefile generated by imake - do not edit!\n");
-	}
-
-	for (p1 = pline; p1 < end; p1++) {
-		if (*p1 == '@' && *(p1+1) == '@'
-		    /* ignore ClearCase version-extended pathnames */
-		    && !(p1 != pline && !isspace(*(p1-1)) && *(p1+2) == '/'))
-		{ /* soft EOL */
-			*p1++ = '\0';
-			p1++; /* skip over second @ */
-			break;
-		}
-		else if (*p1 == '\n') { /* real EOL */
-#if defined CROSSCOMPILE || defined WIN32
-# if defined CROSSCOMPILE
-		  if (sys == win32)
-# endif
-		    {
-			if (p1 > pline && p1[-1] == '\r')
-				p1[-1] = '\0';
-		    }
-#endif
-			*p1++ = '\0';
-			break;
-		}
-	}
-
-	/*
-	 * return NULL at the end of the file.
-	 */
-	p2 = (pline == p1 ? NULL : pline);
-	pline = p1;
-	return(p2);
-}
-
-void
-writetmpfile(FILE *fd, const char *buf, int cnt, const char *fname)
-{
-	if (fwrite(buf, sizeof(char), cnt, fd) == -1)
-		LogFatal("Cannot write to %s.", fname);
-}
-
-char *
-Emalloc(int size)
-{
-	char	*p;
-
-	if ((p = malloc(size)) == NULL)
-		LogFatal("Cannot allocate %d bytes", size);
-	return(p);
-}
-
-#if defined CROSSCOMPILE || defined FIXUP_CPP_WHITESPACE
-void
-KludgeOutputLine(char **pline)
-{
-	char	*p = *pline;
-	char	quotechar = '\0';
-
-	switch (*p) {
-	    case '#':	/*Comment - ignore*/
-		break;
-	    case '\t':	/*Already tabbed - ignore it*/
-		break;
-	    case ' ':	/*May need a tab*/
-	    default:
-# ifdef CROSSCOMPILE
-		if (inline_syntax)
-# endif
-# if defined CROSSCOMPILE || defined INLINE_SYNTAX
-		{
-		    if (*p == '<' && p[1] == '<') { /* inline file close */
-			InInline--;
-			InRule = TRUE;
-			break;
-		    }
-		}
-# endif
-		/*
-		 * The following cases should not be treated as beginning of
-		 * rules:
-		 * variable := name (GNU make)
-		 * variable = .*:.* (':' should be allowed as value)
-		 * sed 's:/a:/b:'   (: used in quoted values)
-		 */
-		for (; *p; p++) {
-		    if (quotechar) {
-			if (quotechar == '\\' ||
-			    (*p == quotechar &&
-# if defined CROSSCOMPILE || defined WIN32
-			     (
-#  if defined CROSSCOMPILE
-			      (sys == win32) &&
-#  endif
-			      quotechar != ')') &&
-# endif
-			     p[-1] != '\\'))
-			    quotechar = '\0';
-			continue;
-		    }
-		    switch (*p) {
-		    case '\\':
-		    case '"':
-		    case '\'':
-			quotechar = *p;
-			break;
-		    case '(':
-			quotechar = ')';
-			break;
-		    case '{':
-			quotechar = '}';
-			break;
-		    case '[':
-			quotechar = ']';
-			break;
-		    case '=':
-# ifdef CROSSCOMPILE
-			if (remove_cpp_leadspace)
-# endif
-# if defined CROSSCOMPILE || defined REMOVE_CPP_LEADSPACE
-			{
-			    if (!InRule && **pline == ' ') {
-				while (**pline == ' ')
-				    (*pline)++;
-			    }
-			}
-# endif
-			goto breakfor;
-# if defined CROSSCOMPILE || defined INLINE_SYNTAX
-		    case '<':
-			if (inline_syntax) {
-			    if (p[1] == '<') /* inline file start */
-				InInline++;
-			}
-			break;
-# endif
-		    case ':':
-			if (p[1] == '=')
-			    goto breakfor;
-			while (**pline == ' ')
-			    (*pline)++;
-			InRule = TRUE;
-			return;
-		    }
-		}
-breakfor:
-		if (InRule && **pline == ' ')
-		    **pline = '\t';
-		break;
-	}
-}
-
-void
-KludgeResetRule(void)
-{
-	InRule = FALSE;
-}
-#endif
-char *
-Strdup(const char *cp)
-{
-	char *new = Emalloc(strlen(cp) + 1);
-
-	strcpy(new, cp);
-	return new;
-}
-
-#ifdef CROSSCOMPILE
-char*
-CrossCompileCPP(void)
-{
-    char *cpp, *c;
-    int len ;
-    if (crosscompile_use_cc_e)
-	AddCppArg("-E");
-
-    cpp = strrchr(crosscompile_cpp,'/');
-    if (!cpp)
-	cpp = crosscompile_cpp;
-    else
-	cpp++;
-
-    len = strlen(cpp) + strlen(CrossCompileDir) + 2;
-    c = Emalloc(len);
-
-    (void)snprintf(c, len,"%s/%s",CrossCompileDir,cpp);
-
-    return c;
-}
-
-#endif
-
-#ifdef CROSSCOMPILE
-static void
-get_cross_compile_dir(FILE *inFile)
-{
-	fprintf(inFile, "#define CrossCompileDir %s\n",
-		CrossCompileDir);
-	fprintf(inFile, "#define CrossCompiling YES\n");
-}
-#endif
diff --git a/nx-X11/config/imake/imake.man b/nx-X11/config/imake/imake.man
deleted file mode 100644
index 34d5b9403..000000000
--- a/nx-X11/config/imake/imake.man
+++ /dev/null
@@ -1,262 +0,0 @@
-.\" $Xorg: imake.man,v 1.4 2001/02/09 02:03:16 xorgcvs Exp $
-.\" Copyright (c) 1993, 1994, 1998 The Open Group
-.\"
-.\" Permission to use, copy, modify, distribute, and sell this software and its
-.\" documentation for any purpose is hereby granted without fee, provided that
-.\" the above copyright notice appear in all copies and that both that
-.\" copyright notice and this permission notice appear in supporting
-.\" documentation.
-.\" 
-.\" The above copyright notice and this permission notice shall be included
-.\" in all copies or substantial portions of the Software.
-.\" 
-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-.\" IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-.\" OTHER DEALINGS IN THE SOFTWARE.
-.\" 
-.\" Except as contained in this notice, the name of The Open Group shall
-.\" not be used in advertising or otherwise to promote the sale, use or
-.\" other dealings in this Software without prior written authorization
-.\" from The Open Group.
-.\"
-.\" $XFree86: imake.man,v 1.8 2001/12/14 19:53:19 dawes Exp $
-.\"
-.TH IMAKE 1 __xorgversion__
-.SH NAME
-imake \- C preprocessor interface to the make utility
-.SH SYNOPSIS
-\fBimake\fP [ \fB\-D\fP\fIdefine\fP ] [ \fB\-I\fP\fIdir\fP ]
-[ \fB\-U\fP\fIdefine\fP ] 
-[ \fB\-T\fP\fItemplate\fP ]
-[ \fB\-f\fP \fIfilename\fP ] [ \fB\-C\fP \fIfilename\fP ]
-[ \fB\-s\fP \fIfilename\fP ] [ \fB\-e\fP ]
-[ \fB\-v\fP ]
-.SH DESCRIPTION
-.I Imake
-is used to 
-generate \fIMakefiles\fP from a template, a set of \fIcpp\fP macro functions,
-and a per-directory input file called an \fIImakefile\fP.  This allows machine
-dependencies (such as compiler options, alternate command names, and special
-\fImake\fP rules) to be kept separate from the descriptions of the
-various items to be built.
-.SH OPTIONS
-The following command line options may be passed to \fIimake\fP:
-.TP 8
-.B \-D\fIdefine\fP
-This option is passed directly to \fIcpp\fP.  It is typically used to set
-directory-specific variables.  For example, the X Window System uses this
-flag to set \fITOPDIR\fP to the name of the directory containing the top
-of the core distribution and \fICURDIR\fP to the name of the current 
-directory, relative to the top.
-.TP 8
-.B \-I\fIdirectory\fP
-This option is passed directly to \fIcpp\fP.  It is typically used to 
-indicate the directory in which the \fIimake\fP template and configuration
-files may be found.
-.TP 8
-.B \-U\fIdefine\fP
-This option is passed directly to \fIcpp\fP.  It is typically used to
-unset variables when debugging \fIimake\fP configuration files.
-.TP 8
-.B \-T\fItemplate\fP
-This option specifies the name of the master template file (which is usually
-located in the directory specified with \fI\-I\fP) used by \fIcpp\fP.
-The default is \fIImake.tmpl\fP.
-.TP 8
-.B \-f \fIfilename\fP
-This option specifies the name of the per-directory input file.  The default
-is \fIImakefile\fP.
-.TP 8
-.B \-C \fIfilename\fP
-This option specifies the name of the .c file that is constructed in the
-current directory.  The default is \fIImakefile.c\fP.
-.TP 8
-.B \-s \fIfilename\fP
-This option specifies the name of the \fImake\fP description file to be 
-generated but \fImake\fP should not be invoked.
-If the \fIfilename\fP is a dash (\-), the 
-output is written to \fIstdout\fP.  The default is to generate, but
-not execute, a \fIMakefile\fP.
-.TP 8
-.B \-e
-This option indicates the \fIimake\fP should execute the generated
-\fIMakefile\fP.  The default is to leave this to the user.
-.TP 8
-.B \-v
-This option indicates that \fIimake\fP should print the \fIcpp\fP command line 
-that it is using to generate the \fIMakefile\fP.
-.SH "HOW IT WORKS"
-\fIImake\fP invokes \fIcpp\fP with any \fI\-I\fP or \fI\-D\fP flags passed
-on the command line and passes the name of a file containing the
-following 3 lines:
-.sp
-.nf
-\&		#define IMAKE_TEMPLATE "Imake.tmpl"
-\&		#define INCLUDE_IMAKEFILE <Imakefile>
-\&		#include IMAKE_TEMPLATE
-.fi
-.sp
-where \fIImake.tmpl\fP and \fIImakefile\fP may be overridden by the 
-\fI\-T\fP and \fI\-f\fP command options, respectively.
-.PP
-The IMAKE_TEMPLATE typically
-reads in a file containing machine-dependent parameters 
-(specified as \fIcpp\fP symbols), a site-specific parameters file,
-a file defining variables,
-a file
-containing \fIcpp\fP macro functions for generating \fImake\fP rules, and
-finally the \fIImakefile\fP (specified by INCLUDE_IMAKEFILE) in the current 
-directory.  The \fIImakefile\fP uses the macro functions to indicate what
-targets should be built; \fIimake\fP takes care of generating the appropriate
-rules.
-.PP
-.I Imake
-configuration files contain two types of variables, imake variables
-and make variables.  The imake variables are interpreted by cpp when
-.I imake
-is run.  By convention they are mixed case.  The make variables are
-written into the
-.I Makefile
-for later interpretation by
-.I make.
-By convention make variables are upper case.
-.PP
-The rules file (usually named \fIImake.rules\fP in the configuration
-directory) contains a variety of \fIcpp\fP macro functions that are
-configured according to the current platform.  \fIImake\fP replaces 
-any occurrences of the string ``@@'' with a newline to allow macros that
-generate more than one line of \fImake\fP rules.  
-For example, the macro
-.ta 1i 1.6i 5i
-.nf
-
-\& #define	program_target(program, objlist)	@@\e
- program:	objlist		@@\e
-	$(CC)  \-o  $@  objlist  $(LDFLAGS)
-
-.fi
-when called with
-.I "program_target(foo, foo1.o  foo2.o)"
-will expand to
-.nf
-
- foo:	foo1.o  foo2.o
-	$(CC)  \-o  $@  foo1.o  foo2.o  $(LDFLAGS)
-
-.fi
-.PP
-\fIImake\fP also replaces any occurrences of the word ``XCOMM'' with
-the character ``#'' to permit placing comments in the Makefile without
-causing ``invalid directive'' errors from the preprocessor.
-.PP
-Some complex \fIimake\fP macros require generated \fImake\fP variables
-local to each invocation of the macro, often because their value
-depends on parameters passed to the macro.
-Such variables can be created by using an \fIimake\fP variable
-of the form \fBXVARdef\fP\fIn\fP, where \fIn\fP is a single digit.
-A unique \fImake\fP variable will be substituted.  Later occurrences
-of the variable \fBXVARuse\fP\fIn\fP will
-be replaced by the variable created by the corresponding
-\fBXVARdef\fP\fIn\fP.
-.PP
-On systems whose \fIcpp\fP reduces multiple tabs and spaces to a single
-space, \fIimake\fP attempts to put back any necessary tabs (\fImake\fP is
-very picky about the difference between tabs and spaces).  For this reason,
-colons (:) in command lines must be preceded by a backslash (\\).
-.SH "USE WITH THE X WINDOW SYSTEM"
-The X Window System uses \fIimake\fP extensively, for both full builds within
-the source tree and external software.  As mentioned above, two special
-variables, \fITOPDIR\fP and \fICURDIR,\fP are set to make referencing files
-using relative path names easier.  For example, the following command is
-generated automatically to build the \fIMakefile\fP in the directory
-\fIlib/X/\fP (relative to the top of the sources):
-.sp
-.nf
-	%  ../.././config/imake  \-I../.././config  \\
-		\-DTOPDIR=../../.   \-DCURDIR=./lib/X
-.fi
-.sp
-When building X programs outside the source tree, a special symbol
-\fIUseInstalled\fP is defined and \fITOPDIR\fP and
-\fICURDIR\fP are omitted.  If the configuration files have been
-properly installed, the script \fIxmkmf\fP(1) may be used.
-.SH "INPUT FILES"
-Here is a summary of the files read by
-.I imake
-as used by X.
-The indentation shows what files include what other files.
-.nf
-.sp
-.ta 3i
-    Imake.tmpl	generic variables
-        site.def	site-specific, BeforeVendorCF defined
-        *.cf	machine-specific
-            *Lib.rules	shared library rules
-        site.def	site-specific, AfterVendorCF defined
-        Imake.rules	rules
-        Project.tmpl	X-specific variables
-            *Lib.tmpl	shared library variables
-        Imakefile
-            Library.tmpl	library rules
-            Server.tmpl	server rules
-            Threads.tmpl	multi-threaded rules
-.fi
-.LP
-Note that \fIsite.def\fP gets included twice, once before the
-\fI*.cf\fP file and once after.  Although most site customizations
-should be specified after the \fI*.cf\fP file, some, such as the
-choice of compiler, need to be specified before, because other
-variable settings may depend on them.
-.LP
-The first time \fIsite.def\fP is included, the variable BeforeVendorCF
-is defined, and the second time, the variable AfterVendorCF is
-defined.  All code in \fIsite.def\fP should be inside an #ifdef for
-one of these symbols.
-.SH FILES
-.ta 3i
-Imakefile.c	temporary input file for cpp
-.br
-/tmp/Imf.XXXXXX	temporary Makefile for -s
-.br
-/tmp/IIf.XXXXXX	temporary Imakefile if specified Imakefile uses # comments
-.br
-__cpp__	default C preprocessor
-.DT
-.SH "SEE ALSO"
-make(1), xmkmf(1)
-.br
-S. I. Feldman,
-.I
-Make \(em A Program for Maintaining Computer Programs
-.SH "ENVIRONMENT VARIABLES"
-The following environment variables may be set, however their use is not
-recommended as they introduce dependencies that are not readily apparent
-when \fIimake\fP is run:
-.TP 5
-.B IMAKEINCLUDE
-If defined, this specifies a ``\-I'' include argument to pass to the
-C preprocessor.  E.g., ``\-I/usr/X11/config''.
-.TP 5
-.B IMAKECPP
-If defined, this should be a valid path to a preprocessor program.
-E.g., ``/usr/local/cpp''.
-By default,
-.I imake
-will use cc -E or __cpp__, depending on the OS specific configuration.
-.TP 5
-.B IMAKEMAKE
-If defined, this should be a valid path to a make program,
-such as ``/usr/local/make''.
-By default,
-.I imake
-will use whatever
-.I make
-program is found using
-.I execvp(3).
-This variable is only used if the ``\-e'' option is specified.
-.SH "AUTHOR"
-Todd Brunhoff, Tektronix and MIT Project Athena; Jim Fulton, MIT X Consortium
diff --git a/nx-X11/config/imake/imakemdep.h b/nx-X11/config/imake/imakemdep.h
deleted file mode 100644
index 469454114..000000000
--- a/nx-X11/config/imake/imakemdep.h
+++ /dev/null
@@ -1,1514 +0,0 @@
-/* $Xorg: imakemdep.h,v 1.6 2001/02/09 02:03:16 xorgcvs Exp $ */
-/* $XdotOrg: xc/config/imake/imakemdep.h,v 1.12 2005/11/08 06:33:24 jkj Exp $ */
-/*
-
-Copyright (c) 1993, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/config/imake/imakemdep.h,v 3.71 2003/06/12 14:12:26 eich Exp $ */
-
-
-/* 
- * This file contains machine-dependent constants for the imake utility.
- * When porting imake, read each of the steps below and add in any necessary
- * definitions.  In general you should *not* edit ccimake.c or imake.c!
- */
-
-#ifdef __UNIXOS2__
-#define lstat stat
-#endif
-
-#ifdef CCIMAKE
-/*
- * Step 1:  imake_ccflags
- *     Define any special flags that will be needed to get imake.c to compile.
- *     These will be passed to the compile along with the contents of the
- *     make variable BOOTSTRAPCFLAGS.
- */
-#if defined(clipper) || defined(__clipper__)
-#define imake_ccflags "-O -DSYSV -DBOOTSTRAPCFLAGS=-DSYSV"
-#endif
-
-#ifdef hpux
-#ifdef hp9000s800
-#define imake_ccflags "-DSYSV"
-#else
-#define imake_ccflags "-Wc,-Nd4000,-Ns3000 -DSYSV"
-#endif
-#endif
-
-#if defined(macII) || defined(_AUX_SOURCE)
-#define imake_ccflags "-DmacII -DSYSV"
-#endif
-
-#ifdef stellar
-#define imake_ccflags "-DSYSV"
-#endif
-
-/*
- * SCO UnixWare and OpenServer 6 are both System V Release 5 based OSes.
- * The native C compiler doesn't assert __UNIXWARE__ but gcc does, so
- * we don't redefine it if we are using gcc (as it sets it to a specific
- * value). On OpenServer 6, which is a multi-ABI world, if you attempt
- * to build with -Kosr, then the C compiler will assert __OPENSERVER__
- * and set it to the value 507.  That indicates an OSR5 compile, and
- * is handled below.
- */
-
-#if defined(__UNIXWARE__) || defined(__USLC__) || defined(Oki) || defined(NCR)
-# ifdef imake_ccflags
-#  undef imake_ccflags
-# endif
-# ifdef __UNIXWARE__
-#  ifndef __GNUC__
-#   define imake_ccflags "-Xa -DSVR4 -DSVR5 -D__UNIXWARE__"
-#  else
-#   define imake_ccflags "-Xa -DSVR4 -DSVR5"
-#  endif
-# else
-#  define imake_ccflags "-Xa -DSVR4"
-# endif
-#endif
-
-/* SCO may define __USLC__ so put this after the USL check */
-#if defined(M_UNIX) || defined(_SCO_DS) || defined(__OPENSERVER__)
-# ifdef imake_ccflags
-#  undef imake_ccflags
-# endif
-# define imake_ccflags "-DSYSV -DSCO325 -D__SCO__"
-#endif
-
-#ifdef sony
-#if defined(SYSTYPE_SYSV) || defined(_SYSTYPE_SYSV)
-#define imake_ccflags "-DSVR4"
-#else
-#include <sys/param.h>
-#if NEWSOS < 41
-#define imake_ccflags "-Dbsd43 -DNOSTDHDRS"
-#else
-#if NEWSOS < 42
-#define imake_ccflags "-Dbsd43"
-#endif
-#endif
-#endif
-#endif
-
-#if defined(_IBMR2) || defined(aix)
-#define imake_ccflags "-Daix -DSYSV"
-#endif
-
-#ifdef Mips
-#  if defined(SYSTYPE_BSD) || defined(BSD) || defined(BSD43)
-#    define imake_ccflags "-DBSD43"
-#  else 
-#    define imake_ccflags "-DSYSV"
-#  endif
-#endif 
-
-#ifdef is68k
-#define imake_ccflags "-Dluna -Duniosb"
-#endif
-
-#ifdef SYSV386
-# ifdef SVR4
-#  define imake_ccflags "-Xa -DSVR4"
-# else
-#  define imake_ccflags "-DSYSV"
-# endif
-#endif
-
-#ifdef SVR4
-# ifdef i386
-#  define imake_ccflags "-Xa -DSVR4"
-# endif
-#endif
-
-#ifdef SYSV
-# ifdef i386
-#  define imake_ccflags "-DSYSV"
-# endif
-#endif
-
-#if defined(Lynx) || defined(__Lynx__)
-#define imake_ccflags "-DLynx"
-#endif /* Lynx */
-
-#ifdef __convex__
-#define imake_ccflags "-fn -tm c1"
-#endif
-
-#ifdef apollo
-#define imake_ccflags "-DX_NOT_POSIX"
-#endif
-
-#ifdef WIN32
-#ifdef __GNUC__
-#define imake_ccflags "-D__STDC__"
-#else
-#if _MSC_VER < 1000
-#define imake_ccflags "-nologo -batch -D__STDC__"
-#else
-#define imake_ccflags "-nologo -D__STDC__"
-#endif
-#endif
-#endif
-
-#ifdef __uxp__
-#define imake_ccflags "-DSVR4 -DANSICPP"
-#endif
-
-#ifdef __sxg__
-#define imake_ccflags "-DSYSV -DUSG -DNOSTDHDRS"
-#endif
-
-#ifdef _SEQUENT_
-#define imake_ccflags "-Xa -DSVR4"
-#endif
-
-#if defined(SX) || defined(PC_UX)
-#define imake_ccflags "-DSYSV"
-#endif
-
-#ifdef nec_ews_svr2
-#define imake_ccflags "-DUSG"
-#endif
-
-#if defined(nec_ews_svr4) || defined(_nec_ews_svr4) || defined(_nec_up) || defined(_nec_ft)
-#define imake_ccflags "-DSVR4"
-#endif
-
-#if defined(MACH) && !defined(__GNU__)
-#define imake_ccflags "-DNOSTDHDRS"
-#endif
-
-/* this is for OS/2 under UNIXOS2. This won't work with DOS */
-#if defined(__UNIXOS2__)
-#define imake_ccflags "-DBSD43"
-#endif
-
-#if defined(__QNX__) && !defined(__QNXNTO__)
-#define imake_ccflags "-D__QNX__ -D_i386"
-#endif
-
-#if defined(__QNXNTO__)
-#define imake_ccflags "-D__QNXNTO__"
-#endif
-
-#else /* not CCIMAKE */
-#ifndef MAKEDEPEND
-/*
- * Step 2:  dup2
- *     If your OS doesn't have a dup2() system call to duplicate one file
- *     descriptor onto another, define such a mechanism here (if you don't
- *     already fall under the existing category(ies).
- */
-#if defined(SYSV) && !defined(Mips) && !defined(_SEQUENT_) && !defined(__SCO__)
-#define	dup2(fd1,fd2)	((fd1 == fd2) ? fd1 : (close(fd2), \
-					       fcntl(fd1, F_DUPFD, fd2)))
-#endif
-
-
-/*
- * Step 3:  FIXUP_CPP_WHITESPACE
- *     If your cpp collapses tabs in macro expansions into a single space and
- *     replaces escaped newlines with a space, define this symbol.  This will
- *     cause imake to attempt to patch up the generated Makefile by looking
- *     for lines that have colons in them (this is why the rules file escapes
- *     all colons).  One way to tell if you need this is to see whether or not
- *     your Makefiles have no tabs in them and lots of @@ strings.
- */
-#if defined(sun) || defined(SYSV) || defined(SVR4) || defined(hcx) || defined(WIN32) || defined(__SCO__) || (defined(AMOEBA) && defined(CROSS_COMPILE)) || defined(__QNX__) || defined(__sgi) || defined(__UNIXOS2__) || defined(__UNIXWARE__)
-#define FIXUP_CPP_WHITESPACE
-#endif
-#ifdef WIN32
-#define REMOVE_CPP_LEADSPACE
-#define INLINE_SYNTAX
-#define MAGIC_MAKE_VARS
-#endif
-#ifdef __minix_vmd
-#define FIXUP_CPP_WHITESPACE
-#endif
-
-#if defined(Lynx)
-/* On LynxOS 2.4.0 imake gets built with the old "legacy"
- * /bin/cc which has a rather pedantic builtin preprocessor.
- * Using a macro which is not #defined (as in Step 5
- * below) flags an *error*
- */
-#define __NetBSD_Version__ 0
-#endif
-
-/*
- * Step 4:  USE_CC_E, DEFAULT_CC, DEFAULT_CPP
- *     If you want to use cc -E instead of cpp, define USE_CC_E.
- *     If use cc -E but want a different compiler, define DEFAULT_CC.
- *     If the cpp you need is not in /lib/cpp, define DEFAULT_CPP.
- */
-#if !defined (CROSSCOMPILE) || defined (CROSSCOMPILE_CPP) 
-
-#if defined(__APPLE__)
-#define DEFAULT_CPP "/usr/bin/cpp"
-#define DEFAULT_CC "cc"
-#endif
-#if defined(Lynx) || defined(__Lynx__)
-#define DEFAULT_CC "gcc"
-#define USE_CC_E
-#endif
-#ifdef hpux
-#define USE_CC_E
-#endif
-#ifdef WIN32
-#define USE_CC_E
-#ifdef __GNUC__
-#define DEFAULT_CC "gcc"
-#else
-#define DEFAULT_CC "cl"
-#endif
-#endif
-#ifdef apollo
-#define DEFAULT_CPP "/usr/lib/cpp"
-#endif
-#if defined(clipper) || defined(__clipper__)
-#define DEFAULT_CPP "/usr/lib/cpp"
-#endif
-#if defined(_IBMR2) && !defined(DEFAULT_CPP)
-#define DEFAULT_CPP "/usr/ccs/lib/cpp"
-#endif
-#if defined(sun) && (defined(SVR4) || defined(__svr4__) || defined(__SVR4) || defined(__sol__))
-#define DEFAULT_CPP "/usr/ccs/lib/cpp"
-#endif
-#ifdef __bsdi__
-#define DEFAULT_CPP "/usr/bin/cpp"
-#endif
-#ifdef __uxp__
-#define DEFAULT_CPP "/usr/ccs/lib/cpp"
-#endif
-#ifdef __sxg__
-#define DEFAULT_CPP "/usr/lib/cpp"
-#endif
-#if defined(__386BSD__)
-#define DEFAULT_CPP "/usr/libexec/cpp"
-#endif
-#if defined(__FreeBSD__)  || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
-#define USE_CC_E
-#endif
-#if defined(__sgi) && defined(__ANSI_CPP__)
-#define USE_CC_E
-#endif
-#if defined(MACH) && !defined(__GNU__)
-#define USE_CC_E
-#endif
-#ifdef __minix_vmd
-#define DEFAULT_CPP "/usr/lib/cpp"
-#endif
-#if defined(__UNIXOS2__)
-/* expects cpp in PATH */
-#define DEFAULT_CPP "cpp"
-#endif
-#ifdef __CYGWIN__
-#define DEFAULT_CC "gcc"
-#define DEFAULT_CPP "/usr/bin/cpp"
-#endif
-#if defined (__QNX__)
-#ifdef __QNXNTO__
-#define DEFAULT_CPP "/usr/bin/cpp"
-#else
-#define DEFAULT_CPP "/usr/X11R6/bin/cpp"
-#endif
-#endif
-#if defined(__GNUC__) && !defined(USE_CC_E)
-#define USE_CC_E
-#ifndef DEFAULT_CC
-#define DEFAULT_CC "gcc"
-#endif
-#endif
-
-#endif /* !defined (CROSSCOMPILE) || defined (CROSSCOMPILE_CPP) */
-/*
- * Step 5:  cpp_argv
- *     The following table contains the flags that should be passed
- *     whenever a Makefile is being generated.  If your preprocessor 
- *     doesn't predefine any unique symbols, choose one and add it to the
- *     end of this table.  Then, do the following:
- * 
- *         a.  Use this symbol in Imake.cf when setting MacroFile.
- *         b.  Put this symbol in the definition of BootstrapCFlags in your
- *             <platform>.cf file.
- *         c.  When doing a make World, always add "BOOTSTRAPCFLAGS=-Dsymbol" 
- *             to the end of the command line.
- * 
- *     Note that you may define more than one symbol (useful for platforms 
- *     that support multiple operating systems).
- */
-
-#define	ARGUMENTS 50	/* number of arguments in various arrays */
-#if !defined (CROSSCOMPILE) || defined (CROSSCOMPILE_CPP) 
-char *cpp_argv[ARGUMENTS] = {
-	"cc",		/* replaced by the actual program to exec */
-	"-I.",		/* add current directory to include path */
-#if !defined(__NetBSD_Version__) || __NetBSD_Version__ < 103080000
-#ifdef unix
-	"-Uunix",	/* remove unix symbol so that filename unix.c okay */
-#endif
-#endif
-#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \
-    defined(__FreeBSD__) || defined(__DragonFly__) || defined(MACH) || \
-    defined(linux) || defined(__GNU__) || defined(__bsdi__) || \
-    defined(__GNUC__) || defined(__GLIBC__)
-# ifdef __i386__
-	"-D__i386__",
-#  if defined(__GNUC__) && (__GNUC__ >= 3)
-	"-m32",
-#  endif
-# endif
-# ifdef __i486__
-	"-D__i486__",
-# endif
-# ifdef __i586__
-	"-D__i586__",
-# endif
-# ifdef __i686__
-	"-D__i686__",
-# endif
-# ifdef __k6__
-	"-D__k6__",
-# endif
-# ifdef __ia64__
-	"-D__ia64__",
-# endif
-# ifdef __amd64__
-	"-D__amd64__",
-# endif
-# ifdef __x86_64__
-	"-D__amd64__",
-# endif
-# ifdef __s390__
-	"-D__s390__",
-# endif
-# ifdef __alpha__
-	"-D__alpha__",
-# endif
-# ifdef __arm__
-	"-D__arm__",
-# endif
-# ifdef __s390x__
-       "-D__s390x__",
-# endif
-# ifdef __sparc__
-	"-D__sparc__",
-# endif
-# ifdef __m68k__
-	"-D__m68k__",
-# endif
-# ifdef __hppa__
-	"-D__hppa__",
-# endif
-# ifdef __sh__
-	"-D__sh__",
-# endif
-# ifdef __sh3__
-	"-D__sh3__",
-# endif
-# ifdef __SH3__
-	"-D__SH3__",
-# endif
-# ifdef __SH4__
-	"-D__SH4__",
-# endif
-# ifdef __SH4NOFPU__
-	"-D__SH4_NOFPU__",
-# endif
-# ifdef __GNUC__
-	"-traditional",
-# endif
-#endif
-#ifdef M4330
-	"-DM4330",	/* Tektronix */
-#endif
-#ifdef M4310
-	"-DM4310",	/* Tektronix */
-#endif
-#if defined(macII) || defined(_AUX_SOURCE)
-	"-DmacII",	/* Apple A/UX */
-#endif
-#if defined(USL) || defined(__UNIXWARE__) || \
-	(defined(__USLC__) && !defined(_SCO_DS))
-	"-D__UNIXWARE__",	/* SCO UnixWare 7 */
-#endif
-#ifdef sony
-	"-Dsony",	/* Sony */
-#if !defined(SYSTYPE_SYSV) && !defined(_SYSTYPE_SYSV) && NEWSOS < 42
-	"-Dbsd43",
-#endif
-#endif
-#ifdef _IBMR2
-	"-D_IBMR2",	/* IBM RS-6000 (we ensured that aix is defined above */
-#ifndef aix
-#define aix		/* allow BOOTSTRAPCFLAGS="-D_IBMR2" */
-#endif
-#endif /* _IBMR2 */
-#ifdef aix
-	"-Daix",	/* AIX instead of AOS */
-#ifndef ibm
-#define ibm		/* allow BOOTSTRAPCFLAGS="-Daix" */
-#endif
-#endif /* aix */
-#ifdef ibm
-	"-Dibm",	/* IBM PS/2 and RT under both AOS and AIX */
-#endif
-#ifdef luna
-	"-Dluna",	/* OMRON luna 68K and 88K */
-#ifdef luna1
-	"-Dluna1",
-#endif
-#ifdef luna88k		/* need not on UniOS-Mach Vers. 1.13 */
-	"-traditional", /* for some older version            */
-#endif			/* instead of "-DXCOMM=\\#"          */
-#ifdef uniosb
-	"-Duniosb",
-#endif
-#ifdef uniosu
-	"-Duniosu",
-#endif
-#endif /* luna */
-#ifdef Mips
-	"-DMips",	/* Define and use Mips for Mips Co. OS/mach. */
-# if defined(SYSTYPE_BSD) || defined(BSD) || defined(BSD43)
-	"-DBSD43",	/* Mips RISCOS supports two environments */
-# else
-	"-DSYSV",	/* System V environment is the default */
-# endif
-#endif /* Mips */
-#ifdef MOTOROLA
-	"-DMOTOROLA",    /* Motorola Delta Systems */
-# ifdef SYSV
-	"-DSYSV", 
-# endif
-# ifdef SVR4
-	"-DSVR4",
-# endif
-#endif /* MOTOROLA */
-#if defined(M_UNIX) || defined(sco) || defined(__SCO__) || \
-	defined(_SCO_DS) || defined(__OPENSERVER__)
-	"-D__SCO__",
-	"-DSYSV",
-#endif
-#ifdef i386
-	"-Di386",
-# ifdef SVR4
-	"-DSVR4",
-# endif
-# ifdef SYSV
-	"-DSYSV",
-#  ifdef ISC
-	"-DISC",
-#   ifdef ISC40
-	"-DISC40",       /* ISC 4.0 */
-#   else
-#    ifdef ISC202
-	"-DISC202",      /* ISC 2.0.2 */
-#    else
-#     ifdef ISC30
-	"-DISC30",       /* ISC 3.0 */
-#     else
-	"-DISC22",       /* ISC 2.2.1 */
-#     endif
-#    endif
-#   endif
-#  endif
-#  if (_SCO_DS - 0 == 1)
-    "-DSCO325",
-#  endif
-#  if (_SCO_DS - 0 > 1)
-    "-DSCO5V6",
-#  endif
-# endif
-# ifdef ESIX
-	"-DESIX",
-# endif
-# ifdef ATT
-	"-DATT",
-# endif
-# ifdef DELL
-	"-DDELL",
-# endif
-#endif
-#ifdef SYSV386           /* System V/386 folks, obsolete */
-	"-Di386",
-# ifdef SVR4
-	"-DSVR4",
-# endif
-# ifdef ISC
-	"-DISC",
-#  ifdef ISC40
-	"-DISC40",       /* ISC 4.0 */
-#  else
-#   ifdef ISC202
-	"-DISC202",      /* ISC 2.0.2 */
-#   else
-#    ifdef ISC30
-	"-DISC30",       /* ISC 3.0 */
-#    else
-	"-DISC22",       /* ISC 2.2.1 */
-#    endif
-#   endif
-#  endif
-# endif
-# if (_SCO_DS - 0 == 1)
-	"-DSCO325",
-# endif
-#  if (_SCO_DS - 0 > 1)
-    "-DSCO5V6",
-#  endif
-# ifdef ESIX
-	"-DESIX",
-# endif
-# ifdef ATT
-	"-DATT",
-# endif
-# ifdef DELL
-	"-DDELL",
-# endif
-#endif
-#ifdef __osf__
-	"-D__osf__",
-# ifdef __mips__
-	"-D__mips__",
-# endif
-# ifdef __alpha
-	"-D__alpha",
-# endif
-# ifdef __amiga__
-	"-D__amiga__",
-# endif
-# ifdef __alpha__
-	"-D__alpha__",
-# endif
-# ifdef __i386__
-	"-D__i386__",
-# endif
-# ifdef __GNUC__
-	"-traditional",
-# endif
-#endif
-#ifdef Oki
-	"-DOki",
-#endif
-#ifdef sun
-#if defined(SVR4) || defined(__svr4__) || defined(__SVR4) || defined(__sol__)
-	"-DSVR4",
-#endif
-# ifdef __sparcv9
-	"-D__sparcv9",
-# endif
-# ifdef __amd64
-	"-D__amd64",
-# endif
-#endif
-#ifdef WIN32
-	"-DWIN32",
-#ifndef __GNUC__
-	"-nologo",
-#if _MSC_VER < 1000
-	"-batch",
-#endif
-#endif
-	"-D__STDC__",
-#endif
-#ifdef NCR
-	"-DNCR",	/* NCR */
-#endif
-#ifdef linux
-        "-Dlinux",
-#endif
-#if defined(__CYGWIN__)
-        "-traditional",
-#endif
-#if defined(Lynx) || defined(__Lynx__)
-        "-traditional",
-#if 0
-        "-DLYNX",		/* do we really need this?? */
-#endif
-	"-DLynx",
-# ifdef ppc
-	"-Dppc",
-# endif
-# ifdef ppc64
-	"-Dppc64",
-# endif
-# if defined(m68k)  || defined(M68k) || defined(m68040)
-	"-Dm68k",
-	"-DM68k",
-# endif
-# ifdef uSPARC1
-	"-Dsparc",
-# endif
-#endif
-#ifdef __uxp__
-	"-D__uxp__",
-#endif
-#ifdef __sxg__
-	"-D__sxg__",
-#endif
-#ifdef nec_ews_svr2
-	"-Dnec_ews_svr2",
-#endif
-#ifdef AMOEBA
-	"-DAMOEBA",
-# ifdef CROSS_COMPILE
-	"-DCROSS_COMPILE",
-#  ifdef CROSS_i80386
-	"-Di80386",
-#  endif
-#  ifdef CROSS_sparc
-	"-Dsparc",
-#  endif
-#  ifdef CROSS_mc68000
-	"-Dmc68000",
-#  endif
-# else
-#  ifdef i80386
-	"-Di80386",
-#  endif
-#  ifdef sparc
-	"-Dsparc",
-#  endif
-#  ifdef mc68000
-	"-Dmc68000",
-#  endif
-# endif
-#endif
-#if defined(__sgi) && defined(__ANSI_CPP__)
-	"-cckr",
-#endif
-#ifdef __minix_vmd
-	"-Dminix",
-#endif
-
-#if defined(__UNIXOS2__)
-	"-traditional",
-	"-Demxos2",
-#endif
-#ifdef MetroLink
-	"-DMetroLink",
-# ifdef SVR4
-	"-DSVR4",
-# endif
-#endif
-#ifdef __powerpc__
-	"-D__powerpc__",
-#endif
-#ifdef __powerpc64__
-	"-D__powerpc64__",
-#endif
-#ifdef PowerMAX_OS
-	"-DPowerMAX_OS",
-#endif
-#if defined (__QNX__) && !defined(__QNXNTO__)
-        "-traditional",
-        "-D__QNX__",
-#endif
-
-#if defined(__QNXNTO__)
-        "-traditional",
-        "-D__QNXNTO__",
-#if defined(i386)
-        "-Di386",
-#endif
-#if defined(__i386__)
-        "-D__i386__",
-#endif
-#if defined(PPC)
-        "-DPPC",
-#endif
-#if defined(MIPS)
-        "-DMIPS",
-#endif
-#endif
-
-#if defined(__APPLE__)
-        "-D__APPLE__",
-        "-D__DARWIN__",
-# ifdef __ppc__
-        "-D__ppc__",
-# endif
-# ifdef __ppc64__
-        "-D__ppc64__",
-# endif
-# ifdef __i386__
-        "-D__i386__",
-# endif
-#endif
-};
-#endif /* CROSSCOMPILE */
-
-
-/*
- * Step 6: DEFAULT_OS_MAJOR_REV, DEFAULT_OS_MINOR_REV, DEFAULT_OS_TEENY_REV,
- *	and DEFAULT_OS_NAME.
- *	If your system provides a way to generate the default major,
- *	minor, teeny, or system names at runtime add commands below.
- *	The syntax of the _REV strings is 'f fmt' where 'f' is an argument
- *	you would give to uname, and "fmt" is a scanf() format string.
- *	Supported uname arguments are "snrvm", and if you specify multiple
- *	arguments they will be separated by spaces.  No more than 5 arguments
- *	may be given.  Unlike uname() order of arguments matters.
- *
- *	DEFAULT_OS_MAJOR_REV_FROB, DEFAULT_OS_MINOR_REV_FROB,
- *	DEFAULT_OS_TEENY_REV_FROB, and DEFAULT_OS_NAME_FROB can be used to
- *	modify the results of the use of the various strings.
- */
-#if !defined CROSSCOMPILE || defined CROSSCOMPILE_CPP
-# if defined(aix)
-/* uname -v returns "x" (e.g. "4"), and uname -r returns "y" (e.g. "1") */
-#  define DEFAULT_OS_MAJOR_REV	"v %[0-9]"
-#  define DEFAULT_OS_MINOR_REV	"r %[0-9]"
-/* No information available to generate default OSTeenyVersion value. */
-#  define DEFAULT_OS_NAME	"srvm %[^\n]"
-# elif defined(sun) || defined(sgi) || defined(ultrix) || defined(__uxp__) || defined(sony)
-/* uname -r returns "x.y[.z]", e.g. "5.4" or "4.1.3" */
-#  define DEFAULT_OS_MAJOR_REV	"r %[0-9]"
-#  define DEFAULT_OS_MINOR_REV	"r %*d.%[0-9]"
-#  define DEFAULT_OS_TEENY_REV	"r %*d.%*d.%[0-9]"
-#  define DEFAULT_OS_NAME	"srvm %[^\n]"
-# elif defined(hpux)
-/* uname -r returns "W.x.yz", e.g. "B.10.01" */
-#  define DEFAULT_OS_MAJOR_REV	"r %*[^.].%[0-9]"
-#  define DEFAULT_OS_MINOR_REV	"r %*[^.].%*d.%1s"
-#  define DEFAULT_OS_TEENY_REV	"r %*[^.].%*d.%*c%[0-9]"
-#  define DEFAULT_OS_NAME	"srvm %[^\n]"
-# elif defined(USL) || defined(__USLC__) || defined(__UNIXWARE__) || \
-	defined(__SCO__) || defined(__OPENSERVER__) || defined(_SCO_DS)
-/* uname -v returns "x.yz" or "x.y.z", e.g. "2.02" or "2.1.2". */
-#  define DEFAULT_OS_MAJOR_REV	"v %[0-9]"
-#  define DEFAULT_OS_MINOR_REV	"v %*d.%1s"
-#  define DEFAULT_OS_TEENY_REV	"v %*d.%*c%[.0-9]"
-#  define DEFAULT_OS_NAME	"srvm %[^\n]"
-# elif defined(__APPLE__)
-/* uname -v returns "x.yz" or "x.y.z", e.g. "2.02" or "2.1.2". */
-#  define DEFAULT_OS_MAJOR_REV	"r %[0-9]"
-#  define DEFAULT_OS_MINOR_REV	"r %*d.%[0-9]"
-#  define DEFAULT_OS_TEENY_REV	"r %*d.%*d.%[0-9]" /* this will just get 0 */
-#  define DEFAULT_OS_NAME	"s %[^\n]"
-# elif defined(__osf__)
-/* uname -r returns "Wx.y", e.g. "V3.2" or "T4.0" */
-#  define DEFAULT_OS_MAJOR_REV	"r %*[^0-9]%[0-9]"
-#  define DEFAULT_OS_MINOR_REV	"r %*[^.].%[0-9]"
-#  define DEFAULT_OS_NAME	"srvm %[^\n]"
-# elif defined(__uxp__)
-/* NOTE: "x.y[.z]" above handles UXP/DF.  This is a sample alternative. */
-/* uname -v returns "VxLy Yzzzzz ....", e.g. "V20L10 Y95021 Increment 5 ..." */
-#  define DEFAULT_OS_MAJOR_REV	"v V%[0-9]"
-#  define DEFAULT_OS_MINOR_REV	"v V%*dL%[0-9]"
-#  define DEFAULT_OS_NAME	"srvm %[^\n]"
-# elif defined(linux) || defined(__bsdi__)
-#  define DEFAULT_OS_MAJOR_REV	"r %[0-9]"
-#  define DEFAULT_OS_MINOR_REV	"r %*d.%[0-9]"
-#  define DEFAULT_OS_TEENY_REV	"r %*d.%*d.%[0-9]"
-#  define DEFAULT_OS_NAME	"srm %[^\n]"
-#  if defined(linux) && defined  (CROSSCOMPILE_CPP)
-#   define CROSS_UTS_SYSNAME "Linux"
-#   include <linux/version.h>
-#   define CROSS_UTS_RELEASE UTS_RELEASE
-# endif
-# elif defined(__CYGWIN__)
-#  define DEFAULT_OS_MAJOR_REV	"r %[0-9]"
-#  define DEFAULT_OS_MINOR_REV	"r %*d.%[0-9]"
-#  define DEFAULT_OS_TEENY_REV	"r %*d.%*d.%[0-9]"
-#  define DEFAULT_OS_NAME	"srm %[^\n]"
-#  if defined(__CYGWIN__) && defined  (CROSSCOMPILE_CPP)
-#   define CROSS_UTS_SYSNAME "Cygwin"
-#   include <cygwin/version.h>
-#   define CROSS_UTS_RELEASE "1.3.12"
-#  endif
-# elif defined(__GNU__)
-#  define DEFAULT_OS_MAJOR_REV	"r %[0-9]"
-#  define DEFAULT_OS_MINOR_REV	"r %*d.%[0-9]"
-#  define DEFAULT_OS_NAME	"srm %[^\n]"
-# elif defined(ISC)
-/* ISC all Versions ? */
-/* uname -r returns "x.y", e.g. "3.2" ,uname -v returns "x" e.g. "2" */
-#  define DEFAULT_OS_MAJOR_REV   "r %[0-9]"
-#  define DEFAULT_OS_MINOR_REV   "r %*d.%[0-9]"
-#  define DEFAULT_OS_TEENY_REV   "v %[0-9]" 
-/* # define DEFAULT_OS_NAME        "srm %[^\n]" */ /* Not useful on ISC */
-# elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__DragonFly__)
-/* BSD/OS too? */
-/* uname -r returns "x.y[.z]-mumble", e.g. "2.1.5-RELEASE" or "2.2-0801SNAP" */
-#  define DEFAULT_OS_MAJOR_REV   "r %[0-9]"
-#  define DEFAULT_OS_MINOR_REV   "r %*d.%[0-9]"
-#  define DEFAULT_OS_TEENY_REV   "r %*d.%*d.%[0-9]" 
-#  define DEFAULT_OS_NAME        "srm %[^\n]"
-#  if defined(__FreeBSD__) || defined(__DragonFly__)
-/* Use an alternate way to find the teeny version for -STABLE, -SNAP versions */
-#   ifndef CROSSCOMPILE_CPP
-#    define DEFAULT_OS_TEENY_REV_FROB(buf, size)			\
-      do {								\
-	if (*buf == 0) {						\
-		int __mib[2];						\
-		size_t __len;						\
-		int __osrel;						\
-									\
-		__mib[0] = CTL_KERN;					\
-		__mib[1] = KERN_OSRELDATE;				\
-		__len = sizeof(__osrel);				\
-		sysctl(__mib, 2, &__osrel, &__len, NULL, 0);		\
-		if (__osrel < 210000) {					\
-			if (__osrel < 199607)				\
-				buf[0] = '0';				\
-			else if (__osrel < 199612)			\
-				buf[0] = '5';				\
-			else if (__osrel == 199612)			\
-				buf[0] = '6';				\
-			else						\
-				buf[0] = '8'; /* guess */		\
-		} else {						\
-			buf[0] = ((__osrel / 1000) % 10) + '0';		\
-		}							\
-		buf[1] = 0;						\
-	}								\
-     } while (0)
-#   endif
-#  else
-   /* OpenBSD - Add DEFAULT_MACHINE_ARCHITECTURE */
-#   define DEFAULT_MACHINE_ARCHITECTURE "m %[^\n]"
-#  endif
-# elif defined(__NetBSD__)
-/*
- * uname -r returns "x.y([ABCD...]|_mumble)", e.g.:
- *	1.2	1.2_BETA	1.2A	1.2B
- *
- * That means that we have to do something special to turn the
- * TEENY revision into a form that we can use (i.e., a string of
- * decimal digits).
- *
- * We also frob the name DEFAULT_OS_NAME so that it looks like the
- * 'standard' NetBSD name for the version, e.g. "NetBSD/i386 1.2B" for
- * NetBSD 1.2B on an i386.
- */
-#  define DEFAULT_OS_MAJOR_REV   "r %[0-9]"
-#  define DEFAULT_OS_MINOR_REV   "r %*d.%[0-9]"
-#  define DEFAULT_OS_TEENY_REV   "r %*d.%*d%[A-Z]" 
-#  define DEFAULT_OS_TEENY_REV_FROB(buf, size)				\
-    do {								\
-	int	teeny = 0;						\
-	char	*ptr = (buf);						\
-									\
-	while (*ptr >= 'A' && *ptr <= 'Z') /* sanity check */		\
-	    teeny = teeny * 26 + (int)(*ptr++ - 'A');			\
-									\
-	snprintf((buf), (size), "%d", teeny + 1);			\
-    } while (0)
-#  define DEFAULT_OS_NAME        "smr %[^\n]"
-#  define DEFAULT_OS_NAME_FROB(buf, size)				\
-    do {								\
-	char *__sp;							\
-	if ((__sp = strchr((buf), ' ')) != NULL)			\
-		*__sp = '/';						\
-    } while (0)
-# elif defined(__Lynx__) || defined(Lynx)
-/* Lynx 2.4.0 /bin/cc doesn't like #elif */
-#  define DEFAULT_OS_MAJOR_REV   "r %[0-9]"
-#  define DEFAULT_OS_MINOR_REV   "r %*d.%[0-9]"
-#  define DEFAULT_OS_TEENY_REV   "r %*d.%*d.%[0-9]" 
-#  define DEFAULT_OS_NAME        "srm %[^\n]"
-# elif defined(_SEQUENT_)
-/* uname -v returns 'Vx.y.z', e.g. 'V4.4.2' */
-#  define DEFAULT_OS_MAJOR_REV	"v V%[0-9]"
-#  define DEFAULT_OS_MINOR_REV	"v V%*d.%[0-9]"
-#  define DEFAULT_OS_TEENY_REV	"v V%*d.%*d.%[0-9]"
-#  define DEFAULT_OS_NAME	"s %[^\n]"
-# endif
-#endif /* !defined CROSSCOMPILE || defined CROSSCOMPILE_CPP */
-
-# if defined (CROSSCOMPILE_CPP) 
-#  ifndef CROSS_UTS_SYSNAME
-char *cross_uts_sysname = "";
-#  else
-char *cross_uts_sysname = CROSS_UTS_SYSNAME;
-#  endif
-#  ifndef CROSS_UTS_RELEASE
-char* cross_uts_release = "";
-#  else
-char* cross_uts_release = CROSS_UTS_RELEASE;
-#  endif
-#  ifndef CROSS_UTS_MACHINE
-char *cross_uts_machine = "";
-#  else
-char *cross_uts_machine = CROSS_UTS_MACHINE;
-#  endif
-#  ifndef CROSS_UTS_VERSION
-char * cross_uts_version = "";
-#  else
-char * cross_uts_version = CROSS_UTS_VERSION;
-#  endif
-#  ifdef DEFAULT_OS_NAME
-char *defaultOsName = DEFAULT_OS_NAME;
-#  else 
-char *defaultOsName = NULL;
-# endif
-#  ifdef DEFAULT_OS_MAJOR_REV
-char *defaultOsMajorRev = DEFAULT_OS_MAJOR_REV;
-#  else 
-char *defaultOsMajorRev = NULL;
-# endif
-#  ifdef DEFAULT_OS_MINOR_REV
-char *defaultOsMinorRev = DEFAULT_OS_MINOR_REV;
-#  else 
-char *defaultOsMinorRev = NULL;
-#  endif
-#  ifdef DEFAULT_OS_TEENY_REV
-char *defaultOsTeenyRev = DEFAULT_OS_TEENY_REV;
-#  else 
-char *defaultOsTeenyRev = NULL;
-#  endif
-#  ifdef DEFAULT_MACHINE_ARCHITECTURE
-char *defaultMachineArchitecture = DEFAULT_MACHINE_ARCHITECTURE;
-#  else 
-char *defaultMachineArchitecture = NULL;
-#  endif
-# ifdef DEFAULT_OS_NAME_FROB
-void defaultOsNameFrob(char *buf, int size)
-{DEFAULT_OS_NAME_FROB(buf,size)}
-# else
-void (*defaultOsNameFrob)(char *buf, int size) = NULL;
-# endif
-# ifdef DEFAULT_OS_MAJOR_REV_FROB
-void defaultOsMajorRevFrob(char *buf, int size)
-{DEFAULT_OS_MAJOR_REV_FROB(buf,size)}
-# else
-void (*defaultOsMajorRevFrob)(char *buf, int size) = NULL;
-# endif
-# ifdef DEFAULT_OS_MINOR_REV_FROB
-void defaultOsMinorRevFrob(char *buf, int size)
-{DEFAULT_OS_MINOR_REV_FROB(buf,size)}
-# else
-void (*defaultOsMinorRevFrob)(char *buf, int size) = NULL;
-# endif
-# ifdef DEFAULT_OS_TEENY_REV_FROB
-void defaultOsTeenyRevFrob(char *buf, int size)
-{DEFAULT_OS_TEENY_REV_FROB(buf,size)}
-# else
-void (*defaultOsTeenyRevFrob)(char *buf, int size) = NULL;
-# endif
-# endif /* CROSSCOMPILE_CPP */
-
-#else /* else MAKEDEPEND */
-#if !defined (CROSSCOMPILE) || defined (CROSSCOMPILE_CPP) 
-/*
- * Step 7:  predefs
- *     If your compiler and/or preprocessor define any specific symbols, add
- *     them to the the following table.  The definition of struct symtab is
- *     in util/makedepend/def.h.
- */
-#undef DEF_EVALUATE
-#undef DEF_STRINGIFY
-#define DEF_EVALUATE(__x) #__x
-#define DEF_STRINGIFY(_x) DEF_EVALUATE(_x)
-struct symtab	predefs[] = {
-#ifdef apollo
-	{"apollo", "1"},
-#endif
-#if defined(clipper) || defined(__clipper__)
-	{"clipper", "1"},
-	{"__clipper__", "1"},
-	{"clix", "1"},
-	{"__clix__", "1"},
-#endif
-#ifdef ibm032
-	{"ibm032", "1"},
-#endif
-#ifdef ibm
-	{"ibm", "1"},
-#endif
-#ifdef aix
-	{"aix", "1"},
-#endif
-#ifdef sun
-	{"sun", "1"},
-#endif
-#ifdef sun2
-	{"sun2", "1"},
-#endif
-#ifdef sun3
-	{"sun3", "1"},
-#endif
-#ifdef sun4
-	{"sun4", "1"},
-#endif
-#ifdef sparc
-	{"sparc", "1"},
-#endif
-#ifdef __sparc
-	{"__sparc", "1"},
-#endif
-#ifdef __sparcv9
-	{"__sparcv9", "1"},
-#endif
-#ifdef __sparc__
-	{"__sparc__", "1"},
-#endif
-#ifdef __sparcv9__
-	{"__sparcv9__", "1"},
-#endif
-#ifdef hpux
-	{"hpux", "1"},
-#endif
-#ifdef __hpux
-	{"__hpux", "1"},
-#endif
-#ifdef __hp9000s800
-	{"__hp9000s800", "1"},
-#endif
-#ifdef __hp9000s700
-	{"__hp9000s700", "1"},
-#endif
-#ifdef vax
-	{"vax", "1"},
-#endif
-#ifdef VMS
-	{"VMS", "1"},
-#endif
-#ifdef att
-	{"att", "1"},
-#endif
-#ifdef mips
-	{"mips", "1"},
-#endif
-#ifdef __mips__
-	{"__mips__", "1"},
-#endif
-#ifdef ultrix
-	{"ultrix", "1"},
-#endif
-#ifdef stellar
-	{"stellar", "1"},
-#endif
-#ifdef mc68000
-	{"mc68000", "1"},
-#endif
-#ifdef mc68020
-	{"mc68020", "1"},
-#endif
-#ifdef __GNUC__
-	{"__GNUC__", DEF_STRINGIFY(__GNUC__)},
-#endif
-#ifdef __STRICT_ANSI__
-	{"__STRICT_ANSI__", "1"},
-#endif
-#ifdef __STDC__
-	{"__STDC__", DEF_STRINGIFY(__STDC__)},
-#endif
-#ifdef __HIGHC__
-	{"__HIGHC__", "1"},
-#endif
-#ifdef __OPENSERVER__
-	{"__OPENSERVER__", DEF_STRINGIFY(__OPENSERVER__)},
-#endif
-#ifdef _SCO_DS
-	{"_SCO_DS", DEF_STRINGIFY(_SCO_DS)},
-#endif
-#ifdef _SCO_DS_LL
-	{"_SCO_DS_LL", DEF_STRINGIFY(_SCO_DS_LL)},
-#endif
-#ifdef __SCO_VERSION__
-	{"__SCO_VERSION__", DEF_STRINGIFY(__SCO_VERSION__)},
-#endif
-#ifdef __UNIXWARE__
-	{"__UNIXWARE__", DEF_STRINGIFY(__UNIXWARE__)},
-#endif
-#ifdef __USLC__
-	{"__USLC__", DEF_STRINGIFY(__USLC__)},
-#endif
-#ifdef CMU
-	{"CMU", "1"},
-#endif
-#ifdef luna
-	{"luna", "1"},
-#ifdef luna1
-	{"luna1", "1"},
-#endif
-#ifdef luna2
-	{"luna2", "1"},
-#endif
-#ifdef luna88k
-	{"luna88k", "1"},
-#endif
-#ifdef uniosb
-	{"uniosb", "1"},
-#endif
-#ifdef uniosu
-	{"uniosu", "1"},
-#endif
-#endif
-#ifdef ieeep754
-	{"ieeep754", "1"},
-#endif
-#ifdef is68k
-	{"is68k", "1"},
-#endif
-#ifdef m68k
-        {"m68k", "1"},
-#endif
-#ifdef M68k
-        {"M68k", "1"},
-#endif
-#ifdef __m68k__
-	{"__m68k__", "1"},
-#endif
-#ifdef m88k
-        {"m88k", "1"},
-#endif
-#ifdef __m88k__
-	{"__m88k__", "1"},
-#endif
-#ifdef bsd43
-	{"bsd43", "1"},
-#endif
-#ifdef hcx
-	{"hcx", "1"},
-#endif
-#ifdef sony
-	{"sony", "1"},
-#ifdef SYSTYPE_SYSV
-	{"SYSTYPE_SYSV", "1"},
-#endif
-#ifdef _SYSTYPE_SYSV
-	{"_SYSTYPE_SYSV", "1"},
-#endif
-#endif
-#ifdef __OSF__
-	{"__OSF__", "1"},
-#endif
-#ifdef __osf__
-	{"__osf__", "1"},
-#endif
-#ifdef __amiga__
-	{"__amiga__", "1"},
-#endif
-#ifdef __alpha
-	{"__alpha", "1"},
-#endif
-#ifdef __alpha__
-	{"__alpha__", "1"},
-#endif
-#ifdef __DECC
-	{"__DECC",  "1"},
-#endif
-#ifdef __decc
-	{"__decc",  "1"},
-#endif
-#ifdef __unix__
-	{"__unix__", "1"},
-#endif
-#ifdef __uxp__
-	{"__uxp__", "1"},
-#endif
-#ifdef __sxg__
-	{"__sxg__", "1"},
-#endif
-#ifdef _SEQUENT_
-	{"_SEQUENT_", "1"},
-	{"__STDC__", "1"},
-#endif
-#ifdef __bsdi__
-	{"__bsdi__", "1"},
-#endif
-#ifdef nec_ews_svr2
-	{"nec_ews_svr2", "1"},
-#endif
-#ifdef nec_ews_svr4
-	{"nec_ews_svr4", "1"},
-#endif
-#ifdef _nec_ews_svr4
-	{"_nec_ews_svr4", "1"},
-#endif
-#ifdef _nec_up
-	{"_nec_up", "1"},
-#endif
-#ifdef SX
-	{"SX", "1"},
-#endif
-#ifdef nec
-	{"nec", "1"},
-#endif
-#ifdef _nec_ft
-	{"_nec_ft", "1"},
-#endif
-#ifdef PC_UX
-	{"PC_UX", "1"},
-#endif
-#ifdef sgi
-	{"sgi", "1"},
-#endif
-#ifdef __sgi
-	{"__sgi", "1"},
-#endif
-#ifdef _MIPS_FPSET
-	{"_MIPS_FPSET", DEF_STRINGIFY(_MIPS_FPSET)},
-#endif
-#ifdef _MIPS_ISA
-	{"_MIPS_ISA", DEF_STRINGIFY(_MIPS_ISA)},
-#endif
-#ifdef _MIPS_SIM
-	{"_MIPS_SIM", DEF_STRINGIFY(_MIPS_SIM)},
-#endif
-#ifdef _MIPS_SZINT
-	{"_MIPS_SZINT", DEF_STRINGIFY(_MIPS_SZINT)},
-#endif
-#ifdef _MIPS_SZLONG
-	{"_MIPS_SZLONG", DEF_STRINGIFY(_MIPS_SZLONG)},
-#endif
-#ifdef _MIPS_SZPTR
-	{"_MIPS_SZPTR", DEF_STRINGIFY(_MIPS_SZPTR)},
-#endif
-#ifdef __DragonFly__
-	{"__DragonFly__", "1"},
-#endif
-#ifdef __FreeBSD__
-	{"__FreeBSD__", "1"},
-#endif
-#ifdef __OpenBSD__
-	{"__OpenBSD__", "1"},
-#endif
-#ifdef __NetBSD__
-	{"__NetBSD__", "1"},
-#endif
-#ifdef __GNU__
-	{"__GNU__", "1"},
-#endif
-#ifdef __ELF__
-	{"__ELF__", "1"},
-#endif
-#ifdef __UNIXOS2__
-	{"__UNIXOS2__", "1"},
-#endif
-#if defined(__QNX__)
-        {"__QNX__", "1"},
-#endif
-#ifdef __QNXNTO__
-        {"__QNXNTO__", "1"},
-#endif
-# ifdef __powerpc__
-	{"__powerpc__", "1"},
-# endif
-# ifdef __powerpc64__
-	{"__powerpc64__", "1"},
-# endif
-# ifdef PowerMAX_OS
-	{"PowerMAX_OS", "1"},
-# endif
-# ifdef ia64
-	{"ia64", "1"},
-# endif
-# ifdef __ia64__
-	{"__ia64__", "1"},
-# endif
-# if defined (amd64) || defined (x86_64)
-	{"amd64", "1"},
-	{"x86_64", "1"},
-# endif
-# if defined (__amd64__) || defined (__x86_64__)
-	{"__amd64__", "1"},
-	{"__x86_64__", "1"},
-# endif
-# if defined (__amd64) || defined(__x86_64)
-	{"__amd64", "1"},
-	{"__x86_64", "1"},
-# endif
-# ifdef __x86
-	{"__x86", "1"},
-# endif
-# ifdef __i386
-	{"__i386", "1"},
-# endif
-# ifdef __i386__
-	{"__i386__", "1"},
-# endif
-# ifdef __i486__
-	{"__i486__", "1"},
-# endif
-# ifdef __i586__
-	{"__i586__", "1"},
-# endif
-# ifdef __i686__
-	{"__i686__", "1"},
-# endif
-# ifdef __k6__
-	{"__k6__", "1"},
-# endif
-# ifdef i386
-	{"i386", "1"},
-# endif
-# ifdef i486
-	{"i486", "1"},
-# endif
-# ifdef i586
-	{"i586", "1"},
-# endif
-# ifdef i686
-	{ "i686", "1"},
-# endif
-# ifdef k6
-	{"k6", "1"},
-# endif
-# ifdef sparc
-	{"sparc", "1"},
-# endif
-# ifdef __sparc__
-	{"__sparc__", "1"},
-# endif
-# ifdef __s390__
-	{"__s390__", "1"},
-# endif
-# ifdef __hppa__
-	{"__hppa__", "1"},
-# endif
-# ifdef __sh__
-	{"__sh__", "1"},
-# endif
-# ifdef __sh3_
-	{"__sh3__", "1"},
-# endif
-# ifdef __SH3__
-	{"__SH3__", "1"},
-# endif
-# ifdef __SH4__
-	{"__SH4__", "1"},
-# endif
-# ifdef __SH4NOFPU__
-	{"__SH4NOFPU__", "1"},
-# endif
-#if defined(__ppc__)
-        {"__ppc__", "1"},
-#endif
-#if defined(__ppc64__)
-        {"__ppc64__", "1"},
-#endif
-#if defined(__BIG_ENDIAN__)
-      {"__BIG_ENDIAN__", "1"},
-#endif
-#if defined(__LITTLE_ENDIAN__)
-      {"__LITTLE_ENDIAN__", "1"},
-#endif
-#if defined (__CHAR_BIT__)
-	{"__CHAR_BIT__", DEF_STRINGIFY(__CHAR_BIT__)},
-#endif
-#if defined (__BUILTIN_VA_STRUCT)
-	{"__BUILTIN_VA_STRUCT", "1"},
-#endif
-#if defined (__BUILTIN_VA_ARG_INCR)
-	{"__BUILTIN_VA_ARG_INCR", "1"},
-#endif	
-	/* add any additional symbols before this line */
-	{NULL, NULL}
-};
-#undef DEF_EVALUATE
-#undef DEF_STRINGIFY
-#endif /* CROSSCOMPILE */
-#endif /* MAKEDEPEND */
-
-# ifndef MAKEDEPEND
-#  if  defined (CROSSCOMPILE_CPP) 
-#   ifdef USE_CC_E
-boolean crosscompile_use_cc_e = TRUE;
-#    ifdef DEFAULT_CC
-char* crosscompile_cpp = DEFAULT_CC;
-#    else
-char* crosscompile_cpp = "cc";
-#    endif
-#   else
-boolean crosscompile_use_cc_e = FALSE;
-#    ifdef DEFAULT_CPP
-char* crosscompile_cpp = DEFAULT_CPP;
-#    else
-char* crosscompile_cpp = "cpp";
-#    endif
-#   endif
-#   ifdef FIXUP_CPP_WHITESPACE
-boolean fixup_whitespace = TRUE;
-#   else
-boolean fixup_whitespace = FALSE;
-#   endif
-#   ifdef REMOVE_CPP_LEADSPACE
-boolean remove_cpp_leadspace = TRUE;
-#   else
-boolean remove_cpp_leadspace = FALSE;
-#   endif
-#   ifdef INLINE_SYNTAX
-boolean inline_syntax = TRUE;
-#   else
-boolean inline_syntax = FALSE;
-#   endif
-#   ifdef MAGIC_MAKE_VARS
-boolean magic_make_vars = TRUE;
-#   else
-boolean magic_make_vars = FALSE;
-#   endif
-
-typedef enum {
-  unknown,
-  freeBSD,
-  netBSD,
-  LinuX,
-  emx,
-  win32,
-  dragonfly
-} System;
-
-#   if defined(linux) || defined(__GLIBC__)
-System sys = LinuX;
-#   elif defined __FreeBSD__
-System sys = freebsd;
-#   elif defined __NetBSD__
-System sys = netBSD;
-#   elif defined __EMX__
-System sys = emx;
-#   elif defined WIN32
-System sys = win32;
-#   elif defined __DragonFly__
-System sys = dragonfly;
-#   else
-System sys = unknown;
-#   endif
-
-#   if defined __GNUC__
-int gnu_c = __GNUC__;
-int gnu_c_minor = __GNUC_MINOR__;
-#   else 
-int gnu_c = 0;
-int gnu_c_minor = -1;
-#   endif
-#   if defined(linux) || defined(__GLIBC__)
-#    include <features.h>
-int glibc_major = __GLIBC__ + 4;
-int glibc_minor = __GLIBC_MINOR__;
-#   else
-int glibc_major = 0;
-int glibc_minor = -1;
-#   endif
-#  endif /* !CROSSCOMPILE || CROSSCOMPILE_CPP */
-
-# endif /* MAKEDEPEND */
-
-#endif /* CCIMAKE */
diff --git a/nx-X11/config/imake/imakesvc.cmd b/nx-X11/config/imake/imakesvc.cmd
deleted file mode 100644
index 1108c3904..000000000
--- a/nx-X11/config/imake/imakesvc.cmd
+++ /dev/null
@@ -1,302 +0,0 @@
-/* Rexx OS/2
- * This script serves as a helper cmd file for imake. Install this in
- * the path just like imake itself.
- *
- * $XFree86: xc/config/imake/imakesvc.cmd,v 3.13 1999/04/29 09:13:23 dawes Exp $
- */
-'@echo off'
-ADDRESS CMD
-CALL RxFuncAdd 'SysFileDelete', 'RexxUtil', 'SysFileDelete'
-CALL RxFuncAdd 'SysFileTree', 'RexxUtil', 'SysFileTree'
-CALL RxFuncAdd 'SysRmDir', 'RexxUtil', 'SysRmDir'
-CALL RxFuncAdd 'SysMkDir', 'RexxUtil', 'SysMkDir'
-
-PARSE ARG all
-code = WORD(all,1)
-
-SELECT
-   WHEN code=1 THEN DO
-      /* imakesvc 1 u/n dir ruledir top current */
-      instflg = WORD(all,2)
-      imakecmd = '\imake'
-      ruledir = WORD(all,4)
-      topdir = WORD(all,5)
-      currentdir = WORD(all,6)
-      IF instflg = 'u' THEN DO 
-         root = VALUE('X11ROOT',,'OS2ENVIRONMENT')
-         IF root = '' THEN DO
-            SAY 'Fatal error: no X11ROOT environment variable found!'
-            EXIT 99
-         END
-         imakecmd = 'imake'
-	 IF POS(':',ruledir) = 0 THEN
-            ruledir1 = root||ruledir
-	 ELSE
-	    ruledir1 = ruledir
-         topdir1 = topdir
-         useinst = '-DUseInstalled'
-      END 
-      ELSE DO
-         /* in n mode, we must add a prefix ../ for MakeMakeSubdirs */
-         ruledir1 = '../'||ruledir
-         topdir1 = '../'||topdir
-         useinst = ''
-      END
-
-      ruledir = ruledir1
-      topdir = topdir1
-      curdir = DIRECTORY()
-      dir = fixbadprefix(WORD(all,3))
-      d = DIRECTORY(dir)
-      dirfwd=TRANSLATE(dir,'/','\')
-      RC = SysFileDelete('Makefile.bak')
-      IF exists('Makefile') THEN REN Makefile Makefile.bak
-      /* There is a difficulty in the Imakefiles. Some builds refer
-       * to directories that are in a different subtree. We need to adjust
-       * the CURDIR and TOPDIR and -I paths
-       */
-      IF SUBSTR(dirfwd,1,2)='..' THEN DO
-         /* must recalculate passed topdir, currentdir, and ruledir */
-         ndist = nlevels(topdir)
-         ncurdir = './'striplevel(dirfwd,ndist-1)
-         ntopdir = maketop(nlevels(ncurdir))
-         nruledir = ntopdir||'/config/cf'
-      END 
-      ELSE DO
-         /* this is simple it is relative to this dir */
-         pfx = downlevels(dirfwd)
-         nruledir = ruledir
-         IF instflg = 'n' THEN DO /*sm120296*/
-            nruledir = pfx||ruledir
-         END
-         ntopdir = pfx||topdir
-         ncurdir = currentdir  /* use to be pfx || currentdir */
-      END
-      imakecmd useinst '-I'nruledir' -DTOPDIR='ntopdir' -DCURDIR='ncurdir'/'dirfwd
-      'x11make MAKE=x11make SHELL= Makefiles'
-      d = DIRECTORY(curdir)
-   END
-   WHEN code=2 THEN DO
-      /* imakesvc 2 buildincdir buildinctop currentdir file */
-      bid = WORD(all,3)
-      cid = WORD(all,4)
-      fil = WORD(all,5)
-      curdir = DIRECTORY()
-      d = DIRECTORY(WORD(all,2))
-      rc = SysFileDelete(fil)
-      dir = TRANSLATE(bid'/'cid'/'fil,'\','/')
-      COPY dir .' >nul 2>&1 '
-      d = DIRECTORY(curdir)
-   END
-   WHEN code=3 THEN DO
-      /* imakesvc 3 subdir updir file */
-      sdi = WORD(all,2)
-      fil = WORD(all,4)
-      curdir = DIRECTORY()
-      d = DIRECTORY(WORD(all,3))
-      rc = SysFileDelete(fil)
-      dir = TRANSLATE(sdi'/'fil,'\','/')
-      COPY dir' . >nul 2>&1'
-      d = DIRECTORY(curdir)
-   END
-   WHEN code=4 THEN DO
-      /* imakesvc 4 [-r] files... */
-      rec = WORD(all,2)
-      fp = 2
-      IF rec = '-r' THEN fp = 3 
-      ELSE rec = '-n'
-      DO i=fp TO WORDS(all)
-	 CALL discard rec,TRANSLATE(WORD(all,i),'\','/')
-      END	
-   END
-   WHEN code=5 THEN DO
-      /* imakesvc 5 file */
-      file = TRANSLATE(WORD(all,2),'\','/')
-      RC = SysFileDelete(file'.bak')
-      if exists(file) THEN 'REN 'file file||'.bak'
-   END
-   WHEN code=6 THEN DO
-      /* imakesvc 6 file */
-      file = TRANSLATE(WORD(all,2),'\','/')
-      CALL SysFileDelete(file||'.bak')
-      if exists(file) THEN 'REN 'file file||'.bak'
-   END
-   WHEN code=7 THEN DO
-      /* imakesvc 7 from to */
-      from = TRANSLATE(WORD(all,2),'\','/')
-      to = TRANSLATE(WORD(all,3),'\','/')
-      CALL SysFileDelete(to)
-      COPY from to' >nul 2>&1'
-   END
-   WHEN code=8 THEN DO
-      /* imakesvc 8 arg */
-      SAY SUBWORD(TRANSLATE(all,'  ','222c'x),2)
-   END
-   WHEN code=9 THEN DO
-      /* imakesvc 9 dst.c incl.h src.c */
-      dst = TRANSLATE(WORD(all,2),'\','/')
-      src = TRANSLATE(WORD(all,4),'\','/')
-      CALL SysFileDelete(dst)
-      CALL LINEOUT dst,'#include "'WORD(all,3)'"'
-      CALL LINEOUT dst,'#include "'src'"'
-      CALL LINEOUT dst 
-   END
-   WHEN code=10 THEN DO
-      /* imakesvc 10 srcfile destdir destfile suffix */
-      src = stripsuffix(WORD(all,2))
-      destdir = TRANSLATE(WORD(all,3),'\','/')
-      dest = stripsuffix(WORD(all,4))
-      suffix = WORD(all,5)
-      tgt = destdir'\'dest'.'suffix
-      /* if you have no col.exe get one from 4.4BSD */
-      'groff -e -t -man -Tascii 'src'.man | col -b >'tgt
-   END
-   WHEN code=11 THEN DO
-      /* imakesvc 11 dirtomake */
-      dirtomake = TRANSLATE(WORD(all,2),'\','/')
-      rc = SysMkDir(dirtomake)
-   END
-   WHEN code=12 THEN DO
-      /* imakesvc 12 srcfile destdir destfile */
-      src = stripsuffix(WORD(all,2))
-      destdir = TRANSLATE(WORD(all,3),'\','/')
-      dest = stripsuffix(WORD(all,4))
-      tgt = destdir'\'dest'.gz'
-      /* if you have no col.exe get one from 4.4BSD */
-      'groff -e -t -man -Tascii 'src'.man | col -b | gzip -n >'tgt
-   END
-   WHEN code=13 THEN DO
-      /* imakesvc 13 indir fromfile tofile */
-      ind = TRANSLATE(WORD(all,2),'\','/')
-      frm = TRANSLATE(WORD(all,3),'\','/')
-      tof = ind'\'WORD(all,4)
-      IF \(exists(ind)) THEN call SysMkDir ind
-      rc = SysFileDelete(tof)
-      COPY frm' 'tof
-   END
-   WHEN code=14 THEN DO
-      /* imakesvc 14 destdir srcfile... */
-      destdir = TRANSLATE(WORD(all,2),'\','/')
-      DO i=3 TO WORDS(all)
-	src = stripsuffix(WORD(all,i))
-	tgt = destdir'\'src'.gz'
-	'groff -e -t -man -Tascii 'src'.man | col -b | gzip -n >'tgt
-      END
-   END
-   WHEN code=15 THEN DO
-      /* imakesvc 15 destdir suffix srcfile... */
-      destdir = TRANSLATE(WORD(all,2),'\','/')
-      suffix = WORD(all,3)
-      DO i=4 TO WORDS(all)
-	src = stripsuffix(WORD(all,i))
-	tgt = destdir'\'src'.'suffix
-	'groff -e -t -man -Tascii 'src'.man | col -b >'tgt
-      END
-   END
-   WHEN code=16 THEN DO
-      /* imakesvc 16 dirlist...*/
-      mkfontdir = TRANSLATE(WORD(all,2),'\','/')
-      earg=''
-      DO i=3 TO WORDS(all)
-        arg = WORD(all,i)
-        earg = earg' -e 'arg
-      END
-      mkfontdir' -r -p inst/ 'earg' .'
-   END
-   OTHERWISE NOP
-END
-RETURN
-
-downlevels:
-oldpos = 1
-pfx = ''
-DO FOREVER
-   newpos = POS('/',ARG(1),oldpos)
-   IF newpos = 0 THEN LEAVE
-   newpfx = '../'pfx
-   oldpos = newpos+1
-   pfx = newpfx
-END
-RETURN pfx
-
-/* returns 1, if file exists */
-exists:
-'DIR "'arg(1)'" >nul 2>&1'
-IF rc = 0 THEN return 1
-RETURN 0
-
-discard: PROCEDURE
-rec=ARG(1)
-files=ARG(2)
-IF rec = '-r' THEN DO
-   old = DIRECTORY()
-   nd = DIRECTORY
-   CALL SysFileTree files, 'deld', 'DO'
-   IF deld.0 > 0 THEN DO
-      DO m=1 TO deld.0
-         CALL DIRECTORY deld.m
-         CALL discard '-R' .
-         CALL DIRECTORY ..
-         CALL SysRmDir deld.m
-      END 
-      CALL SysRmDir files
-   END
-   CALL SysFileTree files, 'delf', 'FO'
-   DO k=1 TO delf.0
-      DEL '"'delf.k'"' '>nul 2>&1'
-   END
-   CALL SysRmDir files
-END 
-ELSE DO
-   DEL '"'files'"' '>nul 2>&1'
-END
-RETURN
-
-/* somehow make or cmd manages to convert a relative path ..\..\. to ..... */
-fixbadprefix:
-count = 1
-str = ARG(1)
-DO WHILE SUBSTR(str,count,2) = '..'
-   count = count+1
-   str = INSERT('\',str,count)
-   count = count+2
-END
-RETURN str
-
-striplevel:
-str=ARG(1)
-n=arg(2)
-DO count=0 TO n
-   p = POS('/',str)
-   IF p = 0 THEN LEAVE
-   str = DELSTR(str,1,p)
-END
-RETURN str
-
-nlevels:
-str = ARG(1)
-count = 0
-oldpos = 1
-DO FOREVER
-   newpos = POS('/',str,oldpos)
-   IF newpos = 0 THEN LEAVE
-   oldpos = newpos + 1
-   count = count + 1
-END
-RETURN count
-
-maketop:
-str = ''
-n = ARG(1)
-DO k=1 TO n
-  str = str||'../'
-END
-RETURN str||'.'
-
-stripsuffix:
-str = ARG(1)
-spos = POS('.',str)
-IF spos = 0 THEN
-   RETURN str
-ELSE
-   RETURN LEFT(str,spos-1)
diff --git a/nx-X11/config/makedepend/Imakefile b/nx-X11/config/makedepend/Imakefile
deleted file mode 100644
index 8bb20724b..000000000
--- a/nx-X11/config/makedepend/Imakefile
+++ /dev/null
@@ -1,101 +0,0 @@
-XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:50 cpqbld Exp $
-XCOMM
-XCOMM
-XCOMM
-XCOMM
-XCOMM $XFree86: xc/config/makedepend/Imakefile,v 3.12tsi Exp $
-
-    SRCS = include.c main.c parse.c pr.c cppsetup.c ifparser.c
-    OBJS = include.o main.o parse.o pr.o cppsetup.o ifparser.o
-
-XCOMM Some compilers generate fatal errors if an -L directory does
-XCOMM not exist.  Since BUILDLIBDIR may not exist yet suppress its use.
-         LDPRELIB =
-        LDPRELIBS =
-
-#if HasGcc && !defined(PreIncDir)
-#ifdef CrossCompileDir
-#else
-#define PreIncDir /usr/local/lib/gcc-include
-#endif
-#endif
-#ifdef PreIncDir
-PREINCDIR = PreIncDir
-PREINC_DEFINES = -DPREINCDIR=\"$(PREINCDIR)\"
-#endif
-#ifndef StdIncDir
-#ifdef CrossCompileDir
-#define StdIncDir Concat(CrossCompileDir,/../include)
-#else
-#define StdIncDir /usr/include
-#endif
-#endif
-STDINCDIR = StdIncDir
-STDINC_DEFINES = -DINCLUDEDIR=\"$(STDINCDIR)\"
-#ifdef PostIncDir
-POSTINCDIR = PostIncDir
-POSTINC_DEFINES = -DPOSTINCDIR=\"$(POSTINCDIR)\"
-#endif
-#ifdef ExtraIncDir
-EXTRAINCDIR = ExtraIncDir
-EXTRAINC_DEFINES = -DEXTRAINCDIR=\"$(EXTRAINCDIR)\"
-#endif
-INC_DEFINES = $(PREINC_DEFINES) $(STDINC_DEFINES) $(POSTINC_DEFINES) \
-	      $(EXTRAINC_DEFINES)
-OSUF = Concat(.,Osuf)
-OSUF_DEFINES = -DOBJSUFFIX=\"$(OSUF)\"
-MAIN_DEFINES = $(INC_DEFINES) $(SIGNAL_DEFINES) $(OSUF_DEFINES)
-INCLUDES = -I$(IMAKESRC) -I$(TOP)/include $(TOP_X_INCLUDES)/X11
-
- DEPLIBS =
-
-#if defined(MacIIArchitecture) || defined(SequentArchitecture) || defined(i386ScoArchitecture)
- XBSDLIB = /**/
-#endif
-
-AllTarget(HostProgramTargetName(makedepend))
-
-makedependonly:: HostProgramTargetName(makedepend)
-
-/*
- * bootstrapping: want to build the real makedepend
- * only after we've run "make depend" here.  That way
- * the program has the right dependencies for clearmake.
- * Save the bootstrap original files so they can be winked in
- * to other views.
- */
-
-#if HasClearmake
-bootstrap:
-	test -h X11 || $(LN) TOPDIR/include X11
-	$(MAKE) -f Makefile.proto TOP_INCLUDES=-I. makedepend
-
-depend::
-	$(MAKE) -f Makefile.proto depend
-	test -d bootstrap || mkdir bootstrap
-	$(MV) *.o makedepend bootstrap
-	$(MAKE) -f Makefile.proto makedepend
-
-clean::
-	$(RM) -r bootstrap
-	$(RM) X11
-#else
-bootstrap:
-#endif /* HasClearmake */
-
-clean::
-	$(RM) Makefile.proto
-
-#undef InstallManPage
-#define InstallManPage(file,dest) /* as nothing */
-#if CrossCompiling
-ComplexHostProgramTarget(makedepend)
-#else
-ComplexProgramTarget(makedepend)
-#endif
-
-SpecialCObjectRule(main,$(ICONFIGFILES),$(MAIN_DEFINES))
-
-InstallManPageLong(mkdepend,$(MANDIR),makedepend)
-
-InstallDriverSDKNamedProg(makedepend,makedepend,$(DRIVERSDKDIR)/config/makedepend)
diff --git a/nx-X11/config/makedepend/cpp.ed b/nx-X11/config/makedepend/cpp.ed
deleted file mode 100644
index 3a7db5096..000000000
--- a/nx-X11/config/makedepend/cpp.ed
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# $Xorg: cpp.ed,v 1.3 2000/08/17 19:41:50 cpqbld Exp $
-#
-# $Locker $
-#
-/struct symtab stab/d
-/struct symtab \*defloc;/d
-/struct symtab \*udfloc;/d
-/struct symtab \*incloc;/d
-/struct symtab \*ifloc;/d
-/struct symtab \*elsloc;/d
-/struct symtab \*eifloc;/d
-/struct symtab \*ifdloc;/d
-/struct symtab \*ifnloc;/d
-/struct symtab \*ysysloc;/d
-/struct symtab \*varloc;/d
-/struct symtab \*lneloc;/d
-/struct symtab \*ulnloc;/d
-/struct symtab \*uflloc;/d
-/^sayline(/s/$/	DELETED/p
-.,/^}/d
-/^unfill(/s/$/	DELETED/p
-.-1,/^}/d
-/^doincl(/s/$/	DELETED/p
-.-1,/^}/d
-/^equfrm(/s/$/	DELETED/p
-.,/^}/d
-/^dodef(/s/$/	DELETED/p
-.-1,/^}/d
-/^control(/s/$/	DELETED/p
-.-1,/^}/d
-/^savestring(/s/$/	DELETED/p
-.-1,/^}/d
-/^stsym(/s/$/	DELETED/p
-.-1,/^}/d
-/^ppsym(/s/$/	DELETED/p
-.-1,/^}/d
-/^yyerror(/s/$/	DELETED/p
-.,/^}/d
-/^ppwarn(/s/$/	DELETED/p
-.,/^}/d
-/^lookup(/s/$/	DELETED/p
-.-1,/^}/d
-/^subst(/s/$/	DELETED/p
-.-1,/^}/d
-/^trmdir(/s/$/	DELETED/p
-.-1,/^}/d
-/^copy(/s/$/	DELETED/p
-.-1,/^}/d
-/^pperror(/s/$/	DELETED/p
-.,/^}/d
-/^main(/s/$/	CHANGED to cpp_varsetup(argc,argv)/p
-.c
-cpp_varsetup(argc,argv)
-.
-/^strdex(/s/$/	DELETED/p
-.-1,/^}/d
-/^ for(i=1; i<argc; i++)/s/$/	To the end DELETED/p
-.,$c
-}
-.
-/^dump(/s/$/	DELETED/p
-.,/^}/c
-dump() { fatal("dump\n"); }
-.
-/^refill(/s/$/	DELETED/p
-.,/^}/c
-refill() { fatal("refill\n"); }
-.
-/^slookup(/s/$/	DELETED/p
-.-1,/^}/c
-static struct symtab *slookup() { fatal("slookup\n"); }
-.
-w
-q
diff --git a/nx-X11/config/makedepend/cppsetup.c b/nx-X11/config/makedepend/cppsetup.c
deleted file mode 100644
index c7ac25681..000000000
--- a/nx-X11/config/makedepend/cppsetup.c
+++ /dev/null
@@ -1,233 +0,0 @@
-/* $Xorg: cppsetup.c,v 1.5 2001/02/09 02:03:16 xorgcvs Exp $ */
-/*
-
-Copyright (c) 1993, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/config/makedepend/cppsetup.c,v 3.10 2001/12/14 19:53:20 dawes Exp $ */
-
-#include "def.h"
-
-#ifdef	CPP
-/*
- * This file is strictly for the sake of cpy.y and yylex.c (if
- * you indeed have the source for cpp).
- */
-#define IB 1
-#define SB 2
-#define NB 4
-#define CB 8
-#define QB 16
-#define WB 32
-#define SALT '#'
-#if defined(pdp11) || defined(vax) || defined(ns16000) || defined(mc68000) || defined(ibm032)
-#define COFF 128
-#else
-#define COFF 0
-#endif
-/*
- * These variables used by cpy.y and yylex.c
- */
-extern char	*outp, *inp, *newp, *pend;
-extern char	*ptrtab;
-extern char	fastab[];
-extern char	slotab[];
-
-/*
- * cppsetup
- */
-struct filepointer	*currentfile;
-struct inclist		*currentinc;
-
-int
-cppsetup(char *line, struct filepointer *filep, struct inclist *inc)
-{
-	char *p, savec;
-	static boolean setupdone = FALSE;
-	boolean	value;
-
-	if (!setupdone) {
-		cpp_varsetup();
-		setupdone = TRUE;
-	}
-
-	currentfile = filep;
-	currentinc = inc;
-	inp = newp = line;
-	for (p=newp; *p; p++)
-		;
-
-	/*
-	 * put a newline back on the end, and set up pend, etc.
-	 */
-	*p++ = '\n';
-	savec = *p;
-	*p = '\0';
-	pend = p;
-
-	ptrtab = slotab+COFF;
-	*--inp = SALT; 
-	outp=inp; 
-	value = yyparse();
-	*p = savec;
-	return(value);
-}
-
-struct symtab **lookup(symbol)
-	char	*symbol;
-{
-	static struct symtab    *undefined;
-	struct symtab   **sp;
-
-	sp = isdefined(symbol, currentinc, NULL);
-	if (sp == NULL) {
-		sp = &undefined;
-		(*sp)->s_value = NULL;
-	}
-	return (sp);
-}
-
-pperror(tag, x0,x1,x2,x3,x4)
-	int	tag,x0,x1,x2,x3,x4;
-{
-	warning("\"%s\", line %d: ", currentinc->i_file, currentfile->f_line);
-	warning(x0,x1,x2,x3,x4);
-}
-
-
-yyerror(s)
-	register char	*s;
-{
-	fatalerr("Fatal error: %s\n", s);
-}
-#else /* not CPP */
-
-#include "ifparser.h"
-struct _parse_data {
-    struct filepointer *filep;
-    struct inclist *inc;
-    char *filename;
-    const char *line;
-};
-
-static const char *
-my_if_errors (IfParser *ip, const char *cp, const char *expecting)
-{
-    struct _parse_data *pd = (struct _parse_data *) ip->data;
-    int lineno = pd->filep->f_line;
-    char *filename = pd->filename;
-    char prefix[300];
-    int prefixlen;
-    int i;
-
-    sprintf (prefix, "\"%s\":%d", filename, lineno);
-    prefixlen = strlen(prefix);
-    fprintf (stderr, "%s:  %s", prefix, pd->line);
-    i = cp - pd->line;
-    if (i > 0 && pd->line[i-1] != '\n') {
-	putc ('\n', stderr);
-    }
-    for (i += prefixlen + 3; i > 0; i--) {
-	putc (' ', stderr);
-    }
-    fprintf (stderr, "^--- expecting %s\n", expecting);
-    return NULL;
-}
-
-
-#define MAXNAMELEN 256
-
-static struct symtab **
-lookup_variable (IfParser *ip, const char *var, int len)
-{
-    char tmpbuf[MAXNAMELEN + 1];
-    struct _parse_data *pd = (struct _parse_data *) ip->data;
-
-    if (len > MAXNAMELEN)
-	return 0;
-
-    strncpy (tmpbuf, var, len);
-    tmpbuf[len] = '\0';
-    return isdefined (tmpbuf, pd->inc, NULL);
-}
-
-
-static int
-my_eval_defined (IfParser *ip, const char *var, int len)
-{
-    if (lookup_variable (ip, var, len))
-	return 1;
-    else
-	return 0;
-}
-
-#define isvarfirstletter(ccc) (isalpha(ccc) || (ccc) == '_')
-
-static long
-my_eval_variable (IfParser *ip, const char *var, int len)
-{
-    long val;
-    struct symtab **s;
-
-    s = lookup_variable (ip, var, len);
-    if (!s)
-	return 0;
-    do {
-	var = (*s)->s_value;
-	if (!isvarfirstletter(*var) || !strcmp((*s)->s_name, var))
-	    break;
-	s = lookup_variable (ip, var, strlen(var));
-    } while (s);
-
-    var = ParseIfExpression(ip, var, &val);
-    if (var && *var) debug(4, ("extraneous: '%s'\n", var));
-    return val;
-}
-
-int
-cppsetup(char *filename,
-	 char *line,
-	 struct filepointer *filep,
-	 struct inclist *inc)
-{
-    IfParser ip;
-    struct _parse_data pd;
-    long val = 0;
-
-    pd.filep = filep;
-    pd.inc = inc;
-    pd.line = line;
-    pd.filename = filename;
-    ip.funcs.handle_error = my_if_errors;
-    ip.funcs.eval_defined = my_eval_defined;
-    ip.funcs.eval_variable = my_eval_variable;
-    ip.data = (char *) &pd;
-
-    (void) ParseIfExpression (&ip, line, &val);
-    if (val)
-	return IF;
-    else
-	return IFFALSE;
-}
-#endif /* CPP */
-
diff --git a/nx-X11/config/makedepend/def.h b/nx-X11/config/makedepend/def.h
deleted file mode 100644
index cf8f37b02..000000000
--- a/nx-X11/config/makedepend/def.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/* $XdotOrg: xc/config/makedepend/def.h,v 1.4 2005/07/29 18:42:37 kem Exp $ */
-/* $Xorg: def.h,v 1.4 2001/02/09 02:03:16 xorgcvs Exp $ */
-/*
-
-Copyright (c) 1993, 1994, 1998 The Open Group.
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/config/makedepend/def.h,v 3.13tsi Exp $ */
-
-#ifdef HAVE_CONFIG_H /* Autotooled for Xorg 7.0? */
-# include "makedepend-config.h"
-# define USING_AUTOCONF
-#endif
-
-#include <X11/Xos.h>
-#include <X11/Xfuncproto.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#if 0
-#ifndef X_NOT_POSIX
-#ifndef _POSIX_SOURCE
-#define _POSIX_SOURCE
-#endif
-#endif
-#endif
-#include <sys/types.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-
-#define MAXDEFINES	512
-#define MAXFILES	1024
-#define MAXINCFILES	128	/* "-include" files */
-#define MAXDIRS		64
-#define SYMTABINC	10	/* must be > 1 for define() to work right */
-#define	TRUE		1
-#define	FALSE		0
-
-/* the following must match the directives table in main.c */
-#define	IF		0
-#define	IFDEF		1
-#define	IFNDEF		2
-#define	ELSE		3
-#define	ENDIF		4
-#define	DEFINE		5
-#define	UNDEF		6
-#define	INCLUDE		7
-#define	LINE		8
-#define	PRAGMA		9
-#define ERROR           10
-#define IDENT           11
-#define SCCS            12
-#define ELIF            13
-#define EJECT           14
-#define WARNING         15
-#define INCLUDENEXT     16
-#define IFFALSE         17     /* pseudo value --- never matched */
-#define ELIFFALSE       18     /* pseudo value --- never matched */
-#define INCLUDEDOT      19     /* pseudo value --- never matched */
-#define IFGUESSFALSE    20     /* pseudo value --- never matched */
-#define ELIFGUESSFALSE  21     /* pseudo value --- never matched */
-#define INCLUDENEXTDOT  22     /* pseudo value --- never matched */
-
-#ifdef DEBUG
-extern int	_debugmask;
-/*
- * debug levels are:
- * 
- *     0	show ifn*(def)*,endif
- *     1	trace defined/!defined
- *     2	show #include
- *     3	show #include SYMBOL
- *     4-6	unused
- */
-#define debug(level,arg) { if (_debugmask & (1 << level)) warning arg; }
-#else
-#define	debug(level,arg) /**/
-#endif /* DEBUG */
-
-typedef	unsigned char boolean;
-
-struct symtab {
-	char	*s_name;
-	char	*s_value;
-};
-
-/* possible i_flag */
-#define DEFCHECKED	(1<<0)	/* whether defines have been checked */
-#define NOTIFIED	(1<<1)	/* whether we have revealed includes */
-#define MARKED		(1<<2)	/* whether it's in the makefile */
-#define SEARCHED	(1<<3)	/* whether we have read this */
-#define FINISHED	(1<<4)	/* whether we are done reading this */
-#define INCLUDED_SYM	(1<<5)	/* whether #include SYMBOL was found
-				   Can't use i_list if TRUE */
-struct	inclist {
-	char		*i_incstring;	/* string from #include line */
-	char		*i_file;	/* path name of the include file */
-	struct inclist	**i_list;	/* list of files it itself includes */
-	int		i_listlen;	/* length of i_list */
-	struct symtab	**i_defs;	/* symbol table for this file and its
-					   children when merged */
-	int		i_ndefs;	/* current # defines */
-	boolean		*i_merged;      /* whether we have merged child
-					   defines */
-	unsigned char   i_flags;
-};
-
-struct filepointer {
-	char	*f_name;
-	char	*f_p;
-	char	*f_base;
-	char	*f_end;
-	long	f_len;
-	long	f_line;
-	long	cmdinc_count;
-	char	**cmdinc_list;
-	long	cmdinc_line;
-};
-
-#include <stdlib.h>
-#if defined(macII) && !defined(__STDC__)  /* stdlib.h fails to define these */
-char *malloc(), *realloc();
-#endif /* macII */
-
-char			*copy(char *str);
-int                     match(char *str, char **list);
-char			*base_name(char *file);
-char			*getnextline(struct filepointer *fp);
-struct symtab		**slookup(char *symbol, struct inclist *file);
-struct symtab		**isdefined(char *symbol, struct inclist *file,
-				    struct inclist **srcfile);
-struct symtab		**fdefined(char *symbol, struct inclist *file,
-				   struct inclist **srcfile);
-struct filepointer	*getfile(char *file);
-void                    included_by(struct inclist *ip, 
-				    struct inclist *newfile);
-struct inclist		*newinclude(char *newfile, char *incstring);
-void                    inc_clean (void);
-struct inclist		*inc_path(char *file, char *include, int type);
-
-void                    freefile(struct filepointer *fp);
-
-void                    define2(char *name, char *val, struct inclist *file);
-void                    define(char *def, struct inclist *file);
-void                    undefine(char *symbol, struct inclist *file);
-int                     find_includes(struct filepointer *filep, 
-				      struct inclist *file, 
-				      struct inclist *file_red, 
-				      int recursion, boolean failOK);
-
-void                    recursive_pr_include(struct inclist *head, 
-					     char *file, char *base);
-void                    add_include(struct filepointer *filep, 
-				    struct inclist *file, 
-				    struct inclist *file_red, 
-				    char *include, int type,
-				    boolean failOK);
-
-int                     cppsetup(char *filename,
-				 char *line,
-				 struct filepointer *filep,
-				 struct inclist *inc);
-
-
-extern void fatalerr(char *, ...);
-extern void warning(char *, ...);
-extern void warning1(char *, ...);
diff --git a/nx-X11/config/makedepend/ifparser.c b/nx-X11/config/makedepend/ifparser.c
deleted file mode 100644
index 58c05a09f..000000000
--- a/nx-X11/config/makedepend/ifparser.c
+++ /dev/null
@@ -1,553 +0,0 @@
-/*
- * $Xorg: ifparser.c,v 1.3 2000/08/17 19:41:50 cpqbld Exp $
- *
- * Copyright 1992 Network Computing Devices, Inc.
- * 
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Network Computing Devices may not be
- * used in advertising or publicity pertaining to distribution of the software
- * without specific, written prior permission.  Network Computing Devices makes
- * no representations about the suitability of this software for any purpose.
- * It is provided ``as is'' without express or implied warranty.
- * 
- * NETWORK COMPUTING DEVICES DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
- * IN NO EVENT SHALL NETWORK COMPUTING DEVICES BE LIABLE FOR ANY SPECIAL,
- * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- * 
- * Author:  Jim Fulton
- *          Network Computing Devices, Inc.
- * 
- * Simple if statement processor
- *
- * This module can be used to evaluate string representations of C language
- * if constructs.  It accepts the following grammar:
- * 
- *     EXPRESSION	:=	VALUE
- * 			 |	VALUE  BINOP	EXPRESSION
- *			 |	VALUE	'?'	EXPRESSION ':'	EXPRESSION
- * 
- *     VALUE		:=	'('  EXPRESSION  ')'
- * 			 |	'!'  VALUE
- * 			 |	'-'  VALUE
- * 			 |	'+'  VALUE
- *			 |	'~'  VALUE
- * 			 |	'defined'  '('  variable  ')'
- * 			 |	'defined'  variable
- *			 |	# variable '(' variable-list ')'
- * 			 |	variable
- * 			 |	number
- * 
- *     BINOP		:=	'*'	|  '/'	|  '%'
- * 			 |	'+'	|  '-'
- * 			 |	'<<'	|  '>>'
- * 			 |	'<'	|  '>'	|  '<='  |  '>='
- * 			 |	'=='	|  '!='
- * 			 |	'&'	|  '^'  |  '|'
- * 			 |	'&&'	|  '||'
- * 
- * The normal C order of precedence is supported.
- * 
- * 
- * External Entry Points:
- * 
- *     ParseIfExpression		parse a string for #if
- */
-/* $XFree86: xc/config/makedepend/ifparser.c,v 3.10tsi Exp $ */
-
-#include "ifparser.h"
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
-
-/****************************************************************************
-		   Internal Macros and Utilities for Parser
- ****************************************************************************/
-
-#define DO(val) if (!(val)) return NULL
-#define CALLFUNC(ggg,fff) (*((ggg)->funcs.fff))
-#define SKIPSPACE(ccc) while (isspace(*ccc)) ccc++
-#define isvarfirstletter(ccc) (isalpha(ccc) || (ccc) == '_')
-
-
-static const char *
-parse_variable (IfParser *g, const char *cp, const char **varp)
-{
-    SKIPSPACE (cp);
-
-    if (!isvarfirstletter (*cp))
-	return CALLFUNC(g, handle_error) (g, cp, "variable name");
-
-    *varp = cp;
-    /* EMPTY */
-    for (cp++; isalnum(*cp) || *cp == '_'; cp++) ;
-    return cp;
-}
-
-
-static const char *
-parse_number (IfParser *g, const char *cp, long *valp)
-{
-    long base = 10;
-    SKIPSPACE (cp);
-
-    if (!isdigit(*cp))
-	return CALLFUNC(g, handle_error) (g, cp, "number");
-
-    *valp = 0;
-
-    if (*cp == '0') {
-	cp++;
-	if ((*cp == 'x') || (*cp == 'X')) {
-	    base = 16;
-	    cp++;
-	} else {
-	    base = 8;
-	}
-    }
-
-    /* Ignore overflows and assume ASCII, what source is usually written in */
-    while (1) {
-	int increment = -1;
-	if (base == 8) {
-	    if ((*cp >= '0') && (*cp <= '7'))
-		increment = *cp++ - '0';
-	} else if (base == 16) {
-	    if ((*cp >= '0') && (*cp <= '9'))
-		increment = *cp++ - '0';
-	    else if ((*cp >= 'A') &&  (*cp <= 'F'))
-		increment = *cp++ - ('A' - 10);
-	    else if ((*cp >= 'a') && (*cp <= 'f'))
-		increment = *cp++ - ('a' - 10);
-	} else {	/* Decimal */
-	    if ((*cp >= '0') && (*cp <= '9'))
-		increment = *cp++ - '0';
-	}
-	if (increment < 0)
-	    break;
-	*valp = (*valp * base) + increment;
-    }
-
-    /* Skip trailing qualifiers */
-    while (*cp == 'U' || *cp == 'u' || *cp == 'L' || *cp == 'l') cp++;
-    return cp;
-}
-
-static const char *
-parse_character (IfParser *g, const char *cp, long *valp)
-{
-    char val;
-
-    SKIPSPACE (cp);
-    if (*cp == '\\')
-	switch (cp[1]) {
-	case 'n': val = '\n'; break;
-	case 't': val = '\t'; break;
-	case 'v': val = '\v'; break;
-	case 'b': val = '\b'; break;
-	case 'r': val = '\r'; break;
-	case 'f': val = '\f'; break;
-	case 'a': val = '\a'; break;
-	case '\\': val = '\\'; break;
-	case '?': val = '\?'; break;
-	case '\'': val = '\''; break;
-	case '\"': val = '\"'; break;
-	case 'x': val = (char) strtol (cp + 2, NULL, 16); break;
-	default: val = (char) strtol (cp + 1, NULL, 8); break;
-	}
-    else
-	val = *cp;
-    while (*cp != '\'') cp++;
-    *valp = (long) val;
-    return cp;
-}
-
-static const char *
-parse_value (IfParser *g, const char *cp, long *valp)
-{
-    const char *var, *varend;
-
-    *valp = 0;
-
-    SKIPSPACE (cp);
-    if (!*cp)
-	return cp;
-
-    switch (*cp) {
-      case '(':
-	DO (cp = ParseIfExpression (g, cp + 1, valp));
-	SKIPSPACE (cp);
-	if (*cp != ')') 
-	    return CALLFUNC(g, handle_error) (g, cp, ")");
-
-	return cp + 1;			/* skip the right paren */
-
-      case '!':
-	DO (cp = parse_value (g, cp + 1, valp));
-	*valp = !(*valp);
-	return cp;
-
-      case '-':
-	DO (cp = parse_value (g, cp + 1, valp));
-	*valp = -(*valp);
-	return cp;
-
-      case '+':
-	DO (cp = parse_value (g, cp + 1, valp));
-	return cp;
-
-      case '~':
-	DO (cp = parse_value (g, cp + 1, valp));
-	*valp = ~(*valp);
-	return cp;
-
-      case '#':
-	DO (cp = parse_variable (g, cp + 1, &var));
-	SKIPSPACE (cp);
-	if (*cp != '(')
-	    return CALLFUNC(g, handle_error) (g, cp, "(");
-	do {
-	    DO (cp = parse_variable (g, cp + 1, &var));
-	    SKIPSPACE (cp);
-	} while (*cp && *cp != ')');
-	if (*cp != ')')
-	    return CALLFUNC(g, handle_error) (g, cp, ")");
-	*valp = 1; /* XXX */
-	return cp + 1;
-
-      case '\'':
-	DO (cp = parse_character (g, cp + 1, valp));
-	if (*cp != '\'')
-	    return CALLFUNC(g, handle_error) (g, cp, "'");
-	return cp + 1;
-
-      case 'd':
-	if (strncmp (cp, "defined", 7) == 0 && !isalnum(cp[7])) {
-	    int paren = 0;
-	    int len;
-
-	    cp += 7;
-	    SKIPSPACE (cp);
-	    if (*cp == '(') {
-		paren = 1;
-		cp++;
-	    }
-	    DO (cp = parse_variable (g, cp, &var));
-	    len = cp - var;
-	    SKIPSPACE (cp);
-	    if (paren && *cp != ')')
-		return CALLFUNC(g, handle_error) (g, cp, ")");
-	    *valp = (*(g->funcs.eval_defined)) (g, var, len);
-	    return cp + paren;		/* skip the right paren */
-	}
-	/* fall out */
-    }
-
-    if (isdigit(*cp)) {
-	DO (cp = parse_number (g, cp, valp));
-    } else if (!isvarfirstletter(*cp))
-	return CALLFUNC(g, handle_error) (g, cp, "variable or number");
-    else {
-	DO (cp = parse_variable (g, cp, &var));
-	varend = cp;
-	SKIPSPACE(cp);
-	if (*cp != '(') {
-	    *valp = (*(g->funcs.eval_variable)) (g, var, varend - var);
-	} else {
-	    do {
-		long dummy;
-		DO (cp = ParseIfExpression (g, cp + 1, &dummy));
-		SKIPSPACE(cp);
-		if (*cp == ')')
-		    break;
-		if (*cp != ',')
-		    return CALLFUNC(g, handle_error) (g, cp, ",");
-	    } while (1);
-
-	    *valp = 1;	/* XXX */
-	    cp++;
-	}
-    }
-    
-    return cp;
-}
-
-
-
-static const char *
-parse_product (IfParser *g, const char *cp, long *valp)
-{
-    long rightval;
-
-    DO (cp = parse_value (g, cp, valp));
-    SKIPSPACE (cp);
-
-    switch (*cp) {
-      case '*':
-	DO (cp = parse_product (g, cp + 1, &rightval));
-	*valp = (*valp * rightval);
-	break;
-
-      case '/':
-	DO (cp = parse_product (g, cp + 1, &rightval));
-    if (rightval)
-	    *valp = (*valp / rightval);
-    else
-        *valp = LONG_MAX;
-	break;
-
-      case '%':
-	DO (cp = parse_product (g, cp + 1, &rightval));
-	*valp = (*valp % rightval);
-	break;
-    }
-    return cp;
-}
-
-
-static const char *
-parse_sum (IfParser *g, const char *cp, long *valp)
-{
-    long rightval;
-
-    DO (cp = parse_product (g, cp, valp));
-    SKIPSPACE (cp);
-
-    switch (*cp) {
-      case '+':
-	DO (cp = parse_sum (g, cp + 1, &rightval));
-	*valp = (*valp + rightval);
-	break;
-
-      case '-':
-	DO (cp = parse_sum (g, cp + 1, &rightval));
-	*valp = (*valp - rightval);
-	break;
-    }
-    return cp;
-}
-
-
-static const char *
-parse_shift (IfParser *g, const char *cp, long *valp)
-{
-    long rightval;
-
-    DO (cp = parse_sum (g, cp, valp));
-    SKIPSPACE (cp);
-
-    switch (*cp) {
-      case '<':
-	if (cp[1] == '<') {
-	    DO (cp = parse_shift (g, cp + 2, &rightval));
-	    *valp = (*valp << rightval);
-	}
-	break;
-
-      case '>':
-	if (cp[1] == '>') {
-	    DO (cp = parse_shift (g, cp + 2, &rightval));
-	    *valp = (*valp >> rightval);
-	}
-	break;
-    }
-    return cp;
-}
-
-
-static const char *
-parse_inequality (IfParser *g, const char *cp, long *valp)
-{
-    long rightval;
-
-    DO (cp = parse_shift (g, cp, valp));
-    SKIPSPACE (cp);
-
-    switch (*cp) {
-      case '<':
-	if (cp[1] == '=') {
-	    DO (cp = parse_inequality (g, cp + 2, &rightval));
-	    *valp = (*valp <= rightval);
-	} else {
-	    DO (cp = parse_inequality (g, cp + 1, &rightval));
-	    *valp = (*valp < rightval);
-	}
-	break;
-
-      case '>':
-	if (cp[1] == '=') {
-	    DO (cp = parse_inequality (g, cp + 2, &rightval));
-	    *valp = (*valp >= rightval);
-	} else {
-	    DO (cp = parse_inequality (g, cp + 1, &rightval));
-	    *valp = (*valp > rightval);
-	}
-	break;
-    }
-    return cp;
-}
-
-
-static const char *
-parse_equality (IfParser *g, const char *cp, long *valp)
-{
-    long rightval;
-
-    DO (cp = parse_inequality (g, cp, valp));
-    SKIPSPACE (cp);
-
-    switch (*cp) {
-      case '=':
-	if (cp[1] == '=')
-	    cp++;
-	DO (cp = parse_equality (g, cp + 1, &rightval));
-	*valp = (*valp == rightval);
-	break;
-
-      case '!':
-	if (cp[1] != '=')
-	    break;
-	DO (cp = parse_equality (g, cp + 2, &rightval));
-	*valp = (*valp != rightval);
-	break;
-    }
-    return cp;
-}
-
-
-static const char *
-parse_band (IfParser *g, const char *cp, long *valp)
-{
-    long rightval;
-
-    DO (cp = parse_equality (g, cp, valp));
-    SKIPSPACE (cp);
-
-    switch (*cp) {
-      case '&':
-	if (cp[1] != '&') {
-	    DO (cp = parse_band (g, cp + 1, &rightval));
-	    *valp = (*valp & rightval);
-	}
-	break;
-    }
-    return cp;
-}
-
-
-static const char *
-parse_bxor (IfParser *g, const char *cp, long *valp)
-{
-    long rightval;
-
-    DO (cp = parse_band (g, cp, valp));
-    SKIPSPACE (cp);
-
-    switch (*cp) {
-      case '^':
-	DO (cp = parse_bxor (g, cp + 1, &rightval));
-	*valp = (*valp ^ rightval);
-	break;
-    }
-    return cp;
-}
-
-
-static const char *
-parse_bor (IfParser *g, const char *cp, long *valp)
-{
-    long rightval;
-
-    DO (cp = parse_bxor (g, cp, valp));
-    SKIPSPACE (cp);
-
-    switch (*cp) {
-      case '|':
-	if (cp[1] != '|') {
-	    DO (cp = parse_bor (g, cp + 1, &rightval));
-	    *valp = (*valp | rightval);
-	}
-	break;
-    }
-    return cp;
-}
-
-
-static const char *
-parse_land (IfParser *g, const char *cp, long *valp)
-{
-    long rightval;
-
-    DO (cp = parse_bor (g, cp, valp));
-    SKIPSPACE (cp);
-
-    switch (*cp) {
-      case '&':
-	if (cp[1] != '&')
-	    return CALLFUNC(g, handle_error) (g, cp, "&&");
-	DO (cp = parse_land (g, cp + 2, &rightval));
-	*valp = (*valp && rightval);
-	break;
-    }
-    return cp;
-}
-
-
-static const char *
-parse_lor (IfParser *g, const char *cp, long *valp)
-{
-    long rightval;
-
-    DO (cp = parse_land (g, cp, valp));
-    SKIPSPACE (cp);
-
-    switch (*cp) {
-      case '|':
-	if (cp[1] != '|')
-	    return CALLFUNC(g, handle_error) (g, cp, "||");
-	DO (cp = parse_lor (g, cp + 2, &rightval));
-	*valp = (*valp || rightval);
-	break;
-    }
-    return cp;
-}
-
-
-static const char *
-parse_cond(IfParser *g, const char *cp, long *valp)
-{
-    long trueval, falseval;
-
-    DO (cp = parse_lor (g, cp, valp));
-    SKIPSPACE (cp);
-
-    switch (*cp) {
-      case '?':
-	DO (cp = parse_cond (g, cp + 1, &trueval));
-	SKIPSPACE (cp);
-	if (*cp != ':')
-	    return CALLFUNC(g, handle_error) (g, cp, ":");
-	DO (cp = parse_cond (g, cp + 1, &falseval));
-	*valp = (*valp ? trueval : falseval);
-	break;
-    }
-    return cp;
-}
-
-
-/****************************************************************************
-			     External Entry Points
- ****************************************************************************/
-
-const char *
-ParseIfExpression (IfParser *g, const char *cp, long *valp)
-{
-    return parse_cond (g, cp, valp);
-}
diff --git a/nx-X11/config/makedepend/ifparser.h b/nx-X11/config/makedepend/ifparser.h
deleted file mode 100644
index 398a3e49c..000000000
--- a/nx-X11/config/makedepend/ifparser.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * $Xorg: ifparser.h,v 1.3 2000/08/17 19:41:51 cpqbld Exp $
- *
- * Copyright 1992 Network Computing Devices, Inc.
- * 
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Network Computing Devices may not be
- * used in advertising or publicity pertaining to distribution of the software
- * without specific, written prior permission.  Network Computing Devices makes
- * no representations about the suitability of this software for any purpose.
- * It is provided ``as is'' without express or implied warranty.
- * 
- * NETWORK COMPUTING DEVICES DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
- * IN NO EVENT SHALL NETWORK COMPUTING DEVICES BE LIABLE FOR ANY SPECIAL,
- * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- * 
- * Author:  Jim Fulton
- *          Network Computing Devices, Inc.
- * 
- * Simple if statement processor
- *
- * This module can be used to evaluate string representations of C language
- * if constructs.  It accepts the following grammar:
- * 
- *     EXPRESSION	:=	VALUE
- * 			 |	VALUE  BINOP	EXPRESSION
- *			 |	VALUE	'?'	EXPRESSION ':'	EXPRESSION
- * 
- *     VALUE		:=	'('  EXPRESSION  ')'
- * 			 |	'!'  VALUE
- * 			 |	'-'  VALUE
- *			 |	'~'  VALUE
- * 			 |	'defined'  '('  variable  ')'
- * 			 |	variable
- * 			 |	number
- * 
- *     BINOP		:=	'*'	|  '/'	|  '%'
- * 			 |	'+'	|  '-'
- * 			 |	'<<'	|  '>>'
- * 			 |	'<'	|  '>'	|  '<='  |  '>='
- * 			 |	'=='	|  '!='
- * 			 |	'&'	|  '^'  |  '|'
- * 			 |	'&&'	|  '||'
- * 
- * The normal C order of precedence is supported.
- * 
- * 
- * External Entry Points:
- * 
- *     ParseIfExpression		parse a string for #if
- */
-
-/* $XFree86: xc/config/makedepend/ifparser.h,v 3.4 2001/01/17 16:38:58 dawes Exp $ */
-
-#include <stdio.h>
-
-typedef int Bool;
-#define False 0
-#define True 1
-
-typedef struct _if_parser {
-    struct {				/* functions */
-	const char *(*handle_error) (struct _if_parser *, const char *,
-				     const char *);
-	long (*eval_variable) (struct _if_parser *, const char *, int);
-	int (*eval_defined) (struct _if_parser *, const char *, int);
-    } funcs;
-    char *data;
-} IfParser;
-
-const char *ParseIfExpression (
-    IfParser *, 
-    const char *, 
-    long *
-);
-
diff --git a/nx-X11/config/makedepend/include.c b/nx-X11/config/makedepend/include.c
deleted file mode 100644
index 65ce78338..000000000
--- a/nx-X11/config/makedepend/include.c
+++ /dev/null
@@ -1,318 +0,0 @@
-/* $Xorg: include.c,v 1.4 2001/02/09 02:03:16 xorgcvs Exp $ */
-/*
-
-Copyright (c) 1993, 1994, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/config/makedepend/include.c,v 3.6 2001/04/29 23:25:02 tsi Exp $ */
-
-
-#include "def.h"
-
-extern struct	inclist	inclist[ MAXFILES ],
-			*inclistp, *inclistnext;
-extern char	*includedirs[ ],
-		**includedirsnext;
-extern char	*notdotdot[ ];
-extern boolean show_where_not;
-extern boolean warn_multiple;
-
-static boolean
-isdot(char *p)
-{
-	if(p && *p++ == '.' && *p++ == '\0')
-		return(TRUE);
-	return(FALSE);
-}
-
-static boolean
-isdotdot(char *p)
-{
-	if(p && *p++ == '.' && *p++ == '.' && *p++ == '\0')
-		return(TRUE);
-	return(FALSE);
-}
-
-static boolean
-issymbolic(char *dir, char *component)
-{
-#ifdef S_IFLNK
-	struct stat	st;
-	char	buf[ BUFSIZ ], **pp;
-
-	sprintf(buf, "%s%s%s", dir, *dir ? "/" : "", component);
-	for (pp=notdotdot; *pp; pp++)
-		if (strcmp(*pp, buf) == 0)
-			return (TRUE);
-	if (lstat(buf, &st) == 0
-	&& (st.st_mode & S_IFMT) == S_IFLNK) {
-		*pp++ = copy(buf);
-		if (pp >= &notdotdot[ MAXDIRS ])
-			fatalerr("out of .. dirs, increase MAXDIRS\n");
-		return(TRUE);
-	}
-#endif
-	return(FALSE);
-}
-
-/*
- * Occasionally, pathnames are created that look like .../x/../y
- * Any of the 'x/..' sequences within the name can be eliminated.
- * (but only if 'x' is not a symbolic link!!)
- */
-static void
-remove_dotdot(char *path)
-{
-	register char	*end, *from, *to, **cp;
-	char		*components[ MAXFILES ],
-			newpath[ BUFSIZ ];
-	boolean		component_copied;
-
-	/*
-	 * slice path up into components.
-	 */
-	to = newpath;
-	if (*path == '/')
-		*to++ = '/';
-	*to = '\0';
-	cp = components;
-	for (from=end=path; *end; end++)
-		if (*end == '/') {
-			while (*end == '/')
-				*end++ = '\0';
-			if (*from)
-				*cp++ = from;
-			from = end;
-		}
-	*cp++ = from;
-	*cp = NULL;
-
-	/*
-	 * Recursively remove all 'x/..' component pairs.
-	 */
-	cp = components;
-	while(*cp) {
-		if (!isdot(*cp) && !isdotdot(*cp) && isdotdot(*(cp+1))
-		    && !issymbolic(newpath, *cp))
-		{
-		    char **fp = cp + 2;
-		    char **tp = cp;
-
-		    do 
-			*tp++ = *fp; /* move all the pointers down */
-		    while (*fp++);
-		    if (cp != components)
-			cp--;	/* go back and check for nested ".." */
-		} else {
-		    cp++;
-		}
-	}
-	/*
-	 * Concatenate the remaining path elements.
-	 */
-	cp = components;
-	component_copied = FALSE;
-	while(*cp) {
-		if (component_copied)
-			*to++ = '/';
-		component_copied = TRUE;
-		for (from = *cp; *from; )
-			*to++ = *from++;
-		*to = '\0';
-		cp++;
-	}
-	*to++ = '\0';
-
-	/*
-	 * copy the reconstituted path back to our pointer.
-	 */
-	strcpy(path, newpath);
-}
-
-/*
- * Add an include file to the list of those included by 'file'.
- */
-struct inclist *
-newinclude(char *newfile, char *incstring)
-{
-	register struct inclist	*ip;
-
-	/*
-	 * First, put this file on the global list of include files.
-	 */
-	ip = inclistp++;
-	if (inclistp == inclist + MAXFILES - 1)
-		fatalerr("out of space: increase MAXFILES\n");
-	ip->i_file = copy(newfile);
-
-	if (incstring == NULL)
-		ip->i_incstring = ip->i_file;
-	else
-		ip->i_incstring = copy(incstring);
-
-	inclistnext = inclistp;
-	return(ip);
-}
-
-void
-included_by(struct inclist *ip, struct inclist *newfile)
-{
-	register int i;
-
-	if (ip == NULL)
-		return;
-	/*
-	 * Put this include file (newfile) on the list of files included
-	 * by 'file'.  If 'file' is NULL, then it is not an include
-	 * file itself (i.e. was probably mentioned on the command line).
-	 * If it is already on the list, don't stick it on again.
-	 */
-	if (ip->i_list == NULL) {
-		ip->i_list = (struct inclist **)
-			malloc(sizeof(struct inclist *) * ++ip->i_listlen);
-		ip->i_merged = (boolean *)
-		    malloc(sizeof(boolean) * ip->i_listlen);
-	} else {
-		for (i=0; i<ip->i_listlen; i++)
-			if (ip->i_list[ i ] == newfile) {
-			    i = strlen(newfile->i_file);
-			    if (!(ip->i_flags & INCLUDED_SYM) &&
-				!(i > 2 &&
-				  newfile->i_file[i-1] == 'c' &&
-				  newfile->i_file[i-2] == '.'))
-			    {
-				/* only bitch if ip has */
-				/* no #include SYMBOL lines  */
-				/* and is not a .c file */
-				if (warn_multiple)
-				{
-					warning("%s includes %s more than once!\n",
-						ip->i_file, newfile->i_file);
-					warning1("Already have\n");
-					for (i=0; i<ip->i_listlen; i++)
-						warning1("\t%s\n", ip->i_list[i]->i_file);
-				}
-			    }
-			    return;
-			}
-		ip->i_list = (struct inclist **) realloc(ip->i_list,
-			sizeof(struct inclist *) * ++ip->i_listlen);
-		ip->i_merged = (boolean *)
-		    realloc(ip->i_merged, sizeof(boolean) * ip->i_listlen);
-	}
-	ip->i_list[ ip->i_listlen-1 ] = newfile;
-	ip->i_merged[ ip->i_listlen-1 ] = FALSE;
-}
-
-void
-inc_clean (void)
-{
-	register struct inclist *ip;
-
-	for (ip = inclist; ip < inclistp; ip++) {
-		ip->i_flags &= ~MARKED;
-	}
-}
-
-struct inclist *
-inc_path(char *file, char *include, int type)
-{
-	static char		path[ BUFSIZ ];
-	register char		**pp, *p;
-	register struct inclist	*ip;
-	struct stat		st;
-
-	/*
-	 * Check all previously found include files for a path that
-	 * has already been expanded.
-	 */
-	if ((type == INCLUDE) || (type == INCLUDEDOT))
-		inclistnext = inclist;
-	ip = inclistnext;
-
-	for (; ip->i_file; ip++) {
-		if ((strcmp(ip->i_incstring, include) == 0) &&
-		    !(ip->i_flags & INCLUDED_SYM)) {
-			inclistnext = ip + 1;
-			return ip;
-		}
-	}
-
-	if (inclistnext == inclist) {
-		/*
-		 * If the path was surrounded by "" or is an absolute path,
-		 * then check the exact path provided.
-		 */
-		if ((type == INCLUDEDOT) ||
-		    (type == INCLUDENEXTDOT) ||
-		    (*include == '/')) {
-			if (stat(include, &st) == 0)
-				return newinclude(include, include);
-			if (show_where_not)
-				warning1("\tnot in %s\n", include);
-		}
-
-		/*
-		 * If the path was surrounded by "" see if this include file is
-		 * in the directory of the file being parsed.
-		 */
-		if ((type == INCLUDEDOT) || (type == INCLUDENEXTDOT)) {
-			for (p=file+strlen(file); p>file; p--)
-				if (*p == '/')
-					break;
-			if (p == file) {
-				strcpy(path, include);
-			} else {
-				strncpy(path, file, (p-file) + 1);
-				path[ (p-file) + 1 ] = '\0';
-				strcpy(path + (p-file) + 1, include);
-			}
-			remove_dotdot(path);
-			if (stat(path, &st) == 0)
-				return newinclude(path, include);
-			if (show_where_not)
-				warning1("\tnot in %s\n", path);
-		}
-	}
-
-	/*
-	 * Check the include directories specified.  Standard include dirs
-	 * should be at the end.
-	 */
-	if ((type == INCLUDE) || (type == INCLUDEDOT))
-		includedirsnext = includedirs;
-	pp = includedirsnext;
-
-	for (; *pp; pp++) {
-		sprintf(path, "%s/%s", *pp, include);
-		remove_dotdot(path);
-		if (stat(path, &st) == 0) {
-			includedirsnext = pp + 1;
-			return newinclude(path, include);
-		}
-		if (show_where_not)
-			warning1("\tnot in %s\n", path);
-	}
-
-	return NULL;
-}
diff --git a/nx-X11/config/makedepend/main.c b/nx-X11/config/makedepend/main.c
deleted file mode 100644
index 94fed0518..000000000
--- a/nx-X11/config/makedepend/main.c
+++ /dev/null
@@ -1,865 +0,0 @@
-/* $Xorg: main.c,v 1.5 2001/02/09 02:03:16 xorgcvs Exp $ */
-/* $XdotOrg: xc/config/makedepend/main.c,v 1.4 2005/07/05 19:02:01 alanc Exp $ */
-/*
-
-Copyright (c) 1993, 1994, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/config/makedepend/main.c,v 3.31tsi Exp $ */
-
-#include "def.h"
-#ifdef hpux
-#define sigvec sigvector
-#endif /* hpux */
-
-#ifdef X_POSIX_C_SOURCE
-#define _POSIX_C_SOURCE X_POSIX_C_SOURCE
-#include <signal.h>
-#undef _POSIX_C_SOURCE
-#else
-#if defined(X_NOT_POSIX) || defined(_POSIX_SOURCE)
-#include <signal.h>
-#else
-#define _POSIX_SOURCE
-#include <signal.h>
-#undef _POSIX_SOURCE
-#endif
-#endif
-
-#include <stdarg.h>
-
-#ifdef DEBUG
-int	_debugmask;
-#endif
-
-/* #define DEBUG_DUMP */
-#ifdef DEBUG_DUMP
-#define DBG_PRINT(file, fmt, args)   fprintf(file, fmt, args)
-#else
-#define DBG_PRINT(file, fmt, args)   /* empty */
-#endif
-
-#define DASH_INC_PRE    "#include \""
-#define DASH_INC_POST   "\""
-
-char *ProgramName;
-
-char	*directives[] = {
-	"if",
-	"ifdef",
-	"ifndef",
-	"else",
-	"endif",
-	"define",
-	"undef",
-	"include",
-	"line",
-	"pragma",
-	"error",
-	"ident",
-	"sccs",
-	"elif",
-	"eject",
-	"warning",
-	"include_next",
-	NULL
-};
-
-#define MAKEDEPEND
-#include "imakemdep.h"	/* from config sources */
-#undef MAKEDEPEND
-
-struct	inclist inclist[ MAXFILES ],
-		*inclistp = inclist,
-		*inclistnext = inclist,
-		maininclist;
-
-static char	*filelist[ MAXFILES ];
-char		*includedirs[ MAXDIRS + 1 ],
-		**includedirsnext = includedirs;
-char		*notdotdot[ MAXDIRS ];
-static int	cmdinc_count = 0;
-static char	*cmdinc_list[ 2 * MAXINCFILES ];
-char		*objprefix = "";
-char		*objsuffix = OBJSUFFIX;
-static char	*startat = "# DO NOT DELETE";
-int		width = 78;
-static boolean	append = FALSE;
-boolean		printed = FALSE;
-boolean		verbose = FALSE;
-boolean		show_where_not = FALSE;
-/* Warn on multiple includes of same file */
-boolean 	warn_multiple = FALSE;
-
-static void setfile_cmdinc(struct filepointer *filep, long count, char **list);
-static void redirect(char *line, char *makefile);
-
-static
-#ifdef RETSIGTYPE
-RETSIGTYPE
-#else
-# ifdef SIGNALRETURNSINT
-int
-# else
-void
-# endif
-#endif
-catch (int sig)
-{
-	fflush (stdout);
-	fatalerr ("got signal %d\n", sig);
-}
-
-#if defined(USG) || (defined(i386) && defined(SYSV)) || defined(WIN32) || defined(__UNIXOS2__) || defined(Lynx_22) || defined(__CYGWIN__)
-#define USGISH
-#endif
-
-#ifndef USGISH
-#ifdef X_NOT_POSIX
-#define sigaction sigvec
-#define sa_handler sv_handler
-#define sa_mask sv_mask
-#define sa_flags sv_flags
-#endif
-struct sigaction sig_act;
-#endif /* USGISH */
-
-#ifndef USING_AUTOCONF
-# if !defined(USGISH) && !defined(_SEQUENT_) && !defined(MINIX)
-#  define HAVE_FCHMOD	1
-# endif
-#endif
-
-int
-main(int argc, char *argv[])
-{
-	char	**fp = filelist;
-	char	**incp = includedirs;
-	char	*p;
-	struct inclist	*ip;
-	char	*makefile = NULL;
-	struct filepointer	*filecontent;
-	struct symtab *psymp = predefs;
-	char *endmarker = NULL;
-	char *defincdir = NULL;
-	char **undeflist = NULL;
-	int numundefs = 0, i;
-
-	ProgramName = argv[0];
-
-	while (psymp->s_name)
-	{
-	    define2(psymp->s_name, psymp->s_value, &maininclist);
-	    psymp++;
-	}
-	if (argc == 2 && argv[1][0] == '@') {
-	    struct stat ast;
-	    int afd;
-	    char *args;
-	    char **nargv;
-	    int nargc;
-	    char quotechar = '\0';
-
-	    nargc = 1;
-	    if ((afd = open(argv[1]+1, O_RDONLY)) < 0)
-		fatalerr("cannot open \"%s\"\n", argv[1]+1);
-	    fstat(afd, &ast);
-	    args = (char *)malloc(ast.st_size + 1);
-	    if ((ast.st_size = read(afd, args, ast.st_size)) < 0)
-		fatalerr("failed to read %s\n", argv[1]+1);
-	    args[ast.st_size] = '\0';
-	    close(afd);
-	    for (p = args; *p; p++) {
-		if (quotechar) {
-		    if (quotechar == '\\' ||
-			(*p == quotechar && p[-1] != '\\'))
-			quotechar = '\0';
-		    continue;
-		}
-		switch (*p) {
-		case '\\':
-		case '"':
-		case '\'':
-		    quotechar = *p;
-		    break;
-		case ' ':
-		case '\n':
-		    *p = '\0';
-		    if (p > args && p[-1])
-			nargc++;
-		    break;
-		}
-	    }
-	    if (p[-1])
-		nargc++;
-	    nargv = (char **)malloc(nargc * sizeof(char *));
-	    nargv[0] = argv[0];
-	    argc = 1;
-	    for (p = args; argc < nargc; p += strlen(p) + 1)
-		if (*p) nargv[argc++] = p;
-	    argv = nargv;
-	}
-	for(argc--, argv++; argc; argc--, argv++) {
-	    	/* if looking for endmarker then check before parsing */
-		if (endmarker && strcmp (endmarker, *argv) == 0) {
-		    endmarker = NULL;
-		    continue;
-		}
-		if (**argv != '-') {
-			/* treat +thing as an option for C++ */
-			if (endmarker && **argv == '+')
-				continue;
-			*fp++ = argv[0];
-			continue;
-		}
-		switch(argv[0][1]) {
-		case '-':
-			endmarker = &argv[0][2];
-			if (endmarker[0] == '\0') endmarker = "--";
-			break;
-		case 'D':
-			if (argv[0][2] == '\0') {
-				argv++;
-				argc--;
-			}
-			for (p=argv[0] + 2; *p ; p++)
-				if (*p == '=') {
-					*p = ' ';
-					break;
-				}
-			define(argv[0] + 2, &maininclist);
-			break;
-		case 'I':
-			if (incp >= includedirs + MAXDIRS)
-			    fatalerr("Too many -I flags.\n");
-			*incp++ = argv[0]+2;
-			if (**(incp-1) == '\0') {
-				*(incp-1) = *(++argv);
-				argc--;
-			}
-			break;
-		case 'U':
-			/* Undef's override all -D's so save them up */
-			numundefs++;
-			if (numundefs == 1)
-			    undeflist = malloc(sizeof(char *));
-			else
-			    undeflist = realloc(undeflist,
-						numundefs * sizeof(char *));
-			if (argv[0][2] == '\0') {
-				argv++;
-				argc--;
-			}
-			undeflist[numundefs - 1] = argv[0] + 2;
-			break;
-		case 'Y':
-			defincdir = argv[0]+2;
-			break;
-		/* do not use if endmarker processing */
-		case 'a':
-			if (endmarker) break;
-			append = TRUE;
-			break;
-		case 'w':
-			if (endmarker) break;
-			if (argv[0][2] == '\0') {
-				argv++;
-				argc--;
-				width = atoi(argv[0]);
-			} else
-				width = atoi(argv[0]+2);
-			break;
-		case 'o':
-			if (endmarker) break;
-			if (argv[0][2] == '\0') {
-				argv++;
-				argc--;
-				objsuffix = argv[0];
-			} else
-				objsuffix = argv[0]+2;
-			break;
-		case 'p':
-			if (endmarker) break;
-			if (argv[0][2] == '\0') {
-				argv++;
-				argc--;
-				objprefix = argv[0];
-			} else
-				objprefix = argv[0]+2;
-			break;
-		case 'v':
-			if (endmarker) break;
-			verbose = TRUE;
-#ifdef DEBUG
-			if (argv[0][2])
-				_debugmask = atoi(argv[0]+2);
-#endif
-			break;
-		case 's':
-			if (endmarker) break;
-			startat = argv[0]+2;
-			if (*startat == '\0') {
-				startat = *(++argv);
-				argc--;
-			}
-			if (*startat != '#')
-				fatalerr("-s flag's value should start %s\n",
-					"with '#'.");
-			break;
-		case 'f':
-			if (endmarker) break;
-			makefile = argv[0]+2;
-			if (*makefile == '\0') {
-				makefile = *(++argv);
-				argc--;
-			}
-			break;
-
-		case 'm':
-			warn_multiple = TRUE;
-			break;
-			
-		/* Ignore -O, -g so we can just pass ${CFLAGS} to
-		   makedepend
-		 */
-		case 'O':
-		case 'g':
-			break;
-		case 'i':
-			if (strcmp(&argv[0][1],"include") == 0) {
-				char *buf;
-				if (argc<2)
-					fatalerr("option -include is a "
-						 "missing its parameter\n");
-				if (cmdinc_count >= MAXINCFILES)
-					fatalerr("Too many -include flags.\n");
-				argc--;
-				argv++;
-				buf = malloc(strlen(DASH_INC_PRE) +
-					     strlen(argv[0]) +
-					     strlen(DASH_INC_POST) + 1);
-                		if(!buf)
-					fatalerr("out of memory at "
-						 "-include string\n");
-				cmdinc_list[2 * cmdinc_count + 0] = argv[0];
-				cmdinc_list[2 * cmdinc_count + 1] = buf;
-				cmdinc_count++;
-				break;
-			}
-			/* intentional fall through */
-		default:
-			if (endmarker) break;
-	/*		fatalerr("unknown opt = %s\n", argv[0]); */
-			warning("ignoring option %s\n", argv[0]);
-		}
-	}
-	/* Now do the undefs from the command line */
-	for (i = 0; i < numundefs; i++)
-	    undefine(undeflist[i], &maininclist);
-	if (numundefs > 0)
-	    free(undeflist);
-
-	if (!defincdir) {
-#ifdef PREINCDIR
-	    if (incp >= includedirs + MAXDIRS)
-		fatalerr("Too many -I flags.\n");
-	    *incp++ = PREINCDIR;
-#endif
-#ifdef __UNIXOS2__
-	    {
-		char *emxinc = getenv("C_INCLUDE_PATH");
-		/* can have more than one component */
-		if (emxinc) {
-		    char *beg, *end;
-		    beg= (char*)strdup(emxinc);
-		    for (;;) {
-			end = (char*)strchr(beg,';');
-			if (end) *end = 0;
-		    	if (incp >= includedirs + MAXDIRS)
-				fatalerr("Too many include dirs\n");
-			*incp++ = beg;
-			if (!end) break;
-			beg = end+1;
-		    }
-		}
-	    }
-#else /* !__UNIXOS2__, does not use INCLUDEDIR at all */
-	    if (incp >= includedirs + MAXDIRS)
-		fatalerr("Too many -I flags.\n");
-	    *incp++ = INCLUDEDIR;
-#endif
-
-#ifdef EXTRAINCDIR
-	    if (incp >= includedirs + MAXDIRS)
-		fatalerr("Too many -I flags.\n");
-	    *incp++ = EXTRAINCDIR;
-#endif
-
-#ifdef POSTINCDIR
-	    if (incp >= includedirs + MAXDIRS)
-		fatalerr("Too many -I flags.\n");
-	    *incp++ = POSTINCDIR;
-#endif
-	} else if (*defincdir) {
-	    if (incp >= includedirs + MAXDIRS)
-		fatalerr("Too many -I flags.\n");
-	    *incp++ = defincdir;
-	}
-
-	redirect(startat, makefile);
-
-	/*
-	 * catch signals.
-	 */
-#ifdef USGISH
-/*  should really reset SIGINT to SIG_IGN if it was.  */
-#ifdef SIGHUP
-	signal (SIGHUP, catch);
-#endif
-	signal (SIGINT, catch);
-#ifdef SIGQUIT
-	signal (SIGQUIT, catch);
-#endif
-	signal (SIGILL, catch);
-#ifdef SIGBUS
-	signal (SIGBUS, catch);
-#endif
-	signal (SIGSEGV, catch);
-#ifdef SIGSYS
-	signal (SIGSYS, catch);
-#endif
-#else
-	sig_act.sa_handler = catch;
-#if defined(_POSIX_SOURCE) || !defined(X_NOT_POSIX)
-	sigemptyset(&sig_act.sa_mask);
-	sigaddset(&sig_act.sa_mask, SIGINT);
-	sigaddset(&sig_act.sa_mask, SIGQUIT);
-#ifdef SIGBUS
-	sigaddset(&sig_act.sa_mask, SIGBUS);
-#endif
-	sigaddset(&sig_act.sa_mask, SIGILL);
-	sigaddset(&sig_act.sa_mask, SIGSEGV);
-	sigaddset(&sig_act.sa_mask, SIGHUP);
-	sigaddset(&sig_act.sa_mask, SIGPIPE);
-#ifdef SIGSYS
-	sigaddset(&sig_act.sa_mask, SIGSYS);
-#endif
-#else
-	sig_act.sa_mask = ((1<<(SIGINT -1))
-			   |(1<<(SIGQUIT-1))
-#ifdef SIGBUS
-			   |(1<<(SIGBUS-1))
-#endif
-			   |(1<<(SIGILL-1))
-			   |(1<<(SIGSEGV-1))
-			   |(1<<(SIGHUP-1))
-			   |(1<<(SIGPIPE-1))
-#ifdef SIGSYS
-			   |(1<<(SIGSYS-1))
-#endif
-			   );
-#endif /* _POSIX_SOURCE */
-	sig_act.sa_flags = 0;
-	sigaction(SIGHUP, &sig_act, (struct sigaction *)0);
-	sigaction(SIGINT, &sig_act, (struct sigaction *)0);
-	sigaction(SIGQUIT, &sig_act, (struct sigaction *)0);
-	sigaction(SIGILL, &sig_act, (struct sigaction *)0);
-#ifdef SIGBUS
-	sigaction(SIGBUS, &sig_act, (struct sigaction *)0);
-#endif
-	sigaction(SIGSEGV, &sig_act, (struct sigaction *)0);
-#ifdef SIGSYS
-	sigaction(SIGSYS, &sig_act, (struct sigaction *)0);
-#endif
-#endif /* USGISH */
-
-	/*
-	 * now peruse through the list of files.
-	 */
-	for(fp=filelist; *fp; fp++) {
-		DBG_PRINT(stderr,"file: %s\n",*fp);
-		filecontent = getfile(*fp);
-		setfile_cmdinc(filecontent, cmdinc_count, cmdinc_list);
-		ip = newinclude(*fp, (char *)NULL);
-
-		find_includes(filecontent, ip, ip, 0, FALSE);
-		freefile(filecontent);
-		recursive_pr_include(ip, ip->i_file, base_name(*fp));
-		inc_clean();
-	}
-	if (printed)
-		printf("\n");
-	return 0;
-}
-
-#ifdef __UNIXOS2__
-/*
- * eliminate \r chars from file
- */
-static int 
-elim_cr(char *buf, int sz)
-{
-	int i,wp;
-	for (i= wp = 0; i<sz; i++) {
-		if (buf[i] != '\r')
-			buf[wp++] = buf[i];
-	}
-	return wp;
-}
-#endif
-
-struct filepointer *
-getfile(char *file)
-{
-	int	fd;
-	struct filepointer	*content;
-	struct stat	st;
-
-	content = (struct filepointer *)malloc(sizeof(struct filepointer));
-	content->f_name = file;
-	if ((fd = open(file, O_RDONLY)) < 0) {
-		warning("cannot open \"%s\"\n", file);
-		content->f_p = content->f_base = content->f_end = (char *)malloc(1);
-		*content->f_p = '\0';
-		return(content);
-	}
-	fstat(fd, &st);
-	content->f_base = (char *)malloc(st.st_size+1);
-	if (content->f_base == NULL)
-		fatalerr("cannot allocate mem\n");
-	if ((st.st_size = read(fd, content->f_base, st.st_size)) < 0)
-		fatalerr("failed to read %s\n", file);
-#ifdef __UNIXOS2__
-	st.st_size = elim_cr(content->f_base,st.st_size);
-#endif
-	close(fd);
-	content->f_len = st.st_size+1;
-	content->f_p = content->f_base;
-	content->f_end = content->f_base + st.st_size;
-	*content->f_end = '\0';
-	content->f_line = 0;
-	content->cmdinc_count = 0;
-	content->cmdinc_list = NULL;
-	content->cmdinc_line = 0;
-	return(content);
-}
-
-void
-setfile_cmdinc(struct filepointer* filep, long count, char** list)
-{
-	filep->cmdinc_count = count;
-	filep->cmdinc_list = list;
-	filep->cmdinc_line = 0;
-}
-
-void
-freefile(struct filepointer *fp)
-{
-	free(fp->f_base);
-	free(fp);
-}
-
-char *copy(char *str)
-{
-	char	*p = (char *)malloc(strlen(str) + 1);
-
-	strcpy(p, str);
-	return(p);
-}
-
-int
-match(char *str, char **list)
-{
-	int	i;
-
-	for (i=0; *list; i++, list++)
-		if (strcmp(str, *list) == 0)
-			return(i);
-	return(-1);
-}
-
-/*
- * Get the next line.  We only return lines beginning with '#' since that
- * is all this program is ever interested in.
- */
-char *getnextline(struct filepointer *filep)
-{
-	char	*p,	/* walking pointer */
-		*eof,	/* end of file pointer */
-		*bol;	/* beginning of line pointer */
-	int	lineno;	/* line number */
-	boolean whitespace = FALSE;
-
-	/*
-	 * Fake the "-include" line files in form of #include to the
-	 * start of each file.
-	 */
-	if (filep->cmdinc_line < filep->cmdinc_count) {
-		char *inc = filep->cmdinc_list[2 * filep->cmdinc_line + 0];
-		char *buf = filep->cmdinc_list[2 * filep->cmdinc_line + 1];
-		filep->cmdinc_line++;
-		sprintf(buf,"%s%s%s",DASH_INC_PRE,inc,DASH_INC_POST);
-		DBG_PRINT(stderr,"%s\n",buf);
-		return(buf);
-	}
-
-	p = filep->f_p;
-	eof = filep->f_end;
-	if (p >= eof)
-		return((char *)NULL);
-	lineno = filep->f_line;
-
-	for (bol = p--; ++p < eof; ) {
-		if ((bol == p) && ((*p == ' ') || (*p == '\t')))
-		{
-			/* Consume leading white-spaces for this line */
-			while (((p+1) < eof) && ((*p == ' ') || (*p == '\t')))
-			{
-				p++;
-				bol++;
-			}
-			whitespace = TRUE;
-		}
-        
-		if (*p == '/' && (p+1) < eof && *(p+1) == '*') {
-			/* Consume C comments */
-			*(p++) = ' ';
-			*(p++) = ' ';
-			while (p < eof && *p) {
-				if (*p == '*' && (p+1) < eof && *(p+1) == '/') {
-					*(p++) = ' ';
-					*(p++) = ' ';
-					break;
-				}
-				if (*p == '\n')
-					lineno++;
-				*(p++) = ' ';
-			}
-			--p;
-		}
-		else if (*p == '/' && (p+1) < eof && *(p+1) == '/') {
-			/* Consume C++ comments */
-			*(p++) = ' ';
-			*(p++) = ' ';
-			while (p < eof && *p) {
-				if (*p == '\\' && (p+1) < eof &&
-				    *(p+1) == '\n') {
-					*(p++) = ' ';
-					lineno++;
-				}
-				else if (*p == '?' && (p+3) < eof &&
-					 *(p+1) == '?' && 
-					 *(p+2) == '/' &&
-					 *(p+3) == '\n') {
-					*(p++) = ' ';
-					*(p++) = ' ';
-					*(p++) = ' ';
-					lineno++;
-				}
-				else if (*p == '\n')
-					break;	/* to process end of line */
-				*(p++) = ' ';
-			}
-			--p;
-		}
-		else if (*p == '\\' && (p+1) < eof && *(p+1) == '\n') {
-			/* Consume backslash line terminations */
-			*(p++) = ' ';
-			*p = ' ';
-			lineno++;
-		}
-		else if (*p == '?' && (p+3) < eof &&
-			 *(p+1) == '?' && *(p+2) == '/' && *(p+3) == '\n') {
-			/* Consume trigraph'ed backslash line terminations */
-			*(p++) = ' ';
-			*(p++) = ' ';
-			*(p++) = ' ';
-			*p = ' ';
-			lineno++;
-		}
-		else if (*p == '\n') {
-			lineno++;
-			if (*bol == '#') {
-				char *cp;
-
-				*(p++) = '\0';
-				/* punt lines with just # (yacc generated) */
-				for (cp = bol+1; 
-				     *cp && (*cp == ' ' || *cp == '\t'); cp++);
-				if (*cp) goto done;
-				--p;
-			}
-			bol = p+1;
-			whitespace = FALSE;
-		}
-	}
-	if (*bol != '#')
-		bol = NULL;
-done:
-	filep->f_p = p;
-	filep->f_line = lineno;
-#ifdef DEBUG_DUMP
-	if (bol)
-		DBG_PRINT(stderr,"%s\n",bol);
-#endif
-	return(bol);
-}
-
-/*
- * Strip the file name down to what we want to see in the Makefile.
- * It will have objprefix and objsuffix around it.
- */
-char *base_name(char *file)
-{
-	char	*p;
-
-	file = copy(file);
-	for(p=file+strlen(file); p>file && *p != '.'; p--) ;
-
-	if (*p == '.')
-		*p = '\0';
-	return(file);
-}
-
-#ifdef USING_AUTOCONF
-# ifndef HAVE_RENAME
-#  define NEED_RENAME
-# endif
-#else /* Imake configured, check known OS'es without rename() */
-# if defined(USG) && !defined(SVR4) && !defined(__UNIXOS2__) && !defined(clipper) && !defined(__clipper__)
-#  define NEED_RENAME
-# endif
-#endif
-
-#ifdef NEED_RENAME
-int rename (char *from, char *to)
-{
-    (void) unlink (to);
-    if (link (from, to) == 0) {
-	unlink (from);
-	return 0;
-    } else {
-	return -1;
-    }
-}
-#endif /* NEED_RENAME */
-
-void
-redirect(char *line, char *makefile)
-{
-	struct stat	st;
-	FILE	*fdin, *fdout;
-	char	backup[ BUFSIZ ],
-		buf[ BUFSIZ ];
-	boolean	found = FALSE;
-	int	len;
-
-	/*
-	 * if makefile is "-" then let it pour onto stdout.
-	 */
-	if (makefile && *makefile == '-' && *(makefile+1) == '\0') {
-		puts(line);
-		return;
-	}
-
-	/*
-	 * use a default makefile is not specified.
-	 */
-	if (!makefile) {
-		if (stat("Makefile", &st) == 0)
-			makefile = "Makefile";
-		else if (stat("makefile", &st) == 0)
-			makefile = "makefile";
-		else
-			fatalerr("[mM]akefile is not present\n");
-	}
-	else
-	    stat(makefile, &st);
-	if ((fdin = fopen(makefile, "r")) == NULL)
-		fatalerr("cannot open \"%s\"\n", makefile);
-	sprintf(backup, "%s.bak", makefile);
-	unlink(backup);
-#if defined(WIN32) || defined(__UNIXOS2__) || defined(__CYGWIN__)
-	fclose(fdin);
-#endif
-	if (rename(makefile, backup) < 0)
-		fatalerr("cannot rename %s to %s\n", makefile, backup);
-#if defined(WIN32) || defined(__UNIXOS2__) || defined(__CYGWIN__)
-	if ((fdin = fopen(backup, "r")) == NULL)
-		fatalerr("cannot open \"%s\"\n", backup);
-#endif
-	if ((fdout = freopen(makefile, "w", stdout)) == NULL)
-		fatalerr("cannot open \"%s\"\n", backup);
-	len = strlen(line);
-	while (!found && fgets(buf, BUFSIZ, fdin)) {
-		if (*buf == '#' && strncmp(line, buf, len) == 0)
-			found = TRUE;
-		fputs(buf, fdout);
-	}
-	if (!found) {
-		if (verbose)
-		warning("Adding new delimiting line \"%s\" and dependencies...\n",
-			line);
-		puts(line); /* same as fputs(fdout); but with newline */
-	} else if (append) {
-	    while (fgets(buf, BUFSIZ, fdin)) {
-		fputs(buf, fdout);
-	    }
-	}
-	fflush(fdout);
-#ifndef HAVE_FCHMOD
-	chmod(makefile, st.st_mode);
-#else
-        fchmod(fileno(fdout), st.st_mode);
-#endif /* HAVE_FCHMOD */
-}
-
-void
-fatalerr(char *msg, ...)
-{
-	va_list args;
-	fprintf(stderr, "%s: error:  ", ProgramName);
-	va_start(args, msg);
-	vfprintf(stderr, msg, args);
-	va_end(args);
-	exit (1);
-}
-
-void
-warning(char *msg, ...)
-{
-	va_list args;
-	fprintf(stderr, "%s: warning:  ", ProgramName);
-	va_start(args, msg);
-	vfprintf(stderr, msg, args);
-	va_end(args);
-}
-
-void
-warning1(char *msg, ...)
-{
-	va_list args;
-	va_start(args, msg);
-	vfprintf(stderr, msg, args);
-	va_end(args);
-}
diff --git a/nx-X11/config/makedepend/mkdepend.man b/nx-X11/config/makedepend/mkdepend.man
deleted file mode 100644
index ac67cc8d3..000000000
--- a/nx-X11/config/makedepend/mkdepend.man
+++ /dev/null
@@ -1,382 +0,0 @@
-.\" $Xorg: mkdepend.man,v 1.5 2001/02/09 02:03:16 xorgcvs Exp $
-.\" Copyright (c) 1993, 1994, 1998 The Open Group
-.\" 
-.\" Permission to use, copy, modify, distribute, and sell this software and its
-.\" documentation for any purpose is hereby granted without fee, provided that
-.\" the above copyright notice appear in all copies and that both that
-.\" copyright notice and this permission notice appear in supporting
-.\" documentation.
-.\" 
-.\" The above copyright notice and this permission notice shall be included in
-.\" all copies or substantial portions of the Software.
-.\" 
-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL 
-.\" THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
-.\" WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF 
-.\" OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
-.\" SOFTWARE.
-.\" 
-.\" Except as contained in this notice, the name of The Open Group shall not 
-.\" be used in advertising or otherwise to promote the sale, use or other 
-.\" dealing in this Software without prior written authorization from The
-.\" Open Group.
-.\"
-.\" $XFree86: xc/config/makedepend/mkdepend.man,v 1.6 2001/12/17 20:52:22 dawes Exp $
-.\"
-.TH MAKEDEPEND 1 __xorgversion__
-.UC 4
-.SH NAME
-makedepend \- create dependencies in makefiles
-.SH SYNOPSIS
-.B makedepend
-[
-.BI \-D name\fB=\fPdef
-] [
-.BI \-D name
-] [
-.BI \-I includedir
-] [
-.BI \-Y includedir
-] [
-.B \-a
-] [
-.BI \-f makefile
-] [
-.BI \-include \ file
-] [
-.BI \-o objsuffix
-] [
-.BI \-p objprefix
-] [
-.BI \-s string
-] [
-.BI \-w width
-] [
-.B \-v
-] [
-.B \-m
-] [
-\-\^\-
-.I otheroptions
-\-\^\-
-]
-.I sourcefile
-\&.\|.\|.
-.br
-.SH DESCRIPTION
-The
-.B makedepend
-program reads each
-.I sourcefile
-in sequence and parses it like a C-preprocessor,
-processing all
-.I #include,
-.I #define,
-.I #undef,
-.I #ifdef,
-.I #ifndef,
-.I #endif,
-.I #if,
-.I #elif
-and
-.I #else
-directives so that it can correctly tell which
-.I #include,
-directives would be used in a compilation.
-Any
-.I #include,
-directives can reference files having other
-.I #include
-directives, and parsing will occur in these files as well.
-.PP
-Every file that a
-.I sourcefile
-includes,
-directly or indirectly,
-is what
-.B makedepend
-calls a \fIdependency.\fP
-These dependencies are then written to a
-.I makefile
-in such a way that
-.B make(1)
-will know which object files must be recompiled when a dependency has changed.
-.PP
-By default,
-.B makedepend
-places its output in the file named
-.I makefile
-if it exists, otherwise
-.I Makefile.
-An alternate makefile may be specified with the
-.B \-f
-option.
-It first searches the makefile for
-the line
-.sp
-\&    # DO NOT DELETE THIS LINE \-\^\- make depend depends on it.
-.sp
-or one provided with the
-.B \-s
-option,
-as a delimiter for the dependency output.
-If it finds it, it will delete everything
-following this to the end of the makefile
-and put the output after this line.
-If it doesn't find it, the program
-will append the string to the end of the makefile
-and place the output following that.
-For each
-.I sourcefile
-appearing on the command line,
-.B makedepend
-puts lines in the makefile of the form
-.sp
-     sourcefile.o:\0dfile .\|.\|.
-.sp
-Where \fIsourcefile.o\fP is the name from the command
-line with its suffix replaced with ``.o'',
-and \fIdfile\fP is a dependency discovered in a
-.I #include
-directive while parsing
-.I sourcefile
-or one of the files it included.
-.SH EXAMPLE
-Normally,
-.B makedepend
-will be used in a makefile target so that typing ``make depend'' will
-bring the dependencies up to date for the makefile.
-For example,
-.nf
-    SRCS\0=\0file1.c\0file2.c\0.\|.\|.
-    CFLAGS\0=\0\-O\0\-DHACK\0\-I\^.\^.\^/foobar\0\-xyz
-    depend:
-            makedepend\0\-\^\-\0$(CFLAGS)\0\-\^\-\0$(SRCS)
-.fi
-.SH OPTIONS
-The program
-will ignore any option that it does not understand so that you may use
-the same arguments that you would for
-.B cc(1).
-.TP 5
-.B \-D\fIname\fP=\fIdef\fP \fRor\fP \-D\fIname\fP
-Define.
-This places a definition for
-.I name
-in
-.B makedepend's
-symbol table.
-Without 
-.I =def\|
-the symbol becomes defined as ``1''.
-.TP 5
-.B \-I\fIincludedir\fP
-Include directory.
-This option tells
-.B makedepend
-to prepend
-.I includedir
-to its list of directories to search when it encounters
-a
-.I #include
-directive.
-By default,
-.B makedepend
-only searches the standard include directories (usually /usr/include
-and possibly a compiler-dependent directory).
-.TP 5
-.B \-Y\fIincludedir\fP
-Replace all of the standard include directories with the single specified
-include directory; you can omit the
-.I includedir
-to simply prevent searching the standard include directories.
-.TP 5
-.B \-a
-Append the dependencies to the end of the file instead of replacing them. 
-.TP 5
-.B \-f\fImakefile\fP
-Filename.
-This allows you to specify an alternate makefile in which
-.B makedepend
-can place its output.
-Specifying ``\-'' as the file name (i.e., \fB\-f\-\fP) sends the
-output to standard output instead of modifying an existing file.
-.TP 5
-.B \-include \fIfile\fP
-Process file as input, and include all the resulting output
-before processing the regular input file. This has the same
-affect as if the specified file is an include statement that
-appears before the very first line of the regular input file.
-.TP 5
-.B \-o\fIobjsuffix\fP
-Object file suffix.
-Some systems may have object files whose suffix is something other
-than ``.o''.
-This option allows you to specify another suffix, such as
-``.b'' with
-.I \-o.b
-or ``:obj''
-with
-.I \-o:obj
-and so forth.
-.TP 5
-.B \-p\fIobjprefix\fP
-Object file prefix.
-The prefix is prepended to the name of the object file. This is
-usually used to designate a different directory for the object file.
-The default is the empty string.
-.TP 5
-.B \-s\fIstring\fP
-Starting string delimiter.
-This option permits you to specify
-a different string for
-.B makedepend
-to look for in the makefile.
-.TP 5
-.B \-w\fIwidth\fP
-Line width.
-Normally,
-.B makedepend
-will ensure that every output line that it writes will be no wider than
-78 characters for the sake of readability.
-This option enables you to change this width.
-.TP 5
-.B \-v
-Verbose operation.
-This option causes 
-.B makedepend
-to emit the list of files included by each input file.
-.TP 5
-.B \-m
-Warn about multiple inclusion.
-This option causes 
-.B makedepend
-to produce a warning if any input file includes another file more than
-once.  In previous versions of 
-.B makedepend
-this was the default behavior; the default has been changed to better
-match the behavior of the C compiler, which does not consider multiple
-inclusion to be an error.  This option is provided for backward 
-compatibility, and to aid in debugging problems related to multiple
-inclusion.
-.TP 5
-.B "\-\^\- \fIoptions\fP \-\^\-"
-If
-.B makedepend
-encounters a double hyphen (\-\^\-) in the argument list,
-then any unrecognized argument following it
-will be silently ignored; a second double hyphen terminates this
-special treatment.
-In this way,
-.B makedepend
-can be made to safely ignore esoteric compiler arguments that might
-normally be found in a CFLAGS
-.B make
-macro (see the
-.B EXAMPLE
-section above).
-All options that
-.B makedepend
-recognizes and appear between the pair of double hyphens
-are processed normally.
-.SH ALGORITHM
-The approach used in this program enables it to run an order of magnitude
-faster than any other ``dependency generator'' I have ever seen.
-Central to this performance are two assumptions:
-that all files compiled by a single
-makefile will be compiled with roughly the same
-.I \-I
-and
-.I \-D
-options;
-and that most files in a single directory will include largely the
-same files.
-.PP
-Given these assumptions,
-.B makedepend
-expects to be called once for each makefile, with
-all source files that are maintained by the
-makefile appearing on the command line.
-It parses each source and include
-file exactly once, maintaining an internal symbol table
-for each.
-Thus, the first file on the command line will take an amount of time
-proportional to the amount of time that a normal C preprocessor takes.
-But on subsequent files, if it encounters an include file
-that it has already parsed, it does not parse it again.
-.PP
-For example,
-imagine you are compiling two files,
-.I file1.c
-and
-.I file2.c,
-they each include the header file
-.I header.h,
-and the file
-.I header.h
-in turn includes the files
-.I def1.h
-and
-.I def2.h.
-When you run the command
-.sp
-    makedepend\0file1.c\0file2.c
-.sp
-.B makedepend
-will parse
-.I file1.c
-and consequently,
-.I header.h
-and then
-.I def1.h
-and
-.I def2.h.
-It then decides that the dependencies for this file are
-.sp
-    file1.o:\0header.h\0def1.h\0def2.h
-.sp
-But when the program parses
-.I file2.c
-and discovers that it, too, includes
-.I header.h,
-it does not parse the file,
-but simply adds
-.I header.h,
-.I def1.h
-and
-.I def2.h
-to the list of dependencies for
-.I file2.o.
-.SH "SEE ALSO"
-cc(1), make(1)
-.SH BUGS
-.B makedepend
-parses, but does not currently evaluate, the SVR4 #predicate(token-list)
-preprocessor expression; such expressions are simply assumed to be true.
-This may cause the wrong
-.I #include
-directives to be evaluated.
-.PP
-Imagine you are parsing two files,
-say
-.I file1.c
-and
-.I file2.c,
-each includes the file
-.I def.h.
-The list of files that
-.I def.h
-includes might truly be different when
-.I def.h
-is included by
-.I file1.c
-than when it is included by
-.I file2.c.
-But once
-.B makedepend
-arrives at a list of dependencies for a file,
-it is cast in concrete.
-.SH AUTHOR
-Todd Brunhoff, Tektronix, Inc. and MIT Project Athena
diff --git a/nx-X11/config/makedepend/parse.c b/nx-X11/config/makedepend/parse.c
deleted file mode 100644
index 935c61df7..000000000
--- a/nx-X11/config/makedepend/parse.c
+++ /dev/null
@@ -1,686 +0,0 @@
-/* $Xorg: parse.c,v 1.6 2001/02/09 02:03:16 xorgcvs Exp $ */
-/*
-
-Copyright (c) 1993, 1994, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/config/makedepend/parse.c,v 1.11 2001/12/17 20:52:22 dawes Exp $ */
-
-#include "def.h"
-
-extern char	*directives[];
-extern struct inclist	inclist[ MAXFILES ],
-			*inclistnext,
-			maininclist;
-extern char	*includedirs[ ],
-		**includedirsnext;
-
-static int deftype (char *line, struct filepointer *filep,
-		    struct inclist *file_red, struct inclist *file,
-		    int parse_it);
-static int zero_value(char *filename, char *exp, struct filepointer *filep,
-		    struct inclist *file_red);
-static int merge2defines(struct inclist *file1, struct inclist *file2);
-
-static int
-gobble(struct filepointer *filep, struct inclist *file,
-       struct inclist *file_red)
-{
-	char	*line;
-	int	type;
-
-	while ((line = getnextline(filep))) {
-		switch(type = deftype(line, filep, file_red, file, FALSE)) {
-		case IF:
-		case IFFALSE:
-		case IFGUESSFALSE:
-		case IFDEF:
-		case IFNDEF:
-			type = gobble(filep, file, file_red);
-			while ((type == ELIF) || (type == ELIFFALSE) ||
-			       (type == ELIFGUESSFALSE))
-			    type = gobble(filep, file, file_red);
-			if (type == ELSE)
-			        (void)gobble(filep, file, file_red);
-			break;
-		case ELSE:
-		case ENDIF:
-			debug(0,("%s, line %d: #%s\n",
-				file->i_file, filep->f_line,
-				directives[type]));
-			return(type);
-		case DEFINE:
-		case UNDEF:
-		case INCLUDE:
-		case INCLUDEDOT:
-		case PRAGMA:
-		case ERROR:
-		case IDENT:
-		case SCCS:
-		case EJECT:
-		case WARNING:
-		case INCLUDENEXT:
-		case INCLUDENEXTDOT:
-			break;
-		case ELIF:
-		case ELIFFALSE:
-		case ELIFGUESSFALSE:
-			return(type);
-		case -1:
-			warning("%s", file_red->i_file);
-			if (file_red != file)
-				warning1(" (reading %s)", file->i_file);
-			warning1(", line %d: unknown directive == \"%s\"\n",
-				filep->f_line, line);
-			break;
-		}
-	}
-	return(-1);
-}
-
-/*
- * Decide what type of # directive this line is.
- */
-static int 
-deftype (char *line, struct filepointer *filep, 
-	     struct inclist *file_red, struct inclist *file, int parse_it)
-{
-	register char	*p;
-	char	*directive, savechar, *q;
-	register int	ret;
-
-	/*
-	 * Parse the directive...
-	 */
-	directive=line+1;
-	while (*directive == ' ' || *directive == '\t')
-		directive++;
-
-	p = directive;
-	while ((*p == '_') || (*p >= 'a' && *p <= 'z'))
-		p++;
-	savechar = *p;
-	*p = '\0';
-	ret = match(directive, directives);
-	*p = savechar;
-
-	/* If we don't recognize this compiler directive or we happen to just
-	 * be gobbling up text while waiting for an #endif or #elif or #else
-	 * in the case of an #elif we must check the zero_value and return an
-	 * ELIF or an ELIFFALSE.
-	 */
-
-	if (ret == ELIF && !parse_it)
-	{
-	    while (*p == ' ' || *p == '\t')
-		p++;
-	    /*
-	     * parse an expression.
-	     */
-	    debug(0,("%s, line %d: #elif %s ",
-		   file->i_file, filep->f_line, p));
-	    ret = zero_value(file->i_file, p, filep, file_red);
-	    if (ret != IF)
-	    {
-		debug(0,("false...\n"));
-		if (ret == IFFALSE)
-		    return(ELIFFALSE);
-		else
-		    return(ELIFGUESSFALSE);
-	    }
-	    else
-	    {
-		debug(0,("true...\n"));
-		return(ELIF);
-	    }
-	}
-
-	if (ret < 0 || ! parse_it)
-		return(ret);
-
-	/*
-	 * now decide how to parse the directive, and do it.
-	 */
-	while (*p == ' ' || *p == '\t')
-		p++;
-	q = p + strlen(p);
-	do {
-		q--;
-	} while (*q == ' ' || *q == '\t');
-	q[1] = '\0';
-	switch (ret) {
-	case IF:
-		/*
-		 * parse an expression.
-		 */
-		ret = zero_value(file->i_file, p, filep, file_red);
-		debug(0,("%s, line %d: %s #if %s\n",
-			 file->i_file, filep->f_line, ret?"false":"true", p));
-		break;
-	case IFDEF:
-	case IFNDEF:
-		debug(0,("%s, line %d: #%s %s\n",
-			file->i_file, filep->f_line, directives[ret], p));
-	case UNDEF:
-		/*
-		 * separate the name of a single symbol.
-		 */
-		while (isalnum(*p) || *p == '_')
-			*line++ = *p++;
-		*line = '\0';
-		break;
-	case INCLUDE:
-	case INCLUDENEXT:
-		debug(2,("%s, line %d: #include%s %s\n",
-			file->i_file, filep->f_line,
-			(ret == INCLUDE) ? "" : "_next", p));
-
-		/* Support ANSI macro substitution */
-		while (1) {
-			struct symtab **sym;
-
-			if (!*p || *p == '"' || *p == '<')
-				break;
-
-		    	sym = isdefined(p, file_red, NULL);
-			if (!sym)
-				break;
-
-			p = (*sym)->s_value;
-			debug(3,("%s : #includes SYMBOL %s = %s\n",
-			       file->i_incstring,
-			       (*sym) -> s_name,
-			       (*sym) -> s_value));
-			/* mark file as having included a 'soft include' */
-			file->i_flags |= INCLUDED_SYM; 
-		}
-
-		/*
-		 * Separate the name of the include file.
-		 */
-		while (*p && *p != '"' && *p != '<')
-			p++;
-		if (! *p)
-			return(-2);
-		if (*p++ == '"') {
-			if (ret == INCLUDE)
-				ret = INCLUDEDOT;
-			else
-				ret = INCLUDENEXTDOT;
-			while (*p && *p != '"')
-				*line++ = *p++;
-		} else
-			while (*p && *p != '>')
-				*line++ = *p++;
-		*line = '\0';
-		break;
-	case DEFINE:
-		/*
-		 * copy the definition back to the beginning of the line.
-		 */
-		strcpy (line, p);
-		break;
-	case ELSE:
-	case ENDIF:
-	case ELIF:
-	case PRAGMA:
-	case ERROR:
-	case IDENT:
-	case SCCS:
-	case EJECT:
-	case WARNING:
-		debug(0,("%s, line %d: #%s\n",
-			file->i_file, filep->f_line, directives[ret]));
-		/*
-		 * nothing to do.
-		 */
-		break;
-	}
-	return(ret);
-}
-
-struct symtab **
-fdefined(char *symbol, struct inclist *file, struct inclist **srcfile)
-{
-	struct inclist	**ip;
-	struct symtab	**val;
-	int	i;
-	static int	recurse_lvl = 0;
-
-	if (file->i_flags & DEFCHECKED)
-		return(NULL);
-	debug(2,("Looking for %s in %s\n", symbol, file->i_file));
-	file->i_flags |= DEFCHECKED;
-	if ((val = slookup(symbol, file)))
-		debug(1,("%s defined in %s as %s\n",
-			 symbol, file->i_file, (*val)->s_value));
-	if (val == NULL && file->i_list)
-	{
-		for (ip = file->i_list, i=0; i < file->i_listlen; i++, ip++)
-			if (file->i_merged[i]==FALSE) {
-				val = fdefined(symbol, *ip, srcfile);
-				file->i_merged[i]=merge2defines(file,*ip);
-				if (val!=NULL) break;
-			}
-	}
-	else if (val != NULL && srcfile != NULL) *srcfile = file;
-	recurse_lvl--;
-	file->i_flags &= ~DEFCHECKED;
-
-	return(val);
-}
-
-struct symtab **
-isdefined(char *symbol, struct inclist *file, struct inclist **srcfile)
-{
-	struct symtab	**val;
-
-	if ((val = slookup(symbol, &maininclist))) {
-		debug(1,("%s defined on command line\n", symbol));
-		if (srcfile != NULL) *srcfile = &maininclist;
-		return(val);
-	}
-	if ((val = fdefined(symbol, file, srcfile)))
-		return(val);
-	debug(1,("%s not defined in %s\n", symbol, file->i_file));
-	return(NULL);
-}
-
-/*
- * Return type based on if the #if expression evaluates to 0
- */
-static int
-zero_value(char *filename,
-	   char *exp,
-	   struct filepointer *filep,
-	   struct inclist *file_red)
-{
-	if (cppsetup(filename, exp, filep, file_red))
-	    return(IFFALSE);
-	else
-	    return(IF);
-}
-
-void
-define2(char *name, char *val, struct inclist *file)
-{
-    int first, last, below;
-    register struct symtab **sp = NULL, **dest;
-    struct symtab *stab;
-
-    /* Make space if it's needed */
-    if (file->i_defs == NULL)
-    {
-	file->i_defs = (struct symtab **)
-			malloc(sizeof (struct symtab*) * SYMTABINC);
-	file->i_ndefs = 0;
-    }
-    else if (!(file->i_ndefs % SYMTABINC))
-	file->i_defs = (struct symtab **)
-			realloc(file->i_defs,
-			   sizeof(struct symtab*)*(file->i_ndefs+SYMTABINC));
-
-    if (file->i_defs == NULL)
-	fatalerr("malloc()/realloc() failure in insert_defn()\n");
-
-    below = first = 0;
-    last = file->i_ndefs - 1;
-    while (last >= first)
-    {
-	/* Fast inline binary search */
-	register char *s1;
-	register char *s2;
-	register int middle = (first + last) / 2;
-
-	/* Fast inline strchr() */
-	s1 = name;
-	s2 = file->i_defs[middle]->s_name;
-	while (*s1++ == *s2++)
-	    if (s2[-1] == '\0') break;
-
-	/* If exact match, set sp and break */
-	if (*--s1 == *--s2) 
-	{
-	    sp = file->i_defs + middle;
-	    break;
-	}
-
-	/* If name > i_defs[middle] ... */
-	if (*s1 > *s2) 
-	{
-	    below = first;
-	    first = middle + 1;
-	}
-	/* else ... */
-	else
-	{
-	    below = last = middle - 1;
-	}
-    }
-
-    /* Search is done.  If we found an exact match to the symbol name,
-       just replace its s_value */
-    if (sp != NULL)
-    {
-	debug(1,("redefining %s from %s to %s in file %s\n",
-		name, (*sp)->s_value, val, file->i_file));
-	free((*sp)->s_value);
-	(*sp)->s_value = copy(val);
-	return;
-    }
-
-    sp = file->i_defs + file->i_ndefs++;
-    dest = file->i_defs + below + 1;
-    while (sp > dest)
-    {
-	*sp = sp[-1];
-	sp--;
-    }
-    stab = (struct symtab *) malloc(sizeof (struct symtab));
-    if (stab == NULL)
-	fatalerr("malloc()/realloc() failure in insert_defn()\n");
-
-    debug(1,("defining %s to %s in file %s\n", name, val, file->i_file));
-    stab->s_name = copy(name);
-    stab->s_value = copy(val);
-    *sp = stab;
-}
-
-void
-define(char *def, struct inclist *file)
-{
-    char *val;
-
-    /* Separate symbol name and its value */
-    val = def;
-    while (isalnum(*val) || *val == '_')
-	val++;
-    if (*val)
-	*val++ = '\0';
-    while (*val == ' ' || *val == '\t')
-	val++;
-
-    if (!*val)
-	val = "1";
-    define2(def, val, file);
-}
-
-struct symtab **
-slookup(char *symbol, struct inclist *file)
-{
-	register int first = 0;
-	register int last = file->i_ndefs - 1;
-
-	if (file) while (last >= first)
-	{
-	    /* Fast inline binary search */
-	    register char *s1;
-	    register char *s2;
-	    register int middle = (first + last) / 2;
-
-	    /* Fast inline strchr() */
-	    s1 = symbol;
-	    s2 = file->i_defs[middle]->s_name;
-	    while (*s1++ == *s2++)
-	        if (s2[-1] == '\0') break;
-
-	    /* If exact match, we're done */
-	    if (*--s1 == *--s2) 
-	    {
-	        return file->i_defs + middle;
-	    }
-
-	    /* If symbol > i_defs[middle] ... */
-	    if (*s1 > *s2) 
-	    {
-	        first = middle + 1;
-	    }
-	    /* else ... */
-	    else
-	    {
-	        last = middle - 1;
-	    }
-	}
-	return(NULL);
-}
-
-static int 
-merge2defines(struct inclist *file1, struct inclist *file2)
-{
-	int i;
-
-	if ((file1==NULL) || (file2==NULL) ||
-	    !(file2->i_flags & FINISHED))
-		return 0;
-
-	for (i=0; i < file2->i_listlen; i++)
-		if (file2->i_merged[i]==FALSE)
-			return 0;
-
-	{
-		int first1 = 0;
-		int last1 = file1->i_ndefs - 1;
-
-		int first2 = 0;
-		int last2 = file2->i_ndefs - 1;
-
-                int first=0;
-                struct symtab** i_defs = NULL;
-		int deflen=file1->i_ndefs+file2->i_ndefs;
-
-		debug(2,("merging %s into %s\n",
-			file2->i_file, file1->i_file));
-
-                if (deflen>0)
-                { 
-                	/* make sure deflen % SYMTABINC == 0 is still true */
-                	deflen += (SYMTABINC - deflen % SYMTABINC) % SYMTABINC;
-                	i_defs=(struct symtab**)
-			    malloc(deflen*sizeof(struct symtab*));
-                	if (i_defs==NULL) return 0;
-        	}
-
-        	while ((last1 >= first1) && (last2 >= first2))
-        	{
-	    		char *s1=file1->i_defs[first1]->s_name;
-	    		char *s2=file2->i_defs[first2]->s_name;
-
-     			if (strcmp(s1,s2) < 0)
-                        	i_defs[first++]=file1->i_defs[first1++];
-     			else if (strcmp(s1,s2) > 0)
-                        	i_defs[first++]=file2->i_defs[first2++];
-                        else /* equal */
-                        {
-                        	i_defs[first++]=file2->i_defs[first2++];
-                                first1++;
-                        }
-        	}
-        	while (last1 >= first1)
-        	{
-                        i_defs[first++]=file1->i_defs[first1++];
-        	}
-        	while (last2 >= first2)
-        	{
-                        i_defs[first++]=file2->i_defs[first2++];
-        	}
-
-                if (file1->i_defs) free(file1->i_defs);
-                file1->i_defs=i_defs;
-                file1->i_ndefs=first;
-                
-		return 1;
-  	}
-}
-
-void
-undefine(char *symbol, struct inclist *file)
-{
-	register struct symtab **ptr;
-	struct inclist *srcfile;
-	while ((ptr = isdefined(symbol, file, &srcfile)) != NULL)
-	{
-	    srcfile->i_ndefs--;
-	    for (; ptr < srcfile->i_defs + srcfile->i_ndefs; ptr++)
-		*ptr = ptr[1];
-	}
-}
-
-int
-find_includes(struct filepointer *filep, struct inclist *file, 
-	      struct inclist *file_red, int recursion, boolean failOK)
-{
-	struct inclist	*inclistp;
-	char		**includedirsp;
-	register char	*line;
-	register int	type;
-	boolean recfailOK;
-
-	while ((line = getnextline(filep))) {
-		switch(type = deftype(line, filep, file_red, file, TRUE)) {
-		case IF:
-		doif:
-			type = find_includes(filep, file,
-				file_red, recursion+1, failOK);
-			while ((type == ELIF) || (type == ELIFFALSE) ||
-			       (type == ELIFGUESSFALSE))
-				type = gobble(filep, file, file_red);
-			if (type == ELSE)
-				gobble(filep, file, file_red);
-			break;
-		case IFFALSE:
-		case IFGUESSFALSE:
-		    doiffalse:
-			if (type == IFGUESSFALSE || type == ELIFGUESSFALSE)
-			    recfailOK = TRUE;
-			else
-			    recfailOK = failOK;
-			type = gobble(filep, file, file_red);
-			if (type == ELSE)
-			    find_includes(filep, file,
-					  file_red, recursion+1, recfailOK);
-			else
-			if (type == ELIF)
-			    goto doif;
-			else
-			if ((type == ELIFFALSE) || (type == ELIFGUESSFALSE))
-			    goto doiffalse;
-			break;
-		case IFDEF:
-		case IFNDEF:
-			if ((type == IFDEF && isdefined(line, file_red, NULL))
-			 || (type == IFNDEF && !isdefined(line, file_red, NULL))) {
-				debug(1,(type == IFNDEF ?
-				    "line %d: %s !def'd in %s via %s%s\n" : "",
-				    filep->f_line, line,
-				    file->i_file, file_red->i_file, ": doit"));
-				type = find_includes(filep, file,
-					file_red, recursion+1, failOK);
-				while (type == ELIF || type == ELIFFALSE || type == ELIFGUESSFALSE)
-					type = gobble(filep, file, file_red);
-				if (type == ELSE)
-					gobble(filep, file, file_red);
-			}
-			else {
-				debug(1,(type == IFDEF ?
-				    "line %d: %s !def'd in %s via %s%s\n" : "",
-				    filep->f_line, line,
-				    file->i_file, file_red->i_file, ": gobble"));
-				type = gobble(filep, file, file_red);
-				if (type == ELSE)
-					find_includes(filep, file,
-						file_red, recursion+1, failOK);
-				else if (type == ELIF)
-				    	goto doif;
-				else if (type == ELIFFALSE || type == ELIFGUESSFALSE)
-				    	goto doiffalse;
-			}
-			break;
-		case ELSE:
-		case ELIFFALSE:
-		case ELIFGUESSFALSE:
-		case ELIF:
-			if (!recursion)
-				gobble(filep, file, file_red);
-		case ENDIF:
-			if (recursion)
-				return(type);
-		case DEFINE:
-			define(line, file);
-			break;
-		case UNDEF:
-			if (!*line) {
-			    warning("%s", file_red->i_file);
-			    if (file_red != file)
-				warning1(" (reading %s)", file->i_file);
-			    warning1(", line %d: incomplete undef == \"%s\"\n",
-				filep->f_line, line);
-			    break;
-			}
-			undefine(line, file_red);
-			break;
-		case INCLUDE:
-		case INCLUDEDOT:
-		case INCLUDENEXT:
-		case INCLUDENEXTDOT:
-			inclistp = inclistnext;
-			includedirsp = includedirsnext;
-			debug(2,("%s, reading %s, includes %s\n",
-				file_red->i_file, file->i_file, line));
-			add_include(filep, file, file_red, line, type, failOK);
-			inclistnext = inclistp;
-			includedirsnext = includedirsp;
-			break;
-		case ERROR:
-		case WARNING:
-		    	warning("%s", file_red->i_file);
-			if (file_red != file)
-				warning1(" (reading %s)", file->i_file);
-			warning1(", line %d: %s\n",
-				 filep->f_line, line);
-		    	break;
-		    
-		case PRAGMA:
-		case IDENT:
-		case SCCS:
-		case EJECT:
-			break;
-		case -1:
-			warning("%s", file_red->i_file);
-			if (file_red != file)
-			    warning1(" (reading %s)", file->i_file);
-			warning1(", line %d: unknown directive == \"%s\"\n",
-				 filep->f_line, line);
-			break;
-		case -2:
-			warning("%s", file_red->i_file);
-			if (file_red != file)
-			    warning1(" (reading %s)", file->i_file);
-			warning1(", line %d: incomplete include == \"%s\"\n",
-				 filep->f_line, line);
-			break;
-		}
-	}
-	file->i_flags |= FINISHED;
-	debug(2,("finished with %s\n", file->i_file));
-	return(-1);
-}
diff --git a/nx-X11/config/makedepend/pr.c b/nx-X11/config/makedepend/pr.c
deleted file mode 100644
index 5d0e1c4da..000000000
--- a/nx-X11/config/makedepend/pr.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/* $Xorg: pr.c,v 1.4 2001/02/09 02:03:16 xorgcvs Exp $ */
-/*
-
-Copyright (c) 1993, 1994, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/config/makedepend/pr.c,v 1.4 2001/04/29 23:25:02 tsi Exp $ */
-
-#include "def.h"
-
-extern struct	inclist	inclist[ MAXFILES ],
-			*inclistp;
-extern char	*objprefix;
-extern char	*objsuffix;
-extern int	width;
-extern boolean	printed;
-extern boolean	verbose;
-extern boolean	show_where_not;
-
-void
-add_include(struct filepointer *filep, struct inclist *file, 
-	    struct inclist *file_red, char *include, int type,
-	    boolean failOK)
-{
-	register struct inclist	*newfile;
-	register struct filepointer	*content;
-
-	/*
-	 * First decide what the pathname of this include file really is.
-	 */
-	newfile = inc_path(file->i_file, include, type);
-	if (newfile == NULL) {
-		if (failOK)
-		    return;
-		if (file != file_red)
-			warning("%s (reading %s, line %d): ",
-				file_red->i_file, file->i_file, filep->f_line);
-		else
-			warning("%s, line %d: ", file->i_file, filep->f_line);
-		warning1("cannot find include file \"%s\"\n", include);
-		show_where_not = TRUE;
-		newfile = inc_path(file->i_file, include, type);
-		show_where_not = FALSE;
-	}
-
-	if (newfile) {
-		included_by(file, newfile);
-		if (!(newfile->i_flags & SEARCHED)) {
-			newfile->i_flags |= SEARCHED;
-			content = getfile(newfile->i_file);
-			find_includes(content, newfile, file_red, 0, failOK);
-			freefile(content);
-		}
-	}
-}
-
-static void
-pr(struct inclist *ip, char *file, char *base)
-{
-	static char	*lastfile;
-	static int	current_len;
-	register int	len, i;
-	char	buf[ BUFSIZ ];
-
-	printed = TRUE;
-	len = strlen(ip->i_file)+1;
-	if (current_len + len > width || file != lastfile) {
-		lastfile = file;
-		sprintf(buf, "\n%s%s%s: %s", objprefix, base, objsuffix,
-			ip->i_file);
-		len = current_len = strlen(buf);
-	}
-	else {
-		buf[0] = ' ';
-		strcpy(buf+1, ip->i_file);
-		current_len += len;
-	}
-	fwrite(buf, len, 1, stdout);
-
-	/*
-	 * If verbose is set, then print out what this file includes.
-	 */
-	if (! verbose || ip->i_list == NULL || ip->i_flags & NOTIFIED)
-		return;
-	ip->i_flags |= NOTIFIED;
-	lastfile = NULL;
-	printf("\n# %s includes:", ip->i_file);
-	for (i=0; i<ip->i_listlen; i++)
-		printf("\n#\t%s", ip->i_list[ i ]->i_incstring);
-}
-
-void
-recursive_pr_include(struct inclist *head, char *file, char *base)
-{
-	int	i;
-
-	if (head->i_flags & MARKED)
-		return;
-	head->i_flags |= MARKED;
-	if (head->i_file != file)
-		pr(head, file, base);
-	for (i=0; i<head->i_listlen; i++)
-		recursive_pr_include(head->i_list[ i ], file, base);
-}
diff --git a/nxcomp/configure.in b/nxcomp/configure.in
index 206df2ec7..47b29e7bc 100644
--- a/nxcomp/configure.in
+++ b/nxcomp/configure.in
@@ -367,16 +367,6 @@ dnl Find makedepend somewhere.
 AC_SUBST(MAKEDEPEND)
 MAKEDEPEND="$(which makedepend)"
 
-# Try to desperately find makedepend.
-# Set MAKEDEPEND to the shipped makedepend binary. This will not
-# exist in nx-libs-lite, though, in which case MAKEDEPEND
-# will stay empty.
-if test -z "${MAKEDEPEND}"; then
-  if test -x "../nx-X11/config/makedepend/makedepend"; then
-    MAKEDEPEND="../nx-X11/config/makedepend/makedepend"
-  fi
-fi
-
 dnl Determine what to build based on the platform.
 dnl Override the LIBS settings on Cygwin32 so that
 dnl we always link with the exact set of libraries.
diff --git a/nxcompext/configure.in b/nxcompext/configure.in
index 5b9ccc4da..6078851b4 100644
--- a/nxcompext/configure.in
+++ b/nxcompext/configure.in
@@ -226,16 +226,6 @@ dnl Find makedepend somewhere.
 AC_SUBST(MAKEDEPEND)
 MAKEDEPEND="$(which makedepend)"
 
-# Try to desperately find makedepend.
-# Set MAKEDEPEND to the shipped makedepend binary. This will not
-# exist in nx-libs-lite, though, in which case MAKEDEPEND
-# will stay empty.
-if test -z "${MAKEDEPEND}"; then
-  if test -x "../nx-X11/config/makedepend/makedepend"; then
-    MAKEDEPEND="../nx-X11/config/makedepend/makedepend"
-  fi
-fi
-
 dnl Determine what to build based on the platform.
 dnl Override the LIBS settings on Cygwin32 so that
 dnl we always link with the exact set of libraries.
diff --git a/nxcompshad/configure.in b/nxcompshad/configure.in
index 8468b4733..7ec064cc6 100644
--- a/nxcompshad/configure.in
+++ b/nxcompshad/configure.in
@@ -274,14 +274,4 @@ dnl Find makedepend somewhere.
 AC_SUBST(MAKEDEPEND)
 MAKEDEPEND="$(which makedepend)"
 
-# Try to desperately find makedepend.
-# Set MAKEDEPEND to the shipped makedepend binary. This will not
-# exist in nx-libs-lite, though, in which case MAKEDEPEND
-# will stay empty.
-if test -z "${MAKEDEPEND}"; then
-  if test -x "../nx-X11/config/makedepend/makedepend"; then
-    MAKEDEPEND="../nx-X11/config/makedepend/makedepend"
-  fi
-fi
-
 AC_OUTPUT(Makefile nxcompshad.pc)
-- 
cgit v1.2.3


From d650a0b47eadeb675e2d2cf03ad10a4dbc564971 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Thu, 23 Jun 2016 14:27:15 +0200
Subject: OPTFLAGS: Properly propagate build option flags to nxcomp{,ext,shad}
 and the nx-X11 build scripts.

 Note:

  - The "normal" way to inject CFLAGS (and CPPFLAGS) into nx-X11 builds is copying those
    options over into the variable CDEBUGFLAGS.
  - LDFLAGS have to be handed to nx-X11 via LOCAL_LDFLAGS.

 This change also includes a slight change in the nx-X11 build order.

 Old build order:

  Main Makefile:

      - [...]
      - libNX_X11
        + implicitly building nxcomp
        + implicitly building nxcompext
      - [...]
      - nxagent
        + implicitly building nxcompshad
      - [...]

 New build ordner:

  Main Makefile:

      - [...]
      - nxcomp
      - setup nx-X11 build env
        + cd nx-X11 && make BuildEnv
      - nx-X11/lib/*
      - nxcompext
      - nxcompshad
      - [...]
      - nxagent
      - [...]

 Fixes ArcticaProject/nx-libs#141
 Fixes X2GoBTS#84
---
 Makefile                          | 14 +++++++++++---
 debian/rules                      |  2 +-
 nx-X11/Makefile                   | 16 ++++++++++------
 nx-X11/lib/X11/Imakefile          | 38 --------------------------------------
 nx-X11/programs/Xserver/Imakefile | 22 +---------------------
 nx-libs.spec                      |  1 +
 nxcomp/Makefile.in                |  6 ++++--
 nxcomp/configure.in               |  8 ++++++--
 nxcompext/Makefile.in             |  6 ++++--
 nxcompext/configure.in            |  8 ++++++--
 nxcompshad/Makefile.in            |  6 ++++--
 nxcompshad/configure.in           | 12 ++++++++----
 nxproxy/configure.in              |  8 ++++++--
 13 files changed, 62 insertions(+), 85 deletions(-)

(limited to 'nxcomp')

diff --git a/Makefile b/Makefile
index e2077ed5b..daff448cd 100644
--- a/Makefile
+++ b/Makefile
@@ -49,9 +49,7 @@ build-lite:
 
 build-full:
 # in the full case, we rely on "magic" in the nx-X11 imake-based makefiles...
-	cd nxcomp && autoconf
-	cd nxcompext && autoconf
-	cd nxcompshad && autoconf
+	cd nxcomp && autoconf && (${CONFIGURE}) && ${MAKE}
 
 	# prepare nx-X11/config/cf/nxversion.def
 	sed \
@@ -62,6 +60,16 @@ build-full:
 	    nx-X11/config/cf/nxversion.def.in \
 	    > nx-X11/config/cf/nxversion.def
 
+	# prepare Makefiles and the nx-X11 symlinking magic
+	cd nx-X11 && make BuildEnv
+
+	# build libNX_X11 and libNX_Xext prior to building
+	# nxcomp{ext,shad}.
+	cd nx-X11/lib && make
+
+	cd nxcompext && autoconf && (${CONFIGURE}) && ${MAKE}
+	cd nxcompshad && autoconf && (${CONFIGURE}) && ${MAKE}
+
 	cd nx-X11 && ${MAKE} World
 
 	cd nxproxy && autoconf && (${CONFIGURE}) && ${MAKE}
diff --git a/debian/rules b/debian/rules
index a37478c21..275956c9a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,7 +66,7 @@ override_dh_auto_install:
 
 override_dh_auto_build:
 
-	LOCAL_LDFLAGS="$(LDFLAGS)" SHLIBGLOBALSFLAGS="$(LDFLAGS)" SHLIBDIR="$(LIBDIR)" PREFIX=/usr dh_auto_build --parallel
+	PREFIX=/usr dh_auto_build --parallel -- CDEBUGFLAGS="$(CPPFLAGS) $(CFLAGS)" LOCAL_LDFLAGS="$(LDFLAGS)" SHLIBGLOBALSFLAGS="$(LDFLAGS)" SHLIBDIR="$(LIBDIR)"
 
 override_dh_strip:
 	dh_strip -plibnx-x11-6 --dbg-package=libnx-x11-6-dbg
diff --git a/nx-X11/Makefile b/nx-X11/Makefile
index cb8c86b2b..1096e62cf 100644
--- a/nx-X11/Makefile
+++ b/nx-X11/Makefile
@@ -39,6 +39,15 @@ World:
 	@echo ""
 	@date
 	@echo ""
+	if [ ! -f xmakefile ]; then ${MAKE} ${MFLAGS} BuildEnv; fi
+	${MAKE} ${MAKE_OPTS} $(MFLAGS) $(WORLDOPTS) World
+	@echo ""
+	@date
+	@echo ""
+	@echo Full build of $(RELEASE) complete.
+	@echo ""
+
+BuildEnv:
 	@if [ -f xmakefile ]; then \
 	    ${MAKE} ${MAKE_OPTS} -k distclean || \
 	    ${MAKE} ${MAKE_OPTS} -k clean || \
@@ -52,12 +61,7 @@ World:
 	${MAKE} ${MAKE_OPTS} $(MFLAGS) BOOTSTRAPSUBDIRS= clean
 	${MAKE} ${MAKE_OPTS} $(MFLAGS) includes
 	${MAKE} ${MAKE_OPTS} $(MFLAGS) depend
-	${MAKE} ${MAKE_OPTS} $(MFLAGS) $(WORLDOPTS) World
-	@echo ""
-	@date
-	@echo ""
-	@echo Full build of $(RELEASE) complete.
-	@echo ""
+
 
 .PRECIOUS: Makefile
 
diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile
index 81a1cfd3d..1ba1e4818 100644
--- a/nx-X11/lib/X11/Imakefile
+++ b/nx-X11/lib/X11/Imakefile
@@ -1139,44 +1139,6 @@ includes:: ks_tables.h
 
 CONFIGURE ?= ./configure
 
-#if NXLibraries
-
-$(NX_XCOMPCONFIGTARGET):
-	cd ../../../nxcomp && \
-	${CONFIGURE}
-
-$(NX_XCOMPEXTCONFIGTARGET):
-	cd ../../../nxcompext && \
-	${CONFIGURE}
-
-#ifdef SunArchitecture
-$(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET)
-	${MAKE} -C $(NX_XCOMPLIBDIR)
-
-$(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET)
-	${MAKE} -C ../../../nxcompext
-
-#else
-$(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET)
-	${MAKE} -C $(NX_XCOMPLIBDIR)
-
-$(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET) $(NX_XCOMPLIBTARGET) lib$(LIBNAME).so.$(SOXLIBREV)
-	${MAKE} -C ../../../nxcompext
-
-#endif
-
-depend::
-
-lib$(LIBNAME).so.$(SOXLIBREV): $(NX_XCOMPLIBTARGET)
-
-all:: $(NX_XCOMPLIBTARGET)
-
-depend:: $(NX_XCOMPLIBTARGET)
-
-all:: $(NX_XCOMPEXTLIBTARGET)
-
-#endif
-
 depend:: ks_tables.h
 
 clean::
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index 0d820fad2..50031217e 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -455,27 +455,7 @@ NX_XSHADOWLIBNAME   = cygXcompshad.dll
 NX_XSHADOWLIBNAME   = libXcompshad.so
 #endif
 
-NX_XSHADOWLIBDIR    = $(XTOP)/../nxcompshad
-NX_XSHADOWLIBTARGET = $(NX_XSHADOWLIBDIR)/$(NX_XSHADOWLIBNAME)
-NX_XSHADOWCONFIGTARGET = $(NX_XSHADOWLIBDIR)/config.status
-
-CONFIGURE ?= ./configure
-
-$(NX_XSHADOWCONFIGTARGET):
-	cd $(NX_XSHADOWLIBDIR) && \
-	${CONFIGURE}
-
-#ifdef SunArchitecture
-$(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET)
-	cd $(NX_XSHADOWLIBDIR) && \
-	${MAKE}
-#else
-$(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET)
-	cd $(NX_XSHADOWLIBDIR) && \
-	rm -f *.o && ${MAKE}
-#endif
-
-ServerTarget(nxagent,$(NX_XSHADOWLIBTARGET) $(NXAGENTDIRS),$(NXAGENTOBJS), \
+ServerTarget(nxagent,$(NXAGENTDIRS),$(NXAGENTOBJS), \
         $(LIBCWRAPPER) $(NXAGENTLIBS) $(LOADABLEEXTS),$(NXAGENTSYSLIBS) $(NXAGENTNXLIBS))
 
 /*
diff --git a/nx-libs.spec b/nx-libs.spec
index 770f1870a..8b2ecb09a 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -454,6 +454,7 @@ chmod a+x my_configure;
 %{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro}
 export SHLIBGLOBALSFLAGS="%{__global_ldflags}"
 export LOCAL_LDFLAGS="%{__global_ldflags}"
+export CDEBUGFLAGS="%{__global_cppflags} %{__global_cflags}"
 make %{?_smp_mflags} CONFIGURE="$PWD/my_configure" PREFIX=%{_prefix} USRLIBDIR=%{_libdir} SHLIBDIR=%{_libdir}
 
 %install
diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in
index 759ab6a4f..ee12c3dbb 100644
--- a/nxcomp/Makefile.in
+++ b/nxcomp/Makefile.in
@@ -41,6 +41,8 @@ CXXFLAGS    = @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \
 CXXINCLUDES =
 CXXDEFINES  =
 
+CPPFLAGS    = @CPPFLAGS@
+
 #
 # C programs have their own CFLAGS.
 # 
@@ -87,9 +89,9 @@ DEPENDINCLUDES = -I/usr/include/c++ -I/usr/include/g++ -I/usr/include/g++-3
 .SUFFIXES: .cpp.c
 
 .cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(CXXINCLUDES) $(CXXDEFINES) $<
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CXXINCLUDES) $(CXXDEFINES) $<
 .c.o:
-	$(CC) -c $(CCFLAGS) $(CCINCLUDES) $(CCDEFINES) $<
+	$(CC) -c $(CPPFLAGS) $(CCFLAGS) $(CCINCLUDES) $(CCDEFINES) $<
 
 LIBRARY = Xcomp
 
diff --git a/nxcomp/configure.in b/nxcomp/configure.in
index 47b29e7bc..6586f22b2 100644
--- a/nxcomp/configure.in
+++ b/nxcomp/configure.in
@@ -10,8 +10,12 @@ AC_SUBST(pkgconfigdir)
 
 dnl Set our default compilation flags.
 
-CXXFLAGS="$CXXFLAGS -O3 -fno-rtti -fno-exceptions"
-CFLAGS="$CFLAGS -O3"
+if test "x$CXXFLAGS" = "x"; then
+  CXXFLAGS="-O3 -fno-rtti -fno-exceptions"
+fi
+if test "x$CFLAGS" = "x"; then
+  CFLAGS="$CFLAGS -O3"
+fi
 
 dnl Reset default linking directives.
 
diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in
index dd18c8053..415ffabb1 100644
--- a/nxcompext/Makefile.in
+++ b/nxcompext/Makefile.in
@@ -34,6 +34,8 @@ CXXFLAGS    = @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \
 CXXINCLUDES = -I. -I../nxcomp
 CXXDEFINES  =
 
+CPPFLAGS    = @CPPFLAGS@
+
 CC          = @CC@
 CCFLAGS     = @CFLAGS@ @X_CFLAGS@ @DEFS@ \
               -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
@@ -78,9 +80,9 @@ DEPENDINCLUDES =  -I/usr/include/c++ -I/usr/include/g++ -I/usr/include/g++-3
 .SUFFIXES: .cpp.c
 
 .cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(CXXINCLUDES) $<
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CXXINCLUDES) $<
 .c.o:
-	$(CC) -c $(CCFLAGS) $(CCINCLUDES) $<
+	$(CC) -c $(CPPFLAGS) $(CCFLAGS) $(CCINCLUDES) $<
 
 LIBRARY = Xcompext
 
diff --git a/nxcompext/configure.in b/nxcompext/configure.in
index 6078851b4..70bb9d121 100644
--- a/nxcompext/configure.in
+++ b/nxcompext/configure.in
@@ -10,8 +10,12 @@ AC_SUBST(pkgconfigdir)
 
 dnl Reset default compilation flags.
 
-CXXFLAGS="$CXXFLAGS -O3"
-CFLAGS="$CFLAGS -O3"
+if test "x$CXXFLAGS" = "x"; then
+  CXXFLAGS="-O3"
+fi
+if test "x$CFLAGS" == "x"; then
+  CFLAGS="-O3"
+fi
 
 dnl Reset default linking directives.
 
diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in
index 68bb1fbad..9c2b6f4fd 100644
--- a/nxcompshad/Makefile.in
+++ b/nxcompshad/Makefile.in
@@ -36,6 +36,8 @@ CXXFLAGS    = @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \
 CXXINCLUDES =
 CXXDEFINES  =
 
+CPPFLAGS    = @CPPFLAGS@
+
 #
 # C programs don't share the C++ flags. They should
 # have their own @CCFLAGS@.
@@ -99,9 +101,9 @@ DEPENDINCLUDES = -I/usr/include/g++ -I/usr/include/g++-3
 .SUFFIXES: .cpp.c
 
 .cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(CXXINCLUDES) $(CXXDEFINES) $<
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CXXINCLUDES) $(CXXDEFINES) $<
 .c.o:
-	$(CC) -c $(CCFLAGS) $(CCINCLUDES) $(CCDEFINES) $<
+	$(CC) -c $(CPPFLAGS) $(CCFLAGS) $(CCINCLUDES) $(CCDEFINES) $<
 
 LIBRARY = Xcompshad
 
diff --git a/nxcompshad/configure.in b/nxcompshad/configure.in
index 7ec064cc6..226b13ef8 100644
--- a/nxcompshad/configure.in
+++ b/nxcompshad/configure.in
@@ -10,8 +10,12 @@ AC_SUBST(pkgconfigdir)
 
 dnl Reset default compilation flags.
 
-CXXFLAGS="$CXXFLAGS -O3"
-CPPFLAGS="$CPPFLAGS -O3"
+if test "x$CXXFLAGS" == "x"; then
+  CXXFLAGS="-O3"
+fi
+if test "x$CPPFLAGS" == "x"; then
+  CPPFLAGS="-O3"
+fi
 
 dnl Reset default linking directives.
 
@@ -80,8 +84,8 @@ case "${gcc_version}" in
 
      *)
         AC_MSG_RESULT([yes])
-        CXXFLAGS="$CXXFLAGS -Wmissing-declarations -Wnested-externs"
-        CPPFLAGS="$CPPFLAGS -Wmissing-declarations -Wnested-externs"
+        CXXFLAGS="$CXXFLAGS -Wmissing-declarations"
+        CPPFLAGS="$CPPFLAGS -Wmissing-declarations"
         ;;
 esac
 
diff --git a/nxproxy/configure.in b/nxproxy/configure.in
index 268584216..12e2a08d2 100644
--- a/nxproxy/configure.in
+++ b/nxproxy/configure.in
@@ -7,8 +7,12 @@ AC_PREREQ(2.13)
 
 dnl Reset default compilation flags.
 
-CXXFLAGS="$CXXFLAGS -O3"
-CPPFLAGS="$CPPFLAGS -O3"
+if test "x$CXXFLAGS" == "x"; then
+  CXXFLAGS="-O3"
+fi
+if test "x$CPPFLAGS" == "x"; then
+  CPPFLAGS="-O3"
+fi
 
 dnl Prefer headers and libraries from nx-X11 if present.
 
-- 
cgit v1.2.3


From c5a2cf82f6baf7a9e64ec2328a5bac0dfee453ef Mon Sep 17 00:00:00 2001
From: Salvador Fandino <sfandino@yahoo.com>
Date: Mon, 1 Jun 2015 17:52:33 +0200
Subject: Rework SetupTcpSocket to use ListenConnectionTCP

---
 nxcomp/Loop.cpp | 67 +--------------------------------------------------------
 1 file changed, 1 insertion(+), 66 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 5086db012..b1653bff8 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -3945,72 +3945,7 @@ int SetupTcpSocket()
   // Open TCP socket emulating local display.
   //
 
-  tcpFD = socket(AF_INET, SOCK_STREAM, PF_UNSPEC);
-
-  if (tcpFD == -1)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Call to socket failed for TCP socket"
-            << ". Error is " << EGET() << " '" << ESTR() << "'.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Call to socket failed for TCP socket"
-         << ". Error is " << EGET() << " '" << ESTR() << "'.\n";
-
-    HandleCleanup();
-  }
-  else if (SetReuseAddress(tcpFD) < 0)
-  {
-    HandleCleanup();
-  }
-
-  unsigned int proxyPortTCP = X_TCP_PORT + proxyPort;
-
-  sockaddr_in tcpAddr;
-
-  tcpAddr.sin_family = AF_INET;
-  tcpAddr.sin_port = htons(proxyPortTCP);
-  if ( loopbackBind )
-  {
-    tcpAddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-  }
-  else
-  {
-    tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-  }
-
-  if (bind(tcpFD, (sockaddr *) &tcpAddr, sizeof(tcpAddr)) == -1)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Call to bind failed for TCP port "
-            << proxyPortTCP << ". Error is " << EGET() << " '" << ESTR()
-            << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Call to bind failed for TCP port "
-         << proxyPortTCP << ". Error is " << EGET() << " '" << ESTR()
-         << "'.\n";
-
-    HandleCleanup();
-  }
-
-  if (listen(tcpFD, 8) == -1)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Call to listen failed for TCP port "
-            << proxyPortTCP << ". Error is " << EGET() << " '" << ESTR()
-            << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Call to listen failed for TCP port "
-         << proxyPortTCP << ". Error is " << EGET() << " '" << ESTR()
-         << "'.\n";
-
-    HandleCleanup();
-  }
-
-  return 1;
+  return ListenConnectionTCP((loopbackBind ? "localhost" : "*"), X_TCP_PORT + proxyPort, "X11");
 }
 
 int SetupUnixSocket()
-- 
cgit v1.2.3


From 5ea2d901ba96d2d552385db0708c5edb66bb7a98 Mon Sep 17 00:00:00 2001
From: Salvador Fandino <sfandino@yahoo.com>
Date: Tue, 2 Jun 2015 10:31:53 +0200
Subject: rewrite SetupUnixSocket to use ListenConnectionUnix

---
 nxcomp/Loop.cpp | 90 +++++++++++++--------------------------------------------
 1 file changed, 20 insertions(+), 70 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index b1653bff8..7e8b1ec62 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -3954,90 +3954,40 @@ int SetupUnixSocket()
   // Open UNIX domain socket for display.
   //
 
-  unixFD = socket(AF_UNIX, SOCK_STREAM, PF_UNSPEC);
-
-  if (unixFD == -1)
-  {
+  if (!control->TempPath) {
     #ifdef PANIC
-    *logofs << "Loop: PANIC! Call to socket failed for UNIX domain"
-            << ". Error is " << EGET() << " '" << ESTR() << "'.\n"
-            << logofs_flush;
+    *logofs << "Loop: PANIC! Temporal path is null.\n" << logofs_flush;
     #endif
 
-    cerr << "Error" << ": Call to socket failed for UNIX domain"
-         << ". Error is " << EGET() << " '" << ESTR() << "'.\n";
-
+    cerr << "Error" << ": Temporal path is null.\n";
     HandleCleanup();
   }
 
-  sockaddr_un unixAddr;
-  unixAddr.sun_family = AF_UNIX;
+  unsigned int required = snprintf(unixSocketName, DEFAULT_STRING_LENGTH, "%s/.X11-unix", control->TempPath);
+  if (required < sizeof(unixSocketName)) {
 
-  char dirName[DEFAULT_STRING_LENGTH];
+    // No need to execute the following actions conditionally
+    mkdir(unixSocketName, (0777 | S_ISVTX));
+    chmod(unixSocketName, (0777 | S_ISVTX));
 
-  snprintf(dirName, DEFAULT_STRING_LENGTH - 1, "%s/.X11-unix",
-               control -> TempPath);
+    required = snprintf(unixSocketName, DEFAULT_STRING_LENGTH, "%s/.X11-unix/X%d", control->TempPath, proxyPort);
+    if (required < sizeof(unixSocketName)) {
 
-  *(dirName + DEFAULT_STRING_LENGTH - 1) = '\0';
-
-  struct stat dirStat;
-
-  if ((stat(dirName, &dirStat) == -1) && (EGET() == ENOENT))
-  {
-    mkdir(dirName, (0777 | S_ISVTX));
-    chmod(dirName, (0777 | S_ISVTX));
+      unixFD = ListenConnectionUnix(unixSocketName, "x11");
+      if (unixFD >= 0)
+        chmod(unixSocketName, 0777);
+      return unixFD;
+    }
   }
 
-  snprintf(unixSocketName,  DEFAULT_STRING_LENGTH - 1, "%s/X%d",
-               dirName, proxyPort);
+  unixSocketName[0] = '\0'; // Just in case!
 
-  strncpy(unixAddr.sun_path, unixSocketName, 108);
-
-  #ifdef TEST
-  *logofs << "Loop: Assuming Unix socket with name '"
-          << unixAddr.sun_path << "'.\n"
-          << logofs_flush;
+  #ifdef PANIC
+  *logofs << "Loop: PANIC! path for unix socket is too long.\n" << logofs_flush;
   #endif
 
-  *(unixAddr.sun_path + 107) = '\0';
-
-  if (bind(unixFD, (sockaddr *) &unixAddr, sizeof(unixAddr)) == -1)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Call to bind failed for UNIX domain socket "
-            << unixSocketName << ". Error is " << EGET() << " '" << ESTR()
-            << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ":  Call to bind failed for UNIX domain socket "
-         << unixSocketName << ". Error is " << EGET() << " '" << ESTR()
-         << "'.\n";
-
-    HandleCleanup();
-  }
-
-  if (listen(unixFD, 8) == -1)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Call to listen failed for UNIX domain socket "
-            << unixSocketName << ". Error is " << EGET() << " '" << ESTR()
-            << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ":  Call to listen failed for UNIX domain socket "
-         << unixSocketName << ". Error is " << EGET() << " '" << ESTR()
-         << "'.\n";
-
-    HandleCleanup();
-  }
-
-  //
-  // Let any local user to gain access to socket.
-  //
-
-  chmod(unixSocketName, 0777);
-
-  return 1;
+  cerr << "Error" << ": path for Unix socket is too long.\n";
+  HandleCleanup();
 }
 
 //
-- 
cgit v1.2.3


From d2e8551efe6b78a429ed400b37ac8f86b81830ef Mon Sep 17 00:00:00 2001
From: Salvador Fandino <sfandino@yahoo.com>
Date: Tue, 2 Jun 2015 12:30:49 +0200
Subject: Simplify ParseListenOption

Merge code paths.

Use GetHostAddress to resolve the target host address instead of inet_aton.
---
 nxcomp/Loop.cpp | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 7e8b1ec62..aab5c356d 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -13571,25 +13571,17 @@ int ParseListenOption(int &address)
     // on localhost.
     //
 
-    if (control -> ProxyMode == proxy_server)
-    {
-      address = (int) inet_addr("127.0.0.1");
+    if (loopbackBind || (control->ProxyMode == proxy_server)) {
+      address = htonl(INADDR_LOOPBACK);
     }
     else
     {
-      if ( loopbackBind )
-      {
-        address = htonl(INADDR_LOOPBACK);
-      }
-      else
-      {
-        address = htonl(INADDR_ANY);
-      }
+      address = htonl(INADDR_ANY);
     }
   }
   else
   {
-    address = inet_addr(listenHost);
+    address = GetHostAddress(listenHost);
   }
 
   return 1;
-- 
cgit v1.2.3


From d6edd7c978bfd826988aa99c75d346eaf8d4eac0 Mon Sep 17 00:00:00 2001
From: Salvador Fandino <sfandino@yahoo.com>
Date: Tue, 2 Jun 2015 12:34:20 +0200
Subject: Remove work around for OS/X that was doing nothing

Remove an old work around that's not needed anymore.

Tested on OS/X 10.10 for x86.
---
 nxcomp/Loop.cpp | 24 ------------------------
 1 file changed, 24 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index aab5c356d..059ac2d93 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -6671,32 +6671,8 @@ int WaitForRemote(int portNum)
   tcpAddr.sin_family = AF_INET;
   tcpAddr.sin_port = htons(portNum);
 
-  //
-  // Quick patch to run on MacOS/X where inet_addr("127.0.0.1")
-  // alone seems to fail to return a valid interface. It probably
-  // just needs a htonl() or something like that.
-  // 
-  // TODO: We have to give another look at inet_addr("127.0.0.1")
-  // on the Mac.
-  //
-
-  #ifdef __APPLE__
-
-  if ( loopbackBind )
-  {
-    tcpAddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-  }
-  else
-  {
-    tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-  }
-
-  #else
-
   tcpAddr.sin_addr.s_addr = listenIPAddr;
 
-  #endif
-
   if (bind(proxyFD, (sockaddr *) &tcpAddr, sizeof(tcpAddr)) == -1)
   {
     #ifdef PANIC
-- 
cgit v1.2.3


From 28736a8886b8c611ccf6098766b47f49ef9757b9 Mon Sep 17 00:00:00 2001
From: Salvador Fandino <sfandino@yahoo.com>
Date: Tue, 2 Jun 2015 12:54:15 +0200
Subject: remove unused listenHost parameter

---
 nxcomp/Loop.cpp | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 059ac2d93..6dc544fe5 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -954,7 +954,6 @@ static char unixSocketName[DEFAULT_STRING_LENGTH] = { 0 };
 
 static char connectHost[DEFAULT_STRING_LENGTH] = { 0 };
 static char acceptHost[DEFAULT_STRING_LENGTH]  = { 0 };
-static char listenHost[DEFAULT_STRING_LENGTH]  = { 0 };
 static char displayHost[DEFAULT_STRING_LENGTH] = { 0 };
 static char authCookie[DEFAULT_STRING_LENGTH]  = { 0 };
 
@@ -5456,7 +5455,6 @@ void CleanupLocal()
 
   *connectHost = '\0';
   *acceptHost  = '\0';
-  *listenHost  = '\0';
   *displayHost = '\0';
   *authCookie  = '\0';
 
@@ -13539,27 +13537,13 @@ ParseFontPathError:
 
 int ParseListenOption(int &address)
 {
-  if (*listenHost == '\0')
-  {
-    //
-    // On the X client side listen on any address.
-    // On the X server side listen to the forwarder
-    // on localhost.
-    //
-
-    if (loopbackBind || (control->ProxyMode == proxy_server)) {
-      address = htonl(INADDR_LOOPBACK);
-    }
-    else
-    {
-      address = htonl(INADDR_ANY);
-    }
+  if (loopbackBind || (control->ProxyMode == proxy_server)) {
+    address = htonl(INADDR_LOOPBACK);
   }
   else
   {
-    address = GetHostAddress(listenHost);
+    address = htonl(INADDR_ANY);
   }
-
   return 1;
 }
 
-- 
cgit v1.2.3


From c92a102ba786e4b642bc454381b69d7d104ec5b5 Mon Sep 17 00:00:00 2001
From: Salvador Fandino <sfandino@yahoo.com>
Date: Tue, 2 Jun 2015 13:25:34 +0200
Subject: rewrite WaitForRemote to build on top of ListenConnectionTCP

---
 nxcomp/Loop.cpp | 63 ++-------------------------------------------------------
 1 file changed, 2 insertions(+), 61 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 6dc544fe5..20114afbf 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -6611,7 +6611,6 @@ int WaitForRemote(int portNum)
   char hostLabel[DEFAULT_STRING_LENGTH] = { 0 };
 
   int retryAccept  = -1;
-  int listenIPAddr = -1;
 
   int proxyFD = -1;
   int newFD   = -1;
@@ -6640,66 +6639,8 @@ int WaitForRemote(int portNum)
     }
   }
 
-  proxyFD = socket(AF_INET, SOCK_STREAM, PF_UNSPEC);
-
-  if (proxyFD == -1)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Call to socket failed for TCP socket. "
-            << "Error is " << EGET() << " '" << ESTR() << "'.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Call to socket failed for TCP socket. "
-         << "Error is " << EGET() << " '" << ESTR() << "'.\n";
-
-    goto WaitForRemoteError;
-  }
-  else if (SetReuseAddress(proxyFD) < 0)
-  {
-    goto WaitForRemoteError;
-  }
-
-  listenIPAddr = 0;
-
-  ParseListenOption(listenIPAddr);
-
-  sockaddr_in tcpAddr;
-
-  tcpAddr.sin_family = AF_INET;
-  tcpAddr.sin_port = htons(portNum);
-
-  tcpAddr.sin_addr.s_addr = listenIPAddr;
-
-  if (bind(proxyFD, (sockaddr *) &tcpAddr, sizeof(tcpAddr)) == -1)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Call to bind failed for TCP port "
-            << portNum << ". Error is " << EGET() << " '" << ESTR()
-            << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Call to bind failed for TCP port "
-         << portNum << ". Error is " << EGET() << " '" << ESTR()
-         << "'.\n";
-
-    goto WaitForRemoteError;
-  }
-
-  if (listen(proxyFD, 4) == -1)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Call to listen failed for TCP port "
-            << portNum << ". Error is " << EGET() << " '" << ESTR()
-            << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Call to listen failed for TCP port "
-         << portNum << ". Error is " << EGET() << " '" << ESTR()
-         << "'.\n";
-
-    goto WaitForRemoteError;
-  }
+  proxyFD = ListenConnectionTCP( ((loopbackBind || (control->ProxyMode == proxy_server)) ? "localhost" : "*"),
+                                 portNum, "NX");
 
   if (*acceptHost != '\0')
   {
-- 
cgit v1.2.3


From f706d774b4dfd4c4254c3cf5c29ec28eb9313568 Mon Sep 17 00:00:00 2001
From: Salvador Fandino <sfandino@yahoo.com>
Date: Tue, 2 Jun 2015 15:35:50 +0200
Subject: remove now unused function ParseListenOption

---
 nxcomp/Loop.cpp | 20 --------------------
 1 file changed, 20 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 20114afbf..f051130dd 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -523,14 +523,6 @@ static int ParseHostOption(const char *opt, char *host, int &port);
 
 static int ParseFontPath(char *path);
 
-//
-// Determine the interface where to listen for
-// the remote proxy connection or the local
-// forwarder.
-//
-
-static int ParseListenOption(int &interface);
-
 //
 // Translate a pack method id in a literal.
 //
@@ -13476,18 +13468,6 @@ ParseFontPathError:
   return -1;
 }
 
-int ParseListenOption(int &address)
-{
-  if (loopbackBind || (control->ProxyMode == proxy_server)) {
-    address = htonl(INADDR_LOOPBACK);
-  }
-  else
-  {
-    address = htonl(INADDR_ANY);
-  }
-  return 1;
-}
-
 int OpenLogFile(char *name, ostream *&stream)
 {
   if (name == NULL || *name == '\0')
-- 
cgit v1.2.3


From b23dcd101a3fbfe662479ddfe6985bd2b874741f Mon Sep 17 00:00:00 2001
From: Salvador Fandino <sfandino@yahoo.com>
Date: Tue, 2 Jun 2015 14:55:40 +0200
Subject: merge code paths depending on acceptHost being ""

---
 nxcomp/Loop.cpp | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index f051130dd..450c477c6 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -6629,22 +6629,16 @@ int WaitForRemote(int portNum)
 
       goto WaitForRemoteError;
     }
-  }
-
-  proxyFD = ListenConnectionTCP( ((loopbackBind || (control->ProxyMode == proxy_server)) ? "localhost" : "*"),
-                                 portNum, "NX");
-
-  if (*acceptHost != '\0')
-  {
-    strcat(hostLabel, "'");
-    strcat(hostLabel, acceptHost);
-    strcat(hostLabel, "'");
+    strcpy(hostLabel, "any host");
   }
   else
   {
-    strcpy(hostLabel, "any host");
+    snprintf(hostLabel, sizeof(hostLabel), "'%s'", acceptHost);
   }
 
+  proxyFD = ListenConnectionTCP(((loopbackBind || (control->ProxyMode == proxy_server)) ? "localhost" : "*"),
+                                portNum, "NX");
+
   #ifdef TEST
   *logofs << "Loop: Waiting for connection from "
           << hostLabel  << " on port '" << portNum
-- 
cgit v1.2.3


From c6e9565127d5980d9f57928b36e8ca424197ca9e Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 15 Jun 2016 10:29:12 +0200
Subject: nxcomp/Loop.cpp: Add Unix file socket support for proxy <-> proxy
 connection.

---
 nxcomp/ChannelEndPoint.cpp | 143 ++++++++--
 nxcomp/ChannelEndPoint.h   |  11 +-
 nxcomp/Loop.cpp            | 675 ++++++++++++++++++++++++++++++++-------------
 3 files changed, 607 insertions(+), 222 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/ChannelEndPoint.cpp b/nxcomp/ChannelEndPoint.cpp
index cb35e52d2..3e3053927 100644
--- a/nxcomp/ChannelEndPoint.cpp
+++ b/nxcomp/ChannelEndPoint.cpp
@@ -24,6 +24,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <sys/stat.h>
 
 #include "ChannelEndPoint.h"
 
@@ -31,8 +32,21 @@
 
 ChannelEndPoint::ChannelEndPoint(const char *spec)
   : defaultTCPPort_(0), defaultTCPInterface_(0),
-    defaultUnixPath_(NULL) {
-  spec_ = (spec ? strdup(spec) : NULL);
+    defaultUnixPath_(NULL), spec_(NULL) {
+  setSpec(spec);
+}
+
+ChannelEndPoint::~ChannelEndPoint()
+{
+  char *unixPath = NULL;
+
+  if (getUnixPath(&unixPath))
+  {
+    struct stat st;
+    lstat(unixPath, &st);
+    if(S_ISSOCK(st.st_mode))
+      unlink(unixPath);
+  }
 }
 
 void
@@ -40,21 +54,92 @@ ChannelEndPoint::setSpec(const char *spec) {
   if (spec_) free(spec_);
 
   if (spec && strlen(spec))
+  {
     spec_ = strdup(spec);
+    isUnix_ = getUnixPath();
+    isTCP_ = getTCPHostAndPort();
+  }
   else
+  {
     spec_ = NULL;
+    isUnix_ = false;
+    isTCP_ = false;
+  }
 }
 
 void
-ChannelEndPoint::setSpec(int port) {
+ChannelEndPoint::setSpec(long port) {
   if (port >= 0) {
     char tmp[20];
-    sprintf(tmp, "%d", port);
+    sprintf(tmp, "%ld", port);
     setSpec(tmp);
   }
+  else {
+    disable();
+  }
+}
+
+void
+ChannelEndPoint::setSpec(const char *hostName, long port) {
+  int length;
+
+  if (spec_) free(spec_);
+  isUnix_ = false;
+  isTCP_ = false;
+
+  if (hostName && strlen(hostName) && port >= 1)
+  {
+    length = snprintf(NULL, 0, "tcp:%s:%ld", hostName, port);
+    spec_ = (char *)calloc(length + 1, sizeof(char));
+    snprintf(spec_, length+1, "tcp:%s:%ld", hostName, port);
+    isTCP_ = true;
+  }
   else setSpec((char*)NULL);
 }
 
+bool
+ChannelEndPoint::getSpec(char **socketUri) const {
+
+  if (socketUri) *socketUri = NULL;
+
+  char *unixPath = NULL;
+  char *hostName = NULL;
+  long port = -1;
+
+  char *newSocketUri = NULL;
+  int length = -1;
+
+  if (getUnixPath(&unixPath))
+  {
+    length = snprintf(NULL, 0, "unix:%s", unixPath);
+  }
+  else if (getTCPHostAndPort(&hostName, &port))
+  {
+    length = snprintf(NULL, 0, "tcp:%s:%ld", hostName, port);
+  }
+
+  if (length > 0)
+  {
+    newSocketUri = (char *)calloc(length + 1, sizeof(char));
+    if (isUnixSocket())
+      snprintf(newSocketUri, length+1, "unix:%s", unixPath);
+    else
+      snprintf(newSocketUri, length+1, "tcp:%s:%ld", hostName, port);
+
+    if (socketUri)
+      *socketUri = strdup(newSocketUri);
+  }
+
+  free(newSocketUri);
+  free(unixPath);
+  free(hostName);
+
+  if (*socketUri != '\0')
+    return true;
+
+  return false;
+}
+
 void
 ChannelEndPoint::setDefaultTCPPort(long port) {
   defaultTCPPort_ = port;
@@ -76,10 +161,12 @@ ChannelEndPoint::setDefaultUnixPath(char *path) {
 }
 
 void
-ChannelEndPoint::disable() { setSpec("0"); }
+ChannelEndPoint::disable() {
+  setSpec("0");
+}
 
 bool
-ChannelEndPoint::specIsPort(long *port) const {
+ChannelEndPoint::getPort(long *port) const {
   if (port) *port = 0;
   long p = -1;
   if (spec_) {
@@ -101,7 +188,7 @@ ChannelEndPoint::getUnixPath(char **unixPath) const {
   long p;
   char *path = NULL;
 
-  if (specIsPort(&p)) {
+  if (getPort(&p)) {
     if (p != 1) return false;
   }
   else if (spec_ && (strncmp("unix:", spec_, 5) == 0)) {
@@ -122,6 +209,11 @@ ChannelEndPoint::getUnixPath(char **unixPath) const {
   return true;
 }
 
+bool
+ChannelEndPoint::isUnixSocket() const {
+  return isUnix_;
+}
+
 // FIXME!!!
 static const char *
 getComputerName() {
@@ -158,7 +250,7 @@ ChannelEndPoint::getTCPHostAndPort(char **host, long *port) const {
   if (host) *host = NULL;
   if (port) *port = 0;
 
-  if (specIsPort(&p)) {
+  if (getPort(&p)) {
     h_len = 0;
   }
   else if (spec_ && (strncmp("tcp:", spec_, 4) == 0)) {
@@ -194,8 +286,8 @@ ChannelEndPoint::getTCPHostAndPort(char **host, long *port) const {
 }
 
 bool
-ChannelEndPoint::enabled() const {
-  return (getUnixPath() || getTCPHostAndPort());
+ChannelEndPoint::isTCPSocket() const {
+  return isTCP_;
 }
 
 long ChannelEndPoint::getTCPPort() const {
@@ -204,9 +296,16 @@ long ChannelEndPoint::getTCPPort() const {
   return -1;
 }
 
+bool
+ChannelEndPoint::enabled() const {
+  return (isUnixSocket() || isTCPSocket());
+}
+
 bool
 ChannelEndPoint::validateSpec() {
-  return (specIsPort() || getUnixPath() || getTCPHostAndPort());
+  isTCP_ = getTCPHostAndPort();
+  isUnix_ = getUnixPath();
+  return ( getPort() || isUnix_ || isTCP_ );
 }
 
 ChannelEndPoint &ChannelEndPoint::operator=(const ChannelEndPoint &other) {
@@ -219,26 +318,24 @@ ChannelEndPoint &ChannelEndPoint::operator=(const ChannelEndPoint &other) {
   old = spec_;
   spec_ = (other.spec_ ? strdup(other.spec_) : NULL);
   free(old);
+  isUnix_ = getUnixPath();
+  isTCP_ = getTCPHostAndPort();
   return *this;
 }
 
 std::ostream& operator<<(std::ostream& os, const ChannelEndPoint& endPoint) {
   if (endPoint.enabled()) {
-    char *unixPath, *host;
-    long port;
-    if (endPoint.getUnixPath(&unixPath)) {
-      os << "unix:" << unixPath;
-      free(unixPath);
+    char* endPointSpec = NULL;
+    if (endPoint.getSpec(&endPointSpec))
+    {
+      os << endPointSpec;
+      free(endPointSpec);
     }
-    else if (endPoint.getTCPHostAndPort(&host, &port)) {
-      os << "tcp:" << host << ":" << port;
-      free(host);
-    }
-    else {
+    else
       os << "(invalid)";
-    }
   }
-  else {
+  else
+  {
     os << "(disabled)";
   }
   return os;
diff --git a/nxcomp/ChannelEndPoint.h b/nxcomp/ChannelEndPoint.h
index 5b4e75345..901952e37 100644
--- a/nxcomp/ChannelEndPoint.h
+++ b/nxcomp/ChannelEndPoint.h
@@ -33,25 +33,32 @@ class ChannelEndPoint
   int defaultTCPInterface_; // 0=localhost, otherwise IP of public interface.
   char *defaultUnixPath_;
   char *spec_;
+  bool isUnix_;
+  bool isTCP_;
 
-  bool specIsPort(long *port = NULL) const;
+  bool getPort(long *port = NULL) const;
 
  public:
   ChannelEndPoint(const char *spec = NULL);
+  ~ChannelEndPoint();
   ChannelEndPoint &operator=(const ChannelEndPoint &other);
 
   bool enabled() const;
   bool disabled() { return !enabled(); }
   void disable();
   void setSpec(const char *spec);
-  void setSpec(int port);
+  void setSpec(long port);
+  void setSpec(const char *hostName, long port);
+  bool getSpec(char **socketUri) const;
   void setDefaultTCPPort(long port);
   void setDefaultTCPInterface(int publicInterface);
   void setDefaultUnixPath(char *path);
 
   bool getUnixPath(char **path = NULL) const;
+  bool isUnixSocket() const;
   bool getTCPHostAndPort(char **hostname = NULL, long *port = NULL) const;
   long getTCPPort() const;
+  bool isTCPSocket() const;
 
   bool validateSpec();
 };
diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 450c477c6..6bec5e30d 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -239,7 +239,7 @@ struct sockaddr_un
 // should connect to remote.
 //
 
-#define WE_INITIATE_CONNECTION    (*connectHost != '\0')
+#define WE_INITIATE_CONNECTION    (connectSocket.enabled())
 
 //
 // Is true if we must provide our credentials
@@ -255,7 +255,7 @@ struct sockaddr_un
 //
 
 #define WE_LISTEN_FORWARDER       (control -> ProxyMode == proxy_server && \
-                                           listenPort != -1)
+                                           listenSocket.enabled())
 
 //
 // You must define FLUSH in Misc.h if
@@ -440,7 +440,7 @@ static int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
 
 static int ListenConnection(ChannelEndPoint &endPoint, const char *label);
 static int ListenConnectionTCP(const char *host, long port, const char *label);
-static int ListenConnectionUnix(const char *unixPath, const char *label);
+static int ListenConnectionUnix(const char *path, const char *label);
 static int ListenConnectionAny(sockaddr *addr, socklen_t addrlen, const char *label);
 static int AcceptConnection(int fd, int domain, const char *label);
 
@@ -448,8 +448,11 @@ static int AcceptConnection(int fd, int domain, const char *label);
 // Other convenience functions.
 //
 
-static int WaitForRemote(int portNum);
-static int ConnectToRemote(const char *const hostName, int portNum);
+static int PrepareProxyConnectionTCP(char** hostName, long int* portNum, int* timeout, int* proxyFD, int* reason);
+static int PrepareProxyConnectionUnix(char** path, int* timeout, int* proxyFD, int* reason);
+
+static int WaitForRemote(ChannelEndPoint &socketAddress);
+static int ConnectToRemote(ChannelEndPoint &socketAddress);
 
 static int SendProxyOptions(int fd);
 static int SendProxyCaches(int fd);
@@ -514,7 +517,7 @@ static int ParsePackOption(const char *opt);
 // given on the command line.
 //
 
-static int ParseHostOption(const char *opt, char *host, int &port);
+static int ParseHostOption(const char *opt, char *host, long &port);
 
 //
 // Translate a font server port specification
@@ -944,7 +947,6 @@ static char unixSocketName[DEFAULT_STRING_LENGTH] = { 0 };
 // Other parameters.
 //
 
-static char connectHost[DEFAULT_STRING_LENGTH] = { 0 };
 static char acceptHost[DEFAULT_STRING_LENGTH]  = { 0 };
 static char displayHost[DEFAULT_STRING_LENGTH] = { 0 };
 static char authCookie[DEFAULT_STRING_LENGTH]  = { 0 };
@@ -963,13 +965,19 @@ static sockaddr *xServerAddr          = NULL;
 static unsigned int xServerAddrLength = 0;
 
 //
-// The port where the local proxy will await
-// the peer connection or where the remote
-// proxy will be contacted.
+// The representation of a Unix socket path or
+// a bind address, denoting where the local proxy
+// will await the peer connection.
+//
+
+static ChannelEndPoint listenSocket;
+
+//
+// The TCP host and port or Unix file socket where
+// the remote proxy will be contacted.
 //
 
-static int listenPort  = -1;
-static int connectPort = -1;
+static ChannelEndPoint connectSocket;
 
 //
 // Helper channels are disabled by default.
@@ -3355,58 +3363,88 @@ int InitBeforeNegotiation()
 
 int SetupProxyConnection()
 {
+
   if (proxyFD == -1)
   {
+
+    char *socketUri = NULL;
+
+    // Let's make sure, the default value for listenSocket is properly set. Doing this
+    // here, because we have to make sure that we call it after the connectSocket
+    // declaration is really really complete.
+
+    if (listenSocket.disabled() && connectSocket.disabled())
+    {
+      char listenPortValue[20] = { 0 };
+      sprintf(listenPortValue, "%ld", (long)(proxyPort + DEFAULT_NX_PROXY_PORT_OFFSET));
+
+      SetAndValidateChannelEndPointArg("local", "listen", listenPortValue, listenSocket);
+    }
+
+    #ifdef TEST
+    connectSocket.getSpec(&socketUri);
+    *logofs << "Loop: connectSocket is "<< ( connectSocket.enabled() ? "enabled" : "disabled") << ". "
+            << "The socket URI is '"<< ( socketUri != NULL ? socketUri : "<unset>") << "'.\n" << logofs_flush;
+    listenSocket.getSpec(&socketUri);
+    *logofs << "Loop: listenSocket is "<< ( listenSocket.enabled() ? "enabled" : "disabled") << ". "
+            << "The socket URI is '"<< ( socketUri != NULL ? socketUri : "<unset>") << "'.\n" << logofs_flush;
+    free(socketUri);
+    socketUri = NULL;
+    #endif
+
     if (WE_INITIATE_CONNECTION)
     {
-      if (connectPort < 0)
+      if (connectSocket.getSpec(&socketUri))
       {
-        connectPort = DEFAULT_NX_PROXY_PORT_OFFSET + proxyPort;
-      }
-
-      #ifdef TEST
-      *logofs << "Loop: Going to connect to " << connectHost
-              << ":" << connectPort << ".\n" << logofs_flush;
-      #endif
+        #ifdef TEST
+        *logofs << "Loop: Going to connect to '" << socketUri
+                << "'.\n" << logofs_flush;
+        #endif
+        free(socketUri);
 
-      proxyFD = ConnectToRemote(connectHost, connectPort);
+        proxyFD = ConnectToRemote(connectSocket);
 
-      #ifdef TEST
-      *logofs << "Loop: Connected to remote proxy on FD#"
-              << proxyFD << ".\n" << logofs_flush;
-      #endif
+        #ifdef TEST
+        *logofs << "Loop: Connected to remote proxy on FD#"
+                << proxyFD << ".\n" << logofs_flush;
+        #endif
 
-      cerr << "Info" << ": Connection to remote proxy '" << connectHost
-           << ":" << connectPort << "' established.\n";
+        cerr << "Info" << ": Connected to remote proxy on FD#"
+             << proxyFD << ".\n";
+      }
     }
     else
     {
-      if (listenPort < 0)
+
+      if (listenSocket.isTCPSocket() && (listenSocket.getTCPPort() < 0))
       {
-        listenPort = DEFAULT_NX_PROXY_PORT_OFFSET + proxyPort;
+        listenSocket.setSpec(DEFAULT_NX_PROXY_PORT_OFFSET + proxyPort);
       }
 
-      #ifdef TEST
-      *logofs << "Loop: Going to wait for connection on port " 
-              << listenPort << ".\n" << logofs_flush;
-      #endif
+      if (listenSocket.getSpec(&socketUri))
+      {
+        #ifdef TEST
+        *logofs << "Loop: Going to wait for connection at '"
+                << socketUri << "'.\n" << logofs_flush;
+        #endif
+        free(socketUri);
 
-      proxyFD = WaitForRemote(listenPort);
+        proxyFD = WaitForRemote(listenSocket);
 
-      #ifdef TEST
+        #ifdef TEST
+        if (WE_LISTEN_FORWARDER)
+        {
+          *logofs << "Loop: Connected to remote forwarder on FD#"
+                  << proxyFD << ".\n" << logofs_flush;
+        }
+        else
+        {
+          *logofs << "Loop: Connected to remote proxy on FD#"
+                  << proxyFD << ".\n" << logofs_flush;
+        }
+        #endif
 
-      if (WE_LISTEN_FORWARDER)
-      {
-        *logofs << "Loop: Connected to remote forwarder on FD#"
-                << proxyFD << ".\n" << logofs_flush;
       }
-      else
-      {
-        *logofs << "Loop: Connected to remote proxy on FD#"
-                << proxyFD << ".\n" << logofs_flush;
-      }
-
-      #endif
     }
   }
   #ifdef TEST
@@ -3422,8 +3460,11 @@ int SetupProxyConnection()
   // to reduce startup time. Option will
   // later be disabled if needed.
   //
+  // either listenSocket or connectSocket is used here...
+
+  if(listenSocket.isTCPSocket() || connectSocket.isTCPSocket())
 
-  SetNoDelay(proxyFD, 1);
+    SetNoDelay(proxyFD, 1);
 
   //
   // We need non-blocking input since the
@@ -4404,11 +4445,13 @@ int ListenConnectionAny(sockaddr *addr, socklen_t addrlen, const char *label)
 
     goto SetupSocketError;
   }
-  if (SetReuseAddress(newFD) < 0)
-  {
-    // SetReuseAddress already warns with an error
-    goto SetupSocketError;
-  }
+
+  if (addr->sa_family == AF_INET)
+    if (SetReuseAddress(newFD) < 0)
+    {
+      // SetReuseAddress already warns with an error
+      goto SetupSocketError;
+    }
 
   if (bind(newFD, addr, addrlen) == -1)
   {
@@ -4427,12 +4470,12 @@ int ListenConnectionAny(sockaddr *addr, socklen_t addrlen, const char *label)
   if (listen(newFD, 8) == -1)
   {
     #ifdef PANIC
-    *logofs << "Loop: PANIC! Call to bind failed for " << label
+    *logofs << "Loop: PANIC! Call to listen failed for " << label
             << ". Error is " << EGET()
             << " '" << ESTR() << "'.\n" << logofs_flush;
     #endif
 
-    cerr << "Error" << ": Call to bind failed for " << label
+    cerr << "Error" << ": Call to listen failed for " << label
          << ". Error is " << EGET()
          << " '" << ESTR() << "'.\n";
 
@@ -5445,7 +5488,6 @@ void CleanupLocal()
 
   *unixSocketName = '\0';
 
-  *connectHost = '\0';
   *acceptHost  = '\0';
   *displayHost = '\0';
   *authCookie  = '\0';
@@ -5460,8 +5502,8 @@ void CleanupLocal()
 
   xServerAddr = NULL;
 
-  listenPort  = -1;
-  connectPort = -1;
+  listenSocket.disable();
+  connectSocket.disable();
 
   cupsPort.disable();
   auxPort.disable();
@@ -6592,62 +6634,79 @@ void ResetTimer()
 }
 
 //
-// Open TCP socket to listen for remote proxy and
-// block until remote connects. If successful close
-// the listening socket and return FD on which the
-// other party is connected.
+// Open TCP or UNIX file socket to listen for remote proxy
+// and block until remote connects. If successful close
+// the listening socket and return FD on which the other
+// party is connected.
 //
 
-int WaitForRemote(int portNum)
+int WaitForRemote(ChannelEndPoint &socketAddress)
 {
   char hostLabel[DEFAULT_STRING_LENGTH] = { 0 };
+  char *socketUri = NULL;
 
   int retryAccept  = -1;
 
   int proxyFD = -1;
   int newFD   = -1;
 
-  //
-  // Get IP address of host to be awaited.
-  //
-
   int acceptIPAddr = 0;
 
-  if (*acceptHost != '\0')
+  if (socketAddress.isTCPSocket())
   {
-    acceptIPAddr = GetHostAddress(acceptHost);
 
-    if (acceptIPAddr == 0)
+    //
+    // Get IP address of host to be awaited.
+    //
+
+    if (*acceptHost != '\0')
     {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Cannot accept connections from unknown host '"
-              << acceptHost << "'.\n" << logofs_flush;
-      #endif
+      acceptIPAddr = GetHostAddress(acceptHost);
 
-      cerr << "Error" << ": Cannot accept connections from unknown host '"
-           << acceptHost << "'.\n";
+      if (acceptIPAddr == 0)
+      {
+        #ifdef PANIC
+        *logofs << "Loop: PANIC! Cannot accept connections from unknown host '"
+                << acceptHost << "'.\n" << logofs_flush;
+        #endif
 
-      goto WaitForRemoteError;
+        cerr << "Error" << ": Cannot accept connections from unknown host '"
+             << acceptHost << "'.\n";
+
+        goto WaitForRemoteError;
+      }
+      strcpy(hostLabel, "any host");
+    }
+    else
+    {
+      snprintf(hostLabel, sizeof(hostLabel), "'%s'", acceptHost);
+    }
+
+    if (loopbackBind)
+    {
+      long bindPort;
+      if (socketAddress.getTCPHostAndPort(NULL, &bindPort))
+          socketAddress.setSpec("localhost", bindPort);
     }
-    strcpy(hostLabel, "any host");
   }
+  else if (socketAddress.isUnixSocket())
+    strcpy(hostLabel, "this host");
   else
-  {
-    snprintf(hostLabel, sizeof(hostLabel), "'%s'", acceptHost);
-  }
+    strcpy(hostLabel, "unknown origin (something went wrong!!!)");
+
 
-  proxyFD = ListenConnectionTCP(((loopbackBind || (control->ProxyMode == proxy_server)) ? "localhost" : "*"),
-                                portNum, "NX");
+  proxyFD = ListenConnection(socketAddress, "NX");
 
+  socketAddress.getSpec(&socketUri);
   #ifdef TEST
   *logofs << "Loop: Waiting for connection from "
-          << hostLabel  << " on port '" << portNum
+          << hostLabel  << " on socket '" << socketUri
           << "'.\n" << logofs_flush;
   #endif
-
   cerr << "Info" << ": Waiting for connection from "
-       << hostLabel << " on port '" << portNum
+       << hostLabel << " on socket '" << socketUri
        << "'.\n";
+  free(socketUri);
 
   //
   // How many times to loop waiting for connections
@@ -6702,12 +6761,19 @@ int WaitForRemote(int portNum)
     }
     else if (result > 0 && FD_ISSET(proxyFD, &readSet))
     {
-      sockaddr_in newAddr;
-
-      socklen_t addrLen = sizeof(sockaddr_in);
 
-      newFD = accept(proxyFD, (sockaddr *) &newAddr, &addrLen);
+      sockaddr_in newAddrINET;
 
+      if (socketAddress.isUnixSocket())
+      {
+        socklen_t addrLen = sizeof(sockaddr_un);
+        newFD = accept(proxyFD, NULL, &addrLen);
+      }
+      else if (socketAddress.isTCPSocket())
+      {
+        socklen_t addrLen = sizeof(sockaddr_in);
+        newFD = accept(proxyFD, (sockaddr *) &newAddrINET, &addrLen);
+      }
       if (newFD == -1)
       {
         #ifdef PANIC
@@ -6722,47 +6788,82 @@ int WaitForRemote(int portNum)
         goto WaitForRemoteError;
       }
 
-      char *connectedHost = inet_ntoa(newAddr.sin_addr);
-
-      if (*acceptHost == '\0' || (int) newAddr.sin_addr.s_addr == acceptIPAddr)
+      if (socketAddress.isUnixSocket())
       {
-        #ifdef TEST
-
-        unsigned int connectedPort = ntohs(newAddr.sin_port);
 
-        *logofs << "Loop: Accepted connection from '" << connectedHost
-                << "' with port '" << connectedPort << "'.\n"
+        char * unixPath = NULL;
+        socketAddress.getUnixPath(&unixPath);
+        #ifdef TEST
+        *logofs << "Loop: Accepted connection from this host on Unix file socket '"
+                << unixPath << "'.\n"
                 << logofs_flush;
         #endif
 
-        cerr << "Info" << ": Accepted connection from '"
-             << connectedHost << "'.\n";
+        cerr << "Info" << ": Accepted connection from this host on Unix file socket '"
+             << unixPath << "'.\n";
+        free(unixPath);
 
         break;
       }
-      else
+      else if (socketAddress.isTCPSocket())
       {
-        #ifdef PANIC
-        *logofs << "Loop: WARNING! Refusing connection from '" << connectedHost
-                << "' on port '" << portNum << "'.\n" << logofs_flush;
-        #endif
 
-        cerr << "Warning" << ": Refusing connection from '"
-             << connectedHost << "'.\n";
-      }
+        char *connectedHost = inet_ntoa(newAddrINET.sin_addr);
 
-      //
-      // Not the best way to elude a DOS attack...
-      //
+        if (*acceptHost == '\0' || (int) newAddrINET.sin_addr.s_addr == acceptIPAddr)
+        {
+
+          #ifdef TEST
 
-      sleep(5);
+          unsigned int connectedPort = ntohs(newAddrINET.sin_port);
+
+          *logofs << "Loop: Accepted connection from '" << connectedHost
+                  << "' with port '" << connectedPort << "'.\n"
+                  << logofs_flush;
+          #endif
+
+          cerr << "Info" << ": Accepted connection from '"
+               << connectedHost << "'.\n";
+
+          break;
+        }
+        else
+        {
+          #ifdef PANIC
+          *logofs << "Loop: WARNING! Refusing connection from '" << connectedHost
+                  << "' on port '" << socketAddress.getTCPPort() << "'.\n" << logofs_flush;
+          #endif
+
+          cerr << "Warning" << ": Refusing connection from '"
+               << connectedHost << "'.\n";
+	}
+
+        //
+        // Not the best way to elude a DOS attack...
+        //
+
+        sleep(5);
+
+        close(newFD);
+
+      }
 
-      close(newFD);
     }
 
     if (--retryAccept == 0)
     {
-      if (*acceptHost == '\0')
+      if (socketAddress.isUnixSocket())
+      {
+        #ifdef PANIC
+        *logofs << "Loop: PANIC! Connection via Unix file socket from this host "
+                << "could not be established.\n"
+                << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Connection via Unix file socket from this host "
+             << "could not be established.\n";
+      }
+      else if (*acceptHost == '\0')
       {
         #ifdef PANIC
         *logofs << "Loop: PANIC! Connection with remote host "
@@ -6804,43 +6905,194 @@ WaitForRemoteError:
   HandleCleanup();
 }
 
-//
-// Connect to remote proxy. If successful
-// return FD of connection, else return -1.
-//
-
-int ConnectToRemote(const char *const hostName, int portNum)
+int PrepareProxyConnectionTCP(char** hostName, long int* portNum, int* timeout, int* proxyFD, int* reason)
 {
-  int proxyFD = -1;
 
-  int remoteIPAddr = GetHostAddress(hostName);
+  if (!proxyFD)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Implementation error (PrepareProxyConnectionTCP). "
+            << "'proxyFD' must not be a NULL pointer.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ":  Implementation error (PrepareProxyConnectionTCP). "
+            << "'proxyFD' must not be a NULL pointer.\n";
+
+    return -1;
+  }
+
+  if (!reason)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Implementation error (PrepareProxyConnectionTCP). "
+            << "'reason' must not be a NULL pointer.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ":  Implementation error (PrepareProxyConnectionTCP). "
+            << "'reason' must not be a NULL pointer.\n";
+
+    return -1;
+  }
 
+  int remoteIPAddr = GetHostAddress(*hostName);
   if (remoteIPAddr == 0)
   {
     #ifdef PANIC
     *logofs << "Loop: PANIC! Unknown remote host '"
-            << hostName << "'.\n" << logofs_flush;
+            << *hostName << "'.\n" << logofs_flush;
     #endif
-
-    cerr << "Error" << ": Unknown remote host '"
-         << hostName << "'.\n";
+        cerr << "Error" << ": Unknown remote host '"
+         << *hostName << "'.\n";
 
     HandleCleanup();
   }
 
   #ifdef TEST
   *logofs << "Loop: Connecting to remote host '" 
-          << hostName << ":" << portNum << "'.\n"
+          << *hostName << ":" << *portNum << "'.\n"
           << logofs_flush;
   #endif
 
   cerr << "Info" << ": Connecting to remote host '"
-       << hostName << ":" << portNum << "'.\n"
+       << *hostName << ":" << *portNum << "'.\n"
        << logofs_flush;
 
+  *proxyFD = -1;
+  *reason = -1;
+
+  sockaddr_in addr;
+  addr.sin_family = AF_INET;
+  addr.sin_port = htons(*portNum);
+  addr.sin_addr.s_addr = remoteIPAddr;
+
+  *proxyFD = socket(AF_INET, SOCK_STREAM, PF_UNSPEC);
+  *reason = EGET();
+
+  if (*proxyFD == -1)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Call to socket failed. "
+            << "Error is " << *reason << " '" << ESTR()
+            << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Call to socket failed. "
+         << "Error is " << *reason << " '" << ESTR()
+         << "'.\n";
+    return -1;
+
+  }
+  else if (SetReuseAddress(*proxyFD) < 0)
+  {
+    return -1;
+  }
+
+  //
+  // Ensure operation is timed out
+  // if there is a network problem.
+  //
+
+  if (timeout)
+    SetTimer(*timeout);
+  else
+    SetTimer(20000);
+
+  int result = connect(*proxyFD, (sockaddr *) &addr, sizeof(sockaddr_in));
+
+  *reason = EGET();
+
+  ResetTimer();
+
+  return result;
+
+}
+
+int PrepareProxyConnectionUnix(char** path, int* timeout, int* proxyFD, int* reason)
+{
+
+  if (!proxyFD)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Implementation error (PrepareProxyConnectionUnix). "
+            << "proxyFD must not be a NULL pointer.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ":  Implementation error (PrepareProxyConnectionUnix). "
+            << "proxyFD must not be a NULL pointer.\n";
+
+    return -1;
+  }
+
+  if (!reason)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Implementation error (PrepareProxyConnectionUnix). "
+            << "'reason' must not be a NULL pointer.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ":  Implementation error (PrepareProxyConnectionUnix). "
+            << "'reason' must not be a NULL pointer.\n";
+
+    return -1;
+  }
+
+  /* FIXME: Add socket file existence and permission checks */
+
+  *proxyFD = -1;
+  *reason = -1;
+
+  sockaddr_un addr;
+  addr.sun_family = AF_UNIX;
+  strncpy(addr.sun_path, *path, 108 - 1);
+
+  *proxyFD = socket(AF_UNIX, SOCK_STREAM, PF_UNSPEC);
+  *reason = EGET();
+
+  if (*proxyFD == -1)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Call to socket failed. "
+            << "Error is " << *reason << " '" << ESTR()
+            << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Call to socket failed. "
+         << "Error is " << *reason << " '" << ESTR()
+         << "'.\n";
+
+    return -1;
+  }
+
+  //
+  // Ensure operation is timed out
+  // if there is a network problem.
+  //
+
+  if (timeout)
+    SetTimer(*timeout);
+  else
+    SetTimer(20000);
+
+  int result = connect(*proxyFD, (sockaddr *) &addr, sizeof(sockaddr_un));
+
+  *reason = EGET();
+
+  ResetTimer();
+
+  return result;
+}
+
+//
+// Connect to remote proxy. If successful
+// return FD of connection, else return -1.
+//
+
+int ConnectToRemote(ChannelEndPoint &socketAddress)
+{
+
   //
   // How many times we retry to connect to remote
-  // host in case of failure?
+  // host / Unix domain socket in case of failure?
   //
 
   int retryConnect = control -> OptionProxyRetryConnect;
@@ -6858,39 +7110,16 @@ int ConnectToRemote(const char *const hostName, int portNum)
 
   T_timestamp lastRetry = getNewTimestamp();
 
-  sockaddr_in addr;
+  int result = -1;
+  int reason = -1;
+  int proxyFD = -1;
 
-  addr.sin_family = AF_INET;
-  addr.sin_port = htons(portNum);
-  addr.sin_addr.s_addr = remoteIPAddr;
+  char *hostName = NULL;
+  long int portNum = -1;
+  char *unixPath = NULL;
 
   for (;;)
   {
-    proxyFD = socket(AF_INET, SOCK_STREAM, PF_UNSPEC);
-
-    if (proxyFD == -1)
-    {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Call to socket failed. "
-              << "Error is " << EGET() << " '" << ESTR()
-              << "'.\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Call to socket failed. "
-           << "Error is " << EGET() << " '" << ESTR()
-           << "'.\n";
-
-      goto ConnectToRemoteError;
-    }
-    else if (SetReuseAddress(proxyFD) < 0)
-    {
-      goto ConnectToRemoteError;
-    }
-
-    //
-    // Ensure operation is timed out
-    // if there is a network problem.
-    //
 
     #ifdef DEBUG
     *logofs << "Loop: Timer set to " << connectTimeout / 1000
@@ -6899,13 +7128,10 @@ int ConnectToRemote(const char *const hostName, int portNum)
             << "'.\n" << logofs_flush;
     #endif
 
-    SetTimer(connectTimeout);
-
-    int result = connect(proxyFD, (sockaddr *) &addr, sizeof(sockaddr_in));
-
-    int reason = EGET();
-
-    ResetTimer();
+    if (socketAddress.getUnixPath(&unixPath))
+      result = PrepareProxyConnectionUnix(&unixPath, &connectTimeout, &proxyFD, &reason);
+    else if (socketAddress.getTCPHostAndPort(&hostName, &portNum))
+      result = PrepareProxyConnectionTCP(&hostName, &portNum, &connectTimeout, &proxyFD, &reason);
 
     if (result < 0)
     {
@@ -6919,24 +7145,40 @@ int ConnectToRemote(const char *const hostName, int portNum)
       {
         ESET(reason);
 
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Connection to '" << hostName
-                << ":" << portNum << "' failed. Error is "
-                << EGET() << " '" << ESTR() << "'.\n"
-                << logofs_flush;
-        #endif
+        if (socketAddress.isUnixSocket())
+        {
+          #ifdef PANIC
+          *logofs << "Loop: PANIC! Connection to Unix file socket '"
+                  << unixPath << "' failed. Error is "
+                  << EGET() << " '" << ESTR() << "'.\n"
+                  << logofs_flush;
+          #endif
 
-        cerr << "Error" << ": Connection to '" << hostName
-             << ":" << portNum << "' failed. Error is "
-             << EGET() << " '" << ESTR() << "'.\n";
+          cerr << "Error" << ": Connection to Unix file socket '"
+                  << unixPath << "' failed. Error is "
+                  << EGET() << " '" << ESTR() << "'.\n";
+        }
+        else
+        {
 
+          #ifdef PANIC
+          *logofs << "Loop: PANIC! Connection to '" << hostName
+                  << ":" << portNum << "' failed. Error is "
+                  << EGET() << " '" << ESTR() << "'.\n"
+                  << logofs_flush;
+          #endif
+
+          cerr << "Error" << ": Connection to '" << hostName
+               << ":" << portNum << "' failed. Error is "
+               << EGET() << " '" << ESTR() << "'.\n";
+        }
         goto ConnectToRemoteError;
       }
       else
       {
         #ifdef TEST
-        *logofs << "Loop: Sleeping " << retryTimeout 
-                << " Ms before retrying.\n"
+        *logofs << "Loop: Sleeping " << retryTimeout
+                << " ms before retrying.\n"
                 << logofs_flush;
         #endif
 
@@ -7005,10 +7247,20 @@ int ConnectToRemote(const char *const hostName, int portNum)
       ESET(reason);
 
       #ifdef TEST
-      *logofs << "Loop: Connection to '" << hostName
-              << ":" << portNum << "' failed with error '"
-              << ESTR() << "'. Retrying.\n"
-              << logofs_flush;
+      if (unixPath[0] != '\0' )
+      {
+        *logofs << "Loop: Connection to Unix socket file '"
+                << unixPath << "' failed with error '"
+                << ESTR() << "'. Retrying.\n"
+                << logofs_flush;
+      }
+      else
+      {
+        *logofs << "Loop: Connection to '" << hostName
+                << ":" << portNum << "' failed with error '"
+                << ESTR() << "'. Retrying.\n"
+                << logofs_flush;
+      }
       #endif
     }
     else
@@ -8234,6 +8486,9 @@ int ParseEnvironmentOptions(const char *env, int force)
 
   name = strtok(nextOpts, "=");
 
+  char connectHost[DEFAULT_STRING_LENGTH] = { 0 };
+  long connectPort = -1;
+
   while (name)
   {
     value = strtok(NULL, ",");
@@ -8254,6 +8509,7 @@ int ParseEnvironmentOptions(const char *env, int force)
     }
     else if (strcasecmp(name, "link") == 0)
     {
+
       if (control -> ProxyMode == proxy_server)
       {
         PrintOptionIgnored("local", name, value);
@@ -8315,26 +8571,29 @@ int ParseEnvironmentOptions(const char *env, int force)
     }
     else if (strcasecmp(name, "listen") == 0)
     {
-      if (*connectHost != '\0')
+      char *socketUri = NULL;
+      if (connectSocket.getSpec(&socketUri))
       {
         #ifdef PANIC
         *logofs << "Loop: PANIC! Can't handle 'listen' and 'connect' parameters "
                 << "at the same time.\n" << logofs_flush;
 
         *logofs << "Loop: PANIC! Refusing 'listen' parameter with 'connect' being '"
-                << connectHost << "'.\n" << logofs_flush;
+                << socketUri << "'.\n" << logofs_flush;
         #endif
 
         cerr << "Error" << ": Can't handle 'listen' and 'connect' parameters "
              << "at the same time.\n";
 
         cerr << "Error" << ": Refusing 'listen' parameter with 'connect' being '"
-             << connectHost << "'.\n";
+             << socketUri << "'.\n";
 
+        free(socketUri);
         return -1;
       }
 
-      listenPort = ValidateArg("local", name, value);
+      SetAndValidateChannelEndPointArg("local", name, value, listenSocket);
+
     }
     else if (strcasecmp(name, "loopback") == 0)
     {
@@ -8342,22 +8601,24 @@ int ParseEnvironmentOptions(const char *env, int force)
     }
     else if (strcasecmp(name, "accept") == 0)
     {
-      if (*connectHost != '\0')
+      char *socketUri = NULL;
+      if (connectSocket.getSpec(&socketUri))
       {
         #ifdef PANIC
         *logofs << "Loop: PANIC! Can't handle 'accept' and 'connect' parameters "
                 << "at the same time.\n" << logofs_flush;
 
         *logofs << "Loop: PANIC! Refusing 'accept' parameter with 'connect' being '"
-                << connectHost << "'.\n" << logofs_flush;
+                << socketUri << "'.\n" << logofs_flush;
         #endif
 
         cerr << "Error" << ": Can't handle 'accept' and 'connect' parameters "
              << "at the same time.\n";
 
         cerr << "Error" << ": Refusing 'accept' parameter with 'connect' being '"
-             << connectHost << "'.\n";
+             << socketUri << "'.\n";
 
+	free(socketUri);
         return -1;
       }
 
@@ -8383,8 +8644,12 @@ int ParseEnvironmentOptions(const char *env, int force)
 
         return -1;
       }
-
-      strncpy(connectHost, value, DEFAULT_STRING_LENGTH - 1);
+      if ((strncmp(value, "tcp:", 4) == 0) || (strncmp(value, "unix:", 5) == 0))
+        SetAndValidateChannelEndPointArg("local", name, value, connectSocket);
+      else
+        // if the "connect" parameter does not start with "unix:" or "tcp:" assume
+        // old parameter usage style (providing hostname string only).
+        strcpy(connectHost, value);
     }
     else if (strcasecmp(name, "port") == 0)
     {
@@ -8842,6 +9107,17 @@ int ParseEnvironmentOptions(const char *env, int force)
 
   } // End of while (name) ...
 
+  // Assemble the connectSocket channel end point if parameter values have been old-school...
+  if (connectSocket.disabled() && (connectHost[0] != '\0') && (proxyPort > 0 || connectPort > 0))
+  {
+    if (connectPort < 0)
+      connectPort = proxyPort + DEFAULT_NX_PROXY_PORT_OFFSET;
+
+    char tcpHostAndPort[DEFAULT_STRING_LENGTH] = { 0 };
+    sprintf(tcpHostAndPort, "tcp:%s:%ld", connectHost, connectPort);
+    SetAndValidateChannelEndPointArg("local", name, tcpHostAndPort, connectSocket);
+  }
+
   #ifdef TEST
   *logofs << "Loop: Completed parsing of string '"
           << env << "'.\n" << logofs_flush;
@@ -9082,16 +9358,21 @@ int ParseCommandLineOptions(int argc, const char **argv)
         // command line at the connecting side.
         //
 
-        if (ParseHostOption(nextArg, connectHost, connectPort) > 0)
-        {
-          //
-          // Assume port is at a proxied display offset.
-          //
+        char *cHost;
+        long cPort;
 
-          proxyPort = connectPort;
+        if (connectSocket.getTCPHostAndPort(&cHost, &cPort) && (ParseHostOption(nextArg, cHost, cPort) > 0))
+          {
+            //
+            // Assume port is at a proxied display offset.
+            //
 
-          connectPort += DEFAULT_NX_PROXY_PORT_OFFSET;
-        }
+            proxyPort = cPort;
+
+            cPort += DEFAULT_NX_PROXY_PORT_OFFSET;
+            connectSocket.setSpec(cHost, cPort);
+
+          }
         else if (ParseEnvironmentOptions(nextArg, 1) < 0)
         {
           return -1;
@@ -13195,7 +13476,7 @@ int ParseBitrateOption(const char *opt)
   return 1;
 }
 
-int ParseHostOption(const char *opt, char *host, int &port)
+int ParseHostOption(const char *opt, char *host, long &port)
 {
   #ifdef TEST
   *logofs << "Loop: Trying to parse options string '" << opt
-- 
cgit v1.2.3


From 4ad29435c8549a9e27d3299957cbb190603fb080 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 5 Jul 2016 10:26:34 +0200
Subject: Drop multiple COPYING files contaning the GPL-2 license text.

 One COPYING file in the project's base folder is sufficient.
---
 nx-X11/COPYING                             | 339 -----------------------------
 nx-X11/programs/Xserver/hw/nxagent/COPYING | 339 -----------------------------
 nxcomp/COPYING                             | 339 -----------------------------
 nxcompext/COPYING                          | 339 -----------------------------
 nxcompshad/COPYING                         | 339 -----------------------------
 nxproxy/COPYING                            | 339 -----------------------------
 6 files changed, 2034 deletions(-)
 delete mode 100644 nx-X11/COPYING
 delete mode 100644 nx-X11/programs/Xserver/hw/nxagent/COPYING
 delete mode 100644 nxcomp/COPYING
 delete mode 100644 nxcompext/COPYING
 delete mode 100644 nxcompshad/COPYING
 delete mode 100644 nxproxy/COPYING

(limited to 'nxcomp')

diff --git a/nx-X11/COPYING b/nx-X11/COPYING
deleted file mode 100644
index d511905c1..000000000
--- a/nx-X11/COPYING
+++ /dev/null
@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/nx-X11/programs/Xserver/hw/nxagent/COPYING b/nx-X11/programs/Xserver/hw/nxagent/COPYING
deleted file mode 100644
index d511905c1..000000000
--- a/nx-X11/programs/Xserver/hw/nxagent/COPYING
+++ /dev/null
@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/nxcomp/COPYING b/nxcomp/COPYING
deleted file mode 100644
index d511905c1..000000000
--- a/nxcomp/COPYING
+++ /dev/null
@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/nxcompext/COPYING b/nxcompext/COPYING
deleted file mode 100644
index d511905c1..000000000
--- a/nxcompext/COPYING
+++ /dev/null
@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/nxcompshad/COPYING b/nxcompshad/COPYING
deleted file mode 100644
index d511905c1..000000000
--- a/nxcompshad/COPYING
+++ /dev/null
@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/nxproxy/COPYING b/nxproxy/COPYING
deleted file mode 100644
index d511905c1..000000000
--- a/nxproxy/COPYING
+++ /dev/null
@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
-- 
cgit v1.2.3


From d38ccd197413f6fad830c314d904904368d3770d Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 5 Jul 2016 10:33:08 +0200
Subject: LICENSE files: Have a main LICENSE file and one for nxcomp in the
 project's base folder.

 Drop other LICENSE files added by NoMachine scattered all over the code tree.
---
 LICENSE                                    | 26 +++++++++
 LICENSE.nxcomp                             | 90 ++++++++++++++++++++++++++++++
 nx-X11/LICENSE                             | 26 ---------
 nx-X11/programs/Xserver/hw/nxagent/LICENSE | 26 ---------
 nxcomp/LICENSE                             | 90 ------------------------------
 nxcompext/LICENSE                          | 21 -------
 nxcompshad/LICENSE                         | 22 --------
 nxproxy/LICENSE                            | 36 ------------
 8 files changed, 116 insertions(+), 221 deletions(-)
 create mode 100644 LICENSE
 create mode 100644 LICENSE.nxcomp
 delete mode 100644 nx-X11/LICENSE
 delete mode 100644 nx-X11/programs/Xserver/hw/nxagent/LICENSE
 delete mode 100644 nxcomp/LICENSE
 delete mode 100644 nxcompext/LICENSE
 delete mode 100644 nxcompshad/LICENSE
 delete mode 100644 nxproxy/LICENSE

(limited to 'nxcomp')

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000000000..32cb52b45
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,26 @@
+Copyright (c) 2001, 2011 NoMachine - http://www.nomachine.com/.
+
+NX-X11 and NX extensions to X are copyright of NoMachine.
+
+Redistribution and use of this software is allowed according to the
+following terms:
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License Version 2, and
+not any other version, as published by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTA-
+BILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, you can request a copy to NoMachine
+or write to the Free Software Foundation, Inc., 59 Temple Place,
+Suite 330, Boston, MA  02111-1307 USA
+
+Parts of this software are derived from XFree86 and X.org projects.
+Other copyrights and the MIT/X11 license applies to different sources.
+Please check the applicable copyrights in each file or subdirectory.
+
+All rights reserved.
diff --git a/LICENSE.nxcomp b/LICENSE.nxcomp
new file mode 100644
index 000000000..02ab0e272
--- /dev/null
+++ b/LICENSE.nxcomp
@@ -0,0 +1,90 @@
+Copyright (c) 2001,2010 NoMachine - http://www.nomachine.com/.
+Copyright (c) 2000,2003 Gian Filippo Pinzari
+
+NXCOMP library and NX extensions to X are copyright of NoMachine.
+Redistribution and use of this software is allowed according to the
+following terms:
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License Version 2, and
+not any other version, as published by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTA-
+BILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, you can request a copy to NoMachine
+or write to the Free Software Foundation, Inc., 59 Temple Place, Suite
+330, Boston, MA  02111-1307 USA
+
+==============================================================================
+
+Parts of this software are derived from DXPC project. These copyright
+notices apply to original DXPC code:
+
+Redistribution and use in source and binary forms are permitted provi-
+ded that the above copyright notice and this paragraph are duplicated
+in all such forms.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+Copyright (c) 1995,1996,2000,2006 Brian Pane
+Copyright (c) 1996,1997 Zachary Vonler and Brian Pane
+Copyright (c) 1999 Kevin Vigor and Brian Pane
+<crossed-out>Copyright (c) 2000,2006 Gian Filippo Pinzari and Brian Pane</crossed-out>
+
+All rights reserved.
+
+==============================================================================
+
+Update 2015-05-21 on the nature of the original DXPC license: The
+original DXPC code used to be available under a license which failed to
+explicitly grant the permission to modify, but was later retroactively
+re-licensed under the 2-clause BSD license (see
+README.on-retroactive-DXPC-license for the copyright owners' statements;
+see <https://bugs.debian.org/784565> for more details).
+
+In the course of discussion, it also became evident that Gian Filippo
+Pinzari never participated in any of the official DXPC releases, but
+rather worked on the forked code on the NoMachine side. Thus, we
+crossed-out his name in the above copyright notice and moved him to the
+top list of copyright holders associated with the GPL-2 re-licensing done
+by NoMachine.
+
+Thus, the version of DXPC where NXCOMP got forked from (most likely some
+DXPC version between release 3.7.0 and release 3.8.0) can be considered
+as BSD-2-clause, as quoted below:
+
+Copyright (c) 1995,1996 Brian Pane
+Copyright (c) 1996,1997 Zachary Vonler and Brian Pane
+Copyright (c) 1999-2002 Kevin Vigor and Brian Pane
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
diff --git a/nx-X11/LICENSE b/nx-X11/LICENSE
deleted file mode 100644
index 32cb52b45..000000000
--- a/nx-X11/LICENSE
+++ /dev/null
@@ -1,26 +0,0 @@
-Copyright (c) 2001, 2011 NoMachine - http://www.nomachine.com/.
-
-NX-X11 and NX extensions to X are copyright of NoMachine.
-
-Redistribution and use of this software is allowed according to the
-following terms:
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License Version 2, and
-not any other version, as published by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTA-
-BILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, you can request a copy to NoMachine
-or write to the Free Software Foundation, Inc., 59 Temple Place,
-Suite 330, Boston, MA  02111-1307 USA
-
-Parts of this software are derived from XFree86 and X.org projects.
-Other copyrights and the MIT/X11 license applies to different sources.
-Please check the applicable copyrights in each file or subdirectory.
-
-All rights reserved.
diff --git a/nx-X11/programs/Xserver/hw/nxagent/LICENSE b/nx-X11/programs/Xserver/hw/nxagent/LICENSE
deleted file mode 100644
index 8446e6f55..000000000
--- a/nx-X11/programs/Xserver/hw/nxagent/LICENSE
+++ /dev/null
@@ -1,26 +0,0 @@
-Copyright (c) 2001, 2011 NoMachine - http://www.nomachine.com/.
-
-NXAGENT and NX extensions to X are copyright of NoMachine.
-
-Redistribution and use of this software is allowed according to the
-following terms:
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License Version 2, and
-not any other version, as published by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTA-
-BILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, you can request a copy to NoMachine
-or write to the Free Software Foundation, Inc., 59 Temple Place,
-Suite 330, Boston, MA  02111-1307 USA
-
-Parts of this software are derived from XFree86 and X.org projects.
-Other copyrights and the MIT/X11 license applies to different sources.
-Please check the applicable copyrights in each file or subdirectory.
-
-All rights reserved.
diff --git a/nxcomp/LICENSE b/nxcomp/LICENSE
deleted file mode 100644
index 02ab0e272..000000000
--- a/nxcomp/LICENSE
+++ /dev/null
@@ -1,90 +0,0 @@
-Copyright (c) 2001,2010 NoMachine - http://www.nomachine.com/.
-Copyright (c) 2000,2003 Gian Filippo Pinzari
-
-NXCOMP library and NX extensions to X are copyright of NoMachine.
-Redistribution and use of this software is allowed according to the
-following terms:
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License Version 2, and
-not any other version, as published by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTA-
-BILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, you can request a copy to NoMachine
-or write to the Free Software Foundation, Inc., 59 Temple Place, Suite
-330, Boston, MA  02111-1307 USA
-
-==============================================================================
-
-Parts of this software are derived from DXPC project. These copyright
-notices apply to original DXPC code:
-
-Redistribution and use in source and binary forms are permitted provi-
-ded that the above copyright notice and this paragraph are duplicated
-in all such forms.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-Copyright (c) 1995,1996,2000,2006 Brian Pane
-Copyright (c) 1996,1997 Zachary Vonler and Brian Pane
-Copyright (c) 1999 Kevin Vigor and Brian Pane
-<crossed-out>Copyright (c) 2000,2006 Gian Filippo Pinzari and Brian Pane</crossed-out>
-
-All rights reserved.
-
-==============================================================================
-
-Update 2015-05-21 on the nature of the original DXPC license: The
-original DXPC code used to be available under a license which failed to
-explicitly grant the permission to modify, but was later retroactively
-re-licensed under the 2-clause BSD license (see
-README.on-retroactive-DXPC-license for the copyright owners' statements;
-see <https://bugs.debian.org/784565> for more details).
-
-In the course of discussion, it also became evident that Gian Filippo
-Pinzari never participated in any of the official DXPC releases, but
-rather worked on the forked code on the NoMachine side. Thus, we
-crossed-out his name in the above copyright notice and moved him to the
-top list of copyright holders associated with the GPL-2 re-licensing done
-by NoMachine.
-
-Thus, the version of DXPC where NXCOMP got forked from (most likely some
-DXPC version between release 3.7.0 and release 3.8.0) can be considered
-as BSD-2-clause, as quoted below:
-
-Copyright (c) 1995,1996 Brian Pane
-Copyright (c) 1996,1997 Zachary Vonler and Brian Pane
-Copyright (c) 1999-2002 Kevin Vigor and Brian Pane
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer in the
-  documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
diff --git a/nxcompext/LICENSE b/nxcompext/LICENSE
deleted file mode 100644
index 12eb6576c..000000000
--- a/nxcompext/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-Copyright (c) 2001, 2009 NoMachine - http://www.nomachine.com/.
-
-NXCOMPEXT library and NX extensions to X are copyright of NoMachine.
-Redistribution and use of this software is allowed according to the
-following terms:
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License Version 2, and
-not any other version, as published by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTA-
-BILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, you can request a copy to NoMachine
-or write to the Free Software Foundation, Inc., 59 Temple Place,
-Suite 330, Boston, MA  02111-1307 USA
-
-All rights reserved.
diff --git a/nxcompshad/LICENSE b/nxcompshad/LICENSE
deleted file mode 100644
index 2c7f95a2d..000000000
--- a/nxcompshad/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 2001, 2011 NoMachine - http://www.nomachine.com/.
-
-NXCOMPSHAD and NX extensions to X are copyright of NoMachine.
-
-Redistribution and use of this software is allowed according to the
-following terms:
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License Version 2, and
-not any other version, as published by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTA-
-BILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, you can request a copy to NoMachine
-or write to the Free Software Foundation, Inc., 59 Temple Place,
-Suite 330, Boston, MA  02111-1307 USA
-
-All rights reserved.
diff --git a/nxproxy/LICENSE b/nxproxy/LICENSE
deleted file mode 100644
index 64522ca4c..000000000
--- a/nxproxy/LICENSE
+++ /dev/null
@@ -1,36 +0,0 @@
-Copyright (c) 2001, 2011 NoMachine - http://www.nomachine.com/.
-
-NXPROXY and NX extensions to this software are copyright of NoMachine.
-Redistribution and use of this software is allowed according to the
-following terms:
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License Version 2, and
-not any other version, as published by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-
-Parts of this software are derived from DXPC project. These copyright
-notices apply to original DXPC code:
-
-Redistribution and use in source and binary forms are permitted provided
-that the above copyright notice and this paragraph are duplicated in all
-such forms.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-Copyright (c) 1995,1996 Brian Pane
-Copyright (c) 1996,1997 Zachary Vonler and Brian Pane
-Copyright (c) 1999 Kevin Vigor and Brian Pane
-Copyright (c) 2000,2001 Gian Filippo Pinzari and Brian Pane
-
-All rights reserved.
-- 
cgit v1.2.3


From b38f01092ab65f41fc0a525c46c874a228676f71 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 5 Jul 2016 10:40:11 +0200
Subject: NoMachine documentation files: Move to doc/_attic_/ folder.

---
 .../NoMachine_documentation_files/nx-X11_CHANGELOG | 1085 ++++
 .../nx-X11_programs_Xserver_hw_nxagent_CHANGELOG   | 6359 ++++++++++++++++++++
 .../NoMachine_documentation_files/nxcomp_CHANGELOG | 3778 ++++++++++++
 .../NoMachine_documentation_files/nxcomp_README    |   21 +
 .../nxcomp_README-IPAQ                             |   21 +
 .../nxcompext_CHANGELOG                            |  806 +++
 .../NoMachine_documentation_files/nxcompext_README |   15 +
 .../nxcompshad_CHANGELOG                           |  404 ++
 .../nxproxy_CHANGELOG                              |  216 +
 .../NoMachine_documentation_files/nxproxy_README   |   14 +
 .../nxproxy_README-IPAQ                            |   27 +
 .../nxproxy_README-VALGRIND                        |   39 +
 nx-X11/CHANGELOG                                   | 1085 ----
 nx-X11/programs/Xserver/hw/nxagent/CHANGELOG       | 6359 --------------------
 nxcomp/CHANGELOG                                   | 3778 ------------
 nxcomp/README                                      |   21 -
 nxcomp/README-IPAQ                                 |   21 -
 nxcompext/CHANGELOG                                |  806 ---
 nxcompext/README                                   |   15 -
 nxcompshad/CHANGELOG                               |  404 --
 nxproxy/CHANGELOG                                  |  216 -
 nxproxy/README                                     |   14 -
 nxproxy/README-IPAQ                                |   27 -
 nxproxy/README-VALGRIND                            |   39 -
 24 files changed, 12785 insertions(+), 12785 deletions(-)
 create mode 100644 doc/_attic_/NoMachine_documentation_files/nx-X11_CHANGELOG
 create mode 100644 doc/_attic_/NoMachine_documentation_files/nx-X11_programs_Xserver_hw_nxagent_CHANGELOG
 create mode 100644 doc/_attic_/NoMachine_documentation_files/nxcomp_CHANGELOG
 create mode 100644 doc/_attic_/NoMachine_documentation_files/nxcomp_README
 create mode 100644 doc/_attic_/NoMachine_documentation_files/nxcomp_README-IPAQ
 create mode 100644 doc/_attic_/NoMachine_documentation_files/nxcompext_CHANGELOG
 create mode 100644 doc/_attic_/NoMachine_documentation_files/nxcompext_README
 create mode 100644 doc/_attic_/NoMachine_documentation_files/nxcompshad_CHANGELOG
 create mode 100644 doc/_attic_/NoMachine_documentation_files/nxproxy_CHANGELOG
 create mode 100644 doc/_attic_/NoMachine_documentation_files/nxproxy_README
 create mode 100644 doc/_attic_/NoMachine_documentation_files/nxproxy_README-IPAQ
 create mode 100644 doc/_attic_/NoMachine_documentation_files/nxproxy_README-VALGRIND
 delete mode 100644 nx-X11/CHANGELOG
 delete mode 100644 nx-X11/programs/Xserver/hw/nxagent/CHANGELOG
 delete mode 100644 nxcomp/CHANGELOG
 delete mode 100644 nxcomp/README
 delete mode 100644 nxcomp/README-IPAQ
 delete mode 100644 nxcompext/CHANGELOG
 delete mode 100644 nxcompext/README
 delete mode 100644 nxcompshad/CHANGELOG
 delete mode 100644 nxproxy/CHANGELOG
 delete mode 100644 nxproxy/README
 delete mode 100644 nxproxy/README-IPAQ
 delete mode 100644 nxproxy/README-VALGRIND

(limited to 'nxcomp')

diff --git a/doc/_attic_/NoMachine_documentation_files/nx-X11_CHANGELOG b/doc/_attic_/NoMachine_documentation_files/nx-X11_CHANGELOG
new file mode 100644
index 000000000..ffbbe0a61
--- /dev/null
+++ b/doc/_attic_/NoMachine_documentation_files/nx-X11_CHANGELOG
@@ -0,0 +1,1085 @@
+ChangeLog:
+
+nx-X11-3.5.0-2
+
+- Fixed TR0202420. XKB utility functions wrote out of bounds.
+
+- Upgraded RandR server extension to version 1.2.
+
+nx-X11-3.5.0-1
+
+- Opened the 3.5.0 branch based on nx-X11-3.4.0-4.
+
+- Updated copyright to year 2011.
+
+nx-X11-3.4.0-4
+
+- Fixed TR06H02359. Removed compiler warnings.
+
+nx-X11-3.4.0-3
+
+- Updated copyright to year 2010.
+
+nx-X11-3.4.0-2
+
+- Fixed TR04G02208. Added a path to rgb file.
+
+nx-X11-3.4.0-1
+
+- Opened the 3.4.0 branch based on nx-X11-3.3.0-7.
+
+- Updated copyright to year 2009.
+
+nx-X11-3.3.0-7
+
+- Fixed TR08G02257. The maximum client condition was reached because
+  available fd exhausted. This bug was caused by a function in font
+  library not closing the file before a return on error breaking the
+  flow of normal execution.
+
+- Fixed TR06G02225. The implementation of Xvprintf() has been reviewed
+  to work on more platforms. Previous implementation caused a failure
+  in the build of keyboard map on some platform like Solaris 8 and 9.
+
+nx-X11-3.3.0-6
+
+- Fixed TR03G02198. Reimplemented Xvprintf() in Xserver/os to handle
+  the case in which vsnprintf returned -1.
+
+- Returning from _XSeqSyncFunction() and _XReply() if an I/O error is
+  detected.
+
+nx-X11-3.3.0-5
+
+- Fixed TR01G02163. Signals need to be blocked before the call to
+  fork() in the Popen() utility.
+ 
+- Fixed TR01G02164. Trapezoid data need to be validated before use.
+  This issue was the same of CVE-2007-2437.
+
+nx-X11-3.3.0-4
+
+- Enabled the code resetting the Xlib buffer if an IO error occured.
+
+nx-X11-3.3.0-3
+
+- Fixed the search path for the XKB base directory.
+
+nx-X11-3.3.0-2
+
+- Fixed TR10F02116. The X11 agent could enter an indefinite wait state
+  if connection to X display is broken and libX11 output buffer is not
+  empty.
+
+nx-X11-3.3.0-1
+
+- Opened the 3.3.0 branch based on nx-X11-3.2.0-2.
+
+nx-X11-3.2.0-2
+
+- Imported patch fixing issues from  X.Org security advisory, June
+  11th, 2008: Multiple vulnerabilities in X server extensions. CVE
+  IDs: CVE-2008-1377, CVE-2008-1379, CVE-2008-2360, CVE-2008-2361,
+  CVE-2008-2362.
+
+nx-X11-3.2.0-1
+
+- Opened the 3.2.0 branch based on nx-X11-3.1.0-6.
+
+nx-X11-3.1.0-6
+
+- Modified Xserver Imakefile to link the Xfixes library.
+
+nx-X11-3.1.0-5
+
+- Disabled the terminate action, just in case the TerminateServer
+  symbol is binded to a non default key sequence.
+
+nx-X11-3.1.0-4
+
+- Imported patch fixing issues from  X.Org security advisory, January
+  17th, 2008: Multiple vulnerabilities in the X server.  CVE IDs:
+  CVE-2007-5760    CVE-2007-5958    CVE-2007-6427   CVE-2007-6428
+  CVE-2007-6429    CVE-2008-0006.
+
+nx-X11-3.1.0-3
+
+- Moved a variable definition placed in _mesa_make_current().
+
+nx-X11-3.1.0-2
+
+- Fixed TR10E01924. A crash could occur in _mesa_make_current().
+
+- Initialized after_ret variable in _XcmsGetProperty().
+
+nx-X11-3.1.0-1
+
+- Opened the 3.1.0 branch based on nx-X11-3.0.0-37.
+
+nx-X11-3.0.0-37
+
+- Changed the Xserver Imakefile to link against Xcomposite on the
+  Cygwin platform too.
+
+nx-X11-3.0.0-36
+
+- Fixed TR07E01806. Modified host.def to build GLX code with symbol
+  __GLX_ALIGN64 defined on Solaris platform.
+
+nx-X11-3.0.0-35
+
+- Flush explicitly the NX link before entering the select() in the
+  WaitForReadable() and WaitForWritable() routines.
+
+nx-X11-3.0.0-34
+
+- Changed the agent Imakefile to link to the Xcomposite library.
+
+nx-X11-3.0.0-33
+
+- Fix the NX_TRANS_WAKEUP stuff in WaitForSomething() to not over-
+  ride a valid timeout.
+
+- Check if the requesting client is gone in the XFixes functions
+  sending the cursor events.
+
+nx-X11-3.0.0-32
+
+- Define DDXOSVERRORF and DDXOSFATALERROR symbols on Sun.
+
+- Changed the copyright attribution from Medialogic to NoMachine.
+
+nx-X11-3.0.0-31
+
+- Make SmartScheduleStopTimer() visible outside Xserver/os/utils.c
+  so that it can be called by the agent. Export the declaration in
+  dixstruct.h. 
+
+nx-X11-3.0.0-30
+
+- The OsVendorVErrorFFatal flag is set to 1 if the function pointed
+  by OsVendorVErrorFProc is called due to a fatal error.
+
+- Give the possibility to the agent to redirect the standard error
+  during a Popen() or a System() by setting the OsVendorStartRedir-
+  ectErrorFProc and OsVendorEndRedirectErrorFProc function pointers.
+
+nx-X11-3.0.0-29
+
+- Changed the default message printed on a fatal server error. The
+  new message is:
+
+  Error: Aborting session with 'Error text...'.
+
+- Hacked LogVWrite() to force all fatal error messages to have an
+  uppercase initial. Also remove the trailing newline and the full-
+  stop, if present.
+
+nx-X11-3.0.0-28
+
+- Corrected the typos in the ChangeLog.
+
+nx-X11-3.0.0-27
+
+- Fixed the cleanup of the X_RenderCompositeText16 padding bytes.
+
+- More code cleanup in the NX changes to the Xrender library.
+
+- Changed host.def to build the freetype and fontconfig libraries
+  if the agent server is also built. Freetype is built as a shared
+  library: this avoids the link error on 64 bit platforms.
+
+nx-X11-3.0.0-26
+
+- Applied the following security patches, from the X.Org security
+  advisory, April 3rd, 2007 "Multiple vulnerability in X server,
+  libXfont and libX11":
+
+  xorg-xserver-1.2.0-xcmisc.diff
+  xorg-libXfont-1.2.7-bdf-fontdir.diff
+  xorg-libX11-1.1.1-xinitimage.diff
+
+nx-X11-3.0.0-25
+
+- Added the missing *.X.original file for ChkIfEv.c and Xlib.h.
+
+nx-X11-3.0.0-24
+
+- Changed Xrender to clean up the padding bytes in XRenderComposite-
+  Text functions.
+
+- Added function XRenderCleanGlyphs() cleaning the padding bytes in
+  the data section of RenderAddGlyphs requests.
+
+nx-X11-3.0.0-23
+
+- Removed the additional parameter from the call to NXTransFlush()
+  in _XReply().
+
+- Call NXTransExit() on AbortServer() (called by FatalError()) to
+  give the proxy a chance to shut down the NX transport.
+
+nx-X11-3.0.0-22
+
+- Moved the replacement of XCheckIfEvent() ChkIfEv.c with the name
+  XCheckIfEventNoFlush().
+
+nx-X11-3.0.0-21
+
+- Set BUFSIZE to 8192 bytes. While the output buffer size can be
+  configured by setting the XLIBBUFFERSIZE in the environment (see
+  OpenDis.c), this constant is still used when reading from the
+  socket.
+
+nx-X11-3.0.0-20
+
+- If set, the handler pointed by _NXDisplayWriteFunction is called
+  after that more data is written to the display connection.
+
+nx-X11-3.0.0-19
+
+- Added a RejectWellKnownSockets() stub to make possible to compile
+  the agent when the NX transport is disabled.
+
+- Added more useful logs to _XWaitForWritable().
+
+nx-X11-3.0.0-18
+
+- Changed Imakefile of X11 and Xserver in order to build nxcompshad
+  just before the NX agent server.
+
+- Changed Imakefile in Xserver to add NXdamage.o to NXAGENTOBJS.
+
+nx-X11-3.0.0-17
+
+- Changed host.def in order to build Xdamage and Xrandr libraries.
+
+- Changed host.def in order not to build NXWin.
+
+nx-X11-3.0.0-16
+
+- Changed host.def in order to build Xtst as a shared library.
+
+nx-X11-3.0.0-15
+
+- Changes to comply with nxcompshad library.
+
+- Changed configuration to statically build Xtst library.
+
+- Restored parser directory under Xserver/hw/xfree86.
+
+nx-X11-3.0.0-14
+
+- Changed the LICENSE file to state that the software is only made
+  available under the version 2 of the GPL.
+
+- Added file COPYING.
+
+- In nx-X11/programs and nx-X11/programs/Xserver/hw/xfree86, removed
+  files and directories not needed to build servers.
+
+nx-X11-3.0.0-13
+
+- Changes aimed to link servers with static versions of Xdmcp and Xau
+  libraries.
+
+nx-X11-3.0.0-12
+
+- Added references to implented FR in the ChangeLog.
+
+- Removed nx-X11/fonts and nx-X11/doc directories. They are not needed
+  for building the NX components.
+
+nx-X11-3.0.0-11
+
+- Updated the copyright notices to year 2007.
+
+nx-X11-3.0.0-10
+
+- Applied the following security patches:
+
+   x11r6.9.0-cidfonts.diff 
+   x11r6.9.0-dbe-render.diff
+   x11r6.9.0-geteuid.diff
+   x11r6.9.0-mitri.diff
+   x11r6.9.0-setuid.diff
+
+nx-X11-3.0.0-9
+
+- Merged the NX changes to X11 with the X11R6.9.0 version of X.org.
+
+nx-X11-3.0.0-8
+
+- Changes to build Xshadow library when building X11.
+
+- Changes to Xserver Imakefile to link Xshadow library.
+
+- Changes to host.def in order to build on old distributions.
+
+nx-X11-3.0.0-7
+
+- Imported changes up to nx-X11-2.1.0-2
+
+- Fixed TR08D01485. Updated rgb file paths validation in order to
+  support Ubuntu distribution.
+
+- Added Xtst to libraries to be linked by nxagent.
+
+- Changed Xpm Imakefile to build a shared library on Solaris.
+
+- Fixed build error on Solaris in xtrans.
+
+- Changed host.def not to build Xnest server.
+
+- Changed Xserver Imakefile to link nxaccess library.
+
+nx-X11-3.0.0-6
+
+- Added the path of nxaccess library to the server link command.
+
+nx-X11-3.0.0-5
+
+- Implemented FR10C01079 and FR10C01080. The merge of NX changes to
+  the X.org code is complete.
+
+- Merged changes in config/cf. The NX-*.def files have been dismissed.
+  Main platform dependent configurations have been moved to host.def.
+
+- Removed *.reference files from config/cf.
+
+- Fixed compilation for Cygwin platform.
+
+nx-X11-3.0.0-4
+
+- Imported all changes up to nx-X11-2.0.0-32.
+
+- Cleaned up lib/zlib directory.
+
+- Added missing file programs/Xserver/os/utils.c.NX.original.
+
+- Updated the copyright notice to year 2006.
+
+- The pointer to the display buffer is reset after an I/O error.
+  This prevents leaving the buffer in an inconsistent state if the
+  error occurs inside _XFlush().
+
+- Removed the modifications to the Xrender library. The cleanup of
+  the padding bytes is now performed by the NX transport.
+
+- NX uses the updated ZLIB from its build tree, so Imake.tmpl will
+  now assume that the platform as ZLIB unless otherwise stated.
+
+- The path of the SecurityPolicy file is searched and validated at
+  runtime.
+
+- Added the _X11TransSocketProxyConnInfo() function to Xtranssock.c
+  It returns the pointer to the XtransConnInfo private, if it is a
+  valid _NXProxyConnInfo structure.
+
+- The above function is used by OpenDis.c to detect if the NX trans-
+  port was requested on the display and avoid spurious error messa-
+  ges in the case of a connection failure.
+
+- Added NXmiwindow.o to the NXAGENTOBJS in the Xserver's Imakefile
+  and imported NXmiwindow.c in nxagent. This allows us to check the
+  pointer to the pOldClip region in miSetShape() before going on
+  freeing it.
+
+- The path of the XKB base directory and of the xkbcomp comand is
+  validated at runtime.
+
+- Also added a check to verify the validity of the rgb file path.
+
+- Added NXresource.o to NXAGENTOBJS in the Imakefile of nxagent. We
+  need this to a assign a resource to the pixmaps and other server
+  objects which need to be enumerated at reconnection. Some objects,
+  being created by the X server and not by the clients, don't pass
+  through the resource assignment process operated by the dix. To
+  ensure that all objects get a resource, we add a resource at the
+  time the object is created and temporarily assign the resource to
+  the server client. If the dix later assigns the resource to a va-
+  lid client, the resource is removed from the server client's list.
+  
+- The display block handler registered by the client is called in
+  WaitForReadable() and WaitForWritable() before every select(),
+  not only upon entering the function. The reason is that more
+  data can be possibly produced for the NX link by the proxy it-
+  self and, when setting the flush policy to deferred, the client
+  may not have the chance of flushing the NX link.
+
+- Fixed a bug in XkbUseExtension() that caused Xlib to query the
+  presence of the XKEYBOARD extension multiple times. This partial-
+  ly implents the FR01D01275. The complete implementation required
+  modifications to the X11 agent, implemented in nxagent-2.0.0-33.
+
+- Updated to comply with the new NXTransFlush() interface.
+
+- Both nxwin and nxagent now read the X authority file by using an
+  fopen() instead of the system command 'cat'.
+
+- Removed NXmiwindow.o from the NXAGENTOBJ list. The agent will now
+  use the original miwindow.c.
+
+- Added some additional logs in Xtranssock.c to follow the creation
+  and removal of the X server's Unix listener.
+
+- Avoided the sleep of 5 seconds forced by Xtransutil.c if the dir-
+  ectory where the Unix listener is created is not owned by root.
+  This sleep is not executed on Cygwin (where the X socket can be
+  hardly owned by root) but may delay the startup of the agent if
+  the user chose a different NX_TEMP directory. Furthermore, it is
+  unclear what real benefits such sleeps are intended to bring to
+  the security of the X server. This can be controlled by defining
+  the NX_TRANS_SLEEP directive in Xserver/os/Imakefile.
+
+- Added NXmiexpose.o to the NXAGENTOBJ.
+
+- Ensured that _X11TransSocketCloseConnInfo() now initiates the NX
+  shutdown by calling NXTransClose().
+
+- Corrected a misplaced #else that made SocketUNIXConnect() skip a
+  block if the connection was not to the NX transport.
+
+- Updated to comply with the new NX function prototypes introduced
+  in nxcomp-2.0.0-31.
+
+- Moved the most important Xtranssock.c modifications into separate
+  functions.
+
+- Ensured that the modifications enabling the internal connections
+  to the proxy are compiled only when the TRANS_CLIENT directive is
+  defined.
+
+- Solved a bug that prevented the X11 socket to be deleted at the X
+  server shutdown. This needs further tests.
+
+- Added nxcompext to the link of nxagent, now that the dependency
+  of libX11 from nxcompext is removed.
+
+- Improved the Xtranssock routines to never loop through the array
+  of connection info.
+
+- Added a congestion flag to the connection info structure and a
+  function querying the transport and reporting if a change in the
+  congestion state has occurred. The code is currently not enabled,
+  because instead of polling the transport, we let the proxy notify
+  the changes in congestion state by using the callback. The code
+  can be used in future to extend the library, for example, by add-
+  ing some counters tracking the bandwidth usage of the socket con-
+  nection, so that we can make the congestion notifications work
+  even with a plain X11 connection.
+
+- Profiled the routines in XlibInt.c to reduce the number of calls
+  to the error predicate function provided by the client.
+
+- Fixed the nxcompext build problem that caused make World to fail.
+
+- Added a 'CONF' target to the X11 and Xext Imakefiles so that the
+  configure script is not run if the config.status exists.
+
+- Added the _NXDisplayBlockHandler hook. The function is called by
+  Xlib before blocking. The parameter says if Xlib is going to wait
+  for more input or because it needs to write to the display  socket.
+  The client can use the hook to perform any internal operation that
+  may require some time to complete. The user, though, should not
+  try to read or write to the display inside the callback routine.
+
+- Removed the outdated NX_TRANS_PROCESS, NX_TRANS_THREAD and NX_TR-
+  ANS_INCLUDE defines.
+
+- Reverted the lib/Xext Imakefile to the original XF86 version and
+  moved the build of the nxcompext library among the libX11 depend-
+  encies.
+
+- Corrected the lib/X11 Imakefile so that a new build of nxcomp and
+  nxcompext is not attempted if the libraries are up-to-date.
+
+- Removed the unused display buffer and image cleanup functions.
+  
+- Reverted the PutImage.c file to the original XF86 version.
+  
+- Added the _NXDisplayErrorPredicate function in XlibInt.c. It is
+  actually a pointer to a function called whenever Xlib is going to
+  perform a network operation. If the function returns true, the
+  call will be aborted and Xlib will return the control to the ap-
+  plication. It is up to the application to set the XlibDisplayIO-
+  Error flag after the _NXDisplayErrorPredicate returns true. The
+  function can be used to activate additional checks, besides the
+  normal failures detected by Xlib on the display socket. For exam-
+  ple, the application can set the funciton to verify if an inter-
+  rupt was received or if any other event occurred mandating the
+  end of the session.
+
+- Modified XIfEvent(), XMaskEvent() and XPeekIfEvent() to check the
+  _NXDisplayErrorPredicate function and return immediately if the
+  function returns true.
+
+- Modified _XWaitForReadable() to never enter the loop if the dis-
+  play is broken.
+
+- Corrected a make problem on Windows that caused the nxcomp and
+  nxcompext libraries to be referred with the wrong name, with the
+  result that a new configure and make was attempted at each build
+  attempt.
+
+- Merged all the changes to os, Xext, xkb, dix.
+
+- Changed host.def to build only the agent server.
+
+- Merged the changes to Xtranssock.c
+
+nx-X11-3.0.0-3
+
+- Merged the changes to lib/X11. Restored original PutImage.c and
+  ClDisplay.c files.
+
+nx-X11-3.0.0-2
+
+- Created a directory named 'reference' to keep files that are chan-
+  ged during the development of nx-X11 since the 1.5.0-16 to 2.0.0-32
+  version. These files will be removed as long as the differences are
+  merged to the 3.0.0 version. When all differences are merged, this
+  directory will be removed.
+
+nx-X11-3.0.0-1
+
+- Opened the 3.0.0 branch based on the nx-X11-2.0.0-9. The 3.0.0
+  branch will now support the migration toward the X.org tree. Due
+  to time concerns, the 2.0.0 branch is going to be based on the
+  same nx-X11 as the 1.5.0.
+
+nx-X11-2.0.0-9
+
+- Modified the agent link arguments to explicitly include the NX
+  libraries.
+
+- Disabled the Xinerama extension to avoid further clashes with
+  the redefinition of GC in Xlib.
+
+- Added os/libos.a at the end of the agent link.
+
+nx-X11-2.0.0-8
+
+- Moved the declarations of _NXEnable* and related structures from
+  Xlibint.h to NXlibint.h.  
+
+- Added provision for building the agent. This can be controlled by
+  setting NXAgentServer to YES in host.def.
+
+- Setting the NXUpgradeAgentServer variable to YES in the host.def
+  file will make the agent assume that it is being built in the new
+  environment. This variable is normally unset when building in the
+  1.5.0 tree.
+
+nx-X11-2.0.0-7
+
+- Fixed a problem on AMD64 due to the size of the area pointed by
+  the argument of _X11TransBytesReadable(). BytesReadable_t is long,
+  at least on Linux, while the ioctl() requires a pointer to an int.
+  The original _X11TransBytesReadable() function simply calls the
+  ioctl() by passing the pointer that is provided. NXTransReadable(),
+  instead, was correctly returning the value assuming a pointer to
+  a long, but this crashes some applications, among them xterm. Now
+  NXTransReadable() follows the same schema of the ioctl() call and
+  stores the result assuming a pointer to an int.
+
+- Removed the outdated NX_TRANS_PROCESS and NX_TRANS_THREAD code.
+
+nx-X11-2.0.0-6
+
+- Made xterm work with the NX transport. This required small changes
+  to the Xt toolkit's and the xterm's files to let them use the NX
+  aware select(). This is useful to test the NX transport until the
+  nxagent server is integrated.
+
+- When the transport is gone _X11TransSocketBytesReadable() returns
+  EPIPE. This makes the client become aware of the closure of the
+  connection.
+
+- Added a call to NXTransDestroy() in XCloseDisplay().
+
+- The exit() function in XlibInt.c causes a call to NXTransExit().
+
+- Merged changes to dix/pixmap.c, xkb/xkbDflts.h, mi/Imakefile.
+
+- Removed unneeded changes and files containing patches already in
+  the latest X.org distribution: dix/dispatch.c, fb/fbcompose.c, fb/
+  fbgc.c, xkb/ddxList.c, font/fontfile/dirfile.c, font/fontfile/
+  encparse.c, font/fontfile/fontfile.c, font/FreeType/fttools.c,
+  Xrender/FillRect.c, Xrender/Picture.c.
+
+nx-X11-2.0.0-5
+
+- Changes to the lib/X11/Imakefile to cleanly build the tree. This
+  is obtained by creating a link to the Xcomp library in exports/lib
+  without having to modify the programs' Imakefiles.
+
+- Finished merging the NX changes in the lib/X11 files.
+
+- Merged the CHANGELOG with the one from the 1.5.0 tree.
+
+nx-X11-2.0.0-4
+
+- Merged the NX changes in most Xtrans and lib/X11 files.
+
+nx-X11-2.0.0-3
+
+- Temporarily disabled the use of the MMX extensions in the Xserver's
+  fb code to successfully compile with GCC 4.
+
+nx-X11-2.0.0-2
+
+- Imported the *.NX.reference and *.XF86.reference files that will
+  be needed for the merge. These files are the *.original from the
+  1.5.0 tree. They will be removed as long as the merge advances.
+
+nx-X11-2.0.0-1
+
+- Created the 2.0.0 branch based on X.org the 6.8.99.16 snapshot.
+
+nx-X11-1.5.0-16
+
+- Added the missing *.XF86.original and *.NX.original files.
+
+nx-X11-1.5.0-15
+
+- Made the nxagent server use select() instead of poll() on Solaris
+  so that it can leverage the new NX transport.
+
+- Moved the NXTransFlush() call to _XReply().
+
+nx-X11-1.5.0-14
+
+- Added the 'synchronous' parameter in the _XWaitForReadable() call
+  to NXTransFlush().
+
+nx-X11-1.5.0-13
+
+- Removed the log entry in XlibInt.c on calling the NXTransFlush().
+
+nx-X11-1.5.0-12
+
+- Changed XlibInt.c and utils.c to call NXTransExit().
+
+nx-X11-1.5.0-11
+
+- Changed XlibInt.c to comply with the new NXTransFlush() interfa-
+  ce introduced in nxcomp-1.5.0-42.
+
+- Cosmetic changes to messages printed for debug.
+
+nx-X11-1.5.0-10
+
+- Ensured that all calls to _XIOError() are followed by a return.
+
+- Put exiting the client program in the case of an I/O error under
+  the control of the _NXContinueOnDisplayError flag. If set, the
+  I/O error routine will simply return, leaving to the application
+  the responsibility of checking the state of the XlibDisplayIOEr-
+  ror flag.
+
+- Added some checks whenever a read or write is performed on the X
+  connection, so that we can exit the I/O loop if the X channel is
+  gone. It is likely that more work will be needed when trying to
+  support XTHREADS enabled connections. This should not be a pro-
+  blem for now, as the default is still to quit the application un-
+  less the _NXContinueOnDisplayError flag is explicitly set.
+
+nx-X11-1.5.0-9
+
+- Removed the references to the cygipc library in NXWin. Now use the
+  cygserver daemon to provide the MIT-SHM extension.
+
+- Fixed an error in the UseCygIPC definition.
+
+- Changed the cygwin.cf file to avoid redefinition of the BuildGlxExt,
+  XWinServer and BuildGlxExt symbols.
+
+nx-X11-1.5.0-8
+
+- Added provision for deferred writes in the NX transport. When en-
+  tering _XWaitForReadable() we must ensure that data is flushed to
+  the proxy link.
+
+- Added the UseCygIPC define to NX-Cygwin.def.
+
+- Updated the NoMachine copyright notice on the modified files.
+
+nx-X11-1.5.0-7
+
+- Added the GLX extension in NX-Sun.def.
+
+- Added some more logs in WaitFor.c.
+
+nx-X11-1.5.0-6
+
+- Modified Xlibint.h and XlibInt.c to remove the _NXFlushSize para-
+  meter. New agents run the NX transport in-process, so we don't get
+  any benefit from increasing the display buffer size.
+
+- Modified NX-Darwin.def to not build the NXDarwin server. Since the
+  1.4.0 version the NXDarwin server is unsupported and the NX client
+  for the Mac requires that the Apple X server is installed.
+
+- Changed NX-Linux.def to avoid the warning due to "SharedLibGLw"
+  being not defined.
+
+nx-X11-1.5.0-5
+
+- Modified the Xserver Imakefile to link nxagent with FbPostFbLibs
+  and avoid including mfb/libmfb.a.
+
+- Added the GLX extension in NX-Linux.def. This provides unaccelera-
+  ted support in nxagent, with GLX operations translated into core X
+  protocol primitives.
+
+- Fixed x-X11/programs/Xserver/GL/dri/Imakefile to look in ../../hw/
+  /xfree86/os-support/bus for includes.
+
+nx-X11-1.5.0-4
+
+- Avoid calling NXTransSelect() if the transport is gone, so that we
+  don't have to wait until the timeout.
+
+- Added the "-fno-strict-aliasing" option to linux.cf when compiling
+  with a GCC version >= 4. In the words of Stefan Dirsch: "The opt-
+  ion, which is default since gcc 3.1, can result in wrong code when
+  the gcc warnings related to it are ignored. And as there are seve-
+  ral warnings in X11 related to it, it has been disabled for X11
+  from the beginning. This didn't change for gcc4, so it still needs
+  to be used."
+
+- Added more logs in XlibInt.c and utils.c. A warning is printed if
+  the SmartScheduler is initialized.
+
+nx-X11-1.5.0-3
+
+- Started integration of nxcomp with the X libraries. The Xtrans
+  code creates an internal connection to the nxcomp library instead
+  of a child proxy process.
+
+- Changed Xpoll.h and XlibInt.c to replace the standard Select
+  with a version giving NX a chance to check its own descriptors.
+
+- Implemented the NXTransReadVector() and the NXTransWriteVector()
+  functions to replace READV() and WRITEV().
+
+- Implemented memory-to-memory communication with the NX proxy by
+  making use of the NXTransAgent() interface.
+
+nx-X11-1.5.0-2
+
+- We think that the way LoadAuthorization() is working is wrong.
+  It doesn't reset the list of stored authorizations before reading
+  the new cookies. Our take is that if a new auth file is to be
+  read, the only cookies that are to be accepted are those that are
+  in the new file, not those in the file -plus- those that have
+  been in the file in the past. Furthermore, if the list can't be
+  read or it is empty, it should assume that it ignores which co-
+  okies are valid and thus it should disable any access. Your mile-
+  age can vary. A less draconian approach could be to leave the old
+  cookies if the file can't be read and remove them only if the
+  file is empty.
+
+  Adding the cookies without removing the old values for the same
+  protocol has an important implication. If an user shares the co-
+  okie with somebody and later wants to revoke the access to the
+  display, changing the cookie will not work. This is especially
+  important with NX. For security reasons, after reconnecting the
+  session to a different display, it is advisable to generate a
+  new set of cookies, but doing that it is useless with the current
+  code, as the old cookies are going to be still accepted. On the
+  same topic, consider that once an user has got access to the X
+  server, he/she can freely enable host authentication from any
+  host, so the safe behaviour should be to reset the host based
+  authenthication at least at reconnection, and keep as valid only
+  the cookies that are actually in the file. This behaviour would
+  surely break many applications, among them a SSH connection run
+  inside a NX session, as ssh -X reads the cookie for the display
+  only at session startup and does not read the cookies again
+  when the auth file is changed.
+
+  Another bug (or feature, depending on how you want to consider
+  it) is that if the authority file contains entries for different
+  displays (as it is the norm when the authority file is the default
+  .Xauthority in the user's home), the X server will match -any- of
+  the cookies, even cookies that are not for its own display. This 
+  means that you have to be careful when passing an authority file
+  to nxagent and maybe keep separate files for letting nxagent find
+  the cookie to be used to connect to the remote display and for
+  letting it find what cookies to accept. If the file is the same,
+  clients will be able to connect to nxagent with both the cookies.
+  This bug obviously affects any X server, also the real X server
+  running on the workstation, so it is common to see nxagent being
+  able to connect to the X server even if no cookie matches the
+  real display.
+
+- Added a check in lib/Xau/AuRead.c to prevent the fread() call to
+  be interrupted by SIGCHLD while reading the auth file. Due to the
+  way the old code worked, this could lead to the server enabling
+  local host access to the display. This problem had been identified
+  in the past. We just found that all the code dealing with reading
+  the auth file was affected. The code calls sigprocmask() to block
+  the signal (though it leaves some other calls unprotected) but the
+  SIGCHLD was not included in the set.
+
+- Added SIGCHLD to the set of signals that are blocked when reading
+  the authorization file.
+
+- As I was at it, I changed the path to the SecurityPolicy file. A
+  few Linux ditributors ship the file in $LIBDIR/xserver, a few only
+  in /etc/X11/xserver, most others in both places. It seems that
+  those who ship in $LIBDIR/xserver do also in /etc/X11 but the op-
+  posite is not true, so I switched to /etc/X11.
+
+nx-X11-1.5.0-1
+
+- Opened the 1.5.0 branch.
+
+nx-X11-1.4.1-2
+
+- Set parameter UseCygIPC on cygwin conf file in order to force the
+  build of MIT-SHM estension.
+
+- Removed some spurius object file.
+
+nx-X11-1.4.1-1
+
+- Opened the 1.4.1 branch.
+
+nx-X11-1.4.0-8
+
+- Changed DefaultFontPath and DefaultRGBDatabase in 
+  NX-Cygwin.def.
+
+nx-X11-1.4.0-7
+
+- Imported dispatch in nxdarwin package, in order to let
+  nxdarwin being able to detect new client connection.
+
+- Changed the Xpm Imakefile to make also .a static library
+  on Solaris. To link nxviewer and nxdestkop staticaly.
+
+nx-X11-1.4.0-6
+
+- XInput extension enabled on MacOSX.
+
+- Added some missing backup files of the original XFree86
+  package.
+
+nx-X11-1.4.0-5
+
+- Changed the mi Imakefile in order to let xfree86 servers use
+  the normal mi extension initialization for the XInput exten-
+  sion.
+
+- XInput extension enabled on Solaris.
+
+nx-X11-1.4.0-4
+
+- Removed the RejectWellKnownSocket for the cygwin and
+  MacOSX environments that doesn't use the Xtransport library.
+
+nx-X11-1.4.0-3
+
+- Changed the implementation of the reject method in the
+  Xtransport library, now close any new incoming connection 
+  immediately without reading or writing to it.
+
+nx-X11-1.4.0-2
+
+- Implemented a reject method in the Xtransport library,
+  this function accept and close every connection attempt,
+  on the specified listening socket.
+
+- Added the new function RejectWellKnownSocket to the os
+  connection code.
+  This function use the new transport reject function on
+  all listening socket.
+
+nx-X11-1.4.0-1
+
+- Opened the 1.4.0 branch.
+
+- Removed forgotten nxagent-1.3.2-20 directory.
+
+nx-X11-1.3.2-9
+
+- Prevents NX Darwin server going through the reset. On Darwin
+  we found that the it is not possible to get the correct key-
+  board layout unless it is set on the local machine, before
+  the NX session is started, by using xmodmap. As we set the
+  keyboard locally, we must prevent the X server to reset, or
+  we would loose any local configuration.
+
+nx-X11-1.3.2-8
+
+- Removed action associated to keysym XK_Terminate_Server. This
+  could cause agent to be terminated when pressing shift + back-
+  space if using the default US keyboard mapping.
+
+- Disabled the remaining debug logs in lib/X11/PutImage.c
+
+nx-X11-1.3.2-7
+
+- Fixed the wrong programs/Xserver/Imakefile in 1.3.2-6 package.
+
+nx-X11-1.3.2-6
+
+- Changed the define from NX_CLEAN_IN_PLACE to NX_CLEAN_INPLACE.
+  Definition of symbol is now placed in the Imakefile.
+
+- The new _NXEnableCleanInplace Xlib variable does control which
+  algorithm is used to clean the images. Setting NX_IMAGEINPLACE
+  in the environment will activate the in-place cleanup.
+
+- The default value of _NXEnableCleanInplace is -1. Leaving it to
+  a value <= 0 disables use of CleanInplace.
+
+nx-X11-1.3.2-5
+
+- Patch in config/cf/sun.cf. Fix for libfontconfig compilation
+  during gmake Everything on Solaris.
+
+- Patch in lib/X11/Imakefile. Fix for nxcomp compilation during
+  gmake World on Solaris.
+
+nx-X11-1.3.2-4
+
+- Image cleanup is now performed by using NXCleanInPlaceImage from
+  nxcompext. This function saves a buffer copy by cleaning the
+  padding bytes in the same buffer provided by the caller. Note that
+  to prevent memory violations in the case the image was allocated
+  in a static buffer, the function will temporarily redefine the
+  SIGSEGV handler. The former handler is restored before returning
+  to the caller. This can potentially affect some multithreaded
+  clients. Is to be decided if the function is safe enough to be
+  included in the production release.
+
+nx-X11-1.3.2-3
+
+- More debug logs in programs/Xserver/xkb/ddxLoad.c.
+
+nx-X11-1.3.2-2
+
+- Added NXmiwindow.o to NXAGENTOBJS in programs/Xserver/Imakefile.
+  File was not linked into the resulting nxagent. This solves the
+  problem of missing repaints in CDE and other Xt applications.
+
+nx-X11-1.3.2-1
+
+- Added some debug logs in programs/Xserver/xkb/ddxLoad.c. Function
+  XkbDDXCompileKeymapByNames is called by OpenOffice to read the
+  keyboard configuration whenever a drop-down menu is accessed. It
+  seem to always fail with the following error:
+
+  The XKEYBOARD keymap compiler (xkbcomp) reports:
+  > Error:            Can't find file "unknown" for geometry include
+  >                   Exiting
+  >                   Abandoning geometry file "default"
+
+- Opened the 1.3.2 development branch.
+
+nx-X11-1.3.1-12
+
+- Fixed a problem in xkb/ddxLoad.c on Solaris where Pclose was
+  always returning an error code despite the fact that command
+  was executed properly.
+
+nx-X11-1.3.1-11
+
+- Changed default GCC flags from '-O2 -fno-strength-reduce' to
+  -O3. No platform where NX is targeted is currently using a
+  GCC 2.x affected by the -fno-strength-reduce bug. Note also
+  that nxcomp is already compiled with -O3 since 1.1.1, so it
+  can be considered safe.
+
+nx-X11-1.3.1-10
+
+- Imported an updated fbcompose.c file from XFree86-4.3.99.902.
+  This fixes "uninitialized value" problems reported by Valgrind.
+
+- Fixed further buffer overflows by updating the following file
+  with recent versions coming from the XFree86-4.3.99.902 tree.
+
+  nx-X11/lib/font/fontfile/dirfile.c
+  nx-X11/lib/font/fontfile/encparse.c
+  nx-X11/lib/font/fontfile/fontfile.c
+
+- Fixed a possible buffer overflow in lib/font/FreeType/fttools.c.
+  Verified that the change is already in the XFree86 4.4.0 CVS.
+
+nx-X11-1.3.1-9
+
+- Fixed Xserver/Imakefile which was still referencing NXpixmap.o.
+
+nx-X11-1.3.1-8
+
+- Imported an updated fbgc.c from XFree86-4.3.99.902. This fixes
+  some minor problems reported by Valgrind.
+
+- A major problem was reported by Valgrind about reading after
+  the block allocated in fbCreatePixmap from AllocatePixmap. The
+  file pixmap.c has been modified so that 4 bytes are added to
+  the pixmap buffer at any new allocation. This quick hack should
+  solve the problem for both nxagent and the NXWin server. Further
+  investigation is planned for the next release.
+
+- Fixed Xtranssock.c to compile on Solaris where struct sigaction
+  doesn't have the sa_restorer member.
+
+nx-X11-1.3.1-5
+
+- Renamed the NX-sun.def configuration file to NX-Sun.def.
+
+- Renamed the non-standard NX_iPAQ_XServer and NX_Zaurus_XServer
+  symbols to NXiPAQXServer and NXZaurusXServer.
+
+- Added the missing sun.cf.XF86.original file in config/cf.
+
+- Added the missing empty file host.def.XF86.original in the
+  same directory.
+
+- Added initialization of sa.sa_mask when setting sigaction()
+  for SIGCHLD. The problem was reported by Valgrind running
+  nxagent.
+
+- Removed an unused block of code from WaitFor.c. The code had
+  been commented out in previous versions.
+
+- Removed the non-standard colon at the end of version in this
+  CHANGELOG.
+
+- Removed the spurious spaces in this CHANGELOG.
+
+nx-X11-1.3.1-4
+
+- Added a little workaround to the top Imakefile intended to
+  hide the makedepend warnings about non portable whitespaces
+  in sources.
+
+nx-X11-1.3.1-3
+
+- Fixed compilation problem with nxagent-1.3.1-13.
+
+nx-X11-1.3.1-2
+
+- Changes in NX-sun.def configuration file for Solaris to allow
+  compilation of the XKB extension. 
+
+nx-X11-1.3.1-1
+
+- Opened the 1.3.1 development branch.
+
+nx-X11-1.3.0-6
+
+- Original output buffer size in stock XFree86 is 2048. We try
+  to reduce context switches and help stream compression by
+  increasing the maximum size of the buffer 8192. _NXFlushSize
+  determines when the display buffer is actually flushed. It is
+  set by default to 4096 but agents should set it to 0 if they
+  want to disable early flush.
+
+- Added the _NXLostSequenceFunction function pointer to let NX
+  agents suppress the error message and modify the default Xlib
+  behaviour when out-of-order sequence numbers are received.
diff --git a/doc/_attic_/NoMachine_documentation_files/nx-X11_programs_Xserver_hw_nxagent_CHANGELOG b/doc/_attic_/NoMachine_documentation_files/nx-X11_programs_Xserver_hw_nxagent_CHANGELOG
new file mode 100644
index 000000000..0a82773f4
--- /dev/null
+++ b/doc/_attic_/NoMachine_documentation_files/nx-X11_programs_Xserver_hw_nxagent_CHANGELOG
@@ -0,0 +1,6359 @@
+ChangeLog:
+
+nxagent-3.5.0-9
+
+- Fixed an issue with cursor position set in XTest extension.
+
+nxagent-3.5.0-8
+
+- Fixed TR01J02646. Performance issues with cairo version 1.12.
+
+- Fixed TR01J02667. Changes to mouse sensitivity couldn't be forwarded
+  to NX client host although -noignore was among extra options.
+
+- Fixed TR05J02705. Agent ignore WarpPointer requests.
+
+- Fixed TR05J02706. Suspended sessions could not be recovered using
+  a client form a different version.
+
+- Fixed TR05J02703. Agent failed because of missing checks on source
+  drawables in the render code.
+
+nxagent-3.5.0-7
+
+- Fixed TR10I02622. Corrected function searching for icon file.
+
+nxagent-3.5.0-6
+
+- Fixed TR10I02621. Avoided explicit call to XMapWindow() at recon-
+  nection stage.
+
+- Fixed TR10I02620. Solved error in default visual set up.
+
+- Fixed TR10H02390. Get the actual remote key code for CapsLock and
+  NumLock.
+
+nxagent-3.5.0-5
+
+- The NX agent failed to resize its own window to fit the desktop size
+  in shadow sessions. TR07I02561 is now fixed also in shadow mode.
+
+nxagent-3.5.0-4
+
+- Fixed TR07I02530. Solved a buffer overflow occurring when the '-fp'
+  option value exceeds 1024 characters.
+
+- Extended list of the available screen geometries.
+
+nxagent-3.5.0-3
+
+- Fixed TR08I02572. Upgraded RandR extension to version 1.2.
+
+- Fixed TR07I02561. The NX agent failed to resize its own window to
+  fit the desktop size.
+
+nxagent-3.5.0-2
+
+- Fixed TR0502449. Initialized font server path even if font server
+  connection fails.
+
+nxagent-3.5.0-1
+
+- Opened the 3.5.0 branch based on nxagent-3.4.0-16.
+
+- Updated copyright to year 2009.
+
+- Fixed TR0302438. Added a check in function exporting property in
+  order to handle the case looking up an atom name returns a null
+  pointer.
+
+nxagent-3.4.0-16
+
+- Updated copyright to year 2011.
+
+nxagent-3.4.0-15
+
+- Added reference to fixed TR11H02405.
+
+nxagent-3.4.0-14
+
+- Reverted fix for TR03H02335 implemented in nxagent-3.4.0-6. The
+  emulation of right click by Control key + left click introduces
+  issues for some applications changing the reaction to the left click
+  depending on the state of Control key. Issue reported in TR03H02335
+  affects Apple laptop touchpads having a single button acting as
+  left button: on those devices the right button can be emulated by
+  a double-fingered tap (using two fingertips simultaneously).
+
+nxagent-3.4.0-13
+
+- Fixed TR12H02414. Exported property must be split if ChangeProperty
+  request exceeds 262140 bytes.
+
+- Reset AllScreens option at reconnection time if full screen mode
+  have to be automatically turned off.
+
+nxagent-3.4.0-12
+
+- If one of the two full screen modes is active ('one screen' or 'all
+  screens') both keystrokes Ctrl-Alt-F and Ctrl-Alt-Shift-F change the
+  mode back to 'windowed'.
+
+- Fixed TR11H02405. XRenderFreePicture is called only for pictures
+  that were actually created on the X server side.
+
+- Ctrl+Alt+f switch fullscreen to all monitors, while Ctrl+Alt+Shift+f
+  does it to one monitor only.
+
+- If the fullscreen option is enabled at the startup, session starts
+  in the fullscreen mode on all monitors.
+
+- Added a call to XReparentWindow in the nxagentSwitchAllScreens().
+
+- Corrected focus and grab when switching to fullscreen on
+  all monitors.
+
+- Removed a compile warning e deleted some unused variables.
+
+- Removed nxagentPointerAndKeyboardGrabbed variable. 
+
+- Use the override redirect attribute to switch to fullscreen to all
+  monitors instead of send _NET_WM_FULLSCREEN_MONITORS hint to the WM.
+
+- Added nxagentMinimizeFromFullScreen(), nxagentMaximizeToFullScreen()
+  and nxagentCreateIconWindow().
+
+- Removed check on EnterNotify to grab the keyboard in fullscreen
+  mode not only if mode is 'NotifyNormal'.
+
+nxagent-3.4.0-11
+
+- Corrected switching between viewport mode and resize mode.
+
+- Fixed TR04H02340. Keycode is correctly translated in shadow sessions
+  also if the remote X display is using evdev.
+
+nxagent-3.4.0-10
+
+- Handled XGrabKeyboard() return value.
+
+- Fixed TR10D01512. NumLock and CapsLock keys are now synchronized
+  between local and remote.
+
+nxagent-3.4.0-9
+
+- Fixed TR06H02362. No icon was swown in the task bar.
+
+- Fixed keyboard grab in fullscreen mode.
+
+- Fixed compiler warnings.
+
+nxagent-3.4.0-8
+
+- Grab the keyboard in fullscreen mode on EnterNotify only if mode is
+  'NotifyNormal'.
+
+- Yield control in the dispatch loop in case we stop the smart sche-
+  duler timer while waiting for a reply from the remote display.
+
+nxagent-3.4.0-7
+
+- Fixed TR08D01478. The communication with the compiz window manager
+  by means of the _NET_WM_PING property was not handled properly.
+
+- Fixed a type mismatch in XKB events on 64 bit platforms.
+
+- Moved grab/ungrab keyboard from focus in/out event to enter/leave
+  notify event.
+
+- Removed nxagentIconWindow because it's not longer used.
+
+nxagent-3.4.0-6
+
+- Fixed TR09F02102. Problem was with pointer buttons map.
+
+- Fixed TR02H02327. Some KeyRelease events was discarded.
+
+- Fixed up Num and Caps locks.
+
+- Fixed TR03H02335. Emulated right mouse button for Mac clients.
+
+- Added utilities to print info about internal and remote windows.
+
+- Fixed TR01F01995. Solved a picture resource leak by destroying remo-
+  te pictures only when their reference counter returns to zero.
+
+- Fixed TR04H02337. Errors occurred because pictures with no drawable
+  were handled badly.
+
+- Implemented handling nxagent's private for gradient pictures and so-
+  lid fill picture.
+
+- Fixed BadMatch condition check in function ProcRenderComposite.
+
+- Fixed nxagentComposite() to handle situations with source picture
+  drawable pointing to NULL.
+
+- Implemented render acceleration for requests:  CreateSolidFill,
+  CreateLinearGradient, CreateRadialGradient, CreateConicalGradient.
+
+- Fixed TR03G02196. Dialogs are shown to the fore when the NX session
+  is in fullscreen mode.
+
+- Changed mechanism to switch to fullscreen mode. Now the override
+  redirect attribute is no longer used and _NET_WM_STATE_FULLSCREEN
+  hint is sent to the WM.
+
+nxagent-3.4.0-5
+
+- Updated copyright to year 2010.
+
+nxagent-3.4.0-4
+
+- Fixed TR07F02090. Now XDMCP sessions start without problems.
+
+- Fixed TR08G02259. Corrected window border granularity of rootless
+  session at reconnection on 64 bit platforms.
+
+- Fixed TR11G02290. Forcing null timeout with queued events only if
+  display connection is up. This prevents the flood of session log.
+
+- Fixed TR10G02287. Now QueryTree's loop is aborted in case of failure
+  and session log isn't filled anymore with repeated warning messages.
+
+- Fixed TR01G02154. Corrected window placement when switching between
+  fullscreen and windowed mode.
+
+- Fixed TR09G02276. Now the agent does not receive unwanted characters
+  while interacting with the local window manager.
+
+- Implemented FR02G02174. Added ability to do large screen pans in
+  viewport mode through key combination Ctrl+Alt+Shift+Arrow.
+
+- Corrected parsing of the 'client' option when the client OS is Mac.
+
+nxagent-3.4.0-3
+
+- Fixed TR09G02271. The array containing the font name fields was not
+  correctly initialized for non-standard font names.
+
+nxagent-3.4.0-2
+
+- Updated copyright to year 2009.
+
+nxagent-3.4.0-1
+
+- Opened the 3.4.0 branch based on nxagent-3.3.0-19.
+
+- Changed the printed version number.
+
+nxagent-3.3.0-19
+
+- Fixed TR09G02266. A proper error message is printed in the session
+  log if the shadowing initialization fails because of a mismatch in
+  the visual class.
+
+- Added a workaround for X servers that doesn't return 1 among the
+  available depths.
+
+nxagent-3.3.0-18
+
+- The area to restore from the backing store is limited by the screen
+  size instead of the visible screen.
+
+nxagent-3.3.0-17
+
+- Fixed TR12F02150. The agent could crash when copying text from VNC
+  viewer. Fixed by aborting the procedure in case the retrieved pro-
+  perty has not a valid format.
+
+nxagent-3.3.0-16
+
+- Fixed TR07G02247. Don't try to call XSetWindowColormap() if the
+  window has no colormap, e.g. if its class is InputOnly.
+
+nxagent-3.3.0-15
+
+- Fixed TR04G02210. Region is cut to the visible screen before re-
+  storing areas from the backing store.
+
+- Fixed TR07G02246. Box is shrinked if bounds can't stay in a short
+  signed integer.
+
+nxagent-3.3.0-14
+
+- Fixed TR03G02206. waitpid() call was missing for the "Fonts replace-
+  ment" dialog type.
+
+- Fixed TR03G02195. Added a properties structure compatible with 32
+  and 64 bit platform types.
+
+nxagent-3.3.0-13
+
+- Handle the window unmap immediately. Don't add it to the configure
+  queue.
+
+nxagent-3.3.0-12
+
+- Fixed TR03G02200. Timestamps could be in the future in KeyRelease
+  events sent to the X clients.
+
+- Added debug logging of input devices state  Logging can be enabled
+  or disabled via the Ctrl+Alt+x shortcut. State info is dumped every
+  5 seconds.
+
+- Added Ctrl+Alt+y shortcut used to deactivate input devices grab for
+  debug purposes.
+
+nxagent-3.3.0-11
+
+- Changed the message logging the screen size changes, in order to
+  show the fullscreen state.
+
+- Handle the window unmapping in the nxagentConfigureWindow queue.
+
+nxagent-3.3.0-10
+
+- Fixed TR12F02146. Compare the drawable and the bitmap data before
+  realizing the image update, in order to delay the data clean up that
+  caused the memcmp() failure.
+
+- Fixed TR01G02156. Reduce the exposing area by subtracting the ex-
+  posed region.
+
+- Fixed a compile warning in Drawable.c.
+
+- Added detailed logs in the nxagentSynchronizeRegion() function if
+  the data memory allocation fails.
+
+nxagent-3.3.0-9
+
+- Added /usr/NX/share/base to alternate font paths. This would fix
+  TR11F02130 if fonts fixed and cursor are installed there.
+
+- Changed Keyboard initialization and reset. This change should fix
+  TR11F02129, TR11F02131, TR11F02132.
+
+nxagent-3.3.0-8
+
+- Fixed TR12F02144. Image bits of render glyphs are copied before they
+  are cleaned. This will avoid a memory corruption.
+
+- Fixed TR12F02145. When dispatching a MotionNotify event, check if a
+  top-level window has been entered before trying to show the pulldown
+  dialog.
+
+nxagent-3.3.0-7
+
+- Added debug code for pointer input.
+
+nxagent-3.3.0-6
+
+- Fixed compile warnings.
+
+nxagent-3.3.0-5
+
+- Disabled verbose logging in Rootless.c.
+
+nxagent-3.3.0-4
+
+- Fix the XKB map load in the case of 64 bit server.
+
+nxagent-3.3.0-3
+
+- Fixed TR10F02119. If the remote X display is using evdev keyboard
+  then copy maps from remote.
+
+- Upgraded VERSION to 3.3.0.
+
+nxagent-3.3.0-2
+
+- Fixed TR10F02115. Painting errors occurred when screen areas beyond
+  the current viewport became viewable in the NX Client for Windows.
+
+- Using a new struct type nxagentWMHints to avoid type mismatch on
+  64 bit platforms.
+
+- Added debug utilities for pointer input.
+
+nxagent-3.3.0-1
+
+- Opened the 3.3.0 branch based on nxagent-3.2.0-12.
+
+nxagent-3.2.0-12
+
+- Ignore 'resize' option at reconnection if viewport mode is on.
+
+- Fixed TR08E01814. Added shadow keymap initialization in order to
+  enable nxcompshad to translate keycodes across different layouts. 
+
+nxagent-3.2.0-11
+
+- Fixed TR08F02098. Function splitting font names has to be instruct-
+  ed to handle the right number of fields.
+
+nxagent-3.2.0-10
+
+- Extended fix for TR07F02091 to include font names having zero in
+  fields RESOLUTION_X and RESOLUTION_Y.
+
+nxagent-3.2.0-9
+
+- Fixed TR07F02091. Scalable fonts were not correctly listed among
+  available fonts.
+
+- Fixed TR06F02080. Use the corrupted area extents as maximum size of
+  the image data.
+
+nxagent-3.2.0-8
+
+- Fixed TR07F02082. The agent server could be unable to init core
+  keyboard on 64 bit systems.
+
+nxagent-3.2.0-7
+
+- Imported patch fixing issues from  X.Org security advisory, June
+  11th, 2008: Multiple vulnerabilities in X server extensions. CVE
+  IDs: CVE-2008-1377, CVE-2008-1379, CVE-2008-2360, CVE-2008-2361,
+  CVE-2008-2362.
+
+nxagent-3.2.0-6
+
+- Fixed TR05F02063. Ignore ReparentNotify events for non-rootless
+  sessions.
+
+- Fixed TR06F02068. Try to pack images only if format is ZPixmap.
+
+- Don't require reparent on close of NX window.
+
+nxagent-3.2.0-5
+
+- Fixed TR04F02044. Restored the original MakeRootTile() function in
+  order to create the root window background pixmap.
+
+- Fixed TR04F02041. Gnome panels stayed on top of the NX session win-
+  dow with desktops running Compiz. This fix provides a solution for
+  the Fullscreen mode.
+
+- Improved for the shadow session the handling of master session win-
+  dow resize.
+
+nxagent-3.2.0-4
+
+- Fixed TR10D01535. The agent window is not minimized anymore when
+  pointer leaves.
+
+- Changes aimed to avoid possible type mismatch in XDisplay struct
+  on 64 bit architectures.
+
+nxagent-3.2.0-3
+
+- Fixed a build issue on Solaris.
+
+nxagent-3.2.0-2
+
+- Code clean up. Moved a variable definition to the beginnning of a
+  block.
+
+nxagent-3.2.0-1
+
+- Opened the 3.2.0 branch based on nxagent-3.1.0-9.
+
+nxagent-3.1.0-9
+
+- Fixed TR03F02025. German umlauts couldn't be pasted into a remote
+  Windows application. Now also the UTF8_STRING target is available
+  for ConvertSelection requests.
+
+- Fixed TR03F02031. Moved SetScreenSaverTimer() call in order to avoid
+  undesired reset of the auto-disconnect timeout when a screen saver
+  turns on.
+
+nxagent-3.1.0-8
+
+- Added reference to fixed TR02F02007 and TR07E01762 in the CHANGELOG.
+
+- Set the GC trap before calling fbPolySegment.
+
+- Fixed TR09E01863. A flag is set if a resource has been added or fre-
+  ed and it is checked in FindClientResourcesByType().
+
+- Added void entries to nxagentRequestLiteral vector in order to avoid
+  a wrong string is printed to the output for NoOperation request.
+
+- Fixed TR11E01948. Now keyboard status is initialized again after
+  the NX session is reconnected. This avoids CAPS LOCK and NUM LOCK
+  synchronization problems.
+
+- Added nxagentXkbCapsTrap and nxagentXkbNumTrap to avoid CAPS LOCK
+  and NUM LOCK synchronization problems when CAPS LOCK or NUM LOCK is
+  the first key to be pressed in the NX session.
+
+- Corrected subSize variable initialization in nxagentRealizeImage().
+
+- Fixed various memory leaks.
+
+- Fixed TR11E01950. Copy and paste via edit menu didn't work for some
+  applications.
+
+- Corrected property type in nxagentRequestSelection(). Some external
+  applications didn't enable their paste button when nxagent was the
+  owner of the CLIPBOARD selection.
+
+- Added struct to save values queried by XQueryExtension for XFixes
+  extension.
+
+nxagent-3.1.0-7
+
+- Imported patch fixing issues from  X.Org security advisory, January
+  17th, 2008: Multiple vulnerabilities in the X server.  CVE IDs:
+  CVE-2007-5760    CVE-2007-5958    CVE-2007-6427   CVE-2007-6428
+  CVE-2007-6429    CVE-2008-0006.
+
+- Fixed TR02F02007. Handled the case if nxagentCreateDrawableBitmap()
+  fails to create the pixmap intended to store the bitmap data.
+
+nxagent-3.1.0-6
+
+- Fixed a compile warning in Args.c.
+
+- The synchronization loop breaks if the drawable is clean when it's
+  not supposed to be.
+
+- Fixed TR12E01966. Emacs tooltips were not displayed properly. Added
+  a check on the event mask before calling miWindowExposures().
+
+- Fixed TR01F01982. ConfigureNotify warning is printed in verbose mode
+  only.
+
+nxagent-3.1.0-5
+
+- Moved some variable definitions placed in ProcGetProperty().
+
+nxagent-3.1.0-4
+
+- Fixed TR06D01397. The problem was: drag & drop operations between
+  windows of Java applications didn't work in NX Client for Windows.
+
+- Implemented FR12E01957. Added a limit to the amount of data that can
+  be pasted from an NX session into an external application. The new
+  option - named 'copysize' - can be read from the 'options' file.
+
+nxagent-3.1.0-3
+
+- Fixed TR12E01963. The window tree is revalidated explicitly after
+  recomputing the root window clip regions.
+
+nxagent-3.1.0-2
+
+- Fixed TR11E01946. Forcing exposures on regions saved in the backing
+  store could bring to unexpected results.
+
+- Fixed TR11E01928. Animated cursors were not properly disconnected
+  and reconnected.
+
+nxagent-3.1.0-1
+
+- Opened the 3.1.0 branch based on nxagent-3.0.0-93.
+
+nxagent-3.0.0-93
+
+- Fixed TR10E01913. Now bell settings are restored after the agent
+  reconnects.
+
+nxagent-3.0.0-92
+
+- Fixed a compilation error on 64 bit platforms.
+
+nxagent-3.0.0-91
+
+- Checked the window synchronization status before subtracting an ex-
+  posed area from the corrupted region.
+
+nxagent-3.0.0-90
+
+- Fixed TR11E01932. In case of rootless session displayed by NXWin X
+  server, synthetic ConfigureNotify events are generated by the X11
+  agent. This helps to correct menu navigation in Java 1.6.0.
+
+- Fixed the handling of 'client' parameter.
+
+- Fixed bad refreshes in viewport navigation in the case of Windows
+  client.
+
+- Fixed TR11E01930. If the defer level is set by means of the command
+  line, the DeferLevel option is not reset while resuming the session.
+
+- Fixed TR07E01762. Problem in comparison of font names.
+
+- Printed the new geometry in the session log when the agent screen is
+  resized.
+
+nxagent-3.0.0-89
+
+- Fixed TR10E01919. The agent could crash in the routine in charge of
+  find a replacement for a missing font.
+
+- Removed an unuseful log message.
+
+nxagent-3.0.0-88
+
+- Fixed TR10D01539. Some XKEYBOARD requests are disabled if the option
+  'keyboard' has value 'query'. This locks the initial keyboard map.
+  Enabling/disabling of XKEYBOARD requests is done at run time.
+
+- Added -noxkblock command line option enabling the XKEYBOARD requests
+  even if the option 'keyboard' value is 'query'.
+
+nxagent-3.0.0-87
+
+- Reworked the handling of CT_PIXMAP client clips. Clips are always
+  converted in regions for internal use, while bitmap are saved for
+  operations involving the remote X.
+
+nxagent-3.0.0-86
+
+- Fixed TR07E01749. Now using different resolution between shadow
+  and master session with shadow display option 'As on the server'
+  doesn't display black borders.
+
+- Fixed TR09E01852. The GC clips of type CT_PIXMAP are not converted
+  in regions. This avoids generating regions made up by thousands of
+  rectangles. Backing store function SetClipmaskRgn is implemented by
+  a stub doing nothing.
+
+nxagent-3.0.0-85
+
+- Fixed TR08E01841. Exposed are forced to new areas exposed by the
+  viewport.
+
+- Fixed TR02E01645. Remote exposures was blocked if the NX client was
+  running on Linux without window manager.
+
+- Even if the agent window is fully obscured, synchronization is not
+  skipped if the Composite extension of the remote display is in use.
+
+- Fixed TR08E01851. Exposures events have to be internally generated
+  for regions that can't be restored because the backing pixmap is
+  corrupted.
+
+- Fixed TR08E01847. The initial values of store used to save XChangeGC
+  calls are set to the default GC values.
+
+- When a drawable becomes synchronized, its outdated bitmap is destro-
+  yed.
+
+- If a pixmap is not fully synchronized after a synchronization loop
+  it is cleared, just like windows.
+
+- Solved a problem causing some pixmaps to remain among the corrup-
+  ted resources even if they were synchronized.
+
+nxagent-3.0.0-84
+
+- Renamed Misc.h as Utils.h to solve name clashes on Windows platform.
+
+nxagent-3.0.0-83
+
+- Changes to include correctly declaration of _XDisplay structure on
+  64 bit platforms. Further tests are needed to confirm that it fixes
+  TR08E01824.
+
+nxagent-3.0.0-82
+
+- Fixed TR08E01821. Changed nxagentAddItemBSPixmapList() to check if
+  the pixmap item has already an entry in the list before adding it.
+
+- Fixed TR07E01795. Sun Studio main window showed only its grey back-
+  ground. Changed clipboard events handling to let the agent notify
+  a failure in converting selection.
+
+nxagent-3.0.0-81
+
+- Based on nxagent-3.0.0-78.
+
+- The agent options are saved before reopening the display in the
+  reconnection procedure. If the new initialization fails the backup
+  values of options are restored.
+
+- Keyboard device info are saved before the keyboard reset occuring
+  in the reconnection procedure. If the new initialization of the
+  keyboard fails, the old values are restored.
+
+- The initialization procedure of keyboard device returns with error
+  if it fails to retrieve the keyboard mapping information from the
+  remote display.
+
+- The reconnection fails if the default depth of the new display is
+  different from the previous one.
+
+- The session can be migrated if the visuals don't match for color
+  masks swapping. At the moment there are no conversions to line up
+  the RGB masks, so even if the session can be migrated, incorrect
+  colors may be shown.
+
+nxagent-3.0.0-80
+
+- The agent options are saved before reopening the display in the
+  reconnection procedure. If the new initialization fails the backup
+  values of options are restored.
+
+- The flag storing that a SIGHUP has been received is reset if the
+  function reconnecting the session fails.
+
+nxagent-3.0.0-79
+
+- Changed the SIGHUP handler not to ignore the signal if the state
+  is SESSION_GOING_UP or SESSION_GOING_DOWN.
+
+- Keyboard device info are saved before the keybord reset occuring
+  in the reconnection procedure. If the new initialization of the
+  keyboard fails, the old values are restored.
+
+- The initialization procedure of keyboard device returns with error
+  if it fails to retrieve the keyboard mapping information from the
+  remote display.
+
+- The reconnection fails if the default depth of the new display is
+  different from the previous one.
+
+- The session can be migrated if the visuals don't match for color
+  masks swapping. At the moment there are no conversions to line up
+  the RGB masks, so even if the session can be migrated, incorrect
+  colors may be shown.
+
+nxagent-3.0.0-78
+
+- Fixed TR07E01747. Fixed warnings occuring when compiling for AMD64.
+
+- Fixed TR07E01753. NoMachine WM icon in the title bar is displayed
+  correctly.
+
+- Fixed TR03E01656. If client and server endianess didn't match, glyph
+  images bits have to be only temporarily swapped.
+
+- Fixed TR07E01746. Terminate the shadow agent if the option 'shadow'
+  is empty.
+
+- Added option '-verbose'. It enables the printing of errors received
+  by the agent from the remote X server.
+
+- Warnings related to missing fonts are printed only if verbose mode
+  is enabled.
+
+- Disabled a log message related to the use of Composite extension.
+
+nxagent-3.0.0-77
+
+- The pixmap formats are initialized without taking care of which are
+  supported on the remote display.
+
+- Removed the check for pixmap format compatibility when migrating the
+  session to a new display.
+
+- Fixed TR06E01725. A minimum set of available picture formats is
+  used to ensure a wide migration from/to different displays.
+
+- The PictFormat structures used by nxagent are no longer filtered
+  with the ones available on the real display.
+
+- The background pixmaps are cleared while reconnecting in order to
+  make them usable.
+
+- Fixed TR01E01619. Changed the RandR implementation to return a re-
+  fresh rate other than zero.
+
+nxagent-3.0.0-76
+
+- Changed the keystroke to force the drawable's synchronization to
+  CTRL-ALT-J.
+
+nxagent-3.0.0-75
+
+- If the backing store tries to restore areas from a corrupted pixmap,
+  such areas are subtracted from the saved region, so that exposures
+  will be sent for them.
+
+nxagent-3.0.0-74
+
+- Don't skip the synchronization when there are more clients ready.
+  This temporarily solves the synchronization problems observed in
+  the previous versions if one or more clients kept the agent busy.
+
+nxagent-3.0.0-73
+
+- If the PolyFillRect() uses a FillStippled or a FillOpaqueStippled
+  fill style and the destination is corrupted, the area affected by
+  the operation is first synchronized.
+
+nxagent-3.0.0-72
+
+- Fixed the bug affecting the position of the input window when a
+  session was migrated to a linux X server with no window manager
+  running.
+
+- The color used to fill the corrupted backgrounds is converted de-
+  pending on the depth of remote X server.
+
+- The PolyFillRect() does not clean the corrupted destination region
+  if a stipple pixmap is used as mask. This solution is adopted to
+  reduce the region fragmentation and to solve the text drawing pro-
+  blems affecting rdesktop.
+
+nxagent-3.0.0-71
+
+- Force a flush of the display buffer if the coalescence timeout is
+  expired. Set the timeout according to the link type, from 0 to 50
+  ms for link MODEM.
+
+- In nxagentRealizeImage() the width in byte is computed newly if
+  the image has been scaled.
+
+- The shadow agent clips the screen updates in tile only if the link
+  type is MODEM or ISDN.
+
+- Split the abort conditions in the synchronization loop to check
+  separately the congestion and the blocking status.
+
+- Implemented a workaround in order to avoid graphical problems with
+  render composite operations on Xfree86 remote server.
+
+nxagent-3.0.0-70
+
+- Various adjustments aimed at using the best defer rules depending
+  on the congestion state.
+
+- Fixed a problem with icons of message boxes in shadow sessions.
+
+- Changed the log message printed when the shadow agent can't connect
+  to the master session.
+
+- If Composite is in use, don't skip the PutImage and CopyArea opera-
+  tions even if the agent window is fully obscured.
+
+nxagent-3.0.0-69
+
+- The option -nodamage prevents the shadow agent from using the damage
+  extension.
+
+- Changed the scaling feature to set the byte order of the source
+  image according to the local endianess.
+
+- Changed the scaling feature in order to handle different ratios for
+  horizontal and vertical sizes.
+
+- Force the shadow sessions to be non-persistent.
+
+- When a pixmap background is synchronized, an expose is sent to its
+  owners.
+
+nxagent-3.0.0-68
+
+- Changed the type of parameters passed to nxagentRootlessRestack in
+  order to be compliant with Xlib types on 64 bit platfors.
+
+- The nxagentCompositeRects() checks for the render operation type to
+  determine if the corrupted destination region must be cleared.
+
+nxagent-3.0.0-67
+
+- Fixed a condition discarding the expose events received from the X
+  server.
+
+nxagent-3.0.0-66
+
+- The corrupted resources are removed when a session suspends, and are
+  reallocated only at reconnection. This is aimed at avoiding synchro-
+  nization loops when the link is down.
+
+nxagent-3.0.0-65
+
+- Initialize for now the tile size at 64x64 in shadow mode.
+
+- The height and width of the tiles used for synchronizing drawables
+  are set without overriding command line option 'tile'.
+
+- Avoid calling miWindowExposures() for empty regions.
+
+- Fixed a bug while clearing corrupted regions with window exposures.
+
+- The corrupted drawable counters are not reset if there are bitmaps
+  to synchronize.
+
+nxagent-3.0.0-64
+
+- The synchronization bitmap is used only when requesting a full
+  drawable synchronization, otherwise the frame-buffer is used as
+  source.
+
+- Fixed some bugs in the synchronization loop.
+
+- Removed the remaining debug output.
+
+nxagent-3.0.0-63
+
+- Don't start the synchronization loop if the wakeup handler found
+  some clients ready.
+
+- Don't flush the display buffers if the synchronization was inter-
+  rupted and there are more drawables to synchronize.
+
+- Changed the backing store functions to not save the obscured areas
+  which are inside the corrupted region of a window.
+
+- Added the code to send the XClearArea() commands in shadow mode at
+  the end of the synchronization loop. In this way large images are
+  still split in tiles but, on fast links, the final result can made
+  visible all at once.
+
+- Modified the corrupted drawable counters to only report the number
+  of resources needing synchronization. This allows the block hand-
+  ler to avoid spinning through the synchronization loop if there is
+  nothing to do.
+
+- On a window exposure remove the corrupted region of the destinat-
+  ion window.
+
+- For testing purposes, the pixmap synchronization loop starts only
+  if there are corrupted backgrounds.
+
+nxagent-3.0.0-62
+
+- The image scaling is applied only if the destination drawable is the
+  pixmap shadowing the frame buffer of the master session.
+
+- The shadow agent exits with a fatal error if it can't connect to the
+  master session.
+
+nxagent-3.0.0-61
+
+- Forward the SIGCHLD to the NX transport instead of letting the NX
+  transport forward the signal to us. This allows the agent to set
+  and replace the signal handler at any time, without having to ta-
+  ke care of the state of the NX transport.
+
+- Improved the synchronization loop by implementing a simple round-
+  robin mechanism between the resources needing synchronization.
+
+nxagent-3.0.0-60
+
+- Use a new set of functions to install, post-install and reset the
+  signal handlers.
+
+- Reset the signal handlers to their initial state after a display
+  failure, as part of the disconnection procedure.
+
+- Don't set SA_RESTART in the sigaction flags. Make the signal int-
+  errupt the system call.
+
+- Terminate all the running dialogs before exiting.
+
+nxagent-3.0.0-59
+
+- Use the value of nxagentCongestion in nxagentUserInput() instead
+  of calling NXDisplayCongestion().
+
+nxagent-3.0.0-58
+
+- The clip mask of the scratch GC used by nxagentDeferCopyArea() is
+  reset before releasing the GC.
+
+- The MotionNotify event can now break the synchronization loop.
+
+- In the case of shadow sessions, if synchronization aborts then the
+  remaining data to synchronize are not stored in a bitmap.
+
+- If a table rebuild occurs in a loop searching for resources, the
+  loop restarts from beginning not to use the out of date table.
+
+nxagent-3.0.0-57
+
+- The synchronization bitmap is created only if the corrupted area
+  of the source drawable is visible.
+
+- The synchronization loop skips the last synchronizing drawable to
+  give a chance to the next resources to be synchronized.
+
+- Removed the session starting infos concerning the mismatching ver-
+  sions of render and the window manager detection.
+
+- Split the gliph lists in Render.c only if the symbol SPLIT_GLYPH_-
+  LISTS is defined.
+
+- Read again the events in the block handler after the flush.
+
+- The nxagentCongestion variable is now a value ranging from 0 to 9,
+  not a boolean flag.
+
+- Added some experimental code dynamically reducing the size of the
+  display output buffer when the agent is blocking for write.
+
+nxagent-3.0.0-56
+
+- The synchronization loop is now aborted when a short timeout exp-
+  ires. If the drawable synchronization cannot be completed, the
+  remaining data is stored in a bitmap. The synchronization loop is
+  then restarted using the data from the bitmap, instead of pulling
+  the latest image from the framebuffer. This allows the agent to
+  show a complete frame when displaying videos and animations, while
+  at the same time giving a chance to the clients to update the
+  screen in background. When an image from the saved bitmap is put
+  on the remote display, the image is compared with the actual data
+  in the framebuffer. If the two bitmaps match, the corresponding
+  region of the drawable is marked as synchronized, otherwise the
+  drawable remains dirty and will be synchronized at the next loop
+  using the new data taken from the framebuffer.
+
+- If the smart schedules is enabled, let the dispatcher decide when
+  it is time to yield and process the next client.
+
+nxagent-3.0.0-55
+
+- Disable the smart scheduler in the case of shadow sessions.
+
+- If the smart scheduler is enabled, stop the timer before returning
+  from the block handler. WaitForSomething() sets a zero timeout if
+  there are clients with input but doesn't stop the timer. The select
+  is then interrupted to update the schedule time even if, what the
+  dispatcher cares, is only the ticks count at the time the client
+  is scheduled in.
+
+- Fixed a compilation warning in NXresource.c.
+
+- The main window of the shadow agent is mapped in nxagentMapDefault-
+  Windows, like for non shadow agents, if the remote display has no
+  window manager running. This avoids a flickering effect on the !M
+  logo having place if the shadow session was displayed from a Wind-
+  ows client.
+
+- Some code related to the use of the Composite extension is not built
+  in the agent being not necessary anymore.
+
+nxagent-3.0.0-54
+
+- Get SmartScheduleStopTimer() from dixstruct.h.
+
+- Updated the NoMachine icon file.
+
+nxagent-3.0.0-53
+
+- Changed the message 'NXAGENT: Fatal IO error on display' into 'Info:
+  Disconnected from display'.
+
+- Fix a problem occurring when the FindClientResourcesByType() needs
+  to reallocate the resource table.
+
+- The popup window synchronization breaks if an user input is caught.
+
+- Implemented FR05E01712. The stderr and stdin are redirected to the
+  'clients' file in the session directory.
+
+- The nxagentRealizeImage function does nothing if the agent is not
+  connected to the display.
+
+- Removed the code implementing the redraws of the viewport frame.
+  Such code is not needed because is't enough for the agent to handle
+  the expose event received from the X server.
+
+nxagent-3.0.0-52
+
+- Where it is necessary to wrap the function PaintWindowBackground,
+  the original function pointer is saved and restored afterwards. This
+  let other code wrapping that function (e.g. the damage extension) to
+  work correctly.
+
+- If the agent works in shadow mode, the defer parameters are ignored.
+
+nxagent-3.0.0-51
+
+- Use the smart scheduler on platforms where it is enabled.
+
+- Check ClientsWithInput in the wakeup handler and update the number
+  of clients ready if any descriptor is set.
+
+nxagent-3.0.0-50
+
+- Fixed TR05E01714. Changed VisibilityNotify event so that it forces
+  a refresh on the root window, but only if on the agent Composite is
+  enabled and its window moves from a VisibilityFullyObscured to ano-
+  ther state.
+
+- Grant the availability of core fonts in master sessions also after
+  the disconnection. This makes possible to start new clients inside
+  a shadow sessions while the master is down.
+
+- Changed nxagentGlyphs() to send a single glyph list per request.
+
+- Major rewrite of the agent dispatch handler.
+
+- Some name changes to the functions handling the session states.
+
+nxagent-3.0.0-49
+
+- Made the dispatch loop yield control to a different client after a
+  fair amount of time even if the current client doesn't produce any
+  output.
+
+nxagent-3.0.0-48
+
+- Modified the message in the suspend dialog to say 'Disconnect' in
+  place of 'Suspend'.
+
+- Added macros in Pixels.h to determine the behavior of the lazy en-
+  coding.
+
+- Changed the copyright attribution from Medialogic to NoMachine.
+
+- Reset all options to their defaults before processing the session
+  arguments. This fixes the problem with the DeferLevel option not
+  being set at reconnection.
+
+nxagent-3.0.0-47
+
+- Initialized the arguments of NXGetControlParameters(), NXGetShmem-
+  Parameters() and NXGetUnpackParameters() to end up with valid data
+  also in the case of a display failure.
+
+- Converted the coordinates in the X_PolyFill requests to relative
+  mode. This makes all the requests independent from the origin and
+  helps the caching by the proxy.
+
+nxagent-3.0.0-46
+
+- Don't print the 'Display failure' message on a SIGTERM.
+
+- Ensure that the NX transport is shut down after the 'Terminating
+  session at...' message if the session is killed by the user.
+
+- Let the agent filter the error output by setting the OsVendorVEr-
+  rorFProc function pointer.
+
+- Give the possibility to the agent to redirect the standard error
+  during a Popen() or a System() by setting the OsVendorStartRedir-
+  ectErrorFProc and OsVendorEndRedirectErrorFProc function pointers.
+
+- Fixed a problem in nxagentPolyFillRect() not properly propagating
+  to the destination.
+
+- Added nxagentPolyFillRect() and nxagentGlyphs() among the funct-
+  ions increasing the pixmaps usage counter.
+
+- Cleaned up some of the FIXME related to the lazy encoding.
+
+nxagent-3.0.0-45
+
+- Use the three distinct functions in nxcompext to query the state
+  of the display connection.
+
+- Terminate gracefully on a fatal server error by printing the fol-
+  lowing in the session log:
+
+  Error: Aborting session with 'Error text...'.
+  Session: Aborting session at '...'.
+  Session: Session aborted at '...'.
+
+- Removed more debug messages from the session log.
+
+nxagent-3.0.0-44
+
+- Guess whether to compress an image with a lossless encoder based
+  also on the width and height, not only on size.
+
+- Corrupted pixmaps used as tiles propagate the dirty area when they
+  are involved in a PolyFillRect() operation.
+
+- On link settings ADSL to LAN, images are not split in tiles to bet-
+  ter fill all the available bandwidth.
+
+- Pixmaps referenced often as source in deferred operations or used
+  as backgrounds, are now synchronized as long as when the network
+  congestion level remains 0.
+
+- Use nxagentPaintWindowBorder() to update the window's border in
+  the framebuffer.
+
+- Fixed a problem with the new handling of the X_RenderChangePicture
+  requests that caused the text to be erroneously clipped.
+
+nxagent-3.0.0-43
+
+- Don't pass the uid of the shared memory segment to the nxcompshad
+  library if it can't be retrieved from the options.
+
+- Fixed the new handling of the RenderChangePicture requests to work
+  on 64 bit platforms.
+
+nxagent-3.0.0-42
+
+- Added support for the 'lossy', 'lossless' and 'adaptive' pack me-
+  thod literals. These values activate the dynamic selection of the
+  pack method by the agent.
+
+- Use the newer constant PACK_NONE instead of NO_PACK.
+
+nxagent-3.0.0-41
+
+- Fixed a bug in the disconnection procedure introduced with the new
+  handling of the display events.
+
+- Realize the XRenderChangePicture() request only if a change of the
+  remote picture's attributes is detected.
+
+nxagent-3.0.0-40
+
+- Dynamically select a lossy or a lossless encoder based on the num-
+  ber of pixels that appear to be different in the image.
+
+- Use the new PACK_BITMAP_16M_COLORS image encoding. Handle the case
+  when the packed image data points at the same data as the original
+  image. This is useful to save a copy.
+
+- The PACK_BITMAP_16M_COLORS method is now the default for lossless
+  encoding.
+
+- Don't use compression for the alpha channel. This is also intended
+  to better leverage the stream compression.
+
+nxagent-3.0.0-39
+
+- The nxagentComposite() function doesn't check the source and mask
+  synchronization status, but defers the XRenderComposite() operation
+  by checking the defer level only.
+
+- If the target of an XCompositeText() function is an hidden window,
+  the operation is prevented.
+
+- Passing the uid of master X server process to nxcompshad library.
+
+- Before the call of XRenderAddGlyphs(), call the new library function
+  XRenderCleanGlyphs() cleaning the padding bytes of data section of
+  request.
+
+nxagent-3.0.0-38
+
+- Don't warp the cursor if the requesting client is a shadow agent.
+
+- Changed a call to NXFlushDisplay in order to align to nxcomp version
+  3.0.0-15.
+
+- Updated the NoMachine icon file.
+
+- Changed Agent.h in order to include NX version of Xlib.h avoiding
+  missing declarations.
+
+- If the NXDisplayCongestion notifies an optimum congestion state,
+  the continuous user input, due to unreleased buttons/keys, doesn't
+  break the drawable's synchronization.
+
+- Renamed the option 'block' as 'tile'.
+
+- Implemented a way to guess if the destination drawable of a copy
+  area is a popup window. In such a case, the source is synchronized
+  before doing the copy to avoid ugly effects like text items floating
+  on an invisible background.
+
+- In order to reduce the number of clip mask changings, if the clean
+  region of a corrupted source drawable is formed by a single rectan-
+  gle, its coordinates are used to change extents and position of the
+  area involved in the copy area operation.
+
+- Fixed a crash caused by a reference to a resource table freed by a
+  table rebuilding. This was happening because during the pixmap re-
+  connection some new GC resources went beyond the resource table li-
+  mit, causing a table relocation. As a general rule, a function loop-
+  ing across a resource table should not add or remove resources.
+
+nxagent-3.0.0-37
+
+- To improve the efficiency of the algorithm deferring the trapezoid
+  operations, the composite does not propagate the glyphs flag to
+  the destination.
+
+- Moved the replacement of XCheckIfEvent() to nx-X11 with the name
+  XCheckIfEventNoFlush().
+
+nxagent-3.0.0-36
+
+- Changed nxagentDisplayFlushHandler() according to the new semantic
+  of the handler. The function is called by nxcomp when new data is
+  sent to the remote proxy.
+
+- After the flush handler is called, use NXQueryDisplay() with query
+  type NXDisplayCongestion to update the congestion flag.
+
+- Modified the boxes list defragmentation to merge only those rectan-
+  gles which fully overlap.
+
+- During the synchronization loop the nxagentDispatchHandler() takes
+  care of reading the enqueued events, while the nxagentUserInput()
+  checks only for state changes due to a processed key/button event.
+
+- Set the display output buffer size according to the link type.
+
+- Removed the congestion and synchronization callbacks.
+
+nxagent-3.0.0-35
+
+- In order to avoid the lossy encoding of text regions, the nxagent-
+  GlyphsExtents is computed even if the mask format is not specified.
+  In this case, the render implementation was not calculating the ex-
+  tents of composite text operation, whose coordinates are useful only
+  to build a mask pixmap.
+
+nxagent-3.0.0-34
+
+- Removed message 'Could not init font path element' from the output.
+
+- Moved initialization of picture support before the call to miDCInit-
+  ialize in the screen opening procedure. This is because miDCInitial-
+  ize calls DamageSetup that wraps the picture screen functions.
+
+- Implemented FR05E01686. Added option 'menu' enabling/disabling the
+  pulldown menu in the rootless agent.
+
+- Added a flag to each drawable to record if they have been the dest-
+  ination of a glyph operation. This is used to skip the deferral of
+  some operations (e.g. render trapezoids) if they can cause the
+  drawable to be synchronized using a lossy encoding.
+
+- The render trapezoids are deferred if the operation falls inside
+  a dirty region or if the destination drawable does not contain
+  glyphs.
+
+- Imported the NXmitrap.c file from render directory.
+
+- Improved the algorithm queuing multiple writes across a proxy
+  flush.
+
+nxagent-3.0.0-33
+
+- Read the event queue after each request processed. Doing this
+  is expensive but it seems to work best.
+
+- Don't split the big trapezoid requests. Splitting the requests
+  doesn't seem to provide any benefit with the clients tested.
+
+- By defining BLOCKS in Handlers.c, Events.c and NXdispatch.c, log
+  the begin and end of the most sensitive routines.
+
+nxagent-3.0.0-32
+
+- Use NXSetDisplayWriteHandler() to register a callback invoked
+  by Xlib after some data is written to the display socket. This
+  callback allows the agent to better determine when it is time
+  to send the sync requests.
+
+nxagent-3.0.0-31
+
+- The operation of adding glyphs to remote glyphset has been defer-
+  red, in order to avoid to add unused glyphs. When a composite text
+  operation looks for a certain glyph, if it has not been added to
+  the selected glyphset, an XRenderAddglyphs is requested.
+
+- The forced synchronization timeout is now dependant on link type.
+
+- Force the mi to process the events just after having processed
+  any input.
+
+- Added an experimental 'hard' sync request intended to wait for
+  the X server to complete an image operation. This also affects
+  the agent only when the NX transport is not running.
+
+- Added a synchronization mechanism intended to let the agent de-
+  tect if the X server is not able to process its input when the
+  NX transport is not activated. The algorithm uses asynchronous
+  X_GetInputFocus replies to minimize the impact of latency on
+  slow connections. A new request is sent at any given amount of
+  bytes read from our clients. When the number of pending replies
+  is exceeded, the agent stops accepting additional requests and
+  waits for the remote until the number of pending replies returns
+  below the limit. Note that when the NX transport is running, the
+  algorithm is disabled to not interfere with the proxy's own
+  token-based flow control.
+
+- Added the nxagentDispatchHandler() function. It is called by the
+  dispatcher after a client's request has been processed.
+
+- Added the nxagentWaitEvents() function. It blocks waiting for
+  more input with an optional timeout. It handles the case when
+  the NX transport is not running and is able to recover gracely
+  from a display failure by returning the error.
+
+- Replaced most of the code that was relying on NXTransContinue()
+  to use the new function.
+
+- Moved the new event-related functions to Events.h and Events.c.
+
+- Disabled the code raising the splash screen at reconnection.
+
+- Reverted change done in 3.0.0-8 version, dealing with expose events
+  not having entries in the queue. They are not collected in a global
+  region but sent immediately.
+
+nxagent-3.0.0-30
+
+- Let the block handler check if there are events queued after the
+  flush before entering the select.
+
+- Changed the dispatch loop to read the incoming events more often.
+
+- Added the nxagentReadEvents() and nxagentCheckEvents() functions.
+  Differently from XCheckIfEvent(), nxagentCheckEvents() doesn't
+  flush the output buffer if no event is available. nxagentReadEv-
+  ents(), instead, it's like XEventsQueued() but forces the use of
+  the QueuedAfterReading mode. These functions should be used when-
+  ever XEventsQueued() and XCheckIfEvent() would be required.
+
+- The nxagentQueuedEvents() macro uses XQLength() to return the
+  number of events that have been read and need to be dispatched.
+
+- The nxagentPendingEvents() function returns true if there is any
+  event queued. If not, it queries the transport to find if more
+  events can be read.
+
+- Ripristinated the code preventing the agent to connect to its own
+  display. The code was disabled while migrating to the new tree.
+
+- Removed the dependencies from the NXAGENT_QUERYBSIZE, NXAGENT_NO-
+  EXPOSEOPTIMIZE and NXAGENT_ONEXIT. Removed the unused code.
+
+- Removed more unused code in Clipboard.c.
+
+- The shadow agent calls NXShadowDestroy before exiting.
+
+- Reverted a change done in 3.0.0-8 dealing with expose events. If the
+  result of the subtraction is not sent immediately, some duplicated
+  refresh is shown.
+
+nxagent-3.0.0-29
+
+- The splash screen is removed as soon as the session is started in
+  the case of shadow session.
+
+- The rules to verify when the synchronization loop can be stopped
+  are specified by means of a bitmask passed as parameter to synch-
+  ronization functions.
+
+- The glyphsets are no longer reconnected during a session resuming,
+  but only when they are used.
+
+- Initialized the timeout parameter in block handlers in case of NULL
+  value.
+
+- Added option 'block' to specify the size of image slices sent during
+  the synchronization.
+
+- Fixed a memory leak in nxagentParseOptions().
+
+nxagent-3.0.0-28
+
+- Improved the nxagentGetOptimizedRegionBoxes() function to optimize
+  the high fragmented rectangle lists.
+
+- When resizing nxagent window the fictitious resize for all top level
+  windows, triggering the window tree validation, is not executed if
+  rootless mode is off.
+
+- The nxagentInputWindows cannot be resized in rootless mode because
+  they are not created.
+
+- Added NXdamage.c to the source files.
+
+- Changed damage's GCOps functions drawing text. This was needed be-
+  cause the original functions didn't call agent GCOps if the drawable
+  was registered for damage events.
+
+nxagent-3.0.0-27
+
+- Fixed TR04E01677. Changed the reconnection procedure to call the
+  function destroying the NoMachine splash window. It rarely happened
+  that the splash window was not removed after resuming a session.
+
+- Ignored the ForceScreenSaver requested by X clients to avoid clashes
+  with our screen saver handling.
+
+- Cleanup of code handling the screen saver timeout to remove referen-
+  ces to the old drawable's synchronization method.
+
+- Fixed TR04E01664. The session is terminated instead of suspended if
+  the auto-disconnect timeout expires and the persistence is not allo-
+  wed.
+
+- Reverted an optimization in nxagentCheckWindowConfiguration() in
+  order to avoid inconsistencies in the stacking order.
+
+- Fixed a segmentation fault in rootless mode.
+
+nxagent-3.0.0-26
+
+- Some fixes to build in the Cygwin environment.
+
+nxagent-3.0.0-25
+
+- Renamed the option 'lazylevel' to 'defer'.
+
+- Added a flag to windows to know if they have transparent children,
+  in order to reduce to minimum the put images on windows covered by
+  their children.
+
+- Created a generic list of graphic contexts, used when synchronizing
+  drawables between the nxagent and the remote X server. All the GCs
+  are created with IncludeInferiors property. This solves problem when
+  trying to synchronize windows covered by children with transparent
+  backgrounds.
+
+- The nxagentUserInput checks if keys are pressed.
+
+- Fixed some memory leaks.
+
+- In shadow mode, removed the handling of events of the source display
+  from the code. They can be handled in the nxcompshad library.
+
+- In shadow mode, allow the synchronization loop to break in case of
+  input event.
+
+- Moved the call to miDCInitialize after the initialization of poin-
+  ters to screen functions. This was needed to make DAMAGE work pro-
+  perly.
+
+- In shadow mode, not breaking the polling if a mouse button is down.
+
+- In shadow mode, allow events to break the loop sending updates.
+
+- At reconnection the input window is raised after the root window is
+  mapped.
+
+- Fixed an invalid read. The call to the function nxagentSetInstalled-
+  ColormapWindows() has been moved from nxagentDestroyWindow to Dele-
+  teWindow.
+
+nxagent-3.0.0-24
+
+- The corrupted drawables are added to dedicated lists of resources
+  to speed up the synchronization process.
+
+- The nxagentUserInput checks if a mouse button is pressed.
+
+- Created the nxagentGetScratchGC which resets the scratch GCs to de-
+  faults values also on the remote X server.
+
+- The synchronization cycle is forced when a timeout expires, albeit
+  the remote display is blocked.
+
+- Added a parameter to synchronization functions to specify if loops
+  can break. It's useful to force the synchronization in some circum-
+  stances.
+
+- Keystroke CTRL-ALT-R is enabled in shadow mode too. It is used to
+  switch scaled and non-scaled modes.
+
+- Some changes to adjust the window position.
+
+- Moved some macros to Misc.h.
+
+- Some changes to adjust the behaviour of scaling feature in case of
+  resize and switch to full screen.
+
+- Freeing the buffer used for scaling if no needed anymore.
+
+nxagent-3.0.0-23
+
+- Fixed TR02E01648 and TR10D01534. Changed pointer motion events han-
+  dling. In desktop mode the nxagent creates a InputOnly window that
+  collects the MotionNotify events. This window is mapped over the
+  root window. In rootless mode the nxagent creates all windows on
+  real X server with PointerMotionMask.
+
+- Not exiting from the block handler with zero timeout if drawables to
+  be synchronized are pixmaps only.
+
+- Reduced the margin around the glyph extent from 5 to 3 pixels.
+
+nxagent-3.0.0-22
+
+- Fixed initialization of XImage used for scaling.
+
+- Changes to fix the position of the shadow main window.
+
+nxagent-3.0.0-21
+
+- Moved the implementation of scaling feature in nxagentRealizeImage.
+
+- Disabled log message 'Font not found' in Font.c.
+
+- The synchronization loop is called inside the BlockHandler. Synch-
+  ronization goes on until the display is not blocked.
+
+- Exiting the BlockHandler with timeout zero if corrupted drawables
+  have not been synchronized because of blocked display connection.
+
+- Changed the synchronization loop to slice the dirty regions.
+
+- The updates by shadowing nxagents are now sent using the lazy me-
+  chanics: the remote buffer pixmap is marked as dirty, then synch-
+  ronized.
+
+- Traversing the tree to synchonize windows.
+
+nxagent-3.0.0-20
+
+- Fixed a bug in the nxagentGetOptimizedRegionBoxes() function which
+  was causing a bad merging of boxes.
+
+- Added a margin of 5 pixels around the glyphs extents before synch-
+  ronizing them.
+
+- The synchronization cycle has been reactivated for the first lazy
+  level, in order to synchronize the window's background.
+
+- The CopyArea between pixmaps doesn't mark the full destination as
+  corrupted, but clips the operation with the synchronized area of the
+  source as happens for the windows.
+
+- Implemented scaling feature for the shadow agent. To do: run-time
+  control of this feature by keystrokes and window resize; adapting
+  the window size to the scaled dimensions.
+
+- Setting the shadow session scaling ratio equal to the size chosen
+  from the user divided by the size of the main session.
+
+- Scaled mouse motion events according with the ratio.
+
+- Implemented the nxagentScaleImage() function.
+
+- Updated version number and copyright in the output log.
+
+- Fixed TR06D01390. When resizing nxagent window, we make a fictitious
+  resize for all top level windows, in order to trigger the window
+  tree validation.
+
+nxagent-3.0.0-19
+
+- Force LazyLevel to 0 in case of shadowing session.
+
+- If shadowing poller returns that nothing is changed and no updates
+  have to be sent, call WaitForSomething select with 50 ms timeout.
+
+- The shadow agent doesn't break the sending of updates in case of
+  mouse motion events.
+
+- The scratch GC's clip mask was not cleared during a drawable synch-
+  ronization. Now the GetScratchGC() function is called after changing
+  the nxagentGCTrap flag.
+
+- Implemented the function nxagentGetOptimizedRegionBoxes(). It gets
+  the list of boxes forming a region and operates on it to merge as
+  much boxes as possible, checking their width and position.
+
+- Implemented the function nxagentClearRegion(). It does an XClearA-
+  rea() for each box belonging to a region, using the color returned
+  by nxagentGetCorruptedRegionColor() as background of target window.
+
+- Implemented the function nxagentGetCorruptedRegionColor(). It gets
+  the color of first outer pixel in the bottom right corner of re-
+  gion.
+
+- Fixed some memory leaks.
+
+- Checked and removed some FIXME concerning the lazy encoding.
+
+- Fixed and added some debug messages in Render.c, GC.c and GCOps.c.
+
+- Added to the Literals.h file the Render and Shared memory requests.
+
+nxagent-3.0.0-18
+
+- Changes to comply with nxcompshad library.
+
+nxagent-3.0.0-17
+
+- The master agent holds the number of shadow nxagents connected to
+  itself. The shadow nxagent notify its presence to master nxagent
+  by setting the _NX_SHADOW property.
+
+nxagent-3.0.0-16
+
+- Rearranged the lazy level rules. All the link types now use the lazy
+  level 1: the pixmaps are always corrupted, and they becomes synchro-
+  nized only when they're sources of an operation (i.e. CopyArea, ren-
+  der).
+
+- The lazy levels greater than 1 don't synchronize automatically. It's
+  possible to synchronize with two keystrokes: CTRL+ALT+Z forces the
+  windows synchronization without take care of the congestion; CTRL+
+  ALT+X synchronizes the windows and the background until there is
+  enough bandwidth.
+
+- Only the tile, stipples and glyphs are always synchronized.
+
+- The height of glyphs region has been doubled to obtain a better vi-
+  sual effect after the synchronization.
+
+- Fixed a problem causing the background pixmaps to be used also if
+  they were not fully synchronized.
+
+- Added a function to convert a PolyPoint in a dirty region. The fun-
+  ction is now disabled because it is not advisable to use the exten-
+  ts.
+
+- The XCopyArea is not requested if the clip region is NIL.
+
+- The nxagentPutImage does not update the framebuffer when it is
+  doing a synchronization.
+
+- Moved all the code handling the drawables synchronization in the
+  Drawable.c file.
+
+- As the shared memory pixmaps are never synchronized with the re-
+  mote X server, now they're marked as dirty when they're created.
+
+- An XFillRectangles request now marks the rectangles of the desti-
+  nation drawable as synchronized.
+
+- Fixed a bug that was causing the CopyArea to propagate wrongly the
+  corrupted region on the destination drawable when the GC uses a
+  clip mask.
+
+- Implemented a test function useful to show on the windows all the
+  dirty regions as colored rectangles. It is used with the CTRL+ALT+A
+  keystroke.
+
+- Before sending the XRenderComposite operations (trapezoids, trian-
+  gles, TriStrip, TriFan), the drawables involved are synchronized if
+  they are dirties.
+
+- Changes to shadow mode.
+
+- Moved the code splitting the screen shadowing updates to a separate
+  function.
+
+- Suspend the sending of updates if input is received from the user.
+
+- Make use of callback mechanism implemented in the nxshadow library
+  to suspend screen polling when input is received from the user.
+
+- Flush the display link when requested by the proxy.
+
+nxagent-3.0.0-15
+
+- Print the following info when the screen is resized: "Info: Resized
+  screen [<screen number>] to [<width>x<height>].
+
+- Changes to comply with nxshadow library.
+
+- Fixed the height of screen updates in shadowing mode.
+
+- Terminate cleanly if shadowing initialization fails.
+
+- Split shadowing screen updates in smaller rectangles for slow links.
+
+nxagent-3.0.0-14
+
+- Fixed a compilation error in NXrender.c.
+
+nxagent-3.0.0-13
+
+- Changed the LICENSE file to state that the software is only made
+  available under the version 2 of the GPL.
+
+- Added file COPYING.
+
+- Updated the files imported from X.org to the 6.9.0 release.
+
+nxagent-3.0.0-12
+
+- Fixed compilation on Sun platform.
+
+nxagent-3.0.0-11
+
+- Implemented an algorithm adapting colors if the target display have
+  different depth than the shadowed display. It requires that visuals
+  are TrueColor and depths are 16 or 24 or 32.
+
+- Added the option shadowmode. If this option is '0' the shadowing
+  session doesn't interact with the attached session.
+
+nxagent-3.0.0-10
+
+- Changes to comply with the nxshadow component.
+
+nxagent-3.0.0-9
+
+- Applied changes to files imported from X.org sources.
+
+- Updated copyright notices to the current year.
+
+nxagent-3.0.0-8
+
+- Imported changes up to nxagent-2.1.0-17.
+
+- Fixed problem with font path on Solaris 10.
+
+- Disabled some log messages.
+
+- If the agent has blocked when trying to write to the display, try to
+  read other events from the connection.
+
+- After synchronizing expose events, the result of subtraction is not
+  sent immediately, but added to a region. Expose events will be for-
+  warded to clients after exiting from the event loop.
+
+- Critical output is set when button mouse events are received.
+
+- Fixed TR12D01584. X11 sessions could not be started on Mandriva Li-
+  nux 2007 because of a different location of fonts. The font path
+  used by this distribution is now added to the alternates font paths.
+
+- Fixed TR11D01550. Modified the collection of visuals when nxagent
+  opens a display. Now we only use the ones with the same depth than
+  the default one set in the screen.
+
+- Modified the reconnection of pict-format structures, to avoid an
+  error that arises when migrating a session by a Linux machine to
+  a Windows one.
+
+- Small changes in handling of expose events.
+
+- GraphicsExpose are no more forwarded to clients immediately. They
+  are merged with remote-only exposures and sent later.
+
+- Invalidated expose queue elements dealing with destroyed windows.
+
+- Cleaned up code in nxagentSynchronizeExpose().
+
+- Fixed TR10D01541. Now when destroing a window if lastClientWindowPtr
+  point to this window then in nxagentClearClipboard() we put nxagent-
+  ClearClipboard to NULL and lastClientStage to SelectionStageNone.
+
+- Fixed a problem with LazyLevel option that wasn't correctly read
+  from command line.
+
+- Fixed an arithmetic exception raised when the viewable corrupted
+  region is empty but not nil.
+
+- Removed the obsolete 'sss' option.
+
+- Fixed a warning related to the expose queue.
+
+- Modified the queue of exposed region to remove some memmov() calls.
+
+- Remote expose events not having entries in the queue are collected
+  in a global region and sent later, instead of being sent immediate-
+  ly.
+
+- Changed nxagentCheckWindowConfiguration() to prevent unuseful calls
+  to XQueryTree().
+
+- Fixed TR10D01530. Fixed an invalid write in doOpenFont().
+
+- Fixed some invalid write/read in nxagentVerifyDefaultFontPath().
+
+- Fixed TR10D01518. If needed, a restack is performed on the top level
+  windows in rootless mode.
+
+- Fixed TR10D01520. Reviewed session termination and log messages in
+  the case of indirect XDMCP.
+
+- In PictureCreateDefaultFormats(), cleaned the PictFormatRec struct
+  when the format is not supported.
+
+- Fixed TR09D01498. As it is possible to use multiple paths where to
+  store the fonts, now the agent concatenates all the existing font
+  paths used in various XFree/Xorg distributions to obtain a unique
+  default font path.
+
+- Fixed TR09D01502. The privates of the real pixmap are initialized
+  before trying to allocate a virtual pixmap, avoiding the possibility
+  to access an inconsistent structure in case the allocation fails.
+
+- Fixed a memory leak due to a missing deallocation of a virtual pix-
+  map's region.
+
+- Fixed TR08D01486. Removed a warning in NXrender.c.
+
+- Implemented FR08D01470. Now in the reconnection phase missing fonts
+  are replaced by the most similar picked among the available ones.
+
+- Fixed TR08D01480. A condition inside the nxagentWindowExposures
+  function was ignoring the possibility that the first region para-
+  meter could be a null region.
+
+- Fixed TR06D01409. Now NXCollectGrabPointer() is called with the
+  owner_events true in ActivatePointerGrab() .
+
+- Fixed TR03D01317. Increased the time after wich the session termina-
+  tes.
+
+- Fixed TR08D01475. In rootless, ConfigureWindow requests are only
+  forwarded to the X server, even if no window manager has been detec-
+  ted.
+
+- Fixed TR04D01367. An XKB event is sent to notify that keyboard map-
+  ping has changed.
+
+- Check the number of regions in the list before running nxagentSynch-
+  ronizeExpose().
+
+- Reduced the number of GCs used during the drawable synchronization.
+
+- Optimized the corrupted region synchronization trying to use the
+  extents is some circumstances instead of split the full region.
+
+- Checked and removed some FIXME.
+
+- Fixed TR05D01384. Xgl server uses less picture formats than nxagent
+  usually does. Now the PictFormat structures used by nxagent are fil-
+  tered with the ones available for the real display.
+
+- Fixed TR06D01410. Function nxagentRestoreAreas have to make use of
+  a GC with subwindow mode ClipByChildren for preventing from repaint
+  also children of restored window. Children are restored in a separ-
+  ate call, if they have backing store on.
+
+- Fixed TR07D01426. The cursor data were swapped in place if the dis-
+  play had different bitmap bit order. Let Xlib do this work on a copy
+  of the image, preventing from messing up the original data.
+
+- Fixed TR07D01450. Some fonts were missing in the list of available
+  fonts because the ListFonts pattern used to build this list was too
+  much generic. To build a full font list two different patterns have
+  been used.
+
+- Fixed TR07D01449. Some X clients might affect the X screen saver
+  functioning modifying the default properties. The SetScreenSaver
+  request now correctly checks the parameters changes to avoid any
+  issue.
+
+- Fixed TR07D01432. X11 sessions could not be started on Debian 'Etch'
+  because of a different location of fonts. The font path provided by
+  the Debian Policy is now added to the alternates font paths.
+
+- Fixed TR07D01437. The auto suspend timer was reset when it should
+  not.
+
+- Fixed a conditional jump on uninitialised value.
+
+- Fixed TR05D01380. Now migrating a session when display have a 16-bit
+  depth does recover all visuals, avoiding reconnection failure.
+
+nxagent-3.0.0-7
+
+- Fixed problems occurring when the main session is terminated and the
+  connection is refused to the shadow agent.
+
+- Fixed include directory order for Solaris.
+
+nxagent-3.0.0-6
+
+- The shadow agent works only in viewport mode.
+
+- Added nxagentShadowCreateMainWindow function. This function creates a
+  pixmap and a window for mirroring the display root window.
+
+- Added NXShadowUpdateBuffer() function in order to create the buffer
+  for the poller with the same sizes of the root window of the master
+  agent.
+
+- Added NXxrandr.c NXxrandr.h and NXxrandrint.h files.
+
+- If the main agent screen is resized, the shadow agent adapts to the
+  new size of the root window.
+
+- Changed option activating mirror to -S.
+
+- Removed usleep() call when the agent is suspended.
+
+- Input events are sent to the main session even if it is in sus-
+  pended state.
+
+- Updates are made from top to bottom.
+
+- Added the option IgnoreVisibility. If this option is set, PutImage
+  is not skipped when the window is fully obscured.
+
+- Added the option 'shadow' saying the display to attach.
+
+nxagent-3.0.0-5
+
+- Added the mirror mode. It is activated by -M option.
+
+- Recovered the state of keys when the agent in access mode loses
+  focus in mirror mode.
+
+- Changes to work with 16-bit depth display in mirror mode.
+
+- Changed the Imakefile in order to include NXaccess.h and NXaccess-
+  Event.h files.
+
+- The layout keyboard is passed to NXShadowCreate() function in order
+  to load the right keymap file in mirror mode.
+
+nxagent-3.0.0-4
+
+- Small changes to build on 64 bit x86 platform.
+
+nxagent-3.0.0-3
+
+- Fixes to build on Cygwin platform.
+
+- Change the order of include directories in Imakefile.
+
+- Renamed GC.h, Window.h and Pixmap.h to avoid name clashes.
+
+- Undefined NXAGENT_UPDRADE in Composite.c and NXcomposite* files.
+
+- Defined ddxBeforeReset() in Init.c.
+
+nxagent-3.0.0-2
+
+- Merged changes to NXdispatch.c, NXdixfonts.c, NXmiwindow.c, NX-
+  picture.c, NXproperty.c, NXrender.c, NXresource.c, NXwindow.c.
+
+nxagent-3.0.0-1
+
+- Opened the 3.0.0 branch based on nxagent-2.0.0-88.
+
+nxagent-2.0.0-88
+
+- Fixed a memory leak in the code handling the remote font list.
+
+- Removed some log message.
+
+nxagent-2.0.0-87
+
+- The box size is checked during the region synchronization to avoid a
+  possible arithmetic exception.
+
+nxagent-2.0.0-86
+
+- Checked the validity of the colormap in nxagentChangeWindowAttri-
+  butes().
+
+nxagent-2.0.0-85
+
+- Fixed the bad destination coordinates of shared memory pixmap synch-
+  ronization in nxagentCopyArea() and nxagentCopyPlane() functions.
+
+nxagent-2.0.0-84
+
+- Discard the Terminate Server key sequence Ctrl-Alt-BackSpace.
+
+nxagent-2.0.0-83
+
+- Added a workaround to prevent the use of an inconsistent client poi-
+  nter in the nxagentNotifyConvertFailure() function.
+
+nxagent-2.0.0-82
+
+- Fixed the parsing of option 'backingstore'.
+
+nxagent-2.0.0-81
+
+- The agent window visibility on the real X server is used together
+  with the internal state to decide if graphics operations can be
+  avoided.
+
+- When restoring areas, if the backing pixmap is corrupted, an expose
+  event is sent to the region that can't be restored.
+
+nxagent-2.0.0-80
+
+- The core protocol requests internally used to accomplish a Render
+  extension request are no longer propagated to the real X server. To
+  be more precise in this way we can save many XCreatePixmap, XChange-
+  GC and XSetClipRectangles.
+
+- Corrected a minimal incoherence in nxagentCopyArea in managing the
+  creation and deallocation of a region.
+
+- Fixed a double synchronization of an aged drawable during a put ima-
+  ge operation, due to a missing check of nxagentSplitTrap value.
+
+- Added the VisibilityChangeMask bit to the event masks.
+
+- Improved the algorithm which prevents the server client's resource
+  duplication.
+
+nxagent-2.0.0-79
+
+- Added the 'lazylevel' option usable in the command line to specify
+  how much the Agent should be lazy. The default level is 2. Each
+  level adds the following rules to the previous ones:
+
+  Level 0  The lazy is off.
+
+  Level 1  The put images are skipped if we were out of bandwidth,
+           unless that the destination drawable has an old corru-
+           pted region.
+
+  Level 2  No data is put or copied on pixmaps, marking them always
+           as corrupted and synchronizing them on demand.
+
+  Level 3  The put images over the windows are skipped marking the
+           destination as corrupted. When a copy area to a window is
+           requested, the source is synchronized before copying it.
+
+  Level 4  The source drawable is no longer synchronized before a
+           copy area, but the operation is clipped to the synchro-
+           nized region.
+
+- Implemented a dynamic synchronization mechanism, based on user ac-
+  tivity: if the input devices are not used for a variable amount of
+  time (depending from the configured link type), the synchronization
+  starts and goes on until there is enough bandwidth.
+
+- Minor fixes to the way the copy area propagates the corrupted re-
+  gion.
+
+- Whenever a put image is done, a full synchronization is forced on
+  the destination drawable if it has an old corrupted region.
+
+- During the overall synchronization a drawable is skipped if its
+  timestamp is lower than the synchronization interval.
+
+- Updated the copy plane to skip the operations from a corrupted pix-
+  map to another pixmap.
+
+- Fixed the pixmaps synchronization which was not checking the avai-
+  lable bandwidth.
+
+- In rootless mode, ConfigureWindow requests are not internally per-
+  formed for top level windows if a window manager is running. Anyway
+  they are forwarded to the X server.
+
+- Enabled the DPMS extension.
+
+- Fixed the -dpi option.
+
+nxagent-2.0.0-78
+
+- When the remote proxy supports the alpha encoding, the alpha data
+  is sent compressed. When connected to an old version, the agent
+  uses the NXSetUnpackAlphaCompat() call.
+
+- Added support for the RLE pack method.
+
+nxagent-2.0.0-77
+
+- Fixed the check for special keystrokes. State mask for Alt and Meta
+  keys are inferred from the X server modifier map.
+
+nxagent-2.0.0-76
+
+- Fixed application icon in rootless mode.
+
+- If SYNC_WHOLE_GLYPH_DRAWABLE is set in Render.c the whole drawables
+  used in the composite glyphs are synchronized. This is useful to
+  evaluate the policy we should use to minimize the put images.
+
+- Code cleanup in Pixmap.c concerning the synchronization functions.
+
+- Added the nxagentSynchronizeBox() function.
+
+- Setting a wide band link (ADSL, WAN, LAN) disables Lazy and Strea-
+  ming options.
+
+- Now the Lazy option can be switched by the Ctrl+Alt+E keystroke.
+
+- Set a timestamp on a drawable to verify how much old its data are.
+  If we didn't update it since two seconds, the put image operations
+  are not skipped.
+
+- The image data split in chunks smaller than a threshold is now mo-
+  ved from the nxagentPutImage() to the nxagentRealizeImage() func-
+  tion. If a chunk is going to be put on an hidden area of a window,
+  the operation is skipped.
+
+- Fixed the value assigned to the id of the alpha visual. Now it is
+  assigned by XAllocID().
+
+- Removed a call to XSetInputFocus() before mapping the default win-
+  dows.
+
+- Restored the backup display pointer when failing to reconnect the
+  display.
+
+- Fixed some return value in the options parser function.
+
+- Fixed the parsing of environment variable.
+
+nxagent-2.0.0-75
+
+- Optionally split the long X_RenderTrapezoid requests in multiple
+  messages to help the compression.
+
+nxagent-2.0.0-74
+
+- Fixed a bug preventing the reconnection of pictures.
+
+- Fixed the way the agent notify its start up to NX Client. Now the
+  ownership of agent atom is set before the reconnection of pixmaps.
+
+nxagent-2.0.0-73
+
+- Added a check on the display pointer in nxagentTerminateDisplay()
+  to ensure that we don't try to force an I/O error if the display
+  is already down.
+
+- The image operations now are clipped to the visible area of the
+  drawable. As this may hamper the caching algorithm, only source
+  images bigger than 32K are clipped.
+
+- Code cleanup in Render.c.
+
+- When setting SKIP_LOUSY_RENDER_OPERATIONS in Render.c the realiza-
+  tion of some operations is skipped. This is useful to determine
+  how clients (mis)use the RENDER extension to achieve even worse
+  performance than they were able to achieve using the core protocol.
+
+nxagent-2.0.0-72
+
+- Ensured that SIGUSR1 and SIGUSR2 are ignored if the NX transport
+  is not running.
+
+nxagent-2.0.0-71
+
+- Modified the following messages used to track the session state:
+
+  From: "Session: Session starting at..."
+  To:   "Session: Starting session at..."
+
+  From: "Session: Session terminating at..."
+  To:   "Session: Terminating session at..."
+
+nxagent-2.0.0-70
+
+- Removed the obsolete 'Info' messages related to the 'fast' versus
+  'slow' copy area and get image modes. The -slow and -fast options
+  are now ignored as ignored are the keystrokes that allowed switch-
+  ing between the two modes.
+
+- Removed more obsolete warnings and commented the logs left around
+  for test purposes.
+
+- Removed the code in NXdispatch.c handling the fake get-image.
+
+- Removed the flags related to the use of the frame-buffer.
+
+- Major code cleanup in GCOps.c, Window.c, GC.c, Pixmap.c, Screen.c.
+
+nxagent-2.0.0-69
+
+- Added a check to avoid parsing an empty DISPLAY variable.
+
+- Added parsing of the 'streaming' option.
+
+- GetTimeInMillis() function is compiled only if DDXTIME is defined,
+  to avoid double definition errors on Solaris platform.
+
+- Messages "Suspending session..." and "Session suspended..." are not
+  printed if the DE_TERMINATE dispatch exception is set.
+
+- When synchronizing the shared memory pixmaps the image is no longer
+  put on the framebuffer.
+
+- Code cleanup in the nxagentSynhronizeRegion() function.
+
+- Added the 'lazy' option to enable or disable the lazy policy. It is
+  activated by default. At the moment this is configured at compile
+  time and can't be changed through a command line or the option file.
+
+- Fixed the counter of the corrupted backgrounds by checking if the
+  pixmap was already marked.
+
+- The option SharedPixmaps is now activated by default.
+
+- Fixed a problem when synchronizing the shared memory pixmaps with
+  the operation being erroneously skipped.
+
+nxagent-2.0.0-68
+
+- If we are doing a copy area to a pixmap and the source drawable is
+  not synchronized, the destination is marked as corrupted and the co-
+  py area request is not propagated to the X server. As a general rule
+  the source drawables are now synchronized only when they are copied
+  to a visible window.
+
+- The nxagentSynchronizeRegion() function synchronizes the region one
+  box at a time. This solves the incorrect pictures synchronization.
+
+- When a new element is added to the list of exposed region, sending
+  the synchronization request to the X server is postponed to the next
+  call of nxagentFlushConfigureWindow().
+
+nxagent-2.0.0-67
+
+- Ensured that NXTransDestroy() is called when getting rid of the NX
+  transport.
+
+nxagent-2.0.0-66
+
+- The various messages used by the NX server to control the state of
+  the session have been changed and the NX server will have to be mo-
+  dified accordingly.
+
+  At the early startup the agent will print the following message:
+
+  "Info: Agent running with pid '...'."
+
+  Followed by:
+
+  "Session: Session starting at '...'."
+
+  The ellipsis here represent the current timestamp, as reported by
+  the POSIX function ctime():
+
+  Example: Mon May 22 15:07:11 2006.
+
+  After the connection to the remote display has been established,
+  the agent will print the following message:
+
+  "Session: Session started at '...'."
+
+  This replaces the old messages:
+
+  "Info: Session started, state is [SESSION_UP]."
+
+  Or:
+
+  "Info: XDMCP session started, state is [SESSION_UP]."
+
+  And:
+
+  "Info: Entering dispatch loop with exception 0x0."
+
+  If the display connection can't be established, due to a network
+  failure, for example, the agent will exit with a fatal error, for
+  example:
+
+  "Fatal server error:
+   Error: Unable to open display 'nx/nx,options=...'."
+
+  This is a special case, as the X server is still initializing and
+  the agent can't intercept all the possible causes of errors.
+
+  When suspending the session, the agent will print one of the fol-
+  lowing messages, depending on the reason of the disconnection:
+
+  "Session: Suspending session at '...'."
+
+  Or:
+
+  "Session: Display failure detected at '...'."
+  "Session: Suspending session at '...'."
+
+  As soon as the disconnection procedure is completed, the agent will
+  notify the server with the message:
+
+  "Session: Session suspended at '...'."
+
+  This message replaces the old message:
+
+  "Session: Session suspended."
+
+  When entering the reconnection procedure, the agent will print:
+
+  "Session: Resuming session at '...'."
+
+  If the session can be successfully resumed, the agent will print:
+
+  "Session: Session resumed at '...'."
+
+  Otherwise, if the display cannot be opened or if the proxy is not
+  able to negotiate the session, the agent will return in suspended
+  mode by printing:
+
+  "Session: Display failure detected at '...'."
+  "Session: Session suspended at '...'."
+
+  At the time the session be terminated, the agent will print:
+
+  "Session: Session terminating at '...'."
+
+  Followed by:
+
+  "Session: Session terminated at '...'."
+
+  This replaces the old message:
+
+  Info: Exiting dispatch loop with exception 0x2.
+
+  The message 'Session terminated at...' should be the last message
+  parsed by the NX server. From that moment on the NX server will
+  wait the agent process to ensure that the cleanup procedures are
+  completed without errors and that the process successfully termi-
+  nates with the exit code 0.
+
+nxagent-2.0.0-65
+
+- Many improvements to the block handler and to the drawable synch-
+  ronization loop.
+
+- Anyway the synchronization loop is skipped, at the moment, to bet-
+  ter test the new copy area implementation. Also all the put-image
+  on pixmaps are skipped, so that the pixmaps are only synchronized
+  on demand.
+
+- Small fix in the put image to always use the region already allo-
+  cated when marking a region as corrupted.
+
+nxagent-2.0.0-64
+
+- The realization of the put image operations now depends on the
+  state of the link, as reported by the proxy through the synchroni-
+  zation handler. If the proxy link is aproaching a congestion, the
+  destination area of the drawable is marked as corrupted and the
+  operation is skipped.
+
+- At the moment the synchronization strategy is quite unsophistica-
+  ted. The drawables are synchronized when a timeout expires in the
+  block handler. The synchronization loop is aborted as soon as the
+  link approaches again the congestion and is restarted at the next
+  timeout.
+
+- Imported miwindow.c from the DIX layer. The code has been changed
+  to prevent miSetShape() from trying to destroy a null region. The
+  bug appears to be related to the backing store but it is unclear
+  if can also affect the sample server. The region is allocated at
+  the beginning of the function only if the backing store is set for
+  the window. Then miSetShape() calls miChangeSaveUnder(), that, in
+  turn, calls miCheckSubSaveUnder(). The latter can change the back-
+  ing store attribute of -some- windows, including, apparently, the
+  window that miSetShape() is processing. miSetShape() then destroys
+  the region if the backing store is set, but it doesn't verify if
+  the region was actually allocated. The problem is fixed by simply
+  adding a check on the pointer.
+
+nxagent-2.0.0-63
+
+- Added the nxagentDisplaySynchronizationHandler() callback. The NX
+  transport uses the callback to report when it is possible synchro-
+  nize the pixmaps and the other X objects that are corrupted or in-
+  complete.
+
+- Fixed nxagentClearSelection() to correctly validate the selection
+  owner before clearing the record.
+
+- Changed the NXGetControlParameters() call to reflect the changes
+  to the reply.
+
+nxagent-2.0.0-62
+
+- At reconnection the pixmap data is sent to the remote X server only
+  in two cases: if the pixmap is associated to a picture (glyphs, for
+  example) or if its depth is 1 (clip masks of GCs). All the other
+  pixmaps are marked as corrupted and synchronized on demand as soon
+  as the drawable is used as a source. This code is not enabled by
+  default and is currently being tested.
+
+- Implemented a new copy area function synchronizing the corrupted
+  region of a drawable before using it as a source.
+
+- Imported resource.c from the DIX. This makes possible to avoid the
+  duplication of the RT_GC, RT_FONT and RT_PIXMAP resource types.
+
+- Added the RT_NX_GC resource type and removed the old code dealing
+  with the reconnection of the GCs used by the GLX extension.
+
+- Fixed a problem in the synchronization of the window background.
+
+- Checked and removed some FIXMEs related to the streaming code.
+
+- Changed nxagentRestoreAreas() to take care of the width of the win-
+  dow's border.
+
+- Changed nxagentSaveAreas() to be independent from the window's pos-
+  ition.
+
+- Called nxagentMapDefaultWindows() before pixmaps' reconnection.
+
+- Changed nxagentMapDefaultWindows() to notify the client about the
+  agent's startup also when running in rootless mode.
+
+- Added the delete and backspace keystrokes to the routine removing
+  duplicated keys.
+
+- Wehn resizing the desktop the clip region of the children windows
+  is clipped to the new size of the root. This fixes a crash occur-
+  ring when resizing the desktop to the minimum height.
+
+nxagent-2.0.0-61
+
+- Changed the extraction of alpha channel from images to be endianess
+  independent.
+
+nxagent-2.0.0-60
+
+- nxagentReleaseSplit() now uses the NXAbortSplit() request to force
+  the proxy to discard the pending splits.
+
+- Added the value of the SharedMemory and SharedPixmaps options in
+  the log, together with the size of the shared memory segment used
+  by the remote proxy.
+
+- Fixed the compilation problem affecting the previous version.
+
+- The location of xkb base directory is checked by calling  _NXGetXkb-
+  BasePath() function.
+
+- Fixed TR05D01371. nxagentVerifyDefaultFontPath() is called only if
+  the default font path is not defined on the command line.
+
+- Removed some log message.
+
+nxagent-2.0.0-59
+
+- Improved the composite text operation to synchronize the regions
+  affected by the operation instead of the whole drawable.
+
+- Updated the copy plane to better propagate the corrupted region
+  to the destination.
+
+- The background pixmaps are synchronized with a deferred strategy.
+  Tiles and stipples are still synchronized as soon as the GC needs
+  to be used.
+
+- Completed the new copy area implementation.
+
+- Shared memory pixmaps are not synchronized after a RenderChange-
+  Picture operation. This needs further testing.
+
+- Added a nxagentNotifyKeyboardChanges() function that sends a Map-
+  pingNotify event to clients when the keyboard is reloaded or re-
+  configured. The SendMappingNotify() function is not used anymore.
+  This hopefully solves the TR01D01284.
+
+- Moved the nxagentResetKeyboard() function in Keyboard.c.
+
+- Checked if the previous sibling of a window is changed before try-
+  ing to restack it. This saves the redundant window configuration
+  requests of the previous version.
+
+nxagent-2.0.0-58
+
+- Before composite glyphs operations, only areas intersecting the
+  glyphs extents are synchronized.
+
+- When a new split resource is allocated, a copy of the GC used by
+  the put image operation is created. Such copy will be safely used
+  by the commit operation even if the original GC is changed or
+  destroyed.
+
+nxagent-2.0.0-57
+
+- Region saved by the backing store and corrupted region of backing
+  store pixmaps are emptied at suspend and resume time. This makes
+  the exposures go to the clients that will redraw their windows.
+
+- Changed the nxagent root window cursor. The cursor of the parent
+  window is used instead of the default 'X' cursor.
+
+nxagent-2.0.0-56
+
+- Rewritten the state machine handling the streaming of the images.
+
+- By calling FatalError(), the normal server shutdown was skipped
+  and left the X server socket in .X11-unix. This happened also if
+  for any reason the agent couldn't complete the session startup.
+  Now the DDX abort routine, if the agent is not exiting because of
+  an exception, calls nxagentAbortDisplay() which closes down the
+  well known sockets.
+
+- Upon a failure of the reconnection procedure, if the alert shown
+  to the user by leveraging the proxy control channel is not set
+  to a valid code, the function in will use a default.
+
+nxagent-2.0.0-55
+
+- Added an explicit link flush in the display block handler. The
+  block handler should now be called by nx-X11 before entering the
+  select, not only the the agent has entered WaitForReadable() or
+  WaitForWritable().
+
+- Removed the checks on the value of the Streaming option. The way
+  a drawable is treated only depends from its previous state.
+
+- Started reimplementing the copy area operation to better propaga-
+  te the corrupted region to the destination.
+
+- Shared pixmaps are now synchronized before a copy plane operation.
+
+- The unpack alpha is discarded before the drawable synchronization.
+  This fixes the problems with the synchronization of the cursor. A
+  better way to deal with the condition is to be considered for the
+  future.
+
+- Added a check in the nxagentPutImage() function to skip the opera-
+  tion if the window is fully obscured.
+
+nxagent-2.0.0-54
+
+- Fixed a bug in nxagentPaintWindowBackground(). A region passed as
+  parameter was modified by this function and this affected subseq-
+  uent operations involving the region.
+
+- In rootless mode, the map state of a top level window is uncondit-
+  ionally reflected in the internal state when receiving a map event
+  from the real display.
+
+nxagent-2.0.0-53
+
+- Regions are marked as synchronized after an image operation if the
+  image didn't generate a split.
+
+- When an image operation takes place on a drawable which is already
+  being streamed, the resource is marked as invalid and the commits
+  are discarded.
+
+- A specific trap is used at the time a drawable is synchronized.
+
+- Fixed Render.c to use the latest streaming code.
+
+nxagent-2.0.0-52
+
+- Fixed a problem in rootless mode where some windows could have mis-
+  sed to update the mapped flag after a MapNotify event.
+
+nxagent-2.0.0-51
+
+- Realization of images is skipped, if the link is down, and a small
+  delay is introduced before returning from the image function.
+
+- Started implementing a new handler to let the agent include arbit-
+  rary data in the transport statistics. For now, only the interfa-
+  ces and the stubs exist, and the handler is not registered to the
+  proxy.
+
+nxagent-2.0.0-50
+
+- Removed the unused code in nxagentCheckPixmapIntegrity().
+
+- Instead of calling nxagentShapeWindow() immediately, windows to be
+  reshaped are added to the list of windows that have to be configur-
+  ed at later time. This allows SaveAreas() to work even when windows
+  change shape, as in the case of the "bouncing cursor" as implement-
+  ed in some versions of the KDE.
+
+- Added a missing call to nxagentFlushConfigureWindow() in the recon-
+  nection procedure.
+
+nxagent-2.0.0-49
+
+- Code cleanup in the lazy encoding. Implemented distinct utilities
+  to allocate the split resources and manage the corrupted areas.
+
+- The Render.c file is taken from the previous version because the
+  updates break the composite code.
+
+- Renamed the option 'Lazy' to 'Streaming'.
+
+nxagent-2.0.0-48
+
+- Made the image cache use the agent data, instead of allocating and
+  copying.
+
+- Fixed a memory leak in the image routines.
+
+- The image cache is freed at exit. This helps investigating other
+  eventual leaks.
+
+nxagent-2.0.0-47
+
+- Solved the problem at reconnection with lazy encoding enabled.
+
+nxagent-2.0.0-46
+
+- Solved a bug in the parsing of the pack method that made the agent
+  select an unavailable id.
+
+nxagent-2.0.0-45
+
+- Ensured that images are explicitly byte swapped before sending to
+  an X server using a different byte order. In the attempt of saving
+  an expensive operation, the previous code let the unpack procedure
+  do the job, but this could fail to work in some special cases.
+
+- Cleaned the bitmaps used for the core cursors before putting the
+  image.
+
+- Left the display error handler installed during all the lifetime
+  of the session so that other parts of the code don't have to inst-
+  all it explicitly before entering a critical Xlib routine.
+
+- Removed more unused code.
+
+nxagent-2.0.0-44
+
+- Fixed the problem with the cursor image being encoded with a lossy
+  method. The fix is a temporary. The final solution requires changes
+  to the lazy encoding.
+
+- Reworked the code dealing with the alpha visual. The color mask is
+  set based on the endianess of the remote display and is recreated
+  after a session resume.
+
+- Removed more unused code.
+
+nxagent-2.0.0-43
+
+- Corrupted regions are now correctly clipped to the visible area of
+  the drawable.
+
+- Fixed a problem with the clip mask when calculating the intersect-
+  ion of the clip region with the destination region.
+
+- Drawables involved in a composite glyph operation are now synchro-
+  nized prior to being used.
+
+- The nxagentRealizeDrawable() function is now called only for draw-
+  ables that are not already synchronized.
+
+- Pixmaps are now skipped in the synchronization loop. Synchronizat-
+  ion of pixmap is to be implemented.
+
+nxagent-2.0.0-42
+
+- Improved the algorithm removing the duplicated keys by trying to
+  read more events.
+
+nxagent-2.0.0-41
+
+- Made use of the NXFinishSplit() request to speed up the completion
+  of a pending split.
+
+- Added an explicit NX transport flush before any operation that may
+  block waiting for data from the X server.
+
+- Set the NX flush policy to deferred after reconnection.
+
+- Solved refresh problems when reconnecting in rootless mode.
+
+- Modified the routine removing duplicated arrow key events. Now the
+  routine deals with page down and page up keys as well.
+
+- Added a check for xkb base directory path, in order to support new
+  Linux distributions.
+
+- Disabled backing store support for rootless sessions, as implement-
+  ation is not very functional, yet.
+
+nxagent-2.0.0-40
+
+- Removed code related to old managing of backing store.
+
+- Added initialization of backing store by calling miInitializeBack-
+  ingStore().
+
+- Implemented nxagentSaveAreas() and nxagentRestoreAreas() functions.
+  These functions are based on fb code. Calls to XCopyArea() have been
+  added in their implementation to make them be effective also on the
+  real X server.
+
+- Instead of calling nxagentConfigureWindow() in ClipNotify() and
+  PositionWindow(), windows to be configured or mapped are added to a
+  list, together with a mask storing operation that have to be done.
+  Windows in the list will be configured or mapped later by calling
+  nxagentFlushConfigureWindow(). This avoids that windows were mapped
+  or configured before saving areas in the backing store pixmaps.
+
+- The function nxagentFlushConfigureWindow() is called before resto-
+  ring areas on the X server in nxagentRestoreAreas() and at the end
+  of ConfigureWindow and MapWindow in the DIX layer.
+
+- Blocked the NoExpose events at the proxy side.
+
+- Fixed an error in nxagentCompareRegions().
+
+nxagent-2.0.0-39
+
+- Ensured that the display errors are detected while waiting for a
+  split operation to complete.
+
+- Removed more unused code.
+
+nxagent-2.0.0-38
+
+- Changed nxagentSetCursorPosition() to avoid warping the cursor if
+  the requesting client is NULL or the serverClient.
+
+- Added a specific trap to avoid compressing an image associated to
+  a RENDER cursor using a lossy encoding.
+
+nxagent-2.0.0-37
+
+- Added a check in nxagentPaintWindowBackground() to avoid calling of
+  XClearArea() if the window is not realized.
+
+- Modified nxagentAtomNames in Atoms.c to include CLIPBOARD and TIME-
+  STAMP atoms, avoiding further calls to XInternAtom in Clipboard.c.
+
+- Solved TR04D01356. Auto repeat mode setting is no more propagated to
+  the X server keyboard.
+
+- Cleaned up the code in the routine removing duplicated arrow key
+  events.
+
+nxagent-2.0.0-36
+
+- Added the Literals.h file. For now it just contains a table used
+  to translate a request opcode to the name of the X request, to be
+  used for test purposes.
+
+nxagent-2.0.0-35
+
+- Major code rewrite in nxagentPutSubImage(). Removed support for the
+  deprecated image encodings. Ensured that padding bytes are cleaned
+  before trying to locate the image in the nxcompext cache. Avoided
+  to store the image in the cache if it is coming from a XVideo or
+  GLX operation.
+
+- Added support for the new RGB image encoder. This allows the agent
+  to use the simplest encoding by still separating the alpha channel
+  from the image data.
+
+- Added the missing check in nxagentRedirectWindow() verifying that
+  use of the composite extension is enabled.
+
+- Updated to use the new NXCleanImage() function.
+
+- Removed more debugging output.
+
+nxagent-2.0.0-34
+
+- Updated to use the 'what' parameter in NXFlushDisplay().
+
+- Removed the duplicated arrow key events from the event queue.
+
+- Solved the TR04D01355. The X11 agent now tries to locate the
+  fonts.dir file in the misc directory, to verify the validity of
+  the font path.
+
+- Added a check in nxagentChangeClip to avoid creating a new clip
+  mask if the old clip mask matches the former.
+
+- Use the 'fixed' font to replace fonts that are not found a the
+  display reconnection. This should overcome one the most common
+  sources of troubles when migrating the session to a different
+  display, and constitute the base for improving the algorithm
+  trying to match a substitute font.
+
+- Implemented the FR04D01360. Now the user can enable/disable the
+  streaming of the images by using the option 'streaming'.
+
+- Implemented the FR04D01358. The backing-store can be enabled or
+  disabled by using the  option 'backingstore'.
+
+- Forced the reconnection routine to call the IOError handler in
+  the case the display cannot be opened.
+
+nxagent-2.0.0-33
+
+- The GetImage requests in 'slow' mode are now served by retrieving
+  the content of the drawable from the frame buffer.
+
+- Replaced a call to XQueryExtension() by one to XRenderQueryExten-
+  sion(). This function caches previous QueryExtension requests. This
+  partially implements FR01D01275.
+
+- At reconnection, the keyboard is reset only if the keyboard option
+  has been changed.
+
+- Fixed the fonts reconnection procedure. Now the remote fonts list
+  is refilled before fonts reconnection and after failed fonts
+  reconnection, so as to store the correct list of available fonts.
+
+- Added a check in nxagentLoadQueryFont to look up selected font in
+  the list of available fonts. This check avoid filling FontStruct
+  with invalid data.
+
+- Added TIMESTAMP to handled selection targets.
+
+nxagent-2.0.0-32
+
+- Implemented FR03D01323. Added the 'clipboard' option to enable or
+  disable copy and paste operations from the user's desktop to the NX
+  session or vice versa. This option can take four values:
+
+  client  The content copied on the client can be pasted inside the
+          NX session.
+
+  server  The content copied inside the NX session can be pasted
+          on the client.
+
+  both    The copy & paste operations are allowed both between the
+          client and the NX session and viceversa.
+
+  none    The copy&paste operations between the client and the NX
+          session are never allowed.
+
+nxagent-2.0.0-31
+
+- Implemented FR03D01337. Now the X11 agent is able to read the op-
+  tions from different places according to the following order: the
+  DISPLAY variable, the options file, the command line.
+
+- Implemented FR03D01347. Added 'composite' to parsed options.
+
+- Always activate shared memory support in the remote X server proxy.
+
+- Modified nxagentCopyArea for the case the source is a shared memory
+  pixmap. The pixmap on the X server is not synchronized, but the con-
+  tent of the shared pixmap mantained by the agent is placed directly
+  on the destination drawable. This allows to skip the following Copy-
+  Area operation.
+
+nxagent-2.0.0-30
+
+- Added the missing flush of the Xlib buffer at the beginning of
+  the block handler.
+
+nxagent-2.0.0-29
+
+- Changes in the block and wakeup handlers to queue multiple reads
+  and flush the link on demand.
+
+- Removed the unused code in Control.h and Control.c. Renamed the
+  files as Client.h and Client.c.
+
+- Added support for the '-nocomposite' command line option.
+
+nxagent-2.0.0-28
+
+- Moved the composite code to Composite.h and Composite.c.
+
+- Redirected the top-level windows when running in rootless mode.
+
+nxagent-2.0.0-27
+
+- When the composite extension is supported by the remote display,
+  the agent window is redirected to the off-screen memory of the
+  X server.
+
+- Imported Xcomposite.c, Xcomposite.h and xcompositeint.h from the
+  3.0.0 branch to be able to activate the off-screen redirection of
+  the top level windows.
+
+- Added Composite to the list of agent options. The default is to
+  use the composite extension, when available.
+
+nxagent-2.0.0-26
+
+- Avoided to suspend the clients on excess of karma or after a get
+  input focus request.
+
+- Images are now split only when the agent is in congestion state.
+
+- Moved all the image related functions from GCOps.h and GCOps.c to
+  Image.h and Image.c.
+
+- Removed the unused includes in GCOps.c and Image.c.
+
+- Added the karma delay field to the NXGetControlParameters() call.
+
+- Renamed placeholder.xpm as nxmissing.xpm. Renamed the Icon.h file
+  as Icons.h. Added there a define to point at nxmissing.xpm in the
+  include.
+
+nxagent-2.0.0-25
+
+- Implemented the FR03D01334. Option keyboard is now a synonym of
+  option kbtype.
+
+nxagent-2.0.0-24
+
+- Ensured that the split procedure is completed before executing a
+  render operation that required a synchronization of a shared mem-
+  ory pixmap.
+
+- Added the appropriate checks to avoid synchronizing the same sha-
+  red memory pixmap multiple times.
+
+nxagent-2.0.0-23
+
+- Imported changes to NXrender.c and NXshm.c in the files for the
+  3.0.0 port.
+
+nxagent-2.0.0-22
+
+- Implemented FR03D01331. Options shpix and shmem enable/disable the
+  use of shared pixmaps and shared memory extension.
+
+- Implented handling of value "query" for nxagentKbtype. This value
+  is passed by the NX client for MacOSX. If value of nxagentKbtype is
+  "query" or NULL we init keyboard by core protocol functions reading
+  the keyvoard mapping of the X server. The property _XKB_RULES_NAMES
+  is always set on the root window with default values of model and
+  layout.
+
+- Fixed TR11C01223. When the XDM connection can't be established the
+  agent creates an alert to notify the user that XDM session failed
+  to start.
+
+- Changed Clipboard.c to fix invalid read errors in nxagentGetClip-
+  boardWindow() function.
+
+- Implemented FR11C01218. Modified Font.c introducing the new function
+  nxagentLoadQueryFont, this function loads the font_struct struct
+  locally instead of sending a QueryFont request.
+
+- Modified nxagentListRemoteFontsfunction to fill nxagentFontList
+  struct with all remote fonts, avoiding further calls to XListFonts.
+
+- Added two functions, nxagentFreeRemoteFontList and nxagentFreeFont,
+  used in disconnect phase to empty the nxagentFontList struct and
+  the cached FontStruct elements, respectively.
+
+nxagent-2.0.0-21
+
+- Updated to include the remote proxy version in the NXGetControl-
+  Parameter reply.
+
+- Updated to use the NXDisplayFlush() and NXSetDisplayPolicy() int-
+  erfaces.
+
+nxagent-2.0.0-20
+
+- NXInitDisplay() and NXResetDisplay() are called at the time we
+  open or close the display, to let nxcompext set up its internal
+  structures.
+
+nxagent-2.0.0-19
+
+- Activated the streaming of the images even in the case of a link
+  type LAN.
+
+- In NXmiexpose.c, if the number of rectangles in an exposed region
+  exceeds 4, we let a predicate function decide if it is better to
+  send the window extents, rather than the rectangles in the region.
+
+- Added the NXAGENT_SERVER define in the Imakefile. It will be used
+  in future to mark all the modifications made to files we imported
+  from other layers.
+
+- Removed the warnings from NXmiexpose.c.
+
+nxagent-2.0.0-18
+
+- Imported NXmiexpose.c in the agent code.
+
+- Removed NXmiwindow.c from the agent code. We now use the original
+  miwindow.c
+
+- Removed the static qualifier from the _NXFontPath definition.
+
+- Started implementing the new lazy encoding mechanism. For each of
+  the drawables, the agent will create a "corrupted" region and will
+  try to synchronize the drawable when there is bandwidth available.
+  This is a work in progress.
+
+- Implemented the function nxagentFbOnShadowDisplay. This is a test
+  facility which opens a window on the display showing the content
+  of the agent's framebuffer.
+
+nxagent-2.0.0-17
+
+- The image streaming procedure is now activated also when using a
+  link of type LAN.
+
+- Removed the call to NXTransDestroy() in nxagentCloseDisplay. The
+  NX transport is now implicitly shut down by either NXForceDisplay-
+  Error() or XCloseDisplay().
+
+- Updated to comply with the new NX function prototypes introduced
+  in nxcomp-2.0.0-31.
+
+nxagent-2.0.0-16
+
+- Fixed a bug in the nxagentModifyPixmapHeader function that was
+  causing some glyphs to be displayed incorrectly.
+
+- Implemented the test function nxagentPixmapOnShadowDisplay, useful
+  to display a pixmap on the real screen to check its consistency.
+
+nxagent-2.0.0-15
+
+- Ensured that, before restarting a client after a no-split, all the
+  pending image commits are executed.
+
+- Installed the display error predicate function before trying to
+  open the display even at session startup. This prevents the agent
+  from disappearing silently if a failure occurs before the display
+  initialization is completed.
+
+- Moved the initialization of the callback functions in Display.c.
+
+- Added some interfaces to manipulate the callbacks and the error
+  handlers and verify the state of the display flags.
+
+nxagent-2.0.0-14
+
+- Implemented stub versions of the nxagentDisplayCongestionHandler()
+  and nxagentDisplayBlockHandler() callbacks. See nx-X11-2.0.0-17.
+
+- Added the nxagentDisplayErrorPredicate() function. In combination
+  with changes implemented in nx-X11-2.0.0-16, this allows the agent
+  to abort a blocking operation and shutdown the display in a timely
+  fashion if a signal or any other error condition is received insi-
+  de Xlib.
+
+- Modified nxagentWaitSplitEvent() to use XIfEvent() as we can trust
+  the proxy to either send the event or give up the proxy connection.
+  The function will also give up when an error condition is raised,
+  like for example a session termination requested by the user.
+
+- Removed any remaining reference to the unused display buffer and
+  image cleanup functions.
+
+- Fixed exposures problems when reconnecting.
+
+- Solved TR05C00896. The problem was due to window manager utilizing
+  zero-thick-lines drawing requests. These drawing operations are now
+  performed by calling fbPolySegment() instead of miPolySegment(),
+   which doesn't handle the zero-thick-lines drawing case.
+
+nxagent-2.0.0-13
+
+- Improved the management of the expose events. We now create the
+  fake window used to keep the agent synchronized with the X server
+  only once, instead of creating and configuring a different window
+  for each generated region.
+
+- A warning is printed if the changes requested for the fake window
+  don't match the changes reported in the subsequent ConfigureNotify
+  event.
+
+- Imported previous changes in NXevents.c into the 3.0.0 port.
+
+nxagent-2.0.0-12
+
+- Activated the image streaming also during the reconnection. This
+  makes possible to leverage the remote disk cache.
+
+- Ensured that all clients are restarted when the session is suspen-
+  ded. This is required because the proxy is gone but we may have
+  some client still waiting for the completion of a split procedure.
+
+- Skipped the reset of the keyboard device if the display breaks at
+  the time it is being reconnected.
+
+- As the reset of the keyboard may have failed before we were able
+  to set a valid DeviceIntPtr, also added a check in ProcessPointer-
+  Event(), in NXevents.c to verify that the state of the display is
+  valid before accessing any of the device members. This is to be
+  better investigated.
+
+nxagent-2.0.0-11
+
+- Solved TR02D01298. The clip region associated to the current glyph
+  was not updated because the serial number of the virtual pixmap
+  pointed by the picture was not incremented.
+
+- Imported the NXmiglyph.c file from render directory.
+
+- Removed the patch added in the release 1.3.2-6 temporary fixing this
+  problem.
+
+nxagent-2.0.0-10
+
+- Various improvements the wakeup procedures.
+
+- Implemented the FR10C01110. Now, the X11 agent manages both the
+  PRIMARY and CLIPBOARD selections. It is possible copy and paste text
+  also by using Ctrl+C and Ctrl-V.
+
+- Modified NXdispatch.c in order to correctly include header files.
+
+- More cosmetic changes and code cleanup.
+
+- Imported changes into the files for the 3.0.0 port.
+
+nxagent-2.0.0-9
+
+- Rewritten the procedures suspending and resuming the clients in
+  Control.c. This solves a problem with clients that were restarted
+  at wrong time and should ensure that multiple events for the same
+  client are correctly handled.
+
+- Removed the calls to NXSetUnpackGeometry() setting the parameters
+  for the client 0. The geometry is now set only at the right time,
+  just before trying to unpack the image.
+
+- Removed the sample code using the NXTransChannel() interface.
+
+nxagent-2.0.0-8
+
+- Added test code showing how to open a new NX channel by using the
+  NXTransChannel() interface.
+
+- Streaming of images is not attempted in the case of link LAN.
+
+- Added preliminary code to the tell the proxy to flush the link if
+  the agent is idle.
+
+- Imported changes from nx-X11-2.0.0-14 in NXdixfonts.c.
+
+nxagent-2.0.0-7
+
+- Modified exposures managing: agent synchronizes both with remote X
+  server and remote window manager for every generated region. Synch-
+  ronization is reached sending a ConfigureWindow request for a fake
+  window created on purpose. This way the exposures for the resulting
+  region coming from calculating the difference between local region
+  and the remote region are sent to clients in order to avoid duplica-
+  ted refreshes.
+
+- Improved new algorithm for managing exposures in order to work pro-
+  perly also in rootless mode: added privates to windows in order to
+  get information about mapping of windows on remote X server and vi-
+  sibility state too. This way local exposures are replaced by remote
+  ones if windows are mapped only for agent or windows are not fully
+  visible. This solves TR08C00971.
+
+- Window attributes values about backing store and save-under are re-
+  spectively set to NotUseful and False when creating a window on re-
+  mote X server and ignored when a client requests to change these
+  attributes.
+
+- Removed a no more needed function call to generate exposures when
+  resizing windows.
+
+nxagent-2.0.0-6
+
+- Updated the NoMachine copyright notices.
+
+nxagent-2.0.0-5
+
+- Added handling of font reconnection failure. In case of failure in
+  reconnecting some font, the agent adds the font server connection
+  forwarded by nxcomp to the font path of the X server.
+
+- Fixed TR09C01022. Moved the handling of the session states into
+  main cycle. The session states are not more handled into SIGHUP and
+  IOError handlers but into nxagentHandleConnectionStates() called in
+  nxagentWakeupHandler().
+
+- In ResizeChildrenWinSize(), privates storing window geometry are
+  updated even if the call to PositionWindow() is skipped. This have
+  to be done because the window is moved by the X server accordingly
+  with window gravity. This prevent some window positioning error on
+  the real display evidenced with OpenOffice and GNOME.
+
+nxagent-2.0.0-4
+
+- Solved TR12C01234. In some conditions Alt-F4 keystroke made the user
+  unable to open the Gnome Menu panel. This was due to the agent dis-
+  carding KeyRelease events for Alt-F4 and Alt-F2.
+
+- Undefined TEST and DEBUG in Dialog.c
+
+- Changed the NXAGENT_VERSION define from 1.5.0 to 2.0.0
+
+- Caching and streaming of images is now disabled when dispatching
+  requests from the GLX and XVideo extensions.
+
+- Added the NXxvdisp.c and NXglxext.c files. These files are needed
+  to intercept calls to the XVideo and GLX extensions. Only files
+  in the main directory are imported. Files in the X directory, used
+  for the 3.0.0 port, for now are empty.
+
+- Added the nxagentXvTrap and nxagentGlxTrap flags. These flags are
+  set when dispatching requests from the XVideo and GLX extensions.
+
+- Added the GL and Xext include directories to the Imakefile to be
+  able to compile the NXxvdisp.c and NXglxext.c sources.
+
+- Modified the NXrender.c and NXshm.c files to set the nxagentGCTrap
+  nxagentRenderTrap and nxagentShmTrap even when dispatching requests
+  from swapped clients. Files for the 3.0.0 port are not updated.
+
+nxagent-2.0.0-3
+
+- Solved a problem in the export of WM_SIZE_HINTS properties in root-
+  less mode on 64 bit machines.
+
+- Modified Render.c in order to correctly process Xrender header fi-
+  les on 64 bit machines.
+
+- Made changes in order to compile the agent in the Cygwin environ-
+  ment.
+
+- Renamed the files Time.* to Millis.*
+
+- Specified the relative path of some included header files.
+
+- In the Imakefile added a new include paths order related to the
+  Cygwin environment to avoid name clashes.
+
+- Disabled the MIT-SHM extension in the Cygwin environment.
+
+- Fixed TR11C01186. Added -timeout item to the usage message.
+
+- Fixed TR08C00945. Scrolling a document in Firefox caused image left-
+  overs with animated banners. Set the right window gravity on windows
+  created in the real X server. Let X move children for us accordingly
+  with window gravity attribute, without dix interferences.
+
+- Removed logs related to parsing of the options file.
+
+- Modified dialogs in order to show the name of the session in the
+  caption.
+
+nxagent-2.0.0-2
+
+- Imported changes up to nxagent-1.5.0-112.
+
+- Fixed TR12C01241. The failure condition returned by the XQueryTree
+  function is managed in order to avoid the subsequent errors.
+
+- Fixed the TR11C01165. X11 sessions could not be started on Ubuntu
+  5.10 because of the different location of fonts. Now we check the
+  existence of the fonts directory pointed by the default XF86 and
+  X.org font path and, if the directory does not exist, we use the
+  alternate font path used on Ubuntu.
+
+- Set the default value of DeviceControl option to False before resu-
+  ming a session.
+
+- Added a warning message printed if reset of keyboard fails at recon-
+  nection.
+
+- Fixed TR11C01185. Solved by checking if there are windows iconized
+  when a window is destroyed.
+
+- Fixed TR11C01164. The xkbcomp process used LD_LIBRARY_PATH as it was
+  a child of the agent. Added a call to NXUnsetLibraryPath() in Init.c
+  in order to remove LD_LIBRARY_PATH before executing a child process.
+
+- Check if there are windows iconized before terminating a rootless
+  session.
+
+- Modified CHANGELOG to include reference to fixed TRs TR08C00967 and
+  TR08C00969. Removed some typo.
+
+- Fixed TR11C01194. The agent crashed if launched with -kb option.
+
+- Fixed TR10C01042. The keyboard didn't work if the session migrated
+  from Apple X server to another platform and viceversa. This has been
+  solved by initializing the keyboard device whenever the session is
+  resumed. This feature can be disabled by the new option -nokbreset.
+
+- Fixed some compilation error arising if TEST was enabled in the file
+  Keyboard.c.
+
+- Fixed TR11C01167. During the disconnection the font structures poin-
+  ted by the font cache were freed leaving inconsistent data in the
+  corresponding privates. Now they are nullified and the GCs are che-
+  cked to guarantee a correct font handling in the suspended state.
+
+nxagent-2.0.0-1
+
+- Opened the 2.0.0 branch based on the 1.6.0-11.
+
+nxagent-1.6.0-11
+
+- Updated the NX.original copies of files in X directory.
+
+- Merged the NX changes:
+
+  - From dix/extension.c to NXextension.c.
+  - From dix/dixfonts.c to NXdixfonts.c.
+  - From dix/glyphcurs.c to NXglyphcurs.c.
+
+- Export of CARDINAL properties are expanded to 64 bit units on 64
+  bit machines.
+
+- Solved a segmentation fault when handling configure notify events
+  in rootless mode on 64 bit machines.
+
+- Merged the NX changes from dix/property in X/NXproperty.c.
+
+- Correctly allocated the local variable used in the call to NXGet-
+  CollectedInputFocus to be of 64 bit on 64 bit machine.
+
+- Defined symbolic constants XlibWindow in order to propertly handle
+  export property on 64 bit machine.
+
+- Moved the XlibAtom define from Atoms.h to Agent.h.
+
+- Modified export properties of type Window and Atom in order to han-
+  dle correctly Window and Atom types on 64 bit machines.
+
+- Removed some invalid read in Atom handling code when compiled for 64
+  bit, due to mismatched size of Atom type between Xlib and Xserver
+  code.
+
+- Modified some header files in order to properly see the correct pro-
+  totypes of some Xlib structures on 64 bit machines.
+
+- The variable currentDispatch is always defined.
+
+- The dispatch current time is updated, this way the initial timeout
+  can elapse and the splash window is removed.
+
+nxagent-1.6.0-10
+
+- Imported changes from nxagent-1.5.0-103.
+
+- Removed some redundant redeclarations.
+
+- Merged the NX changes from randr/randr.c to NXrandr.c.
+
+- Removed some warnings in NXrandr.c.
+
+- Removed NXAGENT_FORCEBACK and NXAGENT_INTERNALBS code.
+
+- Added ddxInitGlobals function in order to compile with the new X.org
+  tree.
+
+- Converted nxagentSynchronizeShmPixmap from macro to function to
+  solve a graphical render problem caused by the variable's scope.
+
+nxagent-1.6.0-9
+
+- Imported changes from nxagent-1.5.0-102
+
+- Fixed TR10C01124. Function nxagentSetPictureFilter() filled the log
+  with  a debug message.
+
+- Removed a debug message in Events.c.
+
+- Run function nxagentSetTopLevelEventMask() only in rootless mode.
+
+- In the Java application IntelliJ the dropdown menus was shown in a
+  wrong position when the main window was moved or minimized. The
+  problem is solved for KDE desktop environment.
+
+- Fixed TR08C00967, TR08C00969, TR08C00941. Our incomplete implementa-
+  tion of the MIT-SHM X11 extension was a problem for some applica-
+  tions using the Shared Memory Pixmaps. Now the extension support has
+  been completed, so the nxagent can handle the Shared Memory Pixmaps
+  requests. Introduced some changes in the render implementation to
+  synchronize the content of the Shared Memory Pixmaps with the X ser-
+  ver before performing the ChangePicture and Composite operations.
+
+nxagent-1.6.0-8
+
+- Fixed TR09C01028. The problem was the GC foreground was not updated
+  on the X server. This was due to the private fields was not copied
+  from a GC to another in the function nxagentCopyGC(). Added macro
+  nxagentCopyGCPriv in GC.h.
+
+- Solved TR11C01162. Removed the dialog shown by nxcomp/nxagent when
+  the resume of a session is happening over a slow link.
+
+nxagent-1.6.0-7
+
+- Imported changes up to nxagent-1.5.0-100.
+
+- Fixed some compilation errors.
+
+- Fixed a typo in nxagentChangeClip() declaration.
+
+- Fixed TR10C01040. After the session resume the applications using
+  OpenGL were not correctly resumed because some GCs were not recon-
+  nected. Now we save these GCs in a safe vector, so we can't lose
+  them.
+
+- Improved font reconnection procedure in order to take advantage of
+  new font channel provided by nxcomp. If resuming session fails be-
+  cause missing fonts, the font channel provided by nxcomp is added
+  to font paths of X server. After reconnection succeded the font
+  channel is removed from font paths.
+
+- In the Java application IntelliJ the dropdown menus remained opened
+  and shown in a wrong position when the main window was moved or
+  minimized. This problem has been solved by sending a sinthetic event
+  to client. This solves partially TR09C01012.
+
+- In the same application the caret was not shown in the text window.
+  Solved the problem by setting nxagentGCTrap before calling a MI
+  function in every GC operations.
+
+- Merged the NX changes:
+
+  - From render/glyph.c to NXglyph.c.
+  - From Xext/shm.c to NXshm.c.
+  - From render/render.c to NXrender.c.
+  - From mi/miwindow.c to NXmiwindow.c
+  - From render/glyphstr.h to NXglyphstr.h.
+  - From render/picturestr.h to NXpicturestr.h.
+  - From render/picture.c to NXpicture.c.
+  - From dix/dispatch.c to NXdispatch.c.
+  - From dix/events.c to NXevents.c.
+
+- Changed picturestr.h glyphstr.h to remove some formatting changes
+  compared to the original files.
+
+- Disabled Xinerama extension in order to fix a type conflict in NX-
+  dispatch.c.
+
+- The current directory has been moved in front of the include dire-
+  ctory list.
+
+- Removed NXAGENT_FORCEBACK code in files imported from DIX.
+
+- Changed NXshm.c NXrandr.c NXproperty.c  NXpicture.c NXglyphcurs.c
+  NXglyph.c NXextension.c NXrender.c NXdixfonts.c NXdispatch.c NXmi-
+  window.c to remove some formatting changes compared to the original
+  files.
+
+- Added copyright notice to file NXrandr.c.
+
+- All files, except those from mi and dix, compile fine in the new
+  tree. Problems remain with different size of Atoms and other XID
+  objects.
+
+- More compilation fixes for the new tree.
+
+- Merged the NX changes from dix/window.c to NXwindow.c.
+
+- Changed NXwindow.c and NXevents.c to remove some formatting chan-
+  ges compared to the original files.
+
+- More compilation fixes aimed at porting the agent to the new tree.
+
+- Started porting the agent to the 6.8.99.16 X.org tree.
+
+- Lot of compilation fixes aimed at building in the new environment.
+
+- Files imported from the X.org tree's dix and mi will have to be
+  recreated in the nxagent/X directory. The new files will be inclu-
+  ded and built from the nxagent/X director if the NXAGENT_UPGRADE
+  symbol is defined (as it is the case when building in the 2.0.0
+  nx-X11 tree), otherwise the usual NX* files in the nxagent's dir-
+  ectory will be compiled.
+
+- Fixed TR09C01021. SIGHUP it was not received from the proxy. The
+  handler of SIGHUP must be installed also in the case of not persi-
+  stent sessions.
+
+- In non persistent case: if session is normally running, SIGHUP sig-
+  nal is dealt like SIGTERM, otherwise it is passed to the proxy.
+
+- Fixed TR09C01027. Changed function nxagentHandleConfigureNotify()
+  in order to get changes of the staking order in a rootless session
+  even if no window manager is running.
+
+- Fixed TR09C01025. The problem was XView application could be unable
+  to respond to user's input. Modified the Event Mask for non top le-
+  vel windows reparented by the root window. Set the input member of
+  XWMHints to communicate the window manager the keyboard focus model
+  used by the application.
+
+- Fixed TR09C01026. Added 'fast' and 'slow' to the set of accepted
+  command line parameters. 'fast', 'slow' and 'geometry' command line
+  parameters have precedence regarding the options file.
+
+- Fixed TR08C00968. There was a problem in the implementation of the
+  render extension.
+
+- Fixed TR09C01016. In rootless mode when the session was resumed,
+  the cursor was shown with a wrong shape.
+
+- Fixed TR09C01011. Allowed clients to monitor the root window for
+  structure redirect, button press and resize redirect events in root-
+  less mode. This is a quick hack to make the java bean shell work
+  flawlessy with the agent.
+
+- Solved TR08C00961. Improved the algorithm updating the sprite win-
+  dow. Now it is updated based upon crossing and motion event. Since
+  on some X server, like Windows and MacOsX X servers, the only cros-
+  sing event is not a reliable method to trace the sprite window chan-
+  ges.
+
+- Fixed TR08C00966. Solved the problem on Windows when a rootless
+  session is suspended and some of the application windows are
+  minimized.
+
+- Fixed TR08C00960. Updated the internal screen dimension in rootless
+  sessions at reconnection.
+
+- Fixed TR09C01005. The problem was that the 'render' option on the
+  command line was overridden by the one provided in the options file.
+
+- Implemented the HandleEmptySplitEvent function that synchronizes all
+  the drawables after the depletion of the split store, when the lazy
+  option is activated.
+
+- Some changes in order to avoid duplicated refreshes when display-
+  ing Mandrake's kde menu.
+
+- Changed level of some logs from WARNING into TEST in Window.c and
+  in Rootless.c.
+
+- Fixed TR08C00958. Changed the log message printed when the user re-
+  quest to resume the session.
+
+nxagent-1.6.0-6
+
+- When reconnecting, try to estimate the shift on the main window due
+  to WM reparenting.
+
+- In the handling of configure events, if a WM is running save the po-
+  sition of the main window only if event is synthetic.
+
+nxagent-1.6.0-5
+
+- Command line option -noshmem disables shared memory extension in the
+  agent.
+
+- Changed level of some logs from WARNING into TEST.
+
+nxagent-1.6.0-4
+
+- Some changes in order to improve handling of expose events in root-
+  less. The GetInputFocus request is not sent after reconfiguring a
+  top level window: window manager intervention could give race condi-
+  tions. The request is placed in WindowsRestructured() in order to be
+  sure it is sent after any event that could generate expose.
+
+- Zero lenght change property are now imported in rootless mode.
+
+- Corrected few typos.
+
+- Replaced the function usleep with NXTransContinue when NX transport
+  is running.
+
+- Changed the session state to GOING_DOWN as soon as the reconnection
+  is failed.
+
+nxagent-1.6.0-3
+
+- Updated rootless toplevel window map when a window is reparented to
+  the root window.
+
+- Renoved duplicated entry in rootless toplevel window map.
+
+nxagent-1.6.0-2
+
+- Removed TEST and DEBUG in Color.c.
+
+- Removed a compilation error in Atoms.c if DEBUG is enabled.
+
+- Removed invalid read at server reset in rootless mode, now the a-
+  toms description are duplicate before that we cache them.
+
+- Now the local atom in the atom cache are reset when exiting from
+  the dispatch loop.
+
+nxagent-1.6.0-1
+
+- Opened the 1.6.0 branch based on nxagent-1.5.0-87.
+
+nxagent-1.5.0-87
+
+- Corrected the enable-disable lazy encoding dialog in order to show
+  the correct keystroke Ctrl-Alt-E.
+
+nxagent-1.5.0-86
+
+- Reset agent position at reconnection when the new size of display
+  doesn't match the old size and fullscreen is on.
+
+- Inserted a comment about handling of expose events.
+
+nxagent-1.5.0-85
+
+- If fullscreen and resize options are true when reconnecting, geo-
+  metry option is ignored and the root window is resized to the en-
+  tire screen.
+
+- Read the position of the main window at startup from geometry op-
+  tions.
+
+nxagent-1.5.0-84
+
+- Changed the keystroke Ctrl-Alt-L to toggle the image encoding on
+  and off to the new combination Ctrl-Alt-E.
+
+- Enabled the keystroke Ctrl-Alt-M to minimize the root window also
+  in window mode.
+
+nxagent-1.5.0-83
+
+- Replaced the call to XIfEvent() with something less efficient but
+  safer, based on XCheckIfEvent(). The previous version might never
+  return if an I/O Error was encountered waiting for the event. The
+  new version fails gracefully, and returns after having restarted
+  the client.
+
+nxagent-1.5.0-82
+
+- Removed some debug logs.
+
+nxagent-1.5.0-81
+
+- Forced window mode if X server geometry has changed at reconnection.
+
+nxagent-1.5.0-80
+
+- Reset resize desktop at startup flag before reconnection.
+
+nxagent-1.5.0-79
+
+- Removed race condition in the parsing order of the options parame-
+  ter, now the geometry parameters are set in screen initialization.
+
+nxagent-1.5.0-78
+
+- Disabled auto-resize and viewport mode dialog in case of rootless
+  session.
+
+- Removed no more used -backingstore option from usage messages.
+
+- Modified -bs command line option: now the default value "when_re-
+  quested" is always set.
+
+- Fixed wrong size of root window when switching from full screen to
+  window mode and viewport navigation mode is enabled.
+
+- Added option that solved a minimize bug in LeaveNotify when the
+  root window is in full screen and the user is using viewport navi-
+  gation mode.
+
+- Forwarded HUP signal to NX transport, when session state is up and
+  running.
+
+nxagent-1.5.0-77
+
+- Do PutImage in every case. Don't check if the drawable is synchro-
+  nized.
+
+- Do CopyArea, CopyPlane, Composite in every case, don't check whether
+  the source is dirty.
+
+nxagent-1.5.0-76
+
+- Terminate rootless session 15 seconds after the last mapped window
+  has been destroyed.
+
+nxagent-1.5.0-75
+
+- Ctrl-Alt-T shows suspend/terminate dialog also in rootless mode.
+
+- Sleeps 50 ms in the block handler if the session state is down.
+
+- In rootless mode, the focus window is changed following FocusIn
+  events received from the real X server, also in the case no win-
+  dow manager has been detected.
+
+nxagent-1.5.0-74
+
+- Changed the alerts names to comply with nxcomp-1.5.0-57.
+
+- Moved loading of placeholder from startup to the first time it is
+  needed.
+
+- Corrected a typo in the CHANGELOG.
+
+nxagent-1.5.0-73
+
+- Ignored put image on not synchronized drawables, when the image
+  doesn't cover the entire surface.
+
+- Added parsing of render parameter in option file.
+
+- Ignored I/O Error when session is suspended.
+
+- Managed I/O Error at reconnection.
+
+nxagent-1.5.0-72
+
+- Fixed offset of the default window at reconnection and after switch-
+  ing from fullscreen in window mode.
+
+- Suppressed the -lazy command line option.
+
+- Made some slightly changes in GCOps.c and Pixmap.c in order to com-
+  ply with the new 'Lazy' option.
+
+- Avoided to do CopyArea, CopyPlane and Composite operations when the
+  source drawable is dirty.
+
+- Rootless disconnect dialog has changed. This dialog is launched
+  after some time the last window has been closed.
+
+- Ignored geometry changes at reconnection if resize at startup is
+  not set.
+
+- Removed reset of the offset of the root window in viewport mode at
+  reconnection.
+
+- Fixed some refreshes problems in viewport mode and in desktop resize
+  mode.
+
+- Fixed a memory leak in nxagentWindowExposures().
+
+- Added predicate to nxagentDispatchEvents.
+
+- Implemented framework in order to wait for a free resource entry,
+  when calling the asynchronous Collect* functions.
+
+nxagent-1.5.0-71
+
+- Added keystroke Ctrl+Alt+L switching lazy encoding option.
+
+- Disabled viewport movement in resize mode.
+
+- Changed agent geometry at screen resize.
+
+- Changed agent geometry at initialization.
+
+nxagent-1.5.0-70
+
+- Restored the set of blocked signal after the dialog pid just laun-
+  ched has been stored.
+
+- Removed an already fixed FIXME.
+
+- Updated the copyright message.
+
+nxagent-1.5.0-69
+
+- Started working at the integration of the lazy encoding functiona-
+  lity. Made the agent draw the placeholder if the image is split and
+  never suspend the client. There is no provision for synchronizing
+  the drawables yet.
+
+- Made the lazy encoding configurable by the new 'Lazy' option.
+
+- Updated to include the changes in the NXStartSplit() and NXCommit-
+  Split() requests.
+
+- This version requires nxcomp-1.5.0-55 and nxcompext-1.5.0-16.
+
+nxagent-1.5.0-68
+
+- Fixed reconnection of iconified windows.
+
+- Ignored the X server's scratch pixmap at reconnection.
+
+- The desktop gets automatically resized at reconnection if the desk-
+  top resize option is enabled.
+
+- Added the resize option in nxagentProcessOptionsFile() to allow the
+  user to change the geometry of both the root and the default window
+  at reconnection.
+
+- Fixed max size of the default window at startup when auto-resize
+  mode is enabled or in the case of a reconnected session.
+
+- Made some minimal changes in Atoms.c and NXdispatch.c.
+
+nxagent-1.5.0-67
+
+- Changed handling of expose events received from real X server. A re-
+  gion is composed from expose events by checking the count field.
+
+- Reimplemented the exposures managing. Now the GetInputFocus request
+  is sent after a window has been configured or unmapped. We use a
+  vector to store windows originating expose events while waiting for
+  the reply to GetInputFocus.
+
+nxagent-1.5.0-66
+
+- Added the DisplayLatency value in the agent options. This is int-
+  ended to give a hint about the latency of the current display
+  connection. The value is currently used to determine if the agent
+  is running across a slow link, and so it's appropriate to display
+  the begin-reconnection alert.
+
+nxagent-1.5.0-65
+
+- Added the DesktopResize option. It controls the behaviour of the
+  automatic (RandR) resize of the desktop when dragging the agent's
+  window border.
+
+- Automatic resize is again the default.
+
+- Disabled the test logs in Events.c, GCOps.c Pixmap.c, Handlers.c,
+  Reconnect.c.
+
+- More cosmetic changes and code cleanup.
+
+nxagent-1.5.0-64
+
+- Rewritten the image streaming procedure to better leverage the new
+  infrastructure. The start-split/end-split procedure is always init-
+  iated by the agent, including when the size of the image is below
+  the threshold, but the client is only suspended when the split has
+  taken place in the NX transport.
+
+nxagent-1.5.0-63
+
+- Updated image streaming to use the new NX notification events.
+
+- Removed the references to the NXSync() operation, not used anymore
+  by the agent.
+
+nxagent-1.5.0-62
+
+- Fixed wrong position of the root window in case of viewport naviga-
+  tion mode.
+
+- Added a field to the client private to trace the client type.
+
+- Tracked which clients are nxclient dialogs in order to not run the
+  pulldown dialog on them.
+
+nxagent-1.5.0-61
+
+- Disabled server reset if not needed by XDMCP.
+
+- Disabled persistence for indirect XDMCP session until the first gre-
+  eter with the list of host has disappeared.
+
+- Created a small data structure to contain information about integri-
+  ty status and placeholder status of a drawable.
+
+- Modified the call to nxagentRealizeOnePixmap function in order to
+  avoid errors during the signal handling.
+
+nxagent-1.5.0-60
+
+- Added the XDMCP option. If both Rootless and XDMCP are selected the
+  session will fail.
+
+nxagent-1.5.0-59
+
+- Limited the permission to reset the agent only to indirect XDMCP
+  sessions, only one reset is allowed.
+
+- Fixed max size of the default window when switching from fullscreen
+  to window mode and auto-resize is disabled.
+
+nxagent-1.5.0-58
+
+- Enabled reset mechanism, in order to make XDMCP session work proper-
+  ly.
+
+- Added XSync for window manager detection, after a server reset since
+  the XInternAtom already used should be cached.
+
+- Now the pixmap status is always tested on real pixmap.
+
+- The placeholder is drawn only once per drawable.
+
+- Implemented nxagentUnmapWindows() in case of failed reconnection if
+  the session was running in fullscreen mode and NX transport is not
+  enabled.
+
+- In nxagentPutSplitImage(), passing leftPad to XCreateImage().
+
+- This version avoids sending the XSync() to the remote when a large
+  amounts of GetInputFocus requests are issued by the same client.
+  It will require more testing, especially to verify how it works on
+  old Windows machines.
+
+- Changed the NXCommitSplit() call to comply with the new interface.
+
+- The drawable status is now propagated on graphic operations where
+  the source is using the tile and stipple components on the graphic
+  context and the tile or stipple are not synchronized. This affects
+  the following operations:
+
+  - PolyLines
+  - PolySegment
+  - PolyRectangle
+  - PolyArc
+  - FillPolygon
+  - PolyFillRect
+  - PolyFillArc
+  - PolyText8
+  - PolyText16
+
+nxagent-1.5.0-57
+
+- Removed two XSync() operations at screen initialization.
+
+- Modified keyboard initialization in order to load the correct rules.
+  This is choosen according to the vendor string of X-Window system in-
+  stalled on the local machine.
+
+- Corrected a few typos.
+
+- When the NX transport is present, the failed reconnection dialog is
+  launched on the remote X server by using the NXTransAlert() function.
+  The same dialog is managed by NXTransDialog() when a session is run
+  by connecting directly to the display.
+
+- Removed the function nxagentUnmapAllWindows().
+
+nxagent-1.5.0-56
+
+- Set the parent window for the pulldown dialog.
+
+nxagent-1.5.0-55
+
+- Added an alert at the time the reconnection procedure begins. The
+  alert is shown only when the NX transport is present and the link
+  type is not LAN and is removed at the end of the resume operation.
+
+- Removed the former code used for testing the alert functionality.
+
+- Moved the function removing the splash window in Splash.c.
+
+nxagent-1.5.0-54
+
+- Fixed initialization of window privates storing exposed regions.
+  This solves a bug affecting the refresh of windows introduced in
+  nxagent-1.5.0-42.
+
+- Added a STARTING state to nxagent. Until the agent is in this state
+  the suspension mechanism is not activated.
+
+nxagent-1.5.0-53
+
+- Added the special keystroke Ctrl+Alt+R to enable or disable the
+  auto-resize mode.
+
+- A dialog notifies the user when the auto-resize mode is toggled.
+
+- Added a test alert at startup, to verify that NXTransAlert() is
+  working as expected.
+
+nxagent-1.5.0-52
+
+- Changed the code to call NXTransDialog() and NXTransExit().
+
+nxagent-1.5.0-51
+
+- Solved a bug that prevented the clients that had been restarted
+  to be immediately selected for input.
+
+- Removed some code that was added for debugging.
+
+nxagent-1.5.0-50
+
+- Fixed a memory leak in nxagentHandleExposeEvent().
+
+- Fixed a memory leak in nxagentDestroyWindow().
+
+- Now rootless dialog is launched only when last mapped window is
+  deleted, since we have pulldown window to control the session.
+
+- Added pulldown dialog to handle NX windows in rootless sessions.
+  This dialog is activated from a "magic" slice of window under the
+  top border.
+
+- Solved a problem with sessions that might fail at reconnection.
+
+- Now the message text of the dialog launched in case of failed re-
+  connection explains the reason why the agent cannot be resumed.
+
+- Implemented function nxagentUnmapAllWindows() to unmap all windows
+  if nxagent has failed to migrate the session to the new display.
+
+nxagent-1.5.0-49
+
+- Fixed the problems with propagation of the drawable status.
+
+- Modified nxagentPutSplitImage in order to set the correct height
+  of the last split image.
+
+- Code cleaning and optimization in Dialog.c.
+
+- Solved bug that switched on the full screen state in rootless se-
+  ssion.
+
+- Changed the way dialog caption are set in rootless mode. It is set
+  upon the session name or session id value.
+
+- Corrected the function nxagentFailedReconnectinDialog().
+
+nxagent-1.5.0-48
+
+- Solved bug that switched on the full screen state in rootless se-
+  ssion.
+
+- Changed the way dialog caption are set in rootless mode. It is set
+  upon the session name or session id value.
+
+- Corrected the function nxagentFailedReconnectinDialog().
+
+nxagent-1.5.0-47
+
+- Now we call NXContinueOnDisplayError() with value 1 just after
+  having opened the display. This will cause the NX Xlib to return
+  in the case of an I/O error, instead of quitting the application.
+
+- Removed the references to Context.h and the related elements.
+
+- Reflected the changes occurred in NXlib.c regarding NXDisplayErr-
+  ror() and inverted the logic compared to NXDisplayIsValid().
+
+- Added a dialog box to notify the user when nxagent has failed to
+  migrate the session to the new display. Because the main X agent
+  connection is unavailable, this dialog uses the auxiliary nxcomp
+  keyboard channel.
+
+- Disabled the special keystroke Ctrl+Alt+S if any dialog is already
+  running.
+
+- Started implementing lazy synchronization of pixmaps. At the pre-
+  sent moment the implementation doesn't try to perform any optimi-
+  zation on the windows' regions that have to be redrawn and neither
+  it checks the congestion state. After having synchronized a reaso-
+  nable number of pixmaps, it simply sends to all the affected win-
+  dows an expose event, mandating the repaint of the whole area.
+
+- Removed a warning in Atoms.c.
+
+nxagent-1.5.0-46
+
+- Removed the longjmp() at the time an I/O error was encountered on
+  the display.
+
+nxagent-1.5.0-45
+
+- Removed UNDEFINED status for drawables.
+
+- Now lazy encoding affects only windows.
+
+- Changed the block handler to call NXTransFlush() with 'if needed'.
+
+nxagent-1.5.0-44
+
+- After reconnection, stored exposed regions are reset and the manag-
+  ing of duplicate expose events is restarted.
+
+- Detection of window manager has been moved to the start of screen
+  initialization. Screen dimensions and fullscreen option are over-
+  ridden if no window manager is detected.
+
+- Added a call to XSync() in switching fullscreen function in order
+  to synchronize it with the network behaviour.
+
+- Started adding provision for deferred writes in the NX transport.
+  When the flush policy will be set accordingly, X data accumulated
+  by the proxy will be written to the network under the control of
+  the block and wakeup handlers.
+
+- Fixed a bug in nxagentCopyArea(). In some cases, pixmap drawables
+  was erroneusly supposed to be windows. This produced invalid reads
+  when trying to access to fields of WindowRec structure.
+
+nxagent-1.5.0-43
+
+- In the code managing the property notify events, NXCollectProperty
+  is not called if the window is not found in the tree mantained by
+  the agent.
+
+- Changed managing of screen resize in order to avoid repeated resize
+  of desktop. The agent sleeps one second, then all configure event
+  are read from the queue and the server connection. The desktop re-
+  size is performed after the last read configure event.
+
+- Changed nxagentImportProperty() in order to use NXCollectProperty
+  instead of XGetWindowProperty. This avoids many round-trips in root-
+  less mode.
+
+- Fixed Invalid write problem in nxagentRRSetScreenConfig().
+
+nxagent-1.5.0-42
+
+- Modyfied test of NXSetUnpackGeometry for visuals, so now the compa-
+  rison between visuals is based on their IDs and not on the memory
+  area allocated for their visual structure.
+
+- Modified exposure managing in order to avoid duplicated refreshes.
+  Now only exposed regions not formerly managed yet are sent to the
+  clients.
+
+nxagent-1.5.0-41
+
+- Modified nxagentCloseScreen() in order to free the frame buffer.
+
+- Added information of the integrity of the windows. Now the integrity
+  has became a drawable property that will expand in every drawable to
+  drawable operation.
+
+nxagent-1.5.0-40
+
+- Splitting of images now happens only if the display is a valid con-
+  nection.
+
+- The isItTimeToYield flag is now set in the dispatcher only when the
+  client has been actually suspended because of a karma, a sync, or
+  a split operation.
+
+nxagent-1.5.0-39
+
+- Improved the handling of the PutImage request to offer provision
+  for splitting images coming from orders generated by extensions.
+
+- Fixed a problem with clients being unexpectedly restarted instead
+  of waiting for the end of split.
+
+nxagent-1.5.0-38
+
+- Added a persistent dialog when agent is running in rootless mode.
+
+- Modified the policy of management of nxclient dialogs.
+
+- Fixed memory leak problem in nxagentPutSplitImage().
+
+- Modified printing of some debug messages to avoid passing a null
+  pointer to fprintf().
+
+nxagent-1.5.0-37
+
+- Implemented initial support for streaming the packed images in the
+  handling of the MIT-SHM extension.
+
+nxagent-1.5.0-36
+
+- Updated the pixmap status when a placeholder is copied on the pix-
+  map and when the pixmap is the target of a RENDER composite opera-
+  tion.
+
+- Solved the TR05C00900. The NX transport was forced to be set when-
+  ever the display name contained the nx prefix.
+
+- Implemented the FRSA052393. Removed the compression filters applied
+  by nxagent to cursor pixmaps.
+
+- Modified RANDR implementation to make the user able to resize the
+  desktop by simply dragging the agent window's border. Screen resize
+  is made after a small timeout, to give time to the last configure
+  event to come from the server and avoid multiple re-configurations
+  of the screen.
+
+nxagent-1.5.0-35
+
+- Added the current screen size to the set of sizes returned by the
+  RANDR extension.
+
+nxagent-1.5.0-34
+
+- Corrected the placeholder xpm image.
+
+- Added a client dialog to notify the user that nxagent is running in
+  fast or in slow mode after pressing Ctrl + Alt + S.
+
+- Modified RANDR implementation to give a set of screen sizes. Im-
+  plemented functions actually performing screen resize on a RANDR
+  request. Now toggling to fullscreen make the desktop cover the en-
+  tire screen area.
+
+nxagent-1.5.0-33
+
+- Added an auto-disconnect feature similar to the one present in the
+  Windows Terminal Server. The feature is modeled on the built-in X
+  server's screen-saver. If the agent doesn't receive any input from
+  the user in a given timeout, it will either terminate the session,
+  if no client is connected to the display, or will suspend it, so
+  that applications will be left running.
+
+- The default is to disable the auto-disconnect option. The feature
+  is activated by specifying a "-timeout s" parameter on the command
+  line, with s being the timeout in seconds. The minimum allowed ti-
+  meout is 60 seconds.
+
+- The waitpid() call now only checks the agent's own children.
+
+- Moved the longjmp() context declaration to a new Context.h file to
+  avoid clash with redefinitions by the PNG headers.
+
+- Few other cosmetic changes.
+
+nxagent-1.5.0-32
+
+- Added a check on the type of the connection to avoid cleaning the
+  images when not needed.
+
+nxagent-1.5.0-31
+
+- Modified the placeholder frames, now it has a left top black border
+  and a bottom right grey one.
+
+- Modified fbShmPutImage() in order to set the correct size for the
+  temporary pixmap.
+
+- Modified nxagentForceExposure() and nxagentHandleExposeEvent() in
+  order to clip exposed regions to the window size region of the root
+  window.
+
+- Added a new placeholder xpm image.
+
+- Corrected few typos.
+
+- Added function to synchronize GC tiles and stipples whenever those
+  pixmaps have been realized.
+
+nxagent-1.5.0-30
+
+- Hidden viewport windows to clients in QueryTree request in order
+  to make work XDMCP properly.
+
+nxagent-1.5.0-29
+
+- Removed some warnings with gcc 3.4.
+
+- Added desktop -D switch to usage.
+
+- Paint window background draw on framebuffer only with OpenOffice
+  client.
+
+- Now fast copy are and fast getimage are no more set according to
+  the link type, their default value has been set to true.
+
+nxagent-1.5.0-28
+
+- Modified nxagentUpdateViewportFrame() in order to solve a refresh
+  problem. Windows composing the external frame must be always on top
+  to be sure that agent sends expose events for every window.
+
+- In rootless mode agent doesn't export anymore the properties when
+  disconnected from the X server.
+
+- Changed the way agent check if the connection with the X server
+  is available. Instead of using a state machine it uses the display
+  flag.
+
+- Removed the SIGTERM handling function in persistent code. We don't
+  need anymore those function since agent is no more sleeping when
+  disconnected.
+
+- Implemented nxagentFreePropertyList() function in order to empty the
+  list of exported properties when the rootless agent is disconnected.
+
+- Added special keystroke Ctrl + Alt + S toggling between fast and
+  slow mode for GetImage and CopyArea.
+
+- Added missing handling of down arrow key in Keystroke.c.
+
+- Modified nxagentForceExposure() in order to intersect exposed re-
+  gions with the clip region of the root window. This prevents window
+  functions from painting outside the frame buffer.
+
+- Added the field usesFrameBuffer in struct nxagentPrivClient. Modifi-
+  ed GC funtion and DoGetImage() in order to write in the frame buffer
+  only if usesFrameBuffer is True.
+
+- Removed code performing PutImage in the frame buffer, as it is use-
+  less at the moment.
+
+- Modified ProcChangeProperty() to check WM_NAME property.
+
+- Added a piece of code in nxagentOpenScreen() checking for and remo-
+  ving duplicated visuals.
+
+- Added the Dialog.c Dialog.h files. Unified all calls to NXDialog,
+  and blocked SIGCHLD before calling in order not to get the signal
+  before the child pid has been stored.
+
+- Modified the algorithm that disconnect the running session in
+  order to avoid the opening of a new dialog box for closing or
+  suspending the nxagent.
+
+nxagent-1.5.0-27
+
+- Changed the disconnect/reconnect procedure in order to have a pro-
+  per default colormap vector when session is suspended, solving a
+  segmentation fault in create window function.
+
+- Corrected few errors in slow copy area mechanism.
+
+- Modified screen initialization in order to allocate memory for the
+  internal frame buffer.
+
+- Modified some GC functions for writing to and reading from the frame
+  buffer.
+
+- Modified nxagentCreateWindow() for initializing the window in the
+  frame buffer.
+
+- Modified nxagentCreateColormap() in order to use the default visual
+  if a matching one is not found.
+
+- Modified function DoGetImage() in order to call nxagentGetImage() in
+  place of nxagentGetDefaultImage() if fast option is on.
+
+- Added nxagentCheckWindowIntegrity() function verifying the matching
+  between the internal frame buffer and the X server for a window.
+
+nxagent-1.5.0-26
+
+- Added the property "_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR" to the list
+  of exported property in rootless mode, in order to let clients use
+  the system tray.
+
+- Modified import of WM_STATE properties in rootless mode in order
+  to better handle null resources.
+
+- Enhanced the slow CopyArea mechanism in case of one part of the
+  image is out of the X server screen or out of nxagent screen.
+
+- Changed type for variables width and height of default window
+  from 'unsigned int' to 'int'.
+
+nxagent-1.5.0-25
+
+- Added a new signal handler for SIGCHLD. The transport is set to
+  forward the signal (by means of a new NX_SIGNAL_FORWARD action).
+  This allows the agent to wait for its own children.
+
+nxagent-1.5.0-24
+
+- Set up the RANDR extension. When querying the configuration, the
+  clients get 3 sizes, the first being the current size, the second
+  being the maximum size of the remote display, the third being the
+  minimum size (arbitrarily set to 100x100 pixels). Screen sizes in
+  millimeters are calculated based on the size reported for the real
+  display.
+
+  An example of xrandr -q output is below:
+
+   SZ:    Pixels          Physical       Refresh
+  *0    800 x 600    ( 270mm x 203mm )
+   1    100 x 100    (  33mm x  33mm )
+   2   1400 x 1050   ( 474mm x 356mm )
+  Current rotation - normal
+  Current reflection - none
+  Rotations possible - normal
+  Reflections possible - none
+
+  As you can note, reflections and rotation is not possible.
+
+- Set up the GLX extension. This provides basic support with GLX op-
+  erations being translated into core X protocol primitives.
+
+- Moved initialization of GLX and RANDR to the Extensions.c file.
+
+- Removed the references to the unused mfb library. Modified Screen.c
+  to allocate the right privates for the fb code.
+
+- Modified the Xserver Imakefile to link nxagent with FbPostFbLibs
+  and avoid including mfb/libmfb.a.
+
+nxagent-1.5.0-23
+
+- Fixed an incorrect buffer length calculation when retrieving a re-
+  mote property.
+
+- Added a check to avoid the use of a NULL pointer when changing the
+  window cursor.
+
+- Implemented a function to lookup the remote pixmaps.
+
+- Changed the RENDER initialization messages.
+
+- Corrected a few typos in symbol names.
+
+nxagent-1.5.0-22
+
+- Added the nxagentNeedConnectionChange() macro.
+
+- Small optimizations in the block and wakeup handlers.
+
+nxagent-1.5.0-21
+
+- NXCollectGrabPointer() is called by passing nxagentDefaultClient().
+  This is a macro that checks the validity of requestingClient and,
+  if the pointer is NULL, defaults to NXNumberOfConnections - 1.
+
+nxagent-1.5.0-20
+
+- Replaced all calls to XGrabPointer with the asynchronous version
+  provided by nxcompext.
+
+- In DeactivatePointerGrab() function, mouse button state is set to
+  up if the window entered by the pointer is the root window and the
+  agent is in rootless mode. This change is needed because the sub-
+  sequent KeyRelease event could be not received by the agent (for
+  example if the focus had left the window), so that agent could be
+  unable to update the mouse button state.
+
+- In rootless mode, grabs exported to X in ActivatePointerGrab() are
+  always made asynchronous. The synchronous behaviour is implemented
+  by the agent, so that requiring a further synchronous grab down to
+  the real X server is of little use and potentially harmful.
+
+- Modified function XYToWindow() in order to manage the case that
+  mouse pointer is located on the title bar of a top level window in
+  rootless mode.
+
+- Reflected name changes to NXImageCache variables.
+
+nxagent-1.5.0-19
+
+- Changed the implementation of the SIGHUP handler to forward the sig-
+  nal to the proxy only when appropriate. This allows nxagent to close
+  the NX connection without having to go through an I/O error on the
+  display.
+
+- Modified nxagentBreakXConnection() to check if the NX transport is
+  running and thus use NXTransDestroy(). Using a simple shutdown() may
+  not work, for example if NX is using the memory to memory transport.
+
+- Added the -D option, to let users specify that agent must be run in
+  desktop mode. This is presently the default.
+
+nxagent-1.5.0-18
+
+- Set the PropertyChange mask on input/output window in rootless mode
+  in order to get the PropertyNotify events.
+
+nxagent-1.5.0-17
+
+- Cleaned of the reconnection routines, removed the NXAGENT_RECONNECT
+  macro.
+
+- Now the SIGHUP handler forwards the signal also to the NX transport.
+
+- Moved the NXTransDestroy() call in the closure of the display, so
+  we can avoid going through the I/O error handler.
+
+- Removed an invalid free in the function that closes the display.
+
+- Commented out more code in Display.c to avoid the segfault on exit.
+
+- In rootless mode, now function XYToWindow() starts search from the
+  last window originated an EnterNotify event. In this way, we can
+  prevent shaded windows from getting mouse events.
+
+- The variable to disable the smart scheduler is set at its definition
+  instead of setting it in the Dispatch function. This avoids the call
+  to SmartScheduleInit.
+
+- Changed implementation of cursor visualization in rootless mode. We
+  made the cursor attributes changes go transparently to the X server
+  while in desktop mode we ignore any client request to change the cu-
+  rsor on the X side, and we just set the cursor on the default window
+  any time the pointer cross a window border.
+
+- Expanded the range of properties exported on the remote Xserver,
+  this way we export properties whose atom name starts with "WM_" and
+  "_NET_".
+
+- In Rootless mode PropertyChangeMask is added to top level window in
+  order to get PropertyNotify Events.
+
+- First implementation in rootless mode of nxagentImportProperty fun-
+  ction with which after reception of PropertyNotify Events, all chan-
+  ging properties coming from external clients such as Window Manager
+  will be imported in agent windows.
+
+- Changed the GetEventMask function in order to handle the InputOnly
+  windows that need to be notified of property changes in rootless
+  mode.
+
+nxagent-1.5.0-16
+
+- Implemented the -B command line switch, to let nxagent impersonate
+  a "pure" proxy on the NX server side (that is without X connections
+  having to be managed by the nxagent's dispatcher). Such a "nxagent
+   -B" is going to replace the corresponding nxproxy process that in
+  previous version of NX server was run with the same options.
+
+- When running nxagent in 'bind' mode the X port where the the proxy
+  has to listen for connection must be specified after the -B option.
+  The other NX options must be passed in the DISPLAY environment.
+
+  Example:
+
+  nxagent -B :9
+
+- The initialization procedure will check that the display included
+  on the command line matches the one specified in the NX display
+  options.
+
+  For example, given the command:
+
+  nxagent -B :9
+
+  The NX options must be something like:
+
+  DISPLAY=nx/nx,link=modem:9
+
+  This allows users to find out which display the agent is impersona-
+  ting by running a 'ps' and inspecting the command line.
+
+- Fixed a bug preventing the proxy's ClientMessage to reach the right
+  function when activating rootless mode.
+
+- Removed unused function nomachineLogo.
+
+- Code cleaning and soem optimizations in Rootless.c.
+
+- We want to import all properties changed by external clients to our
+  internal windows. But we must ignore property notify generated by
+  our own requests. For this purpose we implement a list to record
+  every change property that we dispatch. This way when processing
+  a property notify we can distinguish between the notify generated
+  by our request and those generated by an 'outside client'.
+
+- In rootless mode, optimized window configurations mantaining inter-
+  nal stacking order.
+
+- Fixed focus troubles in rootless mode. Now focus window is set fol-
+  lowing FocusIn events.
+
+- In rootless mode, now fake KeyRelease events on FocusOut are sent
+  only if keys having down state are modifiers. This prevents from
+  sending key events to a wrong client.
+
+- Removed unused function nxagentRootlessNextSibling in Rootless.c.
+
+- Removed unused function nxagentRootlessStackingOrder in Rootless.c.
+
+- Fixed compilation error if TEST log is enabled in Events.c.
+
+- Changed Options variables to comply with NX naming rules.
+
+- Some additional cosmetic changes.
+
+nxagent-1.5.0-15
+
+- Modified functions nxagentPutImage and DoGetImage for XYPixmap fo-
+  rmat.
+
+- Completed implementation of shared memory extension.
+
+- Implemented a mechanism that prevents monitoring of SubStructure-
+  Redirect ResizeRedirect and ButtonPress events by any clients simu-
+  lating the presence of a window manager running inside the agent.
+
+- Added debug functions in order to check the status of syncroniza-
+  tion between the pixmaps residing on the X server and the local
+  framebuffer ones.
+
+- Changed the policy used when realizing all the pixmaps in 'lazy en-
+  coding' mode so that the agent now switches to 'eager' policy.
+
+- Fixed the routine handling the pixmaps realization: pixmaps with
+  an invalid id are not processed anymore.
+
+- Solved a bug in the routine taking care of clearing the NoMachine
+  logo: the state of the background was set to 'pixel' without de-
+  stroying an eventual backround pixmap.
+
+- Solved a bug in the 'MakeRootTile' function: the value returned by
+  'AddResource' was not interpreted in the correct way causing the
+  function to bail out without drawing the NoMachine logo and set-
+  ting the background state to Pixmap.
+
+- Renamed PlaceHolder.c to Lazy.c and PlaceHolder.h to Lazy.h.
+
+- Inserted a test feature that cleans the framebuffer pixmaps when
+  they are created.
+
+nxagent-1.5.0-14
+
+- Changed some reconnection messages.
+
+- Now the disconnect procedure is called also after an IO Error is
+  received.
+
+- The rootless agent now doesn't filter anymore keystrokes combina-
+  tion related to desktop feature, like viewport navigation the full-
+  screen state and minimization.
+
+- In rootless mode, internal stacking order is updated by comparing
+  the stack of top level windows mantained by the X server with the
+  one mantained by the agent. A global configuration of windows is
+  performed from top to bottom through the stack.
+
+- In rootless mode, map state of  top level windows is kept up to date
+  by managing map and unmap events.
+
+- In rootless mode, enter events are managed to keep track of top
+  level window position. It is very useful for managing differences
+  among window manager behaviours. It should be reimplemented follo-
+  wing the advice given in ICCCM 4.1.5.
+
+- In rootless mode, requests of configure top level windows are di-
+  rectly forwarded to the real X server. Internal configuration is up-
+  dated when configure events are managed by the agent. In order to
+  mantain internal stacking order up to date, a query tree request is
+  performed on the real root window.
+
+- Added viewport navigation by Ctrl + Alt + keypad arrows.
+
+- Fixed wrong internal configuration of agent top level windows, while
+  agent runs in rootless mode with metacity window manager.
+
+- Fixed segmentation fault in nxagent running in rootless mode with
+  OpenOffice.
+
+- Fixed wrong internal stacking order of drop down menus of firefox
+  with nxagent in rootless mode.
+
+nxagent-1.5.0-13
+
+- Fixed compilation problem on solaris.
+
+- Modified the modify pixmap header function. Previously this function
+  has been modified in order to solve a glyph problem, enlarging both
+  the pixmaps dimensions by four. Corrected the misbehaviour that
+  modify the pixmaps dimension even if the caller doesn't want to
+  change it.
+
+nxagent-1.5.0-12
+
+- Fixed erroneous behaviour of Root Window in fullscreen mode caused by
+  wrong value of XSpan and YSpan.
+
+- Fixed wrong clients' position at Reconnection in Rootless mode,
+  setting offset and WinGravity fields in XsizeHints structure.
+
+- Fixed segmentation fault on closing windows that stay always on top.
+
+- Moved the handling of configure notify events in the appropriate
+  functions, and cleaned it.
+
+- In rootless mode, internal stacking order of top level windows is
+  mantained up to date by monitoring events from window manager top
+  level windows.
+
+- Modify the creation of screen at reconnection for detecting an
+  eventual failure.
+
+- Removed export of window properties on the X server in desktop mode.
+
+- Changed the events mask for client's window set on the X server.
+  We don't use anymore the window mask choosen by clients. In rootless
+  mode for a top level window we use the default event mask and for a
+  child only the exposure mask.
+
+nxagent-1.5.0-11
+
+- Restored default event mask at reconnection.
+
+- Fixed abnormal behaviour in rootless mode if application windows are
+  close to the lower and right bounds of the screen. This trouble was
+  due to the wrong size of the agent root window.
+
+- Fixed abnormal behaviour in rootless mode for mouse button events if
+  the application window is not fully contained in the screen.
+
+- In rootless mode, exposed region are extended a few to take in ac-
+  count border width offsets caused by window managers.
+
+- In rootless mode, grab pointer requests from clients are forwarded
+  to X server. This makes application able to close their pop up win-
+  dows on a pointer event.
+
+- Fixed wrong position of the agent root window after resize of main
+  window.
+
+- Changed the size of viewport frame windows in order to avoid re-
+  freshing problems.
+
+nxagent-1.5.0-10
+
+- Handled the Client messages on rootless mode.
+
+- Initializations of event masks have been moved in a unique group of
+  functions.
+
+- Disabled the SmartScheduler in dispatcher as it seems to affect the
+  responsiveness of nxagent.
+
+- Modified the block and wakeup handlers. We could have left data to
+  write to our display connection when entering in WaitForSomething()
+  so we now flush everything before entering the select() and let the
+  proxy do all the buffering.
+
+- Fixed the wakeup handler to match the correct prototype.
+
+- Few cosmetic changes.
+
+- Inserted a test feature that cleans the framebuffer pixmaps when
+  they are created.
+
+- Adjusted pixmap status information in almost every gc operations.
+
+- Removed a warning for usleep not defined on Suse 9.0.
+
+- Adjusted pixmap status information in copy plane operations.
+
+- Throwed fatal error if on lazy encoding the place holder pixmap
+  couldn't be loaded.
+
+- Removed the static path to xpm file in place holder initialization.
+
+- Removed useless signal handler initialization multiple times.
+
+- Refined validation of atoms in the atom cache code.
+
+- Corrected few errors in atom cache initialization.
+
+- Added a primitive atom cache that mantain the map between internal
+  and external atoms.
+
+- Window properties export began on the X server side in rootless
+  mode, this way nxagent open the communication between local clients
+  and the window manager on the X server.
+
+nxagent-1.5.0-9
+
+- Fixed wrong position of the main window in case of maximizing in
+  window mode.
+
+- Set the correct scan line lenght for XYPixmap created in PutImage
+  and GetImage.
+
+- Removed a segmentation fault in GetDefaultImage. The problem arose
+  because the XYPixmap created with a data storage taking in account
+  of only some planes instead of all the depths planes. Despite XPut-
+  Pixel was treating the image as a complete XYPixmap of that depth.
+
+- Removed MapWindow Error at reconnection caused by wrong value of
+  IconWindow.
+
+- Now nxagent_WM_START is intialized as soon as the Atoms are
+  queried.
+
+- Removed Geometry restrictions.
+
+- Changed the configuration of the agent window in window mode.
+
+- The agent window is correctly reconnected even if is resized.
+
+nxagent-1.5.0-8
+
+- Updated copyright notices.
+
+- Removed a segmentation fault in font cache cleaning routine. The
+  problem arise when the session is disconnected and the font struct
+  are not allocated.
+
+- Used the return mask of XParseGeometry to correctly set only the
+  parameters that are involved.
+
+- Unified the initialization of all the geometry related parameters.
+
+- Updated the offset of the four viewport frames windows at recon-
+  nection.
+
+- Changed the way the geometry parameter is used. Now the first time a
+  session is started it set the internal dimension of the agent root
+  window, afterwards it only affects the dimension of the external
+  window on the X server.
+
+- Corrected splash screen offset at reconnection in fullscreen mode.
+
+- Agent can be launched in fullscreen mode and his geometry can differ
+  from the X server geometry.
+
+- Now Width and Height options are used to store geometry of the
+  default window even on fullscreen mode, and to restore the correct
+  dimension when switching back to window mode from fullscreen
+  we added two more options.
+
+- Removed an error in the move viewport procedure that didn't upgrade
+  the offset of the internal root window when the external root win-
+  dow was maximized.
+
+- Unified the initialization of all the geometry related parameters.
+
+- The window manager detection procedure is now started whenever there
+  is an attempt to minimize the fullscreen window or to pass to window
+  mode.
+
+- Function's optimization for detecting if WM is running.
+
+- Switching to window mode has been disabled when the window manager
+  is not running.
+
+nxagent-1.5.0-7
+
+- Now background pixel is not reset at reconnection.
+
+- Now geometry is parsed also as a command line parameter.
+
+- Fixed wrong offset of the root window after a reconnection in case
+  of window mode.
+
+- Fixed wrong geometry of the nxagent window after a reconnection
+  in case of window mode.
+
+- Fixed wrong position of the main window after a reconnection in
+  case of fullscreen mode.
+
+- Fixed refreshing windows problems in viewport navigation. Four in-
+  visible windows are created around the agent window to automatica-
+  lly generate exposure when the viewport frame is moved or a windows
+  come out from the non visibile part of the agent window.
+
+- We need to store the GC records in a list that will be freed in case
+  the reconnection succed and will be restored in case of failure. We
+  have to do this because we cannot destroy the GC records in the
+  disconnect or reconnect procedure, because this way we couldn't
+  recover from a disconnection or a reconnection failure.
+
+- Rewritten the reconnection procedure. Since we cannot be sure
+  that the reconnection will succed we cannot destroy the display
+  structure, so we postpone the closing of the previous display
+  with the creation of the new connection.
+
+nxagent-1.5.0-6
+
+- Adjusted usage list in order to show the R parameter for rootless
+  mode.
+
+- Added handling of display parameter to option file.
+  Corrected few typos error, in option file parsing.
+
+nxagent-1.5.0-5
+
+- Removed error that prevented the realization of cursor in eager
+  mode.
+
+nxagent-1.5.0-4
+
+- Fixed abnormal behaviour of termination dialog, after the keystroke
+  Ctrl + Alt + T.
+
+- Fixed segmentation fault in function parsing option file.
+
+- Fixed various errors on eager encodings.
+
+- Added lazy command line switch in order to switch lazy encoding
+  on.
+
+- Code cleaning.
+
+- Implemented a signal to switch between two pixmap
+  realization policies.
+
+- Corrected an error while defining pixmaps status.
+
+- Implemented a debug feature, consisting in a method that pushes
+  the synchronized realization of all the pixmaps.
+
+- Began implementation of place holders in replacing of images while
+  they are being loaded.
+
+- Performed some changes on spreading of pixmaps status information
+  on copy area.
+
+- Began implementation of lazy encoding.
+
+- Changed version to 1.5.0.
+
+nxagent-1.5.0-3
+
+- Removed the option -nogetimage (FRSA052305).
+
+- Code cleaning in Font.c.
+
+- Removed NXAGENT_FONTMATCH macro.
+
+- Removed NXAGENT_FONTCACHE macro.
+
+- Handled the ReparentNotify event we get when in rootless mode
+  ours window are reparented from the window manager. Inserted
+  fake windows to take account of this new parents.
+
+- Removed the redirection of client message in rootless mode, and
+  the configuration of the WM_PROTOCOLS properties on all the top
+  level windows.
+
+- Removed parent ID from the windows private structure.
+
+- Implemented screen operation ReparentWindow.
+
+- Redirect all client message of type WM_PROTOCOLS and value WM_DELETE-
+  _WINDOW to internal clients in rootless mode.
+
+- Set the WM_PROTOCOLS property on all the top level window.
+
+nxagent-1.5.0-2
+
+- Changed viewport navigation, in order to make it works in fullscreen
+  mode.
+
+- Changed special keystrokes used for closing session and minimizing
+  fullscreen window.
+
+- Removed the message 'NX was unable to negotiate a cache
+  for this session' (FRSA052296).
+
+- Fixed a minor bug. It made metacity produced a warning when the agent
+  started up.
+
+- Code cleaning.
+
+- Implemented dynamic handling of the main window's size in the X11
+  agent (FRSA052264).
+
+- Implemented dynamic navigation of the main window's viewport in the
+  X11 agent (FRSA052265). Users can navigate the viewport while keys
+  Ctrl + Alt are pressed, either by arrows keys or dragging it by the
+  pointer.
+
+- Implemented dynamic handling of the full-screen attribute in the
+  X11 agent.
+
+- First implementation of dynamic handling of the full-screen
+  attribute (FRSA052263).
+
+- Now the X connection descriptor is not closed when disconnected,
+  because the transport layer still has reference to it. So we want
+  it busy till we don't close the display, so we shutdown it instead
+  of closing it.
+
+- Removed replys when disconnected.
+
+- Added the X connection number to the set of enabled input devices, at
+  reconnection.
+
+- Rewritten the disconnect/reconnect layout.
+
+- Now in the suspend status nxagent doesn't sleep.
+
+- Implementing toggle fullscreen special keys.
+
+nxagent-1.5.0-1
+
+- Opened the 1.5.0 branch.
+
+nxagent-1.4.1-7
+
+- Imported changes from nxagent-1.4.0-64 version.
+
+nxagent-1.4.1-6
+
+- Implemented a GC cache for reconnecting pixmap.
+
+nxagent-1.4.1-5
+
+- Handled the situation of disconnect when the pointer has been grabbed.
+  We disconnect and reconnect the "grabbing" cursor and after reconnection
+  we fake a button release in order to let client know that the pointer
+  button has in effect been released.
+
+- Code cleanup.
+
+nxagent-1.4.1-4
+
+- Imported changes from nxagent-1.4.0-63 version.
+
+nxagent-1.4.1-3
+
+- Imported changes from nxagent-1.4.0-62 version.
+
+nxagent-1.4.1-2
+
+- Cleaned code in the GC reconnection area.
+  Scratchs GC are now reconnected before of the pixmaps.
+
+nxagent-1.4.1-1
+
+- Opened the 1.4.1 branch.
+
+nxagent-1.4.0-65
+
+- Cosmetic changes to the diagnostic output.
+
+nxagent-1.4.0-64
+
+- Changed the RENDER version advertised to X clients to be the lowest
+  value between the version of RENDER of nxagent and of the remote X
+  server.
+
+- Disabled fast copy area and fast get image flags, if RENDER extension
+  is not available.
+
+- At the screen initialization, if we don't have window manager we
+  grab keyboard to let nxagent get keyboard events.
+
+- Completely rewritted the handling of KeyPress events, now we moved
+  all the test for 'special' keybindings in file keystroke.c. Added the
+  combination MOD1/2-CTRL-SHIFT-<TAB> for terminate/suspend the session,
+  we used the combination MOD1/2 in order to let it work even on MacOS
+  where Alt(MOD1) doesn't seem to be set.
+
+- Ignored visibility notify events on the icon windows, that were
+  messing up the agent visibility state.
+
+- Changed nxagent reaction on VisibilityNotify event. It fixed the
+  problem with refresh session under Mac OS X with NXDarwin.
+
+nxagent-1.4.0-63
+
+- Reset the congestion state at transport initialization.
+
+nxagent-1.4.0-62
+
+- Fixed the disconnection and reconnection of window that have attached
+  an animated cursor.
+
+nxagent-1.4.0-61
+
+- Removed the XInputExtension initialization in order to use the more
+  general mi extension initialization enabled on new mi version.
+
+- Removed some useless test and logging info on copy area function.
+
+nxagent-1.4.0-60
+
+- Changed the implementation of CopyArea and CopyPlane.
+  If both drawables are on framebuffer we send NoExpose to clients,
+  otherwise we use the mi function HandleExposure to calculate the
+  region to be exposed instead of let mi redo all the copy operation.
+
+nxagent-1.4.0-59
+
+- Disabled use of caching and cleaning of images, if NX transport is
+  not used.
+
+nxagent-1.4.0-58
+
+- Added timeout on convert selection operation. If timeout has not
+  expired and is there a pending operation any new request is dropped
+  and the client notified, until timeout expiration.
+
+- Corrected a bug that prevented to correctly store last convert se-
+  lection request time.
+
+nxagent-1.4.0-57
+
+- The Xinput extension is now initialized at startup. This is of
+  little use because nxagent only needs to support the core pointer
+  and keyboard. Anyway this allows nxagent to get rid of the warn-
+  ings printed by some X clients on recent Linux versions when the
+  extension is not found.
+
+nxagent-1.4.0-56
+
+- Fixed value returned by ConvertSelection. It was the cause of
+  possible slowndowns during KDE sessions.
+
+nxagent-1.4.0-55
+
+- Agent icon now is loaded from a binary-
+  embedded Xpm image, if any attempt to
+  load the default Xpm file from the image
+  directory or from the path fails.
+  Removed code used in the old logo drawing
+  function.
+
+nxagent-1.4.0-54
+
+- Enabled code for sending to client graphics
+  exposures. Redirecting the ones coming from
+  remote X server, only if agent window is not
+  fully visible, and calculating ourselves failure
+  in CopyArea/Plane and notifying clients.
+  The only drawback is that we can have double
+  refresh effect if agent window is covered.
+
+NOTE: Partially enabled MIT-SHM extension has
+      been developed but has not been included
+      in stable release. Included in version
+      nxagent-1.4.0-53-DAR1.
+
+nxagent-1.4.0-53
+
+- Implemented a reliable technic to detect
+  if is there any window manager running on
+  the X server.
+
+nxagent-1.4.0-52
+
+- Fixed a bug that prevented to correctly
+  notify the client of a successfull convert
+  selection.
+
+nxagent-1.4.0-51
+
+- Removed a logging error in render initialization.
+
+nxagent-1.4.0-50
+
+- Now we take the ownership of the selection
+  on "NX_CUT_BUFFER_SERVER" twice, in order
+  to solve bug in communication with nxclient
+  to let him see our main window and know that
+  agent established connection with X server.
+
+nxagent-1.4.0-49
+
+- Fixed the colormask layout of the visual
+  used to put images on the real X server when
+  the drawable has an alpha channel, according
+  to the endianess of the X server.
+
+nxagent-1.4.0-48
+
+- Moved up the render compatibility limit,
+  due to the inclusion of the support for render
+  cursor missing on the 0.2 version.
+
+nxagent-1.4.0-47
+
+- Changing artsd forwarding port from display
+  + 8000 to display + 7000
+
+- Stoping key release event if key press was
+  catched before. For Alt-F2/F4 combination.
+
+- Preserved the alpha data on drawables that
+  are not used by picture but have a depth of 32.
+
+nxagent-1.4.0-46
+
+- Rewritten all the code regarding to the
+  acceleration for the Render creation of the
+  cursor, and removed the acceleration for
+  the animated cursor.
+
+nxagent-1.4.0-45
+
+- The two RENDER operations creating cursors and
+  animated cursors have been accelerated by for-
+  warding the original operation to the X server.
+
+nxagent-1.4.0-44
+
+- Fixed a problem in the clipboard procedure.
+  Now when we get a request of the selection
+  from an internal client we have to, if the
+  owner is on the X server, forward the request
+  to X, otherwise we have to pass the request
+  to our internal client.
+  But for a problem in this procedure we passed,
+  in some situation, the request to the internal
+  client even if the owner was on the other side.
+
+- Fixed a segmentation problem in the render
+  extension by removing composite trapezoid
+  operation on window.
+
+nxagent-1.4.0-43
+
+- Added some pointer sanity check in the discon-
+  nect procedure. The problem was arising because
+  we were executing the code twice when after
+  began a voluntar disconnection the X connect-
+  ion was broken for a network failure.
+
+- Changed directory where nxagent gets the icon.
+
+- Fixed missing implementation of rendering
+  trapezoids.
+
+- Fixed bug in render extension when the nxagent
+  create cursor diffrent then 32 bits format.
+
+nxagent-1.4.0-42
+
+- Solved segmentation fault, caused by a longjmp
+  on a stack context not previously saved.
+
+nxagent-1.4.0-41
+
+- Added an exposures of the window in a resize
+  operation.
+
+nxagent-1.4.0-40
+
+- Implemented a timeout on the opening of the X
+  display, if we get it we reject all well known
+  sockets.
+
+nxagent-1.4.0-39
+
+- Corrected minor error on events handling.
+
+nxagent-1.4.0-38
+
+- Removed in the resize window code some exposure
+  that generated useless traffic.
+
+- Option geometry is no more parsed in the option
+  file.
+
+nxagent-1.4.0-37
+
+- When session is suspended and we get TERM signal
+  nxagent just exit instead of just breaking out of
+  dispatch loop because we get a terminate exception.
+  Cleared display variable after having closed the
+  connection with the X server.
+
+nxagent-1.4.0-36
+
+- Refined some details in the ICC with nxclient.
+
+nxagent-1.4.0-35
+
+- Implemented a new method to comunicate to nxclient,
+  the raise of the agent root window, taking the ownership
+  of the selection "A-{MD5 of session}".
+  Used the same selection to let nxclient comunicate to agent
+  by changing the property on the same string, when the user
+  choose by the administrator to terminate or suspend the
+  session.
+
+nxagent-1.4.0-34
+
+- Key sequence to Suspend/Terminate session (Alt-F4).
+
+- Key sequence to Minimize session in fullscreen mode (Alt-F2).
+
+- Check if WM is started, for Alt-F2 sequence.
+
+- Corrected calculation geometry of exposed region
+  sent to client after reconnection.
+  This solve a serious memory leak of nxagent.
+
+- Fixed a bug in validate GC code that passed
+  a wrong pointer of tile to framebuffer.
+
+nxagent-1.4.0-33
+
+- Changed the reconnection state machine in order
+  to let agent exit if has got the TERM signal.
+
+nxagent-1.4.0-32
+
+- Fixed memory leak in option parser that wasted
+  memory if more than one occurence of 'option'
+  argument would have been parsed.
+
+- Removed a invalid read in Keyboard initialization.
+  Now kbtype option value is copyed instead that
+  referenced.
+
+- The X connection number is recorded only after
+  having cheched for display being successfully opened.
+
+nxagent-1.4.0-31
+
+- Fixed memory leak problem caused by region not
+  beeing destroyed previously.
+
+- Fixed a memory leak in keyboard initialization.
+
+- Fixed a bug in the function that parse the option file,
+  we were reading the options in the format NAME=VALUE and
+  were passing it to the argument parser in the format
+  {NAME, VALUE}, without the prepending '-' in front of NAME.
+
+nxagent-1.4.0-30
+
+- Readded option persistent in order to let nxagent
+  works with older nxserver that are still launching
+  nxagent with the persistent option.
+
+nxagent-1.4.0-29
+
+- Corrected the message of the client dialog
+  asking if user want to suspend or terminate the
+  session.
+
+- Chenged the default value for persistence of session
+  in nxagent to true. Change the persistent option to
+  nopersistent in order to disable it.
+
+nxagent-1.4.0-28
+
+- Added check on screen initialization of possible
+  memory allocation failure.
+
+- Changed the parsing policies of the option file.
+  Now we are just considering kbtype and geometry
+  options.
+
+- Removed testing code that forced rootless mode
+  when geometry is 100X100.
+
+- Correctly initialized and mapped the icon window
+  on fullscreen mode.
+
+nxagent-1.4.0-27
+
+- Fixed lost memory problem caused by second
+  initialization of screen privates. Screen
+  privates is already initialized by miScreenInit
+  function.
+
+nxagent-1.4.0-26
+
+- Added option command line option. This parameter
+  is used to show complete path to option file.
+
+- Added parser of the option file.
+
+- Now default value for fast copy area and fast
+  getimage is true.
+
+nxagent-1.4.0-25
+
+- Done some cleanup to the initialization of the
+  defaults drawables at reconnection, and removed
+  a memory leak in the reopening of the Display.
+
+nxagent-1.4.0-24
+
+- Changed the version number, printed at startup.
+
+- Removed a memory leak in the font reconnection stage.
+
+nxagent-1.4.0-23
+
+- Removed a bug that messed up the render status info
+  if reconnected to a display with no render support.
+  Anyway nxserver should prevent agent to trying reconn-
+  ecting to such display.
+
+nxagent-1.4.0-22
+
+- Enhanced the reconnection error reporting function.
+
+nxagent-1.4.0-21
+
+- Get the ownership of selection NX_CUT_BUFFER_SERVER at reconnection
+  in order to let client knows that agent windows has started
+  successfully.
+
+nxagent-1.4.0-20
+
+- Now we draw splash logo at reconnection. And destroy it and show
+  all other windows when reconnection has done all in once. We draw
+  it on default window instead that on root window, and we map root
+  window when reconnection has finished.
+
+nxagent-1.4.0-19
+
+- Removed the old Xconnection descriptor and added the new one
+  to the device set, instead of resetting the entire enabled
+  device set, at reconnection.
+
+nxagent-1.4.0-18
+
+- Reset the enabled devices set of descriptors, and properly
+  add to this set the the Xconnection descriptor.
+
+NOTE: This solves all the known solaris reconnection problems.
+      (The problem appear only on solaris because on this machine
+       the Xconnection descriptor is changing at reconnection.)
+
+nxagent-1.4.0-17
+
+- Restored the previously owned primary selection, at reconnection.
+  Removed the handling of the return value of XSetSelectionOwner,
+  man page doesn't specify any return value.
+
+nxagent-1.4.0-16
+
+- Added compatibility with older windows clients(Xserver)
+  that send a WM_DELETE_WINDOW client message WM_DELETE_WINDOW
+  to all top level window and so agent show more than one
+  NXDialog asking for confirmation, instead of sending just the
+  message to top level window that are visible and haven't set
+  the override redirect option.
+
+nxagent-1.4.0-15
+
+- Ignored unmatched DirectColor visuals at reconnection
+  on a different display not providing it.
+
+nxagent-1.4.0-14
+
+- Moved the render query extension in display
+  initialization from screen initialization.
+
+- Changed reconnection policy to disallow reconnect a
+  session that is using render to a server not providing it.
+
+nxagent-1.4.0-13
+
+- Unified the screen opening function.
+
+- Changed the reconnection requirements
+  policy about geometry of X server.
+  Now agent doesn't accept changes of X server
+  root window size only if in fullscreen mode.
+
+nxagent-1.4.0-12
+
+- Improved failure notification messagges in Display and
+  font code.
+
+nxagent-1.4.0-11
+
+- Now visuals are properly recreated, in order to reconnect
+  to another X server.
+
+- Updated render formats at reconnection.
+
+nxagent-1.4.0-10
+
+- Removed a serious memory leak at reconnection.
+
+nxagent-1.4.0-9
+
+- Added after window reconnection the redisplay of the current
+  cursor. Done some general cleanup at cursor reconnection code.
+
+nxagent-1.4.0-8
+
+- Unified tha atom creation at reconnect.
+
+nxagent-1.4.0-7
+
+- Dix layer when creating a GC use a default real pixmap as
+  stipple but agent need a virtual one. This can cause
+  segmentation fault to agent if is there any apps that use the
+  default GC stipple created by dix, without changing it.
+
+nxagent-1.4.0-6
+
+- Imported 1.4.0-1-DAR6 from the 1.4.0 development branch.
+
+- Handled reconnection of window's cursor still not
+  reconnected at window reconnection. (This because that cursor
+  is no more a server[nxagent] resource).
+
+- Set the last image client variable at reconnection in order
+  to use the visual cache indexed for client number.
+  Without this we could get a segmentation fault.
+
+- Handled properly the reconnection of animated cursor.
+  Modified the procedure of animated cursor creation
+  in order to empty some unused fields.
+
+- Removed a 4 bytes memory leak at reconnection.
+
+- Synced new tree with nxagent-1.3.2-23.
+
+- Finished the unify of PutImage at reconnection.
+  Added a Reconnection Trap in order to let screen functions
+  (like PutImage) knows that are working at reconnection time
+  and can behave differently.
+
+- Unified the code for the normal PutImage and the one's used at
+  reconnection. But the code that calculate the split is still
+  doubled.
+
+nxagent-1.4.0-5
+
+- Imported 1.3.2-23 from the 1.3.2 development branch, and dropped
+  the previous 1.4.0 versions.
+
+nxagent-1.3.2-23
+
+- Pixel hints are set according to the display's depth. Added the
+  defaults to be used on 16 bits.
+
+nxagent-1.3.2-22
+
+- The pixel hint on Solaris is by default 0xffffff. The value can be
+  overridden by using the -hint option followed by the hex represen-
+  tation of the color, as in -hint 0xaabbcc.
+
+nxagent-1.3.2-21
+
+- Asynchronous GetImages are now disabled. If fast GetImage mode is
+  enabled, agent will always try to guess the pixel to be used for
+  the solid pattern, based, at its best, on the geometry of the pro-
+  vided area. This behaviour can be overridden by passing the -slow
+  parameter on the command line. Slow mode is also the default when
+  selecting WAN or LAN link settings.
+
+- Code cleanup in preparation of the final release.
+
+nxagent-1.3.2-20
+
+- New code uses sigaction to set the SIGHUP handler in persistent
+  mode. Contrarily to signal(), the sigaction call doesn't seem to
+  reset the handler to SIG_DFL after the signal has been caught.
+  This problem seems to be specific of Solaris.
+
+- Client messages of type WM_PROTOCOLS are now handled even when
+  a window manager is not detected at agent startup.
+
+- Removed handling of GraphicsExposure coming fron the real server.
+  Agent will still generate events in the MI. Code dealing with the
+  remote events needs to be better tuned as it seems to cause some
+  troubles with double refreshes.
+
+nxagent-1.3.2-19
+
+- Starting from this version agent doens't use NXSync and NXKarma
+  messages to manage bandwidth arbitration among clients but makes
+  efficient use of the congestion notification messages introduced
+  in 1.3.1. A new handler has been added to manage the congestion
+  state. The handler will block, if needed, waiting for the decon-
+  gestion notification coming from proxy.
+
+nxagent-1.3.2-18
+
+- Rewritten the block handlers to check the event queue more often.
+  The new code seems to greatly enhance responsiveness, especially
+  on fast links.
+
+- Now agent will handle the expose events coming from the remote
+  display inside the event dispatcher.
+
+- Created a new function collecting the expose events. Function is
+  optimized to add all the expose events for the same window to a
+  single region. Region is passed to the mi when the last event
+  has been processed.
+
+- Still dealing with GetImage from OpenOffice. Now we try to match
+  the geometry of the incoming requests with known geometry of most
+  of its graphic elements. It seem to work on Fedora.
+
+nxagent-1.3.2-17
+
+- Added swapping of image data in nxagentGetImage() when connecting
+  to a display having a different image byte order than the agent
+  server.
+
+- Added a new nxagentImageReformat() function in GCOps.c.
+
+- Now agent will not try to pack images having a data size smaller
+  than 768 bytes. The previous threshold was set to 64. The Mandrake
+  vesion of KDE seems to send lot of such small images. Compressed
+  through JPEG, these images obtain a very poor ratio of nearly 1:1.
+
+- Added a function translating and sending the GraphicsExposures
+  events received from the remote server to the agent's clients.
+
+- Renamed the functions providing the ad-hoc handling of remote X
+  events.
+
+nxagent-1.3.2-16
+
+- Implemented a cache for the alpha channel data. With clients
+  making heavy use of the alpha blending, the new cache is able to
+  cut by nearly 30% the traffic incoming to proxy, offering compara-
+  ble savings in CPU performance. While proxy is usually able to
+  cache almost all the alpha traffic, when caching is not enabled
+  (f.e. when link setting is WAN or LAN) this data is sent uncomp-
+  ressed by the agent. Tests running common desktop environments
+  showed that alpha channel could weight up to 2 times the corres-
+  ponding data generated by the packed images.
+
+- Fixed the compilation warnings in NXrender.c.
+
+nxagent-1.3.2-15
+
+- Rewritten handling of GetImage from dispatcher down to GCOps. If
+  the fast GetImage mode is enabled agent will use the asynchronous
+  calls provided by nxcompext to get data from the real server. Data
+  collected from the last get image performed is preserved and the
+  upper left pixel is used to guess a solid background.
+
+- Added a nxagentGetBackgroundImage() function to apply a similar
+  mechanism when the nxagent window isn't fully visible. Previously
+  a solid white background was returned. The new handling seems to
+  correctly match the window background in most cases.
+
+- Fixed a problem passing the bytes per line value when creating a
+  XYPixmap image. The previously calculated value didn't take into
+  account the depth of the image.
+
+- Now image's bytes per line, length and visual are calculated by
+  using a few utility functions added to GCOps.c.
+
+- Added declaration of the nxagentVisibility related variables to
+  Window.h.
+
+nxagent-1.3.2-14
+
+- On Fedora xbcomp configuration fails when agent is run nested.
+  This causes keyboard to ignore most AltGr keys. Strangely enough
+  this behaviour has been observed only with KDE while GNOME does
+  not seem to be affected. Reason is to be investigated.
+
+- Auto-repeat mode of the agent's keyboard device is now always
+  disabled. Agent will leverage auto-repeated keystrokes genera-
+  ted on the real server even when propagating device configura-
+  tion changes.
+
+- The info output telling if agent will propagate the changes to
+  devices' setting is now printed after having initialized the
+  screen. The purpose would be to verify if agent is running in
+  fullscreen mode and there is no WM on the real display. In this
+  case we should forcibly propagate device configuration changes.
+  Unfortunately, due to the way intern atoms are collected, this
+  is not going to work on platforms where sessions are likely to
+  run on an existing X server.
+
+nxagent-1.3.2-13
+
+- Fixed a problem with XYPixmaps being used in PutImage with the
+  wrong left pad. This is a step forward in the solution of the
+  corrupted masks displayed by Mozilla when showing some animated
+  GIFs.
+
+- By selecting 'fast' mode nxagent will now skip real XGetImage
+  operations on windows. This becomes the default in the case of
+  MODEM, ISDN and ADSL links. In theory X clients should never do
+  that. In practice a few naive programs and libraries (like, sur-
+  prisingly enough, a famous Linux office automation suite) do,
+  mainly to compose images with the window's backgound. Why don't
+  they compose content into a Pixmap?
+
+- Improved the implementation of CompositeGlyphs. It now uses a
+  single call to XRenderCompositeText instead of splitting the
+  output in multiple RENDER requests.
+
+- In previous versions file NXmiwindow.o was not linked into the
+  resulting nxagent. This solves the problem of missing repaints
+  in CDE and other Xt applications. Be sure you upgrade nx-X11
+  to version nx-X11-1.3.2-2.
+
+- Added a warning when the change keyboard control or the change
+  pointer control functions are called.
+
+nxagent-1.3.2-12
+
+- Added bit-swapping of glyphs having depth 1 when agent has a
+  different bitmap-bit-order than the X server.
+
+- The KeyRelease event's timestamp calculation, accounting for
+  differences in time between the local and the remote machine,
+  will now use the timestamp taken from the last KeyPress. Using
+  the timestamp of the last event was sometimes causing time to
+  go backward with the result that server could remain grabbed.
+  This solves the long-standing "mouse stop responding" problem.
+
+- Fixed a problem handling the alpha channeled visual introduced
+  while experimenting with the new server endianess layout.
+
+nxagent-1.3.2-11
+
+- Added the Reset option to options repository. By default agent
+  will skip server reset when the last client disconnects. This is
+  equivalent to passing the -noreset option to a standard XFree86
+  server. To restore the original behaviour the new -reset option
+  can be used on the command line.
+
+- Moved the SharedMemory and DeviceControl options to the options
+  repository.
+
+- A basic session, still leveraging all the default facilities, can
+  now be run as: nxagent -name NX -geometry 800x600+10+100 :1. The
+  -fp unix/:7100 option can be added to enable access to the X font
+  server.
+
+- Fixed a "unused variable" warning in Cursor.c.
+
+nxagent-1.3.2-10
+
+- Rootless mode. Some cleanup in initialization.
+
+- Rootless mode. Working at the configure-window errors.
+
+nxagent-1.3.2-9
+
+- Removed limitations when running nxagent nested inside another
+  nxagent server. Now both render extension and packing of images
+  are enabled.
+
+- The nxagent X server now inherits its endianess from the host
+  architecture, instead of assuming the same endianess of the con-
+  necting client. This fixes the remaining problems running ses-
+  sions nested inside another nxagent server.
+
+- Removed any reference to ReformatImage().
+
+nxagent-1.3.2-8
+
+- Changed the way the agent server handles images internally.
+  The inherited Xnest code used to set the server's image order
+  to the same order of the remote X display. This caused agent
+  to create images in the internal frame-buffer with a different
+  endianess in respect to images got from X clients.
+
+- The new image handling code seems to solve all the known image
+  endianess problems, for example cursors created on big-endian
+  displays with a wrong shape or glyphs being showed flipped when
+  retrieving the image data from the virtual frame-buffer.
+
+- As an added bonus the new code seems to double the performance
+  of the SPARC Solaris server when accessing i386 clients.
+
+- Commented out all the existing calls to ReformatImage(). Code
+  needs now extensive testing to see if any of the calls must be
+  actually restored.
+
+- Replaced calls to index() with strchr().
+
+nxagent-1.3.2-7
+
+- Solved a potential memory error when accessing a client or a
+  window pointer in clipboard management code after the resources
+  had been destroyed. Added a nxagentClearClipboard() function to
+  be called before a client or a window is destroyed to get rid
+  of any reference to the disposed resources.
+
+- Auto-repeated keystrokes generated by agent from inside the
+  virtual keyboard device are now ignored. Agent will correctly
+  honor auto-repeated keystrokes generated by the real X server.
+  This is actually the expected behaviour. The former implemen-
+  tation triggered an annoying bug, with keystrokes being inad-
+  vertedly auto-repeated in the case of high latency on the
+  network link.
+
+- Agent will now ignore the pointer settings changes generated
+  inside the remote session. The original behaviour was to reset
+  the pointer values (for example acceleration) to the X factory
+  settings at session startup. Agent will now inherit whatever
+  values are set on the real X display.
+
+- Added a -noignore parameter. When passed, agent will propagate
+  to the real X server any change to keyboard and pointer control
+  settings operated by its own X clients.
+
+nxagent-1.3.2-6
+
+- Fixed problem with glyphs being drawn clipped in the virtual
+  frame buffer. This is not yet the final solution but it seems
+  to work in all the circumstances where problem was observed
+  in the past. Problem seems to be caused by scratch pixmaps
+  being requested with a width and height smaller than actually
+  required. Note anyway that pixmap's buffer seems to be never
+  accessed beyond its boundary. This probably means that memory
+  for the pixmap is originally allocated using the right size.
+
+- Moved backing-store selection to options repository. Now by
+  default the backing-store mode is set to WhenRequested. This
+  means that, in most cases, there is no need to pass the -bs
+  option on the command line.
+
+- Code cleanup in Render.c, NXrender.c, NXglyph.c.
+
+nxagent-1.3.2-5
+
+- Fixed initialization of all the supported depths. Previous
+  versions correctly initialized the various depths but still
+  failed to advertise the support of any other depth than the
+  default depth supported by the remote X server.
+
+- Persistent mode. We now correctly propagate the pixmap ID of
+  the parent to the virtual pixmap at reconnection. This fixes
+  the reconnection errors when render extension is enabled.
+
+- Persistent mode. Solved the refresh problems at reconnection.
+  Problems were generated by the lack of window parent's ID at
+  the time session was reconnected.
+
+- Changed the agent's behaviour at the time the close button is
+  pressed. If agent is running in persistent mode a new dialog
+  is showed with the option to suspend the session.
+
+nxagent-1.3.2-4
+
+- Persistent mode. At the time the proxy connection is reset the
+  per-client unpack geometry information is cleared. This makes
+  agent find out that a new unpack geometry is needed as soon as
+  the display is reconnected.
+
+- Persistent mode. Lot of logging added in order to trace use of
+  resources as long as they are recreated. The current version
+  fails to correctly restore the picture information when render
+  is enabled.
+
+nxagent-1.3.2-3
+
+- Finally fixed all the problems with missing initialization of
+  pixmap formats. The screen info is now correctly set up even
+  when the remote display doesn't support all the target depths.
+  Many thanks to Michael L Torrie who helped me to reproduce the
+  problem and come to a solution.
+
+- Moved initialization of depths, default drawables and pixmap
+  formats to their own functions in Display.c.
+
+nxagent-1.3.2-2
+
+- Fixed the nxagentDestroyPixmap() function to correctly take into
+  account the reference counter of the virtual pixmaps. This solves
+  the crashes observed when running some GTK clients like xchat.
+
+- Added a function Pixmap.c to forcibly destroy the pixmaps created
+  in the virtual framebuffer when the parent pixmap is destroyed.
+
+- This version contains some verbose output intended to better test
+  the new behaviour. The output will be removed in future versions.
+
+nxagent-1.3.2-1
+
+- More cleanup in Pixmap.c.
+
+- Rewritten nxagentCreatePixmap(). Corrected an error where the
+  bitsPerPixel field was set to the pixmap's depth instead of the
+  result of BitsPerPixel(depth). This finally solves the problem
+  of text being incorrectly rendered in the virtual framebuffer.
+
+- Corrected the X error returned at the end of session when trying
+  to free a pixmap with an invalid id.
+
+- Opened the 1.3.2 branch.
+
+nxagent-1.3.1-32
+
+- Cleanup of Pixmap.h/Pixmap.c. Renamed macros according to the
+  nxagent naming conventions.
+
+nxagent-1.3.1-31
+
+- When running in fullscreen mode, grab and ungrab of pointer and
+  keyboard is performed in new functions, placed in Events.c.
+
+- The event loop now checks if the enter/leave notify carries a
+  NotifyInferior detail and, in this case, doesn't perform the grab.
+  This saves half the amount of grabs (and the related roundtrips)
+  performed by the previous version.
+
+- Ungrab of pointer is now performed whenever the cursor leaves the
+  fullscreen window. In previous version only the keyboard was
+  explicitly ungrabbed.
+
+- Added a warning in the event loop when receiving a MappingNotify.
+  This event is presently unhandled and seems to be reported, as a
+  consequence of the selected event mask, only by some X servers.
+
+nxagent-1.3.1-30
+
+- Reverted the patch introduced in Pixmap.c. The whole issue is
+  being investigated in its ramifications up to the virtual frame
+  buffer.
+
+nxagent-1.3.1-29
+
+- Fixed a problem in the nxagentDestroyPixmap function where the
+  reference counter of pixmaps could be decremented twice. This
+  could lead to agent trying to free the pixmaps more than once.
+
+- On Solaris there is no description for pc105 keyboard model. As
+  a workaround we consider pc104 to be the closest approximation.
+
+nxagent-1.3.1-28
+
+- Fixed a bug in the create window procedure. With some clients,
+  like Maelstrom and xmame, the creation of the main window was
+  failing due to the wrong colormap and visual attributes used
+  by agent on the real X server.
+
+- In fullscreen mode the keyboard is now grabbed at the time we
+  receive an EnterNotify event. This fixes a problem at startup
+  observed on some Debian based distributions where agent didn't
+  receive the keyboard focus until user had minimized and then
+  brought to front the agent's window. The grab is now correctly
+  performed by using the timestamp of the remote X server ins-
+  tead of our local timestamp.
+
+- In NXdixfonts.c strings corresponding to names of fonts and
+  font aliases cached by nxagent were missing the terminating
+  zero.
+
+- In function InitClientPrivates fixed the missing initializa-
+  tion of the is_ignored member of the ClientPriv structure.
+
+- Added the Persistent option to Options repository. The flag is
+  intended to replace the old nxagentEnableReconnect variable.
+
+nxagent-1.3.1-27
+
+- Fixed a memory allocation problem in Keyboard.c. A string was
+  allocated in the heap without making enough room for the trail-
+  ing zero.
+
+nxagent-1.3.1-26
+
+- Added further run-time checks to verify that pixmaps are not
+  created with bad bit-per-plane settings. This problem seems to
+  be caused by lack of support by nxagent of some combinations
+  of depth and visual when the render extension is enabled. If
+  this is the case, hide the render extension to new clients and
+  force any subsequent render operation to return a BadRequest
+  error. This required including extension.c from dix. A new
+  NXextension.c file is added to the distribution.
+
+- A problem was reported by Valgrind about reading the first 4
+  bytes just after the block allocated in fbCreatePixmap from
+  nxagentCreatePixmap. A quick fix was added to pixmap.c from
+  dix so that AllocatePixmap adds 4 additinal bytes to each
+  buffer.
+
+nxagent-1.3.1-25
+
+- Fixed a memory corruption error. The original AllocateGlyphSet
+  from render/glyph.c could be called instead of the NX counter-
+  part defined in NXglyph.c. This could lead to the missing
+  allocation of the trailing remote glyphset id field.
+
+- Added initialization of an otherwise usused string in function
+  nxagentPropagateArtsdProperties(). The whole string is probably
+  to be removed in future versions.
+
+- Moved the flag used to avoid reentrancy in GCOps to a separate
+  Trap header and source.
+
+- Further cleanup. Removed the zombie file NXglyphcurs.h.
+
+- Added missing initialization of the picture pointer in private
+  window's data in nxagentCreateWindow.
+
+nxagent-1.3.1-24
+
+- Added the missing timeout when calling WaitForSomething() at
+  startup. The bug caused the splash to remain on screen until
+  a further event was received.
+
+- Fixed a BadAtom error on Windows during initialization. Error
+  was caused by a bad attempt to change the NX_AGENT_SIGNATURE.
+
+- Hunting the 0 bits-per-plane drawable bug in nxagentValidateGC.
+  Added tracing output and additional checks. GC validation is
+  skipped if it is not possible to recover an appropriate value.
+
+- Ensured that nxagentDisplayName is set before calling the post
+  initialization procedure.
+
+nxagent-1.3.1-23
+
+- When session is run nested inside another NX X agent, all the
+  optimizations regarding remote expose events on fully visible
+  windows are disabled. This solves the refresh problems encoun-
+  tered when covering the nested session with a window from the
+  local X server.
+
+- Reusing NX_AGENT_SIGNATURE atom to detect nested operation.
+  Atom is created internally to the agent server at startup,
+  before any atom on the real display.
+
+- Fixed construction of caption used for dialog boxes spawn by
+  agent. The previous algorithm failed to identify the correct
+  string in parameter -name passed on the command line.
+
+nxagent-1.3.1-22
+
+- Ensured that state of keyboard modifiers is initialized with
+  values from the real X server when the first key stroke is
+  pressed by the user.
+
+- Fixed the X_SetInputFocus errors generated at session startup.
+
+- Rootless mode. Ensured that remote expose events are always
+  reported by the remote proxy. This is a temporary fix looking
+  forward for better handling of visibility events.
+
+nxagent-1.3.1-21
+
+- Saved a GetWindowAttributes and a GetGeometry in the function
+  drawing the splash screen.
+
+- Better handling of splash at startup. Removed the flickering on
+  Windows without recurring to another atom. This is achieved by
+  optimizing drawing and delaying mapping of the main windows.
+
+- Modified the magic values activating rootless mode to 100x100.
+
+- Removed modifications introduced in 1.3.1-20.
+
+nxagent-1.3.1-20
+
+- Working on eliminating the splash screen flickering on Windows
+  and Darwin. Checked if the NX_SPLASH atom has been created by
+  the NX X server. If this is the case, we let the NX X server
+  show the splash screen on our behalf.
+
+nxagent-1.3.1-19
+
+- Improved the initialization phase by removing a GetProperty, an
+  InternAtom and two GetInputFocus round-trips.
+
+- Added appropriate masking of the state bits reported by the
+  XkbStateNotifyMask event.
+
+- Added a simple mechanism during the itialization phase to trace
+  the use of X server replies.
+
+nxagent-1.3.1-18
+
+- Made some order in functions loading the NX icon.
+
+- Removed some more zombie files from agent distribution. Now only
+  the files imported from DIX and MI have name prepended with NX.
+
+nxagent-1.3.1-17
+
+- Moved names and values of intern atoms created by agent in their
+  specific header and source.
+
+- We temporarily force rootless mode if user provides a geometry
+  of 801x601. This is intended to simplify testing. Note that if
+  rootless is selected, we'll anyway disregard any geometry set
+  by the user, assuming the geometry of the real display.
+
+nxagent-1.3.1-16
+
+- We are checking now whether NX_IDENTITY intern atom is created
+  before NX_SPLASH. We want NX X servers to show the splash on our
+  behalf, so if NX_SPLASH is already interned, than we just skip
+  the splash procedure.
+
+nxagent-1.3.1-15
+
+- Rootless mode. Fixed a segfault handling ConfigureNotify events
+  on top-level windows.
+
+- Moved handling of ClientMessages coming from proxy in a separate
+  function.
+
+nxagent-1.3.1-14
+
+- Rewritten the code dealing with key modifier changes. Now we
+  use XKB events instead of synchronous XkbGetIndicatorState()
+  calls.
+
+- Moved activation of keyboard and pointer events to Events.c.
+
+- Removed pointer motion optimizations as a better logic, taking
+  in account the selected link speed, is already implemented in
+  proxy.
+
+nxagent-1.3.1-13
+
+- Renamed the -reconnect option as -persistent.
+
+- Rootless mode. Agent's root windows are not mapped at startup.
+
+- Removed the zombie file glyphcurs.c from agent distribution.
+
+nxagent-1.3.1-12
+
+- Corrected a typo in the new CopyArea code in GCOps.c where:
+
+  if (srcx > nxagentWidth)  srcx = nxagentWidth;
+  if (srcy > nxagentHeight) srcx = nxagentHeight;
+
+  had to be:
+
+  if (srcx > nxagentWidth)  srcx = nxagentWidth;
+  if (srcy > nxagentHeight) srcy = nxagentHeight;
+
+- Added handling of the fullscreen command line parameter to the
+  options repository.
+
+- Added agent geometry parameters to the options repository.
+
+nxagent-1.3.1-11
+
+- Rootless mode. Added handling of configuration events reported
+  for the top-level windows.
+
+- Rootless mode. Children of the root window get the event mask
+  selected when the window is created. This makes the keyboard
+  work at least with xterm and other simple clients. There are
+  still problems with the pointer events.
+
+- Created new Splash.h and Splash.c sources file to contain the
+  few splash screen procedures that were previously sparsed in
+  multiple files.
+
+- Added traces in all the window creation procedures and in the
+  initialization routines called at startup.
+
+- Renamed some source files to make simpler to identify what is
+  imported from DIX and what actually pertains to agent.
+
+nxagent-1.3.1-10
+
+- Added the missing RestackWindow screen operation. This solves
+  problems of incorrect stacking order observed in menus when
+  using the drop shadow feature in the latest KDE versions.
+
+nxagent-1.3.1-9
+
+- The new standard for checking previous inclusion of headers is
+  by verifying definition of _Filename_H_ where Filename is the
+  base name of the file, for example __Options_H__ in the case
+  of "Options.h". This is intended to be a step in reducing the
+  number of defines in code prefixed with NXAGENT.
+
+- Updated NX copyright to year 2004. Placed copyright statement
+  regarding NXAGENT and NX modifications to the Xnest software
+  at the beginning of the file. Checked again if credit is given
+  to all the existing copyright owners.
+
+nxagent-1.3.1-8
+
+- Added a new Options repository to store the values currently
+  dispersed all over around. The new macros nxagentOption(option)
+  and nxagentChangeOption(option, value) should be used from now
+  on to access the important values affecting agent's operations.
+
+- General cleanup of code. Removed the remaining references to
+  the Xnest legacy code.
+
+nxagent-1.3.1-7
+
+- Some steps forward toward rootless agent. Now all the top level
+  windows are correctly created. Drawing to the real screen seems
+  to work without problems. It is still not possible to get events
+  in the event loop and the remote WM is interfering with the WM
+  on the local display.
+
+- More cleanup of code. Some changes to parts added since 1.3.1-5.
+
+nxagent-1.3.1-6
+
+- A drawable with 0 bpp can somehow arrive to the fb layer. The
+  problem needs to be better investigated. In the meanwhile a
+  quick check is added to correctly identify the ill condition.
+
+- Small fix to allow Num/Caps lock synchronization also on the
+  windows platform. This is still to be considered beta quality.
+
+- New options -slow and -fast added to agent. When "fast mode" is
+  not set, agent will query the remote X server to get real content
+  of drawables. When fast mode is enabled, agent will save the
+  round-trip by just clearing the drawable to its background. The
+  default mode is "slow", thus agent will always query the remote
+  server. When "fast mode" is explicitly set or when NX transport
+  is detected and the link is one of MODEM, ISDN and ADSL, agent
+  will default to "fast mode". This behaviour can be overridden by
+  system administrators by setting the key AGENT_EXTRA_OPTIONS_X
+  to "-slow" in node configuration.
+
+nxagent-1.3.1-5
+
+- Created framework for rootless agent. Added a -rootless option.
+
+- Slowly going toward a better organization of nxagent internals.
+  Renamed some files and moved things around. Changed some comments
+  in Screen.c to be more explainatory.
+
+nxagent-1.3.1-4
+
+- Changed default keyboard model to "pc102" (was "pc101") to correct
+  problems with "<" and ">" keys on the German keyboards and, poten-
+  tially on other layouts.
+
+- Added new parameter -kbtype to handle both geometry and layout in
+  a single form, for example pc102/pl. Parameter -keyboard is still
+  supported for backward compatibility.
+
+- Synchronization of Num and Caps lock status is now done comparing
+  the real keyboard and the internal state at the time nxagent gets
+  the focus. If state doesn't match, a fake keyboard event is sent.
+
+nxagent-1.3.1-3
+
+- Fixed a further problem on CopyArea between windows and pixmaps.
+
+nxagent-1.3.1-2
+
+- Implemented CopyArea on framebuffer when copying from windows to
+  pixmaps. Added the -slow command line switch to let nxagent get
+  the real content of the window from the X server. This requires
+  an expensive round-trip so it is disabled by default.
+
+nxagent-1.3.1-1
+
+- Opened the 1.3.1 branch.
+
+nxagent-1.3.0-32
+
+- Fixed a bug on 16 bpp displays using render extension. Now only
+  images which are used by render pictures and which have depth 32
+  are created with a different visual color mask. This saves a big
+  amount of SetUnpackColormap requests.
+
+nxagent-1.3.0-31
+
+- Fixed a bug in nxagentComposite routine. The macro nxgentPicturePriv
+  was used without checking for a null pointer argument.
+
+nxagent-1.3.0-30
+
+- Limitations on bandwidth introduced whenever the agent's window
+  is covered are now disabled by default. They can be enabled by
+  specifying the -limit option on the command line. The -nolimit
+  option is left for compatibility with the previous versions.
+  This handy feature caused complaints in the past from users who
+  instruct window managers to not move the window having focus on
+  top of the stacking order.
+
+nxagent-1.3.0-29
+
+- Removed the warnings issued at compile time.
+
+nxagent-1.3.0-28
+
+- Replaced the corrupted file nxagent.xpm with the original version.
+
+nxagent-1.3.0-27
+
+- Hopefully fixed all the remained memory leaks. Most problems were
+  due to agent's render extension not freeing resources on X server.
+
+- Added support for big-endian X server display on render extension.
+  Glyphs are reformatted according with the destination order.
+
+- Added per client information for SetUnpackGeometry, now the unpack
+  routines should have the correct information for the color mask at
+  the end of the split process.
+
+
+nxagent-1.3.0-26
+
+- Changed the message printed in the log when leaving the dispatch
+  loop from 'Error' to 'Info'.
+
+- Moved initialization of _NXFlushSize to nxcompext in order to set
+  value at the time NXGetControlParameters() is called.
+
+nxagent-1.3.0-25
+
+- Content of selection is now acquired using a single round-trip.
+  If content exceeds 262144 bytes, it is truncated at that size.
+  This works in most situations, at least with text, that, by the
+  way, is the only target supported at the moment. An improvement
+  would be to modify the state machine in a way that the remaining
+  data part is got using a second round-trip. This is not difficult
+  to do and can be considered for future releases.
+
+- In handling of clipborad we had to disable check on multiple
+  convert selection requests from the same client. There is a bug
+  in the algorithm that prevents the counter to be reset at the
+  appropriate time. This is to be investigated.
+
+nxagent-1.3.0-24
+
+- Added asynchronous handling of GetProperty requests and replies
+  using the NXCollectProperty and NXGetCollectedProperty requests
+  and the NXCollectPropertyNotify event in NXclipboard.c and in
+  Event.c. Implementation is not complete yet and can sometimes
+  cause X clients to misbehave.
+
+- Function xnestBitBlitHelper() now always returns NullRegion.
+  Handling of graphical expose events should be rewritten so that
+  regions are always generated internally to nxagent. Returning a
+  null region without checking our event queue, anyway, saves a
+  flush of the display buffer and doesn't seem to affect the
+  functionalities.
+
+- This version comprises modifications to Events.c, GCOps.c,
+  NXClipboard.c, NXwindow.c and Window.c where I found XSync()
+  messages (or code used to just send XSync() messages) outside
+  any #ifdef ..._DEBUG.
+
+nxagent-1.3.0-16
+
+- A dialog is showed at startup if proxy was not able to load a
+  persistent cache.
+
+- Reflected changes introduced in NXGetControlParameters() to add
+  more detailed information about the compression settings.
+
+- Fixed a potential bug with the name of the agent's display at the
+  time a dialog had to be showed. String was allocated with only 6
+  characters. This could lead to dialogs not being showed using
+  display ports greater than 9999.
+
+- NX.h is now included by NXControl.h. Removed #include directives
+  from other files.
diff --git a/doc/_attic_/NoMachine_documentation_files/nxcomp_CHANGELOG b/doc/_attic_/NoMachine_documentation_files/nxcomp_CHANGELOG
new file mode 100644
index 000000000..b0323d4a7
--- /dev/null
+++ b/doc/_attic_/NoMachine_documentation_files/nxcomp_CHANGELOG
@@ -0,0 +1,3778 @@
+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.
+
+- Updated copyright to year 2011.
+
+nxcomp-3.4.0-7
+
+- Fixed TR03H02334. Modified the UNIX domain socket checks on MacOSX
+  to be compliant with the standard introduced in OSX 10.6.3.
+
+nxcomp-3.4.0-6
+
+- Solved compilation problems on Solaris.
+
+nxcomp-3.4.0-5
+
+- Solved compilation problems on GCC 4.4.
+
+nxcomp-3.4.0-4
+
+- Added reference to fixed TR02H02325.
+
+nxcomp-3.4.0-3
+
+- Updated copyright to year 2010.
+
+nxcomp-3.4.0-2
+
+- Fixed TR03G02204. Changed the parsing of X authority entries in
+  order to handle the case where the hostname includes white spaces.
+
+- Fixed TR02H02325. Bug in PNG decompression on 16bpp displays.
+
+nxcomp-3.4.0-1
+
+- Opened the 3.4.0 branch based on nxcomp-3.3.0-4.
+
+- Changed version number.
+
+- Updated copyright to year 2009.
+
+nxcomp-3.3.0-4
+
+- Check if the variable storing the ping time exceeded the maximum
+  integer value.
+
+- Recover incorrect sequence number when the proxy is not connected
+  to an agent.
+
+nxcomp-3.3.0-3
+
+- Removed a condition in ClientChannel that caused a loss in event
+  sequence numbers.
+
+nxcomp-3.3.0-2
+
+- Updated VERSION.
+
+nxcomp-3.3.0-1
+
+- Opened the 3.3.0 branch based on nxcomp-3.2.0-7.
+
+nxcomp-3.2.0-7
+
+- Solved a compilation problem on GCC 4.3.
+
+nxcomp-3.2.0-6
+
+- Changes considering that unsetenv() returns void on Mac OS X.
+
+nxcomp-3.2.0-5
+
+- Fixed TR03F02024. Assume the launchd unix socket as X socket.
+
+- Changed the authorization cookie retrieval when using the launchd
+  socket on MacOSX, in order to wait for the X server start.
+
+nxcomp-3.2.0-4
+
+- Fixed TR03F02026. Unset environment variable LD_LIBRARY_PATH before
+  calling the exec function running nxclient.
+
+nxcomp-3.2.0-3
+
+- Fix addMsTimestamp() and subMsTimestamp(). Remove the check for
+  a valid input in diffTimestamp() and diffUsTimestamp().
+
+nxcomp-3.2.0-2
+
+- Fixed TR12E01973. Now the correct number of bits are used for the
+  number of points in a X_FillPoly request.
+
+nxcomp-3.2.0-1
+
+- Opened the 3.2.0 branch based on nxcomp-3.1.0-6.
+
+nxcomp-3.1.0-6
+
+- Always use a timeout of 50 ms to update the congestion counter.
+
+nxcomp-3.1.0-5
+
+- Solve the possible deadlock caused by both proxies running out of
+  tokens at the same time.
+
+- In ServerProxy::handleCheckDrop() copy the list since the function
+  can delete the elements.
+
+nxcomp-3.1.0-4
+
+- Classes ProxyReadBuffer and ServerReadBuffer returned an invalid
+  number of characters to read in the case of a readable() failure.
+
+- Connections to proxy versions newer than 3.0.0 were not accepted.
+
+- Reading options from file could fail if options contained spaces
+  or other characters interrupting the fscanf()'s matching of input.
+
+- The proxy link could not be flushed if a ping request was replied
+  after the end of the read loop.
+
+nxcomp-3.1.0-3
+
+- Fixed a compilation warning on GCC 2.95.
+  
+nxcomp-3.1.0-2
+
+- Solved TR09E01852. Modified the encoding of the number of rects
+  in the XSetClipRectangles request.
+  
+nxcomp-3.1.0-1
+
+- Opened the 3.1.0 branch based on nxcomp-3.0.0-46.
+
+nxcomp-3.0.0-46
+
+- Fixed TR09E01865 and TR08E01831. Assume the old behavior of compr-
+  essing the CUPS, SMB, HTTP and Font channels when connected to an
+  old proxy version.
+
+nxcomp-3.0.0-45
+
+- Retry the fork() 30 times, but only on Cygwin (Sob!).
+
+nxcomp-3.0.0-44
+
+- In the case of an error, try again to fork() after a second, for
+  a maximum of 5 times. This seems to constitute a valid workaround
+  to the intermittent fork() failures observed on Windows.
+  
+- Fixed NXTransDestroy() to show the 'broken connection' dialog in
+  the case of a link failure on the client.
+
+- Handled the 'terminating' and 'terminated' messages as new proxy
+  stages.
+
+- Force all the directories and files created by the library to be
+  readable only by the user.
+
+- Don't complain if the shared memory segment can't be initialized
+  on Windows.
+
+nxcomp-3.0.0-43
+
+- Prevent the reallocation of the read buffer in the proxy and the
+  agent transport if the buffer was borrowed by an upper layer.
+
+- Let the house-keeping process remove the cache directories that
+  are empty and have not be used since more than 30 days.
+
+- Added the missing destruction of the ZLIB stream used for image
+  decompression at proxy shutdown.
+
+nxcomp-3.0.0-42
+
+- In handleFastWriteReply(), moved the initialization of the 'next'
+  pointer inside the '#ifndef __sun' block. This should fix the re-
+  maining encoding problems on SPARCs.
+
+nxcomp-3.0.0-41
+
+- VMWare virtual machines can have the system timer deadly broken.
+  In the case of timeout, try to send a ping regardless we are the
+  client or the server proxy to force a write by the remote.
+
+- Removed the messages 'Info: Using image cache parameters...' and
+  'Info: Using image streaming parameters...' from the session log
+  if the image cache is not enabled.
+
+nxcomp-3.0.0-40
+
+- Removed the messages 'Info: Shutting down the NX transport' and
+  'Info: End of NX transport requested by...' at the session tear
+  down.
+
+- Removed the remaining log output.
+
+nxcomp-3.0.0-39
+
+- Don't reset the timer on proxy shutdown.
+
+nxcomp-3.0.0-38
+
+- Don't reinstall the signal handler if the signal was enabled and
+  the NXTransSignal() action is NX_SIGNAL_FORWARD.
+
+nxcomp-3.0.0-37
+
+- Return a congestion level 9 if the agent channel is in congestion
+  state.
+
+- Set the idle timeout (used to update the congestion state) based
+  on the link type. The timeout is 0 ms with link LAN and 50 ms in
+  the case of MODEM, with the other values in the between.
+
+nxcomp-3.0.0-36
+
+- Changed the encoding of the RenderCompositeGlyphs requests. Use
+  a separate cache for X and Y. Send a single bit for offset X and
+  offset Y if they match the source coordinates.
+
+- Always use the memcpy() in the handleFastWrite*() on Sun, as the
+  alternative code doesn't work on SPARC if the buffer is not word
+  aligned.
+
+nxcomp-3.0.0-35
+
+- Ensure a smooth transition between different congestion states.
+  If the current congestion counter is greater than the previous,
+  ramp up the value quickly by taking the current counter. If the
+  new congestion counter is less than the previous, ramp down the
+  reported value slowly by calculating the average of the last 8
+  updates. Reset the congestion counter to 0 if no token reply is
+  pending and the proxy is idle until a timeout.
+
+nxcomp-3.0.0-34
+
+- Calculate the current congestion as the average of the last 3
+  frames sent.
+
+nxcomp-3.0.0-33
+
+- When sending a X_RenderCompositeGlyph update, send a single bit
+  if the source X and Y match the values in cache.
+
+- Save the check on the bytes readable from the proxy descriptor
+  after the select.
+
+nxcomp-3.0.0-32
+
+- Send the X_GetImage replies uncompressed to better leverage the
+  stream compression.
+
+- Before entering in congestion state, force a read to see whether
+  the remote proxy aborted the connection.
+
+nxcomp-3.0.0-31
+
+- Try to avoid using memcpy() in the channels' handleFastWrite*().
+
+- Changed the copyright notices at the beginning of the files that
+  were referring to NXPROXY to refer to NXCOMP.
+
+nxcomp-3.0.0-30
+
+- Set the agent and proxy descriptors as ready, when appropriate,
+  also in the case of an interrupt.
+
+nxcomp-3.0.0-29
+
+- On the X server side, read more events from the X server just be-
+  fore and just after having written some data. On the X client si-
+  de, apply the same to the proxy link.
+
+- X11 channels originate a congestion control code as soon as the-
+  re is some data left from the previous write.
+
+nxcomp-3.0.0-28
+
+- Displaced automatically the "channel unresponsive" and "no data
+  received from remote" dialogs if the error condition is ceased.
+
+- Rewritten the channel drain procedure.
+
+- Tried a different approach to the channel congestion handling.
+  The X11 channels are not drained after a blocking write but only
+  if a further write is requested and the channel is still in con-
+  gestion state. Benchmarks show that this is still sub-optimal,
+  compared to sending the congestion code immediately also for X11
+  channels. See the next version.
+
+nxcomp-3.0.0-27
+
+- Ignored the agent option 'defer'.
+
+- Dropped support for the 1.4.0 versions.
+
+- More fixes to support the 1.5.0.
+
+nxcomp-3.0.0-26
+
+- The channel read buffer can inherit the data to be encoded from
+  the caller, instead of taking it from the transport. This is le-
+  veraged by the agent channel to save the copy.
+
+- Ignored the agent option 'clients'.
+
+- Removed the deprecated code checking the CPU limits.
+
+- Removed the counters that were duplicated in the Statistics and
+  the Control classes.
+
+nxcomp-3.0.0-25
+
+- Improved the effectiveness of the caching of the RenderComposite-
+  Glyphs by using a differential encoding for the length, delta x
+  and delta y of the first string.
+
+- Better handle the compatibility between different formats of the
+  cache files.
+
+nxcomp-3.0.0-24
+
+- Fixed the compatibility problem with the 1.5.0 versions.
+
+- Removed the constants NXDisplayReadable, NXDisplayFlushable and
+  NXDisplayCongestion. Now nxcompext has three distinct functions.
+
+nxcomp-3.0.0-23
+
+- Removed support for Rdp, Tight and Hextile packed images decod-
+  ing since they have been made obsolete by the new NX server.
+
+- Use the value 0 for the action is_hit and 1 for is_added. This
+  increases the frequency of zeroes in the encode buffer, giving
+  better compression.
+
+- Changed the copyright attribution from Medialogic to NoMachine.
+
+nxcomp-3.0.0-22
+
+- Implemented an alternate encoding reducing the size of the int
+  caches to 16 elements and transmitting the values in blocks of
+  4 bits. Although this encoding reduces the effectiveness of
+  the differential compression, it allows better compression of
+  the final stream, resulting in a 10% to 20% gain in all condi-
+  tions. The new encoding is experimental, as it would make the
+  3.0.0 incompatible with all the previous NX versions. Use this
+  package as a reference for future implementations.
+
+nxcomp-3.0.0-21
+
+- Encode the first two coordinates of a FillPoly message by using
+  a differential encoding, thus the origin of the polygon is not
+  included in the checksum. This is aimed to work in combination
+  with the agent converting all the FillPoly requests to the rela-
+  tive coordinate mode.
+
+- Add the coordinate mode to the checksum of the PolyPoint and Po-
+  lyLine messages so that it doesn't need to be encoded separately.
+
+- Disable the streaming for all messages. This saves the encoding
+  of a boolean for each message that could potentially be streamed.
+
+- Don't try to match the block size when encoding a value based on
+  an IntCache. This saves the additional bool in 90% of the cases.
+ 
+- Removed support for the former RDP and RFB session types. 
+
+- Due to the above changes, this version is incompatible with the
+  previous 3.0.0 releases.
+
+nxcomp-3.0.0-20
+
+- Added support for the 'lossy', 'lossless' and 'adaptive' pack me-
+  thod literals. These values activate the dynamic selection of the
+  pack method by the agent.
+
+- Made the 'adaptive' pack method the default for all link types.
+
+- The default stream compression level is now 6 for link type ISDN,
+  4 for ADSL and 1 for WAN. The default data compression level is
+  always 1, except for LAN that is 0.
+
+nxcomp-3.0.0-19
+
+- Print in the session log the X11 display that the proxy is imper-
+  sonating or where it is forwarding the connections.
+
+nxcomp-3.0.0-18
+
+- Implemented decoding of the PACK_BITMAP_16M_COLORS pack method.
+  This is a very simple encoder removing the 4th byte in 32 bits-
+  per-plane images. This encoder is intended to better leverage
+  the stream compression on low bandwidth links.
+
+- Removed the code cleaning the padding bytes in RenderAddGlyphs
+  and RenderCompositeGlyphs as the operation is now performed in
+  Xrender.
+
+- Removed the "Info: Synchronizing local and remote caches." and
+  "Info: Using remote server '...'." lines from the session log.
+
+nxcomp-3.0.0-17
+
+- Determine the CPU endianess at compile time only on Linux and
+  Cygwin.
+
+nxcomp-3.0.0-16
+
+- Optimized the memory allocation of the ReadBuffer classes. The
+  buffers from the Transport classes are used, when possible, to
+  avoid the copy.
+
+nxcomp-3.0.0-15
+
+- Reworked the code dealing with the channel congestion control
+  messages for increased efficiency.
+
+- Removed the pending_ flag from the proxy and channel class mem-
+  bers. If needed, the classes will query the transport buffers
+  to see whether there is data pending.
+
+- Removed the additional parameter from NXTransFlush().
+
+- The proxy doesn't issue anymore a sync control message on a X
+  reply. Anyway it will respond to the request for compatibility
+  with older versions.
+
+- Removed the dynamic selection of the encoding method for the
+  X_QueryColors request and X_ListFonts, X_QueryColors, X_Query-
+  Font replies. Now all of them use the differential encoding to
+  better leverage the stream compression.
+
+- Fixed to build on SUNs where we don't have endian.h.
+
+nxcomp-3.0.0-14
+
+- When handling partial proxy messages, don't try to determine how
+  many bytes still need to be read if the ZLIB stream compression
+  is enabled.
+
+- If a message can't be located, the ReadBuffer class checks if it
+  is possible to consume the data already in the transport buffer.
+
+- Optimize the MD5 routines by determining the CPU endianess at
+  compile time.
+
+- Force Drawable and GContext to be CARD32 in NXproto.h.
+  
+nxcomp-3.0.0-13
+
+- Changed the semantic of the NXDisplayFlushHandler callback. The
+  function is called when new data is sent to the remote proxy or,
+  with a 0 length, upon receiving a new token reply, so that the
+  agent can update its congestion state.
+
+- Added the NXTransCongestion() function. It returns a value bet-
+  ween 0 and 9 indicating the congestion level based on the tokens
+  remaining. A value of 9 means that the link is congested and no
+  further data can be sent.
+
+- Removed the congestion and synchronization callbacks. They are
+  superseded by the new NXTransCongestion() implementation.
+
+nxcomp-3.0.0-12
+
+- Send the token replies at the end of the encode loop instead of
+  flushing the buffer immediately.
+
+- Fixed TR05E01687. Correctly detect CTRL-ALT-SHIFT-ESC keystrokes.
+
+- Renamed the option 'block' as 'tile'.
+
+- Ignored the option 'menu', targeting the X11 agent.
+
+nxcomp-3.0.0-11
+
+- Removed the 'interactive' attribute from generic channels. We now
+  use the 'prioritized' attribute which yields the same result.
+
+- Simplified the channels' read loop by always reading only once.
+
+- The channels flush the link as soon as the token is exceeded even
+  if the flush policy is set to deferred.
+
+- Reserved more cache memory for the images when running a shadow
+  session.
+
+nxcomp-3.0.0-10
+
+- Added the NXDisplayWriteHandler callback definition.
+
+- Removed the code that forced the proxy to retain in the cache the
+  images referenced at session startup.
+
+- Disabled the persistent image cache since this is not supported
+  by the current agent. This will save the overhead caused by the
+  image house-keeping process.
+
+nxcomp-3.0.0-9
+
+- Fixed a cast problem in GetBytesReadable().
+
+nxcomp-3.0.0-8
+
+- Added the NXTransTime() utility. It return the time in milliseconds
+  elapsed since the last call to the same function. Useful for bench-
+  marking the Xlib layer.
+
+- Ignored the option 'block' targeting the X11 agent.
+
+nxcomp-3.0.0-7
+
+- Ignored the options 'shadow', 'shadowmode' targeting the X11 agent.
+
+- Added the session type 'shadow'.
+
+nxcomp-3.0.0-6
+
+- Fixed TR08D01484. Fixed a bug in the cleanup of the RenderAddGlyphs
+  messages. We clean up only the glyphs with depth 8, width greater
+  than 1 and pixmap byte pad 4.
+
+- Added file COPYING.
+
+nxcomp-3.0.0-5
+
+- Updated the copyright notices to the current year.
+
+nxcomp-3.0.0-4
+
+- Imported changes up to nxcomp-2.1.0-6.
+
+- Fixed TR12D01563. Changed the configure script to always build the
+  library with the -fPIC option. This is related to the way SELinux
+  works.
+
+- Fixed the dependency from local endianess for 16-bit color RDP un-
+  packing functions. This caused wrong colors to be displayed when the
+  proxy and the X server were running on two separate machines having 
+  different endianess.
+
+- Fixed TR10D01523. The Channel::handleDrain() method now accounts
+  for the fact that agent connections can't be drained.
+
+- Changed the Tight and Hextile decoding functions to use the X ser-
+  ver's byte order.
+
+nxcomp-3.0.0-3
+
+- Changed the main loop to handle the 3.0.0 version.
+
+nxcomp-3.0.0-2
+
+- Updated the file VERSION.
+
+nxcomp-3.0.0-1
+
+- Opened the 3.0.0 branch based on nxcomp-2.0.0-81.
+
+nxcomp-2.0.0-81
+
+- Fixed the dependency from local endianess for JPEG and PNG decomp-
+  ression functions. This caused wrong colors to be displayed when
+  the proxy and the X server were running on two separate machines
+  having different endianess.
+
+- Fixed the number of entries in the handleColormap() function.
+
+nxcomp-2.0.0-80
+
+- Fixed TR06D01404. Removed the warning issued when calling the
+  AgentTransport::drain() method.
+
+nxcomp-2.0.0-79
+
+- Updated copyright to year 2006.
+
+nxcomp-2.0.0-78
+
+- Fixed a bug in the cleanup of the RenderAddGlyphs messages.
+
+- Minor improvements to the encoding of the RenderCompositeGlyphs
+  and RenderComposite requests.
+
+- Added 'client' to the list of the ignored options.
+
+nxcomp-2.0.0-77
+
+- Added cleanup of the padding bytes in the RenderCompositeGlyphs
+  and RenderAddGlyphs requests.
+
+nxcomp-2.0.0-76
+
+- Before adding the frame's bytes to the tokens, the frame length
+  is normalized based on the stream compression ratio of the last
+  frame sent. This avoids entering the drain loop too early when
+  the data is highly compressible. 
+
+- Moved the render messages' private data in a union to reduce the
+  footprint of the render store.
+
+nxcomp-2.0.0-75
+
+- The action performed on the remote message store and the affected
+  position are encoded as a single value. This saves approximately
+  1 bit per each message.
+
+- Created more Compat classes to handle the backward compatibility
+  with the 1.4.0 and 1.5.0 versions.
+
+nxcomp-2.0.0-74
+
+- Added support for the RLE pack method and made it the default if
+  the selected link type is LAN.
+
+- Removed the legacy support for the 'render' option provided at X
+  server side.
+
+- When defining LAME in ClientChannel.h, the channel has the chance
+  of suppressing more opcodes by the handleTaintLameRequest() call.
+  This is for test purposes.
+
+nxcomp-2.0.0-73
+
+- The X_NXSetUnpackColormap and X_NXSetUnpackAlpha now carry their
+  data in compressed form. The alpha data is compressed using the
+  ZLIB RLE encoding, while the colormap data is compressed using
+  the default ZLIB deflate.
+
+- Thanks to the above changes, ZLIB data compression of all messa-
+  ges which do not have a specific encoding is turned off, so that
+  we can make better use of the final stream compression.
+
+- Created new message structures to handle the compatibility with
+  the old proxy versions. When connected to an old proxy version
+  the agent should use the NXSetUnpackColormapCompat() and NXSet-
+  UnpackAlpha() interfaces.
+
+nxcomp-2.0.0-72
+
+- Solved a compatibility problem with the 1.X.X versions due to the
+  new render encodings.
+
+nxcomp-2.0.0-71
+
+- Improvements to X_RenderSetPictureClipRectangles.
+
+- Fixed handleUnpack() to pass the correct byte order parameter to
+  to the unpack alpha function.
+
+- Added the --parent parameter to the client even in pulldown mode.
+
+- Fixed a deallocation bug in StaticCompressor.
+
+nxcomp-2.0.0-70
+
+- Added compression of X_RenderSetPictureFilter, X_RenderSetPicture-
+  Transform, X_RenderTrapezoids and X_RenderTriangles.
+
+nxcomp-2.0.0-69
+
+- Changed the format of the persistent cache to accommodate the new
+  encoding of the render opcodes. Caches from the 1.4.0 and 1.5.0
+  should be still loaded and saved correctly when connected to and
+  old version of the library.
+
+- Improved the encoding of the X_CreatePixmap, X_ChangeGC, X_Render-
+  CompositeGlyphs, X_RenderComposite, X_RenderCreateGlyphSet, X_Rend-
+  erFreePicture and X_RenderCreatePicture messages. Added new classes
+  to handle the backward compatibility.
+
+- Made the static compression and decompression code reside in the
+  same class.
+
+nxcomp-2.0.0-68
+
+- Improved the encoding of the X_RenderCreateGlyphSet and X_Render-
+  FreeGlyphSet requests.
+
+nxcomp-2.0.0-67
+
+- Modified the following session messages:
+
+  From: "Session: Session starting at..."
+  To:   "Session: Starting session at..."
+
+  From: "Session: Session terminating at..."
+  To:   "Session: Terminating session at..."
+
+- Improved the encoding of the requests creating or freeing an XID.
+  This affects X_CreateGC, X_CreateWindow, X_CreatePixmap, X_Render-
+  CreatePicture, X_FreeGC, X_DestroyWindow, X_FreePixmap, X_Render-
+  FreePicture.
+
+- Added 'streaming' and 'backingstore' to the list of options used
+  by agents.
+
+- Modified the info messages to print the ZLIB compression paramet-
+  ers to be more compact and only use two lines.
+
+nxcomp-2.0.0-66
+
+- When part of an agent, the proxy will wait for the NXTransDestroy()
+  function to initiate the shutdown.
+
+nxcomp-2.0.0-65
+
+- Starting from this version the NX client can control the behaviour
+  of the client proxy by monitoring the messages marked as "Session".
+
+  At the early initialization the proxy will print:
+
+  "Session: Session starting at '...'.
+
+  The ellipsis here represent the current timestamp, as reported by
+  the POSIX function ctime():
+
+  Once the session is running, the proxy will print:
+
+  "Session: Session started at '...'.
+
+  At the time the session is being shut down, the proxy will print:
+
+  "Session: Session terminating at '...'.
+
+  Followed by:
+
+  Session: Session terminated at '...'.
+
+  The message "Info: Starting X protocol compression." is removed,
+  replaced by the message 'Session started at...' with the same
+  meaning. 
+
+  Once the message 'Session: Session terminated at..." is read from
+  the output, the client can optionally wait for the proxy process
+  to complete and terminate with an exit code 0.
+
+- The "Session" messages are not printed when the proxy is running
+  on the NX server side, as part of an agent.
+
+nxcomp-2.0.0-64
+
+- Reduced the default token limit from 32 to 24. The synchronizat-
+  ion callback is triggered by the tokens going below half the li-
+  mit.
+
+nxcomp-2.0.0-63
+
+- Added -I/usr/include/c++ to makedepend.
+
+nxcomp-2.0.0-62
+
+- The house-keeping process is now started upon the initialization,
+  if the memory cache is enabled, and, on the X server side, when
+  the remote actually requested access to the image cache.
+
+nxcomp-2.0.0-61
+
+- Added a NX_HANDLER_SYNCHRONIZATION callback to NXTransHandler().
+  The handler is called when the agent can use the available band-
+  width to synchronize X objects that are corrupted or incomplete.
+
+  The reason can be:
+
+  NX_SYNCHRONIZATION_BEGIN:   The synchronizationis is allowed.
+
+  NX_SYNCHRONIZATION_END:     The synchronizationis must stop.
+
+  The reason can be determined by agents by using the NXBeginSynch-
+  ronization and NXEndSynchronization values defined in NXvars.h.
+
+- Bytes from 14 to 24 in the X_NXGetControlParameters reply report,
+  respectively, the frame timeout, the ping timeout, the preferred
+  image split mode and the split size threshold.
+
+nxcomp-2.0.0-60
+
+- The following messages used by the NX client and server have been
+  changed. The NX client and server should be modified accordingly.
+
+  From: "Info: Shutting down the link and exiting."
+  To:   "Info: Shutting down the NX transport."
+
+  From: "Info: End of session requested by remote proxy."
+  To:   "Info: End of NX transport requested by remote"
+
+  From: "Info: End of session requested by agent termination."
+  To:   "Info: End of NX transport requested by agent."
+
+  From: "Info: End of session requested by signal '...'."
+  To:   "Info: End of NX transport requested by signal '...'."
+
+  From: "Info: Shutting down the link and exiting."
+  To:   "Info: Shutting down the NX transport."
+
+  From: "Info: Waiting for cleanup timeout to complete."
+  To:   "Info: Waiting the cleanup timeout to complete."
+
+  From: "Info: Waiting for watchdog process to complete."
+  To:   "Info: Waiting the watchdog process to complete."
+
+nxcomp-2.0.0-59
+
+- Added more debug information regarding the timing of packets sent
+  and received.
+
+- Added the possibility to redirect the log output to a file that can
+  be later shared with nxssh running in "binder" mode. This is useful
+  when testing the forwarding of the SSHD connection by nxssh to the
+  agent. Activated by defining BINDER in Loop.cpp.
+
+nxcomp-2.0.0-58
+
+- Fixed the unpack alpha procedure to only rely on the image's byte
+  order.
+
+- Solved the X_PutImage encoding problem introduced in the 2.0.0-56
+  version and restored the compatibility with the 1.5.0 version.
+
+nxcomp-2.0.0-57
+
+- Added a NXTransFile() function. It returns the name of the files
+  used by the proxy for the current session.
+
+  The type parameter can be:
+
+  NX_FILE_SESSION:  Usually the file 'session' in the user's session
+                    directory.
+
+  NX_FILE_ERRORS:   The file used for the diagnostic output. Usually
+                    the file 'errors' in the session directory.
+
+  NX_FILE_OPTIONS:  The file containing the NX options, if any.
+ 
+  NX_FILE_STATS:    The file used for the statistics output.
+
+  The returned string is allocated in static memory. The caller must
+  copy the string upon returning from the function, without freeing
+  the pointer.
+
+- Fixed the PANIC in the handling of the abort split messages.
+
+- The encode and decode routines may write one byte past the nominal
+  end of the encode buffer. This additional byte is now included in
+  the payload. This is actually a bug, but harmless.
+
+nxcomp-2.0.0-56
+
+- Added the X_NXAbortSplit request. It can be used to interrupt the
+  streaming of all the messages currently in the split store for
+  the specified resource. Depending if the split store did or did
+  not contain split messages, the client will receive an immediate
+  end-split or no-split notification.
+
+- Removed the split modes NXSplitModeEager and NXSplitModeLazy. The
+  available modes are now NXSplitModeSync and NXSplitModeAsync. The
+  mode NXSplitModeAsync replaces the two old modes and is now the
+  default. Similarly to NXSplitModeEager, it makes the proxy split
+  only messages that exceed a size threshold, but the threshold is
+  generally smaller than in the previous versions.
+
+  #define NXSplitModeDefault  0
+  #define NXSplitModeAsync    1
+  #define NXSplitModeSync     2
+
+- Renamed X_NXSplit to X_NXSplitData, X_NXAbortSplit to X_NXSplitEv-
+  ent.
+
+- The proxy now enters a drain loop, when in congestion state, and
+  waits until the decongestion. Also the X channels are drained if
+  blocked.
+
+- The select is restarted immediately if only the proxy is selected
+  and the data read doesn't make a complete message.
+
+- The size of the shared memory segment used by the X server proxy
+  is now negotiated at startup and the selected value is printed in
+  the session log.
+
+- Added the option 'encrypted'. It tells the local proxy if it is
+  running as part of a program providing encryption of the point to
+  point communication. This is useful to determine if the proxy can
+  block waiting for data or needs to yield to the client to let it
+  handle the remote connection.
+
+nxcomp-2.0.0-55
+
+- Fixed handleRestart() to correctly send the end-split event only
+  after the split sequence has been closed by the client.
+
+- Fixed a possible memory error in the Keeper class occurring if the
+  image caches were erased while in the middle of a loop.
+
+nxcomp-2.0.0-54
+
+- Added a '--parent' option when running the client in dialog mode.
+  This is the process id that needs to be signaled in the case the
+  user chooses to do so.
+
+nxcomp-2.0.0-53
+
+- Solved a bug in the abort split procedure. The procedure assumed
+  that the split had to be at the head of the list. This may not be
+  the case if the split was loaded from disk asynchronously, after
+  a different split with the same checksum was recomposed.
+
+- By defining STRICT in Loop.cpp, the number of available tokens is
+  set to 1. This can be used to trigger the congestion more often
+  than it would possible when testing the software with the default
+  settings.
+
+- Added more debug output to the procedures handling the streaming
+  of the images.
+
+- Reset the channel's split pending and congestion flags in the fin-
+  ish procedure. Not doing so caused some additional loops at chan-
+  nel shutdown.
+
+- Fixed a bug on Cygwin that prevented the log files to be succes-
+  sfully reopened when the size limit was exceeded.
+
+- Failures to write to the agent transport are reported sooner when
+  the channel is finished. This saves a few more loops at session
+  shutdown.
+
+nxcomp-2.0.0-52
+
+- Started implementing a new handler to let the agent include arbit-
+  rary data in the transport statistics. The parameter, in this case,
+  is a pointer to a pointer to a null terminated string. The pointer
+  is set at the time the handler is registered. The pointed string
+  will have to be filled by the agent with its statistics data. For
+  now, only the interfaces and the stubs exist.
+
+- Disabled the timestamp cache as it still causes rounding problems
+  when calculating the current bitrate.
+
+nxcomp-2.0.0-51
+
+- Removed SelectPackMethod(), not used anymore, from Pack.c.
+
+nxcomp-2.0.0-50
+
+- Added the X_NXFinishSplit request. It forces the proxy to comple-
+  tely transfer all the split messages for the given resource, and
+  then notify the agent.
+
+- Fixed the statistics to not account the split bits to the control
+  token.
+
+nxcomp-2.0.0-49
+
+- Fixed a bug that caused the split timeout to be reset even if a
+  different channel had splits to send.
+
+- Removed an error condition that arose when a split operation was
+  requested by a different channel than the first to connect. The
+  reason is that an auxiliary channel (like the one created by the
+  server to store the keyboard configuration) can be the first to
+  open a connection to the X server, then can come the agent, that
+  is actually using the NX opcodes. The proxy will now simply print
+  a debug message. 
+
+- Removed a further error condition that was assumed by the proxy
+  if a pending flush was detected while no channel was selected for
+  output. This can actually happen if the channel was dropped and,
+  in the meanwhile, the user requested the proxy statistics.
+
+nxcomp-2.0.0-48
+
+- Added a 'type' parameter to NXTransFlush(). The new NX_FLUSH_IDLE
+  type should be used by agents when they have finished handling all
+  their clients and are going to wait for more input. This is the
+  case, for example, of the X agent returning from WaitForSomething()
+  after having set a small timeout to find out if there are clients
+  ready, or the case of a RDP agent finding that there are no opcodes
+  to read from the RDP server. The 'idle' flush should be requested
+  also when the X11 agent is waiting for a split to complete. When
+  the flag is used, the proxy uses the available bandwidth to encode
+  more low-priority data, like the payload of images being streamed.
+
+nxcomp-2.0.0-47
+
+- Added a new RGB image encoder. For now the encoder uses a static
+  Z stream to compress the image data in the destination buffer and
+  allows the agent to use the simplest encoding by still separating
+  the alpha channel from the image data. The new encoder can be the
+  the base for implementing color reduction by dithering or a color-
+  mapped translation of the image similar to PNG, but without the
+  PNG overhead and with the colormap being sent to the client using
+  the NXSetUnpackColormap() opcode.
+
+- Put the routines implementing static deflating and inflating of
+  a ZLIB buffer from the Compressor and Decompressor classes to Z.h
+  and Z.cpp, so that they can be reused by the new RGB encoder.
+
+nxcomp-2.0.0-46
+
+- Fixed a segfault arising when trying to start a child without the
+  NX transport.
+
+nxcomp-2.0.0-45
+
+- Undefined the MATCH directive.
+
+nxcomp-2.0.0-44
+
+- Changed the encoding of the X_CreatePixmap, X_CreateGC, X_Render-
+  CreatePicture, X_CreateWindow, RenderCreateGlyphSet.cpp. The Xid
+  of the drawable is included in the checksum of the X_CreateGC and
+  X_CreatePixmap message. This leverages the way GC and Pixmaps are
+  allocated in the X agent to obtain better compression.
+
+- Removed the code handling the reset of the proxy connection. This
+  functionality was unused since when the persistence is handled by
+  the agent.
+
+- Added a specific section in the statistics output for the render
+  extension.
+
+nxcomp-2.0.0-43
+
+- Fixed a bug that could have caused the sending of multiple 'end
+  split' messages for the same split sequence.
+
+- Added handling of the option 'strict'.
+
+nxcomp-2.0.0-42
+
+- Added a missing channel switch directive when encoding abort split
+  messages at the server side. This could cause a decoding error on
+  the client.
+
+nxcomp-2.0.0-41
+
+- Ensured that the link is flushed immediately on the X server side
+  when important keyboard or mouse activity is detected in input.
+
+- Implemented a timestamp cache to avoid calling gettimeofday() when
+  it is enough to use the last timestamp gotten from the system. The
+  cache can be disabled by undefining CACHE_TIMESTAMP in Timestamp.h.
+
+nxcomp-2.0.0-40
+
+- Added the karma delay field to the X_NXGetControlParameters reply.
+
+- Solved a bug with the decoding of split messages likely to happen
+  only when using link type LAN.
+
+nxcomp-2.0.0-39
+
+- Implemented separate flow control for the generic channels and the
+  image streaming data.
+
+- Improved the split procedure to load a message from the disk cache
+  if found after it was originally discarded because locked.
+
+nxcomp-2.0.0-38
+
+- Renamed the 'shmem' option as 'shseg'. The 'shmem' option becomes
+  specific to the agent and will be used together with 'shpix' option
+  to indicate if, respectively, the shared memory extension and the
+  use of the shared pixmaps must be enabled in the agent server. The
+  new option will be instead used by the proxy to determine the size
+  of the memory segment shared between the proxy and the X server.
+
+- Added the 'shmem', 'shpix', 'keyboard' and 'clipboard' to the list
+  of ignored options. The 'keyboard' option should become a synonym
+  of 'kbtype'. The 'clipboard' option will tell the NX agent if the
+  clipboard support should be disabled for security reasons.
+
+nxcomp-2.0.0-37
+
+- Ensured that, when running a raw session, the persistent cache is
+  loaded and saved only once in the session lifetime.
+
+- Added the 'product' keyword to the list of recognized options. The
+  option is ignored by the proxy, but can be used by the client or
+  server to facilitate the support.
+
+nxcomp-2.0.0-36
+
+- Added the remote version number in the X_NXGetControlParameters
+  reply.
+
+- Solved a bug related to the removal of the split stores.
+
+- Removed the unused code dealing with the flush timeouts.
+
+nxcomp-2.0.0-35
+
+- Added an alert to notify the user about the failure of the XDMCP
+  session.
+
+nxcomp-2.0.0-34
+
+- The active channels and the agent resources are now stored in a
+  list container.
+
+- Added the X_NXFreeSplit request. The request is currently unused
+  because the split store is freed automatically when it becomes
+  empty, but can be useful in future if we want to implement other
+  otpimizations.
+
+nxcomp-2.0.0-33
+
+- There is now a split store for each agent resource. This allows
+  the proxy to divide the bandwidth among the agent resources.
+
+- A simple round-robin load-balancing is implemented, dividing the
+  bandwidth equally among all the split stores.
+
+- If there is a previous request being streamed for the same res-
+  ource, cached messages are appended to the split store and then
+  committed in the original order. This makes possible to stream
+  the colormap and the alpha channel data even if the split invol-
+  ves multiple PutImage or PutPackedImage operations in a single
+  start-split/end-split sequence.
+
+- Implemented the commit store class. Made the commit store expand
+  the message in the final buffer, instead of leveraging the mes-
+  sage store.
+
+- Channels having a drop command pending are checked before trying
+  to load or save the cache. This prevents a potential problem with
+  the protocol violation error that could be reported by the client
+  side proxy.
+
+- The current bitrate is now calculated at the time the transport
+  actually writes the data to the network, not at the time the data
+  is appended to the transport by the upper layers. The reason is
+  that the data can be compressed by the stream compressor and so
+  we can calculate the real bitrate only after having flushed the
+  ZLIB stream. This fixes the wrong numbers that could be reported
+  by the statistics in the previous versions.
+
+nxcomp-2.0.0-32
+
+- More progress in the implementation of the new image streaming.
+  This version has been tested to work when connecting to an 1.5.0
+  server. Due to the significant changes in the way the streaming
+  works in the newer versions, split is never activated by a 2.0.0
+  server connecting to a 1.5.0 client.
+
+- Fixed the NXTransClose() function to check if the fd matches the
+  NX agent connection.
+
+- Fixed the includes in Socket.h to compile on Solaris and MacOSX.
+
+nxcomp-2.0.0-31
+
+- Changed the NX transport functions that didn't require a NX fd
+  parameter to include one. The value can be NX_FD_ANY to signify
+  any running NX transport.
+
+nxcomp-2.0.0-30
+
+- More progress in the new implementation of image streaming.
+
+- This version is apparently compatible with the 1.5.0 client but
+  needs further testing.
+
+nxcomp-2.0.0-29
+
+- Implemented the NXTransHandler() interface and made the proxy
+  use the callback, when it is installed, instead of the notifi-
+  cation events.
+
+- Modified the agent transport to report an EOF condition as soon
+  as the channel is dropped, instead of reporting the error only
+  after the proxy shutdown. This allows the agent to handle its
+  clients while the proxy is handling the grace timeout.
+
+- Added a test facility to verify if the client and server caches
+  match at shutdown.
+
+- More advances in the new implementation of streaming.
+
+nxcomp-2.0.0-28
+
+- Made the session shutdown faster, normally below 1 second. The
+  grace time is now 500 ms once all channels have been dropped.
+
+nxcomp-2.0.0-27
+
+- The house-keeping process will now run a number of iterations
+  (currently 100) and then will exit. The proxy will check the
+  exit code and, if it was requested by the child, will restart
+  it. This is intended to keep the memory consumption low, as I
+  noted that after a big number of iterations the performance of
+  the allocator start to degrade quickly.
+
+nxcomp-2.0.0-26
+
+- Started implementing the NXTransHandler() interface to let the X
+  application hook a callback and be notified by the proxy when an
+  event occurs. At the moment only congestion events are supported.
+  The interface makes possible for the caller to provide a generic
+  parameter. This parameter is passed back to the handler function.
+  The parameter is expected to be the Xlib display pointer, given
+  that the proxy doesn't have access to the Xlib structures.
+
+- Moved all the internal variables shared between Xlib, nxcompext
+  and the X server in nxcomp. Declarations and function prototypes
+  moved to NXvars.h.
+
+- Removed the NXGetCleanupParameters() and NXGetImageParameters()
+  interfaces and the remaining references to the unused display
+  buffer and image cleanup functions.
+
+- In this version the images streaming functionality is disabled.
+  Because of that, expect compatibility problems when connecting
+  to a different nxcomp version.
+
+nxcomp-2.0.0-25
+
+- Forced the end of the session earlier if a shutdown has been re-
+  quested by the local side but the remote proxy is not responding.
+
+nxcomp-2.0.0-24
+
+- Changed the loop deleting the file items in Keeper to pick the
+  first element instead of looping through the iterator.
+
+- More problems with the libstdc++ allocators. During the tests, I
+  found that the Keeper class can leak industrial amounts of memory.
+  Valgrind says that the objects that are not freed are the File
+  items we allocate in collect(). As this looked suspicious, I log-
+  ged the constructors and destructors and can say that everything
+  is OK on our side. Unfortunately, by removing the spleeps used
+  to let the program work silently in background, one can find that
+  the memory occupation still grows by a MB every few seconds. This
+  is less a problem on Windows, where the memory occupation remains
+  almost constant. See the comment on __USE_MALLOC below.
+
+- Increased the maximum size of a message that the proxy is allo-
+  wed to cache to 4MB. This makes possible to cache many replies
+  (like the X_QueryFont replies) that often exceeded the previous
+  limit.
+
+nxcomp-2.0.0-23
+
+- Fixed a compatibility problem with the 1.5.0 that arose when
+  encoding an image with caching and streaming temporarily disa-
+  bled.
+
+- Removed the __USE_MALLOC define in Types.h because this is what
+  the g++ developers want. I'll try to avoid flames and will not
+  comment on this.
+
+- Added a --with-use-malloc configure option. This option should
+  be used when building the release packages on GCC versions that
+  support it.
+
+- Started fixing the commit procedure to be able to deal with the
+  alpha channel.
+
+nxcomp-2.0.0-22
+
+- Prevented channels from being dropped while in the middle of a
+  read loop.
+
+- Added a small utility ensuring that the SIGCHLD we receive in
+  the main loop can be always identified as pertaining to an our
+  child.
+
+- Increased the space available for the control messages at the
+  beginning of the encode buffer and ensured that there is always
+  enough space for adding a token message, in the case this is
+  required by the flush procedure.
+
+- Made all cache files readable only by the user.
+
+nxcomp-2.0.0-21
+
+- Solved a bug in the streaming of images that caused the agent's
+  clients to never resume when connected to an old proxy version.
+
+nxcomp-2.0.0-20
+
+- Disabled again streaming of the alpha channel data. By enabling
+  it, the agent randomly fails to repaint the exposed regions. The
+  reason is to be investigated.
+
+nxcomp-2.0.0-19
+
+- Implemented the split mode NXSplitModeSync. When this mode is
+  selected, the proxy will not send data for the split at the head
+  of the list until the  remote peer has confirmed that the message
+  is not available in the image cache. This is going to be useful
+  in combination with the lazy encoding.
+
+- Improved the error detection in the case of failure when saving
+  a recomposed split on disk.
+
+- Added X_NXSetUnpackAlpha to the set of requests that is possible
+  to stream.
+
+nxcomp-2.0.0-18
+
+- Enabled the 2.0.0 features that were disabled for test purposes.
+
+- Changed the LICENSE file to state that the software is only made
+  available under the version 2 of the GPL.
+
+nxcomp-2.0.0-17
+
+- Introduced a new channel of type 'slave'. Opening a slave channel
+  should let the proxy fork a new NX client instance (or whatever
+  is in the NX_SLAVE environment) and pass to it the channel's desc-
+  riptors. This client instance should authenticate the peer, for
+  example using the proxy cookie (see how this is implemented in
+  nxsensor) and then negotiate the service to be used on the channel.
+  This can be used to implement forwarding of arbitrary ports or ad-
+  ditional services, like a simple file transfer protocol. For now
+  the implementation is incomplete. Opening a slave channel will
+  result in the remote proxy just dropping the channel connection.
+
+- The proxy is forcibly flushed at the end of each loop. This is a
+  temporary fix until the agents are updated to flush the proxy link
+  on demand.
+
+- Added a new alert to be used in the case the RDP session is closed
+  and replaced with a new session using the same Windows account.
+
+- Added a forward declaration of class RenderMinorExtensionStore in
+  file RenderExtension.h to compile using gcc 4.0.X.
+
+- Added removal of all .orig file when running a 'make clean'.
+
+- The code uses again the 2.0.0 style shutdown (the one waiting for
+  the watchdog process to terminate).
+
+nxcomp-2.0.0-16
+
+- Added the NXTransChannel() interface to allow agents to create
+  new channels connected to the port that will be forwarded by the
+  remote proxy. The function returns 1 on success, 0 if the NX
+  transport is not running, or -1 in the case of error. On success,
+  the descriptor provided by the caller can be used for all the
+  subsequent I/O, including selecting the descriptor to check if
+  I/O is possible. The type parameter not only tells to the proxy
+  the remote port where the channel has to be connected, but gives
+  a hint about the type of data that will be carried by the channel,
+  so that the proxy can optimize the compression and schedule the
+  traffic on the slow link.
+
+  The type can be:
+
+  NX_CHANNEL_X:     The channel will carry X traffic and it
+                    will be connected to the remote X display.
+
+  NX_CHANNEL_CUPS:  The channel will carry CUPS/IPP protocol.
+
+  NX_CHANNEL_SMB:   The channel will carry SMB/CIFS protocol.
+
+  NX_CHANNEL_MEDIA: The channel will transport audio or other
+                    multimedia data.
+
+  NX_CHANNEL_HTTP:  The channel will carry HTTP protocol.
+
+  NX_CHANNEL_FONT:  The channel will forward a X font server
+                    connection.
+
+  Only the proxy running at the NX server/X client side will be
+  able to create a X, CUPS, SMB, MEDIA and HTTP channel. A proxy
+  running at the NX client/X server side can create font server
+  connections. The channel creation will also fail if the remote
+  end was not set up to forward the connection.
+
+  To create a new channel the agent will have to set up a socket-
+  pair and pass to the proxy one of the socket descriptors.
+
+  Example:
+
+  #include <sys/types.h>
+  #include <sys/socket.h>
+
+  int fds[2];
+
+  if (socketpair(PF_LOCAL, SOCK_STREAM, 0, fds) < 0)
+  {
+    ...
+  }
+  else
+  {
+    //
+    // Use fds[0] locally and let the
+    // proxy use fds[1].
+    //
+
+    if (NXTransChannel(fds[1], NX_CHANNEL_X) <= 0)
+    {
+      ...
+    }
+
+    //
+    // The agent can now use fds[0] in
+    // read(), write() and select()
+    // system calls.
+    //
+
+    ...
+  }
+
+  Note that all the I/O on the descriptor should be non-blocking,
+  to give a chance to the NX transport to run in the background
+  and handle the data that will be fed to the agent's side of the
+  socketpair. This will happen automatically, as long as the agent
+  uses the XSelect() version of the select() function (as it is
+  normal whenever performing Xlib I/O). In all the other cases,
+  like presumably in the agent's main loop, the agent will have
+  to loop through NXTransPrepare(), NXTransSelect() and NXTrans-
+  Execute() functions explicitly, adding to the sets the descript-
+  ors that are awaited by the agent. Please check the implementa-
+  tion of _XSelect() in nx-X11/lib/X11/XlibInt.c for an example.
+
+nxcomp-2.0.0-15
+
+- Some changes aimed at finding a workaround to the unreliability
+  of the font server connections. The X server seems to be really
+  picky about the network latency, so we try to read immediately
+  from the channel just being created, instead of waiting for a
+  new loop. Additionally the proxy will keep reading from the font
+  server connections even after the maximum length of the frame
+  is exceeded, in the hope that it will be able to send a complete
+  message in a single frame.
+
+- updated the various internal consistency tests run when the TEST
+  or INFO flags are enabled.
+
+nxcomp-2.0.0-14
+
+- It seems that the closure of the socket sometimes takes several
+  seconds, on Windows, after the connection is broken, with the
+  result that the alert can be shown long after the user has gone
+  after the failed session. We now skip the closure of the proxy
+  link on Windows if we are about to exit.
+
+- The code uses the 1.5.0 style shutdown (the one waiting for the
+  term signal in the main process) to be able to test the library
+  with the old server. To activate the new shutdown procedure be
+  sure the define SHUTDOWN_COMPATIBLE_1_5_0 is unset.
+
+nxcomp-2.0.0-13
+
+- Ensured that static members in channels are reset at the time a
+  new proxy is created.
+
+- Adjusted the token parameters for link modes other than modem.
+
+nxcomp-2.0.0-12
+
+- Handled compatibility with 1.X.X versions not sending the count
+  field in the token.
+
+- The proxy link is now flushed automatically if the agent has not
+  set the deferred flush mode.
+
+nxcomp-2.0.0-11
+
+- Significant modifications to allow the proxy to keep data in the
+  encode buffer across multiple loops, until the data is flushed
+  because an explicit request by the agent or. Besides maximizing
+  the amount of data sent in a single frame, this makes it possi-
+  ble to move any packet coalescence strategy in the agent, while
+  still using an 'immediate' flush policy.
+
+- Modified the procedure handling the proxy congestion. Each token
+  now carries a counter which represents the multiple of TokenBytes
+  data bytes that need to be confirmed by the remote end. The ser-
+  ver side proxy will need to reply by including the value of the
+  counter. When sending a new token, the tokens are decremented by
+  the counter and the client side proxy enters in congestion when
+  the available tokens becomes zero or negative.
+
+nxcomp-2.0.0-10
+
+- Implemented specific encoding of the X_NXSetCacheParameters
+  request.
+
+- Handled the compatibility with older versions not supporting the
+  new request. In this case the request is handled at the local si-
+  de, preventing the X requests to be cached or split, even without
+  the cooperation of the remote side.
+
+nxcomp-2.0.0-9
+
+- Modified the shutdown procedure to not rely on the TERM signal
+  when the proxy needs to wait for the server to complete. We will
+  now print the following message in the session log:
+
+  Info: Watchdog running with pid 'n'.
+  Info: Waiting for watchdog process to complete.
+
+  The NX server will have to kill the process with the given pid
+  to mandate the proxy shutdown. This solves the TR11C01192.
+
+- Added the X_NXSetCacheParameters request. It tells to the proxy
+  how to handle caching of X requests, namely if requests should
+  be stored in the memory cache, split in smaller data chunks and,
+  in the case of images, saved on disk in the persistent image
+  cache. The request affects all the X messages until the proxy
+  is further configured.
+
+- Enabling and disabling loading and saving of persistent images
+  due to a X_NXSetCacheParameters is still to be implemented.
+
+- Implemented font channel compatibility with older versions. If
+  the font port is queried and the remote proxy doesn't support
+  the tunneling of font server connections, an empty string is
+  returned.
+
+- The option 'resize', used by agents, is now silently ignored.
+  This solves the TR10C01061.
+
+- Added the missing reference to TR08C000981.
+
+nxcomp-2.0.0-8
+
+- Discarded the first idea of setting the font path implicitly in
+  the X server side proxy, by means of a multi-pass operation and
+  added the NXGetFontParameters() request and reply. If the proxy
+  has been configured accordingly, the request returns the X font
+  path that can be set by the agent to tunnel the font server con-
+  nections through the NX link.
+
+- Changed the parsing of the font server port to be able to handle
+  the defaults.
+
+nxcomp-2.0.0-7
+
+- More work on tunneling of font server connections.
+
+- The synchronization requests are now replied at the same time
+  as a new request is received, by checking if the channel has
+  already gone past the awaited sequence number. This avoids the
+  delay caused by the previous versions in the case the expected
+  reply had been handled asynchronously, inside the write loop.
+
+nxcomp-2.0.0-6
+
+- The display is again passed to the client using the -display
+  parameter.
+
+- The option 'type' is now ignored at X server side. Support at
+  the X server side had been left for compatibility with older
+  versions of the proxy.
+
+- Added direct support for more session types, namely 'unix-cde',
+  'unix-xdm', 'unix-console', 'unix-default'. The 'unix-console'
+  and 'unix-default', similarly to 'unix-application', will now
+  trigger the 'raw' mode.
+
+nxcomp-2.0.0-5
+
+- Renamed Png.h and Png.cpp to Pgn.h and Pgn.cpp to avoid name
+  clashes on Windows.
+
+- The distclean target now removes the autom4te.cache directory.
+
+nxcomp-2.0.0-4
+
+- Added the 'kill=n' option to let the proxy add the process to
+  the list of daemons that must be terminated at session shutdown.
+  Multiple 'kill=n' options can be specified. The proxy will send
+  to each process a SIGTERM signal before exiting.
+
+- Removed the code that forcibly disabled the RENDER extension on
+  Solaris. Eventual compatibility problems will be now handled in
+  the NX agent.
+
+- The path to the client executable is now assumed to be in the
+  NX_CLIENT environment. If the variable is not set, the proxy
+  will guess the location based on the target platform. This is
+  part of the FR11C01215.
+
+nxcomp-2.0.0-3
+
+- More code cleanup. Protocol step 5 and cache step 2 are assumed
+  by default. This allows us to remove the various channel caches
+  that are not used anymore.
+
+- Removed the outdated encodeBegin() and encodeEnd() methods.
+
+nxcomp-2.0.0-2
+
+- Added compatibility with the 1.5.0 and 1.4.0 versions. Protocol
+  version older than the 1.4.0 will cause the proxy to drop the
+  connection.
+
+- Rewritten the version negotiatiation logic to better handle the
+  compatibility between the local and the remote version.
+
+- Removed the conditional code handling the compatibility with
+  the protocol encodings from 1 to 4.
+
+- Small adjustments to the session negotiation procedure to give
+  more hints in the case of errors. A dialog is now issued if the
+  remote proxy drops the connection due to a probable authentica-
+  tion failure or when the remote proxy version is not compatible
+  with our version.
+
+nxcomp-2.0.0-1
+
+- Opened the 2.0.0 branch based on nxcomp-1.5.0-80.
+
+nxcomp-1.5.0-80
+
+- Fixed a bug that prevented the Unix socket to be created in the
+  right directory. This affected the ability of the server to run
+  NX sessions without the agent encoding.
+  
+nxcomp-1.5.0-79
+
+- Solved a bug in the 15 to 16 bpp conversion for RDP sessions.
+
+- Corrected a typo in the PANIC message of Unpack16To24 function.
+
+- Optimized the 16 bpp RDP decompression routine.
+
+nxcomp-1.5.0-78
+
+- Implemented the FR11C01215. The following environment variables
+  are checked to determine the location of the relevant NX direct-
+  ories:
+
+  $NX_ROOT   The root NX directory is the place where the session
+             directory and the cache files are created. This is
+             usually overridden by passing the 'root=' option. By
+             default, the root NX directory is assumed to be the
+             directory '.nx' in the user's home.
+
+  $NX_SYSTEM The directory where NX programs and libraries reside.
+             If not set, the value is assumed to be '/usr/NX'.
+             Programs, libraries and data files are respectedly
+             searched in the 'bin', 'lib' and 'share' subdirecto-
+             ries.
+
+  $NX_HOME   The NX user's home directory. If $NX_ROOT is not set
+             or invalid, the user's NX directory is created here.
+
+  $NX_TEMP   The directory where the X11 Unix Domain Sockets and
+             all temporary files are to be created.
+
+  $NX_CLIENT The full path to the nxclient executable. If the va-
+             riable is not set, the nxclient executable will be
+             run assuming that the program is in the system path.
+             This can be useful on platforms like Windows and the
+             Mac where nxclient is located in a different direct-
+             ory compared to the other programs, to make easier
+             for the user to execute the program from the shell.
+
+  Other environment variables:
+
+  $HOME      The variable is checked in the case $NX_HOME is not
+             set, null or invalid.
+
+  $TEMP      The variable is checked whenever the $NX_TEMP direct-
+             ory is not set, null or invalid.
+
+  $PATH      The path where all executables are searched, except
+             nxclient. If $NX_CLIENT is not set, also the client
+             executable is searched in the system path.
+
+  $XAUTHORITY
+             This is the file containing the X11 authorization
+             cookies. If not set, the file is assumed to be in
+             the user's home (either $NX_HOME or $HOME).
+
+  $LD_LIBRARY_PATH
+             System-wide library search order. This should be set
+             by the program invoking the proxy.
+
+- Extended the usage message to document the relevant environment.
+
+- Made the WaitChild() function interruptible. This allows the user
+  to terminate the connection procedure immediately, by sending a
+  signal to the proxy process while an abort dialog is shown in the
+  foreground. This is part of the solution to the TR11C01216.
+
+- Implementation of the FR11C01215 is not yet complete. The client
+  program and the nxauth/xauth are still searched using the previ-
+  ous logic. In particular, the NX_CLIENT variable is ignored.
+	
+nxcomp-1.5.0-77
+
+- Corrected the typo in the alert dealing with VNC authentication
+  failures. This solves the TR11C01199.
+
+nxcomp-1.5.0-76
+
+- Added the missing initialization in the client and server proxy
+  constructors.
+
+nxcomp-1.5.0-75
+
+- Starting from this version the build procedure will automatically
+  create a DLL on Windows.
+
+- Disabled exceptions in the compiled code.
+
+- Disabled run-time type information to further reduce the size of
+  the executable.
+
+- Compiling with GCC 4.0.0 and -fno-exceptions produces a warning
+  in some files, due to control apparently reaching the end of a
+  non void function. This is bogus and has been confirmed to be a
+  GCC 4.0.0 bug solved in more recent versions.
+
+nxcomp-1.5.0-74
+
+- Imported changes from nxcomp-1.6.0-4.
+
+- Solved a compilation error on Solaris and MacOSX platforms.
+
+- The 'font' option now accepts either a numeric value (for a TCP
+  port) or a 'unix/:port' or 'tcp/:port' specification. In the case
+  of Unix ports, we assume that a port specification "unix/:7100"
+  corresponds to the "/tmp/.font-unix/fs7100" socket and a port like
+  "unix/:-1" corresponds to "/tmp/.font-unix/fs-1".
+
+- An absolute file path is also accepted as a valid socket. This is
+  useful to test the forwarding of the font server connection, for
+  example by running a normal X client and pointing the socket to
+  the X server.
+
+- Protocol step 7 is now only assumed when connecting to a remote
+  proxy version 1.6.0 or later.
+
+nxcomp-1.5.0-73
+
+- Use the include files from nx-X11 if the nx-X11/include directory
+  is found. The previous configure checked the presence of nx-X11/
+  exports/include, that might not be built at the time this library
+  is compiled.
+
+nxcomp-1.5.0-72
+
+- Fixed a problem on AMD64 due to the size of the area pointed by
+  the argument of NXTransReadable(). The ioctl() requires a pointer
+  to an int, at least on Linux. The original _X11TransBytesReadable()
+  function simply calls the ioctl() by passing the pointer that is
+  provided. Returning the value assuming a pointer to a long crashes
+  some applications, among them xterm. Now NXTransReadable() follows
+  the same schema of the ioctl() call and stores the result assuming
+  a pointer to an int.
+
+nxcomp-1.5.0-71
+
+- Ensured that the NX trasport is destroyed on NXTransExit() even if
+  the parent has overridden our signal handlers.
+
+- Added attribute 'noreturn' to NXTransExit().
+
+- Small change to the shutdown procedure to send the "Waiting for a
+  further signal" just after the watchdog is started.
+
+nxcomp-1.5.0-70
+
+- Added the definition of protocol step 7. The new protocol step is
+  implicitly assumed when activating the font server channel, so that
+  NX clients and servers may decide what to do by verifying the patch
+  version of the peer software. This makes possible to activate the
+  feature without stepping up the 1.5.0 version of the software.
+
+nxcomp-1.5.0-69
+
+- Added the -fPIC GCC flag when compiling on AMD64 architectures.
+
+- Small changes to configure.in to have specific CFLAGS.
+
+- Created a new configure using autoconf 2.59.
+
+- Added the 'mask=n' option to determine how channel ids are distri-
+  buted between client ans server. By default, channels whose ids are
+  multiple of 8 (starting from 0) are reserved for the client side.
+  All other channels can be allocated at the NX server side.
+
+- A check is missing on the protocol supported by the remote side,
+  so it is likely that mixing this version with older 1.5.0 will not
+  work.
+
+- The release has the debug logs enabled.
+
+nxcomp-1.5.0-68
+
+- Added provision for opening new channels on both client and server
+  side. This required small changes to the way channel ids are mapped
+  and retrieved, so that both sides now support bidirectional mapping
+  of file descriptors to channels.
+
+- Made the code handling allocation of new generic channels to reside
+  in the base Proxy class.
+
+nxcomp-1.5.0-67
+
+- Renamed the 'embedded keyboard' channels as 'aux' channel.
+
+- Renamed 'samba' channels as 'smb'.
+
+- The 'samba' and 'smb' options can now be used interchangeably. The
+  same applies to the 'keybd' and 'aux' options, used to set up the
+  auxiliary X channel.
+
+- Added a new font channel. The channel is used to forward X font
+  server connections from the X server on the NX client to the remote
+  NX server. The channel is not yet functional and requires change to
+  the channel allocation mechanism.
+
+- Added a common interface to create new listening sockets. This is
+  currently used for additional services, but not for the X display
+  sockets.
+
+- Simplified the interface used to accept new connections to channels 
+  being forwarded.
+
+- Removed the -V option as nxproxy is not using dlopen() anymore.
+
+- Removed the inclusion of ClientChannel.h in Proxy.cpp that caused
+  test symbols to be reverted to undefined.
+
+nxcomp-1.5.0-66
+
+- Made failures setting the IPTOS_LOWDELAY on the proxy socket to
+  cause a warning, instead of an error.
+
+- Made the clean target delete the Cygwin specific libraries.
+
+- Updated the configure and Message.h to deal with GCC 4. Solves the
+  TR08C000981.
+
+nxcomp-1.5.0-65
+
+- Removed the warning issued on parsing the agent option 'rootless'.
+  Solves the TR08C00959.
+
+- MacOSX 10.4 defines socklen_t. Made the definition conditional so
+  that we can still support older versions. Solves the TR07C00926.
+
+- Updated the ChangeLog to include references to the solved TRs.
+
+nxcomp-1.5.0-64
+
+- Imported the 1.6.0 changes in the maintenance 1.5.0.
+
+- Removed a wrong assertion that might cause the session to fail
+  when the software was compiled with TEST enabled in Proxy.cpp.
+
+- The nxclient dialog process is signaled with SIGKILL on Windows,
+  as the SIGTERM is ignored. This solves the TR07C00929.
+
+- Ensured the JPEG error flag is always set before jumping out of
+  the Jpeg decompression.
+
+- Skipped errors encontered setting the TCP_NODELAY flag on Mac.
+  Solves TR08C00940.
+
+- Few cosmetic changes.
+
+nxcomp-1.5.0-63
+
+- Ensured that the parent is checked often in the keeper process,
+  so that, in the case of a premature death, the child is exited
+  earlier.
+
+nxcomp-1.5.0-62
+
+- Some performance tuning of the LAN and WAN link modes.
+
+nxcomp-1.5.0-61
+
+- Fixed the problems arisen with loading or saving the image files
+  on Windows by forcing the streams to be opened in binary mode.
+  These problems have been triggered by the recent Cygwin upgrade.
+
+- Removed the logs that had be left enabled for test purposes.
+
+nxcomp-1.5.0-60
+
+- Made all errors encountered while unpacking an image just print
+  a warning in the session log. Such errors are not fatal but the
+  client monitors the state of the session at startup, so that by
+  marking image decompression errors as such may cause the session
+  to be aborted.
+
+- Marked as warnings also errors encountered by trying to load an
+  image from disk.
+
+nxcomp-1.5.0-59
+
+- When detected, the CTRL+ALT+SHIFT+ESC sequence is removed from
+  the event stream.
+
+- Also modified the message in the session log to issue a warning,
+  instead of an error.
+
+nxcomp-1.5.0-58
+
+- Added a setjmp() before yielding the control to the JPEG library.
+  This makes possible to recover from the JPEG decompression errors
+  that were previously fatal.
+
+- In the commit split request, the client id is now encoded by the
+  client channel beside the propagate flag. The client id is igno-
+  red by the decoding party. As in the old protocol versions, the
+  committing client is taken from the client id that was originally
+  sent together with the packed image.
+
+- Fixed the compilation problem when defining OPCODES in Misc.cpp.
+
+- Skipped the synchronous flush of the proxy link when connecting
+  to a previous NX version.
+
+- Ensured that the new alerts are only requested when connected to
+  a compatible proxy.
+
+- Ignored the option 'fullscreen', targeting the agents.
+
+nxcomp-1.5.0-57
+
+- Added more alerts and changed the name of those dealing with the
+  resume of a session.
+
+- Added the MIXED define. When set, the proxy will let all logs go
+  to the standard error. This is useful to interleave the Xlib log
+  output with the proxy output in a single file.
+
+- Added a new alert to report an I/O error at agent reconnection.
+  This is one of those alert that can't be actually shown, but are
+  included to offer a consistent view to the agent implementation.
+
+nxcomp-1.5.0-56
+
+- Added the split mode NXSplitModeSync. By selecting this mode,
+  the proxy will try to empty the split store immediately, until
+  all messages marked in such mode will be synchronized. The im-
+  plementation is left to future versions.
+
+  #define NXSplitModeSync     3
+
+- Added the messages specific to RDP and VNC sessions in NXalert.h.
+  Included are also a few alerts related to changes to the color
+  depth and desktop geometry that may be eventually mandated by the
+  remote server.
+
+- Corrected a typo in NXalert.h
+
+nxcomp-1.5.0-55
+
+- Added the 'mode' field in the X_NXStartSplit request. It determi-
+  nes the strategy that the proxy will adopt to handle the image.
+  If set to 'eager', the proxy will only split the messages whose
+  size exceeds the split threshold (the threshold can be found in
+  the X_NXGetControlParameters reply). If mode is set to lazy, the
+  proxy will split any image that it is not able to find in its
+  cache.
+
+  The opcode and the two available modes are defined in NXproto.h,
+  currently:
+
+  #define NXSplitModeDefault  0
+  #define NXSplitModeEager    1
+  #define NXSplitModeLazy     2
+
+- All requests related to image streaming now carry a 'resource' id.
+  The id is currently ignored by the proxy in the case of X_NXCom-
+  mitSplit requests.
+
+- Added a new NXSetSplitMode() request. It determines the strategy
+  that the proxy will adopt to stream the images. If set to 'eager'
+  the proxy will only split the messages whose size exceeds the
+  split threshold, otherwise it will  split all the images, regard-
+  less their size. This is in preparation of the lazy encoding in
+  agent.
+
+- Slightly decreased the startup timeout compared to the value it
+  had in the 1.4.0. This timeout is used to retain the images used
+  during session startup in the persistent cache.
+
+nxcomp-1.5.0-54
+
+- Modified the text of the begin-reconnection alert to mention the
+  speed of the connection detected by the agent.
+
+nxcomp-1.5.0-53
+
+- Reworked the handling of the abort-split events issued by the re-
+  remote proxy so that we now finalize the procedure and restart the
+  client asynchronously, in the middle of the write loop.
+
+nxcomp-1.5.0-52
+
+- Rewritten the internal interface to the notification events. There
+  are now five different split notification events:
+
+  NXNoSplitNotify        The operation didn't cause any actual split.
+                         The client can be immediately restarted.
+
+  NXStartSplitNotify     A split is ongoing. The client should be
+                         suspended until the end of the split.
+
+  NXCommitSplitNotify    A complete request has been recomposed. The
+                         client can commit the given request to the
+                          X server.
+
+  NXEndSplitNotify       The split operation was duly completed. The
+                         client can be restarted.
+
+  NXEmptySplitNotify     No more split operation are pending. The
+                         agent can use this information to implement
+                         specific strategies, requiring for example
+                         that all messages have been recomposed at
+                         the remote end. This can include updating
+                         the drawables that were not synchronized
+                         because of the lazy encoding.
+
+- Removed the X_NXSync and X_NXKarma operations, not used anymore by
+  the NX agents.
+
+- Increasing or decreasing a timeout makes it respectively equal to
+  the base timeout or to the base timeout / 4.
+
+nxcomp-1.5.0-51
+
+- Improved the mechanism by which synchronization replies are sent
+  to the X client proxy.
+
+- Using the leftPad field as passed by the nxagent 1.5.0-58 doesn't
+  seem to work with the MIT-SHM. The workaround is to disable the
+  MIT-SHM operation in the case of 1 bpp images.
+
+- Removed the limitation on the size of the shared memory segment
+  that had been introduced for test purposes.
+
+nxcomp-1.5.0-50
+
+- Solved compilation problem when --with-info was not given.
+
+nxcomp-1.5.0-49
+
+- Improved support for color matching from 15 and 16 bpp to 24 and
+  32 bpp in RDP sessions.
+
+- Solved TR05C00910. This was about "shadows" that might appear in
+  RDP sessions when small elements like tooltips were drawn.
+
+nxcomp-1.5.0-48
+
+- Added a 'commit' field in X_NXCommitSplit request. When zero, the
+  X server side proxy will unlock the message in the message store,
+  without actually committing the image to the X server. The new
+  field required changes to the encoding. This means that this ver-
+  sion is not compatible with older 1.5.0 nxcomp releases.
+
+- Added a new control message. This is used by NXTransFlush() to for-
+  ce a roundtrip between the proxies and speed-up the handling of
+  the synchronous replies.
+
+nxcomp-1.5.0-47
+
+- Made the timeouts dynamic, based on the user input and the current
+  bitrate.
+
+- Set the available tokens to 8. This allows for 16 KB to be sent on
+  a modem before having to wait for a reply.
+
+- Added provision for removing a dialog on the remote end. This can
+  be used, for example, to get rid of a message that was displayed
+  by the agent at the beginning of a lengthy operation.
+
+- Fixed a fault that arose when trying to run the proxy on a display
+  whose name began with the 'nx' string.
+
+- Running a client or server session on a display host beginning with
+  'nx' should be now possible.
+
+- Flush is now always immediate when there is already data queued in
+  the TCP socket.
+
+nxcomp-1.5.0-46
+
+- Created the NXalert.h header from Alert.h to share the alert codes
+  with the agents. The new NXTransAlert() interface can be used to
+  start an alert on the remote side.
+
+- Created the NXTransParse*() and NXTransCleanup() wrappers.
+
+- Temporarily using the single-dash style when passing parameters to
+  nxclient until the double-dash style is fixed.
+
+nxcomp-1.5.0-45
+
+- Motion events are now flushed at the time the X server channel is
+  sending the token reply.
+
+- Renamed NXDialog() to NXTransDialog() and added a window ID parame-
+  ter, to be used by the agent when starting the "pulldown" dialogs.
+
+- Also renamed the other NX utility functions.
+
+nxcomp-1.5.0-44
+
+- Solved a bug that prevented auxiliary X connections from working
+  with the agent.
+
+- Added the missing check on the proxy pointer in HandleTimer() as
+  it may be actually called before the proxy is created.
+
+nxcomp-1.5.0-43
+
+- Started tuning the performance. For now, the available tokens are
+  set to an improbable value of 10000.
+
+nxcomp-1.5.0-42
+
+- Disabled the X server side remote expose events for test purposes.
+  This is intended uncover the display problems introduced by the
+  new handling of exposures in the X11 agent.
+
+- Fixed some timestamp related functions to avoid rounding problems.
+
+- Moved the timestamps of split, frame and flush from the Control
+  to the Proxy class.
+
+- Made the X server side proxy to skip updating the counters related
+  to token management.
+
+- Made also the X server side use deferred flushes.
+
+- Modified handleFrame() to manage both pings and data frames and
+  send the token before the actual write operation.
+
+- Cleaned the pseudo-files used to load the control parameters.
+
+- Cleaned up the FIXME's in the lower layers. More FIXME's remain in
+  the frontend classes.
+
+- Added a further counter to the statistics tracking the number of
+  network writes performed on the proxy link.
+
+nxcomp-1.5.0-41
+
+- Now the watchdog process doesn't kill the parent. The termination
+  event is determined by monitoring the child. This is advisable to
+  avoid interfering with the signal handling in agent.
+ 
+- The house-keeping process is not started if differential compres-
+  sion (and thus caching of images) is disabled.
+
+- Wait for the watchdog to terminate before starting the house-keep-
+  ing process.
+
+- Fixed the problem of gray stripes in white areas when using 15bpp
+  RDP compression. This solves the TR06C00916.
+
+- Added a log in Message.cpp to tell when an image is removed from
+  the memory cache.
+
+- Removed most of the logs. Only left the logs directly related to
+  the deferred flushes.
+
+- Removed a warning due to a missing definition in NX.h.
+
+nxcomp-1.5.0-40
+
+- Added the signal '12' to the set of blocked signal on Cygwin. This
+  is what is delivered to the application when it tries to create a
+  shared memory segment when the cygserver is not running. The call
+  later returns "Operation not implemented", only useful if you have
+  survived to the signal.
+
+- Modified the configure script to not link against cygipc.
+
+- Improved error handling in the negotiation phase.
+
+- Reset the last signal received when aborting a connection attempt.
+  Not doing that might cause a warning.
+
+nxcomp-1.5.0-39
+
+- Both channels and proxy can now deal with incomplete messages by
+  waiting for the full data to become available. This is not going
+  to work when the transport is connected to an agent that is run-
+  ning in-process, so the timeout must be really small.
+
+- Made the main loop more compact by letting a single function read
+  from proxy and channels. The same change applies to writing to
+  descriptors that are reported to be ready.
+  
+- Optimized the loop to report as ready the agent descriptors that
+  have become available after the proxy execution phase. 
+
+- Now the proxy will try to asynchronously read from its descriptor
+  after having read from the channel.
+
+- Unified the routine setting the routines setting the read and write
+  descriptors and the timeouts.
+
+- Unified the routine handling the channel events.
+
+- Reintroduced the last ping timestamp to avoid sending more than a
+  single ping every PingTimeout milliseconds.
+
+- The cleanup procedure now waits for the watchdog and house-keeping
+  processes to terminate.
+
+- Reverted the change occurred in 1.5.0-35 about the byte-ordering
+  problem in decompression of PNG and JPEG images.
+
+- More coding about deferred flushes.
+
+- Relevant debug logs are enabled in the main loop, in the proxy and
+  in the channel classes, so use only for testing.
+
+nxcomp-1.5.0-38
+
+- Started the implementation of deferred writes based on the new NX
+  transport.
+
+- Solved a problem with the statistics file affecting the Windows
+  platform. Basically it seems that Cygwin or the stdc++ library
+  don't deal correctly with files that are reopened just after
+  having unlinked them.
+
+- Implemented support for 15 bpp RDP bitmaps.
+
+- Added "rdpcolors" and "rdpcache" to the list of parameters that
+  are ignored in ParseEnviromentOptions().
+
+- This version has lot of logs enabled and some forced cleanups in
+  the case of unexpected conditions. Avoid to use it for long-last-
+  ing test sessions.
+
+nxcomp-1.5.0-37
+
+- Now splitting of images is fully disabled when running with link
+  LAN. Previously the split was not executed by the proxy, but the
+  agent was configured to send the start/end sequence.
+
+- Added the check protecting the proxy from token underflow. In the
+  previous code the check was left out to verify the conditions un-
+  der which this event might be encountered.
+
+- NXTransWrite() and NXTransWriteVector() allocate a context before
+  calling handleRead(), so they can correctly return in the case of
+  a cleanup.
+
+nxcomp-1.5.0-36
+
+- Modified the channel write loop to interleave abort split events
+  between the writes to the X server socket.
+
+nxcomp-1.5.0-35
+
+- Solved a byte-ordering problem in decompression of PNG and JPEG
+  images.
+
+- Changed the handleToken() interface to make explicit if a token
+  must be issued because of a ping.
+
+- Small fix to prevent a warning in Jpeg.cpp when TEST is enabled.
+
+nxcomp-1.5.0-34
+
+- Solved a few problems introduced by the rewrite of the read loops
+  in channels.
+
+- Added definition of NXCollectInputFocusNotify.
+
+nxcomp-1.5.0-33
+
+- Implemented a new control flow system based on tokens exchanged bet-
+  ween the proxies. When the clint side runs out of tokens it stops
+  sending data until a new token is returned. Tokens are sent whenever
+  the data written to the socket exceeds the amount of data set for a
+  scheduled write, so the proxy is free to send a number of smaller
+  frames before running out of tokens.
+
+- The reason the new system is introduced is because the old method
+  had two outstanding problems:
+
+  - It worked very well when the proxies were directly connected,
+    but couldn't reliably detect a link congestion when tunneled
+    over SSH.
+
+  - In the attempt of reducing the data queued to the TCP layer, it
+    didn't leverage all the available bandwidth.
+
+- Moved the final check on the state of the session at the end of
+  execution stage, instead of the beginning. The signals sent by the
+  user to request the statistics could be reset before the proxy had
+  entered the right procedure.
+
+- Added the session type 'unix-rootless', to be used for single apps
+  run with the agent in rootless mode.
+
+nxcomp-1.5.0-32
+
+- Modified the main loop to skip the select when I/O is possible on
+  any of the agent descriptors or the proxy link.
+
+- Now the house-keeping process is allocated in the heap instead of
+  the stack.
+
+nxcomp-1.5.0-31
+
+- The server channel now performs asynchronous reads from the display
+  by interleaving them with data decoded from the remote proxy.
+
+- Improved the handling of the memory-to-memory transport.
+
+nxcomp-1.5.0-30
+
+- Redesigned the handling of the congestion events to work more re-
+  liably and to report the events to the remote peer earlier.
+
+- Increased the size of the shared memory segment when the MIT-SHM
+  extension is activated.
+
+- Solved a bug that prevented the ping timeout to work as expected.
+
+- Ensured that, when entering the main select(), neither the chan-
+  nels or the proxy have pending messages in the read buffers.
+
+- There is now only a single case where we can have pending messa-
+  ges, namely in the handling of the MIT-SHM events.
+
+- Solved a bug introduced by the 1.5.0-29 that made the proxy en-
+  ter the select with a null timeout.
+
+- Renamed LINK_TYPE_AUTO to LINK_TYPE_NONE in NXproto.h.
+
+nxcomp-1.5.0-29
+
+- Now encoding data from the agent descriptors happens in the same
+  context as data is written to the buffer.
+
+- Optimized the handling of the congestion events to avoid running
+  further unneeded loops.
+
+- Added timer handling utilities.
+
+nxcomp-1.5.0-28
+
+- Added code providing information about the reason of the failure
+  encountered connecting to the local X server. This greatly helps
+  when troubleshooting X authorization problems.
+
+- On connection failure a warning message is printed in the session
+  log.
+
+- Removed the warning that was previously printed when the MIT-SHM
+  extension failed to be initialized on Windows. Shared memory has
+  problems on Cygwin and it currently doesn't work in NXWin.
+
+- Reworked the message printed in the case of link failure.
+
+nxcomp-1.5.0-27
+
+- Solved a bug in the connection procedure introduced by 1.5.0-25.
+
+nxcomp-1.5.0-26
+
+- Transformed the errors printed on failure of the fork() creating
+  the children into warnings. This can happen quite often on Win-
+  dows, due to well known Cygwin problems. See also the ChangeLog
+  entry for nxcomp 1.4.0-28. This patch closes the TRSL052278 but
+  it's obviously not a long-term solution.
+
+- Set the sticky bit when creating the '/tmp/.X11-unix' directory.
+
+- Modified the Makefile.in to remove the *.out.* files generated by
+  Valgrind.
+
+- Updated the README files.
+
+nxcomp-1.5.0-25
+
+- Changed the directory where the client for the Mac is searched if
+  it is not found in the system path.
+
+- Modified Auth.cpp to use nxauth also on the Mac.
+
+- Reworked the procedure showing the alert dialog when a timeout is
+  encountered in the initial connection.
+
+- Removed the experimental code from the official 1.5.0 branch.
+
+nxcomp-1.5.0-24
+
+- Implemented more experimental classes.
+
+nxcomp-1.5.0-23
+
+- Added the NX_SIGNAL_FORWARD action to NXTransSignal(). This can
+  be used to let the proxy call the original signal handler of the
+  agent after having blocked the signal.
+
+nxcomp-1.5.0-22
+
+- Ensured that we always have a context, even before creating the
+  transport.
+
+- Suppressed the error message printed when passing the -h option.
+
+- Added the experimental code that is currently under development.
+
+nxcomp-1.5.0-21
+
+- Enabled the fake X cookie authentication. This requires checking
+  the remote proxy version to verify that the server supports the
+  new authorization mechanism.
+
+- It's worth noting that the X client side proxy doesn't care which
+  cookie is sent over the connection. The problem is that clients
+  connecting to 1.4.0 servers don't have a method to force the ser-
+  ver to use the fake cookie. This means that we have to solve the
+  problem by letting the proxy check the remote version so that it
+  can omit to replace the cookie when connecting to older servers.
+
+nxcomp-1.5.0-20
+
+- Added the NXTransCongestion() function. It returns true if proxy
+  is in congestion state.
+
+- Removed an incorrect warning that was printed when calling force()
+  for the memory-to-memory transport. The agent could actually re-
+  quire multiple loops to read all data queued for it.
+
+nxcomp-1.5.0-19
+
+- Small optimization in NXTransReadable() to run a new NXTransConti-
+  nue() loop only after at least RetryTimeout milliseconds are pas-
+  sed since the last call and still no data is available. This cuts
+  the number of unneeded loops to 1/4th of the total, probably more,
+  on faster machines.
+
+- Added NXCollectGrabPointerNotify to NXproto.h.
+
+nxcomp-1.5.0-18
+
+- Minor changes to NXTransContinue().
+
+nxcomp-1.5.0-17
+
+- Moved respawning of a new nxclient instance in the cleanup procedu-
+  re. This ensures that the respawn is executed whatever is the rea-
+  son of the session shutdown.
+
+- Added a method to force closure of a given channel in proxy.
+
+- Removed code handling the special case triggered on Windows by the
+  presence of a NX_SESSION variable in the environment.
+
+nxcomp-1.5.0-16
+
+- Added the NXTransSignal() function to let agents tell to the proxy
+  how to handle the standard POSIX signals. Given the SIGINT signal,
+  for example, the caller can specify any of the following actions.
+
+  NX_SIGNAL_ENABLE:  A signal handler will have to be installed by
+                     the library, so that it can be intercepted by
+                     the proxy.
+
+  NX_SIGNAL_DISABLE: The signal will be handled by the caller and,
+                     eventually, forwarded to the proxy by calling
+                     NXTransSignal() explicitly.
+
+  NX_SIGNAL_RAISE:   The signal must be handled now, as if it had
+                     been delivered by the operating system. This
+                     function can be called by the agent with the
+                     purpose of propagating a signal to the proxy.
+
+  As a rule of thumb, agents should let the proxy handle SIGUSR1 and
+  SIGUSR2, used for producing the NX protocol statistics, and SIGHUP,
+  used for disconnecting the NX transport.
+
+- The following signals are blocked by default upon creation of the
+  NX transport:
+
+  SIGCHLD    These signals should be always put under the control
+  SIGUSR1    of the proxy. If agents are intercepting them, agents
+  SIGUSR2    should later call NXTransSignal(..., NX_SIGNAL_RAISE)
+  SIGHUP     to forward the signal to the proxy.
+
+  SIGINT     These signals should be intercepted by agents. Agents
+  SIGTERM    should ensure that NXTransDestroy() is called before
+             exiting, to give the proxy a chance to shut down the
+             NX transport.
+
+  SIGPIPE    This signal is blocked by the proxy, but not used to
+             implement any functionality. It can be handled by the
+             NX agent without affecting the proxy.
+
+  SIGALRM    This is not blocked by the proxy, but could be used
+             in future.
+
+  SIGVTALRM  These signals are not used and should not be used in
+  SIGWINCH   future versions of the library.
+  SIGIO
+  SIGTSTP
+  SIGTTIN
+  SIGTTOU
+
+- By calling NXTransSignal(..., NX_SIGNAL_DISABLE) nxcomp will res-
+  tore the signal handler that was saved at the time the proxy hand-
+  ler was installed. This means that you should call the function
+  just after the XOpenDisplay() or any other function used to init-
+  ialize the NX transport.
+
+nxcomp-1.5.0-15
+
+- In NXTransContinue(), if the transport is gone, return immediately,
+  that is without having to wait until the NXTransSelect() timeout.
+
+- Ensure that NXTransCreate() has a jump context, just in the case
+  a subsequent operation would cause a cleanup.
+
+nxcomp-1.5.0-14
+
+- Solved a problem with requests left in the agent's buffer when run-
+  ning the NX transport. The agent could have enqueued data to our
+  side and checked the available events but requests could not be
+  written to the proxy because proxy might not have had a chance to
+  enter a new select. We found that this behaviour was triggered by
+  _XEventsQueued, so now a new loop is forced when agent is calling
+  _X11TransDataReadable. The procedure can be optimized, by avoiding
+  an expensive loop when no critical I/O is pending.
+
+- Added a few additional logs to ClientChannel and ServerChannel.
+
+nxcomp-1.5.0-13
+
+- Added the code handling the special cases of an user not specifying
+  a proxy cookie or the case of the X authorization file not contain-
+  ing a value matching the display. In the first case we'll forward
+  the same cookie that was feeded to the proxy, in the second case we
+  will forward to the X server a random generated cookie, similarly to
+  what SSH does in this same condition.
+
+- Rewritten the command line parser. Removed all the command line
+  options parsed on behalf of nxproxy except:
+
+  -C          Specify that nxproxy has to run on the "X client"
+              side, listening for connections and impersonating
+              an X server.\n\
+
+  -S          Specify that nxproxy has to run in "X server" mode,
+              thus forwarding the connections to daemons running
+              on the client.\n\
+
+  -V n.n.n    Request nxproxy to load the given nxcomp version.
+              This option is only present on Solaris and Linux.
+
+  -v          Print version information.
+
+  host:port   Put at the end, specifies the host and port of the
+              listening proxy.
+
+  value=name  Set the NX option to the provided value.
+
+  Multiple NX options can be specified in the DISPLAY environment or
+  on the command line, by using the nx/nx,name=value notation.
+
+- The above information is printed on the console when incurring in
+  a parse error, together with a list of the available option=value
+  parameters.
+
+- Renamed the 'log' option to 'errors'. This makes sense as the de-
+  fault name for the log file is actually 'errors'.
+
+- Now the "Established X server connection" message is printed to
+  the session log only after the X connection has passed the X auth-
+  entication phase. This means that the NX client should become able
+  to show the details of the session log whenever the session fails
+  due to a cookie problem.
+
+- When selecting the additional services without specifying a port,
+  the client proxy will now automatically forward the connections to
+  the corresponding well-known ports of the CUPS, SMB and HTTP servi-
+  ces. Embedded X keyboard connections will be automatically forward-
+  ed to the same display port used to connect to the X server. The
+  user will still have to specify the port to be used for the media
+  connections as we don't have a suitable well-known port.
+
+- Starting from this version, connections to the keybd port will cre-
+  ate real X connection channels. This is required to let connections
+  leverage the fake authorization cookie.
+
+- By testing the forwarding of keybd connections I found that, when
+  letting X clients connect to the port, it is required to provide
+  the X cookie for the unix display. Adding only the TCP cookie will
+  not work. For example, by creating a cookie as in:
+
+  xauth add localhost:2009  MIT-MAGIC-COOKIE-1  6f...f4
+
+  And running:
+
+  xterm xterm -display localhost:2009
+
+  You will get the following error:
+
+  Xlib: connection to "localhost:2009.0" refused by server
+  Xlib: No protocol specified
+
+  Adding also the unix cookie will fix it:
+
+  xauth add localhost/unix:2009  MIT-MAGIC-COOKIE-1  6f...f4
+
+  This seems to be a Xlib problem, with Xlib trying to get the cookie
+  for the UDS port even if the TCP port was requested by the user.
+
+- Fixed a bug that prevented the nxclient dialog to be displayed when
+  the session was abruptedly shut down.
+
+- Fixed the compilation error on Apple MacOSX due to the sa_restorer
+  field in sigaction. As long as this field is present on Linux we
+  will keep following the safer route and will set it explicitly to
+  NULL.
+
+- Included what needs to be included in Process.cpp to compile with
+  older gcc.
+
+nxcomp-1.5.0-12
+
+- Implemented a replacement for the popen() and pclose() that do not
+  rely on a shell to run the command. They were required on Windows,
+  where we don't ship a suitable shell in the install.
+
+- Removed code forcing the PATH to include the bin directory on
+  Windows.
+
+nxcomp-1.5.0-11
+
+- Forced Auth.cpp on Windows to have the directory containing the
+  nxauth executable in the PATH. This is just for testing, until
+  nxclient is fixed.
+
+- Fixed compilation errors on Cygwin and Sun.
+
+- Removed the NX_FORCE_* stubs.
+
+nxcomp-1.5.0-10
+
+- Modified the memory management policies in ReadBuffer to fit all
+  the available bytes in a single buffer allocation.
+
+- The locateMessage() methods now give hints on the amount of data
+  that has to be read.
+
+- The read loop in channel now doesn't yield in the case of prio-
+  ritized messages. This is experimental.
+
+- Removed the check on isTimeToYield() between encodings of multi-
+  ple messages. This is aimed at reducing the risk of leaving pen-
+  ding messages in channels.
+
+- Modified the channels' read loop to always read all the available
+  data.
+
+- Disabled the log output that was selected when compiling with the
+  configure option --with-info. This leaves space for other log out-
+  put to be selected for more up-to-date scopes.
+
+- Implemented the NXTransReadVector() and the NXTransWriteVector()
+  functions to replace READV() and WRITEV().
+
+- Implemented memory-to-memory communication between the agent and
+  the NX proxy by making use of the NXTransAgent() interface in the
+  nx-X11/lib/X11/Xtranssock.c file.
+
+- Added a check in NXTransSelect() for the EBADF and, on Solaris,
+  the EINVAL errors. It can happen in the X11 code that a descript-
+  or has become invalid before it is removed from the managed set 
+
+- Rewritten the signal handling functions to restore the old actions
+  and masks when the NX transport is destroyed.
+
+- Added a NXTransAgent() function to let agents tell the proxy which
+  descriptor must be used for the controlling connection. Setting a
+  controlling connection has the effect of disabling further X client
+  connections and makes the proxy terminate when the channel is shut
+  down.
+
+- Solved a problem with setting the initial timeout in the select().
+
+- Modified the Makefile.in to not include -Wno-deprecated when compi-
+  ling C programs.
+
+nxcomp-1.5.0-9
+
+- Fixed a problem that prevented the 1.5.0-8 to work on the NX server
+  side.
+
+- This version has NX_FORCE_NULL_LISTEN_OPTION and NX_FORCE_NEW_SES-
+  SION_OPTION undefined, so it should work in a way that is compati-
+  ble with the old nxcomp.
+
+nxcomp-1.5.0-8
+
+- The new code comes with a preliminary integration of nxcomp with
+  SSH. It is now possible to create the NX transport by just calling
+  the "switch" command as in the following example:
+
+  NX> 299 Switching connection to: NX options: ...
+
+- Other possible forms for the NX switch command are:
+
+  NX> 299 Switching connection to: NX mode: ...
+
+  NX> 299 Switching connection to: NX mode: ... options: ...
+
+  Or just:
+
+  NX> 299 Switching connection to: NX
+
+  The "mode" parameter is there to provide a way to run both enc-
+  rypted and unencrypted connections. Possible values are "encrypt-
+  ed", "unencrypted" or "default", the latter being an alias for
+  "encrypted". Unfortunately I was not able to test unencrypted
+  connections, so this may or may not work.
+
+- The top-level process can create the NX transport layer by calling
+  NXTransCreate(). The user has to set up a socket pair and pass the
+  higher descriptor to nxcomp. nxcomp will later monitor its end, by
+  reading and writing NX-encoded traffic. The user has to call the
+  NXTransExecute() function as often as it is possible, by letting
+  first NXTransPrepare() combine the sets of NX descriptors with the
+  descriptors that are used inside its process. A custom NXTransSel-
+  ect() is provided to optionally replace the original select(). This
+  function saves the original error code and the number of selected
+  descriptors upon exit, so the user can call it, restore the original
+  values as they were returned by the select() and run the rest of
+  the loop unmodified.
+
+- Future versions of the library should provide appropriate methods
+  for passing data to and from the proxy by means of a memcpy(), so
+  that it will be possible to remove the even minimal TCP overhead.
+
+- Note that integration is far from complete. More work is required
+  especially to manage the shutdown cleanly, in a way that gives to
+  SSH a chance to free its resources, and on adding facilities for
+  handling SSH and NX signals in a single function.
+
+- Rewritten the initialization procedure to make possible to run the
+  proxy in-process in an arbitrary connection manager, like SSH or a
+  HTTP utility. The same functionality can be used to embed nxcomp in
+  the NX agents, so that nxcomp has not to run in a separate process.
+
+- A new state-machine handles the advances through the connection
+  stages until the remote proxy (or the forwarder process ) is auth-
+  enticated, options have been negotiated and the session is started.
+
+- The option "session" is now used to pass the name of the session
+  file to the proxy. The parameter was previously used to pass the
+  literal name of the session, as set by the user, and was ignored
+  by the proxy. By default the session log is the standard error of
+  the process. It is anyway required to set the option when running
+  inside SSH, otherwise output will go to the same file as the SSH
+  output. In the NX client this would be the 'sshlog' file.
+
+- This version can be easily crafted to test the new integration by
+  setting the following define:
+
+  NX_FORCE_NULL_LISTEN_OPTION
+
+  This makes possible to test the nxcomp/nxssh integration by using
+  any production 1.4.0 client. To run this version you are required
+  to use nxproxy 1.5.0-4 and nxssh-1.5.0-6.
+
+- New functions handling enabling and disabling signals, based on
+  sigprocmask().
+
+- Improved error reporting when failures are encountered while ne-
+  gotiating the session.
+
+nxcomp-1.5.0-7
+
+- Caches are saved with a version identifier 1.4.0 so that they are
+  not discarded after upgrading the software to the 1.5.0.
+
+- Made values of T_* enumerations to be all lower case.
+
+- Updated copyright to year 2005.
+
+- Started working on an interface for running nxcomp in-process, as
+  a additional transport layer of nxssh or nxagent.
+
+nxcomp-1.5.0-6
+
+- Modified the configure script and the makefiles to not include the
+  -Wstrict-prototypes and -Wmissing-prototypes compilation flags. The
+  -Wnested-externs and -Wmissing-declarations flags are not included
+  when using GCC 3.
+
+- Removed the initial newline from string "NXPROXY - Version" printed
+  at program startup.
+  
+- Made X authentication compatible with 1.4.0 clients. This is a tem-
+  porary solution while code is updated to handle the new X authori-
+  zation scheme.
+
+nxcomp-1.5.0-5
+
+- Added an Auth class to handle the X authentication. The NX server
+  should now use the same proxie cookie that is passed by the client
+  at session startup. The X server side proxy will forward the autho-
+  rization credentials by replacing the fake cookie with the real co-
+  okie, as it is read from the auth file using the xauth utility. The
+  implementation is based on the corresponding code found in the SSH
+  client and comes with the same limitations: only MIT-MAGIC-COOKIE-1
+  cookies are checked and the authorization file is read only once,
+  at the time the instance is initialized. If the auth file changes
+  along the life of the session, the old cookie will still be used.
+  This works with X servers because of an undocumented "feature".
+  See also nx-X11.
+
+nxcomp-1.5.0-4
+
+- Adjusted for alarm(0) returning an inconsistent value in ConnectTo-
+  Remote().
+
+- Small changes to Types.h, Jpeg.cpp and Png.cpp to compile with gcc
+  3.4.2.
+
+- Cosmetic changes to the ChangeLog file.
+
+nxcomp-1.5.0-3
+
+- Removed test code from ServerChannel.cpp.
+
+- Small cosmetic change in Loop.cpp.
+
+- Tested for compatibility against 1.4.1-8.
+
+nxcomp-1.5.0-2
+
+- Changed VERSION file according to TRCL052336.
+
+nxcomp-1.5.0-1
+
+- Opened the 1.5.0 branch based on 1.4.1-9.
+
+nxcomp-1.4.1-9
+
+- Implemented methods PACK_RDP_PLAIN_64K_COLORS and PACK_RDP_PLAIN_-
+  16M_COLORS. It seems that 16 bpp plain bitmaps can be seldom recei-
+  ved. This doesn't seem to be the case of 24 bpp bitmaps.
+
+nxcomp-1.4.1-8
+
+- The new code enables use of 16 bpp and 32 bpp RDP bitmaps. This re-
+  quired modifications to the following files:
+
+  Misc.h
+  Misc.cpp
+  Loop.cpp
+  Control.cpp
+  ServerChannel.cpp
+  Unpack.h
+  Unpack.cpp
+
+- Lots of cosmetic changes compared to the original code in 1.4.1-7.
+
+- Merged the 1.4.0 and the 1.4.1 branches by importing changes up to
+  the 1.4.1-7.
+
+nxcomp-1.4.0-30
+
+- Modified the function checking the Unix socket where X connections
+  will be forwarded. The function will not fail if the socket itself
+  doesn't exist yet. This solves the TRCL042203.
+
+- Moved the code checking for the CTRL+ALT+SHIFT+ESC sequence to a
+  separate function. The implementation will now look for a different
+  sequence on the MacOS/X platform. This should solve the TRCL042182.
+
+nxcomp-1.4.0-29
+
+- Solved a bug that could cause proxy to stop reading data from the
+  X channels due to an incorrect calculation of the bytes queued on
+  the proxy link. The bug only affected Linux kernels of the 2.0/2.2
+  series.
+
+- Fixed a problem in the proxy class that could let the select time-
+  out to become zero.
+
+nxcomp-1.4.0-28
+
+- Prevented the main proxy process from quitting when the fork() of
+  any of the children fails. This can actually happen on Windows due
+  to conflicts in reallocating any of the Cygwin DLLs.
+
+- Reworked handling of the priority flag in channels when dealing
+  with the X_InternAtoms and X_AllocColor requests to reduce the time
+  of session startup. Priority is never set in case of X_InternAtom
+  requests and replies as we assume that most clients use the appro-
+  priate Xlib function to pipeline multiple requests in a single net-
+  work operation.
+
+- The timeout after which proxy will abort the peer connection is
+  still 120 seconds. An alert dialog will be shown earlier, after 30
+  seconds instead of 60.
+
+nxcomp-1.4.0-27
+
+- Removed the code setting priority on channels on ButtonPress and
+  Button release events. It seems preferrable to delay the flush and
+  pack more events in a single frame. This makes possible to get the
+  ButtonRelease together with the ButtonPress.
+
+- Fixed error detection in SetNoDelay() where a positive result
+  could produce a 'not supported' message in debug mode.
+
+nxcomp-1.4.0-26
+
+- Reworked the check aimed at detecting the clock drifts. The previ-
+  ous code, introduced in 1.3.2-2, had the undesired side-effect of
+  resetting the proxy timeout. This could cause the proxy to never
+  detect that the other end had been killed.
+
+- The default behaviour of proxy is now to terminate the session at
+  the time an error is encountered. This includes network failures.
+
+- Added a new dialog to be shown to the user whenever the session
+  is terminated abnormally.
+
+nxcomp-1.4.0-25
+
+- Fixed a bug in handling of suppression of errors generated by
+  committing the image splits. Other errors, unrelated to the commit
+  of split, could be suppressed. This might cause the hangup of the
+  session when the suppressed error was matching a reply.
+
+nxcomp-1.4.0-24
+
+- When killing the proxy process -9 the watchdog could remain alive.
+  This caused the SSH link to keep the stderr open, with the effect
+  that former proxy message were not flushed to the session log.
+  Now the watchdog checks every second if the parent is dead, so
+  that file descriptors can be closed as soon as possible.
+
+- SetupDisplaySocket() tried to force the connections to the X
+  server on the UNIX port whenever the display was set to localhost.
+  This patch was intended to fix a bug in nxclient, using the TCP
+  port even when the display was set to a UNIX socket. This beha-
+  viour caused problems when running nxclient on a remote host by
+  means of a ssh -X. Proxy will now adhere to the display setting.
+
+nxcomp-1.4.0-23
+
+- Added the possibility to respawn nxclient at the end of session.
+  This is an useful feature when powering thin-clients where NX
+  is the only application made available.
+
+- This configuration applies system-wide to the local client ins-
+  tallation. By default it is disabled. It can be enabled by the
+  by creating a 'noexit' file in the directory '/usr/NX/share',
+  or at compile time, by setting ENABLE_RESTART_ON_SHUTDOWN to 1.
+
+- Note that the solution is not perfect yet, as there are cases
+  where session could die without going through HandleShutdown(),
+  for example if a decoding error is raised in the communication
+  with the remote peer and the subsequent restore of the proxy
+  link fails to succeed.
+
+nxcomp-1.4.0-22
+
+- Corrected typos in Timestamp.h and Loop.cpp.
+
+nxcomp-1.4.0-21
+
+- Tuned the handling of RenderCompositeGlyphs. Now compression of
+  RENDER shows an average ratio of 8:1. This is a steady increase
+  compared to the 5:1 of the 1.3.2 version. The overall advantage
+  when running clients displaying a large amount of text is 30%.
+
+nxcomp-1.4.0-20
+
+- Added a new message store for the CreatePixmap request.
+
+- Fixed handleCopy() to only send the data part past the offset.
+  This fix can save a significant amount of traffic, especially
+  when sending many small images whose size doesn't reach the
+  threshold set for compressing them.
+
+nxcomp-1.4.0-19
+
+- Added tuning of all the RENDER requests. RenderCompositeGlyphs
+  will require further work.
+
+- Completed porting of the RENDER requests to the new templates.
+
+nxcomp-1.4.0-18
+
+- Tuned the handling of RenderCreatePicture and RenderFreePicture.
+
+- Created a new template system for writing new message encoders.
+
+- Renamed getBits() in EncodeBuffer with diffBits(). The getBits()
+  method now returns the bits actually allocated in the buffer and
+  can be called multiple times.
+
+nxcomp-1.4.0-17
+
+- Provided specific encoding of the remaining RENDER requests and
+  added compression of RenderCreateGlyphSet.
+
+nxcomp-1.4.0-16
+
+- Code underwent through 7 different patch versions but seems to
+  be stable now. It still needs to provide specific encoding for
+  RenderCreatePicture RenderChangePicture and RenderFreePicture.
+  Code will likely include incompatible changes at any new version
+  until the new encoding will stabilize, so be sure that you use
+  the same nxcomp version at both sides.
+
+- Created the infrastructure for compressing extension messages
+  based on the minor opcode. A new class, MinorMessageStore, has
+  to be inherited by stores requiring specific compression, so
+  that all the encoding methods of the parent can be redirected
+  to it. The RENDER extension is now compressed using this new
+  class.
+
+- Managed to maintain the compatibility with caches created by the
+  1.3.X version. Caches will be saved using the old format if the
+  remote version is not a 1.4.x. When restoring a cache created
+  by the 1.3.x with both proxies being the newest version, RENDER
+  mesages will be discarded without having to discard the whole
+  cache.
+
+- Added a member to the message class to store the identity size.
+  This field is now used instead of the default data offset to
+  manage the message data, that is the part of message after the
+  identity.
+
+- Removed the warnings printed in the session log when passing the
+  'kbtype' and the 'geometry' options to the proxy. These options
+  are actually used by agents.
+
+nxcomp-1.4.0-15
+
+- Started implementation of the new framework for handling enco-
+  ding of X extensions.
+
+- Renamed the overloaded methods handleEncode() and handleDecode()
+  to handleEncodeCached(), handleEncodeIdentity() and handleDecode-
+  Cached(), handleDecodeIdentity().
+
+- Updated the copyright notice to year 2004.
+
+nxcomp-1.4.0-14
+
+- Added the new channel for HTTP connections. This channel can be
+  used to let applications running on the NX server get access to
+  data and applications made available by a HTTP daemon running at
+  the client side.
+
+  This channel is not used at the moment by nxclient. It can be
+  activated by passing http=1 to the NX server side proxy and the
+  value http=80 to the NX client side.
+
+nxcomp-1.4.0-13
+
+- Quick patch to run on MacOS/X where inet_addr("127.0.0.1")
+  alone seems to fail to return a valid interface.
+
+nxcomp-1.4.0-12
+
+- Few cosmetic changes to logging.
+
+- Removed the debug output.
+
+nxcomp-1.4.0-11
+
+- Removed code used for simulating the new forwarding function-
+  ality without client and server support.
+
+nxcomp-1.4.0-10
+
+- Implemented authentication of the forwarder to the listening
+  proxy. If a session cookie is required, the forwarder must
+  provide the cookie upon connection.
+
+  An authentication phase at the time the forwarder connects
+  to the NX client side is strongly suggested because it is usu-
+  ally this side that sends the authorization cookie. Without
+  such a forwarder authentication, the local peer would reveal
+  the cookie to the first process connecting to the port.
+
+- If no cookie is specified in the switch command, the forward-
+  er is required to skip the authentication phase. This can be
+  useful when running the programs on the command line.
+
+- The implementation required appropriate changes to session
+  negotiation in nxssh. This version requires nxssh-1.4.0-8.
+
+nxcomp-1.4.0-9
+
+- Fixed the startup procedure to correctly negotiate the cookie
+  when the X server side proxy is listening for a forwarder.
+
+- When listening for a local forwarder (that is when the listen
+  option is enabled at X server side), proxy will listen for the
+  forwarder on the localhost interface.
+
+- This version has ports and and other parameters hardcoded for
+  testing purposes and is not intended for normal use.
+
+nxcomp-1.4.0-8
+
+- Slightly modified the text of FAILED_PROXY_CONNECTION alert.
+
+nxcomp-1.4.0-7
+
+- Added provision for leaving a running dialog showing an OK box
+  if proxy is exiting abnormally. This seems to fail to yield the
+  expected results as, at the present moment, client checks if
+  parent has exited.
+
+- Added a Binder class invoked when calling proxy with -B option.
+  It would serve as a replacement of the modifications I'm doing
+  in nxssh. The class is just a framework and the implementation
+  is unfinished.
+
+nxcomp-1.4.0-6
+
+- Added a line in the session log if the connection procedure is
+  aborted due to a signal.
+
+- Fixed ParseHostOption() to let it take in account the proxy
+  port offset when passing 'host:port' as the last parameter at
+  X server side.
+
+nxcomp-1.4.0-5
+
+- Lowered the default port offsets used for CUPS and SMB services
+  to 2000 and 3000. Arbitrary ports can be used by passing the ser-
+  vice's port at proxy startup. By default, anyway, the port is at
+  the same offset of the proxied display. Considering that the NX
+  server uses to start the first session at display 1000, we must
+  lower some of the defaults to avoid interference with the normal
+  X sessions run on the server.
+
+  Session at display ":1000" will have:
+
+  . Forwarding of CUPS connections at 3000.
+
+  . Forwarding of SMB connections at 4000.
+
+  . The listening proxy (at NX server side) at 5000. This
+    port is not used when enabling SSH tunneling
+
+  . The proxied X display (NX agent or proxy) at 7000.
+
+  . Forwarding of multimedia channels at 8000.
+
+  . Forwarding of embedded keyboard connections at 9000.
+
+- Turned off the log output.
+
+nxcomp-1.4.0-4
+
+- Managed to get the X client side proxy connect to the remote
+  peer. This means that some parameters that were implicitly
+  assumed based on the proxied port simulating the X display
+  must be now specified in the NX display string.
+
+- The 'port' parameter now specifies the remote TCP port where
+  the local proxy will connect to the remote peer. In previous
+  versions this parameter also affected the proxied port. This
+  was mainly a side effect, as the remote peer was always con-
+  tacted at port 4000 plus the proxied display offset.
+
+- Added the 'listen' parameter to tell to the proxy that is go-
+  ing to accept the peer connection on which port it will be
+  contacted. By default, similarly to the previous version, the
+  proxy will listen at the proxied display offset.
+
+- A check has been added in order to disallow passing both the
+  'accept' and the 'connect' parameter at the same time. A simi-
+  lar check affects the 'listen' parameter.
+
+- Renamed the previously unused 'sync' channel as 'cups'.
+
+nxcomp-1.4.0-3
+
+- Preserved the ability of version 1.3.2 to load caches generated
+  by this version.
+
+nxcomp-1.4.0-2
+
+- Small fixes to compile under Solaris 8.
+
+nxcomp-1.4.0-1
+
+- Opened the 1.4.0 branch.
+
+nxcomp-1.3.2-4
+
+- Fixed a problem with shmget(). Code in ServerChannel checked
+  the return value for being greater then 0, while 0 can actual-
+  ly be a valid segment.
+
+- When memory cache is disabled, nxcomp will explicitly set the
+  appropriate control variables dealing with loading and saving
+  of the persistent cache. This can be considered a cosmetic
+  change as nxcomp will disable NX delta compression if memory
+  cache is not available and this has an implicit effect on the
+  ability to load and save such a cache.
+
+nxcomp-1.3.2-3
+
+- Removed inclusion of zlib.h in Png.cpp. Conflicting symbols
+  with zlib.h from nx-X11 could cause compilation to fail.
+
+nxcomp-1.3.2-2
+
+- Added a function to take into account the clock drifts at the
+  time we check the ping from the remote proxy. This can be
+  caused by the user changing the system time or by small adjust-
+  ments introduced by the operating system making the clock go
+  backward. Such events could cause the proxy link to be shut
+  down and reconnected.
+
+- Reduced the length of lines printed in statistics when showing
+  the details of X protocol's opcodes. This is intended to help
+  nxclient to keep the whole statistics in the 'details' window,
+  so that users don't have to use the scrollbars.
+
+nxcomp-1.3.2-1
+
+- Opened the 1.3.2 branch.
+
+nxcomp-1.3.1-5
+
+- It seems that Solaris can return an EINVAL error selecting a
+  shutdown descriptor even before we actually close the socket.
+  We now ignore the condition on Solaris. This is definitely a
+  Solaris bug. 
+
+nxcomp-1.3.1-4
+
+- Increased the timeout after which proxy will abort the peer
+  connection to 120 seconds. An alert dialog will now be shown
+  after 60 seconds, instead of the 30 seconds being the default
+  in the previous version. Some users reported the timeout to
+  be too short in the case of temporary network failures.
+
+nxcomp-1.3.1-3
+
+- Some optimizations in the cache house-keeping process. Now it
+  runs at lower system priority in respect to the parent. Any 2
+  iterations through directories and images, it also sleeps for
+  a tiny amount of time. This further decreases the system load.
+
+- Removed the underline characters and added a colon in the
+  title of this ChangeLog to fully comply with format used in
+  the release notices.
+
+nxcomp-1.3.1-2
+
+- Fixed a crash when running both client and server on the SPARC
+  Solaris. An optimization used to avoid byte-swapping when both
+  hosts have the same endianess doesn't work on SPARC if buffer
+  is not aligned to word boundary. A better version of the code
+  should check the CPU, not the OS, as this probably applies to
+  other processors.
+
+nxcomp-1.3.1-1
+
+- Opened the 1.3.1 branch.
+
+nxcomp-1.3.0-50
+
+- Disabled the processor limit in X client side proxy. In previous
+  versions the processor load limit was set to an idle time ratio
+  of 2. This was likely to cause an unwanted slowdown on very old
+  hardware or when running the server as guest OS inside a VMWare
+  virtual machine.
+
+nxcomp-1.3.0-49
+
+- Last minute update on proxy shutdown bug on Cygwin. A stack
+  trace reveals that faillure happens in the static destructor of
+  the BlockCacheSet class. It seems that problem appeared just
+  after having upgraded to the latest version of Cygwin DLL. Now
+  the destructor is skipped at shutdown.
+
+nxcomp-1.3.0-48
+
+- Further fix to overcome the shutdown problem on Windows.
+
+nxcomp-1.3.0-47
+
+- Used T_files::value_type() in Keeper.cpp. The form without the
+  explicit constructor fails to compile with GCC 2.91 on RH 6.2.
+
+- Fixed '==' -> '=' in configure.in to build under RH 6.2 and
+  probably other platforms.
+
+nxcomp-1.3.0-46
+
+- The cleanup procedure now skips deletion of the IO streams
+  under Windows. This is intended to overcome a strange segfault
+  occurring at random time, at the time proxy is being shutdown.
+
+nxcomp-1.3.0-45
+
+- Newer versions of the stdlibc++ do not seem to be able to deal
+  with NULL strings or non printable characters. This caused the
+  standard error stream to get sometimes corrupted in the case
+  TEST and DEBUG logs were enabled in Loop.cpp.
+
+nxcomp-1.3.0-44
+
+- Disabled TEST and DEBUG logs in ServerChannel.
+
+nxcomp-1.3.0-43
+
+- Fixed a crash when unpacking an image in server proxy in the
+  case the unpack state for the given channel had not been
+  previously created.
+
+nxcomp-1.3.0-42
+
+- Small modification to setSchedule() to not account previous
+  data accumulated in the encode buffer. The new code seems to
+  allow better use of the available bandwidth.
+
+nxcomp-1.3.0-41
+
+- Further fix in Tight decompression. Content of the main write
+  buffer was not removed before flushing the unpacked data to
+  the X server link.
+
+nxcomp-1.3.0-40
+
+- Removed the code marked as FIXME in Loop and ServerChannel.
+  Code was used in previous version to override any pack method
+  other than NO_PACK and to disable initialization of the shared
+  memory.
+
+nxcomp-1.3.0-39
+
+- Solved the problem with unpacking of RDP text on big-endian
+  architectures. The width field in PutPackedImage was put as
+  16 bits and extracted as 32 bits at decoding side.
+
+- Moved the code checking if any of the children has exited in a
+  specific function. This function is now called any time signals
+  are newly enabled. This works even on Solaris.
+
+- Enabled use of shared memory with Tight image decompression.
+
+- Added event NXCollectPropertyNotify to NXproto.h.
+
+nxcomp-1.3.0-38
+
+- Message locks are now checked before splitting a message.
+
+nxcomp-1.3.0-37
+
+- Added a further counter to yield encoding data if the amount 
+  of output bytes to be written to channels exceeds a threshold.
+
+- Modified proxy to write data immediately if the encoding loop
+  was interrupted.
+
+nxcomp-1.3.0-36
+
+- Further fix required by Tight decompression. By handling mul-
+  tiple writes in the Tight class we may flush the main write
+  buffer in the wrong order. If Tight decompression is enabled,
+  the buffer is now flushed before decoding the packed image.
+
+- A SIGCHLD is raised any time signals are newly enabled. This
+  allows the main loop to wait() the pid of children that had
+  exited while signals were disabled.
+
+nxcomp-1.3.0-35
+
+- Fixed Tight decompression by handling multiple writes to the
+  channel's transport inside the decompression function.
+
+- Made Tight decompressor in ServerChannel a pointer instead of
+  an instance of the class. Class is allocated the first time it
+  is referenced.
+
+- Rewritten handleUnpack() in ServerChannel to use a switch()
+  on the pack method instead of multiple if().
+
+nxcomp-1.3.0-34
+
+- Disabled RENDER extension when running X agent sessions on
+  the Solaris client. Problems seem to be caused by incompati-
+  bilities in the implementation of RENDER on the Sun X server
+  shipped by default. We did not test NX with the XFree86 X
+  server, but it seems that, when using the Sun X server, even
+  plain X clients don't make full use of the extension.
+
+nxcomp-1.3.0-33
+
+- Added 4 new fields to the X_NXGetControlParameters reply.
+  A dialog should be shown by agent if proxy was not able to
+  negotiate a persistent cache or if a cache was selected but
+  not loaded because incompatible or corrupted.
+
+- Fixed a bug on Solaris where socket() must be recreated if
+  the first connect() fails. Not a problem. The strange thing
+  is that if you reuse the socket(), the subsequent connect()
+  is successful and the program fails as soon as you try to
+  write to it.
+
+nxcomp-1.3.0-32
+
+- Added request X_NXFreeUnpack to free the resources allocated
+  by the remote proxy to unpack images for the given agent's
+  client
+
+- Added an alert at X server side if proxies were not able to
+  negotiate a persistent cache or if a cache was selected but
+  not loaded at X server side (that means that probably cache
+  was not compatible or corrupted). The alert is not enabled
+  at the moment. Before enabling it, we need to find a way to
+  deal with full-screen mode.
+
+- Tuning of MIT-SHM parameters.
+
+nxcomp-1.3.0-31
+
+- Modified the following requests to carry the id of the
+  agent's client:
+
+  - X_NXSetUnpackGeometry
+  - X_NXSetUnpackColormap
+  - X_NXSetUnpackAlpha
+  - X_NXPutPackedImage
+
+  Now each agent's client has its own record pointing to the
+  geometry, colormap and alpha channel that will be used to
+  unpack the image. Code is not finished yet so it is advisable
+  that agents' writers keep using client id 0. Note also that
+  the final solution will require some changes to the way split
+  notifications are sent to agent that I plan to implement in
+  the next versions.
+
+- The X_NXSetUnpackGeometry request has now a message store.
+  This should reduce the overhead to the minimum even in the
+  case of dumb agents not checking if the current geometry
+  matches the image to be unpacked.
+
+nxcomp-1.3.0-30
+
+- Improved handling of short-circuited replies at X client
+  side. Request opcodes are now pushed in the sequence queue
+  to determine if a reply is expected. In this case tainting
+  of reply is skipped to preserve the sequence ordering of
+  any event or error that could have generated by the reply.
+  This seems to solve all the problems reported by people
+  running a NX session in virtual desktop mode nested in an
+  existing session being run in single application mode.
+
+- Modified the cleanup procedure to print the 'Waiting for'
+  message in the session log only at the time all X channels
+  have been actually shut down. This message can be used by
+  the NX server to find out the appropriate time to close
+  the session.
+
+- Added the selected session type to the 'Using pack method'
+  message printed at startup.
+
+- Added the option to close down the proxy link and perform
+  a clean shutdown of the session, re-read the whole session
+  configuration or restart the proxy link when a SIGHUP is
+  delivered to the proxy process. The default behaviour is
+  to close down the session. The new default (the old one was
+  to restart the link) is a required feature to let users run
+  full sessions using single application mode f.e. in a LTSP
+  environment. I noted that when the controlling terminal of
+  the X session is closed, a SIGHUP is delivered to the X
+  server side proxy (probably it is delivered to all the con-
+  nected clients, and, thus for NX, only to the proxy). This
+  signal can be used to terminate the whole session.
+
+nxcomp-1.3.0-29
+
+- Changed defaults to disable image masks when running proxy
+  in single application mode. The new configuration requires
+  changes in NX server and in NX X11 library. Users should
+  experience much better image quality when using NX on slow
+  links. This comes at the cost of slightly worse compression
+  ratios.
+
+nxcomp-1.3.0-28
+
+- Opcode of request was not rewritten by server channel when
+  using link LAN. This caused problems with taint of replies.
+
+nxcomp-1.3.0-27
+
+- Modified the split store and the split procedures in client
+  channel to always return the client id in the notification
+  events. The new field is added to event at byte offset 28
+  to preserve compatibility with previous agent releases. The
+  modification permits to agent to match the commit of alpha
+  channel with the original image, if requests are split by
+  proxy.
+
+- Temporarily set the timeout used to poll MIT-SHM completion
+  events coming from X server to 0. More testing is required.
+
+- Fixed an inconsistent message generated in statistics due to
+  a division by 0.
+
+nxcomp-1.3.0-26
+
+- Modified pending timeout from 1 to 0 milliseconds. This means
+  that both channels and proxy are now immediately restarted to
+  let them consume all data left in their read buffer.
+
+- When querying the X server for MIT-SHM support, size of name
+  in X_QueryExtension request was sent as 32 bits instead of 16.
+  This caused request to fail on big endian architectures.
+
+- Modified the MIT-SHM initialization procedure to always send
+  all the 3 protocol requests also in the case of early failures.
+
+nxcomp-1.3.0-25
+
+- Implemented handling of the new X_NXSetUnpackAlpha message.
+  Performances are very satisfactory. Using most of the current
+  GNOME and KDE applications, caching reaches 90% of the total
+  messages.
+
+- Modified the persistent cache management routines to handle
+  backward compatibility with proxy versions prior of 1.3.0.
+
+- It has been made possible to send both X_NXSetUnpackColormap
+  and X_NXSetUnpackAlpha messages with 0 entries to temporarily
+  disable use of the colormap or the alpha channel and free the
+  resources allocated by the server channel class.
+
+- Added function UnpackAlpha() to Unpack.cpp.
+
+nxcomp-1.3.0-24
+
+- Using WriteBuffer::registerPointer() to track growing of the
+  write buffer in handleFastWrite() functions. This problem
+  existed even in 1.2.2 but never shown up because we didn't
+  have to use the pointer after data had been written to the
+  write buffer. Now, instead, we have to post-process the write
+  buffer to copy data to the shared segment.
+
+- Optimized memory allocations running with link LAN to save a
+  memcpy() any time new data is allocated in the scratch buffer.
+
+- When running with link LAN the scratch buffer is now used only
+  when:
+
+  - A further allocation would case growing of the write buffer
+    (and, thus, a memcpy() of the previous content).
+
+  - When data to added is bigger than the write threshold.
+
+  In previous versions the scratch buffer was used any time the 
+  total amount of data to be written (write buffer + scratch
+  buffer) exceeded the scheduled write threshold. This caused
+  small writes to be appended even when a single write could
+  be  obtained without reallocating the buffer.
+
+- Preliminary support for transporting the alpha channel in a
+  separate message in case of 32 bits displays using the RENDER
+  extension.
+
+nxcomp-1.3.0-23
+
+- Modified the mask used to open the shared memory segment on
+  OS/X to 0777. We have to better investigate why the previous
+  0600 mask doesn't work even if the user running the proxy is
+  the same user running the X server.
+
+nxcomp-1.3.0-22
+
+- Implemented MIT-SHM support on LAN connections.
+
+- More MIT-SHM bug fixes.
+
+nxcomp-1.3.0-21
+
+- Better use of the shared segment through an improved
+  algorithm leveraging the offset field of the X_ShmPutImage
+  request. The new algorithm greatly reduces the amount of
+  polls the proxy needs to perform to find if the completion
+  event has arrived.
+
+- Implemented MIT-SHM support for X_PutImage requests.
+
+- Implemented option shmem=value. Use of this option is anyway
+  discouraged. Proxy will allocate the shared memory segment
+  based on the size of the in-memory cache set by the user.
+  Use of MIT-SHM is disabled when user did set a memory cache
+  smaller than 2MB (for example on the embedded client).
+
+- Rewritten post-processing of images in server channel loop.
+
+- Improved error handling to ensure we intercept all MIT-SHM
+  X errors before they reach the NX agent.
+
+- Solved a problem that was causing channels to not reflect
+  shared memory support flags set in control.
+
+nxcomp-1.3.0-20
+
+- Solved a compatibility problem when mixing proxy versions
+  1.2.2 and 1.3.0.
+
+nxcomp-1.3.0-18
+
+- Rewritten interfaces to shared memory initialization in
+  client and server channel.
+
+- Server channel checks for the completion event until a
+  timeout before reusing the shared memory segment.
+
+- Flush flag was not cleared after the write buffer had been
+  flushed in handleWrite() of both client and server channels.
+  This could lead to multiple fragmented writes, affecting
+  the performances.
+
+- Added -lcygipc to linking on Windows platform.
+
+- Added a check on GCC version to see if -Wnested-externs
+  -Wmissing-declarations are valid options.
+
+nxcomp-1.3.0-17
+
+- Implemented initial support for MIT-SHM extension in the
+  network path between the X server proxy and the real X
+  server. Presently it works only for X_NXPutPackedImages.
+
+- Modified configure.in to compile under FreeBSD.
+
+- Small changes to sources due to FreeBSD support.
+
+nxcomp-1.3.0-16
+
+- Fixed caching of RENDER extension on MacOS/X and Solaris.
+
+- Under Solaris an explicit call to EnableSignal() is needed
+  at the end of the signal handler as raising a signal seems
+  to reset the previous settings.
+
+- Can't find a way to get bytes queued for write on Solaris as
+  both FIONWRITE and TIOCOUTQ don't seem to be available. This
+  means that NX server on Solaris is only able to detect con-
+  gestions on proxy link at the time a write fails with error
+  EAGAIN.
+
+- Starting from this version, render extension messages are not
+  automatically discarded from cache when running agent based X
+  sessions. This is in preparation of render support introduced
+  in this release.
+
+nxcomp-1.3.0-15
+
+- Changed default to force writes if X channels exceed buffer
+  limits. This change was suggested by benchmarks performed on
+  Win32.
+
+- Wrapped IO on cache files in functions performing better error
+  checking.
+
+- General cleanup in handling of socket options for MacOS/X and
+  Solaris.
+
+nxcomp-1.3.0-14
+
+- Corrupted persistent caches were not deleted in case loading
+  of any of the message stores failed. To run further sessions
+  on the same host, user had to delete the cache file manually.
+
+- Improved error handling in JPEG decompression. Now connection
+  is reset in case of failure.
+
+- Before performing JPEG or PNG decompression, image is better
+  checked to verify if loading from disk failed.
+
+- Improved error handling in case of failure loading persistent
+  cache from disk. On MacOS/X istream -> fail() doesn't seem to
+  work properly. This needs further investigation.
+
+- The default installation path of nxclient is searched under
+  MacOS/X at the time nxclient is invoked in dialog mode.
+
+nxcomp-1.3.0-13
+
+- Fixed a (further) compilation problem under Solaris. Now static
+  libraries are first searched under /usr/sfw/lib (in case Sun
+  would decide to include them in future releases).
+
+nxcomp-1.3.0-12
+
+- Fixed parsing of command line when passing option -V.
+
+- Correctly detected ENOPROTOOPT when setting TCP_NODELAY socket
+  option on MacOS/X and Solaris.
+
+nxcomp-1.3.0-11
+
+- Given option in configure to specify what needs to be built
+  statically:
+
+  --with-static-png     enable static linking of PNG library
+  --with-static-jpeg    enable static linking of JPEG library
+  --with-static-z       enable static linking of Z library
+
+nxcomp-1.3.0-10
+
+- Fixed a problem in saving of persistent cache on big-endian
+  machines.
+
+nxcomp-1.3.0-9
+
+- Testing with different settings to check if it's possible to
+  increase the performances under Windows.
+
+- Solved a problem in parsing of options that prevented proxy
+  to connect to a remote session running at port offset 0.
+
+- Fixed two warnings compiling on Solaris.
+
+- Changed configure.in to first check for nx-X11 includes
+  and libraries. Added "/usr/openwin/bin/makedepend" to path
+  searched for the executable.
+
+nxcomp-1.3.0-8
+
+- Small cleanup in configure.in and files modified by Gregorz
+  Kryza to add support for Solaris.
+
+- A new configure script has been generated using autoconf-2.57-3.
+
+nxcomp-1.3.0-7
+
+- Added support for detection of Solaris in configure script.
+  Now Makefile.in uses ranlib instead of ar.
+
+- Small changes in source and header files to support Solaris.
+
+nxcomp-1.3.0-4
+
+- Corrected a bug that could cause priority on proxy and channels 
+  to be not taken in account at the time proxy tries to determine 
+  if it's time to flush the proxy link.
+
+- Better implementation of abort split notification by X server
+  proxy to its remote peer. The new implementation doesn't
+  need to set a timeout and permits notifications to be received
+  earlier.
+
+- Improved support for 'tainting' XSync() messages coming from 
+  X clients in single application mode. Now a X_GetInputFocus
+  is sent to the real X server any n such messages received by
+  proxy. 
+
+- Included support for 15 bpp displays. It seems that handling
+  them as 16 bpp it's OK.
diff --git a/doc/_attic_/NoMachine_documentation_files/nxcomp_README b/doc/_attic_/NoMachine_documentation_files/nxcomp_README
new file mode 100644
index 000000000..f35cce6b5
--- /dev/null
+++ b/doc/_attic_/NoMachine_documentation_files/nxcomp_README
@@ -0,0 +1,21 @@
+README
+------
+
+Building
+--------
+
+1. To compile:
+
+   > tar zxvf nxcomp-X.Y.Z-N.tar.gz
+   > cd nxcomp
+   > ./configure
+   > make
+
+   You'll have to run gmake under Solaris.
+
+2. The 'make install' target is not currently supported
+   in the Makefile, but it should be simple to fix.
+
+You need at least nxproxy and nxagent packages to enjoy this code. Check the
+NoMachine website at http://www.nomachine.com to get the latest release.
+
diff --git a/doc/_attic_/NoMachine_documentation_files/nxcomp_README-IPAQ b/doc/_attic_/NoMachine_documentation_files/nxcomp_README-IPAQ
new file mode 100644
index 000000000..f9418635c
--- /dev/null
+++ b/doc/_attic_/NoMachine_documentation_files/nxcomp_README-IPAQ
@@ -0,0 +1,21 @@
+README-IPAQ
+-----------
+
+1. Install a cross-compiler for ARM. You can find detailed
+   informations at:
+
+   http://www.ailis.de/~k/knowledge/crosscompiling/toolchain.php
+
+   There are also binaries needed to install the cross-compiler.
+
+2. Configure and compile libXcomp using:
+
+   $ ./configure --with-ipaq
+   $ make
+
+   After compilation type:
+
+   $ arm-linux-strip libXcomp.*
+
+3. Remember that you also need nxproxy to actually run your NX X
+   session.
diff --git a/doc/_attic_/NoMachine_documentation_files/nxcompext_CHANGELOG b/doc/_attic_/NoMachine_documentation_files/nxcompext_CHANGELOG
new file mode 100644
index 000000000..941e9b411
--- /dev/null
+++ b/doc/_attic_/NoMachine_documentation_files/nxcompext_CHANGELOG
@@ -0,0 +1,806 @@
+ChangeLog:
+
+nxcompext-3.5.0-1
+
+- Opened the 3.5.0 branch based on nxcompext-3.4.0-1.
+
+- Updated copyright to year 2011. 
+
+nxcompext-3.4.0-1
+
+- Opened the 3.4.0 branch based on nxcompext-3.3.0-4.
+
+- Updated version number.
+
+- Updated copyright to year 2009.
+
+nxcompext-3.3.0-4
+
+- Fixed TR03G02199. The color palette allocated for encoding an image
+  having 256 colors or less was not freed.
+
+nxcompext-3.3.0-3
+
+- Now setting the correct event serial number when sending collect
+  notifies back.
+
+nxcompext-3.3.0-2
+
+- Updated VERSION.
+
+nxcompext-3.3.0-1
+
+- Opened the 3.3.0 branch based on nxcompext-3.2.0-1.
+
+nxcompext-3.2.0-1
+
+- Opened the 3.2.0 branch based on nxcompext-3.1.0-2.
+
+nxcompext-3.1.0-2
+
+- Updated file VERSION to match the current release version.
+
+nxcompext-3.1.0-1
+
+- Opened the 3.1.0 branch based on nxcompext-3.0.0-18.
+
+nxcompext-3.0.0-18
+
+- Removed the remaining debug output.
+
+nxcompext-3.0.0-17
+
+- Changed the copyright notices at the beginning of the files that
+  were referring to NXPROXY to refer to NXCOMPEXT.
+
+nxcompext-3.0.0-16
+
+- Handle the reply failure in NXGetShmemParameters().
+
+nxcompext-3.0.0-15
+
+- Separated the functionalities made available by NXQueryDisplay()
+  in three distinct functions:
+
+  NXDisplayReadable()  Query the number of bytes readable from
+                       the display connection.
+
+  NXDisplayFlushable() Query the number of the outstanding bytes
+                       to flush to the display connection.
+
+  NXDisplayCongestion() Return a value between 0 and 9 indicating
+                        the congestion level of the NX transport.
+
+- Renamed NXQueryDisplayError() to NXDisplayError().
+
+nxcompext-3.0.0-14
+
+- Removed support for Rdp, Tight and Hextile packed images encod-
+  ing since they have been made obsolete by the new NX server.
+
+- Changed the copyright attribution from Medialogic to NoMachine.
+
+nxcompext-3.0.0-13
+
+- Allocate 1024 additional bytes for the Jpeg compression, instead
+  of 512, to avoid failures on very tiny images.
+
+- Removed support for the special *PNG_JPEG* pack method.
+
+nxcompext-3.0.0-12
+
+- Implemented the NXEncodeBitmap() method. This is a very simple
+  encoder removing the 4th byte in 32 bits-per-plane images. For
+  the other pixmap depths it simply returns a pointer to the orig-
+  inal image data, saving the copy. This encoding is intended to
+  better leverage the stream compression on low bandwidth links.
+
+- Removed the quality parameter from the RGB/RLE encoding function.
+
+nxcompext-3.0.0-11
+
+- Removed the additional parameter in the call to NXTransFlush().
+
+nxcompext-3.0.0-10
+
+- Moved the _NXRDPGlyph and _NXRDPText declarations from NXlib.h
+  to NXproto.h to force fields to be CARD32.
+
+- Fixed a typo in NXSetDisplayBuffer() that could cause a double
+  free.
+
+- Fixed a compilation error with old GCC versions.
+
+- Removed the warning issued on AMD64 when compiling with the logs
+  enabled.
+
+nxcompext-3.0.0-9
+
+- Added the NXDisplayCongestion query type to NXQueryDisplay(). It
+  returns a value between 0 and 9, with 9 meaning that the link is
+  congested and no further data can be sent.
+
+- Added the NXSetDisplayBuffer() function. It allows the caller to
+  set the display output buffer size at runtime.
+
+- Removed the congestion and synchronization callbacks.
+
+nxcompext-3.0.0-8
+
+- Removed the warnings issued when purging the collected data at
+  display reset.
+
+nxcompext-3.0.0-7
+
+- Added the NXSetDisplayWriteHandler() interface. The function
+  registers a callback that will be invoked every time more data
+  is written to the display socket.
+
+nxcompext-3.0.0-6
+
+- Made NXQueryDisplay() take into account the bytes in the display
+  buffer when queried for the bytes flushable.
+
+nxcompext-3.0.0-5
+
+- Added file COPYING.
+
+nxcompext-3.0.0-4
+
+- Updated copyright notices to the current year.
+
+nxcompext-3.0.0-3
+
+- Imported changes up to nxcompext-2.1.0-4.
+
+- Fixed TR12D01564. Changed configure script to build library with
+  -fPIC option.
+
+- Added 256 byte to the size of Jpeg destination buffer. 
+
+nxcompext-3.0.0-2
+
+- Updated the file VERSION.
+
+nxcompext-3.0.0-1
+
+- Opened the 3.0.0 branch based on nxcompext-2.0.0-33.
+
+nxcompext-2.0.0-33
+
+- Placed the inclusion of jpeglib.h after the X includes to fix a
+  possible compilation error.
+
+nxcompext-2.0.0-32
+
+- Avoid to copy the data to the scratch buffer and yield the task
+  of padding the output to _XSend() in the NXPutPackedImage(), NX-
+  SetUnpackAlpha() and NXSetUnpackColormap() requests.
+
+- Added support for the RLE pack method.
+
+nxcompext-2.0.0-31
+
+- The X_NXSetUnpackColormap and X_NXSetUnpackAlpha now carry their
+  data in compressed form. The alpha data is compressed using the
+  ZLIB RLE encoding, while the colormap data is compressed using
+  the default ZLIB deflate.
+
+- Created new message structures to handle the compatibility with
+  the old proxy versions. When connected to an old proxy version
+  the agent should use the NXSetUnpackColormapCompat() and NXSet-
+  UnpackAlpha() interfaces.
+
+nxcompext-2.0.0-30
+
+- Removed the unfriendly warning printed if a client tried to reset
+  the library multiple times.
+
+nxcompext-2.0.0-29
+
+- Made possible to compile even if makedepend is not found.
+
+nxcompext-2.0.0-28
+
+- Added the NXSetDisplaySynchronizationHandler() interface. The NX
+  transport will use the callback to report when the agent can use
+  the available bandwidth to synchronize the X objects that are
+  corrupted or incomplete.
+
+- Bytes from 14 to 24 in the NXGetControlParameters() reply report,
+  respectively, the frame timeout, the ping timeout, the preferred
+  image split mode and the split size threshold.
+
+nxcompext-2.0.0-27
+
+- Changed the image cleanup functions and the Png and Jpeg encoders
+  to be independent from the host endianess.
+
+- Enabled again the image cleanup on big endian machines.
+
+nxcompext-2.0.0-26
+
+- Added the NXAbortSplit() request.
+
+- Added information about the size of the shared memory segment used
+  by the remote proxy in the NXGetShmemParameters() reply.
+
+nxcompext-2.0.0-25
+
+- Renamed the NXGetSplitResource() and NXGetUnpackResource() utili-
+  ties to NXAllocSplit() and NXAllocUnpack(). They can be called
+  with a NXAnyResource parameter to get the first available id or
+  requre a specific resource. From this version the resource must
+  be explicitly reserved. NXFreeUnpack() and NXFreeSplit() check
+  if the resource was allocated and don't do anything if it is not
+  the case. NXAllocSplit() and NXAllocUnpack() return NXNoResource
+  if the resource can't be reserved.
+
+nxcompext-2.0.0-24
+
+- NXFlushDisplay() now verifies whether the XlibDisplayWriting flag
+  is set before flushing the display buffer. in this case, it only
+  flushes the NX link.
+
+nxcompext-2.0.0-23
+
+- Implemented a move-to-front strategy for the image cache, to mi-
+  nimize the number of lookups.
+
+- Fixed the problems imtroduced by the new cache implementation by
+  modifying the memory allocation routines in Jpeg.c and Pgn.c.
+
+- Temporarily fixed the cleanup problems on big-endian machines by
+  skipping the operation.
+
+- Added a NXSetDisplayStatisticsHandler() to let the agent include
+  arbitrary data in the transport statistics. The parameter is a
+  pointer to a pointer to a null terminated string. The pointer is
+  set at the time the handler is registered. The pointed string can
+  be filled by the agent with its statistics data.
+
+nxcompext-2.0.0-22
+
+- The NXCacheFindImage() returns a pointer to the checksum, if the
+  image is found.
+
+- The image cache uses the data passed to NXCacheAddImage() instead
+  of making a copy.
+
+- The Z stream used by the RGB encoder is allocated at initializat-
+  ion and freed at reset.
+
+nxcompext-2.0.0-21
+
+- Removed the reliance on the local byte order in the image cleanup
+  functions.
+
+nxcompext-2.0.0-20
+
+- Added the NXFinishSplit() request. It forces the proxy to comple-
+  tely transfer all the split messages for the given resource, and
+  then notify the agent.
+
+nxcompext-2.0.0-19
+
+- Enabled again the cleanup of images.
+
+- Updated to comply with the new NXTransFlush() interface.
+
+nxcompext-2.0.0-18
+
+- Moved all the declarations in Rgb.c at the beginning of the block
+  to avoid the possible compilation errors with old compilers.
+
+nxcompext-2.0.0-17
+
+- Added a new RGB image encoder. For now the encoder uses a static
+  Z stream to compress the image data in the destination buffer and
+  allows the agent to use the simplest encoding by still separating
+  the alpha channel from the image data. The new encoder can be the
+  the base for implementing color reduction by dithering or a color-
+  mapped translation of the image similar to PNG, but without the
+  PNG overhead and with the colormap being sent to the client using
+  the NXSetUnpackColormap() opcode.
+
+- Created a new NXCleanImage() function that takes a XImage pointer
+  and uses either the CleanXYImage() or the CleanZImage() routines
+  to cleanup the padding bits.
+
+nxcompext-2.0.0-16
+
+- Added a parameter to NXFlushDisplay() to specify what needs to be
+  flushed. The parameter can be one the following values, defined
+  in NXvars.h:
+
+  NXFlushBuffer   Only the Xlib buffer is to be flushed.
+
+  NXFlushLink     Flush both the Xlib buffer and any pending
+                  data encoded by the NX transport.
+
+  NXFlushIdle     Inform the NX transport that the agent is
+                  idle. This will let the NX transport encode
+                  more low-priority data, and then flush the
+                  link.
+
+- Ensured that the padding bytes are cleaned when creating a new
+  PNG image. It seems that some images are still missed. This is
+  to be investigated.
+
+nxcompext-2.0.0-15
+
+- Ensured that the packed image cache is recreated only on a size
+  change.
+
+nxcompext-2.0.0-14
+
+- Updated to get the karma delay field from the X_NXGetControlPara-
+  meters reply.
+
+nxcompext-2.0.0-13
+
+- Added the NXSetDisplayPolicy() and NXSetDisplayFlushHandler() in-
+  terfaces. The second function registers a callback that will be
+  invoked by the NX transport when the number of bytes encoded by
+  the proxy exceeds the threshold set for the scheduled write.
+
+- Added the NXFlushDisplay() and NXQueryDisplay() interfaces. They
+  are used to hide the corresponding NX transport functions to the
+  application. NXQueryDisplay() can be called with the NXDisplay-
+  Flushable or NXDisplayReadable parameters, to get, repectively,
+  the number of bytes that are queued to the NX transport and the
+  number of bytes that is possible to read.
+
+- Included the remote proxy version in the NXGetControlParameter()
+  reply.
+
+nxcompext-2.0.0-12
+
+- Added the NXGetSplitResource() and NXGetUnpackResource utilities.
+  These can be used by the client to find out the first unused id
+  available for a split or unpack operation.
+
+- Added the NXFreeSplit() request function. It makes the resource
+  available for the next operation and tells the proxy to destroy
+  all the storage associated to the split.
+
+- Renamed the NXNumberOfConnections constant to NXNumberOfResources.
+
+nxcompext-2.0.0-11
+
+- Changed NXForceDisplayError() to also shut down the NX transport
+  by calling NXTransClose().
+
+- Updated to comply with the new NX function prototypes introduced
+  in nxcomp-2.0.0-31.
+
+nxcompext-2.0.0-10
+
+- NXQueryDisplayError() now checks the predicate function only if
+  the I/O error was not encountered already.
+
+nxcompext-2.0.0-9
+
+- Added the NXSetDisplayErrorPredicate(), NXSetDisplayBlockHand-
+  ler(), NXSetDisplayCongestionHandler(), NXSetLostSequenceHand-
+  ler() interfaces to let the user set the values used internal-
+  ly. All functions return the previous handler. See ChangeLog
+  in nx-X11-2.0.0-16 and nx-X11-2.0.0-17.
+
+- Moved all the internal variables shared between Xlib, nxcompext
+  and the X server in nxcomp. Declarations and function prototypes
+  moved to NXvars.h.
+
+- Some name changes. In particular the NXContinueOnDisplayError()
+  function iss renamed NXHandleDisplayError() and NXDisplayError()
+  is now renamed NXQueryDisplayError(). To verify if the display
+  is valid, NXQueryDisplayError() will now call the _NXDisplayEr-
+  rorPredicate function, or, if the predicate function is not set,
+  will simply check the value of the XlibDisplayIOError flag.
+
+- Removed the NXGetCleanupParameters() and NXGetImageParameters()
+  interfaces and the remaining references to the unused display
+  buffer and image cleanup functions.
+
+- Updated the NoMachine copyright notice to year 2006.
+
+nxcompext-2.0.0-8
+
+- Removed the unused screen parameter from XSetUnpackGeometry().
+
+- NXSetUnpackGeometry() now fails if no visual is provided.
+
+nxcompext-2.0.0-7
+
+- Changed the LICENSE file to state that the software is only made
+  available under the version 2 of the GPL.
+
+- Removed the misplaced DXPC copyright notices from the license.
+  They were copied from NXCOMP but they don't apply in any way to
+  NXCOMPEXT.
+
+nxcompext-2.0.0-6
+
+- Added the NXSetCacheParameters() request. It tells to the local
+  proxy how to handle the X requests, namely if the next requests
+  have to be stored in the memory cache, split in smal data chunks,
+  and in the case of images, saved on disk in the persistent image
+  cache. The request will affect all X messages, including plain
+  and packed images. It can be used to tell the proxy to discard
+  images coming from some selected operations, like GLX or XVideo.
+
+nxcompext-2.0.0-5
+
+- Added the NXGetFontParameters() request and reply. If the proxy
+  has been configured accordingly, the request returns the X font
+  path that can be set by the agent to tunnel the font server con-
+  nections through the NX link.
+
+nxcompext-2.0.0-4
+
+- Initial work on font server tunneling.
+
+nxcompext-2.0.0-3
+
+- Renamed the NXSetExposeEvents request to NXSetExposeParameters.
+
+nxcompext-2.0.0-2
+
+- Modified the configure and the makefiles to support the Cygwin
+  environment.
+
+- Renamed Png.h to Pgn.h to avoid name clashes on Windows.
+
+- The distclean target now removes the autom4te.cache directory.
+
+nxcompext-2.0.0-1
+
+- Opened the 2.0.0 branch based on nxcompext-1.5.0-20.
+
+nxcompext-1.5.0-20
+
+- Removed the code installing a SIGSEGV handler before trying to
+  clean an image in NXCleanImageInPlace().
+
+nxcompext-1.5.0-19
+
+- Added the NXUnsetLibraryPath() function to specify the behaviour
+  of the Popen() in the X server. If the _NXUnsetLibraryPath flag
+  is set, the Popen() will remove the LD_LIBRARY_PATH variable from
+  the environment before running the child process. This will cause
+  the X server to run the process (for example the keyboard initia-
+  lization utilities) by using the native system libraries, instead
+  of the libraries shipped with the NX environment.
+
+nxcompext-1.5.0-18
+
+- Moved the declarations of _NXEnable* and related structures from
+  Xlibint.h to NXlibint.h.  
+
+- Use the include files from nx-X11 if the nx-X11/include directory
+  is found. The previous configure checked the presence of nx-X11/
+  exports/include, that might not be built at the time this library
+  is compiled.
+
+nxcompext-1.5.0-17
+
+- Added the -fPIC GCC flag when compiling on AMD64 architectures.
+
+- Removed all warnings when compiling with GCC4.
+
+- Small changes to configure.in to have specific CFLAGS.
+
+- Created a new configure using autoconf 2.59.
+
+nxcompext-1.5.0-16
+
+- Added the 'mode' field in the NXStartSplit() request. It determi-
+  nes the strategy that the proxy will adopt to handle the image.
+  If set to 'eager', the proxy will only split the messages whose
+  size exceeds the split threshold (the threshold can be found in
+  the NXGetControlParameters() reply). If mode is set to lazy, the
+  proxy will split any image that it is not able to find in its
+  cache.
+
+  The opcode and the two available modes are defined in NXproto.h,
+  currently:
+
+  #define NXSplitModeDefault  0
+  #define NXSplitModeEager    1
+  #define NXSplitModeLazy     2
+
+- All requests related to image streaming now carry a 'resource' id.
+  The id is currently ignored by the proxy in the case of NXCommit-
+  Split() requests.
+
+nxcompext-1.5.0-15
+
+- Removed the NXSync() and NXKarma() operations, not used anymore
+  by the NX agents.
+
+- Updated to comply with changes occurred in the numbering of the
+  notification events and in the interface to the image streaming
+  functions.
+
+nxcompext-1.5.0-14
+
+- Accounted for the missing xoffset field in clean-up of XYPixmaps.
+
+nxcompext-1.5.0-13
+
+- Added a 'commit' field in NXCommitSplit(). When zero, the remote
+  proxy will remove the message from the split store, without send-
+  ing the recomposed image to the X server.
+
+nxcompext-1.5.0-12
+
+- Added the NXContinueOnDisplayError() function to specify the be-
+  haviour of the Xlib I/O error handler. If the flag is set to true,
+  Xlib will simply return, instead of quitting the program. This
+  leaves to the application the responsibility of checking the sta-
+  te of the XlibDisplayIOError flag.
+
+- Changed NXDisplayIsValid() to NXDisplayError() and inverted the
+  logic. Now the function returns true if the display pointer is
+  NULL or the XlibDisplayIOError flag is set.
+
+- Added the NXForceDisplayError() function, to shutdown the display
+  descriptor and force Xlib to set the I/O error flag.
+
+nxcompext-1.5.0-11
+
+- Added -I../nx-X11/exports/include to CCINCLUDES in Makefile.in.
+
+nxcompext-1.5.0-10
+
+- Added FindLSB() to replace ffs() that may be not present on some
+  systems.
+
+- Some cosmetic changes.
+
+nxcompext-1.5.0-9
+
+- Fixed a printf() that prevented the code to compile if TEST was
+  enabled.
+
+nxcompext-1.5.0-8
+
+- Implemented the NXLib interface for asynchronous handling of the
+  XGetInputFocus requests and replies.
+
+nxcompext-1.5.0-7
+
+- Removed the _NXFlushSize parameter. New agents run the NX trans-
+  port in-process, so we don't get any benefit from increasing the
+  display buffer size.
+
+nxcompext-1.5.0-6
+
+- Added a NXDisplayIsValid() to check that the display is not NULL
+  and that the descriptor was not shut down after an IOError. The
+  reason a function is needed for this is that the flags field is
+  only in Xlibint and it is not visible to Xlib applications.
+
+nxcompext-1.5.0-5
+
+- Added the NXGetCollect*Resource utility functions, returning the
+  first available small integer resource id that can be used in a
+  subsequent collect request.
+
+nxcompext-1.5.0-4
+
+- Added the NXNumberOfConnections constant.
+
+nxcompext-1.5.0-3
+
+- Implemented the NXLib interface for the asynchronous handling of
+  the XGrabPointer requests and replies.
+
+- Solved an error in image cleaning that prevented the 8 bits-per-
+  pixel images to be completely cleaned. Due to the bug, only half
+  of the total lines were cleaned.
+
+- Removed a bug that prevented the cleaning of XYPixmaps images of
+  bitmap unit 32 and byte order LSB.
+
+- Renamed the NXImageCache variables to show they are global. They
+  are currently used in the nxagent code.
+
+nxcompext-1.5.0-2
+
+- Changed VERSION file.
+
+nxcompext-1.5.0-1
+
+- Opened the 1.5.0 branch.
+
+nxcompext-1.4.1-1
+
+- Removed the configure option --with-static. There are two options
+  now, --with-static-png and --with-static-jpeg, to offer a greater
+  degree of control on the resulting library.
+
+- This version differs from the 1.4.0-3-KRY1 in the way that the con-
+  figure script is generated by GNU Autoconf 2.57, the same version
+  used for nxcomp.
+
+- Opened the 1.4.1 branch.
+
+nxcompext-1.4.0-3
+
+- Updated the VERSION file to reflect the 1.4.0 status.
+
+nxcompext-1.4.0-2
+
+- Imported changes from the latest 1.3.2 development branch.
+
+- The 1.4.0 branch already had a 1.4.0-1 version. The changes from
+  the 1.4.0-1 were up to date with the 1.3.2-2 version.
+
+nxcompext-1.3.2-6
+
+- Fixed problem with icons in KDE and Mozilla on SPARC Solaris. The
+  problem was related to cleaning of one-bit XYPixmaps on big-endian
+  hosts, where shift of the cleaning mask executed in the wrong di-
+  rection.
+
+nxcompext-1.3.2-5
+
+- Changes in Clean.c to compile on Solaris.
+
+nxcompext-1.3.2-4
+
+- Fixed a bug in clean image procedures for 1bit XYPixmaps. The bug
+  caused Mozilla to trash some transparent icons in web pages and
+  the toolbar.
+
+- Added cleaning of the padding bytes at the end of the data chunk
+  inside XImage structure
+
+- Implemented handling of SIGSEGV during cleanup in case of static
+  data.
+
+- Moved image cleanup and masking code in new Clean.c and Mask.c
+  sources.
+
+- Corrected few typos in NXCollectImage code.
+
+nxcompext-1.3.2-2
+
+- Imported 1.4.0-1 changes from the 1.4.0 development branch.
+
+- Modified NXAllocColors to handle errors generated allocating
+  each requested color. A per-color result code is now returned 
+  to the caller.
+
+- Code cleanup in Png.h and Png.c.
+
+nxcompext-1.3.2-1
+
+- Opened the 1.3.2 branch.
+
+nxcompext-1.3.1-2
+
+- Removed the underline characters and added a colon in the
+  title of this ChangeLog to fully comply with format used in
+  the release notices.
+
+nxcompext-1.3.1-1
+
+- Opened the 1.3.1 branch.
+
+nxcompext-1.3.0-18
+
+- Added the _NXLostSequenceHandler function to let NX agents
+  suppress the error message and modify the default Xlib
+  behaviour when out-of-order sequence numbers are received.
+  Pointer to function is assigned to _NXLostSequenceFunction
+  in XlibInt.c.
+
+- Original output buffer size in stock XFree86 is 2048. We try
+  to reduce context switches and help stream compression by
+  increasing the maximum size of the buffer 8192. _NXFlushSize
+  determines when the display buffer is actually flushed. It is
+  set by default to 4096 in XlibInt.c and set to 0 to use the
+  maximum available size at the time NXGetControlParameters()
+  is called.
+
+nxcompext-1.3.0-17
+
+- In handling of asynchronous GetProperty replies a warning
+  message was printed in session log when a null property was
+  stored in the state structure. This message is now printed
+  only if TEST is defined.
+
+nxcompext-1.3.0-16
+
+- Added asynchronous handling of GetProperty request and reply
+  by means of the NXCollectProperty and NXGetCollectedProperty
+  requests and the NXCollectPropertyNotify event.
+
+nxcompext-1.3.0-15
+
+- Added 4 new fields to the X_NXGetControlParameters reply.
+
+nxcompext-1.3.0-14
+
+- Added request X_NXFreeUnpack to free the resources allocated
+  by the remote proxy to unpack images for the given agent's
+  client
+
+nxcompext-1.3.0-13
+
+- Modified the following requests to carry the id of the
+  agent's client in the field resource:
+
+  - X_NXSetUnpackGeometry
+  - X_NXSetUnpackColormap
+  - X_NXSetUnpackAlpha
+  - X_NXPutPackedImage
+
+nxcompext-1.3.0-11
+
+- Modified the MIT-SHM initialization procedure to always send
+  all the 3 protocol requests also in the case of early failures.
+
+nxcompext-1.3.0-10
+
+- Added handling of X_NXSetUnpackAlpha request.
+
+- It has been made possible to send both X_NXSetUnpackColormap
+  and X_NXSetUnpackAlpha messages with 0 entries to temporarily
+  disable use of the colormap or the alpha channel and free the
+  resources allocated by the remote proxy.
+
+nxcompext-1.3.0-9
+
+- Solved a compatibility problem when mixing proxy versions
+  1.2.2 and 1.3.0 due to the missing X_NXGetShmemParameters
+  request.
+
+nxcompext-1.3.0-7
+
+- Reduced the number of requests needed to setup the shared
+  segment at X server proxy from 4 to 3.
+
+- Small changes to the shared memory interface to support
+  path X agent to X client proxy.
+
+nxcompext-1.3.0-6
+
+- Implemented initial support for MIT-SHM extension in the
+  network path between the X server proxy and the real X
+  server.
+
+- Configure script now checks for the FreeBSD environment.
+
+- New configure script generated using autoconf-2.57-3.
+
+- Removed the XFree86 CCDEFINES from Makefile.in.
+
+nxcompext-1.3.0-5
+
+- Cosmetic changes.
+
+- Started to convert configure.in to the new layout adopted
+  for nxcomp.
+
+- Created file CHANGELOG.
+
+nxcompext-1.3.0-4
+
+- More fixes in image clean-up.
+
+nxcompext-1.3.0-3
+
+- Many fixes in image clean-up functions to handle differences
+  in endianess between client and X server.
+
+nxcompext-1.3.0-2
+
+- Modified configure.in to compile under Solaris.
+
+nxcompext-1.3.0-1
+
+- First 1.3.0 version based on nxcompext-1.2.2-12.
+
diff --git a/doc/_attic_/NoMachine_documentation_files/nxcompext_README b/doc/_attic_/NoMachine_documentation_files/nxcompext_README
new file mode 100644
index 000000000..39648e76b
--- /dev/null
+++ b/doc/_attic_/NoMachine_documentation_files/nxcompext_README
@@ -0,0 +1,15 @@
+README
+------
+
+1. To compile:
+
+   > tar zxvf nxcompext-X.Y.Z-N.tar.gz
+   > cd nxcompext
+   > ./configure
+   > make
+
+   You'll have to run gmake under Solaris.
+
+2. The 'make install' target is not currently supported
+   in the Makefile, but it should be simple to fix.
+
diff --git a/doc/_attic_/NoMachine_documentation_files/nxcompshad_CHANGELOG b/doc/_attic_/NoMachine_documentation_files/nxcompshad_CHANGELOG
new file mode 100644
index 000000000..3472a4afe
--- /dev/null
+++ b/doc/_attic_/NoMachine_documentation_files/nxcompshad_CHANGELOG
@@ -0,0 +1,404 @@
+ChangeLog:
+
+nxcompshad-3.5.0-2
+
+- Fixed TR03G02189. Now key combinations involving the Shift keys
+  are recognized correctly.
+
+nxcompshad-3.5.0-1
+
+- Opened the 3.5.0 branch based on nxcompshad-3.4.0-3.
+
+- Updated copyright to year 2011.
+
+nxcompshad-3.4.0-3
+
+- Updated copyright to year 2010.
+
+nxcompshad-3.4.0-2
+
+- Fixed TR08G02256. Now the Shadow session is shown correctly with
+  MIT-SHM extension disabled.
+
+- Improved updateShadowFrameBuffer() and ~Poller() functions.
+
+- Avoided memory leak.
+
+nxcompshad-3.4.0-1
+
+- Opened the 3.4.0 branch based on nxcompshad-3.3.0-3.
+
+- Updated version number.
+
+- Updated copyright to year 2009.
+
+- Improved error messages logging in case of initialization failures.
+
+nxcompshad-3.3.0-3
+
+- Fixed TR01G02158. Keymap initialization could be incorrect because
+  of a type mismatch on 64 bit platforms.
+
+nxcompshad-3.3.0-2
+
+- Updated VERSION.
+
+nxcompshad-3.3.0-1
+
+- Opened the 3.3.0 branch based on nxcompshad-3.2.0-3.
+
+nxcompshad-3.2.0-3
+
+- Improved keycode translation.
+
+nxcompshad-3.2.0-2
+
+- Solved a problem when sending fake modifier events.
+
+- Added support for keyboard events handling for the web player.
+
+- Changed keycodes translation for Solaris keyboard.
+
+- Corrected a problem for keycodes translation from Solaris keyboard.
+
+- Fixed TR02F02001. In shadow session the shadower's keyboard layout
+  could be wrong. Now keycodes are correctly translated if master and
+  shadow keyboards have different layouts.
+
+- Added NXShadowGetScreenSize() and NXShadowSetScreenSize() functions,
+  so that the shadow session can handle correctly the resize of the
+  master session window.
+
+- Solved a compilation problem on GCC 4.3.
+
+nxcompshad-3.2.0-1
+
+- Opened the 3.2.0 branch based on nxcompshad-3.1.0-2.
+
+nxcompshad-3.1.0-2
+
+- Updated file VERSION to match the current release version.
+
+nxcompshad-3.1.0-1
+
+- Opened the 3.1.0 branch based on nxcompshad-3.0.0-19.
+
+nxcompshad-3.0.0-19
+
+- Skip initialization of damage extension if it was already disabled.
+
+nxcompshad-3.0.0-18
+
+- The poller destructor checks if the damage extension is in use.
+
+- Small changes to the function getting the screen content in the case
+  damage is not in use.
+
+nxcompshad-3.0.0-17
+
+- Cleanup of some log messages.
+
+nxcompshad-3.0.0-16
+
+- Disabled some log message in the functions initializing the poller.
+
+nxcompshad-3.0.0-15
+
+- Before calling XTest functions, it is checked if the connection to
+  master X server has been initialized.
+
+nxcompshad-3.0.0-14
+
+- After the shm segment is created, its mode is changed and it is
+  marked for destroying. A check on the number of attaches is done.
+
+nxcompshad-3.0.0-13
+
+- Creating the shm segment even if the uid of master X server can't be
+  retrieved.
+
+- Fixed reallocation of update region.
+
+- Checking if the master X server provides XTest extension.
+
+nxcompshad-3.0.0-12
+
+- Fixed a compiler warning on AMD64 platform.
+
+- Changed configure script to add -fPIC option.
+
+- Fixed a mismatch in UpdateManager destructor.
+
+nxcompshad-3.0.0-11
+
+- Fixed the function setting the uid of shm segment.
+
+- Sync with the master X server before marking the shm segment to be
+  destroyed.
+
+nxcompshad-3.0.0-10
+
+- Setting the shm segments as readable only by the master X server
+  process.
+
+- Mark shm segments to be destroyed when the last process detach.
+
+- Enabled keycode translation in order to allow keyboards of different
+  models to work.
+
+nxcompshad-3.0.0-9
+
+- Changed the LICENSE file to state that the software is only made
+  available under the version 2 of the GPL.
+
+- Added file COPYING.
+
+- Changes to translate keycodes between different keyboard types. The
+  keycodes are translated through the keysym.
+
+- Changes to convert a Mode_switch key to ISO_Level3_Shift if it is
+  needed.
+
+nxcompshad-3.0.0-8
+
+- Added interface function NXShadowDisableShm disabling the use of
+  MIT-SHM extension.
+
+- Added interface function NXShadowDisableDamage disabling the use of
+  DAMAGE extension.
+
+- Added interface function NXShadowSetDisplayUid setting the uid of
+  shadowed X server
+
+- Changed the owner of shared memory segments to the uid of the sha-
+  dowed X server.
+
+- Fixed logWarning method.
+
+- Moved the code initializing the use of shared memory to shmInit
+  method of X11 Poller.
+
+nxcompshad-3.0.0-7
+
+- Removed the class qualifier in the declaration of destroyUpdate-
+  ManagerRegion().
+
+nxcompshad-3.0.0-6
+
+- Fixed build errors on 64 bit platforms.
+
+- Called XTestGrabControl to override possible grabs of the X server.
+
+nxcompshad-3.0.0-5
+
+- Added some stub members to the Poller class. These are intended to
+  handle keyboard state.
+
+- Changes in the default polling algorithm to disable the line pri-
+  ority persistence.
+
+nxcompshad-3.0.0-4
+
+- If a low layer handling of screen changes is available (DAMAGE in
+  case of X11), polling routine uses it and returns immediately.
+
+- Creating a Damage notify object if the extension is supported.
+
+- DamageNotify events are saved in the update region. After all avail-
+  able events have been handled, the content of screen is retrieved
+  by ShnGetImage requests.
+
+- XDamageSubtract and XSync are done before any event handling.
+
+- Damages are requested as raw rectangles.
+
+- Added Xdamage and Xrandr to required libraries.
+
+- Fixed a problem with some lines not refreshed in shadowing mode.
+
+nxcompshad-3.0.0-3
+
+- Added destroyUpdateManagerRegion() method to UpdateManager class.
+
+- Turned off some log messages.
+
+- Changed configure.in to remove warnings related to deprecated header
+  files and options.
+
+- Changed Makefile.in to remove autom4te.cache dir if the target is
+  'distclean'.
+
+- Removed multi-word file names.
+
+nxcompshad-3.0.0-2
+
+- Changes to get the screen of original display by a ShmGetImage.
+
+- Exit the polling loop if more than 50 ms have elapsed.
+
+nxcompshad-3.0.0-1
+
+- Created nxcompshad based on nxshadow-3.0.0-7.
+
+nxshadow-3.0.0-7
+
+- Deleted files KeyCursorTmp.cpp, scancodes.h, constant.h.
+
+- Renamed NXshadow.h to Shadow.h.
+
+- Merged NXshadowEvent.h with Shadow.h.
+
+- Fixed configure.in, changed Makefile.in to build Xcompshad library,
+  rebuilt configure script.
+
+nxshadow-3.0.0-6
+
+- Implemented a callback mechanism to ask the caller program if screen
+  polling have to be suspended.
+
+nxshadow-3.0.0-5
+
+- Changes to comply with the library name.
+
+- Fixed a bug in CorePoller that could prevent the update of the last
+  line of a rectangle.
+
+nxshadow-3.0.0-4
+
+- Removed some parameters of the NXShadowAddUpdaterDisplay() function.
+
+nxshadow-3.0.0-3
+
+- Updated copyright notices to the current year.
+
+- Code cleanup in KeysCursorTmp.c file.
+
+nxshadow-3.0.0-2
+
+- If master agent uses shared memory extension, the GetImage is rea-
+  lized by XShmGetImage() function.
+
+- Added new parameters to NXShadowAddUpdaterDisplay() function, the
+  depth and bit mask color of the master display.
+
+nxshadow-3.0.0-1
+
+- Opened the nxshadow-3.0.0 branch based on the nxaccess-3.0.0-13.
+
+- Renamed NXaccess.h NXaccessEvent.h and RegionM.h files as NXshadow.h
+  NXshadowEvent.h and Regions.h.
+
+- Modified the Makefile.in file and configure scripts in order to
+  compile the component.
+
+nxaccess-3.0.0-13
+
+- Fixed X11Poller.cpp pre-processing.
+
+nxaccess-3.0.0-12
+
+- Fixed build problems on Solaris.
+
+nxaccess-3.0.0-11
+
+- Added NXShadowUpdateBuffer() function. This function creates the
+  buffer for the polling.
+
+- If the scaline fails, the polling will suspend for 50 ms.
+
+- Added some functions in order to access data member class.
+
+nxaccess-3.0.0-10
+
+- Used XTEST extension to make the shared display create input events.
+
+nxaccess-3.0.0-9
+
+- Added the mouse events.
+
+- Now, it's possible to connect to X server display or agent display,
+  the display's content is captured by GetImage and sent to another
+  display by PutImage.
+
+nxaccess-3.0.0-8
+
+- Added KeysCursorTmp.cpp file.
+
+- Solved a problem with the keys, when the window lost focus the Key-
+  Release events weren't propagated.
+
+nxaccess-3.0.0-7
+
+- Added functions in order to remove issues with some keys combina-
+  tion.
+
+nxaccess-3.0.0-6
+
+- Added functions to simulate keys Ctrl + Alt + Del in order to run
+  the Task Manager application.
+
+- Now nxaccess is able to manage all switches between desktops.
+
+nxaccess-3.0.0-5
+
+- Solved a problem with the cursor shape. After a while, the cursor
+  shape are no more updated.
+
+- Now the cursor is updated only when it changes its shape.
+
+- Removed a dirty lines after screen updates.
+
+- Removed the unused file Keyboard.cpp.
+
+- Added the colorCorrect() macro in NXaccess.h.
+
+- Removed the colorCorrect() function in Updater.cpp.
+
+nxaccess-3.0.0-4
+
+- Renamed some source files and functions conforming them to the name
+  of component.
+
+nxaccess-3.0.0-3
+
+- Removed the parameter of type Display in all methods of the class
+  Poller.
+
+- Print, Break and Pause keys are enabled.
+
+nxaccess-3.0.0-2
+
+- Modified the Makefile.in in order to avoid compiling the executive
+  file.
+
+- Removed the unused file Main.cpp.
+
+- The Windows keys are enabled.
+
+- Synchronized local and remote states of Num_Lock, Caps_Lock and
+  Scroll_Lock.
+
+- Updated the NoMachine copyright notices.
+
+nxaccess-3.0.0-1
+
+- Opened the 3.0.0 branch based on the nxmirror-2.0.0-3.
+
+nxmirror-2.0.0-3
+
+- Added the keyboard events for all layouts.
+
+- The mouse wheel button is enabled.
+
+nxmirror-2.0.0-2
+
+- Completed implementation of the keyboard events only for italian
+  layout.
+
+- Added the mouse events and shape cursor.
+
+nxmirror-2.0.0-1
+
+- Opened the 2.0.0 branch based on the 1.5.0-60.
+
+- Added CHANGELOG.
diff --git a/doc/_attic_/NoMachine_documentation_files/nxproxy_CHANGELOG b/doc/_attic_/NoMachine_documentation_files/nxproxy_CHANGELOG
new file mode 100644
index 000000000..e5dff2e4f
--- /dev/null
+++ b/doc/_attic_/NoMachine_documentation_files/nxproxy_CHANGELOG
@@ -0,0 +1,216 @@
+ChangeLog:
+
+nxproxy-3.5.0-1
+
+- Opened the 3.5.0 branch based on nxproxy-3.4.0-2.
+
+- Updated copyright to year 2011.
+
+nxproxy-3.4.0-2
+
+- Updated copyright to year 2009.
+
+nxproxy-3.4.0-1
+
+- Opened the 3.4.0 branch based on nxproxy-3.3.0-2.
+
+- Changed version number.
+
+nxproxy-3.3.0-2
+
+- Updated VERSION.
+
+nxproxy-3.3.0-1
+
+- Opened the 3.3.0 branch based on nxproxy-3.2.0-1.
+
+nxproxy-3.2.0-1
+
+- Opened the 3.2.0 branch based on nxproxy-3.1.0-2.
+
+nxproxy-3.1.0-2
+
+- Updated version number.
+
+nxproxy-3.1.0-1
+
+- Opened the 3.1.0 branch based on nxproxy-3.0.0-4.
+
+nxproxy-3.0.0-4
+
+- Added file COPYING.
+
+- Changed the LICENSE file to state that the software is only made
+  available under the version 2 of the GPL.
+
+nxproxy-3.0.0-3
+
+- Updated the copyright notices to year 2007.
+
+nxproxy-3.0.0-2
+
+- Updated the file VERSION.
+
+nxproxy-3.0.0-1
+
+- Opened the 3.0.0 branch based on nxproxy-2.0.0-2.
+
+nxproxy-2.0.0-2
+
+- Updated copyright to year 2006.
+
+nxproxy-2.0.0-1
+
+- Opened the 2.0.0 branch based on nxproxy-1.5.0-10.
+
+nxproxy-1.5.0-10
+
+- Added the JPEG, PNG and Z libraries to the linker when compiling
+  on Cygwin. GCC 3.3.x requires that these libraries are explicitly
+  given while this is not required since GCC 3.4.x.
+
+- Created a new configure using autoconf 2.59.
+
+nxproxy-1.5.0-9
+
+- Removed provision for dynamically loading a different version of
+  the nxcomp library.
+
+nxproxy-1.5.0-8
+
+- Updated to reflect the new naming of the NX transport interfaces.
+
+nxproxy-1.5.0-7
+
+- Modified the Makefile.in to remove the *.out.* files generated by
+  Valgrind when running a 'make clean'.
+
+- Modified the README files and removed files that were outdated.
+
+nxproxy-1.5.0-6
+
+- Removed the NX_FORCE_IDLE_PROXY stubs.
+
+nxproxy-1.5.0-5
+
+- This version has NX_FORCE_IDLE_PROXY undefined, so it should work
+  in a way that is compatible with the old nxproxy.
+
+nxproxy-1.5.0-4
+
+- This software is crafted by default to test the new integration
+  between nxcomp and nxssh. The process will stay idle and will
+  let nxssh create the proxy. Note that the session log will go to
+  'sshlog', not to 'session'. This will have to be fixed in nxcomp
+  in future versions.
+
+- Removed the references to the "bind" functionality that is not
+  used in the current software.
+
+nxproxy-1.5.0-3
+
+- Added a NX_FORCE_IDLE_PROXY. If set, nxproxy will stay idle and
+  will not try to create a nxcomp proxy. This is used for testing
+  the new in-process nxcomp functionalities with the development
+  versions of nxclient and nxssh software.
+
+nxproxy-1.5.0-2
+
+- Small changes to this file.
+
+nxproxy-1.5.0-1
+
+- Opened the 1.5.0 branch.
+
+nxproxy-1.4.1-1
+
+- Opened the 1.4.1 branch.
+
+nxproxy-1.4.0-3
+
+- We were lucky. We found a machine where nxproxy failed exactly
+  in the same way described by multiple users in their reports.
+  The error was the same ('dlopen: win32 line 126') and neither
+  rebasing the Cygwin DLLs or removing all the other Cygwin li-
+  braries worked. So the problem had necessarily to be in a bug-
+  gy Cygwin dlopen() implementation. To solve this I had to make
+  changes to the nxproxy code on Windows, so it links to nxcomp
+  at compile time in the way specified below. As far as I can
+  tell, any other way fails. This seems to be another Cygwin bug:
+  the linker says that everything is OK but then the executable
+  can't be run. Both the Cygwin's bash and the command.com say
+  'Permission denied'.
+
+  LIBS = -L../nxcomp -lstdc++ -Wl,-e,_mainCRTStartup -lXcomp \
+         -lcygipc -static -lpng -static -ljpeg -lz
+
+nxproxy-1.4.0-2
+
+- Added a Binder class invoked when calling proxy with -B option.
+  It would serve as a replacement of the modifications I'm doing
+  in nxssh. The class is just a framework and the implementation
+  is unfinished.
+
+- Solved a potential problem in Main.c with NXExit() being called
+  after the dlclose(). This was unlikely to happen as proxy never
+  returns.
+
+nxproxy-1.4.0-1
+
+- Opened the 1.4.0 branch.
+
+nxproxy-1.3.2-1
+
+- Opened the 1.3.2 branch.
+
+nxproxy-1.3.1-2
+
+- Removed the underline characters and added a colon in the
+  title of this ChangeLog to fully comply with format used in
+  the release notices.
+
+nxproxy-1.3.1-1
+
+- Opened the 1.3.1 branch.
+
+nxproxy-1.3.0-7
+
+- Added a check on the OS version when running on MacOS/X.
+  Versions 10.2 and 10.3 differ in the way names are mangled.
+
+- Fixed error detection on dlsym(). The previous code was not
+  able to correctly identify missing symbols.
+
+nxproxy-1.3.0-6
+
+- Modified configure.in to compile under FreeBSD.
+
+nxproxy-1.3.0-5
+
+- Fixed a (further) compilation problem under Cygwin.
+
+nxproxy-1.3.0-4
+
+- New nxproxy is able to load libXcomp by dlopen() under
+  Cygwin. This simplifies both code in Main.c and the
+  configure.in script.
+
+- Changed configure.in to not link with -mwindows under
+  Cygwin. Linking with -mwindows prevented stderr to be
+  correctly output when running nxproxy on a console.
+
+nxproxy-1.3.0-3
+
+- Changed configure.in to first check for nx-X11 includes
+  and libraries. Added "/usr/openwin/bin/makedepend" to
+  path searched for the executable.
+
+nxproxy-1.3.0-2
+
+- Small cleanup in configure.in. A new configure script has
+  been generated using autoconf-2.57-3.
+
+nxproxy-1.3.0-1
+
+- Updated internal version, so this release tries to load
+  libXcomp version 1.3.0.
diff --git a/doc/_attic_/NoMachine_documentation_files/nxproxy_README b/doc/_attic_/NoMachine_documentation_files/nxproxy_README
new file mode 100644
index 000000000..8f95d9f3f
--- /dev/null
+++ b/doc/_attic_/NoMachine_documentation_files/nxproxy_README
@@ -0,0 +1,14 @@
+README
+------
+
+1. To compile:
+
+   > tar zxvf nxproxy-X.Y.Z-N.tar.gz
+   > cd nxproxy
+   > ./configure
+   > make
+
+   You'll have to run gmake under Solaris.
+
+2. The 'make install' target is not currently supported
+   in the Makefile, but it should be simple to fix.
diff --git a/doc/_attic_/NoMachine_documentation_files/nxproxy_README-IPAQ b/doc/_attic_/NoMachine_documentation_files/nxproxy_README-IPAQ
new file mode 100644
index 000000000..7a8a8a958
--- /dev/null
+++ b/doc/_attic_/NoMachine_documentation_files/nxproxy_README-IPAQ
@@ -0,0 +1,27 @@
+README-IPAQ
+-----------
+
+1. Install a cross-compiler for ARM. You can find detailed
+   informations at:
+
+   http://www.ailis.de/~k/knowledge/crosscompiling/toolchain.php
+
+   There are also binaries needed to install the cross-compiler.
+
+2. Configure and compile nxproxy using:
+
+   $ ./configure --with-ipaq
+   $ make
+
+   After compilation type:
+
+   $ arm-linux-strip nxproxy
+
+3. You need libXcomp.so to run nxproxy. Be sure you include the
+   library in your LD_LIBRARY_PATH. For example, you can run:
+
+   > export LD_LIBRARY_PATH $HOME/NX/nxcomp
+   > nxproxy -S localhost:8
+
+4. The package nxscripts contains many examples of NX usage that
+   you can modify to suit your needs.
diff --git a/doc/_attic_/NoMachine_documentation_files/nxproxy_README-VALGRIND b/doc/_attic_/NoMachine_documentation_files/nxproxy_README-VALGRIND
new file mode 100644
index 000000000..ce4d513a4
--- /dev/null
+++ b/doc/_attic_/NoMachine_documentation_files/nxproxy_README-VALGRIND
@@ -0,0 +1,39 @@
+README-VALGRIND
+---------------
+
+You can run nxproxy (and nxcomp) under the supervision of valgrind
+(a very good memory debugger) by wrapping nxproxy in the following
+script:
+
+<snip>
+#!/bin/bash
+
+# Enable core dumps.
+
+ulimit -c unlimited
+
+# Set this to directory where nxproxy is located.
+
+NXPROXY_DIR=~/NX/nxproxy
+
+# Set this to directory where valgrind is located.
+
+VALGRIND_DIR=/usr/local/bin
+
+exec ${VALGRIND_DIR}/valgrind -v --leak-check=yes --leak-resolution=high \
+                              --show-reachable=yes --show-reachable=yes \
+                              --suppressions=${NXPROXY_DIR}/nxproxy.supp \
+                              --num-callers=16 --logfile-fd=2 \
+\
+${NXPROXY_DIR}/nxproxy $1 $2 $3 $4 $5 $6 $7 $8 $9
+<snip>
+
+Run the following commands on your shell, right in the place where
+the nxproxy executable is to be placed in your setup:
+
+$ cat >nxproxy
+<copy paste the previous lines here>
+$ chmod a+x nxproxy
+
+Output of valgrind will go on stderr, that is in session file, if
+run in NX environment.
diff --git a/nx-X11/CHANGELOG b/nx-X11/CHANGELOG
deleted file mode 100644
index ffbbe0a61..000000000
--- a/nx-X11/CHANGELOG
+++ /dev/null
@@ -1,1085 +0,0 @@
-ChangeLog:
-
-nx-X11-3.5.0-2
-
-- Fixed TR0202420. XKB utility functions wrote out of bounds.
-
-- Upgraded RandR server extension to version 1.2.
-
-nx-X11-3.5.0-1
-
-- Opened the 3.5.0 branch based on nx-X11-3.4.0-4.
-
-- Updated copyright to year 2011.
-
-nx-X11-3.4.0-4
-
-- Fixed TR06H02359. Removed compiler warnings.
-
-nx-X11-3.4.0-3
-
-- Updated copyright to year 2010.
-
-nx-X11-3.4.0-2
-
-- Fixed TR04G02208. Added a path to rgb file.
-
-nx-X11-3.4.0-1
-
-- Opened the 3.4.0 branch based on nx-X11-3.3.0-7.
-
-- Updated copyright to year 2009.
-
-nx-X11-3.3.0-7
-
-- Fixed TR08G02257. The maximum client condition was reached because
-  available fd exhausted. This bug was caused by a function in font
-  library not closing the file before a return on error breaking the
-  flow of normal execution.
-
-- Fixed TR06G02225. The implementation of Xvprintf() has been reviewed
-  to work on more platforms. Previous implementation caused a failure
-  in the build of keyboard map on some platform like Solaris 8 and 9.
-
-nx-X11-3.3.0-6
-
-- Fixed TR03G02198. Reimplemented Xvprintf() in Xserver/os to handle
-  the case in which vsnprintf returned -1.
-
-- Returning from _XSeqSyncFunction() and _XReply() if an I/O error is
-  detected.
-
-nx-X11-3.3.0-5
-
-- Fixed TR01G02163. Signals need to be blocked before the call to
-  fork() in the Popen() utility.
- 
-- Fixed TR01G02164. Trapezoid data need to be validated before use.
-  This issue was the same of CVE-2007-2437.
-
-nx-X11-3.3.0-4
-
-- Enabled the code resetting the Xlib buffer if an IO error occured.
-
-nx-X11-3.3.0-3
-
-- Fixed the search path for the XKB base directory.
-
-nx-X11-3.3.0-2
-
-- Fixed TR10F02116. The X11 agent could enter an indefinite wait state
-  if connection to X display is broken and libX11 output buffer is not
-  empty.
-
-nx-X11-3.3.0-1
-
-- Opened the 3.3.0 branch based on nx-X11-3.2.0-2.
-
-nx-X11-3.2.0-2
-
-- Imported patch fixing issues from  X.Org security advisory, June
-  11th, 2008: Multiple vulnerabilities in X server extensions. CVE
-  IDs: CVE-2008-1377, CVE-2008-1379, CVE-2008-2360, CVE-2008-2361,
-  CVE-2008-2362.
-
-nx-X11-3.2.0-1
-
-- Opened the 3.2.0 branch based on nx-X11-3.1.0-6.
-
-nx-X11-3.1.0-6
-
-- Modified Xserver Imakefile to link the Xfixes library.
-
-nx-X11-3.1.0-5
-
-- Disabled the terminate action, just in case the TerminateServer
-  symbol is binded to a non default key sequence.
-
-nx-X11-3.1.0-4
-
-- Imported patch fixing issues from  X.Org security advisory, January
-  17th, 2008: Multiple vulnerabilities in the X server.  CVE IDs:
-  CVE-2007-5760    CVE-2007-5958    CVE-2007-6427   CVE-2007-6428
-  CVE-2007-6429    CVE-2008-0006.
-
-nx-X11-3.1.0-3
-
-- Moved a variable definition placed in _mesa_make_current().
-
-nx-X11-3.1.0-2
-
-- Fixed TR10E01924. A crash could occur in _mesa_make_current().
-
-- Initialized after_ret variable in _XcmsGetProperty().
-
-nx-X11-3.1.0-1
-
-- Opened the 3.1.0 branch based on nx-X11-3.0.0-37.
-
-nx-X11-3.0.0-37
-
-- Changed the Xserver Imakefile to link against Xcomposite on the
-  Cygwin platform too.
-
-nx-X11-3.0.0-36
-
-- Fixed TR07E01806. Modified host.def to build GLX code with symbol
-  __GLX_ALIGN64 defined on Solaris platform.
-
-nx-X11-3.0.0-35
-
-- Flush explicitly the NX link before entering the select() in the
-  WaitForReadable() and WaitForWritable() routines.
-
-nx-X11-3.0.0-34
-
-- Changed the agent Imakefile to link to the Xcomposite library.
-
-nx-X11-3.0.0-33
-
-- Fix the NX_TRANS_WAKEUP stuff in WaitForSomething() to not over-
-  ride a valid timeout.
-
-- Check if the requesting client is gone in the XFixes functions
-  sending the cursor events.
-
-nx-X11-3.0.0-32
-
-- Define DDXOSVERRORF and DDXOSFATALERROR symbols on Sun.
-
-- Changed the copyright attribution from Medialogic to NoMachine.
-
-nx-X11-3.0.0-31
-
-- Make SmartScheduleStopTimer() visible outside Xserver/os/utils.c
-  so that it can be called by the agent. Export the declaration in
-  dixstruct.h. 
-
-nx-X11-3.0.0-30
-
-- The OsVendorVErrorFFatal flag is set to 1 if the function pointed
-  by OsVendorVErrorFProc is called due to a fatal error.
-
-- Give the possibility to the agent to redirect the standard error
-  during a Popen() or a System() by setting the OsVendorStartRedir-
-  ectErrorFProc and OsVendorEndRedirectErrorFProc function pointers.
-
-nx-X11-3.0.0-29
-
-- Changed the default message printed on a fatal server error. The
-  new message is:
-
-  Error: Aborting session with 'Error text...'.
-
-- Hacked LogVWrite() to force all fatal error messages to have an
-  uppercase initial. Also remove the trailing newline and the full-
-  stop, if present.
-
-nx-X11-3.0.0-28
-
-- Corrected the typos in the ChangeLog.
-
-nx-X11-3.0.0-27
-
-- Fixed the cleanup of the X_RenderCompositeText16 padding bytes.
-
-- More code cleanup in the NX changes to the Xrender library.
-
-- Changed host.def to build the freetype and fontconfig libraries
-  if the agent server is also built. Freetype is built as a shared
-  library: this avoids the link error on 64 bit platforms.
-
-nx-X11-3.0.0-26
-
-- Applied the following security patches, from the X.Org security
-  advisory, April 3rd, 2007 "Multiple vulnerability in X server,
-  libXfont and libX11":
-
-  xorg-xserver-1.2.0-xcmisc.diff
-  xorg-libXfont-1.2.7-bdf-fontdir.diff
-  xorg-libX11-1.1.1-xinitimage.diff
-
-nx-X11-3.0.0-25
-
-- Added the missing *.X.original file for ChkIfEv.c and Xlib.h.
-
-nx-X11-3.0.0-24
-
-- Changed Xrender to clean up the padding bytes in XRenderComposite-
-  Text functions.
-
-- Added function XRenderCleanGlyphs() cleaning the padding bytes in
-  the data section of RenderAddGlyphs requests.
-
-nx-X11-3.0.0-23
-
-- Removed the additional parameter from the call to NXTransFlush()
-  in _XReply().
-
-- Call NXTransExit() on AbortServer() (called by FatalError()) to
-  give the proxy a chance to shut down the NX transport.
-
-nx-X11-3.0.0-22
-
-- Moved the replacement of XCheckIfEvent() ChkIfEv.c with the name
-  XCheckIfEventNoFlush().
-
-nx-X11-3.0.0-21
-
-- Set BUFSIZE to 8192 bytes. While the output buffer size can be
-  configured by setting the XLIBBUFFERSIZE in the environment (see
-  OpenDis.c), this constant is still used when reading from the
-  socket.
-
-nx-X11-3.0.0-20
-
-- If set, the handler pointed by _NXDisplayWriteFunction is called
-  after that more data is written to the display connection.
-
-nx-X11-3.0.0-19
-
-- Added a RejectWellKnownSockets() stub to make possible to compile
-  the agent when the NX transport is disabled.
-
-- Added more useful logs to _XWaitForWritable().
-
-nx-X11-3.0.0-18
-
-- Changed Imakefile of X11 and Xserver in order to build nxcompshad
-  just before the NX agent server.
-
-- Changed Imakefile in Xserver to add NXdamage.o to NXAGENTOBJS.
-
-nx-X11-3.0.0-17
-
-- Changed host.def in order to build Xdamage and Xrandr libraries.
-
-- Changed host.def in order not to build NXWin.
-
-nx-X11-3.0.0-16
-
-- Changed host.def in order to build Xtst as a shared library.
-
-nx-X11-3.0.0-15
-
-- Changes to comply with nxcompshad library.
-
-- Changed configuration to statically build Xtst library.
-
-- Restored parser directory under Xserver/hw/xfree86.
-
-nx-X11-3.0.0-14
-
-- Changed the LICENSE file to state that the software is only made
-  available under the version 2 of the GPL.
-
-- Added file COPYING.
-
-- In nx-X11/programs and nx-X11/programs/Xserver/hw/xfree86, removed
-  files and directories not needed to build servers.
-
-nx-X11-3.0.0-13
-
-- Changes aimed to link servers with static versions of Xdmcp and Xau
-  libraries.
-
-nx-X11-3.0.0-12
-
-- Added references to implented FR in the ChangeLog.
-
-- Removed nx-X11/fonts and nx-X11/doc directories. They are not needed
-  for building the NX components.
-
-nx-X11-3.0.0-11
-
-- Updated the copyright notices to year 2007.
-
-nx-X11-3.0.0-10
-
-- Applied the following security patches:
-
-   x11r6.9.0-cidfonts.diff 
-   x11r6.9.0-dbe-render.diff
-   x11r6.9.0-geteuid.diff
-   x11r6.9.0-mitri.diff
-   x11r6.9.0-setuid.diff
-
-nx-X11-3.0.0-9
-
-- Merged the NX changes to X11 with the X11R6.9.0 version of X.org.
-
-nx-X11-3.0.0-8
-
-- Changes to build Xshadow library when building X11.
-
-- Changes to Xserver Imakefile to link Xshadow library.
-
-- Changes to host.def in order to build on old distributions.
-
-nx-X11-3.0.0-7
-
-- Imported changes up to nx-X11-2.1.0-2
-
-- Fixed TR08D01485. Updated rgb file paths validation in order to
-  support Ubuntu distribution.
-
-- Added Xtst to libraries to be linked by nxagent.
-
-- Changed Xpm Imakefile to build a shared library on Solaris.
-
-- Fixed build error on Solaris in xtrans.
-
-- Changed host.def not to build Xnest server.
-
-- Changed Xserver Imakefile to link nxaccess library.
-
-nx-X11-3.0.0-6
-
-- Added the path of nxaccess library to the server link command.
-
-nx-X11-3.0.0-5
-
-- Implemented FR10C01079 and FR10C01080. The merge of NX changes to
-  the X.org code is complete.
-
-- Merged changes in config/cf. The NX-*.def files have been dismissed.
-  Main platform dependent configurations have been moved to host.def.
-
-- Removed *.reference files from config/cf.
-
-- Fixed compilation for Cygwin platform.
-
-nx-X11-3.0.0-4
-
-- Imported all changes up to nx-X11-2.0.0-32.
-
-- Cleaned up lib/zlib directory.
-
-- Added missing file programs/Xserver/os/utils.c.NX.original.
-
-- Updated the copyright notice to year 2006.
-
-- The pointer to the display buffer is reset after an I/O error.
-  This prevents leaving the buffer in an inconsistent state if the
-  error occurs inside _XFlush().
-
-- Removed the modifications to the Xrender library. The cleanup of
-  the padding bytes is now performed by the NX transport.
-
-- NX uses the updated ZLIB from its build tree, so Imake.tmpl will
-  now assume that the platform as ZLIB unless otherwise stated.
-
-- The path of the SecurityPolicy file is searched and validated at
-  runtime.
-
-- Added the _X11TransSocketProxyConnInfo() function to Xtranssock.c
-  It returns the pointer to the XtransConnInfo private, if it is a
-  valid _NXProxyConnInfo structure.
-
-- The above function is used by OpenDis.c to detect if the NX trans-
-  port was requested on the display and avoid spurious error messa-
-  ges in the case of a connection failure.
-
-- Added NXmiwindow.o to the NXAGENTOBJS in the Xserver's Imakefile
-  and imported NXmiwindow.c in nxagent. This allows us to check the
-  pointer to the pOldClip region in miSetShape() before going on
-  freeing it.
-
-- The path of the XKB base directory and of the xkbcomp comand is
-  validated at runtime.
-
-- Also added a check to verify the validity of the rgb file path.
-
-- Added NXresource.o to NXAGENTOBJS in the Imakefile of nxagent. We
-  need this to a assign a resource to the pixmaps and other server
-  objects which need to be enumerated at reconnection. Some objects,
-  being created by the X server and not by the clients, don't pass
-  through the resource assignment process operated by the dix. To
-  ensure that all objects get a resource, we add a resource at the
-  time the object is created and temporarily assign the resource to
-  the server client. If the dix later assigns the resource to a va-
-  lid client, the resource is removed from the server client's list.
-  
-- The display block handler registered by the client is called in
-  WaitForReadable() and WaitForWritable() before every select(),
-  not only upon entering the function. The reason is that more
-  data can be possibly produced for the NX link by the proxy it-
-  self and, when setting the flush policy to deferred, the client
-  may not have the chance of flushing the NX link.
-
-- Fixed a bug in XkbUseExtension() that caused Xlib to query the
-  presence of the XKEYBOARD extension multiple times. This partial-
-  ly implents the FR01D01275. The complete implementation required
-  modifications to the X11 agent, implemented in nxagent-2.0.0-33.
-
-- Updated to comply with the new NXTransFlush() interface.
-
-- Both nxwin and nxagent now read the X authority file by using an
-  fopen() instead of the system command 'cat'.
-
-- Removed NXmiwindow.o from the NXAGENTOBJ list. The agent will now
-  use the original miwindow.c.
-
-- Added some additional logs in Xtranssock.c to follow the creation
-  and removal of the X server's Unix listener.
-
-- Avoided the sleep of 5 seconds forced by Xtransutil.c if the dir-
-  ectory where the Unix listener is created is not owned by root.
-  This sleep is not executed on Cygwin (where the X socket can be
-  hardly owned by root) but may delay the startup of the agent if
-  the user chose a different NX_TEMP directory. Furthermore, it is
-  unclear what real benefits such sleeps are intended to bring to
-  the security of the X server. This can be controlled by defining
-  the NX_TRANS_SLEEP directive in Xserver/os/Imakefile.
-
-- Added NXmiexpose.o to the NXAGENTOBJ.
-
-- Ensured that _X11TransSocketCloseConnInfo() now initiates the NX
-  shutdown by calling NXTransClose().
-
-- Corrected a misplaced #else that made SocketUNIXConnect() skip a
-  block if the connection was not to the NX transport.
-
-- Updated to comply with the new NX function prototypes introduced
-  in nxcomp-2.0.0-31.
-
-- Moved the most important Xtranssock.c modifications into separate
-  functions.
-
-- Ensured that the modifications enabling the internal connections
-  to the proxy are compiled only when the TRANS_CLIENT directive is
-  defined.
-
-- Solved a bug that prevented the X11 socket to be deleted at the X
-  server shutdown. This needs further tests.
-
-- Added nxcompext to the link of nxagent, now that the dependency
-  of libX11 from nxcompext is removed.
-
-- Improved the Xtranssock routines to never loop through the array
-  of connection info.
-
-- Added a congestion flag to the connection info structure and a
-  function querying the transport and reporting if a change in the
-  congestion state has occurred. The code is currently not enabled,
-  because instead of polling the transport, we let the proxy notify
-  the changes in congestion state by using the callback. The code
-  can be used in future to extend the library, for example, by add-
-  ing some counters tracking the bandwidth usage of the socket con-
-  nection, so that we can make the congestion notifications work
-  even with a plain X11 connection.
-
-- Profiled the routines in XlibInt.c to reduce the number of calls
-  to the error predicate function provided by the client.
-
-- Fixed the nxcompext build problem that caused make World to fail.
-
-- Added a 'CONF' target to the X11 and Xext Imakefiles so that the
-  configure script is not run if the config.status exists.
-
-- Added the _NXDisplayBlockHandler hook. The function is called by
-  Xlib before blocking. The parameter says if Xlib is going to wait
-  for more input or because it needs to write to the display  socket.
-  The client can use the hook to perform any internal operation that
-  may require some time to complete. The user, though, should not
-  try to read or write to the display inside the callback routine.
-
-- Removed the outdated NX_TRANS_PROCESS, NX_TRANS_THREAD and NX_TR-
-  ANS_INCLUDE defines.
-
-- Reverted the lib/Xext Imakefile to the original XF86 version and
-  moved the build of the nxcompext library among the libX11 depend-
-  encies.
-
-- Corrected the lib/X11 Imakefile so that a new build of nxcomp and
-  nxcompext is not attempted if the libraries are up-to-date.
-
-- Removed the unused display buffer and image cleanup functions.
-  
-- Reverted the PutImage.c file to the original XF86 version.
-  
-- Added the _NXDisplayErrorPredicate function in XlibInt.c. It is
-  actually a pointer to a function called whenever Xlib is going to
-  perform a network operation. If the function returns true, the
-  call will be aborted and Xlib will return the control to the ap-
-  plication. It is up to the application to set the XlibDisplayIO-
-  Error flag after the _NXDisplayErrorPredicate returns true. The
-  function can be used to activate additional checks, besides the
-  normal failures detected by Xlib on the display socket. For exam-
-  ple, the application can set the funciton to verify if an inter-
-  rupt was received or if any other event occurred mandating the
-  end of the session.
-
-- Modified XIfEvent(), XMaskEvent() and XPeekIfEvent() to check the
-  _NXDisplayErrorPredicate function and return immediately if the
-  function returns true.
-
-- Modified _XWaitForReadable() to never enter the loop if the dis-
-  play is broken.
-
-- Corrected a make problem on Windows that caused the nxcomp and
-  nxcompext libraries to be referred with the wrong name, with the
-  result that a new configure and make was attempted at each build
-  attempt.
-
-- Merged all the changes to os, Xext, xkb, dix.
-
-- Changed host.def to build only the agent server.
-
-- Merged the changes to Xtranssock.c
-
-nx-X11-3.0.0-3
-
-- Merged the changes to lib/X11. Restored original PutImage.c and
-  ClDisplay.c files.
-
-nx-X11-3.0.0-2
-
-- Created a directory named 'reference' to keep files that are chan-
-  ged during the development of nx-X11 since the 1.5.0-16 to 2.0.0-32
-  version. These files will be removed as long as the differences are
-  merged to the 3.0.0 version. When all differences are merged, this
-  directory will be removed.
-
-nx-X11-3.0.0-1
-
-- Opened the 3.0.0 branch based on the nx-X11-2.0.0-9. The 3.0.0
-  branch will now support the migration toward the X.org tree. Due
-  to time concerns, the 2.0.0 branch is going to be based on the
-  same nx-X11 as the 1.5.0.
-
-nx-X11-2.0.0-9
-
-- Modified the agent link arguments to explicitly include the NX
-  libraries.
-
-- Disabled the Xinerama extension to avoid further clashes with
-  the redefinition of GC in Xlib.
-
-- Added os/libos.a at the end of the agent link.
-
-nx-X11-2.0.0-8
-
-- Moved the declarations of _NXEnable* and related structures from
-  Xlibint.h to NXlibint.h.  
-
-- Added provision for building the agent. This can be controlled by
-  setting NXAgentServer to YES in host.def.
-
-- Setting the NXUpgradeAgentServer variable to YES in the host.def
-  file will make the agent assume that it is being built in the new
-  environment. This variable is normally unset when building in the
-  1.5.0 tree.
-
-nx-X11-2.0.0-7
-
-- Fixed a problem on AMD64 due to the size of the area pointed by
-  the argument of _X11TransBytesReadable(). BytesReadable_t is long,
-  at least on Linux, while the ioctl() requires a pointer to an int.
-  The original _X11TransBytesReadable() function simply calls the
-  ioctl() by passing the pointer that is provided. NXTransReadable(),
-  instead, was correctly returning the value assuming a pointer to
-  a long, but this crashes some applications, among them xterm. Now
-  NXTransReadable() follows the same schema of the ioctl() call and
-  stores the result assuming a pointer to an int.
-
-- Removed the outdated NX_TRANS_PROCESS and NX_TRANS_THREAD code.
-
-nx-X11-2.0.0-6
-
-- Made xterm work with the NX transport. This required small changes
-  to the Xt toolkit's and the xterm's files to let them use the NX
-  aware select(). This is useful to test the NX transport until the
-  nxagent server is integrated.
-
-- When the transport is gone _X11TransSocketBytesReadable() returns
-  EPIPE. This makes the client become aware of the closure of the
-  connection.
-
-- Added a call to NXTransDestroy() in XCloseDisplay().
-
-- The exit() function in XlibInt.c causes a call to NXTransExit().
-
-- Merged changes to dix/pixmap.c, xkb/xkbDflts.h, mi/Imakefile.
-
-- Removed unneeded changes and files containing patches already in
-  the latest X.org distribution: dix/dispatch.c, fb/fbcompose.c, fb/
-  fbgc.c, xkb/ddxList.c, font/fontfile/dirfile.c, font/fontfile/
-  encparse.c, font/fontfile/fontfile.c, font/FreeType/fttools.c,
-  Xrender/FillRect.c, Xrender/Picture.c.
-
-nx-X11-2.0.0-5
-
-- Changes to the lib/X11/Imakefile to cleanly build the tree. This
-  is obtained by creating a link to the Xcomp library in exports/lib
-  without having to modify the programs' Imakefiles.
-
-- Finished merging the NX changes in the lib/X11 files.
-
-- Merged the CHANGELOG with the one from the 1.5.0 tree.
-
-nx-X11-2.0.0-4
-
-- Merged the NX changes in most Xtrans and lib/X11 files.
-
-nx-X11-2.0.0-3
-
-- Temporarily disabled the use of the MMX extensions in the Xserver's
-  fb code to successfully compile with GCC 4.
-
-nx-X11-2.0.0-2
-
-- Imported the *.NX.reference and *.XF86.reference files that will
-  be needed for the merge. These files are the *.original from the
-  1.5.0 tree. They will be removed as long as the merge advances.
-
-nx-X11-2.0.0-1
-
-- Created the 2.0.0 branch based on X.org the 6.8.99.16 snapshot.
-
-nx-X11-1.5.0-16
-
-- Added the missing *.XF86.original and *.NX.original files.
-
-nx-X11-1.5.0-15
-
-- Made the nxagent server use select() instead of poll() on Solaris
-  so that it can leverage the new NX transport.
-
-- Moved the NXTransFlush() call to _XReply().
-
-nx-X11-1.5.0-14
-
-- Added the 'synchronous' parameter in the _XWaitForReadable() call
-  to NXTransFlush().
-
-nx-X11-1.5.0-13
-
-- Removed the log entry in XlibInt.c on calling the NXTransFlush().
-
-nx-X11-1.5.0-12
-
-- Changed XlibInt.c and utils.c to call NXTransExit().
-
-nx-X11-1.5.0-11
-
-- Changed XlibInt.c to comply with the new NXTransFlush() interfa-
-  ce introduced in nxcomp-1.5.0-42.
-
-- Cosmetic changes to messages printed for debug.
-
-nx-X11-1.5.0-10
-
-- Ensured that all calls to _XIOError() are followed by a return.
-
-- Put exiting the client program in the case of an I/O error under
-  the control of the _NXContinueOnDisplayError flag. If set, the
-  I/O error routine will simply return, leaving to the application
-  the responsibility of checking the state of the XlibDisplayIOEr-
-  ror flag.
-
-- Added some checks whenever a read or write is performed on the X
-  connection, so that we can exit the I/O loop if the X channel is
-  gone. It is likely that more work will be needed when trying to
-  support XTHREADS enabled connections. This should not be a pro-
-  blem for now, as the default is still to quit the application un-
-  less the _NXContinueOnDisplayError flag is explicitly set.
-
-nx-X11-1.5.0-9
-
-- Removed the references to the cygipc library in NXWin. Now use the
-  cygserver daemon to provide the MIT-SHM extension.
-
-- Fixed an error in the UseCygIPC definition.
-
-- Changed the cygwin.cf file to avoid redefinition of the BuildGlxExt,
-  XWinServer and BuildGlxExt symbols.
-
-nx-X11-1.5.0-8
-
-- Added provision for deferred writes in the NX transport. When en-
-  tering _XWaitForReadable() we must ensure that data is flushed to
-  the proxy link.
-
-- Added the UseCygIPC define to NX-Cygwin.def.
-
-- Updated the NoMachine copyright notice on the modified files.
-
-nx-X11-1.5.0-7
-
-- Added the GLX extension in NX-Sun.def.
-
-- Added some more logs in WaitFor.c.
-
-nx-X11-1.5.0-6
-
-- Modified Xlibint.h and XlibInt.c to remove the _NXFlushSize para-
-  meter. New agents run the NX transport in-process, so we don't get
-  any benefit from increasing the display buffer size.
-
-- Modified NX-Darwin.def to not build the NXDarwin server. Since the
-  1.4.0 version the NXDarwin server is unsupported and the NX client
-  for the Mac requires that the Apple X server is installed.
-
-- Changed NX-Linux.def to avoid the warning due to "SharedLibGLw"
-  being not defined.
-
-nx-X11-1.5.0-5
-
-- Modified the Xserver Imakefile to link nxagent with FbPostFbLibs
-  and avoid including mfb/libmfb.a.
-
-- Added the GLX extension in NX-Linux.def. This provides unaccelera-
-  ted support in nxagent, with GLX operations translated into core X
-  protocol primitives.
-
-- Fixed x-X11/programs/Xserver/GL/dri/Imakefile to look in ../../hw/
-  /xfree86/os-support/bus for includes.
-
-nx-X11-1.5.0-4
-
-- Avoid calling NXTransSelect() if the transport is gone, so that we
-  don't have to wait until the timeout.
-
-- Added the "-fno-strict-aliasing" option to linux.cf when compiling
-  with a GCC version >= 4. In the words of Stefan Dirsch: "The opt-
-  ion, which is default since gcc 3.1, can result in wrong code when
-  the gcc warnings related to it are ignored. And as there are seve-
-  ral warnings in X11 related to it, it has been disabled for X11
-  from the beginning. This didn't change for gcc4, so it still needs
-  to be used."
-
-- Added more logs in XlibInt.c and utils.c. A warning is printed if
-  the SmartScheduler is initialized.
-
-nx-X11-1.5.0-3
-
-- Started integration of nxcomp with the X libraries. The Xtrans
-  code creates an internal connection to the nxcomp library instead
-  of a child proxy process.
-
-- Changed Xpoll.h and XlibInt.c to replace the standard Select
-  with a version giving NX a chance to check its own descriptors.
-
-- Implemented the NXTransReadVector() and the NXTransWriteVector()
-  functions to replace READV() and WRITEV().
-
-- Implemented memory-to-memory communication with the NX proxy by
-  making use of the NXTransAgent() interface.
-
-nx-X11-1.5.0-2
-
-- We think that the way LoadAuthorization() is working is wrong.
-  It doesn't reset the list of stored authorizations before reading
-  the new cookies. Our take is that if a new auth file is to be
-  read, the only cookies that are to be accepted are those that are
-  in the new file, not those in the file -plus- those that have
-  been in the file in the past. Furthermore, if the list can't be
-  read or it is empty, it should assume that it ignores which co-
-  okies are valid and thus it should disable any access. Your mile-
-  age can vary. A less draconian approach could be to leave the old
-  cookies if the file can't be read and remove them only if the
-  file is empty.
-
-  Adding the cookies without removing the old values for the same
-  protocol has an important implication. If an user shares the co-
-  okie with somebody and later wants to revoke the access to the
-  display, changing the cookie will not work. This is especially
-  important with NX. For security reasons, after reconnecting the
-  session to a different display, it is advisable to generate a
-  new set of cookies, but doing that it is useless with the current
-  code, as the old cookies are going to be still accepted. On the
-  same topic, consider that once an user has got access to the X
-  server, he/she can freely enable host authentication from any
-  host, so the safe behaviour should be to reset the host based
-  authenthication at least at reconnection, and keep as valid only
-  the cookies that are actually in the file. This behaviour would
-  surely break many applications, among them a SSH connection run
-  inside a NX session, as ssh -X reads the cookie for the display
-  only at session startup and does not read the cookies again
-  when the auth file is changed.
-
-  Another bug (or feature, depending on how you want to consider
-  it) is that if the authority file contains entries for different
-  displays (as it is the norm when the authority file is the default
-  .Xauthority in the user's home), the X server will match -any- of
-  the cookies, even cookies that are not for its own display. This 
-  means that you have to be careful when passing an authority file
-  to nxagent and maybe keep separate files for letting nxagent find
-  the cookie to be used to connect to the remote display and for
-  letting it find what cookies to accept. If the file is the same,
-  clients will be able to connect to nxagent with both the cookies.
-  This bug obviously affects any X server, also the real X server
-  running on the workstation, so it is common to see nxagent being
-  able to connect to the X server even if no cookie matches the
-  real display.
-
-- Added a check in lib/Xau/AuRead.c to prevent the fread() call to
-  be interrupted by SIGCHLD while reading the auth file. Due to the
-  way the old code worked, this could lead to the server enabling
-  local host access to the display. This problem had been identified
-  in the past. We just found that all the code dealing with reading
-  the auth file was affected. The code calls sigprocmask() to block
-  the signal (though it leaves some other calls unprotected) but the
-  SIGCHLD was not included in the set.
-
-- Added SIGCHLD to the set of signals that are blocked when reading
-  the authorization file.
-
-- As I was at it, I changed the path to the SecurityPolicy file. A
-  few Linux ditributors ship the file in $LIBDIR/xserver, a few only
-  in /etc/X11/xserver, most others in both places. It seems that
-  those who ship in $LIBDIR/xserver do also in /etc/X11 but the op-
-  posite is not true, so I switched to /etc/X11.
-
-nx-X11-1.5.0-1
-
-- Opened the 1.5.0 branch.
-
-nx-X11-1.4.1-2
-
-- Set parameter UseCygIPC on cygwin conf file in order to force the
-  build of MIT-SHM estension.
-
-- Removed some spurius object file.
-
-nx-X11-1.4.1-1
-
-- Opened the 1.4.1 branch.
-
-nx-X11-1.4.0-8
-
-- Changed DefaultFontPath and DefaultRGBDatabase in 
-  NX-Cygwin.def.
-
-nx-X11-1.4.0-7
-
-- Imported dispatch in nxdarwin package, in order to let
-  nxdarwin being able to detect new client connection.
-
-- Changed the Xpm Imakefile to make also .a static library
-  on Solaris. To link nxviewer and nxdestkop staticaly.
-
-nx-X11-1.4.0-6
-
-- XInput extension enabled on MacOSX.
-
-- Added some missing backup files of the original XFree86
-  package.
-
-nx-X11-1.4.0-5
-
-- Changed the mi Imakefile in order to let xfree86 servers use
-  the normal mi extension initialization for the XInput exten-
-  sion.
-
-- XInput extension enabled on Solaris.
-
-nx-X11-1.4.0-4
-
-- Removed the RejectWellKnownSocket for the cygwin and
-  MacOSX environments that doesn't use the Xtransport library.
-
-nx-X11-1.4.0-3
-
-- Changed the implementation of the reject method in the
-  Xtransport library, now close any new incoming connection 
-  immediately without reading or writing to it.
-
-nx-X11-1.4.0-2
-
-- Implemented a reject method in the Xtransport library,
-  this function accept and close every connection attempt,
-  on the specified listening socket.
-
-- Added the new function RejectWellKnownSocket to the os
-  connection code.
-  This function use the new transport reject function on
-  all listening socket.
-
-nx-X11-1.4.0-1
-
-- Opened the 1.4.0 branch.
-
-- Removed forgotten nxagent-1.3.2-20 directory.
-
-nx-X11-1.3.2-9
-
-- Prevents NX Darwin server going through the reset. On Darwin
-  we found that the it is not possible to get the correct key-
-  board layout unless it is set on the local machine, before
-  the NX session is started, by using xmodmap. As we set the
-  keyboard locally, we must prevent the X server to reset, or
-  we would loose any local configuration.
-
-nx-X11-1.3.2-8
-
-- Removed action associated to keysym XK_Terminate_Server. This
-  could cause agent to be terminated when pressing shift + back-
-  space if using the default US keyboard mapping.
-
-- Disabled the remaining debug logs in lib/X11/PutImage.c
-
-nx-X11-1.3.2-7
-
-- Fixed the wrong programs/Xserver/Imakefile in 1.3.2-6 package.
-
-nx-X11-1.3.2-6
-
-- Changed the define from NX_CLEAN_IN_PLACE to NX_CLEAN_INPLACE.
-  Definition of symbol is now placed in the Imakefile.
-
-- The new _NXEnableCleanInplace Xlib variable does control which
-  algorithm is used to clean the images. Setting NX_IMAGEINPLACE
-  in the environment will activate the in-place cleanup.
-
-- The default value of _NXEnableCleanInplace is -1. Leaving it to
-  a value <= 0 disables use of CleanInplace.
-
-nx-X11-1.3.2-5
-
-- Patch in config/cf/sun.cf. Fix for libfontconfig compilation
-  during gmake Everything on Solaris.
-
-- Patch in lib/X11/Imakefile. Fix for nxcomp compilation during
-  gmake World on Solaris.
-
-nx-X11-1.3.2-4
-
-- Image cleanup is now performed by using NXCleanInPlaceImage from
-  nxcompext. This function saves a buffer copy by cleaning the
-  padding bytes in the same buffer provided by the caller. Note that
-  to prevent memory violations in the case the image was allocated
-  in a static buffer, the function will temporarily redefine the
-  SIGSEGV handler. The former handler is restored before returning
-  to the caller. This can potentially affect some multithreaded
-  clients. Is to be decided if the function is safe enough to be
-  included in the production release.
-
-nx-X11-1.3.2-3
-
-- More debug logs in programs/Xserver/xkb/ddxLoad.c.
-
-nx-X11-1.3.2-2
-
-- Added NXmiwindow.o to NXAGENTOBJS in programs/Xserver/Imakefile.
-  File was not linked into the resulting nxagent. This solves the
-  problem of missing repaints in CDE and other Xt applications.
-
-nx-X11-1.3.2-1
-
-- Added some debug logs in programs/Xserver/xkb/ddxLoad.c. Function
-  XkbDDXCompileKeymapByNames is called by OpenOffice to read the
-  keyboard configuration whenever a drop-down menu is accessed. It
-  seem to always fail with the following error:
-
-  The XKEYBOARD keymap compiler (xkbcomp) reports:
-  > Error:            Can't find file "unknown" for geometry include
-  >                   Exiting
-  >                   Abandoning geometry file "default"
-
-- Opened the 1.3.2 development branch.
-
-nx-X11-1.3.1-12
-
-- Fixed a problem in xkb/ddxLoad.c on Solaris where Pclose was
-  always returning an error code despite the fact that command
-  was executed properly.
-
-nx-X11-1.3.1-11
-
-- Changed default GCC flags from '-O2 -fno-strength-reduce' to
-  -O3. No platform where NX is targeted is currently using a
-  GCC 2.x affected by the -fno-strength-reduce bug. Note also
-  that nxcomp is already compiled with -O3 since 1.1.1, so it
-  can be considered safe.
-
-nx-X11-1.3.1-10
-
-- Imported an updated fbcompose.c file from XFree86-4.3.99.902.
-  This fixes "uninitialized value" problems reported by Valgrind.
-
-- Fixed further buffer overflows by updating the following file
-  with recent versions coming from the XFree86-4.3.99.902 tree.
-
-  nx-X11/lib/font/fontfile/dirfile.c
-  nx-X11/lib/font/fontfile/encparse.c
-  nx-X11/lib/font/fontfile/fontfile.c
-
-- Fixed a possible buffer overflow in lib/font/FreeType/fttools.c.
-  Verified that the change is already in the XFree86 4.4.0 CVS.
-
-nx-X11-1.3.1-9
-
-- Fixed Xserver/Imakefile which was still referencing NXpixmap.o.
-
-nx-X11-1.3.1-8
-
-- Imported an updated fbgc.c from XFree86-4.3.99.902. This fixes
-  some minor problems reported by Valgrind.
-
-- A major problem was reported by Valgrind about reading after
-  the block allocated in fbCreatePixmap from AllocatePixmap. The
-  file pixmap.c has been modified so that 4 bytes are added to
-  the pixmap buffer at any new allocation. This quick hack should
-  solve the problem for both nxagent and the NXWin server. Further
-  investigation is planned for the next release.
-
-- Fixed Xtranssock.c to compile on Solaris where struct sigaction
-  doesn't have the sa_restorer member.
-
-nx-X11-1.3.1-5
-
-- Renamed the NX-sun.def configuration file to NX-Sun.def.
-
-- Renamed the non-standard NX_iPAQ_XServer and NX_Zaurus_XServer
-  symbols to NXiPAQXServer and NXZaurusXServer.
-
-- Added the missing sun.cf.XF86.original file in config/cf.
-
-- Added the missing empty file host.def.XF86.original in the
-  same directory.
-
-- Added initialization of sa.sa_mask when setting sigaction()
-  for SIGCHLD. The problem was reported by Valgrind running
-  nxagent.
-
-- Removed an unused block of code from WaitFor.c. The code had
-  been commented out in previous versions.
-
-- Removed the non-standard colon at the end of version in this
-  CHANGELOG.
-
-- Removed the spurious spaces in this CHANGELOG.
-
-nx-X11-1.3.1-4
-
-- Added a little workaround to the top Imakefile intended to
-  hide the makedepend warnings about non portable whitespaces
-  in sources.
-
-nx-X11-1.3.1-3
-
-- Fixed compilation problem with nxagent-1.3.1-13.
-
-nx-X11-1.3.1-2
-
-- Changes in NX-sun.def configuration file for Solaris to allow
-  compilation of the XKB extension. 
-
-nx-X11-1.3.1-1
-
-- Opened the 1.3.1 development branch.
-
-nx-X11-1.3.0-6
-
-- Original output buffer size in stock XFree86 is 2048. We try
-  to reduce context switches and help stream compression by
-  increasing the maximum size of the buffer 8192. _NXFlushSize
-  determines when the display buffer is actually flushed. It is
-  set by default to 4096 but agents should set it to 0 if they
-  want to disable early flush.
-
-- Added the _NXLostSequenceFunction function pointer to let NX
-  agents suppress the error message and modify the default Xlib
-  behaviour when out-of-order sequence numbers are received.
diff --git a/nx-X11/programs/Xserver/hw/nxagent/CHANGELOG b/nx-X11/programs/Xserver/hw/nxagent/CHANGELOG
deleted file mode 100644
index 0a82773f4..000000000
--- a/nx-X11/programs/Xserver/hw/nxagent/CHANGELOG
+++ /dev/null
@@ -1,6359 +0,0 @@
-ChangeLog:
-
-nxagent-3.5.0-9
-
-- Fixed an issue with cursor position set in XTest extension.
-
-nxagent-3.5.0-8
-
-- Fixed TR01J02646. Performance issues with cairo version 1.12.
-
-- Fixed TR01J02667. Changes to mouse sensitivity couldn't be forwarded
-  to NX client host although -noignore was among extra options.
-
-- Fixed TR05J02705. Agent ignore WarpPointer requests.
-
-- Fixed TR05J02706. Suspended sessions could not be recovered using
-  a client form a different version.
-
-- Fixed TR05J02703. Agent failed because of missing checks on source
-  drawables in the render code.
-
-nxagent-3.5.0-7
-
-- Fixed TR10I02622. Corrected function searching for icon file.
-
-nxagent-3.5.0-6
-
-- Fixed TR10I02621. Avoided explicit call to XMapWindow() at recon-
-  nection stage.
-
-- Fixed TR10I02620. Solved error in default visual set up.
-
-- Fixed TR10H02390. Get the actual remote key code for CapsLock and
-  NumLock.
-
-nxagent-3.5.0-5
-
-- The NX agent failed to resize its own window to fit the desktop size
-  in shadow sessions. TR07I02561 is now fixed also in shadow mode.
-
-nxagent-3.5.0-4
-
-- Fixed TR07I02530. Solved a buffer overflow occurring when the '-fp'
-  option value exceeds 1024 characters.
-
-- Extended list of the available screen geometries.
-
-nxagent-3.5.0-3
-
-- Fixed TR08I02572. Upgraded RandR extension to version 1.2.
-
-- Fixed TR07I02561. The NX agent failed to resize its own window to
-  fit the desktop size.
-
-nxagent-3.5.0-2
-
-- Fixed TR0502449. Initialized font server path even if font server
-  connection fails.
-
-nxagent-3.5.0-1
-
-- Opened the 3.5.0 branch based on nxagent-3.4.0-16.
-
-- Updated copyright to year 2009.
-
-- Fixed TR0302438. Added a check in function exporting property in
-  order to handle the case looking up an atom name returns a null
-  pointer.
-
-nxagent-3.4.0-16
-
-- Updated copyright to year 2011.
-
-nxagent-3.4.0-15
-
-- Added reference to fixed TR11H02405.
-
-nxagent-3.4.0-14
-
-- Reverted fix for TR03H02335 implemented in nxagent-3.4.0-6. The
-  emulation of right click by Control key + left click introduces
-  issues for some applications changing the reaction to the left click
-  depending on the state of Control key. Issue reported in TR03H02335
-  affects Apple laptop touchpads having a single button acting as
-  left button: on those devices the right button can be emulated by
-  a double-fingered tap (using two fingertips simultaneously).
-
-nxagent-3.4.0-13
-
-- Fixed TR12H02414. Exported property must be split if ChangeProperty
-  request exceeds 262140 bytes.
-
-- Reset AllScreens option at reconnection time if full screen mode
-  have to be automatically turned off.
-
-nxagent-3.4.0-12
-
-- If one of the two full screen modes is active ('one screen' or 'all
-  screens') both keystrokes Ctrl-Alt-F and Ctrl-Alt-Shift-F change the
-  mode back to 'windowed'.
-
-- Fixed TR11H02405. XRenderFreePicture is called only for pictures
-  that were actually created on the X server side.
-
-- Ctrl+Alt+f switch fullscreen to all monitors, while Ctrl+Alt+Shift+f
-  does it to one monitor only.
-
-- If the fullscreen option is enabled at the startup, session starts
-  in the fullscreen mode on all monitors.
-
-- Added a call to XReparentWindow in the nxagentSwitchAllScreens().
-
-- Corrected focus and grab when switching to fullscreen on
-  all monitors.
-
-- Removed a compile warning e deleted some unused variables.
-
-- Removed nxagentPointerAndKeyboardGrabbed variable. 
-
-- Use the override redirect attribute to switch to fullscreen to all
-  monitors instead of send _NET_WM_FULLSCREEN_MONITORS hint to the WM.
-
-- Added nxagentMinimizeFromFullScreen(), nxagentMaximizeToFullScreen()
-  and nxagentCreateIconWindow().
-
-- Removed check on EnterNotify to grab the keyboard in fullscreen
-  mode not only if mode is 'NotifyNormal'.
-
-nxagent-3.4.0-11
-
-- Corrected switching between viewport mode and resize mode.
-
-- Fixed TR04H02340. Keycode is correctly translated in shadow sessions
-  also if the remote X display is using evdev.
-
-nxagent-3.4.0-10
-
-- Handled XGrabKeyboard() return value.
-
-- Fixed TR10D01512. NumLock and CapsLock keys are now synchronized
-  between local and remote.
-
-nxagent-3.4.0-9
-
-- Fixed TR06H02362. No icon was swown in the task bar.
-
-- Fixed keyboard grab in fullscreen mode.
-
-- Fixed compiler warnings.
-
-nxagent-3.4.0-8
-
-- Grab the keyboard in fullscreen mode on EnterNotify only if mode is
-  'NotifyNormal'.
-
-- Yield control in the dispatch loop in case we stop the smart sche-
-  duler timer while waiting for a reply from the remote display.
-
-nxagent-3.4.0-7
-
-- Fixed TR08D01478. The communication with the compiz window manager
-  by means of the _NET_WM_PING property was not handled properly.
-
-- Fixed a type mismatch in XKB events on 64 bit platforms.
-
-- Moved grab/ungrab keyboard from focus in/out event to enter/leave
-  notify event.
-
-- Removed nxagentIconWindow because it's not longer used.
-
-nxagent-3.4.0-6
-
-- Fixed TR09F02102. Problem was with pointer buttons map.
-
-- Fixed TR02H02327. Some KeyRelease events was discarded.
-
-- Fixed up Num and Caps locks.
-
-- Fixed TR03H02335. Emulated right mouse button for Mac clients.
-
-- Added utilities to print info about internal and remote windows.
-
-- Fixed TR01F01995. Solved a picture resource leak by destroying remo-
-  te pictures only when their reference counter returns to zero.
-
-- Fixed TR04H02337. Errors occurred because pictures with no drawable
-  were handled badly.
-
-- Implemented handling nxagent's private for gradient pictures and so-
-  lid fill picture.
-
-- Fixed BadMatch condition check in function ProcRenderComposite.
-
-- Fixed nxagentComposite() to handle situations with source picture
-  drawable pointing to NULL.
-
-- Implemented render acceleration for requests:  CreateSolidFill,
-  CreateLinearGradient, CreateRadialGradient, CreateConicalGradient.
-
-- Fixed TR03G02196. Dialogs are shown to the fore when the NX session
-  is in fullscreen mode.
-
-- Changed mechanism to switch to fullscreen mode. Now the override
-  redirect attribute is no longer used and _NET_WM_STATE_FULLSCREEN
-  hint is sent to the WM.
-
-nxagent-3.4.0-5
-
-- Updated copyright to year 2010.
-
-nxagent-3.4.0-4
-
-- Fixed TR07F02090. Now XDMCP sessions start without problems.
-
-- Fixed TR08G02259. Corrected window border granularity of rootless
-  session at reconnection on 64 bit platforms.
-
-- Fixed TR11G02290. Forcing null timeout with queued events only if
-  display connection is up. This prevents the flood of session log.
-
-- Fixed TR10G02287. Now QueryTree's loop is aborted in case of failure
-  and session log isn't filled anymore with repeated warning messages.
-
-- Fixed TR01G02154. Corrected window placement when switching between
-  fullscreen and windowed mode.
-
-- Fixed TR09G02276. Now the agent does not receive unwanted characters
-  while interacting with the local window manager.
-
-- Implemented FR02G02174. Added ability to do large screen pans in
-  viewport mode through key combination Ctrl+Alt+Shift+Arrow.
-
-- Corrected parsing of the 'client' option when the client OS is Mac.
-
-nxagent-3.4.0-3
-
-- Fixed TR09G02271. The array containing the font name fields was not
-  correctly initialized for non-standard font names.
-
-nxagent-3.4.0-2
-
-- Updated copyright to year 2009.
-
-nxagent-3.4.0-1
-
-- Opened the 3.4.0 branch based on nxagent-3.3.0-19.
-
-- Changed the printed version number.
-
-nxagent-3.3.0-19
-
-- Fixed TR09G02266. A proper error message is printed in the session
-  log if the shadowing initialization fails because of a mismatch in
-  the visual class.
-
-- Added a workaround for X servers that doesn't return 1 among the
-  available depths.
-
-nxagent-3.3.0-18
-
-- The area to restore from the backing store is limited by the screen
-  size instead of the visible screen.
-
-nxagent-3.3.0-17
-
-- Fixed TR12F02150. The agent could crash when copying text from VNC
-  viewer. Fixed by aborting the procedure in case the retrieved pro-
-  perty has not a valid format.
-
-nxagent-3.3.0-16
-
-- Fixed TR07G02247. Don't try to call XSetWindowColormap() if the
-  window has no colormap, e.g. if its class is InputOnly.
-
-nxagent-3.3.0-15
-
-- Fixed TR04G02210. Region is cut to the visible screen before re-
-  storing areas from the backing store.
-
-- Fixed TR07G02246. Box is shrinked if bounds can't stay in a short
-  signed integer.
-
-nxagent-3.3.0-14
-
-- Fixed TR03G02206. waitpid() call was missing for the "Fonts replace-
-  ment" dialog type.
-
-- Fixed TR03G02195. Added a properties structure compatible with 32
-  and 64 bit platform types.
-
-nxagent-3.3.0-13
-
-- Handle the window unmap immediately. Don't add it to the configure
-  queue.
-
-nxagent-3.3.0-12
-
-- Fixed TR03G02200. Timestamps could be in the future in KeyRelease
-  events sent to the X clients.
-
-- Added debug logging of input devices state  Logging can be enabled
-  or disabled via the Ctrl+Alt+x shortcut. State info is dumped every
-  5 seconds.
-
-- Added Ctrl+Alt+y shortcut used to deactivate input devices grab for
-  debug purposes.
-
-nxagent-3.3.0-11
-
-- Changed the message logging the screen size changes, in order to
-  show the fullscreen state.
-
-- Handle the window unmapping in the nxagentConfigureWindow queue.
-
-nxagent-3.3.0-10
-
-- Fixed TR12F02146. Compare the drawable and the bitmap data before
-  realizing the image update, in order to delay the data clean up that
-  caused the memcmp() failure.
-
-- Fixed TR01G02156. Reduce the exposing area by subtracting the ex-
-  posed region.
-
-- Fixed a compile warning in Drawable.c.
-
-- Added detailed logs in the nxagentSynchronizeRegion() function if
-  the data memory allocation fails.
-
-nxagent-3.3.0-9
-
-- Added /usr/NX/share/base to alternate font paths. This would fix
-  TR11F02130 if fonts fixed and cursor are installed there.
-
-- Changed Keyboard initialization and reset. This change should fix
-  TR11F02129, TR11F02131, TR11F02132.
-
-nxagent-3.3.0-8
-
-- Fixed TR12F02144. Image bits of render glyphs are copied before they
-  are cleaned. This will avoid a memory corruption.
-
-- Fixed TR12F02145. When dispatching a MotionNotify event, check if a
-  top-level window has been entered before trying to show the pulldown
-  dialog.
-
-nxagent-3.3.0-7
-
-- Added debug code for pointer input.
-
-nxagent-3.3.0-6
-
-- Fixed compile warnings.
-
-nxagent-3.3.0-5
-
-- Disabled verbose logging in Rootless.c.
-
-nxagent-3.3.0-4
-
-- Fix the XKB map load in the case of 64 bit server.
-
-nxagent-3.3.0-3
-
-- Fixed TR10F02119. If the remote X display is using evdev keyboard
-  then copy maps from remote.
-
-- Upgraded VERSION to 3.3.0.
-
-nxagent-3.3.0-2
-
-- Fixed TR10F02115. Painting errors occurred when screen areas beyond
-  the current viewport became viewable in the NX Client for Windows.
-
-- Using a new struct type nxagentWMHints to avoid type mismatch on
-  64 bit platforms.
-
-- Added debug utilities for pointer input.
-
-nxagent-3.3.0-1
-
-- Opened the 3.3.0 branch based on nxagent-3.2.0-12.
-
-nxagent-3.2.0-12
-
-- Ignore 'resize' option at reconnection if viewport mode is on.
-
-- Fixed TR08E01814. Added shadow keymap initialization in order to
-  enable nxcompshad to translate keycodes across different layouts. 
-
-nxagent-3.2.0-11
-
-- Fixed TR08F02098. Function splitting font names has to be instruct-
-  ed to handle the right number of fields.
-
-nxagent-3.2.0-10
-
-- Extended fix for TR07F02091 to include font names having zero in
-  fields RESOLUTION_X and RESOLUTION_Y.
-
-nxagent-3.2.0-9
-
-- Fixed TR07F02091. Scalable fonts were not correctly listed among
-  available fonts.
-
-- Fixed TR06F02080. Use the corrupted area extents as maximum size of
-  the image data.
-
-nxagent-3.2.0-8
-
-- Fixed TR07F02082. The agent server could be unable to init core
-  keyboard on 64 bit systems.
-
-nxagent-3.2.0-7
-
-- Imported patch fixing issues from  X.Org security advisory, June
-  11th, 2008: Multiple vulnerabilities in X server extensions. CVE
-  IDs: CVE-2008-1377, CVE-2008-1379, CVE-2008-2360, CVE-2008-2361,
-  CVE-2008-2362.
-
-nxagent-3.2.0-6
-
-- Fixed TR05F02063. Ignore ReparentNotify events for non-rootless
-  sessions.
-
-- Fixed TR06F02068. Try to pack images only if format is ZPixmap.
-
-- Don't require reparent on close of NX window.
-
-nxagent-3.2.0-5
-
-- Fixed TR04F02044. Restored the original MakeRootTile() function in
-  order to create the root window background pixmap.
-
-- Fixed TR04F02041. Gnome panels stayed on top of the NX session win-
-  dow with desktops running Compiz. This fix provides a solution for
-  the Fullscreen mode.
-
-- Improved for the shadow session the handling of master session win-
-  dow resize.
-
-nxagent-3.2.0-4
-
-- Fixed TR10D01535. The agent window is not minimized anymore when
-  pointer leaves.
-
-- Changes aimed to avoid possible type mismatch in XDisplay struct
-  on 64 bit architectures.
-
-nxagent-3.2.0-3
-
-- Fixed a build issue on Solaris.
-
-nxagent-3.2.0-2
-
-- Code clean up. Moved a variable definition to the beginnning of a
-  block.
-
-nxagent-3.2.0-1
-
-- Opened the 3.2.0 branch based on nxagent-3.1.0-9.
-
-nxagent-3.1.0-9
-
-- Fixed TR03F02025. German umlauts couldn't be pasted into a remote
-  Windows application. Now also the UTF8_STRING target is available
-  for ConvertSelection requests.
-
-- Fixed TR03F02031. Moved SetScreenSaverTimer() call in order to avoid
-  undesired reset of the auto-disconnect timeout when a screen saver
-  turns on.
-
-nxagent-3.1.0-8
-
-- Added reference to fixed TR02F02007 and TR07E01762 in the CHANGELOG.
-
-- Set the GC trap before calling fbPolySegment.
-
-- Fixed TR09E01863. A flag is set if a resource has been added or fre-
-  ed and it is checked in FindClientResourcesByType().
-
-- Added void entries to nxagentRequestLiteral vector in order to avoid
-  a wrong string is printed to the output for NoOperation request.
-
-- Fixed TR11E01948. Now keyboard status is initialized again after
-  the NX session is reconnected. This avoids CAPS LOCK and NUM LOCK
-  synchronization problems.
-
-- Added nxagentXkbCapsTrap and nxagentXkbNumTrap to avoid CAPS LOCK
-  and NUM LOCK synchronization problems when CAPS LOCK or NUM LOCK is
-  the first key to be pressed in the NX session.
-
-- Corrected subSize variable initialization in nxagentRealizeImage().
-
-- Fixed various memory leaks.
-
-- Fixed TR11E01950. Copy and paste via edit menu didn't work for some
-  applications.
-
-- Corrected property type in nxagentRequestSelection(). Some external
-  applications didn't enable their paste button when nxagent was the
-  owner of the CLIPBOARD selection.
-
-- Added struct to save values queried by XQueryExtension for XFixes
-  extension.
-
-nxagent-3.1.0-7
-
-- Imported patch fixing issues from  X.Org security advisory, January
-  17th, 2008: Multiple vulnerabilities in the X server.  CVE IDs:
-  CVE-2007-5760    CVE-2007-5958    CVE-2007-6427   CVE-2007-6428
-  CVE-2007-6429    CVE-2008-0006.
-
-- Fixed TR02F02007. Handled the case if nxagentCreateDrawableBitmap()
-  fails to create the pixmap intended to store the bitmap data.
-
-nxagent-3.1.0-6
-
-- Fixed a compile warning in Args.c.
-
-- The synchronization loop breaks if the drawable is clean when it's
-  not supposed to be.
-
-- Fixed TR12E01966. Emacs tooltips were not displayed properly. Added
-  a check on the event mask before calling miWindowExposures().
-
-- Fixed TR01F01982. ConfigureNotify warning is printed in verbose mode
-  only.
-
-nxagent-3.1.0-5
-
-- Moved some variable definitions placed in ProcGetProperty().
-
-nxagent-3.1.0-4
-
-- Fixed TR06D01397. The problem was: drag & drop operations between
-  windows of Java applications didn't work in NX Client for Windows.
-
-- Implemented FR12E01957. Added a limit to the amount of data that can
-  be pasted from an NX session into an external application. The new
-  option - named 'copysize' - can be read from the 'options' file.
-
-nxagent-3.1.0-3
-
-- Fixed TR12E01963. The window tree is revalidated explicitly after
-  recomputing the root window clip regions.
-
-nxagent-3.1.0-2
-
-- Fixed TR11E01946. Forcing exposures on regions saved in the backing
-  store could bring to unexpected results.
-
-- Fixed TR11E01928. Animated cursors were not properly disconnected
-  and reconnected.
-
-nxagent-3.1.0-1
-
-- Opened the 3.1.0 branch based on nxagent-3.0.0-93.
-
-nxagent-3.0.0-93
-
-- Fixed TR10E01913. Now bell settings are restored after the agent
-  reconnects.
-
-nxagent-3.0.0-92
-
-- Fixed a compilation error on 64 bit platforms.
-
-nxagent-3.0.0-91
-
-- Checked the window synchronization status before subtracting an ex-
-  posed area from the corrupted region.
-
-nxagent-3.0.0-90
-
-- Fixed TR11E01932. In case of rootless session displayed by NXWin X
-  server, synthetic ConfigureNotify events are generated by the X11
-  agent. This helps to correct menu navigation in Java 1.6.0.
-
-- Fixed the handling of 'client' parameter.
-
-- Fixed bad refreshes in viewport navigation in the case of Windows
-  client.
-
-- Fixed TR11E01930. If the defer level is set by means of the command
-  line, the DeferLevel option is not reset while resuming the session.
-
-- Fixed TR07E01762. Problem in comparison of font names.
-
-- Printed the new geometry in the session log when the agent screen is
-  resized.
-
-nxagent-3.0.0-89
-
-- Fixed TR10E01919. The agent could crash in the routine in charge of
-  find a replacement for a missing font.
-
-- Removed an unuseful log message.
-
-nxagent-3.0.0-88
-
-- Fixed TR10D01539. Some XKEYBOARD requests are disabled if the option
-  'keyboard' has value 'query'. This locks the initial keyboard map.
-  Enabling/disabling of XKEYBOARD requests is done at run time.
-
-- Added -noxkblock command line option enabling the XKEYBOARD requests
-  even if the option 'keyboard' value is 'query'.
-
-nxagent-3.0.0-87
-
-- Reworked the handling of CT_PIXMAP client clips. Clips are always
-  converted in regions for internal use, while bitmap are saved for
-  operations involving the remote X.
-
-nxagent-3.0.0-86
-
-- Fixed TR07E01749. Now using different resolution between shadow
-  and master session with shadow display option 'As on the server'
-  doesn't display black borders.
-
-- Fixed TR09E01852. The GC clips of type CT_PIXMAP are not converted
-  in regions. This avoids generating regions made up by thousands of
-  rectangles. Backing store function SetClipmaskRgn is implemented by
-  a stub doing nothing.
-
-nxagent-3.0.0-85
-
-- Fixed TR08E01841. Exposed are forced to new areas exposed by the
-  viewport.
-
-- Fixed TR02E01645. Remote exposures was blocked if the NX client was
-  running on Linux without window manager.
-
-- Even if the agent window is fully obscured, synchronization is not
-  skipped if the Composite extension of the remote display is in use.
-
-- Fixed TR08E01851. Exposures events have to be internally generated
-  for regions that can't be restored because the backing pixmap is
-  corrupted.
-
-- Fixed TR08E01847. The initial values of store used to save XChangeGC
-  calls are set to the default GC values.
-
-- When a drawable becomes synchronized, its outdated bitmap is destro-
-  yed.
-
-- If a pixmap is not fully synchronized after a synchronization loop
-  it is cleared, just like windows.
-
-- Solved a problem causing some pixmaps to remain among the corrup-
-  ted resources even if they were synchronized.
-
-nxagent-3.0.0-84
-
-- Renamed Misc.h as Utils.h to solve name clashes on Windows platform.
-
-nxagent-3.0.0-83
-
-- Changes to include correctly declaration of _XDisplay structure on
-  64 bit platforms. Further tests are needed to confirm that it fixes
-  TR08E01824.
-
-nxagent-3.0.0-82
-
-- Fixed TR08E01821. Changed nxagentAddItemBSPixmapList() to check if
-  the pixmap item has already an entry in the list before adding it.
-
-- Fixed TR07E01795. Sun Studio main window showed only its grey back-
-  ground. Changed clipboard events handling to let the agent notify
-  a failure in converting selection.
-
-nxagent-3.0.0-81
-
-- Based on nxagent-3.0.0-78.
-
-- The agent options are saved before reopening the display in the
-  reconnection procedure. If the new initialization fails the backup
-  values of options are restored.
-
-- Keyboard device info are saved before the keyboard reset occuring
-  in the reconnection procedure. If the new initialization of the
-  keyboard fails, the old values are restored.
-
-- The initialization procedure of keyboard device returns with error
-  if it fails to retrieve the keyboard mapping information from the
-  remote display.
-
-- The reconnection fails if the default depth of the new display is
-  different from the previous one.
-
-- The session can be migrated if the visuals don't match for color
-  masks swapping. At the moment there are no conversions to line up
-  the RGB masks, so even if the session can be migrated, incorrect
-  colors may be shown.
-
-nxagent-3.0.0-80
-
-- The agent options are saved before reopening the display in the
-  reconnection procedure. If the new initialization fails the backup
-  values of options are restored.
-
-- The flag storing that a SIGHUP has been received is reset if the
-  function reconnecting the session fails.
-
-nxagent-3.0.0-79
-
-- Changed the SIGHUP handler not to ignore the signal if the state
-  is SESSION_GOING_UP or SESSION_GOING_DOWN.
-
-- Keyboard device info are saved before the keybord reset occuring
-  in the reconnection procedure. If the new initialization of the
-  keyboard fails, the old values are restored.
-
-- The initialization procedure of keyboard device returns with error
-  if it fails to retrieve the keyboard mapping information from the
-  remote display.
-
-- The reconnection fails if the default depth of the new display is
-  different from the previous one.
-
-- The session can be migrated if the visuals don't match for color
-  masks swapping. At the moment there are no conversions to line up
-  the RGB masks, so even if the session can be migrated, incorrect
-  colors may be shown.
-
-nxagent-3.0.0-78
-
-- Fixed TR07E01747. Fixed warnings occuring when compiling for AMD64.
-
-- Fixed TR07E01753. NoMachine WM icon in the title bar is displayed
-  correctly.
-
-- Fixed TR03E01656. If client and server endianess didn't match, glyph
-  images bits have to be only temporarily swapped.
-
-- Fixed TR07E01746. Terminate the shadow agent if the option 'shadow'
-  is empty.
-
-- Added option '-verbose'. It enables the printing of errors received
-  by the agent from the remote X server.
-
-- Warnings related to missing fonts are printed only if verbose mode
-  is enabled.
-
-- Disabled a log message related to the use of Composite extension.
-
-nxagent-3.0.0-77
-
-- The pixmap formats are initialized without taking care of which are
-  supported on the remote display.
-
-- Removed the check for pixmap format compatibility when migrating the
-  session to a new display.
-
-- Fixed TR06E01725. A minimum set of available picture formats is
-  used to ensure a wide migration from/to different displays.
-
-- The PictFormat structures used by nxagent are no longer filtered
-  with the ones available on the real display.
-
-- The background pixmaps are cleared while reconnecting in order to
-  make them usable.
-
-- Fixed TR01E01619. Changed the RandR implementation to return a re-
-  fresh rate other than zero.
-
-nxagent-3.0.0-76
-
-- Changed the keystroke to force the drawable's synchronization to
-  CTRL-ALT-J.
-
-nxagent-3.0.0-75
-
-- If the backing store tries to restore areas from a corrupted pixmap,
-  such areas are subtracted from the saved region, so that exposures
-  will be sent for them.
-
-nxagent-3.0.0-74
-
-- Don't skip the synchronization when there are more clients ready.
-  This temporarily solves the synchronization problems observed in
-  the previous versions if one or more clients kept the agent busy.
-
-nxagent-3.0.0-73
-
-- If the PolyFillRect() uses a FillStippled or a FillOpaqueStippled
-  fill style and the destination is corrupted, the area affected by
-  the operation is first synchronized.
-
-nxagent-3.0.0-72
-
-- Fixed the bug affecting the position of the input window when a
-  session was migrated to a linux X server with no window manager
-  running.
-
-- The color used to fill the corrupted backgrounds is converted de-
-  pending on the depth of remote X server.
-
-- The PolyFillRect() does not clean the corrupted destination region
-  if a stipple pixmap is used as mask. This solution is adopted to
-  reduce the region fragmentation and to solve the text drawing pro-
-  blems affecting rdesktop.
-
-nxagent-3.0.0-71
-
-- Force a flush of the display buffer if the coalescence timeout is
-  expired. Set the timeout according to the link type, from 0 to 50
-  ms for link MODEM.
-
-- In nxagentRealizeImage() the width in byte is computed newly if
-  the image has been scaled.
-
-- The shadow agent clips the screen updates in tile only if the link
-  type is MODEM or ISDN.
-
-- Split the abort conditions in the synchronization loop to check
-  separately the congestion and the blocking status.
-
-- Implemented a workaround in order to avoid graphical problems with
-  render composite operations on Xfree86 remote server.
-
-nxagent-3.0.0-70
-
-- Various adjustments aimed at using the best defer rules depending
-  on the congestion state.
-
-- Fixed a problem with icons of message boxes in shadow sessions.
-
-- Changed the log message printed when the shadow agent can't connect
-  to the master session.
-
-- If Composite is in use, don't skip the PutImage and CopyArea opera-
-  tions even if the agent window is fully obscured.
-
-nxagent-3.0.0-69
-
-- The option -nodamage prevents the shadow agent from using the damage
-  extension.
-
-- Changed the scaling feature to set the byte order of the source
-  image according to the local endianess.
-
-- Changed the scaling feature in order to handle different ratios for
-  horizontal and vertical sizes.
-
-- Force the shadow sessions to be non-persistent.
-
-- When a pixmap background is synchronized, an expose is sent to its
-  owners.
-
-nxagent-3.0.0-68
-
-- Changed the type of parameters passed to nxagentRootlessRestack in
-  order to be compliant with Xlib types on 64 bit platfors.
-
-- The nxagentCompositeRects() checks for the render operation type to
-  determine if the corrupted destination region must be cleared.
-
-nxagent-3.0.0-67
-
-- Fixed a condition discarding the expose events received from the X
-  server.
-
-nxagent-3.0.0-66
-
-- The corrupted resources are removed when a session suspends, and are
-  reallocated only at reconnection. This is aimed at avoiding synchro-
-  nization loops when the link is down.
-
-nxagent-3.0.0-65
-
-- Initialize for now the tile size at 64x64 in shadow mode.
-
-- The height and width of the tiles used for synchronizing drawables
-  are set without overriding command line option 'tile'.
-
-- Avoid calling miWindowExposures() for empty regions.
-
-- Fixed a bug while clearing corrupted regions with window exposures.
-
-- The corrupted drawable counters are not reset if there are bitmaps
-  to synchronize.
-
-nxagent-3.0.0-64
-
-- The synchronization bitmap is used only when requesting a full
-  drawable synchronization, otherwise the frame-buffer is used as
-  source.
-
-- Fixed some bugs in the synchronization loop.
-
-- Removed the remaining debug output.
-
-nxagent-3.0.0-63
-
-- Don't start the synchronization loop if the wakeup handler found
-  some clients ready.
-
-- Don't flush the display buffers if the synchronization was inter-
-  rupted and there are more drawables to synchronize.
-
-- Changed the backing store functions to not save the obscured areas
-  which are inside the corrupted region of a window.
-
-- Added the code to send the XClearArea() commands in shadow mode at
-  the end of the synchronization loop. In this way large images are
-  still split in tiles but, on fast links, the final result can made
-  visible all at once.
-
-- Modified the corrupted drawable counters to only report the number
-  of resources needing synchronization. This allows the block hand-
-  ler to avoid spinning through the synchronization loop if there is
-  nothing to do.
-
-- On a window exposure remove the corrupted region of the destinat-
-  ion window.
-
-- For testing purposes, the pixmap synchronization loop starts only
-  if there are corrupted backgrounds.
-
-nxagent-3.0.0-62
-
-- The image scaling is applied only if the destination drawable is the
-  pixmap shadowing the frame buffer of the master session.
-
-- The shadow agent exits with a fatal error if it can't connect to the
-  master session.
-
-nxagent-3.0.0-61
-
-- Forward the SIGCHLD to the NX transport instead of letting the NX
-  transport forward the signal to us. This allows the agent to set
-  and replace the signal handler at any time, without having to ta-
-  ke care of the state of the NX transport.
-
-- Improved the synchronization loop by implementing a simple round-
-  robin mechanism between the resources needing synchronization.
-
-nxagent-3.0.0-60
-
-- Use a new set of functions to install, post-install and reset the
-  signal handlers.
-
-- Reset the signal handlers to their initial state after a display
-  failure, as part of the disconnection procedure.
-
-- Don't set SA_RESTART in the sigaction flags. Make the signal int-
-  errupt the system call.
-
-- Terminate all the running dialogs before exiting.
-
-nxagent-3.0.0-59
-
-- Use the value of nxagentCongestion in nxagentUserInput() instead
-  of calling NXDisplayCongestion().
-
-nxagent-3.0.0-58
-
-- The clip mask of the scratch GC used by nxagentDeferCopyArea() is
-  reset before releasing the GC.
-
-- The MotionNotify event can now break the synchronization loop.
-
-- In the case of shadow sessions, if synchronization aborts then the
-  remaining data to synchronize are not stored in a bitmap.
-
-- If a table rebuild occurs in a loop searching for resources, the
-  loop restarts from beginning not to use the out of date table.
-
-nxagent-3.0.0-57
-
-- The synchronization bitmap is created only if the corrupted area
-  of the source drawable is visible.
-
-- The synchronization loop skips the last synchronizing drawable to
-  give a chance to the next resources to be synchronized.
-
-- Removed the session starting infos concerning the mismatching ver-
-  sions of render and the window manager detection.
-
-- Split the gliph lists in Render.c only if the symbol SPLIT_GLYPH_-
-  LISTS is defined.
-
-- Read again the events in the block handler after the flush.
-
-- The nxagentCongestion variable is now a value ranging from 0 to 9,
-  not a boolean flag.
-
-- Added some experimental code dynamically reducing the size of the
-  display output buffer when the agent is blocking for write.
-
-nxagent-3.0.0-56
-
-- The synchronization loop is now aborted when a short timeout exp-
-  ires. If the drawable synchronization cannot be completed, the
-  remaining data is stored in a bitmap. The synchronization loop is
-  then restarted using the data from the bitmap, instead of pulling
-  the latest image from the framebuffer. This allows the agent to
-  show a complete frame when displaying videos and animations, while
-  at the same time giving a chance to the clients to update the
-  screen in background. When an image from the saved bitmap is put
-  on the remote display, the image is compared with the actual data
-  in the framebuffer. If the two bitmaps match, the corresponding
-  region of the drawable is marked as synchronized, otherwise the
-  drawable remains dirty and will be synchronized at the next loop
-  using the new data taken from the framebuffer.
-
-- If the smart schedules is enabled, let the dispatcher decide when
-  it is time to yield and process the next client.
-
-nxagent-3.0.0-55
-
-- Disable the smart scheduler in the case of shadow sessions.
-
-- If the smart scheduler is enabled, stop the timer before returning
-  from the block handler. WaitForSomething() sets a zero timeout if
-  there are clients with input but doesn't stop the timer. The select
-  is then interrupted to update the schedule time even if, what the
-  dispatcher cares, is only the ticks count at the time the client
-  is scheduled in.
-
-- Fixed a compilation warning in NXresource.c.
-
-- The main window of the shadow agent is mapped in nxagentMapDefault-
-  Windows, like for non shadow agents, if the remote display has no
-  window manager running. This avoids a flickering effect on the !M
-  logo having place if the shadow session was displayed from a Wind-
-  ows client.
-
-- Some code related to the use of the Composite extension is not built
-  in the agent being not necessary anymore.
-
-nxagent-3.0.0-54
-
-- Get SmartScheduleStopTimer() from dixstruct.h.
-
-- Updated the NoMachine icon file.
-
-nxagent-3.0.0-53
-
-- Changed the message 'NXAGENT: Fatal IO error on display' into 'Info:
-  Disconnected from display'.
-
-- Fix a problem occurring when the FindClientResourcesByType() needs
-  to reallocate the resource table.
-
-- The popup window synchronization breaks if an user input is caught.
-
-- Implemented FR05E01712. The stderr and stdin are redirected to the
-  'clients' file in the session directory.
-
-- The nxagentRealizeImage function does nothing if the agent is not
-  connected to the display.
-
-- Removed the code implementing the redraws of the viewport frame.
-  Such code is not needed because is't enough for the agent to handle
-  the expose event received from the X server.
-
-nxagent-3.0.0-52
-
-- Where it is necessary to wrap the function PaintWindowBackground,
-  the original function pointer is saved and restored afterwards. This
-  let other code wrapping that function (e.g. the damage extension) to
-  work correctly.
-
-- If the agent works in shadow mode, the defer parameters are ignored.
-
-nxagent-3.0.0-51
-
-- Use the smart scheduler on platforms where it is enabled.
-
-- Check ClientsWithInput in the wakeup handler and update the number
-  of clients ready if any descriptor is set.
-
-nxagent-3.0.0-50
-
-- Fixed TR05E01714. Changed VisibilityNotify event so that it forces
-  a refresh on the root window, but only if on the agent Composite is
-  enabled and its window moves from a VisibilityFullyObscured to ano-
-  ther state.
-
-- Grant the availability of core fonts in master sessions also after
-  the disconnection. This makes possible to start new clients inside
-  a shadow sessions while the master is down.
-
-- Changed nxagentGlyphs() to send a single glyph list per request.
-
-- Major rewrite of the agent dispatch handler.
-
-- Some name changes to the functions handling the session states.
-
-nxagent-3.0.0-49
-
-- Made the dispatch loop yield control to a different client after a
-  fair amount of time even if the current client doesn't produce any
-  output.
-
-nxagent-3.0.0-48
-
-- Modified the message in the suspend dialog to say 'Disconnect' in
-  place of 'Suspend'.
-
-- Added macros in Pixels.h to determine the behavior of the lazy en-
-  coding.
-
-- Changed the copyright attribution from Medialogic to NoMachine.
-
-- Reset all options to their defaults before processing the session
-  arguments. This fixes the problem with the DeferLevel option not
-  being set at reconnection.
-
-nxagent-3.0.0-47
-
-- Initialized the arguments of NXGetControlParameters(), NXGetShmem-
-  Parameters() and NXGetUnpackParameters() to end up with valid data
-  also in the case of a display failure.
-
-- Converted the coordinates in the X_PolyFill requests to relative
-  mode. This makes all the requests independent from the origin and
-  helps the caching by the proxy.
-
-nxagent-3.0.0-46
-
-- Don't print the 'Display failure' message on a SIGTERM.
-
-- Ensure that the NX transport is shut down after the 'Terminating
-  session at...' message if the session is killed by the user.
-
-- Let the agent filter the error output by setting the OsVendorVEr-
-  rorFProc function pointer.
-
-- Give the possibility to the agent to redirect the standard error
-  during a Popen() or a System() by setting the OsVendorStartRedir-
-  ectErrorFProc and OsVendorEndRedirectErrorFProc function pointers.
-
-- Fixed a problem in nxagentPolyFillRect() not properly propagating
-  to the destination.
-
-- Added nxagentPolyFillRect() and nxagentGlyphs() among the funct-
-  ions increasing the pixmaps usage counter.
-
-- Cleaned up some of the FIXME related to the lazy encoding.
-
-nxagent-3.0.0-45
-
-- Use the three distinct functions in nxcompext to query the state
-  of the display connection.
-
-- Terminate gracefully on a fatal server error by printing the fol-
-  lowing in the session log:
-
-  Error: Aborting session with 'Error text...'.
-  Session: Aborting session at '...'.
-  Session: Session aborted at '...'.
-
-- Removed more debug messages from the session log.
-
-nxagent-3.0.0-44
-
-- Guess whether to compress an image with a lossless encoder based
-  also on the width and height, not only on size.
-
-- Corrupted pixmaps used as tiles propagate the dirty area when they
-  are involved in a PolyFillRect() operation.
-
-- On link settings ADSL to LAN, images are not split in tiles to bet-
-  ter fill all the available bandwidth.
-
-- Pixmaps referenced often as source in deferred operations or used
-  as backgrounds, are now synchronized as long as when the network
-  congestion level remains 0.
-
-- Use nxagentPaintWindowBorder() to update the window's border in
-  the framebuffer.
-
-- Fixed a problem with the new handling of the X_RenderChangePicture
-  requests that caused the text to be erroneously clipped.
-
-nxagent-3.0.0-43
-
-- Don't pass the uid of the shared memory segment to the nxcompshad
-  library if it can't be retrieved from the options.
-
-- Fixed the new handling of the RenderChangePicture requests to work
-  on 64 bit platforms.
-
-nxagent-3.0.0-42
-
-- Added support for the 'lossy', 'lossless' and 'adaptive' pack me-
-  thod literals. These values activate the dynamic selection of the
-  pack method by the agent.
-
-- Use the newer constant PACK_NONE instead of NO_PACK.
-
-nxagent-3.0.0-41
-
-- Fixed a bug in the disconnection procedure introduced with the new
-  handling of the display events.
-
-- Realize the XRenderChangePicture() request only if a change of the
-  remote picture's attributes is detected.
-
-nxagent-3.0.0-40
-
-- Dynamically select a lossy or a lossless encoder based on the num-
-  ber of pixels that appear to be different in the image.
-
-- Use the new PACK_BITMAP_16M_COLORS image encoding. Handle the case
-  when the packed image data points at the same data as the original
-  image. This is useful to save a copy.
-
-- The PACK_BITMAP_16M_COLORS method is now the default for lossless
-  encoding.
-
-- Don't use compression for the alpha channel. This is also intended
-  to better leverage the stream compression.
-
-nxagent-3.0.0-39
-
-- The nxagentComposite() function doesn't check the source and mask
-  synchronization status, but defers the XRenderComposite() operation
-  by checking the defer level only.
-
-- If the target of an XCompositeText() function is an hidden window,
-  the operation is prevented.
-
-- Passing the uid of master X server process to nxcompshad library.
-
-- Before the call of XRenderAddGlyphs(), call the new library function
-  XRenderCleanGlyphs() cleaning the padding bytes of data section of
-  request.
-
-nxagent-3.0.0-38
-
-- Don't warp the cursor if the requesting client is a shadow agent.
-
-- Changed a call to NXFlushDisplay in order to align to nxcomp version
-  3.0.0-15.
-
-- Updated the NoMachine icon file.
-
-- Changed Agent.h in order to include NX version of Xlib.h avoiding
-  missing declarations.
-
-- If the NXDisplayCongestion notifies an optimum congestion state,
-  the continuous user input, due to unreleased buttons/keys, doesn't
-  break the drawable's synchronization.
-
-- Renamed the option 'block' as 'tile'.
-
-- Implemented a way to guess if the destination drawable of a copy
-  area is a popup window. In such a case, the source is synchronized
-  before doing the copy to avoid ugly effects like text items floating
-  on an invisible background.
-
-- In order to reduce the number of clip mask changings, if the clean
-  region of a corrupted source drawable is formed by a single rectan-
-  gle, its coordinates are used to change extents and position of the
-  area involved in the copy area operation.
-
-- Fixed a crash caused by a reference to a resource table freed by a
-  table rebuilding. This was happening because during the pixmap re-
-  connection some new GC resources went beyond the resource table li-
-  mit, causing a table relocation. As a general rule, a function loop-
-  ing across a resource table should not add or remove resources.
-
-nxagent-3.0.0-37
-
-- To improve the efficiency of the algorithm deferring the trapezoid
-  operations, the composite does not propagate the glyphs flag to
-  the destination.
-
-- Moved the replacement of XCheckIfEvent() to nx-X11 with the name
-  XCheckIfEventNoFlush().
-
-nxagent-3.0.0-36
-
-- Changed nxagentDisplayFlushHandler() according to the new semantic
-  of the handler. The function is called by nxcomp when new data is
-  sent to the remote proxy.
-
-- After the flush handler is called, use NXQueryDisplay() with query
-  type NXDisplayCongestion to update the congestion flag.
-
-- Modified the boxes list defragmentation to merge only those rectan-
-  gles which fully overlap.
-
-- During the synchronization loop the nxagentDispatchHandler() takes
-  care of reading the enqueued events, while the nxagentUserInput()
-  checks only for state changes due to a processed key/button event.
-
-- Set the display output buffer size according to the link type.
-
-- Removed the congestion and synchronization callbacks.
-
-nxagent-3.0.0-35
-
-- In order to avoid the lossy encoding of text regions, the nxagent-
-  GlyphsExtents is computed even if the mask format is not specified.
-  In this case, the render implementation was not calculating the ex-
-  tents of composite text operation, whose coordinates are useful only
-  to build a mask pixmap.
-
-nxagent-3.0.0-34
-
-- Removed message 'Could not init font path element' from the output.
-
-- Moved initialization of picture support before the call to miDCInit-
-  ialize in the screen opening procedure. This is because miDCInitial-
-  ize calls DamageSetup that wraps the picture screen functions.
-
-- Implemented FR05E01686. Added option 'menu' enabling/disabling the
-  pulldown menu in the rootless agent.
-
-- Added a flag to each drawable to record if they have been the dest-
-  ination of a glyph operation. This is used to skip the deferral of
-  some operations (e.g. render trapezoids) if they can cause the
-  drawable to be synchronized using a lossy encoding.
-
-- The render trapezoids are deferred if the operation falls inside
-  a dirty region or if the destination drawable does not contain
-  glyphs.
-
-- Imported the NXmitrap.c file from render directory.
-
-- Improved the algorithm queuing multiple writes across a proxy
-  flush.
-
-nxagent-3.0.0-33
-
-- Read the event queue after each request processed. Doing this
-  is expensive but it seems to work best.
-
-- Don't split the big trapezoid requests. Splitting the requests
-  doesn't seem to provide any benefit with the clients tested.
-
-- By defining BLOCKS in Handlers.c, Events.c and NXdispatch.c, log
-  the begin and end of the most sensitive routines.
-
-nxagent-3.0.0-32
-
-- Use NXSetDisplayWriteHandler() to register a callback invoked
-  by Xlib after some data is written to the display socket. This
-  callback allows the agent to better determine when it is time
-  to send the sync requests.
-
-nxagent-3.0.0-31
-
-- The operation of adding glyphs to remote glyphset has been defer-
-  red, in order to avoid to add unused glyphs. When a composite text
-  operation looks for a certain glyph, if it has not been added to
-  the selected glyphset, an XRenderAddglyphs is requested.
-
-- The forced synchronization timeout is now dependant on link type.
-
-- Force the mi to process the events just after having processed
-  any input.
-
-- Added an experimental 'hard' sync request intended to wait for
-  the X server to complete an image operation. This also affects
-  the agent only when the NX transport is not running.
-
-- Added a synchronization mechanism intended to let the agent de-
-  tect if the X server is not able to process its input when the
-  NX transport is not activated. The algorithm uses asynchronous
-  X_GetInputFocus replies to minimize the impact of latency on
-  slow connections. A new request is sent at any given amount of
-  bytes read from our clients. When the number of pending replies
-  is exceeded, the agent stops accepting additional requests and
-  waits for the remote until the number of pending replies returns
-  below the limit. Note that when the NX transport is running, the
-  algorithm is disabled to not interfere with the proxy's own
-  token-based flow control.
-
-- Added the nxagentDispatchHandler() function. It is called by the
-  dispatcher after a client's request has been processed.
-
-- Added the nxagentWaitEvents() function. It blocks waiting for
-  more input with an optional timeout. It handles the case when
-  the NX transport is not running and is able to recover gracely
-  from a display failure by returning the error.
-
-- Replaced most of the code that was relying on NXTransContinue()
-  to use the new function.
-
-- Moved the new event-related functions to Events.h and Events.c.
-
-- Disabled the code raising the splash screen at reconnection.
-
-- Reverted change done in 3.0.0-8 version, dealing with expose events
-  not having entries in the queue. They are not collected in a global
-  region but sent immediately.
-
-nxagent-3.0.0-30
-
-- Let the block handler check if there are events queued after the
-  flush before entering the select.
-
-- Changed the dispatch loop to read the incoming events more often.
-
-- Added the nxagentReadEvents() and nxagentCheckEvents() functions.
-  Differently from XCheckIfEvent(), nxagentCheckEvents() doesn't
-  flush the output buffer if no event is available. nxagentReadEv-
-  ents(), instead, it's like XEventsQueued() but forces the use of
-  the QueuedAfterReading mode. These functions should be used when-
-  ever XEventsQueued() and XCheckIfEvent() would be required.
-
-- The nxagentQueuedEvents() macro uses XQLength() to return the
-  number of events that have been read and need to be dispatched.
-
-- The nxagentPendingEvents() function returns true if there is any
-  event queued. If not, it queries the transport to find if more
-  events can be read.
-
-- Ripristinated the code preventing the agent to connect to its own
-  display. The code was disabled while migrating to the new tree.
-
-- Removed the dependencies from the NXAGENT_QUERYBSIZE, NXAGENT_NO-
-  EXPOSEOPTIMIZE and NXAGENT_ONEXIT. Removed the unused code.
-
-- Removed more unused code in Clipboard.c.
-
-- The shadow agent calls NXShadowDestroy before exiting.
-
-- Reverted a change done in 3.0.0-8 dealing with expose events. If the
-  result of the subtraction is not sent immediately, some duplicated
-  refresh is shown.
-
-nxagent-3.0.0-29
-
-- The splash screen is removed as soon as the session is started in
-  the case of shadow session.
-
-- The rules to verify when the synchronization loop can be stopped
-  are specified by means of a bitmask passed as parameter to synch-
-  ronization functions.
-
-- The glyphsets are no longer reconnected during a session resuming,
-  but only when they are used.
-
-- Initialized the timeout parameter in block handlers in case of NULL
-  value.
-
-- Added option 'block' to specify the size of image slices sent during
-  the synchronization.
-
-- Fixed a memory leak in nxagentParseOptions().
-
-nxagent-3.0.0-28
-
-- Improved the nxagentGetOptimizedRegionBoxes() function to optimize
-  the high fragmented rectangle lists.
-
-- When resizing nxagent window the fictitious resize for all top level
-  windows, triggering the window tree validation, is not executed if
-  rootless mode is off.
-
-- The nxagentInputWindows cannot be resized in rootless mode because
-  they are not created.
-
-- Added NXdamage.c to the source files.
-
-- Changed damage's GCOps functions drawing text. This was needed be-
-  cause the original functions didn't call agent GCOps if the drawable
-  was registered for damage events.
-
-nxagent-3.0.0-27
-
-- Fixed TR04E01677. Changed the reconnection procedure to call the
-  function destroying the NoMachine splash window. It rarely happened
-  that the splash window was not removed after resuming a session.
-
-- Ignored the ForceScreenSaver requested by X clients to avoid clashes
-  with our screen saver handling.
-
-- Cleanup of code handling the screen saver timeout to remove referen-
-  ces to the old drawable's synchronization method.
-
-- Fixed TR04E01664. The session is terminated instead of suspended if
-  the auto-disconnect timeout expires and the persistence is not allo-
-  wed.
-
-- Reverted an optimization in nxagentCheckWindowConfiguration() in
-  order to avoid inconsistencies in the stacking order.
-
-- Fixed a segmentation fault in rootless mode.
-
-nxagent-3.0.0-26
-
-- Some fixes to build in the Cygwin environment.
-
-nxagent-3.0.0-25
-
-- Renamed the option 'lazylevel' to 'defer'.
-
-- Added a flag to windows to know if they have transparent children,
-  in order to reduce to minimum the put images on windows covered by
-  their children.
-
-- Created a generic list of graphic contexts, used when synchronizing
-  drawables between the nxagent and the remote X server. All the GCs
-  are created with IncludeInferiors property. This solves problem when
-  trying to synchronize windows covered by children with transparent
-  backgrounds.
-
-- The nxagentUserInput checks if keys are pressed.
-
-- Fixed some memory leaks.
-
-- In shadow mode, removed the handling of events of the source display
-  from the code. They can be handled in the nxcompshad library.
-
-- In shadow mode, allow the synchronization loop to break in case of
-  input event.
-
-- Moved the call to miDCInitialize after the initialization of poin-
-  ters to screen functions. This was needed to make DAMAGE work pro-
-  perly.
-
-- In shadow mode, not breaking the polling if a mouse button is down.
-
-- In shadow mode, allow events to break the loop sending updates.
-
-- At reconnection the input window is raised after the root window is
-  mapped.
-
-- Fixed an invalid read. The call to the function nxagentSetInstalled-
-  ColormapWindows() has been moved from nxagentDestroyWindow to Dele-
-  teWindow.
-
-nxagent-3.0.0-24
-
-- The corrupted drawables are added to dedicated lists of resources
-  to speed up the synchronization process.
-
-- The nxagentUserInput checks if a mouse button is pressed.
-
-- Created the nxagentGetScratchGC which resets the scratch GCs to de-
-  faults values also on the remote X server.
-
-- The synchronization cycle is forced when a timeout expires, albeit
-  the remote display is blocked.
-
-- Added a parameter to synchronization functions to specify if loops
-  can break. It's useful to force the synchronization in some circum-
-  stances.
-
-- Keystroke CTRL-ALT-R is enabled in shadow mode too. It is used to
-  switch scaled and non-scaled modes.
-
-- Some changes to adjust the window position.
-
-- Moved some macros to Misc.h.
-
-- Some changes to adjust the behaviour of scaling feature in case of
-  resize and switch to full screen.
-
-- Freeing the buffer used for scaling if no needed anymore.
-
-nxagent-3.0.0-23
-
-- Fixed TR02E01648 and TR10D01534. Changed pointer motion events han-
-  dling. In desktop mode the nxagent creates a InputOnly window that
-  collects the MotionNotify events. This window is mapped over the
-  root window. In rootless mode the nxagent creates all windows on
-  real X server with PointerMotionMask.
-
-- Not exiting from the block handler with zero timeout if drawables to
-  be synchronized are pixmaps only.
-
-- Reduced the margin around the glyph extent from 5 to 3 pixels.
-
-nxagent-3.0.0-22
-
-- Fixed initialization of XImage used for scaling.
-
-- Changes to fix the position of the shadow main window.
-
-nxagent-3.0.0-21
-
-- Moved the implementation of scaling feature in nxagentRealizeImage.
-
-- Disabled log message 'Font not found' in Font.c.
-
-- The synchronization loop is called inside the BlockHandler. Synch-
-  ronization goes on until the display is not blocked.
-
-- Exiting the BlockHandler with timeout zero if corrupted drawables
-  have not been synchronized because of blocked display connection.
-
-- Changed the synchronization loop to slice the dirty regions.
-
-- The updates by shadowing nxagents are now sent using the lazy me-
-  chanics: the remote buffer pixmap is marked as dirty, then synch-
-  ronized.
-
-- Traversing the tree to synchonize windows.
-
-nxagent-3.0.0-20
-
-- Fixed a bug in the nxagentGetOptimizedRegionBoxes() function which
-  was causing a bad merging of boxes.
-
-- Added a margin of 5 pixels around the glyphs extents before synch-
-  ronizing them.
-
-- The synchronization cycle has been reactivated for the first lazy
-  level, in order to synchronize the window's background.
-
-- The CopyArea between pixmaps doesn't mark the full destination as
-  corrupted, but clips the operation with the synchronized area of the
-  source as happens for the windows.
-
-- Implemented scaling feature for the shadow agent. To do: run-time
-  control of this feature by keystrokes and window resize; adapting
-  the window size to the scaled dimensions.
-
-- Setting the shadow session scaling ratio equal to the size chosen
-  from the user divided by the size of the main session.
-
-- Scaled mouse motion events according with the ratio.
-
-- Implemented the nxagentScaleImage() function.
-
-- Updated version number and copyright in the output log.
-
-- Fixed TR06D01390. When resizing nxagent window, we make a fictitious
-  resize for all top level windows, in order to trigger the window
-  tree validation.
-
-nxagent-3.0.0-19
-
-- Force LazyLevel to 0 in case of shadowing session.
-
-- If shadowing poller returns that nothing is changed and no updates
-  have to be sent, call WaitForSomething select with 50 ms timeout.
-
-- The shadow agent doesn't break the sending of updates in case of
-  mouse motion events.
-
-- The scratch GC's clip mask was not cleared during a drawable synch-
-  ronization. Now the GetScratchGC() function is called after changing
-  the nxagentGCTrap flag.
-
-- Implemented the function nxagentGetOptimizedRegionBoxes(). It gets
-  the list of boxes forming a region and operates on it to merge as
-  much boxes as possible, checking their width and position.
-
-- Implemented the function nxagentClearRegion(). It does an XClearA-
-  rea() for each box belonging to a region, using the color returned
-  by nxagentGetCorruptedRegionColor() as background of target window.
-
-- Implemented the function nxagentGetCorruptedRegionColor(). It gets
-  the color of first outer pixel in the bottom right corner of re-
-  gion.
-
-- Fixed some memory leaks.
-
-- Checked and removed some FIXME concerning the lazy encoding.
-
-- Fixed and added some debug messages in Render.c, GC.c and GCOps.c.
-
-- Added to the Literals.h file the Render and Shared memory requests.
-
-nxagent-3.0.0-18
-
-- Changes to comply with nxcompshad library.
-
-nxagent-3.0.0-17
-
-- The master agent holds the number of shadow nxagents connected to
-  itself. The shadow nxagent notify its presence to master nxagent
-  by setting the _NX_SHADOW property.
-
-nxagent-3.0.0-16
-
-- Rearranged the lazy level rules. All the link types now use the lazy
-  level 1: the pixmaps are always corrupted, and they becomes synchro-
-  nized only when they're sources of an operation (i.e. CopyArea, ren-
-  der).
-
-- The lazy levels greater than 1 don't synchronize automatically. It's
-  possible to synchronize with two keystrokes: CTRL+ALT+Z forces the
-  windows synchronization without take care of the congestion; CTRL+
-  ALT+X synchronizes the windows and the background until there is
-  enough bandwidth.
-
-- Only the tile, stipples and glyphs are always synchronized.
-
-- The height of glyphs region has been doubled to obtain a better vi-
-  sual effect after the synchronization.
-
-- Fixed a problem causing the background pixmaps to be used also if
-  they were not fully synchronized.
-
-- Added a function to convert a PolyPoint in a dirty region. The fun-
-  ction is now disabled because it is not advisable to use the exten-
-  ts.
-
-- The XCopyArea is not requested if the clip region is NIL.
-
-- The nxagentPutImage does not update the framebuffer when it is
-  doing a synchronization.
-
-- Moved all the code handling the drawables synchronization in the
-  Drawable.c file.
-
-- As the shared memory pixmaps are never synchronized with the re-
-  mote X server, now they're marked as dirty when they're created.
-
-- An XFillRectangles request now marks the rectangles of the desti-
-  nation drawable as synchronized.
-
-- Fixed a bug that was causing the CopyArea to propagate wrongly the
-  corrupted region on the destination drawable when the GC uses a
-  clip mask.
-
-- Implemented a test function useful to show on the windows all the
-  dirty regions as colored rectangles. It is used with the CTRL+ALT+A
-  keystroke.
-
-- Before sending the XRenderComposite operations (trapezoids, trian-
-  gles, TriStrip, TriFan), the drawables involved are synchronized if
-  they are dirties.
-
-- Changes to shadow mode.
-
-- Moved the code splitting the screen shadowing updates to a separate
-  function.
-
-- Suspend the sending of updates if input is received from the user.
-
-- Make use of callback mechanism implemented in the nxshadow library
-  to suspend screen polling when input is received from the user.
-
-- Flush the display link when requested by the proxy.
-
-nxagent-3.0.0-15
-
-- Print the following info when the screen is resized: "Info: Resized
-  screen [<screen number>] to [<width>x<height>].
-
-- Changes to comply with nxshadow library.
-
-- Fixed the height of screen updates in shadowing mode.
-
-- Terminate cleanly if shadowing initialization fails.
-
-- Split shadowing screen updates in smaller rectangles for slow links.
-
-nxagent-3.0.0-14
-
-- Fixed a compilation error in NXrender.c.
-
-nxagent-3.0.0-13
-
-- Changed the LICENSE file to state that the software is only made
-  available under the version 2 of the GPL.
-
-- Added file COPYING.
-
-- Updated the files imported from X.org to the 6.9.0 release.
-
-nxagent-3.0.0-12
-
-- Fixed compilation on Sun platform.
-
-nxagent-3.0.0-11
-
-- Implemented an algorithm adapting colors if the target display have
-  different depth than the shadowed display. It requires that visuals
-  are TrueColor and depths are 16 or 24 or 32.
-
-- Added the option shadowmode. If this option is '0' the shadowing
-  session doesn't interact with the attached session.
-
-nxagent-3.0.0-10
-
-- Changes to comply with the nxshadow component.
-
-nxagent-3.0.0-9
-
-- Applied changes to files imported from X.org sources.
-
-- Updated copyright notices to the current year.
-
-nxagent-3.0.0-8
-
-- Imported changes up to nxagent-2.1.0-17.
-
-- Fixed problem with font path on Solaris 10.
-
-- Disabled some log messages.
-
-- If the agent has blocked when trying to write to the display, try to
-  read other events from the connection.
-
-- After synchronizing expose events, the result of subtraction is not
-  sent immediately, but added to a region. Expose events will be for-
-  warded to clients after exiting from the event loop.
-
-- Critical output is set when button mouse events are received.
-
-- Fixed TR12D01584. X11 sessions could not be started on Mandriva Li-
-  nux 2007 because of a different location of fonts. The font path
-  used by this distribution is now added to the alternates font paths.
-
-- Fixed TR11D01550. Modified the collection of visuals when nxagent
-  opens a display. Now we only use the ones with the same depth than
-  the default one set in the screen.
-
-- Modified the reconnection of pict-format structures, to avoid an
-  error that arises when migrating a session by a Linux machine to
-  a Windows one.
-
-- Small changes in handling of expose events.
-
-- GraphicsExpose are no more forwarded to clients immediately. They
-  are merged with remote-only exposures and sent later.
-
-- Invalidated expose queue elements dealing with destroyed windows.
-
-- Cleaned up code in nxagentSynchronizeExpose().
-
-- Fixed TR10D01541. Now when destroing a window if lastClientWindowPtr
-  point to this window then in nxagentClearClipboard() we put nxagent-
-  ClearClipboard to NULL and lastClientStage to SelectionStageNone.
-
-- Fixed a problem with LazyLevel option that wasn't correctly read
-  from command line.
-
-- Fixed an arithmetic exception raised when the viewable corrupted
-  region is empty but not nil.
-
-- Removed the obsolete 'sss' option.
-
-- Fixed a warning related to the expose queue.
-
-- Modified the queue of exposed region to remove some memmov() calls.
-
-- Remote expose events not having entries in the queue are collected
-  in a global region and sent later, instead of being sent immediate-
-  ly.
-
-- Changed nxagentCheckWindowConfiguration() to prevent unuseful calls
-  to XQueryTree().
-
-- Fixed TR10D01530. Fixed an invalid write in doOpenFont().
-
-- Fixed some invalid write/read in nxagentVerifyDefaultFontPath().
-
-- Fixed TR10D01518. If needed, a restack is performed on the top level
-  windows in rootless mode.
-
-- Fixed TR10D01520. Reviewed session termination and log messages in
-  the case of indirect XDMCP.
-
-- In PictureCreateDefaultFormats(), cleaned the PictFormatRec struct
-  when the format is not supported.
-
-- Fixed TR09D01498. As it is possible to use multiple paths where to
-  store the fonts, now the agent concatenates all the existing font
-  paths used in various XFree/Xorg distributions to obtain a unique
-  default font path.
-
-- Fixed TR09D01502. The privates of the real pixmap are initialized
-  before trying to allocate a virtual pixmap, avoiding the possibility
-  to access an inconsistent structure in case the allocation fails.
-
-- Fixed a memory leak due to a missing deallocation of a virtual pix-
-  map's region.
-
-- Fixed TR08D01486. Removed a warning in NXrender.c.
-
-- Implemented FR08D01470. Now in the reconnection phase missing fonts
-  are replaced by the most similar picked among the available ones.
-
-- Fixed TR08D01480. A condition inside the nxagentWindowExposures
-  function was ignoring the possibility that the first region para-
-  meter could be a null region.
-
-- Fixed TR06D01409. Now NXCollectGrabPointer() is called with the
-  owner_events true in ActivatePointerGrab() .
-
-- Fixed TR03D01317. Increased the time after wich the session termina-
-  tes.
-
-- Fixed TR08D01475. In rootless, ConfigureWindow requests are only
-  forwarded to the X server, even if no window manager has been detec-
-  ted.
-
-- Fixed TR04D01367. An XKB event is sent to notify that keyboard map-
-  ping has changed.
-
-- Check the number of regions in the list before running nxagentSynch-
-  ronizeExpose().
-
-- Reduced the number of GCs used during the drawable synchronization.
-
-- Optimized the corrupted region synchronization trying to use the
-  extents is some circumstances instead of split the full region.
-
-- Checked and removed some FIXME.
-
-- Fixed TR05D01384. Xgl server uses less picture formats than nxagent
-  usually does. Now the PictFormat structures used by nxagent are fil-
-  tered with the ones available for the real display.
-
-- Fixed TR06D01410. Function nxagentRestoreAreas have to make use of
-  a GC with subwindow mode ClipByChildren for preventing from repaint
-  also children of restored window. Children are restored in a separ-
-  ate call, if they have backing store on.
-
-- Fixed TR07D01426. The cursor data were swapped in place if the dis-
-  play had different bitmap bit order. Let Xlib do this work on a copy
-  of the image, preventing from messing up the original data.
-
-- Fixed TR07D01450. Some fonts were missing in the list of available
-  fonts because the ListFonts pattern used to build this list was too
-  much generic. To build a full font list two different patterns have
-  been used.
-
-- Fixed TR07D01449. Some X clients might affect the X screen saver
-  functioning modifying the default properties. The SetScreenSaver
-  request now correctly checks the parameters changes to avoid any
-  issue.
-
-- Fixed TR07D01432. X11 sessions could not be started on Debian 'Etch'
-  because of a different location of fonts. The font path provided by
-  the Debian Policy is now added to the alternates font paths.
-
-- Fixed TR07D01437. The auto suspend timer was reset when it should
-  not.
-
-- Fixed a conditional jump on uninitialised value.
-
-- Fixed TR05D01380. Now migrating a session when display have a 16-bit
-  depth does recover all visuals, avoiding reconnection failure.
-
-nxagent-3.0.0-7
-
-- Fixed problems occurring when the main session is terminated and the
-  connection is refused to the shadow agent.
-
-- Fixed include directory order for Solaris.
-
-nxagent-3.0.0-6
-
-- The shadow agent works only in viewport mode.
-
-- Added nxagentShadowCreateMainWindow function. This function creates a
-  pixmap and a window for mirroring the display root window.
-
-- Added NXShadowUpdateBuffer() function in order to create the buffer
-  for the poller with the same sizes of the root window of the master
-  agent.
-
-- Added NXxrandr.c NXxrandr.h and NXxrandrint.h files.
-
-- If the main agent screen is resized, the shadow agent adapts to the
-  new size of the root window.
-
-- Changed option activating mirror to -S.
-
-- Removed usleep() call when the agent is suspended.
-
-- Input events are sent to the main session even if it is in sus-
-  pended state.
-
-- Updates are made from top to bottom.
-
-- Added the option IgnoreVisibility. If this option is set, PutImage
-  is not skipped when the window is fully obscured.
-
-- Added the option 'shadow' saying the display to attach.
-
-nxagent-3.0.0-5
-
-- Added the mirror mode. It is activated by -M option.
-
-- Recovered the state of keys when the agent in access mode loses
-  focus in mirror mode.
-
-- Changes to work with 16-bit depth display in mirror mode.
-
-- Changed the Imakefile in order to include NXaccess.h and NXaccess-
-  Event.h files.
-
-- The layout keyboard is passed to NXShadowCreate() function in order
-  to load the right keymap file in mirror mode.
-
-nxagent-3.0.0-4
-
-- Small changes to build on 64 bit x86 platform.
-
-nxagent-3.0.0-3
-
-- Fixes to build on Cygwin platform.
-
-- Change the order of include directories in Imakefile.
-
-- Renamed GC.h, Window.h and Pixmap.h to avoid name clashes.
-
-- Undefined NXAGENT_UPDRADE in Composite.c and NXcomposite* files.
-
-- Defined ddxBeforeReset() in Init.c.
-
-nxagent-3.0.0-2
-
-- Merged changes to NXdispatch.c, NXdixfonts.c, NXmiwindow.c, NX-
-  picture.c, NXproperty.c, NXrender.c, NXresource.c, NXwindow.c.
-
-nxagent-3.0.0-1
-
-- Opened the 3.0.0 branch based on nxagent-2.0.0-88.
-
-nxagent-2.0.0-88
-
-- Fixed a memory leak in the code handling the remote font list.
-
-- Removed some log message.
-
-nxagent-2.0.0-87
-
-- The box size is checked during the region synchronization to avoid a
-  possible arithmetic exception.
-
-nxagent-2.0.0-86
-
-- Checked the validity of the colormap in nxagentChangeWindowAttri-
-  butes().
-
-nxagent-2.0.0-85
-
-- Fixed the bad destination coordinates of shared memory pixmap synch-
-  ronization in nxagentCopyArea() and nxagentCopyPlane() functions.
-
-nxagent-2.0.0-84
-
-- Discard the Terminate Server key sequence Ctrl-Alt-BackSpace.
-
-nxagent-2.0.0-83
-
-- Added a workaround to prevent the use of an inconsistent client poi-
-  nter in the nxagentNotifyConvertFailure() function.
-
-nxagent-2.0.0-82
-
-- Fixed the parsing of option 'backingstore'.
-
-nxagent-2.0.0-81
-
-- The agent window visibility on the real X server is used together
-  with the internal state to decide if graphics operations can be
-  avoided.
-
-- When restoring areas, if the backing pixmap is corrupted, an expose
-  event is sent to the region that can't be restored.
-
-nxagent-2.0.0-80
-
-- The core protocol requests internally used to accomplish a Render
-  extension request are no longer propagated to the real X server. To
-  be more precise in this way we can save many XCreatePixmap, XChange-
-  GC and XSetClipRectangles.
-
-- Corrected a minimal incoherence in nxagentCopyArea in managing the
-  creation and deallocation of a region.
-
-- Fixed a double synchronization of an aged drawable during a put ima-
-  ge operation, due to a missing check of nxagentSplitTrap value.
-
-- Added the VisibilityChangeMask bit to the event masks.
-
-- Improved the algorithm which prevents the server client's resource
-  duplication.
-
-nxagent-2.0.0-79
-
-- Added the 'lazylevel' option usable in the command line to specify
-  how much the Agent should be lazy. The default level is 2. Each
-  level adds the following rules to the previous ones:
-
-  Level 0  The lazy is off.
-
-  Level 1  The put images are skipped if we were out of bandwidth,
-           unless that the destination drawable has an old corru-
-           pted region.
-
-  Level 2  No data is put or copied on pixmaps, marking them always
-           as corrupted and synchronizing them on demand.
-
-  Level 3  The put images over the windows are skipped marking the
-           destination as corrupted. When a copy area to a window is
-           requested, the source is synchronized before copying it.
-
-  Level 4  The source drawable is no longer synchronized before a
-           copy area, but the operation is clipped to the synchro-
-           nized region.
-
-- Implemented a dynamic synchronization mechanism, based on user ac-
-  tivity: if the input devices are not used for a variable amount of
-  time (depending from the configured link type), the synchronization
-  starts and goes on until there is enough bandwidth.
-
-- Minor fixes to the way the copy area propagates the corrupted re-
-  gion.
-
-- Whenever a put image is done, a full synchronization is forced on
-  the destination drawable if it has an old corrupted region.
-
-- During the overall synchronization a drawable is skipped if its
-  timestamp is lower than the synchronization interval.
-
-- Updated the copy plane to skip the operations from a corrupted pix-
-  map to another pixmap.
-
-- Fixed the pixmaps synchronization which was not checking the avai-
-  lable bandwidth.
-
-- In rootless mode, ConfigureWindow requests are not internally per-
-  formed for top level windows if a window manager is running. Anyway
-  they are forwarded to the X server.
-
-- Enabled the DPMS extension.
-
-- Fixed the -dpi option.
-
-nxagent-2.0.0-78
-
-- When the remote proxy supports the alpha encoding, the alpha data
-  is sent compressed. When connected to an old version, the agent
-  uses the NXSetUnpackAlphaCompat() call.
-
-- Added support for the RLE pack method.
-
-nxagent-2.0.0-77
-
-- Fixed the check for special keystrokes. State mask for Alt and Meta
-  keys are inferred from the X server modifier map.
-
-nxagent-2.0.0-76
-
-- Fixed application icon in rootless mode.
-
-- If SYNC_WHOLE_GLYPH_DRAWABLE is set in Render.c the whole drawables
-  used in the composite glyphs are synchronized. This is useful to
-  evaluate the policy we should use to minimize the put images.
-
-- Code cleanup in Pixmap.c concerning the synchronization functions.
-
-- Added the nxagentSynchronizeBox() function.
-
-- Setting a wide band link (ADSL, WAN, LAN) disables Lazy and Strea-
-  ming options.
-
-- Now the Lazy option can be switched by the Ctrl+Alt+E keystroke.
-
-- Set a timestamp on a drawable to verify how much old its data are.
-  If we didn't update it since two seconds, the put image operations
-  are not skipped.
-
-- The image data split in chunks smaller than a threshold is now mo-
-  ved from the nxagentPutImage() to the nxagentRealizeImage() func-
-  tion. If a chunk is going to be put on an hidden area of a window,
-  the operation is skipped.
-
-- Fixed the value assigned to the id of the alpha visual. Now it is
-  assigned by XAllocID().
-
-- Removed a call to XSetInputFocus() before mapping the default win-
-  dows.
-
-- Restored the backup display pointer when failing to reconnect the
-  display.
-
-- Fixed some return value in the options parser function.
-
-- Fixed the parsing of environment variable.
-
-nxagent-2.0.0-75
-
-- Optionally split the long X_RenderTrapezoid requests in multiple
-  messages to help the compression.
-
-nxagent-2.0.0-74
-
-- Fixed a bug preventing the reconnection of pictures.
-
-- Fixed the way the agent notify its start up to NX Client. Now the
-  ownership of agent atom is set before the reconnection of pixmaps.
-
-nxagent-2.0.0-73
-
-- Added a check on the display pointer in nxagentTerminateDisplay()
-  to ensure that we don't try to force an I/O error if the display
-  is already down.
-
-- The image operations now are clipped to the visible area of the
-  drawable. As this may hamper the caching algorithm, only source
-  images bigger than 32K are clipped.
-
-- Code cleanup in Render.c.
-
-- When setting SKIP_LOUSY_RENDER_OPERATIONS in Render.c the realiza-
-  tion of some operations is skipped. This is useful to determine
-  how clients (mis)use the RENDER extension to achieve even worse
-  performance than they were able to achieve using the core protocol.
-
-nxagent-2.0.0-72
-
-- Ensured that SIGUSR1 and SIGUSR2 are ignored if the NX transport
-  is not running.
-
-nxagent-2.0.0-71
-
-- Modified the following messages used to track the session state:
-
-  From: "Session: Session starting at..."
-  To:   "Session: Starting session at..."
-
-  From: "Session: Session terminating at..."
-  To:   "Session: Terminating session at..."
-
-nxagent-2.0.0-70
-
-- Removed the obsolete 'Info' messages related to the 'fast' versus
-  'slow' copy area and get image modes. The -slow and -fast options
-  are now ignored as ignored are the keystrokes that allowed switch-
-  ing between the two modes.
-
-- Removed more obsolete warnings and commented the logs left around
-  for test purposes.
-
-- Removed the code in NXdispatch.c handling the fake get-image.
-
-- Removed the flags related to the use of the frame-buffer.
-
-- Major code cleanup in GCOps.c, Window.c, GC.c, Pixmap.c, Screen.c.
-
-nxagent-2.0.0-69
-
-- Added a check to avoid parsing an empty DISPLAY variable.
-
-- Added parsing of the 'streaming' option.
-
-- GetTimeInMillis() function is compiled only if DDXTIME is defined,
-  to avoid double definition errors on Solaris platform.
-
-- Messages "Suspending session..." and "Session suspended..." are not
-  printed if the DE_TERMINATE dispatch exception is set.
-
-- When synchronizing the shared memory pixmaps the image is no longer
-  put on the framebuffer.
-
-- Code cleanup in the nxagentSynhronizeRegion() function.
-
-- Added the 'lazy' option to enable or disable the lazy policy. It is
-  activated by default. At the moment this is configured at compile
-  time and can't be changed through a command line or the option file.
-
-- Fixed the counter of the corrupted backgrounds by checking if the
-  pixmap was already marked.
-
-- The option SharedPixmaps is now activated by default.
-
-- Fixed a problem when synchronizing the shared memory pixmaps with
-  the operation being erroneously skipped.
-
-nxagent-2.0.0-68
-
-- If we are doing a copy area to a pixmap and the source drawable is
-  not synchronized, the destination is marked as corrupted and the co-
-  py area request is not propagated to the X server. As a general rule
-  the source drawables are now synchronized only when they are copied
-  to a visible window.
-
-- The nxagentSynchronizeRegion() function synchronizes the region one
-  box at a time. This solves the incorrect pictures synchronization.
-
-- When a new element is added to the list of exposed region, sending
-  the synchronization request to the X server is postponed to the next
-  call of nxagentFlushConfigureWindow().
-
-nxagent-2.0.0-67
-
-- Ensured that NXTransDestroy() is called when getting rid of the NX
-  transport.
-
-nxagent-2.0.0-66
-
-- The various messages used by the NX server to control the state of
-  the session have been changed and the NX server will have to be mo-
-  dified accordingly.
-
-  At the early startup the agent will print the following message:
-
-  "Info: Agent running with pid '...'."
-
-  Followed by:
-
-  "Session: Session starting at '...'."
-
-  The ellipsis here represent the current timestamp, as reported by
-  the POSIX function ctime():
-
-  Example: Mon May 22 15:07:11 2006.
-
-  After the connection to the remote display has been established,
-  the agent will print the following message:
-
-  "Session: Session started at '...'."
-
-  This replaces the old messages:
-
-  "Info: Session started, state is [SESSION_UP]."
-
-  Or:
-
-  "Info: XDMCP session started, state is [SESSION_UP]."
-
-  And:
-
-  "Info: Entering dispatch loop with exception 0x0."
-
-  If the display connection can't be established, due to a network
-  failure, for example, the agent will exit with a fatal error, for
-  example:
-
-  "Fatal server error:
-   Error: Unable to open display 'nx/nx,options=...'."
-
-  This is a special case, as the X server is still initializing and
-  the agent can't intercept all the possible causes of errors.
-
-  When suspending the session, the agent will print one of the fol-
-  lowing messages, depending on the reason of the disconnection:
-
-  "Session: Suspending session at '...'."
-
-  Or:
-
-  "Session: Display failure detected at '...'."
-  "Session: Suspending session at '...'."
-
-  As soon as the disconnection procedure is completed, the agent will
-  notify the server with the message:
-
-  "Session: Session suspended at '...'."
-
-  This message replaces the old message:
-
-  "Session: Session suspended."
-
-  When entering the reconnection procedure, the agent will print:
-
-  "Session: Resuming session at '...'."
-
-  If the session can be successfully resumed, the agent will print:
-
-  "Session: Session resumed at '...'."
-
-  Otherwise, if the display cannot be opened or if the proxy is not
-  able to negotiate the session, the agent will return in suspended
-  mode by printing:
-
-  "Session: Display failure detected at '...'."
-  "Session: Session suspended at '...'."
-
-  At the time the session be terminated, the agent will print:
-
-  "Session: Session terminating at '...'."
-
-  Followed by:
-
-  "Session: Session terminated at '...'."
-
-  This replaces the old message:
-
-  Info: Exiting dispatch loop with exception 0x2.
-
-  The message 'Session terminated at...' should be the last message
-  parsed by the NX server. From that moment on the NX server will
-  wait the agent process to ensure that the cleanup procedures are
-  completed without errors and that the process successfully termi-
-  nates with the exit code 0.
-
-nxagent-2.0.0-65
-
-- Many improvements to the block handler and to the drawable synch-
-  ronization loop.
-
-- Anyway the synchronization loop is skipped, at the moment, to bet-
-  ter test the new copy area implementation. Also all the put-image
-  on pixmaps are skipped, so that the pixmaps are only synchronized
-  on demand.
-
-- Small fix in the put image to always use the region already allo-
-  cated when marking a region as corrupted.
-
-nxagent-2.0.0-64
-
-- The realization of the put image operations now depends on the
-  state of the link, as reported by the proxy through the synchroni-
-  zation handler. If the proxy link is aproaching a congestion, the
-  destination area of the drawable is marked as corrupted and the
-  operation is skipped.
-
-- At the moment the synchronization strategy is quite unsophistica-
-  ted. The drawables are synchronized when a timeout expires in the
-  block handler. The synchronization loop is aborted as soon as the
-  link approaches again the congestion and is restarted at the next
-  timeout.
-
-- Imported miwindow.c from the DIX layer. The code has been changed
-  to prevent miSetShape() from trying to destroy a null region. The
-  bug appears to be related to the backing store but it is unclear
-  if can also affect the sample server. The region is allocated at
-  the beginning of the function only if the backing store is set for
-  the window. Then miSetShape() calls miChangeSaveUnder(), that, in
-  turn, calls miCheckSubSaveUnder(). The latter can change the back-
-  ing store attribute of -some- windows, including, apparently, the
-  window that miSetShape() is processing. miSetShape() then destroys
-  the region if the backing store is set, but it doesn't verify if
-  the region was actually allocated. The problem is fixed by simply
-  adding a check on the pointer.
-
-nxagent-2.0.0-63
-
-- Added the nxagentDisplaySynchronizationHandler() callback. The NX
-  transport uses the callback to report when it is possible synchro-
-  nize the pixmaps and the other X objects that are corrupted or in-
-  complete.
-
-- Fixed nxagentClearSelection() to correctly validate the selection
-  owner before clearing the record.
-
-- Changed the NXGetControlParameters() call to reflect the changes
-  to the reply.
-
-nxagent-2.0.0-62
-
-- At reconnection the pixmap data is sent to the remote X server only
-  in two cases: if the pixmap is associated to a picture (glyphs, for
-  example) or if its depth is 1 (clip masks of GCs). All the other
-  pixmaps are marked as corrupted and synchronized on demand as soon
-  as the drawable is used as a source. This code is not enabled by
-  default and is currently being tested.
-
-- Implemented a new copy area function synchronizing the corrupted
-  region of a drawable before using it as a source.
-
-- Imported resource.c from the DIX. This makes possible to avoid the
-  duplication of the RT_GC, RT_FONT and RT_PIXMAP resource types.
-
-- Added the RT_NX_GC resource type and removed the old code dealing
-  with the reconnection of the GCs used by the GLX extension.
-
-- Fixed a problem in the synchronization of the window background.
-
-- Checked and removed some FIXMEs related to the streaming code.
-
-- Changed nxagentRestoreAreas() to take care of the width of the win-
-  dow's border.
-
-- Changed nxagentSaveAreas() to be independent from the window's pos-
-  ition.
-
-- Called nxagentMapDefaultWindows() before pixmaps' reconnection.
-
-- Changed nxagentMapDefaultWindows() to notify the client about the
-  agent's startup also when running in rootless mode.
-
-- Added the delete and backspace keystrokes to the routine removing
-  duplicated keys.
-
-- Wehn resizing the desktop the clip region of the children windows
-  is clipped to the new size of the root. This fixes a crash occur-
-  ring when resizing the desktop to the minimum height.
-
-nxagent-2.0.0-61
-
-- Changed the extraction of alpha channel from images to be endianess
-  independent.
-
-nxagent-2.0.0-60
-
-- nxagentReleaseSplit() now uses the NXAbortSplit() request to force
-  the proxy to discard the pending splits.
-
-- Added the value of the SharedMemory and SharedPixmaps options in
-  the log, together with the size of the shared memory segment used
-  by the remote proxy.
-
-- Fixed the compilation problem affecting the previous version.
-
-- The location of xkb base directory is checked by calling  _NXGetXkb-
-  BasePath() function.
-
-- Fixed TR05D01371. nxagentVerifyDefaultFontPath() is called only if
-  the default font path is not defined on the command line.
-
-- Removed some log message.
-
-nxagent-2.0.0-59
-
-- Improved the composite text operation to synchronize the regions
-  affected by the operation instead of the whole drawable.
-
-- Updated the copy plane to better propagate the corrupted region
-  to the destination.
-
-- The background pixmaps are synchronized with a deferred strategy.
-  Tiles and stipples are still synchronized as soon as the GC needs
-  to be used.
-
-- Completed the new copy area implementation.
-
-- Shared memory pixmaps are not synchronized after a RenderChange-
-  Picture operation. This needs further testing.
-
-- Added a nxagentNotifyKeyboardChanges() function that sends a Map-
-  pingNotify event to clients when the keyboard is reloaded or re-
-  configured. The SendMappingNotify() function is not used anymore.
-  This hopefully solves the TR01D01284.
-
-- Moved the nxagentResetKeyboard() function in Keyboard.c.
-
-- Checked if the previous sibling of a window is changed before try-
-  ing to restack it. This saves the redundant window configuration
-  requests of the previous version.
-
-nxagent-2.0.0-58
-
-- Before composite glyphs operations, only areas intersecting the
-  glyphs extents are synchronized.
-
-- When a new split resource is allocated, a copy of the GC used by
-  the put image operation is created. Such copy will be safely used
-  by the commit operation even if the original GC is changed or
-  destroyed.
-
-nxagent-2.0.0-57
-
-- Region saved by the backing store and corrupted region of backing
-  store pixmaps are emptied at suspend and resume time. This makes
-  the exposures go to the clients that will redraw their windows.
-
-- Changed the nxagent root window cursor. The cursor of the parent
-  window is used instead of the default 'X' cursor.
-
-nxagent-2.0.0-56
-
-- Rewritten the state machine handling the streaming of the images.
-
-- By calling FatalError(), the normal server shutdown was skipped
-  and left the X server socket in .X11-unix. This happened also if
-  for any reason the agent couldn't complete the session startup.
-  Now the DDX abort routine, if the agent is not exiting because of
-  an exception, calls nxagentAbortDisplay() which closes down the
-  well known sockets.
-
-- Upon a failure of the reconnection procedure, if the alert shown
-  to the user by leveraging the proxy control channel is not set
-  to a valid code, the function in will use a default.
-
-nxagent-2.0.0-55
-
-- Added an explicit link flush in the display block handler. The
-  block handler should now be called by nx-X11 before entering the
-  select, not only the the agent has entered WaitForReadable() or
-  WaitForWritable().
-
-- Removed the checks on the value of the Streaming option. The way
-  a drawable is treated only depends from its previous state.
-
-- Started reimplementing the copy area operation to better propaga-
-  te the corrupted region to the destination.
-
-- Shared pixmaps are now synchronized before a copy plane operation.
-
-- The unpack alpha is discarded before the drawable synchronization.
-  This fixes the problems with the synchronization of the cursor. A
-  better way to deal with the condition is to be considered for the
-  future.
-
-- Added a check in the nxagentPutImage() function to skip the opera-
-  tion if the window is fully obscured.
-
-nxagent-2.0.0-54
-
-- Fixed a bug in nxagentPaintWindowBackground(). A region passed as
-  parameter was modified by this function and this affected subseq-
-  uent operations involving the region.
-
-- In rootless mode, the map state of a top level window is uncondit-
-  ionally reflected in the internal state when receiving a map event
-  from the real display.
-
-nxagent-2.0.0-53
-
-- Regions are marked as synchronized after an image operation if the
-  image didn't generate a split.
-
-- When an image operation takes place on a drawable which is already
-  being streamed, the resource is marked as invalid and the commits
-  are discarded.
-
-- A specific trap is used at the time a drawable is synchronized.
-
-- Fixed Render.c to use the latest streaming code.
-
-nxagent-2.0.0-52
-
-- Fixed a problem in rootless mode where some windows could have mis-
-  sed to update the mapped flag after a MapNotify event.
-
-nxagent-2.0.0-51
-
-- Realization of images is skipped, if the link is down, and a small
-  delay is introduced before returning from the image function.
-
-- Started implementing a new handler to let the agent include arbit-
-  rary data in the transport statistics. For now, only the interfa-
-  ces and the stubs exist, and the handler is not registered to the
-  proxy.
-
-nxagent-2.0.0-50
-
-- Removed the unused code in nxagentCheckPixmapIntegrity().
-
-- Instead of calling nxagentShapeWindow() immediately, windows to be
-  reshaped are added to the list of windows that have to be configur-
-  ed at later time. This allows SaveAreas() to work even when windows
-  change shape, as in the case of the "bouncing cursor" as implement-
-  ed in some versions of the KDE.
-
-- Added a missing call to nxagentFlushConfigureWindow() in the recon-
-  nection procedure.
-
-nxagent-2.0.0-49
-
-- Code cleanup in the lazy encoding. Implemented distinct utilities
-  to allocate the split resources and manage the corrupted areas.
-
-- The Render.c file is taken from the previous version because the
-  updates break the composite code.
-
-- Renamed the option 'Lazy' to 'Streaming'.
-
-nxagent-2.0.0-48
-
-- Made the image cache use the agent data, instead of allocating and
-  copying.
-
-- Fixed a memory leak in the image routines.
-
-- The image cache is freed at exit. This helps investigating other
-  eventual leaks.
-
-nxagent-2.0.0-47
-
-- Solved the problem at reconnection with lazy encoding enabled.
-
-nxagent-2.0.0-46
-
-- Solved a bug in the parsing of the pack method that made the agent
-  select an unavailable id.
-
-nxagent-2.0.0-45
-
-- Ensured that images are explicitly byte swapped before sending to
-  an X server using a different byte order. In the attempt of saving
-  an expensive operation, the previous code let the unpack procedure
-  do the job, but this could fail to work in some special cases.
-
-- Cleaned the bitmaps used for the core cursors before putting the
-  image.
-
-- Left the display error handler installed during all the lifetime
-  of the session so that other parts of the code don't have to inst-
-  all it explicitly before entering a critical Xlib routine.
-
-- Removed more unused code.
-
-nxagent-2.0.0-44
-
-- Fixed the problem with the cursor image being encoded with a lossy
-  method. The fix is a temporary. The final solution requires changes
-  to the lazy encoding.
-
-- Reworked the code dealing with the alpha visual. The color mask is
-  set based on the endianess of the remote display and is recreated
-  after a session resume.
-
-- Removed more unused code.
-
-nxagent-2.0.0-43
-
-- Corrupted regions are now correctly clipped to the visible area of
-  the drawable.
-
-- Fixed a problem with the clip mask when calculating the intersect-
-  ion of the clip region with the destination region.
-
-- Drawables involved in a composite glyph operation are now synchro-
-  nized prior to being used.
-
-- The nxagentRealizeDrawable() function is now called only for draw-
-  ables that are not already synchronized.
-
-- Pixmaps are now skipped in the synchronization loop. Synchronizat-
-  ion of pixmap is to be implemented.
-
-nxagent-2.0.0-42
-
-- Improved the algorithm removing the duplicated keys by trying to
-  read more events.
-
-nxagent-2.0.0-41
-
-- Made use of the NXFinishSplit() request to speed up the completion
-  of a pending split.
-
-- Added an explicit NX transport flush before any operation that may
-  block waiting for data from the X server.
-
-- Set the NX flush policy to deferred after reconnection.
-
-- Solved refresh problems when reconnecting in rootless mode.
-
-- Modified the routine removing duplicated arrow key events. Now the
-  routine deals with page down and page up keys as well.
-
-- Added a check for xkb base directory path, in order to support new
-  Linux distributions.
-
-- Disabled backing store support for rootless sessions, as implement-
-  ation is not very functional, yet.
-
-nxagent-2.0.0-40
-
-- Removed code related to old managing of backing store.
-
-- Added initialization of backing store by calling miInitializeBack-
-  ingStore().
-
-- Implemented nxagentSaveAreas() and nxagentRestoreAreas() functions.
-  These functions are based on fb code. Calls to XCopyArea() have been
-  added in their implementation to make them be effective also on the
-  real X server.
-
-- Instead of calling nxagentConfigureWindow() in ClipNotify() and
-  PositionWindow(), windows to be configured or mapped are added to a
-  list, together with a mask storing operation that have to be done.
-  Windows in the list will be configured or mapped later by calling
-  nxagentFlushConfigureWindow(). This avoids that windows were mapped
-  or configured before saving areas in the backing store pixmaps.
-
-- The function nxagentFlushConfigureWindow() is called before resto-
-  ring areas on the X server in nxagentRestoreAreas() and at the end
-  of ConfigureWindow and MapWindow in the DIX layer.
-
-- Blocked the NoExpose events at the proxy side.
-
-- Fixed an error in nxagentCompareRegions().
-
-nxagent-2.0.0-39
-
-- Ensured that the display errors are detected while waiting for a
-  split operation to complete.
-
-- Removed more unused code.
-
-nxagent-2.0.0-38
-
-- Changed nxagentSetCursorPosition() to avoid warping the cursor if
-  the requesting client is NULL or the serverClient.
-
-- Added a specific trap to avoid compressing an image associated to
-  a RENDER cursor using a lossy encoding.
-
-nxagent-2.0.0-37
-
-- Added a check in nxagentPaintWindowBackground() to avoid calling of
-  XClearArea() if the window is not realized.
-
-- Modified nxagentAtomNames in Atoms.c to include CLIPBOARD and TIME-
-  STAMP atoms, avoiding further calls to XInternAtom in Clipboard.c.
-
-- Solved TR04D01356. Auto repeat mode setting is no more propagated to
-  the X server keyboard.
-
-- Cleaned up the code in the routine removing duplicated arrow key
-  events.
-
-nxagent-2.0.0-36
-
-- Added the Literals.h file. For now it just contains a table used
-  to translate a request opcode to the name of the X request, to be
-  used for test purposes.
-
-nxagent-2.0.0-35
-
-- Major code rewrite in nxagentPutSubImage(). Removed support for the
-  deprecated image encodings. Ensured that padding bytes are cleaned
-  before trying to locate the image in the nxcompext cache. Avoided
-  to store the image in the cache if it is coming from a XVideo or
-  GLX operation.
-
-- Added support for the new RGB image encoder. This allows the agent
-  to use the simplest encoding by still separating the alpha channel
-  from the image data.
-
-- Added the missing check in nxagentRedirectWindow() verifying that
-  use of the composite extension is enabled.
-
-- Updated to use the new NXCleanImage() function.
-
-- Removed more debugging output.
-
-nxagent-2.0.0-34
-
-- Updated to use the 'what' parameter in NXFlushDisplay().
-
-- Removed the duplicated arrow key events from the event queue.
-
-- Solved the TR04D01355. The X11 agent now tries to locate the
-  fonts.dir file in the misc directory, to verify the validity of
-  the font path.
-
-- Added a check in nxagentChangeClip to avoid creating a new clip
-  mask if the old clip mask matches the former.
-
-- Use the 'fixed' font to replace fonts that are not found a the
-  display reconnection. This should overcome one the most common
-  sources of troubles when migrating the session to a different
-  display, and constitute the base for improving the algorithm
-  trying to match a substitute font.
-
-- Implemented the FR04D01360. Now the user can enable/disable the
-  streaming of the images by using the option 'streaming'.
-
-- Implemented the FR04D01358. The backing-store can be enabled or
-  disabled by using the  option 'backingstore'.
-
-- Forced the reconnection routine to call the IOError handler in
-  the case the display cannot be opened.
-
-nxagent-2.0.0-33
-
-- The GetImage requests in 'slow' mode are now served by retrieving
-  the content of the drawable from the frame buffer.
-
-- Replaced a call to XQueryExtension() by one to XRenderQueryExten-
-  sion(). This function caches previous QueryExtension requests. This
-  partially implements FR01D01275.
-
-- At reconnection, the keyboard is reset only if the keyboard option
-  has been changed.
-
-- Fixed the fonts reconnection procedure. Now the remote fonts list
-  is refilled before fonts reconnection and after failed fonts
-  reconnection, so as to store the correct list of available fonts.
-
-- Added a check in nxagentLoadQueryFont to look up selected font in
-  the list of available fonts. This check avoid filling FontStruct
-  with invalid data.
-
-- Added TIMESTAMP to handled selection targets.
-
-nxagent-2.0.0-32
-
-- Implemented FR03D01323. Added the 'clipboard' option to enable or
-  disable copy and paste operations from the user's desktop to the NX
-  session or vice versa. This option can take four values:
-
-  client  The content copied on the client can be pasted inside the
-          NX session.
-
-  server  The content copied inside the NX session can be pasted
-          on the client.
-
-  both    The copy & paste operations are allowed both between the
-          client and the NX session and viceversa.
-
-  none    The copy&paste operations between the client and the NX
-          session are never allowed.
-
-nxagent-2.0.0-31
-
-- Implemented FR03D01337. Now the X11 agent is able to read the op-
-  tions from different places according to the following order: the
-  DISPLAY variable, the options file, the command line.
-
-- Implemented FR03D01347. Added 'composite' to parsed options.
-
-- Always activate shared memory support in the remote X server proxy.
-
-- Modified nxagentCopyArea for the case the source is a shared memory
-  pixmap. The pixmap on the X server is not synchronized, but the con-
-  tent of the shared pixmap mantained by the agent is placed directly
-  on the destination drawable. This allows to skip the following Copy-
-  Area operation.
-
-nxagent-2.0.0-30
-
-- Added the missing flush of the Xlib buffer at the beginning of
-  the block handler.
-
-nxagent-2.0.0-29
-
-- Changes in the block and wakeup handlers to queue multiple reads
-  and flush the link on demand.
-
-- Removed the unused code in Control.h and Control.c. Renamed the
-  files as Client.h and Client.c.
-
-- Added support for the '-nocomposite' command line option.
-
-nxagent-2.0.0-28
-
-- Moved the composite code to Composite.h and Composite.c.
-
-- Redirected the top-level windows when running in rootless mode.
-
-nxagent-2.0.0-27
-
-- When the composite extension is supported by the remote display,
-  the agent window is redirected to the off-screen memory of the
-  X server.
-
-- Imported Xcomposite.c, Xcomposite.h and xcompositeint.h from the
-  3.0.0 branch to be able to activate the off-screen redirection of
-  the top level windows.
-
-- Added Composite to the list of agent options. The default is to
-  use the composite extension, when available.
-
-nxagent-2.0.0-26
-
-- Avoided to suspend the clients on excess of karma or after a get
-  input focus request.
-
-- Images are now split only when the agent is in congestion state.
-
-- Moved all the image related functions from GCOps.h and GCOps.c to
-  Image.h and Image.c.
-
-- Removed the unused includes in GCOps.c and Image.c.
-
-- Added the karma delay field to the NXGetControlParameters() call.
-
-- Renamed placeholder.xpm as nxmissing.xpm. Renamed the Icon.h file
-  as Icons.h. Added there a define to point at nxmissing.xpm in the
-  include.
-
-nxagent-2.0.0-25
-
-- Implemented the FR03D01334. Option keyboard is now a synonym of
-  option kbtype.
-
-nxagent-2.0.0-24
-
-- Ensured that the split procedure is completed before executing a
-  render operation that required a synchronization of a shared mem-
-  ory pixmap.
-
-- Added the appropriate checks to avoid synchronizing the same sha-
-  red memory pixmap multiple times.
-
-nxagent-2.0.0-23
-
-- Imported changes to NXrender.c and NXshm.c in the files for the
-  3.0.0 port.
-
-nxagent-2.0.0-22
-
-- Implemented FR03D01331. Options shpix and shmem enable/disable the
-  use of shared pixmaps and shared memory extension.
-
-- Implented handling of value "query" for nxagentKbtype. This value
-  is passed by the NX client for MacOSX. If value of nxagentKbtype is
-  "query" or NULL we init keyboard by core protocol functions reading
-  the keyvoard mapping of the X server. The property _XKB_RULES_NAMES
-  is always set on the root window with default values of model and
-  layout.
-
-- Fixed TR11C01223. When the XDM connection can't be established the
-  agent creates an alert to notify the user that XDM session failed
-  to start.
-
-- Changed Clipboard.c to fix invalid read errors in nxagentGetClip-
-  boardWindow() function.
-
-- Implemented FR11C01218. Modified Font.c introducing the new function
-  nxagentLoadQueryFont, this function loads the font_struct struct
-  locally instead of sending a QueryFont request.
-
-- Modified nxagentListRemoteFontsfunction to fill nxagentFontList
-  struct with all remote fonts, avoiding further calls to XListFonts.
-
-- Added two functions, nxagentFreeRemoteFontList and nxagentFreeFont,
-  used in disconnect phase to empty the nxagentFontList struct and
-  the cached FontStruct elements, respectively.
-
-nxagent-2.0.0-21
-
-- Updated to include the remote proxy version in the NXGetControl-
-  Parameter reply.
-
-- Updated to use the NXDisplayFlush() and NXSetDisplayPolicy() int-
-  erfaces.
-
-nxagent-2.0.0-20
-
-- NXInitDisplay() and NXResetDisplay() are called at the time we
-  open or close the display, to let nxcompext set up its internal
-  structures.
-
-nxagent-2.0.0-19
-
-- Activated the streaming of the images even in the case of a link
-  type LAN.
-
-- In NXmiexpose.c, if the number of rectangles in an exposed region
-  exceeds 4, we let a predicate function decide if it is better to
-  send the window extents, rather than the rectangles in the region.
-
-- Added the NXAGENT_SERVER define in the Imakefile. It will be used
-  in future to mark all the modifications made to files we imported
-  from other layers.
-
-- Removed the warnings from NXmiexpose.c.
-
-nxagent-2.0.0-18
-
-- Imported NXmiexpose.c in the agent code.
-
-- Removed NXmiwindow.c from the agent code. We now use the original
-  miwindow.c
-
-- Removed the static qualifier from the _NXFontPath definition.
-
-- Started implementing the new lazy encoding mechanism. For each of
-  the drawables, the agent will create a "corrupted" region and will
-  try to synchronize the drawable when there is bandwidth available.
-  This is a work in progress.
-
-- Implemented the function nxagentFbOnShadowDisplay. This is a test
-  facility which opens a window on the display showing the content
-  of the agent's framebuffer.
-
-nxagent-2.0.0-17
-
-- The image streaming procedure is now activated also when using a
-  link of type LAN.
-
-- Removed the call to NXTransDestroy() in nxagentCloseDisplay. The
-  NX transport is now implicitly shut down by either NXForceDisplay-
-  Error() or XCloseDisplay().
-
-- Updated to comply with the new NX function prototypes introduced
-  in nxcomp-2.0.0-31.
-
-nxagent-2.0.0-16
-
-- Fixed a bug in the nxagentModifyPixmapHeader function that was
-  causing some glyphs to be displayed incorrectly.
-
-- Implemented the test function nxagentPixmapOnShadowDisplay, useful
-  to display a pixmap on the real screen to check its consistency.
-
-nxagent-2.0.0-15
-
-- Ensured that, before restarting a client after a no-split, all the
-  pending image commits are executed.
-
-- Installed the display error predicate function before trying to
-  open the display even at session startup. This prevents the agent
-  from disappearing silently if a failure occurs before the display
-  initialization is completed.
-
-- Moved the initialization of the callback functions in Display.c.
-
-- Added some interfaces to manipulate the callbacks and the error
-  handlers and verify the state of the display flags.
-
-nxagent-2.0.0-14
-
-- Implemented stub versions of the nxagentDisplayCongestionHandler()
-  and nxagentDisplayBlockHandler() callbacks. See nx-X11-2.0.0-17.
-
-- Added the nxagentDisplayErrorPredicate() function. In combination
-  with changes implemented in nx-X11-2.0.0-16, this allows the agent
-  to abort a blocking operation and shutdown the display in a timely
-  fashion if a signal or any other error condition is received insi-
-  de Xlib.
-
-- Modified nxagentWaitSplitEvent() to use XIfEvent() as we can trust
-  the proxy to either send the event or give up the proxy connection.
-  The function will also give up when an error condition is raised,
-  like for example a session termination requested by the user.
-
-- Removed any remaining reference to the unused display buffer and
-  image cleanup functions.
-
-- Fixed exposures problems when reconnecting.
-
-- Solved TR05C00896. The problem was due to window manager utilizing
-  zero-thick-lines drawing requests. These drawing operations are now
-  performed by calling fbPolySegment() instead of miPolySegment(),
-   which doesn't handle the zero-thick-lines drawing case.
-
-nxagent-2.0.0-13
-
-- Improved the management of the expose events. We now create the
-  fake window used to keep the agent synchronized with the X server
-  only once, instead of creating and configuring a different window
-  for each generated region.
-
-- A warning is printed if the changes requested for the fake window
-  don't match the changes reported in the subsequent ConfigureNotify
-  event.
-
-- Imported previous changes in NXevents.c into the 3.0.0 port.
-
-nxagent-2.0.0-12
-
-- Activated the image streaming also during the reconnection. This
-  makes possible to leverage the remote disk cache.
-
-- Ensured that all clients are restarted when the session is suspen-
-  ded. This is required because the proxy is gone but we may have
-  some client still waiting for the completion of a split procedure.
-
-- Skipped the reset of the keyboard device if the display breaks at
-  the time it is being reconnected.
-
-- As the reset of the keyboard may have failed before we were able
-  to set a valid DeviceIntPtr, also added a check in ProcessPointer-
-  Event(), in NXevents.c to verify that the state of the display is
-  valid before accessing any of the device members. This is to be
-  better investigated.
-
-nxagent-2.0.0-11
-
-- Solved TR02D01298. The clip region associated to the current glyph
-  was not updated because the serial number of the virtual pixmap
-  pointed by the picture was not incremented.
-
-- Imported the NXmiglyph.c file from render directory.
-
-- Removed the patch added in the release 1.3.2-6 temporary fixing this
-  problem.
-
-nxagent-2.0.0-10
-
-- Various improvements the wakeup procedures.
-
-- Implemented the FR10C01110. Now, the X11 agent manages both the
-  PRIMARY and CLIPBOARD selections. It is possible copy and paste text
-  also by using Ctrl+C and Ctrl-V.
-
-- Modified NXdispatch.c in order to correctly include header files.
-
-- More cosmetic changes and code cleanup.
-
-- Imported changes into the files for the 3.0.0 port.
-
-nxagent-2.0.0-9
-
-- Rewritten the procedures suspending and resuming the clients in
-  Control.c. This solves a problem with clients that were restarted
-  at wrong time and should ensure that multiple events for the same
-  client are correctly handled.
-
-- Removed the calls to NXSetUnpackGeometry() setting the parameters
-  for the client 0. The geometry is now set only at the right time,
-  just before trying to unpack the image.
-
-- Removed the sample code using the NXTransChannel() interface.
-
-nxagent-2.0.0-8
-
-- Added test code showing how to open a new NX channel by using the
-  NXTransChannel() interface.
-
-- Streaming of images is not attempted in the case of link LAN.
-
-- Added preliminary code to the tell the proxy to flush the link if
-  the agent is idle.
-
-- Imported changes from nx-X11-2.0.0-14 in NXdixfonts.c.
-
-nxagent-2.0.0-7
-
-- Modified exposures managing: agent synchronizes both with remote X
-  server and remote window manager for every generated region. Synch-
-  ronization is reached sending a ConfigureWindow request for a fake
-  window created on purpose. This way the exposures for the resulting
-  region coming from calculating the difference between local region
-  and the remote region are sent to clients in order to avoid duplica-
-  ted refreshes.
-
-- Improved new algorithm for managing exposures in order to work pro-
-  perly also in rootless mode: added privates to windows in order to
-  get information about mapping of windows on remote X server and vi-
-  sibility state too. This way local exposures are replaced by remote
-  ones if windows are mapped only for agent or windows are not fully
-  visible. This solves TR08C00971.
-
-- Window attributes values about backing store and save-under are re-
-  spectively set to NotUseful and False when creating a window on re-
-  mote X server and ignored when a client requests to change these
-  attributes.
-
-- Removed a no more needed function call to generate exposures when
-  resizing windows.
-
-nxagent-2.0.0-6
-
-- Updated the NoMachine copyright notices.
-
-nxagent-2.0.0-5
-
-- Added handling of font reconnection failure. In case of failure in
-  reconnecting some font, the agent adds the font server connection
-  forwarded by nxcomp to the font path of the X server.
-
-- Fixed TR09C01022. Moved the handling of the session states into
-  main cycle. The session states are not more handled into SIGHUP and
-  IOError handlers but into nxagentHandleConnectionStates() called in
-  nxagentWakeupHandler().
-
-- In ResizeChildrenWinSize(), privates storing window geometry are
-  updated even if the call to PositionWindow() is skipped. This have
-  to be done because the window is moved by the X server accordingly
-  with window gravity. This prevent some window positioning error on
-  the real display evidenced with OpenOffice and GNOME.
-
-nxagent-2.0.0-4
-
-- Solved TR12C01234. In some conditions Alt-F4 keystroke made the user
-  unable to open the Gnome Menu panel. This was due to the agent dis-
-  carding KeyRelease events for Alt-F4 and Alt-F2.
-
-- Undefined TEST and DEBUG in Dialog.c
-
-- Changed the NXAGENT_VERSION define from 1.5.0 to 2.0.0
-
-- Caching and streaming of images is now disabled when dispatching
-  requests from the GLX and XVideo extensions.
-
-- Added the NXxvdisp.c and NXglxext.c files. These files are needed
-  to intercept calls to the XVideo and GLX extensions. Only files
-  in the main directory are imported. Files in the X directory, used
-  for the 3.0.0 port, for now are empty.
-
-- Added the nxagentXvTrap and nxagentGlxTrap flags. These flags are
-  set when dispatching requests from the XVideo and GLX extensions.
-
-- Added the GL and Xext include directories to the Imakefile to be
-  able to compile the NXxvdisp.c and NXglxext.c sources.
-
-- Modified the NXrender.c and NXshm.c files to set the nxagentGCTrap
-  nxagentRenderTrap and nxagentShmTrap even when dispatching requests
-  from swapped clients. Files for the 3.0.0 port are not updated.
-
-nxagent-2.0.0-3
-
-- Solved a problem in the export of WM_SIZE_HINTS properties in root-
-  less mode on 64 bit machines.
-
-- Modified Render.c in order to correctly process Xrender header fi-
-  les on 64 bit machines.
-
-- Made changes in order to compile the agent in the Cygwin environ-
-  ment.
-
-- Renamed the files Time.* to Millis.*
-
-- Specified the relative path of some included header files.
-
-- In the Imakefile added a new include paths order related to the
-  Cygwin environment to avoid name clashes.
-
-- Disabled the MIT-SHM extension in the Cygwin environment.
-
-- Fixed TR11C01186. Added -timeout item to the usage message.
-
-- Fixed TR08C00945. Scrolling a document in Firefox caused image left-
-  overs with animated banners. Set the right window gravity on windows
-  created in the real X server. Let X move children for us accordingly
-  with window gravity attribute, without dix interferences.
-
-- Removed logs related to parsing of the options file.
-
-- Modified dialogs in order to show the name of the session in the
-  caption.
-
-nxagent-2.0.0-2
-
-- Imported changes up to nxagent-1.5.0-112.
-
-- Fixed TR12C01241. The failure condition returned by the XQueryTree
-  function is managed in order to avoid the subsequent errors.
-
-- Fixed the TR11C01165. X11 sessions could not be started on Ubuntu
-  5.10 because of the different location of fonts. Now we check the
-  existence of the fonts directory pointed by the default XF86 and
-  X.org font path and, if the directory does not exist, we use the
-  alternate font path used on Ubuntu.
-
-- Set the default value of DeviceControl option to False before resu-
-  ming a session.
-
-- Added a warning message printed if reset of keyboard fails at recon-
-  nection.
-
-- Fixed TR11C01185. Solved by checking if there are windows iconized
-  when a window is destroyed.
-
-- Fixed TR11C01164. The xkbcomp process used LD_LIBRARY_PATH as it was
-  a child of the agent. Added a call to NXUnsetLibraryPath() in Init.c
-  in order to remove LD_LIBRARY_PATH before executing a child process.
-
-- Check if there are windows iconized before terminating a rootless
-  session.
-
-- Modified CHANGELOG to include reference to fixed TRs TR08C00967 and
-  TR08C00969. Removed some typo.
-
-- Fixed TR11C01194. The agent crashed if launched with -kb option.
-
-- Fixed TR10C01042. The keyboard didn't work if the session migrated
-  from Apple X server to another platform and viceversa. This has been
-  solved by initializing the keyboard device whenever the session is
-  resumed. This feature can be disabled by the new option -nokbreset.
-
-- Fixed some compilation error arising if TEST was enabled in the file
-  Keyboard.c.
-
-- Fixed TR11C01167. During the disconnection the font structures poin-
-  ted by the font cache were freed leaving inconsistent data in the
-  corresponding privates. Now they are nullified and the GCs are che-
-  cked to guarantee a correct font handling in the suspended state.
-
-nxagent-2.0.0-1
-
-- Opened the 2.0.0 branch based on the 1.6.0-11.
-
-nxagent-1.6.0-11
-
-- Updated the NX.original copies of files in X directory.
-
-- Merged the NX changes:
-
-  - From dix/extension.c to NXextension.c.
-  - From dix/dixfonts.c to NXdixfonts.c.
-  - From dix/glyphcurs.c to NXglyphcurs.c.
-
-- Export of CARDINAL properties are expanded to 64 bit units on 64
-  bit machines.
-
-- Solved a segmentation fault when handling configure notify events
-  in rootless mode on 64 bit machines.
-
-- Merged the NX changes from dix/property in X/NXproperty.c.
-
-- Correctly allocated the local variable used in the call to NXGet-
-  CollectedInputFocus to be of 64 bit on 64 bit machine.
-
-- Defined symbolic constants XlibWindow in order to propertly handle
-  export property on 64 bit machine.
-
-- Moved the XlibAtom define from Atoms.h to Agent.h.
-
-- Modified export properties of type Window and Atom in order to han-
-  dle correctly Window and Atom types on 64 bit machines.
-
-- Removed some invalid read in Atom handling code when compiled for 64
-  bit, due to mismatched size of Atom type between Xlib and Xserver
-  code.
-
-- Modified some header files in order to properly see the correct pro-
-  totypes of some Xlib structures on 64 bit machines.
-
-- The variable currentDispatch is always defined.
-
-- The dispatch current time is updated, this way the initial timeout
-  can elapse and the splash window is removed.
-
-nxagent-1.6.0-10
-
-- Imported changes from nxagent-1.5.0-103.
-
-- Removed some redundant redeclarations.
-
-- Merged the NX changes from randr/randr.c to NXrandr.c.
-
-- Removed some warnings in NXrandr.c.
-
-- Removed NXAGENT_FORCEBACK and NXAGENT_INTERNALBS code.
-
-- Added ddxInitGlobals function in order to compile with the new X.org
-  tree.
-
-- Converted nxagentSynchronizeShmPixmap from macro to function to
-  solve a graphical render problem caused by the variable's scope.
-
-nxagent-1.6.0-9
-
-- Imported changes from nxagent-1.5.0-102
-
-- Fixed TR10C01124. Function nxagentSetPictureFilter() filled the log
-  with  a debug message.
-
-- Removed a debug message in Events.c.
-
-- Run function nxagentSetTopLevelEventMask() only in rootless mode.
-
-- In the Java application IntelliJ the dropdown menus was shown in a
-  wrong position when the main window was moved or minimized. The
-  problem is solved for KDE desktop environment.
-
-- Fixed TR08C00967, TR08C00969, TR08C00941. Our incomplete implementa-
-  tion of the MIT-SHM X11 extension was a problem for some applica-
-  tions using the Shared Memory Pixmaps. Now the extension support has
-  been completed, so the nxagent can handle the Shared Memory Pixmaps
-  requests. Introduced some changes in the render implementation to
-  synchronize the content of the Shared Memory Pixmaps with the X ser-
-  ver before performing the ChangePicture and Composite operations.
-
-nxagent-1.6.0-8
-
-- Fixed TR09C01028. The problem was the GC foreground was not updated
-  on the X server. This was due to the private fields was not copied
-  from a GC to another in the function nxagentCopyGC(). Added macro
-  nxagentCopyGCPriv in GC.h.
-
-- Solved TR11C01162. Removed the dialog shown by nxcomp/nxagent when
-  the resume of a session is happening over a slow link.
-
-nxagent-1.6.0-7
-
-- Imported changes up to nxagent-1.5.0-100.
-
-- Fixed some compilation errors.
-
-- Fixed a typo in nxagentChangeClip() declaration.
-
-- Fixed TR10C01040. After the session resume the applications using
-  OpenGL were not correctly resumed because some GCs were not recon-
-  nected. Now we save these GCs in a safe vector, so we can't lose
-  them.
-
-- Improved font reconnection procedure in order to take advantage of
-  new font channel provided by nxcomp. If resuming session fails be-
-  cause missing fonts, the font channel provided by nxcomp is added
-  to font paths of X server. After reconnection succeded the font
-  channel is removed from font paths.
-
-- In the Java application IntelliJ the dropdown menus remained opened
-  and shown in a wrong position when the main window was moved or
-  minimized. This problem has been solved by sending a sinthetic event
-  to client. This solves partially TR09C01012.
-
-- In the same application the caret was not shown in the text window.
-  Solved the problem by setting nxagentGCTrap before calling a MI
-  function in every GC operations.
-
-- Merged the NX changes:
-
-  - From render/glyph.c to NXglyph.c.
-  - From Xext/shm.c to NXshm.c.
-  - From render/render.c to NXrender.c.
-  - From mi/miwindow.c to NXmiwindow.c
-  - From render/glyphstr.h to NXglyphstr.h.
-  - From render/picturestr.h to NXpicturestr.h.
-  - From render/picture.c to NXpicture.c.
-  - From dix/dispatch.c to NXdispatch.c.
-  - From dix/events.c to NXevents.c.
-
-- Changed picturestr.h glyphstr.h to remove some formatting changes
-  compared to the original files.
-
-- Disabled Xinerama extension in order to fix a type conflict in NX-
-  dispatch.c.
-
-- The current directory has been moved in front of the include dire-
-  ctory list.
-
-- Removed NXAGENT_FORCEBACK code in files imported from DIX.
-
-- Changed NXshm.c NXrandr.c NXproperty.c  NXpicture.c NXglyphcurs.c
-  NXglyph.c NXextension.c NXrender.c NXdixfonts.c NXdispatch.c NXmi-
-  window.c to remove some formatting changes compared to the original
-  files.
-
-- Added copyright notice to file NXrandr.c.
-
-- All files, except those from mi and dix, compile fine in the new
-  tree. Problems remain with different size of Atoms and other XID
-  objects.
-
-- More compilation fixes for the new tree.
-
-- Merged the NX changes from dix/window.c to NXwindow.c.
-
-- Changed NXwindow.c and NXevents.c to remove some formatting chan-
-  ges compared to the original files.
-
-- More compilation fixes aimed at porting the agent to the new tree.
-
-- Started porting the agent to the 6.8.99.16 X.org tree.
-
-- Lot of compilation fixes aimed at building in the new environment.
-
-- Files imported from the X.org tree's dix and mi will have to be
-  recreated in the nxagent/X directory. The new files will be inclu-
-  ded and built from the nxagent/X director if the NXAGENT_UPGRADE
-  symbol is defined (as it is the case when building in the 2.0.0
-  nx-X11 tree), otherwise the usual NX* files in the nxagent's dir-
-  ectory will be compiled.
-
-- Fixed TR09C01021. SIGHUP it was not received from the proxy. The
-  handler of SIGHUP must be installed also in the case of not persi-
-  stent sessions.
-
-- In non persistent case: if session is normally running, SIGHUP sig-
-  nal is dealt like SIGTERM, otherwise it is passed to the proxy.
-
-- Fixed TR09C01027. Changed function nxagentHandleConfigureNotify()
-  in order to get changes of the staking order in a rootless session
-  even if no window manager is running.
-
-- Fixed TR09C01025. The problem was XView application could be unable
-  to respond to user's input. Modified the Event Mask for non top le-
-  vel windows reparented by the root window. Set the input member of
-  XWMHints to communicate the window manager the keyboard focus model
-  used by the application.
-
-- Fixed TR09C01026. Added 'fast' and 'slow' to the set of accepted
-  command line parameters. 'fast', 'slow' and 'geometry' command line
-  parameters have precedence regarding the options file.
-
-- Fixed TR08C00968. There was a problem in the implementation of the
-  render extension.
-
-- Fixed TR09C01016. In rootless mode when the session was resumed,
-  the cursor was shown with a wrong shape.
-
-- Fixed TR09C01011. Allowed clients to monitor the root window for
-  structure redirect, button press and resize redirect events in root-
-  less mode. This is a quick hack to make the java bean shell work
-  flawlessy with the agent.
-
-- Solved TR08C00961. Improved the algorithm updating the sprite win-
-  dow. Now it is updated based upon crossing and motion event. Since
-  on some X server, like Windows and MacOsX X servers, the only cros-
-  sing event is not a reliable method to trace the sprite window chan-
-  ges.
-
-- Fixed TR08C00966. Solved the problem on Windows when a rootless
-  session is suspended and some of the application windows are
-  minimized.
-
-- Fixed TR08C00960. Updated the internal screen dimension in rootless
-  sessions at reconnection.
-
-- Fixed TR09C01005. The problem was that the 'render' option on the
-  command line was overridden by the one provided in the options file.
-
-- Implemented the HandleEmptySplitEvent function that synchronizes all
-  the drawables after the depletion of the split store, when the lazy
-  option is activated.
-
-- Some changes in order to avoid duplicated refreshes when display-
-  ing Mandrake's kde menu.
-
-- Changed level of some logs from WARNING into TEST in Window.c and
-  in Rootless.c.
-
-- Fixed TR08C00958. Changed the log message printed when the user re-
-  quest to resume the session.
-
-nxagent-1.6.0-6
-
-- When reconnecting, try to estimate the shift on the main window due
-  to WM reparenting.
-
-- In the handling of configure events, if a WM is running save the po-
-  sition of the main window only if event is synthetic.
-
-nxagent-1.6.0-5
-
-- Command line option -noshmem disables shared memory extension in the
-  agent.
-
-- Changed level of some logs from WARNING into TEST.
-
-nxagent-1.6.0-4
-
-- Some changes in order to improve handling of expose events in root-
-  less. The GetInputFocus request is not sent after reconfiguring a
-  top level window: window manager intervention could give race condi-
-  tions. The request is placed in WindowsRestructured() in order to be
-  sure it is sent after any event that could generate expose.
-
-- Zero lenght change property are now imported in rootless mode.
-
-- Corrected few typos.
-
-- Replaced the function usleep with NXTransContinue when NX transport
-  is running.
-
-- Changed the session state to GOING_DOWN as soon as the reconnection
-  is failed.
-
-nxagent-1.6.0-3
-
-- Updated rootless toplevel window map when a window is reparented to
-  the root window.
-
-- Renoved duplicated entry in rootless toplevel window map.
-
-nxagent-1.6.0-2
-
-- Removed TEST and DEBUG in Color.c.
-
-- Removed a compilation error in Atoms.c if DEBUG is enabled.
-
-- Removed invalid read at server reset in rootless mode, now the a-
-  toms description are duplicate before that we cache them.
-
-- Now the local atom in the atom cache are reset when exiting from
-  the dispatch loop.
-
-nxagent-1.6.0-1
-
-- Opened the 1.6.0 branch based on nxagent-1.5.0-87.
-
-nxagent-1.5.0-87
-
-- Corrected the enable-disable lazy encoding dialog in order to show
-  the correct keystroke Ctrl-Alt-E.
-
-nxagent-1.5.0-86
-
-- Reset agent position at reconnection when the new size of display
-  doesn't match the old size and fullscreen is on.
-
-- Inserted a comment about handling of expose events.
-
-nxagent-1.5.0-85
-
-- If fullscreen and resize options are true when reconnecting, geo-
-  metry option is ignored and the root window is resized to the en-
-  tire screen.
-
-- Read the position of the main window at startup from geometry op-
-  tions.
-
-nxagent-1.5.0-84
-
-- Changed the keystroke Ctrl-Alt-L to toggle the image encoding on
-  and off to the new combination Ctrl-Alt-E.
-
-- Enabled the keystroke Ctrl-Alt-M to minimize the root window also
-  in window mode.
-
-nxagent-1.5.0-83
-
-- Replaced the call to XIfEvent() with something less efficient but
-  safer, based on XCheckIfEvent(). The previous version might never
-  return if an I/O Error was encountered waiting for the event. The
-  new version fails gracefully, and returns after having restarted
-  the client.
-
-nxagent-1.5.0-82
-
-- Removed some debug logs.
-
-nxagent-1.5.0-81
-
-- Forced window mode if X server geometry has changed at reconnection.
-
-nxagent-1.5.0-80
-
-- Reset resize desktop at startup flag before reconnection.
-
-nxagent-1.5.0-79
-
-- Removed race condition in the parsing order of the options parame-
-  ter, now the geometry parameters are set in screen initialization.
-
-nxagent-1.5.0-78
-
-- Disabled auto-resize and viewport mode dialog in case of rootless
-  session.
-
-- Removed no more used -backingstore option from usage messages.
-
-- Modified -bs command line option: now the default value "when_re-
-  quested" is always set.
-
-- Fixed wrong size of root window when switching from full screen to
-  window mode and viewport navigation mode is enabled.
-
-- Added option that solved a minimize bug in LeaveNotify when the
-  root window is in full screen and the user is using viewport navi-
-  gation mode.
-
-- Forwarded HUP signal to NX transport, when session state is up and
-  running.
-
-nxagent-1.5.0-77
-
-- Do PutImage in every case. Don't check if the drawable is synchro-
-  nized.
-
-- Do CopyArea, CopyPlane, Composite in every case, don't check whether
-  the source is dirty.
-
-nxagent-1.5.0-76
-
-- Terminate rootless session 15 seconds after the last mapped window
-  has been destroyed.
-
-nxagent-1.5.0-75
-
-- Ctrl-Alt-T shows suspend/terminate dialog also in rootless mode.
-
-- Sleeps 50 ms in the block handler if the session state is down.
-
-- In rootless mode, the focus window is changed following FocusIn
-  events received from the real X server, also in the case no win-
-  dow manager has been detected.
-
-nxagent-1.5.0-74
-
-- Changed the alerts names to comply with nxcomp-1.5.0-57.
-
-- Moved loading of placeholder from startup to the first time it is
-  needed.
-
-- Corrected a typo in the CHANGELOG.
-
-nxagent-1.5.0-73
-
-- Ignored put image on not synchronized drawables, when the image
-  doesn't cover the entire surface.
-
-- Added parsing of render parameter in option file.
-
-- Ignored I/O Error when session is suspended.
-
-- Managed I/O Error at reconnection.
-
-nxagent-1.5.0-72
-
-- Fixed offset of the default window at reconnection and after switch-
-  ing from fullscreen in window mode.
-
-- Suppressed the -lazy command line option.
-
-- Made some slightly changes in GCOps.c and Pixmap.c in order to com-
-  ply with the new 'Lazy' option.
-
-- Avoided to do CopyArea, CopyPlane and Composite operations when the
-  source drawable is dirty.
-
-- Rootless disconnect dialog has changed. This dialog is launched
-  after some time the last window has been closed.
-
-- Ignored geometry changes at reconnection if resize at startup is
-  not set.
-
-- Removed reset of the offset of the root window in viewport mode at
-  reconnection.
-
-- Fixed some refreshes problems in viewport mode and in desktop resize
-  mode.
-
-- Fixed a memory leak in nxagentWindowExposures().
-
-- Added predicate to nxagentDispatchEvents.
-
-- Implemented framework in order to wait for a free resource entry,
-  when calling the asynchronous Collect* functions.
-
-nxagent-1.5.0-71
-
-- Added keystroke Ctrl+Alt+L switching lazy encoding option.
-
-- Disabled viewport movement in resize mode.
-
-- Changed agent geometry at screen resize.
-
-- Changed agent geometry at initialization.
-
-nxagent-1.5.0-70
-
-- Restored the set of blocked signal after the dialog pid just laun-
-  ched has been stored.
-
-- Removed an already fixed FIXME.
-
-- Updated the copyright message.
-
-nxagent-1.5.0-69
-
-- Started working at the integration of the lazy encoding functiona-
-  lity. Made the agent draw the placeholder if the image is split and
-  never suspend the client. There is no provision for synchronizing
-  the drawables yet.
-
-- Made the lazy encoding configurable by the new 'Lazy' option.
-
-- Updated to include the changes in the NXStartSplit() and NXCommit-
-  Split() requests.
-
-- This version requires nxcomp-1.5.0-55 and nxcompext-1.5.0-16.
-
-nxagent-1.5.0-68
-
-- Fixed reconnection of iconified windows.
-
-- Ignored the X server's scratch pixmap at reconnection.
-
-- The desktop gets automatically resized at reconnection if the desk-
-  top resize option is enabled.
-
-- Added the resize option in nxagentProcessOptionsFile() to allow the
-  user to change the geometry of both the root and the default window
-  at reconnection.
-
-- Fixed max size of the default window at startup when auto-resize
-  mode is enabled or in the case of a reconnected session.
-
-- Made some minimal changes in Atoms.c and NXdispatch.c.
-
-nxagent-1.5.0-67
-
-- Changed handling of expose events received from real X server. A re-
-  gion is composed from expose events by checking the count field.
-
-- Reimplemented the exposures managing. Now the GetInputFocus request
-  is sent after a window has been configured or unmapped. We use a
-  vector to store windows originating expose events while waiting for
-  the reply to GetInputFocus.
-
-nxagent-1.5.0-66
-
-- Added the DisplayLatency value in the agent options. This is int-
-  ended to give a hint about the latency of the current display
-  connection. The value is currently used to determine if the agent
-  is running across a slow link, and so it's appropriate to display
-  the begin-reconnection alert.
-
-nxagent-1.5.0-65
-
-- Added the DesktopResize option. It controls the behaviour of the
-  automatic (RandR) resize of the desktop when dragging the agent's
-  window border.
-
-- Automatic resize is again the default.
-
-- Disabled the test logs in Events.c, GCOps.c Pixmap.c, Handlers.c,
-  Reconnect.c.
-
-- More cosmetic changes and code cleanup.
-
-nxagent-1.5.0-64
-
-- Rewritten the image streaming procedure to better leverage the new
-  infrastructure. The start-split/end-split procedure is always init-
-  iated by the agent, including when the size of the image is below
-  the threshold, but the client is only suspended when the split has
-  taken place in the NX transport.
-
-nxagent-1.5.0-63
-
-- Updated image streaming to use the new NX notification events.
-
-- Removed the references to the NXSync() operation, not used anymore
-  by the agent.
-
-nxagent-1.5.0-62
-
-- Fixed wrong position of the root window in case of viewport naviga-
-  tion mode.
-
-- Added a field to the client private to trace the client type.
-
-- Tracked which clients are nxclient dialogs in order to not run the
-  pulldown dialog on them.
-
-nxagent-1.5.0-61
-
-- Disabled server reset if not needed by XDMCP.
-
-- Disabled persistence for indirect XDMCP session until the first gre-
-  eter with the list of host has disappeared.
-
-- Created a small data structure to contain information about integri-
-  ty status and placeholder status of a drawable.
-
-- Modified the call to nxagentRealizeOnePixmap function in order to
-  avoid errors during the signal handling.
-
-nxagent-1.5.0-60
-
-- Added the XDMCP option. If both Rootless and XDMCP are selected the
-  session will fail.
-
-nxagent-1.5.0-59
-
-- Limited the permission to reset the agent only to indirect XDMCP
-  sessions, only one reset is allowed.
-
-- Fixed max size of the default window when switching from fullscreen
-  to window mode and auto-resize is disabled.
-
-nxagent-1.5.0-58
-
-- Enabled reset mechanism, in order to make XDMCP session work proper-
-  ly.
-
-- Added XSync for window manager detection, after a server reset since
-  the XInternAtom already used should be cached.
-
-- Now the pixmap status is always tested on real pixmap.
-
-- The placeholder is drawn only once per drawable.
-
-- Implemented nxagentUnmapWindows() in case of failed reconnection if
-  the session was running in fullscreen mode and NX transport is not
-  enabled.
-
-- In nxagentPutSplitImage(), passing leftPad to XCreateImage().
-
-- This version avoids sending the XSync() to the remote when a large
-  amounts of GetInputFocus requests are issued by the same client.
-  It will require more testing, especially to verify how it works on
-  old Windows machines.
-
-- Changed the NXCommitSplit() call to comply with the new interface.
-
-- The drawable status is now propagated on graphic operations where
-  the source is using the tile and stipple components on the graphic
-  context and the tile or stipple are not synchronized. This affects
-  the following operations:
-
-  - PolyLines
-  - PolySegment
-  - PolyRectangle
-  - PolyArc
-  - FillPolygon
-  - PolyFillRect
-  - PolyFillArc
-  - PolyText8
-  - PolyText16
-
-nxagent-1.5.0-57
-
-- Removed two XSync() operations at screen initialization.
-
-- Modified keyboard initialization in order to load the correct rules.
-  This is choosen according to the vendor string of X-Window system in-
-  stalled on the local machine.
-
-- Corrected a few typos.
-
-- When the NX transport is present, the failed reconnection dialog is
-  launched on the remote X server by using the NXTransAlert() function.
-  The same dialog is managed by NXTransDialog() when a session is run
-  by connecting directly to the display.
-
-- Removed the function nxagentUnmapAllWindows().
-
-nxagent-1.5.0-56
-
-- Set the parent window for the pulldown dialog.
-
-nxagent-1.5.0-55
-
-- Added an alert at the time the reconnection procedure begins. The
-  alert is shown only when the NX transport is present and the link
-  type is not LAN and is removed at the end of the resume operation.
-
-- Removed the former code used for testing the alert functionality.
-
-- Moved the function removing the splash window in Splash.c.
-
-nxagent-1.5.0-54
-
-- Fixed initialization of window privates storing exposed regions.
-  This solves a bug affecting the refresh of windows introduced in
-  nxagent-1.5.0-42.
-
-- Added a STARTING state to nxagent. Until the agent is in this state
-  the suspension mechanism is not activated.
-
-nxagent-1.5.0-53
-
-- Added the special keystroke Ctrl+Alt+R to enable or disable the
-  auto-resize mode.
-
-- A dialog notifies the user when the auto-resize mode is toggled.
-
-- Added a test alert at startup, to verify that NXTransAlert() is
-  working as expected.
-
-nxagent-1.5.0-52
-
-- Changed the code to call NXTransDialog() and NXTransExit().
-
-nxagent-1.5.0-51
-
-- Solved a bug that prevented the clients that had been restarted
-  to be immediately selected for input.
-
-- Removed some code that was added for debugging.
-
-nxagent-1.5.0-50
-
-- Fixed a memory leak in nxagentHandleExposeEvent().
-
-- Fixed a memory leak in nxagentDestroyWindow().
-
-- Now rootless dialog is launched only when last mapped window is
-  deleted, since we have pulldown window to control the session.
-
-- Added pulldown dialog to handle NX windows in rootless sessions.
-  This dialog is activated from a "magic" slice of window under the
-  top border.
-
-- Solved a problem with sessions that might fail at reconnection.
-
-- Now the message text of the dialog launched in case of failed re-
-  connection explains the reason why the agent cannot be resumed.
-
-- Implemented function nxagentUnmapAllWindows() to unmap all windows
-  if nxagent has failed to migrate the session to the new display.
-
-nxagent-1.5.0-49
-
-- Fixed the problems with propagation of the drawable status.
-
-- Modified nxagentPutSplitImage in order to set the correct height
-  of the last split image.
-
-- Code cleaning and optimization in Dialog.c.
-
-- Solved bug that switched on the full screen state in rootless se-
-  ssion.
-
-- Changed the way dialog caption are set in rootless mode. It is set
-  upon the session name or session id value.
-
-- Corrected the function nxagentFailedReconnectinDialog().
-
-nxagent-1.5.0-48
-
-- Solved bug that switched on the full screen state in rootless se-
-  ssion.
-
-- Changed the way dialog caption are set in rootless mode. It is set
-  upon the session name or session id value.
-
-- Corrected the function nxagentFailedReconnectinDialog().
-
-nxagent-1.5.0-47
-
-- Now we call NXContinueOnDisplayError() with value 1 just after
-  having opened the display. This will cause the NX Xlib to return
-  in the case of an I/O error, instead of quitting the application.
-
-- Removed the references to Context.h and the related elements.
-
-- Reflected the changes occurred in NXlib.c regarding NXDisplayErr-
-  ror() and inverted the logic compared to NXDisplayIsValid().
-
-- Added a dialog box to notify the user when nxagent has failed to
-  migrate the session to the new display. Because the main X agent
-  connection is unavailable, this dialog uses the auxiliary nxcomp
-  keyboard channel.
-
-- Disabled the special keystroke Ctrl+Alt+S if any dialog is already
-  running.
-
-- Started implementing lazy synchronization of pixmaps. At the pre-
-  sent moment the implementation doesn't try to perform any optimi-
-  zation on the windows' regions that have to be redrawn and neither
-  it checks the congestion state. After having synchronized a reaso-
-  nable number of pixmaps, it simply sends to all the affected win-
-  dows an expose event, mandating the repaint of the whole area.
-
-- Removed a warning in Atoms.c.
-
-nxagent-1.5.0-46
-
-- Removed the longjmp() at the time an I/O error was encountered on
-  the display.
-
-nxagent-1.5.0-45
-
-- Removed UNDEFINED status for drawables.
-
-- Now lazy encoding affects only windows.
-
-- Changed the block handler to call NXTransFlush() with 'if needed'.
-
-nxagent-1.5.0-44
-
-- After reconnection, stored exposed regions are reset and the manag-
-  ing of duplicate expose events is restarted.
-
-- Detection of window manager has been moved to the start of screen
-  initialization. Screen dimensions and fullscreen option are over-
-  ridden if no window manager is detected.
-
-- Added a call to XSync() in switching fullscreen function in order
-  to synchronize it with the network behaviour.
-
-- Started adding provision for deferred writes in the NX transport.
-  When the flush policy will be set accordingly, X data accumulated
-  by the proxy will be written to the network under the control of
-  the block and wakeup handlers.
-
-- Fixed a bug in nxagentCopyArea(). In some cases, pixmap drawables
-  was erroneusly supposed to be windows. This produced invalid reads
-  when trying to access to fields of WindowRec structure.
-
-nxagent-1.5.0-43
-
-- In the code managing the property notify events, NXCollectProperty
-  is not called if the window is not found in the tree mantained by
-  the agent.
-
-- Changed managing of screen resize in order to avoid repeated resize
-  of desktop. The agent sleeps one second, then all configure event
-  are read from the queue and the server connection. The desktop re-
-  size is performed after the last read configure event.
-
-- Changed nxagentImportProperty() in order to use NXCollectProperty
-  instead of XGetWindowProperty. This avoids many round-trips in root-
-  less mode.
-
-- Fixed Invalid write problem in nxagentRRSetScreenConfig().
-
-nxagent-1.5.0-42
-
-- Modyfied test of NXSetUnpackGeometry for visuals, so now the compa-
-  rison between visuals is based on their IDs and not on the memory
-  area allocated for their visual structure.
-
-- Modified exposure managing in order to avoid duplicated refreshes.
-  Now only exposed regions not formerly managed yet are sent to the
-  clients.
-
-nxagent-1.5.0-41
-
-- Modified nxagentCloseScreen() in order to free the frame buffer.
-
-- Added information of the integrity of the windows. Now the integrity
-  has became a drawable property that will expand in every drawable to
-  drawable operation.
-
-nxagent-1.5.0-40
-
-- Splitting of images now happens only if the display is a valid con-
-  nection.
-
-- The isItTimeToYield flag is now set in the dispatcher only when the
-  client has been actually suspended because of a karma, a sync, or
-  a split operation.
-
-nxagent-1.5.0-39
-
-- Improved the handling of the PutImage request to offer provision
-  for splitting images coming from orders generated by extensions.
-
-- Fixed a problem with clients being unexpectedly restarted instead
-  of waiting for the end of split.
-
-nxagent-1.5.0-38
-
-- Added a persistent dialog when agent is running in rootless mode.
-
-- Modified the policy of management of nxclient dialogs.
-
-- Fixed memory leak problem in nxagentPutSplitImage().
-
-- Modified printing of some debug messages to avoid passing a null
-  pointer to fprintf().
-
-nxagent-1.5.0-37
-
-- Implemented initial support for streaming the packed images in the
-  handling of the MIT-SHM extension.
-
-nxagent-1.5.0-36
-
-- Updated the pixmap status when a placeholder is copied on the pix-
-  map and when the pixmap is the target of a RENDER composite opera-
-  tion.
-
-- Solved the TR05C00900. The NX transport was forced to be set when-
-  ever the display name contained the nx prefix.
-
-- Implemented the FRSA052393. Removed the compression filters applied
-  by nxagent to cursor pixmaps.
-
-- Modified RANDR implementation to make the user able to resize the
-  desktop by simply dragging the agent window's border. Screen resize
-  is made after a small timeout, to give time to the last configure
-  event to come from the server and avoid multiple re-configurations
-  of the screen.
-
-nxagent-1.5.0-35
-
-- Added the current screen size to the set of sizes returned by the
-  RANDR extension.
-
-nxagent-1.5.0-34
-
-- Corrected the placeholder xpm image.
-
-- Added a client dialog to notify the user that nxagent is running in
-  fast or in slow mode after pressing Ctrl + Alt + S.
-
-- Modified RANDR implementation to give a set of screen sizes. Im-
-  plemented functions actually performing screen resize on a RANDR
-  request. Now toggling to fullscreen make the desktop cover the en-
-  tire screen area.
-
-nxagent-1.5.0-33
-
-- Added an auto-disconnect feature similar to the one present in the
-  Windows Terminal Server. The feature is modeled on the built-in X
-  server's screen-saver. If the agent doesn't receive any input from
-  the user in a given timeout, it will either terminate the session,
-  if no client is connected to the display, or will suspend it, so
-  that applications will be left running.
-
-- The default is to disable the auto-disconnect option. The feature
-  is activated by specifying a "-timeout s" parameter on the command
-  line, with s being the timeout in seconds. The minimum allowed ti-
-  meout is 60 seconds.
-
-- The waitpid() call now only checks the agent's own children.
-
-- Moved the longjmp() context declaration to a new Context.h file to
-  avoid clash with redefinitions by the PNG headers.
-
-- Few other cosmetic changes.
-
-nxagent-1.5.0-32
-
-- Added a check on the type of the connection to avoid cleaning the
-  images when not needed.
-
-nxagent-1.5.0-31
-
-- Modified the placeholder frames, now it has a left top black border
-  and a bottom right grey one.
-
-- Modified fbShmPutImage() in order to set the correct size for the
-  temporary pixmap.
-
-- Modified nxagentForceExposure() and nxagentHandleExposeEvent() in
-  order to clip exposed regions to the window size region of the root
-  window.
-
-- Added a new placeholder xpm image.
-
-- Corrected few typos.
-
-- Added function to synchronize GC tiles and stipples whenever those
-  pixmaps have been realized.
-
-nxagent-1.5.0-30
-
-- Hidden viewport windows to clients in QueryTree request in order
-  to make work XDMCP properly.
-
-nxagent-1.5.0-29
-
-- Removed some warnings with gcc 3.4.
-
-- Added desktop -D switch to usage.
-
-- Paint window background draw on framebuffer only with OpenOffice
-  client.
-
-- Now fast copy are and fast getimage are no more set according to
-  the link type, their default value has been set to true.
-
-nxagent-1.5.0-28
-
-- Modified nxagentUpdateViewportFrame() in order to solve a refresh
-  problem. Windows composing the external frame must be always on top
-  to be sure that agent sends expose events for every window.
-
-- In rootless mode agent doesn't export anymore the properties when
-  disconnected from the X server.
-
-- Changed the way agent check if the connection with the X server
-  is available. Instead of using a state machine it uses the display
-  flag.
-
-- Removed the SIGTERM handling function in persistent code. We don't
-  need anymore those function since agent is no more sleeping when
-  disconnected.
-
-- Implemented nxagentFreePropertyList() function in order to empty the
-  list of exported properties when the rootless agent is disconnected.
-
-- Added special keystroke Ctrl + Alt + S toggling between fast and
-  slow mode for GetImage and CopyArea.
-
-- Added missing handling of down arrow key in Keystroke.c.
-
-- Modified nxagentForceExposure() in order to intersect exposed re-
-  gions with the clip region of the root window. This prevents window
-  functions from painting outside the frame buffer.
-
-- Added the field usesFrameBuffer in struct nxagentPrivClient. Modifi-
-  ed GC funtion and DoGetImage() in order to write in the frame buffer
-  only if usesFrameBuffer is True.
-
-- Removed code performing PutImage in the frame buffer, as it is use-
-  less at the moment.
-
-- Modified ProcChangeProperty() to check WM_NAME property.
-
-- Added a piece of code in nxagentOpenScreen() checking for and remo-
-  ving duplicated visuals.
-
-- Added the Dialog.c Dialog.h files. Unified all calls to NXDialog,
-  and blocked SIGCHLD before calling in order not to get the signal
-  before the child pid has been stored.
-
-- Modified the algorithm that disconnect the running session in
-  order to avoid the opening of a new dialog box for closing or
-  suspending the nxagent.
-
-nxagent-1.5.0-27
-
-- Changed the disconnect/reconnect procedure in order to have a pro-
-  per default colormap vector when session is suspended, solving a
-  segmentation fault in create window function.
-
-- Corrected few errors in slow copy area mechanism.
-
-- Modified screen initialization in order to allocate memory for the
-  internal frame buffer.
-
-- Modified some GC functions for writing to and reading from the frame
-  buffer.
-
-- Modified nxagentCreateWindow() for initializing the window in the
-  frame buffer.
-
-- Modified nxagentCreateColormap() in order to use the default visual
-  if a matching one is not found.
-
-- Modified function DoGetImage() in order to call nxagentGetImage() in
-  place of nxagentGetDefaultImage() if fast option is on.
-
-- Added nxagentCheckWindowIntegrity() function verifying the matching
-  between the internal frame buffer and the X server for a window.
-
-nxagent-1.5.0-26
-
-- Added the property "_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR" to the list
-  of exported property in rootless mode, in order to let clients use
-  the system tray.
-
-- Modified import of WM_STATE properties in rootless mode in order
-  to better handle null resources.
-
-- Enhanced the slow CopyArea mechanism in case of one part of the
-  image is out of the X server screen or out of nxagent screen.
-
-- Changed type for variables width and height of default window
-  from 'unsigned int' to 'int'.
-
-nxagent-1.5.0-25
-
-- Added a new signal handler for SIGCHLD. The transport is set to
-  forward the signal (by means of a new NX_SIGNAL_FORWARD action).
-  This allows the agent to wait for its own children.
-
-nxagent-1.5.0-24
-
-- Set up the RANDR extension. When querying the configuration, the
-  clients get 3 sizes, the first being the current size, the second
-  being the maximum size of the remote display, the third being the
-  minimum size (arbitrarily set to 100x100 pixels). Screen sizes in
-  millimeters are calculated based on the size reported for the real
-  display.
-
-  An example of xrandr -q output is below:
-
-   SZ:    Pixels          Physical       Refresh
-  *0    800 x 600    ( 270mm x 203mm )
-   1    100 x 100    (  33mm x  33mm )
-   2   1400 x 1050   ( 474mm x 356mm )
-  Current rotation - normal
-  Current reflection - none
-  Rotations possible - normal
-  Reflections possible - none
-
-  As you can note, reflections and rotation is not possible.
-
-- Set up the GLX extension. This provides basic support with GLX op-
-  erations being translated into core X protocol primitives.
-
-- Moved initialization of GLX and RANDR to the Extensions.c file.
-
-- Removed the references to the unused mfb library. Modified Screen.c
-  to allocate the right privates for the fb code.
-
-- Modified the Xserver Imakefile to link nxagent with FbPostFbLibs
-  and avoid including mfb/libmfb.a.
-
-nxagent-1.5.0-23
-
-- Fixed an incorrect buffer length calculation when retrieving a re-
-  mote property.
-
-- Added a check to avoid the use of a NULL pointer when changing the
-  window cursor.
-
-- Implemented a function to lookup the remote pixmaps.
-
-- Changed the RENDER initialization messages.
-
-- Corrected a few typos in symbol names.
-
-nxagent-1.5.0-22
-
-- Added the nxagentNeedConnectionChange() macro.
-
-- Small optimizations in the block and wakeup handlers.
-
-nxagent-1.5.0-21
-
-- NXCollectGrabPointer() is called by passing nxagentDefaultClient().
-  This is a macro that checks the validity of requestingClient and,
-  if the pointer is NULL, defaults to NXNumberOfConnections - 1.
-
-nxagent-1.5.0-20
-
-- Replaced all calls to XGrabPointer with the asynchronous version
-  provided by nxcompext.
-
-- In DeactivatePointerGrab() function, mouse button state is set to
-  up if the window entered by the pointer is the root window and the
-  agent is in rootless mode. This change is needed because the sub-
-  sequent KeyRelease event could be not received by the agent (for
-  example if the focus had left the window), so that agent could be
-  unable to update the mouse button state.
-
-- In rootless mode, grabs exported to X in ActivatePointerGrab() are
-  always made asynchronous. The synchronous behaviour is implemented
-  by the agent, so that requiring a further synchronous grab down to
-  the real X server is of little use and potentially harmful.
-
-- Modified function XYToWindow() in order to manage the case that
-  mouse pointer is located on the title bar of a top level window in
-  rootless mode.
-
-- Reflected name changes to NXImageCache variables.
-
-nxagent-1.5.0-19
-
-- Changed the implementation of the SIGHUP handler to forward the sig-
-  nal to the proxy only when appropriate. This allows nxagent to close
-  the NX connection without having to go through an I/O error on the
-  display.
-
-- Modified nxagentBreakXConnection() to check if the NX transport is
-  running and thus use NXTransDestroy(). Using a simple shutdown() may
-  not work, for example if NX is using the memory to memory transport.
-
-- Added the -D option, to let users specify that agent must be run in
-  desktop mode. This is presently the default.
-
-nxagent-1.5.0-18
-
-- Set the PropertyChange mask on input/output window in rootless mode
-  in order to get the PropertyNotify events.
-
-nxagent-1.5.0-17
-
-- Cleaned of the reconnection routines, removed the NXAGENT_RECONNECT
-  macro.
-
-- Now the SIGHUP handler forwards the signal also to the NX transport.
-
-- Moved the NXTransDestroy() call in the closure of the display, so
-  we can avoid going through the I/O error handler.
-
-- Removed an invalid free in the function that closes the display.
-
-- Commented out more code in Display.c to avoid the segfault on exit.
-
-- In rootless mode, now function XYToWindow() starts search from the
-  last window originated an EnterNotify event. In this way, we can
-  prevent shaded windows from getting mouse events.
-
-- The variable to disable the smart scheduler is set at its definition
-  instead of setting it in the Dispatch function. This avoids the call
-  to SmartScheduleInit.
-
-- Changed implementation of cursor visualization in rootless mode. We
-  made the cursor attributes changes go transparently to the X server
-  while in desktop mode we ignore any client request to change the cu-
-  rsor on the X side, and we just set the cursor on the default window
-  any time the pointer cross a window border.
-
-- Expanded the range of properties exported on the remote Xserver,
-  this way we export properties whose atom name starts with "WM_" and
-  "_NET_".
-
-- In Rootless mode PropertyChangeMask is added to top level window in
-  order to get PropertyNotify Events.
-
-- First implementation in rootless mode of nxagentImportProperty fun-
-  ction with which after reception of PropertyNotify Events, all chan-
-  ging properties coming from external clients such as Window Manager
-  will be imported in agent windows.
-
-- Changed the GetEventMask function in order to handle the InputOnly
-  windows that need to be notified of property changes in rootless
-  mode.
-
-nxagent-1.5.0-16
-
-- Implemented the -B command line switch, to let nxagent impersonate
-  a "pure" proxy on the NX server side (that is without X connections
-  having to be managed by the nxagent's dispatcher). Such a "nxagent
-   -B" is going to replace the corresponding nxproxy process that in
-  previous version of NX server was run with the same options.
-
-- When running nxagent in 'bind' mode the X port where the the proxy
-  has to listen for connection must be specified after the -B option.
-  The other NX options must be passed in the DISPLAY environment.
-
-  Example:
-
-  nxagent -B :9
-
-- The initialization procedure will check that the display included
-  on the command line matches the one specified in the NX display
-  options.
-
-  For example, given the command:
-
-  nxagent -B :9
-
-  The NX options must be something like:
-
-  DISPLAY=nx/nx,link=modem:9
-
-  This allows users to find out which display the agent is impersona-
-  ting by running a 'ps' and inspecting the command line.
-
-- Fixed a bug preventing the proxy's ClientMessage to reach the right
-  function when activating rootless mode.
-
-- Removed unused function nomachineLogo.
-
-- Code cleaning and soem optimizations in Rootless.c.
-
-- We want to import all properties changed by external clients to our
-  internal windows. But we must ignore property notify generated by
-  our own requests. For this purpose we implement a list to record
-  every change property that we dispatch. This way when processing
-  a property notify we can distinguish between the notify generated
-  by our request and those generated by an 'outside client'.
-
-- In rootless mode, optimized window configurations mantaining inter-
-  nal stacking order.
-
-- Fixed focus troubles in rootless mode. Now focus window is set fol-
-  lowing FocusIn events.
-
-- In rootless mode, now fake KeyRelease events on FocusOut are sent
-  only if keys having down state are modifiers. This prevents from
-  sending key events to a wrong client.
-
-- Removed unused function nxagentRootlessNextSibling in Rootless.c.
-
-- Removed unused function nxagentRootlessStackingOrder in Rootless.c.
-
-- Fixed compilation error if TEST log is enabled in Events.c.
-
-- Changed Options variables to comply with NX naming rules.
-
-- Some additional cosmetic changes.
-
-nxagent-1.5.0-15
-
-- Modified functions nxagentPutImage and DoGetImage for XYPixmap fo-
-  rmat.
-
-- Completed implementation of shared memory extension.
-
-- Implemented a mechanism that prevents monitoring of SubStructure-
-  Redirect ResizeRedirect and ButtonPress events by any clients simu-
-  lating the presence of a window manager running inside the agent.
-
-- Added debug functions in order to check the status of syncroniza-
-  tion between the pixmaps residing on the X server and the local
-  framebuffer ones.
-
-- Changed the policy used when realizing all the pixmaps in 'lazy en-
-  coding' mode so that the agent now switches to 'eager' policy.
-
-- Fixed the routine handling the pixmaps realization: pixmaps with
-  an invalid id are not processed anymore.
-
-- Solved a bug in the routine taking care of clearing the NoMachine
-  logo: the state of the background was set to 'pixel' without de-
-  stroying an eventual backround pixmap.
-
-- Solved a bug in the 'MakeRootTile' function: the value returned by
-  'AddResource' was not interpreted in the correct way causing the
-  function to bail out without drawing the NoMachine logo and set-
-  ting the background state to Pixmap.
-
-- Renamed PlaceHolder.c to Lazy.c and PlaceHolder.h to Lazy.h.
-
-- Inserted a test feature that cleans the framebuffer pixmaps when
-  they are created.
-
-nxagent-1.5.0-14
-
-- Changed some reconnection messages.
-
-- Now the disconnect procedure is called also after an IO Error is
-  received.
-
-- The rootless agent now doesn't filter anymore keystrokes combina-
-  tion related to desktop feature, like viewport navigation the full-
-  screen state and minimization.
-
-- In rootless mode, internal stacking order is updated by comparing
-  the stack of top level windows mantained by the X server with the
-  one mantained by the agent. A global configuration of windows is
-  performed from top to bottom through the stack.
-
-- In rootless mode, map state of  top level windows is kept up to date
-  by managing map and unmap events.
-
-- In rootless mode, enter events are managed to keep track of top
-  level window position. It is very useful for managing differences
-  among window manager behaviours. It should be reimplemented follo-
-  wing the advice given in ICCCM 4.1.5.
-
-- In rootless mode, requests of configure top level windows are di-
-  rectly forwarded to the real X server. Internal configuration is up-
-  dated when configure events are managed by the agent. In order to
-  mantain internal stacking order up to date, a query tree request is
-  performed on the real root window.
-
-- Added viewport navigation by Ctrl + Alt + keypad arrows.
-
-- Fixed wrong internal configuration of agent top level windows, while
-  agent runs in rootless mode with metacity window manager.
-
-- Fixed segmentation fault in nxagent running in rootless mode with
-  OpenOffice.
-
-- Fixed wrong internal stacking order of drop down menus of firefox
-  with nxagent in rootless mode.
-
-nxagent-1.5.0-13
-
-- Fixed compilation problem on solaris.
-
-- Modified the modify pixmap header function. Previously this function
-  has been modified in order to solve a glyph problem, enlarging both
-  the pixmaps dimensions by four. Corrected the misbehaviour that
-  modify the pixmaps dimension even if the caller doesn't want to
-  change it.
-
-nxagent-1.5.0-12
-
-- Fixed erroneous behaviour of Root Window in fullscreen mode caused by
-  wrong value of XSpan and YSpan.
-
-- Fixed wrong clients' position at Reconnection in Rootless mode,
-  setting offset and WinGravity fields in XsizeHints structure.
-
-- Fixed segmentation fault on closing windows that stay always on top.
-
-- Moved the handling of configure notify events in the appropriate
-  functions, and cleaned it.
-
-- In rootless mode, internal stacking order of top level windows is
-  mantained up to date by monitoring events from window manager top
-  level windows.
-
-- Modify the creation of screen at reconnection for detecting an
-  eventual failure.
-
-- Removed export of window properties on the X server in desktop mode.
-
-- Changed the events mask for client's window set on the X server.
-  We don't use anymore the window mask choosen by clients. In rootless
-  mode for a top level window we use the default event mask and for a
-  child only the exposure mask.
-
-nxagent-1.5.0-11
-
-- Restored default event mask at reconnection.
-
-- Fixed abnormal behaviour in rootless mode if application windows are
-  close to the lower and right bounds of the screen. This trouble was
-  due to the wrong size of the agent root window.
-
-- Fixed abnormal behaviour in rootless mode for mouse button events if
-  the application window is not fully contained in the screen.
-
-- In rootless mode, exposed region are extended a few to take in ac-
-  count border width offsets caused by window managers.
-
-- In rootless mode, grab pointer requests from clients are forwarded
-  to X server. This makes application able to close their pop up win-
-  dows on a pointer event.
-
-- Fixed wrong position of the agent root window after resize of main
-  window.
-
-- Changed the size of viewport frame windows in order to avoid re-
-  freshing problems.
-
-nxagent-1.5.0-10
-
-- Handled the Client messages on rootless mode.
-
-- Initializations of event masks have been moved in a unique group of
-  functions.
-
-- Disabled the SmartScheduler in dispatcher as it seems to affect the
-  responsiveness of nxagent.
-
-- Modified the block and wakeup handlers. We could have left data to
-  write to our display connection when entering in WaitForSomething()
-  so we now flush everything before entering the select() and let the
-  proxy do all the buffering.
-
-- Fixed the wakeup handler to match the correct prototype.
-
-- Few cosmetic changes.
-
-- Inserted a test feature that cleans the framebuffer pixmaps when
-  they are created.
-
-- Adjusted pixmap status information in almost every gc operations.
-
-- Removed a warning for usleep not defined on Suse 9.0.
-
-- Adjusted pixmap status information in copy plane operations.
-
-- Throwed fatal error if on lazy encoding the place holder pixmap
-  couldn't be loaded.
-
-- Removed the static path to xpm file in place holder initialization.
-
-- Removed useless signal handler initialization multiple times.
-
-- Refined validation of atoms in the atom cache code.
-
-- Corrected few errors in atom cache initialization.
-
-- Added a primitive atom cache that mantain the map between internal
-  and external atoms.
-
-- Window properties export began on the X server side in rootless
-  mode, this way nxagent open the communication between local clients
-  and the window manager on the X server.
-
-nxagent-1.5.0-9
-
-- Fixed wrong position of the main window in case of maximizing in
-  window mode.
-
-- Set the correct scan line lenght for XYPixmap created in PutImage
-  and GetImage.
-
-- Removed a segmentation fault in GetDefaultImage. The problem arose
-  because the XYPixmap created with a data storage taking in account
-  of only some planes instead of all the depths planes. Despite XPut-
-  Pixel was treating the image as a complete XYPixmap of that depth.
-
-- Removed MapWindow Error at reconnection caused by wrong value of
-  IconWindow.
-
-- Now nxagent_WM_START is intialized as soon as the Atoms are
-  queried.
-
-- Removed Geometry restrictions.
-
-- Changed the configuration of the agent window in window mode.
-
-- The agent window is correctly reconnected even if is resized.
-
-nxagent-1.5.0-8
-
-- Updated copyright notices.
-
-- Removed a segmentation fault in font cache cleaning routine. The
-  problem arise when the session is disconnected and the font struct
-  are not allocated.
-
-- Used the return mask of XParseGeometry to correctly set only the
-  parameters that are involved.
-
-- Unified the initialization of all the geometry related parameters.
-
-- Updated the offset of the four viewport frames windows at recon-
-  nection.
-
-- Changed the way the geometry parameter is used. Now the first time a
-  session is started it set the internal dimension of the agent root
-  window, afterwards it only affects the dimension of the external
-  window on the X server.
-
-- Corrected splash screen offset at reconnection in fullscreen mode.
-
-- Agent can be launched in fullscreen mode and his geometry can differ
-  from the X server geometry.
-
-- Now Width and Height options are used to store geometry of the
-  default window even on fullscreen mode, and to restore the correct
-  dimension when switching back to window mode from fullscreen
-  we added two more options.
-
-- Removed an error in the move viewport procedure that didn't upgrade
-  the offset of the internal root window when the external root win-
-  dow was maximized.
-
-- Unified the initialization of all the geometry related parameters.
-
-- The window manager detection procedure is now started whenever there
-  is an attempt to minimize the fullscreen window or to pass to window
-  mode.
-
-- Function's optimization for detecting if WM is running.
-
-- Switching to window mode has been disabled when the window manager
-  is not running.
-
-nxagent-1.5.0-7
-
-- Now background pixel is not reset at reconnection.
-
-- Now geometry is parsed also as a command line parameter.
-
-- Fixed wrong offset of the root window after a reconnection in case
-  of window mode.
-
-- Fixed wrong geometry of the nxagent window after a reconnection
-  in case of window mode.
-
-- Fixed wrong position of the main window after a reconnection in
-  case of fullscreen mode.
-
-- Fixed refreshing windows problems in viewport navigation. Four in-
-  visible windows are created around the agent window to automatica-
-  lly generate exposure when the viewport frame is moved or a windows
-  come out from the non visibile part of the agent window.
-
-- We need to store the GC records in a list that will be freed in case
-  the reconnection succed and will be restored in case of failure. We
-  have to do this because we cannot destroy the GC records in the
-  disconnect or reconnect procedure, because this way we couldn't
-  recover from a disconnection or a reconnection failure.
-
-- Rewritten the reconnection procedure. Since we cannot be sure
-  that the reconnection will succed we cannot destroy the display
-  structure, so we postpone the closing of the previous display
-  with the creation of the new connection.
-
-nxagent-1.5.0-6
-
-- Adjusted usage list in order to show the R parameter for rootless
-  mode.
-
-- Added handling of display parameter to option file.
-  Corrected few typos error, in option file parsing.
-
-nxagent-1.5.0-5
-
-- Removed error that prevented the realization of cursor in eager
-  mode.
-
-nxagent-1.5.0-4
-
-- Fixed abnormal behaviour of termination dialog, after the keystroke
-  Ctrl + Alt + T.
-
-- Fixed segmentation fault in function parsing option file.
-
-- Fixed various errors on eager encodings.
-
-- Added lazy command line switch in order to switch lazy encoding
-  on.
-
-- Code cleaning.
-
-- Implemented a signal to switch between two pixmap
-  realization policies.
-
-- Corrected an error while defining pixmaps status.
-
-- Implemented a debug feature, consisting in a method that pushes
-  the synchronized realization of all the pixmaps.
-
-- Began implementation of place holders in replacing of images while
-  they are being loaded.
-
-- Performed some changes on spreading of pixmaps status information
-  on copy area.
-
-- Began implementation of lazy encoding.
-
-- Changed version to 1.5.0.
-
-nxagent-1.5.0-3
-
-- Removed the option -nogetimage (FRSA052305).
-
-- Code cleaning in Font.c.
-
-- Removed NXAGENT_FONTMATCH macro.
-
-- Removed NXAGENT_FONTCACHE macro.
-
-- Handled the ReparentNotify event we get when in rootless mode
-  ours window are reparented from the window manager. Inserted
-  fake windows to take account of this new parents.
-
-- Removed the redirection of client message in rootless mode, and
-  the configuration of the WM_PROTOCOLS properties on all the top
-  level windows.
-
-- Removed parent ID from the windows private structure.
-
-- Implemented screen operation ReparentWindow.
-
-- Redirect all client message of type WM_PROTOCOLS and value WM_DELETE-
-  _WINDOW to internal clients in rootless mode.
-
-- Set the WM_PROTOCOLS property on all the top level window.
-
-nxagent-1.5.0-2
-
-- Changed viewport navigation, in order to make it works in fullscreen
-  mode.
-
-- Changed special keystrokes used for closing session and minimizing
-  fullscreen window.
-
-- Removed the message 'NX was unable to negotiate a cache
-  for this session' (FRSA052296).
-
-- Fixed a minor bug. It made metacity produced a warning when the agent
-  started up.
-
-- Code cleaning.
-
-- Implemented dynamic handling of the main window's size in the X11
-  agent (FRSA052264).
-
-- Implemented dynamic navigation of the main window's viewport in the
-  X11 agent (FRSA052265). Users can navigate the viewport while keys
-  Ctrl + Alt are pressed, either by arrows keys or dragging it by the
-  pointer.
-
-- Implemented dynamic handling of the full-screen attribute in the
-  X11 agent.
-
-- First implementation of dynamic handling of the full-screen
-  attribute (FRSA052263).
-
-- Now the X connection descriptor is not closed when disconnected,
-  because the transport layer still has reference to it. So we want
-  it busy till we don't close the display, so we shutdown it instead
-  of closing it.
-
-- Removed replys when disconnected.
-
-- Added the X connection number to the set of enabled input devices, at
-  reconnection.
-
-- Rewritten the disconnect/reconnect layout.
-
-- Now in the suspend status nxagent doesn't sleep.
-
-- Implementing toggle fullscreen special keys.
-
-nxagent-1.5.0-1
-
-- Opened the 1.5.0 branch.
-
-nxagent-1.4.1-7
-
-- Imported changes from nxagent-1.4.0-64 version.
-
-nxagent-1.4.1-6
-
-- Implemented a GC cache for reconnecting pixmap.
-
-nxagent-1.4.1-5
-
-- Handled the situation of disconnect when the pointer has been grabbed.
-  We disconnect and reconnect the "grabbing" cursor and after reconnection
-  we fake a button release in order to let client know that the pointer
-  button has in effect been released.
-
-- Code cleanup.
-
-nxagent-1.4.1-4
-
-- Imported changes from nxagent-1.4.0-63 version.
-
-nxagent-1.4.1-3
-
-- Imported changes from nxagent-1.4.0-62 version.
-
-nxagent-1.4.1-2
-
-- Cleaned code in the GC reconnection area.
-  Scratchs GC are now reconnected before of the pixmaps.
-
-nxagent-1.4.1-1
-
-- Opened the 1.4.1 branch.
-
-nxagent-1.4.0-65
-
-- Cosmetic changes to the diagnostic output.
-
-nxagent-1.4.0-64
-
-- Changed the RENDER version advertised to X clients to be the lowest
-  value between the version of RENDER of nxagent and of the remote X
-  server.
-
-- Disabled fast copy area and fast get image flags, if RENDER extension
-  is not available.
-
-- At the screen initialization, if we don't have window manager we
-  grab keyboard to let nxagent get keyboard events.
-
-- Completely rewritted the handling of KeyPress events, now we moved
-  all the test for 'special' keybindings in file keystroke.c. Added the
-  combination MOD1/2-CTRL-SHIFT-<TAB> for terminate/suspend the session,
-  we used the combination MOD1/2 in order to let it work even on MacOS
-  where Alt(MOD1) doesn't seem to be set.
-
-- Ignored visibility notify events on the icon windows, that were
-  messing up the agent visibility state.
-
-- Changed nxagent reaction on VisibilityNotify event. It fixed the
-  problem with refresh session under Mac OS X with NXDarwin.
-
-nxagent-1.4.0-63
-
-- Reset the congestion state at transport initialization.
-
-nxagent-1.4.0-62
-
-- Fixed the disconnection and reconnection of window that have attached
-  an animated cursor.
-
-nxagent-1.4.0-61
-
-- Removed the XInputExtension initialization in order to use the more
-  general mi extension initialization enabled on new mi version.
-
-- Removed some useless test and logging info on copy area function.
-
-nxagent-1.4.0-60
-
-- Changed the implementation of CopyArea and CopyPlane.
-  If both drawables are on framebuffer we send NoExpose to clients,
-  otherwise we use the mi function HandleExposure to calculate the
-  region to be exposed instead of let mi redo all the copy operation.
-
-nxagent-1.4.0-59
-
-- Disabled use of caching and cleaning of images, if NX transport is
-  not used.
-
-nxagent-1.4.0-58
-
-- Added timeout on convert selection operation. If timeout has not
-  expired and is there a pending operation any new request is dropped
-  and the client notified, until timeout expiration.
-
-- Corrected a bug that prevented to correctly store last convert se-
-  lection request time.
-
-nxagent-1.4.0-57
-
-- The Xinput extension is now initialized at startup. This is of
-  little use because nxagent only needs to support the core pointer
-  and keyboard. Anyway this allows nxagent to get rid of the warn-
-  ings printed by some X clients on recent Linux versions when the
-  extension is not found.
-
-nxagent-1.4.0-56
-
-- Fixed value returned by ConvertSelection. It was the cause of
-  possible slowndowns during KDE sessions.
-
-nxagent-1.4.0-55
-
-- Agent icon now is loaded from a binary-
-  embedded Xpm image, if any attempt to
-  load the default Xpm file from the image
-  directory or from the path fails.
-  Removed code used in the old logo drawing
-  function.
-
-nxagent-1.4.0-54
-
-- Enabled code for sending to client graphics
-  exposures. Redirecting the ones coming from
-  remote X server, only if agent window is not
-  fully visible, and calculating ourselves failure
-  in CopyArea/Plane and notifying clients.
-  The only drawback is that we can have double
-  refresh effect if agent window is covered.
-
-NOTE: Partially enabled MIT-SHM extension has
-      been developed but has not been included
-      in stable release. Included in version
-      nxagent-1.4.0-53-DAR1.
-
-nxagent-1.4.0-53
-
-- Implemented a reliable technic to detect
-  if is there any window manager running on
-  the X server.
-
-nxagent-1.4.0-52
-
-- Fixed a bug that prevented to correctly
-  notify the client of a successfull convert
-  selection.
-
-nxagent-1.4.0-51
-
-- Removed a logging error in render initialization.
-
-nxagent-1.4.0-50
-
-- Now we take the ownership of the selection
-  on "NX_CUT_BUFFER_SERVER" twice, in order
-  to solve bug in communication with nxclient
-  to let him see our main window and know that
-  agent established connection with X server.
-
-nxagent-1.4.0-49
-
-- Fixed the colormask layout of the visual
-  used to put images on the real X server when
-  the drawable has an alpha channel, according
-  to the endianess of the X server.
-
-nxagent-1.4.0-48
-
-- Moved up the render compatibility limit,
-  due to the inclusion of the support for render
-  cursor missing on the 0.2 version.
-
-nxagent-1.4.0-47
-
-- Changing artsd forwarding port from display
-  + 8000 to display + 7000
-
-- Stoping key release event if key press was
-  catched before. For Alt-F2/F4 combination.
-
-- Preserved the alpha data on drawables that
-  are not used by picture but have a depth of 32.
-
-nxagent-1.4.0-46
-
-- Rewritten all the code regarding to the
-  acceleration for the Render creation of the
-  cursor, and removed the acceleration for
-  the animated cursor.
-
-nxagent-1.4.0-45
-
-- The two RENDER operations creating cursors and
-  animated cursors have been accelerated by for-
-  warding the original operation to the X server.
-
-nxagent-1.4.0-44
-
-- Fixed a problem in the clipboard procedure.
-  Now when we get a request of the selection
-  from an internal client we have to, if the
-  owner is on the X server, forward the request
-  to X, otherwise we have to pass the request
-  to our internal client.
-  But for a problem in this procedure we passed,
-  in some situation, the request to the internal
-  client even if the owner was on the other side.
-
-- Fixed a segmentation problem in the render
-  extension by removing composite trapezoid
-  operation on window.
-
-nxagent-1.4.0-43
-
-- Added some pointer sanity check in the discon-
-  nect procedure. The problem was arising because
-  we were executing the code twice when after
-  began a voluntar disconnection the X connect-
-  ion was broken for a network failure.
-
-- Changed directory where nxagent gets the icon.
-
-- Fixed missing implementation of rendering
-  trapezoids.
-
-- Fixed bug in render extension when the nxagent
-  create cursor diffrent then 32 bits format.
-
-nxagent-1.4.0-42
-
-- Solved segmentation fault, caused by a longjmp
-  on a stack context not previously saved.
-
-nxagent-1.4.0-41
-
-- Added an exposures of the window in a resize
-  operation.
-
-nxagent-1.4.0-40
-
-- Implemented a timeout on the opening of the X
-  display, if we get it we reject all well known
-  sockets.
-
-nxagent-1.4.0-39
-
-- Corrected minor error on events handling.
-
-nxagent-1.4.0-38
-
-- Removed in the resize window code some exposure
-  that generated useless traffic.
-
-- Option geometry is no more parsed in the option
-  file.
-
-nxagent-1.4.0-37
-
-- When session is suspended and we get TERM signal
-  nxagent just exit instead of just breaking out of
-  dispatch loop because we get a terminate exception.
-  Cleared display variable after having closed the
-  connection with the X server.
-
-nxagent-1.4.0-36
-
-- Refined some details in the ICC with nxclient.
-
-nxagent-1.4.0-35
-
-- Implemented a new method to comunicate to nxclient,
-  the raise of the agent root window, taking the ownership
-  of the selection "A-{MD5 of session}".
-  Used the same selection to let nxclient comunicate to agent
-  by changing the property on the same string, when the user
-  choose by the administrator to terminate or suspend the
-  session.
-
-nxagent-1.4.0-34
-
-- Key sequence to Suspend/Terminate session (Alt-F4).
-
-- Key sequence to Minimize session in fullscreen mode (Alt-F2).
-
-- Check if WM is started, for Alt-F2 sequence.
-
-- Corrected calculation geometry of exposed region
-  sent to client after reconnection.
-  This solve a serious memory leak of nxagent.
-
-- Fixed a bug in validate GC code that passed
-  a wrong pointer of tile to framebuffer.
-
-nxagent-1.4.0-33
-
-- Changed the reconnection state machine in order
-  to let agent exit if has got the TERM signal.
-
-nxagent-1.4.0-32
-
-- Fixed memory leak in option parser that wasted
-  memory if more than one occurence of 'option'
-  argument would have been parsed.
-
-- Removed a invalid read in Keyboard initialization.
-  Now kbtype option value is copyed instead that
-  referenced.
-
-- The X connection number is recorded only after
-  having cheched for display being successfully opened.
-
-nxagent-1.4.0-31
-
-- Fixed memory leak problem caused by region not
-  beeing destroyed previously.
-
-- Fixed a memory leak in keyboard initialization.
-
-- Fixed a bug in the function that parse the option file,
-  we were reading the options in the format NAME=VALUE and
-  were passing it to the argument parser in the format
-  {NAME, VALUE}, without the prepending '-' in front of NAME.
-
-nxagent-1.4.0-30
-
-- Readded option persistent in order to let nxagent
-  works with older nxserver that are still launching
-  nxagent with the persistent option.
-
-nxagent-1.4.0-29
-
-- Corrected the message of the client dialog
-  asking if user want to suspend or terminate the
-  session.
-
-- Chenged the default value for persistence of session
-  in nxagent to true. Change the persistent option to
-  nopersistent in order to disable it.
-
-nxagent-1.4.0-28
-
-- Added check on screen initialization of possible
-  memory allocation failure.
-
-- Changed the parsing policies of the option file.
-  Now we are just considering kbtype and geometry
-  options.
-
-- Removed testing code that forced rootless mode
-  when geometry is 100X100.
-
-- Correctly initialized and mapped the icon window
-  on fullscreen mode.
-
-nxagent-1.4.0-27
-
-- Fixed lost memory problem caused by second
-  initialization of screen privates. Screen
-  privates is already initialized by miScreenInit
-  function.
-
-nxagent-1.4.0-26
-
-- Added option command line option. This parameter
-  is used to show complete path to option file.
-
-- Added parser of the option file.
-
-- Now default value for fast copy area and fast
-  getimage is true.
-
-nxagent-1.4.0-25
-
-- Done some cleanup to the initialization of the
-  defaults drawables at reconnection, and removed
-  a memory leak in the reopening of the Display.
-
-nxagent-1.4.0-24
-
-- Changed the version number, printed at startup.
-
-- Removed a memory leak in the font reconnection stage.
-
-nxagent-1.4.0-23
-
-- Removed a bug that messed up the render status info
-  if reconnected to a display with no render support.
-  Anyway nxserver should prevent agent to trying reconn-
-  ecting to such display.
-
-nxagent-1.4.0-22
-
-- Enhanced the reconnection error reporting function.
-
-nxagent-1.4.0-21
-
-- Get the ownership of selection NX_CUT_BUFFER_SERVER at reconnection
-  in order to let client knows that agent windows has started
-  successfully.
-
-nxagent-1.4.0-20
-
-- Now we draw splash logo at reconnection. And destroy it and show
-  all other windows when reconnection has done all in once. We draw
-  it on default window instead that on root window, and we map root
-  window when reconnection has finished.
-
-nxagent-1.4.0-19
-
-- Removed the old Xconnection descriptor and added the new one
-  to the device set, instead of resetting the entire enabled
-  device set, at reconnection.
-
-nxagent-1.4.0-18
-
-- Reset the enabled devices set of descriptors, and properly
-  add to this set the the Xconnection descriptor.
-
-NOTE: This solves all the known solaris reconnection problems.
-      (The problem appear only on solaris because on this machine
-       the Xconnection descriptor is changing at reconnection.)
-
-nxagent-1.4.0-17
-
-- Restored the previously owned primary selection, at reconnection.
-  Removed the handling of the return value of XSetSelectionOwner,
-  man page doesn't specify any return value.
-
-nxagent-1.4.0-16
-
-- Added compatibility with older windows clients(Xserver)
-  that send a WM_DELETE_WINDOW client message WM_DELETE_WINDOW
-  to all top level window and so agent show more than one
-  NXDialog asking for confirmation, instead of sending just the
-  message to top level window that are visible and haven't set
-  the override redirect option.
-
-nxagent-1.4.0-15
-
-- Ignored unmatched DirectColor visuals at reconnection
-  on a different display not providing it.
-
-nxagent-1.4.0-14
-
-- Moved the render query extension in display
-  initialization from screen initialization.
-
-- Changed reconnection policy to disallow reconnect a
-  session that is using render to a server not providing it.
-
-nxagent-1.4.0-13
-
-- Unified the screen opening function.
-
-- Changed the reconnection requirements
-  policy about geometry of X server.
-  Now agent doesn't accept changes of X server
-  root window size only if in fullscreen mode.
-
-nxagent-1.4.0-12
-
-- Improved failure notification messagges in Display and
-  font code.
-
-nxagent-1.4.0-11
-
-- Now visuals are properly recreated, in order to reconnect
-  to another X server.
-
-- Updated render formats at reconnection.
-
-nxagent-1.4.0-10
-
-- Removed a serious memory leak at reconnection.
-
-nxagent-1.4.0-9
-
-- Added after window reconnection the redisplay of the current
-  cursor. Done some general cleanup at cursor reconnection code.
-
-nxagent-1.4.0-8
-
-- Unified tha atom creation at reconnect.
-
-nxagent-1.4.0-7
-
-- Dix layer when creating a GC use a default real pixmap as
-  stipple but agent need a virtual one. This can cause
-  segmentation fault to agent if is there any apps that use the
-  default GC stipple created by dix, without changing it.
-
-nxagent-1.4.0-6
-
-- Imported 1.4.0-1-DAR6 from the 1.4.0 development branch.
-
-- Handled reconnection of window's cursor still not
-  reconnected at window reconnection. (This because that cursor
-  is no more a server[nxagent] resource).
-
-- Set the last image client variable at reconnection in order
-  to use the visual cache indexed for client number.
-  Without this we could get a segmentation fault.
-
-- Handled properly the reconnection of animated cursor.
-  Modified the procedure of animated cursor creation
-  in order to empty some unused fields.
-
-- Removed a 4 bytes memory leak at reconnection.
-
-- Synced new tree with nxagent-1.3.2-23.
-
-- Finished the unify of PutImage at reconnection.
-  Added a Reconnection Trap in order to let screen functions
-  (like PutImage) knows that are working at reconnection time
-  and can behave differently.
-
-- Unified the code for the normal PutImage and the one's used at
-  reconnection. But the code that calculate the split is still
-  doubled.
-
-nxagent-1.4.0-5
-
-- Imported 1.3.2-23 from the 1.3.2 development branch, and dropped
-  the previous 1.4.0 versions.
-
-nxagent-1.3.2-23
-
-- Pixel hints are set according to the display's depth. Added the
-  defaults to be used on 16 bits.
-
-nxagent-1.3.2-22
-
-- The pixel hint on Solaris is by default 0xffffff. The value can be
-  overridden by using the -hint option followed by the hex represen-
-  tation of the color, as in -hint 0xaabbcc.
-
-nxagent-1.3.2-21
-
-- Asynchronous GetImages are now disabled. If fast GetImage mode is
-  enabled, agent will always try to guess the pixel to be used for
-  the solid pattern, based, at its best, on the geometry of the pro-
-  vided area. This behaviour can be overridden by passing the -slow
-  parameter on the command line. Slow mode is also the default when
-  selecting WAN or LAN link settings.
-
-- Code cleanup in preparation of the final release.
-
-nxagent-1.3.2-20
-
-- New code uses sigaction to set the SIGHUP handler in persistent
-  mode. Contrarily to signal(), the sigaction call doesn't seem to
-  reset the handler to SIG_DFL after the signal has been caught.
-  This problem seems to be specific of Solaris.
-
-- Client messages of type WM_PROTOCOLS are now handled even when
-  a window manager is not detected at agent startup.
-
-- Removed handling of GraphicsExposure coming fron the real server.
-  Agent will still generate events in the MI. Code dealing with the
-  remote events needs to be better tuned as it seems to cause some
-  troubles with double refreshes.
-
-nxagent-1.3.2-19
-
-- Starting from this version agent doens't use NXSync and NXKarma
-  messages to manage bandwidth arbitration among clients but makes
-  efficient use of the congestion notification messages introduced
-  in 1.3.1. A new handler has been added to manage the congestion
-  state. The handler will block, if needed, waiting for the decon-
-  gestion notification coming from proxy.
-
-nxagent-1.3.2-18
-
-- Rewritten the block handlers to check the event queue more often.
-  The new code seems to greatly enhance responsiveness, especially
-  on fast links.
-
-- Now agent will handle the expose events coming from the remote
-  display inside the event dispatcher.
-
-- Created a new function collecting the expose events. Function is
-  optimized to add all the expose events for the same window to a
-  single region. Region is passed to the mi when the last event
-  has been processed.
-
-- Still dealing with GetImage from OpenOffice. Now we try to match
-  the geometry of the incoming requests with known geometry of most
-  of its graphic elements. It seem to work on Fedora.
-
-nxagent-1.3.2-17
-
-- Added swapping of image data in nxagentGetImage() when connecting
-  to a display having a different image byte order than the agent
-  server.
-
-- Added a new nxagentImageReformat() function in GCOps.c.
-
-- Now agent will not try to pack images having a data size smaller
-  than 768 bytes. The previous threshold was set to 64. The Mandrake
-  vesion of KDE seems to send lot of such small images. Compressed
-  through JPEG, these images obtain a very poor ratio of nearly 1:1.
-
-- Added a function translating and sending the GraphicsExposures
-  events received from the remote server to the agent's clients.
-
-- Renamed the functions providing the ad-hoc handling of remote X
-  events.
-
-nxagent-1.3.2-16
-
-- Implemented a cache for the alpha channel data. With clients
-  making heavy use of the alpha blending, the new cache is able to
-  cut by nearly 30% the traffic incoming to proxy, offering compara-
-  ble savings in CPU performance. While proxy is usually able to
-  cache almost all the alpha traffic, when caching is not enabled
-  (f.e. when link setting is WAN or LAN) this data is sent uncomp-
-  ressed by the agent. Tests running common desktop environments
-  showed that alpha channel could weight up to 2 times the corres-
-  ponding data generated by the packed images.
-
-- Fixed the compilation warnings in NXrender.c.
-
-nxagent-1.3.2-15
-
-- Rewritten handling of GetImage from dispatcher down to GCOps. If
-  the fast GetImage mode is enabled agent will use the asynchronous
-  calls provided by nxcompext to get data from the real server. Data
-  collected from the last get image performed is preserved and the
-  upper left pixel is used to guess a solid background.
-
-- Added a nxagentGetBackgroundImage() function to apply a similar
-  mechanism when the nxagent window isn't fully visible. Previously
-  a solid white background was returned. The new handling seems to
-  correctly match the window background in most cases.
-
-- Fixed a problem passing the bytes per line value when creating a
-  XYPixmap image. The previously calculated value didn't take into
-  account the depth of the image.
-
-- Now image's bytes per line, length and visual are calculated by
-  using a few utility functions added to GCOps.c.
-
-- Added declaration of the nxagentVisibility related variables to
-  Window.h.
-
-nxagent-1.3.2-14
-
-- On Fedora xbcomp configuration fails when agent is run nested.
-  This causes keyboard to ignore most AltGr keys. Strangely enough
-  this behaviour has been observed only with KDE while GNOME does
-  not seem to be affected. Reason is to be investigated.
-
-- Auto-repeat mode of the agent's keyboard device is now always
-  disabled. Agent will leverage auto-repeated keystrokes genera-
-  ted on the real server even when propagating device configura-
-  tion changes.
-
-- The info output telling if agent will propagate the changes to
-  devices' setting is now printed after having initialized the
-  screen. The purpose would be to verify if agent is running in
-  fullscreen mode and there is no WM on the real display. In this
-  case we should forcibly propagate device configuration changes.
-  Unfortunately, due to the way intern atoms are collected, this
-  is not going to work on platforms where sessions are likely to
-  run on an existing X server.
-
-nxagent-1.3.2-13
-
-- Fixed a problem with XYPixmaps being used in PutImage with the
-  wrong left pad. This is a step forward in the solution of the
-  corrupted masks displayed by Mozilla when showing some animated
-  GIFs.
-
-- By selecting 'fast' mode nxagent will now skip real XGetImage
-  operations on windows. This becomes the default in the case of
-  MODEM, ISDN and ADSL links. In theory X clients should never do
-  that. In practice a few naive programs and libraries (like, sur-
-  prisingly enough, a famous Linux office automation suite) do,
-  mainly to compose images with the window's backgound. Why don't
-  they compose content into a Pixmap?
-
-- Improved the implementation of CompositeGlyphs. It now uses a
-  single call to XRenderCompositeText instead of splitting the
-  output in multiple RENDER requests.
-
-- In previous versions file NXmiwindow.o was not linked into the
-  resulting nxagent. This solves the problem of missing repaints
-  in CDE and other Xt applications. Be sure you upgrade nx-X11
-  to version nx-X11-1.3.2-2.
-
-- Added a warning when the change keyboard control or the change
-  pointer control functions are called.
-
-nxagent-1.3.2-12
-
-- Added bit-swapping of glyphs having depth 1 when agent has a
-  different bitmap-bit-order than the X server.
-
-- The KeyRelease event's timestamp calculation, accounting for
-  differences in time between the local and the remote machine,
-  will now use the timestamp taken from the last KeyPress. Using
-  the timestamp of the last event was sometimes causing time to
-  go backward with the result that server could remain grabbed.
-  This solves the long-standing "mouse stop responding" problem.
-
-- Fixed a problem handling the alpha channeled visual introduced
-  while experimenting with the new server endianess layout.
-
-nxagent-1.3.2-11
-
-- Added the Reset option to options repository. By default agent
-  will skip server reset when the last client disconnects. This is
-  equivalent to passing the -noreset option to a standard XFree86
-  server. To restore the original behaviour the new -reset option
-  can be used on the command line.
-
-- Moved the SharedMemory and DeviceControl options to the options
-  repository.
-
-- A basic session, still leveraging all the default facilities, can
-  now be run as: nxagent -name NX -geometry 800x600+10+100 :1. The
-  -fp unix/:7100 option can be added to enable access to the X font
-  server.
-
-- Fixed a "unused variable" warning in Cursor.c.
-
-nxagent-1.3.2-10
-
-- Rootless mode. Some cleanup in initialization.
-
-- Rootless mode. Working at the configure-window errors.
-
-nxagent-1.3.2-9
-
-- Removed limitations when running nxagent nested inside another
-  nxagent server. Now both render extension and packing of images
-  are enabled.
-
-- The nxagent X server now inherits its endianess from the host
-  architecture, instead of assuming the same endianess of the con-
-  necting client. This fixes the remaining problems running ses-
-  sions nested inside another nxagent server.
-
-- Removed any reference to ReformatImage().
-
-nxagent-1.3.2-8
-
-- Changed the way the agent server handles images internally.
-  The inherited Xnest code used to set the server's image order
-  to the same order of the remote X display. This caused agent
-  to create images in the internal frame-buffer with a different
-  endianess in respect to images got from X clients.
-
-- The new image handling code seems to solve all the known image
-  endianess problems, for example cursors created on big-endian
-  displays with a wrong shape or glyphs being showed flipped when
-  retrieving the image data from the virtual frame-buffer.
-
-- As an added bonus the new code seems to double the performance
-  of the SPARC Solaris server when accessing i386 clients.
-
-- Commented out all the existing calls to ReformatImage(). Code
-  needs now extensive testing to see if any of the calls must be
-  actually restored.
-
-- Replaced calls to index() with strchr().
-
-nxagent-1.3.2-7
-
-- Solved a potential memory error when accessing a client or a
-  window pointer in clipboard management code after the resources
-  had been destroyed. Added a nxagentClearClipboard() function to
-  be called before a client or a window is destroyed to get rid
-  of any reference to the disposed resources.
-
-- Auto-repeated keystrokes generated by agent from inside the
-  virtual keyboard device are now ignored. Agent will correctly
-  honor auto-repeated keystrokes generated by the real X server.
-  This is actually the expected behaviour. The former implemen-
-  tation triggered an annoying bug, with keystrokes being inad-
-  vertedly auto-repeated in the case of high latency on the
-  network link.
-
-- Agent will now ignore the pointer settings changes generated
-  inside the remote session. The original behaviour was to reset
-  the pointer values (for example acceleration) to the X factory
-  settings at session startup. Agent will now inherit whatever
-  values are set on the real X display.
-
-- Added a -noignore parameter. When passed, agent will propagate
-  to the real X server any change to keyboard and pointer control
-  settings operated by its own X clients.
-
-nxagent-1.3.2-6
-
-- Fixed problem with glyphs being drawn clipped in the virtual
-  frame buffer. This is not yet the final solution but it seems
-  to work in all the circumstances where problem was observed
-  in the past. Problem seems to be caused by scratch pixmaps
-  being requested with a width and height smaller than actually
-  required. Note anyway that pixmap's buffer seems to be never
-  accessed beyond its boundary. This probably means that memory
-  for the pixmap is originally allocated using the right size.
-
-- Moved backing-store selection to options repository. Now by
-  default the backing-store mode is set to WhenRequested. This
-  means that, in most cases, there is no need to pass the -bs
-  option on the command line.
-
-- Code cleanup in Render.c, NXrender.c, NXglyph.c.
-
-nxagent-1.3.2-5
-
-- Fixed initialization of all the supported depths. Previous
-  versions correctly initialized the various depths but still
-  failed to advertise the support of any other depth than the
-  default depth supported by the remote X server.
-
-- Persistent mode. We now correctly propagate the pixmap ID of
-  the parent to the virtual pixmap at reconnection. This fixes
-  the reconnection errors when render extension is enabled.
-
-- Persistent mode. Solved the refresh problems at reconnection.
-  Problems were generated by the lack of window parent's ID at
-  the time session was reconnected.
-
-- Changed the agent's behaviour at the time the close button is
-  pressed. If agent is running in persistent mode a new dialog
-  is showed with the option to suspend the session.
-
-nxagent-1.3.2-4
-
-- Persistent mode. At the time the proxy connection is reset the
-  per-client unpack geometry information is cleared. This makes
-  agent find out that a new unpack geometry is needed as soon as
-  the display is reconnected.
-
-- Persistent mode. Lot of logging added in order to trace use of
-  resources as long as they are recreated. The current version
-  fails to correctly restore the picture information when render
-  is enabled.
-
-nxagent-1.3.2-3
-
-- Finally fixed all the problems with missing initialization of
-  pixmap formats. The screen info is now correctly set up even
-  when the remote display doesn't support all the target depths.
-  Many thanks to Michael L Torrie who helped me to reproduce the
-  problem and come to a solution.
-
-- Moved initialization of depths, default drawables and pixmap
-  formats to their own functions in Display.c.
-
-nxagent-1.3.2-2
-
-- Fixed the nxagentDestroyPixmap() function to correctly take into
-  account the reference counter of the virtual pixmaps. This solves
-  the crashes observed when running some GTK clients like xchat.
-
-- Added a function Pixmap.c to forcibly destroy the pixmaps created
-  in the virtual framebuffer when the parent pixmap is destroyed.
-
-- This version contains some verbose output intended to better test
-  the new behaviour. The output will be removed in future versions.
-
-nxagent-1.3.2-1
-
-- More cleanup in Pixmap.c.
-
-- Rewritten nxagentCreatePixmap(). Corrected an error where the
-  bitsPerPixel field was set to the pixmap's depth instead of the
-  result of BitsPerPixel(depth). This finally solves the problem
-  of text being incorrectly rendered in the virtual framebuffer.
-
-- Corrected the X error returned at the end of session when trying
-  to free a pixmap with an invalid id.
-
-- Opened the 1.3.2 branch.
-
-nxagent-1.3.1-32
-
-- Cleanup of Pixmap.h/Pixmap.c. Renamed macros according to the
-  nxagent naming conventions.
-
-nxagent-1.3.1-31
-
-- When running in fullscreen mode, grab and ungrab of pointer and
-  keyboard is performed in new functions, placed in Events.c.
-
-- The event loop now checks if the enter/leave notify carries a
-  NotifyInferior detail and, in this case, doesn't perform the grab.
-  This saves half the amount of grabs (and the related roundtrips)
-  performed by the previous version.
-
-- Ungrab of pointer is now performed whenever the cursor leaves the
-  fullscreen window. In previous version only the keyboard was
-  explicitly ungrabbed.
-
-- Added a warning in the event loop when receiving a MappingNotify.
-  This event is presently unhandled and seems to be reported, as a
-  consequence of the selected event mask, only by some X servers.
-
-nxagent-1.3.1-30
-
-- Reverted the patch introduced in Pixmap.c. The whole issue is
-  being investigated in its ramifications up to the virtual frame
-  buffer.
-
-nxagent-1.3.1-29
-
-- Fixed a problem in the nxagentDestroyPixmap function where the
-  reference counter of pixmaps could be decremented twice. This
-  could lead to agent trying to free the pixmaps more than once.
-
-- On Solaris there is no description for pc105 keyboard model. As
-  a workaround we consider pc104 to be the closest approximation.
-
-nxagent-1.3.1-28
-
-- Fixed a bug in the create window procedure. With some clients,
-  like Maelstrom and xmame, the creation of the main window was
-  failing due to the wrong colormap and visual attributes used
-  by agent on the real X server.
-
-- In fullscreen mode the keyboard is now grabbed at the time we
-  receive an EnterNotify event. This fixes a problem at startup
-  observed on some Debian based distributions where agent didn't
-  receive the keyboard focus until user had minimized and then
-  brought to front the agent's window. The grab is now correctly
-  performed by using the timestamp of the remote X server ins-
-  tead of our local timestamp.
-
-- In NXdixfonts.c strings corresponding to names of fonts and
-  font aliases cached by nxagent were missing the terminating
-  zero.
-
-- In function InitClientPrivates fixed the missing initializa-
-  tion of the is_ignored member of the ClientPriv structure.
-
-- Added the Persistent option to Options repository. The flag is
-  intended to replace the old nxagentEnableReconnect variable.
-
-nxagent-1.3.1-27
-
-- Fixed a memory allocation problem in Keyboard.c. A string was
-  allocated in the heap without making enough room for the trail-
-  ing zero.
-
-nxagent-1.3.1-26
-
-- Added further run-time checks to verify that pixmaps are not
-  created with bad bit-per-plane settings. This problem seems to
-  be caused by lack of support by nxagent of some combinations
-  of depth and visual when the render extension is enabled. If
-  this is the case, hide the render extension to new clients and
-  force any subsequent render operation to return a BadRequest
-  error. This required including extension.c from dix. A new
-  NXextension.c file is added to the distribution.
-
-- A problem was reported by Valgrind about reading the first 4
-  bytes just after the block allocated in fbCreatePixmap from
-  nxagentCreatePixmap. A quick fix was added to pixmap.c from
-  dix so that AllocatePixmap adds 4 additinal bytes to each
-  buffer.
-
-nxagent-1.3.1-25
-
-- Fixed a memory corruption error. The original AllocateGlyphSet
-  from render/glyph.c could be called instead of the NX counter-
-  part defined in NXglyph.c. This could lead to the missing
-  allocation of the trailing remote glyphset id field.
-
-- Added initialization of an otherwise usused string in function
-  nxagentPropagateArtsdProperties(). The whole string is probably
-  to be removed in future versions.
-
-- Moved the flag used to avoid reentrancy in GCOps to a separate
-  Trap header and source.
-
-- Further cleanup. Removed the zombie file NXglyphcurs.h.
-
-- Added missing initialization of the picture pointer in private
-  window's data in nxagentCreateWindow.
-
-nxagent-1.3.1-24
-
-- Added the missing timeout when calling WaitForSomething() at
-  startup. The bug caused the splash to remain on screen until
-  a further event was received.
-
-- Fixed a BadAtom error on Windows during initialization. Error
-  was caused by a bad attempt to change the NX_AGENT_SIGNATURE.
-
-- Hunting the 0 bits-per-plane drawable bug in nxagentValidateGC.
-  Added tracing output and additional checks. GC validation is
-  skipped if it is not possible to recover an appropriate value.
-
-- Ensured that nxagentDisplayName is set before calling the post
-  initialization procedure.
-
-nxagent-1.3.1-23
-
-- When session is run nested inside another NX X agent, all the
-  optimizations regarding remote expose events on fully visible
-  windows are disabled. This solves the refresh problems encoun-
-  tered when covering the nested session with a window from the
-  local X server.
-
-- Reusing NX_AGENT_SIGNATURE atom to detect nested operation.
-  Atom is created internally to the agent server at startup,
-  before any atom on the real display.
-
-- Fixed construction of caption used for dialog boxes spawn by
-  agent. The previous algorithm failed to identify the correct
-  string in parameter -name passed on the command line.
-
-nxagent-1.3.1-22
-
-- Ensured that state of keyboard modifiers is initialized with
-  values from the real X server when the first key stroke is
-  pressed by the user.
-
-- Fixed the X_SetInputFocus errors generated at session startup.
-
-- Rootless mode. Ensured that remote expose events are always
-  reported by the remote proxy. This is a temporary fix looking
-  forward for better handling of visibility events.
-
-nxagent-1.3.1-21
-
-- Saved a GetWindowAttributes and a GetGeometry in the function
-  drawing the splash screen.
-
-- Better handling of splash at startup. Removed the flickering on
-  Windows without recurring to another atom. This is achieved by
-  optimizing drawing and delaying mapping of the main windows.
-
-- Modified the magic values activating rootless mode to 100x100.
-
-- Removed modifications introduced in 1.3.1-20.
-
-nxagent-1.3.1-20
-
-- Working on eliminating the splash screen flickering on Windows
-  and Darwin. Checked if the NX_SPLASH atom has been created by
-  the NX X server. If this is the case, we let the NX X server
-  show the splash screen on our behalf.
-
-nxagent-1.3.1-19
-
-- Improved the initialization phase by removing a GetProperty, an
-  InternAtom and two GetInputFocus round-trips.
-
-- Added appropriate masking of the state bits reported by the
-  XkbStateNotifyMask event.
-
-- Added a simple mechanism during the itialization phase to trace
-  the use of X server replies.
-
-nxagent-1.3.1-18
-
-- Made some order in functions loading the NX icon.
-
-- Removed some more zombie files from agent distribution. Now only
-  the files imported from DIX and MI have name prepended with NX.
-
-nxagent-1.3.1-17
-
-- Moved names and values of intern atoms created by agent in their
-  specific header and source.
-
-- We temporarily force rootless mode if user provides a geometry
-  of 801x601. This is intended to simplify testing. Note that if
-  rootless is selected, we'll anyway disregard any geometry set
-  by the user, assuming the geometry of the real display.
-
-nxagent-1.3.1-16
-
-- We are checking now whether NX_IDENTITY intern atom is created
-  before NX_SPLASH. We want NX X servers to show the splash on our
-  behalf, so if NX_SPLASH is already interned, than we just skip
-  the splash procedure.
-
-nxagent-1.3.1-15
-
-- Rootless mode. Fixed a segfault handling ConfigureNotify events
-  on top-level windows.
-
-- Moved handling of ClientMessages coming from proxy in a separate
-  function.
-
-nxagent-1.3.1-14
-
-- Rewritten the code dealing with key modifier changes. Now we
-  use XKB events instead of synchronous XkbGetIndicatorState()
-  calls.
-
-- Moved activation of keyboard and pointer events to Events.c.
-
-- Removed pointer motion optimizations as a better logic, taking
-  in account the selected link speed, is already implemented in
-  proxy.
-
-nxagent-1.3.1-13
-
-- Renamed the -reconnect option as -persistent.
-
-- Rootless mode. Agent's root windows are not mapped at startup.
-
-- Removed the zombie file glyphcurs.c from agent distribution.
-
-nxagent-1.3.1-12
-
-- Corrected a typo in the new CopyArea code in GCOps.c where:
-
-  if (srcx > nxagentWidth)  srcx = nxagentWidth;
-  if (srcy > nxagentHeight) srcx = nxagentHeight;
-
-  had to be:
-
-  if (srcx > nxagentWidth)  srcx = nxagentWidth;
-  if (srcy > nxagentHeight) srcy = nxagentHeight;
-
-- Added handling of the fullscreen command line parameter to the
-  options repository.
-
-- Added agent geometry parameters to the options repository.
-
-nxagent-1.3.1-11
-
-- Rootless mode. Added handling of configuration events reported
-  for the top-level windows.
-
-- Rootless mode. Children of the root window get the event mask
-  selected when the window is created. This makes the keyboard
-  work at least with xterm and other simple clients. There are
-  still problems with the pointer events.
-
-- Created new Splash.h and Splash.c sources file to contain the
-  few splash screen procedures that were previously sparsed in
-  multiple files.
-
-- Added traces in all the window creation procedures and in the
-  initialization routines called at startup.
-
-- Renamed some source files to make simpler to identify what is
-  imported from DIX and what actually pertains to agent.
-
-nxagent-1.3.1-10
-
-- Added the missing RestackWindow screen operation. This solves
-  problems of incorrect stacking order observed in menus when
-  using the drop shadow feature in the latest KDE versions.
-
-nxagent-1.3.1-9
-
-- The new standard for checking previous inclusion of headers is
-  by verifying definition of _Filename_H_ where Filename is the
-  base name of the file, for example __Options_H__ in the case
-  of "Options.h". This is intended to be a step in reducing the
-  number of defines in code prefixed with NXAGENT.
-
-- Updated NX copyright to year 2004. Placed copyright statement
-  regarding NXAGENT and NX modifications to the Xnest software
-  at the beginning of the file. Checked again if credit is given
-  to all the existing copyright owners.
-
-nxagent-1.3.1-8
-
-- Added a new Options repository to store the values currently
-  dispersed all over around. The new macros nxagentOption(option)
-  and nxagentChangeOption(option, value) should be used from now
-  on to access the important values affecting agent's operations.
-
-- General cleanup of code. Removed the remaining references to
-  the Xnest legacy code.
-
-nxagent-1.3.1-7
-
-- Some steps forward toward rootless agent. Now all the top level
-  windows are correctly created. Drawing to the real screen seems
-  to work without problems. It is still not possible to get events
-  in the event loop and the remote WM is interfering with the WM
-  on the local display.
-
-- More cleanup of code. Some changes to parts added since 1.3.1-5.
-
-nxagent-1.3.1-6
-
-- A drawable with 0 bpp can somehow arrive to the fb layer. The
-  problem needs to be better investigated. In the meanwhile a
-  quick check is added to correctly identify the ill condition.
-
-- Small fix to allow Num/Caps lock synchronization also on the
-  windows platform. This is still to be considered beta quality.
-
-- New options -slow and -fast added to agent. When "fast mode" is
-  not set, agent will query the remote X server to get real content
-  of drawables. When fast mode is enabled, agent will save the
-  round-trip by just clearing the drawable to its background. The
-  default mode is "slow", thus agent will always query the remote
-  server. When "fast mode" is explicitly set or when NX transport
-  is detected and the link is one of MODEM, ISDN and ADSL, agent
-  will default to "fast mode". This behaviour can be overridden by
-  system administrators by setting the key AGENT_EXTRA_OPTIONS_X
-  to "-slow" in node configuration.
-
-nxagent-1.3.1-5
-
-- Created framework for rootless agent. Added a -rootless option.
-
-- Slowly going toward a better organization of nxagent internals.
-  Renamed some files and moved things around. Changed some comments
-  in Screen.c to be more explainatory.
-
-nxagent-1.3.1-4
-
-- Changed default keyboard model to "pc102" (was "pc101") to correct
-  problems with "<" and ">" keys on the German keyboards and, poten-
-  tially on other layouts.
-
-- Added new parameter -kbtype to handle both geometry and layout in
-  a single form, for example pc102/pl. Parameter -keyboard is still
-  supported for backward compatibility.
-
-- Synchronization of Num and Caps lock status is now done comparing
-  the real keyboard and the internal state at the time nxagent gets
-  the focus. If state doesn't match, a fake keyboard event is sent.
-
-nxagent-1.3.1-3
-
-- Fixed a further problem on CopyArea between windows and pixmaps.
-
-nxagent-1.3.1-2
-
-- Implemented CopyArea on framebuffer when copying from windows to
-  pixmaps. Added the -slow command line switch to let nxagent get
-  the real content of the window from the X server. This requires
-  an expensive round-trip so it is disabled by default.
-
-nxagent-1.3.1-1
-
-- Opened the 1.3.1 branch.
-
-nxagent-1.3.0-32
-
-- Fixed a bug on 16 bpp displays using render extension. Now only
-  images which are used by render pictures and which have depth 32
-  are created with a different visual color mask. This saves a big
-  amount of SetUnpackColormap requests.
-
-nxagent-1.3.0-31
-
-- Fixed a bug in nxagentComposite routine. The macro nxgentPicturePriv
-  was used without checking for a null pointer argument.
-
-nxagent-1.3.0-30
-
-- Limitations on bandwidth introduced whenever the agent's window
-  is covered are now disabled by default. They can be enabled by
-  specifying the -limit option on the command line. The -nolimit
-  option is left for compatibility with the previous versions.
-  This handy feature caused complaints in the past from users who
-  instruct window managers to not move the window having focus on
-  top of the stacking order.
-
-nxagent-1.3.0-29
-
-- Removed the warnings issued at compile time.
-
-nxagent-1.3.0-28
-
-- Replaced the corrupted file nxagent.xpm with the original version.
-
-nxagent-1.3.0-27
-
-- Hopefully fixed all the remained memory leaks. Most problems were
-  due to agent's render extension not freeing resources on X server.
-
-- Added support for big-endian X server display on render extension.
-  Glyphs are reformatted according with the destination order.
-
-- Added per client information for SetUnpackGeometry, now the unpack
-  routines should have the correct information for the color mask at
-  the end of the split process.
-
-
-nxagent-1.3.0-26
-
-- Changed the message printed in the log when leaving the dispatch
-  loop from 'Error' to 'Info'.
-
-- Moved initialization of _NXFlushSize to nxcompext in order to set
-  value at the time NXGetControlParameters() is called.
-
-nxagent-1.3.0-25
-
-- Content of selection is now acquired using a single round-trip.
-  If content exceeds 262144 bytes, it is truncated at that size.
-  This works in most situations, at least with text, that, by the
-  way, is the only target supported at the moment. An improvement
-  would be to modify the state machine in a way that the remaining
-  data part is got using a second round-trip. This is not difficult
-  to do and can be considered for future releases.
-
-- In handling of clipborad we had to disable check on multiple
-  convert selection requests from the same client. There is a bug
-  in the algorithm that prevents the counter to be reset at the
-  appropriate time. This is to be investigated.
-
-nxagent-1.3.0-24
-
-- Added asynchronous handling of GetProperty requests and replies
-  using the NXCollectProperty and NXGetCollectedProperty requests
-  and the NXCollectPropertyNotify event in NXclipboard.c and in
-  Event.c. Implementation is not complete yet and can sometimes
-  cause X clients to misbehave.
-
-- Function xnestBitBlitHelper() now always returns NullRegion.
-  Handling of graphical expose events should be rewritten so that
-  regions are always generated internally to nxagent. Returning a
-  null region without checking our event queue, anyway, saves a
-  flush of the display buffer and doesn't seem to affect the
-  functionalities.
-
-- This version comprises modifications to Events.c, GCOps.c,
-  NXClipboard.c, NXwindow.c and Window.c where I found XSync()
-  messages (or code used to just send XSync() messages) outside
-  any #ifdef ..._DEBUG.
-
-nxagent-1.3.0-16
-
-- A dialog is showed at startup if proxy was not able to load a
-  persistent cache.
-
-- Reflected changes introduced in NXGetControlParameters() to add
-  more detailed information about the compression settings.
-
-- Fixed a potential bug with the name of the agent's display at the
-  time a dialog had to be showed. String was allocated with only 6
-  characters. This could lead to dialogs not being showed using
-  display ports greater than 9999.
-
-- NX.h is now included by NXControl.h. Removed #include directives
-  from other files.
diff --git a/nxcomp/CHANGELOG b/nxcomp/CHANGELOG
deleted file mode 100644
index b0323d4a7..000000000
--- a/nxcomp/CHANGELOG
+++ /dev/null
@@ -1,3778 +0,0 @@
-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.
-
-- Updated copyright to year 2011.
-
-nxcomp-3.4.0-7
-
-- Fixed TR03H02334. Modified the UNIX domain socket checks on MacOSX
-  to be compliant with the standard introduced in OSX 10.6.3.
-
-nxcomp-3.4.0-6
-
-- Solved compilation problems on Solaris.
-
-nxcomp-3.4.0-5
-
-- Solved compilation problems on GCC 4.4.
-
-nxcomp-3.4.0-4
-
-- Added reference to fixed TR02H02325.
-
-nxcomp-3.4.0-3
-
-- Updated copyright to year 2010.
-
-nxcomp-3.4.0-2
-
-- Fixed TR03G02204. Changed the parsing of X authority entries in
-  order to handle the case where the hostname includes white spaces.
-
-- Fixed TR02H02325. Bug in PNG decompression on 16bpp displays.
-
-nxcomp-3.4.0-1
-
-- Opened the 3.4.0 branch based on nxcomp-3.3.0-4.
-
-- Changed version number.
-
-- Updated copyright to year 2009.
-
-nxcomp-3.3.0-4
-
-- Check if the variable storing the ping time exceeded the maximum
-  integer value.
-
-- Recover incorrect sequence number when the proxy is not connected
-  to an agent.
-
-nxcomp-3.3.0-3
-
-- Removed a condition in ClientChannel that caused a loss in event
-  sequence numbers.
-
-nxcomp-3.3.0-2
-
-- Updated VERSION.
-
-nxcomp-3.3.0-1
-
-- Opened the 3.3.0 branch based on nxcomp-3.2.0-7.
-
-nxcomp-3.2.0-7
-
-- Solved a compilation problem on GCC 4.3.
-
-nxcomp-3.2.0-6
-
-- Changes considering that unsetenv() returns void on Mac OS X.
-
-nxcomp-3.2.0-5
-
-- Fixed TR03F02024. Assume the launchd unix socket as X socket.
-
-- Changed the authorization cookie retrieval when using the launchd
-  socket on MacOSX, in order to wait for the X server start.
-
-nxcomp-3.2.0-4
-
-- Fixed TR03F02026. Unset environment variable LD_LIBRARY_PATH before
-  calling the exec function running nxclient.
-
-nxcomp-3.2.0-3
-
-- Fix addMsTimestamp() and subMsTimestamp(). Remove the check for
-  a valid input in diffTimestamp() and diffUsTimestamp().
-
-nxcomp-3.2.0-2
-
-- Fixed TR12E01973. Now the correct number of bits are used for the
-  number of points in a X_FillPoly request.
-
-nxcomp-3.2.0-1
-
-- Opened the 3.2.0 branch based on nxcomp-3.1.0-6.
-
-nxcomp-3.1.0-6
-
-- Always use a timeout of 50 ms to update the congestion counter.
-
-nxcomp-3.1.0-5
-
-- Solve the possible deadlock caused by both proxies running out of
-  tokens at the same time.
-
-- In ServerProxy::handleCheckDrop() copy the list since the function
-  can delete the elements.
-
-nxcomp-3.1.0-4
-
-- Classes ProxyReadBuffer and ServerReadBuffer returned an invalid
-  number of characters to read in the case of a readable() failure.
-
-- Connections to proxy versions newer than 3.0.0 were not accepted.
-
-- Reading options from file could fail if options contained spaces
-  or other characters interrupting the fscanf()'s matching of input.
-
-- The proxy link could not be flushed if a ping request was replied
-  after the end of the read loop.
-
-nxcomp-3.1.0-3
-
-- Fixed a compilation warning on GCC 2.95.
-  
-nxcomp-3.1.0-2
-
-- Solved TR09E01852. Modified the encoding of the number of rects
-  in the XSetClipRectangles request.
-  
-nxcomp-3.1.0-1
-
-- Opened the 3.1.0 branch based on nxcomp-3.0.0-46.
-
-nxcomp-3.0.0-46
-
-- Fixed TR09E01865 and TR08E01831. Assume the old behavior of compr-
-  essing the CUPS, SMB, HTTP and Font channels when connected to an
-  old proxy version.
-
-nxcomp-3.0.0-45
-
-- Retry the fork() 30 times, but only on Cygwin (Sob!).
-
-nxcomp-3.0.0-44
-
-- In the case of an error, try again to fork() after a second, for
-  a maximum of 5 times. This seems to constitute a valid workaround
-  to the intermittent fork() failures observed on Windows.
-  
-- Fixed NXTransDestroy() to show the 'broken connection' dialog in
-  the case of a link failure on the client.
-
-- Handled the 'terminating' and 'terminated' messages as new proxy
-  stages.
-
-- Force all the directories and files created by the library to be
-  readable only by the user.
-
-- Don't complain if the shared memory segment can't be initialized
-  on Windows.
-
-nxcomp-3.0.0-43
-
-- Prevent the reallocation of the read buffer in the proxy and the
-  agent transport if the buffer was borrowed by an upper layer.
-
-- Let the house-keeping process remove the cache directories that
-  are empty and have not be used since more than 30 days.
-
-- Added the missing destruction of the ZLIB stream used for image
-  decompression at proxy shutdown.
-
-nxcomp-3.0.0-42
-
-- In handleFastWriteReply(), moved the initialization of the 'next'
-  pointer inside the '#ifndef __sun' block. This should fix the re-
-  maining encoding problems on SPARCs.
-
-nxcomp-3.0.0-41
-
-- VMWare virtual machines can have the system timer deadly broken.
-  In the case of timeout, try to send a ping regardless we are the
-  client or the server proxy to force a write by the remote.
-
-- Removed the messages 'Info: Using image cache parameters...' and
-  'Info: Using image streaming parameters...' from the session log
-  if the image cache is not enabled.
-
-nxcomp-3.0.0-40
-
-- Removed the messages 'Info: Shutting down the NX transport' and
-  'Info: End of NX transport requested by...' at the session tear
-  down.
-
-- Removed the remaining log output.
-
-nxcomp-3.0.0-39
-
-- Don't reset the timer on proxy shutdown.
-
-nxcomp-3.0.0-38
-
-- Don't reinstall the signal handler if the signal was enabled and
-  the NXTransSignal() action is NX_SIGNAL_FORWARD.
-
-nxcomp-3.0.0-37
-
-- Return a congestion level 9 if the agent channel is in congestion
-  state.
-
-- Set the idle timeout (used to update the congestion state) based
-  on the link type. The timeout is 0 ms with link LAN and 50 ms in
-  the case of MODEM, with the other values in the between.
-
-nxcomp-3.0.0-36
-
-- Changed the encoding of the RenderCompositeGlyphs requests. Use
-  a separate cache for X and Y. Send a single bit for offset X and
-  offset Y if they match the source coordinates.
-
-- Always use the memcpy() in the handleFastWrite*() on Sun, as the
-  alternative code doesn't work on SPARC if the buffer is not word
-  aligned.
-
-nxcomp-3.0.0-35
-
-- Ensure a smooth transition between different congestion states.
-  If the current congestion counter is greater than the previous,
-  ramp up the value quickly by taking the current counter. If the
-  new congestion counter is less than the previous, ramp down the
-  reported value slowly by calculating the average of the last 8
-  updates. Reset the congestion counter to 0 if no token reply is
-  pending and the proxy is idle until a timeout.
-
-nxcomp-3.0.0-34
-
-- Calculate the current congestion as the average of the last 3
-  frames sent.
-
-nxcomp-3.0.0-33
-
-- When sending a X_RenderCompositeGlyph update, send a single bit
-  if the source X and Y match the values in cache.
-
-- Save the check on the bytes readable from the proxy descriptor
-  after the select.
-
-nxcomp-3.0.0-32
-
-- Send the X_GetImage replies uncompressed to better leverage the
-  stream compression.
-
-- Before entering in congestion state, force a read to see whether
-  the remote proxy aborted the connection.
-
-nxcomp-3.0.0-31
-
-- Try to avoid using memcpy() in the channels' handleFastWrite*().
-
-- Changed the copyright notices at the beginning of the files that
-  were referring to NXPROXY to refer to NXCOMP.
-
-nxcomp-3.0.0-30
-
-- Set the agent and proxy descriptors as ready, when appropriate,
-  also in the case of an interrupt.
-
-nxcomp-3.0.0-29
-
-- On the X server side, read more events from the X server just be-
-  fore and just after having written some data. On the X client si-
-  de, apply the same to the proxy link.
-
-- X11 channels originate a congestion control code as soon as the-
-  re is some data left from the previous write.
-
-nxcomp-3.0.0-28
-
-- Displaced automatically the "channel unresponsive" and "no data
-  received from remote" dialogs if the error condition is ceased.
-
-- Rewritten the channel drain procedure.
-
-- Tried a different approach to the channel congestion handling.
-  The X11 channels are not drained after a blocking write but only
-  if a further write is requested and the channel is still in con-
-  gestion state. Benchmarks show that this is still sub-optimal,
-  compared to sending the congestion code immediately also for X11
-  channels. See the next version.
-
-nxcomp-3.0.0-27
-
-- Ignored the agent option 'defer'.
-
-- Dropped support for the 1.4.0 versions.
-
-- More fixes to support the 1.5.0.
-
-nxcomp-3.0.0-26
-
-- The channel read buffer can inherit the data to be encoded from
-  the caller, instead of taking it from the transport. This is le-
-  veraged by the agent channel to save the copy.
-
-- Ignored the agent option 'clients'.
-
-- Removed the deprecated code checking the CPU limits.
-
-- Removed the counters that were duplicated in the Statistics and
-  the Control classes.
-
-nxcomp-3.0.0-25
-
-- Improved the effectiveness of the caching of the RenderComposite-
-  Glyphs by using a differential encoding for the length, delta x
-  and delta y of the first string.
-
-- Better handle the compatibility between different formats of the
-  cache files.
-
-nxcomp-3.0.0-24
-
-- Fixed the compatibility problem with the 1.5.0 versions.
-
-- Removed the constants NXDisplayReadable, NXDisplayFlushable and
-  NXDisplayCongestion. Now nxcompext has three distinct functions.
-
-nxcomp-3.0.0-23
-
-- Removed support for Rdp, Tight and Hextile packed images decod-
-  ing since they have been made obsolete by the new NX server.
-
-- Use the value 0 for the action is_hit and 1 for is_added. This
-  increases the frequency of zeroes in the encode buffer, giving
-  better compression.
-
-- Changed the copyright attribution from Medialogic to NoMachine.
-
-nxcomp-3.0.0-22
-
-- Implemented an alternate encoding reducing the size of the int
-  caches to 16 elements and transmitting the values in blocks of
-  4 bits. Although this encoding reduces the effectiveness of
-  the differential compression, it allows better compression of
-  the final stream, resulting in a 10% to 20% gain in all condi-
-  tions. The new encoding is experimental, as it would make the
-  3.0.0 incompatible with all the previous NX versions. Use this
-  package as a reference for future implementations.
-
-nxcomp-3.0.0-21
-
-- Encode the first two coordinates of a FillPoly message by using
-  a differential encoding, thus the origin of the polygon is not
-  included in the checksum. This is aimed to work in combination
-  with the agent converting all the FillPoly requests to the rela-
-  tive coordinate mode.
-
-- Add the coordinate mode to the checksum of the PolyPoint and Po-
-  lyLine messages so that it doesn't need to be encoded separately.
-
-- Disable the streaming for all messages. This saves the encoding
-  of a boolean for each message that could potentially be streamed.
-
-- Don't try to match the block size when encoding a value based on
-  an IntCache. This saves the additional bool in 90% of the cases.
- 
-- Removed support for the former RDP and RFB session types. 
-
-- Due to the above changes, this version is incompatible with the
-  previous 3.0.0 releases.
-
-nxcomp-3.0.0-20
-
-- Added support for the 'lossy', 'lossless' and 'adaptive' pack me-
-  thod literals. These values activate the dynamic selection of the
-  pack method by the agent.
-
-- Made the 'adaptive' pack method the default for all link types.
-
-- The default stream compression level is now 6 for link type ISDN,
-  4 for ADSL and 1 for WAN. The default data compression level is
-  always 1, except for LAN that is 0.
-
-nxcomp-3.0.0-19
-
-- Print in the session log the X11 display that the proxy is imper-
-  sonating or where it is forwarding the connections.
-
-nxcomp-3.0.0-18
-
-- Implemented decoding of the PACK_BITMAP_16M_COLORS pack method.
-  This is a very simple encoder removing the 4th byte in 32 bits-
-  per-plane images. This encoder is intended to better leverage
-  the stream compression on low bandwidth links.
-
-- Removed the code cleaning the padding bytes in RenderAddGlyphs
-  and RenderCompositeGlyphs as the operation is now performed in
-  Xrender.
-
-- Removed the "Info: Synchronizing local and remote caches." and
-  "Info: Using remote server '...'." lines from the session log.
-
-nxcomp-3.0.0-17
-
-- Determine the CPU endianess at compile time only on Linux and
-  Cygwin.
-
-nxcomp-3.0.0-16
-
-- Optimized the memory allocation of the ReadBuffer classes. The
-  buffers from the Transport classes are used, when possible, to
-  avoid the copy.
-
-nxcomp-3.0.0-15
-
-- Reworked the code dealing with the channel congestion control
-  messages for increased efficiency.
-
-- Removed the pending_ flag from the proxy and channel class mem-
-  bers. If needed, the classes will query the transport buffers
-  to see whether there is data pending.
-
-- Removed the additional parameter from NXTransFlush().
-
-- The proxy doesn't issue anymore a sync control message on a X
-  reply. Anyway it will respond to the request for compatibility
-  with older versions.
-
-- Removed the dynamic selection of the encoding method for the
-  X_QueryColors request and X_ListFonts, X_QueryColors, X_Query-
-  Font replies. Now all of them use the differential encoding to
-  better leverage the stream compression.
-
-- Fixed to build on SUNs where we don't have endian.h.
-
-nxcomp-3.0.0-14
-
-- When handling partial proxy messages, don't try to determine how
-  many bytes still need to be read if the ZLIB stream compression
-  is enabled.
-
-- If a message can't be located, the ReadBuffer class checks if it
-  is possible to consume the data already in the transport buffer.
-
-- Optimize the MD5 routines by determining the CPU endianess at
-  compile time.
-
-- Force Drawable and GContext to be CARD32 in NXproto.h.
-  
-nxcomp-3.0.0-13
-
-- Changed the semantic of the NXDisplayFlushHandler callback. The
-  function is called when new data is sent to the remote proxy or,
-  with a 0 length, upon receiving a new token reply, so that the
-  agent can update its congestion state.
-
-- Added the NXTransCongestion() function. It returns a value bet-
-  ween 0 and 9 indicating the congestion level based on the tokens
-  remaining. A value of 9 means that the link is congested and no
-  further data can be sent.
-
-- Removed the congestion and synchronization callbacks. They are
-  superseded by the new NXTransCongestion() implementation.
-
-nxcomp-3.0.0-12
-
-- Send the token replies at the end of the encode loop instead of
-  flushing the buffer immediately.
-
-- Fixed TR05E01687. Correctly detect CTRL-ALT-SHIFT-ESC keystrokes.
-
-- Renamed the option 'block' as 'tile'.
-
-- Ignored the option 'menu', targeting the X11 agent.
-
-nxcomp-3.0.0-11
-
-- Removed the 'interactive' attribute from generic channels. We now
-  use the 'prioritized' attribute which yields the same result.
-
-- Simplified the channels' read loop by always reading only once.
-
-- The channels flush the link as soon as the token is exceeded even
-  if the flush policy is set to deferred.
-
-- Reserved more cache memory for the images when running a shadow
-  session.
-
-nxcomp-3.0.0-10
-
-- Added the NXDisplayWriteHandler callback definition.
-
-- Removed the code that forced the proxy to retain in the cache the
-  images referenced at session startup.
-
-- Disabled the persistent image cache since this is not supported
-  by the current agent. This will save the overhead caused by the
-  image house-keeping process.
-
-nxcomp-3.0.0-9
-
-- Fixed a cast problem in GetBytesReadable().
-
-nxcomp-3.0.0-8
-
-- Added the NXTransTime() utility. It return the time in milliseconds
-  elapsed since the last call to the same function. Useful for bench-
-  marking the Xlib layer.
-
-- Ignored the option 'block' targeting the X11 agent.
-
-nxcomp-3.0.0-7
-
-- Ignored the options 'shadow', 'shadowmode' targeting the X11 agent.
-
-- Added the session type 'shadow'.
-
-nxcomp-3.0.0-6
-
-- Fixed TR08D01484. Fixed a bug in the cleanup of the RenderAddGlyphs
-  messages. We clean up only the glyphs with depth 8, width greater
-  than 1 and pixmap byte pad 4.
-
-- Added file COPYING.
-
-nxcomp-3.0.0-5
-
-- Updated the copyright notices to the current year.
-
-nxcomp-3.0.0-4
-
-- Imported changes up to nxcomp-2.1.0-6.
-
-- Fixed TR12D01563. Changed the configure script to always build the
-  library with the -fPIC option. This is related to the way SELinux
-  works.
-
-- Fixed the dependency from local endianess for 16-bit color RDP un-
-  packing functions. This caused wrong colors to be displayed when the
-  proxy and the X server were running on two separate machines having 
-  different endianess.
-
-- Fixed TR10D01523. The Channel::handleDrain() method now accounts
-  for the fact that agent connections can't be drained.
-
-- Changed the Tight and Hextile decoding functions to use the X ser-
-  ver's byte order.
-
-nxcomp-3.0.0-3
-
-- Changed the main loop to handle the 3.0.0 version.
-
-nxcomp-3.0.0-2
-
-- Updated the file VERSION.
-
-nxcomp-3.0.0-1
-
-- Opened the 3.0.0 branch based on nxcomp-2.0.0-81.
-
-nxcomp-2.0.0-81
-
-- Fixed the dependency from local endianess for JPEG and PNG decomp-
-  ression functions. This caused wrong colors to be displayed when
-  the proxy and the X server were running on two separate machines
-  having different endianess.
-
-- Fixed the number of entries in the handleColormap() function.
-
-nxcomp-2.0.0-80
-
-- Fixed TR06D01404. Removed the warning issued when calling the
-  AgentTransport::drain() method.
-
-nxcomp-2.0.0-79
-
-- Updated copyright to year 2006.
-
-nxcomp-2.0.0-78
-
-- Fixed a bug in the cleanup of the RenderAddGlyphs messages.
-
-- Minor improvements to the encoding of the RenderCompositeGlyphs
-  and RenderComposite requests.
-
-- Added 'client' to the list of the ignored options.
-
-nxcomp-2.0.0-77
-
-- Added cleanup of the padding bytes in the RenderCompositeGlyphs
-  and RenderAddGlyphs requests.
-
-nxcomp-2.0.0-76
-
-- Before adding the frame's bytes to the tokens, the frame length
-  is normalized based on the stream compression ratio of the last
-  frame sent. This avoids entering the drain loop too early when
-  the data is highly compressible. 
-
-- Moved the render messages' private data in a union to reduce the
-  footprint of the render store.
-
-nxcomp-2.0.0-75
-
-- The action performed on the remote message store and the affected
-  position are encoded as a single value. This saves approximately
-  1 bit per each message.
-
-- Created more Compat classes to handle the backward compatibility
-  with the 1.4.0 and 1.5.0 versions.
-
-nxcomp-2.0.0-74
-
-- Added support for the RLE pack method and made it the default if
-  the selected link type is LAN.
-
-- Removed the legacy support for the 'render' option provided at X
-  server side.
-
-- When defining LAME in ClientChannel.h, the channel has the chance
-  of suppressing more opcodes by the handleTaintLameRequest() call.
-  This is for test purposes.
-
-nxcomp-2.0.0-73
-
-- The X_NXSetUnpackColormap and X_NXSetUnpackAlpha now carry their
-  data in compressed form. The alpha data is compressed using the
-  ZLIB RLE encoding, while the colormap data is compressed using
-  the default ZLIB deflate.
-
-- Thanks to the above changes, ZLIB data compression of all messa-
-  ges which do not have a specific encoding is turned off, so that
-  we can make better use of the final stream compression.
-
-- Created new message structures to handle the compatibility with
-  the old proxy versions. When connected to an old proxy version
-  the agent should use the NXSetUnpackColormapCompat() and NXSet-
-  UnpackAlpha() interfaces.
-
-nxcomp-2.0.0-72
-
-- Solved a compatibility problem with the 1.X.X versions due to the
-  new render encodings.
-
-nxcomp-2.0.0-71
-
-- Improvements to X_RenderSetPictureClipRectangles.
-
-- Fixed handleUnpack() to pass the correct byte order parameter to
-  to the unpack alpha function.
-
-- Added the --parent parameter to the client even in pulldown mode.
-
-- Fixed a deallocation bug in StaticCompressor.
-
-nxcomp-2.0.0-70
-
-- Added compression of X_RenderSetPictureFilter, X_RenderSetPicture-
-  Transform, X_RenderTrapezoids and X_RenderTriangles.
-
-nxcomp-2.0.0-69
-
-- Changed the format of the persistent cache to accommodate the new
-  encoding of the render opcodes. Caches from the 1.4.0 and 1.5.0
-  should be still loaded and saved correctly when connected to and
-  old version of the library.
-
-- Improved the encoding of the X_CreatePixmap, X_ChangeGC, X_Render-
-  CompositeGlyphs, X_RenderComposite, X_RenderCreateGlyphSet, X_Rend-
-  erFreePicture and X_RenderCreatePicture messages. Added new classes
-  to handle the backward compatibility.
-
-- Made the static compression and decompression code reside in the
-  same class.
-
-nxcomp-2.0.0-68
-
-- Improved the encoding of the X_RenderCreateGlyphSet and X_Render-
-  FreeGlyphSet requests.
-
-nxcomp-2.0.0-67
-
-- Modified the following session messages:
-
-  From: "Session: Session starting at..."
-  To:   "Session: Starting session at..."
-
-  From: "Session: Session terminating at..."
-  To:   "Session: Terminating session at..."
-
-- Improved the encoding of the requests creating or freeing an XID.
-  This affects X_CreateGC, X_CreateWindow, X_CreatePixmap, X_Render-
-  CreatePicture, X_FreeGC, X_DestroyWindow, X_FreePixmap, X_Render-
-  FreePicture.
-
-- Added 'streaming' and 'backingstore' to the list of options used
-  by agents.
-
-- Modified the info messages to print the ZLIB compression paramet-
-  ers to be more compact and only use two lines.
-
-nxcomp-2.0.0-66
-
-- When part of an agent, the proxy will wait for the NXTransDestroy()
-  function to initiate the shutdown.
-
-nxcomp-2.0.0-65
-
-- Starting from this version the NX client can control the behaviour
-  of the client proxy by monitoring the messages marked as "Session".
-
-  At the early initialization the proxy will print:
-
-  "Session: Session starting at '...'.
-
-  The ellipsis here represent the current timestamp, as reported by
-  the POSIX function ctime():
-
-  Once the session is running, the proxy will print:
-
-  "Session: Session started at '...'.
-
-  At the time the session is being shut down, the proxy will print:
-
-  "Session: Session terminating at '...'.
-
-  Followed by:
-
-  Session: Session terminated at '...'.
-
-  The message "Info: Starting X protocol compression." is removed,
-  replaced by the message 'Session started at...' with the same
-  meaning. 
-
-  Once the message 'Session: Session terminated at..." is read from
-  the output, the client can optionally wait for the proxy process
-  to complete and terminate with an exit code 0.
-
-- The "Session" messages are not printed when the proxy is running
-  on the NX server side, as part of an agent.
-
-nxcomp-2.0.0-64
-
-- Reduced the default token limit from 32 to 24. The synchronizat-
-  ion callback is triggered by the tokens going below half the li-
-  mit.
-
-nxcomp-2.0.0-63
-
-- Added -I/usr/include/c++ to makedepend.
-
-nxcomp-2.0.0-62
-
-- The house-keeping process is now started upon the initialization,
-  if the memory cache is enabled, and, on the X server side, when
-  the remote actually requested access to the image cache.
-
-nxcomp-2.0.0-61
-
-- Added a NX_HANDLER_SYNCHRONIZATION callback to NXTransHandler().
-  The handler is called when the agent can use the available band-
-  width to synchronize X objects that are corrupted or incomplete.
-
-  The reason can be:
-
-  NX_SYNCHRONIZATION_BEGIN:   The synchronizationis is allowed.
-
-  NX_SYNCHRONIZATION_END:     The synchronizationis must stop.
-
-  The reason can be determined by agents by using the NXBeginSynch-
-  ronization and NXEndSynchronization values defined in NXvars.h.
-
-- Bytes from 14 to 24 in the X_NXGetControlParameters reply report,
-  respectively, the frame timeout, the ping timeout, the preferred
-  image split mode and the split size threshold.
-
-nxcomp-2.0.0-60
-
-- The following messages used by the NX client and server have been
-  changed. The NX client and server should be modified accordingly.
-
-  From: "Info: Shutting down the link and exiting."
-  To:   "Info: Shutting down the NX transport."
-
-  From: "Info: End of session requested by remote proxy."
-  To:   "Info: End of NX transport requested by remote"
-
-  From: "Info: End of session requested by agent termination."
-  To:   "Info: End of NX transport requested by agent."
-
-  From: "Info: End of session requested by signal '...'."
-  To:   "Info: End of NX transport requested by signal '...'."
-
-  From: "Info: Shutting down the link and exiting."
-  To:   "Info: Shutting down the NX transport."
-
-  From: "Info: Waiting for cleanup timeout to complete."
-  To:   "Info: Waiting the cleanup timeout to complete."
-
-  From: "Info: Waiting for watchdog process to complete."
-  To:   "Info: Waiting the watchdog process to complete."
-
-nxcomp-2.0.0-59
-
-- Added more debug information regarding the timing of packets sent
-  and received.
-
-- Added the possibility to redirect the log output to a file that can
-  be later shared with nxssh running in "binder" mode. This is useful
-  when testing the forwarding of the SSHD connection by nxssh to the
-  agent. Activated by defining BINDER in Loop.cpp.
-
-nxcomp-2.0.0-58
-
-- Fixed the unpack alpha procedure to only rely on the image's byte
-  order.
-
-- Solved the X_PutImage encoding problem introduced in the 2.0.0-56
-  version and restored the compatibility with the 1.5.0 version.
-
-nxcomp-2.0.0-57
-
-- Added a NXTransFile() function. It returns the name of the files
-  used by the proxy for the current session.
-
-  The type parameter can be:
-
-  NX_FILE_SESSION:  Usually the file 'session' in the user's session
-                    directory.
-
-  NX_FILE_ERRORS:   The file used for the diagnostic output. Usually
-                    the file 'errors' in the session directory.
-
-  NX_FILE_OPTIONS:  The file containing the NX options, if any.
- 
-  NX_FILE_STATS:    The file used for the statistics output.
-
-  The returned string is allocated in static memory. The caller must
-  copy the string upon returning from the function, without freeing
-  the pointer.
-
-- Fixed the PANIC in the handling of the abort split messages.
-
-- The encode and decode routines may write one byte past the nominal
-  end of the encode buffer. This additional byte is now included in
-  the payload. This is actually a bug, but harmless.
-
-nxcomp-2.0.0-56
-
-- Added the X_NXAbortSplit request. It can be used to interrupt the
-  streaming of all the messages currently in the split store for
-  the specified resource. Depending if the split store did or did
-  not contain split messages, the client will receive an immediate
-  end-split or no-split notification.
-
-- Removed the split modes NXSplitModeEager and NXSplitModeLazy. The
-  available modes are now NXSplitModeSync and NXSplitModeAsync. The
-  mode NXSplitModeAsync replaces the two old modes and is now the
-  default. Similarly to NXSplitModeEager, it makes the proxy split
-  only messages that exceed a size threshold, but the threshold is
-  generally smaller than in the previous versions.
-
-  #define NXSplitModeDefault  0
-  #define NXSplitModeAsync    1
-  #define NXSplitModeSync     2
-
-- Renamed X_NXSplit to X_NXSplitData, X_NXAbortSplit to X_NXSplitEv-
-  ent.
-
-- The proxy now enters a drain loop, when in congestion state, and
-  waits until the decongestion. Also the X channels are drained if
-  blocked.
-
-- The select is restarted immediately if only the proxy is selected
-  and the data read doesn't make a complete message.
-
-- The size of the shared memory segment used by the X server proxy
-  is now negotiated at startup and the selected value is printed in
-  the session log.
-
-- Added the option 'encrypted'. It tells the local proxy if it is
-  running as part of a program providing encryption of the point to
-  point communication. This is useful to determine if the proxy can
-  block waiting for data or needs to yield to the client to let it
-  handle the remote connection.
-
-nxcomp-2.0.0-55
-
-- Fixed handleRestart() to correctly send the end-split event only
-  after the split sequence has been closed by the client.
-
-- Fixed a possible memory error in the Keeper class occurring if the
-  image caches were erased while in the middle of a loop.
-
-nxcomp-2.0.0-54
-
-- Added a '--parent' option when running the client in dialog mode.
-  This is the process id that needs to be signaled in the case the
-  user chooses to do so.
-
-nxcomp-2.0.0-53
-
-- Solved a bug in the abort split procedure. The procedure assumed
-  that the split had to be at the head of the list. This may not be
-  the case if the split was loaded from disk asynchronously, after
-  a different split with the same checksum was recomposed.
-
-- By defining STRICT in Loop.cpp, the number of available tokens is
-  set to 1. This can be used to trigger the congestion more often
-  than it would possible when testing the software with the default
-  settings.
-
-- Added more debug output to the procedures handling the streaming
-  of the images.
-
-- Reset the channel's split pending and congestion flags in the fin-
-  ish procedure. Not doing so caused some additional loops at chan-
-  nel shutdown.
-
-- Fixed a bug on Cygwin that prevented the log files to be succes-
-  sfully reopened when the size limit was exceeded.
-
-- Failures to write to the agent transport are reported sooner when
-  the channel is finished. This saves a few more loops at session
-  shutdown.
-
-nxcomp-2.0.0-52
-
-- Started implementing a new handler to let the agent include arbit-
-  rary data in the transport statistics. The parameter, in this case,
-  is a pointer to a pointer to a null terminated string. The pointer
-  is set at the time the handler is registered. The pointed string
-  will have to be filled by the agent with its statistics data. For
-  now, only the interfaces and the stubs exist.
-
-- Disabled the timestamp cache as it still causes rounding problems
-  when calculating the current bitrate.
-
-nxcomp-2.0.0-51
-
-- Removed SelectPackMethod(), not used anymore, from Pack.c.
-
-nxcomp-2.0.0-50
-
-- Added the X_NXFinishSplit request. It forces the proxy to comple-
-  tely transfer all the split messages for the given resource, and
-  then notify the agent.
-
-- Fixed the statistics to not account the split bits to the control
-  token.
-
-nxcomp-2.0.0-49
-
-- Fixed a bug that caused the split timeout to be reset even if a
-  different channel had splits to send.
-
-- Removed an error condition that arose when a split operation was
-  requested by a different channel than the first to connect. The
-  reason is that an auxiliary channel (like the one created by the
-  server to store the keyboard configuration) can be the first to
-  open a connection to the X server, then can come the agent, that
-  is actually using the NX opcodes. The proxy will now simply print
-  a debug message. 
-
-- Removed a further error condition that was assumed by the proxy
-  if a pending flush was detected while no channel was selected for
-  output. This can actually happen if the channel was dropped and,
-  in the meanwhile, the user requested the proxy statistics.
-
-nxcomp-2.0.0-48
-
-- Added a 'type' parameter to NXTransFlush(). The new NX_FLUSH_IDLE
-  type should be used by agents when they have finished handling all
-  their clients and are going to wait for more input. This is the
-  case, for example, of the X agent returning from WaitForSomething()
-  after having set a small timeout to find out if there are clients
-  ready, or the case of a RDP agent finding that there are no opcodes
-  to read from the RDP server. The 'idle' flush should be requested
-  also when the X11 agent is waiting for a split to complete. When
-  the flag is used, the proxy uses the available bandwidth to encode
-  more low-priority data, like the payload of images being streamed.
-
-nxcomp-2.0.0-47
-
-- Added a new RGB image encoder. For now the encoder uses a static
-  Z stream to compress the image data in the destination buffer and
-  allows the agent to use the simplest encoding by still separating
-  the alpha channel from the image data. The new encoder can be the
-  the base for implementing color reduction by dithering or a color-
-  mapped translation of the image similar to PNG, but without the
-  PNG overhead and with the colormap being sent to the client using
-  the NXSetUnpackColormap() opcode.
-
-- Put the routines implementing static deflating and inflating of
-  a ZLIB buffer from the Compressor and Decompressor classes to Z.h
-  and Z.cpp, so that they can be reused by the new RGB encoder.
-
-nxcomp-2.0.0-46
-
-- Fixed a segfault arising when trying to start a child without the
-  NX transport.
-
-nxcomp-2.0.0-45
-
-- Undefined the MATCH directive.
-
-nxcomp-2.0.0-44
-
-- Changed the encoding of the X_CreatePixmap, X_CreateGC, X_Render-
-  CreatePicture, X_CreateWindow, RenderCreateGlyphSet.cpp. The Xid
-  of the drawable is included in the checksum of the X_CreateGC and
-  X_CreatePixmap message. This leverages the way GC and Pixmaps are
-  allocated in the X agent to obtain better compression.
-
-- Removed the code handling the reset of the proxy connection. This
-  functionality was unused since when the persistence is handled by
-  the agent.
-
-- Added a specific section in the statistics output for the render
-  extension.
-
-nxcomp-2.0.0-43
-
-- Fixed a bug that could have caused the sending of multiple 'end
-  split' messages for the same split sequence.
-
-- Added handling of the option 'strict'.
-
-nxcomp-2.0.0-42
-
-- Added a missing channel switch directive when encoding abort split
-  messages at the server side. This could cause a decoding error on
-  the client.
-
-nxcomp-2.0.0-41
-
-- Ensured that the link is flushed immediately on the X server side
-  when important keyboard or mouse activity is detected in input.
-
-- Implemented a timestamp cache to avoid calling gettimeofday() when
-  it is enough to use the last timestamp gotten from the system. The
-  cache can be disabled by undefining CACHE_TIMESTAMP in Timestamp.h.
-
-nxcomp-2.0.0-40
-
-- Added the karma delay field to the X_NXGetControlParameters reply.
-
-- Solved a bug with the decoding of split messages likely to happen
-  only when using link type LAN.
-
-nxcomp-2.0.0-39
-
-- Implemented separate flow control for the generic channels and the
-  image streaming data.
-
-- Improved the split procedure to load a message from the disk cache
-  if found after it was originally discarded because locked.
-
-nxcomp-2.0.0-38
-
-- Renamed the 'shmem' option as 'shseg'. The 'shmem' option becomes
-  specific to the agent and will be used together with 'shpix' option
-  to indicate if, respectively, the shared memory extension and the
-  use of the shared pixmaps must be enabled in the agent server. The
-  new option will be instead used by the proxy to determine the size
-  of the memory segment shared between the proxy and the X server.
-
-- Added the 'shmem', 'shpix', 'keyboard' and 'clipboard' to the list
-  of ignored options. The 'keyboard' option should become a synonym
-  of 'kbtype'. The 'clipboard' option will tell the NX agent if the
-  clipboard support should be disabled for security reasons.
-
-nxcomp-2.0.0-37
-
-- Ensured that, when running a raw session, the persistent cache is
-  loaded and saved only once in the session lifetime.
-
-- Added the 'product' keyword to the list of recognized options. The
-  option is ignored by the proxy, but can be used by the client or
-  server to facilitate the support.
-
-nxcomp-2.0.0-36
-
-- Added the remote version number in the X_NXGetControlParameters
-  reply.
-
-- Solved a bug related to the removal of the split stores.
-
-- Removed the unused code dealing with the flush timeouts.
-
-nxcomp-2.0.0-35
-
-- Added an alert to notify the user about the failure of the XDMCP
-  session.
-
-nxcomp-2.0.0-34
-
-- The active channels and the agent resources are now stored in a
-  list container.
-
-- Added the X_NXFreeSplit request. The request is currently unused
-  because the split store is freed automatically when it becomes
-  empty, but can be useful in future if we want to implement other
-  otpimizations.
-
-nxcomp-2.0.0-33
-
-- There is now a split store for each agent resource. This allows
-  the proxy to divide the bandwidth among the agent resources.
-
-- A simple round-robin load-balancing is implemented, dividing the
-  bandwidth equally among all the split stores.
-
-- If there is a previous request being streamed for the same res-
-  ource, cached messages are appended to the split store and then
-  committed in the original order. This makes possible to stream
-  the colormap and the alpha channel data even if the split invol-
-  ves multiple PutImage or PutPackedImage operations in a single
-  start-split/end-split sequence.
-
-- Implemented the commit store class. Made the commit store expand
-  the message in the final buffer, instead of leveraging the mes-
-  sage store.
-
-- Channels having a drop command pending are checked before trying
-  to load or save the cache. This prevents a potential problem with
-  the protocol violation error that could be reported by the client
-  side proxy.
-
-- The current bitrate is now calculated at the time the transport
-  actually writes the data to the network, not at the time the data
-  is appended to the transport by the upper layers. The reason is
-  that the data can be compressed by the stream compressor and so
-  we can calculate the real bitrate only after having flushed the
-  ZLIB stream. This fixes the wrong numbers that could be reported
-  by the statistics in the previous versions.
-
-nxcomp-2.0.0-32
-
-- More progress in the implementation of the new image streaming.
-  This version has been tested to work when connecting to an 1.5.0
-  server. Due to the significant changes in the way the streaming
-  works in the newer versions, split is never activated by a 2.0.0
-  server connecting to a 1.5.0 client.
-
-- Fixed the NXTransClose() function to check if the fd matches the
-  NX agent connection.
-
-- Fixed the includes in Socket.h to compile on Solaris and MacOSX.
-
-nxcomp-2.0.0-31
-
-- Changed the NX transport functions that didn't require a NX fd
-  parameter to include one. The value can be NX_FD_ANY to signify
-  any running NX transport.
-
-nxcomp-2.0.0-30
-
-- More progress in the new implementation of image streaming.
-
-- This version is apparently compatible with the 1.5.0 client but
-  needs further testing.
-
-nxcomp-2.0.0-29
-
-- Implemented the NXTransHandler() interface and made the proxy
-  use the callback, when it is installed, instead of the notifi-
-  cation events.
-
-- Modified the agent transport to report an EOF condition as soon
-  as the channel is dropped, instead of reporting the error only
-  after the proxy shutdown. This allows the agent to handle its
-  clients while the proxy is handling the grace timeout.
-
-- Added a test facility to verify if the client and server caches
-  match at shutdown.
-
-- More advances in the new implementation of streaming.
-
-nxcomp-2.0.0-28
-
-- Made the session shutdown faster, normally below 1 second. The
-  grace time is now 500 ms once all channels have been dropped.
-
-nxcomp-2.0.0-27
-
-- The house-keeping process will now run a number of iterations
-  (currently 100) and then will exit. The proxy will check the
-  exit code and, if it was requested by the child, will restart
-  it. This is intended to keep the memory consumption low, as I
-  noted that after a big number of iterations the performance of
-  the allocator start to degrade quickly.
-
-nxcomp-2.0.0-26
-
-- Started implementing the NXTransHandler() interface to let the X
-  application hook a callback and be notified by the proxy when an
-  event occurs. At the moment only congestion events are supported.
-  The interface makes possible for the caller to provide a generic
-  parameter. This parameter is passed back to the handler function.
-  The parameter is expected to be the Xlib display pointer, given
-  that the proxy doesn't have access to the Xlib structures.
-
-- Moved all the internal variables shared between Xlib, nxcompext
-  and the X server in nxcomp. Declarations and function prototypes
-  moved to NXvars.h.
-
-- Removed the NXGetCleanupParameters() and NXGetImageParameters()
-  interfaces and the remaining references to the unused display
-  buffer and image cleanup functions.
-
-- In this version the images streaming functionality is disabled.
-  Because of that, expect compatibility problems when connecting
-  to a different nxcomp version.
-
-nxcomp-2.0.0-25
-
-- Forced the end of the session earlier if a shutdown has been re-
-  quested by the local side but the remote proxy is not responding.
-
-nxcomp-2.0.0-24
-
-- Changed the loop deleting the file items in Keeper to pick the
-  first element instead of looping through the iterator.
-
-- More problems with the libstdc++ allocators. During the tests, I
-  found that the Keeper class can leak industrial amounts of memory.
-  Valgrind says that the objects that are not freed are the File
-  items we allocate in collect(). As this looked suspicious, I log-
-  ged the constructors and destructors and can say that everything
-  is OK on our side. Unfortunately, by removing the spleeps used
-  to let the program work silently in background, one can find that
-  the memory occupation still grows by a MB every few seconds. This
-  is less a problem on Windows, where the memory occupation remains
-  almost constant. See the comment on __USE_MALLOC below.
-
-- Increased the maximum size of a message that the proxy is allo-
-  wed to cache to 4MB. This makes possible to cache many replies
-  (like the X_QueryFont replies) that often exceeded the previous
-  limit.
-
-nxcomp-2.0.0-23
-
-- Fixed a compatibility problem with the 1.5.0 that arose when
-  encoding an image with caching and streaming temporarily disa-
-  bled.
-
-- Removed the __USE_MALLOC define in Types.h because this is what
-  the g++ developers want. I'll try to avoid flames and will not
-  comment on this.
-
-- Added a --with-use-malloc configure option. This option should
-  be used when building the release packages on GCC versions that
-  support it.
-
-- Started fixing the commit procedure to be able to deal with the
-  alpha channel.
-
-nxcomp-2.0.0-22
-
-- Prevented channels from being dropped while in the middle of a
-  read loop.
-
-- Added a small utility ensuring that the SIGCHLD we receive in
-  the main loop can be always identified as pertaining to an our
-  child.
-
-- Increased the space available for the control messages at the
-  beginning of the encode buffer and ensured that there is always
-  enough space for adding a token message, in the case this is
-  required by the flush procedure.
-
-- Made all cache files readable only by the user.
-
-nxcomp-2.0.0-21
-
-- Solved a bug in the streaming of images that caused the agent's
-  clients to never resume when connected to an old proxy version.
-
-nxcomp-2.0.0-20
-
-- Disabled again streaming of the alpha channel data. By enabling
-  it, the agent randomly fails to repaint the exposed regions. The
-  reason is to be investigated.
-
-nxcomp-2.0.0-19
-
-- Implemented the split mode NXSplitModeSync. When this mode is
-  selected, the proxy will not send data for the split at the head
-  of the list until the  remote peer has confirmed that the message
-  is not available in the image cache. This is going to be useful
-  in combination with the lazy encoding.
-
-- Improved the error detection in the case of failure when saving
-  a recomposed split on disk.
-
-- Added X_NXSetUnpackAlpha to the set of requests that is possible
-  to stream.
-
-nxcomp-2.0.0-18
-
-- Enabled the 2.0.0 features that were disabled for test purposes.
-
-- Changed the LICENSE file to state that the software is only made
-  available under the version 2 of the GPL.
-
-nxcomp-2.0.0-17
-
-- Introduced a new channel of type 'slave'. Opening a slave channel
-  should let the proxy fork a new NX client instance (or whatever
-  is in the NX_SLAVE environment) and pass to it the channel's desc-
-  riptors. This client instance should authenticate the peer, for
-  example using the proxy cookie (see how this is implemented in
-  nxsensor) and then negotiate the service to be used on the channel.
-  This can be used to implement forwarding of arbitrary ports or ad-
-  ditional services, like a simple file transfer protocol. For now
-  the implementation is incomplete. Opening a slave channel will
-  result in the remote proxy just dropping the channel connection.
-
-- The proxy is forcibly flushed at the end of each loop. This is a
-  temporary fix until the agents are updated to flush the proxy link
-  on demand.
-
-- Added a new alert to be used in the case the RDP session is closed
-  and replaced with a new session using the same Windows account.
-
-- Added a forward declaration of class RenderMinorExtensionStore in
-  file RenderExtension.h to compile using gcc 4.0.X.
-
-- Added removal of all .orig file when running a 'make clean'.
-
-- The code uses again the 2.0.0 style shutdown (the one waiting for
-  the watchdog process to terminate).
-
-nxcomp-2.0.0-16
-
-- Added the NXTransChannel() interface to allow agents to create
-  new channels connected to the port that will be forwarded by the
-  remote proxy. The function returns 1 on success, 0 if the NX
-  transport is not running, or -1 in the case of error. On success,
-  the descriptor provided by the caller can be used for all the
-  subsequent I/O, including selecting the descriptor to check if
-  I/O is possible. The type parameter not only tells to the proxy
-  the remote port where the channel has to be connected, but gives
-  a hint about the type of data that will be carried by the channel,
-  so that the proxy can optimize the compression and schedule the
-  traffic on the slow link.
-
-  The type can be:
-
-  NX_CHANNEL_X:     The channel will carry X traffic and it
-                    will be connected to the remote X display.
-
-  NX_CHANNEL_CUPS:  The channel will carry CUPS/IPP protocol.
-
-  NX_CHANNEL_SMB:   The channel will carry SMB/CIFS protocol.
-
-  NX_CHANNEL_MEDIA: The channel will transport audio or other
-                    multimedia data.
-
-  NX_CHANNEL_HTTP:  The channel will carry HTTP protocol.
-
-  NX_CHANNEL_FONT:  The channel will forward a X font server
-                    connection.
-
-  Only the proxy running at the NX server/X client side will be
-  able to create a X, CUPS, SMB, MEDIA and HTTP channel. A proxy
-  running at the NX client/X server side can create font server
-  connections. The channel creation will also fail if the remote
-  end was not set up to forward the connection.
-
-  To create a new channel the agent will have to set up a socket-
-  pair and pass to the proxy one of the socket descriptors.
-
-  Example:
-
-  #include <sys/types.h>
-  #include <sys/socket.h>
-
-  int fds[2];
-
-  if (socketpair(PF_LOCAL, SOCK_STREAM, 0, fds) < 0)
-  {
-    ...
-  }
-  else
-  {
-    //
-    // Use fds[0] locally and let the
-    // proxy use fds[1].
-    //
-
-    if (NXTransChannel(fds[1], NX_CHANNEL_X) <= 0)
-    {
-      ...
-    }
-
-    //
-    // The agent can now use fds[0] in
-    // read(), write() and select()
-    // system calls.
-    //
-
-    ...
-  }
-
-  Note that all the I/O on the descriptor should be non-blocking,
-  to give a chance to the NX transport to run in the background
-  and handle the data that will be fed to the agent's side of the
-  socketpair. This will happen automatically, as long as the agent
-  uses the XSelect() version of the select() function (as it is
-  normal whenever performing Xlib I/O). In all the other cases,
-  like presumably in the agent's main loop, the agent will have
-  to loop through NXTransPrepare(), NXTransSelect() and NXTrans-
-  Execute() functions explicitly, adding to the sets the descript-
-  ors that are awaited by the agent. Please check the implementa-
-  tion of _XSelect() in nx-X11/lib/X11/XlibInt.c for an example.
-
-nxcomp-2.0.0-15
-
-- Some changes aimed at finding a workaround to the unreliability
-  of the font server connections. The X server seems to be really
-  picky about the network latency, so we try to read immediately
-  from the channel just being created, instead of waiting for a
-  new loop. Additionally the proxy will keep reading from the font
-  server connections even after the maximum length of the frame
-  is exceeded, in the hope that it will be able to send a complete
-  message in a single frame.
-
-- updated the various internal consistency tests run when the TEST
-  or INFO flags are enabled.
-
-nxcomp-2.0.0-14
-
-- It seems that the closure of the socket sometimes takes several
-  seconds, on Windows, after the connection is broken, with the
-  result that the alert can be shown long after the user has gone
-  after the failed session. We now skip the closure of the proxy
-  link on Windows if we are about to exit.
-
-- The code uses the 1.5.0 style shutdown (the one waiting for the
-  term signal in the main process) to be able to test the library
-  with the old server. To activate the new shutdown procedure be
-  sure the define SHUTDOWN_COMPATIBLE_1_5_0 is unset.
-
-nxcomp-2.0.0-13
-
-- Ensured that static members in channels are reset at the time a
-  new proxy is created.
-
-- Adjusted the token parameters for link modes other than modem.
-
-nxcomp-2.0.0-12
-
-- Handled compatibility with 1.X.X versions not sending the count
-  field in the token.
-
-- The proxy link is now flushed automatically if the agent has not
-  set the deferred flush mode.
-
-nxcomp-2.0.0-11
-
-- Significant modifications to allow the proxy to keep data in the
-  encode buffer across multiple loops, until the data is flushed
-  because an explicit request by the agent or. Besides maximizing
-  the amount of data sent in a single frame, this makes it possi-
-  ble to move any packet coalescence strategy in the agent, while
-  still using an 'immediate' flush policy.
-
-- Modified the procedure handling the proxy congestion. Each token
-  now carries a counter which represents the multiple of TokenBytes
-  data bytes that need to be confirmed by the remote end. The ser-
-  ver side proxy will need to reply by including the value of the
-  counter. When sending a new token, the tokens are decremented by
-  the counter and the client side proxy enters in congestion when
-  the available tokens becomes zero or negative.
-
-nxcomp-2.0.0-10
-
-- Implemented specific encoding of the X_NXSetCacheParameters
-  request.
-
-- Handled the compatibility with older versions not supporting the
-  new request. In this case the request is handled at the local si-
-  de, preventing the X requests to be cached or split, even without
-  the cooperation of the remote side.
-
-nxcomp-2.0.0-9
-
-- Modified the shutdown procedure to not rely on the TERM signal
-  when the proxy needs to wait for the server to complete. We will
-  now print the following message in the session log:
-
-  Info: Watchdog running with pid 'n'.
-  Info: Waiting for watchdog process to complete.
-
-  The NX server will have to kill the process with the given pid
-  to mandate the proxy shutdown. This solves the TR11C01192.
-
-- Added the X_NXSetCacheParameters request. It tells to the proxy
-  how to handle caching of X requests, namely if requests should
-  be stored in the memory cache, split in smaller data chunks and,
-  in the case of images, saved on disk in the persistent image
-  cache. The request affects all the X messages until the proxy
-  is further configured.
-
-- Enabling and disabling loading and saving of persistent images
-  due to a X_NXSetCacheParameters is still to be implemented.
-
-- Implemented font channel compatibility with older versions. If
-  the font port is queried and the remote proxy doesn't support
-  the tunneling of font server connections, an empty string is
-  returned.
-
-- The option 'resize', used by agents, is now silently ignored.
-  This solves the TR10C01061.
-
-- Added the missing reference to TR08C000981.
-
-nxcomp-2.0.0-8
-
-- Discarded the first idea of setting the font path implicitly in
-  the X server side proxy, by means of a multi-pass operation and
-  added the NXGetFontParameters() request and reply. If the proxy
-  has been configured accordingly, the request returns the X font
-  path that can be set by the agent to tunnel the font server con-
-  nections through the NX link.
-
-- Changed the parsing of the font server port to be able to handle
-  the defaults.
-
-nxcomp-2.0.0-7
-
-- More work on tunneling of font server connections.
-
-- The synchronization requests are now replied at the same time
-  as a new request is received, by checking if the channel has
-  already gone past the awaited sequence number. This avoids the
-  delay caused by the previous versions in the case the expected
-  reply had been handled asynchronously, inside the write loop.
-
-nxcomp-2.0.0-6
-
-- The display is again passed to the client using the -display
-  parameter.
-
-- The option 'type' is now ignored at X server side. Support at
-  the X server side had been left for compatibility with older
-  versions of the proxy.
-
-- Added direct support for more session types, namely 'unix-cde',
-  'unix-xdm', 'unix-console', 'unix-default'. The 'unix-console'
-  and 'unix-default', similarly to 'unix-application', will now
-  trigger the 'raw' mode.
-
-nxcomp-2.0.0-5
-
-- Renamed Png.h and Png.cpp to Pgn.h and Pgn.cpp to avoid name
-  clashes on Windows.
-
-- The distclean target now removes the autom4te.cache directory.
-
-nxcomp-2.0.0-4
-
-- Added the 'kill=n' option to let the proxy add the process to
-  the list of daemons that must be terminated at session shutdown.
-  Multiple 'kill=n' options can be specified. The proxy will send
-  to each process a SIGTERM signal before exiting.
-
-- Removed the code that forcibly disabled the RENDER extension on
-  Solaris. Eventual compatibility problems will be now handled in
-  the NX agent.
-
-- The path to the client executable is now assumed to be in the
-  NX_CLIENT environment. If the variable is not set, the proxy
-  will guess the location based on the target platform. This is
-  part of the FR11C01215.
-
-nxcomp-2.0.0-3
-
-- More code cleanup. Protocol step 5 and cache step 2 are assumed
-  by default. This allows us to remove the various channel caches
-  that are not used anymore.
-
-- Removed the outdated encodeBegin() and encodeEnd() methods.
-
-nxcomp-2.0.0-2
-
-- Added compatibility with the 1.5.0 and 1.4.0 versions. Protocol
-  version older than the 1.4.0 will cause the proxy to drop the
-  connection.
-
-- Rewritten the version negotiatiation logic to better handle the
-  compatibility between the local and the remote version.
-
-- Removed the conditional code handling the compatibility with
-  the protocol encodings from 1 to 4.
-
-- Small adjustments to the session negotiation procedure to give
-  more hints in the case of errors. A dialog is now issued if the
-  remote proxy drops the connection due to a probable authentica-
-  tion failure or when the remote proxy version is not compatible
-  with our version.
-
-nxcomp-2.0.0-1
-
-- Opened the 2.0.0 branch based on nxcomp-1.5.0-80.
-
-nxcomp-1.5.0-80
-
-- Fixed a bug that prevented the Unix socket to be created in the
-  right directory. This affected the ability of the server to run
-  NX sessions without the agent encoding.
-  
-nxcomp-1.5.0-79
-
-- Solved a bug in the 15 to 16 bpp conversion for RDP sessions.
-
-- Corrected a typo in the PANIC message of Unpack16To24 function.
-
-- Optimized the 16 bpp RDP decompression routine.
-
-nxcomp-1.5.0-78
-
-- Implemented the FR11C01215. The following environment variables
-  are checked to determine the location of the relevant NX direct-
-  ories:
-
-  $NX_ROOT   The root NX directory is the place where the session
-             directory and the cache files are created. This is
-             usually overridden by passing the 'root=' option. By
-             default, the root NX directory is assumed to be the
-             directory '.nx' in the user's home.
-
-  $NX_SYSTEM The directory where NX programs and libraries reside.
-             If not set, the value is assumed to be '/usr/NX'.
-             Programs, libraries and data files are respectedly
-             searched in the 'bin', 'lib' and 'share' subdirecto-
-             ries.
-
-  $NX_HOME   The NX user's home directory. If $NX_ROOT is not set
-             or invalid, the user's NX directory is created here.
-
-  $NX_TEMP   The directory where the X11 Unix Domain Sockets and
-             all temporary files are to be created.
-
-  $NX_CLIENT The full path to the nxclient executable. If the va-
-             riable is not set, the nxclient executable will be
-             run assuming that the program is in the system path.
-             This can be useful on platforms like Windows and the
-             Mac where nxclient is located in a different direct-
-             ory compared to the other programs, to make easier
-             for the user to execute the program from the shell.
-
-  Other environment variables:
-
-  $HOME      The variable is checked in the case $NX_HOME is not
-             set, null or invalid.
-
-  $TEMP      The variable is checked whenever the $NX_TEMP direct-
-             ory is not set, null or invalid.
-
-  $PATH      The path where all executables are searched, except
-             nxclient. If $NX_CLIENT is not set, also the client
-             executable is searched in the system path.
-
-  $XAUTHORITY
-             This is the file containing the X11 authorization
-             cookies. If not set, the file is assumed to be in
-             the user's home (either $NX_HOME or $HOME).
-
-  $LD_LIBRARY_PATH
-             System-wide library search order. This should be set
-             by the program invoking the proxy.
-
-- Extended the usage message to document the relevant environment.
-
-- Made the WaitChild() function interruptible. This allows the user
-  to terminate the connection procedure immediately, by sending a
-  signal to the proxy process while an abort dialog is shown in the
-  foreground. This is part of the solution to the TR11C01216.
-
-- Implementation of the FR11C01215 is not yet complete. The client
-  program and the nxauth/xauth are still searched using the previ-
-  ous logic. In particular, the NX_CLIENT variable is ignored.
-	
-nxcomp-1.5.0-77
-
-- Corrected the typo in the alert dealing with VNC authentication
-  failures. This solves the TR11C01199.
-
-nxcomp-1.5.0-76
-
-- Added the missing initialization in the client and server proxy
-  constructors.
-
-nxcomp-1.5.0-75
-
-- Starting from this version the build procedure will automatically
-  create a DLL on Windows.
-
-- Disabled exceptions in the compiled code.
-
-- Disabled run-time type information to further reduce the size of
-  the executable.
-
-- Compiling with GCC 4.0.0 and -fno-exceptions produces a warning
-  in some files, due to control apparently reaching the end of a
-  non void function. This is bogus and has been confirmed to be a
-  GCC 4.0.0 bug solved in more recent versions.
-
-nxcomp-1.5.0-74
-
-- Imported changes from nxcomp-1.6.0-4.
-
-- Solved a compilation error on Solaris and MacOSX platforms.
-
-- The 'font' option now accepts either a numeric value (for a TCP
-  port) or a 'unix/:port' or 'tcp/:port' specification. In the case
-  of Unix ports, we assume that a port specification "unix/:7100"
-  corresponds to the "/tmp/.font-unix/fs7100" socket and a port like
-  "unix/:-1" corresponds to "/tmp/.font-unix/fs-1".
-
-- An absolute file path is also accepted as a valid socket. This is
-  useful to test the forwarding of the font server connection, for
-  example by running a normal X client and pointing the socket to
-  the X server.
-
-- Protocol step 7 is now only assumed when connecting to a remote
-  proxy version 1.6.0 or later.
-
-nxcomp-1.5.0-73
-
-- Use the include files from nx-X11 if the nx-X11/include directory
-  is found. The previous configure checked the presence of nx-X11/
-  exports/include, that might not be built at the time this library
-  is compiled.
-
-nxcomp-1.5.0-72
-
-- Fixed a problem on AMD64 due to the size of the area pointed by
-  the argument of NXTransReadable(). The ioctl() requires a pointer
-  to an int, at least on Linux. The original _X11TransBytesReadable()
-  function simply calls the ioctl() by passing the pointer that is
-  provided. Returning the value assuming a pointer to a long crashes
-  some applications, among them xterm. Now NXTransReadable() follows
-  the same schema of the ioctl() call and stores the result assuming
-  a pointer to an int.
-
-nxcomp-1.5.0-71
-
-- Ensured that the NX trasport is destroyed on NXTransExit() even if
-  the parent has overridden our signal handlers.
-
-- Added attribute 'noreturn' to NXTransExit().
-
-- Small change to the shutdown procedure to send the "Waiting for a
-  further signal" just after the watchdog is started.
-
-nxcomp-1.5.0-70
-
-- Added the definition of protocol step 7. The new protocol step is
-  implicitly assumed when activating the font server channel, so that
-  NX clients and servers may decide what to do by verifying the patch
-  version of the peer software. This makes possible to activate the
-  feature without stepping up the 1.5.0 version of the software.
-
-nxcomp-1.5.0-69
-
-- Added the -fPIC GCC flag when compiling on AMD64 architectures.
-
-- Small changes to configure.in to have specific CFLAGS.
-
-- Created a new configure using autoconf 2.59.
-
-- Added the 'mask=n' option to determine how channel ids are distri-
-  buted between client ans server. By default, channels whose ids are
-  multiple of 8 (starting from 0) are reserved for the client side.
-  All other channels can be allocated at the NX server side.
-
-- A check is missing on the protocol supported by the remote side,
-  so it is likely that mixing this version with older 1.5.0 will not
-  work.
-
-- The release has the debug logs enabled.
-
-nxcomp-1.5.0-68
-
-- Added provision for opening new channels on both client and server
-  side. This required small changes to the way channel ids are mapped
-  and retrieved, so that both sides now support bidirectional mapping
-  of file descriptors to channels.
-
-- Made the code handling allocation of new generic channels to reside
-  in the base Proxy class.
-
-nxcomp-1.5.0-67
-
-- Renamed the 'embedded keyboard' channels as 'aux' channel.
-
-- Renamed 'samba' channels as 'smb'.
-
-- The 'samba' and 'smb' options can now be used interchangeably. The
-  same applies to the 'keybd' and 'aux' options, used to set up the
-  auxiliary X channel.
-
-- Added a new font channel. The channel is used to forward X font
-  server connections from the X server on the NX client to the remote
-  NX server. The channel is not yet functional and requires change to
-  the channel allocation mechanism.
-
-- Added a common interface to create new listening sockets. This is
-  currently used for additional services, but not for the X display
-  sockets.
-
-- Simplified the interface used to accept new connections to channels 
-  being forwarded.
-
-- Removed the -V option as nxproxy is not using dlopen() anymore.
-
-- Removed the inclusion of ClientChannel.h in Proxy.cpp that caused
-  test symbols to be reverted to undefined.
-
-nxcomp-1.5.0-66
-
-- Made failures setting the IPTOS_LOWDELAY on the proxy socket to
-  cause a warning, instead of an error.
-
-- Made the clean target delete the Cygwin specific libraries.
-
-- Updated the configure and Message.h to deal with GCC 4. Solves the
-  TR08C000981.
-
-nxcomp-1.5.0-65
-
-- Removed the warning issued on parsing the agent option 'rootless'.
-  Solves the TR08C00959.
-
-- MacOSX 10.4 defines socklen_t. Made the definition conditional so
-  that we can still support older versions. Solves the TR07C00926.
-
-- Updated the ChangeLog to include references to the solved TRs.
-
-nxcomp-1.5.0-64
-
-- Imported the 1.6.0 changes in the maintenance 1.5.0.
-
-- Removed a wrong assertion that might cause the session to fail
-  when the software was compiled with TEST enabled in Proxy.cpp.
-
-- The nxclient dialog process is signaled with SIGKILL on Windows,
-  as the SIGTERM is ignored. This solves the TR07C00929.
-
-- Ensured the JPEG error flag is always set before jumping out of
-  the Jpeg decompression.
-
-- Skipped errors encontered setting the TCP_NODELAY flag on Mac.
-  Solves TR08C00940.
-
-- Few cosmetic changes.
-
-nxcomp-1.5.0-63
-
-- Ensured that the parent is checked often in the keeper process,
-  so that, in the case of a premature death, the child is exited
-  earlier.
-
-nxcomp-1.5.0-62
-
-- Some performance tuning of the LAN and WAN link modes.
-
-nxcomp-1.5.0-61
-
-- Fixed the problems arisen with loading or saving the image files
-  on Windows by forcing the streams to be opened in binary mode.
-  These problems have been triggered by the recent Cygwin upgrade.
-
-- Removed the logs that had be left enabled for test purposes.
-
-nxcomp-1.5.0-60
-
-- Made all errors encountered while unpacking an image just print
-  a warning in the session log. Such errors are not fatal but the
-  client monitors the state of the session at startup, so that by
-  marking image decompression errors as such may cause the session
-  to be aborted.
-
-- Marked as warnings also errors encountered by trying to load an
-  image from disk.
-
-nxcomp-1.5.0-59
-
-- When detected, the CTRL+ALT+SHIFT+ESC sequence is removed from
-  the event stream.
-
-- Also modified the message in the session log to issue a warning,
-  instead of an error.
-
-nxcomp-1.5.0-58
-
-- Added a setjmp() before yielding the control to the JPEG library.
-  This makes possible to recover from the JPEG decompression errors
-  that were previously fatal.
-
-- In the commit split request, the client id is now encoded by the
-  client channel beside the propagate flag. The client id is igno-
-  red by the decoding party. As in the old protocol versions, the
-  committing client is taken from the client id that was originally
-  sent together with the packed image.
-
-- Fixed the compilation problem when defining OPCODES in Misc.cpp.
-
-- Skipped the synchronous flush of the proxy link when connecting
-  to a previous NX version.
-
-- Ensured that the new alerts are only requested when connected to
-  a compatible proxy.
-
-- Ignored the option 'fullscreen', targeting the agents.
-
-nxcomp-1.5.0-57
-
-- Added more alerts and changed the name of those dealing with the
-  resume of a session.
-
-- Added the MIXED define. When set, the proxy will let all logs go
-  to the standard error. This is useful to interleave the Xlib log
-  output with the proxy output in a single file.
-
-- Added a new alert to report an I/O error at agent reconnection.
-  This is one of those alert that can't be actually shown, but are
-  included to offer a consistent view to the agent implementation.
-
-nxcomp-1.5.0-56
-
-- Added the split mode NXSplitModeSync. By selecting this mode,
-  the proxy will try to empty the split store immediately, until
-  all messages marked in such mode will be synchronized. The im-
-  plementation is left to future versions.
-
-  #define NXSplitModeSync     3
-
-- Added the messages specific to RDP and VNC sessions in NXalert.h.
-  Included are also a few alerts related to changes to the color
-  depth and desktop geometry that may be eventually mandated by the
-  remote server.
-
-- Corrected a typo in NXalert.h
-
-nxcomp-1.5.0-55
-
-- Added the 'mode' field in the X_NXStartSplit request. It determi-
-  nes the strategy that the proxy will adopt to handle the image.
-  If set to 'eager', the proxy will only split the messages whose
-  size exceeds the split threshold (the threshold can be found in
-  the X_NXGetControlParameters reply). If mode is set to lazy, the
-  proxy will split any image that it is not able to find in its
-  cache.
-
-  The opcode and the two available modes are defined in NXproto.h,
-  currently:
-
-  #define NXSplitModeDefault  0
-  #define NXSplitModeEager    1
-  #define NXSplitModeLazy     2
-
-- All requests related to image streaming now carry a 'resource' id.
-  The id is currently ignored by the proxy in the case of X_NXCom-
-  mitSplit requests.
-
-- Added a new NXSetSplitMode() request. It determines the strategy
-  that the proxy will adopt to stream the images. If set to 'eager'
-  the proxy will only split the messages whose size exceeds the
-  split threshold, otherwise it will  split all the images, regard-
-  less their size. This is in preparation of the lazy encoding in
-  agent.
-
-- Slightly decreased the startup timeout compared to the value it
-  had in the 1.4.0. This timeout is used to retain the images used
-  during session startup in the persistent cache.
-
-nxcomp-1.5.0-54
-
-- Modified the text of the begin-reconnection alert to mention the
-  speed of the connection detected by the agent.
-
-nxcomp-1.5.0-53
-
-- Reworked the handling of the abort-split events issued by the re-
-  remote proxy so that we now finalize the procedure and restart the
-  client asynchronously, in the middle of the write loop.
-
-nxcomp-1.5.0-52
-
-- Rewritten the internal interface to the notification events. There
-  are now five different split notification events:
-
-  NXNoSplitNotify        The operation didn't cause any actual split.
-                         The client can be immediately restarted.
-
-  NXStartSplitNotify     A split is ongoing. The client should be
-                         suspended until the end of the split.
-
-  NXCommitSplitNotify    A complete request has been recomposed. The
-                         client can commit the given request to the
-                          X server.
-
-  NXEndSplitNotify       The split operation was duly completed. The
-                         client can be restarted.
-
-  NXEmptySplitNotify     No more split operation are pending. The
-                         agent can use this information to implement
-                         specific strategies, requiring for example
-                         that all messages have been recomposed at
-                         the remote end. This can include updating
-                         the drawables that were not synchronized
-                         because of the lazy encoding.
-
-- Removed the X_NXSync and X_NXKarma operations, not used anymore by
-  the NX agents.
-
-- Increasing or decreasing a timeout makes it respectively equal to
-  the base timeout or to the base timeout / 4.
-
-nxcomp-1.5.0-51
-
-- Improved the mechanism by which synchronization replies are sent
-  to the X client proxy.
-
-- Using the leftPad field as passed by the nxagent 1.5.0-58 doesn't
-  seem to work with the MIT-SHM. The workaround is to disable the
-  MIT-SHM operation in the case of 1 bpp images.
-
-- Removed the limitation on the size of the shared memory segment
-  that had been introduced for test purposes.
-
-nxcomp-1.5.0-50
-
-- Solved compilation problem when --with-info was not given.
-
-nxcomp-1.5.0-49
-
-- Improved support for color matching from 15 and 16 bpp to 24 and
-  32 bpp in RDP sessions.
-
-- Solved TR05C00910. This was about "shadows" that might appear in
-  RDP sessions when small elements like tooltips were drawn.
-
-nxcomp-1.5.0-48
-
-- Added a 'commit' field in X_NXCommitSplit request. When zero, the
-  X server side proxy will unlock the message in the message store,
-  without actually committing the image to the X server. The new
-  field required changes to the encoding. This means that this ver-
-  sion is not compatible with older 1.5.0 nxcomp releases.
-
-- Added a new control message. This is used by NXTransFlush() to for-
-  ce a roundtrip between the proxies and speed-up the handling of
-  the synchronous replies.
-
-nxcomp-1.5.0-47
-
-- Made the timeouts dynamic, based on the user input and the current
-  bitrate.
-
-- Set the available tokens to 8. This allows for 16 KB to be sent on
-  a modem before having to wait for a reply.
-
-- Added provision for removing a dialog on the remote end. This can
-  be used, for example, to get rid of a message that was displayed
-  by the agent at the beginning of a lengthy operation.
-
-- Fixed a fault that arose when trying to run the proxy on a display
-  whose name began with the 'nx' string.
-
-- Running a client or server session on a display host beginning with
-  'nx' should be now possible.
-
-- Flush is now always immediate when there is already data queued in
-  the TCP socket.
-
-nxcomp-1.5.0-46
-
-- Created the NXalert.h header from Alert.h to share the alert codes
-  with the agents. The new NXTransAlert() interface can be used to
-  start an alert on the remote side.
-
-- Created the NXTransParse*() and NXTransCleanup() wrappers.
-
-- Temporarily using the single-dash style when passing parameters to
-  nxclient until the double-dash style is fixed.
-
-nxcomp-1.5.0-45
-
-- Motion events are now flushed at the time the X server channel is
-  sending the token reply.
-
-- Renamed NXDialog() to NXTransDialog() and added a window ID parame-
-  ter, to be used by the agent when starting the "pulldown" dialogs.
-
-- Also renamed the other NX utility functions.
-
-nxcomp-1.5.0-44
-
-- Solved a bug that prevented auxiliary X connections from working
-  with the agent.
-
-- Added the missing check on the proxy pointer in HandleTimer() as
-  it may be actually called before the proxy is created.
-
-nxcomp-1.5.0-43
-
-- Started tuning the performance. For now, the available tokens are
-  set to an improbable value of 10000.
-
-nxcomp-1.5.0-42
-
-- Disabled the X server side remote expose events for test purposes.
-  This is intended uncover the display problems introduced by the
-  new handling of exposures in the X11 agent.
-
-- Fixed some timestamp related functions to avoid rounding problems.
-
-- Moved the timestamps of split, frame and flush from the Control
-  to the Proxy class.
-
-- Made the X server side proxy to skip updating the counters related
-  to token management.
-
-- Made also the X server side use deferred flushes.
-
-- Modified handleFrame() to manage both pings and data frames and
-  send the token before the actual write operation.
-
-- Cleaned the pseudo-files used to load the control parameters.
-
-- Cleaned up the FIXME's in the lower layers. More FIXME's remain in
-  the frontend classes.
-
-- Added a further counter to the statistics tracking the number of
-  network writes performed on the proxy link.
-
-nxcomp-1.5.0-41
-
-- Now the watchdog process doesn't kill the parent. The termination
-  event is determined by monitoring the child. This is advisable to
-  avoid interfering with the signal handling in agent.
- 
-- The house-keeping process is not started if differential compres-
-  sion (and thus caching of images) is disabled.
-
-- Wait for the watchdog to terminate before starting the house-keep-
-  ing process.
-
-- Fixed the problem of gray stripes in white areas when using 15bpp
-  RDP compression. This solves the TR06C00916.
-
-- Added a log in Message.cpp to tell when an image is removed from
-  the memory cache.
-
-- Removed most of the logs. Only left the logs directly related to
-  the deferred flushes.
-
-- Removed a warning due to a missing definition in NX.h.
-
-nxcomp-1.5.0-40
-
-- Added the signal '12' to the set of blocked signal on Cygwin. This
-  is what is delivered to the application when it tries to create a
-  shared memory segment when the cygserver is not running. The call
-  later returns "Operation not implemented", only useful if you have
-  survived to the signal.
-
-- Modified the configure script to not link against cygipc.
-
-- Improved error handling in the negotiation phase.
-
-- Reset the last signal received when aborting a connection attempt.
-  Not doing that might cause a warning.
-
-nxcomp-1.5.0-39
-
-- Both channels and proxy can now deal with incomplete messages by
-  waiting for the full data to become available. This is not going
-  to work when the transport is connected to an agent that is run-
-  ning in-process, so the timeout must be really small.
-
-- Made the main loop more compact by letting a single function read
-  from proxy and channels. The same change applies to writing to
-  descriptors that are reported to be ready.
-  
-- Optimized the loop to report as ready the agent descriptors that
-  have become available after the proxy execution phase. 
-
-- Now the proxy will try to asynchronously read from its descriptor
-  after having read from the channel.
-
-- Unified the routine setting the routines setting the read and write
-  descriptors and the timeouts.
-
-- Unified the routine handling the channel events.
-
-- Reintroduced the last ping timestamp to avoid sending more than a
-  single ping every PingTimeout milliseconds.
-
-- The cleanup procedure now waits for the watchdog and house-keeping
-  processes to terminate.
-
-- Reverted the change occurred in 1.5.0-35 about the byte-ordering
-  problem in decompression of PNG and JPEG images.
-
-- More coding about deferred flushes.
-
-- Relevant debug logs are enabled in the main loop, in the proxy and
-  in the channel classes, so use only for testing.
-
-nxcomp-1.5.0-38
-
-- Started the implementation of deferred writes based on the new NX
-  transport.
-
-- Solved a problem with the statistics file affecting the Windows
-  platform. Basically it seems that Cygwin or the stdc++ library
-  don't deal correctly with files that are reopened just after
-  having unlinked them.
-
-- Implemented support for 15 bpp RDP bitmaps.
-
-- Added "rdpcolors" and "rdpcache" to the list of parameters that
-  are ignored in ParseEnviromentOptions().
-
-- This version has lot of logs enabled and some forced cleanups in
-  the case of unexpected conditions. Avoid to use it for long-last-
-  ing test sessions.
-
-nxcomp-1.5.0-37
-
-- Now splitting of images is fully disabled when running with link
-  LAN. Previously the split was not executed by the proxy, but the
-  agent was configured to send the start/end sequence.
-
-- Added the check protecting the proxy from token underflow. In the
-  previous code the check was left out to verify the conditions un-
-  der which this event might be encountered.
-
-- NXTransWrite() and NXTransWriteVector() allocate a context before
-  calling handleRead(), so they can correctly return in the case of
-  a cleanup.
-
-nxcomp-1.5.0-36
-
-- Modified the channel write loop to interleave abort split events
-  between the writes to the X server socket.
-
-nxcomp-1.5.0-35
-
-- Solved a byte-ordering problem in decompression of PNG and JPEG
-  images.
-
-- Changed the handleToken() interface to make explicit if a token
-  must be issued because of a ping.
-
-- Small fix to prevent a warning in Jpeg.cpp when TEST is enabled.
-
-nxcomp-1.5.0-34
-
-- Solved a few problems introduced by the rewrite of the read loops
-  in channels.
-
-- Added definition of NXCollectInputFocusNotify.
-
-nxcomp-1.5.0-33
-
-- Implemented a new control flow system based on tokens exchanged bet-
-  ween the proxies. When the clint side runs out of tokens it stops
-  sending data until a new token is returned. Tokens are sent whenever
-  the data written to the socket exceeds the amount of data set for a
-  scheduled write, so the proxy is free to send a number of smaller
-  frames before running out of tokens.
-
-- The reason the new system is introduced is because the old method
-  had two outstanding problems:
-
-  - It worked very well when the proxies were directly connected,
-    but couldn't reliably detect a link congestion when tunneled
-    over SSH.
-
-  - In the attempt of reducing the data queued to the TCP layer, it
-    didn't leverage all the available bandwidth.
-
-- Moved the final check on the state of the session at the end of
-  execution stage, instead of the beginning. The signals sent by the
-  user to request the statistics could be reset before the proxy had
-  entered the right procedure.
-
-- Added the session type 'unix-rootless', to be used for single apps
-  run with the agent in rootless mode.
-
-nxcomp-1.5.0-32
-
-- Modified the main loop to skip the select when I/O is possible on
-  any of the agent descriptors or the proxy link.
-
-- Now the house-keeping process is allocated in the heap instead of
-  the stack.
-
-nxcomp-1.5.0-31
-
-- The server channel now performs asynchronous reads from the display
-  by interleaving them with data decoded from the remote proxy.
-
-- Improved the handling of the memory-to-memory transport.
-
-nxcomp-1.5.0-30
-
-- Redesigned the handling of the congestion events to work more re-
-  liably and to report the events to the remote peer earlier.
-
-- Increased the size of the shared memory segment when the MIT-SHM
-  extension is activated.
-
-- Solved a bug that prevented the ping timeout to work as expected.
-
-- Ensured that, when entering the main select(), neither the chan-
-  nels or the proxy have pending messages in the read buffers.
-
-- There is now only a single case where we can have pending messa-
-  ges, namely in the handling of the MIT-SHM events.
-
-- Solved a bug introduced by the 1.5.0-29 that made the proxy en-
-  ter the select with a null timeout.
-
-- Renamed LINK_TYPE_AUTO to LINK_TYPE_NONE in NXproto.h.
-
-nxcomp-1.5.0-29
-
-- Now encoding data from the agent descriptors happens in the same
-  context as data is written to the buffer.
-
-- Optimized the handling of the congestion events to avoid running
-  further unneeded loops.
-
-- Added timer handling utilities.
-
-nxcomp-1.5.0-28
-
-- Added code providing information about the reason of the failure
-  encountered connecting to the local X server. This greatly helps
-  when troubleshooting X authorization problems.
-
-- On connection failure a warning message is printed in the session
-  log.
-
-- Removed the warning that was previously printed when the MIT-SHM
-  extension failed to be initialized on Windows. Shared memory has
-  problems on Cygwin and it currently doesn't work in NXWin.
-
-- Reworked the message printed in the case of link failure.
-
-nxcomp-1.5.0-27
-
-- Solved a bug in the connection procedure introduced by 1.5.0-25.
-
-nxcomp-1.5.0-26
-
-- Transformed the errors printed on failure of the fork() creating
-  the children into warnings. This can happen quite often on Win-
-  dows, due to well known Cygwin problems. See also the ChangeLog
-  entry for nxcomp 1.4.0-28. This patch closes the TRSL052278 but
-  it's obviously not a long-term solution.
-
-- Set the sticky bit when creating the '/tmp/.X11-unix' directory.
-
-- Modified the Makefile.in to remove the *.out.* files generated by
-  Valgrind.
-
-- Updated the README files.
-
-nxcomp-1.5.0-25
-
-- Changed the directory where the client for the Mac is searched if
-  it is not found in the system path.
-
-- Modified Auth.cpp to use nxauth also on the Mac.
-
-- Reworked the procedure showing the alert dialog when a timeout is
-  encountered in the initial connection.
-
-- Removed the experimental code from the official 1.5.0 branch.
-
-nxcomp-1.5.0-24
-
-- Implemented more experimental classes.
-
-nxcomp-1.5.0-23
-
-- Added the NX_SIGNAL_FORWARD action to NXTransSignal(). This can
-  be used to let the proxy call the original signal handler of the
-  agent after having blocked the signal.
-
-nxcomp-1.5.0-22
-
-- Ensured that we always have a context, even before creating the
-  transport.
-
-- Suppressed the error message printed when passing the -h option.
-
-- Added the experimental code that is currently under development.
-
-nxcomp-1.5.0-21
-
-- Enabled the fake X cookie authentication. This requires checking
-  the remote proxy version to verify that the server supports the
-  new authorization mechanism.
-
-- It's worth noting that the X client side proxy doesn't care which
-  cookie is sent over the connection. The problem is that clients
-  connecting to 1.4.0 servers don't have a method to force the ser-
-  ver to use the fake cookie. This means that we have to solve the
-  problem by letting the proxy check the remote version so that it
-  can omit to replace the cookie when connecting to older servers.
-
-nxcomp-1.5.0-20
-
-- Added the NXTransCongestion() function. It returns true if proxy
-  is in congestion state.
-
-- Removed an incorrect warning that was printed when calling force()
-  for the memory-to-memory transport. The agent could actually re-
-  quire multiple loops to read all data queued for it.
-
-nxcomp-1.5.0-19
-
-- Small optimization in NXTransReadable() to run a new NXTransConti-
-  nue() loop only after at least RetryTimeout milliseconds are pas-
-  sed since the last call and still no data is available. This cuts
-  the number of unneeded loops to 1/4th of the total, probably more,
-  on faster machines.
-
-- Added NXCollectGrabPointerNotify to NXproto.h.
-
-nxcomp-1.5.0-18
-
-- Minor changes to NXTransContinue().
-
-nxcomp-1.5.0-17
-
-- Moved respawning of a new nxclient instance in the cleanup procedu-
-  re. This ensures that the respawn is executed whatever is the rea-
-  son of the session shutdown.
-
-- Added a method to force closure of a given channel in proxy.
-
-- Removed code handling the special case triggered on Windows by the
-  presence of a NX_SESSION variable in the environment.
-
-nxcomp-1.5.0-16
-
-- Added the NXTransSignal() function to let agents tell to the proxy
-  how to handle the standard POSIX signals. Given the SIGINT signal,
-  for example, the caller can specify any of the following actions.
-
-  NX_SIGNAL_ENABLE:  A signal handler will have to be installed by
-                     the library, so that it can be intercepted by
-                     the proxy.
-
-  NX_SIGNAL_DISABLE: The signal will be handled by the caller and,
-                     eventually, forwarded to the proxy by calling
-                     NXTransSignal() explicitly.
-
-  NX_SIGNAL_RAISE:   The signal must be handled now, as if it had
-                     been delivered by the operating system. This
-                     function can be called by the agent with the
-                     purpose of propagating a signal to the proxy.
-
-  As a rule of thumb, agents should let the proxy handle SIGUSR1 and
-  SIGUSR2, used for producing the NX protocol statistics, and SIGHUP,
-  used for disconnecting the NX transport.
-
-- The following signals are blocked by default upon creation of the
-  NX transport:
-
-  SIGCHLD    These signals should be always put under the control
-  SIGUSR1    of the proxy. If agents are intercepting them, agents
-  SIGUSR2    should later call NXTransSignal(..., NX_SIGNAL_RAISE)
-  SIGHUP     to forward the signal to the proxy.
-
-  SIGINT     These signals should be intercepted by agents. Agents
-  SIGTERM    should ensure that NXTransDestroy() is called before
-             exiting, to give the proxy a chance to shut down the
-             NX transport.
-
-  SIGPIPE    This signal is blocked by the proxy, but not used to
-             implement any functionality. It can be handled by the
-             NX agent without affecting the proxy.
-
-  SIGALRM    This is not blocked by the proxy, but could be used
-             in future.
-
-  SIGVTALRM  These signals are not used and should not be used in
-  SIGWINCH   future versions of the library.
-  SIGIO
-  SIGTSTP
-  SIGTTIN
-  SIGTTOU
-
-- By calling NXTransSignal(..., NX_SIGNAL_DISABLE) nxcomp will res-
-  tore the signal handler that was saved at the time the proxy hand-
-  ler was installed. This means that you should call the function
-  just after the XOpenDisplay() or any other function used to init-
-  ialize the NX transport.
-
-nxcomp-1.5.0-15
-
-- In NXTransContinue(), if the transport is gone, return immediately,
-  that is without having to wait until the NXTransSelect() timeout.
-
-- Ensure that NXTransCreate() has a jump context, just in the case
-  a subsequent operation would cause a cleanup.
-
-nxcomp-1.5.0-14
-
-- Solved a problem with requests left in the agent's buffer when run-
-  ning the NX transport. The agent could have enqueued data to our
-  side and checked the available events but requests could not be
-  written to the proxy because proxy might not have had a chance to
-  enter a new select. We found that this behaviour was triggered by
-  _XEventsQueued, so now a new loop is forced when agent is calling
-  _X11TransDataReadable. The procedure can be optimized, by avoiding
-  an expensive loop when no critical I/O is pending.
-
-- Added a few additional logs to ClientChannel and ServerChannel.
-
-nxcomp-1.5.0-13
-
-- Added the code handling the special cases of an user not specifying
-  a proxy cookie or the case of the X authorization file not contain-
-  ing a value matching the display. In the first case we'll forward
-  the same cookie that was feeded to the proxy, in the second case we
-  will forward to the X server a random generated cookie, similarly to
-  what SSH does in this same condition.
-
-- Rewritten the command line parser. Removed all the command line
-  options parsed on behalf of nxproxy except:
-
-  -C          Specify that nxproxy has to run on the "X client"
-              side, listening for connections and impersonating
-              an X server.\n\
-
-  -S          Specify that nxproxy has to run in "X server" mode,
-              thus forwarding the connections to daemons running
-              on the client.\n\
-
-  -V n.n.n    Request nxproxy to load the given nxcomp version.
-              This option is only present on Solaris and Linux.
-
-  -v          Print version information.
-
-  host:port   Put at the end, specifies the host and port of the
-              listening proxy.
-
-  value=name  Set the NX option to the provided value.
-
-  Multiple NX options can be specified in the DISPLAY environment or
-  on the command line, by using the nx/nx,name=value notation.
-
-- The above information is printed on the console when incurring in
-  a parse error, together with a list of the available option=value
-  parameters.
-
-- Renamed the 'log' option to 'errors'. This makes sense as the de-
-  fault name for the log file is actually 'errors'.
-
-- Now the "Established X server connection" message is printed to
-  the session log only after the X connection has passed the X auth-
-  entication phase. This means that the NX client should become able
-  to show the details of the session log whenever the session fails
-  due to a cookie problem.
-
-- When selecting the additional services without specifying a port,
-  the client proxy will now automatically forward the connections to
-  the corresponding well-known ports of the CUPS, SMB and HTTP servi-
-  ces. Embedded X keyboard connections will be automatically forward-
-  ed to the same display port used to connect to the X server. The
-  user will still have to specify the port to be used for the media
-  connections as we don't have a suitable well-known port.
-
-- Starting from this version, connections to the keybd port will cre-
-  ate real X connection channels. This is required to let connections
-  leverage the fake authorization cookie.
-
-- By testing the forwarding of keybd connections I found that, when
-  letting X clients connect to the port, it is required to provide
-  the X cookie for the unix display. Adding only the TCP cookie will
-  not work. For example, by creating a cookie as in:
-
-  xauth add localhost:2009  MIT-MAGIC-COOKIE-1  6f...f4
-
-  And running:
-
-  xterm xterm -display localhost:2009
-
-  You will get the following error:
-
-  Xlib: connection to "localhost:2009.0" refused by server
-  Xlib: No protocol specified
-
-  Adding also the unix cookie will fix it:
-
-  xauth add localhost/unix:2009  MIT-MAGIC-COOKIE-1  6f...f4
-
-  This seems to be a Xlib problem, with Xlib trying to get the cookie
-  for the UDS port even if the TCP port was requested by the user.
-
-- Fixed a bug that prevented the nxclient dialog to be displayed when
-  the session was abruptedly shut down.
-
-- Fixed the compilation error on Apple MacOSX due to the sa_restorer
-  field in sigaction. As long as this field is present on Linux we
-  will keep following the safer route and will set it explicitly to
-  NULL.
-
-- Included what needs to be included in Process.cpp to compile with
-  older gcc.
-
-nxcomp-1.5.0-12
-
-- Implemented a replacement for the popen() and pclose() that do not
-  rely on a shell to run the command. They were required on Windows,
-  where we don't ship a suitable shell in the install.
-
-- Removed code forcing the PATH to include the bin directory on
-  Windows.
-
-nxcomp-1.5.0-11
-
-- Forced Auth.cpp on Windows to have the directory containing the
-  nxauth executable in the PATH. This is just for testing, until
-  nxclient is fixed.
-
-- Fixed compilation errors on Cygwin and Sun.
-
-- Removed the NX_FORCE_* stubs.
-
-nxcomp-1.5.0-10
-
-- Modified the memory management policies in ReadBuffer to fit all
-  the available bytes in a single buffer allocation.
-
-- The locateMessage() methods now give hints on the amount of data
-  that has to be read.
-
-- The read loop in channel now doesn't yield in the case of prio-
-  ritized messages. This is experimental.
-
-- Removed the check on isTimeToYield() between encodings of multi-
-  ple messages. This is aimed at reducing the risk of leaving pen-
-  ding messages in channels.
-
-- Modified the channels' read loop to always read all the available
-  data.
-
-- Disabled the log output that was selected when compiling with the
-  configure option --with-info. This leaves space for other log out-
-  put to be selected for more up-to-date scopes.
-
-- Implemented the NXTransReadVector() and the NXTransWriteVector()
-  functions to replace READV() and WRITEV().
-
-- Implemented memory-to-memory communication between the agent and
-  the NX proxy by making use of the NXTransAgent() interface in the
-  nx-X11/lib/X11/Xtranssock.c file.
-
-- Added a check in NXTransSelect() for the EBADF and, on Solaris,
-  the EINVAL errors. It can happen in the X11 code that a descript-
-  or has become invalid before it is removed from the managed set 
-
-- Rewritten the signal handling functions to restore the old actions
-  and masks when the NX transport is destroyed.
-
-- Added a NXTransAgent() function to let agents tell the proxy which
-  descriptor must be used for the controlling connection. Setting a
-  controlling connection has the effect of disabling further X client
-  connections and makes the proxy terminate when the channel is shut
-  down.
-
-- Solved a problem with setting the initial timeout in the select().
-
-- Modified the Makefile.in to not include -Wno-deprecated when compi-
-  ling C programs.
-
-nxcomp-1.5.0-9
-
-- Fixed a problem that prevented the 1.5.0-8 to work on the NX server
-  side.
-
-- This version has NX_FORCE_NULL_LISTEN_OPTION and NX_FORCE_NEW_SES-
-  SION_OPTION undefined, so it should work in a way that is compati-
-  ble with the old nxcomp.
-
-nxcomp-1.5.0-8
-
-- The new code comes with a preliminary integration of nxcomp with
-  SSH. It is now possible to create the NX transport by just calling
-  the "switch" command as in the following example:
-
-  NX> 299 Switching connection to: NX options: ...
-
-- Other possible forms for the NX switch command are:
-
-  NX> 299 Switching connection to: NX mode: ...
-
-  NX> 299 Switching connection to: NX mode: ... options: ...
-
-  Or just:
-
-  NX> 299 Switching connection to: NX
-
-  The "mode" parameter is there to provide a way to run both enc-
-  rypted and unencrypted connections. Possible values are "encrypt-
-  ed", "unencrypted" or "default", the latter being an alias for
-  "encrypted". Unfortunately I was not able to test unencrypted
-  connections, so this may or may not work.
-
-- The top-level process can create the NX transport layer by calling
-  NXTransCreate(). The user has to set up a socket pair and pass the
-  higher descriptor to nxcomp. nxcomp will later monitor its end, by
-  reading and writing NX-encoded traffic. The user has to call the
-  NXTransExecute() function as often as it is possible, by letting
-  first NXTransPrepare() combine the sets of NX descriptors with the
-  descriptors that are used inside its process. A custom NXTransSel-
-  ect() is provided to optionally replace the original select(). This
-  function saves the original error code and the number of selected
-  descriptors upon exit, so the user can call it, restore the original
-  values as they were returned by the select() and run the rest of
-  the loop unmodified.
-
-- Future versions of the library should provide appropriate methods
-  for passing data to and from the proxy by means of a memcpy(), so
-  that it will be possible to remove the even minimal TCP overhead.
-
-- Note that integration is far from complete. More work is required
-  especially to manage the shutdown cleanly, in a way that gives to
-  SSH a chance to free its resources, and on adding facilities for
-  handling SSH and NX signals in a single function.
-
-- Rewritten the initialization procedure to make possible to run the
-  proxy in-process in an arbitrary connection manager, like SSH or a
-  HTTP utility. The same functionality can be used to embed nxcomp in
-  the NX agents, so that nxcomp has not to run in a separate process.
-
-- A new state-machine handles the advances through the connection
-  stages until the remote proxy (or the forwarder process ) is auth-
-  enticated, options have been negotiated and the session is started.
-
-- The option "session" is now used to pass the name of the session
-  file to the proxy. The parameter was previously used to pass the
-  literal name of the session, as set by the user, and was ignored
-  by the proxy. By default the session log is the standard error of
-  the process. It is anyway required to set the option when running
-  inside SSH, otherwise output will go to the same file as the SSH
-  output. In the NX client this would be the 'sshlog' file.
-
-- This version can be easily crafted to test the new integration by
-  setting the following define:
-
-  NX_FORCE_NULL_LISTEN_OPTION
-
-  This makes possible to test the nxcomp/nxssh integration by using
-  any production 1.4.0 client. To run this version you are required
-  to use nxproxy 1.5.0-4 and nxssh-1.5.0-6.
-
-- New functions handling enabling and disabling signals, based on
-  sigprocmask().
-
-- Improved error reporting when failures are encountered while ne-
-  gotiating the session.
-
-nxcomp-1.5.0-7
-
-- Caches are saved with a version identifier 1.4.0 so that they are
-  not discarded after upgrading the software to the 1.5.0.
-
-- Made values of T_* enumerations to be all lower case.
-
-- Updated copyright to year 2005.
-
-- Started working on an interface for running nxcomp in-process, as
-  a additional transport layer of nxssh or nxagent.
-
-nxcomp-1.5.0-6
-
-- Modified the configure script and the makefiles to not include the
-  -Wstrict-prototypes and -Wmissing-prototypes compilation flags. The
-  -Wnested-externs and -Wmissing-declarations flags are not included
-  when using GCC 3.
-
-- Removed the initial newline from string "NXPROXY - Version" printed
-  at program startup.
-  
-- Made X authentication compatible with 1.4.0 clients. This is a tem-
-  porary solution while code is updated to handle the new X authori-
-  zation scheme.
-
-nxcomp-1.5.0-5
-
-- Added an Auth class to handle the X authentication. The NX server
-  should now use the same proxie cookie that is passed by the client
-  at session startup. The X server side proxy will forward the autho-
-  rization credentials by replacing the fake cookie with the real co-
-  okie, as it is read from the auth file using the xauth utility. The
-  implementation is based on the corresponding code found in the SSH
-  client and comes with the same limitations: only MIT-MAGIC-COOKIE-1
-  cookies are checked and the authorization file is read only once,
-  at the time the instance is initialized. If the auth file changes
-  along the life of the session, the old cookie will still be used.
-  This works with X servers because of an undocumented "feature".
-  See also nx-X11.
-
-nxcomp-1.5.0-4
-
-- Adjusted for alarm(0) returning an inconsistent value in ConnectTo-
-  Remote().
-
-- Small changes to Types.h, Jpeg.cpp and Png.cpp to compile with gcc
-  3.4.2.
-
-- Cosmetic changes to the ChangeLog file.
-
-nxcomp-1.5.0-3
-
-- Removed test code from ServerChannel.cpp.
-
-- Small cosmetic change in Loop.cpp.
-
-- Tested for compatibility against 1.4.1-8.
-
-nxcomp-1.5.0-2
-
-- Changed VERSION file according to TRCL052336.
-
-nxcomp-1.5.0-1
-
-- Opened the 1.5.0 branch based on 1.4.1-9.
-
-nxcomp-1.4.1-9
-
-- Implemented methods PACK_RDP_PLAIN_64K_COLORS and PACK_RDP_PLAIN_-
-  16M_COLORS. It seems that 16 bpp plain bitmaps can be seldom recei-
-  ved. This doesn't seem to be the case of 24 bpp bitmaps.
-
-nxcomp-1.4.1-8
-
-- The new code enables use of 16 bpp and 32 bpp RDP bitmaps. This re-
-  quired modifications to the following files:
-
-  Misc.h
-  Misc.cpp
-  Loop.cpp
-  Control.cpp
-  ServerChannel.cpp
-  Unpack.h
-  Unpack.cpp
-
-- Lots of cosmetic changes compared to the original code in 1.4.1-7.
-
-- Merged the 1.4.0 and the 1.4.1 branches by importing changes up to
-  the 1.4.1-7.
-
-nxcomp-1.4.0-30
-
-- Modified the function checking the Unix socket where X connections
-  will be forwarded. The function will not fail if the socket itself
-  doesn't exist yet. This solves the TRCL042203.
-
-- Moved the code checking for the CTRL+ALT+SHIFT+ESC sequence to a
-  separate function. The implementation will now look for a different
-  sequence on the MacOS/X platform. This should solve the TRCL042182.
-
-nxcomp-1.4.0-29
-
-- Solved a bug that could cause proxy to stop reading data from the
-  X channels due to an incorrect calculation of the bytes queued on
-  the proxy link. The bug only affected Linux kernels of the 2.0/2.2
-  series.
-
-- Fixed a problem in the proxy class that could let the select time-
-  out to become zero.
-
-nxcomp-1.4.0-28
-
-- Prevented the main proxy process from quitting when the fork() of
-  any of the children fails. This can actually happen on Windows due
-  to conflicts in reallocating any of the Cygwin DLLs.
-
-- Reworked handling of the priority flag in channels when dealing
-  with the X_InternAtoms and X_AllocColor requests to reduce the time
-  of session startup. Priority is never set in case of X_InternAtom
-  requests and replies as we assume that most clients use the appro-
-  priate Xlib function to pipeline multiple requests in a single net-
-  work operation.
-
-- The timeout after which proxy will abort the peer connection is
-  still 120 seconds. An alert dialog will be shown earlier, after 30
-  seconds instead of 60.
-
-nxcomp-1.4.0-27
-
-- Removed the code setting priority on channels on ButtonPress and
-  Button release events. It seems preferrable to delay the flush and
-  pack more events in a single frame. This makes possible to get the
-  ButtonRelease together with the ButtonPress.
-
-- Fixed error detection in SetNoDelay() where a positive result
-  could produce a 'not supported' message in debug mode.
-
-nxcomp-1.4.0-26
-
-- Reworked the check aimed at detecting the clock drifts. The previ-
-  ous code, introduced in 1.3.2-2, had the undesired side-effect of
-  resetting the proxy timeout. This could cause the proxy to never
-  detect that the other end had been killed.
-
-- The default behaviour of proxy is now to terminate the session at
-  the time an error is encountered. This includes network failures.
-
-- Added a new dialog to be shown to the user whenever the session
-  is terminated abnormally.
-
-nxcomp-1.4.0-25
-
-- Fixed a bug in handling of suppression of errors generated by
-  committing the image splits. Other errors, unrelated to the commit
-  of split, could be suppressed. This might cause the hangup of the
-  session when the suppressed error was matching a reply.
-
-nxcomp-1.4.0-24
-
-- When killing the proxy process -9 the watchdog could remain alive.
-  This caused the SSH link to keep the stderr open, with the effect
-  that former proxy message were not flushed to the session log.
-  Now the watchdog checks every second if the parent is dead, so
-  that file descriptors can be closed as soon as possible.
-
-- SetupDisplaySocket() tried to force the connections to the X
-  server on the UNIX port whenever the display was set to localhost.
-  This patch was intended to fix a bug in nxclient, using the TCP
-  port even when the display was set to a UNIX socket. This beha-
-  viour caused problems when running nxclient on a remote host by
-  means of a ssh -X. Proxy will now adhere to the display setting.
-
-nxcomp-1.4.0-23
-
-- Added the possibility to respawn nxclient at the end of session.
-  This is an useful feature when powering thin-clients where NX
-  is the only application made available.
-
-- This configuration applies system-wide to the local client ins-
-  tallation. By default it is disabled. It can be enabled by the
-  by creating a 'noexit' file in the directory '/usr/NX/share',
-  or at compile time, by setting ENABLE_RESTART_ON_SHUTDOWN to 1.
-
-- Note that the solution is not perfect yet, as there are cases
-  where session could die without going through HandleShutdown(),
-  for example if a decoding error is raised in the communication
-  with the remote peer and the subsequent restore of the proxy
-  link fails to succeed.
-
-nxcomp-1.4.0-22
-
-- Corrected typos in Timestamp.h and Loop.cpp.
-
-nxcomp-1.4.0-21
-
-- Tuned the handling of RenderCompositeGlyphs. Now compression of
-  RENDER shows an average ratio of 8:1. This is a steady increase
-  compared to the 5:1 of the 1.3.2 version. The overall advantage
-  when running clients displaying a large amount of text is 30%.
-
-nxcomp-1.4.0-20
-
-- Added a new message store for the CreatePixmap request.
-
-- Fixed handleCopy() to only send the data part past the offset.
-  This fix can save a significant amount of traffic, especially
-  when sending many small images whose size doesn't reach the
-  threshold set for compressing them.
-
-nxcomp-1.4.0-19
-
-- Added tuning of all the RENDER requests. RenderCompositeGlyphs
-  will require further work.
-
-- Completed porting of the RENDER requests to the new templates.
-
-nxcomp-1.4.0-18
-
-- Tuned the handling of RenderCreatePicture and RenderFreePicture.
-
-- Created a new template system for writing new message encoders.
-
-- Renamed getBits() in EncodeBuffer with diffBits(). The getBits()
-  method now returns the bits actually allocated in the buffer and
-  can be called multiple times.
-
-nxcomp-1.4.0-17
-
-- Provided specific encoding of the remaining RENDER requests and
-  added compression of RenderCreateGlyphSet.
-
-nxcomp-1.4.0-16
-
-- Code underwent through 7 different patch versions but seems to
-  be stable now. It still needs to provide specific encoding for
-  RenderCreatePicture RenderChangePicture and RenderFreePicture.
-  Code will likely include incompatible changes at any new version
-  until the new encoding will stabilize, so be sure that you use
-  the same nxcomp version at both sides.
-
-- Created the infrastructure for compressing extension messages
-  based on the minor opcode. A new class, MinorMessageStore, has
-  to be inherited by stores requiring specific compression, so
-  that all the encoding methods of the parent can be redirected
-  to it. The RENDER extension is now compressed using this new
-  class.
-
-- Managed to maintain the compatibility with caches created by the
-  1.3.X version. Caches will be saved using the old format if the
-  remote version is not a 1.4.x. When restoring a cache created
-  by the 1.3.x with both proxies being the newest version, RENDER
-  mesages will be discarded without having to discard the whole
-  cache.
-
-- Added a member to the message class to store the identity size.
-  This field is now used instead of the default data offset to
-  manage the message data, that is the part of message after the
-  identity.
-
-- Removed the warnings printed in the session log when passing the
-  'kbtype' and the 'geometry' options to the proxy. These options
-  are actually used by agents.
-
-nxcomp-1.4.0-15
-
-- Started implementation of the new framework for handling enco-
-  ding of X extensions.
-
-- Renamed the overloaded methods handleEncode() and handleDecode()
-  to handleEncodeCached(), handleEncodeIdentity() and handleDecode-
-  Cached(), handleDecodeIdentity().
-
-- Updated the copyright notice to year 2004.
-
-nxcomp-1.4.0-14
-
-- Added the new channel for HTTP connections. This channel can be
-  used to let applications running on the NX server get access to
-  data and applications made available by a HTTP daemon running at
-  the client side.
-
-  This channel is not used at the moment by nxclient. It can be
-  activated by passing http=1 to the NX server side proxy and the
-  value http=80 to the NX client side.
-
-nxcomp-1.4.0-13
-
-- Quick patch to run on MacOS/X where inet_addr("127.0.0.1")
-  alone seems to fail to return a valid interface.
-
-nxcomp-1.4.0-12
-
-- Few cosmetic changes to logging.
-
-- Removed the debug output.
-
-nxcomp-1.4.0-11
-
-- Removed code used for simulating the new forwarding function-
-  ality without client and server support.
-
-nxcomp-1.4.0-10
-
-- Implemented authentication of the forwarder to the listening
-  proxy. If a session cookie is required, the forwarder must
-  provide the cookie upon connection.
-
-  An authentication phase at the time the forwarder connects
-  to the NX client side is strongly suggested because it is usu-
-  ally this side that sends the authorization cookie. Without
-  such a forwarder authentication, the local peer would reveal
-  the cookie to the first process connecting to the port.
-
-- If no cookie is specified in the switch command, the forward-
-  er is required to skip the authentication phase. This can be
-  useful when running the programs on the command line.
-
-- The implementation required appropriate changes to session
-  negotiation in nxssh. This version requires nxssh-1.4.0-8.
-
-nxcomp-1.4.0-9
-
-- Fixed the startup procedure to correctly negotiate the cookie
-  when the X server side proxy is listening for a forwarder.
-
-- When listening for a local forwarder (that is when the listen
-  option is enabled at X server side), proxy will listen for the
-  forwarder on the localhost interface.
-
-- This version has ports and and other parameters hardcoded for
-  testing purposes and is not intended for normal use.
-
-nxcomp-1.4.0-8
-
-- Slightly modified the text of FAILED_PROXY_CONNECTION alert.
-
-nxcomp-1.4.0-7
-
-- Added provision for leaving a running dialog showing an OK box
-  if proxy is exiting abnormally. This seems to fail to yield the
-  expected results as, at the present moment, client checks if
-  parent has exited.
-
-- Added a Binder class invoked when calling proxy with -B option.
-  It would serve as a replacement of the modifications I'm doing
-  in nxssh. The class is just a framework and the implementation
-  is unfinished.
-
-nxcomp-1.4.0-6
-
-- Added a line in the session log if the connection procedure is
-  aborted due to a signal.
-
-- Fixed ParseHostOption() to let it take in account the proxy
-  port offset when passing 'host:port' as the last parameter at
-  X server side.
-
-nxcomp-1.4.0-5
-
-- Lowered the default port offsets used for CUPS and SMB services
-  to 2000 and 3000. Arbitrary ports can be used by passing the ser-
-  vice's port at proxy startup. By default, anyway, the port is at
-  the same offset of the proxied display. Considering that the NX
-  server uses to start the first session at display 1000, we must
-  lower some of the defaults to avoid interference with the normal
-  X sessions run on the server.
-
-  Session at display ":1000" will have:
-
-  . Forwarding of CUPS connections at 3000.
-
-  . Forwarding of SMB connections at 4000.
-
-  . The listening proxy (at NX server side) at 5000. This
-    port is not used when enabling SSH tunneling
-
-  . The proxied X display (NX agent or proxy) at 7000.
-
-  . Forwarding of multimedia channels at 8000.
-
-  . Forwarding of embedded keyboard connections at 9000.
-
-- Turned off the log output.
-
-nxcomp-1.4.0-4
-
-- Managed to get the X client side proxy connect to the remote
-  peer. This means that some parameters that were implicitly
-  assumed based on the proxied port simulating the X display
-  must be now specified in the NX display string.
-
-- The 'port' parameter now specifies the remote TCP port where
-  the local proxy will connect to the remote peer. In previous
-  versions this parameter also affected the proxied port. This
-  was mainly a side effect, as the remote peer was always con-
-  tacted at port 4000 plus the proxied display offset.
-
-- Added the 'listen' parameter to tell to the proxy that is go-
-  ing to accept the peer connection on which port it will be
-  contacted. By default, similarly to the previous version, the
-  proxy will listen at the proxied display offset.
-
-- A check has been added in order to disallow passing both the
-  'accept' and the 'connect' parameter at the same time. A simi-
-  lar check affects the 'listen' parameter.
-
-- Renamed the previously unused 'sync' channel as 'cups'.
-
-nxcomp-1.4.0-3
-
-- Preserved the ability of version 1.3.2 to load caches generated
-  by this version.
-
-nxcomp-1.4.0-2
-
-- Small fixes to compile under Solaris 8.
-
-nxcomp-1.4.0-1
-
-- Opened the 1.4.0 branch.
-
-nxcomp-1.3.2-4
-
-- Fixed a problem with shmget(). Code in ServerChannel checked
-  the return value for being greater then 0, while 0 can actual-
-  ly be a valid segment.
-
-- When memory cache is disabled, nxcomp will explicitly set the
-  appropriate control variables dealing with loading and saving
-  of the persistent cache. This can be considered a cosmetic
-  change as nxcomp will disable NX delta compression if memory
-  cache is not available and this has an implicit effect on the
-  ability to load and save such a cache.
-
-nxcomp-1.3.2-3
-
-- Removed inclusion of zlib.h in Png.cpp. Conflicting symbols
-  with zlib.h from nx-X11 could cause compilation to fail.
-
-nxcomp-1.3.2-2
-
-- Added a function to take into account the clock drifts at the
-  time we check the ping from the remote proxy. This can be
-  caused by the user changing the system time or by small adjust-
-  ments introduced by the operating system making the clock go
-  backward. Such events could cause the proxy link to be shut
-  down and reconnected.
-
-- Reduced the length of lines printed in statistics when showing
-  the details of X protocol's opcodes. This is intended to help
-  nxclient to keep the whole statistics in the 'details' window,
-  so that users don't have to use the scrollbars.
-
-nxcomp-1.3.2-1
-
-- Opened the 1.3.2 branch.
-
-nxcomp-1.3.1-5
-
-- It seems that Solaris can return an EINVAL error selecting a
-  shutdown descriptor even before we actually close the socket.
-  We now ignore the condition on Solaris. This is definitely a
-  Solaris bug. 
-
-nxcomp-1.3.1-4
-
-- Increased the timeout after which proxy will abort the peer
-  connection to 120 seconds. An alert dialog will now be shown
-  after 60 seconds, instead of the 30 seconds being the default
-  in the previous version. Some users reported the timeout to
-  be too short in the case of temporary network failures.
-
-nxcomp-1.3.1-3
-
-- Some optimizations in the cache house-keeping process. Now it
-  runs at lower system priority in respect to the parent. Any 2
-  iterations through directories and images, it also sleeps for
-  a tiny amount of time. This further decreases the system load.
-
-- Removed the underline characters and added a colon in the
-  title of this ChangeLog to fully comply with format used in
-  the release notices.
-
-nxcomp-1.3.1-2
-
-- Fixed a crash when running both client and server on the SPARC
-  Solaris. An optimization used to avoid byte-swapping when both
-  hosts have the same endianess doesn't work on SPARC if buffer
-  is not aligned to word boundary. A better version of the code
-  should check the CPU, not the OS, as this probably applies to
-  other processors.
-
-nxcomp-1.3.1-1
-
-- Opened the 1.3.1 branch.
-
-nxcomp-1.3.0-50
-
-- Disabled the processor limit in X client side proxy. In previous
-  versions the processor load limit was set to an idle time ratio
-  of 2. This was likely to cause an unwanted slowdown on very old
-  hardware or when running the server as guest OS inside a VMWare
-  virtual machine.
-
-nxcomp-1.3.0-49
-
-- Last minute update on proxy shutdown bug on Cygwin. A stack
-  trace reveals that faillure happens in the static destructor of
-  the BlockCacheSet class. It seems that problem appeared just
-  after having upgraded to the latest version of Cygwin DLL. Now
-  the destructor is skipped at shutdown.
-
-nxcomp-1.3.0-48
-
-- Further fix to overcome the shutdown problem on Windows.
-
-nxcomp-1.3.0-47
-
-- Used T_files::value_type() in Keeper.cpp. The form without the
-  explicit constructor fails to compile with GCC 2.91 on RH 6.2.
-
-- Fixed '==' -> '=' in configure.in to build under RH 6.2 and
-  probably other platforms.
-
-nxcomp-1.3.0-46
-
-- The cleanup procedure now skips deletion of the IO streams
-  under Windows. This is intended to overcome a strange segfault
-  occurring at random time, at the time proxy is being shutdown.
-
-nxcomp-1.3.0-45
-
-- Newer versions of the stdlibc++ do not seem to be able to deal
-  with NULL strings or non printable characters. This caused the
-  standard error stream to get sometimes corrupted in the case
-  TEST and DEBUG logs were enabled in Loop.cpp.
-
-nxcomp-1.3.0-44
-
-- Disabled TEST and DEBUG logs in ServerChannel.
-
-nxcomp-1.3.0-43
-
-- Fixed a crash when unpacking an image in server proxy in the
-  case the unpack state for the given channel had not been
-  previously created.
-
-nxcomp-1.3.0-42
-
-- Small modification to setSchedule() to not account previous
-  data accumulated in the encode buffer. The new code seems to
-  allow better use of the available bandwidth.
-
-nxcomp-1.3.0-41
-
-- Further fix in Tight decompression. Content of the main write
-  buffer was not removed before flushing the unpacked data to
-  the X server link.
-
-nxcomp-1.3.0-40
-
-- Removed the code marked as FIXME in Loop and ServerChannel.
-  Code was used in previous version to override any pack method
-  other than NO_PACK and to disable initialization of the shared
-  memory.
-
-nxcomp-1.3.0-39
-
-- Solved the problem with unpacking of RDP text on big-endian
-  architectures. The width field in PutPackedImage was put as
-  16 bits and extracted as 32 bits at decoding side.
-
-- Moved the code checking if any of the children has exited in a
-  specific function. This function is now called any time signals
-  are newly enabled. This works even on Solaris.
-
-- Enabled use of shared memory with Tight image decompression.
-
-- Added event NXCollectPropertyNotify to NXproto.h.
-
-nxcomp-1.3.0-38
-
-- Message locks are now checked before splitting a message.
-
-nxcomp-1.3.0-37
-
-- Added a further counter to yield encoding data if the amount 
-  of output bytes to be written to channels exceeds a threshold.
-
-- Modified proxy to write data immediately if the encoding loop
-  was interrupted.
-
-nxcomp-1.3.0-36
-
-- Further fix required by Tight decompression. By handling mul-
-  tiple writes in the Tight class we may flush the main write
-  buffer in the wrong order. If Tight decompression is enabled,
-  the buffer is now flushed before decoding the packed image.
-
-- A SIGCHLD is raised any time signals are newly enabled. This
-  allows the main loop to wait() the pid of children that had
-  exited while signals were disabled.
-
-nxcomp-1.3.0-35
-
-- Fixed Tight decompression by handling multiple writes to the
-  channel's transport inside the decompression function.
-
-- Made Tight decompressor in ServerChannel a pointer instead of
-  an instance of the class. Class is allocated the first time it
-  is referenced.
-
-- Rewritten handleUnpack() in ServerChannel to use a switch()
-  on the pack method instead of multiple if().
-
-nxcomp-1.3.0-34
-
-- Disabled RENDER extension when running X agent sessions on
-  the Solaris client. Problems seem to be caused by incompati-
-  bilities in the implementation of RENDER on the Sun X server
-  shipped by default. We did not test NX with the XFree86 X
-  server, but it seems that, when using the Sun X server, even
-  plain X clients don't make full use of the extension.
-
-nxcomp-1.3.0-33
-
-- Added 4 new fields to the X_NXGetControlParameters reply.
-  A dialog should be shown by agent if proxy was not able to
-  negotiate a persistent cache or if a cache was selected but
-  not loaded because incompatible or corrupted.
-
-- Fixed a bug on Solaris where socket() must be recreated if
-  the first connect() fails. Not a problem. The strange thing
-  is that if you reuse the socket(), the subsequent connect()
-  is successful and the program fails as soon as you try to
-  write to it.
-
-nxcomp-1.3.0-32
-
-- Added request X_NXFreeUnpack to free the resources allocated
-  by the remote proxy to unpack images for the given agent's
-  client
-
-- Added an alert at X server side if proxies were not able to
-  negotiate a persistent cache or if a cache was selected but
-  not loaded at X server side (that means that probably cache
-  was not compatible or corrupted). The alert is not enabled
-  at the moment. Before enabling it, we need to find a way to
-  deal with full-screen mode.
-
-- Tuning of MIT-SHM parameters.
-
-nxcomp-1.3.0-31
-
-- Modified the following requests to carry the id of the
-  agent's client:
-
-  - X_NXSetUnpackGeometry
-  - X_NXSetUnpackColormap
-  - X_NXSetUnpackAlpha
-  - X_NXPutPackedImage
-
-  Now each agent's client has its own record pointing to the
-  geometry, colormap and alpha channel that will be used to
-  unpack the image. Code is not finished yet so it is advisable
-  that agents' writers keep using client id 0. Note also that
-  the final solution will require some changes to the way split
-  notifications are sent to agent that I plan to implement in
-  the next versions.
-
-- The X_NXSetUnpackGeometry request has now a message store.
-  This should reduce the overhead to the minimum even in the
-  case of dumb agents not checking if the current geometry
-  matches the image to be unpacked.
-
-nxcomp-1.3.0-30
-
-- Improved handling of short-circuited replies at X client
-  side. Request opcodes are now pushed in the sequence queue
-  to determine if a reply is expected. In this case tainting
-  of reply is skipped to preserve the sequence ordering of
-  any event or error that could have generated by the reply.
-  This seems to solve all the problems reported by people
-  running a NX session in virtual desktop mode nested in an
-  existing session being run in single application mode.
-
-- Modified the cleanup procedure to print the 'Waiting for'
-  message in the session log only at the time all X channels
-  have been actually shut down. This message can be used by
-  the NX server to find out the appropriate time to close
-  the session.
-
-- Added the selected session type to the 'Using pack method'
-  message printed at startup.
-
-- Added the option to close down the proxy link and perform
-  a clean shutdown of the session, re-read the whole session
-  configuration or restart the proxy link when a SIGHUP is
-  delivered to the proxy process. The default behaviour is
-  to close down the session. The new default (the old one was
-  to restart the link) is a required feature to let users run
-  full sessions using single application mode f.e. in a LTSP
-  environment. I noted that when the controlling terminal of
-  the X session is closed, a SIGHUP is delivered to the X
-  server side proxy (probably it is delivered to all the con-
-  nected clients, and, thus for NX, only to the proxy). This
-  signal can be used to terminate the whole session.
-
-nxcomp-1.3.0-29
-
-- Changed defaults to disable image masks when running proxy
-  in single application mode. The new configuration requires
-  changes in NX server and in NX X11 library. Users should
-  experience much better image quality when using NX on slow
-  links. This comes at the cost of slightly worse compression
-  ratios.
-
-nxcomp-1.3.0-28
-
-- Opcode of request was not rewritten by server channel when
-  using link LAN. This caused problems with taint of replies.
-
-nxcomp-1.3.0-27
-
-- Modified the split store and the split procedures in client
-  channel to always return the client id in the notification
-  events. The new field is added to event at byte offset 28
-  to preserve compatibility with previous agent releases. The
-  modification permits to agent to match the commit of alpha
-  channel with the original image, if requests are split by
-  proxy.
-
-- Temporarily set the timeout used to poll MIT-SHM completion
-  events coming from X server to 0. More testing is required.
-
-- Fixed an inconsistent message generated in statistics due to
-  a division by 0.
-
-nxcomp-1.3.0-26
-
-- Modified pending timeout from 1 to 0 milliseconds. This means
-  that both channels and proxy are now immediately restarted to
-  let them consume all data left in their read buffer.
-
-- When querying the X server for MIT-SHM support, size of name
-  in X_QueryExtension request was sent as 32 bits instead of 16.
-  This caused request to fail on big endian architectures.
-
-- Modified the MIT-SHM initialization procedure to always send
-  all the 3 protocol requests also in the case of early failures.
-
-nxcomp-1.3.0-25
-
-- Implemented handling of the new X_NXSetUnpackAlpha message.
-  Performances are very satisfactory. Using most of the current
-  GNOME and KDE applications, caching reaches 90% of the total
-  messages.
-
-- Modified the persistent cache management routines to handle
-  backward compatibility with proxy versions prior of 1.3.0.
-
-- It has been made possible to send both X_NXSetUnpackColormap
-  and X_NXSetUnpackAlpha messages with 0 entries to temporarily
-  disable use of the colormap or the alpha channel and free the
-  resources allocated by the server channel class.
-
-- Added function UnpackAlpha() to Unpack.cpp.
-
-nxcomp-1.3.0-24
-
-- Using WriteBuffer::registerPointer() to track growing of the
-  write buffer in handleFastWrite() functions. This problem
-  existed even in 1.2.2 but never shown up because we didn't
-  have to use the pointer after data had been written to the
-  write buffer. Now, instead, we have to post-process the write
-  buffer to copy data to the shared segment.
-
-- Optimized memory allocations running with link LAN to save a
-  memcpy() any time new data is allocated in the scratch buffer.
-
-- When running with link LAN the scratch buffer is now used only
-  when:
-
-  - A further allocation would case growing of the write buffer
-    (and, thus, a memcpy() of the previous content).
-
-  - When data to added is bigger than the write threshold.
-
-  In previous versions the scratch buffer was used any time the 
-  total amount of data to be written (write buffer + scratch
-  buffer) exceeded the scheduled write threshold. This caused
-  small writes to be appended even when a single write could
-  be  obtained without reallocating the buffer.
-
-- Preliminary support for transporting the alpha channel in a
-  separate message in case of 32 bits displays using the RENDER
-  extension.
-
-nxcomp-1.3.0-23
-
-- Modified the mask used to open the shared memory segment on
-  OS/X to 0777. We have to better investigate why the previous
-  0600 mask doesn't work even if the user running the proxy is
-  the same user running the X server.
-
-nxcomp-1.3.0-22
-
-- Implemented MIT-SHM support on LAN connections.
-
-- More MIT-SHM bug fixes.
-
-nxcomp-1.3.0-21
-
-- Better use of the shared segment through an improved
-  algorithm leveraging the offset field of the X_ShmPutImage
-  request. The new algorithm greatly reduces the amount of
-  polls the proxy needs to perform to find if the completion
-  event has arrived.
-
-- Implemented MIT-SHM support for X_PutImage requests.
-
-- Implemented option shmem=value. Use of this option is anyway
-  discouraged. Proxy will allocate the shared memory segment
-  based on the size of the in-memory cache set by the user.
-  Use of MIT-SHM is disabled when user did set a memory cache
-  smaller than 2MB (for example on the embedded client).
-
-- Rewritten post-processing of images in server channel loop.
-
-- Improved error handling to ensure we intercept all MIT-SHM
-  X errors before they reach the NX agent.
-
-- Solved a problem that was causing channels to not reflect
-  shared memory support flags set in control.
-
-nxcomp-1.3.0-20
-
-- Solved a compatibility problem when mixing proxy versions
-  1.2.2 and 1.3.0.
-
-nxcomp-1.3.0-18
-
-- Rewritten interfaces to shared memory initialization in
-  client and server channel.
-
-- Server channel checks for the completion event until a
-  timeout before reusing the shared memory segment.
-
-- Flush flag was not cleared after the write buffer had been
-  flushed in handleWrite() of both client and server channels.
-  This could lead to multiple fragmented writes, affecting
-  the performances.
-
-- Added -lcygipc to linking on Windows platform.
-
-- Added a check on GCC version to see if -Wnested-externs
-  -Wmissing-declarations are valid options.
-
-nxcomp-1.3.0-17
-
-- Implemented initial support for MIT-SHM extension in the
-  network path between the X server proxy and the real X
-  server. Presently it works only for X_NXPutPackedImages.
-
-- Modified configure.in to compile under FreeBSD.
-
-- Small changes to sources due to FreeBSD support.
-
-nxcomp-1.3.0-16
-
-- Fixed caching of RENDER extension on MacOS/X and Solaris.
-
-- Under Solaris an explicit call to EnableSignal() is needed
-  at the end of the signal handler as raising a signal seems
-  to reset the previous settings.
-
-- Can't find a way to get bytes queued for write on Solaris as
-  both FIONWRITE and TIOCOUTQ don't seem to be available. This
-  means that NX server on Solaris is only able to detect con-
-  gestions on proxy link at the time a write fails with error
-  EAGAIN.
-
-- Starting from this version, render extension messages are not
-  automatically discarded from cache when running agent based X
-  sessions. This is in preparation of render support introduced
-  in this release.
-
-nxcomp-1.3.0-15
-
-- Changed default to force writes if X channels exceed buffer
-  limits. This change was suggested by benchmarks performed on
-  Win32.
-
-- Wrapped IO on cache files in functions performing better error
-  checking.
-
-- General cleanup in handling of socket options for MacOS/X and
-  Solaris.
-
-nxcomp-1.3.0-14
-
-- Corrupted persistent caches were not deleted in case loading
-  of any of the message stores failed. To run further sessions
-  on the same host, user had to delete the cache file manually.
-
-- Improved error handling in JPEG decompression. Now connection
-  is reset in case of failure.
-
-- Before performing JPEG or PNG decompression, image is better
-  checked to verify if loading from disk failed.
-
-- Improved error handling in case of failure loading persistent
-  cache from disk. On MacOS/X istream -> fail() doesn't seem to
-  work properly. This needs further investigation.
-
-- The default installation path of nxclient is searched under
-  MacOS/X at the time nxclient is invoked in dialog mode.
-
-nxcomp-1.3.0-13
-
-- Fixed a (further) compilation problem under Solaris. Now static
-  libraries are first searched under /usr/sfw/lib (in case Sun
-  would decide to include them in future releases).
-
-nxcomp-1.3.0-12
-
-- Fixed parsing of command line when passing option -V.
-
-- Correctly detected ENOPROTOOPT when setting TCP_NODELAY socket
-  option on MacOS/X and Solaris.
-
-nxcomp-1.3.0-11
-
-- Given option in configure to specify what needs to be built
-  statically:
-
-  --with-static-png     enable static linking of PNG library
-  --with-static-jpeg    enable static linking of JPEG library
-  --with-static-z       enable static linking of Z library
-
-nxcomp-1.3.0-10
-
-- Fixed a problem in saving of persistent cache on big-endian
-  machines.
-
-nxcomp-1.3.0-9
-
-- Testing with different settings to check if it's possible to
-  increase the performances under Windows.
-
-- Solved a problem in parsing of options that prevented proxy
-  to connect to a remote session running at port offset 0.
-
-- Fixed two warnings compiling on Solaris.
-
-- Changed configure.in to first check for nx-X11 includes
-  and libraries. Added "/usr/openwin/bin/makedepend" to path
-  searched for the executable.
-
-nxcomp-1.3.0-8
-
-- Small cleanup in configure.in and files modified by Gregorz
-  Kryza to add support for Solaris.
-
-- A new configure script has been generated using autoconf-2.57-3.
-
-nxcomp-1.3.0-7
-
-- Added support for detection of Solaris in configure script.
-  Now Makefile.in uses ranlib instead of ar.
-
-- Small changes in source and header files to support Solaris.
-
-nxcomp-1.3.0-4
-
-- Corrected a bug that could cause priority on proxy and channels 
-  to be not taken in account at the time proxy tries to determine 
-  if it's time to flush the proxy link.
-
-- Better implementation of abort split notification by X server
-  proxy to its remote peer. The new implementation doesn't
-  need to set a timeout and permits notifications to be received
-  earlier.
-
-- Improved support for 'tainting' XSync() messages coming from 
-  X clients in single application mode. Now a X_GetInputFocus
-  is sent to the real X server any n such messages received by
-  proxy. 
-
-- Included support for 15 bpp displays. It seems that handling
-  them as 16 bpp it's OK.
diff --git a/nxcomp/README b/nxcomp/README
deleted file mode 100644
index f35cce6b5..000000000
--- a/nxcomp/README
+++ /dev/null
@@ -1,21 +0,0 @@
-README
-------
-
-Building
---------
-
-1. To compile:
-
-   > tar zxvf nxcomp-X.Y.Z-N.tar.gz
-   > cd nxcomp
-   > ./configure
-   > make
-
-   You'll have to run gmake under Solaris.
-
-2. The 'make install' target is not currently supported
-   in the Makefile, but it should be simple to fix.
-
-You need at least nxproxy and nxagent packages to enjoy this code. Check the
-NoMachine website at http://www.nomachine.com to get the latest release.
-
diff --git a/nxcomp/README-IPAQ b/nxcomp/README-IPAQ
deleted file mode 100644
index f9418635c..000000000
--- a/nxcomp/README-IPAQ
+++ /dev/null
@@ -1,21 +0,0 @@
-README-IPAQ
------------
-
-1. Install a cross-compiler for ARM. You can find detailed
-   informations at:
-
-   http://www.ailis.de/~k/knowledge/crosscompiling/toolchain.php
-
-   There are also binaries needed to install the cross-compiler.
-
-2. Configure and compile libXcomp using:
-
-   $ ./configure --with-ipaq
-   $ make
-
-   After compilation type:
-
-   $ arm-linux-strip libXcomp.*
-
-3. Remember that you also need nxproxy to actually run your NX X
-   session.
diff --git a/nxcompext/CHANGELOG b/nxcompext/CHANGELOG
deleted file mode 100644
index 941e9b411..000000000
--- a/nxcompext/CHANGELOG
+++ /dev/null
@@ -1,806 +0,0 @@
-ChangeLog:
-
-nxcompext-3.5.0-1
-
-- Opened the 3.5.0 branch based on nxcompext-3.4.0-1.
-
-- Updated copyright to year 2011. 
-
-nxcompext-3.4.0-1
-
-- Opened the 3.4.0 branch based on nxcompext-3.3.0-4.
-
-- Updated version number.
-
-- Updated copyright to year 2009.
-
-nxcompext-3.3.0-4
-
-- Fixed TR03G02199. The color palette allocated for encoding an image
-  having 256 colors or less was not freed.
-
-nxcompext-3.3.0-3
-
-- Now setting the correct event serial number when sending collect
-  notifies back.
-
-nxcompext-3.3.0-2
-
-- Updated VERSION.
-
-nxcompext-3.3.0-1
-
-- Opened the 3.3.0 branch based on nxcompext-3.2.0-1.
-
-nxcompext-3.2.0-1
-
-- Opened the 3.2.0 branch based on nxcompext-3.1.0-2.
-
-nxcompext-3.1.0-2
-
-- Updated file VERSION to match the current release version.
-
-nxcompext-3.1.0-1
-
-- Opened the 3.1.0 branch based on nxcompext-3.0.0-18.
-
-nxcompext-3.0.0-18
-
-- Removed the remaining debug output.
-
-nxcompext-3.0.0-17
-
-- Changed the copyright notices at the beginning of the files that
-  were referring to NXPROXY to refer to NXCOMPEXT.
-
-nxcompext-3.0.0-16
-
-- Handle the reply failure in NXGetShmemParameters().
-
-nxcompext-3.0.0-15
-
-- Separated the functionalities made available by NXQueryDisplay()
-  in three distinct functions:
-
-  NXDisplayReadable()  Query the number of bytes readable from
-                       the display connection.
-
-  NXDisplayFlushable() Query the number of the outstanding bytes
-                       to flush to the display connection.
-
-  NXDisplayCongestion() Return a value between 0 and 9 indicating
-                        the congestion level of the NX transport.
-
-- Renamed NXQueryDisplayError() to NXDisplayError().
-
-nxcompext-3.0.0-14
-
-- Removed support for Rdp, Tight and Hextile packed images encod-
-  ing since they have been made obsolete by the new NX server.
-
-- Changed the copyright attribution from Medialogic to NoMachine.
-
-nxcompext-3.0.0-13
-
-- Allocate 1024 additional bytes for the Jpeg compression, instead
-  of 512, to avoid failures on very tiny images.
-
-- Removed support for the special *PNG_JPEG* pack method.
-
-nxcompext-3.0.0-12
-
-- Implemented the NXEncodeBitmap() method. This is a very simple
-  encoder removing the 4th byte in 32 bits-per-plane images. For
-  the other pixmap depths it simply returns a pointer to the orig-
-  inal image data, saving the copy. This encoding is intended to
-  better leverage the stream compression on low bandwidth links.
-
-- Removed the quality parameter from the RGB/RLE encoding function.
-
-nxcompext-3.0.0-11
-
-- Removed the additional parameter in the call to NXTransFlush().
-
-nxcompext-3.0.0-10
-
-- Moved the _NXRDPGlyph and _NXRDPText declarations from NXlib.h
-  to NXproto.h to force fields to be CARD32.
-
-- Fixed a typo in NXSetDisplayBuffer() that could cause a double
-  free.
-
-- Fixed a compilation error with old GCC versions.
-
-- Removed the warning issued on AMD64 when compiling with the logs
-  enabled.
-
-nxcompext-3.0.0-9
-
-- Added the NXDisplayCongestion query type to NXQueryDisplay(). It
-  returns a value between 0 and 9, with 9 meaning that the link is
-  congested and no further data can be sent.
-
-- Added the NXSetDisplayBuffer() function. It allows the caller to
-  set the display output buffer size at runtime.
-
-- Removed the congestion and synchronization callbacks.
-
-nxcompext-3.0.0-8
-
-- Removed the warnings issued when purging the collected data at
-  display reset.
-
-nxcompext-3.0.0-7
-
-- Added the NXSetDisplayWriteHandler() interface. The function
-  registers a callback that will be invoked every time more data
-  is written to the display socket.
-
-nxcompext-3.0.0-6
-
-- Made NXQueryDisplay() take into account the bytes in the display
-  buffer when queried for the bytes flushable.
-
-nxcompext-3.0.0-5
-
-- Added file COPYING.
-
-nxcompext-3.0.0-4
-
-- Updated copyright notices to the current year.
-
-nxcompext-3.0.0-3
-
-- Imported changes up to nxcompext-2.1.0-4.
-
-- Fixed TR12D01564. Changed configure script to build library with
-  -fPIC option.
-
-- Added 256 byte to the size of Jpeg destination buffer. 
-
-nxcompext-3.0.0-2
-
-- Updated the file VERSION.
-
-nxcompext-3.0.0-1
-
-- Opened the 3.0.0 branch based on nxcompext-2.0.0-33.
-
-nxcompext-2.0.0-33
-
-- Placed the inclusion of jpeglib.h after the X includes to fix a
-  possible compilation error.
-
-nxcompext-2.0.0-32
-
-- Avoid to copy the data to the scratch buffer and yield the task
-  of padding the output to _XSend() in the NXPutPackedImage(), NX-
-  SetUnpackAlpha() and NXSetUnpackColormap() requests.
-
-- Added support for the RLE pack method.
-
-nxcompext-2.0.0-31
-
-- The X_NXSetUnpackColormap and X_NXSetUnpackAlpha now carry their
-  data in compressed form. The alpha data is compressed using the
-  ZLIB RLE encoding, while the colormap data is compressed using
-  the default ZLIB deflate.
-
-- Created new message structures to handle the compatibility with
-  the old proxy versions. When connected to an old proxy version
-  the agent should use the NXSetUnpackColormapCompat() and NXSet-
-  UnpackAlpha() interfaces.
-
-nxcompext-2.0.0-30
-
-- Removed the unfriendly warning printed if a client tried to reset
-  the library multiple times.
-
-nxcompext-2.0.0-29
-
-- Made possible to compile even if makedepend is not found.
-
-nxcompext-2.0.0-28
-
-- Added the NXSetDisplaySynchronizationHandler() interface. The NX
-  transport will use the callback to report when the agent can use
-  the available bandwidth to synchronize the X objects that are
-  corrupted or incomplete.
-
-- Bytes from 14 to 24 in the NXGetControlParameters() reply report,
-  respectively, the frame timeout, the ping timeout, the preferred
-  image split mode and the split size threshold.
-
-nxcompext-2.0.0-27
-
-- Changed the image cleanup functions and the Png and Jpeg encoders
-  to be independent from the host endianess.
-
-- Enabled again the image cleanup on big endian machines.
-
-nxcompext-2.0.0-26
-
-- Added the NXAbortSplit() request.
-
-- Added information about the size of the shared memory segment used
-  by the remote proxy in the NXGetShmemParameters() reply.
-
-nxcompext-2.0.0-25
-
-- Renamed the NXGetSplitResource() and NXGetUnpackResource() utili-
-  ties to NXAllocSplit() and NXAllocUnpack(). They can be called
-  with a NXAnyResource parameter to get the first available id or
-  requre a specific resource. From this version the resource must
-  be explicitly reserved. NXFreeUnpack() and NXFreeSplit() check
-  if the resource was allocated and don't do anything if it is not
-  the case. NXAllocSplit() and NXAllocUnpack() return NXNoResource
-  if the resource can't be reserved.
-
-nxcompext-2.0.0-24
-
-- NXFlushDisplay() now verifies whether the XlibDisplayWriting flag
-  is set before flushing the display buffer. in this case, it only
-  flushes the NX link.
-
-nxcompext-2.0.0-23
-
-- Implemented a move-to-front strategy for the image cache, to mi-
-  nimize the number of lookups.
-
-- Fixed the problems imtroduced by the new cache implementation by
-  modifying the memory allocation routines in Jpeg.c and Pgn.c.
-
-- Temporarily fixed the cleanup problems on big-endian machines by
-  skipping the operation.
-
-- Added a NXSetDisplayStatisticsHandler() to let the agent include
-  arbitrary data in the transport statistics. The parameter is a
-  pointer to a pointer to a null terminated string. The pointer is
-  set at the time the handler is registered. The pointed string can
-  be filled by the agent with its statistics data.
-
-nxcompext-2.0.0-22
-
-- The NXCacheFindImage() returns a pointer to the checksum, if the
-  image is found.
-
-- The image cache uses the data passed to NXCacheAddImage() instead
-  of making a copy.
-
-- The Z stream used by the RGB encoder is allocated at initializat-
-  ion and freed at reset.
-
-nxcompext-2.0.0-21
-
-- Removed the reliance on the local byte order in the image cleanup
-  functions.
-
-nxcompext-2.0.0-20
-
-- Added the NXFinishSplit() request. It forces the proxy to comple-
-  tely transfer all the split messages for the given resource, and
-  then notify the agent.
-
-nxcompext-2.0.0-19
-
-- Enabled again the cleanup of images.
-
-- Updated to comply with the new NXTransFlush() interface.
-
-nxcompext-2.0.0-18
-
-- Moved all the declarations in Rgb.c at the beginning of the block
-  to avoid the possible compilation errors with old compilers.
-
-nxcompext-2.0.0-17
-
-- Added a new RGB image encoder. For now the encoder uses a static
-  Z stream to compress the image data in the destination buffer and
-  allows the agent to use the simplest encoding by still separating
-  the alpha channel from the image data. The new encoder can be the
-  the base for implementing color reduction by dithering or a color-
-  mapped translation of the image similar to PNG, but without the
-  PNG overhead and with the colormap being sent to the client using
-  the NXSetUnpackColormap() opcode.
-
-- Created a new NXCleanImage() function that takes a XImage pointer
-  and uses either the CleanXYImage() or the CleanZImage() routines
-  to cleanup the padding bits.
-
-nxcompext-2.0.0-16
-
-- Added a parameter to NXFlushDisplay() to specify what needs to be
-  flushed. The parameter can be one the following values, defined
-  in NXvars.h:
-
-  NXFlushBuffer   Only the Xlib buffer is to be flushed.
-
-  NXFlushLink     Flush both the Xlib buffer and any pending
-                  data encoded by the NX transport.
-
-  NXFlushIdle     Inform the NX transport that the agent is
-                  idle. This will let the NX transport encode
-                  more low-priority data, and then flush the
-                  link.
-
-- Ensured that the padding bytes are cleaned when creating a new
-  PNG image. It seems that some images are still missed. This is
-  to be investigated.
-
-nxcompext-2.0.0-15
-
-- Ensured that the packed image cache is recreated only on a size
-  change.
-
-nxcompext-2.0.0-14
-
-- Updated to get the karma delay field from the X_NXGetControlPara-
-  meters reply.
-
-nxcompext-2.0.0-13
-
-- Added the NXSetDisplayPolicy() and NXSetDisplayFlushHandler() in-
-  terfaces. The second function registers a callback that will be
-  invoked by the NX transport when the number of bytes encoded by
-  the proxy exceeds the threshold set for the scheduled write.
-
-- Added the NXFlushDisplay() and NXQueryDisplay() interfaces. They
-  are used to hide the corresponding NX transport functions to the
-  application. NXQueryDisplay() can be called with the NXDisplay-
-  Flushable or NXDisplayReadable parameters, to get, repectively,
-  the number of bytes that are queued to the NX transport and the
-  number of bytes that is possible to read.
-
-- Included the remote proxy version in the NXGetControlParameter()
-  reply.
-
-nxcompext-2.0.0-12
-
-- Added the NXGetSplitResource() and NXGetUnpackResource utilities.
-  These can be used by the client to find out the first unused id
-  available for a split or unpack operation.
-
-- Added the NXFreeSplit() request function. It makes the resource
-  available for the next operation and tells the proxy to destroy
-  all the storage associated to the split.
-
-- Renamed the NXNumberOfConnections constant to NXNumberOfResources.
-
-nxcompext-2.0.0-11
-
-- Changed NXForceDisplayError() to also shut down the NX transport
-  by calling NXTransClose().
-
-- Updated to comply with the new NX function prototypes introduced
-  in nxcomp-2.0.0-31.
-
-nxcompext-2.0.0-10
-
-- NXQueryDisplayError() now checks the predicate function only if
-  the I/O error was not encountered already.
-
-nxcompext-2.0.0-9
-
-- Added the NXSetDisplayErrorPredicate(), NXSetDisplayBlockHand-
-  ler(), NXSetDisplayCongestionHandler(), NXSetLostSequenceHand-
-  ler() interfaces to let the user set the values used internal-
-  ly. All functions return the previous handler. See ChangeLog
-  in nx-X11-2.0.0-16 and nx-X11-2.0.0-17.
-
-- Moved all the internal variables shared between Xlib, nxcompext
-  and the X server in nxcomp. Declarations and function prototypes
-  moved to NXvars.h.
-
-- Some name changes. In particular the NXContinueOnDisplayError()
-  function iss renamed NXHandleDisplayError() and NXDisplayError()
-  is now renamed NXQueryDisplayError(). To verify if the display
-  is valid, NXQueryDisplayError() will now call the _NXDisplayEr-
-  rorPredicate function, or, if the predicate function is not set,
-  will simply check the value of the XlibDisplayIOError flag.
-
-- Removed the NXGetCleanupParameters() and NXGetImageParameters()
-  interfaces and the remaining references to the unused display
-  buffer and image cleanup functions.
-
-- Updated the NoMachine copyright notice to year 2006.
-
-nxcompext-2.0.0-8
-
-- Removed the unused screen parameter from XSetUnpackGeometry().
-
-- NXSetUnpackGeometry() now fails if no visual is provided.
-
-nxcompext-2.0.0-7
-
-- Changed the LICENSE file to state that the software is only made
-  available under the version 2 of the GPL.
-
-- Removed the misplaced DXPC copyright notices from the license.
-  They were copied from NXCOMP but they don't apply in any way to
-  NXCOMPEXT.
-
-nxcompext-2.0.0-6
-
-- Added the NXSetCacheParameters() request. It tells to the local
-  proxy how to handle the X requests, namely if the next requests
-  have to be stored in the memory cache, split in smal data chunks,
-  and in the case of images, saved on disk in the persistent image
-  cache. The request will affect all X messages, including plain
-  and packed images. It can be used to tell the proxy to discard
-  images coming from some selected operations, like GLX or XVideo.
-
-nxcompext-2.0.0-5
-
-- Added the NXGetFontParameters() request and reply. If the proxy
-  has been configured accordingly, the request returns the X font
-  path that can be set by the agent to tunnel the font server con-
-  nections through the NX link.
-
-nxcompext-2.0.0-4
-
-- Initial work on font server tunneling.
-
-nxcompext-2.0.0-3
-
-- Renamed the NXSetExposeEvents request to NXSetExposeParameters.
-
-nxcompext-2.0.0-2
-
-- Modified the configure and the makefiles to support the Cygwin
-  environment.
-
-- Renamed Png.h to Pgn.h to avoid name clashes on Windows.
-
-- The distclean target now removes the autom4te.cache directory.
-
-nxcompext-2.0.0-1
-
-- Opened the 2.0.0 branch based on nxcompext-1.5.0-20.
-
-nxcompext-1.5.0-20
-
-- Removed the code installing a SIGSEGV handler before trying to
-  clean an image in NXCleanImageInPlace().
-
-nxcompext-1.5.0-19
-
-- Added the NXUnsetLibraryPath() function to specify the behaviour
-  of the Popen() in the X server. If the _NXUnsetLibraryPath flag
-  is set, the Popen() will remove the LD_LIBRARY_PATH variable from
-  the environment before running the child process. This will cause
-  the X server to run the process (for example the keyboard initia-
-  lization utilities) by using the native system libraries, instead
-  of the libraries shipped with the NX environment.
-
-nxcompext-1.5.0-18
-
-- Moved the declarations of _NXEnable* and related structures from
-  Xlibint.h to NXlibint.h.  
-
-- Use the include files from nx-X11 if the nx-X11/include directory
-  is found. The previous configure checked the presence of nx-X11/
-  exports/include, that might not be built at the time this library
-  is compiled.
-
-nxcompext-1.5.0-17
-
-- Added the -fPIC GCC flag when compiling on AMD64 architectures.
-
-- Removed all warnings when compiling with GCC4.
-
-- Small changes to configure.in to have specific CFLAGS.
-
-- Created a new configure using autoconf 2.59.
-
-nxcompext-1.5.0-16
-
-- Added the 'mode' field in the NXStartSplit() request. It determi-
-  nes the strategy that the proxy will adopt to handle the image.
-  If set to 'eager', the proxy will only split the messages whose
-  size exceeds the split threshold (the threshold can be found in
-  the NXGetControlParameters() reply). If mode is set to lazy, the
-  proxy will split any image that it is not able to find in its
-  cache.
-
-  The opcode and the two available modes are defined in NXproto.h,
-  currently:
-
-  #define NXSplitModeDefault  0
-  #define NXSplitModeEager    1
-  #define NXSplitModeLazy     2
-
-- All requests related to image streaming now carry a 'resource' id.
-  The id is currently ignored by the proxy in the case of NXCommit-
-  Split() requests.
-
-nxcompext-1.5.0-15
-
-- Removed the NXSync() and NXKarma() operations, not used anymore
-  by the NX agents.
-
-- Updated to comply with changes occurred in the numbering of the
-  notification events and in the interface to the image streaming
-  functions.
-
-nxcompext-1.5.0-14
-
-- Accounted for the missing xoffset field in clean-up of XYPixmaps.
-
-nxcompext-1.5.0-13
-
-- Added a 'commit' field in NXCommitSplit(). When zero, the remote
-  proxy will remove the message from the split store, without send-
-  ing the recomposed image to the X server.
-
-nxcompext-1.5.0-12
-
-- Added the NXContinueOnDisplayError() function to specify the be-
-  haviour of the Xlib I/O error handler. If the flag is set to true,
-  Xlib will simply return, instead of quitting the program. This
-  leaves to the application the responsibility of checking the sta-
-  te of the XlibDisplayIOError flag.
-
-- Changed NXDisplayIsValid() to NXDisplayError() and inverted the
-  logic. Now the function returns true if the display pointer is
-  NULL or the XlibDisplayIOError flag is set.
-
-- Added the NXForceDisplayError() function, to shutdown the display
-  descriptor and force Xlib to set the I/O error flag.
-
-nxcompext-1.5.0-11
-
-- Added -I../nx-X11/exports/include to CCINCLUDES in Makefile.in.
-
-nxcompext-1.5.0-10
-
-- Added FindLSB() to replace ffs() that may be not present on some
-  systems.
-
-- Some cosmetic changes.
-
-nxcompext-1.5.0-9
-
-- Fixed a printf() that prevented the code to compile if TEST was
-  enabled.
-
-nxcompext-1.5.0-8
-
-- Implemented the NXLib interface for asynchronous handling of the
-  XGetInputFocus requests and replies.
-
-nxcompext-1.5.0-7
-
-- Removed the _NXFlushSize parameter. New agents run the NX trans-
-  port in-process, so we don't get any benefit from increasing the
-  display buffer size.
-
-nxcompext-1.5.0-6
-
-- Added a NXDisplayIsValid() to check that the display is not NULL
-  and that the descriptor was not shut down after an IOError. The
-  reason a function is needed for this is that the flags field is
-  only in Xlibint and it is not visible to Xlib applications.
-
-nxcompext-1.5.0-5
-
-- Added the NXGetCollect*Resource utility functions, returning the
-  first available small integer resource id that can be used in a
-  subsequent collect request.
-
-nxcompext-1.5.0-4
-
-- Added the NXNumberOfConnections constant.
-
-nxcompext-1.5.0-3
-
-- Implemented the NXLib interface for the asynchronous handling of
-  the XGrabPointer requests and replies.
-
-- Solved an error in image cleaning that prevented the 8 bits-per-
-  pixel images to be completely cleaned. Due to the bug, only half
-  of the total lines were cleaned.
-
-- Removed a bug that prevented the cleaning of XYPixmaps images of
-  bitmap unit 32 and byte order LSB.
-
-- Renamed the NXImageCache variables to show they are global. They
-  are currently used in the nxagent code.
-
-nxcompext-1.5.0-2
-
-- Changed VERSION file.
-
-nxcompext-1.5.0-1
-
-- Opened the 1.5.0 branch.
-
-nxcompext-1.4.1-1
-
-- Removed the configure option --with-static. There are two options
-  now, --with-static-png and --with-static-jpeg, to offer a greater
-  degree of control on the resulting library.
-
-- This version differs from the 1.4.0-3-KRY1 in the way that the con-
-  figure script is generated by GNU Autoconf 2.57, the same version
-  used for nxcomp.
-
-- Opened the 1.4.1 branch.
-
-nxcompext-1.4.0-3
-
-- Updated the VERSION file to reflect the 1.4.0 status.
-
-nxcompext-1.4.0-2
-
-- Imported changes from the latest 1.3.2 development branch.
-
-- The 1.4.0 branch already had a 1.4.0-1 version. The changes from
-  the 1.4.0-1 were up to date with the 1.3.2-2 version.
-
-nxcompext-1.3.2-6
-
-- Fixed problem with icons in KDE and Mozilla on SPARC Solaris. The
-  problem was related to cleaning of one-bit XYPixmaps on big-endian
-  hosts, where shift of the cleaning mask executed in the wrong di-
-  rection.
-
-nxcompext-1.3.2-5
-
-- Changes in Clean.c to compile on Solaris.
-
-nxcompext-1.3.2-4
-
-- Fixed a bug in clean image procedures for 1bit XYPixmaps. The bug
-  caused Mozilla to trash some transparent icons in web pages and
-  the toolbar.
-
-- Added cleaning of the padding bytes at the end of the data chunk
-  inside XImage structure
-
-- Implemented handling of SIGSEGV during cleanup in case of static
-  data.
-
-- Moved image cleanup and masking code in new Clean.c and Mask.c
-  sources.
-
-- Corrected few typos in NXCollectImage code.
-
-nxcompext-1.3.2-2
-
-- Imported 1.4.0-1 changes from the 1.4.0 development branch.
-
-- Modified NXAllocColors to handle errors generated allocating
-  each requested color. A per-color result code is now returned 
-  to the caller.
-
-- Code cleanup in Png.h and Png.c.
-
-nxcompext-1.3.2-1
-
-- Opened the 1.3.2 branch.
-
-nxcompext-1.3.1-2
-
-- Removed the underline characters and added a colon in the
-  title of this ChangeLog to fully comply with format used in
-  the release notices.
-
-nxcompext-1.3.1-1
-
-- Opened the 1.3.1 branch.
-
-nxcompext-1.3.0-18
-
-- Added the _NXLostSequenceHandler function to let NX agents
-  suppress the error message and modify the default Xlib
-  behaviour when out-of-order sequence numbers are received.
-  Pointer to function is assigned to _NXLostSequenceFunction
-  in XlibInt.c.
-
-- Original output buffer size in stock XFree86 is 2048. We try
-  to reduce context switches and help stream compression by
-  increasing the maximum size of the buffer 8192. _NXFlushSize
-  determines when the display buffer is actually flushed. It is
-  set by default to 4096 in XlibInt.c and set to 0 to use the
-  maximum available size at the time NXGetControlParameters()
-  is called.
-
-nxcompext-1.3.0-17
-
-- In handling of asynchronous GetProperty replies a warning
-  message was printed in session log when a null property was
-  stored in the state structure. This message is now printed
-  only if TEST is defined.
-
-nxcompext-1.3.0-16
-
-- Added asynchronous handling of GetProperty request and reply
-  by means of the NXCollectProperty and NXGetCollectedProperty
-  requests and the NXCollectPropertyNotify event.
-
-nxcompext-1.3.0-15
-
-- Added 4 new fields to the X_NXGetControlParameters reply.
-
-nxcompext-1.3.0-14
-
-- Added request X_NXFreeUnpack to free the resources allocated
-  by the remote proxy to unpack images for the given agent's
-  client
-
-nxcompext-1.3.0-13
-
-- Modified the following requests to carry the id of the
-  agent's client in the field resource:
-
-  - X_NXSetUnpackGeometry
-  - X_NXSetUnpackColormap
-  - X_NXSetUnpackAlpha
-  - X_NXPutPackedImage
-
-nxcompext-1.3.0-11
-
-- Modified the MIT-SHM initialization procedure to always send
-  all the 3 protocol requests also in the case of early failures.
-
-nxcompext-1.3.0-10
-
-- Added handling of X_NXSetUnpackAlpha request.
-
-- It has been made possible to send both X_NXSetUnpackColormap
-  and X_NXSetUnpackAlpha messages with 0 entries to temporarily
-  disable use of the colormap or the alpha channel and free the
-  resources allocated by the remote proxy.
-
-nxcompext-1.3.0-9
-
-- Solved a compatibility problem when mixing proxy versions
-  1.2.2 and 1.3.0 due to the missing X_NXGetShmemParameters
-  request.
-
-nxcompext-1.3.0-7
-
-- Reduced the number of requests needed to setup the shared
-  segment at X server proxy from 4 to 3.
-
-- Small changes to the shared memory interface to support
-  path X agent to X client proxy.
-
-nxcompext-1.3.0-6
-
-- Implemented initial support for MIT-SHM extension in the
-  network path between the X server proxy and the real X
-  server.
-
-- Configure script now checks for the FreeBSD environment.
-
-- New configure script generated using autoconf-2.57-3.
-
-- Removed the XFree86 CCDEFINES from Makefile.in.
-
-nxcompext-1.3.0-5
-
-- Cosmetic changes.
-
-- Started to convert configure.in to the new layout adopted
-  for nxcomp.
-
-- Created file CHANGELOG.
-
-nxcompext-1.3.0-4
-
-- More fixes in image clean-up.
-
-nxcompext-1.3.0-3
-
-- Many fixes in image clean-up functions to handle differences
-  in endianess between client and X server.
-
-nxcompext-1.3.0-2
-
-- Modified configure.in to compile under Solaris.
-
-nxcompext-1.3.0-1
-
-- First 1.3.0 version based on nxcompext-1.2.2-12.
-
diff --git a/nxcompext/README b/nxcompext/README
deleted file mode 100644
index 39648e76b..000000000
--- a/nxcompext/README
+++ /dev/null
@@ -1,15 +0,0 @@
-README
-------
-
-1. To compile:
-
-   > tar zxvf nxcompext-X.Y.Z-N.tar.gz
-   > cd nxcompext
-   > ./configure
-   > make
-
-   You'll have to run gmake under Solaris.
-
-2. The 'make install' target is not currently supported
-   in the Makefile, but it should be simple to fix.
-
diff --git a/nxcompshad/CHANGELOG b/nxcompshad/CHANGELOG
deleted file mode 100644
index 3472a4afe..000000000
--- a/nxcompshad/CHANGELOG
+++ /dev/null
@@ -1,404 +0,0 @@
-ChangeLog:
-
-nxcompshad-3.5.0-2
-
-- Fixed TR03G02189. Now key combinations involving the Shift keys
-  are recognized correctly.
-
-nxcompshad-3.5.0-1
-
-- Opened the 3.5.0 branch based on nxcompshad-3.4.0-3.
-
-- Updated copyright to year 2011.
-
-nxcompshad-3.4.0-3
-
-- Updated copyright to year 2010.
-
-nxcompshad-3.4.0-2
-
-- Fixed TR08G02256. Now the Shadow session is shown correctly with
-  MIT-SHM extension disabled.
-
-- Improved updateShadowFrameBuffer() and ~Poller() functions.
-
-- Avoided memory leak.
-
-nxcompshad-3.4.0-1
-
-- Opened the 3.4.0 branch based on nxcompshad-3.3.0-3.
-
-- Updated version number.
-
-- Updated copyright to year 2009.
-
-- Improved error messages logging in case of initialization failures.
-
-nxcompshad-3.3.0-3
-
-- Fixed TR01G02158. Keymap initialization could be incorrect because
-  of a type mismatch on 64 bit platforms.
-
-nxcompshad-3.3.0-2
-
-- Updated VERSION.
-
-nxcompshad-3.3.0-1
-
-- Opened the 3.3.0 branch based on nxcompshad-3.2.0-3.
-
-nxcompshad-3.2.0-3
-
-- Improved keycode translation.
-
-nxcompshad-3.2.0-2
-
-- Solved a problem when sending fake modifier events.
-
-- Added support for keyboard events handling for the web player.
-
-- Changed keycodes translation for Solaris keyboard.
-
-- Corrected a problem for keycodes translation from Solaris keyboard.
-
-- Fixed TR02F02001. In shadow session the shadower's keyboard layout
-  could be wrong. Now keycodes are correctly translated if master and
-  shadow keyboards have different layouts.
-
-- Added NXShadowGetScreenSize() and NXShadowSetScreenSize() functions,
-  so that the shadow session can handle correctly the resize of the
-  master session window.
-
-- Solved a compilation problem on GCC 4.3.
-
-nxcompshad-3.2.0-1
-
-- Opened the 3.2.0 branch based on nxcompshad-3.1.0-2.
-
-nxcompshad-3.1.0-2
-
-- Updated file VERSION to match the current release version.
-
-nxcompshad-3.1.0-1
-
-- Opened the 3.1.0 branch based on nxcompshad-3.0.0-19.
-
-nxcompshad-3.0.0-19
-
-- Skip initialization of damage extension if it was already disabled.
-
-nxcompshad-3.0.0-18
-
-- The poller destructor checks if the damage extension is in use.
-
-- Small changes to the function getting the screen content in the case
-  damage is not in use.
-
-nxcompshad-3.0.0-17
-
-- Cleanup of some log messages.
-
-nxcompshad-3.0.0-16
-
-- Disabled some log message in the functions initializing the poller.
-
-nxcompshad-3.0.0-15
-
-- Before calling XTest functions, it is checked if the connection to
-  master X server has been initialized.
-
-nxcompshad-3.0.0-14
-
-- After the shm segment is created, its mode is changed and it is
-  marked for destroying. A check on the number of attaches is done.
-
-nxcompshad-3.0.0-13
-
-- Creating the shm segment even if the uid of master X server can't be
-  retrieved.
-
-- Fixed reallocation of update region.
-
-- Checking if the master X server provides XTest extension.
-
-nxcompshad-3.0.0-12
-
-- Fixed a compiler warning on AMD64 platform.
-
-- Changed configure script to add -fPIC option.
-
-- Fixed a mismatch in UpdateManager destructor.
-
-nxcompshad-3.0.0-11
-
-- Fixed the function setting the uid of shm segment.
-
-- Sync with the master X server before marking the shm segment to be
-  destroyed.
-
-nxcompshad-3.0.0-10
-
-- Setting the shm segments as readable only by the master X server
-  process.
-
-- Mark shm segments to be destroyed when the last process detach.
-
-- Enabled keycode translation in order to allow keyboards of different
-  models to work.
-
-nxcompshad-3.0.0-9
-
-- Changed the LICENSE file to state that the software is only made
-  available under the version 2 of the GPL.
-
-- Added file COPYING.
-
-- Changes to translate keycodes between different keyboard types. The
-  keycodes are translated through the keysym.
-
-- Changes to convert a Mode_switch key to ISO_Level3_Shift if it is
-  needed.
-
-nxcompshad-3.0.0-8
-
-- Added interface function NXShadowDisableShm disabling the use of
-  MIT-SHM extension.
-
-- Added interface function NXShadowDisableDamage disabling the use of
-  DAMAGE extension.
-
-- Added interface function NXShadowSetDisplayUid setting the uid of
-  shadowed X server
-
-- Changed the owner of shared memory segments to the uid of the sha-
-  dowed X server.
-
-- Fixed logWarning method.
-
-- Moved the code initializing the use of shared memory to shmInit
-  method of X11 Poller.
-
-nxcompshad-3.0.0-7
-
-- Removed the class qualifier in the declaration of destroyUpdate-
-  ManagerRegion().
-
-nxcompshad-3.0.0-6
-
-- Fixed build errors on 64 bit platforms.
-
-- Called XTestGrabControl to override possible grabs of the X server.
-
-nxcompshad-3.0.0-5
-
-- Added some stub members to the Poller class. These are intended to
-  handle keyboard state.
-
-- Changes in the default polling algorithm to disable the line pri-
-  ority persistence.
-
-nxcompshad-3.0.0-4
-
-- If a low layer handling of screen changes is available (DAMAGE in
-  case of X11), polling routine uses it and returns immediately.
-
-- Creating a Damage notify object if the extension is supported.
-
-- DamageNotify events are saved in the update region. After all avail-
-  able events have been handled, the content of screen is retrieved
-  by ShnGetImage requests.
-
-- XDamageSubtract and XSync are done before any event handling.
-
-- Damages are requested as raw rectangles.
-
-- Added Xdamage and Xrandr to required libraries.
-
-- Fixed a problem with some lines not refreshed in shadowing mode.
-
-nxcompshad-3.0.0-3
-
-- Added destroyUpdateManagerRegion() method to UpdateManager class.
-
-- Turned off some log messages.
-
-- Changed configure.in to remove warnings related to deprecated header
-  files and options.
-
-- Changed Makefile.in to remove autom4te.cache dir if the target is
-  'distclean'.
-
-- Removed multi-word file names.
-
-nxcompshad-3.0.0-2
-
-- Changes to get the screen of original display by a ShmGetImage.
-
-- Exit the polling loop if more than 50 ms have elapsed.
-
-nxcompshad-3.0.0-1
-
-- Created nxcompshad based on nxshadow-3.0.0-7.
-
-nxshadow-3.0.0-7
-
-- Deleted files KeyCursorTmp.cpp, scancodes.h, constant.h.
-
-- Renamed NXshadow.h to Shadow.h.
-
-- Merged NXshadowEvent.h with Shadow.h.
-
-- Fixed configure.in, changed Makefile.in to build Xcompshad library,
-  rebuilt configure script.
-
-nxshadow-3.0.0-6
-
-- Implemented a callback mechanism to ask the caller program if screen
-  polling have to be suspended.
-
-nxshadow-3.0.0-5
-
-- Changes to comply with the library name.
-
-- Fixed a bug in CorePoller that could prevent the update of the last
-  line of a rectangle.
-
-nxshadow-3.0.0-4
-
-- Removed some parameters of the NXShadowAddUpdaterDisplay() function.
-
-nxshadow-3.0.0-3
-
-- Updated copyright notices to the current year.
-
-- Code cleanup in KeysCursorTmp.c file.
-
-nxshadow-3.0.0-2
-
-- If master agent uses shared memory extension, the GetImage is rea-
-  lized by XShmGetImage() function.
-
-- Added new parameters to NXShadowAddUpdaterDisplay() function, the
-  depth and bit mask color of the master display.
-
-nxshadow-3.0.0-1
-
-- Opened the nxshadow-3.0.0 branch based on the nxaccess-3.0.0-13.
-
-- Renamed NXaccess.h NXaccessEvent.h and RegionM.h files as NXshadow.h
-  NXshadowEvent.h and Regions.h.
-
-- Modified the Makefile.in file and configure scripts in order to
-  compile the component.
-
-nxaccess-3.0.0-13
-
-- Fixed X11Poller.cpp pre-processing.
-
-nxaccess-3.0.0-12
-
-- Fixed build problems on Solaris.
-
-nxaccess-3.0.0-11
-
-- Added NXShadowUpdateBuffer() function. This function creates the
-  buffer for the polling.
-
-- If the scaline fails, the polling will suspend for 50 ms.
-
-- Added some functions in order to access data member class.
-
-nxaccess-3.0.0-10
-
-- Used XTEST extension to make the shared display create input events.
-
-nxaccess-3.0.0-9
-
-- Added the mouse events.
-
-- Now, it's possible to connect to X server display or agent display,
-  the display's content is captured by GetImage and sent to another
-  display by PutImage.
-
-nxaccess-3.0.0-8
-
-- Added KeysCursorTmp.cpp file.
-
-- Solved a problem with the keys, when the window lost focus the Key-
-  Release events weren't propagated.
-
-nxaccess-3.0.0-7
-
-- Added functions in order to remove issues with some keys combina-
-  tion.
-
-nxaccess-3.0.0-6
-
-- Added functions to simulate keys Ctrl + Alt + Del in order to run
-  the Task Manager application.
-
-- Now nxaccess is able to manage all switches between desktops.
-
-nxaccess-3.0.0-5
-
-- Solved a problem with the cursor shape. After a while, the cursor
-  shape are no more updated.
-
-- Now the cursor is updated only when it changes its shape.
-
-- Removed a dirty lines after screen updates.
-
-- Removed the unused file Keyboard.cpp.
-
-- Added the colorCorrect() macro in NXaccess.h.
-
-- Removed the colorCorrect() function in Updater.cpp.
-
-nxaccess-3.0.0-4
-
-- Renamed some source files and functions conforming them to the name
-  of component.
-
-nxaccess-3.0.0-3
-
-- Removed the parameter of type Display in all methods of the class
-  Poller.
-
-- Print, Break and Pause keys are enabled.
-
-nxaccess-3.0.0-2
-
-- Modified the Makefile.in in order to avoid compiling the executive
-  file.
-
-- Removed the unused file Main.cpp.
-
-- The Windows keys are enabled.
-
-- Synchronized local and remote states of Num_Lock, Caps_Lock and
-  Scroll_Lock.
-
-- Updated the NoMachine copyright notices.
-
-nxaccess-3.0.0-1
-
-- Opened the 3.0.0 branch based on the nxmirror-2.0.0-3.
-
-nxmirror-2.0.0-3
-
-- Added the keyboard events for all layouts.
-
-- The mouse wheel button is enabled.
-
-nxmirror-2.0.0-2
-
-- Completed implementation of the keyboard events only for italian
-  layout.
-
-- Added the mouse events and shape cursor.
-
-nxmirror-2.0.0-1
-
-- Opened the 2.0.0 branch based on the 1.5.0-60.
-
-- Added CHANGELOG.
diff --git a/nxproxy/CHANGELOG b/nxproxy/CHANGELOG
deleted file mode 100644
index e5dff2e4f..000000000
--- a/nxproxy/CHANGELOG
+++ /dev/null
@@ -1,216 +0,0 @@
-ChangeLog:
-
-nxproxy-3.5.0-1
-
-- Opened the 3.5.0 branch based on nxproxy-3.4.0-2.
-
-- Updated copyright to year 2011.
-
-nxproxy-3.4.0-2
-
-- Updated copyright to year 2009.
-
-nxproxy-3.4.0-1
-
-- Opened the 3.4.0 branch based on nxproxy-3.3.0-2.
-
-- Changed version number.
-
-nxproxy-3.3.0-2
-
-- Updated VERSION.
-
-nxproxy-3.3.0-1
-
-- Opened the 3.3.0 branch based on nxproxy-3.2.0-1.
-
-nxproxy-3.2.0-1
-
-- Opened the 3.2.0 branch based on nxproxy-3.1.0-2.
-
-nxproxy-3.1.0-2
-
-- Updated version number.
-
-nxproxy-3.1.0-1
-
-- Opened the 3.1.0 branch based on nxproxy-3.0.0-4.
-
-nxproxy-3.0.0-4
-
-- Added file COPYING.
-
-- Changed the LICENSE file to state that the software is only made
-  available under the version 2 of the GPL.
-
-nxproxy-3.0.0-3
-
-- Updated the copyright notices to year 2007.
-
-nxproxy-3.0.0-2
-
-- Updated the file VERSION.
-
-nxproxy-3.0.0-1
-
-- Opened the 3.0.0 branch based on nxproxy-2.0.0-2.
-
-nxproxy-2.0.0-2
-
-- Updated copyright to year 2006.
-
-nxproxy-2.0.0-1
-
-- Opened the 2.0.0 branch based on nxproxy-1.5.0-10.
-
-nxproxy-1.5.0-10
-
-- Added the JPEG, PNG and Z libraries to the linker when compiling
-  on Cygwin. GCC 3.3.x requires that these libraries are explicitly
-  given while this is not required since GCC 3.4.x.
-
-- Created a new configure using autoconf 2.59.
-
-nxproxy-1.5.0-9
-
-- Removed provision for dynamically loading a different version of
-  the nxcomp library.
-
-nxproxy-1.5.0-8
-
-- Updated to reflect the new naming of the NX transport interfaces.
-
-nxproxy-1.5.0-7
-
-- Modified the Makefile.in to remove the *.out.* files generated by
-  Valgrind when running a 'make clean'.
-
-- Modified the README files and removed files that were outdated.
-
-nxproxy-1.5.0-6
-
-- Removed the NX_FORCE_IDLE_PROXY stubs.
-
-nxproxy-1.5.0-5
-
-- This version has NX_FORCE_IDLE_PROXY undefined, so it should work
-  in a way that is compatible with the old nxproxy.
-
-nxproxy-1.5.0-4
-
-- This software is crafted by default to test the new integration
-  between nxcomp and nxssh. The process will stay idle and will
-  let nxssh create the proxy. Note that the session log will go to
-  'sshlog', not to 'session'. This will have to be fixed in nxcomp
-  in future versions.
-
-- Removed the references to the "bind" functionality that is not
-  used in the current software.
-
-nxproxy-1.5.0-3
-
-- Added a NX_FORCE_IDLE_PROXY. If set, nxproxy will stay idle and
-  will not try to create a nxcomp proxy. This is used for testing
-  the new in-process nxcomp functionalities with the development
-  versions of nxclient and nxssh software.
-
-nxproxy-1.5.0-2
-
-- Small changes to this file.
-
-nxproxy-1.5.0-1
-
-- Opened the 1.5.0 branch.
-
-nxproxy-1.4.1-1
-
-- Opened the 1.4.1 branch.
-
-nxproxy-1.4.0-3
-
-- We were lucky. We found a machine where nxproxy failed exactly
-  in the same way described by multiple users in their reports.
-  The error was the same ('dlopen: win32 line 126') and neither
-  rebasing the Cygwin DLLs or removing all the other Cygwin li-
-  braries worked. So the problem had necessarily to be in a bug-
-  gy Cygwin dlopen() implementation. To solve this I had to make
-  changes to the nxproxy code on Windows, so it links to nxcomp
-  at compile time in the way specified below. As far as I can
-  tell, any other way fails. This seems to be another Cygwin bug:
-  the linker says that everything is OK but then the executable
-  can't be run. Both the Cygwin's bash and the command.com say
-  'Permission denied'.
-
-  LIBS = -L../nxcomp -lstdc++ -Wl,-e,_mainCRTStartup -lXcomp \
-         -lcygipc -static -lpng -static -ljpeg -lz
-
-nxproxy-1.4.0-2
-
-- Added a Binder class invoked when calling proxy with -B option.
-  It would serve as a replacement of the modifications I'm doing
-  in nxssh. The class is just a framework and the implementation
-  is unfinished.
-
-- Solved a potential problem in Main.c with NXExit() being called
-  after the dlclose(). This was unlikely to happen as proxy never
-  returns.
-
-nxproxy-1.4.0-1
-
-- Opened the 1.4.0 branch.
-
-nxproxy-1.3.2-1
-
-- Opened the 1.3.2 branch.
-
-nxproxy-1.3.1-2
-
-- Removed the underline characters and added a colon in the
-  title of this ChangeLog to fully comply with format used in
-  the release notices.
-
-nxproxy-1.3.1-1
-
-- Opened the 1.3.1 branch.
-
-nxproxy-1.3.0-7
-
-- Added a check on the OS version when running on MacOS/X.
-  Versions 10.2 and 10.3 differ in the way names are mangled.
-
-- Fixed error detection on dlsym(). The previous code was not
-  able to correctly identify missing symbols.
-
-nxproxy-1.3.0-6
-
-- Modified configure.in to compile under FreeBSD.
-
-nxproxy-1.3.0-5
-
-- Fixed a (further) compilation problem under Cygwin.
-
-nxproxy-1.3.0-4
-
-- New nxproxy is able to load libXcomp by dlopen() under
-  Cygwin. This simplifies both code in Main.c and the
-  configure.in script.
-
-- Changed configure.in to not link with -mwindows under
-  Cygwin. Linking with -mwindows prevented stderr to be
-  correctly output when running nxproxy on a console.
-
-nxproxy-1.3.0-3
-
-- Changed configure.in to first check for nx-X11 includes
-  and libraries. Added "/usr/openwin/bin/makedepend" to
-  path searched for the executable.
-
-nxproxy-1.3.0-2
-
-- Small cleanup in configure.in. A new configure script has
-  been generated using autoconf-2.57-3.
-
-nxproxy-1.3.0-1
-
-- Updated internal version, so this release tries to load
-  libXcomp version 1.3.0.
diff --git a/nxproxy/README b/nxproxy/README
deleted file mode 100644
index 8f95d9f3f..000000000
--- a/nxproxy/README
+++ /dev/null
@@ -1,14 +0,0 @@
-README
-------
-
-1. To compile:
-
-   > tar zxvf nxproxy-X.Y.Z-N.tar.gz
-   > cd nxproxy
-   > ./configure
-   > make
-
-   You'll have to run gmake under Solaris.
-
-2. The 'make install' target is not currently supported
-   in the Makefile, but it should be simple to fix.
diff --git a/nxproxy/README-IPAQ b/nxproxy/README-IPAQ
deleted file mode 100644
index 7a8a8a958..000000000
--- a/nxproxy/README-IPAQ
+++ /dev/null
@@ -1,27 +0,0 @@
-README-IPAQ
------------
-
-1. Install a cross-compiler for ARM. You can find detailed
-   informations at:
-
-   http://www.ailis.de/~k/knowledge/crosscompiling/toolchain.php
-
-   There are also binaries needed to install the cross-compiler.
-
-2. Configure and compile nxproxy using:
-
-   $ ./configure --with-ipaq
-   $ make
-
-   After compilation type:
-
-   $ arm-linux-strip nxproxy
-
-3. You need libXcomp.so to run nxproxy. Be sure you include the
-   library in your LD_LIBRARY_PATH. For example, you can run:
-
-   > export LD_LIBRARY_PATH $HOME/NX/nxcomp
-   > nxproxy -S localhost:8
-
-4. The package nxscripts contains many examples of NX usage that
-   you can modify to suit your needs.
diff --git a/nxproxy/README-VALGRIND b/nxproxy/README-VALGRIND
deleted file mode 100644
index ce4d513a4..000000000
--- a/nxproxy/README-VALGRIND
+++ /dev/null
@@ -1,39 +0,0 @@
-README-VALGRIND
----------------
-
-You can run nxproxy (and nxcomp) under the supervision of valgrind
-(a very good memory debugger) by wrapping nxproxy in the following
-script:
-
-<snip>
-#!/bin/bash
-
-# Enable core dumps.
-
-ulimit -c unlimited
-
-# Set this to directory where nxproxy is located.
-
-NXPROXY_DIR=~/NX/nxproxy
-
-# Set this to directory where valgrind is located.
-
-VALGRIND_DIR=/usr/local/bin
-
-exec ${VALGRIND_DIR}/valgrind -v --leak-check=yes --leak-resolution=high \
-                              --show-reachable=yes --show-reachable=yes \
-                              --suppressions=${NXPROXY_DIR}/nxproxy.supp \
-                              --num-callers=16 --logfile-fd=2 \
-\
-${NXPROXY_DIR}/nxproxy $1 $2 $3 $4 $5 $6 $7 $8 $9
-<snip>
-
-Run the following commands on your shell, right in the place where
-the nxproxy executable is to be placed in your setup:
-
-$ cat >nxproxy
-<copy paste the previous lines here>
-$ chmod a+x nxproxy
-
-Output of valgrind will go on stderr, that is in session file, if
-run in NX environment.
-- 
cgit v1.2.3


From 40179398d1c4ad3d413bad6f39e23d2edc3067a0 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 5 Jul 2016 10:41:24 +0200
Subject: nxcomp licensing: Move README.on-retroactive-DXPC-license to
 doc/nxcomp/ folder.

---
 doc/nxcomp/README.on-retroactive-DXPC-license | 269 ++++++++++++++++++++++++++
 nxcomp/README.on-retroactive-DXPC-license     | 269 --------------------------
 2 files changed, 269 insertions(+), 269 deletions(-)
 create mode 100644 doc/nxcomp/README.on-retroactive-DXPC-license
 delete mode 100644 nxcomp/README.on-retroactive-DXPC-license

(limited to 'nxcomp')

diff --git a/doc/nxcomp/README.on-retroactive-DXPC-license b/doc/nxcomp/README.on-retroactive-DXPC-license
new file mode 100644
index 000000000..563c82b69
--- /dev/null
+++ b/doc/nxcomp/README.on-retroactive-DXPC-license
@@ -0,0 +1,269 @@
+On DXPC retroactive relicensing as BSD-2-clause
+===============================================
+
+TL;DR; In May 2015, all versions of DXPC released before version 3.8.1 (sometime
+in 2002) have retroactively been re-licensed by all previous maintainers
+of DXPC as BSD-2-clause.
+
+This README file gives an overview of the discussion thread that lead to
+the retroactive re-licensing of DXPC.
+
+For the full discussion, see doc/DXPC_re-licensed_debug_784565.mbox in
+this source project or #784565 on the Debian bug tracker [1].
+
+light+love,
+20150521, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=784565
+
+------------------------------------------------------------------------------
+
+STEP 1
+======
+
+In May 2015, a serious license issue around the nxcomp code shipped in
+this source project was raised and solved on the Debian bug tracker (thanks to
+Francesco Poli and many others): http://bugs.debian.org/784565
+
+"""
+From: "Francesco Poli \(wintermute\)" <invernomuto@paranoici.org>
+To: Debian Bug Tracking System <submit@bugs.debian.org>
+Date: Wed, 06 May 2015 19:35:32 +0200
+
+I noticed that the debian/copyright states:
+
+[...]
+| Parts of this software are derived from DXPC project. These copyright
+| notices apply to original DXPC code:
+|
+|    Redistribution and use in source and binary forms are permitted provided
+|    that the above copyright notice and this paragraph are duplicated in all
+|    such forms.
+|
+|    THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+|    WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+|    MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+|
+|    Copyright (c) 1995,1996 Brian Pane
+|    Copyright (c) 1996,1997 Zachary Vonler and Brian Pane
+|    Copyright (c) 1999 Kevin Vigor and Brian Pane
+|    Copyright (c) 2000,2001 Gian Filippo Pinzari and Brian Pane
+[...]
+
+This license lacks the permission to modify the DXPC code.
+Hence, the original DXPC code does not appear to comply with the
+DFSG. And the nx-libs-lite is in part derived from DXPC code.
+
+This basically means that nx-libs-lite includes parts which are
+non-free (as they are derived from non-modifiable code) and
+are also possibly legally undistributable (as they are non-modifiable,
+but actually modified). The combination with the rest of nx-libs-lite
+(which is GPL-licensed) may also be legally undistributable (since
+the license with no permission to modify is GPL-incompatible).
+
+
+If there's anything I misunderstood, please clarify.
+
+Otherwise, please address this issue as soon as possible.
+The copyright owners for the original DXPC code should be
+contacted and persuaded to re-license under GPL-compatible
+terms.
+"""
+
+The issue has been settled by asking all recent maintainers (i.e.,
+copyright holders) of DXPC, to agree on considering the BSD-2-clause
+license (as introduced in DXPC 3.8.1) retro-actively as the license of
+all pre-3.8.1 DXPC releases.
+
+STEP 2:
+=======
+
+Kevin Vigor, the (at that time being) latest known maintainer of DXPC
+replied back immediately and provided the info given below. He also
+stated that he agrees to applying BSD-2-clause retroactively to all
+pre-3.8.1 releases of DXPC.
+
+"""
+From: Kevin Vigor <kevin@vigor.nu>
+To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+CC: 784565@bugs.debian.org, [...]
+Subject: Re: Bug#784565: nx-libs-lite: parts are derived from non-free code
+
+Hi Mike, et al,
+
+   I am not the original author of dxpc, that being Brian Pane. However,
+   I took over maintenance circa 1999 and am still the primary maintainer
+   (though the project has effectively been dead for most of a decade
+   now).
+
+   As you are aware, when I inherited the code, it was licensed under a
+   variant of the BSD license that did not include the 'with
+   modification' clause. To the best of my recollection, somebody from
+   the FSF contacted me circa 2001 regarding this and as a result,
+   subsequent releases were done under a standard 2-clause BSD license
+   with the modification clause. Again, to the best of my recollection, I
+   contacted Brian about this change and he offered no objection.
+
+   Further, I recall distinctly that NoMachine contacted me and
+   explicitly asked permission before including DXPC code in NX, which I
+   happily granted with no new conditions beyond the BSD license already
+   in play.
+
+   It is possible, though by no means certain, that I could dig up
+   ancient email to corroborate this account if necessary. However, I am
+   more than willing to publicly state that I believe NoMachine's use of
+   DXPC code to be both legal and ethical, and that my intent when
+   changing the license to 2-clause BSD was simply to clarity the
+   existing intent and that it ought therefore be considered retroactive.
+
+   Yours,
+      Kevin Vigor
+
+[...]
+"""
+
+STEP 3:
+-------
+
+We were not able to dig out any recent mail address of Zachary Volner,
+another of the DXPC copyright holders, but a phone number.
+
+On Friday, May 15th, I (Mike Gabriel) called that phone number and left a
+message on - hopefully - Zach's voicebox, asking him to mail me, so I
+could explain everything. He mailed back and later on posted the below
+statement to the Debian BTS, also expressing his agreement to the
+retroactive re-licensing of DXPC.
+
+"""
+Date: Mon, 18 May 2015 10:05:38 -0500
+Subject: Re: Bug#784565: nx-libs-lite: parts are derived from non-free code
+From: Zach Vonler <zvonler@gmail.com>
+To: 784565@bugs.debian.org
+
+On Thu, 14 May 2015 05:55:42 +0000 Mike Gabriel <
+mike.gabriel@das-netzwerkteam.de> wrote:
+
+>
+> TL;DR; So here comes my actual question: are you (Brian Pane, Zachary
+> Vonler, Gian Filippo Pinzari) ok with retroactively regarding
+> pre-3.8.1 code of DXPC (that you probably all worked on at that time)
+> as BSD-2-clause? Are you ok with others having taken or taking the
+> pre-3.8.1 DXPC code and distribute it in a modified form?
+>
+
+
+> A yes from all of you as DXPC copyright holders is essential for the
+> continuation of nx-libs development under a free license. This may
+> also possibly be an issue for NXv4 in case parts of it have been
+> derived from DXPC.
+
+
+Yes, I am fine with considering the license change to be retroactive to
+cover the time I was the maintainer.
+
+I have no objections to others distributing modified versions of that code.
+
+Zach
+"""
+
+STEP 4:
+-------
+
+By 18th May 2015, Brian Pane had not mailed back to us. Hoping he is well
+and alive. Giving my personal gratitude to him for his work on DXPC back
+in the nighties.
+
+However, Kevin found an old archive of the DXPC mailing lists, esp. a
+post by Brian expressing openness to modifications of all DXPC code
+versions.
+
+We refer to this regarding his consent on the re-licensing.
+
+"""
+Date: Mon, 18 May 2015 15:11:42 -0600
+From: Kevin Vigor <kevin@vigor.nu>
+To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>,  784565@bugs.debian.org, Francesco Poli <invernomuto@paranoici.org>
+CC: [...]
+Subject: Re: Bug#784565: nx-libs-lite: parts are derived from non-free code
+
+By the way, poking around the interwebs I find there is an archive of the old DXPC mailing list available at:
+
+http://marc.info/?l=dxpc&r=1&w=2
+
+I think you will find this of particular interest:
+
+
+http://marc.info/?l=dxpc&m=93093790813555&w=2
+
+
+List:       dxpc
+Subject:    Re: future tecnologies
+From:       Brian Pane <brianp () cnet ! com>
+Date:       1999-07-02 16:42:18
+[Download message RAW]
+
+Kevin Vigor <kvigor@eng.ascend.com> wrote:
+> On 01-Jul-99 dxpc@mcfeeley.cc.utexas.edu wrote:
+> > Speaking of licensing, are you putting your 3.8.0 changes to the dxpc
+> > code itself under GPL, or are they going to use the original dxpc's
+> > licensing?
+>
+> No, as you can probably guess, I am no fan of the GPL. For stuff on
+> this level, where my hacking is pretty simple and probably devoid of
+> commercial value, I'll just release my changes to the public domain and
+> give up even a copyright interest in them.
+>
+> Your and Zach's copyrights still stand, of course.
+>
+> I *think* that fact that we use the LZO library and API, but do not
+> directly incorporate the code, allows us to escape the clutch of the GPL
+> virus.
+>
+> btw, is there an original dxpc license? I haven't seen anything but a
+> copyright notice, which to my non-lawyerly mind translates as "free to
+> all the world as is, negotiate with copyright owner if modifying or
+> including in some other product".
+
+The copyright banner in the Readme is all the documentation there's ever
+been.  My intent was to allow _any_ distribution, use, and modification
+of the source, without imposing restrictions on the licensing style of
+any system into which others might incorporate the code.  We probably
+should start stating this clearly in the distributions.
+
+-brian
+
+[prev in list] [next in list] [prev in thread] [next in thread]
+"""
+
+STEP 5:
+-------
+
+Last but not least, Kevin informed us that Gian Filippo Pinzari never
+contributed any code to any of the official DPXC releases. So we assumed
+that his copyrights on the code stem from the time where he - under the
+NoMachine umbrella - worked on the code and should probably be associated
+with the GPL-2 re-licensing of the code later on done by NoMachine
+(which we did in the LICENSE file).
+
+It also appears, that there has been an incongruity between the copyright
+statement in nxcomp/Misc.cpp and nxcomp/LICENSE for Gian Filippo Pinzari.
+We used the copyright years (2000,2003) from nxcomp/Misc.cpp instead of
+those originally given in nxcomp/LICENSE (2000,2006).
+
+"""
+Date: Mon, 18 May 2015 19:16:25 -0600
+From: Kevin Vigor <kevin@vigor.nu>
+To: Francesco Poli <invernomuto@paranoici.org>,
+ Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+CC: 784565@bugs.debian.org, [...]
+Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: nx-libs-lite: parts are derived from non-free code
+
+On 5/18/2015 4:14 PM, Francesco Poli wrote:
+> If it is confirmed that Gian Filippo contributed to the forking of
+> DXPC within the NoMachine project, but not directly to DXPC, then I
+> think that he made his contributions available under the terms of the
+> GPL v2 of the NoMachine project. If this is the case, no feedback
+> should be required from his side.
+I can confirm that Gian Fillippo never contributed directly to DXPC.
+You'll note his name does not appear in the DXPC README, and never has.
+"""
diff --git a/nxcomp/README.on-retroactive-DXPC-license b/nxcomp/README.on-retroactive-DXPC-license
deleted file mode 100644
index 563c82b69..000000000
--- a/nxcomp/README.on-retroactive-DXPC-license
+++ /dev/null
@@ -1,269 +0,0 @@
-On DXPC retroactive relicensing as BSD-2-clause
-===============================================
-
-TL;DR; In May 2015, all versions of DXPC released before version 3.8.1 (sometime
-in 2002) have retroactively been re-licensed by all previous maintainers
-of DXPC as BSD-2-clause.
-
-This README file gives an overview of the discussion thread that lead to
-the retroactive re-licensing of DXPC.
-
-For the full discussion, see doc/DXPC_re-licensed_debug_784565.mbox in
-this source project or #784565 on the Debian bug tracker [1].
-
-light+love,
-20150521, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-
-[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=784565
-
-------------------------------------------------------------------------------
-
-STEP 1
-======
-
-In May 2015, a serious license issue around the nxcomp code shipped in
-this source project was raised and solved on the Debian bug tracker (thanks to
-Francesco Poli and many others): http://bugs.debian.org/784565
-
-"""
-From: "Francesco Poli \(wintermute\)" <invernomuto@paranoici.org>
-To: Debian Bug Tracking System <submit@bugs.debian.org>
-Date: Wed, 06 May 2015 19:35:32 +0200
-
-I noticed that the debian/copyright states:
-
-[...]
-| Parts of this software are derived from DXPC project. These copyright
-| notices apply to original DXPC code:
-|
-|    Redistribution and use in source and binary forms are permitted provided
-|    that the above copyright notice and this paragraph are duplicated in all
-|    such forms.
-|
-|    THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
-|    WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-|    MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-|
-|    Copyright (c) 1995,1996 Brian Pane
-|    Copyright (c) 1996,1997 Zachary Vonler and Brian Pane
-|    Copyright (c) 1999 Kevin Vigor and Brian Pane
-|    Copyright (c) 2000,2001 Gian Filippo Pinzari and Brian Pane
-[...]
-
-This license lacks the permission to modify the DXPC code.
-Hence, the original DXPC code does not appear to comply with the
-DFSG. And the nx-libs-lite is in part derived from DXPC code.
-
-This basically means that nx-libs-lite includes parts which are
-non-free (as they are derived from non-modifiable code) and
-are also possibly legally undistributable (as they are non-modifiable,
-but actually modified). The combination with the rest of nx-libs-lite
-(which is GPL-licensed) may also be legally undistributable (since
-the license with no permission to modify is GPL-incompatible).
-
-
-If there's anything I misunderstood, please clarify.
-
-Otherwise, please address this issue as soon as possible.
-The copyright owners for the original DXPC code should be
-contacted and persuaded to re-license under GPL-compatible
-terms.
-"""
-
-The issue has been settled by asking all recent maintainers (i.e.,
-copyright holders) of DXPC, to agree on considering the BSD-2-clause
-license (as introduced in DXPC 3.8.1) retro-actively as the license of
-all pre-3.8.1 DXPC releases.
-
-STEP 2:
-=======
-
-Kevin Vigor, the (at that time being) latest known maintainer of DXPC
-replied back immediately and provided the info given below. He also
-stated that he agrees to applying BSD-2-clause retroactively to all
-pre-3.8.1 releases of DXPC.
-
-"""
-From: Kevin Vigor <kevin@vigor.nu>
-To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-CC: 784565@bugs.debian.org, [...]
-Subject: Re: Bug#784565: nx-libs-lite: parts are derived from non-free code
-
-Hi Mike, et al,
-
-   I am not the original author of dxpc, that being Brian Pane. However,
-   I took over maintenance circa 1999 and am still the primary maintainer
-   (though the project has effectively been dead for most of a decade
-   now).
-
-   As you are aware, when I inherited the code, it was licensed under a
-   variant of the BSD license that did not include the 'with
-   modification' clause. To the best of my recollection, somebody from
-   the FSF contacted me circa 2001 regarding this and as a result,
-   subsequent releases were done under a standard 2-clause BSD license
-   with the modification clause. Again, to the best of my recollection, I
-   contacted Brian about this change and he offered no objection.
-
-   Further, I recall distinctly that NoMachine contacted me and
-   explicitly asked permission before including DXPC code in NX, which I
-   happily granted with no new conditions beyond the BSD license already
-   in play.
-
-   It is possible, though by no means certain, that I could dig up
-   ancient email to corroborate this account if necessary. However, I am
-   more than willing to publicly state that I believe NoMachine's use of
-   DXPC code to be both legal and ethical, and that my intent when
-   changing the license to 2-clause BSD was simply to clarity the
-   existing intent and that it ought therefore be considered retroactive.
-
-   Yours,
-      Kevin Vigor
-
-[...]
-"""
-
-STEP 3:
--------
-
-We were not able to dig out any recent mail address of Zachary Volner,
-another of the DXPC copyright holders, but a phone number.
-
-On Friday, May 15th, I (Mike Gabriel) called that phone number and left a
-message on - hopefully - Zach's voicebox, asking him to mail me, so I
-could explain everything. He mailed back and later on posted the below
-statement to the Debian BTS, also expressing his agreement to the
-retroactive re-licensing of DXPC.
-
-"""
-Date: Mon, 18 May 2015 10:05:38 -0500
-Subject: Re: Bug#784565: nx-libs-lite: parts are derived from non-free code
-From: Zach Vonler <zvonler@gmail.com>
-To: 784565@bugs.debian.org
-
-On Thu, 14 May 2015 05:55:42 +0000 Mike Gabriel <
-mike.gabriel@das-netzwerkteam.de> wrote:
-
->
-> TL;DR; So here comes my actual question: are you (Brian Pane, Zachary
-> Vonler, Gian Filippo Pinzari) ok with retroactively regarding
-> pre-3.8.1 code of DXPC (that you probably all worked on at that time)
-> as BSD-2-clause? Are you ok with others having taken or taking the
-> pre-3.8.1 DXPC code and distribute it in a modified form?
->
-
-
-> A yes from all of you as DXPC copyright holders is essential for the
-> continuation of nx-libs development under a free license. This may
-> also possibly be an issue for NXv4 in case parts of it have been
-> derived from DXPC.
-
-
-Yes, I am fine with considering the license change to be retroactive to
-cover the time I was the maintainer.
-
-I have no objections to others distributing modified versions of that code.
-
-Zach
-"""
-
-STEP 4:
--------
-
-By 18th May 2015, Brian Pane had not mailed back to us. Hoping he is well
-and alive. Giving my personal gratitude to him for his work on DXPC back
-in the nighties.
-
-However, Kevin found an old archive of the DXPC mailing lists, esp. a
-post by Brian expressing openness to modifications of all DXPC code
-versions.
-
-We refer to this regarding his consent on the re-licensing.
-
-"""
-Date: Mon, 18 May 2015 15:11:42 -0600
-From: Kevin Vigor <kevin@vigor.nu>
-To: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>,  784565@bugs.debian.org, Francesco Poli <invernomuto@paranoici.org>
-CC: [...]
-Subject: Re: Bug#784565: nx-libs-lite: parts are derived from non-free code
-
-By the way, poking around the interwebs I find there is an archive of the old DXPC mailing list available at:
-
-http://marc.info/?l=dxpc&r=1&w=2
-
-I think you will find this of particular interest:
-
-
-http://marc.info/?l=dxpc&m=93093790813555&w=2
-
-
-List:       dxpc
-Subject:    Re: future tecnologies
-From:       Brian Pane <brianp () cnet ! com>
-Date:       1999-07-02 16:42:18
-[Download message RAW]
-
-Kevin Vigor <kvigor@eng.ascend.com> wrote:
-> On 01-Jul-99 dxpc@mcfeeley.cc.utexas.edu wrote:
-> > Speaking of licensing, are you putting your 3.8.0 changes to the dxpc
-> > code itself under GPL, or are they going to use the original dxpc's
-> > licensing?
->
-> No, as you can probably guess, I am no fan of the GPL. For stuff on
-> this level, where my hacking is pretty simple and probably devoid of
-> commercial value, I'll just release my changes to the public domain and
-> give up even a copyright interest in them.
->
-> Your and Zach's copyrights still stand, of course.
->
-> I *think* that fact that we use the LZO library and API, but do not
-> directly incorporate the code, allows us to escape the clutch of the GPL
-> virus.
->
-> btw, is there an original dxpc license? I haven't seen anything but a
-> copyright notice, which to my non-lawyerly mind translates as "free to
-> all the world as is, negotiate with copyright owner if modifying or
-> including in some other product".
-
-The copyright banner in the Readme is all the documentation there's ever
-been.  My intent was to allow _any_ distribution, use, and modification
-of the source, without imposing restrictions on the licensing style of
-any system into which others might incorporate the code.  We probably
-should start stating this clearly in the distributions.
-
--brian
-
-[prev in list] [next in list] [prev in thread] [next in thread]
-"""
-
-STEP 5:
--------
-
-Last but not least, Kevin informed us that Gian Filippo Pinzari never
-contributed any code to any of the official DPXC releases. So we assumed
-that his copyrights on the code stem from the time where he - under the
-NoMachine umbrella - worked on the code and should probably be associated
-with the GPL-2 re-licensing of the code later on done by NoMachine
-(which we did in the LICENSE file).
-
-It also appears, that there has been an incongruity between the copyright
-statement in nxcomp/Misc.cpp and nxcomp/LICENSE for Gian Filippo Pinzari.
-We used the copyright years (2000,2003) from nxcomp/Misc.cpp instead of
-those originally given in nxcomp/LICENSE (2000,2006).
-
-"""
-Date: Mon, 18 May 2015 19:16:25 -0600
-From: Kevin Vigor <kevin@vigor.nu>
-To: Francesco Poli <invernomuto@paranoici.org>,
- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-CC: 784565@bugs.debian.org, [...]
-Subject: Re: [pkg-x2go-devel] Bug#784565: Bug#784565: nx-libs-lite: parts are derived from non-free code
-
-On 5/18/2015 4:14 PM, Francesco Poli wrote:
-> If it is confirmed that Gian Filippo contributed to the forking of
-> DXPC within the NoMachine project, but not directly to DXPC, then I
-> think that he made his contributions available under the terms of the
-> GPL v2 of the NoMachine project. If this is the case, no feedback
-> should be required from his side.
-I can confirm that Gian Fillippo never contributed directly to DXPC.
-You'll note his name does not appear in the DXPC README, and never has.
-"""
-- 
cgit v1.2.3


From 06a97857a0380f88b691ac022fa30a05d54e43e0 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 5 Jul 2016 13:25:48 +0200
Subject: nxcomp/Misc.cpp: The clipboard nx/nx option is a string option, not
 int.

---
 nxcomp/Misc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Misc.cpp b/nxcomp/Misc.cpp
index 05794bded..3c73f54d3 100644
--- a/nxcomp/Misc.cpp
+++ b/nxcomp/Misc.cpp
@@ -302,7 +302,7 @@ geometry=s\n\
 resize=b\n\
 fullscreen=b\n\
 keyboard=s\n\
-clipboard=n\n\
+clipboard=s\n\
 streaming=n\n\
 backingstore=n\n\
 composite=n\n\
-- 
cgit v1.2.3


From 51c3d42f3d15b181d58a0df1e5abac8d298d4484 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 5 Jul 2016 16:22:51 +0200
Subject: Per-file copyright notices: Update copyright information in file
 headers that NoMachine placed there own copyright statement in.

---
 nx-X11/Imakefile                                   | 25 +++++++++---
 nx-X11/config/cf/host.def                          | 38 +++++++++---------
 nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h    | 17 ++++----
 nx-X11/include/Xpoll.h.in                          | 39 +++++++++---------
 nx-X11/lib/X11/ConnDis.c                           | 46 ++++++++++++----------
 nx-X11/lib/X11/Imakefile                           | 33 ++++++++--------
 nx-X11/lib/X11/OpenDis.c                           | 45 +++++++++++----------
 nx-X11/lib/X11/XlibAsync.c                         | 43 +++++++++++---------
 nx-X11/lib/X11/XlibInt.c                           | 45 +++++++++++----------
 nx-X11/lib/X11/Xlibint.h                           | 44 +++++++++++----------
 nx-X11/lib/xtrans/Xtranssock.c                     | 45 +++++++++++----------
 nx-X11/programs/Imakefile                          | 19 +++++----
 nx-X11/programs/Xserver/Imakefile                  | 26 +++++++-----
 nx-X11/programs/Xserver/Xext/Imakefile             | 32 +++++++--------
 nx-X11/programs/Xserver/Xext/security.c            | 45 +++++++++++----------
 nx-X11/programs/Xserver/hw/nxagent/Agent.h         | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Args.c          | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Args.h          | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Atoms.c         | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Atoms.h         | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Binder.c        | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Binder.h        | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Client.c        | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Client.h        | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Clipboard.c     | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Clipboard.h     | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Colormap.c      | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Colormap.h      | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Composite.c     | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Composite.h     | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Cursor.c        | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Cursor.h        | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Dialog.c        | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Dialog.h        | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Display.c       | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Display.h       | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Drawable.c      | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Drawable.h      | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Error.c         | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Error.h         | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Events.c        | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Events.h        | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Extensions.c    | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Extensions.h    | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Font.c          | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Font.h          | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/GC.c            | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/GCOps.c         | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/GCOps.h         | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/GCs.h           | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Handlers.c      | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Handlers.h      | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Holder.c        | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Holder.h        | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Icons.h         | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Image.c         | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Image.h         | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Init.c          | 36 ++++++++++++-----
 nx-X11/programs/Xserver/hw/nxagent/Init.h          | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Keyboard.c      | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Keyboard.h      | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Keystroke.c     | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Keystroke.h     | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Literals.h      | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Millis.c        | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Millis.h        | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/NXdamage.c      | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c    | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c    | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/NXevents.c      | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/NXextension.c   | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/NXglxext.c      | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/NXglyph.c       | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c   | 22 +++++++----
 .../Xserver/hw/nxagent/NXglyphstr_GlyphRef.h       | 22 +++++++----
 .../Xserver/hw/nxagent/NXglyphstr_GlyphSet.h       | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c    | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/NXmiglyph.c     | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/NXmitrap.c      | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/NXpicture.c     | 22 +++++++----
 .../hw/nxagent/NXpicturestr_PictSolidFill.h        | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/NXproperty.c    | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/NXrender.c      | 43 +++++++++++---------
 nx-X11/programs/Xserver/hw/nxagent/NXresource.c    | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/NXshm.c         | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/NXwindow.c      | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c      | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Options.c       | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Options.h       | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Pixels.c        | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Pixels.h        | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Pixmap.c        | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Pixmaps.h       | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Pointer.c       | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Pointer.h       | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Reconnect.c     | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Reconnect.h     | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Render.c        | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Render.h        | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Rootless.c      | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Rootless.h      | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Screen.c        | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Screen.h        | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Splash.c        | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Splash.h        | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Split.c         | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Split.h         | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/TestExt.c       | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Trap.c          | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Trap.h          | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Utils.h         | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Visual.c        | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Visual.h        | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Window.c        | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/Windows.h       | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/nxagent.xpm     | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/nxmissing.xpm   | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/os2Stub.c       | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/screensaver     | 22 +++++++----
 nx-X11/programs/Xserver/hw/nxagent/x2go.xpm        | 15 +++++++
 nx-X11/programs/Xserver/mi/Imakefile               | 27 +++++++------
 nx-X11/programs/Xserver/os/Imakefile               | 33 ++++++++--------
 nx-X11/programs/Xserver/os/WaitFor.c               | 45 +++++++++++----------
 nx-X11/programs/Xserver/os/auth.c                  | 44 ++++++++++++---------
 nx-X11/programs/Xserver/os/log.c                   | 44 ++++++++++++---------
 nx-X11/programs/Xserver/os/utils.c                 | 45 +++++++++++----------
 nx-X11/programs/Xserver/randr/Imakefile            | 26 +++++++-----
 nx-X11/programs/Xserver/randr/randr.c              | 42 ++++++++++++--------
 nx-X11/programs/Xserver/randr/rrcrtc.c             | 42 ++++++++++++--------
 nx-X11/programs/Xserver/randr/rrmode.c             | 42 ++++++++++++--------
 nx-X11/programs/Xserver/randr/rrscreen.c           | 42 ++++++++++++--------
 nx-X11/programs/Xserver/randr/rrxinerama.c         | 42 ++++++++++++--------
 nxcomp/ActionCache.cpp                             | 22 +++++++----
 nxcomp/ActionCache.h                               | 22 +++++++----
 nxcomp/Agent.cpp                                   | 22 +++++++----
 nxcomp/Agent.h                                     | 22 +++++++----
 nxcomp/Alpha.cpp                                   | 22 +++++++----
 nxcomp/Alpha.h                                     | 22 +++++++----
 nxcomp/Auth.cpp                                    | 22 +++++++----
 nxcomp/Auth.h                                      | 22 +++++++----
 nxcomp/Bitmap.cpp                                  | 22 +++++++----
 nxcomp/Bitmap.h                                    | 22 +++++++----
 nxcomp/BlockCache.cpp                              | 22 +++++++----
 nxcomp/BlockCache.h                                | 22 +++++++----
 nxcomp/BlockCacheSet.cpp                           | 22 +++++++----
 nxcomp/BlockCacheSet.h                             | 22 +++++++----
 nxcomp/ChangeGC.cpp                                | 22 +++++++----
 nxcomp/ChangeGC.h                                  | 22 +++++++----
 nxcomp/ChangeProperty.cpp                          | 22 +++++++----
 nxcomp/ChangeProperty.h                            | 22 +++++++----
 nxcomp/Channel.cpp                                 | 22 +++++++----
 nxcomp/Channel.h                                   | 22 +++++++----
 nxcomp/ChannelCache.cpp                            | 22 +++++++----
 nxcomp/ChannelCache.h                              | 22 +++++++----
 nxcomp/ChannelEndPoint.cpp                         | 30 ++++++++------
 nxcomp/ChannelEndPoint.h                           | 30 ++++++++------
 nxcomp/ChannelStore.h                              | 22 +++++++----
 nxcomp/CharCache.cpp                               | 22 +++++++----
 nxcomp/CharCache.h                                 | 22 +++++++----
 nxcomp/Children.cpp                                | 22 +++++++----
 nxcomp/ClearArea.cpp                               | 22 +++++++----
 nxcomp/ClearArea.h                                 | 22 +++++++----
 nxcomp/ClientCache.cpp                             | 22 +++++++----
 nxcomp/ClientCache.h                               | 22 +++++++----
 nxcomp/ClientChannel.cpp                           | 22 +++++++----
 nxcomp/ClientChannel.h                             | 22 +++++++----
 nxcomp/ClientProxy.cpp                             | 22 +++++++----
 nxcomp/ClientProxy.h                               | 22 +++++++----
 nxcomp/ClientReadBuffer.cpp                        | 22 +++++++----
 nxcomp/ClientReadBuffer.h                          | 22 +++++++----
 nxcomp/ClientStore.cpp                             | 22 +++++++----
 nxcomp/ClientStore.h                               | 22 +++++++----
 nxcomp/Colormap.cpp                                | 22 +++++++----
 nxcomp/Colormap.h                                  | 22 +++++++----
 nxcomp/ConfigureWindow.cpp                         | 22 +++++++----
 nxcomp/ConfigureWindow.h                           | 22 +++++++----
 nxcomp/Control.cpp                                 | 22 +++++++----
 nxcomp/Control.h                                   | 22 +++++++----
 nxcomp/CopyArea.cpp                                | 22 +++++++----
 nxcomp/CopyArea.h                                  | 22 +++++++----
 nxcomp/CreateGC.cpp                                | 22 +++++++----
 nxcomp/CreateGC.h                                  | 22 +++++++----
 nxcomp/CreatePixmap.cpp                            | 22 +++++++----
 nxcomp/CreatePixmap.h                              | 22 +++++++----
 nxcomp/DecodeBuffer.cpp                            | 22 +++++++----
 nxcomp/DecodeBuffer.h                              | 22 +++++++----
 nxcomp/EncodeBuffer.cpp                            | 22 +++++++----
 nxcomp/EncodeBuffer.h                              | 22 +++++++----
 nxcomp/FillPoly.cpp                                | 22 +++++++----
 nxcomp/FillPoly.h                                  | 22 +++++++----
 nxcomp/Fork.cpp                                    | 22 +++++++----
 nxcomp/Fork.h                                      | 22 +++++++----
 nxcomp/FreeCache.h                                 | 22 +++++++----
 nxcomp/GenericChannel.cpp                          | 22 +++++++----
 nxcomp/GenericChannel.h                            | 22 +++++++----
 nxcomp/GenericReadBuffer.cpp                       | 22 +++++++----
 nxcomp/GenericReadBuffer.h                         | 22 +++++++----
 nxcomp/GenericReply.cpp                            | 22 +++++++----
 nxcomp/GenericReply.h                              | 22 +++++++----
 nxcomp/GenericRequest.cpp                          | 22 +++++++----
 nxcomp/GenericRequest.h                            | 22 +++++++----
 nxcomp/GetImage.cpp                                | 22 +++++++----
 nxcomp/GetImage.h                                  | 22 +++++++----
 nxcomp/GetImageReply.cpp                           | 22 +++++++----
 nxcomp/GetImageReply.h                             | 22 +++++++----
 nxcomp/GetProperty.cpp                             | 22 +++++++----
 nxcomp/GetProperty.h                               | 22 +++++++----
 nxcomp/GetPropertyReply.cpp                        | 22 +++++++----
 nxcomp/GetPropertyReply.h                          | 22 +++++++----
 nxcomp/ImageText16.cpp                             | 22 +++++++----
 nxcomp/ImageText16.h                               | 22 +++++++----
 nxcomp/ImageText8.cpp                              | 22 +++++++----
 nxcomp/ImageText8.h                                | 22 +++++++----
 nxcomp/IntCache.cpp                                | 22 +++++++----
 nxcomp/IntCache.h                                  | 22 +++++++----
 nxcomp/InternAtom.cpp                              | 22 +++++++----
 nxcomp/InternAtom.h                                | 22 +++++++----
 nxcomp/Jpeg.cpp                                    | 22 +++++++----
 nxcomp/Jpeg.h                                      | 22 +++++++----
 nxcomp/Keeper.cpp                                  | 22 +++++++----
 nxcomp/Keeper.h                                    | 22 +++++++----
 nxcomp/List.cpp                                    | 22 +++++++----
 nxcomp/List.h                                      | 22 +++++++----
 nxcomp/ListFontsReply.cpp                          | 22 +++++++----
 nxcomp/ListFontsReply.h                            | 22 +++++++----
 nxcomp/Loop.cpp                                    | 22 +++++++----
 nxcomp/Makefile.in                                 | 40 +++++++++++--------
 nxcomp/Message.cpp                                 | 22 +++++++----
 nxcomp/Message.h                                   | 22 +++++++----
 nxcomp/Misc.cpp                                    | 22 +++++++----
 nxcomp/Misc.h                                      | 22 +++++++----
 nxcomp/NX.h                                        | 22 +++++++----
 nxcomp/NXalert.h                                   | 22 +++++++----
 nxcomp/NXmitshm.h                                  | 22 +++++++----
 nxcomp/NXpack.h                                    | 22 +++++++----
 nxcomp/NXproto.h                                   | 22 +++++++----
 nxcomp/NXrender.h                                  | 22 +++++++----
 nxcomp/NXvars.h                                    | 22 +++++++----
 nxcomp/OpcodeCache.h                               | 22 +++++++----
 nxcomp/OpcodeStore.cpp                             | 22 +++++++----
 nxcomp/OpcodeStore.h                               | 22 +++++++----
 nxcomp/Pgn.cpp                                     | 22 +++++++----
 nxcomp/Pgn.h                                       | 22 +++++++----
 nxcomp/Pipe.cpp                                    | 22 +++++++----
 nxcomp/Pipe.h                                      | 22 +++++++----
 nxcomp/PolyArc.cpp                                 | 22 +++++++----
 nxcomp/PolyArc.h                                   | 22 +++++++----
 nxcomp/PolyFillArc.cpp                             | 22 +++++++----
 nxcomp/PolyFillArc.h                               | 22 +++++++----
 nxcomp/PolyFillRectangle.cpp                       | 22 +++++++----
 nxcomp/PolyFillRectangle.h                         | 22 +++++++----
 nxcomp/PolyLine.cpp                                | 22 +++++++----
 nxcomp/PolyLine.h                                  | 22 +++++++----
 nxcomp/PolyPoint.cpp                               | 22 +++++++----
 nxcomp/PolyPoint.h                                 | 22 +++++++----
 nxcomp/PolySegment.cpp                             | 22 +++++++----
 nxcomp/PolySegment.h                               | 22 +++++++----
 nxcomp/PolyText16.cpp                              | 22 +++++++----
 nxcomp/PolyText16.h                                | 22 +++++++----
 nxcomp/PolyText8.cpp                               | 22 +++++++----
 nxcomp/PolyText8.h                                 | 22 +++++++----
 nxcomp/Proxy.cpp                                   | 22 +++++++----
 nxcomp/Proxy.h                                     | 22 +++++++----
 nxcomp/ProxyReadBuffer.cpp                         | 22 +++++++----
 nxcomp/ProxyReadBuffer.h                           | 22 +++++++----
 nxcomp/PutImage.cpp                                | 22 +++++++----
 nxcomp/PutImage.h                                  | 22 +++++++----
 nxcomp/PutPackedImage.cpp                          | 22 +++++++----
 nxcomp/PutPackedImage.h                            | 22 +++++++----
 nxcomp/QueryFontReply.cpp                          | 22 +++++++----
 nxcomp/QueryFontReply.h                            | 22 +++++++----
 nxcomp/ReadBuffer.cpp                              | 22 +++++++----
 nxcomp/ReadBuffer.h                                | 22 +++++++----
 nxcomp/RenderAddGlyphs.cpp                         | 22 +++++++----
 nxcomp/RenderAddGlyphs.h                           | 22 +++++++----
 nxcomp/RenderChangePicture.cpp                     | 22 +++++++----
 nxcomp/RenderChangePicture.h                       | 22 +++++++----
 nxcomp/RenderComposite.cpp                         | 22 +++++++----
 nxcomp/RenderComposite.h                           | 22 +++++++----
 nxcomp/RenderCompositeGlyphs.cpp                   | 22 +++++++----
 nxcomp/RenderCompositeGlyphs.h                     | 22 +++++++----
 nxcomp/RenderCreateGlyphSet.cpp                    | 22 +++++++----
 nxcomp/RenderCreateGlyphSet.h                      | 22 +++++++----
 nxcomp/RenderCreatePicture.cpp                     | 22 +++++++----
 nxcomp/RenderCreatePicture.h                       | 22 +++++++----
 nxcomp/RenderExtension.cpp                         | 22 +++++++----
 nxcomp/RenderExtension.h                           | 22 +++++++----
 nxcomp/RenderFillRectangles.cpp                    | 22 +++++++----
 nxcomp/RenderFillRectangles.h                      | 22 +++++++----
 nxcomp/RenderFreeGlyphSet.cpp                      | 22 +++++++----
 nxcomp/RenderFreeGlyphSet.h                        | 22 +++++++----
 nxcomp/RenderFreePicture.cpp                       | 22 +++++++----
 nxcomp/RenderFreePicture.h                         | 22 +++++++----
 nxcomp/RenderGenericRequest.cpp                    | 22 +++++++----
 nxcomp/RenderGenericRequest.h                      | 22 +++++++----
 nxcomp/RenderMinorExtensionHeaders.h               | 22 +++++++----
 nxcomp/RenderMinorExtensionMethods.h               | 22 +++++++----
 nxcomp/RenderMinorExtensionTags.h                  | 22 +++++++----
 nxcomp/RenderPictureClip.cpp                       | 22 +++++++----
 nxcomp/RenderPictureClip.h                         | 22 +++++++----
 nxcomp/RenderPictureFilter.cpp                     | 22 +++++++----
 nxcomp/RenderPictureFilter.h                       | 22 +++++++----
 nxcomp/RenderPictureTransform.cpp                  | 22 +++++++----
 nxcomp/RenderPictureTransform.h                    | 22 +++++++----
 nxcomp/RenderTrapezoids.cpp                        | 22 +++++++----
 nxcomp/RenderTrapezoids.h                          | 22 +++++++----
 nxcomp/RenderTriangles.cpp                         | 22 +++++++----
 nxcomp/RenderTriangles.h                           | 22 +++++++----
 nxcomp/Rgb.cpp                                     | 22 +++++++----
 nxcomp/Rgb.h                                       | 22 +++++++----
 nxcomp/Rle.cpp                                     | 22 +++++++----
 nxcomp/Rle.h                                       | 22 +++++++----
 nxcomp/SendEvent.cpp                               | 22 +++++++----
 nxcomp/SendEvent.h                                 | 22 +++++++----
 nxcomp/SequenceQueue.cpp                           | 22 +++++++----
 nxcomp/SequenceQueue.h                             | 22 +++++++----
 nxcomp/ServerCache.cpp                             | 22 +++++++----
 nxcomp/ServerCache.h                               | 22 +++++++----
 nxcomp/ServerChannel.cpp                           | 22 +++++++----
 nxcomp/ServerChannel.h                             | 22 +++++++----
 nxcomp/ServerProxy.cpp                             | 24 +++++++----
 nxcomp/ServerProxy.h                               | 22 +++++++----
 nxcomp/ServerReadBuffer.cpp                        | 22 +++++++----
 nxcomp/ServerReadBuffer.h                          | 22 +++++++----
 nxcomp/ServerStore.cpp                             | 22 +++++++----
 nxcomp/ServerStore.h                               | 22 +++++++----
 nxcomp/SetClipRectangles.cpp                       | 22 +++++++----
 nxcomp/SetClipRectangles.h                         | 22 +++++++----
 nxcomp/SetUnpackAlpha.cpp                          | 22 +++++++----
 nxcomp/SetUnpackAlpha.h                            | 22 +++++++----
 nxcomp/SetUnpackColormap.cpp                       | 22 +++++++----
 nxcomp/SetUnpackColormap.h                         | 22 +++++++----
 nxcomp/SetUnpackGeometry.cpp                       | 22 +++++++----
 nxcomp/SetUnpackGeometry.h                         | 22 +++++++----
 nxcomp/ShapeExtension.cpp                          | 22 +++++++----
 nxcomp/ShapeExtension.h                            | 22 +++++++----
 nxcomp/Socket.cpp                                  | 22 +++++++----
 nxcomp/Socket.h                                    | 22 +++++++----
 nxcomp/Split.cpp                                   | 22 +++++++----
 nxcomp/Split.h                                     | 22 +++++++----
 nxcomp/StaticCompressor.cpp                        | 22 +++++++----
 nxcomp/StaticCompressor.h                          | 22 +++++++----
 nxcomp/Statistics.cpp                              | 22 +++++++----
 nxcomp/Statistics.h                                | 22 +++++++----
 nxcomp/Timestamp.cpp                               | 22 +++++++----
 nxcomp/Timestamp.h                                 | 22 +++++++----
 nxcomp/TranslateCoords.cpp                         | 22 +++++++----
 nxcomp/TranslateCoords.h                           | 22 +++++++----
 nxcomp/Transport.cpp                               | 22 +++++++----
 nxcomp/Transport.h                                 | 22 +++++++----
 nxcomp/Types.h                                     | 22 +++++++----
 nxcomp/Unpack.cpp                                  | 22 +++++++----
 nxcomp/Unpack.h                                    | 22 +++++++----
 nxcomp/Utils.cpp                                   | 22 +++++++----
 nxcomp/WriteBuffer.cpp                             | 22 +++++++----
 nxcomp/WriteBuffer.h                               | 22 +++++++----
 nxcomp/XidCache.cpp                                | 22 +++++++----
 nxcomp/XidCache.h                                  | 22 +++++++----
 nxcomp/Z.cpp                                       | 22 +++++++----
 nxcomp/Z.h                                         | 22 +++++++----
 nxcomp/configure.in                                | 26 ++++++++++++
 nxcompext/Alpha.c                                  | 22 +++++++----
 nxcompext/Alpha.h                                  | 22 +++++++----
 nxcompext/Bitmap.c                                 | 22 +++++++----
 nxcompext/Bitmap.h                                 | 22 +++++++----
 nxcompext/Clean.c                                  | 22 +++++++----
 nxcompext/Clean.h                                  | 22 +++++++----
 nxcompext/Colormap.c                               | 22 +++++++----
 nxcompext/Colormap.h                               | 22 +++++++----
 nxcompext/Jpeg.c                                   | 22 +++++++----
 nxcompext/Jpeg.h                                   | 22 +++++++----
 nxcompext/Makefile.in                              | 40 +++++++++++--------
 nxcompext/Mask.c                                   | 22 +++++++----
 nxcompext/Mask.h                                   | 22 +++++++----
 nxcompext/NXlib.c                                  | 22 +++++++----
 nxcompext/NXlib.h                                  | 22 +++++++----
 nxcompext/NXlibint.h                               | 22 +++++++----
 nxcompext/Pgn.c                                    | 22 +++++++----
 nxcompext/Pgn.h                                    | 22 +++++++----
 nxcompext/Rgb.c                                    | 22 +++++++----
 nxcompext/Rgb.h                                    | 22 +++++++----
 nxcompext/Rle.c                                    | 22 +++++++----
 nxcompext/Rle.h                                    | 22 +++++++----
 nxcompext/Z.c                                      | 22 +++++++----
 nxcompext/Z.h                                      | 22 +++++++----
 nxcompext/configure.in                             | 25 ++++++++++++
 nxcompshad/Core.cpp                                | 22 +++++++----
 nxcompshad/Core.h                                  | 22 +++++++----
 nxcompshad/Input.cpp                               | 22 +++++++----
 nxcompshad/Input.h                                 | 22 +++++++----
 nxcompshad/Logger.cpp                              | 24 +++++++----
 nxcompshad/Logger.h                                | 24 +++++++----
 nxcompshad/Makefile.in                             | 40 +++++++++++--------
 nxcompshad/Manager.cpp                             | 22 +++++++----
 nxcompshad/Manager.h                               | 22 +++++++----
 nxcompshad/Misc.h                                  | 22 +++++++----
 nxcompshad/Poller.h                                | 22 +++++++----
 nxcompshad/Regions.h                               | 22 +++++++----
 nxcompshad/Shadow.cpp                              | 22 +++++++----
 nxcompshad/Shadow.h                                | 22 +++++++----
 nxcompshad/Updater.cpp                             | 22 +++++++----
 nxcompshad/Updater.h                               | 22 +++++++----
 nxcompshad/Win.cpp                                 | 22 +++++++----
 nxcompshad/Win.h                                   | 22 +++++++----
 nxcompshad/X11.cpp                                 | 22 +++++++----
 nxcompshad/X11.h                                   | 22 +++++++----
 nxcompshad/configure.in                            | 26 ++++++++++++
 407 files changed, 6368 insertions(+), 3123 deletions(-)

(limited to 'nxcomp')

diff --git a/nx-X11/Imakefile b/nx-X11/Imakefile
index 45948d2af..78b4cb3f1 100644
--- a/nx-X11/Imakefile
+++ b/nx-X11/Imakefile
@@ -1,9 +1,22 @@
-XCOMM $Xorg: Imakefile,v 1.5 2000/08/17 19:41:44 cpqbld Exp $
-
-
-
-
-XCOMM $XFree86: xc/Imakefile,v 3.29tsi Exp $
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* nx-X11, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/**************************************************************************/
 
 #define IHaveSubdirs
 #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def
index bc25ca9ff..beb6e83cb 100644
--- a/nx-X11/config/cf/host.def
+++ b/nx-X11/config/cf/host.def
@@ -1,4 +1,23 @@
-XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* nx-X11, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/**************************************************************************/
+
 /******************************************************************************/
 /*
  * This file is to provide a quick method for most people to change the
@@ -29,23 +48,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
  */
 /******************************************************************************/
 
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
-/*                                                                        */
-/* NX-X11, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
 #if defined(SunArchitecture)
 #define ProjectRoot /usr/openwin
 #endif
diff --git a/nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h b/nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h
index b4d805d6d..bf6ea040c 100644
--- a/nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h
+++ b/nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h
@@ -1,15 +1,18 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nx-X11/include/Xpoll.h.in b/nx-X11/include/Xpoll.h.in
index 77a0aea3d..47a0341e2 100644
--- a/nx-X11/include/Xpoll.h.in
+++ b/nx-X11/include/Xpoll.h.in
@@ -1,4 +1,22 @@
-/* $Xorg: Xpoll.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* nx-X11, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/**************************************************************************/
 
 /*
 
@@ -49,25 +67,6 @@ from The Open Group.
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-/* $XFree86: xc/include/Xpoll.h,v 3.8 2001/01/17 17:53:11 dawes Exp $ */
-
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
-/*                                                                        */
-/* NX-X11, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
 #ifndef _XPOLL_H_
 #define _XPOLL_H_
 
diff --git a/nx-X11/lib/X11/ConnDis.c b/nx-X11/lib/X11/ConnDis.c
index 0989292ec..fdf4593e2 100644
--- a/nx-X11/lib/X11/ConnDis.c
+++ b/nx-X11/lib/X11/ConnDis.c
@@ -1,5 +1,28 @@
-/* $XdotOrg: xc/lib/X11/ConnDis.c,v 1.10 2005/07/03 07:00:55 daniels Exp $ */
-/* $Xorg: ConnDis.c,v 1.8 2001/02/09 02:03:31 xorgcvs Exp $ */
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* nx-X11, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
 /*
  
 Copyright 1989, 1998  The Open Group
@@ -26,25 +49,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
-/*                                                                        */
-/* NX-X11, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
-/* $XFree86: xc/lib/X11/ConnDis.c,v 3.28 2003/12/02 23:33:17 herrb Exp $ */
-
 /* 
  * This file contains operating system dependencies.
  */
diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile
index 186cd963d..eae462391 100644
--- a/nx-X11/lib/X11/Imakefile
+++ b/nx-X11/lib/X11/Imakefile
@@ -1,29 +1,28 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
-/* NX-X11, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* nx-X11, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
-XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:44:38 cpqbld Exp $
-
-
-
-
-XCOMM $XFree86: xc/lib/X11/Imakefile,v 3.52 2003/05/27 16:53:15 tsi Exp $
-
-
-
         HEADERS = Xlib.h Xresource.h Xutil.h cursorfont.h Xlibint.h \
 		Xcms.h Xlocale.h XKBlib.h XlibConf.h Xregion.h ImUtil.h
 
diff --git a/nx-X11/lib/X11/OpenDis.c b/nx-X11/lib/X11/OpenDis.c
index 691fa95e9..6b022d409 100644
--- a/nx-X11/lib/X11/OpenDis.c
+++ b/nx-X11/lib/X11/OpenDis.c
@@ -1,4 +1,28 @@
-/* $Xorg: OpenDis.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* nx-X11, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
 /*
 
 Copyright 1985, 1986, 1998  The Open Group
@@ -25,25 +49,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
-/*                                                                        */
-/* NX-X11, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
-/* $XFree86: xc/lib/X11/OpenDis.c,v 3.16 2003/07/04 16:24:23 eich Exp $ */
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/nx-X11/lib/X11/XlibAsync.c b/nx-X11/lib/X11/XlibAsync.c
index 1fc64e5d6..d289970ee 100644
--- a/nx-X11/lib/X11/XlibAsync.c
+++ b/nx-X11/lib/X11/XlibAsync.c
@@ -1,4 +1,28 @@
-/* $Xorg: XlibAsync.c,v 1.4 2001/02/09 02:03:38 xorgcvs Exp $ */
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* nx-X11, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
 /*
 
 Copyright 1992, 1998  The Open Group
@@ -27,23 +51,6 @@ from The Open Group.
 
 */
 
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
-/*                                                                        */
-/* NX-X11, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/nx-X11/lib/X11/XlibInt.c b/nx-X11/lib/X11/XlibInt.c
index 5e9cb4a19..67483d3af 100644
--- a/nx-X11/lib/X11/XlibInt.c
+++ b/nx-X11/lib/X11/XlibInt.c
@@ -1,4 +1,28 @@
-/* $Xorg: XlibInt.c,v 1.8 2001/02/09 02:03:38 xorgcvs Exp $ */
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* nx-X11, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
 /*
 
 Copyright 1985, 1986, 1987, 1998  The Open Group
@@ -27,25 +51,6 @@ from The Open Group.
 
 */
 
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
-/*                                                                        */
-/* NX-X11, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
-/* $XFree86: xc/lib/X11/XlibInt.c,v 3.38 2003/10/30 21:55:05 alanh Exp $ */
-
 /*
  *	XlibInt.c - Internal support routines for the C subroutine
  *	interface library (Xlib) to the X Window System Protocol V11.0.
diff --git a/nx-X11/lib/X11/Xlibint.h b/nx-X11/lib/X11/Xlibint.h
index 6e5b2bcea..15dd5cea7 100644
--- a/nx-X11/lib/X11/Xlibint.h
+++ b/nx-X11/lib/X11/Xlibint.h
@@ -1,4 +1,27 @@
-/* $Xorg: Xlibint.h,v 1.5 2001/02/09 02:03:38 xorgcvs Exp $ */
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* nx-X11, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
 
 /*
 
@@ -28,25 +51,6 @@ from The Open Group.
 
 */
 
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
-/*                                                                        */
-/* NX-X11, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
-/* $XFree86: xc/lib/X11/Xlibint.h,v 3.27 2003/05/27 22:26:26 tsi Exp $ */
-
 #ifndef _XLIBINT_H_
 #define _XLIBINT_H_ 1
 
diff --git a/nx-X11/lib/xtrans/Xtranssock.c b/nx-X11/lib/xtrans/Xtranssock.c
index e27ba9993..06c7719bf 100644
--- a/nx-X11/lib/xtrans/Xtranssock.c
+++ b/nx-X11/lib/xtrans/Xtranssock.c
@@ -1,5 +1,28 @@
-/* $XdotOrg: xc/lib/xtrans/Xtranssock.c,v 1.11 2005/11/08 06:33:26 jkj Exp $ */
-/* $Xorg: Xtranssock.c,v 1.11 2001/02/09 02:04:06 xorgcvs Exp $ */
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* nx-X11, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
 /*
 
 Copyright 1993, 1994, 1998  The Open Group
@@ -28,7 +51,6 @@ other dealings in this Software without prior written authorization
 from the copyright holders.
 
 */
-/* $XFree86: xc/lib/xtrans/Xtranssock.c,v 3.68 2004/01/07 04:28:02 dawes Exp $ */
 
 /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA
  *
@@ -53,23 +75,6 @@ from the copyright holders.
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
-/*                                                                        */
-/* NX-X11, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
 #ifdef NX_TRANS_SOCKET
 
 #ifdef NX_TRANS_DEBUG
diff --git a/nx-X11/programs/Imakefile b/nx-X11/programs/Imakefile
index c618d2de9..743851143 100644
--- a/nx-X11/programs/Imakefile
+++ b/nx-X11/programs/Imakefile
@@ -1,15 +1,18 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
-/* NX-X11, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* nx-X11, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index 6a57b792e..f633c94b3 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -1,20 +1,26 @@
-XCOMM $XdotOrg: xc/programs/Xserver/Imakefile,v 1.37 2005/11/18 18:15:23 ajax Exp $
-XCOMM $Xorg: Imakefile,v 1.4 2001/03/14 18:42:02 pookie Exp $
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
-/* NX-X11, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* nx-X11, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/Xext/Imakefile b/nx-X11/programs/Xserver/Xext/Imakefile
index f4add461e..745ba1788 100644
--- a/nx-X11/programs/Xserver/Xext/Imakefile
+++ b/nx-X11/programs/Xserver/Xext/Imakefile
@@ -1,26 +1,26 @@
-/* $XdotOrg: xc/programs/Xserver/Xext/Imakefile,v 1.9 2005/04/24 01:10:12 gisburn Exp $ */
-XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:47:55 cpqbld Exp $
-
-
-
-
-XCOMM $XFree86: xc/programs/Xserver/Xext/Imakefile,v 3.43 2003/04/21 18:56:48 sven Exp $
-
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
-/*                                                                        */
-/* NX-X11, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
+/* nx-X11, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include <Server.tmpl>
diff --git a/nx-X11/programs/Xserver/Xext/security.c b/nx-X11/programs/Xserver/Xext/security.c
index c346f8deb..1071565f3 100644
--- a/nx-X11/programs/Xserver/Xext/security.c
+++ b/nx-X11/programs/Xserver/Xext/security.c
@@ -1,5 +1,28 @@
-/* $XdotOrg: xc/programs/Xserver/Xext/security.c,v 1.5 2005/07/03 07:01:04 daniels Exp $ */
-/* $Xorg: security.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* nx-X11, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
 /*
 
 Copyright 1996, 1998  The Open Group
@@ -25,24 +48,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/Xext/security.c,v 1.16tsi Exp $ */
-
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
-/*                                                                        */
-/* NX-X11, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Agent.h b/nx-X11/programs/Xserver/hw/nxagent/Agent.h
index 2fa2b6240..8577865a2 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Agent.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Agent.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c
index 0d6e4f87e..832595786 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.h b/nx-X11/programs/Xserver/hw/nxagent/Args.h
index a1753d841..5192783e5 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c
index 00411c65e..8f43dce4d 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "scrnintstr.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Atoms.h b/nx-X11/programs/Xserver/hw/nxagent/Atoms.h
index d5b7fe5aa..391e06181 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Atoms.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Atoms.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef __Atoms_H__
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Binder.c b/nx-X11/programs/Xserver/hw/nxagent/Binder.c
index f69d23f4f..ae1cd0f25 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Binder.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Binder.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include <stdio.h>
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Binder.h b/nx-X11/programs/Xserver/hw/nxagent/Binder.h
index f28a82b9f..fc6673132 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Binder.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Binder.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef __Binder_H__
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Client.c b/nx-X11/programs/Xserver/hw/nxagent/Client.c
index eaa216e20..061269a0e 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Client.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Client.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Client.h b/nx-X11/programs/Xserver/hw/nxagent/Client.h
index 67ec50e79..8f4f503ba 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Client.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Client.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef __Client_H__
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
index 2fe9dfbc9..1771d4c9d 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "X.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.h b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.h
index 43189df81..62fc32fd9 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef __Clipboard_H__
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Colormap.c b/nx-X11/programs/Xserver/hw/nxagent/Colormap.c
index 3905e289b..ecfbe210e 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Colormap.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Colormap.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Colormap.h b/nx-X11/programs/Xserver/hw/nxagent/Colormap.h
index b2960590c..fc3c828f9 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Colormap.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Colormap.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Composite.c b/nx-X11/programs/Xserver/hw/nxagent/Composite.c
index cf736f6c0..bd84c52b0 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Composite.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Composite.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "scrnintstr.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Composite.h b/nx-X11/programs/Xserver/hw/nxagent/Composite.h
index e875d0051..abe2551bf 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Composite.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Composite.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef __Composite_H__
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Cursor.c b/nx-X11/programs/Xserver/hw/nxagent/Cursor.c
index 932f7495f..8698308b8 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Cursor.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Cursor.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Cursor.h b/nx-X11/programs/Xserver/hw/nxagent/Cursor.h
index 38f09cd9c..b115dfa38 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Cursor.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Cursor.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Dialog.c b/nx-X11/programs/Xserver/hw/nxagent/Dialog.c
index 354f04120..e7d5ba077 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Dialog.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Dialog.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include <stdio.h>
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Dialog.h b/nx-X11/programs/Xserver/hw/nxagent/Dialog.h
index bd12f3097..8c345d8a7 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Dialog.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Dialog.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef __Dialog_H__
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c
index 15d1d2206..5943fbf77 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Display.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.h b/nx-X11/programs/Xserver/hw/nxagent/Display.h
index 1c12d6cea..fe8ae1d43 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Display.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
index bf88db38c..424f07ef3 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "dixstruct.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Drawable.h b/nx-X11/programs/Xserver/hw/nxagent/Drawable.h
index d05eebf19..6388d5c12 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Drawable.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Drawable.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef __Drawable_H__
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Error.c b/nx-X11/programs/Xserver/hw/nxagent/Error.c
index df62cf4f7..05d0f3081 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Error.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Error.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include <stdio.h>
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Error.h b/nx-X11/programs/Xserver/hw/nxagent/Error.h
index 51d6171da..1d0d9a827 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Error.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Error.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef __Error_H__
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c
index d94a76a21..6cc7b85d6 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Events.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "X.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.h b/nx-X11/programs/Xserver/hw/nxagent/Events.h
index 02b2b8cbe..7d313c331 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Events.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Events.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef __Events_H__
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Extensions.c b/nx-X11/programs/Xserver/hw/nxagent/Extensions.c
index 4af925681..d9db1a8aa 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Extensions.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Extensions.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "micmap.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Extensions.h b/nx-X11/programs/Xserver/hw/nxagent/Extensions.h
index 5335cf87c..9b3672f5a 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Extensions.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Extensions.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.c b/nx-X11/programs/Xserver/hw/nxagent/Font.c
index 2ef471ab1..3d0cc4264 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Font.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Font.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.h b/nx-X11/programs/Xserver/hw/nxagent/Font.h
index 873efba51..c5b236562 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Font.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Font.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/GC.c b/nx-X11/programs/Xserver/hw/nxagent/GC.c
index 1c1a77f37..abe66602a 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/GC.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/GC.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c
index a50a830f9..8961ff6f7 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/GCOps.h b/nx-X11/programs/Xserver/hw/nxagent/GCOps.h
index 725b382c5..bbf7fa3df 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/GCOps.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/GCOps.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/GCs.h b/nx-X11/programs/Xserver/hw/nxagent/GCs.h
index bbd090dcc..84b0063ab 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/GCs.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/GCs.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
index 62cc54990..36244c4a3 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "dixstruct.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Handlers.h b/nx-X11/programs/Xserver/hw/nxagent/Handlers.h
index 0ef8b9ac2..ddae097da 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef __Handlers_H__
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Holder.c b/nx-X11/programs/Xserver/hw/nxagent/Holder.c
index db43acafc..aae48471b 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Holder.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Holder.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include <signal.h>
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Holder.h b/nx-X11/programs/Xserver/hw/nxagent/Holder.h
index c39b98780..d1378ee03 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Holder.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Holder.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef __Holder_H__
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Icons.h b/nx-X11/programs/Xserver/hw/nxagent/Icons.h
index b307f42e6..a87a5a112 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Icons.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Icons.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef __Icons_H__
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Image.c b/nx-X11/programs/Xserver/hw/nxagent/Image.c
index 8cc8962cc..5638765f2 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Image.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Image.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "scrnintstr.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Image.h b/nx-X11/programs/Xserver/hw/nxagent/Image.h
index 57272ab18..771c0dbe1 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Image.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Image.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef __Image_H__
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c
index 3ec9fa14a..d740fcc26 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Init.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c
@@ -1,18 +1,31 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
@@ -224,8 +237,13 @@ void InitOutput(ScreenInfo *screenInfo, int argc, char *argv[])
   if (serverGeneration <= 1)
   {
     fprintf(stderr, "\nNXAGENT - Version " NXAGENT_VERSION_STRING "\n\n");
-    fprintf(stderr, "Copyright (C) 2001, 2011 NoMachine.\n");
-    fprintf(stderr, "See http://www.nomachine.com/ for more information.\n\n");
+    fprintf(stderr, "Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)\n");
+    fprintf(stderr, "Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>\n");
+    fprintf(stderr, "Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 \n");
+    fprintf(stderr, "COPYRIGHT_ULI\n");
+    fprintf(stderr, "Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>\n");
+    fprintf(stderr, "Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)\n");
+    fprintf(stderr, "See https://github.com/ArcticaProject/nx-libs for more information.\n\n");
 
     fprintf(stderr, "Info: Agent running with pid '%d'.\n", getpid());
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.h b/nx-X11/programs/Xserver/hw/nxagent/Init.h
index b516c7b34..29b1100e7 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Init.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
index 921aa73a0..3bff638fb 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.h b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.h
index 036eec57f..368d5d843 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
index 212fcd93c..8dc1a0b85 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "X.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.h b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.h
index d9575c875..45791f9ba 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef __Keystroke_H__
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Literals.h b/nx-X11/programs/Xserver/hw/nxagent/Literals.h
index aaa3430d6..c0bb8c5d7 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Literals.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Literals.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Millis.c b/nx-X11/programs/Xserver/hw/nxagent/Millis.c
index e9c739eeb..ba801b62a 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Millis.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Millis.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include <time.h>
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Millis.h b/nx-X11/programs/Xserver/hw/nxagent/Millis.h
index 69d247bbc..1e76ccbfb 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Millis.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Millis.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef __Millis_H__
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdamage.c b/nx-X11/programs/Xserver/hw/nxagent/NXdamage.c
index 1e38722ce..e6f251a51 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXdamage.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXdamage.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
index 215d06b53..aed923ef1 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /* $XdotOrg: xc/programs/Xserver/dix/dispatch.c,v 1.13 2005/09/13 01:33:19 daniels Exp $ */
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c b/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c
index 21a0cb0a8..1433e3efa 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /* $XdotOrg: xc/programs/Xserver/dix/dixfonts.c,v 1.8 2005/07/03 08:53:38 daniels Exp $ */
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXevents.c b/nx-X11/programs/Xserver/hw/nxagent/NXevents.c
index d19e161ac..e9534eb62 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXevents.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXevents.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /* $XdotOrg: xc/programs/Xserver/dix/events.c,v 1.17 2005/08/25 22:11:04 anholt Exp $ */
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXextension.c b/nx-X11/programs/Xserver/hw/nxagent/NXextension.c
index 71478fcc4..1b5bcb771 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXextension.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXextension.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /* $XFree86: xc/programs/Xserver/dix/extension.c,v 3.11 2001/12/14 19:59:31 dawes Exp $ */
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglxext.c b/nx-X11/programs/Xserver/hw/nxagent/NXglxext.c
index 2c3383dd5..e30f69495 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXglxext.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXglxext.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /* $XFree86: xc/programs/Xserver/GL/glx/glxext.c,v 1.9 2003/09/28 20:15:43 alanh Exp $
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglyph.c b/nx-X11/programs/Xserver/hw/nxagent/NXglyph.c
index f2885d39c..5d6deae6e 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXglyph.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXglyph.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c b/nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c
index 430fb6baf..14ead9614 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /************************************************************************
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglyphstr_GlyphRef.h b/nx-X11/programs/Xserver/hw/nxagent/NXglyphstr_GlyphRef.h
index 6239b113e..ce2414453 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXglyphstr_GlyphRef.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXglyphstr_GlyphRef.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglyphstr_GlyphSet.h b/nx-X11/programs/Xserver/hw/nxagent/NXglyphstr_GlyphSet.h
index 9f6ab45e6..44756a28f 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXglyphstr_GlyphSet.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXglyphstr_GlyphSet.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c b/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c
index 0ef38630f..4cb1e658e 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /* $XdotOrg: xc/programs/Xserver/mi/miexpose.c,v 1.6 2005/07/03 08:53:51 daniels Exp $ */
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXmiglyph.c b/nx-X11/programs/Xserver/hw/nxagent/NXmiglyph.c
index 15798bc77..9eb02b045 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXmiglyph.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXmiglyph.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXmitrap.c b/nx-X11/programs/Xserver/hw/nxagent/NXmitrap.c
index 8db856d0a..a43a36bf1 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXmitrap.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXmitrap.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c b/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c
index 83133cb36..1188d06bf 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXpicturestr_PictSolidFill.h b/nx-X11/programs/Xserver/hw/nxagent/NXpicturestr_PictSolidFill.h
index e54bfafc2..9cd73db5c 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXpicturestr_PictSolidFill.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXpicturestr_PictSolidFill.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c
index 154d85b41..ca76a0be8 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /* $XFree86: xc/programs/Xserver/dix/property.c,v 3.12 2002/02/19 11:09:22 alanh Exp $ */
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c b/nx-X11/programs/Xserver/hw/nxagent/NXrender.c
index 61cf7e9e3..b8c5cdbd2 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXrender.c
@@ -1,4 +1,28 @@
-/* $XdotOrg: xc/programs/Xserver/render/render.c,v 1.12 2005/08/28 19:47:39 ajax Exp $ */
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXAGENT, NX protocol compression and NX extensions to this software    */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
 /*
  * $XFree86: xc/programs/Xserver/render/render.c,v 1.27tsi Exp $
  *
@@ -24,23 +48,6 @@
  * Author:  Keith Packard, SuSE, Inc.
  */
 
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
-/*                                                                        */
-/* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
 #include "../render/render.c"
 
 #include "Trap.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXresource.c b/nx-X11/programs/Xserver/hw/nxagent/NXresource.c
index eb48c5094..d7a5a8ba2 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXresource.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXresource.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /************************************************************
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c
index 28b42d676..f7efe31ea 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /* $XFree86: xc/programs/Xserver/Xext/shm.c,v 3.41 2003/12/17 23:28:56 alanh Exp $ */
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
index 0071a15d0..326fe7d75 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /* $XdotOrg: xc/programs/Xserver/dix/window.c,v 1.12 2005/07/03 08:53:38 daniels Exp $ */
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c b/nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c
index ee95da66c..d1968abc0 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /* $XdotOrg: xc/programs/Xserver/Xext/xvdisp.c,v 1.6 2005/07/03 08:53:36 daniels Exp $ */
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Options.c b/nx-X11/programs/Xserver/hw/nxagent/Options.c
index d0ba8aff5..0a894f9a4 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Options.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Options.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include <stdio.h>
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Options.h b/nx-X11/programs/Xserver/hw/nxagent/Options.h
index 257a332f2..df6f8b65b 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Options.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Options.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef __Options_H__
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixels.c b/nx-X11/programs/Xserver/hw/nxagent/Pixels.c
index d3ab9dd2f..e59ef97ab 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Pixels.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Pixels.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include <stdio.h>
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixels.h b/nx-X11/programs/Xserver/hw/nxagent/Pixels.h
index 4a02d80e5..fa25a46c7 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Pixels.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Pixels.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef __Pixels_H__
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
index 931c564dc..894d749a2 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "scrnintstr.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixmaps.h b/nx-X11/programs/Xserver/hw/nxagent/Pixmaps.h
index fcfc133d5..d823cd77b 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Pixmaps.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Pixmaps.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef __Pixmap_H__
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pointer.c b/nx-X11/programs/Xserver/hw/nxagent/Pointer.c
index 8a8ed85b1..20daec2a3 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Pointer.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Pointer.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pointer.h b/nx-X11/programs/Xserver/hw/nxagent/Pointer.h
index 3b9ccce15..85162d4a5 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Pointer.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Pointer.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
index 74c7587c7..c20386ea1 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include <signal.h>
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.h b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.h
index 5be2928b8..d1c62166b 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef __Reconnect_H__
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/Render.c
index 4c9edb849..7ce204c3c 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Render.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "picturestr.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Render.h b/nx-X11/programs/Xserver/hw/nxagent/Render.h
index 54fe5452a..1c56ec16b 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Render.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Render.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef __Render_H__
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c
index d5c6e71c9..59b588738 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "X.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Rootless.h b/nx-X11/programs/Xserver/hw/nxagent/Rootless.h
index f502b54c3..062e164f4 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Rootless.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Rootless.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef __Rootless_H__
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index 152040fbd..00793c505 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.h b/nx-X11/programs/Xserver/hw/nxagent/Screen.h
index aab2a5e7c..caefbb027 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Splash.c b/nx-X11/programs/Xserver/hw/nxagent/Splash.c
index 35cb7cea9..0d3c2ff22 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Splash.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "windowstr.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Splash.h b/nx-X11/programs/Xserver/hw/nxagent/Splash.h
index 7a987d17e..444f1eed0 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Splash.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef __Splash_H__
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Split.c b/nx-X11/programs/Xserver/hw/nxagent/Split.c
index 3b7961c9c..61a749395 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Split.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Split.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "scrnintstr.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Split.h b/nx-X11/programs/Xserver/hw/nxagent/Split.h
index 2be449a18..65db133bd 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Split.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Split.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef __Split_H__
diff --git a/nx-X11/programs/Xserver/hw/nxagent/TestExt.c b/nx-X11/programs/Xserver/hw/nxagent/TestExt.c
index 30fe1968e..51a2ecb3d 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/TestExt.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/TestExt.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Trap.c b/nx-X11/programs/Xserver/hw/nxagent/Trap.c
index f5e6bde0e..c582f6a16 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Trap.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Trap.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "Trap.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Trap.h b/nx-X11/programs/Xserver/hw/nxagent/Trap.h
index 9258e3b67..f0884f657 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Trap.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Trap.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef __Traps_H__
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Utils.h b/nx-X11/programs/Xserver/hw/nxagent/Utils.h
index ef8c4c714..a3cbc2e9f 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Utils.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Utils.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef __Utils_H__
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Visual.c b/nx-X11/programs/Xserver/hw/nxagent/Visual.c
index b086c0e9a..eebd1fcc1 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Visual.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Visual.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Visual.h b/nx-X11/programs/Xserver/hw/nxagent/Visual.h
index 8436f79ad..70799f3f8 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Visual.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Visual.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c
index 514ee5140..e39afe240 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Window.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include <unistd.h>
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Windows.h b/nx-X11/programs/Xserver/hw/nxagent/Windows.h
index dedb60299..8612cdf82 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Windows.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Windows.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef __Window_H__
diff --git a/nx-X11/programs/Xserver/hw/nxagent/nxagent.xpm b/nx-X11/programs/Xserver/hw/nxagent/nxagent.xpm
index dd8be6cb3..bcdaa2204 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/nxagent.xpm
+++ b/nx-X11/programs/Xserver/hw/nxagent/nxagent.xpm
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /* XPM */ 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/nxmissing.xpm b/nx-X11/programs/Xserver/hw/nxagent/nxmissing.xpm
index 854e0a611..3fb4362d1 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/nxmissing.xpm
+++ b/nx-X11/programs/Xserver/hw/nxagent/nxmissing.xpm
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 static char *placeholderXpm[] = {
diff --git a/nx-X11/programs/Xserver/hw/nxagent/os2Stub.c b/nx-X11/programs/Xserver/hw/nxagent/os2Stub.c
index 9ec7e6bc8..226140dc5 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/os2Stub.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/os2Stub.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/screensaver b/nx-X11/programs/Xserver/hw/nxagent/screensaver
index ef7cd661a..a9ca85114 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/screensaver
+++ b/nx-X11/programs/Xserver/hw/nxagent/screensaver
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #define screensaver_width 256
diff --git a/nx-X11/programs/Xserver/hw/nxagent/x2go.xpm b/nx-X11/programs/Xserver/hw/nxagent/x2go.xpm
index fbe245d0f..46a74eab9 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/x2go.xpm
+++ b/nx-X11/programs/Xserver/hw/nxagent/x2go.xpm
@@ -1,3 +1,18 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright 2008 Heinz-M. Graesing <heinz-m.graesing@obviously-nice.de>  */
+/*                                                                        */
+/* NXAGENT, NX protocol compression and NX extensions to this software    */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/**************************************************************************/
+
 /* XPM */
 static char  *x2goagentIconData[]={
 "128 128 17 1",
diff --git a/nx-X11/programs/Xserver/mi/Imakefile b/nx-X11/programs/Xserver/mi/Imakefile
index 18a04517f..9f7b062df 100644
--- a/nx-X11/programs/Xserver/mi/Imakefile
+++ b/nx-X11/programs/Xserver/mi/Imakefile
@@ -1,23 +1,28 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
-/* NX-X11, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* nx-X11, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
-XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:53:36 cpqbld Exp $
-XCOMM $XFree86: xc/programs/Xserver/mi/Imakefile,v 3.34 2002/05/22 21:38:31 herrb Exp $
-
 NULL =
 
 #include <Server.tmpl>
diff --git a/nx-X11/programs/Xserver/os/Imakefile b/nx-X11/programs/Xserver/os/Imakefile
index 802725306..60a005fb6 100644
--- a/nx-X11/programs/Xserver/os/Imakefile
+++ b/nx-X11/programs/Xserver/os/Imakefile
@@ -1,27 +1,28 @@
-XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:53:40 cpqbld Exp $
-
-
-
-
-XCOMM $XFree86: xc/programs/Xserver/os/Imakefile,v 3.40 2003/09/09 03:20:41 dawes Exp $
-
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
-/*                                                                        */
-/* NX-X11, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
+/* nx-X11, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
- 
+
 #include <Server.tmpl>
 
 /*
diff --git a/nx-X11/programs/Xserver/os/WaitFor.c b/nx-X11/programs/Xserver/os/WaitFor.c
index 0f23c9d4a..2858637fa 100644
--- a/nx-X11/programs/Xserver/os/WaitFor.c
+++ b/nx-X11/programs/Xserver/os/WaitFor.c
@@ -1,4 +1,28 @@
-/* $XFree86: xc/programs/Xserver/os/WaitFor.c,v 3.42 2003/10/16 01:33:35 dawes Exp $ */
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* nx-X11, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -46,25 +70,6 @@ SOFTWARE.
 
 ******************************************************************/
 
-/* $Xorg: WaitFor.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */
-
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
-/*                                                                        */
-/* NX-X11, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
 /*****************************************************************
  * OS Dependent input routines:
  *
diff --git a/nx-X11/programs/Xserver/os/auth.c b/nx-X11/programs/Xserver/os/auth.c
index 587e0d5ec..84bc5c3c6 100644
--- a/nx-X11/programs/Xserver/os/auth.c
+++ b/nx-X11/programs/Xserver/os/auth.c
@@ -1,4 +1,28 @@
-/* $Xorg: auth.c,v 1.5 2001/02/09 02:05:23 xorgcvs Exp $ */
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* nx-X11, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
 /*
 
 Copyright 1988, 1998  The Open Group
@@ -26,24 +50,6 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: auth.c,v 1.13 2003/04/27 21:31:08 herrb Exp $ */
-
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
-/*                                                                        */
-/* NX-X11, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
 
 /*
  * authorization hooks for the server
diff --git a/nx-X11/programs/Xserver/os/log.c b/nx-X11/programs/Xserver/os/log.c
index d8640b5fd..e964896d7 100644
--- a/nx-X11/programs/Xserver/os/log.c
+++ b/nx-X11/programs/Xserver/os/log.c
@@ -1,3 +1,28 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* nx-X11, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
 /*
 
 Copyright 1987, 1998  The Open Group
@@ -76,25 +101,6 @@ OR PERFORMANCE OF THIS SOFTWARE.
  * authorization from the copyright holder(s) and author(s).
  */
 
-/* $XFree86: xc/programs/Xserver/os/log.c,v 1.6 2003/11/07 13:45:27 tsi Exp $ */
-
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
-/*                                                                        */
-/* NX-X11, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c
index 43d92ed98..a6982a3e2 100644
--- a/nx-X11/programs/Xserver/os/utils.c
+++ b/nx-X11/programs/Xserver/os/utils.c
@@ -1,5 +1,28 @@
-/* $XdotOrg: xc/programs/Xserver/os/utils.c,v 1.21 2005/11/08 06:33:30 jkj Exp $ */
-/* $Xorg: utils.c,v 1.5 2001/02/09 02:05:24 xorgcvs Exp $ */
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* nx-X11, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
 /*
 
 Copyright 1987, 1998  The Open Group
@@ -50,24 +73,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
 OR PERFORMANCE OF THIS SOFTWARE.
 
 */
-/* $XFree86: xc/programs/Xserver/os/utils.c,v 3.96 2004/01/07 04:16:37 dawes Exp $ */
-
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
-/*                                                                        */
-/* NX-X11, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
diff --git a/nx-X11/programs/Xserver/randr/Imakefile b/nx-X11/programs/Xserver/randr/Imakefile
index 2959e05ab..6c5c89450 100644
--- a/nx-X11/programs/Xserver/randr/Imakefile
+++ b/nx-X11/programs/Xserver/randr/Imakefile
@@ -1,20 +1,28 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
-/* NX-X11, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* nx-X11, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
-XCOMM $XFree86: xc/programs/Xserver/randr/Imakefile,v 1.1 2001/05/23 03:29:44 keithp Exp $
+
 #include <Server.tmpl>
 
        NULL =
diff --git a/nx-X11/programs/Xserver/randr/randr.c b/nx-X11/programs/Xserver/randr/randr.c
index 4c8576633..b29c3c888 100644
--- a/nx-X11/programs/Xserver/randr/randr.c
+++ b/nx-X11/programs/Xserver/randr/randr.c
@@ -1,3 +1,28 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* nx-X11, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
 /*
  * Copyright © 2000 Compaq Computer Corporation
  * Copyright © 2002 Hewlett-Packard Company
@@ -25,23 +50,6 @@
  *	    Keith Packard, Intel Corporation
  */
 
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
-/*                                                                        */
-/* NX-X11, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
diff --git a/nx-X11/programs/Xserver/randr/rrcrtc.c b/nx-X11/programs/Xserver/randr/rrcrtc.c
index 9bc504e66..5ba66d5a6 100644
--- a/nx-X11/programs/Xserver/randr/rrcrtc.c
+++ b/nx-X11/programs/Xserver/randr/rrcrtc.c
@@ -1,3 +1,28 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* nx-X11, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
 /*
  * Copyright © 2006 Keith Packard
  * Copyright 2010 Red Hat, Inc
@@ -21,23 +46,6 @@
  * OF THIS SOFTWARE.
  */
 
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
-/*                                                                        */
-/* NX-X11, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
 #include "randrstr.h"
 #include "swaprep.h"
 #include "mipointer.h"
diff --git a/nx-X11/programs/Xserver/randr/rrmode.c b/nx-X11/programs/Xserver/randr/rrmode.c
index db832d8f5..a2bbec7d9 100644
--- a/nx-X11/programs/Xserver/randr/rrmode.c
+++ b/nx-X11/programs/Xserver/randr/rrmode.c
@@ -1,3 +1,28 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* nx-X11, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
 /*
  * Copyright © 2006 Keith Packard
  *
@@ -20,23 +45,6 @@
  * OF THIS SOFTWARE.
  */
 
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
-/*                                                                        */
-/* NX-X11, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
 #include "randrstr.h"
 
 RESTYPE RRModeType;
diff --git a/nx-X11/programs/Xserver/randr/rrscreen.c b/nx-X11/programs/Xserver/randr/rrscreen.c
index 9f0476815..bdb8b6dd3 100644
--- a/nx-X11/programs/Xserver/randr/rrscreen.c
+++ b/nx-X11/programs/Xserver/randr/rrscreen.c
@@ -1,3 +1,28 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* nx-X11, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
 /*
  * Copyright © 2006 Keith Packard
  *
@@ -20,23 +45,6 @@
  * OF THIS SOFTWARE.
  */
 
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
-/*                                                                        */
-/* NX-X11, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
 #include "randrstr.h"
 
 static CARD16
diff --git a/nx-X11/programs/Xserver/randr/rrxinerama.c b/nx-X11/programs/Xserver/randr/rrxinerama.c
index be1c0abce..5c80e52db 100644
--- a/nx-X11/programs/Xserver/randr/rrxinerama.c
+++ b/nx-X11/programs/Xserver/randr/rrxinerama.c
@@ -1,3 +1,28 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* nx-X11, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
 /*
  * Copyright © 2006 Keith Packard
  *
@@ -68,23 +93,6 @@
  *           David Thomas <davtom@dream.org.uk>.
  */
 
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
-/*                                                                        */
-/* NX-X11, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
-/*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
 #include "randrstr.h"
 #include "swaprep.h"
 #include "panoramiXproto.h"
diff --git a/nxcomp/ActionCache.cpp b/nxcomp/ActionCache.cpp
index 79b670021..8ad7f7ba2 100644
--- a/nxcomp/ActionCache.cpp
+++ b/nxcomp/ActionCache.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "Control.h"
diff --git a/nxcomp/ActionCache.h b/nxcomp/ActionCache.h
index 23265fcf2..2aedd4a07 100644
--- a/nxcomp/ActionCache.h
+++ b/nxcomp/ActionCache.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef ActionCache_H
diff --git a/nxcomp/Agent.cpp b/nxcomp/Agent.cpp
index c0b729d06..cd65101b3 100644
--- a/nxcomp/Agent.cpp
+++ b/nxcomp/Agent.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "Misc.h"
diff --git a/nxcomp/Agent.h b/nxcomp/Agent.h
index 2c5badf53..3e1a50ae5 100644
--- a/nxcomp/Agent.h
+++ b/nxcomp/Agent.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef Agent_H
diff --git a/nxcomp/Alpha.cpp b/nxcomp/Alpha.cpp
index 931101495..31a31f7cb 100644
--- a/nxcomp/Alpha.cpp
+++ b/nxcomp/Alpha.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "Misc.h"
diff --git a/nxcomp/Alpha.h b/nxcomp/Alpha.h
index 80620e1aa..ea5068812 100644
--- a/nxcomp/Alpha.h
+++ b/nxcomp/Alpha.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef Alpha_H
diff --git a/nxcomp/Auth.cpp b/nxcomp/Auth.cpp
index c52392a51..bc047aa30 100644
--- a/nxcomp/Auth.cpp
+++ b/nxcomp/Auth.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "Auth.h"
diff --git a/nxcomp/Auth.h b/nxcomp/Auth.h
index aac1d1e3f..d51d9a26f 100644
--- a/nxcomp/Auth.h
+++ b/nxcomp/Auth.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef Auth_H
diff --git a/nxcomp/Bitmap.cpp b/nxcomp/Bitmap.cpp
index b5bad226a..fbc34a55e 100644
--- a/nxcomp/Bitmap.cpp
+++ b/nxcomp/Bitmap.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "Misc.h"
diff --git a/nxcomp/Bitmap.h b/nxcomp/Bitmap.h
index 57a1b35bb..8143e3125 100644
--- a/nxcomp/Bitmap.h
+++ b/nxcomp/Bitmap.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef Bitmap_H
diff --git a/nxcomp/BlockCache.cpp b/nxcomp/BlockCache.cpp
index f885290f0..76f7fd797 100644
--- a/nxcomp/BlockCache.cpp
+++ b/nxcomp/BlockCache.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include <string.h>
diff --git a/nxcomp/BlockCache.h b/nxcomp/BlockCache.h
index b9146ceea..48e586966 100644
--- a/nxcomp/BlockCache.h
+++ b/nxcomp/BlockCache.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef BlockCache_H
diff --git a/nxcomp/BlockCacheSet.cpp b/nxcomp/BlockCacheSet.cpp
index 8959ba2b3..3fd5e1ac7 100644
--- a/nxcomp/BlockCacheSet.cpp
+++ b/nxcomp/BlockCacheSet.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "Misc.h"
diff --git a/nxcomp/BlockCacheSet.h b/nxcomp/BlockCacheSet.h
index e27b18088..97273b0e0 100644
--- a/nxcomp/BlockCacheSet.h
+++ b/nxcomp/BlockCacheSet.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef BlockCacheSet_H
diff --git a/nxcomp/ChangeGC.cpp b/nxcomp/ChangeGC.cpp
index 574651763..f06984a10 100644
--- a/nxcomp/ChangeGC.cpp
+++ b/nxcomp/ChangeGC.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "ChangeGC.h"
diff --git a/nxcomp/ChangeGC.h b/nxcomp/ChangeGC.h
index 81b808d87..9cac90e66 100644
--- a/nxcomp/ChangeGC.h
+++ b/nxcomp/ChangeGC.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef ChangeGC_H
diff --git a/nxcomp/ChangeProperty.cpp b/nxcomp/ChangeProperty.cpp
index 0270d7274..dbfb8f5d7 100644
--- a/nxcomp/ChangeProperty.cpp
+++ b/nxcomp/ChangeProperty.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "ChangeProperty.h"
diff --git a/nxcomp/ChangeProperty.h b/nxcomp/ChangeProperty.h
index f941fced9..c06ce10fc 100644
--- a/nxcomp/ChangeProperty.h
+++ b/nxcomp/ChangeProperty.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef ChangeProperty_H
diff --git a/nxcomp/Channel.cpp b/nxcomp/Channel.cpp
index 93efa6343..41a09e951 100644
--- a/nxcomp/Channel.cpp
+++ b/nxcomp/Channel.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "Channel.h"
diff --git a/nxcomp/Channel.h b/nxcomp/Channel.h
index 68fe1d7e9..93b022630 100644
--- a/nxcomp/Channel.h
+++ b/nxcomp/Channel.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef Channel_H
diff --git a/nxcomp/ChannelCache.cpp b/nxcomp/ChannelCache.cpp
index eaf8e426b..5c4c360b9 100644
--- a/nxcomp/ChannelCache.cpp
+++ b/nxcomp/ChannelCache.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "ChannelCache.h"
diff --git a/nxcomp/ChannelCache.h b/nxcomp/ChannelCache.h
index c810a0b96..6a29c3847 100644
--- a/nxcomp/ChannelCache.h
+++ b/nxcomp/ChannelCache.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef ChannelCache_H
diff --git a/nxcomp/ChannelEndPoint.cpp b/nxcomp/ChannelEndPoint.cpp
index 3e3053927..82b8f782e 100644
--- a/nxcomp/ChannelEndPoint.cpp
+++ b/nxcomp/ChannelEndPoint.cpp
@@ -1,19 +1,27 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2015 Qindel Formacion y Servicios SL.                    */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
-/* This program is free software; you can redistribute it and/or modify   */
-/* it under the terms of the GNU General Public License Version 2, as     */
-/* published by the Free Software Foundation.                             */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* This program is distributed in the hope that it will be useful, but    */
-/* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTA-  */
-/* BILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General       */
-/* Public License for more details.                                       */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
-/* You should have received a copy of the GNU General Public License      */
-/* along with this program; if not, you can request a copy to Qindel      */
-/* or write to the Free Software Foundation, Inc., 59 Temple Place, Suite */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
 /* 330, Boston, MA  02111-1307 USA                                        */
 /*                                                                        */
 /* All rights reserved.                                                   */
diff --git a/nxcomp/ChannelEndPoint.h b/nxcomp/ChannelEndPoint.h
index 901952e37..3dc7db83d 100644
--- a/nxcomp/ChannelEndPoint.h
+++ b/nxcomp/ChannelEndPoint.h
@@ -1,19 +1,27 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2015 Qindel Formacion y Servicios SL.                    */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
-/* This program is free software; you can redistribute it and/or modify   */
-/* it under the terms of the GNU General Public License Version 2, as     */
-/* published by the Free Software Foundation.                             */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* This program is distributed in the hope that it will be useful, but    */
-/* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTA-  */
-/* BILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General       */
-/* Public License for more details.                                       */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
-/* You should have received a copy of the GNU General Public License      */
-/* along with this program; if not, you can request a copy to Qindel      */
-/* or write to the Free Software Foundation, Inc., 59 Temple Place, Suite */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
 /* 330, Boston, MA  02111-1307 USA                                        */
 /*                                                                        */
 /* All rights reserved.                                                   */
diff --git a/nxcomp/ChannelStore.h b/nxcomp/ChannelStore.h
index 3103fb308..53bb60f73 100644
--- a/nxcomp/ChannelStore.h
+++ b/nxcomp/ChannelStore.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef ChannelStore_H
diff --git a/nxcomp/CharCache.cpp b/nxcomp/CharCache.cpp
index 2803a1b1d..88e66e3da 100644
--- a/nxcomp/CharCache.cpp
+++ b/nxcomp/CharCache.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "CharCache.h"
diff --git a/nxcomp/CharCache.h b/nxcomp/CharCache.h
index 53710f181..b8891d2df 100644
--- a/nxcomp/CharCache.h
+++ b/nxcomp/CharCache.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef CharCache_H
diff --git a/nxcomp/Children.cpp b/nxcomp/Children.cpp
index a19b882e8..224a86f6d 100644
--- a/nxcomp/Children.cpp
+++ b/nxcomp/Children.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include <unistd.h>
diff --git a/nxcomp/ClearArea.cpp b/nxcomp/ClearArea.cpp
index 83b728158..b76e750a4 100644
--- a/nxcomp/ClearArea.cpp
+++ b/nxcomp/ClearArea.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "ClearArea.h"
diff --git a/nxcomp/ClearArea.h b/nxcomp/ClearArea.h
index 039eea44e..8067edffd 100644
--- a/nxcomp/ClearArea.h
+++ b/nxcomp/ClearArea.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef ClearArea_H
diff --git a/nxcomp/ClientCache.cpp b/nxcomp/ClientCache.cpp
index 49dc4ece5..b6c04dd0b 100644
--- a/nxcomp/ClientCache.cpp
+++ b/nxcomp/ClientCache.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "ClientCache.h"
diff --git a/nxcomp/ClientCache.h b/nxcomp/ClientCache.h
index 9ac263c71..ed3361097 100644
--- a/nxcomp/ClientCache.h
+++ b/nxcomp/ClientCache.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef ClientCache_H
diff --git a/nxcomp/ClientChannel.cpp b/nxcomp/ClientChannel.cpp
index 813e83bee..dbf5f6986 100644
--- a/nxcomp/ClientChannel.cpp
+++ b/nxcomp/ClientChannel.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include <string.h>
diff --git a/nxcomp/ClientChannel.h b/nxcomp/ClientChannel.h
index 5ec55595c..ae92648d5 100644
--- a/nxcomp/ClientChannel.h
+++ b/nxcomp/ClientChannel.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef ClientChannel_H
diff --git a/nxcomp/ClientProxy.cpp b/nxcomp/ClientProxy.cpp
index 7dd3dbbc6..4f8c828f9 100644
--- a/nxcomp/ClientProxy.cpp
+++ b/nxcomp/ClientProxy.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "Socket.h"
diff --git a/nxcomp/ClientProxy.h b/nxcomp/ClientProxy.h
index d58fae77b..b89785b1a 100644
--- a/nxcomp/ClientProxy.h
+++ b/nxcomp/ClientProxy.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef ClientProxy_H
diff --git a/nxcomp/ClientReadBuffer.cpp b/nxcomp/ClientReadBuffer.cpp
index 14aca3240..37502038f 100644
--- a/nxcomp/ClientReadBuffer.cpp
+++ b/nxcomp/ClientReadBuffer.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "ClientReadBuffer.h"
diff --git a/nxcomp/ClientReadBuffer.h b/nxcomp/ClientReadBuffer.h
index 6dee630ac..c557417fa 100644
--- a/nxcomp/ClientReadBuffer.h
+++ b/nxcomp/ClientReadBuffer.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef ClientReadBuffer_H
diff --git a/nxcomp/ClientStore.cpp b/nxcomp/ClientStore.cpp
index d56019258..e1ba3f4a7 100644
--- a/nxcomp/ClientStore.cpp
+++ b/nxcomp/ClientStore.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "ClientStore.h"
diff --git a/nxcomp/ClientStore.h b/nxcomp/ClientStore.h
index 54a68a309..009d87d9f 100644
--- a/nxcomp/ClientStore.h
+++ b/nxcomp/ClientStore.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef ClientStore_H
diff --git a/nxcomp/Colormap.cpp b/nxcomp/Colormap.cpp
index 5702beca9..8579b7317 100644
--- a/nxcomp/Colormap.cpp
+++ b/nxcomp/Colormap.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "Misc.h"
diff --git a/nxcomp/Colormap.h b/nxcomp/Colormap.h
index e0056f86c..a96d003fa 100644
--- a/nxcomp/Colormap.h
+++ b/nxcomp/Colormap.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef Colormap_H
diff --git a/nxcomp/ConfigureWindow.cpp b/nxcomp/ConfigureWindow.cpp
index 995ab1831..7b0794269 100644
--- a/nxcomp/ConfigureWindow.cpp
+++ b/nxcomp/ConfigureWindow.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "ConfigureWindow.h"
diff --git a/nxcomp/ConfigureWindow.h b/nxcomp/ConfigureWindow.h
index bb511b0d4..e02c2aae1 100644
--- a/nxcomp/ConfigureWindow.h
+++ b/nxcomp/ConfigureWindow.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef ConfigureWindow_H
diff --git a/nxcomp/Control.cpp b/nxcomp/Control.cpp
index 93b3ff277..4469a9bf5 100644
--- a/nxcomp/Control.cpp
+++ b/nxcomp/Control.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "NX.h"
diff --git a/nxcomp/Control.h b/nxcomp/Control.h
index b3552e091..764fca2c1 100644
--- a/nxcomp/Control.h
+++ b/nxcomp/Control.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef Control_H
diff --git a/nxcomp/CopyArea.cpp b/nxcomp/CopyArea.cpp
index e384ce13c..3bff8d60e 100644
--- a/nxcomp/CopyArea.cpp
+++ b/nxcomp/CopyArea.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "CopyArea.h"
diff --git a/nxcomp/CopyArea.h b/nxcomp/CopyArea.h
index a811f3801..6b2617875 100644
--- a/nxcomp/CopyArea.h
+++ b/nxcomp/CopyArea.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef CopyArea_H
diff --git a/nxcomp/CreateGC.cpp b/nxcomp/CreateGC.cpp
index fab8bba10..30a2f674e 100644
--- a/nxcomp/CreateGC.cpp
+++ b/nxcomp/CreateGC.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "CreateGC.h"
diff --git a/nxcomp/CreateGC.h b/nxcomp/CreateGC.h
index b77f13c47..03e27d685 100644
--- a/nxcomp/CreateGC.h
+++ b/nxcomp/CreateGC.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef CreateGC_H
diff --git a/nxcomp/CreatePixmap.cpp b/nxcomp/CreatePixmap.cpp
index 403786747..93ca38fbb 100644
--- a/nxcomp/CreatePixmap.cpp
+++ b/nxcomp/CreatePixmap.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "CreatePixmap.h"
diff --git a/nxcomp/CreatePixmap.h b/nxcomp/CreatePixmap.h
index 1d742e452..0a3212dd9 100644
--- a/nxcomp/CreatePixmap.h
+++ b/nxcomp/CreatePixmap.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef CreatePixmap_H
diff --git a/nxcomp/DecodeBuffer.cpp b/nxcomp/DecodeBuffer.cpp
index 28c656cb2..456dee249 100644
--- a/nxcomp/DecodeBuffer.cpp
+++ b/nxcomp/DecodeBuffer.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "Misc.h"
diff --git a/nxcomp/DecodeBuffer.h b/nxcomp/DecodeBuffer.h
index 98f7bf35f..f5f84c54f 100644
--- a/nxcomp/DecodeBuffer.h
+++ b/nxcomp/DecodeBuffer.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef DecodeBuffer_H
diff --git a/nxcomp/EncodeBuffer.cpp b/nxcomp/EncodeBuffer.cpp
index afcf60a9e..a259aacb2 100644
--- a/nxcomp/EncodeBuffer.cpp
+++ b/nxcomp/EncodeBuffer.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "Misc.h"
diff --git a/nxcomp/EncodeBuffer.h b/nxcomp/EncodeBuffer.h
index c7ee0a3b0..67f6ff093 100644
--- a/nxcomp/EncodeBuffer.h
+++ b/nxcomp/EncodeBuffer.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef EncodeBuffer_H
diff --git a/nxcomp/FillPoly.cpp b/nxcomp/FillPoly.cpp
index 291cc2a4b..85fa8fdd1 100644
--- a/nxcomp/FillPoly.cpp
+++ b/nxcomp/FillPoly.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "FillPoly.h"
diff --git a/nxcomp/FillPoly.h b/nxcomp/FillPoly.h
index d926b6dee..4ceb96c09 100644
--- a/nxcomp/FillPoly.h
+++ b/nxcomp/FillPoly.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef FillPoly_H
diff --git a/nxcomp/Fork.cpp b/nxcomp/Fork.cpp
index 48faa2992..0120cb4a6 100644
--- a/nxcomp/Fork.cpp
+++ b/nxcomp/Fork.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include <unistd.h>
diff --git a/nxcomp/Fork.h b/nxcomp/Fork.h
index 9df9f4041..94238ed90 100644
--- a/nxcomp/Fork.h
+++ b/nxcomp/Fork.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 //
diff --git a/nxcomp/FreeCache.h b/nxcomp/FreeCache.h
index 01fa42cd8..bf5c801e5 100644
--- a/nxcomp/FreeCache.h
+++ b/nxcomp/FreeCache.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef FreeCache_H
diff --git a/nxcomp/GenericChannel.cpp b/nxcomp/GenericChannel.cpp
index bf72bf091..6fc049e70 100644
--- a/nxcomp/GenericChannel.cpp
+++ b/nxcomp/GenericChannel.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include <sys/types.h>
diff --git a/nxcomp/GenericChannel.h b/nxcomp/GenericChannel.h
index 10ae794bb..3df18f444 100644
--- a/nxcomp/GenericChannel.h
+++ b/nxcomp/GenericChannel.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef GenericChannel_H
diff --git a/nxcomp/GenericReadBuffer.cpp b/nxcomp/GenericReadBuffer.cpp
index b7b6d93f4..337ae2f61 100644
--- a/nxcomp/GenericReadBuffer.cpp
+++ b/nxcomp/GenericReadBuffer.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "GenericReadBuffer.h"
diff --git a/nxcomp/GenericReadBuffer.h b/nxcomp/GenericReadBuffer.h
index 6b1fdd1fa..5ea4d939d 100644
--- a/nxcomp/GenericReadBuffer.h
+++ b/nxcomp/GenericReadBuffer.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef GenericReadBuffer_H
diff --git a/nxcomp/GenericReply.cpp b/nxcomp/GenericReply.cpp
index f7ffe83dd..3d9a0d638 100644
--- a/nxcomp/GenericReply.cpp
+++ b/nxcomp/GenericReply.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "GenericReply.h"
diff --git a/nxcomp/GenericReply.h b/nxcomp/GenericReply.h
index 20786a8d2..e899b8467 100644
--- a/nxcomp/GenericReply.h
+++ b/nxcomp/GenericReply.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef GenericReply_H
diff --git a/nxcomp/GenericRequest.cpp b/nxcomp/GenericRequest.cpp
index fa34b89d2..5c342fcf7 100644
--- a/nxcomp/GenericRequest.cpp
+++ b/nxcomp/GenericRequest.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "GenericRequest.h"
diff --git a/nxcomp/GenericRequest.h b/nxcomp/GenericRequest.h
index 4f164523e..13ffea718 100644
--- a/nxcomp/GenericRequest.h
+++ b/nxcomp/GenericRequest.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef GenericRequest_H
diff --git a/nxcomp/GetImage.cpp b/nxcomp/GetImage.cpp
index 6be574dbb..f6481b61c 100644
--- a/nxcomp/GetImage.cpp
+++ b/nxcomp/GetImage.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "GetImage.h"
diff --git a/nxcomp/GetImage.h b/nxcomp/GetImage.h
index f48fb9079..1c3558d14 100644
--- a/nxcomp/GetImage.h
+++ b/nxcomp/GetImage.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef GetImage_H
diff --git a/nxcomp/GetImageReply.cpp b/nxcomp/GetImageReply.cpp
index bea3ee84d..9b99d38e7 100644
--- a/nxcomp/GetImageReply.cpp
+++ b/nxcomp/GetImageReply.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "GetImageReply.h"
diff --git a/nxcomp/GetImageReply.h b/nxcomp/GetImageReply.h
index 0fd152122..d4f7c4267 100644
--- a/nxcomp/GetImageReply.h
+++ b/nxcomp/GetImageReply.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef GetImageReply_H
diff --git a/nxcomp/GetProperty.cpp b/nxcomp/GetProperty.cpp
index d358f8a6f..a79ebd64a 100644
--- a/nxcomp/GetProperty.cpp
+++ b/nxcomp/GetProperty.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "GetProperty.h"
diff --git a/nxcomp/GetProperty.h b/nxcomp/GetProperty.h
index a73425354..46727280b 100644
--- a/nxcomp/GetProperty.h
+++ b/nxcomp/GetProperty.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef GetProperty_H
diff --git a/nxcomp/GetPropertyReply.cpp b/nxcomp/GetPropertyReply.cpp
index 4a906e70a..2d0657a4a 100644
--- a/nxcomp/GetPropertyReply.cpp
+++ b/nxcomp/GetPropertyReply.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "GetPropertyReply.h"
diff --git a/nxcomp/GetPropertyReply.h b/nxcomp/GetPropertyReply.h
index f8d53ba0f..01634b408 100644
--- a/nxcomp/GetPropertyReply.h
+++ b/nxcomp/GetPropertyReply.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef GetPropertyReply_H
diff --git a/nxcomp/ImageText16.cpp b/nxcomp/ImageText16.cpp
index 569fdbe13..f3315d4ba 100644
--- a/nxcomp/ImageText16.cpp
+++ b/nxcomp/ImageText16.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "ImageText16.h"
diff --git a/nxcomp/ImageText16.h b/nxcomp/ImageText16.h
index 0e116a4fe..98462ab35 100644
--- a/nxcomp/ImageText16.h
+++ b/nxcomp/ImageText16.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef ImageText16_H
diff --git a/nxcomp/ImageText8.cpp b/nxcomp/ImageText8.cpp
index 161977677..b0d6ac44e 100644
--- a/nxcomp/ImageText8.cpp
+++ b/nxcomp/ImageText8.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "ImageText8.h"
diff --git a/nxcomp/ImageText8.h b/nxcomp/ImageText8.h
index c56502f90..aa9ccb5d9 100644
--- a/nxcomp/ImageText8.h
+++ b/nxcomp/ImageText8.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef ImageText8_H
diff --git a/nxcomp/IntCache.cpp b/nxcomp/IntCache.cpp
index 8262d5605..362412182 100644
--- a/nxcomp/IntCache.cpp
+++ b/nxcomp/IntCache.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include <string.h>
diff --git a/nxcomp/IntCache.h b/nxcomp/IntCache.h
index 15cc8ea53..69c522325 100644
--- a/nxcomp/IntCache.h
+++ b/nxcomp/IntCache.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef IntCache_H
diff --git a/nxcomp/InternAtom.cpp b/nxcomp/InternAtom.cpp
index d90c8c058..760d72222 100644
--- a/nxcomp/InternAtom.cpp
+++ b/nxcomp/InternAtom.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "InternAtom.h"
diff --git a/nxcomp/InternAtom.h b/nxcomp/InternAtom.h
index f7f366dce..6e69eca24 100644
--- a/nxcomp/InternAtom.h
+++ b/nxcomp/InternAtom.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef InternAtom_H
diff --git a/nxcomp/Jpeg.cpp b/nxcomp/Jpeg.cpp
index 414d373ef..54fa71d21 100644
--- a/nxcomp/Jpeg.cpp
+++ b/nxcomp/Jpeg.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include <X11/Xmd.h>
diff --git a/nxcomp/Jpeg.h b/nxcomp/Jpeg.h
index f3743d07a..58a5bffef 100644
--- a/nxcomp/Jpeg.h
+++ b/nxcomp/Jpeg.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef Jpeg_H
diff --git a/nxcomp/Keeper.cpp b/nxcomp/Keeper.cpp
index fd9b79f45..7e8cd0cd7 100644
--- a/nxcomp/Keeper.cpp
+++ b/nxcomp/Keeper.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include <stdio.h>
diff --git a/nxcomp/Keeper.h b/nxcomp/Keeper.h
index c357b2116..b440beceb 100644
--- a/nxcomp/Keeper.h
+++ b/nxcomp/Keeper.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef Keeper_H
diff --git a/nxcomp/List.cpp b/nxcomp/List.cpp
index 1ba104b59..228f83214 100644
--- a/nxcomp/List.cpp
+++ b/nxcomp/List.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "List.h"
diff --git a/nxcomp/List.h b/nxcomp/List.h
index b5e41ae11..31c80f835 100644
--- a/nxcomp/List.h
+++ b/nxcomp/List.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef List_H
diff --git a/nxcomp/ListFontsReply.cpp b/nxcomp/ListFontsReply.cpp
index 84acaba25..827f68a09 100644
--- a/nxcomp/ListFontsReply.cpp
+++ b/nxcomp/ListFontsReply.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "ListFontsReply.h"
diff --git a/nxcomp/ListFontsReply.h b/nxcomp/ListFontsReply.h
index 549b7d1c1..c731878e0 100644
--- a/nxcomp/ListFontsReply.h
+++ b/nxcomp/ListFontsReply.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef ListFontsReply_H
diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 6bec5e30d..c0951ee19 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include <stdio.h>
diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in
index ee12c3dbb..f18875524 100644
--- a/nxcomp/Makefile.in
+++ b/nxcomp/Makefile.in
@@ -1,19 +1,27 @@
-############################################################################
-#                                                                          #
-#  Copyright (c) 2001, 2010 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       #
-#  software is allowed according to terms specified in the file LICENSE    #
-#  which comes in the source distribution.                                 #
-#                                                                          #
-#  Check http://www.nomachine.com/licensing.html for applicability.        #
-#                                                                          #
-#  NX and NoMachine are trademarks of Medialogic S.p.A.                    #
-#                                                                          #
-#  All rights reserved.                                                    #
-#                                                                          #
-############################################################################
+#/**************************************************************************/
+#/*                                                                        */
+#/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+#/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+#/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+#/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+#/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+#/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+#/*                                                                        */
+#/* NXCOMP, NX protocol compression and NX extensions to this software     */
+#/* are copyright of the aforementioned persons and companies.             */
+#/*                                                                        */
+#/* Redistribution and use of the present software is allowed according    */
+#/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+#/* source distribution.                                                   */
+#/*                                                                        */
+#/* All rights reserved.                                                   */
+#/*                                                                        */
+#/* NOTE: This software has received contributions from various other      */
+#/* contributors, only the core maintainers and supporters are listed as   */
+#/* copyright holders. Please contact us, if you feel you should be listed */
+#/* as copyright holder, as well.                                          */
+#/*                                                                        */
+#/**************************************************************************/
 
 #
 # Get these values from the configure script. The
diff --git a/nxcomp/Message.cpp b/nxcomp/Message.cpp
index ccafa9963..530b6b5a8 100644
--- a/nxcomp/Message.cpp
+++ b/nxcomp/Message.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include <cstdio>
diff --git a/nxcomp/Message.h b/nxcomp/Message.h
index c10cb266f..30883f101 100644
--- a/nxcomp/Message.h
+++ b/nxcomp/Message.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef Message_H
diff --git a/nxcomp/Misc.cpp b/nxcomp/Misc.cpp
index 3c73f54d3..ca062ebed 100644
--- a/nxcomp/Misc.cpp
+++ b/nxcomp/Misc.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include <cstdio>
diff --git a/nxcomp/Misc.h b/nxcomp/Misc.h
index 0cc396933..997630137 100644
--- a/nxcomp/Misc.h
+++ b/nxcomp/Misc.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef Misc_H
diff --git a/nxcomp/NX.h b/nxcomp/NX.h
index 1ed8cb62d..7ec79b4b1 100644
--- a/nxcomp/NX.h
+++ b/nxcomp/NX.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef NX_H
diff --git a/nxcomp/NXalert.h b/nxcomp/NXalert.h
index 2f01a3071..dca2f44ca 100644
--- a/nxcomp/NXalert.h
+++ b/nxcomp/NXalert.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef NXalert_H
diff --git a/nxcomp/NXmitshm.h b/nxcomp/NXmitshm.h
index aa79ec8ae..939d488fb 100644
--- a/nxcomp/NXmitshm.h
+++ b/nxcomp/NXmitshm.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef NXmitshm_H
diff --git a/nxcomp/NXpack.h b/nxcomp/NXpack.h
index de1c0f0d9..3eade6855 100644
--- a/nxcomp/NXpack.h
+++ b/nxcomp/NXpack.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef NXpack_H
diff --git a/nxcomp/NXproto.h b/nxcomp/NXproto.h
index ce25cc4c7..7b988bdbf 100644
--- a/nxcomp/NXproto.h
+++ b/nxcomp/NXproto.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef NXproto_H
diff --git a/nxcomp/NXrender.h b/nxcomp/NXrender.h
index bc359f273..280715833 100644
--- a/nxcomp/NXrender.h
+++ b/nxcomp/NXrender.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef NXrender_H
diff --git a/nxcomp/NXvars.h b/nxcomp/NXvars.h
index 3bee6d3ed..f514000d7 100644
--- a/nxcomp/NXvars.h
+++ b/nxcomp/NXvars.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef NXvars_H
diff --git a/nxcomp/OpcodeCache.h b/nxcomp/OpcodeCache.h
index 529f8eee1..e07a1b997 100644
--- a/nxcomp/OpcodeCache.h
+++ b/nxcomp/OpcodeCache.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef OpcodeCache_H
diff --git a/nxcomp/OpcodeStore.cpp b/nxcomp/OpcodeStore.cpp
index 909744821..66a425d53 100644
--- a/nxcomp/OpcodeStore.cpp
+++ b/nxcomp/OpcodeStore.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "OpcodeStore.h"
diff --git a/nxcomp/OpcodeStore.h b/nxcomp/OpcodeStore.h
index f6626dfef..d041ed4b8 100644
--- a/nxcomp/OpcodeStore.h
+++ b/nxcomp/OpcodeStore.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef OpcodeStore_H
diff --git a/nxcomp/Pgn.cpp b/nxcomp/Pgn.cpp
index cdcde84ce..17e1702d4 100644
--- a/nxcomp/Pgn.cpp
+++ b/nxcomp/Pgn.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 //
diff --git a/nxcomp/Pgn.h b/nxcomp/Pgn.h
index ddf9b75d1..e5ea36715 100644
--- a/nxcomp/Pgn.h
+++ b/nxcomp/Pgn.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef Pgn_H
diff --git a/nxcomp/Pipe.cpp b/nxcomp/Pipe.cpp
index 15c7a31b3..88f10edb4 100644
--- a/nxcomp/Pipe.cpp
+++ b/nxcomp/Pipe.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include <stdlib.h>
diff --git a/nxcomp/Pipe.h b/nxcomp/Pipe.h
index b4563a967..fd1061d30 100644
--- a/nxcomp/Pipe.h
+++ b/nxcomp/Pipe.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 //
diff --git a/nxcomp/PolyArc.cpp b/nxcomp/PolyArc.cpp
index e572fa454..8996c6f15 100644
--- a/nxcomp/PolyArc.cpp
+++ b/nxcomp/PolyArc.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "PolyArc.h"
diff --git a/nxcomp/PolyArc.h b/nxcomp/PolyArc.h
index 50d2fd9a9..d744d6a10 100644
--- a/nxcomp/PolyArc.h
+++ b/nxcomp/PolyArc.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef PolyArc_H
diff --git a/nxcomp/PolyFillArc.cpp b/nxcomp/PolyFillArc.cpp
index 2733eb62a..f995a8815 100644
--- a/nxcomp/PolyFillArc.cpp
+++ b/nxcomp/PolyFillArc.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "PolyFillArc.h"
diff --git a/nxcomp/PolyFillArc.h b/nxcomp/PolyFillArc.h
index 721f5ac97..a4eff5b48 100644
--- a/nxcomp/PolyFillArc.h
+++ b/nxcomp/PolyFillArc.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef PolyFillArc_H
diff --git a/nxcomp/PolyFillRectangle.cpp b/nxcomp/PolyFillRectangle.cpp
index e1e6b7876..d0f1452b2 100644
--- a/nxcomp/PolyFillRectangle.cpp
+++ b/nxcomp/PolyFillRectangle.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "PolyFillRectangle.h"
diff --git a/nxcomp/PolyFillRectangle.h b/nxcomp/PolyFillRectangle.h
index bf94c4818..7ebb9270d 100644
--- a/nxcomp/PolyFillRectangle.h
+++ b/nxcomp/PolyFillRectangle.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef PolyFillRectangle_H
diff --git a/nxcomp/PolyLine.cpp b/nxcomp/PolyLine.cpp
index 9f2d82a5d..845985728 100644
--- a/nxcomp/PolyLine.cpp
+++ b/nxcomp/PolyLine.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "PolyLine.h"
diff --git a/nxcomp/PolyLine.h b/nxcomp/PolyLine.h
index 39447e659..66fa5df1a 100644
--- a/nxcomp/PolyLine.h
+++ b/nxcomp/PolyLine.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef PolyLine_H
diff --git a/nxcomp/PolyPoint.cpp b/nxcomp/PolyPoint.cpp
index cae4b80a0..dfd77f40b 100644
--- a/nxcomp/PolyPoint.cpp
+++ b/nxcomp/PolyPoint.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "PolyPoint.h"
diff --git a/nxcomp/PolyPoint.h b/nxcomp/PolyPoint.h
index e090ff9fa..b8ea183bf 100644
--- a/nxcomp/PolyPoint.h
+++ b/nxcomp/PolyPoint.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef PolyPoint_H
diff --git a/nxcomp/PolySegment.cpp b/nxcomp/PolySegment.cpp
index e9259d958..34c2461f1 100644
--- a/nxcomp/PolySegment.cpp
+++ b/nxcomp/PolySegment.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "PolySegment.h"
diff --git a/nxcomp/PolySegment.h b/nxcomp/PolySegment.h
index a74865827..53fd42c60 100644
--- a/nxcomp/PolySegment.h
+++ b/nxcomp/PolySegment.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef PolySegment_H
diff --git a/nxcomp/PolyText16.cpp b/nxcomp/PolyText16.cpp
index d90b093ec..80c77a70f 100644
--- a/nxcomp/PolyText16.cpp
+++ b/nxcomp/PolyText16.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "PolyText16.h"
diff --git a/nxcomp/PolyText16.h b/nxcomp/PolyText16.h
index cda6cceed..805e1fa04 100644
--- a/nxcomp/PolyText16.h
+++ b/nxcomp/PolyText16.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef PolyText16_H
diff --git a/nxcomp/PolyText8.cpp b/nxcomp/PolyText8.cpp
index 15752721d..50c21f79e 100644
--- a/nxcomp/PolyText8.cpp
+++ b/nxcomp/PolyText8.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "PolyText8.h"
diff --git a/nxcomp/PolyText8.h b/nxcomp/PolyText8.h
index eac5aab7c..3d5ff533a 100644
--- a/nxcomp/PolyText8.h
+++ b/nxcomp/PolyText8.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef PolyText8_H
diff --git a/nxcomp/Proxy.cpp b/nxcomp/Proxy.cpp
index 1693590db..c7454bffa 100644
--- a/nxcomp/Proxy.cpp
+++ b/nxcomp/Proxy.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include <cstdio>
diff --git a/nxcomp/Proxy.h b/nxcomp/Proxy.h
index 87ea1ce8a..8259ddbb7 100644
--- a/nxcomp/Proxy.h
+++ b/nxcomp/Proxy.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef Proxy_H
diff --git a/nxcomp/ProxyReadBuffer.cpp b/nxcomp/ProxyReadBuffer.cpp
index 99c3cbaa2..0427bb76c 100644
--- a/nxcomp/ProxyReadBuffer.cpp
+++ b/nxcomp/ProxyReadBuffer.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "ProxyReadBuffer.h"
diff --git a/nxcomp/ProxyReadBuffer.h b/nxcomp/ProxyReadBuffer.h
index b87b215bf..68e9e95fa 100644
--- a/nxcomp/ProxyReadBuffer.h
+++ b/nxcomp/ProxyReadBuffer.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef ProxyReadBuffer_H
diff --git a/nxcomp/PutImage.cpp b/nxcomp/PutImage.cpp
index af170463d..7b9a3ae5d 100644
--- a/nxcomp/PutImage.cpp
+++ b/nxcomp/PutImage.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "PutImage.h"
diff --git a/nxcomp/PutImage.h b/nxcomp/PutImage.h
index 9e438fc84..93dde9dfb 100644
--- a/nxcomp/PutImage.h
+++ b/nxcomp/PutImage.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef PutImage_H
diff --git a/nxcomp/PutPackedImage.cpp b/nxcomp/PutPackedImage.cpp
index af962c703..66506ebbe 100644
--- a/nxcomp/PutPackedImage.cpp
+++ b/nxcomp/PutPackedImage.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "PutPackedImage.h"
diff --git a/nxcomp/PutPackedImage.h b/nxcomp/PutPackedImage.h
index 7427499b8..d28ad39eb 100644
--- a/nxcomp/PutPackedImage.h
+++ b/nxcomp/PutPackedImage.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef PutPackedImage_H
diff --git a/nxcomp/QueryFontReply.cpp b/nxcomp/QueryFontReply.cpp
index d723f9127..ffd5eaee9 100644
--- a/nxcomp/QueryFontReply.cpp
+++ b/nxcomp/QueryFontReply.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "QueryFontReply.h"
diff --git a/nxcomp/QueryFontReply.h b/nxcomp/QueryFontReply.h
index e89720ffe..e12fe4e4b 100644
--- a/nxcomp/QueryFontReply.h
+++ b/nxcomp/QueryFontReply.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef QueryFontReply_H
diff --git a/nxcomp/ReadBuffer.cpp b/nxcomp/ReadBuffer.cpp
index 13122e278..1e2326cee 100644
--- a/nxcomp/ReadBuffer.cpp
+++ b/nxcomp/ReadBuffer.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "ReadBuffer.h"
diff --git a/nxcomp/ReadBuffer.h b/nxcomp/ReadBuffer.h
index 20130120a..a12bcc9b3 100644
--- a/nxcomp/ReadBuffer.h
+++ b/nxcomp/ReadBuffer.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef ReadBuffer_H
diff --git a/nxcomp/RenderAddGlyphs.cpp b/nxcomp/RenderAddGlyphs.cpp
index 1d53ec0f8..ed0864b93 100644
--- a/nxcomp/RenderAddGlyphs.cpp
+++ b/nxcomp/RenderAddGlyphs.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 //
diff --git a/nxcomp/RenderAddGlyphs.h b/nxcomp/RenderAddGlyphs.h
index 918a70c8d..d3c8cd158 100644
--- a/nxcomp/RenderAddGlyphs.h
+++ b/nxcomp/RenderAddGlyphs.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef RenderAddGlyphs_H
diff --git a/nxcomp/RenderChangePicture.cpp b/nxcomp/RenderChangePicture.cpp
index 5dbe39d52..2abb97493 100644
--- a/nxcomp/RenderChangePicture.cpp
+++ b/nxcomp/RenderChangePicture.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 //
diff --git a/nxcomp/RenderChangePicture.h b/nxcomp/RenderChangePicture.h
index e6a89a610..4bab1ef98 100644
--- a/nxcomp/RenderChangePicture.h
+++ b/nxcomp/RenderChangePicture.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef RenderChangePicture_H
diff --git a/nxcomp/RenderComposite.cpp b/nxcomp/RenderComposite.cpp
index e3c121b48..e8603a7da 100644
--- a/nxcomp/RenderComposite.cpp
+++ b/nxcomp/RenderComposite.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 //
diff --git a/nxcomp/RenderComposite.h b/nxcomp/RenderComposite.h
index 91fa30aaa..aafa1e776 100644
--- a/nxcomp/RenderComposite.h
+++ b/nxcomp/RenderComposite.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef RenderComposite_H
diff --git a/nxcomp/RenderCompositeGlyphs.cpp b/nxcomp/RenderCompositeGlyphs.cpp
index 752dedb2b..74b3ec779 100644
--- a/nxcomp/RenderCompositeGlyphs.cpp
+++ b/nxcomp/RenderCompositeGlyphs.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 //
diff --git a/nxcomp/RenderCompositeGlyphs.h b/nxcomp/RenderCompositeGlyphs.h
index 9458ecb14..1062ee781 100644
--- a/nxcomp/RenderCompositeGlyphs.h
+++ b/nxcomp/RenderCompositeGlyphs.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef RenderCompositeGlyphs_H
diff --git a/nxcomp/RenderCreateGlyphSet.cpp b/nxcomp/RenderCreateGlyphSet.cpp
index b9da8d7bf..3e7a71721 100644
--- a/nxcomp/RenderCreateGlyphSet.cpp
+++ b/nxcomp/RenderCreateGlyphSet.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 //
diff --git a/nxcomp/RenderCreateGlyphSet.h b/nxcomp/RenderCreateGlyphSet.h
index 0f14ce0c5..10f5d6699 100644
--- a/nxcomp/RenderCreateGlyphSet.h
+++ b/nxcomp/RenderCreateGlyphSet.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef RenderCreateGlyphSet_H
diff --git a/nxcomp/RenderCreatePicture.cpp b/nxcomp/RenderCreatePicture.cpp
index cb3d56534..2fd736cbb 100644
--- a/nxcomp/RenderCreatePicture.cpp
+++ b/nxcomp/RenderCreatePicture.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 //
diff --git a/nxcomp/RenderCreatePicture.h b/nxcomp/RenderCreatePicture.h
index 35de9b86b..ae2f583a0 100644
--- a/nxcomp/RenderCreatePicture.h
+++ b/nxcomp/RenderCreatePicture.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef RenderCreatePicture_H
diff --git a/nxcomp/RenderExtension.cpp b/nxcomp/RenderExtension.cpp
index 43933748c..bd2285e82 100644
--- a/nxcomp/RenderExtension.cpp
+++ b/nxcomp/RenderExtension.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "NXrender.h"
diff --git a/nxcomp/RenderExtension.h b/nxcomp/RenderExtension.h
index 7ccf54068..aa9db1b55 100644
--- a/nxcomp/RenderExtension.h
+++ b/nxcomp/RenderExtension.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef RenderExtension_H
diff --git a/nxcomp/RenderFillRectangles.cpp b/nxcomp/RenderFillRectangles.cpp
index 6f08d97a4..a6f2c0e0d 100644
--- a/nxcomp/RenderFillRectangles.cpp
+++ b/nxcomp/RenderFillRectangles.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 //
diff --git a/nxcomp/RenderFillRectangles.h b/nxcomp/RenderFillRectangles.h
index 189855907..9efaeffa8 100644
--- a/nxcomp/RenderFillRectangles.h
+++ b/nxcomp/RenderFillRectangles.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef RenderFillRectangles_H
diff --git a/nxcomp/RenderFreeGlyphSet.cpp b/nxcomp/RenderFreeGlyphSet.cpp
index 50010e381..cf1261ac0 100644
--- a/nxcomp/RenderFreeGlyphSet.cpp
+++ b/nxcomp/RenderFreeGlyphSet.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 //
diff --git a/nxcomp/RenderFreeGlyphSet.h b/nxcomp/RenderFreeGlyphSet.h
index 7233031ed..8817e8d99 100644
--- a/nxcomp/RenderFreeGlyphSet.h
+++ b/nxcomp/RenderFreeGlyphSet.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef RenderFreeGlyphSet_H
diff --git a/nxcomp/RenderFreePicture.cpp b/nxcomp/RenderFreePicture.cpp
index b1074f33f..3d468624a 100644
--- a/nxcomp/RenderFreePicture.cpp
+++ b/nxcomp/RenderFreePicture.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 //
diff --git a/nxcomp/RenderFreePicture.h b/nxcomp/RenderFreePicture.h
index 2329cb4e5..b50191a72 100644
--- a/nxcomp/RenderFreePicture.h
+++ b/nxcomp/RenderFreePicture.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef RenderFreePicture_H
diff --git a/nxcomp/RenderGenericRequest.cpp b/nxcomp/RenderGenericRequest.cpp
index 4f979c18f..fc3210ba2 100644
--- a/nxcomp/RenderGenericRequest.cpp
+++ b/nxcomp/RenderGenericRequest.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "NXrender.h"
diff --git a/nxcomp/RenderGenericRequest.h b/nxcomp/RenderGenericRequest.h
index 8fa3acb76..fdf5ca876 100644
--- a/nxcomp/RenderGenericRequest.h
+++ b/nxcomp/RenderGenericRequest.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef RenderGenericRequest_H
diff --git a/nxcomp/RenderMinorExtensionHeaders.h b/nxcomp/RenderMinorExtensionHeaders.h
index dda0042d8..b7f6efc5a 100644
--- a/nxcomp/RenderMinorExtensionHeaders.h
+++ b/nxcomp/RenderMinorExtensionHeaders.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef RenderMinorExtensionHeaders_H
diff --git a/nxcomp/RenderMinorExtensionMethods.h b/nxcomp/RenderMinorExtensionMethods.h
index 397f6966e..d272337e0 100644
--- a/nxcomp/RenderMinorExtensionMethods.h
+++ b/nxcomp/RenderMinorExtensionMethods.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 //
diff --git a/nxcomp/RenderMinorExtensionTags.h b/nxcomp/RenderMinorExtensionTags.h
index 1d61b103c..c24a99638 100644
--- a/nxcomp/RenderMinorExtensionTags.h
+++ b/nxcomp/RenderMinorExtensionTags.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef RenderMinorExtensionTags_H
diff --git a/nxcomp/RenderPictureClip.cpp b/nxcomp/RenderPictureClip.cpp
index 7428e7219..32d526c81 100644
--- a/nxcomp/RenderPictureClip.cpp
+++ b/nxcomp/RenderPictureClip.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 //
diff --git a/nxcomp/RenderPictureClip.h b/nxcomp/RenderPictureClip.h
index 35b320c31..bd811dfcd 100644
--- a/nxcomp/RenderPictureClip.h
+++ b/nxcomp/RenderPictureClip.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef RenderPictureClip_H
diff --git a/nxcomp/RenderPictureFilter.cpp b/nxcomp/RenderPictureFilter.cpp
index b48fdca15..9598601c2 100644
--- a/nxcomp/RenderPictureFilter.cpp
+++ b/nxcomp/RenderPictureFilter.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 //
diff --git a/nxcomp/RenderPictureFilter.h b/nxcomp/RenderPictureFilter.h
index cf6ad5494..a3e37538b 100644
--- a/nxcomp/RenderPictureFilter.h
+++ b/nxcomp/RenderPictureFilter.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef RenderPictureFilter_H
diff --git a/nxcomp/RenderPictureTransform.cpp b/nxcomp/RenderPictureTransform.cpp
index 048b73e6c..053748bd3 100644
--- a/nxcomp/RenderPictureTransform.cpp
+++ b/nxcomp/RenderPictureTransform.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 //
diff --git a/nxcomp/RenderPictureTransform.h b/nxcomp/RenderPictureTransform.h
index 061b6a3d8..649cd05d3 100644
--- a/nxcomp/RenderPictureTransform.h
+++ b/nxcomp/RenderPictureTransform.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef RenderPictureTransform_H
diff --git a/nxcomp/RenderTrapezoids.cpp b/nxcomp/RenderTrapezoids.cpp
index 32fcd01c0..85f4cad05 100644
--- a/nxcomp/RenderTrapezoids.cpp
+++ b/nxcomp/RenderTrapezoids.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 //
diff --git a/nxcomp/RenderTrapezoids.h b/nxcomp/RenderTrapezoids.h
index 3f3202016..faf524c76 100644
--- a/nxcomp/RenderTrapezoids.h
+++ b/nxcomp/RenderTrapezoids.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef RenderTrapezoids_H
diff --git a/nxcomp/RenderTriangles.cpp b/nxcomp/RenderTriangles.cpp
index e98bf3506..746a8e278 100644
--- a/nxcomp/RenderTriangles.cpp
+++ b/nxcomp/RenderTriangles.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 //
diff --git a/nxcomp/RenderTriangles.h b/nxcomp/RenderTriangles.h
index 6c4d105a1..d73efb7b8 100644
--- a/nxcomp/RenderTriangles.h
+++ b/nxcomp/RenderTriangles.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef RenderTriangles_H
diff --git a/nxcomp/Rgb.cpp b/nxcomp/Rgb.cpp
index ad2e2fd92..8946a9fc8 100644
--- a/nxcomp/Rgb.cpp
+++ b/nxcomp/Rgb.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "Misc.h"
diff --git a/nxcomp/Rgb.h b/nxcomp/Rgb.h
index 98ead38e3..ec088dd1b 100644
--- a/nxcomp/Rgb.h
+++ b/nxcomp/Rgb.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef Rgb_H
diff --git a/nxcomp/Rle.cpp b/nxcomp/Rle.cpp
index b7b1460bd..92fc7785a 100644
--- a/nxcomp/Rle.cpp
+++ b/nxcomp/Rle.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "Misc.h"
diff --git a/nxcomp/Rle.h b/nxcomp/Rle.h
index 0e39fae5a..cc5dab0e8 100644
--- a/nxcomp/Rle.h
+++ b/nxcomp/Rle.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef Rle_H
diff --git a/nxcomp/SendEvent.cpp b/nxcomp/SendEvent.cpp
index f65b1dbb2..8658c1835 100644
--- a/nxcomp/SendEvent.cpp
+++ b/nxcomp/SendEvent.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "SendEvent.h"
diff --git a/nxcomp/SendEvent.h b/nxcomp/SendEvent.h
index 9426180a4..a8841a706 100644
--- a/nxcomp/SendEvent.h
+++ b/nxcomp/SendEvent.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef SendEvent_H
diff --git a/nxcomp/SequenceQueue.cpp b/nxcomp/SequenceQueue.cpp
index ce044b1ff..3114bfcd0 100644
--- a/nxcomp/SequenceQueue.cpp
+++ b/nxcomp/SequenceQueue.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "SequenceQueue.h"
diff --git a/nxcomp/SequenceQueue.h b/nxcomp/SequenceQueue.h
index b243c4c9f..2a72bc3fe 100644
--- a/nxcomp/SequenceQueue.h
+++ b/nxcomp/SequenceQueue.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef SequenceQueue_H
diff --git a/nxcomp/ServerCache.cpp b/nxcomp/ServerCache.cpp
index 104ac4728..00693d2af 100644
--- a/nxcomp/ServerCache.cpp
+++ b/nxcomp/ServerCache.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "ServerCache.h"
diff --git a/nxcomp/ServerCache.h b/nxcomp/ServerCache.h
index 2287501bf..c6e2b81b6 100644
--- a/nxcomp/ServerCache.h
+++ b/nxcomp/ServerCache.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef ServerCache_H
diff --git a/nxcomp/ServerChannel.cpp b/nxcomp/ServerChannel.cpp
index ed2f472c7..eff24e90e 100644
--- a/nxcomp/ServerChannel.cpp
+++ b/nxcomp/ServerChannel.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include <string.h>
diff --git a/nxcomp/ServerChannel.h b/nxcomp/ServerChannel.h
index 28d5efb3e..374e52896 100644
--- a/nxcomp/ServerChannel.h
+++ b/nxcomp/ServerChannel.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef ServerChannel_H
diff --git a/nxcomp/ServerProxy.cpp b/nxcomp/ServerProxy.cpp
index 3060e829d..3e32a82c0 100644
--- a/nxcomp/ServerProxy.cpp
+++ b/nxcomp/ServerProxy.cpp
@@ -1,19 +1,27 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
-/* Copyright (c) 2015 Qindel Formacion y Servicios S.L.                   */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
 /**************************************************************************/
 
 #include <unistd.h>
diff --git a/nxcomp/ServerProxy.h b/nxcomp/ServerProxy.h
index cc8191795..e169c4aec 100644
--- a/nxcomp/ServerProxy.h
+++ b/nxcomp/ServerProxy.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef ServerProxy_H
diff --git a/nxcomp/ServerReadBuffer.cpp b/nxcomp/ServerReadBuffer.cpp
index 96c146b77..5bd9bb60f 100644
--- a/nxcomp/ServerReadBuffer.cpp
+++ b/nxcomp/ServerReadBuffer.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "ServerReadBuffer.h"
diff --git a/nxcomp/ServerReadBuffer.h b/nxcomp/ServerReadBuffer.h
index 438e2f0da..d6c207ead 100644
--- a/nxcomp/ServerReadBuffer.h
+++ b/nxcomp/ServerReadBuffer.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef ServerReadBuffer_H
diff --git a/nxcomp/ServerStore.cpp b/nxcomp/ServerStore.cpp
index b0e13b1ad..0fb17d974 100644
--- a/nxcomp/ServerStore.cpp
+++ b/nxcomp/ServerStore.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "ServerStore.h"
diff --git a/nxcomp/ServerStore.h b/nxcomp/ServerStore.h
index 8df1f1e9c..dbbb968e5 100644
--- a/nxcomp/ServerStore.h
+++ b/nxcomp/ServerStore.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef ServerStore_H
diff --git a/nxcomp/SetClipRectangles.cpp b/nxcomp/SetClipRectangles.cpp
index 8774744fb..164ead006 100644
--- a/nxcomp/SetClipRectangles.cpp
+++ b/nxcomp/SetClipRectangles.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "SetClipRectangles.h"
diff --git a/nxcomp/SetClipRectangles.h b/nxcomp/SetClipRectangles.h
index 06b4421f5..a2245360c 100644
--- a/nxcomp/SetClipRectangles.h
+++ b/nxcomp/SetClipRectangles.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef SetClipRectangles_H
diff --git a/nxcomp/SetUnpackAlpha.cpp b/nxcomp/SetUnpackAlpha.cpp
index 792aa33d7..cf09074e3 100644
--- a/nxcomp/SetUnpackAlpha.cpp
+++ b/nxcomp/SetUnpackAlpha.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "SetUnpackAlpha.h"
diff --git a/nxcomp/SetUnpackAlpha.h b/nxcomp/SetUnpackAlpha.h
index 4c4306d8d..54714efaa 100644
--- a/nxcomp/SetUnpackAlpha.h
+++ b/nxcomp/SetUnpackAlpha.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef SetUnpackAlpha_H
diff --git a/nxcomp/SetUnpackColormap.cpp b/nxcomp/SetUnpackColormap.cpp
index 8fb8b3ce7..b44a7cf13 100644
--- a/nxcomp/SetUnpackColormap.cpp
+++ b/nxcomp/SetUnpackColormap.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "SetUnpackColormap.h"
diff --git a/nxcomp/SetUnpackColormap.h b/nxcomp/SetUnpackColormap.h
index fda7fa16d..779366531 100644
--- a/nxcomp/SetUnpackColormap.h
+++ b/nxcomp/SetUnpackColormap.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef SetUnpackColormap_H
diff --git a/nxcomp/SetUnpackGeometry.cpp b/nxcomp/SetUnpackGeometry.cpp
index 67b79a410..49fa4344e 100644
--- a/nxcomp/SetUnpackGeometry.cpp
+++ b/nxcomp/SetUnpackGeometry.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "SetUnpackGeometry.h"
diff --git a/nxcomp/SetUnpackGeometry.h b/nxcomp/SetUnpackGeometry.h
index 3a8224dfb..96104f57f 100644
--- a/nxcomp/SetUnpackGeometry.h
+++ b/nxcomp/SetUnpackGeometry.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef SetUnpackGeometry_H
diff --git a/nxcomp/ShapeExtension.cpp b/nxcomp/ShapeExtension.cpp
index 34fad27c9..be3b9a903 100644
--- a/nxcomp/ShapeExtension.cpp
+++ b/nxcomp/ShapeExtension.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "ShapeExtension.h"
diff --git a/nxcomp/ShapeExtension.h b/nxcomp/ShapeExtension.h
index 41fe48113..4dd636847 100644
--- a/nxcomp/ShapeExtension.h
+++ b/nxcomp/ShapeExtension.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef ShapeExtension_H
diff --git a/nxcomp/Socket.cpp b/nxcomp/Socket.cpp
index ea00a9b4e..28cb5646d 100644
--- a/nxcomp/Socket.cpp
+++ b/nxcomp/Socket.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include <sys/types.h>
diff --git a/nxcomp/Socket.h b/nxcomp/Socket.h
index 27c330850..5e7e47705 100644
--- a/nxcomp/Socket.h
+++ b/nxcomp/Socket.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef Socket_H
diff --git a/nxcomp/Split.cpp b/nxcomp/Split.cpp
index 607544312..b6828c7cb 100644
--- a/nxcomp/Split.cpp
+++ b/nxcomp/Split.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include <unistd.h>
diff --git a/nxcomp/Split.h b/nxcomp/Split.h
index c9a3c9ad3..ee5eae7fe 100644
--- a/nxcomp/Split.h
+++ b/nxcomp/Split.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef Split_H
diff --git a/nxcomp/StaticCompressor.cpp b/nxcomp/StaticCompressor.cpp
index b30e61a80..93103af41 100644
--- a/nxcomp/StaticCompressor.cpp
+++ b/nxcomp/StaticCompressor.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "Z.h"
diff --git a/nxcomp/StaticCompressor.h b/nxcomp/StaticCompressor.h
index 3e5b25ca1..e0b81a527 100644
--- a/nxcomp/StaticCompressor.h
+++ b/nxcomp/StaticCompressor.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef StaticCompressor_H
diff --git a/nxcomp/Statistics.cpp b/nxcomp/Statistics.cpp
index 294518fb7..baad7ef60 100644
--- a/nxcomp/Statistics.cpp
+++ b/nxcomp/Statistics.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include <stdio.h>
diff --git a/nxcomp/Statistics.h b/nxcomp/Statistics.h
index 44ff8834f..1ffb6b5d6 100644
--- a/nxcomp/Statistics.h
+++ b/nxcomp/Statistics.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef Statistics_H
diff --git a/nxcomp/Timestamp.cpp b/nxcomp/Timestamp.cpp
index 295eb65cf..d5b3d613b 100644
--- a/nxcomp/Timestamp.cpp
+++ b/nxcomp/Timestamp.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "Timestamp.h"
diff --git a/nxcomp/Timestamp.h b/nxcomp/Timestamp.h
index 69953988a..604f5a3bc 100644
--- a/nxcomp/Timestamp.h
+++ b/nxcomp/Timestamp.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef Timestamp_H
diff --git a/nxcomp/TranslateCoords.cpp b/nxcomp/TranslateCoords.cpp
index e67e1dac5..97bd285e1 100644
--- a/nxcomp/TranslateCoords.cpp
+++ b/nxcomp/TranslateCoords.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "TranslateCoords.h"
diff --git a/nxcomp/TranslateCoords.h b/nxcomp/TranslateCoords.h
index 3f21b243c..997d079e1 100644
--- a/nxcomp/TranslateCoords.h
+++ b/nxcomp/TranslateCoords.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef TranslateCoords_H
diff --git a/nxcomp/Transport.cpp b/nxcomp/Transport.cpp
index 4b4967826..eaf9775af 100644
--- a/nxcomp/Transport.cpp
+++ b/nxcomp/Transport.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include <stdlib.h>
diff --git a/nxcomp/Transport.h b/nxcomp/Transport.h
index a2efa5270..047396af6 100644
--- a/nxcomp/Transport.h
+++ b/nxcomp/Transport.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef Transport_H
diff --git a/nxcomp/Types.h b/nxcomp/Types.h
index f4a3eb399..e82664c81 100644
--- a/nxcomp/Types.h
+++ b/nxcomp/Types.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef Types_H
diff --git a/nxcomp/Unpack.cpp b/nxcomp/Unpack.cpp
index 5fc494465..50ae890b6 100644
--- a/nxcomp/Unpack.cpp
+++ b/nxcomp/Unpack.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "Misc.h"
diff --git a/nxcomp/Unpack.h b/nxcomp/Unpack.h
index 65a410fb6..faaa41d82 100644
--- a/nxcomp/Unpack.h
+++ b/nxcomp/Unpack.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef Unpack_H
diff --git a/nxcomp/Utils.cpp b/nxcomp/Utils.cpp
index a2820782a..72e1254f8 100644
--- a/nxcomp/Utils.cpp
+++ b/nxcomp/Utils.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "NX.h"
diff --git a/nxcomp/WriteBuffer.cpp b/nxcomp/WriteBuffer.cpp
index ac38fe688..07d14fc30 100644
--- a/nxcomp/WriteBuffer.cpp
+++ b/nxcomp/WriteBuffer.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include <stddef.h>
diff --git a/nxcomp/WriteBuffer.h b/nxcomp/WriteBuffer.h
index 4673cecee..ce408e210 100644
--- a/nxcomp/WriteBuffer.h
+++ b/nxcomp/WriteBuffer.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef WriteBuffer_H
diff --git a/nxcomp/XidCache.cpp b/nxcomp/XidCache.cpp
index a9a723c76..0f83d388f 100644
--- a/nxcomp/XidCache.cpp
+++ b/nxcomp/XidCache.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "Control.h"
diff --git a/nxcomp/XidCache.h b/nxcomp/XidCache.h
index 78a94d8d0..8a09ef9b1 100644
--- a/nxcomp/XidCache.h
+++ b/nxcomp/XidCache.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef XidCache_H
diff --git a/nxcomp/Z.cpp b/nxcomp/Z.cpp
index e6c93cd10..35850b9d0 100644
--- a/nxcomp/Z.cpp
+++ b/nxcomp/Z.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include "Z.h"
diff --git a/nxcomp/Z.h b/nxcomp/Z.h
index d7f7fa185..3a6d684c2 100644
--- a/nxcomp/Z.h
+++ b/nxcomp/Z.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef Z_H
diff --git a/nxcomp/configure.in b/nxcomp/configure.in
index 6586f22b2..8be604836 100644
--- a/nxcomp/configure.in
+++ b/nxcomp/configure.in
@@ -1,3 +1,29 @@
+dnl /**************************************************************************/
+dnl /*                                                                        */
+dnl /* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+dnl /* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+dnl /* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+dnl /* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+dnl /* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+dnl /* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+dnl /*                                                                        */
+dnl /* NXCOMP, NX protocol compression and NX extensions to this software     */
+dnl /* are copyright of the aforementioned persons and companies.             */
+dnl /*                                                                        */
+dnl /* Redistribution and use of the present software is allowed according    */
+dnl /* to terms specified in the file LICENSE.nxcomp which comes in the       */
+dnl /* source distribution.                                                   */
+dnl /*                                                                        */
+dnl /* All rights reserved.                                                   */
+dnl /*                                                                        */
+dnl /* NOTE: This software has received contributions from various other      */
+dnl /* contributors, only the core maintainers and supporters are listed as   */
+dnl /* copyright holders. Please contact us, if you feel you should be listed */
+dnl /* as copyright holder, as well.                                          */
+dnl /*                                                                        */
+dnl /**************************************************************************/
+
+
 dnl Process this file with autoconf to produce a configure script.
 
 dnl Prolog
diff --git a/nxcompext/Alpha.c b/nxcompext/Alpha.c
index bba191fa9..e4d8a3220 100644
--- a/nxcompext/Alpha.c
+++ b/nxcompext/Alpha.c
@@ -1,17 +1,25 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPEXT, NX protocol compression and NX extensions to this software  */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* All rights reserved.                                                   */
 /*                                                                        */
-/* All rigths reserved.                                                   */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
 /*                                                                        */
 /**************************************************************************/
 
diff --git a/nxcompext/Alpha.h b/nxcompext/Alpha.h
index 6ae9aee8e..d7ac4e78e 100644
--- a/nxcompext/Alpha.h
+++ b/nxcompext/Alpha.h
@@ -1,17 +1,25 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPEXT, NX protocol compression and NX extensions to this software  */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* All rights reserved.                                                   */
 /*                                                                        */
-/* All rigths reserved.                                                   */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
 /*                                                                        */
 /**************************************************************************/
 
diff --git a/nxcompext/Bitmap.c b/nxcompext/Bitmap.c
index 725eaacff..c1d07f164 100644
--- a/nxcompext/Bitmap.c
+++ b/nxcompext/Bitmap.c
@@ -1,17 +1,25 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPEXT, NX protocol compression and NX extensions to this software  */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* All rights reserved.                                                   */
 /*                                                                        */
-/* All rigths reserved.                                                   */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
 /*                                                                        */
 /**************************************************************************/
 
diff --git a/nxcompext/Bitmap.h b/nxcompext/Bitmap.h
index 974aa426c..e45836d11 100644
--- a/nxcompext/Bitmap.h
+++ b/nxcompext/Bitmap.h
@@ -1,17 +1,25 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPEXT, NX protocol compression and NX extensions to this software  */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* All rights reserved.                                                   */
 /*                                                                        */
-/* All rigths reserved.                                                   */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
 /*                                                                        */
 /**************************************************************************/
 
diff --git a/nxcompext/Clean.c b/nxcompext/Clean.c
index cc022004f..8fff49547 100644
--- a/nxcompext/Clean.c
+++ b/nxcompext/Clean.c
@@ -1,17 +1,25 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPEXT, NX protocol compression and NX extensions to this software  */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* All rights reserved.                                                   */
 /*                                                                        */
-/* All rigths reserved.                                                   */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
 /*                                                                        */
 /**************************************************************************/
 
diff --git a/nxcompext/Clean.h b/nxcompext/Clean.h
index ba2a62dc4..7d9c0aee1 100644
--- a/nxcompext/Clean.h
+++ b/nxcompext/Clean.h
@@ -1,17 +1,25 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPEXT, NX protocol compression and NX extensions to this software  */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* All rights reserved.                                                   */
 /*                                                                        */
-/* All rigths reserved.                                                   */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
 /*                                                                        */
 /**************************************************************************/
 
diff --git a/nxcompext/Colormap.c b/nxcompext/Colormap.c
index 2e169edab..8ac5fc782 100644
--- a/nxcompext/Colormap.c
+++ b/nxcompext/Colormap.c
@@ -1,17 +1,25 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPEXT, NX protocol compression and NX extensions to this software  */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* All rights reserved.                                                   */
 /*                                                                        */
-/* All rigths reserved.                                                   */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
 /*                                                                        */
 /**************************************************************************/
 
diff --git a/nxcompext/Colormap.h b/nxcompext/Colormap.h
index 42eff34a4..b97fc752b 100644
--- a/nxcompext/Colormap.h
+++ b/nxcompext/Colormap.h
@@ -1,17 +1,25 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPEXT, NX protocol compression and NX extensions to this software  */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* All rights reserved.                                                   */
 /*                                                                        */
-/* All rigths reserved.                                                   */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
 /*                                                                        */
 /**************************************************************************/
 
diff --git a/nxcompext/Jpeg.c b/nxcompext/Jpeg.c
index d6a94cc80..74a94b7be 100644
--- a/nxcompext/Jpeg.c
+++ b/nxcompext/Jpeg.c
@@ -1,17 +1,25 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPEXT, NX protocol compression and NX extensions to this software  */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* All rights reserved.                                                   */
 /*                                                                        */
-/* All rigths reserved.                                                   */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
 /*                                                                        */
 /**************************************************************************/
 
diff --git a/nxcompext/Jpeg.h b/nxcompext/Jpeg.h
index 87740df6d..b50efd3ec 100644
--- a/nxcompext/Jpeg.h
+++ b/nxcompext/Jpeg.h
@@ -1,17 +1,25 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPEXT, NX protocol compression and NX extensions to this software  */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* All rights reserved.                                                   */
 /*                                                                        */
-/* All rigths reserved.                                                   */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
 /*                                                                        */
 /**************************************************************************/
 
diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in
index 415ffabb1..5e0e15015 100644
--- a/nxcompext/Makefile.in
+++ b/nxcompext/Makefile.in
@@ -1,19 +1,27 @@
-############################################################################
-#                                                                          #
-#  Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com.           #
-#                                                                          #
-#  NXCOMPEXT, NX protocol compression and NX extensions to this software   #
-#  are copyright of NoMachine. Redistribution and use of the present       #
-#  software is allowed according to terms specified in the file LICENSE    #
-#  which comes in the source distribution.                                 #
-#                                                                          #
-#  Check http://www.nomachine.com/licensing.html for applicability.        #
-#                                                                          #
-#  NX and NoMachine are trademarks of NoMachine S.r.l.                     #
-#                                                                          #
-#  All rights reserved.                                                    #
-#                                                                          #
-############################################################################
+#/**************************************************************************/
+#/*                                                                        */
+#/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+#/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+#/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+#/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+#/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+#/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+#/*                                                                        */
+#/* NXCOMPEXT, NX protocol compression and NX extensions to this software  */
+#/* are copyright of the aforementioned persons and companies.             */
+#/*                                                                        */
+#/* Redistribution and use of the present software is allowed according    */
+#/* to terms specified in the file LICENSE which comes in the source       */
+#/* distribution.                                                          */
+#/*                                                                        */
+#/* All rights reserved.                                                   */
+#/*                                                                        */
+#/* NOTE: This software has received contributions from various other      */
+#/* contributors, only the core maintainers and supporters are listed as   */
+#/* copyright holders. Please contact us, if you feel you should be listed */
+#/* as copyright holder, as well.                                          */
+#/*                                                                        */
+#/**************************************************************************/
 
 #
 # Get values from configure script.
diff --git a/nxcompext/Mask.c b/nxcompext/Mask.c
index b04989d44..6fbc44a8e 100644
--- a/nxcompext/Mask.c
+++ b/nxcompext/Mask.c
@@ -1,17 +1,25 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPEXT, NX protocol compression and NX extensions to this software  */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* All rights reserved.                                                   */
 /*                                                                        */
-/* All rigths reserved.                                                   */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
 /*                                                                        */
 /**************************************************************************/
 
diff --git a/nxcompext/Mask.h b/nxcompext/Mask.h
index 5d6024f59..1b6fe6d99 100644
--- a/nxcompext/Mask.h
+++ b/nxcompext/Mask.h
@@ -1,17 +1,25 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPEXT, NX protocol compression and NX extensions to this software  */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* All rights reserved.                                                   */
 /*                                                                        */
-/* All rigths reserved.                                                   */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
 /*                                                                        */
 /**************************************************************************/
 
diff --git a/nxcompext/NXlib.c b/nxcompext/NXlib.c
index c705d977d..0b8126557 100644
--- a/nxcompext/NXlib.c
+++ b/nxcompext/NXlib.c
@@ -1,17 +1,25 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPEXT, NX protocol compression and NX extensions to this software  */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* All rights reserved.                                                   */
 /*                                                                        */
-/* All rigths reserved.                                                   */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
 /*                                                                        */
 /**************************************************************************/
 
diff --git a/nxcompext/NXlib.h b/nxcompext/NXlib.h
index 15661b439..f4d76cb46 100644
--- a/nxcompext/NXlib.h
+++ b/nxcompext/NXlib.h
@@ -1,17 +1,25 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPEXT, NX protocol compression and NX extensions to this software  */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* All rights reserved.                                                   */
 /*                                                                        */
-/* All rigths reserved.                                                   */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
 /*                                                                        */
 /**************************************************************************/
 
diff --git a/nxcompext/NXlibint.h b/nxcompext/NXlibint.h
index 37ba63723..e5caf8f45 100644
--- a/nxcompext/NXlibint.h
+++ b/nxcompext/NXlibint.h
@@ -1,17 +1,25 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPEXT, NX protocol compression and NX extensions to this software  */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* All rights reserved.                                                   */
 /*                                                                        */
-/* All rigths reserved.                                                   */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
 /*                                                                        */
 /**************************************************************************/
 
diff --git a/nxcompext/Pgn.c b/nxcompext/Pgn.c
index d8fa919cc..3099a248c 100644
--- a/nxcompext/Pgn.c
+++ b/nxcompext/Pgn.c
@@ -1,17 +1,25 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPEXT, NX protocol compression and NX extensions to this software  */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* All rights reserved.                                                   */
 /*                                                                        */
-/* All rigths reserved.                                                   */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
 /*                                                                        */
 /**************************************************************************/
 
diff --git a/nxcompext/Pgn.h b/nxcompext/Pgn.h
index 075d2bc1e..eb4c8cc3f 100644
--- a/nxcompext/Pgn.h
+++ b/nxcompext/Pgn.h
@@ -1,17 +1,25 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPEXT, NX protocol compression and NX extensions to this software  */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* All rights reserved.                                                   */
 /*                                                                        */
-/* All rigths reserved.                                                   */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
 /*                                                                        */
 /**************************************************************************/
 
diff --git a/nxcompext/Rgb.c b/nxcompext/Rgb.c
index d6cecb4b6..683f11898 100644
--- a/nxcompext/Rgb.c
+++ b/nxcompext/Rgb.c
@@ -1,17 +1,25 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPEXT, NX protocol compression and NX extensions to this software  */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* All rights reserved.                                                   */
 /*                                                                        */
-/* All rigths reserved.                                                   */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
 /*                                                                        */
 /**************************************************************************/
 
diff --git a/nxcompext/Rgb.h b/nxcompext/Rgb.h
index 931ee6af7..fd53ffbf9 100644
--- a/nxcompext/Rgb.h
+++ b/nxcompext/Rgb.h
@@ -1,17 +1,25 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPEXT, NX protocol compression and NX extensions to this software  */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* All rights reserved.                                                   */
 /*                                                                        */
-/* All rigths reserved.                                                   */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
 /*                                                                        */
 /**************************************************************************/
 
diff --git a/nxcompext/Rle.c b/nxcompext/Rle.c
index b647dbbae..883fde1e8 100644
--- a/nxcompext/Rle.c
+++ b/nxcompext/Rle.c
@@ -1,17 +1,25 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPEXT, NX protocol compression and NX extensions to this software  */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* All rights reserved.                                                   */
 /*                                                                        */
-/* All rigths reserved.                                                   */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
 /*                                                                        */
 /**************************************************************************/
 
diff --git a/nxcompext/Rle.h b/nxcompext/Rle.h
index 7125d2f24..a32812657 100644
--- a/nxcompext/Rle.h
+++ b/nxcompext/Rle.h
@@ -1,17 +1,25 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPEXT, NX protocol compression and NX extensions to this software  */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* All rights reserved.                                                   */
 /*                                                                        */
-/* All rigths reserved.                                                   */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
 /*                                                                        */
 /**************************************************************************/
 
diff --git a/nxcompext/Z.c b/nxcompext/Z.c
index d6ed3d149..9ee453d32 100644
--- a/nxcompext/Z.c
+++ b/nxcompext/Z.c
@@ -1,17 +1,25 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPEXT, NX protocol compression and NX extensions to this software  */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* All rights reserved.                                                   */
 /*                                                                        */
-/* All rigths reserved.                                                   */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
 /*                                                                        */
 /**************************************************************************/
 
diff --git a/nxcompext/Z.h b/nxcompext/Z.h
index b6733c607..8133f0c73 100644
--- a/nxcompext/Z.h
+++ b/nxcompext/Z.h
@@ -1,17 +1,25 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2007 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPEXT, NX protocol compression and NX extensions to this software  */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
-/* NX and NoMachine are trademarks of NoMachine S.r.l.                    */
+/* All rights reserved.                                                   */
 /*                                                                        */
-/* All rigths reserved.                                                   */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
 /*                                                                        */
 /**************************************************************************/
 
diff --git a/nxcompext/configure.in b/nxcompext/configure.in
index 70bb9d121..2ec62d497 100644
--- a/nxcompext/configure.in
+++ b/nxcompext/configure.in
@@ -1,3 +1,28 @@
+dnl /**************************************************************************/
+dnl /*                                                                        */
+dnl /* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+dnl /* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+dnl /* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+dnl /* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+dnl /* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+dnl /* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+dnl /*                                                                        */
+dnl /* NXCOMPEXT, NX protocol compression and NX extensions to this software  */
+dnl /* are copyright of the aforementioned persons and companies.             */
+dnl /*                                                                        */
+dnl /* Redistribution and use of the present software is allowed according    */
+dnl /* to terms specified in the file LICENSE which comes in the source       */
+dnl /* distribution.                                                          */
+dnl /*                                                                        */
+dnl /* All rights reserved.                                                   */
+dnl /*                                                                        */
+dnl /* NOTE: This software has received contributions from various other      */
+dnl /* contributors, only the core maintainers and supporters are listed as   */
+dnl /* copyright holders. Please contact us, if you feel you should be listed */
+dnl /* as copyright holder, as well.                                          */
+dnl /*                                                                        */
+dnl /**************************************************************************/
+
 dnl Process this file with autoconf to produce a configure script.
 
 dnl Prolog
diff --git a/nxcompshad/Core.cpp b/nxcompshad/Core.cpp
index 6f9449387..1682d343f 100644
--- a/nxcompshad/Core.cpp
+++ b/nxcompshad/Core.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include <string.h>
diff --git a/nxcompshad/Core.h b/nxcompshad/Core.h
index 9bc8a645b..91f3f1e22 100644
--- a/nxcompshad/Core.h
+++ b/nxcompshad/Core.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef CorePoller_H
diff --git a/nxcompshad/Input.cpp b/nxcompshad/Input.cpp
index f9bf1810d..a79b30459 100644
--- a/nxcompshad/Input.cpp
+++ b/nxcompshad/Input.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include <string.h>
diff --git a/nxcompshad/Input.h b/nxcompshad/Input.h
index 88217c9b1..cbba029a9 100644
--- a/nxcompshad/Input.h
+++ b/nxcompshad/Input.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef Input_H
diff --git a/nxcompshad/Logger.cpp b/nxcompshad/Logger.cpp
index c367c5d7f..f27c97c19 100644
--- a/nxcompshad/Logger.cpp
+++ b/nxcompshad/Logger.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* NXCOMPSHAD, NX protocol compression and NX extensions to this software */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include <stdio.h>
diff --git a/nxcompshad/Logger.h b/nxcompshad/Logger.h
index 2e6430b48..eba81f642 100644
--- a/nxcompshad/Logger.h
+++ b/nxcompshad/Logger.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* NXCOMPSHAD, NX protocol compression and NX extensions to this software */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef Logger_H
diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in
index 053b00988..e14d58312 100644
--- a/nxcompshad/Makefile.in
+++ b/nxcompshad/Makefile.in
@@ -1,19 +1,27 @@
-############################################################################
-#                                                                          #
-#  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       #
-#  software is allowed according to terms specified in the file LICENSE    #
-#  which comes in the source distribution.                                 #
-#                                                                          #
-#  Check http://www.nomachine.com/licensing.html for applicability.        #
-#                                                                          #
-#  NX and NoMachine are trademarks of Medialogic S.p.A.                    #
-#                                                                          #
-#  All rights reserved.                                                    #
-#                                                                          #
-############################################################################
+#/**************************************************************************/
+#/*                                                                        */
+#/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+#/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+#/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+#/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+#/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+#/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+#/*                                                                        */
+#/* NXCOMPSHAD, NX protocol compression and NX extensions to this software */
+#/* are copyright of the aforementioned persons and companies.             */
+#/*                                                                        */
+#/* Redistribution and use of the present software is allowed according    */
+#/* to terms specified in the file LICENSE which comes in the source       */
+#/* distribution.                                                          */
+#/*                                                                        */
+#/* All rights reserved.                                                   */
+#/*                                                                        */
+#/* NOTE: This software has received contributions from various other      */
+#/* contributors, only the core maintainers and supporters are listed as   */
+#/* copyright holders. Please contact us, if you feel you should be listed */
+#/* as copyright holder, as well.                                          */
+#/*                                                                        */
+#/**************************************************************************/
 
 #
 # Get values from configure script.
diff --git a/nxcompshad/Manager.cpp b/nxcompshad/Manager.cpp
index 3b5504a1f..3bb36c13f 100644
--- a/nxcompshad/Manager.cpp
+++ b/nxcompshad/Manager.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include <nx-X11/Xlib.h>
diff --git a/nxcompshad/Manager.h b/nxcompshad/Manager.h
index 56b7e0aa5..92a82cd32 100644
--- a/nxcompshad/Manager.h
+++ b/nxcompshad/Manager.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef UpdateManager_H
diff --git a/nxcompshad/Misc.h b/nxcompshad/Misc.h
index 27f267036..9386dc080 100644
--- a/nxcompshad/Misc.h
+++ b/nxcompshad/Misc.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef Misc_H
diff --git a/nxcompshad/Poller.h b/nxcompshad/Poller.h
index 4435b5bba..6236f872f 100644
--- a/nxcompshad/Poller.h
+++ b/nxcompshad/Poller.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef Poller_H
diff --git a/nxcompshad/Regions.h b/nxcompshad/Regions.h
index d46d11a72..59fdcb46c 100644
--- a/nxcompshad/Regions.h
+++ b/nxcompshad/Regions.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef Region_H
diff --git a/nxcompshad/Shadow.cpp b/nxcompshad/Shadow.cpp
index f9525adcf..4a28f2c52 100644
--- a/nxcompshad/Shadow.cpp
+++ b/nxcompshad/Shadow.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include <signal.h>
diff --git a/nxcompshad/Shadow.h b/nxcompshad/Shadow.h
index 99824b0aa..e1c57c432 100644
--- a/nxcompshad/Shadow.h
+++ b/nxcompshad/Shadow.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef Shadow_H
diff --git a/nxcompshad/Updater.cpp b/nxcompshad/Updater.cpp
index eee81bf16..67f4f9628 100644
--- a/nxcompshad/Updater.cpp
+++ b/nxcompshad/Updater.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #include <nx-X11/Xlib.h>
diff --git a/nxcompshad/Updater.h b/nxcompshad/Updater.h
index cb8b15aa6..10d75c0d6 100644
--- a/nxcompshad/Updater.h
+++ b/nxcompshad/Updater.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef Updater_H
diff --git a/nxcompshad/Win.cpp b/nxcompshad/Win.cpp
index 77a9694bd..b3a06f415 100644
--- a/nxcompshad/Win.cpp
+++ b/nxcompshad/Win.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #if defined(__CYGWIN32__) || defined(WIN32)
diff --git a/nxcompshad/Win.h b/nxcompshad/Win.h
index 1069fa9ee..615f9a5f5 100644
--- a/nxcompshad/Win.h
+++ b/nxcompshad/Win.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifdef __CYGWIN32__
diff --git a/nxcompshad/X11.cpp b/nxcompshad/X11.cpp
index b5383816a..d1af82281 100644
--- a/nxcompshad/X11.cpp
+++ b/nxcompshad/X11.cpp
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #if !defined(__CYGWIN32__) && !defined(WIN32)
diff --git a/nxcompshad/X11.h b/nxcompshad/X11.h
index f5d7f2916..87dd31fea 100644
--- a/nxcompshad/X11.h
+++ b/nxcompshad/X11.h
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifndef X11Poller_H
diff --git a/nxcompshad/configure.in b/nxcompshad/configure.in
index 226b13ef8..bb9286e3d 100644
--- a/nxcompshad/configure.in
+++ b/nxcompshad/configure.in
@@ -1,3 +1,29 @@
+dnl /**************************************************************************/
+dnl /*                                                                        */
+dnl /* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+dnl /* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+dnl /* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+dnl /* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+dnl /* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+dnl /* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+dnl /*                                                                        */
+dnl /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */
+dnl /* are copyright of the aforementioned persons and companies.             */
+dnl /*                                                                        */
+dnl /* Redistribution and use of the present software is allowed according    */
+dnl /* to terms specified in the file LICENSE which comes in the source       */
+dnl /* distribution.                                                          */
+dnl /*                                                                        */
+dnl /* All rights reserved.                                                   */
+dnl /*                                                                        */
+dnl /* NOTE: This software has received contributions from various other      */
+dnl /* contributors, only the core maintainers and supporters are listed as   */
+dnl /* copyright holders. Please contact us, if you feel you should be listed */
+dnl /* as copyright holder, as well.                                          */
+dnl /*                                                                        */
+dnl /**************************************************************************/
+
+
 dnl Process this file with autoconf to produce a configure script.
 
 dnl Prolog
-- 
cgit v1.2.3


From 29be5cc07bdaa22086da6d0607a1c86b07e95875 Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ïonic@ionic.de>
Date: Sat, 2 Jul 2016 21:49:10 +0000
Subject: 
 {nx-X11/programs/Xserver/hw/nxagent/{Args.c,Options.{c,h}},nxcomp/{Loop,Misc}.cpp}:
 add tolerancechecks parameter as an nx/nx option and ReconnectTolerance as an
 nxagentOption.

---
 nx-X11/programs/Xserver/hw/nxagent/Args.c    | 76 ++++++++++++++++++++++++++++
 nx-X11/programs/Xserver/hw/nxagent/Options.c |  2 +
 nx-X11/programs/Xserver/hw/nxagent/Options.h | 17 +++++++
 nxcomp/Loop.cpp                              |  3 +-
 nxcomp/Misc.cpp                              |  4 +-
 5 files changed, 100 insertions(+), 2 deletions(-)

(limited to 'nxcomp')

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c
index 832595786..9e54c0073 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
@@ -1405,6 +1405,82 @@ static void nxagentParseOptions(char *name, char *value)
 
     return;
   }
+  else if (!strcmp(name, "tolerancechecks"))
+  {
+    if (strcmp(value, "strict") == 0)
+    {
+      nxagentChangeOption(ReconnectTolerance, ToleranceChecksStrict);
+    }
+    else if (strcmp(value, "safe") == 0)
+    {
+      nxagentChangeOption(ReconnectTolerance, ToleranceChecksSafe);
+    }
+    else if (strcmp(value, "risky") == 0)
+    {
+      nxagentChangeOption(ReconnectTolerance, ToleranceChecksRisky);
+    }
+    else if (strcmp(value, "none") == 0)
+    {
+      nxagentChangeOption(ReconnectTolerance, ToleranceChecksBypass);
+    }
+    else
+    {
+      /*
+       * Check for a matching integer. Or any integer, really.
+       */
+      long tolerance_parse = 0;
+
+      errno = 0;
+      tolerance_parse = strtol(value, NULL, 10);
+
+      if ((errno) && (0 == tolerance_parse))
+      {
+        fprintf(stderr, "nxagentParseOptions: Unable to convert value [%s] of option [%s]. "
+                        "Ignoring option.\n",
+                        validateString(value), validateString(name));
+
+        return;
+      }
+
+      if ((long) UINT_MAX < tolerance_parse)
+      {
+        tolerance_parse = UINT_MAX;
+
+        fprintf(stderr, "nxagentParseOptions: Warning: value [%s] of option [%s] "
+                        "out of range, clamped to [%u].\n",
+                        validateString(value), validateString(name), tolerance_parse);
+      }
+
+      if (0 > tolerance_parse)
+      {
+        tolerance_parse = 0;
+
+        fprintf(stderr, "nxagentParseOptions: Warning: value [%s] of option [%s] "
+                        "out of range, clamped to [%u].\n",
+                        validateString(value), validateString(name), tolerance_parse);
+      }
+
+      #ifdef TEST
+      switch (tolerance_parse) {
+        case ToleranceChecksStrict:
+        case ToleranceChecksSafe:
+        case ToleranceChecksRisky:
+        case ToleranceChecksBypass:
+                               break;
+        default:
+                               fprintf(stderr, "nxagentParseOptions: Warning: value [%s] of "
+                                               "option [%s] unknown, will be mapped to "
+                                               "\"Bypass\" [%u] value internally.\n",
+                                       validateString(value), validateString(name),
+                                       (unsigned int)ToleranceChecksBypass);
+      }
+      #endif
+
+      nxagentChangeOption(ReconnectTolerance, tolerance_parse);
+    }
+
+    return;
+  }
   else
   {
     #ifdef DEBUG
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Options.c b/nx-X11/programs/Xserver/hw/nxagent/Options.c
index 0a894f9a4..978f3ab95 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Options.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Options.c
@@ -166,6 +166,8 @@ void nxagentInitOptions()
   nxagentOptions.Xinerama = 1;
 
   nxagentOptions.SleepTime = DEFAULT_SLEEP_TIME;
+
+  nxagentOptions.ReconnectTolerance = DEFAULT_TOLERANCE;
 }
 
 /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Options.h b/nx-X11/programs/Xserver/hw/nxagent/Options.h
index df6f8b65b..20616a90b 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Options.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Options.h
@@ -67,6 +67,17 @@ typedef enum _ClientOsType
 
 } ClientOsType;
 
+typedef enum _ToleranceChecksMode
+{
+  ToleranceChecksStrict = 0,
+  ToleranceChecksSafe = 1,
+  ToleranceChecksRisky = 2,
+  ToleranceChecksBypass = 3
+} ToleranceChecksMode;
+
+
+#define DEFAULT_TOLERANCE ToleranceChecksStrict
+
 /*
  * Set of options affecting agent operations.
  */
@@ -414,6 +425,12 @@ typedef struct _AgentOptions
 
   unsigned int SleepTime;
 
+  /*
+   * Tolerance - tightens or loosens reconnect checks.
+   */
+
+  ToleranceChecksMode ReconnectTolerance;
+
 } AgentOptionsRec;
 
 typedef AgentOptionsRec *AgentOptionsPtr;
diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index c0951ee19..10026967a 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -9063,7 +9063,8 @@ int ParseEnvironmentOptions(const char *env, int force)
                                  strcasecmp(name, "clipboard") == 0 ||
                                      strcasecmp(name, "streaming") == 0 ||
                                          strcasecmp(name, "backingstore") == 0 ||
-                                             strcasecmp(name, "sleep") == 0)
+                                             strcasecmp(name, "sleep") == 0 ||
+                                                 strcasecmp(name, "tolerancechecks") == 0)
     {
       #ifdef DEBUG
       *logofs << "Loop: Ignoring agent option '" << name
diff --git a/nxcomp/Misc.cpp b/nxcomp/Misc.cpp
index ca062ebed..c94dc8b9c 100644
--- a/nxcomp/Misc.cpp
+++ b/nxcomp/Misc.cpp
@@ -325,7 +325,9 @@ shadowmode=s\n\
 defer=n\n\
 tile=s\n\
 menu=n\n\
-sleep=n        These options are interpreted by the NX agent. They\n\
+sleep=n\n\
+tolerancecehcks=s\n\
+               These options are interpreted by the NX agent. They\n\
                are ignored by the proxy.\n\
 \n\
   Environment:\n\
-- 
cgit v1.2.3


From ed5d920f6659d990408909c4195f4965955b5251 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 24 Aug 2016 16:08:41 +0200
Subject: nxcomp/Loop.cpp: Refer to Github namespace of Arctica Project as
 location to search for software updates.

 Fixes ArcticaProject/190
---
 nxcomp/Loop.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 10026967a..34ba2a32e 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -12664,7 +12664,7 @@ int SetVersion()
 
   if (local < remote)
   {
-    cerr << "Warning" << ": Consider checking http://www.nomachine.com/ for updates.\n";
+    cerr << "Warning" << ": Consider checking https://github.com/ArcticaProject/nx-libs/releases for updates.\n";
   }
 
   //
-- 
cgit v1.2.3


From 8fc2e80bcdc121b37a379e0bfff8595cb46fd0b6 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 24 Aug 2016 16:11:04 +0200
Subject: nxcomp/*.c: Update copyright headers, use new list of copyright
 holders like for the .cpp files.

---
 nxcomp/Pack.c | 22 +++++++++++++++-------
 nxcomp/Vars.c | 22 +++++++++++++++-------
 2 files changed, 30 insertions(+), 14 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Pack.c b/nxcomp/Pack.c
index 59a54cfbf..97fb93b5f 100644
--- a/nxcomp/Pack.c
+++ b/nxcomp/Pack.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #define PANIC
diff --git a/nxcomp/Vars.c b/nxcomp/Vars.c
index 0d93a6dc6..685969677 100644
--- a/nxcomp/Vars.c
+++ b/nxcomp/Vars.c
@@ -1,18 +1,26 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
 /*                                                                        */
 /* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of NoMachine. Redistribution and use of the present      */
-/* software is allowed according to terms specified in the file LICENSE   */
-/* which comes in the source distribution.                                */
+/* are copyright of the aforementioned persons and companies.             */
 /*                                                                        */
-/* Check http://www.nomachine.com/licensing.html for applicability.       */
-/*                                                                        */
-/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
 /*                                                                        */
 /* All rights reserved.                                                   */
 /*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
 /**************************************************************************/
 
 #ifdef __cplusplus
-- 
cgit v1.2.3


From e2011608fc9f6142e1d84292655fca62f7f57363 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 24 Aug 2016 16:13:52 +0200
Subject: nxcomp/Misc.cpp: Display new list of copyright holders when launching
 nxproxy / nxagent.

---
 nxcomp/Misc.cpp | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Misc.cpp b/nxcomp/Misc.cpp
index c94dc8b9c..b1f024601 100644
--- a/nxcomp/Misc.cpp
+++ b/nxcomp/Misc.cpp
@@ -393,18 +393,26 @@ const char *GetUsageInfo()
 
 static const char CopyrightInfo[] =
 "\
-Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.\n\
+Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)\n\
+Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>\n\
+Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>\n\
+Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>\n\
+Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n\
+Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)\n\
 \n\
-NXCOMP, NX protocol compression and NX extensions to this software \n\
-are copyright of NoMachine. Redistribution (modified or unmodified) and\n\
-use of the present software is allowed according to terms specified in\n\
-the file LICENSE which comes in the source distribution.\n\
+NXCOMP, NX protocol compression and NX extensions to this software\n\
+are copyright of the aforementioned persons and companies.\n\
 \n\
-Check http://www.nomachine.com/licensing.html for applicability.\n\
-\n\
-NX and NoMachine are trademarks of NoMachine S.r.l.\n\
+Redistribution and use of the present software is allowed according\n\
+to terms specified in the file LICENSE.nxcomp which comes in the\n\
+source distribution.\n\
 \n\
 All rights reserved.\n\
+\n\
+NOTE: This software has received contributions from various other\n\
+contributors, only the core maintainers and supporters are listed as\n\
+copyright holders. Please contact us, if you feel you should be listed\n\
+as copyright holder, as well.\n\
 ";
 
 const char *GetCopyrightInfo()
-- 
cgit v1.2.3


From efa309addd1de66f51158a327a7c093320892377 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 24 Aug 2016 16:29:46 +0200
Subject: nxcomp/Loop.cpp: We have GetCopyrightInfo() in Misc.cpp, so why not
 use it? Also: point to ArcticaProject/nx-libs namespace on Github for further
 information.

---
 nxcomp/Loop.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 34ba2a32e..3d0f8da7e 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -13925,8 +13925,8 @@ void PrintProcessInfo()
          << "." << control -> LocalVersionMinor << "."
          << control -> LocalVersionPatch << "\n\n";
 
-    cerr << "Copyright (C) 2001, 2010 NoMachine.\n"
-         << "See http://www.nomachine.com/ for more information.\n\n";
+    cerr << GetCopyrightInfo()
+         << "See https://github.com/ArcticaProject/nx-libs for more information.\n\n";
   }
 
   //
-- 
cgit v1.2.3


From 01ebcfa35418337c96c46965eb0c6831c2096538 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Fri, 26 Aug 2016 12:40:49 +0200
Subject: nxcomp/Loop.cpp: Mention DXPC copyright holders on application (i.e.
 nxproxy) start-up.

---
 nxcomp/Loop.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'nxcomp')

diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 3d0f8da7e..7e67e3450 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -13926,6 +13926,9 @@ void PrintProcessInfo()
          << control -> LocalVersionPatch << "\n\n";
 
     cerr << GetCopyrightInfo()
+	 << "\n"
+         << GetOtherCopyrightInfo()
+	 << "\n"
          << "See https://github.com/ArcticaProject/nx-libs for more information.\n\n";
   }
 
-- 
cgit v1.2.3


From 60e88a0b1fb3570745c3d6bde1b5fdbd8d2f99e7 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Fri, 26 Aug 2016 12:49:28 +0200
Subject: nxcomp/Loop.cpp: We have PrintVersionInfo(), why not use it? Use endl
 instead of \n for EOLs when streaming application's preamble to stderr.

---
 nxcomp/Loop.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 7e67e3450..2f7671cc6 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -13921,15 +13921,18 @@ void PrintProcessInfo()
 {
   if (agent == NULL)
   {
-    cerr << "\nNXPROXY - Version " << control -> LocalVersionMajor
-         << "." << control -> LocalVersionMinor << "."
-         << control -> LocalVersionPatch << "\n\n";
+
+    cerr << endl;
+
+    PrintVersionInfo();
+
+    cerr << endl;
 
     cerr << GetCopyrightInfo()
-	 << "\n"
+         << endl
          << GetOtherCopyrightInfo()
-	 << "\n"
-         << "See https://github.com/ArcticaProject/nx-libs for more information.\n\n";
+         << endl
+         << "See https://github.com/ArcticaProject/nx-libs for more information." << endl << endl;
   }
 
   //
-- 
cgit v1.2.3


From 85f5fdfd28dd7ba024586a62cc7cbba2d1b9e027 Mon Sep 17 00:00:00 2001
From: Vadim Troshchinskiy <vtroshchinskiy@qindel.com>
Date: Fri, 7 Oct 2016 13:58:57 +0200
Subject: Check if unixPath is NULL before accessing it; this fixes crashing of
 nxagent when TEST is enabled.

Fixes ArcticaProject/nx-libs#217.
Closes ArcticaProject/nx-libs#218.
---
 nxcomp/Loop.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 2f7671cc6..a690042d2 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -7255,7 +7255,7 @@ int ConnectToRemote(ChannelEndPoint &socketAddress)
       ESET(reason);
 
       #ifdef TEST
-      if (unixPath[0] != '\0' )
+      if (unixPath && unixPath[0] != '\0' )
       {
         *logofs << "Loop: Connection to Unix socket file '"
                 << unixPath << "' failed with error '"
-- 
cgit v1.2.3


From f55852c2ea6f4217eb3527071be8278d993a912f Mon Sep 17 00:00:00 2001
From: Vadim Troshchinskiyddd <vtroshchinskiy@qindel.com>
Date: Fri, 7 Oct 2016 13:12:39 +0200
Subject: Fix nxproxy hostname parsing.

Fixes ArcticaProject/nx-libs#207
Closes ArcticaProject/nx-libs#216
---
 nxcomp/Loop.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index a690042d2..7e77bc2a9 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -9367,10 +9367,10 @@ int ParseCommandLineOptions(int argc, const char **argv)
         // command line at the connecting side.
         //
 
-        char *cHost;
-        long cPort;
+        char cHost[DEFAULT_STRING_LENGTH] = { '\0' };
+        long cPort = 0;
 
-        if (connectSocket.getTCPHostAndPort(&cHost, &cPort) && (ParseHostOption(nextArg, cHost, cPort) > 0))
+        if (ParseHostOption(nextArg, cHost, cPort) > 0)
           {
             //
             // Assume port is at a proxied display offset.
-- 
cgit v1.2.3


From 0bf52dc991cd8acd2ab2fdcf43d21863ce1bc1e1 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Mon, 10 Oct 2016 01:00:38 +0200
Subject: nxcomp: Fix typo in usage message.

---
 nxcomp/Misc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Misc.cpp b/nxcomp/Misc.cpp
index b1f024601..71013fc6f 100644
--- a/nxcomp/Misc.cpp
+++ b/nxcomp/Misc.cpp
@@ -326,7 +326,7 @@ defer=n\n\
 tile=s\n\
 menu=n\n\
 sleep=n\n\
-tolerancecehcks=s\n\
+tolerancechecks=s\n\
                These options are interpreted by the NX agent. They\n\
                are ignored by the proxy.\n\
 \n\
-- 
cgit v1.2.3


From d2fb76d8bd3fa397dfe3250a5524284334713d57 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Thu, 13 Oct 2016 14:44:27 +0200
Subject: nxcomp/{Client|}Proxy.cpp: Typo fix in error messages.

---
 nxcomp/ClientProxy.cpp | 8 ++++----
 nxcomp/Proxy.cpp       | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/ClientProxy.cpp b/nxcomp/ClientProxy.cpp
index 4f8c828f9..3df45331a 100644
--- a/nxcomp/ClientProxy.cpp
+++ b/nxcomp/ClientProxy.cpp
@@ -193,11 +193,11 @@ int ClientProxy::handleNewAgentConnection(Agent *agent)
   if (channelId == -1)
   {
     #ifdef PANIC
-    *logofs << "ClientProxy: PANIC! Maximum mumber of available "
+    *logofs << "ClientProxy: PANIC! Maximum number of available "
             << "channels exceeded.\n" << logofs_flush;
     #endif
 
-    cerr << "Error" << ": Maximum mumber of available "
+    cerr << "Error" << ": Maximum number of available "
          << "channels exceeded.\n";
 
     return -1;
@@ -226,11 +226,11 @@ int ClientProxy::handleNewXConnection(int clientFd)
     if (channelId == -1)
     {
       #ifdef PANIC
-      *logofs << "ClientProxy: PANIC! Maximum mumber of available "
+      *logofs << "ClientProxy: PANIC! Maximum number of available "
               << "channels exceeded.\n" << logofs_flush;
       #endif
 
-      cerr << "Error" << ": Maximum mumber of available "
+      cerr << "Error" << ": Maximum number of available "
            << "channels exceeded.\n";
 
       return -1;
diff --git a/nxcomp/Proxy.cpp b/nxcomp/Proxy.cpp
index c7454bffa..e499b443e 100644
--- a/nxcomp/Proxy.cpp
+++ b/nxcomp/Proxy.cpp
@@ -5908,11 +5908,11 @@ int Proxy::handleNewGenericConnection(int clientFd, T_channel_type type, const c
   if (channelId == -1)
   {
     #ifdef PANIC
-    *logofs << "Proxy: PANIC! Maximum mumber of available "
+    *logofs << "Proxy: PANIC! Maximum number of available "
             << "channels exceeded.\n" << logofs_flush;
     #endif
 
-    cerr << "Error" << ": Maximum mumber of available "
+    cerr << "Error" << ": Maximum number of available "
          << "channels exceeded.\n";
 
     return -1;
-- 
cgit v1.2.3


From 185fbdaf97def90b203d09868d6e30dd761c68fe Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Sat, 15 Oct 2016 23:01:59 +0200
Subject: Loop.cpp: Fix output of SetCore()

---
 nxcomp/Loop.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 7e77bc2a9..46031e70d 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -10201,7 +10201,7 @@ int SetCore()
   if (getrlimit(RLIMIT_CORE, &rlim))
   {
     #ifdef TEST
-    *logofs << "Cannot read RLIMIT_CORE. Error is '"
+    *logofs << "Loop: Cannot read RLIMIT_CORE. Error is '"
             << ESTR() << "'.\n" << logofs_flush;
     #endif
 
@@ -10215,7 +10215,7 @@ int SetCore()
     if (setrlimit(RLIMIT_CORE, &rlim))
     {
       #ifdef TEST
-      *logofs << "Loop: Cannot read RLIMIT_CORE. Error is '"
+      *logofs << "Loop: Cannot set RLIMIT_CORE. Error is '"
               << ESTR() << "'.\n" << logofs_flush;
       #endif
 
@@ -10224,7 +10224,7 @@ int SetCore()
   }
 
   #ifdef TEST
-  *logofs << "Loop: Set RLIMIT_CORE to "<< rlim.rlim_max
+  *logofs << "Loop: RLIMIT_CORE is "<< rlim.rlim_max
           << ".\n" << logofs_flush;
   #endif
 
-- 
cgit v1.2.3


From 30af52eb324f6bf5551869033605e3141d745a40 Mon Sep 17 00:00:00 2001
From: Vadim Troshchinskiy <vadim@qindel.com>
Date: Tue, 18 Oct 2016 09:19:28 +0200
Subject: Slave channel implementation

When enabled and a connection is made to the port, launches the
process specified in NX_SLAVE_CMD on the other side, and connects
stdin and stdout to the socket.

This is used for VM/client and client/VM communication.
---
 nxcomp/Loop.cpp  |   4 +-
 nxcomp/Proxy.cpp | 183 +++++++++++++++++++++++++++++++++++++++++++++----------
 nxcomp/Proxy.h   |   3 +
 3 files changed, 156 insertions(+), 34 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 46031e70d..09ba6f952 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -359,7 +359,7 @@ static void RestoreSignal(int signal);
 
 static int HandleChildren();
 
-static int HandleChild(int child);
+int HandleChild(int child);
 static int CheckChild(int pid, int status);
 static int WaitChild(int child, const char *label, int force);
 
@@ -6250,6 +6250,8 @@ int HandleChildren()
     return 1;
   }
 
+  proxy->checkSlaves();
+
   //
   // This can actually happen either because we
   // reset the pid of the child process as soon
diff --git a/nxcomp/Proxy.cpp b/nxcomp/Proxy.cpp
index e499b443e..123181489 100644
--- a/nxcomp/Proxy.cpp
+++ b/nxcomp/Proxy.cpp
@@ -29,6 +29,8 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <signal.h>
+
 #ifdef ANDROID
 #include <netinet/in.h>
 #include <netinet/ip.h>
@@ -92,6 +94,8 @@ struct sockaddr_un
 
 extern void CleanupListeners();
 
+extern int HandleChild(int);
+
 //
 // Default size of string buffers.
 //
@@ -165,6 +169,7 @@ Proxy::Proxy(int fd)
 
     fdMap_[channelId]      = nothing;
     channelMap_[channelId] = nothing;
+    slavePidMap_[channelId] = nothing;
   }
 
   inputChannel_  = nothing;
@@ -296,6 +301,66 @@ Proxy::~Proxy()
     }
   }
 
+  //
+  // Kill all active slave channel children, and
+  // give them 5 seconds to exit nicely.
+
+  #ifdef DEBUG
+  *logofs << "Proxy: Killing active slaves" << endl;
+  #endif
+
+  int slave_count = 999;
+  int loop_count = 0;
+
+  while(slave_count > 0 && loop_count < 50)
+  {
+    slave_count = 0;
+
+    for (int channelId = 0; channelId<CONNECTIONS_LIMIT; channelId++)
+    {
+      int pid = slavePidMap_[channelId];
+
+      if (pid > 1) {
+         slave_count++;
+
+         #ifdef DEBUG
+         *logofs << "Proxy: Active slave with pid " << pid << logofs_flush;
+         #endif
+
+         if ( loop_count == 0 )
+         {
+             #ifdef DEBUG
+             *logofs << "Proxy: Sending SIGTERM to " << pid << logofs_flush;
+             #endif
+             kill(pid, SIGTERM);
+         }
+         else if ( loop_count == 25 )
+         {
+             #ifdef DEBUG
+             *logofs << "Proxy: Sending SIGKILL to " << pid << logofs_flush;
+             #endif
+             kill(pid, SIGKILL);
+         }
+
+         if (HandleChild(pid))
+         {
+             #ifdef DEBUG
+             *logofs << "Proxy: Slave " << pid << " terminated" << logofs_flush;
+             #endif
+             slavePidMap_[channelId] = nothing;
+         }
+      }
+    }
+
+    if ( slave_count > 0 )
+    {
+      cerr << "Proxy: Error: Failed to kill all slave channel processes. " << slave_count << " processes still remaining." << endl;
+    }
+
+    usleep(200000);
+    loop_count++;
+  }
+
   delete transport_;
   delete compressor_;
 
@@ -6308,42 +6373,94 @@ int Proxy::handleNewGenericConnectionFromProxyUnix(int channelId, T_channel_type
 
 int Proxy::handleNewSlaveConnectionFromProxy(int channelId)
 {
-  //
-  // Implementation is incomplete. Opening a
-  // slave channel should let the proxy fork
-  // a new client and pass to it the channel
-  // descriptors. For now we make the channel
-  // fail immediately.
-  //
-  // #include <fcntl.h>
-  // #include <sys/types.h>
-  // #include <sys/stat.h>
-  //
-  // char *slaveServer = "/dev/null";
-  //
-  // #ifdef TEST
-  // *logofs << "Proxy: Opening file '" << slaveServer
-  //         << "'.\n" << logofs_flush;
-  // #endif
-  //
-  // int serverFd = open(slaveServer, O_RDWR);
-  //
-  // if (handlePostConnectionFromProxy(channelId, serverFd, channel_slave, "slave") < 0)
-  // {
-  //   return -1;
-  // }
-  //
 
-  #ifdef WARNING
-  *logofs << "Proxy: Refusing new slave connection for "
-          << "channel ID#" << channelId << "\n"
-          << logofs_flush;
-  #endif
+  cerr << "Info" << ": New slave connection on "
+       << "channel ID#" << channelId << "\n";
+
+  char *nx_slave_cmd = getenv("NX_SLAVE_CMD");
+  if (nx_slave_cmd == NULL) {
+    return -1;
+  }
 
-  cerr << "Warning" << ": Refusing new slave connection for "
-          << "channel ID#" << channelId << "\n";
+  int spair[2];
+  if (socketpair(AF_UNIX, SOCK_STREAM, 0, spair) == -1) {
+    perror("socketpair");
+    return -1;
+  }
 
-  return -1;
+  int serverFd = spair[0];
+  int clientFd = spair[1];
+
+  if (handlePostConnectionFromProxy(channelId, serverFd, channel_slave, "slave") < 0)
+  {
+    close(serverFd);
+    close(clientFd);
+    return -1;
+  }
+
+
+  int pid = fork();
+  if (pid == 0)
+  {
+
+    if (dup2(clientFd, 0) == -1)
+    {
+      perror("dup2");
+      exit(1);
+    }
+
+    if (dup2(clientFd, 1) == -1)
+    {
+      perror("dup2");
+      exit(1);
+    }
+
+    close(serverFd);
+    close(clientFd);
+
+    /* Close FDs used by NX, QVD #1208 */
+    for (int fd = 3; fd < 256; fd++) {
+        close(fd);
+    }
+
+    char *const argv[2] = {nx_slave_cmd, NULL};
+
+    if (execv(nx_slave_cmd, argv) == -1)
+    {
+      perror("execv");
+    }
+    exit(1);
+
+  }
+  else if (pid == -1)
+  {
+    // TODO Test this!
+    perror("fork");
+    close(serverFd);
+    close(clientFd);
+    return -1;
+  }
+
+  close(clientFd);
+  slavePidMap_[channelId] = pid;
+
+  cerr << "Info" << ": slave channel ID#" << channelId << " handler has PID " << pid << endl;
+
+  return 1;
+}
+
+void Proxy::checkSlaves()
+{
+  for (int channelId = 0; channelId<CONNECTIONS_LIMIT; channelId++)
+  {
+    int pid = slavePidMap_[channelId];
+
+    if (pid > 1 && HandleChild(pid))
+    {
+      slavePidMap_[channelId] = nothing;
+      cerr << "Info:" << " Handled death of slave with pid " << pid << endl;
+    }
+  }
 }
 
 int Proxy::handlePostConnectionFromProxy(int channelId, int serverFd,
diff --git a/nxcomp/Proxy.h b/nxcomp/Proxy.h
index 8259ddbb7..ea60c827a 100644
--- a/nxcomp/Proxy.h
+++ b/nxcomp/Proxy.h
@@ -302,6 +302,8 @@ class Proxy
 
   int handleNewSlaveConnectionFromProxy(int channelId);
 
+  void checkSlaves();
+
   //
   // Force closure of channels.
   //
@@ -1268,6 +1270,7 @@ class Proxy
 
   int channelMap_[CONNECTIONS_LIMIT];
   int fdMap_[CONNECTIONS_LIMIT];
+  int slavePidMap_[CONNECTIONS_LIMIT];
 };
 
 #endif /* Proxy_H */
-- 
cgit v1.2.3


From c7eac1f95626e376b17ccd684b2a4e9402b3c17c Mon Sep 17 00:00:00 2001
From: Vadim Troshchinskiy <vadim@qindel.com>
Date: Mon, 24 Oct 2016 13:27:52 +0200
Subject: Add description of NX_SLAVE_CMD to man and help

---
 nxcomp/Misc.cpp       | 7 +++++++
 nxproxy/man/nxproxy.1 | 7 +++++++
 2 files changed, 14 insertions(+)

(limited to 'nxcomp')

diff --git a/nxcomp/Misc.cpp b/nxcomp/Misc.cpp
index 71013fc6f..09a0b29d2 100644
--- a/nxcomp/Misc.cpp
+++ b/nxcomp/Misc.cpp
@@ -357,6 +357,13 @@ tolerancechecks=s\n\
                Mac where nxclient is located in a different direct-\n\
                ory compared to the other programs, to make easier\n\
                for the user to execute the program from the shell.\n\
+\n\
+  NX_SLAVE_CMD The full path to the slave channel handler. When the\n\
+               slave channel is enabled, the agent will listen on a\n\
+               port and forward the connection to the NX_SLAVE_CMD\n\
+               program. This can be used to implement agent/proxy\n\
+               communication for applications such as serial port and\n\
+               USB forwarding.\n\
 \n\
   Shell environment:\n\
 \n\
diff --git a/nxproxy/man/nxproxy.1 b/nxproxy/man/nxproxy.1
index 7b950a607..3cf95c992 100644
--- a/nxproxy/man/nxproxy.1
+++ b/nxproxy/man/nxproxy.1
@@ -339,6 +339,13 @@ where <nxclient> is located in a different directory compared to the
 other programs, to make easier for the user to execute the program from
 the shell.
 
+.TP 8
+.B  NX_SLAVE_CMD
+The full path to the slave channel handler. When the slave channel is
+enabled, the agent will listen on a port and forward the connection to
+the NX_SLAVE_CMD program. This can be used to implement agent/proxy
+communication for applications such as serial port and USB forwarding.
+
 .SH SHELL ENVIRONMENT VARIABLES
 
 .TP 8
-- 
cgit v1.2.3


From 4271b9ebde27c67f1a9f6b0506070a36e79fb1bd Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Sat, 29 Oct 2016 23:26:05 +0200
Subject: nxcomp: remove unused Utils.cpp

---
 nxcomp/Utils.cpp | 43 -------------------------------------------
 1 file changed, 43 deletions(-)
 delete mode 100644 nxcomp/Utils.cpp

(limited to 'nxcomp')

diff --git a/nxcomp/Utils.cpp b/nxcomp/Utils.cpp
deleted file mode 100644
index 72e1254f8..000000000
--- a/nxcomp/Utils.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "NX.h"
-
-#include "Timestamp.h"
-
-//
-// Log level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-int NXTransSearch(char *data, int size, int step, int threshold)
-{
-  return -1;
-}
-
-- 
cgit v1.2.3


From 7993d28f1d4cd835980d81993bf53854441a6705 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Thu, 3 Nov 2016 23:53:46 +0100
Subject: add .gitignore files

---
 .gitignore                                    |  13 +
 nx-X11/.gitignore                             |   5 +
 nx-X11/include/.gitignore                     |   5 +
 nx-X11/lib/X11/.gitignore                     |   1 +
 nx-X11/programs/Xserver/.gitignore            |   2 +
 nx-X11/programs/Xserver/GL/.gitignore         | 341 ++++++++++++++++++++++++++
 nx-X11/programs/Xserver/composite/.gitignore  |   0
 nx-X11/programs/Xserver/hw/nxagent/.gitignore |   3 +
 nx-X11/programs/Xserver/include/.gitignore    |   1 +
 nxcomp/.gitignore                             |   2 +
 nxcompext/.gitignore                          |   2 +
 nxcompshad/.gitignore                         |   2 +
 nxproxy/.gitignore                            |   2 +
 13 files changed, 379 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 nx-X11/.gitignore
 create mode 100644 nx-X11/include/.gitignore
 create mode 100644 nx-X11/lib/X11/.gitignore
 create mode 100644 nx-X11/programs/Xserver/.gitignore
 create mode 100644 nx-X11/programs/Xserver/GL/.gitignore
 create mode 100644 nx-X11/programs/Xserver/composite/.gitignore
 create mode 100644 nx-X11/programs/Xserver/hw/nxagent/.gitignore
 create mode 100644 nx-X11/programs/Xserver/include/.gitignore
 create mode 100644 nxcomp/.gitignore
 create mode 100644 nxcompext/.gitignore
 create mode 100644 nxcompshad/.gitignore
 create mode 100644 nxproxy/.gitignore

(limited to 'nxcomp')

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..325bebed4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,13 @@
+.gitignore
+*.o
+*.so.*
+*.so
+*.a
+xmakefile
+autom4te.cache/
+config.log
+config.status
+configure
+depend.status
+*~
+[#]*
diff --git a/nx-X11/.gitignore b/nx-X11/.gitignore
new file mode 100644
index 000000000..8e0d8bf9d
--- /dev/null
+++ b/nx-X11/.gitignore
@@ -0,0 +1,5 @@
+Makefile
+Makefile.bak
+xmakefile
+exports/
+.build-exports/
diff --git a/nx-X11/include/.gitignore b/nx-X11/include/.gitignore
new file mode 100644
index 000000000..16951a0af
--- /dev/null
+++ b/nx-X11/include/.gitignore
@@ -0,0 +1,5 @@
+GL/gl.h
+GL/glext.h
+GL/glxext.h
+GL/osmesa.h
+Xpoll.h
diff --git a/nx-X11/lib/X11/.gitignore b/nx-X11/lib/X11/.gitignore
new file mode 100644
index 000000000..8215e21de
--- /dev/null
+++ b/nx-X11/lib/X11/.gitignore
@@ -0,0 +1 @@
+ks_tables.h
\ No newline at end of file
diff --git a/nx-X11/programs/Xserver/.gitignore b/nx-X11/programs/Xserver/.gitignore
new file mode 100644
index 000000000..ea37aa3ef
--- /dev/null
+++ b/nx-X11/programs/Xserver/.gitignore
@@ -0,0 +1,2 @@
+nxagent
+nxagent.bak
diff --git a/nx-X11/programs/Xserver/GL/.gitignore b/nx-X11/programs/Xserver/GL/.gitignore
new file mode 100644
index 000000000..5231f1978
--- /dev/null
+++ b/nx-X11/programs/Xserver/GL/.gitignore
@@ -0,0 +1,341 @@
+glx/DONE
+glx/glcontextmodes.c
+glx/glcontextmodes.h
+glx/indirect_size.c
+glx/indirect_size.h
+mesa/X/DONE
+mesa/X/compsize.c
+mesa/X/driverfuncs.c
+mesa/X/driverfuncs.h
+mesa/X/xm_api.c
+mesa/X/xm_buffer.c
+mesa/X/xm_dd.c
+mesa/X/xm_line.c
+mesa/X/xm_span.c
+mesa/X/xm_tri.c
+mesa/array_cache/DONE
+mesa/array_cache/ac_context.c
+mesa/array_cache/ac_context.h
+mesa/array_cache/ac_import.c
+mesa/array_cache/acache.h
+mesa/main/DONE
+mesa/main/accum.c
+mesa/main/accum.h
+mesa/main/api_arrayelt.c
+mesa/main/api_arrayelt.h
+mesa/main/api_eval.h
+mesa/main/api_loopback.c
+mesa/main/api_loopback.h
+mesa/main/api_noop.c
+mesa/main/api_noop.h
+mesa/main/api_validate.c
+mesa/main/api_validate.h
+mesa/main/attrib.c
+mesa/main/attrib.h
+mesa/main/blend.c
+mesa/main/blend.h
+mesa/main/bufferobj.c
+mesa/main/bufferobj.h
+mesa/main/buffers.c
+mesa/main/buffers.h
+mesa/main/clip.c
+mesa/main/clip.h
+mesa/main/colormac.h
+mesa/main/colortab.c
+mesa/main/colortab.h
+mesa/main/config.h
+mesa/main/context.c
+mesa/main/context.h
+mesa/main/convolve.c
+mesa/main/convolve.h
+mesa/main/dd.h
+mesa/main/debug.c
+mesa/main/debug.h
+mesa/main/depth.c
+mesa/main/depth.h
+mesa/main/dispatch.c
+mesa/main/dlist.c
+mesa/main/dlist.h
+mesa/main/drawpix.c
+mesa/main/drawpix.h
+mesa/main/enable.c
+mesa/main/enable.h
+mesa/main/enums.c
+mesa/main/enums.h
+mesa/main/eval.c
+mesa/main/eval.h
+mesa/main/execmem.c
+mesa/main/extensions.c
+mesa/main/extensions.h
+mesa/main/fbobject.c
+mesa/main/fbobject.h
+mesa/main/feedback.c
+mesa/main/feedback.h
+mesa/main/fog.c
+mesa/main/fog.h
+mesa/main/framebuffer.c
+mesa/main/framebuffer.h
+mesa/main/get.c
+mesa/main/get.h
+mesa/main/getstring.c
+mesa/main/glapi.c
+mesa/main/glheader.h
+mesa/main/glthread.c
+mesa/main/hash.c
+mesa/main/hash.h
+mesa/main/hint.c
+mesa/main/hint.h
+mesa/main/histogram.c
+mesa/main/histogram.h
+mesa/main/image.c
+mesa/main/image.h
+mesa/main/imports.c
+mesa/main/imports.h
+mesa/main/light.c
+mesa/main/light.h
+mesa/main/lines.c
+mesa/main/lines.h
+mesa/main/macros.h
+mesa/main/matrix.c
+mesa/main/matrix.h
+mesa/main/mm.c
+mesa/main/mm.h
+mesa/main/mtypes.h
+mesa/main/occlude.c
+mesa/main/occlude.h
+mesa/main/pixel.c
+mesa/main/pixel.h
+mesa/main/points.c
+mesa/main/points.h
+mesa/main/polygon.c
+mesa/main/polygon.h
+mesa/main/rastpos.c
+mesa/main/rastpos.h
+mesa/main/renderbuffer.c
+mesa/main/renderbuffer.h
+mesa/main/simple_list.h
+mesa/main/state.c
+mesa/main/state.h
+mesa/main/stencil.c
+mesa/main/stencil.h
+mesa/main/texcompress.c
+mesa/main/texcompress.h
+mesa/main/texcompress_fxt1.c
+mesa/main/texcompress_s3tc.c
+mesa/main/texenvprogram.c
+mesa/main/texenvprogram.h
+mesa/main/texformat.c
+mesa/main/texformat.h
+mesa/main/texformat_tmp.h
+mesa/main/teximage.c
+mesa/main/teximage.h
+mesa/main/texobj.c
+mesa/main/texobj.h
+mesa/main/texrender.c
+mesa/main/texrender.h
+mesa/main/texstate.c
+mesa/main/texstate.h
+mesa/main/texstore.c
+mesa/main/texstore.h
+mesa/main/varray.c
+mesa/main/varray.h
+mesa/main/version.h
+mesa/main/vtxfmt.c
+mesa/main/vtxfmt.h
+mesa/main/vtxfmt_tmp.h
+mesa/math/DONE
+mesa/math/m_clip_tmp.h
+mesa/math/m_copy_tmp.h
+mesa/math/m_debug.h
+mesa/math/m_debug_clip.c
+mesa/math/m_debug_norm.c
+mesa/math/m_debug_util.h
+mesa/math/m_debug_xform.c
+mesa/math/m_dotprod_tmp.h
+mesa/math/m_eval.c
+mesa/math/m_eval.h
+mesa/math/m_matrix.c
+mesa/math/m_matrix.h
+mesa/math/m_norm_tmp.h
+mesa/math/m_trans_tmp.h
+mesa/math/m_translate.c
+mesa/math/m_translate.h
+mesa/math/m_vector.c
+mesa/math/m_vector.h
+mesa/math/m_xform.c
+mesa/math/m_xform.h
+mesa/math/m_xform_tmp.h
+mesa/math/mathmod.h
+mesa/shader/DONE
+mesa/shader/arbfragparse.c
+mesa/shader/arbfragparse.h
+mesa/shader/arbprogparse.c
+mesa/shader/arbprogparse.h
+mesa/shader/arbprogram.c
+mesa/shader/arbprogram.h
+mesa/shader/arbprogram_syn.h
+mesa/shader/arbvertparse.c
+mesa/shader/arbvertparse.h
+mesa/shader/atifragshader.c
+mesa/shader/atifragshader.h
+mesa/shader/grammar/DONE
+mesa/shader/grammar/grammar.c
+mesa/shader/grammar/grammar.h
+mesa/shader/grammar/grammar_mesa.c
+mesa/shader/grammar/grammar_mesa.h
+mesa/shader/grammar/grammar_syn.h
+mesa/shader/nvfragparse.c
+mesa/shader/nvfragparse.h
+mesa/shader/nvfragprog.h
+mesa/shader/nvprogram.c
+mesa/shader/nvprogram.h
+mesa/shader/nvvertexec.c
+mesa/shader/nvvertexec.h
+mesa/shader/nvvertparse.c
+mesa/shader/nvvertparse.h
+mesa/shader/nvvertprog.h
+mesa/shader/program.c
+mesa/shader/program.h
+mesa/shader/shaderobjects.c
+mesa/shader/shaderobjects.h
+mesa/shader/shaderobjects_3dlabs.c
+mesa/shader/shaderobjects_3dlabs.h
+mesa/shader/slang/DONE
+mesa/shader/slang/library/slang_common_builtin_gc.h
+mesa/shader/slang/library/slang_common_builtin_gc_bin.h
+mesa/shader/slang/library/slang_core_gc.h
+mesa/shader/slang/library/slang_core_gc_bin.h
+mesa/shader/slang/library/slang_fragment_builtin_gc.h
+mesa/shader/slang/library/slang_fragment_builtin_gc_bin.h
+mesa/shader/slang/library/slang_shader_syn.h
+mesa/shader/slang/library/slang_version_syn.h
+mesa/shader/slang/library/slang_vertex_builtin_gc.h
+mesa/shader/slang/library/slang_vertex_builtin_gc_bin.h
+mesa/shader/slang/slang_assemble.c
+mesa/shader/slang/slang_assemble.h
+mesa/shader/slang/slang_assemble_assignment.c
+mesa/shader/slang/slang_assemble_assignment.h
+mesa/shader/slang/slang_assemble_conditional.c
+mesa/shader/slang/slang_assemble_conditional.h
+mesa/shader/slang/slang_assemble_constructor.c
+mesa/shader/slang/slang_assemble_constructor.h
+mesa/shader/slang/slang_assemble_typeinfo.c
+mesa/shader/slang/slang_assemble_typeinfo.h
+mesa/shader/slang/slang_compile.c
+mesa/shader/slang/slang_compile.h
+mesa/shader/slang/slang_execute.c
+mesa/shader/slang/slang_execute.h
+mesa/shader/slang/slang_preprocess.c
+mesa/shader/slang/slang_preprocess.h
+mesa/shader/slang/slang_storage.c
+mesa/shader/slang/slang_storage.h
+mesa/shader/slang/slang_utility.c
+mesa/shader/slang/slang_utility.h
+mesa/shader/slang/traverse_wrap.h
+mesa/swrast/DONE
+mesa/swrast/s_aaline.c
+mesa/swrast/s_aaline.h
+mesa/swrast/s_aalinetemp.h
+mesa/swrast/s_aatriangle.c
+mesa/swrast/s_aatriangle.h
+mesa/swrast/s_aatritemp.h
+mesa/swrast/s_accum.c
+mesa/swrast/s_accum.h
+mesa/swrast/s_alpha.c
+mesa/swrast/s_alpha.h
+mesa/swrast/s_atifragshader.c
+mesa/swrast/s_atifragshader.h
+mesa/swrast/s_bitmap.c
+mesa/swrast/s_blend.c
+mesa/swrast/s_blend.h
+mesa/swrast/s_buffers.c
+mesa/swrast/s_context.c
+mesa/swrast/s_context.h
+mesa/swrast/s_copypix.c
+mesa/swrast/s_depth.c
+mesa/swrast/s_depth.h
+mesa/swrast/s_drawpix.c
+mesa/swrast/s_drawpix.h
+mesa/swrast/s_feedback.c
+mesa/swrast/s_feedback.h
+mesa/swrast/s_fog.c
+mesa/swrast/s_fog.h
+mesa/swrast/s_imaging.c
+mesa/swrast/s_lines.c
+mesa/swrast/s_lines.h
+mesa/swrast/s_linetemp.h
+mesa/swrast/s_logic.c
+mesa/swrast/s_logic.h
+mesa/swrast/s_masking.c
+mesa/swrast/s_masking.h
+mesa/swrast/s_nvfragprog.c
+mesa/swrast/s_nvfragprog.h
+mesa/swrast/s_pixeltex.c
+mesa/swrast/s_pixeltex.h
+mesa/swrast/s_points.c
+mesa/swrast/s_points.h
+mesa/swrast/s_pointtemp.h
+mesa/swrast/s_readpix.c
+mesa/swrast/s_span.c
+mesa/swrast/s_span.h
+mesa/swrast/s_spantemp.h
+mesa/swrast/s_stencil.c
+mesa/swrast/s_stencil.h
+mesa/swrast/s_texstore.c
+mesa/swrast/s_texture.c
+mesa/swrast/s_texture.h
+mesa/swrast/s_triangle.c
+mesa/swrast/s_triangle.h
+mesa/swrast/s_trispan.h
+mesa/swrast/s_tritemp.h
+mesa/swrast/s_zoom.c
+mesa/swrast/s_zoom.h
+mesa/swrast/swrast.h
+mesa/swrast_setup/DONE
+mesa/swrast_setup/ss_context.c
+mesa/swrast_setup/ss_context.h
+mesa/swrast_setup/ss_triangle.c
+mesa/swrast_setup/ss_triangle.h
+mesa/swrast_setup/ss_tritmp.h
+mesa/swrast_setup/swrast_setup.h
+mesa/tnl/DONE
+mesa/tnl/t_array_api.c
+mesa/tnl/t_array_api.h
+mesa/tnl/t_array_import.c
+mesa/tnl/t_array_import.h
+mesa/tnl/t_context.c
+mesa/tnl/t_context.h
+mesa/tnl/t_pipeline.c
+mesa/tnl/t_pipeline.h
+mesa/tnl/t_save_api.c
+mesa/tnl/t_save_api.h
+mesa/tnl/t_save_loopback.c
+mesa/tnl/t_save_playback.c
+mesa/tnl/t_vb_arbprogram.c
+mesa/tnl/t_vb_arbprogram.h
+mesa/tnl/t_vb_arbprogram_sse.c
+mesa/tnl/t_vb_cliptmp.h
+mesa/tnl/t_vb_cull.c
+mesa/tnl/t_vb_fog.c
+mesa/tnl/t_vb_light.c
+mesa/tnl/t_vb_lighttmp.h
+mesa/tnl/t_vb_normals.c
+mesa/tnl/t_vb_points.c
+mesa/tnl/t_vb_program.c
+mesa/tnl/t_vb_render.c
+mesa/tnl/t_vb_rendertmp.h
+mesa/tnl/t_vb_texgen.c
+mesa/tnl/t_vb_texmat.c
+mesa/tnl/t_vb_vertex.c
+mesa/tnl/t_vertex.c
+mesa/tnl/t_vertex.h
+mesa/tnl/t_vertex_generic.c
+mesa/tnl/t_vertex_sse.c
+mesa/tnl/t_vp_build.c
+mesa/tnl/t_vp_build.h
+mesa/tnl/t_vtx_api.c
+mesa/tnl/t_vtx_api.h
+mesa/tnl/t_vtx_eval.c
+mesa/tnl/t_vtx_exec.c
+mesa/tnl/t_vtx_generic.c
+mesa/tnl/tnl.h
diff --git a/nx-X11/programs/Xserver/composite/.gitignore b/nx-X11/programs/Xserver/composite/.gitignore
new file mode 100644
index 000000000..e69de29bb
diff --git a/nx-X11/programs/Xserver/hw/nxagent/.gitignore b/nx-X11/programs/Xserver/hw/nxagent/.gitignore
new file mode 100644
index 000000000..256534b63
--- /dev/null
+++ b/nx-X11/programs/Xserver/hw/nxagent/.gitignore
@@ -0,0 +1,3 @@
+miinitext.c
+stubs.c
+xpstubs.c
diff --git a/nx-X11/programs/Xserver/include/.gitignore b/nx-X11/programs/Xserver/include/.gitignore
new file mode 100644
index 000000000..919ccf080
--- /dev/null
+++ b/nx-X11/programs/Xserver/include/.gitignore
@@ -0,0 +1 @@
+osdep.h
diff --git a/nxcomp/.gitignore b/nxcomp/.gitignore
new file mode 100644
index 000000000..27a99e5b2
--- /dev/null
+++ b/nxcomp/.gitignore
@@ -0,0 +1,2 @@
+nxcomp.pc
+Makefile
diff --git a/nxcompext/.gitignore b/nxcompext/.gitignore
new file mode 100644
index 000000000..4dbbba27e
--- /dev/null
+++ b/nxcompext/.gitignore
@@ -0,0 +1,2 @@
+nxcompext.pc
+Makefile
diff --git a/nxcompshad/.gitignore b/nxcompshad/.gitignore
new file mode 100644
index 000000000..f083c6b27
--- /dev/null
+++ b/nxcompshad/.gitignore
@@ -0,0 +1,2 @@
+nxcompshad.pc
+Makefile
diff --git a/nxproxy/.gitignore b/nxproxy/.gitignore
new file mode 100644
index 000000000..3d98254b2
--- /dev/null
+++ b/nxproxy/.gitignore
@@ -0,0 +1,2 @@
+Makefile
+nxproxy
-- 
cgit v1.2.3


From 77188865e24bd750f76785d6bbe2f1851c7466a8 Mon Sep 17 00:00:00 2001
From: Vadim Troshchinskiy <vtroshchinskiy@qindel.com>
Date: Tue, 13 Dec 2016 12:19:09 +0100
Subject: Fix reversed logic in acceptHost setting

---
 nxcomp/Loop.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 09ba6f952..c566aa2d1 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -6685,11 +6685,11 @@ int WaitForRemote(ChannelEndPoint &socketAddress)
 
         goto WaitForRemoteError;
       }
-      strcpy(hostLabel, "any host");
+      snprintf(hostLabel, sizeof(hostLabel), "'%s'", acceptHost);
     }
     else
     {
-      snprintf(hostLabel, sizeof(hostLabel), "'%s'", acceptHost);
+      strcpy(hostLabel, "any host");
     }
 
     if (loopbackBind)
-- 
cgit v1.2.3


From 920f423a59b568cf91128f8e1fa8374e521141ca Mon Sep 17 00:00:00 2001
From: Vadim Troshchinskiy <vtroshchinskiy@qindel.com>
Date: Tue, 13 Dec 2016 12:00:43 +0100
Subject: Make nxagent only bind to loopback when requested

---
 nxcomp/Loop.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index c566aa2d1..86c951a06 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -6692,11 +6692,15 @@ int WaitForRemote(ChannelEndPoint &socketAddress)
       strcpy(hostLabel, "any host");
     }
 
-    if (loopbackBind)
+    long bindPort;
+    if (socketAddress.getTCPHostAndPort(NULL, &bindPort))
     {
-      long bindPort;
-      if (socketAddress.getTCPHostAndPort(NULL, &bindPort))
-          socketAddress.setSpec("localhost", bindPort);
+      socketAddress.setSpec(loopbackBind ? "localhost" : "*", bindPort);
+    }
+    else
+    {
+      // This should never happen
+      cerr << "Error" << ": Unable to change bind host\n";
     }
   }
   else if (socketAddress.isUnixSocket())
-- 
cgit v1.2.3


From b425f071e39ac15e0b5ab8eca5639dcfc26323f9 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 20 Dec 2016 10:33:48 +0100
Subject: nxcomp: Fix artifacts in copyright headers.

---
 nxcomp/ChannelEndPoint.cpp | 5 -----
 nxcomp/ChannelEndPoint.h   | 5 -----
 nxcomp/ServerProxy.cpp     | 1 -
 3 files changed, 11 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/ChannelEndPoint.cpp b/nxcomp/ChannelEndPoint.cpp
index 82b8f782e..8f7d0c68b 100644
--- a/nxcomp/ChannelEndPoint.cpp
+++ b/nxcomp/ChannelEndPoint.cpp
@@ -22,11 +22,6 @@
 /* as copyright holder, as well.                                          */
 /*                                                                        */
 /**************************************************************************/
-/* 330, Boston, MA  02111-1307 USA                                        */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
 
 #include <unistd.h>
 #include <string.h>
diff --git a/nxcomp/ChannelEndPoint.h b/nxcomp/ChannelEndPoint.h
index 3dc7db83d..4c0c728f3 100644
--- a/nxcomp/ChannelEndPoint.h
+++ b/nxcomp/ChannelEndPoint.h
@@ -22,11 +22,6 @@
 /* as copyright holder, as well.                                          */
 /*                                                                        */
 /**************************************************************************/
-/* 330, Boston, MA  02111-1307 USA                                        */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
 
 #ifndef ChannelEndPoint_H
 #define ChannelEndPoint_H
diff --git a/nxcomp/ServerProxy.cpp b/nxcomp/ServerProxy.cpp
index 3e32a82c0..5d1765183 100644
--- a/nxcomp/ServerProxy.cpp
+++ b/nxcomp/ServerProxy.cpp
@@ -22,7 +22,6 @@
 /* as copyright holder, as well.                                          */
 /*                                                                        */
 /**************************************************************************/
-/**************************************************************************/
 
 #include <unistd.h>
 
-- 
cgit v1.2.3


From a4be1b89ff0929b6b801efa9afd996010d7dd075 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Sun, 5 Feb 2017 12:41:28 +0100
Subject: nxcomp/Loop.cpp: Ignore, options= nx/nx parameter, if file options
 path starts with /dev/, /proc/, or /sys/.

 Partially resolved ArcticaProject/nx-libs#51.
---
 nxcomp/Loop.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 86c951a06..b795c62af 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -9138,7 +9138,7 @@ int ParseEnvironmentOptions(const char *env, int force)
           << env << "'.\n" << logofs_flush;
   #endif
 
-  if (*fileOptions != '\0')
+  if ((*fileOptions != '\0') && (strncmp(fileOptions, "/dev/", 5) != 0) && (strncmp(fileOptions, "/proc/", 6) != 0) && (strncmp(fileOptions, "/sys/", 5) != 0))
   {
     if (strcmp(fileOptions, optionsFileName) != 0)
     {
-- 
cgit v1.2.3


From ce037f4e3c15c7cbc50adb02f6027a4d37c0ab90 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Sun, 5 Feb 2017 12:47:57 +0100
Subject: nxcomp/Loop.cpp: Allow nx/nx:<disp> as DISPLAY variable (i.e. an
 empty nx/nx options string.

---
 nxcomp/Loop.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index b795c62af..3710b6414 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -4069,7 +4069,8 @@ int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
     }
     else if (strncasecmp(display, "nx/nx,", 6) == 0 ||
                  strncasecmp(display, "nx,", 3) == 0 ||
-                     strncasecmp(display, "nx:", 3) == 0)
+                     strncasecmp(display, "nx/nx:", 6) == 0 ||
+                         strncasecmp(display, "nx:", 3) == 0)
     {
       #ifdef PANIC
       *logofs << "Loop: PANIC! NX transport on host X server '"
-- 
cgit v1.2.3


From dc8477f76372e685eb999a71afb4e5ec7e3176f1 Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Thu, 9 Mar 2017 09:22:03 +0100
Subject: nxcomp/ChannelEndPoint.cpp: we're not really testing for a character,
 but a pointer.

Fixes: ArcticaProject/nxlibs#389.
---
 nxcomp/ChannelEndPoint.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nxcomp')

diff --git a/nxcomp/ChannelEndPoint.cpp b/nxcomp/ChannelEndPoint.cpp
index 8f7d0c68b..286210dc7 100644
--- a/nxcomp/ChannelEndPoint.cpp
+++ b/nxcomp/ChannelEndPoint.cpp
@@ -137,7 +137,7 @@ ChannelEndPoint::getSpec(char **socketUri) const {
   free(unixPath);
   free(hostName);
 
-  if (*socketUri != '\0')
+  if (NULL != *socketUri)
     return true;
 
   return false;
-- 
cgit v1.2.3


From 99585120652f222a3016854e56884ed89c37de3c Mon Sep 17 00:00:00 2001
From: Mike DePaulo <mikedep333@gmail.com>
Date: Wed, 29 Mar 2017 07:19:25 -0400
Subject: Cygwin nxcomp: Use Cygwin un.h

Cygwin has modified it over the years.
Fixes FTBFS #394
---
 nxcomp/Loop.cpp  | 3 +--
 nxcomp/Proxy.cpp | 6 +-----
 2 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 3710b6414..70c5b4505 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -75,7 +75,6 @@ typedef int socklen_t;
 
 #ifndef __CYGWIN32__
 #include <netinet/tcp.h>
-#include <sys/un.h>
 #endif
 
 //
@@ -103,7 +102,7 @@ typedef int socklen_t;
 // System specific defines.
 //
 
-#if defined(__EMX__) || defined(__CYGWIN32__)
+#if defined(__EMX__)
 
 struct sockaddr_un
 {
diff --git a/nxcomp/Proxy.cpp b/nxcomp/Proxy.cpp
index 123181489..240d403a6 100644
--- a/nxcomp/Proxy.cpp
+++ b/nxcomp/Proxy.cpp
@@ -43,17 +43,13 @@
 #include <netinet/in_systm.h>
 #endif
 
-#ifndef __CYGWIN32__
-#include <sys/un.h>
-#endif
-
 #ifndef ANDROID
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
 #endif
 
-#if defined(__EMX__ ) || defined(__CYGWIN32__)
+#if defined(__EMX__ )
 
 struct sockaddr_un
 {
-- 
cgit v1.2.3


From 1a2bea98174d92164e2aefe35b70676a7b27eb33 Mon Sep 17 00:00:00 2001
From: Mike DePaulo <mikedep333@gmail.com>
Date: Wed, 29 Mar 2017 21:52:25 -0400
Subject: Remove EMX (MS-DOS & OS/2) support

---
 nxcomp/Loop.cpp  |  9 ---------
 nxcomp/Proxy.cpp | 10 ----------
 2 files changed, 19 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 70c5b4505..a3ea11009 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -102,15 +102,6 @@ typedef int socklen_t;
 // System specific defines.
 //
 
-#if defined(__EMX__)
-
-struct sockaddr_un
-{
-  u_short sun_family;
-  char sun_path[108];
-};
-
-#endif
 
 //
 // HP-UX hides this define.
diff --git a/nxcomp/Proxy.cpp b/nxcomp/Proxy.cpp
index 240d403a6..3a7a42362 100644
--- a/nxcomp/Proxy.cpp
+++ b/nxcomp/Proxy.cpp
@@ -49,16 +49,6 @@
 #include <netinet/tcp.h>
 #endif
 
-#if defined(__EMX__ )
-
-struct sockaddr_un
-{
-  u_short sun_family;
-  char sun_path[108];
-};
-
-#endif
-
 #include "NXalert.h"
 #include "NXvars.h"
 
-- 
cgit v1.2.3


From 1441b02f05a9671b9ad8bcba551ebc004af821a2 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Fri, 7 Apr 2017 13:48:56 +0200
Subject: nxcomp/Loop.cpp: Fix server/client mode info cerr printing in
 PrintProcessInfo().

---
 nxcomp/Loop.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index a3ea11009..7aaff09e8 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -13940,7 +13940,7 @@ void PrintProcessInfo()
   //
 
   cerr << "Info: Proxy running in "
-       << (control -> ProxyMode == proxy_client ? "server" : "client")
+       << (control -> ProxyMode == proxy_client ? "client" : "server")
        << " mode with pid '" << getpid() << "'.\n";
 
   if (agent == NULL)
-- 
cgit v1.2.3


From 0f67af9d785254e394dd773fc9f34da2557a1983 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 7 Mar 2017 20:52:43 +0100
Subject: nxcomp/Children.cpp: Don't generate warnings with duplicated NX
 paths.

 Fixes ArcticaProject/nx-libs#370.
---
 nxcomp/Children.cpp | 131 ++++++++++++++++++++++++++++------------------------
 1 file changed, 70 insertions(+), 61 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Children.cpp b/nxcomp/Children.cpp
index 224a86f6d..265ba4e37 100644
--- a/nxcomp/Children.cpp
+++ b/nxcomp/Children.cpp
@@ -260,58 +260,63 @@ int NXTransDialog(const char *caption, const char *message,
     // in the default NX path.
     //
 
-    strcpy(command, "nxclient");
+    if (i == 0)
+    {
 
-    char newPath[DEFAULT_STRING_LIMIT];
+      strcpy(command, "nxclient");
 
-    strcpy(newPath, "/usr/NX/bin:/opt/NX/bin:/usr/local/NX/bin:");
+      char newPath[DEFAULT_STRING_LIMIT];
 
-    #ifdef __APPLE__
+      strcpy(newPath, "/usr/NX/bin:/opt/NX/bin:/usr/local/NX/bin:");
 
-    strcat(newPath, "/Applications/NX Client for OSX.app/Contents/MacOS:");
+      #ifdef __APPLE__
 
-    #endif
+      strcat(newPath, "/Applications/NX Client for OSX.app/Contents/MacOS:");
 
-    #ifdef __CYGWIN32__
+      #endif
 
-    strcat(newPath, ".:");
+      #ifdef __CYGWIN32__
 
-    #endif
+      strcat(newPath, ".:");
 
-    int newLength = strlen(newPath);
+      #endif
 
-    char *oldPath = getenv("PATH");
+      int newLength = strlen(newPath);
 
-    strncpy(newPath + newLength, oldPath, DEFAULT_STRING_LIMIT - newLength - 1);
+      char *oldPath = getenv("PATH");
 
-    newPath[DEFAULT_STRING_LIMIT - 1] = '\0';
+      strncpy(newPath + newLength, oldPath, DEFAULT_STRING_LIMIT - newLength - 1);
 
-    #ifdef WARNING
-    *logofs << "NXTransDialog: WARNING! Trying with path '"
-            << newPath << "'.\n" << logofs_flush;
-    #endif
+      newPath[DEFAULT_STRING_LIMIT - 1] = '\0';
 
-    cerr << "Warning" << ": Trying with path '" << newPath
-         << "'.\n";
+      #ifdef WARNING
+      *logofs << "NXTransDialog: WARNING! Trying with path '"
+              << newPath << "'.\n" << logofs_flush;
+      #endif
 
-    //
-    // Solaris doesn't seem to have
-    // function setenv().
-    //
+      cerr << "Warning" << ": Trying with path '" << newPath
+           << "'.\n";
 
-    #ifdef __sun
+      //
+      // Solaris doesn't seem to have
+      // function setenv().
+      //
 
-    char newEnv[DEFAULT_STRING_LIMIT + 5];
+      #ifdef __sun
 
-    sprintf(newEnv,"PATH=%s", newPath);
+      char newEnv[DEFAULT_STRING_LIMIT + 5];
 
-    putenv(newEnv);
+      sprintf(newEnv,"PATH=%s", newPath);
 
-    #else
+      putenv(newEnv);
 
-    setenv("PATH", newPath, 1);
+      #else
 
-    #endif
+      setenv("PATH", newPath, 1);
+
+      #endif
+
+    }
   }
 
   //
@@ -455,60 +460,64 @@ int NXTransClient(const char* display)
     // in the default NX path.
     //
 
-    strcpy(command, "nxclient");
+    if (i == 0)
+    {
 
-    char newPath[DEFAULT_STRING_LIMIT];
+      strcpy(command, "nxclient");
 
-    strcpy(newPath, "/usr/NX/bin:/opt/NX/bin:/usr/local/NX/bin:");
+      char newPath[DEFAULT_STRING_LIMIT];
 
-    #ifdef __APPLE__
+      strcpy(newPath, "/usr/NX/bin:/opt/NX/bin:/usr/local/NX/bin:");
 
-    strcat(newPath, "/Applications/NX Client for OSX.app/Contents/MacOS:");
+      #ifdef __APPLE__
 
-    #endif
+      strcat(newPath, "/Applications/NX Client for OSX.app/Contents/MacOS:");
 
-    #ifdef __CYGWIN32__
+      #endif
 
-    strcat(newPath, ".:");
+      #ifdef __CYGWIN32__
 
-    #endif
+      strcat(newPath, ".:");
 
-    int newLength = strlen(newPath);
+      #endif
 
-    char *oldPath = getenv("PATH");
+      int newLength = strlen(newPath);
 
-    strncpy(newPath + newLength, oldPath, DEFAULT_STRING_LIMIT - newLength - 1);
+      char *oldPath = getenv("PATH");
 
-    newPath[DEFAULT_STRING_LIMIT - 1] = '\0';
+      strncpy(newPath + newLength, oldPath, DEFAULT_STRING_LIMIT - newLength - 1);
 
-    #ifdef WARNING
-    *logofs << "NXTransClient: WARNING! Trying with path '"
-            << newPath << "'.\n" << logofs_flush;
-    #endif
+      newPath[DEFAULT_STRING_LIMIT - 1] = '\0';
 
-    cerr << "Warning" << ": Trying with path '" << newPath
-         << "'.\n";
+      #ifdef WARNING
+      *logofs << "NXTransClient: WARNING! Trying with path '"
+              << newPath << "'.\n" << logofs_flush;
+      #endif
 
-    //
-    // Solaris doesn't seem to have
-    // function setenv().
-    //
+      cerr << "Warning" << ": Trying with path '" << newPath
+           << "'.\n";
 
-    #ifdef __sun
+      //
+      // Solaris doesn't seem to have
+      // function setenv().
+      //
 
-    char newEnv[DEFAULT_STRING_LIMIT + 5];
+      #ifdef __sun
 
-    sprintf(newEnv,"PATH=%s", newPath);
+      char newEnv[DEFAULT_STRING_LIMIT + 5];
 
-    putenv(newEnv);
+      sprintf(newEnv,"PATH=%s", newPath);
 
-    #else
+      putenv(newEnv);
 
-    setenv("PATH", newPath, 1);
+      #else
 
-    #endif
-  }
+      setenv("PATH", newPath, 1);
 
+      #endif
+    }
+
+  }
   //
   // Hopefully useless.
   //
-- 
cgit v1.2.3


From 7d51cb6760b760768aeb91dd81f10443d094bd6c Mon Sep 17 00:00:00 2001
From: Oleksandr Shneyder <o.schneyder@phoca-gmbh.de>
Date: Thu, 29 Jun 2017 10:08:56 +0200
Subject: nxcomp: Set TokenSize to 1536 for link type ADSL and WAN. Improving
 non-xrender based  browser scrolling behaviour when link type is set to ADSL
 or WAN.

 In the 40-ies (talking about release version numbers), Firefox started
 using the Skia library [1] for client-side rendering of browser content.

 With current versions of Firefox you can switch between libXrender based
 rendering (esp. of Fonts) and Skia based rendering:

    gfx.xrender.enabled = true|false

 Some time around Firefox 52, the default for the gfx.xrender.enabled
 setting got changed by Firefox upstream from true to false. So nowadays,
 Firefox uses Skia by default.

 However, it turns out that Skia scales really badly on remote X11
 connections. Scrolling of long web pages becomes really jolty.

 Something similar could be observed earlier already when using
 Chrome or Chromium (which also has been using Skia for some time
 now).

 This change in nxcomp works around those issues and greatly
 improves scrolling and general browser experience on medium
 throughput networks (like cable modem, ADSL, HDSPA, slow LTE).

 [1] https://en.wikipedia.org/wiki/Skia_Graphics_Engine

 Fixes ArcticaProject/nx-libs#443.
---
 nxcomp/Loop.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 7aaff09e8..4592121de 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -12942,7 +12942,7 @@ int SetLinkAdsl()
 
   control -> LinkMode = LINK_TYPE_ADSL;
 
-  control -> TokenSize  = 512;
+  control -> TokenSize  = 1536;
   control -> TokenLimit = 24;
 
   control -> SplitMode             = 1;
@@ -12972,7 +12972,7 @@ int SetLinkWan()
 
   control -> LinkMode = LINK_TYPE_WAN;
 
-  control -> TokenSize  = 768;
+  control -> TokenSize  = 1536;
   control -> TokenLimit = 24;
 
   control -> SplitMode             = 1;
-- 
cgit v1.2.3


From f76c82403888bb498973ec974dbfd20e4edb02fe Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Fri, 30 Jun 2017 20:13:51 +0200
Subject: nxcomp: Switch to autoreconf.

---
 Makefile                                 |    16 +-
 debian/libxcomp-dev.install              |     1 +
 debian/rules                             |     2 +-
 nx-X11/lib/X11/Imakefile                 |     6 +-
 nx-X11/programs/Xserver/Imakefile        |    20 +-
 nxcomp/.gitignore                        |    23 +-
 nxcomp/ActionCache.cpp                   |    47 -
 nxcomp/ActionCache.h                     |    49 -
 nxcomp/Agent.cpp                         |    80 -
 nxcomp/Agent.h                           |   263 -
 nxcomp/Alpha.cpp                         |   134 -
 nxcomp/Alpha.h                           |    35 -
 nxcomp/Auth.cpp                          |   667 --
 nxcomp/Auth.h                            |   127 -
 nxcomp/Bitmap.cpp                        |   114 -
 nxcomp/Bitmap.h                          |    36 -
 nxcomp/BlockCache.cpp                    |    77 -
 nxcomp/BlockCache.h                      |    67 -
 nxcomp/BlockCacheSet.cpp                 |   143 -
 nxcomp/BlockCacheSet.h                   |    49 -
 nxcomp/ChangeGC.cpp                      |   180 -
 nxcomp/ChangeGC.h                        |   185 -
 nxcomp/ChangeProperty.cpp                |   187 -
 nxcomp/ChangeProperty.h                  |   189 -
 nxcomp/Channel.cpp                       |  2035 ----
 nxcomp/Channel.h                         |   664 --
 nxcomp/ChannelCache.cpp                  |    64 -
 nxcomp/ChannelCache.h                    |    61 -
 nxcomp/ChannelEndPoint.cpp               |   345 -
 nxcomp/ChannelEndPoint.h                 |    71 -
 nxcomp/ChannelStore.h                    |    54 -
 nxcomp/CharCache.cpp                     |    69 -
 nxcomp/CharCache.h                       |    91 -
 nxcomp/Children.cpp                      |  1055 --
 nxcomp/ClearArea.cpp                     |   121 -
 nxcomp/ClearArea.h                       |   182 -
 nxcomp/ClientCache.cpp                   |   388 -
 nxcomp/ClientCache.h                     |   417 -
 nxcomp/ClientChannel.cpp                 |  7877 --------------
 nxcomp/ClientChannel.h                   |   434 -
 nxcomp/ClientProxy.cpp                   |   549 -
 nxcomp/ClientProxy.h                     |   113 -
 nxcomp/ClientReadBuffer.cpp              |   174 -
 nxcomp/ClientReadBuffer.h                |    65 -
 nxcomp/ClientStore.cpp                   |   222 -
 nxcomp/ClientStore.h                     |   143 -
 nxcomp/Colormap.cpp                      |   102 -
 nxcomp/Colormap.h                        |    32 -
 nxcomp/ConfigureWindow.cpp               |   138 -
 nxcomp/ConfigureWindow.h                 |   178 -
 nxcomp/Control.cpp                       |   818 --
 nxcomp/Control.h                         |   764 --
 nxcomp/CopyArea.cpp                      |   195 -
 nxcomp/CopyArea.h                        |   192 -
 nxcomp/CreateGC.cpp                      |   190 -
 nxcomp/CreateGC.h                        |   186 -
 nxcomp/CreatePixmap.cpp                  |   276 -
 nxcomp/CreatePixmap.h                    |   162 -
 nxcomp/DecodeBuffer.cpp                  |   635 --
 nxcomp/DecodeBuffer.h                    |   138 -
 nxcomp/EncodeBuffer.cpp                  |   619 --
 nxcomp/EncodeBuffer.h                    |   183 -
 nxcomp/FillPoly.cpp                      |   235 -
 nxcomp/FillPoly.h                        |   200 -
 nxcomp/Fork.cpp                          |   106 -
 nxcomp/Fork.h                            |    31 -
 nxcomp/FreeCache.h                       |    42 -
 nxcomp/GenericChannel.cpp                |   491 -
 nxcomp/GenericChannel.h                  |   440 -
 nxcomp/GenericReadBuffer.cpp             |    78 -
 nxcomp/GenericReadBuffer.h               |    61 -
 nxcomp/GenericReply.cpp                  |   298 -
 nxcomp/GenericReply.h                    |   161 -
 nxcomp/GenericRequest.cpp                |   330 -
 nxcomp/GenericRequest.h                  |   160 -
 nxcomp/GetImage.cpp                      |   173 -
 nxcomp/GetImage.h                        |   190 -
 nxcomp/GetImageReply.cpp                 |   190 -
 nxcomp/GetImageReply.h                   |   150 -
 nxcomp/GetProperty.cpp                   |   115 -
 nxcomp/GetProperty.h                     |   183 -
 nxcomp/GetPropertyReply.cpp              |   300 -
 nxcomp/GetPropertyReply.h                |   160 -
 nxcomp/ImageText16.cpp                   |   227 -
 nxcomp/ImageText16.h                     |   190 -
 nxcomp/ImageText8.cpp                    |   227 -
 nxcomp/ImageText8.h                      |   190 -
 nxcomp/IntCache.cpp                      |   226 -
 nxcomp/IntCache.h                        |   119 -
 nxcomp/InternAtom.cpp                    |   127 -
 nxcomp/InternAtom.h                      |   178 -
 nxcomp/Jpeg.cpp                          |   886 --
 nxcomp/Jpeg.h                            |    36 -
 nxcomp/Keeper.cpp                        |   608 --
 nxcomp/Keeper.h                          |   199 -
 nxcomp/List.cpp                          |   108 -
 nxcomp/List.h                            |    95 -
 nxcomp/ListFontsReply.cpp                |   209 -
 nxcomp/ListFontsReply.h                  |   146 -
 nxcomp/Loop.cpp                          | 16689 ----------------------------
 nxcomp/MD5.c                             |   399 -
 nxcomp/MD5.h                             |    91 -
 nxcomp/Makefile.am                       |    21 +
 nxcomp/Makefile.in                       |   333 -
 nxcomp/Message.cpp                       |  2339 ----
 nxcomp/Message.h                         |  1089 --
 nxcomp/Misc.cpp                          |  1930 ----
 nxcomp/Misc.h                            |   279 -
 nxcomp/NX.h                              |   471 -
 nxcomp/NXalert.h                         |   276 -
 nxcomp/NXmitshm.h                        |    56 -
 nxcomp/NXpack.h                          |   141 -
 nxcomp/NXproto.h                         |   447 -
 nxcomp/NXrender.h                        |    78 -
 nxcomp/NXvars.h                          |   201 -
 nxcomp/OpcodeCache.h                     |    53 -
 nxcomp/OpcodeStore.cpp                   |    84 -
 nxcomp/OpcodeStore.h                     |    91 -
 nxcomp/Pack.c                            |   180 -
 nxcomp/Pgn.cpp                           |   805 --
 nxcomp/Pgn.h                             |    42 -
 nxcomp/Pipe.cpp                          |   429 -
 nxcomp/Pipe.h                            |    35 -
 nxcomp/PolyArc.cpp                       |   158 -
 nxcomp/PolyArc.h                         |   185 -
 nxcomp/PolyFillArc.cpp                   |   158 -
 nxcomp/PolyFillArc.h                     |   185 -
 nxcomp/PolyFillRectangle.cpp             |   156 -
 nxcomp/PolyFillRectangle.h               |   185 -
 nxcomp/PolyLine.cpp                      |   164 -
 nxcomp/PolyLine.h                        |   186 -
 nxcomp/PolyPoint.cpp                     |   164 -
 nxcomp/PolyPoint.h                       |   186 -
 nxcomp/PolySegment.cpp                   |   158 -
 nxcomp/PolySegment.h                     |   185 -
 nxcomp/PolyText16.cpp                    |   308 -
 nxcomp/PolyText16.h                      |   188 -
 nxcomp/PolyText8.cpp                     |   306 -
 nxcomp/PolyText8.h                       |   188 -
 nxcomp/Proxy.cpp                         |  6525 -----------
 nxcomp/Proxy.h                           |  1276 ---
 nxcomp/ProxyReadBuffer.cpp               |   207 -
 nxcomp/ProxyReadBuffer.h                 |    57 -
 nxcomp/PutImage.cpp                      |   407 -
 nxcomp/PutImage.h                        |   172 -
 nxcomp/PutPackedImage.cpp                |   600 --
 nxcomp/PutPackedImage.h                  |   218 -
 nxcomp/QueryFontReply.cpp                |   150 -
 nxcomp/QueryFontReply.h                  |   136 -
 nxcomp/ReadBuffer.cpp                    |   635 --
 nxcomp/ReadBuffer.h                      |   128 -
 nxcomp/RenderAddGlyphs.cpp               |   229 -
 nxcomp/RenderAddGlyphs.h                 |    88 -
 nxcomp/RenderChangePicture.cpp           |   234 -
 nxcomp/RenderChangePicture.h             |    88 -
 nxcomp/RenderComposite.cpp               |   396 -
 nxcomp/RenderComposite.h                 |    88 -
 nxcomp/RenderCompositeGlyphs.cpp         |   625 --
 nxcomp/RenderCompositeGlyphs.h           |   100 -
 nxcomp/RenderCreateGlyphSet.cpp          |   181 -
 nxcomp/RenderCreateGlyphSet.h            |    88 -
 nxcomp/RenderCreatePicture.cpp           |   274 -
 nxcomp/RenderCreatePicture.h             |    88 -
 nxcomp/RenderExtension.cpp               |   423 -
 nxcomp/RenderExtension.h                 |   504 -
 nxcomp/RenderFillRectangles.cpp          |   233 -
 nxcomp/RenderFillRectangles.h            |    88 -
 nxcomp/RenderFreeGlyphSet.cpp            |   162 -
 nxcomp/RenderFreeGlyphSet.h              |    88 -
 nxcomp/RenderFreePicture.cpp             |   162 -
 nxcomp/RenderFreePicture.h               |    88 -
 nxcomp/RenderGenericRequest.cpp          |   266 -
 nxcomp/RenderGenericRequest.h            |    89 -
 nxcomp/RenderMinorExtensionHeaders.h     |    42 -
 nxcomp/RenderMinorExtensionMethods.h     |    81 -
 nxcomp/RenderMinorExtensionTags.h        |   194 -
 nxcomp/RenderPictureClip.cpp             |   299 -
 nxcomp/RenderPictureClip.h               |    88 -
 nxcomp/RenderPictureFilter.cpp           |   274 -
 nxcomp/RenderPictureFilter.h             |    88 -
 nxcomp/RenderPictureTransform.cpp        |   210 -
 nxcomp/RenderPictureTransform.h          |    88 -
 nxcomp/RenderTrapezoids.cpp              |   368 -
 nxcomp/RenderTrapezoids.h                |    88 -
 nxcomp/RenderTriangles.cpp               |   358 -
 nxcomp/RenderTriangles.h                 |    88 -
 nxcomp/Rgb.cpp                           |   102 -
 nxcomp/Rgb.h                             |    36 -
 nxcomp/Rle.cpp                           |   102 -
 nxcomp/Rle.h                             |    36 -
 nxcomp/SendEvent.cpp                     |   300 -
 nxcomp/SendEvent.h                       |   195 -
 nxcomp/SequenceQueue.cpp                 |   170 -
 nxcomp/SequenceQueue.h                   |    91 -
 nxcomp/ServerCache.cpp                   |   191 -
 nxcomp/ServerCache.h                     |   303 -
 nxcomp/ServerChannel.cpp                 |  7942 --------------
 nxcomp/ServerChannel.h                   |   529 -
 nxcomp/ServerProxy.cpp                   |   617 --
 nxcomp/ServerProxy.h                     |   154 -
 nxcomp/ServerReadBuffer.cpp              |   243 -
 nxcomp/ServerReadBuffer.h                |    73 -
 nxcomp/ServerStore.cpp                   |   179 -
 nxcomp/ServerStore.h                     |    83 -
 nxcomp/SetClipRectangles.cpp             |   150 -
 nxcomp/SetClipRectangles.h               |   187 -
 nxcomp/SetUnpackAlpha.cpp                |   262 -
 nxcomp/SetUnpackAlpha.h                  |   162 -
 nxcomp/SetUnpackColormap.cpp             |   262 -
 nxcomp/SetUnpackColormap.h               |   162 -
 nxcomp/SetUnpackGeometry.cpp             |   301 -
 nxcomp/SetUnpackGeometry.h               |   167 -
 nxcomp/ShapeExtension.cpp                |   301 -
 nxcomp/ShapeExtension.h                  |   164 -
 nxcomp/Socket.cpp                        |   753 --
 nxcomp/Socket.h                          |    96 -
 nxcomp/Split.cpp                         |  1835 ----
 nxcomp/Split.h                           |   543 -
 nxcomp/StaticCompressor.cpp              |   428 -
 nxcomp/StaticCompressor.h                |    80 -
 nxcomp/Statistics.cpp                    |  2003 ----
 nxcomp/Statistics.h                      |   745 --
 nxcomp/Timestamp.cpp                     |    73 -
 nxcomp/Timestamp.h                       |   307 -
 nxcomp/TranslateCoords.cpp               |   111 -
 nxcomp/TranslateCoords.h                 |   185 -
 nxcomp/Transport.cpp                     |  3064 ------
 nxcomp/Transport.h                       |   577 -
 nxcomp/Types.h                           |   271 -
 nxcomp/Unpack.cpp                        |  1510 ---
 nxcomp/Unpack.h                          |   149 -
 nxcomp/Vars.c                            |    54 -
 nxcomp/Version.c                         |    97 -
 nxcomp/WriteBuffer.cpp                   |   496 -
 nxcomp/WriteBuffer.h                     |   134 -
 nxcomp/XidCache.cpp                      |    47 -
 nxcomp/XidCache.h                        |    49 -
 nxcomp/Z.cpp                             |   142 -
 nxcomp/Z.h                               |    37 -
 nxcomp/configure.ac                      |    83 +
 nxcomp/configure.in                      |   413 -
 nxcomp/include/MD5.h                     |    91 +
 nxcomp/include/NX.h                      |   471 +
 nxcomp/include/NXalert.h                 |   276 +
 nxcomp/include/NXpack.h                  |   141 +
 nxcomp/include/NXproto.h                 |   447 +
 nxcomp/include/NXvars.h                  |   201 +
 nxcomp/install-sh                        |   238 -
 nxcomp/m4/nx-macros.m4                   |     1 +
 nxcomp/mkinstalldirs                     |    34 -
 nxcomp/nxcomp.pc.in                      |     2 +-
 nxcomp/src/ActionCache.cpp               |    51 +
 nxcomp/src/ActionCache.h                 |    49 +
 nxcomp/src/Agent.cpp                     |    84 +
 nxcomp/src/Agent.h                       |   263 +
 nxcomp/src/Alpha.cpp                     |   138 +
 nxcomp/src/Alpha.h                       |    35 +
 nxcomp/src/Auth.cpp                      |   671 ++
 nxcomp/src/Auth.h                        |   127 +
 nxcomp/src/Bitmap.cpp                    |   118 +
 nxcomp/src/Bitmap.h                      |    36 +
 nxcomp/src/BlockCache.cpp                |    81 +
 nxcomp/src/BlockCache.h                  |    67 +
 nxcomp/src/BlockCacheSet.cpp             |   147 +
 nxcomp/src/BlockCacheSet.h               |    49 +
 nxcomp/src/ChangeGC.cpp                  |   184 +
 nxcomp/src/ChangeGC.h                    |   185 +
 nxcomp/src/ChangeProperty.cpp            |   191 +
 nxcomp/src/ChangeProperty.h              |   189 +
 nxcomp/src/Channel.cpp                   |  2039 ++++
 nxcomp/src/Channel.h                     |   664 ++
 nxcomp/src/ChannelCache.cpp              |    68 +
 nxcomp/src/ChannelCache.h                |    61 +
 nxcomp/src/ChannelEndPoint.cpp           |   349 +
 nxcomp/src/ChannelEndPoint.h             |    71 +
 nxcomp/src/ChannelStore.h                |    54 +
 nxcomp/src/CharCache.cpp                 |    73 +
 nxcomp/src/CharCache.h                   |    91 +
 nxcomp/src/Children.cpp                  |  1059 ++
 nxcomp/src/ClearArea.cpp                 |   125 +
 nxcomp/src/ClearArea.h                   |   182 +
 nxcomp/src/ClientCache.cpp               |   392 +
 nxcomp/src/ClientCache.h                 |   417 +
 nxcomp/src/ClientChannel.cpp             |  7881 ++++++++++++++
 nxcomp/src/ClientChannel.h               |   434 +
 nxcomp/src/ClientProxy.cpp               |   553 +
 nxcomp/src/ClientProxy.h                 |   113 +
 nxcomp/src/ClientReadBuffer.cpp          |   178 +
 nxcomp/src/ClientReadBuffer.h            |    65 +
 nxcomp/src/ClientStore.cpp               |   226 +
 nxcomp/src/ClientStore.h                 |   143 +
 nxcomp/src/Colormap.cpp                  |   106 +
 nxcomp/src/Colormap.h                    |    32 +
 nxcomp/src/ConfigureWindow.cpp           |   142 +
 nxcomp/src/ConfigureWindow.h             |   178 +
 nxcomp/src/Control.cpp                   |   822 ++
 nxcomp/src/Control.h                     |   764 ++
 nxcomp/src/CopyArea.cpp                  |   199 +
 nxcomp/src/CopyArea.h                    |   192 +
 nxcomp/src/CreateGC.cpp                  |   194 +
 nxcomp/src/CreateGC.h                    |   186 +
 nxcomp/src/CreatePixmap.cpp              |   280 +
 nxcomp/src/CreatePixmap.h                |   162 +
 nxcomp/src/DecodeBuffer.cpp              |   639 ++
 nxcomp/src/DecodeBuffer.h                |   138 +
 nxcomp/src/EncodeBuffer.cpp              |   623 ++
 nxcomp/src/EncodeBuffer.h                |   183 +
 nxcomp/src/FillPoly.cpp                  |   239 +
 nxcomp/src/FillPoly.h                    |   200 +
 nxcomp/src/Fork.cpp                      |   110 +
 nxcomp/src/Fork.h                        |    31 +
 nxcomp/src/FreeCache.h                   |    42 +
 nxcomp/src/GenericChannel.cpp            |   495 +
 nxcomp/src/GenericChannel.h              |   440 +
 nxcomp/src/GenericReadBuffer.cpp         |    82 +
 nxcomp/src/GenericReadBuffer.h           |    61 +
 nxcomp/src/GenericReply.cpp              |   302 +
 nxcomp/src/GenericReply.h                |   161 +
 nxcomp/src/GenericRequest.cpp            |   334 +
 nxcomp/src/GenericRequest.h              |   160 +
 nxcomp/src/GetImage.cpp                  |   177 +
 nxcomp/src/GetImage.h                    |   190 +
 nxcomp/src/GetImageReply.cpp             |   194 +
 nxcomp/src/GetImageReply.h               |   150 +
 nxcomp/src/GetProperty.cpp               |   119 +
 nxcomp/src/GetProperty.h                 |   183 +
 nxcomp/src/GetPropertyReply.cpp          |   304 +
 nxcomp/src/GetPropertyReply.h            |   160 +
 nxcomp/src/ImageText16.cpp               |   231 +
 nxcomp/src/ImageText16.h                 |   190 +
 nxcomp/src/ImageText8.cpp                |   231 +
 nxcomp/src/ImageText8.h                  |   190 +
 nxcomp/src/IntCache.cpp                  |   230 +
 nxcomp/src/IntCache.h                    |   119 +
 nxcomp/src/InternAtom.cpp                |   131 +
 nxcomp/src/InternAtom.h                  |   178 +
 nxcomp/src/Jpeg.cpp                      |   890 ++
 nxcomp/src/Jpeg.h                        |    36 +
 nxcomp/src/Keeper.cpp                    |   612 ++
 nxcomp/src/Keeper.h                      |   199 +
 nxcomp/src/List.cpp                      |   112 +
 nxcomp/src/List.h                        |    95 +
 nxcomp/src/ListFontsReply.cpp            |   213 +
 nxcomp/src/ListFontsReply.h              |   146 +
 nxcomp/src/Loop.cpp                      | 16693 +++++++++++++++++++++++++++++
 nxcomp/src/MD5.c                         |   403 +
 nxcomp/src/Makefile.am                   |   146 +
 nxcomp/src/Message.cpp                   |  2343 ++++
 nxcomp/src/Message.h                     |  1089 ++
 nxcomp/src/Misc.cpp                      |  1934 ++++
 nxcomp/src/Misc.h                        |   279 +
 nxcomp/src/NXmitshm.h                    |    56 +
 nxcomp/src/NXrender.h                    |    78 +
 nxcomp/src/OpcodeCache.h                 |    53 +
 nxcomp/src/OpcodeStore.cpp               |    88 +
 nxcomp/src/OpcodeStore.h                 |    91 +
 nxcomp/src/Pack.c                        |   180 +
 nxcomp/src/Pgn.cpp                       |   809 ++
 nxcomp/src/Pgn.h                         |    42 +
 nxcomp/src/Pipe.cpp                      |   433 +
 nxcomp/src/Pipe.h                        |    35 +
 nxcomp/src/PolyArc.cpp                   |   162 +
 nxcomp/src/PolyArc.h                     |   185 +
 nxcomp/src/PolyFillArc.cpp               |   162 +
 nxcomp/src/PolyFillArc.h                 |   185 +
 nxcomp/src/PolyFillRectangle.cpp         |   160 +
 nxcomp/src/PolyFillRectangle.h           |   185 +
 nxcomp/src/PolyLine.cpp                  |   168 +
 nxcomp/src/PolyLine.h                    |   186 +
 nxcomp/src/PolyPoint.cpp                 |   168 +
 nxcomp/src/PolyPoint.h                   |   186 +
 nxcomp/src/PolySegment.cpp               |   162 +
 nxcomp/src/PolySegment.h                 |   185 +
 nxcomp/src/PolyText16.cpp                |   312 +
 nxcomp/src/PolyText16.h                  |   188 +
 nxcomp/src/PolyText8.cpp                 |   310 +
 nxcomp/src/PolyText8.h                   |   188 +
 nxcomp/src/Proxy.cpp                     |  6529 +++++++++++
 nxcomp/src/Proxy.h                       |  1276 +++
 nxcomp/src/ProxyReadBuffer.cpp           |   211 +
 nxcomp/src/ProxyReadBuffer.h             |    57 +
 nxcomp/src/PutImage.cpp                  |   411 +
 nxcomp/src/PutImage.h                    |   172 +
 nxcomp/src/PutPackedImage.cpp            |   604 ++
 nxcomp/src/PutPackedImage.h              |   218 +
 nxcomp/src/QueryFontReply.cpp            |   154 +
 nxcomp/src/QueryFontReply.h              |   136 +
 nxcomp/src/ReadBuffer.cpp                |   639 ++
 nxcomp/src/ReadBuffer.h                  |   128 +
 nxcomp/src/RenderAddGlyphs.cpp           |   233 +
 nxcomp/src/RenderAddGlyphs.h             |    88 +
 nxcomp/src/RenderChangePicture.cpp       |   238 +
 nxcomp/src/RenderChangePicture.h         |    88 +
 nxcomp/src/RenderComposite.cpp           |   400 +
 nxcomp/src/RenderComposite.h             |    88 +
 nxcomp/src/RenderCompositeGlyphs.cpp     |   629 ++
 nxcomp/src/RenderCompositeGlyphs.h       |   100 +
 nxcomp/src/RenderCreateGlyphSet.cpp      |   185 +
 nxcomp/src/RenderCreateGlyphSet.h        |    88 +
 nxcomp/src/RenderCreatePicture.cpp       |   278 +
 nxcomp/src/RenderCreatePicture.h         |    88 +
 nxcomp/src/RenderExtension.cpp           |   427 +
 nxcomp/src/RenderExtension.h             |   504 +
 nxcomp/src/RenderFillRectangles.cpp      |   237 +
 nxcomp/src/RenderFillRectangles.h        |    88 +
 nxcomp/src/RenderFreeGlyphSet.cpp        |   166 +
 nxcomp/src/RenderFreeGlyphSet.h          |    88 +
 nxcomp/src/RenderFreePicture.cpp         |   166 +
 nxcomp/src/RenderFreePicture.h           |    88 +
 nxcomp/src/RenderGenericRequest.cpp      |   270 +
 nxcomp/src/RenderGenericRequest.h        |    89 +
 nxcomp/src/RenderMinorExtensionHeaders.h |    42 +
 nxcomp/src/RenderMinorExtensionMethods.h |    81 +
 nxcomp/src/RenderMinorExtensionTags.h    |   194 +
 nxcomp/src/RenderPictureClip.cpp         |   303 +
 nxcomp/src/RenderPictureClip.h           |    88 +
 nxcomp/src/RenderPictureFilter.cpp       |   278 +
 nxcomp/src/RenderPictureFilter.h         |    88 +
 nxcomp/src/RenderPictureTransform.cpp    |   214 +
 nxcomp/src/RenderPictureTransform.h      |    88 +
 nxcomp/src/RenderTrapezoids.cpp          |   372 +
 nxcomp/src/RenderTrapezoids.h            |    88 +
 nxcomp/src/RenderTriangles.cpp           |   362 +
 nxcomp/src/RenderTriangles.h             |    88 +
 nxcomp/src/Rgb.cpp                       |   106 +
 nxcomp/src/Rgb.h                         |    36 +
 nxcomp/src/Rle.cpp                       |   106 +
 nxcomp/src/Rle.h                         |    36 +
 nxcomp/src/SendEvent.cpp                 |   304 +
 nxcomp/src/SendEvent.h                   |   195 +
 nxcomp/src/SequenceQueue.cpp             |   174 +
 nxcomp/src/SequenceQueue.h               |    91 +
 nxcomp/src/ServerCache.cpp               |   195 +
 nxcomp/src/ServerCache.h                 |   303 +
 nxcomp/src/ServerChannel.cpp             |  7946 ++++++++++++++
 nxcomp/src/ServerChannel.h               |   529 +
 nxcomp/src/ServerProxy.cpp               |   621 ++
 nxcomp/src/ServerProxy.h                 |   154 +
 nxcomp/src/ServerReadBuffer.cpp          |   247 +
 nxcomp/src/ServerReadBuffer.h            |    73 +
 nxcomp/src/ServerStore.cpp               |   183 +
 nxcomp/src/ServerStore.h                 |    83 +
 nxcomp/src/SetClipRectangles.cpp         |   154 +
 nxcomp/src/SetClipRectangles.h           |   187 +
 nxcomp/src/SetUnpackAlpha.cpp            |   266 +
 nxcomp/src/SetUnpackAlpha.h              |   162 +
 nxcomp/src/SetUnpackColormap.cpp         |   266 +
 nxcomp/src/SetUnpackColormap.h           |   162 +
 nxcomp/src/SetUnpackGeometry.cpp         |   305 +
 nxcomp/src/SetUnpackGeometry.h           |   167 +
 nxcomp/src/ShapeExtension.cpp            |   305 +
 nxcomp/src/ShapeExtension.h              |   164 +
 nxcomp/src/Socket.cpp                    |   757 ++
 nxcomp/src/Socket.h                      |    96 +
 nxcomp/src/Split.cpp                     |  1839 ++++
 nxcomp/src/Split.h                       |   543 +
 nxcomp/src/StaticCompressor.cpp          |   432 +
 nxcomp/src/StaticCompressor.h            |    80 +
 nxcomp/src/Statistics.cpp                |  2007 ++++
 nxcomp/src/Statistics.h                  |   745 ++
 nxcomp/src/Timestamp.cpp                 |    77 +
 nxcomp/src/Timestamp.h                   |   307 +
 nxcomp/src/TranslateCoords.cpp           |   115 +
 nxcomp/src/TranslateCoords.h             |   185 +
 nxcomp/src/Transport.cpp                 |  3068 ++++++
 nxcomp/src/Transport.h                   |   577 +
 nxcomp/src/Types.h                       |   271 +
 nxcomp/src/Unpack.cpp                    |  1514 +++
 nxcomp/src/Unpack.h                      |   149 +
 nxcomp/src/Vars.c                        |    54 +
 nxcomp/src/Version.c                     |   101 +
 nxcomp/src/WriteBuffer.cpp               |   500 +
 nxcomp/src/WriteBuffer.h                 |   134 +
 nxcomp/src/XidCache.cpp                  |    51 +
 nxcomp/src/XidCache.h                    |    49 +
 nxcomp/src/Z.cpp                         |   146 +
 nxcomp/src/Z.h                           |    37 +
 nxproxy/src/Makefile.am                  |     4 +-
 478 files changed, 105105 insertions(+), 105414 deletions(-)
 delete mode 100644 nxcomp/ActionCache.cpp
 delete mode 100644 nxcomp/ActionCache.h
 delete mode 100644 nxcomp/Agent.cpp
 delete mode 100644 nxcomp/Agent.h
 delete mode 100644 nxcomp/Alpha.cpp
 delete mode 100644 nxcomp/Alpha.h
 delete mode 100644 nxcomp/Auth.cpp
 delete mode 100644 nxcomp/Auth.h
 delete mode 100644 nxcomp/Bitmap.cpp
 delete mode 100644 nxcomp/Bitmap.h
 delete mode 100644 nxcomp/BlockCache.cpp
 delete mode 100644 nxcomp/BlockCache.h
 delete mode 100644 nxcomp/BlockCacheSet.cpp
 delete mode 100644 nxcomp/BlockCacheSet.h
 delete mode 100644 nxcomp/ChangeGC.cpp
 delete mode 100644 nxcomp/ChangeGC.h
 delete mode 100644 nxcomp/ChangeProperty.cpp
 delete mode 100644 nxcomp/ChangeProperty.h
 delete mode 100644 nxcomp/Channel.cpp
 delete mode 100644 nxcomp/Channel.h
 delete mode 100644 nxcomp/ChannelCache.cpp
 delete mode 100644 nxcomp/ChannelCache.h
 delete mode 100644 nxcomp/ChannelEndPoint.cpp
 delete mode 100644 nxcomp/ChannelEndPoint.h
 delete mode 100644 nxcomp/ChannelStore.h
 delete mode 100644 nxcomp/CharCache.cpp
 delete mode 100644 nxcomp/CharCache.h
 delete mode 100644 nxcomp/Children.cpp
 delete mode 100644 nxcomp/ClearArea.cpp
 delete mode 100644 nxcomp/ClearArea.h
 delete mode 100644 nxcomp/ClientCache.cpp
 delete mode 100644 nxcomp/ClientCache.h
 delete mode 100644 nxcomp/ClientChannel.cpp
 delete mode 100644 nxcomp/ClientChannel.h
 delete mode 100644 nxcomp/ClientProxy.cpp
 delete mode 100644 nxcomp/ClientProxy.h
 delete mode 100644 nxcomp/ClientReadBuffer.cpp
 delete mode 100644 nxcomp/ClientReadBuffer.h
 delete mode 100644 nxcomp/ClientStore.cpp
 delete mode 100644 nxcomp/ClientStore.h
 delete mode 100644 nxcomp/Colormap.cpp
 delete mode 100644 nxcomp/Colormap.h
 delete mode 100644 nxcomp/ConfigureWindow.cpp
 delete mode 100644 nxcomp/ConfigureWindow.h
 delete mode 100644 nxcomp/Control.cpp
 delete mode 100644 nxcomp/Control.h
 delete mode 100644 nxcomp/CopyArea.cpp
 delete mode 100644 nxcomp/CopyArea.h
 delete mode 100644 nxcomp/CreateGC.cpp
 delete mode 100644 nxcomp/CreateGC.h
 delete mode 100644 nxcomp/CreatePixmap.cpp
 delete mode 100644 nxcomp/CreatePixmap.h
 delete mode 100644 nxcomp/DecodeBuffer.cpp
 delete mode 100644 nxcomp/DecodeBuffer.h
 delete mode 100644 nxcomp/EncodeBuffer.cpp
 delete mode 100644 nxcomp/EncodeBuffer.h
 delete mode 100644 nxcomp/FillPoly.cpp
 delete mode 100644 nxcomp/FillPoly.h
 delete mode 100644 nxcomp/Fork.cpp
 delete mode 100644 nxcomp/Fork.h
 delete mode 100644 nxcomp/FreeCache.h
 delete mode 100644 nxcomp/GenericChannel.cpp
 delete mode 100644 nxcomp/GenericChannel.h
 delete mode 100644 nxcomp/GenericReadBuffer.cpp
 delete mode 100644 nxcomp/GenericReadBuffer.h
 delete mode 100644 nxcomp/GenericReply.cpp
 delete mode 100644 nxcomp/GenericReply.h
 delete mode 100644 nxcomp/GenericRequest.cpp
 delete mode 100644 nxcomp/GenericRequest.h
 delete mode 100644 nxcomp/GetImage.cpp
 delete mode 100644 nxcomp/GetImage.h
 delete mode 100644 nxcomp/GetImageReply.cpp
 delete mode 100644 nxcomp/GetImageReply.h
 delete mode 100644 nxcomp/GetProperty.cpp
 delete mode 100644 nxcomp/GetProperty.h
 delete mode 100644 nxcomp/GetPropertyReply.cpp
 delete mode 100644 nxcomp/GetPropertyReply.h
 delete mode 100644 nxcomp/ImageText16.cpp
 delete mode 100644 nxcomp/ImageText16.h
 delete mode 100644 nxcomp/ImageText8.cpp
 delete mode 100644 nxcomp/ImageText8.h
 delete mode 100644 nxcomp/IntCache.cpp
 delete mode 100644 nxcomp/IntCache.h
 delete mode 100644 nxcomp/InternAtom.cpp
 delete mode 100644 nxcomp/InternAtom.h
 delete mode 100644 nxcomp/Jpeg.cpp
 delete mode 100644 nxcomp/Jpeg.h
 delete mode 100644 nxcomp/Keeper.cpp
 delete mode 100644 nxcomp/Keeper.h
 delete mode 100644 nxcomp/List.cpp
 delete mode 100644 nxcomp/List.h
 delete mode 100644 nxcomp/ListFontsReply.cpp
 delete mode 100644 nxcomp/ListFontsReply.h
 delete mode 100644 nxcomp/Loop.cpp
 delete mode 100644 nxcomp/MD5.c
 delete mode 100644 nxcomp/MD5.h
 create mode 100644 nxcomp/Makefile.am
 delete mode 100644 nxcomp/Makefile.in
 delete mode 100644 nxcomp/Message.cpp
 delete mode 100644 nxcomp/Message.h
 delete mode 100644 nxcomp/Misc.cpp
 delete mode 100644 nxcomp/Misc.h
 delete mode 100644 nxcomp/NX.h
 delete mode 100644 nxcomp/NXalert.h
 delete mode 100644 nxcomp/NXmitshm.h
 delete mode 100644 nxcomp/NXpack.h
 delete mode 100644 nxcomp/NXproto.h
 delete mode 100644 nxcomp/NXrender.h
 delete mode 100644 nxcomp/NXvars.h
 delete mode 100644 nxcomp/OpcodeCache.h
 delete mode 100644 nxcomp/OpcodeStore.cpp
 delete mode 100644 nxcomp/OpcodeStore.h
 delete mode 100644 nxcomp/Pack.c
 delete mode 100644 nxcomp/Pgn.cpp
 delete mode 100644 nxcomp/Pgn.h
 delete mode 100644 nxcomp/Pipe.cpp
 delete mode 100644 nxcomp/Pipe.h
 delete mode 100644 nxcomp/PolyArc.cpp
 delete mode 100644 nxcomp/PolyArc.h
 delete mode 100644 nxcomp/PolyFillArc.cpp
 delete mode 100644 nxcomp/PolyFillArc.h
 delete mode 100644 nxcomp/PolyFillRectangle.cpp
 delete mode 100644 nxcomp/PolyFillRectangle.h
 delete mode 100644 nxcomp/PolyLine.cpp
 delete mode 100644 nxcomp/PolyLine.h
 delete mode 100644 nxcomp/PolyPoint.cpp
 delete mode 100644 nxcomp/PolyPoint.h
 delete mode 100644 nxcomp/PolySegment.cpp
 delete mode 100644 nxcomp/PolySegment.h
 delete mode 100644 nxcomp/PolyText16.cpp
 delete mode 100644 nxcomp/PolyText16.h
 delete mode 100644 nxcomp/PolyText8.cpp
 delete mode 100644 nxcomp/PolyText8.h
 delete mode 100644 nxcomp/Proxy.cpp
 delete mode 100644 nxcomp/Proxy.h
 delete mode 100644 nxcomp/ProxyReadBuffer.cpp
 delete mode 100644 nxcomp/ProxyReadBuffer.h
 delete mode 100644 nxcomp/PutImage.cpp
 delete mode 100644 nxcomp/PutImage.h
 delete mode 100644 nxcomp/PutPackedImage.cpp
 delete mode 100644 nxcomp/PutPackedImage.h
 delete mode 100644 nxcomp/QueryFontReply.cpp
 delete mode 100644 nxcomp/QueryFontReply.h
 delete mode 100644 nxcomp/ReadBuffer.cpp
 delete mode 100644 nxcomp/ReadBuffer.h
 delete mode 100644 nxcomp/RenderAddGlyphs.cpp
 delete mode 100644 nxcomp/RenderAddGlyphs.h
 delete mode 100644 nxcomp/RenderChangePicture.cpp
 delete mode 100644 nxcomp/RenderChangePicture.h
 delete mode 100644 nxcomp/RenderComposite.cpp
 delete mode 100644 nxcomp/RenderComposite.h
 delete mode 100644 nxcomp/RenderCompositeGlyphs.cpp
 delete mode 100644 nxcomp/RenderCompositeGlyphs.h
 delete mode 100644 nxcomp/RenderCreateGlyphSet.cpp
 delete mode 100644 nxcomp/RenderCreateGlyphSet.h
 delete mode 100644 nxcomp/RenderCreatePicture.cpp
 delete mode 100644 nxcomp/RenderCreatePicture.h
 delete mode 100644 nxcomp/RenderExtension.cpp
 delete mode 100644 nxcomp/RenderExtension.h
 delete mode 100644 nxcomp/RenderFillRectangles.cpp
 delete mode 100644 nxcomp/RenderFillRectangles.h
 delete mode 100644 nxcomp/RenderFreeGlyphSet.cpp
 delete mode 100644 nxcomp/RenderFreeGlyphSet.h
 delete mode 100644 nxcomp/RenderFreePicture.cpp
 delete mode 100644 nxcomp/RenderFreePicture.h
 delete mode 100644 nxcomp/RenderGenericRequest.cpp
 delete mode 100644 nxcomp/RenderGenericRequest.h
 delete mode 100644 nxcomp/RenderMinorExtensionHeaders.h
 delete mode 100644 nxcomp/RenderMinorExtensionMethods.h
 delete mode 100644 nxcomp/RenderMinorExtensionTags.h
 delete mode 100644 nxcomp/RenderPictureClip.cpp
 delete mode 100644 nxcomp/RenderPictureClip.h
 delete mode 100644 nxcomp/RenderPictureFilter.cpp
 delete mode 100644 nxcomp/RenderPictureFilter.h
 delete mode 100644 nxcomp/RenderPictureTransform.cpp
 delete mode 100644 nxcomp/RenderPictureTransform.h
 delete mode 100644 nxcomp/RenderTrapezoids.cpp
 delete mode 100644 nxcomp/RenderTrapezoids.h
 delete mode 100644 nxcomp/RenderTriangles.cpp
 delete mode 100644 nxcomp/RenderTriangles.h
 delete mode 100644 nxcomp/Rgb.cpp
 delete mode 100644 nxcomp/Rgb.h
 delete mode 100644 nxcomp/Rle.cpp
 delete mode 100644 nxcomp/Rle.h
 delete mode 100644 nxcomp/SendEvent.cpp
 delete mode 100644 nxcomp/SendEvent.h
 delete mode 100644 nxcomp/SequenceQueue.cpp
 delete mode 100644 nxcomp/SequenceQueue.h
 delete mode 100644 nxcomp/ServerCache.cpp
 delete mode 100644 nxcomp/ServerCache.h
 delete mode 100644 nxcomp/ServerChannel.cpp
 delete mode 100644 nxcomp/ServerChannel.h
 delete mode 100644 nxcomp/ServerProxy.cpp
 delete mode 100644 nxcomp/ServerProxy.h
 delete mode 100644 nxcomp/ServerReadBuffer.cpp
 delete mode 100644 nxcomp/ServerReadBuffer.h
 delete mode 100644 nxcomp/ServerStore.cpp
 delete mode 100644 nxcomp/ServerStore.h
 delete mode 100644 nxcomp/SetClipRectangles.cpp
 delete mode 100644 nxcomp/SetClipRectangles.h
 delete mode 100644 nxcomp/SetUnpackAlpha.cpp
 delete mode 100644 nxcomp/SetUnpackAlpha.h
 delete mode 100644 nxcomp/SetUnpackColormap.cpp
 delete mode 100644 nxcomp/SetUnpackColormap.h
 delete mode 100644 nxcomp/SetUnpackGeometry.cpp
 delete mode 100644 nxcomp/SetUnpackGeometry.h
 delete mode 100644 nxcomp/ShapeExtension.cpp
 delete mode 100644 nxcomp/ShapeExtension.h
 delete mode 100644 nxcomp/Socket.cpp
 delete mode 100644 nxcomp/Socket.h
 delete mode 100644 nxcomp/Split.cpp
 delete mode 100644 nxcomp/Split.h
 delete mode 100644 nxcomp/StaticCompressor.cpp
 delete mode 100644 nxcomp/StaticCompressor.h
 delete mode 100644 nxcomp/Statistics.cpp
 delete mode 100644 nxcomp/Statistics.h
 delete mode 100644 nxcomp/Timestamp.cpp
 delete mode 100644 nxcomp/Timestamp.h
 delete mode 100644 nxcomp/TranslateCoords.cpp
 delete mode 100644 nxcomp/TranslateCoords.h
 delete mode 100644 nxcomp/Transport.cpp
 delete mode 100644 nxcomp/Transport.h
 delete mode 100644 nxcomp/Types.h
 delete mode 100644 nxcomp/Unpack.cpp
 delete mode 100644 nxcomp/Unpack.h
 delete mode 100644 nxcomp/Vars.c
 delete mode 100644 nxcomp/Version.c
 delete mode 100644 nxcomp/WriteBuffer.cpp
 delete mode 100644 nxcomp/WriteBuffer.h
 delete mode 100644 nxcomp/XidCache.cpp
 delete mode 100644 nxcomp/XidCache.h
 delete mode 100644 nxcomp/Z.cpp
 delete mode 100644 nxcomp/Z.h
 create mode 100644 nxcomp/configure.ac
 delete mode 100644 nxcomp/configure.in
 create mode 100644 nxcomp/include/MD5.h
 create mode 100644 nxcomp/include/NX.h
 create mode 100644 nxcomp/include/NXalert.h
 create mode 100644 nxcomp/include/NXpack.h
 create mode 100644 nxcomp/include/NXproto.h
 create mode 100644 nxcomp/include/NXvars.h
 delete mode 100755 nxcomp/install-sh
 create mode 120000 nxcomp/m4/nx-macros.m4
 delete mode 100755 nxcomp/mkinstalldirs
 create mode 100644 nxcomp/src/ActionCache.cpp
 create mode 100644 nxcomp/src/ActionCache.h
 create mode 100644 nxcomp/src/Agent.cpp
 create mode 100644 nxcomp/src/Agent.h
 create mode 100644 nxcomp/src/Alpha.cpp
 create mode 100644 nxcomp/src/Alpha.h
 create mode 100644 nxcomp/src/Auth.cpp
 create mode 100644 nxcomp/src/Auth.h
 create mode 100644 nxcomp/src/Bitmap.cpp
 create mode 100644 nxcomp/src/Bitmap.h
 create mode 100644 nxcomp/src/BlockCache.cpp
 create mode 100644 nxcomp/src/BlockCache.h
 create mode 100644 nxcomp/src/BlockCacheSet.cpp
 create mode 100644 nxcomp/src/BlockCacheSet.h
 create mode 100644 nxcomp/src/ChangeGC.cpp
 create mode 100644 nxcomp/src/ChangeGC.h
 create mode 100644 nxcomp/src/ChangeProperty.cpp
 create mode 100644 nxcomp/src/ChangeProperty.h
 create mode 100644 nxcomp/src/Channel.cpp
 create mode 100644 nxcomp/src/Channel.h
 create mode 100644 nxcomp/src/ChannelCache.cpp
 create mode 100644 nxcomp/src/ChannelCache.h
 create mode 100644 nxcomp/src/ChannelEndPoint.cpp
 create mode 100644 nxcomp/src/ChannelEndPoint.h
 create mode 100644 nxcomp/src/ChannelStore.h
 create mode 100644 nxcomp/src/CharCache.cpp
 create mode 100644 nxcomp/src/CharCache.h
 create mode 100644 nxcomp/src/Children.cpp
 create mode 100644 nxcomp/src/ClearArea.cpp
 create mode 100644 nxcomp/src/ClearArea.h
 create mode 100644 nxcomp/src/ClientCache.cpp
 create mode 100644 nxcomp/src/ClientCache.h
 create mode 100644 nxcomp/src/ClientChannel.cpp
 create mode 100644 nxcomp/src/ClientChannel.h
 create mode 100644 nxcomp/src/ClientProxy.cpp
 create mode 100644 nxcomp/src/ClientProxy.h
 create mode 100644 nxcomp/src/ClientReadBuffer.cpp
 create mode 100644 nxcomp/src/ClientReadBuffer.h
 create mode 100644 nxcomp/src/ClientStore.cpp
 create mode 100644 nxcomp/src/ClientStore.h
 create mode 100644 nxcomp/src/Colormap.cpp
 create mode 100644 nxcomp/src/Colormap.h
 create mode 100644 nxcomp/src/ConfigureWindow.cpp
 create mode 100644 nxcomp/src/ConfigureWindow.h
 create mode 100644 nxcomp/src/Control.cpp
 create mode 100644 nxcomp/src/Control.h
 create mode 100644 nxcomp/src/CopyArea.cpp
 create mode 100644 nxcomp/src/CopyArea.h
 create mode 100644 nxcomp/src/CreateGC.cpp
 create mode 100644 nxcomp/src/CreateGC.h
 create mode 100644 nxcomp/src/CreatePixmap.cpp
 create mode 100644 nxcomp/src/CreatePixmap.h
 create mode 100644 nxcomp/src/DecodeBuffer.cpp
 create mode 100644 nxcomp/src/DecodeBuffer.h
 create mode 100644 nxcomp/src/EncodeBuffer.cpp
 create mode 100644 nxcomp/src/EncodeBuffer.h
 create mode 100644 nxcomp/src/FillPoly.cpp
 create mode 100644 nxcomp/src/FillPoly.h
 create mode 100644 nxcomp/src/Fork.cpp
 create mode 100644 nxcomp/src/Fork.h
 create mode 100644 nxcomp/src/FreeCache.h
 create mode 100644 nxcomp/src/GenericChannel.cpp
 create mode 100644 nxcomp/src/GenericChannel.h
 create mode 100644 nxcomp/src/GenericReadBuffer.cpp
 create mode 100644 nxcomp/src/GenericReadBuffer.h
 create mode 100644 nxcomp/src/GenericReply.cpp
 create mode 100644 nxcomp/src/GenericReply.h
 create mode 100644 nxcomp/src/GenericRequest.cpp
 create mode 100644 nxcomp/src/GenericRequest.h
 create mode 100644 nxcomp/src/GetImage.cpp
 create mode 100644 nxcomp/src/GetImage.h
 create mode 100644 nxcomp/src/GetImageReply.cpp
 create mode 100644 nxcomp/src/GetImageReply.h
 create mode 100644 nxcomp/src/GetProperty.cpp
 create mode 100644 nxcomp/src/GetProperty.h
 create mode 100644 nxcomp/src/GetPropertyReply.cpp
 create mode 100644 nxcomp/src/GetPropertyReply.h
 create mode 100644 nxcomp/src/ImageText16.cpp
 create mode 100644 nxcomp/src/ImageText16.h
 create mode 100644 nxcomp/src/ImageText8.cpp
 create mode 100644 nxcomp/src/ImageText8.h
 create mode 100644 nxcomp/src/IntCache.cpp
 create mode 100644 nxcomp/src/IntCache.h
 create mode 100644 nxcomp/src/InternAtom.cpp
 create mode 100644 nxcomp/src/InternAtom.h
 create mode 100644 nxcomp/src/Jpeg.cpp
 create mode 100644 nxcomp/src/Jpeg.h
 create mode 100644 nxcomp/src/Keeper.cpp
 create mode 100644 nxcomp/src/Keeper.h
 create mode 100644 nxcomp/src/List.cpp
 create mode 100644 nxcomp/src/List.h
 create mode 100644 nxcomp/src/ListFontsReply.cpp
 create mode 100644 nxcomp/src/ListFontsReply.h
 create mode 100644 nxcomp/src/Loop.cpp
 create mode 100644 nxcomp/src/MD5.c
 create mode 100644 nxcomp/src/Makefile.am
 create mode 100644 nxcomp/src/Message.cpp
 create mode 100644 nxcomp/src/Message.h
 create mode 100644 nxcomp/src/Misc.cpp
 create mode 100644 nxcomp/src/Misc.h
 create mode 100644 nxcomp/src/NXmitshm.h
 create mode 100644 nxcomp/src/NXrender.h
 create mode 100644 nxcomp/src/OpcodeCache.h
 create mode 100644 nxcomp/src/OpcodeStore.cpp
 create mode 100644 nxcomp/src/OpcodeStore.h
 create mode 100644 nxcomp/src/Pack.c
 create mode 100644 nxcomp/src/Pgn.cpp
 create mode 100644 nxcomp/src/Pgn.h
 create mode 100644 nxcomp/src/Pipe.cpp
 create mode 100644 nxcomp/src/Pipe.h
 create mode 100644 nxcomp/src/PolyArc.cpp
 create mode 100644 nxcomp/src/PolyArc.h
 create mode 100644 nxcomp/src/PolyFillArc.cpp
 create mode 100644 nxcomp/src/PolyFillArc.h
 create mode 100644 nxcomp/src/PolyFillRectangle.cpp
 create mode 100644 nxcomp/src/PolyFillRectangle.h
 create mode 100644 nxcomp/src/PolyLine.cpp
 create mode 100644 nxcomp/src/PolyLine.h
 create mode 100644 nxcomp/src/PolyPoint.cpp
 create mode 100644 nxcomp/src/PolyPoint.h
 create mode 100644 nxcomp/src/PolySegment.cpp
 create mode 100644 nxcomp/src/PolySegment.h
 create mode 100644 nxcomp/src/PolyText16.cpp
 create mode 100644 nxcomp/src/PolyText16.h
 create mode 100644 nxcomp/src/PolyText8.cpp
 create mode 100644 nxcomp/src/PolyText8.h
 create mode 100644 nxcomp/src/Proxy.cpp
 create mode 100644 nxcomp/src/Proxy.h
 create mode 100644 nxcomp/src/ProxyReadBuffer.cpp
 create mode 100644 nxcomp/src/ProxyReadBuffer.h
 create mode 100644 nxcomp/src/PutImage.cpp
 create mode 100644 nxcomp/src/PutImage.h
 create mode 100644 nxcomp/src/PutPackedImage.cpp
 create mode 100644 nxcomp/src/PutPackedImage.h
 create mode 100644 nxcomp/src/QueryFontReply.cpp
 create mode 100644 nxcomp/src/QueryFontReply.h
 create mode 100644 nxcomp/src/ReadBuffer.cpp
 create mode 100644 nxcomp/src/ReadBuffer.h
 create mode 100644 nxcomp/src/RenderAddGlyphs.cpp
 create mode 100644 nxcomp/src/RenderAddGlyphs.h
 create mode 100644 nxcomp/src/RenderChangePicture.cpp
 create mode 100644 nxcomp/src/RenderChangePicture.h
 create mode 100644 nxcomp/src/RenderComposite.cpp
 create mode 100644 nxcomp/src/RenderComposite.h
 create mode 100644 nxcomp/src/RenderCompositeGlyphs.cpp
 create mode 100644 nxcomp/src/RenderCompositeGlyphs.h
 create mode 100644 nxcomp/src/RenderCreateGlyphSet.cpp
 create mode 100644 nxcomp/src/RenderCreateGlyphSet.h
 create mode 100644 nxcomp/src/RenderCreatePicture.cpp
 create mode 100644 nxcomp/src/RenderCreatePicture.h
 create mode 100644 nxcomp/src/RenderExtension.cpp
 create mode 100644 nxcomp/src/RenderExtension.h
 create mode 100644 nxcomp/src/RenderFillRectangles.cpp
 create mode 100644 nxcomp/src/RenderFillRectangles.h
 create mode 100644 nxcomp/src/RenderFreeGlyphSet.cpp
 create mode 100644 nxcomp/src/RenderFreeGlyphSet.h
 create mode 100644 nxcomp/src/RenderFreePicture.cpp
 create mode 100644 nxcomp/src/RenderFreePicture.h
 create mode 100644 nxcomp/src/RenderGenericRequest.cpp
 create mode 100644 nxcomp/src/RenderGenericRequest.h
 create mode 100644 nxcomp/src/RenderMinorExtensionHeaders.h
 create mode 100644 nxcomp/src/RenderMinorExtensionMethods.h
 create mode 100644 nxcomp/src/RenderMinorExtensionTags.h
 create mode 100644 nxcomp/src/RenderPictureClip.cpp
 create mode 100644 nxcomp/src/RenderPictureClip.h
 create mode 100644 nxcomp/src/RenderPictureFilter.cpp
 create mode 100644 nxcomp/src/RenderPictureFilter.h
 create mode 100644 nxcomp/src/RenderPictureTransform.cpp
 create mode 100644 nxcomp/src/RenderPictureTransform.h
 create mode 100644 nxcomp/src/RenderTrapezoids.cpp
 create mode 100644 nxcomp/src/RenderTrapezoids.h
 create mode 100644 nxcomp/src/RenderTriangles.cpp
 create mode 100644 nxcomp/src/RenderTriangles.h
 create mode 100644 nxcomp/src/Rgb.cpp
 create mode 100644 nxcomp/src/Rgb.h
 create mode 100644 nxcomp/src/Rle.cpp
 create mode 100644 nxcomp/src/Rle.h
 create mode 100644 nxcomp/src/SendEvent.cpp
 create mode 100644 nxcomp/src/SendEvent.h
 create mode 100644 nxcomp/src/SequenceQueue.cpp
 create mode 100644 nxcomp/src/SequenceQueue.h
 create mode 100644 nxcomp/src/ServerCache.cpp
 create mode 100644 nxcomp/src/ServerCache.h
 create mode 100644 nxcomp/src/ServerChannel.cpp
 create mode 100644 nxcomp/src/ServerChannel.h
 create mode 100644 nxcomp/src/ServerProxy.cpp
 create mode 100644 nxcomp/src/ServerProxy.h
 create mode 100644 nxcomp/src/ServerReadBuffer.cpp
 create mode 100644 nxcomp/src/ServerReadBuffer.h
 create mode 100644 nxcomp/src/ServerStore.cpp
 create mode 100644 nxcomp/src/ServerStore.h
 create mode 100644 nxcomp/src/SetClipRectangles.cpp
 create mode 100644 nxcomp/src/SetClipRectangles.h
 create mode 100644 nxcomp/src/SetUnpackAlpha.cpp
 create mode 100644 nxcomp/src/SetUnpackAlpha.h
 create mode 100644 nxcomp/src/SetUnpackColormap.cpp
 create mode 100644 nxcomp/src/SetUnpackColormap.h
 create mode 100644 nxcomp/src/SetUnpackGeometry.cpp
 create mode 100644 nxcomp/src/SetUnpackGeometry.h
 create mode 100644 nxcomp/src/ShapeExtension.cpp
 create mode 100644 nxcomp/src/ShapeExtension.h
 create mode 100644 nxcomp/src/Socket.cpp
 create mode 100644 nxcomp/src/Socket.h
 create mode 100644 nxcomp/src/Split.cpp
 create mode 100644 nxcomp/src/Split.h
 create mode 100644 nxcomp/src/StaticCompressor.cpp
 create mode 100644 nxcomp/src/StaticCompressor.h
 create mode 100644 nxcomp/src/Statistics.cpp
 create mode 100644 nxcomp/src/Statistics.h
 create mode 100644 nxcomp/src/Timestamp.cpp
 create mode 100644 nxcomp/src/Timestamp.h
 create mode 100644 nxcomp/src/TranslateCoords.cpp
 create mode 100644 nxcomp/src/TranslateCoords.h
 create mode 100644 nxcomp/src/Transport.cpp
 create mode 100644 nxcomp/src/Transport.h
 create mode 100644 nxcomp/src/Types.h
 create mode 100644 nxcomp/src/Unpack.cpp
 create mode 100644 nxcomp/src/Unpack.h
 create mode 100644 nxcomp/src/Vars.c
 create mode 100644 nxcomp/src/Version.c
 create mode 100644 nxcomp/src/WriteBuffer.cpp
 create mode 100644 nxcomp/src/WriteBuffer.h
 create mode 100644 nxcomp/src/XidCache.cpp
 create mode 100644 nxcomp/src/XidCache.h
 create mode 100644 nxcomp/src/Z.cpp
 create mode 100644 nxcomp/src/Z.h

(limited to 'nxcomp')

diff --git a/Makefile b/Makefile
index d38015a00..2b4e5dfbd 100644
--- a/Makefile
+++ b/Makefile
@@ -54,14 +54,7 @@ all:
 test:
 	echo "No testing for NX (redistributed)"
 
-build-lite:
-	cd nxcomp && autoconf && (${CONFIGURE}) && ${MAKE}
-	cd nxproxy && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE}
-
-build-full:
-# in the full case, we rely on "magic" in the nx-X11 imake-based makefiles...
-	cd nxcomp && autoconf && (${CONFIGURE}) && ${MAKE}
-
+build-env:
 	# prepare nx-X11/config/cf/nxversion.def
 	sed \
 	    -e 's/###NX_VERSION_MAJOR###/$(NX_VERSION_MAJOR)/' \
@@ -74,6 +67,13 @@ build-full:
 	# prepare Makefiles and the nx-X11 symlinking magic
 	cd nx-X11 && make BuildEnv FONT_DEFINES=$(FONT_DEFINES)
 
+build-lite:
+	cd nxcomp && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE}
+	cd nxproxy && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE}
+
+build-full: build-env
+# in the full case, we rely on "magic" in the nx-X11 imake-based makefiles...
+	cd nxcomp && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE}
 	# build libNX_X11 and libNX_Xext prior to building
 	# nxcomp{ext,shad}.
 	cd nx-X11/lib && make
diff --git a/debian/libxcomp-dev.install b/debian/libxcomp-dev.install
index e27e6ecf0..f73422f40 100644
--- a/debian/libxcomp-dev.install
+++ b/debian/libxcomp-dev.install
@@ -1,4 +1,5 @@
 usr/lib/*/libXcomp.so
+usr/lib/*/libXcomp.a
 usr/include/*/nx/NX.h
 usr/include/*/nx/NXalert.h
 usr/include/*/nx/NXpack.h
diff --git a/debian/rules b/debian/rules
index b59ba83a5..13490a86c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,7 @@ override_dh_clean:
 override_dh_install:
 
 	# remove static libs
-	rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcomp.a
+	rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcomp.la
 	rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcompshad.la
 
 	# remove extras, GL, and other unneeded headers
diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile
index 5b289fae8..a6471bff1 100644
--- a/nx-X11/lib/X11/Imakefile
+++ b/nx-X11/lib/X11/Imakefile
@@ -36,9 +36,9 @@ BuildIncludes($(HEADERS),IncSubdir,..)
 #if NXLibraries
 
 #ifdef SunArchitecture
-NX_INCLUDES = -I../../../nxcomp -I/usr/sfw/include
+NX_INCLUDES = -I../../../nxcomp/include -I/usr/sfw/include
 #else
-NX_INCLUDES = -I../../../nxcomp
+NX_INCLUDES = -I../../../nxcomp/include
 #endif
 
 NX_DEFINES = -DNX_TRANS_SOCKET \
@@ -81,7 +81,7 @@ NX_XCOMPLIBNAME   = libXcomp.so
 NX_XCOMPEXTLIBNAME   = libXcompext.so
 #endif
 
-NX_XCOMPLIBDIR    = $(XTOP)/../nxcomp
+NX_XCOMPLIBDIR    = $(XTOP)/../nxcomp/src/.libs
 NX_XCOMPLIBLINK   = Xcomp
 NX_XCOMPLIBTARGET = $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME)
 NX_REQUIREDLIBS   = -L$(NX_XCOMPLIBDIR) -l$(NX_XCOMPLIBLINK)
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index ed49313ee..3c7e68597 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -213,12 +213,12 @@ NXAGENTDDXDIR = hw
 NXAGENTDIRS = $(STDDIRS) $(FBDIR) $(MIDAMAGEDIR) $(NXAGENTDDXDIR) $(DEPDIRS)
 
 NX_XCOMP_HEADERS = \
-              ../../../nxcomp/MD5.h             \
-              ../../../nxcomp/NXalert.h         \
-              ../../../nxcomp/NX.h              \
-              ../../../nxcomp/NXpack.h          \
-              ../../../nxcomp/NXproto.h         \
-              ../../../nxcomp/NXvars.h          \
+              ../../../nxcomp/include/MD5.h             \
+              ../../../nxcomp/include/NXalert.h         \
+              ../../../nxcomp/include/NX.h              \
+              ../../../nxcomp/include/NXpack.h          \
+              ../../../nxcomp/include/NXproto.h         \
+              ../../../nxcomp/include/NXvars.h          \
               $(NULL)
 
 NX_XCOMPSHAD_HEADERS =                                  \
@@ -315,7 +315,7 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS)
 
 #if defined(SunArchitecture)
 NXAGENTNXLIBS = -L/usr/sfw/lib \
-                -L../../../nxcomp  \
+                -L../../../nxcomp/src/.libs  \
                 -L../../../nxcompshad/src/.libs \
                 -lrt \
                 -lXcomp \
@@ -330,7 +330,7 @@ NXAGENTNXLIBS = -L/usr/sfw/lib \
                 -lXext \
                 $(NULL)
 #elif defined(cygwinArchitecture)
-NXAGENTNXLIBS = -L../../../nxcomp  \
+NXAGENTNXLIBS = -L../../../nxcomp/src/.libs \
                 -L../../../nxcompshad/src/.libs \
                 -lXcomp \
                 -lXcompshad \
@@ -343,7 +343,7 @@ NXAGENTNXLIBS = -L../../../nxcomp  \
                 -lXext \
                 $(NULL)
 #elif defined(OpenBSDArchitecture)
-NXAGENTNXLIBS = -L../../../nxcomp  \
+NXAGENTNXLIBS = -L../../../nxcomp/src/.libs  \
                 -L../../../nx-X11/exports/lib \
                 -L../../../nxcompshad/src/.libs \
                 -lkvm \
@@ -359,7 +359,7 @@ NXAGENTNXLIBS = -L../../../nxcomp  \
                 -lXext \
                 $(NULL)
 #else
-NXAGENTNXLIBS = -L../../../nxcomp  \
+NXAGENTNXLIBS = -L../../../nxcomp/src/.libs  \
                 -L../../../nxcompshad/src/.libs \
                 -lXcomp \
                 -lXcompshad \
diff --git a/nxcomp/.gitignore b/nxcomp/.gitignore
index 27a99e5b2..a148dfa93 100644
--- a/nxcomp/.gitignore
+++ b/nxcomp/.gitignore
@@ -1,2 +1,23 @@
-nxcomp.pc
 Makefile
+Makefile.in
+aclocal.m4
+compile
+config.guess
+config.sub
+depcomp
+install-sh
+ltmain.sh
+missing
+config.h
+config.h.in
+libtool
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+nxcomp.pc
+src/.deps/
+src/Makefile
+src/Makefile.in
+stamp-h1
diff --git a/nxcomp/ActionCache.cpp b/nxcomp/ActionCache.cpp
deleted file mode 100644
index 8ad7f7ba2..000000000
--- a/nxcomp/ActionCache.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "Control.h"
-
-#include "ActionCache.h"
-
-ActionCache::ActionCache()
-{
-  for (int i = 0; i < 256; i++)
-  {
-    base_[i] = new IntCache(8);
-  }
-
-  slot_ = 0;
-  last_ = 0;
-}
-
-ActionCache::~ActionCache()
-{
-  for (int i = 0; i < 256; i++)
-  {
-    delete base_[i];
-  }
-}
diff --git a/nxcomp/ActionCache.h b/nxcomp/ActionCache.h
deleted file mode 100644
index 2aedd4a07..000000000
--- a/nxcomp/ActionCache.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef ActionCache_H
-#define ActionCache_H
-
-#include "IntCache.h"
-
-class ActionCache
-{
-  friend class EncodeBuffer;
-  friend class DecodeBuffer;
-  
-  public:
-
-  ActionCache();
-  ~ActionCache();
-
-  private:
-
-  IntCache *base_[256];
-
-  unsigned int slot_;
-  unsigned short last_;
-};
-
-#endif /* ActionCache_H */
diff --git a/nxcomp/Agent.cpp b/nxcomp/Agent.cpp
deleted file mode 100644
index cd65101b3..000000000
--- a/nxcomp/Agent.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "Misc.h"
-#include "Agent.h"
-#include "Proxy.h"
-
-extern Proxy *proxy;
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-Agent::Agent(int fd[2])
-{
-  remoteFd_ = fd[0];
-  localFd_  = fd[1];
-
-  transport_ = new AgentTransport(localFd_);
-
-  if (transport_ == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "Agent: PANIC! Can't create the memory-to-memory transport "
-            << "for FD#" << localFd_ << ".\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Can't create the memory-to-memory transport "
-         << "for FD#" << localFd_ << ".\n";
-
-    HandleCleanup();
-  }
-
-  FD_ZERO(&saveRead_);
-  FD_ZERO(&saveWrite_);
-
-  canRead_ = 0;
-
-  #ifdef DEBUG
-  *logofs << "Agent: Created agent object at " << this
-          << ".\n" << logofs_flush;
-  #endif
-}
-
-Agent::~Agent()
-{
-  delete transport_;
-
-  #ifdef DEBUG
-  *logofs << "Agent: Deleted agent object at " << this
-          << ".\n" << logofs_flush;
-  #endif
-}
diff --git a/nxcomp/Agent.h b/nxcomp/Agent.h
deleted file mode 100644
index 3e1a50ae5..000000000
--- a/nxcomp/Agent.h
+++ /dev/null
@@ -1,263 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef Agent_H
-#define Agent_H
-
-#include <unistd.h>
-
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/select.h>
-
-#include "Misc.h"
-#include "Transport.h"
-#include "Proxy.h"
-
-extern Proxy *proxy;
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-class Agent
-{
-  public:
-
-  //
-  // Must be created by passing the fake descriptor that
-  // will be used for simulating socket communication
-  // betwen the agent and the proxy. I/O will take place
-  // by copying data to the agent's read and write buf-
-  // fers.
-  //
-
-  Agent(int fd[2]);
-
-  ~Agent();
-
-  AgentTransport *getTransport() const
-  {
-    return transport_;
-  }
-
-  void saveReadMask(fd_set *readSet)
-  {
-    saveRead_ = *readSet;
-  }
-
-  void saveWriteMask(fd_set *writeSet)
-  {
-    saveWrite_ = *writeSet;
-  }
-
-  void clearReadMask(fd_set *readSet)
-  {
-    FD_CLR(remoteFd_, readSet);
-    FD_CLR(localFd_,  readSet);
-  }
-
-  void clearWriteMask(fd_set *writeSet)
-  {
-    FD_CLR(remoteFd_, writeSet);
-    FD_CLR(localFd_,  writeSet);
-  }
-
-  void setLocalRead(fd_set *readSet, int *result)
-  {
-    (*result)++;
-
-    FD_SET(localFd_, readSet);
-  }
-
-  void setRemoteRead(fd_set *readSet, int *result)
-  {
-    (*result)++;
-
-    FD_SET(remoteFd_, readSet);
-  }
-
-  void setRemoteWrite(fd_set *writeSet, int *result)
-  {
-    (*result)++;
-
-    FD_SET(remoteFd_, writeSet);
-  }
-
-  fd_set *getSavedReadMask()
-  {
-    return &saveRead_;
-  }
-
-  fd_set *getSavedWriteMask()
-  {
-    return &saveWrite_;
-  }
-
-  int getRemoteFd() const
-  {
-    return remoteFd_;
-  }
-
-  int getLocalFd() const
-  {
-    return localFd_;
-  }
-
-  int getProxyFd() const
-  {
-    return proxy -> getFd();
-  }
-
-  int isValid() const
-  {
-    return (transport_ != NULL);
-  }
-
-  int localReadable()
-  {
-    return (transport_ -> readable() != 0);
-  }
-
-  //
-  // Check if we can process more data from
-  // the agent descriptor and cache the result
-  // to avoid multiple calls. This must be
-  // always called before querying the other
-  // functions.
-  //
-
-  void saveChannelState()
-  {
-    canRead_ = (proxy != NULL ? proxy -> canRead(localFd_) : 0);
-  }
-
-  int remoteCanRead(const fd_set * const readSet)
-  {
-    // OS X 10.5 requires the second argument to be non-const, so copy readSet.
-    // It's safe though, as FD_ISSET does not operate on it.
-    fd_set readWorkSet = *readSet;
-
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Agent: remoteCanRead() is " <<
-               (FD_ISSET(remoteFd_, &readWorkSet) && transport_ -> dequeuable() != 0)
-            << " with FD_ISSET() " << (int) FD_ISSET(remoteFd_, &readWorkSet)
-            << " and dequeuable " << transport_ -> dequeuable()
-            << ".\n" << logofs_flush;
-    #endif
-
-    return (FD_ISSET(remoteFd_, &readWorkSet) &&
-                transport_ -> dequeuable() != 0);
-  }
-
-  int remoteCanWrite(const fd_set * const writeSet)
-  {
-    // OS X 10.5 requires the second argument to be non-const, so copy writeSet.
-    // It's safe though, as FD_ISSET does not operate on it.
-    fd_set writeWorkSet = *writeSet;
-
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Agent: remoteCanWrite() is " <<
-               (FD_ISSET(remoteFd_, &writeWorkSet) && transport_ ->
-               queuable() != 0 && canRead_ == 1) << " with FD_ISSET() "
-            << (int) FD_ISSET(remoteFd_, &writeWorkSet) << " queueable "
-            << transport_ -> queuable() << " channel can read "
-            << canRead_ << ".\n" << logofs_flush;
-    #endif
-
-    return (FD_ISSET(remoteFd_, &writeWorkSet) &&
-                transport_ -> queuable() != 0 &&
-                    canRead_ == 1);
-  }
-
-  int localCanRead()
-  {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Agent: localCanRead() is " <<
-               (transport_ -> readable() != 0 && canRead_ == 1)
-            << " with readable " << transport_ -> readable()
-            << " channel can read " << canRead_ << ".\n"
-            << logofs_flush;
-    #endif
-
-    return (transport_ -> readable() != 0 &&
-                canRead_ == 1);
-  }
-
-  int proxyCanRead()
-  {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Agent: proxyCanRead() is " << proxy -> canRead()
-            << ".\n" << logofs_flush;
-    #endif
-
-    return (proxy -> canRead());
-  }
-
-  int proxyCanRead(const fd_set * const readSet)
-  {
-    // OS X 10.5 requires the second argument to be non-const, so copy readSet.
-    // It's safe though, as FD_ISSET does not operate on it.
-    fd_set readWorkSet = *readSet;
-
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Agent: proxyCanRead() is "
-            << ((int) FD_ISSET(proxy -> getFd(), &readWorkSet))
-            << ".\n" << logofs_flush;
-    #endif
-
-    return (FD_ISSET(proxy -> getFd(), &readWorkSet));
-  }
-
-  int enqueueData(const char *data, const int size) const
-  {
-    return transport_ -> enqueue(data, size);
-  }
-
-  int dequeueData(char *data, int size) const
-  {
-    return transport_ -> dequeue(data, size);
-  }
-
-  int dequeuableData() const
-  {
-    return transport_ -> dequeuable();
-  }
-
-  private:
-
-  int remoteFd_;
-  int localFd_;
-
-  fd_set saveRead_;
-  fd_set saveWrite_;
-
-  int canRead_;
-
-  AgentTransport *transport_;
-};
-
-#endif /* Agent_H */
diff --git a/nxcomp/Alpha.cpp b/nxcomp/Alpha.cpp
deleted file mode 100644
index 31a31f7cb..000000000
--- a/nxcomp/Alpha.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "Misc.h"
-#include "Unpack.h"
-#include "Alpha.h"
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-int UnpackAlpha(unsigned char method, unsigned char *src_data, int src_size,
-                    unsigned char *dst_data, int dst_size)
-{
-  if (*src_data == 0)
-  {
-    if (dst_size != src_size - 1)
-    {
-      #ifdef TEST
-      *logofs << "UnpackAlpha: PANIC! Invalid destination size "
-              << dst_size << " with source " << src_size
-              << ".\n" << logofs_flush;
-      #endif
-
-      return -1;
-    }
-
-    #ifdef TEST
-    *logofs << "UnpackAlpha: Expanding " << src_size - 1
-            << " bytes of plain alpha data.\n" << logofs_flush;
-    #endif
-
-    memcpy(dst_data, src_data + 1, src_size - 1);
-
-    return 1;
-  }
-
-  unsigned int check_size = dst_size;
-
-  int result = ZDecompress(&unpackStream, dst_data, &check_size,
-                               src_data + 1, src_size - 1);
-
-  if (result != Z_OK)
-  {
-    #ifdef PANIC
-    *logofs << "UnpackAlpha: PANIC! Failure decompressing alpha data. "
-            << "Error is '" << zError(result) << "'.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Failure decompressing alpha data. "
-         << "Error is '" << zError(result) << "'.\n";
-
-    return -1;
-  }
-  else if (check_size != (unsigned int) dst_size)
-  {
-    #ifdef PANIC
-    *logofs << "UnpackAlpha: PANIC! Size mismatch in alpha data. "
-            << "Resulting size is " << check_size << " with "
-            << "expected size " << dst_size << ".\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Size mismatch in alpha data. "
-         << "Resulting size is " << check_size << " with "
-         << "expected size " << dst_size << ".\n";
-
-    return -1;
-  }
-
-  #ifdef TEST
-  *logofs << "UnpackAlpha: Decompressed " << src_size - 1
-          << " bytes to " << dst_size << " bytes of alpha data.\n"
-          << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int UnpackAlpha(T_alpha *alpha, unsigned char *dst_data,
-                    int dst_size, int big_endian)
-{
-  unsigned int count = dst_size >> 2;
-
-  unsigned int i;
-
-  int shift;
-
-  if (count != alpha -> entries)
-  {
-    #ifdef WARNING
-    *logofs << "UnpackAlpha: WARNING! Not applying the alpha with "
-            << count << " elements needed and " << alpha -> entries
-            << " available.\n" << logofs_flush;
-    #endif
-
-    return 0;
-  }
-
-  shift = (big_endian == 1 ? 0 : 3);
-  
-  for (i = 0; i < count; i++)
-  {
-    *(dst_data + shift) = *(alpha -> data + i);
-
-    dst_data += 4;
-  }
-
-  return 1;
-}
diff --git a/nxcomp/Alpha.h b/nxcomp/Alpha.h
deleted file mode 100644
index ea5068812..000000000
--- a/nxcomp/Alpha.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef Alpha_H
-#define Alpha_H
-
-int UnpackAlpha(unsigned char method, unsigned char *src_data, int src_size,
-                    unsigned char *dst_data, int dst_size);
-
-int UnpackAlpha(T_alpha *alpha, unsigned char *dst_data,
-                    int dst_size, int big_endian);
-
-#endif /* Aplha_H */
diff --git a/nxcomp/Auth.cpp b/nxcomp/Auth.cpp
deleted file mode 100644
index bc047aa30..000000000
--- a/nxcomp/Auth.cpp
+++ /dev/null
@@ -1,667 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "Auth.h"
-
-#include "Misc.h"
-#include "Control.h"
-#include "Timestamp.h"
-#include "Pipe.h"
-
-#define DEFAULT_STRING_LIMIT  512
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-//
-// Store the provided cookie as our 'fake' cookie, then
-// read the 'real' cookie from the current X authority
-// file. 
-//
-
-Auth::Auth(char *display, char *cookie)
-{
-  display_ = NULL;
-
-  file_ = NULL;
-
-  last_ = nullTimestamp();
-
-  fakeCookie_ = NULL;
-  realCookie_ = NULL;
-
-  fakeData_ = NULL;
-  realData_ = NULL;
-
-  dataSize_ = 0;
-
-  generatedCookie_ = 0;
-
-  if (display == NULL || *display == '\0' || cookie == NULL ||
-          *cookie == '\0' || strlen(cookie) != 32)
-  {
-    #ifdef PANIC
-    *logofs << "Auth: PANIC! Can't create the X authorization data "
-            << "with cookie '" << cookie << "' and display '"
-            << display << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Can't create the X authorization data "
-         << "with cookie '" << cookie << "' and display '"
-         << display << "'.\n";
-
-    return;
-  }
-
-  #ifdef TEST
-  *logofs << "Auth: Creating X authorization data with cookie '"
-          << cookie << "' and display '" << display << "'.\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // Get a local copy of all parameters.
-  //
-
-  display_ = new char[strlen(display) + 1];
-  file_    = new char[DEFAULT_STRING_LIMIT];
-
-  fakeCookie_ = new char[strlen(cookie) + 1];
-  realCookie_ = new char[DEFAULT_STRING_LIMIT];
-
-  if (display_ == NULL || file_ == NULL ||
-          fakeCookie_ == NULL || realCookie_ == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "Auth: PANIC! Cannot allocate memory for the X "
-            << "authorization data.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Cannot allocate memory for the X "
-         << "authorization data.\n";
-
-    return;
-  }
-
-  strcpy(display_, display);
-
-  *file_ = '\0';
-
-  strcpy(fakeCookie_, cookie);
-
-  *realCookie_ = '\0';
-
-  //
-  // Get the real cookie from the authorization file.
-  //
-
-  updateCookie();
-}
-
-Auth::~Auth()
-{
-  delete [] display_;
-  delete [] file_;
-
-  delete [] fakeCookie_;
-  delete [] realCookie_;
-
-  delete [] fakeData_;
-  delete [] realData_;
-}
-
-//
-// At the present moment the cookie is read only once,
-// at the time the instance is initialized. If the auth
-// file changes along the life of the session, the old
-// cookie will be used. This works with X servers beca-
-// use of an undocumented "feature". See nx-X11.
-//
-
-int Auth::updateCookie()
-{
-  if (isTimestamp(last_) == 0)
-  {
-    #ifdef TEST
-    *logofs << "Auth: Reading the X authorization file "
-            << "with last update at " << strMsTimestamp(last_)
-            << ".\n" << logofs_flush;
-    #endif
-
-    if (getCookie() == 1 && validateCookie() == 1)
-    {
-      //
-      // It should rather be the modification time
-      // the auth file, so we can read it again if
-      // the file is changed.
-      //
-
-      #ifdef TEST
-      *logofs << "Auth: Setting last X authorization file "
-              << "update at " << strMsTimestamp() << ".\n"
-              << logofs_flush;
-      #endif
-
-      last_ = getTimestamp();
-
-      return 1;
-    }
-
-    #ifdef PANIC
-    *logofs << "Auth: PANIC! Cannot read the cookie from the X "
-            << "authorization file.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Cannot read the cookie from the X "
-         << "authorization file.\n";
-
-    return -1;
-  }
-
-  #ifdef TEST
-  *logofs << "Auth: WARNING! Skipping check on the X "
-          << "authorization file.\n" << logofs_flush;
-  #endif
-
-  return 0;
-}
-
-int Auth::getCookie()
-{
-  //
-  // Check the name of the auth file that we are going to use.
-  // It can be either the value of the XAUTHORITY environment
-  // or the default .Xauthority file in the user's home.
-  //
-
-  char *environment;
-
-  environment = getenv("XAUTHORITY");
-
-  if (environment != NULL && *environment != '\0')
-  {
-    strncpy(file_, environment, DEFAULT_STRING_LIMIT - 1);
-  }
-  else
-  {
-    snprintf(file_, DEFAULT_STRING_LIMIT - 1, "%s/.Xauthority",
-                 control -> HomePath);
-  }
-
-  *(file_ + DEFAULT_STRING_LIMIT - 1) = '\0';
-
-  #ifdef TEST
-  *logofs << "Auth: Using X authorization file '" << file_
-          << "'.\n" << logofs_flush;
-  #endif
-
-  //
-  // Use the nxauth command on Windows and the Mac, xauth
-  // on all the other platforms. On Windows we assume that
-  // the nxauth command is located under bin in the client
-  // installation directory. On Mac OS X we assume that the
-  // command is located directly in the client installation
-  // directory, to make bundle shipping easier. On all the
-  // other platforms we use the default xauth command that
-  // is in our path.
-  //
-
-  char command[DEFAULT_STRING_LIMIT];
-
-  #if defined(__CYGWIN32__)
-
-  snprintf(command, DEFAULT_STRING_LIMIT - 1,
-               "%s/bin/nxauth", control -> SystemPath);
-
-  *(command + DEFAULT_STRING_LIMIT - 1) = '\0';
-
-  #elif defined(__APPLE__)
-
-  snprintf(command, DEFAULT_STRING_LIMIT - 1,
-               "%s/nxauth", control -> SystemPath);
-
-  *(command + DEFAULT_STRING_LIMIT - 1) = '\0';
-
-  #else
-
-  strcpy(command, "xauth");
-
-  #endif
-
-  #ifdef TEST
-  *logofs << "Auth: Using X auth command '" << command
-          << "'.\n" << logofs_flush;
-  #endif
-
-  //
-  // The SSH code forces using the unix:n port when passing localhost:n.
-  // This is probably because localhost:n can fail to return a valid
-  // entry on machines where the hostname for localhost doesn't match
-  // exactly the 'localhost' string. For example, on a freshly installed
-  // Fedora Core 3 I get a 'localhost.localdomain/unix:0' entry. Query-
-  // ing 'xauth list localhost:0' results in an empty result, while the
-  // query 'xauth list unix:0' works as expected. Note anyway that if
-  // the cookie for the TCP connection on 'localhost' is set to a dif-
-  // ferent cookie than the one for the Unix connections, both SSH and
-  // NX will match the wrong cookie and session will fail.
-  //
-  
-  char line[DEFAULT_STRING_LIMIT];
-
-  if (strncmp(display_, "localhost:", 10) == 0)
-  {
-    snprintf(line, DEFAULT_STRING_LIMIT, "unix:%s", display_ + 10);
-  }
-  else
-  {
-    snprintf(line, DEFAULT_STRING_LIMIT, "%.200s", display_);
-  }
-
-  const char *parameters[256];
-
-  parameters[0] = command;
-  parameters[1] = command;
-  parameters[2] = "-f";
-  parameters[3] = file_;
-  parameters[4] = "list";
-  parameters[5] = line;
-  parameters[6] = NULL;
-
-  #ifdef TEST
-  *logofs << "Auth: Executing command ";
-
-  for (int i = 0; i < 256 && parameters[i] != NULL; i++)
-  {
-    *logofs << "[" << parameters[i] << "]";
-  }
-
-  *logofs << ".\n" << logofs_flush;
-  #endif
-
-  //
-  // Use the popen() function to read the result
-  // of the command. We would better use our own
-  // implementation.
-  //
-
-  FILE *data = Popen((char *const *) parameters, "r");
-
-  int result = -1;
-
-  if (data == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "Auth: PANIC! Failed to execute the X auth command.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Failed to execute the X auth command.\n";
-
-    goto AuthGetCookieResult;
-  }
-
-  if (fgets(line, DEFAULT_STRING_LIMIT, data) == NULL)
-  {
-    #ifdef WARNING
-    *logofs << "Auth: WARNING! Failed to read data from the X "
-            << "auth command.\n" << logofs_flush;
-    #endif
-
-    #ifdef TEST
-    cerr << "Warning" << ": Failed to read data from the X "
-         << "auth command.\n";
-    #endif
-
-    #ifdef PANIC
-    *logofs << "Auth: WARNING! Generating a fake cookie for "
-            << "X authentication.\n" << logofs_flush;
-    #endif
-
-    #ifdef TEST
-    cerr << "Warning" << ": Generating a fake cookie for "
-         << "X authentication.\n";
-    #endif
-
-    generateCookie(realCookie_);
-  }
-  else
-  {
-    #ifdef TEST
-    *logofs << "Auth: Checking cookie in string '" << line
-            << "'.\n" << logofs_flush;
-    #endif
-
-    // 
-    // Skip the hostname in the authority entry
-    // just in case it includes some white spaces.
-    //
-
-    char *cookie = NULL;
-
-    cookie = index(line, ':');
-
-    if (cookie == NULL)
-    {
-      cookie = line;
-    }
-
-    if (sscanf(cookie, "%*s %*s %511s", realCookie_) != 1)
-    {
-      #ifdef PANIC
-      *logofs << "Auth: PANIC! Failed to identify the cookie "
-              << "in string '" << line << "'.\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Failed to identify the cookie "
-           << "in string '" << line << "'.\n";
-
-      goto AuthGetCookieResult;
-    }
-
-    #ifdef TEST
-    *logofs << "Auth: Got cookie '" << realCookie_
-            << "' from file '" << file_ << "'.\n"
-            << logofs_flush;
-    #endif
-  }
-
-  result = 1;
-
-AuthGetCookieResult:
-
-  if (data != NULL)
-  {
-    Pclose(data);
-  }
-
-  return result;
-}
-
-int Auth::validateCookie()
-{
-  unsigned int length = strlen(realCookie_);
-
-  if (length > DEFAULT_STRING_LIMIT / 2 - 1 ||
-          strlen(fakeCookie_) != length)
-  {
-    #ifdef PANIC
-    *logofs << "Auth: PANIC! Size mismatch between cookies '"
-            << realCookie_ << "' and '" << fakeCookie_ << "'.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Size mismatch between cookies '"
-         << realCookie_ << "' and '" << fakeCookie_ << "'.\n";
-
-    goto AuthValidateCookieError;
-  }
-
-  //
-  // The length of the resulting data will be
-  // half the size of the Hex cookie.
-  //
-
-  length = length / 2;
-
-  fakeData_ = new char[length];
-  realData_ = new char[length];
-
-  if (fakeData_ == NULL || realData_ == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "Auth: PANIC! Cannot allocate memory for the binary X "
-            << "authorization data.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Cannot allocate memory for the binary X "
-         << "authorization data.\n";
-
-    goto AuthValidateCookieError;
-  }
-
-  //
-  // Translate the real cookie from Hex data
-  // to its binary representation.
-  //
-
-  unsigned int value;
-
-  for (unsigned int i = 0; i < length; i++)
-  {
-    if (sscanf(realCookie_ + 2 * i, "%2x", &value) != 1)
-    {
-      #ifdef PANIC
-      *logofs << "Auth: PANIC! Bad X authorization data in real "
-              << "cookie '" << realCookie_ << "'.\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Bad X authorization data in real cookie '"
-           << realCookie_ << "'.\n";
-
-      goto AuthValidateCookieError;
-    }
-
-    realData_[i] = value;
-
-    if (sscanf(fakeCookie_ + 2 * i, "%2x", &value) != 1)
-    {
-      #ifdef PANIC
-      *logofs << "Auth: PANIC! Bad X authorization data in fake "
-              << "cookie '" << fakeCookie_ << "'.\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Bad X authorization data in fake cookie '"
-           << fakeCookie_ << "'.\n";
-
-      goto AuthValidateCookieError;
-    }
-
-    fakeData_[i] = value;
-  }
-
-  dataSize_ = length;
-
-  #ifdef TEST
-  *logofs << "Auth: Validated real cookie '"
-          << realCookie_ << "' and fake cookie '" << fakeCookie_
-          << "' with data with size " << dataSize_ << ".\n"
-          << logofs_flush;
-
-  *logofs << "Auth: Ready to accept incoming connections.\n"
-          << logofs_flush;
-  #endif
-
-  return 1;
-
-AuthValidateCookieError:
-
-  delete [] fakeData_;
-  delete [] realData_;
-
-  fakeData_ = NULL;
-  realData_ = NULL;
-
-  dataSize_ = 0;
-
-  return -1;
-}
-
-int Auth::checkCookie(unsigned char *buffer)
-{
-  if (isValid() != 1)
-  {
-    #ifdef PANIC
-    *logofs << "Auth: PANIC! Attempt to check the X cookie with "
-            << "invalid authorization data.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Attempt to check the X cookie with "
-         << "invalid authorization data.\n";
-
-    return -1;
-  }
-
-  const char *protoName = "MIT-MAGIC-COOKIE-1";
-  int protoSize = strlen(protoName);
-
-  int matchedProtoSize;
-  int matchedDataSize;
-
-  if (buffer[0] == 0x42)
-  {
-    //
-    // Byte order is MSB first.
-    //
-
-    matchedProtoSize = 256 * buffer[6] + buffer[7];
-    matchedDataSize  = 256 * buffer[8] + buffer[9];
-  }
-  else if (buffer[0] == 0x6c)
-  {
-    //
-    // Byte order is LSB first.
-    //
-
-    matchedProtoSize = buffer[6] + 256 * buffer[7];
-    matchedDataSize  = buffer[8] + 256 * buffer[9];
-  }
-  else
-  {
-    #ifdef WARNING
-    *logofs << "Auth: WARNING! Bad X connection data in the buffer.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Warning" << ": Bad X connection data in the buffer.\n";
-
-    return -1;
-  }
-
-  //
-  // Check if both the authentication protocol
-  // and the fake cookie match our data.
-  //
-
-  int protoOffset = 12;
-
-  #ifdef TEST
-  *logofs << "Auth: Received a protocol size of "
-          << matchedProtoSize << " bytes.\n"
-          << logofs_flush;
-  #endif
-
-  if (matchedProtoSize != protoSize ||
-          memcmp(buffer + protoOffset, protoName, protoSize) != 0)
-  {
-    #ifdef WARNING
-    *logofs << "Auth: WARNING! Protocol mismatch or no X "
-            << "authentication data.\n" << logofs_flush;
-    #endif
-
-    cerr << "Warning" << ": Protocol mismatch or no X "
-         << "authentication data.\n";
-
-    return -1;
-  }
-
-  int dataOffset = protoOffset + ((matchedProtoSize + 3) & ~3);
-
-  #ifdef TEST
-  *logofs << "Auth: Received a data size of "
-          << matchedDataSize << " bytes.\n"
-          << logofs_flush;
-  #endif
-
-  if (matchedDataSize != dataSize_ ||
-           memcmp(buffer + dataOffset, fakeData_, dataSize_) != 0)
-  {
-    #ifdef WARNING
-    *logofs << "Auth: WARNING! Cookie mismatch in the X "
-            << "authentication data.\n" << logofs_flush;
-    #endif
-
-    cerr << "Warning" << ": Cookie mismatch in the X "
-         << "authentication data.\n";
-
-    return -1;
-  }
-
-  //
-  // Everything is OK. Replace the fake data.
-  //
-
-  #ifdef TEST
-  *logofs << "Auth: Replacing fake X authentication data "
-          << "with the real data.\n" << logofs_flush;
-  #endif
-
-  memcpy(buffer + dataOffset, realData_, dataSize_);
-
-  return 1;
-}
-
-void Auth::generateCookie(char *cookie)
-{
-  //
-  // Code is from the SSH implementation, except that
-  // we use a much weaker random number generator.
-  // This is not critical, anyway, as this is just a
-  // fake cookie. The X server doesn't have a cookie
-  // for the display, so it will ignore the value we
-  // feed to it.
-  //
-
-  T_timestamp timer = getTimestamp();
-
-  srand((unsigned int) timer.tv_usec);
-
-  unsigned int data = rand();
-
-  for (int i = 0; i < 16; i++)
-  {
-    if (i % 4 == 0)
-    {
-      data = rand();
-    }
-
-    snprintf(cookie + 2 * i, 3, "%02x", data & 0xff);
-
-    data >>= 8;
-  }
-
-  generatedCookie_ = 1;
-
-  #ifdef TEST
-  *logofs << "Auth: Generated X cookie string '"
-          << cookie << "'.\n" << logofs_flush;
-  #endif
-}
diff --git a/nxcomp/Auth.h b/nxcomp/Auth.h
deleted file mode 100644
index d51d9a26f..000000000
--- a/nxcomp/Auth.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef Auth_H
-#define Auth_H
-
-#include "Timestamp.h"
-
-//
-// Handle the forwarding of authorization credentials
-// to the X server by replacing the fake cookie with
-// the real cookie as it is read from the auth file.
-// At the moment only the MIT-MAGIC-COOKIE-1 cookies
-// are recognized. The implementation is based on the
-// corresponding code found in the SSH client.
-//
-
-class Auth
-{
-  public:
-
-  //
-  // Must be created by passing the fake cookie that
-  // will be forwarded by the remote end and with the
-  // real X display that is going to be used for the
-  // session.
-  //
-
-  Auth(char *display, char *cookie);
-
-  ~Auth();
-
-  int isValid()
-  {
-    return (isTimestamp(last_) == 1 && fakeCookie_ != NULL &&
-                *fakeCookie_ != '\0' && realCookie_ != NULL &&
-                    *realCookie_ != '\0' && fakeData_ != NULL &&
-                        realData_ != NULL && dataSize_ != 0);
-  }
-
-  int isFake() const
-  {
-    return generatedCookie_;
-  }
-
-  //
-  // Method called in the channel class to find if the
-  // provided cookie matches the fake one. If the data
-  // matches, the fake cookie is replaced with the real
-  // one.
-  //
-
-  int checkCookie(unsigned char *buffer);
-
-  protected:
-
-  //
-  // Update the real cookie for the display. If called
-  // a further time, check if the auth file is changed
-  // and get the new cookie.
-  //
-
-  int updateCookie();
-
-  //
-  // Find out which authorization file is to be used
-  // and query the cookie for the current display.
-  //
-
-  int getCookie();
-
-  //
-  // Extract the binary data from the cookies so that
-  // data can be directly compared at the time it is
-  // taken from the X request.
-  //
-
-  int validateCookie();
-
-  //
-  // Generate a fake random cookie and copy it to the
-  // provided string.
-  //
-
-  void generateCookie(char *cookie);
-
-  private:
-
-  char *display_;
-  char *file_;
-
-  T_timestamp last_;
-
-  char *fakeCookie_;
-  char *realCookie_;
-
-  char *fakeData_;
-  char *realData_;
-
-  int dataSize_;
-
-  int generatedCookie_;
-};
-
-#endif /* Auth_H */
diff --git a/nxcomp/Bitmap.cpp b/nxcomp/Bitmap.cpp
deleted file mode 100644
index fbc34a55e..000000000
--- a/nxcomp/Bitmap.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "Misc.h"
-#include "Bitmap.h"
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-int UnpackBitmap(T_geometry *geometry, unsigned char method, unsigned char *src_data,
-                  int src_size, int dst_bpp, int dst_width, int dst_height,
-                      unsigned char *dst_data, int dst_size)
-{
-  if (dst_bpp != 32)
-  {
-    #ifdef TEST
-    *logofs << "UnpackBitmap: Nothing to do with "
-            << "image of " << dst_bpp << " bits per plane "
-            << "and size " << src_size << ".\n"
-            << logofs_flush;
-    #endif
-
-    if (src_size != dst_size)
-    {
-      #ifdef PANIC
-      *logofs << "UnpackBitmap: PANIC! Size mismatch with "
-              << src_size << " bytes in the source and "
-              << dst_size << " in the destination.\n"
-              << logofs_flush;
-      #endif
-
-      return -1;
-    }
-
-    memcpy(dst_data, src_data, src_size);
-
-    return 1;
-  }
-  else if (src_size != dst_width * dst_height * 3 ||
-               dst_size != dst_width * dst_height * 4)
-  {
-    #ifdef PANIC
-    *logofs << "UnpackBitmap: PANIC! Size mismatch with "
-            << src_size << " bytes in the source and "
-            << dst_size << " in the destination.\n"
-            << logofs_flush;
-    #endif
-
-    return -1;
-  }
-
-  /*
-   * Insert the 4th byte in the bitmap.
-   */
-
-  unsigned char *next_src = src_data;
-  unsigned char *next_dst = dst_data;
-
-  if (geometry -> image_byte_order == LSBFirst)
-  {
-    while (next_src < src_data + src_size)
-    {
-      *next_dst++ = *next_src++;
-      *next_dst++ = *next_src++;
-      *next_dst++ = *next_src++;
-
-      next_dst++;
-    }
-  }
-  else
-  {
-    while (next_src < src_data + src_size)
-    {
-      next_dst++;
-
-      *next_dst++ = *next_src++;
-      *next_dst++ = *next_src++;
-      *next_dst++ = *next_src++;
-    }
-  }
-
-  #ifdef TEST
-  *logofs << "UnpackBitmap: Unpacked " << src_size
-          << " bytes to a buffer of " << dst_size
-          << " with " << dst_bpp << " bits per plane.\n"
-          << logofs_flush;
-  #endif
-
-  return 1;
-}
diff --git a/nxcomp/Bitmap.h b/nxcomp/Bitmap.h
deleted file mode 100644
index 8143e3125..000000000
--- a/nxcomp/Bitmap.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef Bitmap_H
-#define Bitmap_H
-
-#include "Unpack.h"
-
-int UnpackBitmap(T_geometry *geometry, unsigned char method,
-                     unsigned char *src_data, int src_size, int dst_bpp,
-                         int dst_width, int dst_height, unsigned char *dst_data,
-                             int dst_size);
-
-#endif /* Bitmap_H */
diff --git a/nxcomp/BlockCache.cpp b/nxcomp/BlockCache.cpp
deleted file mode 100644
index 76f7fd797..000000000
--- a/nxcomp/BlockCache.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include <string.h>
-#include "BlockCache.h"
-
-
-int BlockCache::compare(unsigned int size, const unsigned char *data,
-                            int overwrite)
-{
-  int match = 0;
-  if (size == size_)
-  {
-    match = 1;
-    for (unsigned int i = 0; i < size_; i++)
-      if (data[i] != buffer_[i])
-      {
-        match = 0;
-        break;
-      }
-  }
-  if (!match && overwrite)
-    set(size, data);
-  return match;
-}
-
-
-void BlockCache::set(unsigned int size, const unsigned char *data)
-{
-  if (size_ < size)
-  {
-    delete[]buffer_;
-    buffer_ = new unsigned char[size];
-  }
-  size_ = size;
-  memcpy(buffer_, data, size);
-  checksum_ = checksum(size, data);
-}
-
-
-unsigned int BlockCache::checksum(unsigned int size, const unsigned char *data)
-{
-  unsigned int sum = 0;
-  unsigned int shift = 0;
-  const unsigned char *next = data;
-  for (unsigned int i = 0; i < size; i++)
-  {
-    unsigned int value = (unsigned int) *next++;
-    sum += (value << shift);
-    shift++;
-    if (shift == 8)
-      shift = 0;
-  }
-  return sum;
-}
diff --git a/nxcomp/BlockCache.h b/nxcomp/BlockCache.h
deleted file mode 100644
index 48e586966..000000000
--- a/nxcomp/BlockCache.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef BlockCache_H
-#define BlockCache_H
-
-
-// Cache to hold an arbitrary-length block of bytes
-
-class BlockCache
-{
-  public:
-  BlockCache():buffer_(0), size_(0), checksum_(0)
-  {
-  }
-   ~BlockCache()
-  {
-    delete[]buffer_;
-  }
-  int compare(unsigned int size, const unsigned char *data,
-	      int overwrite = 1);
-  void set(unsigned int size, const unsigned char *data);
-
-  unsigned int getLength() const
-  {
-    return size_;
-  }
-  unsigned int getChecksum() const
-  {
-    return checksum_;
-  }
-  const unsigned char *getData() const
-  {
-    return buffer_;
-  }
-
-  static unsigned int checksum(unsigned int size, const unsigned char *data);
-
-private:
-  unsigned char *buffer_;
-  unsigned int size_;
-  unsigned int checksum_;
-};
-
-#endif /* BlockCache_H */
diff --git a/nxcomp/BlockCacheSet.cpp b/nxcomp/BlockCacheSet.cpp
deleted file mode 100644
index 3fd5e1ac7..000000000
--- a/nxcomp/BlockCacheSet.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "Misc.h"
-#include "BlockCacheSet.h"
-
-
-BlockCacheSet::BlockCacheSet(unsigned int numCaches):
-  caches_(new BlockCache *[numCaches]), size_(numCaches), 
-  length_(0)
-{
-  for (unsigned int i = 0; i < numCaches; i++)
-    caches_[i] = new BlockCache();
-}
-
-
-BlockCacheSet::~BlockCacheSet()
-{
-  //
-  // TODO: There is still a strange segfault occurring
-  // at random time under Cygwin, when proxy is being
-  // shutdown. Problem appeared just after upgrading
-  // to the latest version of the Cygwin DLL. A stack
-  // trace, obtained at the last minute, reveals that
-  // failure happens in this destructor.
-  //
-
-  #ifndef __CYGWIN32__
-
-  for (unsigned int i = 0; i < size_; i++)
-    delete caches_[i];
-  delete[]caches_;
-
-  #endif /* ifdef __CYGWIN32__ */
-}
-
-
-int
-BlockCacheSet::lookup(unsigned int dataLength, const unsigned char *data,
-		      unsigned int &index)
-{
-  unsigned int checksum = BlockCache::checksum(dataLength, data);
-  for (unsigned int i = 0; i < length_; i++)
-    if ((caches_[i]->getChecksum() == checksum) &&
-	(caches_[i]->compare(dataLength, data, 0)))
-    {
-      // match
-      index = i;
-      if (i)
-      {
-	BlockCache *save = caches_[i];
-	unsigned int target = (i >> 1);
-	do
-	{
-	  caches_[i] = caches_[i - 1];
-	  i--;
-	}
-	while (i > target);
-	caches_[target] = save;
-      }
-      return 1;
-    }
-  // no match
-  unsigned int insertionPoint = (length_ >> 1);
-  unsigned int start;
-  if (length_ >= size_)
-    start = size_ - 1;
-  else
-  {
-    start = length_;
-    length_++;
-  }
-  BlockCache *save = caches_[start];
-  for (unsigned int k = start; k > insertionPoint; k--)
-    caches_[k] = caches_[k - 1];
-  caches_[insertionPoint] = save;
-  save->set(dataLength, data);
-  return 0;
-}
-
-
-void
-BlockCacheSet::get(unsigned index, unsigned int &size,
-		   const unsigned char *&data)
-{
-  size = caches_[index]->getLength();
-  data = caches_[index]->getData();
-  if (index)
-  {
-    BlockCache *save = caches_[index];
-    unsigned int target = (index >> 1);
-    do
-    {
-      caches_[index] = caches_[index - 1];
-      index--;
-    }
-    while (index > target);
-    caches_[target] = save;
-  }
-}
-
-
-
-void
-BlockCacheSet::set(unsigned int dataLength, const unsigned char *data)
-{
-  unsigned int insertionPoint = (length_ >> 1);
-  unsigned int start;
-  if (length_ >= size_)
-    start = size_ - 1;
-  else
-  {
-    start = length_;
-    length_++;
-  }
-  BlockCache *save = caches_[start];
-  for (unsigned int k = start; k > insertionPoint; k--)
-    caches_[k] = caches_[k - 1];
-  caches_[insertionPoint] = save;
-  save->set(dataLength, data);
-}
diff --git a/nxcomp/BlockCacheSet.h b/nxcomp/BlockCacheSet.h
deleted file mode 100644
index 97273b0e0..000000000
--- a/nxcomp/BlockCacheSet.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef BlockCacheSet_H
-#define BlockCacheSet_H
-
-#include "BlockCache.h"
-
-
-class BlockCacheSet
-{
-  public:
-  BlockCacheSet(unsigned int numCaches);
-   ~BlockCacheSet();
-
-  int lookup(unsigned int size, const unsigned char *data,
-	     unsigned int &index);
-  void get(unsigned int index, unsigned int &size, const unsigned char *&data);
-  void set(unsigned int size, const unsigned char *data);
-
-    private:
-    BlockCache ** caches_;
-  unsigned int size_;
-  unsigned int length_;
-};
-
-#endif /* BlockCacheSet_H */
diff --git a/nxcomp/ChangeGC.cpp b/nxcomp/ChangeGC.cpp
deleted file mode 100644
index f06984a10..000000000
--- a/nxcomp/ChangeGC.cpp
+++ /dev/null
@@ -1,180 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "ChangeGC.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int ChangeGCStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                     unsigned int size, int bigEndian) const
-{
-  ChangeGCMessage *changeGC = (ChangeGCMessage *) message;
-
-  //
-  // Here is the fingerprint.
-  //
-
-  changeGC -> gcontext   = GetULONG(buffer + 4, bigEndian);
-  changeGC -> value_mask = GetULONG(buffer + 8, bigEndian);
-
-  //
-  // Clear the unused bytes carried in the
-  // payload to increase the effectiveness
-  // of the caching algorithm.
-  //
-
-  if ((int) size > dataOffset)
-  {
-    #ifdef DEBUG
-    *logofs << name() << ": Removing unused bytes from the "
-            << "data payload.\n" << logofs_flush;
-    #endif
-
-    changeGC -> value_mask &= (1 << 23) - 1;
-
-    unsigned int mask = 0x1;
-    unsigned char *source = (unsigned char *) buffer + CHANGEGC_DATA_OFFSET;
-    unsigned long value = 0;
-
-    for (unsigned int i = 0; i < 23; i++)
-    {
-      if (changeGC -> value_mask & mask)
-      {
-        value = GetULONG(source, bigEndian);
-
-        value &= (0xffffffff >> (32 - CREATEGC_FIELD_WIDTH[i]));
-
-        PutULONG(value, source, bigEndian);
-
-        source += 4;
-      }
-
-      mask <<= 1;
-    }
-  }
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed Identity for message at "
-          << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int ChangeGCStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                       unsigned int size, int bigEndian) const
-{
-  ChangeGCMessage *changeGC = (ChangeGCMessage *) message;
-
-  //
-  // Fill all the message's fields.
-  //
-
-  PutULONG(changeGC -> gcontext,   buffer + 4, bigEndian);
-  PutULONG(changeGC -> value_mask, buffer + 8, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at "
-          << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void ChangeGCStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  ChangeGCMessage *changeGC = (ChangeGCMessage *) message;
-
-  *logofs << name() << ": Identity gcontext " << changeGC -> gcontext 
-                    << ", mask " << changeGC -> value_mask << ", size "
-                    << changeGC -> size_ << ".\n" << logofs_flush;
-  #endif
-}
-
-void ChangeGCStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                         unsigned int size, int bigEndian) const
-{
-/*
-  md5_append(md5_state_, buffer + 4, 8);
-*/
-  md5_append(md5_state_, buffer + 8, 4);
-}
-
-void ChangeGCStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                       const Message *cachedMessage,
-                                           ChannelCache *channelCache) const
-{
-  ChangeGCMessage *changeGC       = (ChangeGCMessage *) message;
-  ChangeGCMessage *cachedChangeGC = (ChangeGCMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << changeGC -> gcontext
-          << " as gcontext field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeXidValue(changeGC -> gcontext, clientCache -> gcCache);
-
-  cachedChangeGC -> gcontext = changeGC -> gcontext;
-}
-
-void ChangeGCStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                       ChannelCache *channelCache) const
-{
-  ChangeGCMessage *changeGC = (ChangeGCMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  decodeBuffer.decodeXidValue(value, clientCache -> gcCache);
-
-  changeGC -> gcontext = value;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << changeGC -> gcontext
-          << " as gcontext field.\n" << logofs_flush;
-  #endif
-}
diff --git a/nxcomp/ChangeGC.h b/nxcomp/ChangeGC.h
deleted file mode 100644
index 9cac90e66..000000000
--- a/nxcomp/ChangeGC.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef ChangeGC_H
-#define ChangeGC_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define CHANGEGC_ENABLE_CACHE                           1
-#define CHANGEGC_ENABLE_DATA                            0
-#define CHANGEGC_ENABLE_SPLIT                           0
-#define CHANGEGC_ENABLE_COMPRESS                        0
-
-#define CHANGEGC_DATA_LIMIT                             144
-#define CHANGEGC_DATA_OFFSET                            12
-
-#define CHANGEGC_CACHE_SLOTS                            3000
-#define CHANGEGC_CACHE_THRESHOLD                        3
-#define CHANGEGC_CACHE_LOWER_THRESHOLD                  1
-
-//
-// The message class.
-//
-
-class ChangeGCMessage : public Message
-{
-  friend class ChangeGCStore;
-
-  public:
-
-  ChangeGCMessage()
-  {
-  }
-
-  ~ChangeGCMessage()
-  {
-  }
-
-  //
-  // Put here the fields which constitute 
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned int gcontext;
-  unsigned int value_mask;
-};
-
-class ChangeGCStore : public MessageStore
-{
-  //
-  // Constructors and destructors.
-  //
-
-  public:
-
-  ChangeGCStore() : MessageStore()
-  {
-    enableCache    = CHANGEGC_ENABLE_CACHE;
-    enableData     = CHANGEGC_ENABLE_DATA;
-    enableSplit    = CHANGEGC_ENABLE_SPLIT;
-    enableCompress = CHANGEGC_ENABLE_COMPRESS;
-
-    dataLimit  = CHANGEGC_DATA_LIMIT;
-    dataOffset = CHANGEGC_DATA_OFFSET;
-
-    cacheSlots          = CHANGEGC_CACHE_SLOTS;
-    cacheThreshold      = CHANGEGC_CACHE_THRESHOLD;
-    cacheLowerThreshold = CHANGEGC_CACHE_LOWER_THRESHOLD;
-
-    messages_ -> resize(cacheSlots);
-
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      *i = NULL;
-    }
-
-    temporary_ = NULL;
-  }
-
-  virtual ~ChangeGCStore()
-  {
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      destroy(*i);
-    }
-
-    destroy(temporary_);
-  }
-
-  virtual const char *name() const
-  {
-    return "ChangeGC";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_ChangeGC;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(ChangeGCMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  public:
-
-  virtual Message *create() const
-  {
-    return new ChangeGCMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new ChangeGCMessage((const ChangeGCMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (ChangeGCMessage *) message;
-  }
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const;
-};
-
-#endif /* ChangeGC_H */
diff --git a/nxcomp/ChangeProperty.cpp b/nxcomp/ChangeProperty.cpp
deleted file mode 100644
index dbfb8f5d7..000000000
--- a/nxcomp/ChangeProperty.cpp
+++ /dev/null
@@ -1,187 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "ChangeProperty.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int ChangePropertyStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                           unsigned int size, int bigEndian) const
-{
-  ChangePropertyMessage *changeProperty = (ChangePropertyMessage *) message;
-
-  changeProperty -> mode     = *(buffer + 1);
-  changeProperty -> format   = *(buffer + 16);
-
-  changeProperty -> window   = GetULONG(buffer + 4, bigEndian);
-  changeProperty -> property = GetULONG(buffer + 8, bigEndian);
-  changeProperty -> type     = GetULONG(buffer + 12, bigEndian);
-  changeProperty -> length   = GetULONG(buffer + 20, bigEndian);
-
-  //
-  // Cleanup the padding bytes.
-  //
-
-  unsigned int uiFormat;
-  unsigned int uiLengthInBytes;
-
-  if ((int) size > CHANGEPROPERTY_DATA_OFFSET)
-  {
-    uiFormat = *(buffer + 16);
-
-    uiLengthInBytes = changeProperty -> length;
-
-    #ifdef DEBUG
-    *logofs << name() << ": length  " << uiLengthInBytes
-            << ", format " << uiFormat << ", size "
-            << size << ".\n" << logofs_flush;
-    #endif
-
-    if (uiFormat == 16)
-    {
-      uiLengthInBytes <<= 1; 
-    }
-    else if (uiFormat == 32)
-    {
-      uiLengthInBytes <<= 2;
-    }
-
-    unsigned char *end = ((unsigned char *) buffer) + size;
-    unsigned char *pad = ((unsigned char *) buffer) + CHANGEPROPERTY_DATA_OFFSET + uiLengthInBytes;
-
-    CleanData((unsigned char *) pad, end - pad);
-  }
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed identity for message at "
-          << message << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int ChangePropertyStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                             unsigned int size, int bigEndian) const
-{
-  ChangePropertyMessage *changeProperty = (ChangePropertyMessage *) message;
-
-  *(buffer + 1)  = changeProperty -> mode;
-  *(buffer + 16) = changeProperty -> format;
-
-  PutULONG(changeProperty -> window,   buffer + 4,  bigEndian);
-  PutULONG(changeProperty -> property, buffer + 8,  bigEndian);
-  PutULONG(changeProperty -> type,     buffer + 12, bigEndian);
-  PutULONG(changeProperty -> length,   buffer + 20, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at "
-          << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void ChangePropertyStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  ChangePropertyMessage *changeProperty = (ChangePropertyMessage *) message;
-
-  *logofs << name() << ": Identity mode " << (unsigned int) changeProperty -> mode << ", format " 
-          << (unsigned int) changeProperty -> format << ", window " << changeProperty -> window
-          << ", property " << changeProperty -> property << ", type " << changeProperty -> type
-          << ", length " << changeProperty -> length << ", size " << changeProperty -> size_
-          << ".\n" << logofs_flush;
-
-  #endif
-}
-
-void ChangePropertyStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                               unsigned int size, int bigEndian) const
-{
-  md5_append(md5_state_, buffer + 1,  1);
-  md5_append(md5_state_, buffer + 16, 1);
-
-  md5_append(md5_state_, buffer + 8,  4);
-  md5_append(md5_state_, buffer + 12, 4);
-  md5_append(md5_state_, buffer + 20, 4);
-}
-
-void ChangePropertyStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                             const Message *cachedMessage,
-                                                 ChannelCache *channelCache) const
-{
-  ChangePropertyMessage *changeProperty       = (ChangePropertyMessage *) message;
-  ChangePropertyMessage *cachedChangeProperty = (ChangePropertyMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << changeProperty -> window
-          << " as window field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeXidValue(changeProperty -> window, clientCache -> windowCache);
-
-  cachedChangeProperty -> window = changeProperty -> window;
-}
-
-void ChangePropertyStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                             ChannelCache *channelCache) const
-{
-  ChangePropertyMessage *changeProperty = (ChangePropertyMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  decodeBuffer.decodeXidValue(value, clientCache -> windowCache);
-
-  changeProperty -> window = value;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << changeProperty -> window
-          << " as window field.\n" << logofs_flush;
-  #endif
-}
-
-
diff --git a/nxcomp/ChangeProperty.h b/nxcomp/ChangeProperty.h
deleted file mode 100644
index c06ce10fc..000000000
--- a/nxcomp/ChangeProperty.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef ChangeProperty_H
-#define ChangeProperty_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define CHANGEPROPERTY_ENABLE_CACHE               1
-#define CHANGEPROPERTY_ENABLE_DATA                0
-#define CHANGEPROPERTY_ENABLE_SPLIT               0
-#define CHANGEPROPERTY_ENABLE_COMPRESS            0
-
-#define CHANGEPROPERTY_DATA_LIMIT                 28688
-#define CHANGEPROPERTY_DATA_OFFSET                24
-
-#define CHANGEPROPERTY_CACHE_SLOTS                2000
-#define CHANGEPROPERTY_CACHE_THRESHOLD            2
-#define CHANGEPROPERTY_CACHE_LOWER_THRESHOLD      1
-
-//
-// The message class.
-//
-
-class ChangePropertyMessage : public Message
-{
-  friend class ChangePropertyStore;
-
-  public:
-
-  ChangePropertyMessage()
-  {
-  }
-
-  ~ChangePropertyMessage()
-  {
-  }
-
-  //
-  // Put here the fields which constitute 
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned char mode;
-  unsigned char format;
-  unsigned int  window;
-  unsigned int  property;
-  unsigned int  type;
-  unsigned int  length;
-};
-
-class ChangePropertyStore : public MessageStore
-{
-  //
-  // Constructors and destructors.
-  //
-
-  public:
-
-  ChangePropertyStore() : MessageStore()
-  {
-    enableCache    = CHANGEPROPERTY_ENABLE_CACHE;
-    enableData     = CHANGEPROPERTY_ENABLE_DATA;
-    enableSplit    = CHANGEPROPERTY_ENABLE_SPLIT;
-    enableCompress = CHANGEPROPERTY_ENABLE_COMPRESS;
-
-    dataLimit  = CHANGEPROPERTY_DATA_LIMIT;
-    dataOffset = CHANGEPROPERTY_DATA_OFFSET;
-
-    cacheSlots          = CHANGEPROPERTY_CACHE_SLOTS;
-    cacheThreshold      = CHANGEPROPERTY_CACHE_THRESHOLD;
-    cacheLowerThreshold = CHANGEPROPERTY_CACHE_LOWER_THRESHOLD;
-
-    messages_ -> resize(cacheSlots);
-
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      *i = NULL;
-    }
-
-    temporary_ = NULL;
-  }
-
-  virtual ~ChangePropertyStore()
-  {
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      destroy(*i);
-    }
-
-    destroy(temporary_);
-  }
-
-  virtual const char *name() const
-  {
-    return "ChangeProperty";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_ChangeProperty;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(ChangePropertyMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  public:
-
-  virtual Message *create() const
-  {
-    return new ChangePropertyMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new ChangePropertyMessage((const ChangePropertyMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (ChangePropertyMessage *) message;
-  }
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* ChangeProperty_H */
diff --git a/nxcomp/Channel.cpp b/nxcomp/Channel.cpp
deleted file mode 100644
index 41a09e951..000000000
--- a/nxcomp/Channel.cpp
+++ /dev/null
@@ -1,2035 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "Channel.h"
-
-#include "List.h"
-#include "Proxy.h"
-#include "Statistics.h"
-
-#include "StaticCompressor.h"
-
-#include "NXalert.h"
-
-extern Proxy *proxy;
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Log the operations related to splits.
-//
-
-#undef  SPLIT
-
-#undef  COUNT
-
-#define COUNT_MAJOR_OPCODE     154
-
-#undef  MONITOR
-
-#define MONITOR_MAJOR_OPCODE   154
-#define MONITOR_MINOR_OPCODE   23
-
-#undef  CLEAR
-
-#define CLEAR_MAJOR_OPCODE     154
-#define CLEAR_MINOR_OPCODE     23
-
-//
-// Define this to know how many messages
-// are allocated and deallocated.
-//
-
-#undef  REFERENCES
-
-//
-// Set to the descriptor of the first X
-// channel successfully connected.
-//
-
-int Channel::firstClient_ = -1;
-
-//
-// Port used for font server connections.
-//
-
-int Channel::fontPort_ = -1;
-
-//
-// This is used for reference count.
-//
-
-#ifdef REFERENCES
-
-int Channel::references_ = 0;
-
-#endif
-
-Channel::Channel(Transport *transport, StaticCompressor *compressor)
-
-    : transport_(transport), compressor_(compressor)
-{
-  fd_ = transport_ -> fd();
-
-  finish_     = 0;
-  closing_    = 0;
-  drop_       = 0;
-  congestion_ = 0;
-  priority_   = 0;
-
-  alert_ = 0;
-
-  firstRequest_ = 1;
-  firstReply_   = 1;
-
-  enableCache_ = 1;
-  enableSplit_ = 1;
-  enableSave_  = 1;
-  enableLoad_  = 1;
-
-  //
-  // Must be set by proxy.
-  //
-
-  opcodeStore_ = NULL;
- 
-  clientStore_ = NULL;
-  serverStore_ = NULL;
-
-  clientCache_ = NULL;
-  serverCache_ = NULL;
-
-  #ifdef REFERENCES
-  *logofs << "Channel: Created new Channel at " 
-          << this << " out of " << ++references_ 
-          << " allocated references.\n" << logofs_flush;
-  #endif
-}
-
-Channel::~Channel()
-{
-  if (firstClient_ == fd_)
-  {
-    firstClient_ = -1;
-  }
-
-  #ifdef REFERENCES
-  *logofs << "Channel: Deleted Channel at " 
-          << this << " out of " << --references_ 
-          << " allocated references.\n" << logofs_flush;
-  #endif
-}
-
-int Channel::handleEncode(EncodeBuffer &encodeBuffer, ChannelCache *channelCache,
-                              MessageStore *store, const unsigned char opcode,
-                                  const unsigned char *buffer, const unsigned int size)
-{
-  #ifdef MONITOR
-
-  static float totalMessages = 0;
-  static float totalBits     = 0;
-
-  int bits;
-  int diff;
-
-  bits = encodeBuffer.getBits();
-
-  #endif
-
-  //
-  // Check if message can be differentially
-  // encoded using a similar message in the
-  // message store.
-  // 
-
-  #ifdef COUNT
-
-  if (*(buffer) == COUNT_MAJOR_OPCODE)
-  {
-    if (*(buffer) < 128)
-    {
-      *logofs << "handleEncode: Handling OPCODE#" << (unsigned int) *(buffer)
-              << ".\n" << logofs_flush;
-    }
-    else
-    {
-      *logofs << "handleEncode: Handling OPCODE#" << (unsigned int) *(buffer)
-              << " MINOR#" << (unsigned int) *(buffer + 1) << ".\n"
-              << logofs_flush;
-    }
-  }
-
-  #endif
-
-  #ifdef CLEAR
-
-  if (*(buffer) == CLEAR_MAJOR_OPCODE &&
-          (CLEAR_MINOR_OPCODE == -1 || *(buffer + 1) == CLEAR_MINOR_OPCODE))
-  {
-    *((unsigned char *) buffer) = X_NoOperation;
-
-    *((unsigned char *) buffer + 1) = '\0';
-
-    CleanData((unsigned char *) buffer + 4, size - 4);
-  }
-
-  #endif
-
-  if (handleEncodeCached(encodeBuffer, channelCache,
-                             store, buffer, size) == 1)
-  {
-    #ifdef MONITOR
-
-    diff = encodeBuffer.getBits() - bits;
-
-    if (*(buffer) == MONITOR_MAJOR_OPCODE &&
-            (MONITOR_MINOR_OPCODE == -1 || *(buffer + 1) == MONITOR_MINOR_OPCODE))
-    {
-      totalMessages++;
-
-      totalBits += diff;
-
-      *logofs << "handleEncode: Handled cached OPCODE#" << (unsigned int) *(buffer)
-              << " MINOR#" << (unsigned int) *(buffer + 1) << ". " << size
-              << " bytes in, " << diff << " bits (" << ((float) diff) / 8
-              << " bytes) out. Average " << totalBits / totalMessages
-              << "/1.\n" << logofs_flush;
-    }
-
-    #endif
-
-    //
-    // Let the channel update the split store
-    // and notify the agent in the case of a
-    // cache hit.
-    //
-
-    if (store -> enableSplit)
-    {
-      handleSplit(encodeBuffer, store, store -> lastAction,
-                      store -> lastHit, opcode, buffer, size);
-    }
-
-    return 1;
-  }
-
-  //
-  // A similar message could not be found in
-  // cache or message must be discarded. Must
-  // transmit the message using the field by
-  // field differential encoding.
-  //
-
-  handleEncodeIdentity(encodeBuffer, channelCache,
-                           store, buffer, size, bigEndian_);
-
-  //
-  // Check if message has a distinct data part.
-  //
-
-  if (store -> enableData)
-  {
-    //
-    // If message split was requested by agent then send data
-    // out-of-band, dividing it in small chunks. Until message
-    // is completely transferred, keep in the split store a
-    // dummy version of the message, with data replaced with a
-    // pattern.
-    //
-    // While data is being transferred, agent should have put
-    // the resource (for example its client) asleep. It can
-    // happen, though, that a different client would reference
-    // the same message. We cannot issue a cache hit for images
-    // being split (such images are put in store in 'incomplete'
-    // state), so we need to handle this case.
-    //
-
-    if (store -> enableSplit == 1)
-    {
-      //
-      // Let the channel decide what to do with the
-      // message. If the split can't take place be-
-      // cause the split store is full, the channel
-      // will tell the remote side that the data is
-      // going to follow.
-      //
-
-      if (handleSplit(encodeBuffer, store, store -> lastAction,
-                          (store -> lastAction == IS_ADDED ? store -> lastAdded : 0),
-                              opcode, buffer, size) == 1)
-      {
-        #ifdef MONITOR
-
-        diff = encodeBuffer.getBits() - bits;
-
-        if (*(buffer) == MONITOR_MAJOR_OPCODE &&
-                (MONITOR_MINOR_OPCODE == -1 || *(buffer + 1) == MONITOR_MINOR_OPCODE))
-        {
-          totalMessages++;
-
-          totalBits += diff;
-
-          *logofs << "handleEncode: Handled split OPCODE#" << (unsigned int) *(buffer)
-                  << " MINOR#" << (unsigned int) *(buffer + 1) << ". " << size
-                  << " bytes in, " << diff << " bits (" << ((float) diff) / 8
-                  << " bytes) out. Average " << totalBits / totalMessages
-                  << "/1.\n" << logofs_flush;
-        }
-
-        #endif
-
-        return 0;
-      }
-    }
-
-    //
-    // The split did not take place and we are going
-    // to transfer the data part. Check if the static
-    // compression of the data section is enabled.
-    // This is the case of all messages not having a
-    // special differential encoding or messages that
-    // we want to store in cache in compressed form.
-    //
-
-    unsigned int offset = store -> identitySize(buffer, size);
-
-    if (store -> enableCompress)
-    {
-      unsigned char *data   = NULL;
-      unsigned int dataSize = 0;
-
-      int compressed = handleCompress(encodeBuffer, opcode, offset,
-                                          buffer, size, data, dataSize);
-      if (compressed < 0)
-      {
-        return -1;
-      }
-      else if (compressed > 0)
-      {
-        //
-        // Update the size of the message according
-        // to the result of the data compression.
-        //
-
-        handleUpdate(store, size - offset, dataSize);
-      }
-    }
-    else
-    {
-      handleCopy(encodeBuffer, opcode, offset, buffer, size);
-    }
-  }
-
-  #ifdef MONITOR
-
-  diff = encodeBuffer.getBits() - bits;
-
-  if (*(buffer) == MONITOR_MAJOR_OPCODE &&
-          (MONITOR_MINOR_OPCODE == -1 || *(buffer + 1) == MONITOR_MINOR_OPCODE))
-  {
-    totalMessages++;
-
-    totalBits += diff;
-
-    *logofs << "handleEncode: Handled OPCODE#" << (unsigned int) *(buffer)
-            << " MINOR#" << (unsigned int) *(buffer + 1) << ". " << size
-            << " bytes in, " << diff << " bits (" << ((float) diff) / 8
-            << " bytes) out. Average " << totalBits / totalMessages
-            << "/1.\n" << logofs_flush;
-  }
-
-  #endif
-
-  return 0;
-}
-
-int Channel::handleDecode(DecodeBuffer &decodeBuffer, ChannelCache *channelCache,
-                              MessageStore *store, unsigned char &opcode,
-                                  unsigned char *&buffer, unsigned int &size)
-{
-  //
-  // Check first if the message is in the
-  // message store.
-  //
-
-  unsigned int split = 0;
-
-  if (handleDecodeCached(decodeBuffer, channelCache,
-                             store, buffer, size) == 1)
-  {
-    //
-    // Let the channel update the split store
-    // in the case of a message being cached.
-    //
-
-    if (store -> enableSplit == 1)
-    {
-      // Since ProtoStep7 (#issue 108)
-      #ifdef DEBUG
-      *logofs << "handleDecode: " << store -> name()
-              << ": Checking if the message was split.\n"
-              << logofs_flush;
-      #endif
-
-      decodeBuffer.decodeBoolValue(split);
-
-      if (split == 1)
-      {
-        handleSplit(decodeBuffer, store, store -> lastAction,
-                        store -> lastHit, opcode, buffer, size);
-
-        handleCleanAndNullRequest(opcode, buffer, size);
-      }
-    }
-
-    return 1;
-  }
-
-  //
-  // Decode the full identity.
-  //
-
-  handleDecodeIdentity(decodeBuffer, channelCache, store, buffer,
-                           size, bigEndian_, &writeBuffer_);
-
-  //
-  // Check if the message has a distinct
-  // data part.
-  //
-
-  if (store -> enableData)
-  {
-    //
-    // Check if message has been split.
-    //
-
-    if (store -> enableSplit)
-    {
-      #ifdef DEBUG
-      *logofs << "handleDecode: " << store -> name() 
-              << ": Checking if the message was split.\n" 
-              << logofs_flush;
-      #endif
-      
-      decodeBuffer.decodeBoolValue(split);
-
-      if (split == 1)
-      {
-        //
-        // If the message was added to the store,
-        // create the entry without the data part.
-        //
-
-        handleSaveSplit(store, buffer, size);
-
-        handleSplit(decodeBuffer, store, store -> lastAction,
-                        (store -> lastAction == IS_ADDED ? store -> lastAdded : 0),
-                            opcode, buffer, size);
-
-        handleCleanAndNullRequest(opcode, buffer, size);
-
-        return 0;
-      }
-    }
-
-    //
-    // Decode the data part.
-    //
-
-    unsigned int offset = store -> identitySize(buffer, size);
-
-    if (store -> enableCompress)
-    {
-      const unsigned char *data = NULL;
-      unsigned int dataSize = 0;
-
-      int decompressed = handleDecompress(decodeBuffer, opcode, offset,
-                                              buffer, size, data, dataSize);
-      if (decompressed < 0)
-      {
-        return -1;
-      }
-      else if (decompressed > 0)
-      {
-        //
-        // The message has been transferred
-        // in compressed format.
-        //
-
-        handleSave(store, buffer, size, data, dataSize);
-
-        if (store -> enableSplit)
-        {
-          if (split == 1)
-          {
-            handleSplit(decodeBuffer, store, store -> lastAction,
-                            (store -> lastAction == IS_ADDED ? store -> lastAdded : 0),
-                                opcode, buffer, size);
-
-            handleCleanAndNullRequest(opcode, buffer, size);
-          }
-        }
-
-        return 0;
-      }
-    }
-    else
-    {
-      //
-      // Static compression of the data part
-      // was not enabled for this message.
-      //
-
-      handleCopy(decodeBuffer, opcode, offset, buffer, size);
-    }
-  }
-
-  //
-  // The message doesn't have a data part
-  // or the data was not compressed.
-  //
-
-  handleSave(store, buffer, size);
-
-  if (store -> enableSplit)
-  {
-    if (split == 1)
-    {
-      handleSplit(decodeBuffer, store, store -> lastAction,
-                      (store -> lastAction == IS_ADDED ? store -> lastAdded : 0),
-                          opcode, buffer, size);
-
-      handleCleanAndNullRequest(opcode, buffer, size);
-    }
-  }
-
-  return 0;
-}
-
-int Channel::handleEncodeCached(EncodeBuffer &encodeBuffer, ChannelCache *channelCache,
-                                    MessageStore *store,  const unsigned char *buffer,
-                                        const unsigned int size)
-{
-  if (control -> LocalDeltaCompression == 0 ||
-          enableCache_ ==  0 || store -> enableCache == 0)
-  {
-    // Since ProtoStep7 (#issue 108)
-    encodeBuffer.encodeActionValue(is_discarded,
-                       store -> lastActionCache);
-
-    store -> lastAction = is_discarded;
-
-    return 0;
-  }
-
-  #ifdef DEBUG
-  *logofs << "handleEncodeCached: " << store -> name() 
-          << ": Going to handle a new message of this class.\n" 
-          << logofs_flush;
-  #endif
-
-  //
-  // Check if the estimated size of cache is greater
-  // than the requested limit. If it is the case make
-  // some room by deleting one or more messages.
-  //
-
-  int position;
-
-  while (mustCleanStore(store) == 1 && canCleanStore(store) == 1)
-  {
-    #ifdef DEBUG
-    *logofs << "handleEncodeCached: " << store -> name() 
-            << ": Trying to reduce size of message store.\n"
-            << logofs_flush;
-    #endif
-
-    position = store -> clean(use_checksum);
-
-    if (position == nothing)
-    {
-      #ifdef TEST
-      *logofs << "handleEncodeCached: " << store -> name() 
-              << ": WARNING! No message found to be "
-              << "actually removed.\n" << logofs_flush;
-      #endif
-
-      break;
-    }
-
-    #ifdef DEBUG
-    *logofs << "handleEncodeCached: " << store -> name() 
-            << ": Message at position " << position
-            << " will be removed.\n" << logofs_flush;
-    #endif
-
-    //
-    // Encode the position of message to
-    // be discarded.
-    //
-
-    store -> lastRemoved = position;
-
-    // Since ProtoStep7 (#issue 108)
-    encodeBuffer.encodeActionValue(is_removed, store -> lastRemoved,
-                       store -> lastActionCache);
-
-    #ifdef DEBUG
-    *logofs << "handleEncodeCached: " << store -> name() << ": Going to "
-            << "clean up message at position " << position << ".\n" 
-            << logofs_flush;
-    #endif
-
-    store -> remove(position, use_checksum, discard_data);
-
-    #ifdef DEBUG
-    *logofs << "handleEncodeCached: " << store -> name() << ": There are " 
-            << store -> getSize() << " messages in the store out of " 
-            << store -> cacheSlots << " slots.\n" << logofs_flush;
-
-    *logofs << "handleEncodeCached: " << store -> name() 
-            << ": Size of store is " << store -> getLocalStorageSize() 
-            << " bytes locally and " << store -> getRemoteStorageSize() 
-            << " bytes remotely.\n" << logofs_flush;
-
-    *logofs << "handleEncodeCached: " << store -> name() 
-            << ": Size of total cache is " << store -> getLocalTotalStorageSize()
-            << " bytes locally and " << store -> getRemoteTotalStorageSize()
-            << " bytes remotely.\n" << logofs_flush;
-    #endif
-  }
-
-  #ifdef DEBUG
-
-  if (mustCleanStore(store) == 1 && canCleanStore(store) == 0)
-  {
-    *logofs << "handleEncodeCached: " << store -> name() 
-            << ": Store would need a clean but operation will be delayed.\n" 
-            << logofs_flush;
-
-    *logofs << "handleEncodeCached: " << store -> name() << ": There are " 
-            << store -> getSize() << " messages in the store out of " 
-            << store -> cacheSlots << " slots.\n"  << logofs_flush;
-
-    *logofs << "handleEncodeCached: " << store -> name() 
-            << ": Size of store is " << store -> getLocalStorageSize() 
-            << " bytes locally and " << store -> getRemoteStorageSize() 
-            << " bytes remotely.\n" << logofs_flush;
-
-    *logofs << "handleEncodeCached: " << store -> name() 
-            << ": Size of total cache is " << store -> getLocalTotalStorageSize()
-            << " bytes locally and " << store -> getRemoteTotalStorageSize()
-            << " bytes remotely.\n" << logofs_flush;
-  }
-
-  #endif
-
-  //
-  // If 'on the wire' size of message exceeds the
-  // allowed limit then avoid to store it in the
-  // cache.
-  //
-
-  if (store -> validateMessage(buffer, size) == 0)
-  {
-    #ifdef TEST
-    *logofs << "handleEncodeCached: " << store -> name() 
-            << ": Message with size " << size << " ignored.\n" 
-            << logofs_flush;
-    #endif
-
-    // Since ProtoStep7 (#issue 108)
-    encodeBuffer.encodeActionValue(is_discarded,
-                       store -> lastActionCache);
-
-    store -> lastAction = is_discarded;
-
-    return 0;
-  }
-
-  //
-  // Fill the message object with the
-  // received data.
-  //
-
-  Message *message = store -> getTemporary();
-
-  if (message == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "handleEncodeCached: " << store -> name()
-            << ": PANIC! Can't allocate memory for "
-            << "a new message.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Can't allocate memory for "
-         << "a new message in context [D].\n";
-
-    HandleCleanup();
-  }
-
-  //
-  // As we are at encoding side, it is enough to store the
-  // checksum for the object while data can be erased. Both
-  // the identity and the data will never be sent through
-  // the wire again as long as they are stored in the cache
-  // at the decoding side. The split parameter is always
-  // set to 0 as the data will not be stored in any case.
-  //
-
-  store -> parse(message, 0, buffer, size, use_checksum,
-                     discard_data, bigEndian_);
-
-  #ifdef DUMP
-
-  store -> dump(message);
-
-  #endif
-
-  //
-  // Search the object in the message
-  // store. If found get the position.
-  //
-
-  #ifdef DEBUG
-  *logofs << "handleEncodeCached: " << store -> name() 
-          << ": Searching object of size " << size
-          << " in the cache.\n" << logofs_flush;
-  #endif
-
-  int added;
-  int locked;
-
-  position = store -> findOrAdd(message, use_checksum,
-                                    discard_data, added, locked);
-
-  if (position == nothing)
-  {
-    #ifdef WARNING
-    *logofs << "handleEncodeCached: " << store -> name() 
-            << ": WARNING! Can't store object in the cache.\n"
-            << logofs_flush;
-    #endif
-
-    // Since ProtoStep7 (#issue 108)
-    encodeBuffer.encodeActionValue(is_discarded,
-                       store -> lastActionCache);
-
-    store -> lastAction = is_discarded;
-
-    return 0;
-  }
-  else if (locked == 1)
-  {
-    //
-    // We can't issue a cache hit. Encoding identity
-    // differences while message it's being split
-    // would later result in agent to commit a wrong
-    // version of message.
-    //
-
-    #ifdef WARNING
-    *logofs << "handleEncodeCached: " << store -> name() 
-            << ": WARNING! Message of size " << store -> plainSize(position)
-            << " at position " << position << " is locked.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Warning" << ": Message of size " << store -> plainSize(position)
-         << " at position " << position << " is locked.\n";
-
-    // Since ProtoStep7 (#issue 108)
-    encodeBuffer.encodeActionValue(is_discarded,
-                       store -> lastActionCache);
-
-    store -> lastAction = is_discarded;
-
-    return 0;
-  }
-  else if (added == 1)
-  {
-    store -> resetTemporary();
-
-    #ifdef DEBUG
-    *logofs << "handleEncodeCached: " << store -> name() << ": Message of size "
-            << store -> plainSize(position) << " has been stored at position "
-            << position << ".\n" << logofs_flush;
-
-    *logofs << "handleEncodeCached: " << store -> name() << ": There are " 
-            << store -> getSize() << " messages in the store out of " 
-            << store -> cacheSlots << " slots.\n" << logofs_flush;
-
-    *logofs << "handleEncodeCached: " << store -> name() 
-            << ": Size of store is " << store -> getLocalStorageSize() 
-            << " bytes locally and " << store -> getRemoteStorageSize() 
-            << " bytes remotely.\n" << logofs_flush;
-
-    *logofs << "handleEncodeCached: " << store -> name() 
-            << ": Size of total cache is " << store -> getLocalTotalStorageSize()
-            << " bytes locally and " << store -> getRemoteTotalStorageSize()
-            << " bytes remotely.\n" << logofs_flush;
-    #endif
-
-    //
-    // Inform the decoding side that message 
-    // must be inserted in cache and encode
-    // the position where the insertion took
-    // place.
-    //
-
-    store -> lastAction = IS_ADDED;
-
-    store -> lastAdded = position;
-
-    // Since ProtoStep7 (#issue 108)
-    encodeBuffer.encodeActionValue(IS_ADDED, store -> lastAdded,
-                       store -> lastActionCache);
-
-    return 0;
-  }
-  else
-  {
-    #ifdef DEBUG
-    *logofs << "handleEncodeCached: " << store -> name()
-            << ": Cache hit. Found object at position " 
-            << position << ".\n" << logofs_flush;
-    #endif
-
-    //
-    // Must abort the connection if the
-    // the position is invalid.
-    //
-
-    Message *cachedMessage = store -> get(position);
-
-    //
-    // Increase the rating of the cached
-    // message.
-    //
-
-    store -> touch(cachedMessage);
-
-    #ifdef DEBUG
-    *logofs << "handleEncodeCached: " << store -> name() << ": Hits for "
-            << "object at position " << position << " are now " 
-            << store -> getTouches(position) << ".\n"
-            << logofs_flush;
-    #endif
-
-    //
-    // Send to the decoding side position
-    // where object can be found in cache.
-    //
-
-    store -> lastAction = IS_HIT;
-
-    store -> lastHit = position;
-
-    // Since ProtoStep7 (#issue 108)
-    encodeBuffer.encodeActionValue(IS_HIT, store -> lastHit,
-                       store -> lastActionCache);
-
-    //
-    // Send the field by field differences in
-    // respect to the original message stored
-    // in cache.
-    //
-
-    store -> updateIdentity(encodeBuffer, message, cachedMessage, channelCache);
-
-    return 1;
-  }
-}
-
-void Channel::handleUpdateAdded(MessageStore *store, unsigned int dataSize,
-                                    unsigned int compressedDataSize)
-{
-  #ifdef TEST
-
-  if (store -> lastAction != IS_ADDED)
-  {
-    #ifdef PANIC
-    *logofs << "handleUpdateAdded: " << store -> name()
-            << ": PANIC! Function called for action '"
-            << store -> lastAction << "'.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Update function called for "
-         << "store '" << store -> name() << "' with "
-         << "action '" << store -> lastAction
-         << "'.\n";
-
-    HandleCleanup();
-  }
-
-  #endif
-
-  #ifdef DEBUG
-  *logofs << "handleUpdateAdded: " << store -> name() << ": Updating "
-          << "object at position " << store -> lastAdded << " of size "
-          << store -> plainSize(store -> lastAdded) << " (" << dataSize
-          << "/" << compressedDataSize << ").\n" << logofs_flush;
-  #endif
-
-  store -> updateData(store -> lastAdded, dataSize, compressedDataSize);
-
-  #ifdef DEBUG
-  *logofs << "handleUpdateAdded: " << store -> name() << ": There are " 
-          << store -> getSize() << " messages in the store out of " 
-          << store -> cacheSlots << " slots.\n" << logofs_flush;
-
-  *logofs << "handleUpdateAdded: " << store -> name() 
-          << ": Size of store is " << store -> getLocalStorageSize() 
-          << " bytes locally and " << store -> getRemoteStorageSize() 
-          << " bytes remotely.\n" << logofs_flush;
-
-  *logofs << "handleUpdateAdded: " << store -> name() 
-          << ": Size of total cache is " << store -> getLocalTotalStorageSize()
-          << " bytes locally and " << store -> getRemoteTotalStorageSize()
-          << " bytes remotely.\n" << logofs_flush;
-  #endif
-}
-
-int Channel::handleDecodeCached(DecodeBuffer &decodeBuffer, ChannelCache *channelCache,
-                                    MessageStore *store, unsigned char *&buffer,
-                                        unsigned int &size)
-{
-  //
-  // Create a new message object and 
-  // fill it with received data.
-  //
-
-  #ifdef DEBUG
-  *logofs << "handleDecodeCached: " << store -> name() 
-          << ": Going to handle a new message of this class.\n" 
-          << logofs_flush;
-  #endif
-
-  //
-  // Decode bits telling how to handle
-  // this message.
-  //
-
-  unsigned char action;
-  unsigned short int position;
-
-  // Since ProtoStep7 (#issue 108)
-  decodeBuffer.decodeActionValue(action, position,
-                     store -> lastActionCache);
-
-  //
-  // Clean operations must always come 
-  // before any operation on message.
-  //
-
-  while (action == is_removed)
-  {
-    // Since ProtoStep7 (#issue 108)
-    store -> lastRemoved = position;
-
-    #ifdef DEBUG
-
-    if (store -> get(store -> lastRemoved))
-    {
-      *logofs << "handleDecodeCached: " << store -> name() << ": Cleaning up "
-              << "object at position " << store -> lastRemoved
-              << " of size " << store -> plainSize(store -> lastRemoved)
-              << " (" << store -> plainSize(store -> lastRemoved) << "/"
-              << store -> compressedSize(store -> lastRemoved) << ").\n"
-              << logofs_flush;
-    }
-
-    #endif
-
-    //
-    // If the message can't be found we
-    // will abort the connection.
-    //
-
-    store -> remove(store -> lastRemoved, discard_checksum, use_data);
-
-    // Since ProtoStep7 (#issue 108)
-    decodeBuffer.decodeActionValue(action, position,
-                       store -> lastActionCache);
-  }
-
-  //
-  // If it's a cache hit, the position
-  // where object can be found follows.
-  //
-
-  if ((T_store_action) action == IS_HIT)
-  {
-    // Since ProtoStep7 (#issue 108)
-    store -> lastHit = position;
-
-    //
-    // Get data from the cache at given position.
-    //
-
-    #ifdef DEBUG
-
-    if (store -> get(store -> lastHit))
-    {
-      *logofs << "handleDecodeCached: " << store -> name() << ": Retrieving "
-              << "object at position " << store -> lastHit
-              << " of size " << store -> plainSize(store -> lastHit)
-              << " (" << store -> plainSize(store -> lastHit)  << "/"
-              << store -> compressedSize(store -> lastHit) << ").\n"
-              << logofs_flush;
-    }
-
-    #endif
-
-    //
-    // Must abort the connection if the
-    // the position is invalid.
-    //
-
-    Message *message = store -> get(store -> lastHit);
-
-    //
-    // Make room for the outgoing message.
-    //
-
-    size = store -> plainSize(store -> lastHit);
-
-    buffer = writeBuffer_.addMessage(size);
-
-    #ifdef DEBUG
-    *logofs << "handleDecodeCached: " << store -> name() 
-            << ": Prepared an outgoing buffer of " 
-            << size << " bytes.\n" << logofs_flush;
-    #endif
-
-    //
-    // Decode the variant part. Pass client
-    // or server cache to the message store.
-    //
-
-    store -> updateIdentity(decodeBuffer, message, channelCache);
-
-    //
-    // Write each field in the outgoing buffer.
-    //
-
-    store -> unparse(message, buffer, size, bigEndian_);
-
-    #ifdef DUMP
-
-    store -> dump(message);
-
-    #endif
-
-    store -> lastAction = IS_HIT;
-
-    return 1;
-  }
-  else if ((T_store_action) action == IS_ADDED)
-  {
-    // Since ProtoStep7 (#issue 108)
-    store -> lastAdded = position;
-
-    #ifdef DEBUG
-    *logofs << "handleDecodeCached: " << store -> name() 
-            << ": Message will be later stored at position "
-             << store -> lastAdded << ".\n" << logofs_flush;
-    #endif
-
-    store -> lastAction = IS_ADDED;
-
-    return 0;
-  }
-  else
-  {
-    #ifdef DEBUG
-    *logofs << "handleDecodeCached: " << store -> name() 
-            << ": Message will be later discarded.\n"
-            << logofs_flush;
-    #endif
-
-    store -> lastAction = is_discarded;
-
-    return 0;
-  }
-}
-
-void Channel::handleSaveAdded(MessageStore *store, int split, unsigned char *buffer,
-                                  unsigned int size, const unsigned char *compressedData,
-                                      const unsigned int compressedDataSize)
-{
-  #ifdef TEST
-
-  if (store -> lastAction != IS_ADDED)
-  {
-    #ifdef PANIC
-    *logofs << "handleSaveAdded: " << store -> name()
-            << ": PANIC! Function called for action '"
-            << store -> lastAction << "'.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Save function called for "
-         << "store '" << store -> name() << "' with "
-         << "action '" << store -> lastAction
-         << "'.\n";
-
-    HandleCleanup();
-  }
-
-  #endif
-
-  Message *message = store -> getTemporary();
-
-  if (message == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "handleSaveAdded: " << store -> name()
-            << ": PANIC! Can't access temporary storage "
-            << "for message at position " << store -> lastAdded
-            << ".\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Can't access temporary storage "
-         << "for message  at position " << store -> lastAdded
-         << ".\n";
-
-    HandleCleanup();
-  }
-
-  if (compressedData == NULL)
-  {
-    //
-    // If the data part has been split
-    // avoid to copy it into the message.
-    //
-
-    store -> parse(message, split, buffer, size, discard_checksum,
-                       use_data, bigEndian_);
-  }
-  else
-  {
-    store -> parse(message, buffer, size, compressedData, 
-                       compressedDataSize, discard_checksum,
-                           use_data, bigEndian_);
-  }
-
-  if (store -> add(message, store -> lastAdded,
-          discard_checksum, use_data) == nothing)
-  {
-    #ifdef PANIC
-    *logofs << "handleSaveAdded: " << store -> name()
-            << ": PANIC! Can't store message in the cache "
-            << "at position " << store -> lastAdded << ".\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Can't store message of type "
-         << store -> name() << "in the cache at position "
-         << store -> lastAdded << ".\n";
-
-    HandleCleanup();
-  }
-  else
-  {
-    store -> resetTemporary();
-
-    #ifdef DEBUG
-    *logofs << "handleSaveAdded: " << store -> name() << ": Stored "
-            << (compressedData == NULL ? "plain" : "compressed")
-            << " object at position " << store -> lastAdded
-            << " of size " << store -> plainSize(store -> lastAdded)
-            << " (" << store -> plainSize(store -> lastAdded) << "/"
-            << store -> compressedSize(store -> lastAdded) << ").\n"
-            << logofs_flush;
-    #endif
-  }
-
-  #ifdef DEBUG
-  *logofs << "handleSaveAdded: " << store -> name()
-          << ": Size of store is " << store -> getLocalStorageSize()
-          << " bytes locally and " << store -> getRemoteStorageSize()
-          << " bytes remotely.\n" << logofs_flush;
-
-  *logofs << "handleSaveAdded: " << store -> name()
-          << ": Size of total cache is " << store -> getLocalTotalStorageSize()
-          << " bytes locally and " << store -> getRemoteTotalStorageSize()
-          << " bytes remotely.\n" << logofs_flush;
-  #endif
-}
-
-int Channel::handleWait(int timeout)
-{
-  #ifdef TEST
-  *logofs << "handleWait: Going to wait for more data "
-          << "on FD#" << fd_ << " at " << strMsTimestamp()
-          << ".\n" << logofs_flush;
-  #endif
-
-  T_timestamp startTs = getNewTimestamp();
-
-  T_timestamp nowTs = startTs;
-
-  int readable;
-  int remaining;
-
-  for (;;)
-  {
-    remaining = timeout - diffTimestamp(startTs, nowTs);
-
-    if (transport_ -> blocked() == 1)
-    {
-      #ifdef WARNING
-      *logofs << "handleWait: WARNING! Having to drain with "
-              << "channel " << "for FD#" << fd_ << " blocked.\n"
-              << logofs_flush;
-      #endif
-
-      handleDrain(0, remaining);
-
-      continue;
-    }
-
-    if (remaining <= 0)
-    {
-      #ifdef TEST
-      *logofs << "handleWait: Timeout raised while waiting "
-              << "for more data for FD#" << fd_ << " at "
-              << strMsTimestamp() << ".\n"
-              << logofs_flush;
-      #endif
-
-      return 0;
-    }
-
-    #ifdef TEST
-    *logofs << "handleWait: Waiting " << remaining << " Ms "
-            << "for a new message on  FD#" << fd_
-            << ".\n" << logofs_flush;
-    #endif
-
-    readable = transport_ -> wait(remaining);
-
-    if (readable > 0)
-    {
-      #ifdef TEST
-      *logofs << "handleWait: WARNING! Encoding more data "
-              << "for FD#" << fd_ << " at " << strMsTimestamp()
-              << ".\n" << logofs_flush;
-      #endif
-
-      if (proxy -> handleAsyncRead(fd_) < 0)
-      {
-        return -1;
-      }
-
-      return 1;
-    }
-    else if (readable == -1)
-    {
-      return -1;
-    }
-
-    nowTs = getNewTimestamp();
-  }
-}
-
-int Channel::handleDrain(int limit, int timeout)
-{
-  #ifdef TEST
-  *logofs << "handleDrain: Going to drain FD#" << fd_
-          << " with a limit of " << limit << " bytes "
-          << "at " << strMsTimestamp() << ".\n"
-          << logofs_flush;
-  #endif
-
-  T_timestamp startTs = getNewTimestamp();
-
-  T_timestamp nowTs = startTs;
-
-  int drained;
-  int remaining;
-
-  int result;
-
-  for (;;)
-  {
-    remaining = timeout - diffTimestamp(startTs, nowTs);
-
-    if (remaining <= 0)
-    {
-      #ifdef TEST
-      *logofs << "handleDrain: Timeout raised while draining "
-              << "FD#" << fd_ << " at " << strMsTimestamp()
-              << ".\n" << logofs_flush;
-      #endif
-
-      result = 0;
-
-      goto ChannelDrainEnd;
-    }
-
-    #ifdef TEST
-    *logofs << "handleDrain: Trying to write to FD#"
-            << fd_ << " with " << remaining << " Ms "
-            << "remaining.\n" << logofs_flush;
-    #endif
-
-    drained = transport_ -> drain(limit, remaining);
-
-    if (drained == 1)
-    {
-      #ifdef TEST
-      *logofs << "handleDrain: Transport for FD#" << fd_
-              << " drained to " << transport_ -> length()
-              << " bytes at " << strMsTimestamp() << ".\n"
-              << logofs_flush;
-      #endif
-
-      result = 1;
-
-      goto ChannelDrainEnd;
-    }
-    else if (drained == 0 && transport_ -> readable() > 0)
-    {
-      #ifdef TEST
-      *logofs << "handleDrain: WARNING! Encoding more data "
-              << "for FD#" << fd_ << " at " << strMsTimestamp()
-              << ".\n" << logofs_flush;
-      #endif
-
-      if (proxy -> handleAsyncRead(fd_) < 0)
-      {
-        goto ChannelDrainError;
-      }
-    }
-    else if (drained == -1)
-    {
-      goto ChannelDrainError;
-    }
-
-    nowTs = getNewTimestamp();
-
-    if (diffTimestamp(startTs, nowTs) >= control -> ChannelTimeout)
-    {
-      int seconds = (remaining + control -> LatencyTimeout * 10) / 1000;
-
-      #ifdef WARNING
-      *logofs << "handleDrain: WARNING! Could not drain FD#"
-              << fd_ << " within " << seconds << " seconds.\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Warning" << ": Can't write to connection on FD#"
-           << fd_ << " since " << seconds << " seconds.\n";
-
-      if (alert_ == 0)
-      {
-        if (control -> ProxyMode == proxy_client)
-        {
-          alert_ = CLOSE_DEAD_X_CONNECTION_CLIENT_ALERT;
-        }
-        else
-        {
-          alert_ = CLOSE_DEAD_X_CONNECTION_SERVER_ALERT;
-        }
-
-        HandleAlert(alert_, 1);
-      }
-    }
-  }
-
-ChannelDrainEnd:
-
-  //
-  // Maybe we drained the channel and are
-  // now out of the congestion state.
-  //
-
-  handleCongestion();
-
-  return result;
-
-ChannelDrainError:
-
-  finish_ = 1;
-
-  return -1;
-}
-
-int Channel::handleCongestion()
-{
-  //
-  // Send a begin congestion control code
-  // if the local end of the channel does
-  // not consume its data.
-  //
-
-  if (isCongested() == 1)
-  {
-    if (congestion_ == 0)
-    {
-      #if defined(TEST) || defined(INFO)
-      *logofs << "handleCongestion: Sending congestion for FD#"
-              << fd_ << " with length " << transport_ -> length()
-              << " at " << strMsTimestamp() << ".\n"
-              << logofs_flush;
-      #endif
-
-      congestion_ = 1;
-
-      //
-      // Use the callback to send the control
-      // code immediately.
-      //
-
-      if (proxy -> handleAsyncCongestion(fd_) < 0)
-      {
-        finish_ = 1;
-
-        return -1;
-      }
-    }
-  }
-  else
-  {
-    //
-    // If the channel was in congestion state
-    // send an end congestion control code.
-    //
-
-    if (congestion_ == 1)
-    {
-      #if defined(TEST) || defined(INFO)
-      *logofs << "handleCongestion: Sending decongestion for FD#"
-              << fd_ << " with length " << transport_ -> length()
-              << " at " << strMsTimestamp() << ".\n"
-              << logofs_flush;
-      #endif
-
-      congestion_ = 0;
-
-      if (proxy -> handleAsyncDecongestion(fd_) < 0)
-      {
-        finish_ = 1;
-
-        return -1;
-      }
-    }
-
-    //
-    // Remove the "channel unresponsive"
-    // dialog.
-    //
-
-    if (alert_ != 0)
-    {
-      #if defined(TEST) || defined(INFO)
-      *logofs << "handleCongestion: Displacing the dialog "
-              << "for FD#" << fd_ << ".\n" << logofs_flush;
-      #endif
-
-      HandleAlert(DISPLACE_MESSAGE_ALERT, 1);
-    }
-  }
-
-  return 1;
-}
-
-int Channel::handleFlush(T_flush type, int bufferLength, int scratchLength)
-{
-  if (finish_ == 1)
-  {
-    #ifdef TEST
-    *logofs << "handleFlush: Not flushing data for "
-            << "finishing channel for FD#" << fd_
-            << ".\n" << logofs_flush;
-    #endif
-
-    writeBuffer_.fullReset();
-
-    return -1;
-  }
-
-  #ifdef TEST
-  *logofs << "handleFlush: Flushing " << bufferLength
-          << " + " << scratchLength << " bytes "
-          << "to FD#" << fd_ << ".\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // Check if the channel has data available.
-  // Recent Linux kernels are very picky.
-  // They require that we read often or they
-  // assume that the process is non-interact-
-  // ive.
-  //
-
-  int result = 0;
-
-  if (handleAsyncEvents() < 0)
-  {
-    goto ChannelFlushError;
-  }
-
-  //
-  // Write the data in the main buffer first,
-  // followed by the data in the scratch buffer.
-  //
-
-  if (bufferLength > 0)
-  {
-    result = transport_ -> write(write_immediate,
-                                     writeBuffer_.getData(), bufferLength);
-  }
-
-  if (result >= 0 && scratchLength > 0)
-  {
-    result = transport_ -> write(write_immediate,
-                                     writeBuffer_.getScratchData(), scratchLength);
-  }
-
-  if (type == flush_if_any)
-  {
-    writeBuffer_.fullReset();
-  }
-  else
-  {
-    writeBuffer_.partialReset();
-  }
-
-  //
-  // If we failed to write to the X connection then
-  // set the finish flag. The caller should continue
-  // to handle all the remaining messages or it will
-  // corrupt the decode buffer. At the real end, an
-  // error will be propagated to the upper layers
-  // which will perform any needed cleanup.
-  //
-
-  if (result < 0)
-  {
-    goto ChannelFlushError;
-  }
-
-  //
-  // Reset transport buffers.
-  //
-
-  transport_ -> partialReset();
-
-  //
-  // Check if the X server has generated
-  // any event in response to our data.
-  //
-
-  if (handleAsyncEvents() < 0)
-  {
-    goto ChannelFlushError;
-  }
-
-  //
-  // Check if the channel has entered in
-  // congestion state and, in this case,
-  // send an immediate congestion control
-  // code to the remote.
-  //
-
-  handleCongestion();
-
-  //
-  // We could optionally drain the output
-  // buffer if this is X11 channel.
-  //
-  // if (isCongested() == 1 && isReliable() == 1)
-  // {
-  //   if (handleDrain(0, control -> ChannelTimeout) < 0)
-  //   {
-  //     goto ChannelFlushError;
-  //   }
-  // }
-  //
-
-  return 1;
-
-ChannelFlushError:
-
-  finish_ = 1;
-
-  return -1;
-}
-
-int Channel::handleFlush()
-{
-  #ifdef TEST
-  *logofs << "handleFlush: Flushing "
-          << transport_ -> length() << " bytes to FD#"
-          << fd_ << " with descriptor writable.\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // Check if there is anything to read
-  // before anf after having written to
-  // the socket.
-  //
-
-  if (handleAsyncEvents() < 0)
-  {
-    goto ChannelFlushError;
-  }
-
-  if (transport_ -> flush() < 0)
-  {
-    #ifdef TEST
-    *logofs << "handleFlush: Failure detected "
-            << "flushing data to FD#" << fd_
-            << ".\n" << logofs_flush;
-    #endif
-
-    goto ChannelFlushError;
-  }
-
-  if (handleAsyncEvents() < 0)
-  {
-    goto ChannelFlushError;
-  }
-
-  //
-  // Reset channel's transport buffers.
-  //
-
-  transport_ -> partialReset();
-
-  //
-  // Check if the channel went out of the
-  // congestion state.
-  //
-
-  handleCongestion();
-
-  return 1;
-
-ChannelFlushError:
-
-  finish_ = 1;
-
-  return -1;
-}
-
-void Channel::handleResetAlert()
-{
-  if (alert_ != 0)
-  {
-    #ifdef TEST
-    *logofs << "handleResetAlert: The channel alert '"
-            << alert_ << "' was displaced.\n"
-            << logofs_flush;
-    #endif
-
-    alert_ = 0;
-  }
-}
-
-int Channel::handleCompress(EncodeBuffer &encodeBuffer, const unsigned char opcode,
-                                const unsigned int offset, const unsigned char *buffer,
-                                    const unsigned int size, unsigned char *&compressedData,
-                                        unsigned int &compressedDataSize)
-{
-  if (size <= offset)
-  {
-    #ifdef DEBUG
-    *logofs << "handleCompress: Not compressing data for FD#" << fd_
-            << " as offset is " << offset << " with data size "
-            << size << ".\n" << logofs_flush;
-    #endif
-
-    return 0;
-  }
-
-  #ifdef DEBUG
-  *logofs << "handleCompress: Compressing data for FD#" << fd_
-          << " with data size " << size << " and offset "
-          << offset << ".\n" << logofs_flush;
-  #endif
-
-  //
-  // It is responsibility of the compressor to
-  // mark the buffer as such if the compression
-  // couldn't take place.
-  //
-
-  if (compressor_ -> compressBuffer(buffer + offset, size - offset, compressedData,
-                                        compressedDataSize, encodeBuffer) <= 0)
-  {
-    #ifdef DEBUG
-    *logofs << "handleCompress: Sent " << size - offset
-            << " bytes of plain data for FD#" << fd_
-            << ".\n" << logofs_flush;
-    #endif
-
-    return 0;
-  }
-  else
-  {
-    #ifdef DEBUG
-    *logofs << "handleCompress: Sent " << compressedDataSize
-            << " bytes of compressed data for FD#"
-            << fd_ << ".\n" << logofs_flush;
-    #endif
-
-    return 1;
-  }
-}
-
-int Channel::handleDecompress(DecodeBuffer &decodeBuffer, const unsigned char opcode,
-                                  const unsigned int offset, unsigned char *buffer,
-                                      const unsigned int size, const unsigned char *&compressedData,
-                                          unsigned int &compressedDataSize)
-{
-  if (size <= offset)
-  {
-    return 0;
-  }
-
-  int result = compressor_ -> decompressBuffer(buffer + offset, size - offset,
-                                                   compressedData, compressedDataSize,
-                                                       decodeBuffer);
-  if (result < 0)
-  {
-    #ifdef PANIC
-    *logofs << "handleDecompress: PANIC! Failed to decompress "
-            << size - offset << " bytes of data for FD#" << fd_
-            << " with OPCODE#" << (unsigned int) opcode << ".\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Data decompression failed for OPCODE#"
-         << (unsigned int) opcode << ".\n";
-
-    return -1;
-  }
-  else if (result == 0)
-  {
-    #ifdef DEBUG
-    *logofs << "handleDecompress: Received " << size - offset
-            << " bytes of plain data for FD#" << fd_
-            << ".\n" << logofs_flush;
-    #endif
-
-    return 0;
-  }
-  else
-  {
-    #ifdef DEBUG
-    *logofs << "handleDecompress: Received " << compressedDataSize
-            << " bytes of compressed data for FD#" << fd_
-            << ".\n" << logofs_flush;
-    #endif
-
-    return 1;
-  }
-}
-
-int Channel::handleCleanAndNullRequest(unsigned char &opcode, unsigned char *&buffer,
-                                           unsigned int &size)
-{
-  #ifdef TEST
-  *logofs << "handleCleanAndNullRequest: Removing the previous data "
-          << "and sending an X_NoOperation " << "for FD#" << fd_
-          << " due to OPCODE#" << (unsigned int) opcode << " ("
-          << DumpOpcode(opcode) << ").\n" << logofs_flush;
-  #endif
-
-  writeBuffer_.removeMessage(size - 4);
-
-  size   = 4;
-  opcode = X_NoOperation;
-
-  return 1;
-}
-
-int Channel::handleNullRequest(unsigned char &opcode, unsigned char *&buffer,
-                                   unsigned int &size)
-{
-  #ifdef TEST
-  *logofs << "handleNullRequest: Sending an X_NoOperation for FD#"
-          << fd_ << " due to OPCODE#" << (unsigned int) opcode
-          << " (" << DumpOpcode(opcode) << ").\n"
-          << logofs_flush;
-  #endif
-
-  size   = 4;
-  buffer = writeBuffer_.addMessage(size);
-  opcode = X_NoOperation;
-
-  return 1;
-}
-
-void Channel::handleSplitStoreError(int resource)
-{
-  if (resource < 0 || resource >= CONNECTIONS_LIMIT)
-  {
-    #ifdef PANIC
-    *logofs << "handleSplitStoreError: PANIC! Resource "
-            << resource << " is out of range with limit "
-            << "set to " << CONNECTIONS_LIMIT << ".\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Resource " << resource
-         << " is out of range with limit set to "
-         << CONNECTIONS_LIMIT << ".\n";
-
-    HandleCleanup();
-  }
-  else
-  {
-    #ifdef PANIC
-    *logofs << "handleSplitStoreError: PANIC! Cannot "
-            << "allocate the split store for resource "
-            << resource << ".\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Cannot allocate the "
-         << "split store for resource " << resource
-         << ".\n";
-
-    HandleCleanup();
-  }
-}
-
-void Channel::handleSplitStoreAlloc(List *list, int resource)
-{
-  if (resource < 0 || resource >= CONNECTIONS_LIMIT)
-  {
-    handleSplitStoreError(resource);
-  }
-
-  if (clientStore_ -> getSplitStore(resource) == NULL)
-  {
-    #if defined(TEST) || defined(SPLIT)
-    *logofs << "handleSplitStoreAlloc: Allocating a new "
-            << "split store for resource " << resource
-            << ".\n" << logofs_flush;
-    #endif
-
-    SplitStore *splitStore = clientStore_ -> createSplitStore(resource);
-
-    if (splitStore == NULL)
-    {
-      handleSplitStoreError(resource);
-    }
-
-    list -> add(resource);
-  }
-  #if defined(TEST) || defined(SPLIT)
-  else
-  {
-    //
-    // Old proxy versions only use a single
-    // split store.
-    //
-
-    if (resource != 0)
-    {
-      *logofs << "handleSplitStoreAlloc: WARNING! A split "
-              << "store for resource " << resource
-              << " already exists.\n" << logofs_flush;
-    }
-  }
-  #endif
-}
-
-void Channel::handleSplitStoreRemove(List *list, int resource)
-{
-  if (resource < 0 || resource >= CONNECTIONS_LIMIT)
-  {
-    handleSplitStoreError(resource);
-  }
-
-  SplitStore *splitStore = clientStore_ -> getSplitStore(resource);
-
-  if (splitStore != NULL)
-  {
-    #if defined(TEST) || defined(SPLIT)
-    *logofs << "handleSplitStoreRemove: Deleting the "
-            << "split store for resource " << resource
-            << ".\n" << logofs_flush;
-    #endif
-
-    clientStore_ -> destroySplitStore(resource);
-
-    #if defined(TEST) || defined(SPLIT)
-    *logofs << "handleSplitStoreRemove: Deleting resource "
-            << resource << " from the list " << ".\n"
-            << logofs_flush;
-    #endif
-
-    list -> remove(resource);
-  }
-  #if defined(TEST) || defined(SPLIT)
-  else
-  {
-    *logofs << "handleSplitStoreRemove: WARNING! A split "
-            << "store for resource " << resource
-            << " does not exist.\n" << logofs_flush;
-  }
-  #endif
-}
-
-Split *Channel::handleSplitCommitRemove(int request, int resource, int position)
-{
-  #if defined(TEST) || defined(SPLIT)
-  *logofs << "handleSplitCommitRemove: SPLIT! Checking split "
-          << "commit with resource " << resource << " request "
-          << request << " and position " << position
-          << ".\n" << logofs_flush;
-  #endif
-
-  //
-  // Remove the split from the split queue.
-  //
-
-  CommitStore *commitStore = clientStore_ -> getCommitStore();
-
-  Split *split = commitStore -> pop();
-
-  if (split == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "handleSplitCommitRemove: PANIC! Can't "
-            << "find the split in the commit queue.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Can't find the "
-         << "split in the commit queue.\n";
-
-    HandleCleanup();
-  }
-
-  #if defined(TEST) || defined(SPLIT)
-  *logofs << "handleSplitCommitRemove: SPLIT! Element from "
-          << "the queue has resource " << split -> getResource()
-          << " request " << split -> getRequest() << " and "
-          << "position " << split -> getPosition()
-          << ".\n" << logofs_flush;
-  #endif
-
-  // Since ProtoStep7 (#issue 108)
-  if (resource != split -> getResource() ||
-           request != split -> getRequest() ||
-               position != split -> getPosition())
-  {
-    #ifdef PANIC
-    *logofs << "handleSplitCommitRemove: PANIC! The data in "
-            << "the split doesn't match the commit request.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": The data in the split doesn't "
-         << "match the commit request.\n";
-
-    return NULL;
-  }
-
-  #if defined(TEST) || defined(SPLIT)
-
-  commitStore -> dump();
-
-  #endif
-
-  return split;
-}
-
-int Channel::setReferences()
-{
-  #ifdef TEST
-  *logofs << "Channel: Initializing the static "
-          << "members for the base class.\n"
-          << logofs_flush;
-  #endif
-
-  firstClient_ = -1;
-
-  fontPort_ = -1;
-
-  #ifdef REFERENCES
-
-  references_ = 0;
-
-  #endif
-
-  return 1;
-}
-
-int Channel::setOpcodes(OpcodeStore *opcodeStore)
-{
-  opcodeStore_ = opcodeStore;
-
-  #ifdef TEST
-  *logofs << "setOpcodes: Propagated opcodes store to channel "
-          << "for FD#" << fd_ << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int Channel::setStores(ClientStore *clientStore, ServerStore *serverStore)
-{
-  clientStore_ = clientStore;
-  serverStore_ = serverStore;
-
-  #ifdef TEST
-  *logofs << "setStores: Propagated message stores to channel "
-          << "for FD#" << fd_ << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int Channel::setCaches(ClientCache *clientCache, ServerCache *serverCache)
-{
-  clientCache_ = clientCache;
-  serverCache_ = serverCache;
-
-  #ifdef TEST
-  *logofs << "setCaches: Propagated encode caches to channel "
-          << "for FD#" << fd_ << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
diff --git a/nxcomp/Channel.h b/nxcomp/Channel.h
deleted file mode 100644
index 93b022630..000000000
--- a/nxcomp/Channel.h
+++ /dev/null
@@ -1,664 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef Channel_H
-#define Channel_H
-
-#include "Transport.h"
-
-#include "WriteBuffer.h"
-
-#include "OpcodeStore.h"
-
-#include "ClientStore.h"
-#include "ServerStore.h"
-
-#include "ClientCache.h"
-#include "ServerCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-//
-// Forward declaration of referenced classes.
-//
-
-class List;
-
-class StaticCompressor;
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-//
-// Define this to log a line when a channel
-// is created or destroyed.
-//
-
-#undef  REFERENCES
-
-//
-// Type of traffic carried by channel.
-//
-
-typedef enum
-{
-  channel_none = -1,
-  channel_x11,
-  channel_cups,
-  channel_smb,
-  channel_media,
-  channel_http,
-  channel_font,
-  channel_slave,
-  channel_last_tag
-
-} T_channel_type;
-
-//
-// Type of notification event to be sent
-// by proxy to the X channel.
-//
-
-typedef enum
-{
-  notify_no_split,
-  notify_start_split,
-  notify_commit_split,
-  notify_end_split,
-  notify_empty_split,
-
-} T_notification_type;
-
-class Channel
-{
-  public:
-
-  //
-  // Maximum number of X connections supported.
-  //
-
-  static const int CONNECTIONS_LIMIT = 256;
-
-  Channel(Transport *transport, StaticCompressor *compressor);
-
-  virtual ~Channel();
-
-  //
-  // Read any X message available on the X
-  // connection and encode it to the encode
-  // buffer.
-  //
-
-  virtual int handleRead(EncodeBuffer &encodeBuffer, const unsigned char *message,
-                             unsigned int length) = 0;
-
-  //
-  // Decode any X message encoded in the
-  // proxy message and write it to the X
-  // connection.
-  //
-
-  virtual int handleWrite(const unsigned char *message, unsigned int length) = 0;
-
-  //
-  // Other methods to be implemented in
-  // client, server and generic channel
-  // classes.
-  //
-
-  virtual int handleSplit(EncodeBuffer &encodeBuffer, MessageStore *store,
-                              T_store_action action, int position, const unsigned char opcode,
-                                  const unsigned char *buffer, const unsigned int size) = 0;
-
-  virtual int handleSplit(DecodeBuffer &decodeBuffer, MessageStore *store,
-                              T_store_action action, int position, unsigned char &opcode,
-                                  unsigned char *&buffer, unsigned int &size) = 0;
-
-  virtual int handleSplit(EncodeBuffer &encodeBuffer) = 0;
-
-  virtual int handleSplit(DecodeBuffer &decodeBuffer) = 0;
-
-  virtual int handleSplitEvent(EncodeBuffer &encodeBuffer, Split *split) = 0;
-
-  virtual int handleSplitEvent(DecodeBuffer &decodeBuffer) = 0;
-
-  virtual int handleMotion(EncodeBuffer &encodeBuffer) = 0;
-
-  virtual int handleCompletion(EncodeBuffer &encodeBuffer) = 0;
-
-  virtual int handleConfiguration() = 0;
-
-  virtual int handleFinish() = 0;
-
-  //
-  // Interleave reads of the available
-  // events while writing data to the
-  // channel socket.
-  //
-
-  virtual int handleAsyncEvents() = 0;
-
-  //
-  // Handle the channel tear down.
-  //
-
-  int handleClosing()
-  {
-    closing_ = 1;
-
-    return 1;
-  }
-
-  int handleDrop()
-  {
-    drop_ = 1;
-
-    return 1;
-  }
-
-  //
-  // Try to read more data from the socket. In
-  // the meanwhile flush any enqueued data if
-  // the channel is blocked. Return as soon as
-  // more data has been read or the timeout has
-  // been exceeded.
-  //
-
-  int handleWait(int timeout);
-
-  //
-  // Drain the output buffer while handling the
-  // data that may become readable.
-  //
-
-  int handleDrain(int timeout, int limit);
-
-  //
-  // Flush any remaining data in the transport
-  // buffer.
-  //
-
-  int handleFlush();
-
-  //
-  // Called when the loop has replaced or
-  // closed a previous alert.
-  //
-
-  void handleResetAlert();
-
-  //
-  // Initialize all the static members.
-  //
-
-  static int setReferences();
-
-  //
-  // Set pointer to object mapping opcodes
-  // of NX specific messages.
-  //
-
-  int setOpcodes(OpcodeStore *opcodeStore);
-
-  //
-  // Update pointers to message stores in
-  // channels.
-  //
-
-  int setStores(ClientStore *clientStore, ServerStore *serverStore);
-
-  //
-  // The same for channels caches.
-  //
-
-  int setCaches(ClientCache *clientCache, ServerCache *serverCache);
-
-  //
-  // Set the port used for tunneling of the
-  // font server connections.
-  //
-
-  void setPorts(int fontPort)
-  {
-    fontPort_ = fontPort;
-  }
-
-  //
-  // Check if there are pending split 
-  // to send to the remote side.
-  //
-
-  virtual int needSplit() const = 0;
-
-  //
-  // Check if there are motion events
-  // to flush.
-  //
-
-  virtual int needMotion() const = 0;
-
-  //
-  // Return the type of traffic carried
-  // by this channel.
-  //
-
-  virtual T_channel_type getType() const = 0;
-
-  //
-  // Check if the channel has been marked
-  // as closing down.
-  //
-
-  int getFinish() const
-  {
-    return finish_;
-  }
-
-  int getClosing()
-  {
-    return closing_;
-  }
-
-  int getDrop()
-  {
-    return drop_;
-  }
-
-  int getCongestion()
-  {
-    return congestion_;
-  }
-
-  protected:
-
-  int handleFlush(T_flush type)
-  {
-    //
-    // We could write the data immediately if there
-    // is already something queued to the low level
-    // TCP buffers.
-    //
-    // if (... || transport_ -> queued() > 0)
-    // {
-    //   ...
-    // }
-    //
-
-    if (writeBuffer_.getScratchLength() > 0 ||
-          (type == flush_if_any && writeBuffer_.getLength() > 0) ||
-              writeBuffer_.getLength() >= (unsigned int)
-                  control -> TransportFlushBufferSize)
-    {
-      return handleFlush(type, writeBuffer_.getLength(),
-                             writeBuffer_.getScratchLength());
-    }
-
-    return 0;
-  }
-
-  //
-  // Actually flush the data to the
-  // channel descriptor.
-  //
-
-  int handleFlush(T_flush type, int bufferLength, int scratchLength);
-
-  //
-  // Handle the congestion changes.
-  //
-
-  int handleCongestion();
-
-  //
-  // Encode and decode X messages.
-  //
-
-  int handleEncode(EncodeBuffer &encodeBuffer, ChannelCache *channelCache,
-                       MessageStore *store, const unsigned char opcode,
-                           const unsigned char *buffer, const unsigned int size);
-
-  int handleDecode(DecodeBuffer &decodeBuffer, ChannelCache *channelCache,
-                       MessageStore *store, unsigned char &opcode,
-                           unsigned char *&buffer, unsigned int &size);
-
-  //
-  // Encode the message based on its
-  // message store.
-  //
-
-  int handleEncodeCached(EncodeBuffer &encodeBuffer, ChannelCache *channelCache,
-                             MessageStore *store,  const unsigned char *buffer,
-                                 const unsigned int size);
-
-  int handleDecodeCached(DecodeBuffer &decodeBuffer, ChannelCache *channelCache,
-                             MessageStore *store, unsigned char *&buffer,
-                                 unsigned int &size);
-
-  int handleEncodeIdentity(EncodeBuffer &encodeBuffer, ChannelCache *channelCache,
-                               MessageStore *store, const unsigned char *buffer,
-                                   const unsigned int size, int bigEndian)
-  {
-    return (store -> encodeIdentity(encodeBuffer, buffer, size,
-                                        bigEndian, channelCache));
-  }
-
-  int handleDecodeIdentity(DecodeBuffer &decodeBuffer, ChannelCache *channelCache,
-                               MessageStore *store, unsigned char *&buffer,
-                                   unsigned int &size, int bigEndian,
-                                       WriteBuffer *writeBuffer)
-  {
-    return (store -> decodeIdentity(decodeBuffer, buffer, size, bigEndian,
-                                        writeBuffer, channelCache));
-  }
-
-  //
-  // Other utility functions used by
-  // the encoding and decoding methods.
-  //
-
-  void handleCopy(EncodeBuffer &encodeBuffer, const unsigned char opcode,
-                      const unsigned int offset, const unsigned char *buffer,
-                          const unsigned int size)
-  {
-    if (size > offset)
-    {
-      encodeBuffer.encodeMemory(buffer + offset, size - offset);
-    }
-  }
-
-  void handleCopy(DecodeBuffer &decodeBuffer, const unsigned char opcode,
-                      const unsigned int offset, unsigned char *buffer,
-                          const unsigned int size)
-  {
-    if (size > offset)
-    {
-      memcpy(buffer + offset, decodeBuffer.decodeMemory(size - offset), size - offset);
-    }
-  }
-
-  void handleUpdate(MessageStore *store, const unsigned int dataSize,
-                        const unsigned int compressedDataSize)
-  {
-    if (store -> lastAction == IS_ADDED)
-    {
-      handleUpdateAdded(store, dataSize, compressedDataSize);
-    }
-  }
-
-  void handleSave(MessageStore *store, unsigned char *buffer, unsigned int size,
-                      const unsigned char *compressedData = NULL,
-                          const unsigned int compressedDataSize = 0)
-  {
-    if (store -> lastAction == IS_ADDED)
-    {
-      handleSaveAdded(store, 0, buffer, size, compressedData, compressedDataSize);
-    }
-  }
-
-  void handleSaveSplit(MessageStore *store, unsigned char *buffer,
-                          unsigned int size)
-  {
-    if (store -> lastAction == IS_ADDED)
-    {
-      return handleSaveAdded(store, 1, buffer, size, 0, 0);
-    }
-  }
-
-  void handleUpdateAdded(MessageStore *store, const unsigned int dataSize,
-                             const unsigned int compressedDataSize);
-
-  void handleSaveAdded(MessageStore *store, int split, unsigned char *buffer,
-                           unsigned int size, const unsigned char *compressedData,
-                               const unsigned int compressedDataSize);
-
-  //
-  // Compress the data part of a message
-  // using ZLIB or another compressor
-  // and send it over the network.
-  //
-
-  int handleCompress(EncodeBuffer &encodeBuffer, const unsigned char opcode,
-                         const unsigned int offset, const unsigned char *buffer,
-                             const unsigned int size, unsigned char *&compressedData,
-                                 unsigned int &compressedDataSize);
-
-  int handleDecompress(DecodeBuffer &decodeBuffer, const unsigned char opcode,
-                           const unsigned int offset, unsigned char *buffer,
-                               const unsigned int size, const unsigned char *&compressedData,
-                                   unsigned int &compressedDataSize);
-
-  //
-  // Send an X_NoOperation to the X server.
-  // The second version also removes any
-  // previous data in the write buffer.
-  //
-
-  int handleNullRequest(unsigned char &opcode, unsigned char *&buffer,
-                            unsigned int &size);
-
-  int handleCleanAndNullRequest(unsigned char &opcode, unsigned char *&buffer,
-                                    unsigned int &size);
-
-  //
-  // X11 channels are considered to be in
-  // congestion state when there was a
-  // blocking write and, since then, the
-  // local end didn't consume all the data.
-  //
-
-  virtual int isCongested()
-  {
-    return (transport_ -> getType() !=
-                transport_agent && transport_ -> length() >
-                    control -> TransportFlushBufferSize);
-  }
-
-  virtual int isReliable()
-  {
-    return 1;
-  }
-
-  //
-  // Determine how to handle allocation
-  // of new messages in the message
-  // stores.
-  //
-
-  int mustCleanStore(MessageStore *store)
-  {
-    return (store -> getRemoteTotalStorageSize() > control ->
-                RemoteTotalStorageSize || store -> getLocalTotalStorageSize() >
-                    control -> LocalTotalStorageSize || (store -> getRemoteStorageSize() >
-                        (control -> RemoteTotalStorageSize / 100 * store ->
-                            cacheThreshold)) || (store -> getLocalStorageSize() >
-                                (control -> LocalTotalStorageSize / 100 * store ->
-                                    cacheThreshold)));
-  }
-
-  int canCleanStore(MessageStore *store)
-  {
-    return ((store -> getSize() > 0 && (store -> getRemoteStorageSize() >
-                (control -> RemoteTotalStorageSize / 100 * store ->
-                    cacheLowerThreshold))) || (store -> getLocalStorageSize() >
-                        (control -> LocalTotalStorageSize / 100 *  store ->
-                            cacheLowerThreshold)));
-  }
-
-  protected:
-
-  //
-  // Set up the split stores.
-  //
-
-  void handleSplitStoreError(int resource);
-
-  void handleSplitStoreAlloc(List *list, int resource);
-  void handleSplitStoreRemove(List *list, int resource);
-
-  Split *handleSplitCommitRemove(int request, int resource, int position);
-
-  void validateSize(const char *name, int input, int output,
-                        int offset, int size)
-  {
-    if (size < offset || size > control -> MaximumMessageSize ||
-           size != (int) RoundUp4(input) + offset ||
-               output > control -> MaximumMessageSize)
-    {
-      *logofs << "Channel: PANIC! Invalid size " << size
-              << " for " << name << " output with data "
-              << input << "/" << output << "/" << offset
-              << "/" << size << ".\n" << logofs_flush;
-
-      cerr << "Error" << ": Invalid size " << size
-           << " for " << name << " output.\n";
-
-      HandleAbort();
-    }
-  }
-
-  //
-  // Is the X client big endian?
-  //
-
-  int bigEndian() const
-  {
-    return bigEndian_;
-  }
-
-  int bigEndian_;
-
-  //
-  // Other X server's features
-  // saved at session startup.
-  //
-
-  unsigned int imageByteOrder_;
-  unsigned int bitmapBitOrder_;
-  unsigned int scanlineUnit_;
-  unsigned int scanlinePad_;
-
-  int firstRequest_;
-  int firstReply_;
-
-  //
-  // Use this class for IO operations.
-  //
-
-  Transport *transport_;
-
-  //
-  // The static compressor is created by the
-  // proxy and shared among channels.
-  //
-
-  StaticCompressor *compressor_;
-
-  //
-  // Map NX operations to opcodes. Propagated
-  // by proxy to all channels on the same X
-  // server.
-  //
-
-  OpcodeStore *opcodeStore_;
- 
-  //
-  // Also stores are shared between channels.
-  //
-
-  ClientStore *clientStore_;
-  ServerStore *serverStore_;
-
-  //
-  // Caches are specific for each channel.
-  //
-
-  ClientCache *clientCache_;
-  ServerCache *serverCache_;
-
-  //
-  // Data going to X connection.
-  //
-
-  WriteBuffer writeBuffer_;
-
-  //
-  // Other data members.
-  //
-
-  int fd_;
-
-  int finish_;
-  int closing_;
-  int drop_;
-  int congestion_;
-  int priority_;
-
-  int alert_;
-
-  //
-  // It will be set to the descriptor of the
-  // first X channel that is successfully con-
-  // nected and will print an info message on
-  // standard error.
-  //
-
-  static int firstClient_;
-
-  //
-  // Port used for font server connections.
-  //
-
-  static int fontPort_;
-
-  //
-  // Track which cache operations have been
-  // enabled by the agent.
-  //
-
-  int enableCache_;
-  int enableSplit_;
-  int enableSave_;
-  int enableLoad_;
-
-  //
-  // Keep track of object creation and
-  // deletion.
-  //
-
-  #ifdef REFERENCES
-
-  static int references_;
-
-  #endif
-};
-
-#endif /* Channel_H */
diff --git a/nxcomp/ChannelCache.cpp b/nxcomp/ChannelCache.cpp
deleted file mode 100644
index 5c4c360b9..000000000
--- a/nxcomp/ChannelCache.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "ChannelCache.h"
-
-const unsigned int CONFIGUREWINDOW_FIELD_WIDTH[7] =
-{
-  16,     // x
-  16,     // y
-  16,     // width
-  16,     // height
-  16,     // border width
-  29,     // sibling window
-  3       // stack mode
-};
-
-const unsigned int CREATEGC_FIELD_WIDTH[23] =
-{
-  4,      // function
-  32,     // plane mask
-  32,     // foreground
-  32,     // background
-  16,     // line width
-  2,      // line style
-  2,      // cap style
-  2,      // join style
-  2,      // fill style
-  1,      // fill rule
-  29,     // tile
-  29,     // stipple
-  16,     // tile/stipple x origin
-  16,     // tile/stipple y origin
-  29,     // font
-  1,      // subwindow mode
-  1,      // graphics exposures
-  16,     // clip x origin
-  16,     // clip y origin
-  29,     // clip mask
-  16,     // card offset
-  8,      // dashes
-  1       // arc mode
-};
diff --git a/nxcomp/ChannelCache.h b/nxcomp/ChannelCache.h
deleted file mode 100644
index 6a29c3847..000000000
--- a/nxcomp/ChannelCache.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef ChannelCache_H
-#define ChannelCache_H
-
-//
-// Sizes of optional fields for ConfigureWindow
-// request.
-//
-
-extern const unsigned int CONFIGUREWINDOW_FIELD_WIDTH[7];
-
-//
-// Sizes of optional fields for CreateGC request.
-//
-
-extern const unsigned int CREATEGC_FIELD_WIDTH[23];
-
-//
-// This is just needed to provide a pointer
-// to the base cache class in encoding and
-// decoding procedures of message stores.
-//
-
-class ChannelCache
-{
-  public:
-
-  ChannelCache()
-  {
-  }
-
-  ~ChannelCache()
-  {
-  }
-};
-
-#endif /* ChannelCache_H */
diff --git a/nxcomp/ChannelEndPoint.cpp b/nxcomp/ChannelEndPoint.cpp
deleted file mode 100644
index 286210dc7..000000000
--- a/nxcomp/ChannelEndPoint.cpp
+++ /dev/null
@@ -1,345 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/stat.h>
-
-#include "ChannelEndPoint.h"
-
-#include "NXalert.h"
-
-ChannelEndPoint::ChannelEndPoint(const char *spec)
-  : defaultTCPPort_(0), defaultTCPInterface_(0),
-    defaultUnixPath_(NULL), spec_(NULL) {
-  setSpec(spec);
-}
-
-ChannelEndPoint::~ChannelEndPoint()
-{
-  char *unixPath = NULL;
-
-  if (getUnixPath(&unixPath))
-  {
-    struct stat st;
-    lstat(unixPath, &st);
-    if(S_ISSOCK(st.st_mode))
-      unlink(unixPath);
-  }
-}
-
-void
-ChannelEndPoint::setSpec(const char *spec) {
-  if (spec_) free(spec_);
-
-  if (spec && strlen(spec))
-  {
-    spec_ = strdup(spec);
-    isUnix_ = getUnixPath();
-    isTCP_ = getTCPHostAndPort();
-  }
-  else
-  {
-    spec_ = NULL;
-    isUnix_ = false;
-    isTCP_ = false;
-  }
-}
-
-void
-ChannelEndPoint::setSpec(long port) {
-  if (port >= 0) {
-    char tmp[20];
-    sprintf(tmp, "%ld", port);
-    setSpec(tmp);
-  }
-  else {
-    disable();
-  }
-}
-
-void
-ChannelEndPoint::setSpec(const char *hostName, long port) {
-  int length;
-
-  if (spec_) free(spec_);
-  isUnix_ = false;
-  isTCP_ = false;
-
-  if (hostName && strlen(hostName) && port >= 1)
-  {
-    length = snprintf(NULL, 0, "tcp:%s:%ld", hostName, port);
-    spec_ = (char *)calloc(length + 1, sizeof(char));
-    snprintf(spec_, length+1, "tcp:%s:%ld", hostName, port);
-    isTCP_ = true;
-  }
-  else setSpec((char*)NULL);
-}
-
-bool
-ChannelEndPoint::getSpec(char **socketUri) const {
-
-  if (socketUri) *socketUri = NULL;
-
-  char *unixPath = NULL;
-  char *hostName = NULL;
-  long port = -1;
-
-  char *newSocketUri = NULL;
-  int length = -1;
-
-  if (getUnixPath(&unixPath))
-  {
-    length = snprintf(NULL, 0, "unix:%s", unixPath);
-  }
-  else if (getTCPHostAndPort(&hostName, &port))
-  {
-    length = snprintf(NULL, 0, "tcp:%s:%ld", hostName, port);
-  }
-
-  if (length > 0)
-  {
-    newSocketUri = (char *)calloc(length + 1, sizeof(char));
-    if (isUnixSocket())
-      snprintf(newSocketUri, length+1, "unix:%s", unixPath);
-    else
-      snprintf(newSocketUri, length+1, "tcp:%s:%ld", hostName, port);
-
-    if (socketUri)
-      *socketUri = strdup(newSocketUri);
-  }
-
-  free(newSocketUri);
-  free(unixPath);
-  free(hostName);
-
-  if (NULL != *socketUri)
-    return true;
-
-  return false;
-}
-
-void
-ChannelEndPoint::setDefaultTCPPort(long port) {
-  defaultTCPPort_ = port;
-}
-
-void
-ChannelEndPoint::setDefaultTCPInterface(int publicInterface) {
-  defaultTCPInterface_ = publicInterface;
-}
-
-void
-ChannelEndPoint::setDefaultUnixPath(char *path) {
-  if (defaultUnixPath_) free(defaultUnixPath_);
-
-  if (path && strlen(path))
-    defaultUnixPath_ = strdup(path);
-  else
-    defaultUnixPath_ = NULL;
-}
-
-void
-ChannelEndPoint::disable() {
-  setSpec("0");
-}
-
-bool
-ChannelEndPoint::getPort(long *port) const {
-  if (port) *port = 0;
-  long p = -1;
-  if (spec_) {
-    char *end;
-    p = strtol(spec_, &end, 10);
-    if ((end == spec_) || (*end != '\0'))
-      return false;
-  }
-
-  if (port) *port = p;
-  return true;
-}
-
-bool
-ChannelEndPoint::getUnixPath(char **unixPath) const {
-
-  if (unixPath) *unixPath = 0;
-
-  long p;
-  char *path = NULL;
-
-  if (getPort(&p)) {
-    if (p != 1) return false;
-  }
-  else if (spec_ && (strncmp("unix:", spec_, 5) == 0)) {
-    path = spec_ + 5;
-  }
-  else
-    return false;
-
-  if (!path || (*path == '\0')) {
-    path = defaultUnixPath_;
-    if (!path)
-      return false;
-  }
-
-  if (unixPath)
-    *unixPath = strdup(path);
-
-  return true;
-}
-
-bool
-ChannelEndPoint::isUnixSocket() const {
-  return isUnix_;
-}
-
-// FIXME!!!
-static const char *
-getComputerName() {
-  //
-  // Strangely enough, under some Windows OSes SMB
-  // service doesn't bind to localhost. Fall back
-  // to localhost if can't find computer name in
-  // the environment. In future we should try to
-  // bind to localhost and then try the other IPs.
-  //
-
-  const char *hostname = NULL;
-
-  #ifdef __CYGWIN32__
-
-  hostname = getenv("COMPUTERNAME");
-
-  #endif
-
-  if (hostname == NULL)
-  {
-    hostname = "localhost";
-  }
-
-  return hostname;
-}
-
-bool
-ChannelEndPoint::getTCPHostAndPort(char **host, long *port) const {
-  long p;
-  char *h = NULL;
-  ssize_t h_len;
-
-  if (host) *host = NULL;
-  if (port) *port = 0;
-
-  if (getPort(&p)) {
-    h_len = 0;
-  }
-  else if (spec_ && (strncmp("tcp:", spec_, 4) == 0)) {
-    h = spec_ + 4;
-    char *colon = strrchr(h, ':');
-    if (colon) {
-      char *end;
-      h_len = colon++ - h;
-      p = strtol(colon, &end, 10);
-      if ((end == colon) || (*end != '\0'))
-        return false;
-    }
-    else {
-      h_len = strlen(h);
-      p = 1;
-    }
-  }
-  else
-    return false;
-
-  if (p == 1) p = defaultTCPPort_;
-  if (p < 1) return false;
-
-  if (port)
-    *port = p;
-
-  if (host)
-    *host = ( h_len
-              ? strndup(h, h_len)
-              : strdup(defaultTCPInterface_ ? getComputerName() : "localhost"));
-
-  return true;
-}
-
-bool
-ChannelEndPoint::isTCPSocket() const {
-  return isTCP_;
-}
-
-long ChannelEndPoint::getTCPPort() const {
-  long port;
-  if (getTCPHostAndPort(NULL, &port)) return port;
-  return -1;
-}
-
-bool
-ChannelEndPoint::enabled() const {
-  return (isUnixSocket() || isTCPSocket());
-}
-
-bool
-ChannelEndPoint::validateSpec() {
-  isTCP_ = getTCPHostAndPort();
-  isUnix_ = getUnixPath();
-  return ( getPort() || isUnix_ || isTCP_ );
-}
-
-ChannelEndPoint &ChannelEndPoint::operator=(const ChannelEndPoint &other) {
-  char *old;
-  defaultTCPPort_ = other.defaultTCPPort_;
-  defaultTCPInterface_ = other.defaultTCPInterface_;
-  old = defaultUnixPath_;
-  defaultUnixPath_ = (other.defaultUnixPath_ ? strdup(other.defaultUnixPath_) : NULL);
-  free(old);
-  old = spec_;
-  spec_ = (other.spec_ ? strdup(other.spec_) : NULL);
-  free(old);
-  isUnix_ = getUnixPath();
-  isTCP_ = getTCPHostAndPort();
-  return *this;
-}
-
-std::ostream& operator<<(std::ostream& os, const ChannelEndPoint& endPoint) {
-  if (endPoint.enabled()) {
-    char* endPointSpec = NULL;
-    if (endPoint.getSpec(&endPointSpec))
-    {
-      os << endPointSpec;
-      free(endPointSpec);
-    }
-    else
-      os << "(invalid)";
-  }
-  else
-  {
-    os << "(disabled)";
-  }
-  return os;
-}
diff --git a/nxcomp/ChannelEndPoint.h b/nxcomp/ChannelEndPoint.h
deleted file mode 100644
index 4c0c728f3..000000000
--- a/nxcomp/ChannelEndPoint.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef ChannelEndPoint_H
-#define ChannelEndPoint_H
-
-#include <iostream>
-#include <sys/un.h>
-
-class ChannelEndPoint
-{
- private:
-  long defaultTCPPort_;
-  int defaultTCPInterface_; // 0=localhost, otherwise IP of public interface.
-  char *defaultUnixPath_;
-  char *spec_;
-  bool isUnix_;
-  bool isTCP_;
-
-  bool getPort(long *port = NULL) const;
-
- public:
-  ChannelEndPoint(const char *spec = NULL);
-  ~ChannelEndPoint();
-  ChannelEndPoint &operator=(const ChannelEndPoint &other);
-
-  bool enabled() const;
-  bool disabled() { return !enabled(); }
-  void disable();
-  void setSpec(const char *spec);
-  void setSpec(long port);
-  void setSpec(const char *hostName, long port);
-  bool getSpec(char **socketUri) const;
-  void setDefaultTCPPort(long port);
-  void setDefaultTCPInterface(int publicInterface);
-  void setDefaultUnixPath(char *path);
-
-  bool getUnixPath(char **path = NULL) const;
-  bool isUnixSocket() const;
-  bool getTCPHostAndPort(char **hostname = NULL, long *port = NULL) const;
-  long getTCPPort() const;
-  bool isTCPSocket() const;
-
-  bool validateSpec();
-};
-
-std::ostream& operator<<(std::ostream& os, const ChannelEndPoint& endPoint);
-
-#endif
diff --git a/nxcomp/ChannelStore.h b/nxcomp/ChannelStore.h
deleted file mode 100644
index 53bb60f73..000000000
--- a/nxcomp/ChannelStore.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef ChannelStore_H
-#define ChannelStore_H
-
-//
-// One message store for each opcode.
-//
-
-#define CHANNEL_STORE_OPCODE_LIMIT        256
-
-//
-// One split store for each resource.
-//
-
-#define CHANNEL_STORE_RESOURCE_LIMIT      256
-
-class ChannelStore
-{
-  public:
-
-  ChannelStore()
-  {
-  }
-
-  virtual ~ChannelStore()
-  {
-  }
-};
-
-#endif /* ChannelStore_H */
diff --git a/nxcomp/CharCache.cpp b/nxcomp/CharCache.cpp
deleted file mode 100644
index 88e66e3da..000000000
--- a/nxcomp/CharCache.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "CharCache.h"
-
-int CharCache::lookup(unsigned char value, unsigned int &index)
-{
-  for (unsigned int i = 0; i < length_; i++)
-    if (value == buffer_[i])
-    {
-      index = i;
-      if (i)
-      {
-        unsigned int target = (i >> 1);
-        do
-        {
-          buffer_[i] = buffer_[i - 1];
-          i--;
-        }
-        while (i > target);
-        buffer_[target] = value;
-      }
-      return 1;
-    }
-  insert(value);
-  return 0;
-}
-
-void CharCache::insert(unsigned char value)
-{
-  unsigned int insertionPoint = 0;
-  if (2 >= length_)
-    insertionPoint = length_;
-  else
-    insertionPoint = 2;
-  unsigned int start;
-  if (length_ >= 7)
-    start = 7 - 1;
-  else
-  {
-    start = length_;
-    length_++;
-  }
-  for (unsigned int k = start; k > insertionPoint; k--)
-    buffer_[k] = buffer_[k - 1];
-  buffer_[insertionPoint] = value;
-}
diff --git a/nxcomp/CharCache.h b/nxcomp/CharCache.h
deleted file mode 100644
index b8891d2df..000000000
--- a/nxcomp/CharCache.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef CharCache_H
-#define CharCache_H
-
-//
-// CharCache is a counterpart of IntCache that is
-// optimized for use in compressing text composed
-// of 8-bit characters.
-//
-
-class CharCache
-{
-  public:
-
-  CharCache() : length_(0)
-  {
-  }
-
-  ~CharCache()
-  {
-  }
-
-  unsigned int getSize() const
-  {
-    return (unsigned int) length_;
-  }
-
-  int lookup(unsigned char value, unsigned int &index);
-
-  //
-  // This can be inlined as it is only
-  // called by decodeCachedValue().
-  //
-
-  unsigned int get(unsigned int index)
-  {
-    unsigned char result = buffer_[index];
-
-    if (index != 0)
-    {
-      unsigned int i = index;
-      unsigned int target = (i >> 1);
-
-      do
-      {
-        buffer_[i] = buffer_[i - 1];
-
-        i--;
-      }
-      while (i > target);
-
-      buffer_[target] = result;
-    }
-
-    return (unsigned int) result;
-  }
-
-  void insert(unsigned char value);
-
-  private:
-
-  unsigned char length_;
-
-  unsigned char buffer_[7];
-};
-
-#endif /* CharCache_H */
diff --git a/nxcomp/Children.cpp b/nxcomp/Children.cpp
deleted file mode 100644
index 265ba4e37..000000000
--- a/nxcomp/Children.cpp
+++ /dev/null
@@ -1,1055 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include <unistd.h>
-#include <sys/types.h>
-#include <signal.h>
-#include <fcntl.h>
-
-#include "NX.h"
-
-#include "Misc.h"
-
-#include "Types.h"
-#include "Timestamp.h"
-
-#include "Control.h"
-#include "Statistics.h"
-#include "Proxy.h"
-
-#include "Keeper.h"
-#include "Fork.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-#define DISPLAY_LENGTH_LIMIT  256
-#define DEFAULT_STRING_LIMIT  512
-
-//
-// These are from the main loop.
-//
-
-extern Keeper *keeper;
-
-extern int (*handler)(int);
-
-extern int useUnixSocket;
-
-extern int lastDialog;
-extern int lastWatchdog;
-extern int lastKeeper;
-
-extern void CleanupListeners();
-extern void CleanupSockets();
-extern void CleanupAgent();
-extern void CleanupGlobal();
-
-extern void InstallSignals();
-
-extern char *GetClientPath();
-
-extern int CheckParent(const char *name, const char *type,
-                           int parent);
-
-#ifdef __sun
-extern char **environ;
-#endif
-
-//
-// Close all the unused descriptors and
-// install any signal handler that might
-// have been disabled in the main process.
-//
-
-static void SystemCleanup(const char *name);
-
-//
-// Release all objects allocated in the
-// heap.
-
-static void MemoryCleanup(const char *name);
-
-//
-// Remove 'name' from the environment.
-//
-
-static int UnsetEnv(const char *name);
-
-static int NXTransKeeperHandler(int signal);
-static void NXTransKeeperCheck();
-
-
-//
-// Start a nxclient process in dialog mode.
-//
-
-int NXTransDialog(const char *caption, const char *message,
-                      const char *window, const char *type, int local,
-                         const char* display)
-{
-  //
-  // Be sure log file is valid.
-  //
-
-  if (logofs == NULL)
-  {
-    logofs = &cerr;
-  }
-
-  int pid;
-
-  #ifdef TEST
-  *logofs << "NXTransDialog: Going to fork with NX pid '"
-          << getpid() << "'.\n" << logofs_flush;
-  #endif
-
-  pid = Fork();
-
-  if (pid != 0)
-  {
-    if (pid < 0)
-    {
-      #ifdef TEST
-      *logofs << "NXTransDialog: WARNING! Function fork failed. "
-              << "Error is " << EGET() << " '" << ESTR()
-              << "'.\n" << logofs_flush;
-      #endif
-
-      cerr << "Warning" << ": Function fork failed. "
-           << "Error is " << EGET() << " '" << ESTR()
-           << "'.\n";
-    }
-    #ifdef TEST
-    else
-    {
-      *logofs << "NXTransDialog: Created NX dialog process "
-              << "with pid '" << pid << "'.\n"
-              << logofs_flush;
-    }
-    #endif
-
-    return pid;
-  }
-
-  #ifdef TEST
-  *logofs << "NXTransDialog: Executing child with pid '"
-          << getpid() << "' and parent '" << getppid()
-          << "'.\n" << logofs_flush;
-  #endif
-
-  SystemCleanup("NXTransDialog");
-
-  //
-  // Copy the client command before
-  // freeing up the control class.
-  //
-
-  char command[DEFAULT_STRING_LIMIT];
-
-  if (control != NULL)
-  {
-    strcpy(command, control -> ClientPath);
-  }
-  else
-  {
-    char *path = GetClientPath();
-
-    strcpy(command, path);
-
-    delete [] path;
-  }
-
-  //
-  // Get rid of the unused resources.
-  //
-
-  MemoryCleanup("NXTransDialog");
-
-  #ifdef TEST
-  *logofs << "NXTransDialog: Running external NX dialog with caption '"
-          << caption << "' message '" << message << "' type '"
-          << type << "' local '" << local << "' display '"
-          << display << "'.\n"
-          << logofs_flush;
-  #endif
-
-  int pulldown = (strcmp(type, "pulldown") == 0);
-
-  char parent[DEFAULT_STRING_LIMIT];
-
-  snprintf(parent, DEFAULT_STRING_LIMIT, "%d", getppid());
-
-  parent[DEFAULT_STRING_LIMIT - 1] = '\0';
-
-  UnsetEnv("LD_LIBRARY_PATH");
-
-  for (int i = 0; i < 2; i++)
-  {
-    if (local != 0)
-    {
-      if (pulldown)
-      {
-        execlp(command, command, "--dialog", type, "--caption", caption,
-                   "--window", window, "--local", "--parent", parent,
-                       "--display", display, NULL);
-      }
-      else
-      {
-        execlp(command, command, "--dialog", type, "--caption", caption,
-                   "--message", message, "--local", "--parent", parent,
-                       "--display", display, NULL);
-      }
-    }
-    else
-    {
-      if (pulldown)
-      {
-        execlp(command, command, "--dialog", type, "--caption", caption,
-                   "--window", window, "--parent", parent,
-                       "--display", display, NULL);
-      }
-      else
-      {
-        execlp(command, command, "--dialog", type, "--caption", caption,
-                   "--message", message, "--parent", parent,
-                       "--display", display, NULL);
-      }
-    }
-
-    #ifdef WARNING
-    *logofs << "NXTransDialog: WARNING! Couldn't start '"
-            << command << "'. " << "Error is " << EGET()
-            << " '" << ESTR() << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Warning" << ": Couldn't start '" << command
-         << "'. Error is " << EGET() << " '" << ESTR()
-         << "'.\n";
-
-    //
-    // Retry by looking for the default name
-    // in the default NX path.
-    //
-
-    if (i == 0)
-    {
-
-      strcpy(command, "nxclient");
-
-      char newPath[DEFAULT_STRING_LIMIT];
-
-      strcpy(newPath, "/usr/NX/bin:/opt/NX/bin:/usr/local/NX/bin:");
-
-      #ifdef __APPLE__
-
-      strcat(newPath, "/Applications/NX Client for OSX.app/Contents/MacOS:");
-
-      #endif
-
-      #ifdef __CYGWIN32__
-
-      strcat(newPath, ".:");
-
-      #endif
-
-      int newLength = strlen(newPath);
-
-      char *oldPath = getenv("PATH");
-
-      strncpy(newPath + newLength, oldPath, DEFAULT_STRING_LIMIT - newLength - 1);
-
-      newPath[DEFAULT_STRING_LIMIT - 1] = '\0';
-
-      #ifdef WARNING
-      *logofs << "NXTransDialog: WARNING! Trying with path '"
-              << newPath << "'.\n" << logofs_flush;
-      #endif
-
-      cerr << "Warning" << ": Trying with path '" << newPath
-           << "'.\n";
-
-      //
-      // Solaris doesn't seem to have
-      // function setenv().
-      //
-
-      #ifdef __sun
-
-      char newEnv[DEFAULT_STRING_LIMIT + 5];
-
-      sprintf(newEnv,"PATH=%s", newPath);
-
-      putenv(newEnv);
-
-      #else
-
-      setenv("PATH", newPath, 1);
-
-      #endif
-
-    }
-  }
-
-  //
-  // Hopefully useless.
-  //
-
-  exit(0);
-}
-
-//
-// Start a nxclient process in dialog mode.
-//
-
-int NXTransClient(const char* display)
-{
-  //
-  // Be sure log file is valid.
-  //
-
-  if (logofs == NULL)
-  {
-    logofs = &cerr;
-  }
-
-  int pid;
-
-  #ifdef TEST
-  *logofs << "NXTransClient: Going to fork with NX pid '"
-          << getpid() << "'.\n" << logofs_flush;
-  #endif
-
-  pid = Fork();
-
-  if (pid != 0)
-  {
-    if (pid < 0)
-    {
-      #ifdef TEST
-      *logofs << "NXTransClient: WARNING! Function fork failed. "
-              << "Error is " << EGET() << " '" << ESTR()
-              << "'.\n" << logofs_flush;
-      #endif
-
-      cerr << "Warning" << ": Function fork failed. "
-           << "Error is " << EGET() << " '" << ESTR()
-           << "'.\n";
-    }
-    #ifdef TEST
-    else
-    {
-      *logofs << "NXTransClient: Created NX client process "
-              << "with pid '" << pid << "'.\n"
-              << logofs_flush;
-    }
-    #endif
-
-    return pid;
-  }
-
-  #ifdef TEST
-  *logofs << "NXTransClient: Executing child with pid '"
-          << getpid() << "' and parent '" << getppid()
-          << "'.\n" << logofs_flush;
-  #endif
-
-  SystemCleanup("NXTransClient");
-
-  //
-  // Copy the client command before
-  // freeing up the control class.
-  //
-
-  char command[DEFAULT_STRING_LIMIT];
-
-  if (control != NULL)
-  {
-    strcpy(command, control -> ClientPath);
-  }
-  else
-  {
-    char *path = GetClientPath();
-
-    strcpy(command, path);
-
-    delete [] path;
-  }
-
-  //
-  // Get rid of unused resources.
-  //
-
-  MemoryCleanup("NXTransClient");
-
-  #ifdef TEST
-  *logofs << "NXTransClient: Running external NX client with display '"
-          << display << "'.\n" << logofs_flush;
-  #endif
-
-  //
-  // Provide the display in the environment.
-  //
-
-  char newDisplay[DISPLAY_LENGTH_LIMIT];
-
-  #ifdef __sun
-
-  snprintf(newDisplay, DISPLAY_LENGTH_LIMIT - 1, "DISPLAY=%s", display);
-
-  newDisplay[DISPLAY_LENGTH_LIMIT - 1] = '\0';
-
-  putenv(newDisplay);
-
-  #else
-
-  strncpy(newDisplay, display, DISPLAY_LENGTH_LIMIT - 1);
-
-  newDisplay[DISPLAY_LENGTH_LIMIT - 1] = '\0';
-
-  setenv("DISPLAY", newDisplay, 1);
-
-  #endif
-
-  UnsetEnv("LD_LIBRARY_PATH");
-
-  for (int i = 0; i < 2; i++)
-  {
-    execlp(command, command, NULL);
-
-    #ifdef WARNING
-    *logofs << "NXTransClient: WARNING! Couldn't start '"
-            << command << "'. Error is " << EGET() << " '"
-            << ESTR() << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Warning" << ": Couldn't start '" << command
-         << "'. Error is " << EGET() << " '" << ESTR()
-         << "'.\n";
-
-    //
-    // Retry by looking for the default name
-    // in the default NX path.
-    //
-
-    if (i == 0)
-    {
-
-      strcpy(command, "nxclient");
-
-      char newPath[DEFAULT_STRING_LIMIT];
-
-      strcpy(newPath, "/usr/NX/bin:/opt/NX/bin:/usr/local/NX/bin:");
-
-      #ifdef __APPLE__
-
-      strcat(newPath, "/Applications/NX Client for OSX.app/Contents/MacOS:");
-
-      #endif
-
-      #ifdef __CYGWIN32__
-
-      strcat(newPath, ".:");
-
-      #endif
-
-      int newLength = strlen(newPath);
-
-      char *oldPath = getenv("PATH");
-
-      strncpy(newPath + newLength, oldPath, DEFAULT_STRING_LIMIT - newLength - 1);
-
-      newPath[DEFAULT_STRING_LIMIT - 1] = '\0';
-
-      #ifdef WARNING
-      *logofs << "NXTransClient: WARNING! Trying with path '"
-              << newPath << "'.\n" << logofs_flush;
-      #endif
-
-      cerr << "Warning" << ": Trying with path '" << newPath
-           << "'.\n";
-
-      //
-      // Solaris doesn't seem to have
-      // function setenv().
-      //
-
-      #ifdef __sun
-
-      char newEnv[DEFAULT_STRING_LIMIT + 5];
-
-      sprintf(newEnv,"PATH=%s", newPath);
-
-      putenv(newEnv);
-
-      #else
-
-      setenv("PATH", newPath, 1);
-
-      #endif
-    }
-
-  }
-  //
-  // Hopefully useless.
-  //
-
-  exit(0);
-}
-
-//
-// Wait until the timeout is expired.
-// The timeout is expressed in milli-
-// seconds.
-//
-
-int NXTransWatchdog(int timeout)
-{
-  //
-  // Be sure log file is valid.
-  //
-
-  if (logofs == NULL)
-  {
-    logofs = &cerr;
-  }
-
-  int pid;
-
-  #ifdef TEST
-  *logofs << "NXTransWatchdog: Going to fork with NX pid '"
-          << getpid() << "'.\n" << logofs_flush;
-  #endif
-
-  pid = Fork();
-
-  if (pid != 0)
-  {
-    if (pid < 0)
-    {
-      #ifdef TEST
-      *logofs << "NXTransWatchdog: WARNING! Function fork failed. "
-              << "Error is " << EGET() << " '" << ESTR()
-              << "'.\n" << logofs_flush;
-      #endif
-
-      cerr << "Warning" << ": Function fork failed. "
-           << "Error is " << EGET() << " '" << ESTR()
-           << "'.\n";
-    }
-    #ifdef TEST
-    else
-    {
-      *logofs << "NXTransWatchdog: Created NX watchdog process "
-              << "with pid '" << pid << "'.\n" << logofs_flush;
-    }
-    #endif
-
-    return pid;
-  }
-
-  int parent = getppid();
-
-  #ifdef TEST
-  *logofs << "NXTransWatchdog: Executing child with pid '"
-          << getpid() << "' and parent '" << parent
-          << "'.\n" << logofs_flush;
-  #endif
-
-  SystemCleanup("NXTransWatchdog");
-
-  //
-  // Get rid of unused resources.
-  //
-
-  MemoryCleanup("NXTransWatchdog");
-
-  //
-  // Run until the timeout is expired
-  // or forever, if no timeout is
-  // provided.
-  //
-
-  T_timestamp startTs = getTimestamp();
-
-  int diffTs = 0;
-
-  for (;;)
-  {
-    //
-    // Complain if the parent is dead.
-    //
-
-    if (CheckParent("NXTransWatchdog", "watchdog", parent) == 0)
-    {
-      #ifdef TEST
-      *logofs << "NXTransWatchdog: Exiting with no parent "
-              << "running.\n" << logofs_flush;
-      #endif
-
-      HandleCleanup();
-    }
-
-    if (timeout > 0)
-    {
-      if (diffTs >= timeout)
-      {
-        #ifdef TEST
-        *logofs << "NXTransWatchdog: Timeout of " << timeout
-                << " Ms raised in watchdog.\n" << logofs_flush;
-        #endif
-
-        //
-        // We will just exit. Our parent should be
-        // monitoring us and detect that the process
-        // is gone.
-        //
-
-        HandleCleanup();
-      }
-    }
-
-    if (timeout > 0)
-    {
-      #ifdef TEST
-      *logofs << "NXTransWatchdog: Waiting for the timeout "
-              << "with " << timeout - diffTs << " Ms to run.\n"
-              << logofs_flush;
-      #endif
-
-      usleep((timeout - diffTs) * 1000);
-
-      diffTs = diffTimestamp(startTs, getNewTimestamp());
-    }
-    else
-    {
-      #ifdef TEST
-      *logofs << "NXTransWatchdog: Waiting for a signal.\n"
-              << logofs_flush;
-      #endif
-
-      sleep(10);
-    }
-  }
-
-  //
-  // Hopefully useless.
-  //
-
-  exit(0);
-}
-
-int NXTransKeeperHandler(int signal)
-{
-  if (keeper != NULL)
-  {
-    switch (signal)
-    {
-      case SIGTERM:
-      case SIGINT:
-      case SIGHUP:
-      {
-        #ifdef TEST
-        *logofs << "NXTransKeeperHandler: Requesting giveup "
-                << "because of signal " << signal << " ,'"
-                << DumpSignal(signal) << "'.\n"
-                << logofs_flush;
-        #endif
-
-        keeper -> setSignal(signal);
-
-        return 0;
-      }
-    }
-  }
-
-  return 1;
-}
-
-void NXTransKeeperCheck()
-{
-  if (CheckParent("NXTransKeeper", "keeper",
-          keeper -> getParent()) == 0 || keeper -> getSignal() != 0)
-  {
-    #ifdef TEST
-    *logofs << "NXTransKeeperCheck: Exiting because of signal "
-            << "or no parent running.\n" << logofs_flush;
-    #endif
-
-    HandleCleanup();
-  }
-}
-
-int NXTransKeeper(int caches, int images, const char *root)
-{
-  //
-  // Be sure log file is valid.
-  //
-
-  if (logofs == NULL)
-  {
-    logofs = &cerr;
-  }
-
-  if (caches == 0 && images == 0)
-  {
-    #ifdef TEST
-    *logofs << "NXTransKeeper: No NX cache house-keeping needed.\n"
-            << logofs_flush;
-    #endif
-
-    return 0;
-  }
-
-  int pid;
-
-  #ifdef TEST
-  *logofs << "NXTransKeeper: Going to fork with NX pid '"
-          << getpid() << "'.\n" << logofs_flush;
-  #endif
-
-  pid = Fork();
-
-  if (pid != 0)
-  {
-    if (pid < 0)
-    {
-      #ifdef TEST
-      *logofs << "NXTransKeeper: WARNING! Function fork failed. "
-              << "Error is " << EGET() << " '" << ESTR()
-              << "'.\n" << logofs_flush;
-      #endif
-
-      cerr << "Warning" << ": Function fork failed. "
-           << "Error is " << EGET() << " '" << ESTR()
-           << "'.\n";
-    }
-    #ifdef TEST
-    else
-    {
-      *logofs << "NXTransKeeper: Created NX keeper process "
-              << "with pid '" << pid << "'.\n"
-              << logofs_flush;
-    }
-    #endif
-
-    return pid;
-  }
-
-  int parent = getppid();
-
-  #ifdef TEST
-  *logofs << "NXTransKeeper: Executing child with pid '"
-          << getpid() << "' and parent '" << parent
-          << "'.\n" << logofs_flush;
-  #endif
-
-  SystemCleanup("NXTransKeeper");
-
-  #ifdef TEST
-  *logofs << "NXTransKeeper: Going to run with caches " << caches
-          << " images " << images << " and root " << root
-          << " at " << strMsTimestamp() << ".\n" << logofs_flush;
-  #endif
-
-  //
-  // Create the house-keeper class.
-  //
-
-  int timeout = control -> KeeperTimeout;
-
-  keeper = new Keeper(caches, images, root, 100, parent);
-
-  handler = NXTransKeeperHandler;
-
-  if (keeper == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "NXTransKeeper: PANIC! Failed to create the keeper object.\n"
-            << logofs_flush;
-     #endif
-
-     cerr << "Error" << ": Failed to create the keeper object.\n";
-
-     HandleCleanup();
-  }
-
-  //
-  // Get rid of unused resources. Root path
-  // must be copied in keeper's constructor
-  // before control is deleted.
-  //
-  
-  MemoryCleanup("NXTransKeeper");
-
-  //
-  // Decrease the priority of this process.
-  //
-  // The following applies to Cygwin: "Cygwin processes can be 
-  // set to IDLE_PRIORITY_CLASS, NORMAL_PRIORITY_CLASS, HIGH_-
-  // PRIORITY_CLASS, or REALTIME_PRIORITY_CLASS with the nice
-  // call. If you pass a positive number to nice(), then the
-  // priority level will decrease by one (within the above list
-  // of priorities). A negative number would make it increase
-  // by one. It is not possible to change it by more than one
-  // at a time without making repeated calls".
-  //
-
-  if (nice(5) < 0 && errno != 0)
-  {
-    #ifdef WARNING
-    *logofs << "NXTransKeeper: WARNING! Failed to renice process to +5. "
-            << "Error is " << EGET() << " '" << ESTR()
-            << "'.\n" << logofs_flush;
-     #endif
-
-     cerr << "Warning" << ": Failed to renice process to +5. "
-          << "Error is " << EGET() << " '" << ESTR()
-          << "'.\n";
-  }
-
-  //
-  // Delay a bit the first run to give
-  // a boost to the session startup.
-  //
-
-  #ifdef TEST
-  *logofs << "NXTransKeeper: Going to sleep for "
-          << timeout / 20 << " Ms.\n" << logofs_flush;
-  #endif
-
-  usleep(timeout / 20 * 1000);
-
-  NXTransKeeperCheck();
-
-  //
-  // The house keeping of the persistent
-  // caches is performed only once.
-  //
-
-  if (caches != 0)
-  {
-    #ifdef TEST
-    *logofs << "NXTransKeeper: Going to cleanup the NX cache "
-            << "directories at " << strMsTimestamp() << ".\n"
-            << logofs_flush;
-    #endif
-
-    keeper -> cleanupCaches();
-
-    #ifdef TEST
-    *logofs << "NXTransKeeper: Completed cleanup of NX cache "
-            << "directories at " << strMsTimestamp() << ".\n"
-            << logofs_flush;
-    #endif
-  }
-  #ifdef TEST
-  else
-  {
-    *logofs << "NXTransKeeper: Nothing to do for the "
-            << "persistent caches.\n" << logofs_flush;
-  }
-  #endif
-
-  if (images == 0)
-  {
-    #ifdef TEST
-    *logofs << "NXTransKeeper: Nothing to do for the "
-            << "persistent images.\n" << logofs_flush;
-    #endif
-
-    HandleCleanup();
-  }
-
-  //
-  // Take care of the persisten image cache.
-  // Run a number of iterations and then exit,
-  // so we can keep the memory consumption
-  // low. The parent will check our exit code
-  // and will eventually restart us.
-  //
-
-  for (int iterations = 0; iterations < 100; iterations++)
-  {
-    #ifdef TEST
-    *logofs << "NXTransKeeper: Running iteration " << iterations
-            << " at " << strMsTimestamp() << ".\n"
-            << logofs_flush;
-    #endif
-
-    NXTransKeeperCheck();
-
-    #ifdef TEST
-    *logofs << "NXTransKeeper: Going to cleanup the NX images "
-            << "directories at " << strMsTimestamp() << ".\n"
-            << logofs_flush;
-    #endif
-
-    if (keeper -> cleanupImages() < 0)
-    {
-      #ifdef TEST
-      *logofs << "NXTransKeeper: Exiting because of error "
-              << "handling the image cache.\n" << logofs_flush;
-      #endif
-
-      HandleCleanup();
-    }
-
-    #ifdef TEST
-    *logofs << "NXTransKeeper: Completed cleanup of NX images "
-            << "directories at " << strMsTimestamp() << ".\n"
-            << logofs_flush;
-    #endif
-
-    NXTransKeeperCheck();
-
-    #ifdef TEST
-    *logofs << "NXTransKeeper: Going to sleep for " << timeout
-            << " Ms.\n" << logofs_flush;
-    #endif
-
-    usleep(timeout * 1000);
-  }
-
-  HandleCleanup(2);
-
-  //
-  // Hopefully useless.
-  //
-
-  exit(0);
-}
-
-void SystemCleanup(const char *name)
-{
-  #ifdef TEST
-  *logofs << name << ": Performing system cleanup in process "
-          << "with pid '" << getpid() << "'.\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // Reinstall signals that might
-  // have been restored by agents.
-  //
-
-  InstallSignals();
-}
-
-void MemoryCleanup(const char *name)
-{
-  #ifdef TEST
-  *logofs << name << ": Performing memory cleanup in process "
-          << "with pid '" << getpid() << "'.\n"
-          << logofs_flush;
-  #endif
-
-  DisableSignals();
-
-  //
-  // Prevent deletion of unix socket
-  // and lock file.
-  //
-
-  useUnixSocket = 0;
-
-  //
-  // Don't let cleanup kill other
-  // children.
-  //
-
-  lastDialog   = 0;
-  lastWatchdog = 0;
-  lastKeeper   = 0;
-
-  CleanupListeners();
-
-  CleanupSockets();
-
-  CleanupGlobal();
-
-  EnableSignals();
-}
-
-int UnsetEnv(const char *name)
-{
-  int result;
-
-  #ifdef __sun
-
-  char **pEnv = environ;
-
-  int nameLen = strlen(name) + 1;
-
-  char *varName = new char[nameLen + 1];
-
-  strcpy(varName, name);
-
-  strcat(varName, "=");
-
-  pEnv = environ;
-
-  while (*pEnv != NULL)
-  {
-    if (!strncmp(varName, *pEnv, nameLen))
-    {
-      break;
-    }
-
-    *pEnv++;
-  }
-
-  while (*pEnv != NULL)
-  {
-    *pEnv = *(pEnv + 1);
-
-    pEnv++;
-  }
-
-  result = 0;
-
-  #else
-
-  #ifdef __APPLE__
-
-  unsetenv(name);
-  result = 0;
-
-  #else
-
-  result = unsetenv(name);
-
-  #endif
-
-  #endif
-
-  return result;
-}
diff --git a/nxcomp/ClearArea.cpp b/nxcomp/ClearArea.cpp
deleted file mode 100644
index b76e750a4..000000000
--- a/nxcomp/ClearArea.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "ClearArea.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int ClearAreaStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                      unsigned int size, int bigEndian) const
-{
-  ClearAreaMessage *clearArea = (ClearAreaMessage *) message;
-
-  //
-  // Here is the fingerprint.
-  //
-
-  clearArea -> exposures = *(buffer + 1); 
-
-  clearArea -> window = GetULONG(buffer + 4, bigEndian); 
-
-  clearArea -> x      = GetUINT(buffer + 8, bigEndian);
-  clearArea -> y      = GetUINT(buffer + 10, bigEndian);
-  clearArea -> width  = GetUINT(buffer + 12, bigEndian);
-  clearArea -> height = GetUINT(buffer + 14, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed Identity for message at " << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int ClearAreaStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                        unsigned int size, int bigEndian) const
-{
-  ClearAreaMessage *clearArea = (ClearAreaMessage *) message;
-
-  //
-  // Fill all the message's fields.
-  //
-
-  *(buffer + 1) = clearArea -> exposures;
-
-  PutULONG(clearArea -> window, buffer + 4, bigEndian);
-
-  PutUINT(clearArea -> x,      buffer + 8, bigEndian);
-  PutUINT(clearArea -> y,      buffer + 10, bigEndian);
-  PutUINT(clearArea -> width,  buffer + 12, bigEndian);
-  PutUINT(clearArea -> height, buffer + 14, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at " << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void ClearAreaStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  ClearAreaMessage *clearArea = (ClearAreaMessage *) message;
-
-  *logofs << name() << ": Identity exposures " << (unsigned int) clearArea -> exposures 
-          << ", window " << clearArea -> window  << ", x " << clearArea -> x 
-          << ", y " << clearArea -> y << ", width  " << clearArea -> width 
-          << ", height " << clearArea -> height << ", size " << clearArea -> size_ 
-          << ".\n";
-
-  #endif
-}
-
-void ClearAreaStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                          unsigned int size, int bigEndian) const
-{
-  md5_append(md5_state_, buffer + 1,  1);
-  md5_append(md5_state_, buffer + 4,  4);
-  md5_append(md5_state_, buffer + 8,  2);
-  md5_append(md5_state_, buffer + 10, 2);
-  md5_append(md5_state_, buffer + 12, 2);
-  md5_append(md5_state_, buffer + 14, 2);
-}
diff --git a/nxcomp/ClearArea.h b/nxcomp/ClearArea.h
deleted file mode 100644
index 8067edffd..000000000
--- a/nxcomp/ClearArea.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef ClearArea_H
-#define ClearArea_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define CLEARAREA_ENABLE_CACHE               1
-#define CLEARAREA_ENABLE_DATA                0
-#define CLEARAREA_ENABLE_SPLIT               0
-#define CLEARAREA_ENABLE_COMPRESS            0
-
-#define CLEARAREA_DATA_LIMIT                 0
-#define CLEARAREA_DATA_OFFSET                16
-
-#define CLEARAREA_CACHE_SLOTS                3000
-#define CLEARAREA_CACHE_THRESHOLD            5
-#define CLEARAREA_CACHE_LOWER_THRESHOLD      1
-
-//
-// The message class.
-//
-
-class ClearAreaMessage : public Message
-{
-  friend class ClearAreaStore;
-
-  public:
-
-  ClearAreaMessage()
-  {
-  }
-
-  ~ClearAreaMessage()
-  {
-  }
-
-  //
-  // Put here the fields which constitute 
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned char  exposures;
-  unsigned int   window;
-  unsigned short x;
-  unsigned short y;
-  unsigned short width;
-  unsigned short height;
-};
-
-class ClearAreaStore : public MessageStore
-{
-  //
-  // Constructors and destructors.
-  //
-
-  public:
-
-  ClearAreaStore() : MessageStore()
-  {
-    enableCache    = CLEARAREA_ENABLE_CACHE;
-    enableData     = CLEARAREA_ENABLE_DATA;
-    enableSplit    = CLEARAREA_ENABLE_SPLIT;
-    enableCompress = CLEARAREA_ENABLE_COMPRESS;
-
-    dataLimit  = CLEARAREA_DATA_LIMIT;
-    dataOffset = CLEARAREA_DATA_OFFSET;
-
-    cacheSlots          = CLEARAREA_CACHE_SLOTS;
-    cacheThreshold      = CLEARAREA_CACHE_THRESHOLD;
-    cacheLowerThreshold = CLEARAREA_CACHE_LOWER_THRESHOLD;
-
-    messages_ -> resize(cacheSlots);
-
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      *i = NULL;
-    }
-
-    temporary_ = NULL;
-  }
-
-  virtual ~ClearAreaStore()
-  {
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      destroy(*i);
-    }
-
-    destroy(temporary_);
-  }
-
-  virtual const char *name() const
-  {
-    return "ClearArea";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_ClearArea;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(ClearAreaMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  public:
-
-  virtual Message *create() const
-  {
-    return new ClearAreaMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new ClearAreaMessage((const ClearAreaMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (ClearAreaMessage *) message;
-  }
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* ClearArea_H */
diff --git a/nxcomp/ClientCache.cpp b/nxcomp/ClientCache.cpp
deleted file mode 100644
index b6c04dd0b..000000000
--- a/nxcomp/ClientCache.cpp
+++ /dev/null
@@ -1,388 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "ClientCache.h"
-
-ClientCache::ClientCache() :
-
-  freeGCCache(16), freeDrawableCache(16), freeWindowCache(16),
-
-  cursorCache(16), colormapCache(16), visualCache(16), lastFont(0),
-
-  changePropertyPropertyCache(16), changePropertyTypeCache(16),
-  changePropertyData32Cache(16),
-
-  configureWindowBitmaskCache(4),
-
-  convertSelectionRequestorCache(16),
-  convertSelectionLastTimestamp(0),
-
-  copyPlaneBitPlaneCache(8),
-
-  createGCBitmaskCache(8),
-
-  createPixmapIdCache(16), createPixmapLastId(0),
-  createPixmapXCache(8), createPixmapYCache(8),
-
-  createWindowBitmaskCache(8),
-
-  fillPolyNumPointsCache(8), fillPolyIndex(0),
-
-  getSelectionOwnerSelectionCache(8),
-
-  grabButtonEventMaskCache(8), grabButtonConfineCache(8),
-  grabButtonModifierCache(8),
-
-  grabKeyboardLastTimestamp(0),
-
-  imageTextLengthCache(8),
-  imageTextLastX(0), imageTextLastY(0),
-  imageTextCacheX(8), imageTextCacheY(8),
-
-  polySegmentCacheX(8), polySegmentCacheY(8), polySegmentCacheIndex(0),
-
-  polyTextLastX(0), polyTextLastY(0), polyTextCacheX(8),
-  polyTextCacheY(8), polyTextFontCache(8),
-
-  putImageWidthCache(8), putImageHeightCache(8), putImageLastX(0),
-  putImageLastY(0), putImageXCache(8), putImageYCache(8),
-
-  getImagePlaneMaskCache(8),
-
-  queryColorsLastPixel(0),
-
-  setClipRectanglesXCache(8), setClipRectanglesYCache(8),
-
-  setDashesLengthCache(8), setDashesOffsetCache(8),
-
-  setSelectionOwnerCache(8), setSelectionOwnerTimestampCache(8),
-
-  translateCoordsSrcCache(8), translateCoordsDstCache(8),
-  translateCoordsXCache(8), translateCoordsYCache(8),
-
-  sendEventMaskCache(16), sendEventLastSequence(0),
-  sendEventIntDataCache(16),
-
-  putPackedImageSrcLengthCache(16), putPackedImageDstLengthCache(16),
-
-  //
-  // RenderExtension requests.
-  //
-
-  renderFreePictureCache(16),
-
-  renderGlyphSetCache(16),
-  renderFreeGlyphSetCache(16),
-
-  renderIdCache(8),
-
-  renderLengthCache(16), renderFormatCache(16),
-  renderValueMaskCache(8), renderNumGlyphsCache(8),
-
-  renderXCache(16), renderYCache(16),
-  renderLastX(0), renderLastY(0),
-
-  renderWidthCache(16), renderHeightCache(16),
-
-  renderLastId(0),
-
-  renderGlyphXCache(16), renderGlyphYCache(16),
-  renderGlyphX(0), renderGlyphY(0),
-
-  renderLastCompositeGlyphsData(0),
-
-  setCacheParametersCache(8),
-
-  lastIdCache(16), lastId(0)
-
-{
-  unsigned int i;
-
-  for (i = 0; i < 3; i++)
-  {
-    allocColorRGBCache[i] = new IntCache(8);
-
-    convertSelectionAtomCache[i] = new IntCache(8);
-  }
-
-  for (i = 0; i < 4; i++)
-  {
-    clearAreaGeomCache[i] = new IntCache(8);
-  }
-
-  for (i = 0; i < 7; i++)
-  {
-    configureWindowAttrCache[i] = new IntCache(8);
-  }
-
-  for (i = 0; i < 6; i++)
-  {
-    copyAreaGeomCache[i] = new IntCache(8);
-    copyPlaneGeomCache[i] = new IntCache(8);
-  }
-
-  for (i = 0; i < 23; i++)
-  {
-    if (CREATEGC_FIELD_WIDTH[i] > 16)
-    {
-      createGCAttrCache[i] = new IntCache(16);
-    }
-    else
-    {
-      createGCAttrCache[i] = new IntCache(CREATEGC_FIELD_WIDTH[i]);
-    }
-  }
-
-  for (i = 0; i < 6; i++)
-  {
-    createWindowGeomCache[i] = new IntCache(8);
-  }
-
-  for (i = 0; i < 15; i++)
-  {
-    createWindowAttrCache[i] = new IntCache(8);
-  }
-
-  for (i = 0; i < 10; i++)
-  {
-    fillPolyXRelCache[i] = new IntCache(8);
-    fillPolyXAbsCache[i] = new IntCache(8);
-    fillPolyYRelCache[i] = new IntCache(8);
-    fillPolyYAbsCache[i] = new IntCache(8);
-  }
-
-  for (i = 0; i < 8; i++)
-  {
-    fillPolyRecentX[i] = 0;
-    fillPolyRecentY[i] = 0;
-  }
-
-  for (i = 0; i < 4; i++)
-  {
-    polyFillRectangleCacheX[i] = new IntCache(8);
-    polyFillRectangleCacheY[i] = new IntCache(8);
-    polyFillRectangleCacheWidth[i] = new IntCache(8);
-    polyFillRectangleCacheHeight[i] = new IntCache(8);
-  }
-
-  for (i = 0; i < 2; i++)
-  {
-    polyLineCacheX[i] = new IntCache(8);
-    polyLineCacheY[i] = new IntCache(8);
-  }
-
-  for (i = 0; i < 2; i++)
-  {
-    polyPointCacheX[i] = new IntCache(8);
-    polyPointCacheY[i] = new IntCache(8);
-  }
-
-  for (i = 0; i < 4; i++)
-  {
-    polyRectangleGeomCache[i] = new IntCache(8);
-  }
-
-  for (i = 0; i < 2; i++)
-  {
-    polySegmentLastX[i] = 0;
-    polySegmentLastY[i] = 0;
-  }
-
-  for (i = 0; i < 4; i++)
-  {
-    setClipRectanglesGeomCache[i] = new IntCache(8);
-  }
-
-  for (i = 0; i < 2; i++)
-  {
-    polyFillArcCacheX[i] = new IntCache(8);
-    polyFillArcCacheY[i] = new IntCache(8);
-    polyFillArcCacheWidth[i] = new IntCache(8);
-    polyFillArcCacheHeight[i] = new IntCache(8);
-    polyFillArcCacheAngle1[i] = new IntCache(8);
-    polyFillArcCacheAngle2[i] = new IntCache(8);
-  }
-
-  for (i = 0; i < 2; i++)
-  {
-    polyArcCacheX[i] = new IntCache(8);
-    polyArcCacheY[i] = new IntCache(8);
-    polyArcCacheWidth[i] = new IntCache(8);
-    polyArcCacheHeight[i] = new IntCache(8);
-    polyArcCacheAngle1[i] = new IntCache(8);
-    polyArcCacheAngle2[i] = new IntCache(8);
-  }
-
-  for (i = 0; i < 8; i++)
-  {
-    shapeDataCache[i] = new IntCache(8);
-  }
-
-  for (i = 0; i < 8; i++)
-  {
-    genericRequestDataCache[i] = new IntCache(8);
-  }
-
-  for (i = 0; i < 16; i++)
-  {
-    renderDataCache[i] = new IntCache(16);
-  }
-
-  for (i = 0; i < 16; i++)
-  {
-    renderCompositeGlyphsDataCache[i] = new IntCache(16);
-  }
-
-  for (i = 0; i < 3; i++)
-  {
-    renderCompositeDataCache[i] = new IntCache(16);
-  }
-}
-
-
-ClientCache::~ClientCache()
-{
-  unsigned int i;
-
-  for (i = 0; i < 3; i++)
-  {
-    delete allocColorRGBCache[i];
-    delete convertSelectionAtomCache[i];
-  }
-
-  for (i = 0; i < 4; i++)
-  {
-    delete clearAreaGeomCache[i];
-  }
-
-  for (i = 0; i < 7; i++)
-  {
-    delete configureWindowAttrCache[i];
-  }
-
-  for (i = 0; i < 6; i++)
-  {
-    delete copyAreaGeomCache[i];
-    delete copyPlaneGeomCache[i];
-  }
-
-  for (i = 0; i < 23; i++)
-  {
-    delete createGCAttrCache[i];
-  }
-
-  for (i = 0; i < 6; i++)
-  {
-    delete createWindowGeomCache[i];
-  }
-
-  for (i = 0; i < 15; i++)
-  {
-    delete createWindowAttrCache[i];
-  }
-
-  for (i = 0; i < 10; i++)
-  {
-    delete fillPolyXRelCache[i];
-    delete fillPolyXAbsCache[i];
-    delete fillPolyYRelCache[i];
-    delete fillPolyYAbsCache[i];
-  }
-
-  for (i = 0; i < 4; i++)
-  {
-    delete polyFillRectangleCacheX[i];
-    delete polyFillRectangleCacheY[i];
-    delete polyFillRectangleCacheWidth[i];
-    delete polyFillRectangleCacheHeight[i];
-  }
-
-  for (i = 0; i < 2; i++)
-  {
-    delete polyLineCacheX[i];
-    delete polyLineCacheY[i];
-  }
-
-  for (i = 0; i < 2; i++)
-  {
-    delete polyPointCacheX[i];
-    delete polyPointCacheY[i];
-  }
-
-  for (i = 0; i < 4; i++)
-  {
-    delete polyRectangleGeomCache[i];
-  }
-
-  for (i = 0; i < 4; i++)
-  {
-    delete setClipRectanglesGeomCache[i];
-  }
-
-  for (i = 0; i < 2; i++)
-  {
-    delete polyFillArcCacheX[i];
-    delete polyFillArcCacheY[i];
-    delete polyFillArcCacheWidth[i];
-    delete polyFillArcCacheHeight[i];
-    delete polyFillArcCacheAngle1[i];
-    delete polyFillArcCacheAngle2[i];
-  }
-
-  for (i = 0; i < 2; i++)
-  {
-    delete polyArcCacheX[i];
-    delete polyArcCacheY[i];
-    delete polyArcCacheWidth[i];
-    delete polyArcCacheHeight[i];
-    delete polyArcCacheAngle1[i];
-    delete polyArcCacheAngle2[i];
-  }
-
-  for (i = 0; i < 8; i++)
-  {
-    delete shapeDataCache[i];
-  }
-
-  for (i = 0; i < 8; i++)
-  {
-    delete genericRequestDataCache[i];
-  }
-
-  for (i = 0; i < 16; i++)
-  {
-    delete renderDataCache[i];
-  }
-
-  for (i = 0; i < 16; i++)
-  {
-    delete renderCompositeGlyphsDataCache[i];
-  }
-
-  for (i = 0; i < 3; i++)
-  {
-    delete renderCompositeDataCache[i];
-  }
-}
diff --git a/nxcomp/ClientCache.h b/nxcomp/ClientCache.h
deleted file mode 100644
index ed3361097..000000000
--- a/nxcomp/ClientCache.h
+++ /dev/null
@@ -1,417 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef ClientCache_H
-#define ClientCache_H
-
-#include "Misc.h"
-
-#include "IntCache.h"
-#include "CharCache.h"
-#include "OpcodeCache.h"
-#include "XidCache.h"
-#include "FreeCache.h"
-
-#include "ChannelCache.h"
-
-class ClientCache : public ChannelCache
-{
-  public:
-
-  ClientCache();
-
-  ~ClientCache();
-
-  //
-  // Opcode prediction caches.
-  //
-
-  OpcodeCache opcodeCache;
-
-  //
-  // GC and drawables caches.
-  //
-
-  XidCache gcCache;
-  FreeCache freeGCCache;
-
-  XidCache drawableCache;
-  FreeCache freeDrawableCache;
-
-  XidCache windowCache;
-  FreeCache freeWindowCache;
-
-  //
-  // General-purpose caches.
-  //
-
-  IntCache cursorCache;
-  IntCache colormapCache;
-  IntCache visualCache;
-  CharCache depthCache;
-  CharCache resourceCache;
-  CharCache methodCache;
-
-  unsigned int lastFont;
-
-  //
-  // AllocColor request.
-  //
-
-  IntCache *allocColorRGBCache[3];
-
-  //
-  // ChangeProperty request.
-  //
-
-  CharCache changePropertyFormatCache;
-  IntCache changePropertyPropertyCache;
-  IntCache changePropertyTypeCache;
-  IntCache changePropertyData32Cache;
-
-  //
-  // ClearArea request.
-  //
-
-  IntCache *clearAreaGeomCache[4];
-
-  //
-  // ConfigureWindow request.
-  //
-
-  IntCache configureWindowBitmaskCache;
-  IntCache *configureWindowAttrCache[7];
-
-  //
-  // ConvertSelection request.
-  //
-
-  IntCache convertSelectionRequestorCache;
-  IntCache* convertSelectionAtomCache[3];
-  unsigned int convertSelectionLastTimestamp;
-
-  //
-  // CopyArea request.
-  //
-
-  IntCache *copyAreaGeomCache[6];
-
-  //
-  // CopyPlane request.
-  //
-
-  IntCache *copyPlaneGeomCache[6];
-  IntCache copyPlaneBitPlaneCache;
-
-  //
-  // CreateGC request.
-  //
-
-  IntCache createGCBitmaskCache;
-  IntCache *createGCAttrCache[23];
-
-  //
-  // CreatePixmap request.
-  //
-
-  IntCache createPixmapIdCache;
-  unsigned int createPixmapLastId;
-  IntCache createPixmapXCache;
-  IntCache createPixmapYCache;
-
-  //
-  // CreateWindow request.
-  //
-
-  IntCache *createWindowGeomCache[6];
-  IntCache createWindowBitmaskCache;
-  IntCache *createWindowAttrCache[15];
-
-  //
-  // FillPoly request.
-  //
-
-  IntCache fillPolyNumPointsCache;
-  IntCache *fillPolyXRelCache[10];
-  IntCache *fillPolyXAbsCache[10];
-  IntCache *fillPolyYRelCache[10];
-  IntCache *fillPolyYAbsCache[10];
-  unsigned int fillPolyRecentX[8];
-  unsigned int fillPolyRecentY[8];
-  unsigned int fillPolyIndex;
-
-  //
-  // GetSelectionOwner request.
-  //
-
-  IntCache getSelectionOwnerSelectionCache;
-
-  //
-  // GrabButton request (also used for GrabPointer).
-  //
-
-  IntCache grabButtonEventMaskCache;
-  IntCache grabButtonConfineCache;
-  CharCache grabButtonButtonCache;
-  IntCache grabButtonModifierCache;
-
-  //
-  // GrabKeyboard request.
-  //
-
-  unsigned int grabKeyboardLastTimestamp;
-
-  //
-  // ImageText8/16 request.
-  //
-
-  IntCache imageTextLengthCache;
-  unsigned int imageTextLastX;
-  unsigned int imageTextLastY;
-  IntCache imageTextCacheX;
-  IntCache imageTextCacheY;
-
-  //
-  // PolyFillRectangle request.
-  //
-
-  IntCache *polyFillRectangleCacheX[4];
-  IntCache *polyFillRectangleCacheY[4];
-  IntCache *polyFillRectangleCacheWidth[4];
-  IntCache *polyFillRectangleCacheHeight[4];
-
-  //
-  // PolyLine request.
-  //
-
-  IntCache *polyLineCacheX[2];
-  IntCache *polyLineCacheY[2];
-
-  //
-  // PolyPoint request.
-  //
-
-  IntCache *polyPointCacheX[2];
-  IntCache *polyPointCacheY[2];
-
-  //
-  // PolyRectangle request.
-  //
-
-  IntCache *polyRectangleGeomCache[4];
-
-  //
-  // PolySegment request.
-  //
-
-  IntCache polySegmentCacheX;
-  IntCache polySegmentCacheY;
-  unsigned int polySegmentLastX[2];
-  unsigned int polySegmentLastY[2];
-  unsigned int polySegmentCacheIndex;
-
-  //
-  // PolyText8/16 request.
-  //
-
-  unsigned int polyTextLastX;
-  unsigned int polyTextLastY;
-  IntCache polyTextCacheX;
-  IntCache polyTextCacheY;
-  IntCache polyTextFontCache;
-  CharCache polyTextDeltaCache;
-
-  //
-  // PutImage request.
-  //
-
-  IntCache putImageWidthCache;
-  IntCache putImageHeightCache;
-  unsigned int putImageLastX;
-  unsigned int putImageLastY;
-  IntCache putImageXCache;
-  IntCache putImageYCache;
-  CharCache putImageLeftPadCache;
-
-  //
-  // GetImage request.
-  //
-
-  IntCache getImagePlaneMaskCache;
-
-  //
-  // QueryColors request.
-  //
-
-  unsigned int queryColorsLastPixel;
-
-  //
-  // SetClipRectangles request.
-  //
-
-  IntCache setClipRectanglesXCache;
-  IntCache setClipRectanglesYCache;
-  IntCache *setClipRectanglesGeomCache[4];
-
-  //
-  // SetDashes request.
-  //
-
-  IntCache setDashesLengthCache;
-  IntCache setDashesOffsetCache;
-  CharCache setDashesDashCache_[2];
-
-  //
-  // SetSelectionOwner request.
-  //
-
-  IntCache setSelectionOwnerCache;
-  IntCache setSelectionOwnerTimestampCache;
-
-  //
-  // TranslateCoords request.
-  //
-
-  IntCache translateCoordsSrcCache;
-  IntCache translateCoordsDstCache;
-  IntCache translateCoordsXCache;
-  IntCache translateCoordsYCache;
-
-  //
-  // SendEvent request.
-  //
-
-  IntCache     sendEventMaskCache;
-  CharCache    sendEventCodeCache;
-  CharCache    sendEventByteDataCache;
-  unsigned int sendEventLastSequence;
-  IntCache     sendEventIntDataCache;
-  CharCache    sendEventEventCache;
-
-  //
-  // PolyFillArc request.
-  //
-
-  IntCache *polyFillArcCacheX[2];
-  IntCache *polyFillArcCacheY[2];
-  IntCache *polyFillArcCacheWidth[2];
-  IntCache *polyFillArcCacheHeight[2];
-  IntCache *polyFillArcCacheAngle1[2];
-  IntCache *polyFillArcCacheAngle2[2];
-
-  //
-  // PolyArc request.
-  //
-
-  IntCache *polyArcCacheX[2];
-  IntCache *polyArcCacheY[2];
-  IntCache *polyArcCacheWidth[2];
-  IntCache *polyArcCacheHeight[2];
-  IntCache *polyArcCacheAngle1[2];
-  IntCache *polyArcCacheAngle2[2];
-
-  //
-  // PutPackedImage request.
-  //
-
-  IntCache  putPackedImageSrcLengthCache;
-  IntCache  putPackedImageDstLengthCache;
-
-  //
-  // Shape extension requests.
-  //
-
-  CharCache shapeOpcodeCache;
-  IntCache  *shapeDataCache[8];
-
-  //
-  // Generic requests.
-  //
-
-  CharCache genericRequestOpcodeCache;
-  IntCache  *genericRequestDataCache[8];
-
-  //
-  // Render extension requests.
-  //
-
-  OpcodeCache renderOpcodeCache;
-
-  CharCache renderOpCache;
-
-  XidCache  renderSrcPictureCache;
-  XidCache  renderMaskPictureCache;
-  XidCache  renderDstPictureCache;
-  FreeCache renderFreePictureCache;
-
-  IntCache  renderGlyphSetCache;
-  FreeCache renderFreeGlyphSetCache;
-
-  IntCache renderIdCache;
-  IntCache renderLengthCache;
-  IntCache renderFormatCache;
-  IntCache renderValueMaskCache;
-  IntCache renderNumGlyphsCache;
-
-  IntCache renderXCache;
-  IntCache renderYCache;
-
-  unsigned int renderLastX;
-  unsigned int renderLastY;
-
-  IntCache renderWidthCache;
-  IntCache renderHeightCache;
-
-  unsigned int renderLastId;
-
-  IntCache *renderDataCache[16];
-
-  IntCache renderGlyphXCache;
-  IntCache renderGlyphYCache;
-
-  unsigned int renderGlyphX;
-  unsigned int renderGlyphY;
-
-  IntCache *renderCompositeGlyphsDataCache[16];
-  unsigned int renderLastCompositeGlyphsData;
-
-  IntCache *renderCompositeDataCache[3];
-
-  //
-  // SetCacheParameters request.
-  //
-
-  IntCache setCacheParametersCache;
-
-  //
-  // Encode new XID values based
-  // on the last value encoded.
-  //
-
-  IntCache lastIdCache;
-  unsigned int lastId;
-};
-
-#endif /* ClientCache_H */
diff --git a/nxcomp/ClientChannel.cpp b/nxcomp/ClientChannel.cpp
deleted file mode 100644
index dbf5f6986..000000000
--- a/nxcomp/ClientChannel.cpp
+++ /dev/null
@@ -1,7877 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include <string.h>
-
-#include <X11/X.h>
-#include <X11/Xatom.h>
-
-#include "NXproto.h"
-#include "NXrender.h"
-
-#include "ClientChannel.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-#include "StaticCompressor.h"
-
-#include "Statistics.h"
-#include "Proxy.h"
-
-#include "PutImage.h"
-#include "PutPackedImage.h"
-
-extern Proxy *proxy;
-
-//
-// Set the verbosity level. You also
-// need to define OPCODES in Misc.cpp
-// if you want literals instead of
-// opcodes' numbers.
-//
-
-#define PANIC
-#define WARNING
-#undef  OPCODES
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Log the important tracepoints related
-// to writing packets to the peer proxy.
-//
-
-#undef  FLUSH
-
-//
-// Log the operations related to splits.
-//
-
-#undef  SPLIT
-
-//
-// Define this to trace the invocations
-// of the agent's callbacks.
-//
-
-#undef  CALLBACK
-
-//
-// By defining this, a simple procedure is activated at
-// startup which just allocates and deallocates plenty
-// of cache objects. This is used to help determine the
-// current memory requirements.
-//
-
-#undef  MEMORY
-
-//
-// Inspects target of common X operations.
-//
-
-#undef  TARGETS
-
-#ifdef TARGETS
-
-#include <set>
-#include <map>
-
-typedef set < unsigned int, less<unsigned int> > T_windows;
-typedef set < unsigned int, less<unsigned int> > T_pixmaps;
-typedef map < unsigned int, unsigned int, less<unsigned int> > T_gcontexts;
-
-T_windows   windows;
-T_pixmaps   pixmaps;
-T_gcontexts gcontexts;
-
-#endif
-
-//
-// Define this to log when a channel
-// is created or destroyed.
-//
-
-#undef  REFERENCES
-
-//
-// Here are the static members.
-//
-
-#ifdef REFERENCES
-
-int ClientChannel::references_ = 0;
-
-#endif
-
-ClientChannel::ClientChannel(Transport *transport, StaticCompressor *compressor)
-
-  : Channel(transport, compressor), readBuffer_(transport_, this)
-{
-  //
-  // Sequence number of the next message
-  // being encoded or decoded.
-  //
-
-  clientSequence_ = 0;
-  serverSequence_ = 0;
-
-  //
-  // Current sequence known by NX agent.
-  //
-
-  lastSequence_ = 0;
-
-  //
-  // This is used to test the synchronous
-  // flush in the proxy.
-  //
-
-  lastRequest_ = 0;
-
-  //
-  // Store information about the images
-  // being streamed.
-  //
-
-  splitState_.resource = nothing;
-  splitState_.pending  = 0;
-  splitState_.commit   = 0;
-  splitState_.mode     = split_none;
-
-  //
-  // Number of outstanding tainted replies.
-  //
-
-  taintCounter_ = 0;
-
-  #ifdef MEMORY
-
-  *logofs << "ClientChannel: Created 1 ClientCache and 1 ServerCache. "
-          << "You have 30 seconds to check the allocated size.\n"
-          << logofs_flush;
-
-  sleep(30);
-
-  ClientCache *clientCacheTestArray[100];
-  ServerCache *serverCacheTestArray[100];
-
-  for (int i = 0; i < 100; i++)
-  {
-    clientCacheTestArray[i] = new ClientCache();
-  }
-
-  *logofs << "ClientChannel: Created further 100 ClientCache. "
-          << "You have 30 seconds to check the allocated size.\n"
-          << logofs_flush;
-
-  sleep(30);
-
-  for (int i = 0; i < 100; i++)
-  {
-    serverCacheTestArray[i] = new ServerCache();
-  }
-
-  *logofs << "ClientChannel: Created further 100 ServerCache. "
-          << "You have 30 seconds to check the allocated size.\n"
-          << logofs_flush;
-
-  sleep(30);
-
-  for (int i = 0; i < 100; i++)
-  {
-    delete clientCacheTestArray[i];
-    delete serverCacheTestArray[i];
-  }
-
-  *logofs << "ClientChannel: Deleted 100 ClientCache and 100 ServerCache. "
-          << "You have 30 seconds to check the allocated size.\n"
-          << logofs_flush;
-
-  sleep(30);
-
-  #endif
-
-  #ifdef REFERENCES
-  *logofs << "ClientChannel: Created new object at " 
-          << this << " for FD#" << fd_ << " out of " 
-          << ++references_ << " allocated channels.\n"
-          << logofs_flush;
-  #endif
-}
-
-ClientChannel::~ClientChannel()
-{
-  #ifdef REFERENCES
-  *logofs << "ClientChannel: Deleted object at " 
-          << this << " for FD#" << fd_ << " out of "
-          << --references_ << " allocated channels.\n"
-          << logofs_flush;
-  #endif
-}
-
-//
-// Beginning of handleRead().
-//
-
-int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *message,
-                                  unsigned int length)
-{
-  #ifdef TEST
-  *logofs << "handleRead: Called for FD#" << fd_
-          << " with " << encodeBuffer.getLength()
-          << " bytes already encoded.\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // Pointer to located message and
-  // its size in bytes.
-  //
-
-  const unsigned char *inputMessage;
-  unsigned int inputLength;
-
-  //
-  // Set when message is found in
-  // cache.
-  //
-
-  int hit;
-
-  //
-  // Check if we can borrow the buffer
-  // from the caller.
-  //
-
-  if (message != NULL && length != 0)
-  {
-    readBuffer_.readMessage(message, length);
-  }
-  else
-  {
-    //
-    // Get the data from the transport.
-    //
-
-    #if defined(TEST) || defined(INFO)
-    *logofs << "handleRead: Trying to read from FD#"
-            << fd_ << " at " << strMsTimestamp() << ".\n"
-            << logofs_flush;
-    #endif
-
-    int result = readBuffer_.readMessage();
-
-    #ifdef DEBUG
-    *logofs << "handleRead: Read result on FD#" << fd_
-            << " is " << result << ".\n"
-            << logofs_flush;
-    #endif
-
-    if (result < 0)
-    {
-      //
-      // Let the proxy close the channel.
-      //
-
-      return -1;
-    }
-    else if (result == 0)
-    {
-      #if defined(TEST) || defined(INFO)
-
-      *logofs << "handleRead: PANIC! No data read from FD#"
-              << fd_ << " while encoding messages.\n"
-              << logofs_flush;
-
-      HandleCleanup();
-
-      #endif
-
-      return 0;
-    }
-  }
-
-  #if defined(TEST) || defined(INFO) || defined(FLUSH)
-  *logofs << "handleRead: Encoding messages for FD#" << fd_
-          << " with " << readBuffer_.getLength() << " bytes "
-          << "in the buffer.\n" << logofs_flush;
-  #endif
-
-  //
-  // Extract any complete message which 
-  // is available in the buffer.
-  //
-
-  if (proxy -> handleAsyncSwitch(fd_) < 0)
-  {
-    return -1;
-  }
-
-  while ((inputMessage = readBuffer_.getMessage(inputLength)) != NULL)
-  {
-    hit = 0;
- 
-    if (firstRequest_)
-    {
-      //
-      // Need to add the length of the first
-      // request as it was not present in
-      // previous versions.
-      //
-
-      // Since ProtoStep7 (#issue 108)
-      encodeBuffer.encodeValue(inputLength, 8);
-
-      for (unsigned int i = 0; i < inputLength; i++)
-      {
-        encodeBuffer.encodeValue((unsigned int) inputMessage[i], 8);
-      }
-
-      firstRequest_ = 0;
-
-      #if defined(TEST) || defined(OPCODES)
-
-      int bits = encodeBuffer.diffBits();
-
-      *logofs << "handleRead: Handled first request. " << inputLength
-              << " bytes in, " << bits << " bits (" << ((float) bits) / 8
-              << " bytes) out.\n" << logofs_flush;
-      #endif
-
-      priority_++;
-    }
-    else
-    {
-      //
-      // First of all we get the opcode.
-      //
-
-      unsigned char inputOpcode = *inputMessage;
-
-      #if defined(TEST) || defined(INFO)
-
-      //
-      // This is used to test the synchronous
-      // flush in the parent proxy.
-      //
-
-      lastRequest_ = inputOpcode;
-
-      #endif
-
-      //
-      // Check if the request is supported by the
-      // remote. If not, only handle it locally and
-      // taint the opcode as a X_NoOperation. Also
-      // try to short-circuit some replies at this
-      // side. XSync requests, for example, weight
-      // for half of the total round-trips.
-      //
-
-      if (handleTaintRequest(inputOpcode, inputMessage,
-                                 inputLength) < 0)
-      {
-        return -1;
-      }
-
-      encodeBuffer.encodeOpcodeValue(inputOpcode, clientCache_ -> opcodeCache);
-
-      //
-      // Update the current sequence.
-      //
-
-      clientSequence_++;
-      clientSequence_ &= 0xffff;
-
-      #ifdef DEBUG
-      *logofs << "handleRead: Last client sequence number for FD#" 
-              << fd_ << " is " << clientSequence_ << ".\n"
-              << logofs_flush;
-      #endif
-
-      //
-      // If differential compression is disabled
-      // then use the most simple encoding.
-      //
-
-      if (control -> LocalDeltaCompression == 0)
-      {
-        int result = handleFastReadRequest(encodeBuffer, inputOpcode,
-                                               inputMessage, inputLength);
-        if (result < 0)
-        {
-          return -1;
-        }
-        else if (result > 0)
-        {
-          continue;
-        }
-      }
-
-      //
-      // Go to the message's specific encoding.
-      //
-
-      switch (inputOpcode)
-      {
-      case X_AllocColor:
-        {
-          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), 29,
-                             clientCache_ -> colormapCache);
-          const unsigned char *nextSrc = inputMessage + 8;
-          unsigned int colorData[3];
-          for (unsigned int i = 0; i < 3; i++)
-          {
-            unsigned int value = GetUINT(nextSrc, bigEndian_);
-            encodeBuffer.encodeCachedValue(value, 16,
-                               *(clientCache_ -> allocColorRGBCache[i]), 4);
-            colorData[i] = value;
-            nextSrc += 2;
-          }
-
-          sequenceQueue_.push(clientSequence_, inputOpcode,
-                                  colorData[0], colorData[1], colorData[2]);
-
-          priority_++;
-        }
-        break;
-      case X_ReparentWindow:
-        {
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                             clientCache_ -> windowCache);
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8, bigEndian_),
-                             clientCache_ -> windowCache);
-          encodeBuffer.encodeValue(GetUINT(inputMessage + 12, bigEndian_), 16, 11);
-          encodeBuffer.encodeValue(GetUINT(inputMessage + 14, bigEndian_), 16, 11);
-        }
-        break;
-      case X_ChangeProperty:
-        {
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_ChangeProperty);
-
-          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
-                                     inputMessage, inputLength))
-          {
-            hit = 1;
-
-            break;
-          }
-
-          unsigned char format = inputMessage[16];
-          encodeBuffer.encodeCachedValue(format, 8,
-                             clientCache_ -> changePropertyFormatCache);
-          unsigned int dataLength = GetULONG(inputMessage + 20, bigEndian_);
-          encodeBuffer.encodeValue(dataLength, 32, 6);
-          encodeBuffer.encodeValue(inputMessage[1], 2);
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                             clientCache_ -> windowCache);
-          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_), 29,
-                             clientCache_ -> changePropertyPropertyCache, 9);
-          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 12, bigEndian_), 29,
-                             clientCache_ -> changePropertyTypeCache, 9);
-          const unsigned char *nextSrc = inputMessage + 24;
-          if (format == 8)
-          {
-            // Since ProtoStep7 (#issue 108)
-            encodeBuffer.encodeTextData(nextSrc, dataLength);
-          }
-          else if (format == 32)
-          {
-            for (unsigned int i = 0; i < dataLength; i++)
-            {
-              encodeBuffer.encodeCachedValue(GetULONG(nextSrc, bigEndian_), 32,
-                                 clientCache_ -> changePropertyData32Cache);
-              nextSrc += 4;
-            }
-          }
-          else
-          {
-            for (unsigned int i = 0; i < dataLength; i++)
-            {
-              encodeBuffer.encodeValue(GetUINT(nextSrc, bigEndian_), 16);
-              nextSrc += 2;
-            }
-          }
-        }
-        break;
-      case X_SendEvent:
-        {
-          //
-          // TODO: This can be improved. In the worst
-          // cases, it appears to provide a poor 1.6:1
-          // ratio.
-          //
-
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_SendEvent);
-
-          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
-                                     inputMessage, inputLength))
-          {
-            hit = 1;
-
-            break;
-          }
-
-          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]);
-          unsigned int window = GetULONG(inputMessage + 4, bigEndian_);
-
-          if (window == 0 || window == 1)
-          {
-            encodeBuffer.encodeBoolValue(1);
-            encodeBuffer.encodeBoolValue(window);
-          }
-          else
-          {
-            encodeBuffer.encodeBoolValue(0);
-            encodeBuffer.encodeXidValue(window, clientCache_ -> windowCache);
-          }
-
-          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_), 32,
-                             clientCache_ -> sendEventMaskCache, 9);
-          encodeBuffer.encodeCachedValue(*(inputMessage + 12), 8, 
-                             clientCache_ -> sendEventCodeCache);
-          encodeBuffer.encodeCachedValue(*(inputMessage + 13), 8, 
-                             clientCache_ -> sendEventByteDataCache);
-
-          unsigned int newSeq = GetUINT(inputMessage + 14, bigEndian_);
-          unsigned int diffSeq = newSeq - clientCache_ -> sendEventLastSequence;
-          clientCache_ -> sendEventLastSequence = newSeq;
-          encodeBuffer.encodeValue(diffSeq, 16, 4);
-          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 16, bigEndian_), 32,
-                             clientCache_ -> sendEventIntDataCache);
-
-          for (unsigned int i = 20; i < 44; i++)
-          {
-            encodeBuffer.encodeCachedValue((unsigned int) inputMessage[i], 8,
-                               clientCache_ -> sendEventEventCache);
-          }
-        }
-        break;
-      case X_ChangeWindowAttributes:
-        {
-          encodeBuffer.encodeValue((inputLength - 12) >> 2, 4);
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                             clientCache_ -> windowCache);
-          unsigned int bitmask = GetULONG(inputMessage + 8, bigEndian_);
-          encodeBuffer.encodeCachedValue(bitmask, 15,
-                             clientCache_ -> createWindowBitmaskCache);
-          const unsigned char *nextSrc = inputMessage + 12;
-          unsigned int mask = 0x1;
-          for (unsigned int j = 0; j < 15; j++)
-          {
-            if (bitmask & mask)
-            {
-              encodeBuffer.encodeCachedValue(GetULONG(nextSrc, bigEndian_), 32,
-                                 *clientCache_ -> createWindowAttrCache[j]);
-              nextSrc += 4;
-            }
-            mask <<= 1;
-          }
-        }
-        break;
-      case X_ClearArea:
-        {
-          #ifdef TARGETS
-
-          unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
-
-          if (pixmaps.find(t_id) != pixmaps.end())
-          {
-            *logofs << "handleRead: X_ClearArea target id is pixmap "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else if (windows.find(t_id) != windows.end())
-          {
-            *logofs << "handleRead: X_ClearArea target id is window "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else
-          {
-            *logofs << "handleRead: X_ClearArea target id " << t_id
-                    << " is unrecognized.\n" << logofs_flush;
-          }
-
-          #endif
-
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_ClearArea);
-
-          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
-                                     inputMessage, inputLength))
-          {
-            hit = 1;
-
-            break;
-          }
-
-          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]);
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                             clientCache_ -> windowCache);
-          const unsigned char *nextSrc = inputMessage + 8;
-          for (unsigned int i = 0; i < 4; i++)
-          {
-            encodeBuffer.encodeCachedValue(GetUINT(nextSrc, bigEndian_), 16,
-                               *clientCache_ -> clearAreaGeomCache[i], 8);
-            nextSrc += 2;
-          }
-        }
-        break;
-      case X_CloseFont:
-        {
-          unsigned int font = GetULONG(inputMessage + 4, bigEndian_);
-          encodeBuffer.encodeValue(font - clientCache_ -> lastFont, 29, 5);
-          clientCache_ -> lastFont = font;
-        }
-        break;
-      case X_ConfigureWindow:
-        {
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_ConfigureWindow);
-
-          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
-                                     inputMessage, inputLength))
-          {
-            hit = 1;
-
-            break;
-          }
-
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                             clientCache_ -> windowCache);
-          unsigned int bitmask = GetUINT(inputMessage + 8, bigEndian_);
-          encodeBuffer.encodeCachedValue(bitmask, 7,
-                                  clientCache_ -> configureWindowBitmaskCache);
-          unsigned int mask = 0x1;
-          const unsigned char *nextSrc = inputMessage + 12;
-          for (unsigned int i = 0; i < 7; i++)
-          {
-            if (bitmask & mask)
-            {
-              encodeBuffer.encodeCachedValue(GetULONG(nextSrc, bigEndian_),
-                                 CONFIGUREWINDOW_FIELD_WIDTH[i],
-                                     *clientCache_ -> configureWindowAttrCache[i], 8);
-              nextSrc += 4;
-            }
-            mask <<= 1;
-          }
-        }
-        break;
-      case X_ConvertSelection:
-        {
-          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), 29,
-                             clientCache_ -> convertSelectionRequestorCache, 9);
-          const unsigned char* nextSrc = inputMessage + 8;
-          for (unsigned int i = 0; i < 3; i++)
-          {
-            encodeBuffer.encodeCachedValue(GetULONG(nextSrc, bigEndian_), 29,
-                               *(clientCache_ -> convertSelectionAtomCache[i]), 9);
-            nextSrc += 4;
-          }
-          unsigned int timestamp = GetULONG(nextSrc, bigEndian_);
-          encodeBuffer.encodeValue(timestamp -
-                             clientCache_ -> convertSelectionLastTimestamp, 32, 4);
-          clientCache_ -> convertSelectionLastTimestamp = timestamp;
-        }
-        break;
-      case X_CopyArea:
-        {
-          #ifdef TARGETS
-
-          unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
-
-          if (pixmaps.find(t_id) != pixmaps.end())
-          {
-            *logofs << "handleRead: X_CopyArea source id is pixmap "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else if (windows.find(t_id) != windows.end())
-          {
-            *logofs << "handleRead: X_CopyArea source id is window "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else
-          {
-            *logofs << "handleRead: X_CopyArea source id " << t_id
-                    << " is unrecognized.\n" << logofs_flush;
-          }
-
-          t_id = GetULONG(inputMessage + 8, bigEndian_);
-
-          if (pixmaps.find(t_id) != pixmaps.end())
-          {
-            *logofs << "handleRead: X_CopyArea target id is pixmap "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else if (windows.find(t_id) != windows.end())
-          {
-            *logofs << "handleRead: X_CopyArea target id is window "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else
-          {
-            *logofs << "handleRead: X_CopyArea target id " << t_id
-                    << " is unrecognized.\n" << logofs_flush;
-          }
-
-          #endif
-
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_CopyArea);
-
-          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
-                                     inputMessage, inputLength))
-          {
-            hit = 1;
-
-            break;
-          }
-
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
-                             bigEndian_), clientCache_ -> drawableCache);
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8,
-                             bigEndian_), clientCache_ -> drawableCache);
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 12,
-                             bigEndian_), clientCache_ -> gcCache);
-          const unsigned char *nextSrc = inputMessage + 16;
-          for (unsigned int i = 0; i < 6; i++)
-          {
-            encodeBuffer.encodeCachedValue(GetUINT(nextSrc, bigEndian_), 16,
-                               *clientCache_ -> copyAreaGeomCache[i], 8);
-            nextSrc += 2;
-          }
-        }
-        break;
-      case X_CopyGC:
-        {
-          #ifdef TARGETS
-
-          unsigned int s_g_id = GetULONG(inputMessage + 4, bigEndian_);
-          unsigned int d_g_id = GetULONG(inputMessage + 8, bigEndian_);
-
-          *logofs << "handleRead: X_CopyGC source gcontext id is " << s_g_id  
-                  << " destination gcontext id is " << d_g_id << ".\n" 
-                  << logofs_flush;
-
-          #endif
-
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
-                             bigEndian_), clientCache_ -> gcCache);
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8,
-                             bigEndian_), clientCache_ -> gcCache);
-          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 12,
-                             bigEndian_), 23, clientCache_ -> createGCBitmaskCache);
-        }
-        break;
-      case X_CopyPlane:
-        {
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
-                             bigEndian_), clientCache_ -> drawableCache);
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8,
-                             bigEndian_), clientCache_ -> drawableCache);
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 12,
-                             bigEndian_), clientCache_ -> gcCache);
-          const unsigned char *nextSrc = inputMessage + 16;
-          for (unsigned int i = 0; i < 6; i++)
-          {
-            encodeBuffer.encodeCachedValue(GetUINT(nextSrc, bigEndian_), 16,
-                               *clientCache_ -> copyPlaneGeomCache[i], 8);
-            nextSrc += 2;
-          }
-          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 28, bigEndian_), 32,
-                                         clientCache_ -> copyPlaneBitPlaneCache, 10);
-        }
-        break;
-      case X_CreateGC:
-        {
-          #ifdef TARGETS
-
-          unsigned int g_id = GetULONG(inputMessage + 4, bigEndian_);
-          unsigned int t_id = GetULONG(inputMessage + 8, bigEndian_);
-
-          if (pixmaps.find(t_id) != pixmaps.end())
-          {
-            *logofs << "handleRead: X_CreateGC id " << g_id
-                    << " target id is pixmap " << t_id
-                    << ".\n" << logofs_flush;
-          }
-          else if (windows.find(t_id) != windows.end())
-          {
-            *logofs << "handleRead: X_CreateGC id " << g_id
-                    << " target id is window " << t_id
-                    << ".\n" << logofs_flush;
-          }
-          else
-          {
-            *logofs << "handleRead: X_CreateGC id " << g_id
-                    << " target id is unrecognized.\n"
-                    << logofs_flush;
-          }
-
-          gcontexts.insert(T_gcontexts::value_type(g_id, t_id));
-
-          #endif
-
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_CreateGC);
-
-          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
-                                     inputMessage, inputLength))
-          {
-            hit = 1;
-
-            break;
-          }
-
-          // Since ProtoStep7 (#issue 108)
-          encodeBuffer.encodeNewXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                             clientCache_ -> lastId, clientCache_ -> lastIdCache,
-                                 clientCache_ -> gcCache,
-                                     clientCache_ -> freeGCCache);
-
-          const unsigned char *nextSrc = inputMessage + 8;
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8,
-                             bigEndian_), clientCache_ -> drawableCache);
-          nextSrc += 4;
-          unsigned int bitmask = GetULONG(nextSrc, bigEndian_);
-          nextSrc += 4;
-          encodeBuffer.encodeCachedValue(bitmask, 23,
-                             clientCache_ -> createGCBitmaskCache);
-          unsigned int mask = 0x1;
-          for (unsigned int i = 0; i < 23; i++)
-          {
-            if (bitmask & mask)
-            {
-              unsigned int value = GetULONG(nextSrc, bigEndian_);
-              nextSrc += 4;
-              unsigned int fieldWidth = CREATEGC_FIELD_WIDTH[i];
-              if (fieldWidth <= 4)
-              {
-                encodeBuffer.encodeValue(value, fieldWidth);
-              }
-              else
-              {
-                encodeBuffer.encodeCachedValue(value, fieldWidth,
-                                   *clientCache_ -> createGCAttrCache[i]);
-              }
-            }
-            mask <<= 1;
-          }
-        }
-        break;
-      case X_ChangeGC:
-        {
-          #ifdef TARGETS
-
-          unsigned int g_id = GetULONG(inputMessage + 4, bigEndian_);
-
-          T_gcontexts::iterator i = gcontexts.find(g_id);
-
-          if (i != gcontexts.end())
-          {
-            unsigned int t_id = i -> second;
-
-            if (pixmaps.find(t_id) != pixmaps.end())
-            {
-              *logofs << "handleRead: X_ChangeGC gcontext id is " << g_id  
-                      << " target id is pixmap " << t_id << ".\n" 
-                      << logofs_flush;
-            }
-            else if (windows.find(t_id) != windows.end())
-            {
-              *logofs << "handleRead: X_ChangeGC gcontext id is " << g_id  
-                      << " target id is window " << t_id << ".\n" 
-                      << logofs_flush;
-            }
-            else
-            {
-              *logofs << "handleRead: X_ChangeGC gcontext is " << g_id  
-                      << " target id is unrecognized.\n" 
-                      << logofs_flush;
-            }
-          }
-          else
-          {
-            *logofs << "handleRead: X_ChangeGC gcontext id " << g_id  
-                    << " is unrecognized.\n" << logofs_flush;
-          }
-
-          gcontexts.erase(g_id);
-
-          #endif
-
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_ChangeGC);
-
-          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
-                                     inputMessage, inputLength))
-          {
-            hit = 1;
-
-            break;
-          }
-
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
-                             bigEndian_), clientCache_ -> gcCache);
-          const unsigned char *nextSrc = inputMessage + 8;
-          unsigned int bitmask = GetULONG(nextSrc, bigEndian_);
-          nextSrc += 4;
-          encodeBuffer.encodeCachedValue(bitmask, 23,
-                             clientCache_ -> createGCBitmaskCache);
-          unsigned int mask = 0x1;
-          for (unsigned int i = 0; i < 23; i++)
-          {
-            if (bitmask & mask)
-            {
-              unsigned int value = GetULONG(nextSrc, bigEndian_);
-              nextSrc += 4;
-              unsigned int fieldWidth = CREATEGC_FIELD_WIDTH[i];
-              if (fieldWidth <= 4)
-              {
-                encodeBuffer.encodeValue(value, fieldWidth);
-              }
-              else
-              {
-                encodeBuffer.encodeCachedValue(value, fieldWidth,
-                                   *clientCache_ -> createGCAttrCache[i]);
-              }
-            }
-            mask <<= 1;
-          }
-        }
-        break;
-      case X_CreatePixmap:
-        {
-          #ifdef TARGETS
-
-          *logofs << "handleRead: X_CreatePixmap depth " << (unsigned) inputMessage[1]
-                  << ", pixmap id " << GetULONG(inputMessage + 4, bigEndian_)
-                  << ", drawable " << GetULONG(inputMessage + 8, bigEndian_)
-                  << ", width " << GetUINT(inputMessage + 12, bigEndian_)
-                  << ", height " << GetUINT(inputMessage + 14, bigEndian_)
-                  << ", size " << GetUINT(inputMessage + 2, bigEndian_) << 2
-                  << ".\n" << logofs_flush;
-
-          unsigned int   p_id = GetULONG(inputMessage + 4, bigEndian_);
-          unsigned short p_sx = GetUINT(inputMessage + 12, bigEndian_);
-          unsigned short p_sy = GetUINT(inputMessage + 14, bigEndian_);
-
-          *logofs << "handleRead: X_CreatePixmap id is " << p_id 
-                  << " width is " << p_sx << " height is " << p_sy 
-                  << ".\n" << logofs_flush;
-
-          if (p_sx * p_sy <= 64 * 64)
-          {
-            *logofs << "handleRead: X_CreatePixmap id " << p_id << " of size "
-                    << p_sx << "x" << p_sy << "=" << p_sx * p_sy 
-                    << " will be painted at client side.\n" << logofs_flush;
-          }
-          else
-          {
-            *logofs << "handleRead: X_CreatePixmap id " << p_id << " of size "
-                    << p_sx << "x" << p_sy << "=" << p_sx * p_sy 
-                    << " will be painted at server side.\n" << logofs_flush;
-          }
-
-          pixmaps.insert(p_id);
-
-          #endif
-
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_CreatePixmap);
-
-          hit = handleEncode(encodeBuffer, clientCache_, messageStore,
-                                 inputOpcode, inputMessage, inputLength);
-        }
-        break;
-      case X_CreateWindow:
-        {
-          #ifdef TARGETS
-
-          unsigned int w_id = GetULONG(inputMessage + 4, bigEndian_);
-
-          *logofs << "handleRead: X_CreateWindow id is " << w_id
-                  << ".\n" << logofs_flush;
-
-          windows.insert(w_id);
-
-          #endif
-
-          unsigned bitmask = GetULONG(inputMessage + 28, bigEndian_);
-          encodeBuffer.encodeCachedValue((unsigned int) inputMessage[1], 8,
-                                         clientCache_ -> depthCache);
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8, bigEndian_),
-                             clientCache_ -> windowCache);
-
-          // Since ProtoStep7 (#issue 108)
-          encodeBuffer.encodeNewXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                             clientCache_ -> lastId, clientCache_ -> lastIdCache,
-                                 clientCache_ -> windowCache,
-                                     clientCache_ -> freeWindowCache);
-
-          const unsigned char *nextSrc = inputMessage + 12;
-          for (unsigned int i = 0; i < 6; i++)
-          {
-            encodeBuffer.encodeCachedValue(GetUINT(nextSrc, bigEndian_), 16,
-                               *clientCache_ -> createWindowGeomCache[i], 8);
-            nextSrc += 2;
-          }
-          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 24,
-                                 bigEndian_), 29, clientCache_ -> visualCache);
-          encodeBuffer.encodeCachedValue(bitmask, 15,
-                                     clientCache_ -> createWindowBitmaskCache);
-          nextSrc = inputMessage + 32;
-          unsigned int mask = 0x1;
-          for (unsigned int j = 0; j < 15; j++)
-          {
-            if (bitmask & mask)
-            {
-              encodeBuffer.encodeCachedValue(GetULONG(nextSrc, bigEndian_), 32,
-                                 *clientCache_ -> createWindowAttrCache[j]);
-              nextSrc += 4;
-            }
-            mask <<= 1;
-          }
-        }
-        break;
-      case X_DeleteProperty:
-        {
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                             clientCache_ -> windowCache);
-          encodeBuffer.encodeValue(GetULONG(inputMessage + 8, bigEndian_), 29, 9);
-        }
-        break;
-      case X_FillPoly:
-        {
-          #ifdef TARGETS
-
-          unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
-
-          if (pixmaps.find(t_id) != pixmaps.end())
-          {
-            *logofs << "handleRead: X_FillPoly target id is pixmap "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else if (windows.find(t_id) != windows.end())
-          {
-            *logofs << "handleRead: X_FillPoly target id is window "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else
-          {
-            *logofs << "handleRead: X_FillPoly target id " << t_id
-                    << " is unrecognized.\n" << logofs_flush;
-          }
-
-          #endif
-
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_FillPoly);
-
-          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
-                                     inputMessage, inputLength))
-          {
-            hit = 1;
-
-            break;
-          }
-
-          unsigned int numPoints = ((inputLength - 16) >> 2);
-
-          // Since ProtoStep10 (#issue 108)
-          encodeBuffer.encodeCachedValue(numPoints, 16,
-                             clientCache_ -> fillPolyNumPointsCache, 4);
-
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                             clientCache_ -> drawableCache);
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8, bigEndian_),
-                             clientCache_ -> gcCache);
-          encodeBuffer.encodeValue((unsigned int) inputMessage[12], 2);
-          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[13]);
-          int relativeCoordMode = (inputMessage[13] != 0);
-          const unsigned char *nextSrc = inputMessage + 16;
-          unsigned int pointIndex = 0;
-
-          for (unsigned int i = 0; i < numPoints; i++)
-          {
-            if (relativeCoordMode)
-            {
-              encodeBuffer.encodeCachedValue(GetUINT(nextSrc, bigEndian_), 16,
-                                 *clientCache_ -> fillPolyXRelCache[pointIndex], 8);
-              nextSrc += 2;
-              encodeBuffer.encodeCachedValue(GetUINT(nextSrc, bigEndian_), 16,
-                                 *clientCache_ -> fillPolyYRelCache[pointIndex], 8);
-              nextSrc += 2;
-            }
-            else
-            {
-              unsigned int x = GetUINT(nextSrc, bigEndian_);
-              nextSrc += 2;
-              unsigned int y = GetUINT(nextSrc, bigEndian_);
-              nextSrc += 2;
-              unsigned int j;
-              for (j = 0; j < 8; j++)
-                if ((x == clientCache_ -> fillPolyRecentX[j]) &&
-                    (y == clientCache_ -> fillPolyRecentY[j]))
-                  break;
-              if (j < 8)
-              {
-                encodeBuffer.encodeBoolValue(1);
-                encodeBuffer.encodeValue(j, 3);
-              }
-              else
-              {
-                encodeBuffer.encodeBoolValue(0);
-                encodeBuffer.encodeCachedValue(x, 16,
-                             *clientCache_ -> fillPolyXAbsCache[pointIndex], 8);
-                encodeBuffer.encodeCachedValue(y, 16,
-                             *clientCache_ -> fillPolyYAbsCache[pointIndex], 8);
-                clientCache_ -> fillPolyRecentX[clientCache_ -> fillPolyIndex] = x;
-                clientCache_ -> fillPolyRecentY[clientCache_ -> fillPolyIndex] = y;
-                clientCache_ -> fillPolyIndex++;
-                if (clientCache_ -> fillPolyIndex == 8)
-                  clientCache_ -> fillPolyIndex = 0;
-              }
-            }
-
-            if (++pointIndex == 10) pointIndex = 0;
-          }
-        }
-        break;
-      case X_FreeColors:
-        {
-          unsigned int numPixels = GetUINT(inputMessage + 2, bigEndian_) - 3;
-          encodeBuffer.encodeValue(numPixels, 16, 4);
-          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), 29,
-                                         clientCache_ -> colormapCache);
-          encodeBuffer.encodeValue(GetULONG(inputMessage + 8, bigEndian_), 32, 4);
-          const unsigned char *nextSrc = inputMessage + 12;
-          while (numPixels)
-          {
-            encodeBuffer.encodeValue(GetULONG(nextSrc, bigEndian_), 32, 8);
-            nextSrc += 4;
-            numPixels--;
-          }
-        }
-        break;
-      case X_FreeCursor:
-        {
-          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_),
-                                         29, clientCache_ -> cursorCache, 9);
-        }
-        break;
-      case X_FreeGC:
-        {
-          #ifdef TARGETS
-
-          unsigned int g_id = GetULONG(inputMessage + 4, bigEndian_);
-
-          T_gcontexts::iterator i = gcontexts.find(g_id);
-
-          if (i != gcontexts.end())
-          {
-            unsigned int t_id = i -> second;
-
-            if (pixmaps.find(t_id) != pixmaps.end())
-            {
-              *logofs << "handleRead: X_FreeGC gcontext id is " << g_id  
-                      << " target id is pixmap " << t_id << ".\n" 
-                      << logofs_flush;
-            }
-            else if (windows.find(t_id) != windows.end())
-            {
-              *logofs << "handleRead: X_FreeGC gcontext id is " << g_id  
-                      << " target id is window " << t_id << ".\n" 
-                      << logofs_flush;
-            }
-            else
-            {
-              *logofs << "handleRead: X_FreeGC gcontext id is " << g_id  
-                      << " target id is unrecognized.\n" 
-                      << logofs_flush;
-            }
-          }
-          else
-          {
-            *logofs << "handleRead: X_FreeGC gcontext id " << g_id  
-                    << " is unrecognized.\n" << logofs_flush;
-          }
-
-          gcontexts.erase(g_id);
-
-          #endif
-
-          // Since ProtoStep7 (#issue 108)
-          encodeBuffer.encodeFreeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                             clientCache_ -> freeGCCache);
-        }
-        break;
-      case X_FreePixmap:
-        {
-          #ifdef TARGETS
-
-          unsigned int p_id = GetULONG(inputMessage + 4, bigEndian_);
-
-          *logofs << "handleRead: X_FreePixmap id is " << p_id << ".\n" << logofs_flush;
-
-          pixmaps.erase(p_id);
-
-          #endif
-
-          // Since ProtoStep7 (#issue 108)
-          encodeBuffer.encodeFreeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                             clientCache_ -> freeDrawableCache);
-        }
-        break;
-      case X_GetAtomName:
-        {
-          encodeBuffer.encodeValue(GetULONG(inputMessage + 4, bigEndian_), 29, 9);
-
-          sequenceQueue_.push(clientSequence_, inputOpcode);
-
-          priority_++;
-        }
-        break;
-      case X_GetGeometry:
-        {
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                             clientCache_ -> drawableCache);
-
-          sequenceQueue_.push(clientSequence_, inputOpcode);
-
-          priority_++;
-        }
-        break;
-      case X_GetInputFocus:
-        {
-          sequenceQueue_.push(clientSequence_, inputOpcode);
-
-          priority_++;
-        }
-        break;
-      case X_GetModifierMapping:
-        {
-          sequenceQueue_.push(clientSequence_, inputOpcode);
-
-          priority_++;
-        }
-        break;
-      case X_GetKeyboardMapping:
-        {
-          encodeBuffer.encodeValue((unsigned int) inputMessage[4], 8);
-          encodeBuffer.encodeValue((unsigned int) inputMessage[5], 8);
-
-          sequenceQueue_.push(clientSequence_, inputOpcode);
-
-          priority_++;
-        }
-        break;
-      case X_GetProperty:
-        {
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_GetProperty);
-
-          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
-                                     inputMessage, inputLength))
-          {
-            unsigned int property = GetULONG(inputMessage + 8, bigEndian_);
-
-            sequenceQueue_.push(clientSequence_, inputOpcode, property);
-
-            priority_++;
-
-            hit = 1;
-
-            break;
-          }
-
-          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]);
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                             clientCache_ -> windowCache);
-          unsigned int property = GetULONG(inputMessage + 8, bigEndian_);
-          encodeBuffer.encodeValue(property, 29, 9);
-          encodeBuffer.encodeValue(GetULONG(inputMessage + 12, bigEndian_), 29, 9);
-          encodeBuffer.encodeValue(GetULONG(inputMessage + 16, bigEndian_), 32, 2);
-          encodeBuffer.encodeValue(GetULONG(inputMessage + 20, bigEndian_), 32, 8);
-
-          sequenceQueue_.push(clientSequence_, inputOpcode, property);
-
-          priority_++;
-        }
-        break;
-      case X_GetSelectionOwner:
-        {
-          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), 29,
-                             clientCache_ -> getSelectionOwnerSelectionCache, 9);
-
-          sequenceQueue_.push(clientSequence_, inputOpcode);
-
-          priority_++;
-        }
-        break;
-      case X_GrabButton:
-        {
-          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]);
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                             clientCache_ -> windowCache);
-          encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 8, bigEndian_), 16,
-                             clientCache_ -> grabButtonEventMaskCache);
-          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[10]);
-          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[11]);
-          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 12, bigEndian_), 29,
-                             clientCache_ -> grabButtonConfineCache, 9);
-          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 16, bigEndian_), 29,
-                             clientCache_ -> cursorCache, 9);
-          encodeBuffer.encodeCachedValue(inputMessage[20], 8,
-                             clientCache_ -> grabButtonButtonCache);
-          encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 22, bigEndian_), 16,
-                             clientCache_ -> grabButtonModifierCache);
-        }
-        break;
-      case X_GrabPointer:
-        {
-          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]);
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                             clientCache_ -> windowCache);
-          encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 8, bigEndian_), 16,
-                             clientCache_ -> grabButtonEventMaskCache);
-          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[10]);
-          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[11]);
-          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 12,
-                           bigEndian_), 29,
-                               clientCache_ -> grabButtonConfineCache, 9);
-          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 16,
-                           bigEndian_), 29, clientCache_ -> cursorCache, 9);
-
-          unsigned int timestamp = GetULONG(inputMessage + 20, bigEndian_);
-          encodeBuffer.encodeValue(timestamp -
-                           clientCache_ -> grabKeyboardLastTimestamp, 32, 4);
-          clientCache_ -> grabKeyboardLastTimestamp = timestamp;
-
-          sequenceQueue_.push(clientSequence_, inputOpcode);
-
-          priority_++;
-        }
-        break;
-      case X_GrabKeyboard:
-        {
-          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]);
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                             clientCache_ -> windowCache);
-          unsigned int timestamp = GetULONG(inputMessage + 8, bigEndian_);
-          encodeBuffer.encodeValue(timestamp -
-                             clientCache_ -> grabKeyboardLastTimestamp, 32, 4);
-          clientCache_ -> grabKeyboardLastTimestamp = timestamp;
-          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[12]);
-          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[13]);
-
-          sequenceQueue_.push(clientSequence_, inputOpcode);
-
-          priority_++;
-        }
-        break;
-      case X_GrabServer:
-      case X_UngrabServer:
-      case X_NoOperation:
-        {
-        }
-        break;
-      case X_PolyText8:
-        {
-          #ifdef TARGETS
-
-          unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
-
-          if (pixmaps.find(t_id) != pixmaps.end())
-          {
-            *logofs << "handleRead: X_PolyText8 target id is pixmap "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else if (windows.find(t_id) != windows.end())
-          {
-            *logofs << "handleRead: X_PolyText8 target id is window "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else
-          {
-            *logofs << "handleRead: X_PolyText8 target id " << t_id
-                    << " is unrecognized.\n" << logofs_flush;
-          }
-
-          #endif
-
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_PolyText8);
-
-          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
-                                     inputMessage, inputLength))
-          {
-            hit = 1;
-
-            break;
-          }
-
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
-                             bigEndian_), clientCache_ -> drawableCache);
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8,
-                             bigEndian_), clientCache_ -> gcCache);
-          unsigned int x = GetUINT(inputMessage + 12, bigEndian_);
-          int xDiff = x - clientCache_ -> polyTextLastX;
-          clientCache_ -> polyTextLastX = x;
-          encodeBuffer.encodeCachedValue(xDiff, 16,
-                             clientCache_ -> polyTextCacheX);
-          unsigned int y = GetUINT(inputMessage + 14, bigEndian_);
-          int yDiff = y - clientCache_ -> polyTextLastY;
-          clientCache_ -> polyTextLastY = y;
-          encodeBuffer.encodeCachedValue(yDiff, 16,
-                             clientCache_ -> polyTextCacheY);
-          const unsigned char *end = inputMessage + inputLength - 1;
-          const unsigned char *nextSrc = inputMessage + 16;
-          while (nextSrc < end)
-          {
-            unsigned int textLength = (unsigned int) *nextSrc++;
-            encodeBuffer.encodeBoolValue(1);
-            encodeBuffer.encodeValue(textLength, 8);
-            if (textLength == 255)
-            {
-              encodeBuffer.encodeCachedValue(GetULONG(nextSrc, 1), 29,
-                                 clientCache_ -> polyTextFontCache);
-              nextSrc += 4;
-            }
-            else
-            {
-              encodeBuffer.encodeCachedValue(*nextSrc++, 8,
-                                 clientCache_ -> polyTextDeltaCache);
-
-              // Since ProtoStep7 (#issue 108)
-              encodeBuffer.encodeTextData(nextSrc, textLength);
-              nextSrc += textLength;
-            }
-          }
-          encodeBuffer.encodeBoolValue(0);
-        }
-        break;
-      case X_PolyText16:
-        {
-          #ifdef TARGETS
-
-          unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
-
-          if (pixmaps.find(t_id) != pixmaps.end())
-          {
-            *logofs << "handleRead: X_PolyText16 target id is pixmap "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else if (windows.find(t_id) != windows.end())
-          {
-            *logofs << "handleRead: X_PolyText16 target id is window "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else
-          {
-            *logofs << "handleRead: X_PolyText16 target id " << t_id
-                    << " is unrecognized.\n" << logofs_flush;
-          }
-
-          #endif
-
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_PolyText16);
-
-          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
-                                     inputMessage, inputLength))
-          {
-            hit = 1;
-
-            break;
-          }
-
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
-                             bigEndian_), clientCache_ -> drawableCache);
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8,
-                             bigEndian_), clientCache_ -> gcCache);
-          unsigned int x = GetUINT(inputMessage + 12, bigEndian_);
-          int xDiff = x - clientCache_ -> polyTextLastX;
-          clientCache_ -> polyTextLastX = x;
-          encodeBuffer.encodeCachedValue(xDiff, 16,
-                             clientCache_ -> polyTextCacheX);
-          unsigned int y = GetUINT(inputMessage + 14, bigEndian_);
-          int yDiff = y - clientCache_ -> polyTextLastY;
-          clientCache_ -> polyTextLastY = y;
-          encodeBuffer.encodeCachedValue(yDiff, 16,
-                             clientCache_ -> polyTextCacheY);
-          const unsigned char *end = inputMessage + inputLength - 1;
-          const unsigned char *nextSrc = inputMessage + 16;
-          while (nextSrc < end)
-          {
-            unsigned int textLength = (unsigned int) *nextSrc++;
-            encodeBuffer.encodeBoolValue(1);
-            encodeBuffer.encodeValue(textLength, 8);
-            if (textLength == 255)
-            {
-              encodeBuffer.encodeCachedValue(GetULONG(nextSrc, 1), 29,
-                                 clientCache_ -> polyTextFontCache);
-              nextSrc += 4;
-            }
-            else
-            {
-              encodeBuffer.encodeCachedValue(*nextSrc++, 8,
-                                 clientCache_ -> polyTextDeltaCache);
-
-              // Since ProtoStep7 (#issue 108)
-              encodeBuffer.encodeTextData(nextSrc, textLength * 2);
-              nextSrc += textLength * 2;
-            }
-          }
-          encodeBuffer.encodeBoolValue(0);
-        }
-        break;
-      case X_ImageText8:
-        {
-          #ifdef TARGETS
-
-          unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
-
-          if (pixmaps.find(t_id) != pixmaps.end())
-          {
-            *logofs << "handleRead: X_ImageText8 target id is pixmap "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else if (windows.find(t_id) != windows.end())
-          {
-            *logofs << "handleRead: X_ImageText8 target id is window "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else
-          {
-            *logofs << "handleRead: X_ImageText8 target id "
-                    << t_id << " is unrecognized.\n"
-                    << logofs_flush;
-          }
-
-          #endif
-
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_ImageText8);
-
-          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
-                                     inputMessage, inputLength))
-          {
-            hit = 1;
-
-            break;
-          }
-
-          unsigned int textLength = (unsigned int) inputMessage[1];
-          encodeBuffer.encodeCachedValue(textLength, 8,
-                             clientCache_ -> imageTextLengthCache, 4);
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
-                             bigEndian_), clientCache_ -> drawableCache);
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8,
-                             bigEndian_), clientCache_ -> gcCache);
-          unsigned int x = GetUINT(inputMessage + 12, bigEndian_);
-          int xDiff = x - clientCache_ -> imageTextLastX;
-          clientCache_ -> imageTextLastX = x;
-          encodeBuffer.encodeCachedValue(xDiff, 16,
-                             clientCache_ -> imageTextCacheX);
-          unsigned int y = GetUINT(inputMessage + 14, bigEndian_);
-          int yDiff = y - clientCache_ -> imageTextLastY;
-          clientCache_ -> imageTextLastY = y;
-          encodeBuffer.encodeCachedValue(yDiff, 16,
-                             clientCache_ -> imageTextCacheY);
-          const unsigned char *nextSrc = inputMessage + 16;
-
-          // Since ProtoStep7 (#issue 108)
-          encodeBuffer.encodeTextData(nextSrc, textLength);
-        }
-        break;
-      case X_ImageText16:
-        {
-          #ifdef TARGETS
-
-          unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
-
-          if (pixmaps.find(t_id) != pixmaps.end())
-          {
-            *logofs << "handleRead: X_ImageText16 target id is pixmap "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else if (windows.find(t_id) != windows.end())
-          {
-            *logofs << "handleRead: X_ImageText16 target id is window "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else
-          {
-            *logofs << "handleRead: X_ImageText16 target id "
-                    << t_id << " is unrecognized.\n"
-                    << logofs_flush;
-          }
-
-          #endif
-
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_ImageText16);
-
-          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
-                                     inputMessage, inputLength))
-          {
-            hit = 1;
-
-            break;
-          }
-
-          unsigned int textLength = (unsigned int) inputMessage[1];
-          encodeBuffer.encodeCachedValue(textLength, 8,
-                             clientCache_ -> imageTextLengthCache, 4);
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
-                             bigEndian_), clientCache_ -> drawableCache);
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8,
-                             bigEndian_), clientCache_ -> gcCache);
-          unsigned int x = GetUINT(inputMessage + 12, bigEndian_);
-          int xDiff = x - clientCache_ -> imageTextLastX;
-          clientCache_ -> imageTextLastX = x;
-          encodeBuffer.encodeCachedValue(xDiff, 16,
-                             clientCache_ -> imageTextCacheX);
-          unsigned int y = GetUINT(inputMessage + 14, bigEndian_);
-          int yDiff = y - clientCache_ -> imageTextLastY;
-          clientCache_ -> imageTextLastY = y;
-          encodeBuffer.encodeCachedValue(yDiff, 16,
-                             clientCache_ -> imageTextCacheY);
-          const unsigned char *nextSrc = inputMessage + 16;
-
-          // Since ProtoStep7 (#issue 108)
-          encodeBuffer.encodeTextData(nextSrc, textLength * 2);
-        }
-        break;
-      case X_InternAtom:
-        {
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_InternAtom);
-
-          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
-                                     inputMessage, inputLength))
-          {
-            sequenceQueue_.push(clientSequence_, inputOpcode);
-
-            //
-            // Set the priority, also if doing so will
-            // penalize all the well written clients
-            // using XInternAtoms() to pipeline multi-
-            // ple replies.
-            //
-
-            priority_++;
-
-            hit = 1;
-
-            break;
-          }
-
-          unsigned int nameLength = GetUINT(inputMessage + 4, bigEndian_);
-          encodeBuffer.encodeValue(nameLength, 16, 6);
-          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]);
-          const unsigned char *nextSrc = inputMessage + 8;
-
-          // Since ProtoStep7 (#issue 108)
-          encodeBuffer.encodeTextData(nextSrc, nameLength);
-
-          sequenceQueue_.push(clientSequence_, inputOpcode);
-
-          priority_++;
-        }
-        break;
-      case X_ListExtensions:
-        {
-          sequenceQueue_.push(clientSequence_, inputOpcode);
-
-          priority_++;
-        }
-        break;
-      case X_ListFonts:
-        {
-          unsigned int textLength = GetUINT(inputMessage + 6, bigEndian_);
-          encodeBuffer.encodeValue(textLength, 16, 6);
-          encodeBuffer.encodeValue(GetUINT(inputMessage + 4, bigEndian_), 16, 6);
-          const unsigned char* nextSrc = inputMessage + 8;
-
-          // Since ProtoStep7 (#issue 108)
-          encodeBuffer.encodeTextData(nextSrc, textLength);
-
-          sequenceQueue_.push(clientSequence_, inputOpcode);
-
-          priority_++;
-        }
-        break;
-      case X_LookupColor:
-      case X_AllocNamedColor:
-        {
-          unsigned int textLength = GetUINT(inputMessage + 8, bigEndian_);
-          encodeBuffer.encodeValue(textLength, 16, 6);
-          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_),
-                                         29, clientCache_ -> colormapCache);
-          const unsigned char *nextSrc = inputMessage + 12;
-
-          // Since ProtoStep7 (#issue 108)
-          encodeBuffer.encodeTextData(nextSrc, textLength);
-
-          sequenceQueue_.push(clientSequence_, inputOpcode);
-
-          priority_++;
-        }
-        break;
-      case X_MapWindow:
-      case X_UnmapWindow:
-      case X_MapSubwindows:
-      case X_GetWindowAttributes:
-      case X_DestroyWindow:
-      case X_DestroySubwindows:
-      case X_QueryPointer:
-      case X_QueryTree:
-        {
-          #ifdef TARGETS
-
-          if (inputOpcode == X_DestroyWindow)
-          {
-            unsigned int w_id = GetULONG(inputMessage + 4, bigEndian_);
-
-            *logofs << "handleRead: X_DestroyWindow id is "
-                    << w_id << ".\n" << logofs_flush;
-
-            windows.erase(w_id);
-          }
-
-          #endif
-
-          if (inputOpcode == X_DestroyWindow)
-          {
-            // Since ProtoStep7 (#issue 108)
-            encodeBuffer.encodeFreeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                               clientCache_ -> freeWindowCache);
-          }
-          else
-          {
-            encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                               clientCache_ -> windowCache);
-          }
-
-          if ((inputOpcode == X_QueryPointer) ||
-              (inputOpcode == X_GetWindowAttributes) ||
-              (inputOpcode == X_QueryTree))
-          {
-            sequenceQueue_.push(clientSequence_, inputOpcode);
-
-            priority_++;
-          }
-        }
-        break;
-      case X_OpenFont:
-        {
-          unsigned int nameLength = GetUINT(inputMessage + 8, bigEndian_);
-          encodeBuffer.encodeValue(nameLength, 16, 7);
-          unsigned int font = GetULONG(inputMessage + 4, bigEndian_);
-          encodeBuffer.encodeValue(font - clientCache_ -> lastFont, 29, 5);
-          clientCache_ -> lastFont = font;
-          const unsigned char *nextSrc = inputMessage + 12;
-
-          // Since ProtoStep7 (#issue 108)
-          encodeBuffer.encodeTextData(nextSrc, nameLength);
-        }
-        break;
-      case X_PolyFillRectangle:
-        {
-          #ifdef TARGETS
-
-          unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
-
-          if (pixmaps.find(t_id) != pixmaps.end())
-          {
-            *logofs << "handleRead: X_PolyFillRectangle target id is pixmap "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else if (windows.find(t_id) != windows.end())
-          {
-            *logofs << "handleRead: X_PolyFillRectangle target id is window "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else
-          {
-            *logofs << "handleRead: X_PolyFillRectangle target id "
-                    << t_id << " is unrecognized.\n"
-                    << logofs_flush;
-          }
-
-          #endif
-
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_PolyFillRectangle);
-
-          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
-                                     inputMessage, inputLength))
-          {
-            hit = 1;
-
-            break;
-          }
-
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
-                             bigEndian_), clientCache_ -> drawableCache);
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8,
-                             bigEndian_), clientCache_ -> gcCache);
-
-          unsigned int index = 0;
-          unsigned int lastX = 0, lastY = 0;
-          unsigned int lastWidth = 0, lastHeight = 0;
-
-          //
-          // TODO: Could send the size at the beginning
-          // instead of a bool at each iteration.
-          //
-
-          for (unsigned int i = 12; i < inputLength;)
-          {
-            unsigned int x = GetUINT(inputMessage + i, bigEndian_);
-            unsigned int newX = x;
-            x -= lastX;
-            lastX = newX;
-            encodeBuffer.encodeCachedValue(x, 16,
-                         *clientCache_ -> polyFillRectangleCacheX[index], 8);
-            i += 2;
-            unsigned int y = GetUINT(inputMessage + i, bigEndian_);
-            unsigned int newY = y;
-            y -= lastY;
-            lastY = newY;
-            encodeBuffer.encodeCachedValue(y, 16,
-                         *clientCache_ -> polyFillRectangleCacheY[index], 8);
-            i += 2;
-            unsigned int width = GetUINT(inputMessage + i, bigEndian_);
-            unsigned int newWidth = width;
-            width -= lastWidth;
-            lastWidth = newWidth;
-            encodeBuffer.encodeCachedValue(width, 16,
-                         *clientCache_ -> polyFillRectangleCacheWidth[index], 8);
-            i += 2;
-            unsigned int height = GetUINT(inputMessage + i, bigEndian_);
-            unsigned int newHeight = height;
-            height -= lastHeight;
-            lastHeight = newHeight;
-            encodeBuffer.encodeCachedValue(height, 16,
-                         *clientCache_ -> polyFillRectangleCacheHeight[index], 8);
-            i += 2;
-
-            if (++index == 4) index = 0;
-
-            encodeBuffer.encodeBoolValue((i < inputLength) ? 1 : 0);
-          }
-        }
-        break;
-      case X_PolyFillArc:
-        {
-          #ifdef TARGETS
-
-          unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
-
-          if (pixmaps.find(t_id) != pixmaps.end())
-          {
-            *logofs << "handleRead:  X_PolyFillArc target id is pixmap "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else if (windows.find(t_id) != windows.end())
-          {
-            *logofs << "handleRead:  X_PolyFillArc target id is window "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else
-          {
-            *logofs << "handleRead:  X_PolyFillArc target id " << t_id
-                    << " is unrecognized.\n" << logofs_flush;
-          }
-
-          #endif
-
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_PolyFillArc);
-
-          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
-                                     inputMessage, inputLength))
-          {
-            hit = 1;
-
-            break;
-          }
-
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
-                             bigEndian_), clientCache_ -> drawableCache);
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8,
-                             bigEndian_), clientCache_ -> gcCache);
-
-          unsigned int index = 0;
-          unsigned int lastX = 0, lastY = 0;
-          unsigned int lastWidth = 0, lastHeight = 0;
-          unsigned int lastAngle1 = 0, lastAngle2 = 0;
-
-          //
-          // TODO: Could send the size at the beginning
-          // instead of a bool at each iteration.
-          //
-
-          for (unsigned int i = 12; i < inputLength;)
-          {
-            unsigned int x = GetUINT(inputMessage + i, bigEndian_);
-            unsigned int newX = x;
-            x -= lastX;
-            lastX = newX;
-            encodeBuffer.encodeCachedValue(x, 16,
-                         *clientCache_ -> polyFillArcCacheX[index], 8);
-            i += 2;
-            unsigned int y = GetUINT(inputMessage + i, bigEndian_);
-            unsigned int newY = y;
-            y -= lastY;
-            lastY = newY;
-            encodeBuffer.encodeCachedValue(y, 16,
-                         *clientCache_ -> polyFillArcCacheY[index], 8);
-            i += 2;
-            unsigned int width = GetUINT(inputMessage + i, bigEndian_);
-            unsigned int newWidth = width;
-            width -= lastWidth;
-            lastWidth = newWidth;
-            encodeBuffer.encodeCachedValue(width, 16,
-                         *clientCache_ -> polyFillArcCacheWidth[index], 8);
-            i += 2;
-            unsigned int height = GetUINT(inputMessage + i, bigEndian_);
-            unsigned int newHeight = height;
-            height -= lastHeight;
-            lastHeight = newHeight;
-            encodeBuffer.encodeCachedValue(height, 16,
-                         *clientCache_ -> polyFillArcCacheHeight[index], 8);
-            i += 2;
-            unsigned int angle1 = GetUINT(inputMessage + i, bigEndian_);
-            unsigned int newAngle1 = angle1;
-            angle1 -= lastAngle1;
-            lastAngle1 = newAngle1;
-            encodeBuffer.encodeCachedValue(angle1, 16,
-                         *clientCache_ -> polyFillArcCacheAngle1[index], 8);
-            i += 2;
-            unsigned int angle2 = GetUINT(inputMessage + i, bigEndian_);
-            unsigned int newAngle2 = angle2;
-            angle2 -= lastAngle2;
-            lastAngle2 = newAngle2;
-            encodeBuffer.encodeCachedValue(angle2, 16,
-                         *clientCache_ -> polyFillArcCacheAngle2[index], 8);
-            i += 2;
-
-            if (++index == 2) index = 0;
-
-            encodeBuffer.encodeBoolValue((i < inputLength) ? 1 : 0);
-          }
-        }
-        break;
-      case X_PolyArc:
-        {
-          #ifdef TARGETS
-
-          unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
-
-          if (pixmaps.find(t_id) != pixmaps.end())
-          {
-            *logofs << "handleRead: X_PolyArc target id is pixmap "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else if (windows.find(t_id) != windows.end())
-          {
-            *logofs << "handleRead: X_PolyArc target id is window "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else
-          {
-            *logofs << "handleRead: X_PolyArc target id " << t_id
-                    << " is unrecognized.\n" << logofs_flush;
-          }
-
-          #endif
-
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_PolyArc);
-
-          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
-                                     inputMessage, inputLength))
-          {
-            hit = 1;
-
-            break;
-          }
-
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
-                             bigEndian_), clientCache_ -> drawableCache);
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8,
-                             bigEndian_), clientCache_ -> gcCache);
-
-          unsigned int index = 0;
-          unsigned int lastX = 0, lastY = 0;
-          unsigned int lastWidth = 0, lastHeight = 0;
-          unsigned int lastAngle1 = 0, lastAngle2 = 0;
-
-          //
-          // TODO: Could send the size at the beginning
-          // instead of a bool at each iteration.
-          //
-
-          for (unsigned int i = 12; i < inputLength;)
-          {
-            unsigned int x = GetUINT(inputMessage + i, bigEndian_);
-            unsigned int newX = x;
-            x -= lastX;
-            lastX = newX;
-            encodeBuffer.encodeCachedValue(x, 16,
-                         *clientCache_ -> polyArcCacheX[index], 8);
-            i += 2;
-            unsigned int y = GetUINT(inputMessage + i, bigEndian_);
-            unsigned int newY = y;
-            y -= lastY;
-            lastY = newY;
-            encodeBuffer.encodeCachedValue(y, 16,
-                         *clientCache_ -> polyArcCacheY[index], 8);
-            i += 2;
-            unsigned int width = GetUINT(inputMessage + i, bigEndian_);
-            unsigned int newWidth = width;
-            width -= lastWidth;
-            lastWidth = newWidth;
-            encodeBuffer.encodeCachedValue(width, 16,
-                         *clientCache_ -> polyArcCacheWidth[index], 8);
-            i += 2;
-            unsigned int height = GetUINT(inputMessage + i, bigEndian_);
-            unsigned int newHeight = height;
-            height -= lastHeight;
-            lastHeight = newHeight;
-            encodeBuffer.encodeCachedValue(height, 16,
-                         *clientCache_ -> polyArcCacheHeight[index], 8);
-            i += 2;
-            unsigned int angle1 = GetUINT(inputMessage + i, bigEndian_);
-            unsigned int newAngle1 = angle1;
-            angle1 -= lastAngle1;
-            lastAngle1 = newAngle1;
-            encodeBuffer.encodeCachedValue(angle1, 16,
-                         *clientCache_ -> polyArcCacheAngle1[index], 8);
-            i += 2;
-            unsigned int angle2 = GetUINT(inputMessage + i, bigEndian_);
-            unsigned int newAngle2 = angle2;
-            angle2 -= lastAngle2;
-            lastAngle2 = newAngle2;
-            encodeBuffer.encodeCachedValue(angle2, 16,
-                         *clientCache_ -> polyArcCacheAngle2[index], 8);
-            i += 2;
-
-            if (++index == 2) index = 0;
-
-            encodeBuffer.encodeBoolValue((i < inputLength) ? 1 : 0);
-          }
-        }
-        break;
-      case X_PolyPoint:
-        {
-          #ifdef TARGETS
-
-          unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
-
-          if (pixmaps.find(t_id) != pixmaps.end())
-          {
-            *logofs << "handleRead: X_PolyPoint target id is pixmap "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else if (windows.find(t_id) != windows.end())
-          {
-            *logofs << "handleRead: X_PolyPoint target id is window "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else
-          {
-            *logofs << "handleRead: X_PolyPoint target id " << t_id
-                    << " is unrecognized.\n" << logofs_flush;
-          }
-
-          #endif
-
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_PolyPoint);
-
-          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
-                                     inputMessage, inputLength))
-          {
-            hit = 1;
-
-            break;
-          }
-
-          encodeBuffer.encodeValue(GetUINT(inputMessage + 2, bigEndian_) - 3, 16, 4);
-          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]);
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                             clientCache_ -> drawableCache);
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8, bigEndian_),
-                             clientCache_ -> gcCache);
-          const unsigned char *nextSrc = inputMessage + 12;
-
-          unsigned int index = 0;
-          unsigned int lastX = 0, lastY = 0;
-
-          for (unsigned int i = 12; i < inputLength; i += 4)
-          {
-            unsigned int x = GetUINT(nextSrc, bigEndian_);
-            nextSrc += 2;
-            unsigned int tmp = x;
-            x -= lastX;
-            lastX = tmp;
-            encodeBuffer.encodeCachedValue(x, 16,
-                               *clientCache_ -> polyPointCacheX[index], 8);
-            unsigned int y = GetUINT(nextSrc, bigEndian_);
-            nextSrc += 2;
-            tmp = y;
-            y -= lastY;
-            lastY = tmp;
-            encodeBuffer.encodeCachedValue(y, 16,
-                               *clientCache_ -> polyPointCacheY[index], 8);
-
-            if (++index == 2) index = 0;
-          }
-        }
-        break;
-      case X_PolyLine:
-        {
-          #ifdef TARGETS
-
-          unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
-
-          if (pixmaps.find(t_id) != pixmaps.end())
-          {
-            *logofs << "handleRead: X_PolyLine target id is pixmap "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else if (windows.find(t_id) != windows.end())
-          {
-            *logofs << "handleRead: X_PolyLine target id is window "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else
-          {
-            *logofs << "handleRead: X_PolyLine target id " << t_id
-                    << " is unrecognized.\n" << logofs_flush;
-          }
-
-          #endif
-
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_PolyLine);
-
-          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
-                                     inputMessage, inputLength))
-          {
-            hit = 1;
-
-            break;
-          }
-
-          encodeBuffer.encodeValue(GetUINT(inputMessage + 2, bigEndian_) - 3, 16, 4);
-          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]);
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
-                             bigEndian_), clientCache_ -> drawableCache);
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8,
-                             bigEndian_), clientCache_ -> gcCache);
-          const unsigned char *nextSrc = inputMessage + 12;
-
-          unsigned int index = 0;
-          unsigned int lastX = 0, lastY = 0;
-
-          for (unsigned int i = 12; i < inputLength; i += 4)
-          {
-            unsigned int x = GetUINT(nextSrc, bigEndian_);
-            nextSrc += 2;
-            unsigned int tmp = x;
-            x -= lastX;
-            lastX = tmp;
-            encodeBuffer.encodeCachedValue(x, 16,
-                               *clientCache_ -> polyLineCacheX[index], 8);
-            unsigned int y = GetUINT(nextSrc, bigEndian_);
-            nextSrc += 2;
-            tmp = y;
-            y -= lastY;
-            lastY = tmp;
-            encodeBuffer.encodeCachedValue(y, 16,
-                               *clientCache_ -> polyLineCacheY[index], 8);
-
-            if (++index == 2) index = 0;
-          }
-        }
-        break;
-      case X_PolyRectangle:
-        {
-          encodeBuffer.encodeValue((GetUINT(inputMessage + 2,
-                                            bigEndian_) - 3) >> 1, 16, 3);
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
-                             bigEndian_), clientCache_ -> drawableCache);
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8,
-                             bigEndian_), clientCache_ -> gcCache);
-          const unsigned char *end = inputMessage + inputLength;
-          const unsigned char *nextSrc = inputMessage + 12;
-          while (nextSrc < end)
-          {
-            for (unsigned int i = 0; i < 4; i++)
-            {
-              encodeBuffer.encodeCachedValue(GetUINT(nextSrc, bigEndian_), 16,
-                                 *clientCache_ -> polyRectangleGeomCache[i], 8);
-              nextSrc += 2;
-            }
-          }
-        }
-        break;
-      case X_PolySegment:
-        {
-          #ifdef TARGETS
-
-          unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
-
-          if (pixmaps.find(t_id) != pixmaps.end())
-          {
-            *logofs << "handleRead: X_PolySegment target id is pixmap "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else if (windows.find(t_id) != windows.end())
-          {
-            *logofs << "handleRead: X_PolySegment target id is window "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else
-          {
-            *logofs << "handleRead: X_PolySegment target id " << t_id
-                    << " is unrecognized.\n" << logofs_flush;
-          }
-
-          #endif
-
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_PolySegment);
-
-          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
-                                     inputMessage, inputLength))
-          {
-            hit = 1;
-
-            break;
-          }
-
-          encodeBuffer.encodeValue((GetUINT(inputMessage + 2,
-                                            bigEndian_) - 3) >> 1, 16, 4);
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
-                             bigEndian_), clientCache_ -> drawableCache);
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8,
-                             bigEndian_), clientCache_ -> gcCache);
-          const unsigned char *end = inputMessage + inputLength;
-          const unsigned char *nextSrc = inputMessage + 12;
-          // unsigned int index = 0;
-          // unsigned int lastX1, lastY1, lastX2, lastY2;
-          while (nextSrc < end)
-          {
-            unsigned int x = GetUINT(nextSrc, bigEndian_);
-            nextSrc += 2;
-            unsigned int xDiff0 =
-            x - clientCache_ -> polySegmentLastX[0];
-            unsigned int xDiff1 =
-            x - clientCache_ -> polySegmentLastX[1];
-            int xDiff0Abs = (int) xDiff0;
-            if (xDiff0Abs < 0)
-              xDiff0Abs = -xDiff0Abs;
-            int xDiff1Abs = (int) xDiff1;
-            if (xDiff1Abs < 0)
-              xDiff1Abs = -xDiff1Abs;
-
-            unsigned int y = GetUINT(nextSrc, bigEndian_);
-            nextSrc += 2;
-            unsigned int yDiff0 =
-            y - clientCache_ -> polySegmentLastY[0];
-            unsigned int yDiff1 =
-            y - clientCache_ -> polySegmentLastY[1];
-            int yDiff0Abs = (int) yDiff0;
-            if (yDiff0Abs < 0)
-              yDiff0Abs = -yDiff0Abs;
-            int yDiff1Abs = (int) yDiff1;
-            if (yDiff1Abs < 0)
-              yDiff1Abs = -yDiff1Abs;
-
-            int diff0 = xDiff0Abs + yDiff0Abs;
-            int diff1 = xDiff1Abs + yDiff1Abs;
-            if (diff0 < diff1)
-            {
-              encodeBuffer.encodeBoolValue(0);
-              encodeBuffer.encodeCachedValue(xDiff0, 16,
-                                         clientCache_ -> polySegmentCacheX, 6);
-              encodeBuffer.encodeCachedValue(yDiff0, 16,
-                                         clientCache_ -> polySegmentCacheY, 6);
-            }
-            else
-            {
-              encodeBuffer.encodeBoolValue(1);
-              encodeBuffer.encodeCachedValue(xDiff1, 16,
-                                         clientCache_ -> polySegmentCacheX, 6);
-              encodeBuffer.encodeCachedValue(yDiff1, 16,
-                                         clientCache_ -> polySegmentCacheY, 6);
-            }
-
-            clientCache_ -> polySegmentLastX[clientCache_ -> polySegmentCacheIndex] = x;
-            clientCache_ -> polySegmentLastY[clientCache_ -> polySegmentCacheIndex] = y;
-
-            clientCache_ -> polySegmentCacheIndex =
-                  clientCache_ -> polySegmentCacheIndex == 1 ? 0 : 1;
-          }
-        }
-        break;
-      case X_PutImage:
-        {
-          #ifdef TARGETS
-
-          unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
-
-          if (pixmaps.find(t_id) != pixmaps.end())
-          {
-            *logofs << "handleRead: X_PutImage target id is pixmap "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else if (windows.find(t_id) != windows.end())
-          {
-            *logofs << "handleRead: X_PutImage target id is window "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else
-          {
-            *logofs << "handleRead: X_PutImage target id " << t_id
-                    << " is unrecognized.\n" << logofs_flush;
-          }
-
-          #endif
-
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_PutImage);
-
-          hit = handleEncode(encodeBuffer, clientCache_, messageStore,
-                                 inputOpcode, inputMessage, inputLength);
-        }
-        break;
-      case X_QueryBestSize:
-        {
-          encodeBuffer.encodeValue((unsigned int)inputMessage[1], 2);
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
-                             bigEndian_), clientCache_ -> drawableCache);
-          encodeBuffer.encodeValue(GetUINT(inputMessage + 8, bigEndian_), 16, 8);
-          encodeBuffer.encodeValue(GetUINT(inputMessage + 10, bigEndian_), 16, 8);
-
-          sequenceQueue_.push(clientSequence_, inputOpcode);
-
-          priority_++;
-        }
-        break;
-      case X_QueryColors:
-        {
-          // Differential encoding.
-          encodeBuffer.encodeBoolValue(1);
-
-          unsigned int numColors = ((inputLength - 8) >> 2);
-          encodeBuffer.encodeValue(numColors, 16, 5);
-          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), 29,
-                                         clientCache_ -> colormapCache);
-          const unsigned char *nextSrc = inputMessage + 8;
-          unsigned int predictedPixel = clientCache_ -> queryColorsLastPixel;
-          for (unsigned int i = 0; i < numColors; i++)
-          {
-            unsigned int pixel = GetULONG(nextSrc, bigEndian_);
-            nextSrc += 4;
-            if (pixel == predictedPixel)
-              encodeBuffer.encodeBoolValue(1);
-            else
-            {
-              encodeBuffer.encodeBoolValue(0);
-              encodeBuffer.encodeValue(pixel, 32, 9);
-            }
-            if (i == 0)
-              clientCache_ -> queryColorsLastPixel = pixel;
-            predictedPixel = pixel + 1;
-          }
-
-          sequenceQueue_.push(clientSequence_, inputOpcode);
-
-          priority_++;
-        }
-        break;
-      case X_QueryExtension:
-        {
-          #ifdef TEST
-
-          char data[256];
-
-          int length = GetUINT(inputMessage + 4, bigEndian_);
-
-          if (length > 256)
-          {
-            length = 256;
-          }
-
-          strncpy(data, (char *) inputMessage + 8, length);
-
-          *(data + length) = '\0';
-
-          *logofs << "handleRead: Going to query extension '"
-                  << data << "' for FD#" << fd_ << ".\n"
-                  << logofs_flush;
-          #endif
-
-          unsigned int nameLength = GetUINT(inputMessage + 4, bigEndian_);
-          encodeBuffer.encodeValue(nameLength, 16, 6);
-          const unsigned char *nextSrc = inputMessage + 8;
-
-          for (; nameLength; nameLength--)
-          {
-            encodeBuffer.encodeValue((unsigned int) *nextSrc++, 8);
-          }
-
-          unsigned int extension = 0;
-
-          if (strncmp((char *) inputMessage + 8, "SHAPE", 5) == 0)
-          {
-            extension = X_NXInternalShapeExtension;
-          }
-          else if (strncmp((char *) inputMessage + 8, "RENDER", 6) == 0)
-          {
-            extension = X_NXInternalRenderExtension;
-          }
-
-          sequenceQueue_.push(clientSequence_, inputOpcode, extension);
-
-          priority_++;
-        }
-        break;
-      case X_QueryFont:
-        {
-          unsigned int font = GetULONG(inputMessage + 4, bigEndian_);
-          encodeBuffer.encodeValue(font - clientCache_ -> lastFont, 29, 5);
-          clientCache_ -> lastFont = font;
-
-          sequenceQueue_.push(clientSequence_, inputOpcode);
-
-          priority_++;
-        }
-        break;
-      case X_SetClipRectangles:
-        {
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_SetClipRectangles);
-
-          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
-                                     inputMessage, inputLength))
-          {
-            hit = 1;
-
-            break;
-          }
-
-          unsigned int numRectangles = ((inputLength - 12) >> 3);
-
-          // Since ProtoStep9 (#issue 108)
-          encodeBuffer.encodeValue(numRectangles, 15, 4);
-
-          encodeBuffer.encodeValue((unsigned int) inputMessage[1], 2);
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                             clientCache_ -> gcCache);
-          encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 8, bigEndian_), 16,
-                             clientCache_ -> setClipRectanglesXCache, 8);
-          encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 10, bigEndian_), 16,
-                             clientCache_ -> setClipRectanglesYCache, 8);
-          const unsigned char *nextSrc = inputMessage + 12;
-          for (unsigned int i = 0; i < numRectangles; i++)
-          {
-            for (unsigned int j = 0; j < 4; j++)
-            {
-              encodeBuffer.encodeCachedValue(GetUINT(nextSrc, bigEndian_), 16,
-                                 *clientCache_ -> setClipRectanglesGeomCache[j], 8);
-              nextSrc += 2;
-            }
-          }
-        }
-        break;
-      case X_SetDashes:
-        {
-          unsigned int numDashes = GetUINT(inputMessage + 10, bigEndian_);
-          encodeBuffer.encodeCachedValue(numDashes, 16,
-                             clientCache_ -> setDashesLengthCache, 5);
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
-                             clientCache_ -> gcCache);
-          encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 8, bigEndian_), 16,
-                             clientCache_ -> setDashesOffsetCache, 5);
-          const unsigned char *nextSrc = inputMessage + 12;
-          for (unsigned int i = 0; i < numDashes; i++)
-            encodeBuffer.encodeCachedValue(*nextSrc++, 8,
-                                clientCache_ -> setDashesDashCache_[i & 1], 5);
-        }
-        break;
-      case X_SetSelectionOwner:
-        {
-          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), 29,
-                                    clientCache_ -> setSelectionOwnerCache, 9);
-          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_), 29,
-                           clientCache_ -> getSelectionOwnerSelectionCache, 9);
-          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 12, bigEndian_), 32,
-                           clientCache_ -> setSelectionOwnerTimestampCache, 9);
-        }
-        break;
-      case X_TranslateCoords:
-        {
-          #ifdef TARGETS
-
-          unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
-
-          if (pixmaps.find(t_id) != pixmaps.end())
-          {
-            *logofs << "handleRead: X_TranslateCoords source id is pixmap "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else if (windows.find(t_id) != windows.end())
-          {
-            *logofs << "handleRead: X_TranslateCoords source id is window "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else
-          {
-            *logofs << "handleRead: X_TranslateCoords source id " << t_id
-                    << " is unrecognized.\n" << logofs_flush;
-          }
-
-          t_id = GetULONG(inputMessage + 8, bigEndian_);
-
-          if (pixmaps.find(t_id) != pixmaps.end())
-          {
-            *logofs << "handleRead: X_TranslateCoords target id is pixmap "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else if (windows.find(t_id) != windows.end())
-          {
-            *logofs << "handleRead: X_TranslateCoords target id is window "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else
-          {
-            *logofs << "handleRead: X_TranslateCoords target id " << t_id
-                    << " is unrecognized.\n" << logofs_flush;
-          }
-
-          #endif
-
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_TranslateCoords);
-
-          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
-                                     inputMessage, inputLength))
-          {
-            sequenceQueue_.push(clientSequence_, inputOpcode);
-
-            priority_++;
-
-            hit = 1;
-
-            break;
-          }
-
-          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), 29,
-                                   clientCache_ -> translateCoordsSrcCache, 9);
-          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_), 29,
-                                   clientCache_ -> translateCoordsDstCache, 9);
-          encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 12, bigEndian_), 16,
-                                   clientCache_ -> translateCoordsXCache, 8);
-          encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 14, bigEndian_), 16,
-                                   clientCache_ -> translateCoordsYCache, 8);
-
-          sequenceQueue_.push(clientSequence_, inputOpcode);
-
-          priority_++;
-        }
-        break;
-      case X_GetImage:
-        {
-          #ifdef TARGETS
-
-          unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
-
-          if (pixmaps.find(t_id) != pixmaps.end())
-          {
-            *logofs << "handleRead: X_GetImage source id is pixmap "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else if (windows.find(t_id) != windows.end())
-          {
-            *logofs << "handleRead: X_GetImage source id is window "
-                    << t_id << ".\n" << logofs_flush;
-          }
-          else
-          {
-            *logofs << "handleRead: X_GetImage source id " << t_id
-                    << " is unrecognized.\n" << logofs_flush;
-          }
-
-          #endif
-
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_GetImage);
-
-          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
-                                     inputMessage, inputLength))
-          {
-            sequenceQueue_.push(clientSequence_, inputOpcode);
-
-            priority_++;
-
-            hit = 1;
-
-            break;
-          }
-
-          // Format.
-          encodeBuffer.encodeValue((unsigned int) inputMessage[1], 2);
-          // Drawable.
-          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
-                             bigEndian_), clientCache_ -> drawableCache);
-          // X.
-          unsigned int x = GetUINT(inputMessage + 8, bigEndian_);
-          int xDiff = x - clientCache_ -> putImageLastX;
-          clientCache_ -> putImageLastX = x;
-          encodeBuffer.encodeCachedValue(xDiff, 16,
-                             clientCache_ -> putImageXCache, 8);
-          // Y.
-          unsigned int y = GetUINT(inputMessage + 10, bigEndian_);
-          int yDiff = y - clientCache_ -> putImageLastY;
-          clientCache_ -> putImageLastY = y;
-          encodeBuffer.encodeCachedValue(yDiff, 16,
-                             clientCache_ -> putImageYCache, 8);
-          // Width.
-          unsigned int width = GetUINT(inputMessage + 12, bigEndian_);
-          encodeBuffer.encodeCachedValue(width, 16,
-                             clientCache_ -> putImageWidthCache, 8);
-          // Height.
-          unsigned int height = GetUINT(inputMessage + 14, bigEndian_);
-          encodeBuffer.encodeCachedValue(height, 16,
-                             clientCache_ -> putImageHeightCache, 8);
-          // Plane mask.
-          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 16, bigEndian_), 32,
-                             clientCache_ -> getImagePlaneMaskCache, 5);
-
-          sequenceQueue_.push(clientSequence_, inputOpcode);
-
-          priority_++;
-        }
-        break;
-      case X_GetPointerMapping:
-        {
-          sequenceQueue_.push(clientSequence_, inputOpcode);
-
-          priority_++;
-        }
-        break;
-      case X_GetKeyboardControl:
-        {
-          sequenceQueue_.push(clientSequence_, inputOpcode);
-
-          priority_++;
-        }
-        break;
-      default:
-        {
-          if (inputOpcode == opcodeStore_ -> renderExtension)
-          {
-            MessageStore *messageStore = clientStore_ ->
-                                 getRequestStore(X_NXInternalRenderExtension);
-
-            hit = handleEncode(encodeBuffer, clientCache_, messageStore,
-                                   inputOpcode, inputMessage, inputLength);
-          }
-          else if (inputOpcode == opcodeStore_ -> shapeExtension)
-          {
-            MessageStore *messageStore = clientStore_ ->
-                                 getRequestStore(X_NXInternalShapeExtension);
-
-            hit = handleEncode(encodeBuffer, clientCache_, messageStore,
-                                   inputOpcode, inputMessage, inputLength);
-          }
-          else if (inputOpcode == opcodeStore_ -> putPackedImage)
-          {
-            #ifdef TARGETS
-
-            unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
-
-            if (pixmaps.find(t_id) != pixmaps.end())
-            {
-              *logofs << "handleRead: X_NXPutPackedImage target id is pixmap "
-                      << t_id << ".\n" << logofs_flush;
-            }
-            else if (windows.find(t_id) != windows.end())
-            {
-              *logofs << "handleRead: X_NXPutPackedImage target id is window "
-                      << t_id << ".\n" << logofs_flush;
-            }
-            else
-            {
-              *logofs << "handleRead: X_NXPutPackedImage target id " << t_id
-                      << " is unrecognized.\n" << logofs_flush;
-            }
-
-            #endif
-
-            #ifdef DEBUG
-            *logofs << "handleRead: Encoding packed image request for FD#"
-                    << fd_ << ".\n" << logofs_flush;
-            #endif
-
-            //
-            // The field carries the destination data
-            // length. We add the request's size of
-            // the final X_PutImage.
-            //
-
-            unsigned int outputLength = GetULONG(inputMessage + 20, bigEndian_) + 24;
-
-            statistics -> addPackedBytesIn(inputLength);
-
-            statistics -> addPackedBytesOut(outputLength);
-
-            MessageStore *messageStore = clientStore_ ->
-                                 getRequestStore(X_NXPutPackedImage);
-
-            hit = handleEncode(encodeBuffer, clientCache_, messageStore,
-                                   inputOpcode, inputMessage, inputLength);
-          }
-          else if (inputOpcode == opcodeStore_ -> setUnpackColormap)
-          {
-            #ifdef DEBUG
-            *logofs << "handleRead: Encoding set unpack colormap request "
-                    << "for FD#" << fd_ << " with size " << inputLength
-                    << ".\n" << logofs_flush;
-            #endif
-
-            MessageStore *messageStore = clientStore_ ->
-                                 getRequestStore(X_NXSetUnpackColormap);
-
-            hit = handleEncode(encodeBuffer, clientCache_, messageStore,
-                                   inputOpcode, inputMessage, inputLength);
-          }
-          else if (inputOpcode == opcodeStore_ -> setUnpackAlpha)
-          {
-            #ifdef DEBUG
-            *logofs << "handleRead: Encoding set unpack alpha request "
-                    << "for FD#" << fd_ << " with size " << inputLength
-                    << ".\n" << logofs_flush;
-            #endif
-
-            MessageStore *messageStore = clientStore_ ->
-                                 getRequestStore(X_NXSetUnpackAlpha);
-
-            hit = handleEncode(encodeBuffer, clientCache_, messageStore,
-                                   inputOpcode, inputMessage, inputLength);
-          }
-          else if (inputOpcode == opcodeStore_ -> setUnpackGeometry)
-          {
-            #ifdef DEBUG
-            *logofs << "handleRead: Encoding set unpack geometry request "
-                    << "for FD#" << fd_ << " with size " << inputLength
-                    << ".\n" << logofs_flush;
-            #endif
-
-            MessageStore *messageStore = clientStore_ ->
-                                 getRequestStore(X_NXSetUnpackGeometry);
-
-            hit = handleEncode(encodeBuffer, clientCache_, messageStore,
-                                   inputOpcode, inputMessage, inputLength);
-          }
-          else if (inputOpcode == opcodeStore_ -> startSplit)
-          {
-            if (handleStartSplitRequest(encodeBuffer, inputOpcode,
-                                            inputMessage, inputLength) < 0)
-            {
-              return -1;
-            }
-          }
-          else if (inputOpcode == opcodeStore_ -> endSplit)
-          {
-            if (handleEndSplitRequest(encodeBuffer, inputOpcode,
-                                          inputMessage, inputLength) < 0)
-            {
-              return -1;
-            }
-          }
-          else if (inputOpcode == opcodeStore_ -> commitSplit)
-          {
-            if (handleCommitSplitRequest(encodeBuffer, inputOpcode,
-                                             inputMessage, inputLength) < 0)
-            {
-              return -1;
-            }
-          }
-          else if (inputOpcode == opcodeStore_ -> abortSplit)
-          {
-            if (handleAbortSplitRequest(encodeBuffer, inputOpcode,
-                                            inputMessage, inputLength) < 0)
-            {
-              return -1;
-            }
-          }
-          else if (inputOpcode == opcodeStore_ -> finishSplit)
-          {
-            if (handleFinishSplitRequest(encodeBuffer, inputOpcode,
-                                          inputMessage, inputLength) < 0)
-            {
-              return -1;
-            }
-          }
-          else if (inputOpcode == opcodeStore_ -> freeSplit)
-          {
-            #ifdef DEBUG
-            *logofs << "handleRead: Encoding free split request "
-                    << "for FD#" << fd_ << " with size " << inputLength
-                    << ".\n" << logofs_flush;
-            #endif
-
-            encodeBuffer.encodeCachedValue(*(inputMessage + 1), 8,
-                         clientCache_ -> resourceCache);
-          }
-          else if (inputOpcode == opcodeStore_ -> freeUnpack)
-          {
-            #ifdef DEBUG
-            *logofs << "handleRead: Encoding free unpack request "
-                    << "for FD#" << fd_ << " with size " << inputLength
-                    << ".\n" << logofs_flush;
-            #endif
-
-            encodeBuffer.encodeCachedValue(*(inputMessage + 1), 8,
-                         clientCache_ -> resourceCache);
-          }
-          else if (inputOpcode == opcodeStore_ -> getControlParameters)
-          {
-            #ifdef DEBUG
-            *logofs << "handleRead: Encoding get control parameters "
-                    << "request for FD#" << fd_ << " with size "
-                    << inputLength << ".\n" << logofs_flush;
-            #endif
-
-            //
-            // Add the reply to the write buffer. If found
-            // to contain a message, it it will be flushed
-            // to the X client before leaving the loop.
-            //
-
-            unsigned char *reply = writeBuffer_.addMessage(32);
-
-            *(reply + 0) = X_Reply;
-
-            PutUINT(clientSequence_, reply + 2, bigEndian_);
-
-            PutULONG(0, reply + 4, bigEndian_);
-
-            //
-            // Save the sequence number we used
-            // to auto-generate this reply.
-            //
-
-            lastSequence_ = clientSequence_;
-
-            #ifdef TEST
-            *logofs << "handleRead: Registered " << lastSequence_
-                    << " as last auto-generated sequence number.\n"
-                    << logofs_flush;
-            #endif
-
-            *(reply + 1) = control -> LinkMode;
-
-            *(reply + 8)  = control -> LocalVersionMajor;
-            *(reply + 9)  = control -> LocalVersionMinor;
-            *(reply + 10) = control -> LocalVersionPatch;
-
-            *(reply + 11) = control -> RemoteVersionMajor;
-            *(reply + 12) = control -> RemoteVersionMinor;
-            *(reply + 13) = control -> RemoteVersionPatch;
-
-            PutUINT(control -> SplitTimeout,  reply + 14, bigEndian_);
-            PutUINT(control -> MotionTimeout, reply + 16, bigEndian_);
-
-            *(reply + 18) = control -> SplitMode;
-
-            PutULONG(control -> SplitDataThreshold, reply + 20, bigEndian_);
-
-            *(reply + 24) = control -> PackMethod;
-            *(reply + 25) = control -> PackQuality;
-
-            *(reply + 26) = control -> LocalDataCompressionLevel;
-            *(reply + 27) = control -> LocalStreamCompressionLevel;
-            *(reply + 28) = control -> LocalDeltaCompression;
-
-            *(reply + 29) = (control -> LocalDeltaCompression == 1 &&
-                                 control -> PersistentCacheEnableLoad == 1);
-            *(reply + 30) = (control -> LocalDeltaCompression == 1 &&
-                                 control -> PersistentCacheEnableSave == 1);
-            *(reply + 31) = (control -> LocalDeltaCompression == 1 &&
-                                 control -> PersistentCacheEnableLoad == 1 &&
-                                     control -> PersistentCacheName != NULL);
-
-            if (handleFlush(flush_if_any) < 0)
-            {
-              return -1;
-            }
-          }
-          else if (inputOpcode == opcodeStore_ -> getCleanupParameters)
-          {
-            #ifdef WARNING
-            *logofs << "handleRead: WARNING! Encoding fake get cleanup "
-                    << "parameters request for FD#" << fd_ << " with size "
-                    << inputLength << ".\n" << logofs_flush;
-            #endif
-          }
-          else if (inputOpcode == opcodeStore_ -> getImageParameters)
-          {
-            #ifdef WARNING
-            *logofs << "handleRead: WARNING! Encoding fake get cleanup "
-                    << "parameters request for FD#" << fd_ << " with size "
-                    << inputLength << ".\n" << logofs_flush;
-            #endif
-          }
-          else if (inputOpcode == opcodeStore_ -> getUnpackParameters)
-          {
-            #ifdef DEBUG
-            *logofs << "handleRead: Encoding get unpack parameters "
-                    << "request for FD#" << fd_ << " with size "
-                    << inputLength << ".\n" << logofs_flush;
-            #endif
-
-            sequenceQueue_.push(clientSequence_, inputOpcode);
-          }
-          else if (inputOpcode == opcodeStore_ -> getShmemParameters)
-          {
-            if (handleShmemRequest(encodeBuffer, inputOpcode,
-                                       inputMessage, inputLength) < 0)
-            {
-              return -1;
-            }
-          }
-          else if (inputOpcode == opcodeStore_ -> setExposeParameters)
-          {
-            //
-            // Enable or disable expose events
-            // coming from the real server.
-            //
-
-            encodeBuffer.encodeBoolValue(*(inputMessage + 4));
-            encodeBuffer.encodeBoolValue(*(inputMessage + 5));
-            encodeBuffer.encodeBoolValue(*(inputMessage + 6));
-          }
-          else if (inputOpcode == opcodeStore_ -> setCacheParameters)
-          {
-            if (handleCacheRequest(encodeBuffer, inputOpcode,
-                                       inputMessage, inputLength) < 0)
-            {
-              return -1;
-            }
-          }
-          else if (inputOpcode == opcodeStore_ -> getFontParameters)
-          {
-            if (handleFontRequest(encodeBuffer, inputOpcode,
-                                      inputMessage, inputLength) < 0)
-            {
-              return -1;
-            }
-          }
-          else
-          {
-            MessageStore *messageStore = clientStore_ ->
-                                 getRequestStore(X_NXInternalGenericRequest);
-
-            hit = handleEncode(encodeBuffer, clientCache_, messageStore,
-                                   inputOpcode, inputMessage, inputLength);
-
-            //
-            // Don't flush if the opcode is unrecognized.
-            // We may optionally flush it is an extension
-            // but would penalize the well written clients.
-            //
-            // if (inputOpcode > 127)
-            // {
-            //   priority_++;
-            // }
-            //
-          }
-        }
-      } // End of switch on opcode.
-
-      int bits = encodeBuffer.diffBits();
-
-      #if defined(TEST) || defined(OPCODES)
-
-      const char *cacheString = (hit ? "cached " : "");
-
-      *logofs << "handleRead: Handled " << cacheString << "request OPCODE#" 
-              << (unsigned int) inputOpcode << " (" << DumpOpcode(inputOpcode)
-              << ")" << " for FD#" << fd_ << " sequence " << clientSequence_
-              << ". " << inputLength  << " bytes in, " << bits << " bits ("
-              << ((float) bits) / 8 << " bytes) out.\n" << logofs_flush;
-
-      #endif
-
-      if (hit)
-      {
-        statistics -> addCachedRequest(inputOpcode);
-      }
-
-      statistics -> addRequestBits(inputOpcode, inputLength << 3, bits);
-
-      if (inputOpcode == opcodeStore_ -> renderExtension)
-      {
-        if (hit)
-        {
-          statistics -> addRenderCachedRequest(*(inputMessage + 1));
-        }
-
-        statistics -> addRenderRequestBits(*(inputMessage + 1), inputLength << 3, bits);
-      }
-
-    }  // End if (firstRequest_)... else ...
-
-  } // End of while ((inputMessage = readBuffer_.getMessage(inputLength)) != 0) ...
-
-  //
-  // Check if we need to flush because of
-  // prioritized data.
-  //
-
-  if (priority_ > 0)
-  {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "handleRead: WARNING! Requesting flush "
-            << "because of " << priority_ << " prioritized "
-            << "messages for FD#" << fd_ << ".\n"
-            << logofs_flush;
-    #endif
-
-    if (proxy -> handleAsyncPriority() < 0)
-    {
-      return -1;
-    }
-
-    //
-    // Reset the priority flag.
-    //
-
-    priority_ = 0;
-  }
-
-  //
-  // Flush if we exceeded the token length.
-  //
-
-  if (proxy -> canAsyncFlush() == 1)
-  {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "handleRead: WARNING! Requesting flush "
-            << "because of token length exceeded.\n"
-            << logofs_flush;
-    #endif
-
-    if (proxy -> handleAsyncFlush() < 0)
-    {
-      return -1;
-    }
-  }
-
-  #if defined(TEST) || defined(INFO)
-
-  if (transport_ -> pending() != 0 ||
-          readBuffer_.checkMessage() != 0)
-  {
-    *logofs << "handleRead: PANIC! Buffer for X descriptor FD#"
-            << fd_ << " has " << transport_ -> pending()
-            << " bytes to read.\n" << logofs_flush;
-
-    HandleCleanup();
-  }
-
-  #endif
-
-  //
-  // Reset the read buffer.
-  //
-
-  readBuffer_.fullReset();
-
-  return 1;
-}
-
-//
-// End of handleRead().
-//
-
-//
-// Beginning of handleWrite().
-//
-
-int ClientChannel::handleWrite(const unsigned char *message, unsigned int length)
-{
-  #ifdef TEST
-  *logofs << "handleWrite: Called for FD#" << fd_
-          << ".\n" << logofs_flush;
-  #endif
-
-  //
-  // Create the buffer from which to 
-  // decode messages.
-  //
-
-  DecodeBuffer decodeBuffer(message, length);
-
-  #if defined(TEST) || defined(INFO) || defined(FLUSH)
-  *logofs << "handleWrite: Decoding messages for FD#" << fd_
-          << " with " << length << " bytes in the buffer.\n"
-          << logofs_flush;
-  #endif
-
-  if (firstReply_)
-  {
-    #ifdef TEST
-    *logofs << "handleWrite: First reply detected.\n" << logofs_flush;
-    #endif
-
-    unsigned int outputOpcode;
-
-    decodeBuffer.decodeValue(outputOpcode, 8);
-    unsigned int secondByte;
-    decodeBuffer.decodeValue(secondByte, 8);
-    unsigned int major;
-    decodeBuffer.decodeValue(major, 16);
-    unsigned int minor;
-    decodeBuffer.decodeValue(minor, 16);
-    unsigned int extraLength;
-    decodeBuffer.decodeValue(extraLength, 16);
-    unsigned int outputLength = 8 + (extraLength << 2);
-
-    unsigned char *outputMessage = writeBuffer_.addMessage(outputLength);
-    *outputMessage = (unsigned char) outputOpcode;
-    outputMessage[1] = (unsigned char) secondByte;
-    PutUINT(major, outputMessage + 2, bigEndian_);
-    PutUINT(minor, outputMessage + 4, bigEndian_);
-    PutUINT(extraLength, outputMessage + 6, bigEndian_);
-    unsigned char *nextDest = outputMessage + 8;
-    unsigned int cached;
-    decodeBuffer.decodeBoolValue(cached);
-
-    if (cached)
-    {
-      memcpy(nextDest, ServerCache::lastInitReply.getData(), outputLength - 8);
-    }
-    else
-    {
-      for (unsigned i = 8; i < outputLength; i++)
-      {
-        unsigned int nextByte;
-        decodeBuffer.decodeValue(nextByte, 8);
-        *nextDest++ = (unsigned char) nextByte;
-      }
-
-      ServerCache::lastInitReply.set(outputLength - 8, outputMessage + 8);
-    }
-
-    imageByteOrder_ = outputMessage[30];
-    bitmapBitOrder_ = outputMessage[31];
-    scanlineUnit_   = outputMessage[32];
-    scanlinePad_    = outputMessage[33];
-
-    firstReply_ = 0;
-
-  } // End of if (firstReply_)
-
-  //
-  // This was previously in a 'else' block.
-  // Due to the way the first request was
-  // handled, we could not decode multiple
-  // messages in the first frame.
-  //
-
-  { // Start of the decoding block.
-
-    #ifdef DEBUG
-    *logofs << "handleWrite: Starting loop on opcodes.\n"
-            << logofs_flush;
-    #endif
-
-    unsigned char outputOpcode;
-
-    //
-    // NX client needs this line to consider
-    // the initialization phase successfully
-    // completed.
-    //
-
-    if (firstClient_ == -1)
-    {
-      cerr << "Info" << ": Established X client connection.\n" ;
-
-      firstClient_ = fd_;
-    }
-
-    while (decodeBuffer.decodeOpcodeValue(outputOpcode, serverCache_ -> opcodeCache, 1))
-    {
-      #ifdef DEBUG
-      *logofs << "handleWrite: Decoded a new OPCODE#"
-              << (unsigned int) outputOpcode << ".\n"
-              << logofs_flush;
-      #endif
-
-      unsigned char *outputMessage = NULL;
-      unsigned int outputLength    = 0;
-
-      //
-      // General-purpose temp variables 
-      // for decoding ints and chars.
-      //
-
-      unsigned int value   = 0;
-      unsigned char cValue = 0;
-
-      //
-      // Check first if we need to abort any split,
-      // then if this is a reply, finally if it is
-      // en event or error.
-      //
-
-      if (outputOpcode == opcodeStore_ -> splitEvent)
-      {
-        //
-        // It's an abort split, not a normal
-        // burst of proxy data.
-        //
-
-        handleSplitEvent(decodeBuffer);
-
-        continue;
-      }
-      else if (outputOpcode == X_Reply)
-      {
-        #ifdef DEBUG
-        *logofs << "handleWrite: Decoding sequence number of reply.\n"
-                << logofs_flush;
-        #endif
-
-        unsigned int sequenceNum;
-        unsigned int sequenceDiff;
-
-        decodeBuffer.decodeCachedValue(sequenceDiff, 16,
-                           serverCache_ -> replySequenceCache, 7);
-
-        sequenceNum = (serverSequence_ + sequenceDiff) & 0xffff;
-
-        serverSequence_ = sequenceNum;
-
-        #ifdef DEBUG
-        *logofs << "handleWrite: Last server sequence number for FD#" 
-                << fd_ << " is " << serverSequence_ << " with "
-                << "difference " << sequenceDiff << ".\n"
-                << logofs_flush;
-        #endif
-
-        //
-        // In case of reply we can follow the X server and
-        // override any event's sequence number generated
-        // by this side.
-        //
-
-        #ifdef TEST
-        *logofs << "handleWrite: Updating last event's sequence "
-                << lastSequence_ << " to reply's sequence number "
-                << serverSequence_ << " for FD#" << fd_ << ".\n"
-                << logofs_flush;
-        #endif
-
-        lastSequence_ = serverSequence_;
-
-        unsigned short int requestSequenceNum;
-        unsigned char requestOpcode;
-
-        #ifdef DEBUG
-
-        requestSequenceNum = 0;
-        requestOpcode = 0;
-
-        *logofs << "handleWrite: Peek of sequence number returns ";
-
-        *logofs << sequenceQueue_.peek(requestSequenceNum, requestOpcode);
-
-        *logofs << " with sequence " << requestSequenceNum << " and opcode "
-                << (unsigned int) requestOpcode << ".\n" << logofs_flush;
-
-        #endif
-
-        if (sequenceQueue_.peek(requestSequenceNum, requestOpcode) == 1 &&
-                (requestSequenceNum == sequenceNum))
-        {
-          unsigned int requestData[3];
-
-          sequenceQueue_.pop(requestSequenceNum, requestOpcode,
-                                    requestData[0], requestData[1], requestData[2]);
-
-          #ifdef DEBUG
-          *logofs << "handleWrite: Identified reply to OPCODE#"
-                  << (unsigned int) requestOpcode << ".\n"
-                  << logofs_flush;
-          #endif
-
-          //
-          // Is differential encoding disabled?
-          //
-
-          if (control -> RemoteDeltaCompression == 0)
-          {
-            int result = handleFastWriteReply(decodeBuffer, requestOpcode,
-                                                  outputMessage, outputLength);
-            if (result < 0)
-            {
-              return -1;
-            }
-            else if (result > 0)
-            {
-              continue;
-            }
-          }
-
-          switch (requestOpcode)
-          {
-          case X_AllocColor:
-            {
-              outputLength = 32;
-              outputMessage = writeBuffer_.addMessage(outputLength);
-              unsigned char *nextDest = outputMessage + 8;
-              for (unsigned int i = 0; i < 3; i++)
-              {
-                decodeBuffer.decodeBoolValue(value);
-                if (value)
-                {
-                  PutUINT(requestData[i], nextDest, bigEndian_);
-                }
-                else
-                {
-                  decodeBuffer.decodeValue(value, 16, 6);
-                  PutUINT(requestData[i] + value, nextDest, bigEndian_);
-                }
-                nextDest += 2;
-              }
-              decodeBuffer.decodeValue(value, 32, 9);
-              PutULONG(value, outputMessage + 16, bigEndian_);
-            }
-            break;
-          case X_GetAtomName:
-            {
-              unsigned int nameLength;
-              decodeBuffer.decodeValue(nameLength, 16, 6);
-              outputLength = RoundUp4(nameLength) + 32;
-              outputMessage = writeBuffer_.addMessage(outputLength);
-              PutUINT(nameLength, outputMessage + 8, bigEndian_);
-              unsigned char* nextDest = outputMessage + 32;
-
-              // Since ProtoStep7 (#issue 108)
-              decodeBuffer.decodeTextData(nextDest, nameLength);
-            }
-            break;
-          case X_GetGeometry:
-            {
-              outputLength = 32;
-              outputMessage = writeBuffer_.addMessage(outputLength);
-              decodeBuffer.decodeCachedValue(cValue, 8,
-                                 serverCache_ -> depthCache);
-              outputMessage[1] = cValue;
-              decodeBuffer.decodeCachedValue(value, 29,
-                                 serverCache_ -> getGeometryRootCache, 9);
-              PutULONG(value, outputMessage + 8, bigEndian_);
-              unsigned char *nextDest = outputMessage + 12;
-              for (unsigned int i = 0; i < 5; i++)
-              {
-                decodeBuffer.decodeCachedValue(value, 16,
-                                   *serverCache_ -> getGeometryGeomCache[i], 8);
-                PutUINT(value, nextDest, bigEndian_);
-                nextDest += 2;
-              }
-            }
-            break;
-          case X_GetInputFocus:
-            {
-              outputLength = 32;
-              outputMessage = writeBuffer_.addMessage(outputLength);
-              decodeBuffer.decodeValue(value, 2);
-              outputMessage[1] = (unsigned char) value;
-              decodeBuffer.decodeCachedValue(value, 29,
-                                 serverCache_ -> getInputFocusWindowCache);
-              PutULONG(value, outputMessage + 8, bigEndian_);
-            }
-            break;
-          case X_GetKeyboardMapping:
-            {
-              decodeBuffer.decodeBoolValue(value);
-              if (value)
-              {
-                unsigned int dataLength =
-                ServerCache::getKeyboardMappingLastMap.getLength();
-                outputLength = 32 + dataLength;
-                outputMessage = writeBuffer_.addMessage(outputLength);
-                outputMessage[1] =
-                ServerCache::getKeyboardMappingLastKeysymsPerKeycode;
-                memcpy(outputMessage + 32,
-                           ServerCache::getKeyboardMappingLastMap.getData(),
-                               dataLength);
-                break;
-              }
-              unsigned int numKeycodes;
-              decodeBuffer.decodeValue(numKeycodes, 8);
-              unsigned int keysymsPerKeycode;
-              decodeBuffer.decodeValue(keysymsPerKeycode, 8, 4);
-              ServerCache::getKeyboardMappingLastKeysymsPerKeycode =
-                                  keysymsPerKeycode;
-              outputLength = 32 + numKeycodes * keysymsPerKeycode * 4;
-              outputMessage = writeBuffer_.addMessage(outputLength);
-              outputMessage[1] = (unsigned char) keysymsPerKeycode;
-              unsigned char *nextDest = outputMessage + 32;
-              unsigned char previous = 0;
-              for (unsigned int count = numKeycodes * keysymsPerKeycode;
-                       count; --count)
-              {
-                decodeBuffer.decodeBoolValue(value);
-                if (value)
-                  PutULONG((unsigned int) NoSymbol, nextDest, bigEndian_);
-                else
-                {
-                  unsigned int keysym;
-                  decodeBuffer.decodeCachedValue(keysym, 24,
-                             serverCache_ -> getKeyboardMappingKeysymCache, 9);
-                  decodeBuffer.decodeCachedValue(cValue, 8,
-                           serverCache_ -> getKeyboardMappingLastByteCache, 5);
-                  previous += cValue;
-                  PutULONG((keysym << 8) | previous, nextDest, bigEndian_);
-                }
-                nextDest += 4;
-              }
-              ServerCache::getKeyboardMappingLastMap.set(outputLength - 32,
-                                                             outputMessage + 32);
-            }
-            break;
-          case X_GetModifierMapping:
-            {
-              unsigned int keycodesPerModifier;
-              decodeBuffer.decodeValue(keycodesPerModifier, 8);
-              outputLength = 32 + (keycodesPerModifier << 3);
-              outputMessage = writeBuffer_.addMessage(outputLength);
-              outputMessage[1] = (unsigned char) keycodesPerModifier;
-              unsigned char *nextDest = outputMessage + 32;
-              decodeBuffer.decodeBoolValue(value);
-              if (value)
-              {
-                memcpy(outputMessage + 32,
-                           ServerCache::getModifierMappingLastMap.getData(),
-                               ServerCache::getModifierMappingLastMap.getLength());
-                break;
-              }
-              for (unsigned int count = outputLength - 32; count; count--)
-              {
-                decodeBuffer.decodeBoolValue(value);
-                if (value)
-                  *nextDest++ = 0;
-                else
-                {
-                  decodeBuffer.decodeValue(value, 8);
-                  *nextDest++ = value;
-                }
-              }
-              ServerCache::getModifierMappingLastMap.set(outputLength - 32,
-                                                             outputMessage + 32);
-            }
-            break;
-          case X_GetProperty:
-            {
-              MessageStore *messageStore = serverStore_ ->
-                                   getReplyStore(X_GetProperty);
-
-              handleDecode(decodeBuffer, serverCache_, messageStore,
-                               requestOpcode, outputMessage, outputLength);
-            }
-            break;
-          case X_GetSelectionOwner:
-            {
-              outputLength = 32;
-              outputMessage = writeBuffer_.addMessage(outputLength);
-              decodeBuffer.decodeCachedValue(value, 29,
-                                    serverCache_ -> getSelectionOwnerCache, 9);
-              PutULONG(value, outputMessage + 8, bigEndian_);
-            }
-            break;
-          case X_GetWindowAttributes:
-            {
-              outputLength = 44;
-              outputMessage = writeBuffer_.addMessage(outputLength);
-              decodeBuffer.decodeValue(value, 2);
-              outputMessage[1] = (unsigned char) value;
-              decodeBuffer.decodeCachedValue(value, 29,
-                                             serverCache_ -> visualCache);
-              PutULONG(value, outputMessage + 8, bigEndian_);
-              decodeBuffer.decodeCachedValue(value, 16,
-                             serverCache_ -> getWindowAttributesClassCache, 3);
-              PutUINT(value, outputMessage + 12, bigEndian_);
-              decodeBuffer.decodeCachedValue(cValue, 8,
-                           serverCache_ -> getWindowAttributesBitGravityCache);
-              outputMessage[14] = cValue;
-              decodeBuffer.decodeCachedValue(cValue, 8,
-                           serverCache_ -> getWindowAttributesWinGravityCache);
-              outputMessage[15] = cValue;
-              decodeBuffer.decodeCachedValue(value, 32,
-                            serverCache_ -> getWindowAttributesPlanesCache, 9);
-              PutULONG(value, outputMessage + 16, bigEndian_);
-              decodeBuffer.decodeCachedValue(value, 32,
-                             serverCache_ -> getWindowAttributesPixelCache, 9);
-              PutULONG(value, outputMessage + 20, bigEndian_);
-              decodeBuffer.decodeBoolValue(value);
-              outputMessage[24] = (unsigned char) value;
-              decodeBuffer.decodeBoolValue(value);
-              outputMessage[25] = (unsigned char) value;
-              decodeBuffer.decodeValue(value, 2);
-              outputMessage[26] = (unsigned char) value;
-              decodeBuffer.decodeBoolValue(value);
-              outputMessage[27] = (unsigned char) value;
-              decodeBuffer.decodeCachedValue(value, 29,
-                                             serverCache_ -> colormapCache, 9);
-              PutULONG(value, outputMessage + 28, bigEndian_);
-              decodeBuffer.decodeCachedValue(value, 32,
-                            serverCache_ -> getWindowAttributesAllEventsCache);
-              PutULONG(value, outputMessage + 32, bigEndian_);
-              decodeBuffer.decodeCachedValue(value, 32,
-                           serverCache_ -> getWindowAttributesYourEventsCache);
-              PutULONG(value, outputMessage + 36, bigEndian_);
-              decodeBuffer.decodeCachedValue(value, 16,
-                        serverCache_ -> getWindowAttributesDontPropagateCache);
-              PutUINT(value, outputMessage + 40, bigEndian_);
-            }
-            break;
-          case X_GrabKeyboard:
-          case X_GrabPointer:
-            {
-              outputLength = 32;
-              outputMessage = writeBuffer_.addMessage(outputLength);
-              decodeBuffer.decodeValue(value, 3);
-              outputMessage[1] = (unsigned char) value;
-            }
-            break;
-          case X_InternAtom:
-            {
-              outputLength = 32;
-              outputMessage = writeBuffer_.addMessage(outputLength);
-              decodeBuffer.decodeValue(value, 29, 9);
-              PutULONG(value, outputMessage + 8, bigEndian_);
-            }
-            break;
-          case X_ListExtensions:
-            {
-              decodeBuffer.decodeValue(value, 32, 8);
-              outputLength = 32 + (value << 2);
-              outputMessage = writeBuffer_.addMessage(outputLength);
-              unsigned int numExtensions;
-              decodeBuffer.decodeValue(numExtensions, 8);
-              outputMessage[1] = (unsigned char) numExtensions;
-              unsigned char *nextDest = outputMessage + 32;
-              for (; numExtensions; numExtensions--)
-              {
-                unsigned int length;
-                decodeBuffer.decodeValue(length, 8);
-                *nextDest++ = (unsigned char) length;
-                for (; length; length--)
-                {
-                  decodeBuffer.decodeValue(value, 8);
-                  *nextDest++ = value;
-                }
-              }
-            }
-            break;
-          case X_ListFonts:
-            {
-              //
-              // Differential compression can achieve a 12:1 to 14:1
-              // ratio, while the best ZLIB compression can achieve
-              // a mere 4:1 to 5:1. In the first case, though, the
-              // huge amount of data constituting the message would
-              // be stored uncompressed at the remote side. We need
-              // to find a compromise. The solution is to use diffe-
-              // rential compression at startup and ZLIB compression
-              // later on.
-              //
-
-              MessageStore *messageStore = serverStore_ ->
-                                   getReplyStore(X_ListFonts);
-
-              if (handleDecodeCached(decodeBuffer, serverCache_, messageStore,
-                                         outputMessage, outputLength))
-              {
-                break;
-              }
-
-              decodeBuffer.decodeValue(value, 32, 8);
-              outputLength = 32 + (value << 2);
-              outputMessage = writeBuffer_.addMessage(outputLength);
-              unsigned int numFonts;
-              decodeBuffer.decodeValue(numFonts, 16, 6);
-              PutUINT(numFonts, outputMessage + 8, bigEndian_);
-
-              // Differential or plain data compression?
-              decodeBuffer.decodeBoolValue(value);
-
-              if (value)
-              {
-                unsigned char* nextDest = outputMessage + 32;
-                for (; numFonts; numFonts--)
-                {
-                  unsigned int length;
-                  decodeBuffer.decodeValue(length, 8);
-                  *nextDest++ = (unsigned char)length;
-
-                  // Since ProtoStep7 (#issue 108)
-                  decodeBuffer.decodeTextData(nextDest, length);
-                  nextDest += length;
-                }
-
-                handleSave(messageStore, outputMessage, outputLength);
-              }
-              else
-              {
-                const unsigned char *compressedData = NULL;
-                unsigned int compressedDataSize = 0;
-
-                int decompressed = handleDecompress(decodeBuffer, requestOpcode, messageStore -> dataOffset,
-                                                        outputMessage, outputLength, compressedData,
-                                                            compressedDataSize);
-                if (decompressed < 0)
-                {
-                  return -1;
-                }
-                else if (decompressed > 0)
-                {
-                  handleSave(messageStore, outputMessage, outputLength,
-                                 compressedData, compressedDataSize);
-                }
-                else
-                {
-                  handleSave(messageStore, outputMessage, outputLength);
-                }
-              }
-            }
-            break;
-          case X_LookupColor:
-          case X_AllocNamedColor:
-            {
-              outputLength = 32;
-              outputMessage = writeBuffer_.addMessage(outputLength);
-              unsigned char *nextDest = outputMessage + 8;
-              if (requestOpcode == X_AllocNamedColor)
-              {
-                decodeBuffer.decodeValue(value, 32, 9);
-                PutULONG(value, nextDest, bigEndian_);
-                nextDest += 4;
-              }
-              unsigned int count = 3;
-              do
-              {
-                decodeBuffer.decodeValue(value, 16, 9);
-                PutUINT(value, nextDest, bigEndian_);
-                unsigned int visualColor;
-                decodeBuffer.decodeValue(visualColor, 16, 5);
-                visualColor += value;
-                visualColor &= 0xffff;
-                PutUINT(visualColor, nextDest + 6, bigEndian_);
-                nextDest += 2;
-              }
-              while (--count);
-            }
-            break;
-          case X_QueryBestSize:
-            {
-              outputLength = 32;
-              outputMessage = writeBuffer_.addMessage(outputLength);
-              decodeBuffer.decodeValue(value, 16, 8);
-              PutUINT(value, outputMessage + 8, bigEndian_);
-              decodeBuffer.decodeValue(value, 16, 8);
-              PutUINT(value, outputMessage + 10, bigEndian_);
-            }
-            break;
-          case X_QueryColors:
-            {
-              // Differential or plain data compression?
-              decodeBuffer.decodeBoolValue(value);
-
-              if (value)
-              {
-                decodeBuffer.decodeBoolValue(value);
-                if (value)
-                {
-                  unsigned int numColors =
-                  serverCache_ -> queryColorsLastReply.getLength() / 6;
-                  outputLength = 32 + (numColors << 3);
-                  outputMessage = writeBuffer_.addMessage(outputLength);
-                  PutUINT(numColors, outputMessage + 8, bigEndian_);
-                  const unsigned char *nextSrc =
-                  serverCache_ -> queryColorsLastReply.getData();
-                  unsigned char *nextDest = outputMessage + 32;
-                  for (; numColors; numColors--)
-                  {
-                    for (unsigned int i = 0; i < 6; i++)
-                      *nextDest++ = *nextSrc++;
-                    nextDest += 2;
-                  }
-                }
-                else
-                {
-                  unsigned int numColors;
-                  decodeBuffer.decodeValue(numColors, 16, 5);
-                  outputLength = 32 + (numColors << 3);
-                  outputMessage = writeBuffer_.addMessage(outputLength);
-                  PutUINT(numColors, outputMessage + 8, bigEndian_);
-                  unsigned char *nextDest = outputMessage + 32;
-                  for (unsigned int c = 0; c < numColors; c++)
-                  {
-                    for (unsigned int i = 0; i < 3; i++)
-                    {
-                      decodeBuffer.decodeValue(value, 16);
-                      PutUINT(value, nextDest, bigEndian_);
-                      nextDest += 2;
-                    }
-                  }
-                  serverCache_ -> queryColorsLastReply.set(numColors * 6,
-                                       outputMessage + 32);
-                  const unsigned char *nextSrc = nextDest - 1;
-                  nextDest = outputMessage + 32 + ((numColors - 1) << 3) + 5;
-                  for (; numColors > 1; numColors--)
-                  {
-                    for (unsigned int i = 0; i < 6; i++)
-                      *nextDest-- = *nextSrc--;
-                    nextDest -= 2;
-                  }
-                }
-              }
-              else
-              {
-                // Reply length.
-                unsigned int numColors;
-                decodeBuffer.decodeValue(numColors, 16, 5);
-                outputLength = 32 + (numColors << 3);
-                outputMessage = writeBuffer_.addMessage(outputLength);
-                PutUINT(numColors, outputMessage + 8, bigEndian_);
-
-                const unsigned char *compressedData = NULL;
-                unsigned int compressedDataSize = 0;
-
-                int decompressed = handleDecompress(decodeBuffer, requestOpcode, 32,
-                                                        outputMessage, outputLength, compressedData,
-                                                            compressedDataSize);
-                if (decompressed < 0)
-                {
-                  return -1;
-                }
-              }
-            }
-            break;
-          case X_QueryExtension:
-            {
-              outputLength = 32;
-              outputMessage = writeBuffer_.addMessage(outputLength);
-              decodeBuffer.decodeBoolValue(value);
-              outputMessage[8] = (unsigned char) value;
-              decodeBuffer.decodeValue(value, 8);
-              outputMessage[9] = (unsigned char) value;
-              decodeBuffer.decodeValue(value, 8);
-              outputMessage[10] = (unsigned char) value;
-              decodeBuffer.decodeValue(value, 8);
-              outputMessage[11] = (unsigned char) value;
-
-              //
-              // We use a predefined opcode to address
-              // extensions' message stores, while real
-              // opcodes are used for communication with
-              // X server and clients.
-              //
-
-              if (requestData[0] == X_NXInternalShapeExtension)
-              {
-                opcodeStore_ -> shapeExtension = outputMessage[9];
-
-                #ifdef TEST
-                *logofs << "handleWrite: Shape extension opcode for FD#" << fd_
-                        << " is " << (unsigned int) opcodeStore_ -> shapeExtension
-                        << ".\n" << logofs_flush;
-                #endif
-              }
-              else if (requestData[0] == X_NXInternalRenderExtension)
-              {
-                opcodeStore_ -> renderExtension = outputMessage[9];
-
-                #ifdef TEST
-                *logofs << "handleWrite: Render extension opcode for FD#" << fd_
-                        << " is " << (unsigned int) opcodeStore_ -> renderExtension
-                        << ".\n" << logofs_flush;
-                #endif
-              }
-            }
-            break;
-          case X_QueryFont:
-            {
-              //
-              // Use differential compression at startup and plain
-              // data compression later. Check X_ListFonts message
-              // for an explaination.
-              //
-
-              MessageStore *messageStore = serverStore_ ->
-                                   getReplyStore(X_QueryFont);
-
-              if (handleDecodeCached(decodeBuffer, serverCache_, messageStore,
-                                         outputMessage, outputLength))
-              {
-                break;
-              }
-
-              // Differential or plain data compression?
-              decodeBuffer.decodeBoolValue(value);
-
-              if (value)
-              {
-                unsigned int numProperties;
-                unsigned int numCharInfos;
-                decodeBuffer.decodeValue(numProperties, 16, 8);
-                decodeBuffer.decodeValue(numCharInfos, 32, 10);
-                outputLength = 60 + numProperties * 8 + numCharInfos * 12;
-                outputMessage = writeBuffer_.addMessage(outputLength);
-                PutUINT(numProperties, outputMessage + 46, bigEndian_);
-                PutULONG(numCharInfos, outputMessage + 56, bigEndian_);
-                handleDecodeCharInfo(decodeBuffer, outputMessage + 8);
-                handleDecodeCharInfo(decodeBuffer, outputMessage + 24);
-                decodeBuffer.decodeValue(value, 16, 9);
-                PutUINT(value, outputMessage + 40, bigEndian_);
-                decodeBuffer.decodeValue(value, 16, 9);
-                PutUINT(value, outputMessage + 42, bigEndian_);
-                decodeBuffer.decodeValue(value, 16, 9);
-                PutUINT(value, outputMessage + 44, bigEndian_);
-                decodeBuffer.decodeBoolValue(value);
-                outputMessage[48] = (unsigned char) value;
-                decodeBuffer.decodeValue(value, 8);
-                outputMessage[49] = (unsigned char) value;
-                decodeBuffer.decodeValue(value, 8);
-                outputMessage[50] = (unsigned char) value;
-                decodeBuffer.decodeBoolValue(value);
-                outputMessage[51] = (unsigned char) value;
-                decodeBuffer.decodeValue(value, 16, 9);
-                PutUINT(value, outputMessage + 52, bigEndian_);
-                decodeBuffer.decodeValue(value, 16, 9);
-                PutUINT(value, outputMessage + 54, bigEndian_);
-                unsigned char *nextDest = outputMessage + 60;
-                decodeBuffer.decodeBoolValue(value);
-
-                int end = 0;
-
-                if (value == 1)
-                {
-                  unsigned int index;
-                  decodeBuffer.decodeValue(index, 4);
-                  unsigned int length;
-                  const unsigned char *data;
-                  ServerCache::queryFontFontCache.get(index, length, data);
-                  memcpy(nextDest, data, length);
-
-                  end = 1;
-                }
-
-                if (end == 0)
-                {
-                  unsigned char *saveDest = nextDest;
-                  unsigned int length = numProperties * 8 + numCharInfos * 12;
-                  for (; numProperties; numProperties--)
-                  {
-                    decodeBuffer.decodeValue(value, 32, 9);
-                    PutULONG(value, nextDest, bigEndian_);
-                    decodeBuffer.decodeValue(value, 32, 9);
-                    PutULONG(value, nextDest + 4, bigEndian_);
-                    nextDest += 8;
-                  }
-                  for (; numCharInfos; numCharInfos--)
-                  {
-                    handleDecodeCharInfo(decodeBuffer, nextDest);
-
-                    nextDest += 12;
-                  }
-                  ServerCache::queryFontFontCache.set(length, saveDest);
-                }
-
-                handleSave(messageStore, outputMessage, outputLength);
-              }
-              else
-              {
-                // Reply length.
-                unsigned int replyLength;
-                decodeBuffer.decodeValue(replyLength, 32, 16);
-                outputLength = 32 + (replyLength << 2);
-                outputMessage = writeBuffer_.addMessage(outputLength);
-
-                const unsigned char *compressedData = NULL;
-                unsigned int compressedDataSize = 0;
-
-                int decompressed = handleDecompress(decodeBuffer, requestOpcode, messageStore -> dataOffset,
-                                                        outputMessage, outputLength, compressedData,
-                                                            compressedDataSize);
-                if (decompressed < 0)
-                {
-                  return -1;
-                }
-                else if (decompressed > 0)
-                {
-                  handleSave(messageStore, outputMessage, outputLength,
-                                 compressedData, compressedDataSize);
-                }
-                else
-                {
-                  handleSave(messageStore, outputMessage, outputLength);
-                }
-              }
-            }
-            break;
-          case X_QueryPointer:
-            {
-              outputLength = 32;
-              outputMessage = writeBuffer_.addMessage(outputLength);
-              decodeBuffer.decodeBoolValue(value);
-              outputMessage[1] = (unsigned char) value;
-              decodeBuffer.decodeCachedValue(value, 29,
-                                     serverCache_ -> queryPointerRootCache, 9);
-              PutULONG(value, outputMessage + 8, bigEndian_);
-              decodeBuffer.decodeCachedValue(value, 29,
-                                    serverCache_ -> queryPointerChildCache, 9);
-              PutULONG(value, outputMessage + 12, bigEndian_);
-              decodeBuffer.decodeCachedValue(value, 16,
-                                    serverCache_ -> motionNotifyRootXCache, 8);
-              serverCache_ -> motionNotifyLastRootX += value;
-              PutUINT(serverCache_ -> motionNotifyLastRootX, outputMessage + 16,
-                      bigEndian_);
-              decodeBuffer.decodeCachedValue(value, 16,
-                                    serverCache_ -> motionNotifyRootYCache, 8);
-              serverCache_ -> motionNotifyLastRootY += value;
-              PutUINT(serverCache_ -> motionNotifyLastRootY, outputMessage + 18,
-                      bigEndian_);
-              decodeBuffer.decodeCachedValue(value, 16,
-                                   serverCache_ -> motionNotifyEventXCache, 8);
-              PutUINT(serverCache_ -> motionNotifyLastRootX + value,
-                      outputMessage + 20, bigEndian_);
-              decodeBuffer.decodeCachedValue(value, 16,
-                                   serverCache_ -> motionNotifyEventYCache, 8);
-              PutUINT(serverCache_ -> motionNotifyLastRootY + value,
-                      outputMessage + 22, bigEndian_);
-              decodeBuffer.decodeCachedValue(value, 16,
-                                       serverCache_ -> motionNotifyStateCache);
-              PutUINT(value, outputMessage + 24, bigEndian_);
-            }
-            break;
-          case X_QueryTree:
-            {
-              unsigned int children;
-              decodeBuffer.decodeValue(children, 16, 8);
-
-              outputLength = 32 + (children << 2);
-              outputMessage = writeBuffer_.addMessage(outputLength);
-
-              PutULONG(outputLength, outputMessage + 4, bigEndian_);
-
-              decodeBuffer.decodeCachedValue(value, 29,
-                                 serverCache_ -> queryTreeWindowCache);
-
-              PutULONG(value, outputMessage + 8, bigEndian_);
-
-              decodeBuffer.decodeCachedValue(value, 29,
-                                 serverCache_ -> queryTreeWindowCache);
-
-              PutULONG(value, outputMessage + 12, bigEndian_);
-
-              unsigned char *next = outputMessage + 32;
-
-              PutUINT(children, outputMessage + 16, bigEndian_);
-
-              for (unsigned int i = 0; i < children; i++)
-              {
-                decodeBuffer.decodeCachedValue(value, 29,
-                                   serverCache_ -> queryTreeWindowCache);
-
-                PutULONG(value, next + (i * 4), bigEndian_);
-              }
-            }
-            break;
-          case X_TranslateCoords:
-            {
-              outputLength = 32;
-              outputMessage = writeBuffer_.addMessage(outputLength);
-              decodeBuffer.decodeBoolValue(value);
-              outputMessage[1] = (unsigned char) value;
-              decodeBuffer.decodeCachedValue(value, 29,
-                                 serverCache_ -> translateCoordsChildCache, 9);
-              PutULONG(value, outputMessage + 8, bigEndian_);
-              decodeBuffer.decodeCachedValue(value, 16,
-                                     serverCache_ -> translateCoordsXCache, 8);
-              PutUINT(value, outputMessage + 12, bigEndian_);
-              decodeBuffer.decodeCachedValue(value, 16,
-                                     serverCache_ -> translateCoordsYCache, 8);
-              PutUINT(value, outputMessage + 14, bigEndian_);
-            }
-            break;
-          case X_GetImage:
-            {
-              MessageStore *messageStore = serverStore_ ->
-                                   getReplyStore(X_GetImage);
-
-              if (handleDecodeCached(decodeBuffer, serverCache_, messageStore,
-                                         outputMessage, outputLength))
-              {
-                break;
-              }
-
-              // Depth.
-              decodeBuffer.decodeCachedValue(cValue, 8,
-                                 serverCache_ -> depthCache);
-              // Reply length.
-              unsigned int replyLength;
-              decodeBuffer.decodeValue(replyLength, 32, 9);
-              outputLength = 32 + (replyLength << 2);
-              outputMessage = writeBuffer_.addMessage(outputLength);
-              outputMessage[1] = (unsigned char) cValue;
-              // Visual.
-              unsigned int visual;
-              decodeBuffer.decodeCachedValue(visual, 29, 
-                                 serverCache_ -> visualCache);
-              PutULONG(visual, outputMessage + 8, bigEndian_);
-
-              // Since ProtoStep8 (#issue 108)
-              handleCopy(decodeBuffer, requestOpcode, messageStore ->
-                             dataOffset, outputMessage, outputLength);
-
-              handleSave(messageStore, outputMessage, outputLength);
-            }
-            break;
-          case X_GetPointerMapping:
-            {
-              unsigned int nextByte;
-              decodeBuffer.decodeValue(nextByte, 8, 4);
-              unsigned int replyLength;
-              decodeBuffer.decodeValue(replyLength, 32, 4);
-              outputLength = 32 + (replyLength << 2);
-              outputMessage = writeBuffer_.addMessage(outputLength);
-              outputMessage[1] = (unsigned char) nextByte;
-              unsigned char *nextDest = outputMessage + 32;
-              for (unsigned int i = 32; i < outputLength; i++)
-              {
-                decodeBuffer.decodeValue(nextByte, 8, 4);
-                *nextDest++ = (unsigned char) nextByte;
-              }
-            }
-            break;
-          case X_GetKeyboardControl:
-            {
-              unsigned int nextByte;
-              decodeBuffer.decodeValue(nextByte, 8, 2);
-              unsigned int replyLength;
-              decodeBuffer.decodeValue(replyLength, 32, 8);
-              outputLength = 32 + (replyLength << 2);
-              outputMessage = writeBuffer_.addMessage(outputLength);
-              outputMessage[1] = (unsigned char) nextByte;
-              unsigned char *nextDest = outputMessage + 8;
-              for (unsigned int i = 8; i < outputLength; i++)
-              {
-                decodeBuffer.decodeValue(nextByte, 8, 4);
-                *nextDest++ = (unsigned char) nextByte;
-              }
-            }
-            break;
-          default:
-            {
-              if (requestOpcode == opcodeStore_ -> getUnpackParameters)
-              {
-                #ifdef TEST
-                *logofs << "handleWrite: Received get unpack parameters reply "
-                        << "OPCODE#" << (unsigned int) opcodeStore_ -> getUnpackParameters
-                        << ".\n" << logofs_flush;
-                #endif
-
-                outputLength = 32 + PACK_METHOD_LIMIT;
-
-                outputMessage = writeBuffer_.addMessage(outputLength);
-
-                unsigned int method;
-
-                //
-                // Let agent use only the unpack methods
-                // implemented at both sides.
-                //
-
-                for (int i = 0; i < PACK_METHOD_LIMIT; i++)
-                {
-                  decodeBuffer.decodeBoolValue(method);
-
-                  control -> RemoteUnpackMethods[i] = method;
-
-                  *(outputMessage + 32 + i) =
-                      (control -> LocalUnpackMethods[i] == 1 &&
-                           method == 1);
-                }
-              }
-              else if (requestOpcode == opcodeStore_ -> getShmemParameters)
-              {
-                if (handleShmemReply(decodeBuffer, requestOpcode,
-                                         outputMessage, outputLength) < 0)
-                {
-                  return -1;
-                }
-              }
-              else if (requestOpcode == opcodeStore_ -> getFontParameters)
-              {
-                if (handleFontReply(decodeBuffer, requestOpcode,
-                                        outputMessage, outputLength) < 0)
-                {
-                  return -1;
-                }
-              }
-              else
-              {
-                #ifdef PANIC
-                *logofs << "handleWrite: PANIC! No matching request for "
-                        << "reply with sequence number " << sequenceNum
-                        << ".\n" << logofs_flush;
-                #endif
-
-                cerr << "Error" << ": No matching request for "
-                     << "reply with sequence number " << sequenceNum
-                     << ".\n";
-
-                return -1;
-              }
-            }
-          }
-
-          #if defined(TEST) || defined(OPCODES)
-          *logofs << "handleWrite: Handled reply to OPCODE#"
-                  << (unsigned) requestOpcode << " (" << DumpOpcode(requestOpcode)
-                  << ")" << " for FD#" << fd_ << " with sequence " << serverSequence_
-                  << ". Output size is " << outputLength << ".\n" << logofs_flush;
-          #endif
-
-          statistics -> addRepliedRequest(requestOpcode);
-        }
-        else // End of if (sequenceQueue_.peek() && ...)
-        {
-          //
-          // Reply didn't match any request opcode.
-          // Check again if differential encoding
-          // is disabled.
-          //
-
-          #ifdef DEBUG
-          *logofs << "handleWrite: Identified generic reply.\n"
-                  << logofs_flush;
-          #endif
-
-          requestOpcode = X_Reply;
-
-          if (control -> RemoteDeltaCompression == 0)
-          {
-            int result = handleFastWriteReply(decodeBuffer, requestOpcode,
-                                                  outputMessage, outputLength);
-            if (result < 0)
-            {
-              return -1;
-            }
-            else if (result > 0)
-            {
-              continue;
-            }
-          }
-
-          //
-          // All replies whose opcode is not pushed in
-          // sequence number queue are cached together.
-          // Among such replies are those to extension
-          // requests.
-          //
-
-          MessageStore *messageStore = serverStore_ ->
-                               getReplyStore(X_NXInternalGenericReply);
-
-          handleDecode(decodeBuffer, serverCache_, messageStore,
-                           requestOpcode, outputMessage, outputLength);
-
-          #if defined(TEST) || defined(OPCODES)
-          *logofs << "handleWrite: Handled generic reply for FD#" << fd_
-                  << " with sequence " << serverSequence_ << ". Output size is "
-                  << outputLength << ".\n" << logofs_flush;
-          #endif
-
-          statistics -> addRepliedRequest(requestOpcode);
-
-        } // End of if (sequenceQueue_.peek() && ...) else ...
-
-        //
-        // If any output was produced then write opcode,
-        // sequence number and size to the buffer.
-        //
-
-        if (outputLength > 0)
-        {
-          *outputMessage = outputOpcode;
-
-          PutUINT(serverSequence_, outputMessage + 2, bigEndian_);
-
-          PutULONG((outputLength - 32) >> 2, outputMessage + 4, bigEndian_);
-        }
-
-      } // End of if (outputOpcode == 1)...
-      else
-      {
-        //
-        // It's an event or error.
-        //
-
-        unsigned int sequenceNum;
-        unsigned int sequenceDiff;
-
-        decodeBuffer.decodeCachedValue(sequenceDiff, 16,
-                           serverCache_ -> eventSequenceCache, 7);
-
-        sequenceNum = (serverSequence_ + sequenceDiff) & 0xffff;
-
-        serverSequence_ = sequenceNum;
-
-        #ifdef DEBUG
-        *logofs << "handleWrite: Last server sequence number for FD#" 
-                << fd_ << " is " << serverSequence_ << " with "
-                << "difference " << sequenceDiff << ".\n"
-                << logofs_flush;
-        #endif
-
-        //
-        // Check if this is an error that matches
-        // a sequence number for which we were
-        // expecting a reply.
-        //
-
-        if (outputOpcode == X_Error)
-        {
-          unsigned short int errorSequenceNum;
-          unsigned char errorOpcode;
-
-          if (sequenceQueue_.peek(errorSequenceNum, errorOpcode) &&
-                  ((unsigned) errorSequenceNum == serverSequence_))
-          {
-            //
-            // Remove the queued sequence of the reply.
-            //
-
-            #ifdef TEST
-            *logofs << "handleWrite: WARNING! Removing reply to OPCODE#"
-                    << (unsigned) errorOpcode << " sequence "
-                    << errorSequenceNum << " for FD#" << fd_
-                    << " due to error.\n" << logofs_flush;
-            #endif
-
-            sequenceQueue_.pop(errorSequenceNum, errorOpcode);
-
-            //
-            // Send to the client the current sequence
-            // number, not the number that matched the
-            // reply. Because we are generating replies
-            // at our side, Xlib can incur in a sequence
-            // lost if the error comes after the auto-
-            // generated reply.
-            //
-
-            if (control -> SessionMode == session_proxy)
-            {
-              #ifdef TEST
-              *logofs << "handleWrite: Updating last event's sequence "
-                      << lastSequence_ << " to X server's error sequence "
-                      << "number " << serverSequence_ << " for FD#"
-                      << fd_ << ".\n" << logofs_flush;
-              #endif
-
-              lastSequence_ = serverSequence_;
-            }
-          }
-
-          //
-          // In case of errors always send to client the
-          // original X server's sequence associated to
-          // the failing request.
-          //
-
-          if (control -> SessionMode != session_proxy)
-          {
-            #ifdef TEST
-            *logofs << "handleWrite: Updating last event's sequence "
-                    << lastSequence_ << " to X server's error sequence "
-                    << "number " << serverSequence_ << " for FD#"
-                    << fd_ << ".\n" << logofs_flush;
-            #endif
-
-            lastSequence_ = serverSequence_;
-          }
-        }
-
-        //
-        // Check if by producing events at client side we
-        // have modified the events' sequence numbering.
-        // In this case taint the original sequence to
-        // comply with the last one known by client.
-        //
-
-/*
-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 "
-                  << lastSequence_ << " to X server's sequence number "
-                  << serverSequence_ << " for FD#" << fd_
-                  << ".\n" << logofs_flush;
-          #endif
-
-          lastSequence_ = serverSequence_;
-        }
-        #ifdef DEBUG
-        else if (serverSequence_ < lastSequence_)
-        {
-          //
-          // Use our last auto-generated sequence.
-          //
-
-          *logofs << "handleWrite: Tainting sequence number "
-                  << serverSequence_ << " to last event's sequence "
-                  << lastSequence_ << " for FD#" << fd_ << ".\n"
-                  << logofs_flush;
-        }
-        #endif
-
-        //
-        // Check if remote side used fast encoding.
-        //
-
-        if (control -> RemoteDeltaCompression == 0)
-        {
-          int result = handleFastWriteEvent(decodeBuffer, outputOpcode,
-                                                outputMessage, outputLength);
-          if (result < 0)
-          {
-            return -1;
-          }
-          else if (result > 0)
-          {
-            continue;
-          }
-        }
-
-        //
-        // Make space for message in the outgoing buffer
-        // and write opcode and sequence number.
-        //
-
-        outputLength = 32;
-        outputMessage = writeBuffer_.addMessage(outputLength);
-
-        *outputMessage = outputOpcode;
-
-        PutUINT(lastSequence_, outputMessage + 2, bigEndian_);
-
-        #ifdef DEBUG
-        *logofs << "handleWrite: Going to handle event or error OPCODE#"
-                << (unsigned int) outputOpcode << " for FD#" << fd_
-                << " sequence " << lastSequence_ << " (real was "
-                << serverSequence_ << ").\n" << logofs_flush;
-        #endif
-
-        switch (outputOpcode)
-        {
-        case X_Error:
-          {
-            unsigned char code;
-            decodeBuffer.decodeCachedValue(code, 8,
-                               serverCache_ -> errorCodeCache);
-            outputMessage[1] = code;
-
-            #if defined(TEST) || defined(OPCODES)
-            *logofs << "handleWrite: Handled error ERR_CODE#"
-                    << (unsigned int) code << " for FD#" << fd_;
-            #endif
-
-            if ((code != 11) && (code != 8) &&
-                    (code != 15) && (code != 1))
-            {
-              decodeBuffer.decodeValue(value, 32, 16);
-              PutULONG(value, outputMessage + 4, bigEndian_);
-
-              #if defined(TEST) || defined(OPCODES)
-              *logofs << " RES_ID#" << value;
-              #endif
-            }
-
-            if (code >= 18)
-            {
-              decodeBuffer.decodeCachedValue(value, 16,
-                                 serverCache_ -> errorMinorCache);
-              PutUINT(value, outputMessage + 8, bigEndian_);
-
-              #if defined(TEST) || defined(OPCODES)
-              *logofs << " MIN_OP#" << value;
-              #endif
-            }
-
-            decodeBuffer.decodeCachedValue(cValue, 8,
-                               serverCache_ -> errorMajorCache);
-            outputMessage[10] = cValue;
-
-            #if defined(TEST) || defined(OPCODES)
-            *logofs << " MAJ_OP#" << (unsigned int) cValue;
-            #endif
-
-            if (code >= 18)
-            {
-              unsigned char *nextDest = outputMessage + 11;
-              for (unsigned int i = 11; i < 32; i++)
-              {
-                decodeBuffer.decodeValue(value, 8);
-                *nextDest++ = (unsigned char) cValue;
-              }
-            }
-
-            #if defined(TEST) || defined(OPCODES)
-            *logofs << " sequence " << lastSequence_ << " (real was "
-                    << serverSequence_ << ") . Size is "
-                    << (unsigned int) outputLength << ".\n"
-                    << logofs_flush;
-            #endif
-          }
-          break;
-        case ButtonPress:
-        case ButtonRelease:
-        case KeyPress:
-        case KeyRelease:
-        case MotionNotify:
-        case EnterNotify:
-        case LeaveNotify:
-          {
-            if (outputOpcode == MotionNotify)
-            {
-              decodeBuffer.decodeBoolValue(value);
-            }
-            else if (outputOpcode == EnterNotify || outputOpcode == LeaveNotify)
-            {
-              decodeBuffer.decodeValue(value, 3);
-            }
-            else if (outputOpcode == KeyRelease)
-            {
-              decodeBuffer.decodeBoolValue(value);
-              if (value)
-              {
-                value = serverCache_ -> keyPressLastKey;
-              }
-              else
-              {
-                decodeBuffer.decodeValue(value, 8);
-              }
-            }
-            else if (outputOpcode == ButtonPress || outputOpcode == ButtonRelease)
-            {
-              decodeBuffer.decodeCachedValue(cValue, 8,
-                                 serverCache_ -> buttonCache);
-              value = (unsigned int) cValue;
-            }
-            else
-            {
-              decodeBuffer.decodeValue(value, 8);
-            }
-
-            outputMessage[1] = (unsigned char) value;
-            decodeBuffer.decodeCachedValue(value, 32,
-                               serverCache_ -> motionNotifyTimestampCache, 9);
-            serverCache_ -> lastTimestamp += value;
-            PutULONG(serverCache_ -> lastTimestamp, outputMessage + 4,
-                     bigEndian_);
-            unsigned char *nextDest = outputMessage + 8;
-            int skipRest = 0;
-            if (outputOpcode == KeyRelease)
-            {
-              decodeBuffer.decodeBoolValue(value);
-              if (value)
-              {
-                for (unsigned int i = 0; i < 23; i++)
-                {
-                  *nextDest++ = serverCache_ -> keyPressCache[i];
-                }
-                skipRest = 1;
-              }
-            }
-
-            if (!skipRest)
-            {
-              for (unsigned int i = 0; i < 3; i++)
-              {
-                decodeBuffer.decodeCachedValue(value, 29,
-                                   *serverCache_ -> motionNotifyWindowCache[i], 6);
-                PutULONG(value, nextDest, bigEndian_);
-                nextDest += 4;
-              }
-              decodeBuffer.decodeCachedValue(value, 16,
-                                    serverCache_ -> motionNotifyRootXCache, 6);
-              serverCache_ -> motionNotifyLastRootX += value;
-              PutUINT(serverCache_ -> motionNotifyLastRootX, outputMessage + 20,
-                      bigEndian_);
-              decodeBuffer.decodeCachedValue(value, 16,
-                                    serverCache_ -> motionNotifyRootYCache, 6);
-              serverCache_ -> motionNotifyLastRootY += value;
-              PutUINT(serverCache_ -> motionNotifyLastRootY, outputMessage + 22,
-                      bigEndian_);
-              decodeBuffer.decodeCachedValue(value, 16,
-                                   serverCache_ -> motionNotifyEventXCache, 6);
-              PutUINT(serverCache_ -> motionNotifyLastRootX + value,
-                      outputMessage + 24, bigEndian_);
-              decodeBuffer.decodeCachedValue(value, 16,
-                                   serverCache_ -> motionNotifyEventYCache, 6);
-              PutUINT(serverCache_ -> motionNotifyLastRootY + value,
-                      outputMessage + 26, bigEndian_);
-              decodeBuffer.decodeCachedValue(value, 16,
-                                       serverCache_ -> motionNotifyStateCache);
-              PutUINT(value, outputMessage + 28, bigEndian_);
-              if (outputOpcode == EnterNotify || outputOpcode == LeaveNotify)
-              {
-                decodeBuffer.decodeValue(value, 2);
-              }
-              else
-              {
-                decodeBuffer.decodeBoolValue(value);
-              }
-              outputMessage[30] = (unsigned char) value;
-              if (outputOpcode == EnterNotify || outputOpcode == LeaveNotify)
-              {
-                decodeBuffer.decodeValue(value, 2);
-                outputMessage[31] = (unsigned char) value;
-              }
-              else if (outputOpcode == KeyPress)
-              {
-                serverCache_ -> keyPressLastKey = outputMessage[1];
-                for (unsigned int i = 8; i < 31; i++)
-                {
-                  serverCache_ -> keyPressCache[i - 8] = outputMessage[i];
-                }
-              }
-            }
-          }
-          break;
-        case ColormapNotify:
-          {
-            decodeBuffer.decodeCachedValue(value, 29,
-                                 serverCache_ -> colormapNotifyWindowCache, 8);
-            PutULONG(value, outputMessage + 4, bigEndian_);
-            decodeBuffer.decodeCachedValue(value, 29,
-                               serverCache_ -> colormapNotifyColormapCache, 8);
-            PutULONG(value, outputMessage + 8, bigEndian_);
-            decodeBuffer.decodeBoolValue(value);
-            outputMessage[12] = (unsigned char) value;
-            decodeBuffer.decodeBoolValue(value);
-            outputMessage[13] = (unsigned char) value;
-          }
-          break;
-        case ConfigureNotify:
-          {
-            unsigned char *nextDest = outputMessage + 4;
-            for (unsigned int i = 0; i < 3; i++)
-            {
-              decodeBuffer.decodeCachedValue(value, 29,
-                                 *serverCache_ -> configureNotifyWindowCache[i], 9);
-              PutULONG(value, nextDest, bigEndian_);
-              nextDest += 4;
-            }
-            for (unsigned int j = 0; j < 5; j++)
-            {
-              decodeBuffer.decodeCachedValue(value, 16,
-                                 *serverCache_ -> configureNotifyGeomCache[j], 8);
-              PutUINT(value, nextDest, bigEndian_);
-              nextDest += 2;
-            }
-            decodeBuffer.decodeBoolValue(value);
-            *nextDest = value;
-          }
-          break;
-        case CreateNotify:
-          {
-            decodeBuffer.decodeCachedValue(value, 29,
-                                 serverCache_ -> createNotifyWindowCache, 9);
-            PutULONG(value, outputMessage + 4, bigEndian_);
-            decodeBuffer.decodeValue(value, 29, 5);
-            serverCache_ -> createNotifyLastWindow += value;
-            serverCache_ -> createNotifyLastWindow &= 0x1fffffff;
-            PutULONG(serverCache_ -> createNotifyLastWindow, outputMessage + 8,
-                     bigEndian_);
-            unsigned char* nextDest = outputMessage + 12;
-            for (unsigned int i = 0; i < 5; i++)
-            {
-              decodeBuffer.decodeValue(value, 16, 9);
-              PutUINT(value, nextDest, bigEndian_);
-              nextDest += 2;
-            }
-            decodeBuffer.decodeBoolValue(value);
-            *nextDest = (unsigned char) value;
-          }
-          break;
-        case Expose:
-          {
-            decodeBuffer.decodeCachedValue(value, 29,
-                               serverCache_ -> exposeWindowCache, 9);
-            PutULONG(value, outputMessage + 4, bigEndian_);
-            unsigned char *nextDest = outputMessage + 8;
-            for (unsigned int i = 0; i < 5; i++)
-            {
-              decodeBuffer.decodeCachedValue(value, 16,
-                                 *serverCache_ -> exposeGeomCache[i], 6);
-              PutUINT(value, nextDest, bigEndian_);
-              nextDest += 2;
-            }
-          }
-          break;
-        case FocusIn:
-        case FocusOut:
-          {
-            decodeBuffer.decodeValue(value, 3);
-            outputMessage[1] = (unsigned char) value;
-            decodeBuffer.decodeCachedValue(value, 29,
-                                        serverCache_ -> focusInWindowCache, 9);
-            PutULONG(value, outputMessage + 4, bigEndian_);
-            decodeBuffer.decodeValue(value, 2);
-            outputMessage[8] = (unsigned char) value;
-          }
-          break;
-        case KeymapNotify:
-          {
-            decodeBuffer.decodeBoolValue(value);
-            if (value)
-            memcpy(outputMessage + 1, ServerCache::lastKeymap.getData(), 31);
-            else
-            {
-              unsigned char *nextDest = outputMessage + 1;
-              for (unsigned int i = 1; i < 32; i++)
-              {
-                decodeBuffer.decodeValue(value, 8);
-                *nextDest++ = (unsigned char) value;
-              }
-            ServerCache::lastKeymap.set(31, outputMessage + 1);
-            }
-          }
-          break;
-        case MapNotify:
-        case UnmapNotify:
-        case DestroyNotify:
-          {
-            decodeBuffer.decodeCachedValue(value, 29,
-                                       serverCache_ -> mapNotifyEventCache, 9);
-            PutULONG(value, outputMessage + 4, bigEndian_);
-            decodeBuffer.decodeCachedValue(value, 29,
-                                      serverCache_ -> mapNotifyWindowCache, 9);
-            PutULONG(value, outputMessage + 8, bigEndian_);
-            if (outputOpcode == MapNotify || outputOpcode == UnmapNotify)
-            {
-              decodeBuffer.decodeBoolValue(value);
-              outputMessage[12] = (unsigned char) value;
-            }
-          }
-          break;
-        case NoExpose:
-          {
-            decodeBuffer.decodeCachedValue(value, 29,
-                                     serverCache_ -> noExposeDrawableCache, 9);
-            PutULONG(value, outputMessage + 4, bigEndian_);
-            decodeBuffer.decodeCachedValue(value, 16,
-                                           serverCache_ -> noExposeMinorCache);
-            PutUINT(value, outputMessage + 8, bigEndian_);
-            decodeBuffer.decodeCachedValue(cValue, 8,
-                                           serverCache_ -> noExposeMajorCache);
-            outputMessage[10] = cValue;
-          }
-          break;
-        case PropertyNotify:
-          {
-            decodeBuffer.decodeCachedValue(value, 29,
-                                 serverCache_ -> propertyNotifyWindowCache, 9);
-            PutULONG(value, outputMessage + 4, bigEndian_);
-            decodeBuffer.decodeCachedValue(value, 29,
-                                   serverCache_ -> propertyNotifyAtomCache, 9);
-            PutULONG(value, outputMessage + 8, bigEndian_);
-            decodeBuffer.decodeValue(value, 32, 9);
-            serverCache_ -> lastTimestamp += value;
-            PutULONG(serverCache_ -> lastTimestamp, outputMessage + 12,
-                     bigEndian_);
-            decodeBuffer.decodeBoolValue(value);
-            outputMessage[16] = (unsigned char) value;
-          }
-          break;
-        case ReparentNotify:
-          {
-            unsigned char* nextDest = outputMessage + 4;
-            for (unsigned int i = 0; i < 3; i++)
-            {
-              decodeBuffer.decodeCachedValue(value, 29,
-                             serverCache_ -> reparentNotifyWindowCache, 9);
-              PutULONG(value, nextDest, bigEndian_);
-              nextDest += 4;
-            }
-            decodeBuffer.decodeValue(value, 16, 6);
-            PutUINT(value, nextDest, bigEndian_);
-            decodeBuffer.decodeValue(value, 16, 6);
-            PutUINT(value, nextDest + 2, bigEndian_);
-            decodeBuffer.decodeBoolValue(value);
-            outputMessage[20] = (unsigned char)value;
-          }
-          break;
-        case SelectionClear:
-          {
-            decodeBuffer.decodeValue(value, 32, 9);
-            serverCache_ -> lastTimestamp += value;
-            PutULONG(serverCache_ -> lastTimestamp, outputMessage + 4,
-                     bigEndian_);
-            decodeBuffer.decodeCachedValue(value, 29,
-                                   serverCache_ -> selectionClearWindowCache, 9);
-            PutULONG(value, outputMessage + 8, bigEndian_);
-            decodeBuffer.decodeCachedValue(value, 29,
-                                   serverCache_ -> selectionClearAtomCache, 9);
-            PutULONG(value, outputMessage + 12, bigEndian_);
-          }
-          break;
-        case SelectionRequest:
-          {
-            decodeBuffer.decodeValue(value, 32, 9);
-            serverCache_ -> lastTimestamp += value;
-            PutULONG(serverCache_ -> lastTimestamp, outputMessage + 4,
-                     bigEndian_);
-            decodeBuffer.decodeCachedValue(value, 29,
-                                   serverCache_ -> selectionClearWindowCache, 9);
-            PutULONG(value, outputMessage + 8, bigEndian_);
-            decodeBuffer.decodeCachedValue(value, 29,
-                                   serverCache_ -> selectionClearWindowCache, 9);
-            PutULONG(value, outputMessage + 12, bigEndian_);
-            decodeBuffer.decodeCachedValue(value, 29,
-                                   serverCache_ -> selectionClearAtomCache, 9);
-            PutULONG(value, outputMessage + 16, bigEndian_);
-            decodeBuffer.decodeCachedValue(value, 29,
-                                   serverCache_ -> selectionClearAtomCache, 9);
-            PutULONG(value, outputMessage + 20, bigEndian_);
-            decodeBuffer.decodeCachedValue(value, 29,
-                                   serverCache_ -> selectionClearAtomCache, 9);
-            PutULONG(value, outputMessage + 24, bigEndian_);
-          }
-          break;
-        case VisibilityNotify:
-          {
-            decodeBuffer.decodeCachedValue(value, 29,
-                               serverCache_ -> visibilityNotifyWindowCache, 9);
-            PutULONG(value, outputMessage + 4, bigEndian_);
-            decodeBuffer.decodeValue(value, 2);
-            outputMessage[8] = (unsigned char) value;
-          }
-          break;
-        default:
-          {
-            #ifdef TEST
-            *logofs << "handleWrite: Using generic event compression "
-                    << "for OPCODE#" << (unsigned int) outputOpcode
-                    << ".\n" << logofs_flush;
-            #endif
-
-            decodeBuffer.decodeCachedValue(*(outputMessage + 1), 8,
-                         serverCache_ -> genericEventCharCache);
-
-            for (unsigned int i = 0; i < 14; i++)
-            {
-              decodeBuffer.decodeCachedValue(value, 16,
-                           *serverCache_ -> genericEventIntCache[i]);
-
-              PutUINT(value, outputMessage + i * 2 + 4, bigEndian_);
-            }
-          }
-        } // End of switch (outputOpcode)...
-
-        #if defined(TEST) || defined(OPCODES)
-        if (outputOpcode != X_Error)
-        {
-          *logofs << "handleWrite: Handled event OPCODE#"
-                  << (unsigned int) outputOpcode << " for FD#"
-                  << fd_ << " sequence " << lastSequence_ << " (real was "
-                  << serverSequence_ << "). Size is " << outputLength
-                  << ".\n" << logofs_flush;
-        }
-        #endif
-
-        //
-        // Check if we need to suppress the error.
-        //
-
-        if (outputOpcode == X_Error &&
-                handleTaintSyncError(*(outputMessage + 10)) > 0)
-        {
-          #if defined(TEST) || defined(OPCODES)
-          *logofs << "handleWrite: WARNING! Suppressed error OPCODE#"
-                  << (unsigned int) outputOpcode << " for FD#"
-                  << fd_ << " sequence " << lastSequence_ << ".\n"
-                  << logofs_flush;
-          #endif
-
-          writeBuffer_.removeMessage(32);
-        }
-
-      } // End of if (outputOpcode == 1)... else ...
-
-      //
-      // Check if we produced enough data. We need to
-      // decode all provided messages. Just update the
-      // finish flag in case of failure.
-      //
-
-      handleFlush(flush_if_needed);
-
-    } // End of while (decodeBuffer.decodeOpcodeValue(outputOpcode, 8, ...
-
-  } // End of the decoding block.
-
-  //
-  // Write any remaining data to the X connection.
-  //
-
-  if (handleFlush(flush_if_any) < 0)
-  {
-    return -1;
-  }
-
-  return 1;
-}
-
-//
-// End of handleWrite().
-//
-
-//
-// Other members.
-//
-
-int ClientChannel::handleSplit(EncodeBuffer &encodeBuffer, MessageStore *store,
-                                   T_store_action action, int position, const unsigned char opcode,
-                                       const unsigned char *buffer, const unsigned int size)
-{
-  #if defined(TEST) || defined(SPLIT)
-
-  // Since ProtoStep8 (#issue 108)
-  *logofs << "handleSplit: PANIC! SPLIT! Split should "
-          << "not be enabled for message " << "OPCODE#"
-          << (unsigned int) store -> opcode() << ".\n"
-          << logofs_flush;
-
-  HandleCleanup();
-
-  #endif
-
-  //
-  // Refuse the split if it is not introduced
-  // by a start split.
-  //
-
-  // Since ProtoStep7 (#issue 108)
-  if (splitState_.resource == nothing || enableSplit_ == 0)
-  {
-    #if defined(TEST) || defined(SPLIT)
-    *logofs << "handleSplit: SPLIT! Nothing to do for message "
-            << "OPCODE#" << (unsigned int) store -> opcode()
-            << " of size " << size << " position " << position
-            << " with action [" << DumpAction(action) << "] at "
-            << strMsTimestamp() << ".\n" << logofs_flush;
-    #endif
-
-    encodeBuffer.encodeBoolValue(0);
-
-    return 0;
-  }
-
-  //
-  // It's not advisable to allocate the store at
-  // the time we receive the start-split because
-  // we may process all the splits received and
-  // deallocate the store even before we receive
-  // the end split. Another message for the same
-  // split sequence may then come and we would
-  // have a null split store.
-  //
-
-  handleSplitStoreAlloc(&splitResources_, splitState_.resource);
-
-  //
-  // Check if the split was actually requested by
-  // the agent and if the request was saved in the
-  // message store. The split can also be refused
-  // if the message is smaller than the threshold
-  // or if the split store is already full.
-  //
-
-  if (mustSplitMessage(splitState_.resource) == 0)
-  {
-    if (action == IS_HIT || canSplitMessage(splitState_.mode, size) == 0)
-    {
-      #if defined(TEST) || defined(SPLIT)
-
-      if (splitState_.mode == split_none)
-      {
-        #ifdef PANIC
-        *logofs << "handleSplit: PANIC! SPLIT! Split state has "
-                << "mode 'none'.\n" << logofs_flush;
-        #endif
-
-        HandleCleanup();
-      }
-
-      if (action != IS_HIT && (int) size >=
-              control -> SplitDataThreshold)
-      {
-        #ifdef WARNING
-        *logofs << "handleSplit: WARNING! SPLIT! Split stores have "
-                << clientStore_ -> getSplitTotalSize() << " messages "
-                << "and " << clientStore_ -> getSplitTotalStorageSize()
-                << " allocated bytes.\n" << logofs_flush;
-        #endif
-      }
-
-      #endif
-
-      #if defined(TEST) || defined(SPLIT)
-      *logofs << "handleSplit: SPLIT! Message OPCODE#"
-              << (unsigned int) store -> opcode() << " of size " << size
-              << " [not split] with resource " << splitState_.resource
-              << " mode " << splitState_.mode << " position " << position
-              << " and action [" << DumpAction(action) << "] at "
-              << strMsTimestamp() << ".\n" << logofs_flush;
-      #endif
-
-      encodeBuffer.encodeBoolValue(0);
-
-      return 0;
-    }
-  }
-
-  #if defined(TEST) || defined(SPLIT)
-  *logofs << "handleSplit: SPLIT! Message OPCODE#"
-          << (unsigned int) store -> opcode() << " of size " << size
-          << " [split] with resource " << splitState_.resource
-          << " mode " << splitState_.mode << " position " << position
-          << " and action [" << DumpAction(action) << "] at "
-          << strMsTimestamp() << ".\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeBoolValue(1);
-
-  T_checksum checksum = NULL;
-
-  if (action == IS_ADDED)
-  {
-    checksum = store -> getChecksum(position);
-  }
-  else if (action == is_discarded)
-  {
-    //
-    // Generate the checksum on the fly.
-    //
-
-    checksum = store -> getChecksum(buffer, size, bigEndian_);
-  }
-
-  //
-  // The method must abort the connection
-  // if it can't allocate the split.
-  //
-
-  Split *splitMessage = clientStore_ -> getSplitStore(splitState_.resource) ->
-                              add(store, splitState_.resource, splitState_.mode,
-                                      position, action, checksum, buffer, size);
-
-  //
-  // Send the checksum. By using the checksum,
-  // the remote end will try to locate the
-  // message and load it from disk.
-  //
-
-  if (action == IS_HIT)
-  {
-    splitMessage -> setState(split_loaded);
-  }
-  else if (handleSplitChecksum(encodeBuffer, checksum) == 0)
-  {
-    //
-    // If the checksum is not sent, for example
-    // because loading of messages from disk is
-    // disabled, then mark the split as missed.
-    //
-
-    #ifdef WARNING
-    *logofs << "handleSplit: WARNING! Checksum not sent. "
-            << "Marking the split as [missed].\n"
-            << logofs_flush;
-    #endif
-
-    splitMessage -> setState(split_missed);
-  }
-
-  if (action == is_discarded)
-  {
-    delete [] checksum;
-  }
-
-  //
-  // Check if we are ready to send a new split
-  // for this store.
-  //
-
-  handleSplitPending(splitState_.resource);
-
-  #if defined(TEST) || defined(SPLIT)
-
-  *logofs << "handleSplit: SPLIT! There are " << clientStore_ ->
-             getSplitTotalSize() << " messages and " << clientStore_ ->
-             getSplitTotalStorageSize() << " bytes to send in "
-          << "the split stores.\n" << logofs_flush;
-
-  clientStore_ -> dumpSplitStore(splitState_.resource);
-
-  #endif
-
-  return 1;
-}
-
-int ClientChannel::handleSplit(EncodeBuffer &encodeBuffer)
-{
-  //
-  // Determine the maximum amount of bytes
-  // we can write in this iteration.
-  //
-
-  int total = control -> SplitDataPacketLimit;
-
-  int bytes  = total;
-  int splits = 0;
-
-  #if defined(TEST) || defined(SPLIT)
-  *logofs << "handleSplit: SPLIT! Handling splits "
-          << "for FD#" << fd_ << " with " << clientStore_ ->
-             getSplitTotalSize() << " elements and " << total
-          << " bytes to write at " << strMsTimestamp() << ".\n"
-          << logofs_flush;
-  #endif
-
-  if (proxy -> handleAsyncSwitch(fd_) < 0)
-  {
-    return -1;
-  }
-
-  #if defined(TEST) || defined(SPLIT)
-  *logofs << "handleSplit: SPLIT! Looping to find "
-          << "if there is any split to send.\n"
-          << logofs_flush;
-  #endif
-
-  SplitStore *splitStore;
-
-  Split *splitMessage;
-
-  //
-  // Divide the available bandwidth among all the active
-  // split stores by implementing a simple round-robin
-  // mechanism. This can be extended by using an external
-  // function returning the number of bytes to be written
-  // based on the state of the split (splits which didn't
-  // receive yet a confirmation event could be delayed),
-  // the current bitrate, and by letting the agent asso-
-  // ciate a priority to the resource in the start split
-  // operation.
-  //
-
-  splitState_.pending = 0;
-
-  splitResources_.rotate();
-
-  //
-  // Copy the list since elements can be removed
-  // in the middle of the loop.
-  //
-
-  T_list splitList = splitResources_.copyList();
-
-  for (T_list::iterator j = splitList.begin();
-           j != splitList.end(); j++)
-  {
-    int resource = *j;
-
-    #ifdef DEBUG
-    *logofs << "handleSplit: SPLIT! Looping with current "
-            << "resource " << resource << ".\n"
-            << logofs_flush;
-    #endif
-
-    splitStore = clientStore_ -> getSplitStore(resource);
-
-    if (splitStore != NULL)
-    {
-      //
-      // Don't send more than the the packet size
-      // bytes but ensure that we abort any split
-      // found in the disk cache.
-      //
-
-      for (;;)
-      {
-        #if defined(TEST) || defined(SPLIT)
-
-        clientStore_ -> dumpSplitStore(resource);
-
-        #endif
-
-        splitMessage = splitStore -> getFirstSplit();
-
-        if (splitMessage == NULL)
-        {
-          //
-          // We have created the store after a start
-          // split but no message was added yet.
-          //
-
-          #if defined(TEST) || defined(SPLIT)
-          *logofs << "handleSplit: WARNING! SPLIT! The split store "
-                  << "is still empty.\n" << logofs_flush;
-          #endif
-
-          break;
-        }
-
-        //
-        // Splits already aborted can't be in the
-        // split store.
-        //
-
-        #if defined(TEST) || defined(SPLIT)
-
-        if (splitMessage -> getState() == split_aborted)
-        {
-          *logofs << "handleSplit: PANIC! SPLIT! Found an "
-                  << "aborted split in store [" << resource
-                  << "].\n" << logofs_flush;
-
-          HandleCleanup();
-        }
-
-        #endif
-
-        //
-        // Check if there are more messages in the
-        // store that can be aborted or if we have
-        // exceeded the number of bytes we can send
-        // for this iteration.
-        //
-
-        #if defined(TEST) || defined(SPLIT)
-        *logofs << "handleSplit: SPLIT! Checking closure "
-                << "of the inner loop with " << bytes
-                << " bytes to write and split state ["
-                << DumpState(splitMessage -> getState())
-                << "].\n" << logofs_flush;
-        #endif
-
-        if ((splitMessage -> getMode() == split_sync &&
-                splitMessage -> getState() == split_added) ||
-                    (bytes <= 0 && splitMessage ->
-                        getState() != split_loaded))
-        {
-          break;
-        }
-
-        //
-        // If the split was loaded at the remote
-        // side abort it immediately.
-        //
-
-        if (splitMessage -> getState() == split_loaded)
-        {
-          #if defined(TEST) || defined(SPLIT)
-          *logofs << "handleSplit: SPLIT! Sending more data "
-                  << "for store [" << resource << "] with "
-                  << "a split to be aborted.\n"
-                  << logofs_flush;
-          #endif
-
-          if (handleSplitSend(encodeBuffer, resource, splits, bytes) < 0)
-          {
-            return -1;
-          }
-        }
-        else if (bytes > 0)
-        {
-          #if defined(TEST) || defined(SPLIT)
-          *logofs << "handleSplit: SPLIT! Sending more data "
-                  << "for store [" << resource << "] with "
-                  << bytes << " bytes to send.\n"
-                  << logofs_flush;
-          #endif
-
-          if (handleSplitSend(encodeBuffer, resource, splits, bytes) < 0)
-          {
-            return -1;
-          }
-        }
-
-        //
-        // Check if the split store was deleted.
-        //
-
-        splitStore = clientStore_ -> getSplitStore(resource);
-
-        if (splitStore == NULL)
-        {
-          #if defined(TEST) || defined(SPLIT)
-          *logofs << "handleSplit: SPLIT! Exiting from the "
-                  << "inner loop with split store [" << resource
-                  << "] destroyed.\n" << logofs_flush;
-          #endif
-
-          break;
-        }
-      }
-
-      #if defined(TEST) || defined(SPLIT)
-      *logofs << "handleSplit: SPLIT! Completed handling splits "
-              << "for store [" << resource << "] with " << bytes
-              << " bytes still to send.\n" << logofs_flush;
-      #endif
-
-      //
-      // Check if there is still a split to
-      // send for the store just processed.
-      //
-
-      handleSplitPending(resource);
-    }
-  }
-
-  #if defined(TEST) || defined(SPLIT)
-
-  if (splits == 0)
-  {
-    #ifdef PANIC
-    *logofs << "handleSplit: PANIC! Function called but "
-            << "no split message was sent.\n"
-            << logofs_flush;
-    #endif
-
-    HandleCleanup();
-  }
-
-  *logofs << "handleSplit: SPLIT! Sent " << splits
-          << " splits and " << total - bytes << " bytes for FD#" << fd_
-          << " with " << clientStore_ -> getSplitTotalStorageSize()
-          << " bytes and [" << clientStore_ -> getSplitTotalSize()
-          << "] splits remaining.\n" << logofs_flush;
-
-  *logofs << "handleSplit: SPLIT! The pending split flag is "
-          << splitState_.pending << " with " << clientStore_ ->
-             getSplitTotalSize() << " splits in the split stores.\n"
-          << logofs_flush;
-
-  clientStore_ -> dumpSplitStores();
-
-  #endif
-
-  return 1;
-}
-
-int ClientChannel::handleSplitSend(EncodeBuffer &encodeBuffer, int resource,
-                                       int &splits, int &bytes)
-{
-  #if defined(TEST) || defined(SPLIT) 
-
-  SplitStore *splitStore = clientStore_ -> getSplitStore(resource);
-
-  Split *splitMessage = splitStore -> getFirstSplit();
-
-  if (splitStore -> getResource() != resource ||
-          splitMessage -> getResource() != resource)
-  {
-    #ifdef PANIC
-    *logofs << "handleSplitSend: PANIC! The resource doesn't "
-            << "match the split store.\n" << logofs_flush;
-    #endif
-
-    HandleCleanup();
-  }
-
-  *logofs << "handleSplitSend: SPLIT! Sending message "
-          << "OPCODE#" << (unsigned) opcodeStore_ -> splitData
-          << " for resource " << splitMessage -> getResource()
-          << " with request " << splitMessage -> getRequest()
-          << " position " << splitMessage -> getPosition()
-          << " and " << bytes << " bytes to write.\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // Use a special opcode to signal the other
-  // side this is part of a split and not a
-  // new message.
-  //
-
-  encodeBuffer.encodeOpcodeValue(opcodeStore_ -> splitData,
-                                     clientCache_ -> opcodeCache);
-
-  encodeBuffer.encodeCachedValue(resource, 8,
-                     clientCache_ -> resourceCache);
-
-  int result = clientStore_ -> getSplitStore(resource) ->
-                     send(encodeBuffer, bytes);
-
-  if (result < 0)
-  {
-    #ifdef PANIC
-    *logofs << "handleSplit: PANIC! Error sending splits for FD#"
-            << fd_ << ".\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Error sending splits for FD#"
-           << fd_ << ".\n";
-
-    return -1;
-  }
-
-  //
-  // Get the bits written and update the
-  // statistics for this special opcode.
-  //
-
-  int bits = encodeBuffer.diffBits();
-
-  #if defined(TEST) || defined(SPLIT)|| defined(OPCODES)
-  *logofs << "handleSplitSend: SPLIT! Handled request OPCODE#"
-          << (unsigned int) opcodeStore_ -> splitData << " ("
-          << DumpOpcode(opcodeStore_ -> splitData) << ")" << " for FD#"
-          << fd_ << " sequence none. 0 bytes in, " << bits << " bits ("
-          << ((float) bits) / 8 << " bytes) out.\n" << logofs_flush;
-  #endif
-
-  statistics -> addRequestBits(opcodeStore_ -> splitData, 0, bits);
-
-  bytes -= bits >> 3;
-
-  splits++;
-
-  if (result == 1)
-  {
-    #if defined(TEST) || defined(SPLIT)
-    *logofs << "handleSplitSend: SPLIT! Split at the head "
-            << "of the list was completely transferred.\n"
-            << logofs_flush;
-    #endif
-
-    //
-    // The split at the head of the list was
-    // completely transferred.
-    //
-
-    handleRestart(sequence_deferred, resource);
-  }
-  #if defined(TEST) || defined(SPLIT)
-  else
-  {
-    *logofs << "handleSplitSend: SPLIT! More data to send "
-            << "for the split at the head of the list.\n"
-            << logofs_flush;
-  }
-  #endif
-
-  return result;
-}
-
-int ClientChannel::handleSplitChecksum(EncodeBuffer &encodeBuffer, T_checksum checksum)
-{
-  //
-  // Send the checksum only if the loading
-  // or the saving of the message to the
-  // persistent image cache is enabled.
-  //
-
-  if ((control -> ImageCacheEnableLoad == 1 ||
-          control -> ImageCacheEnableSave == 1) &&
-              (enableLoad_ == 1 || enableSave_ == 1))
-  {
-    encodeBuffer.encodeBoolValue(1);
-
-    for (unsigned int i = 0; i < MD5_LENGTH; i++)
-    {
-      encodeBuffer.encodeValue((unsigned int) checksum[i], 8);
-    }
-
-    #if defined(TEST) || defined(SPLIT)
-    *logofs << "handleSplitChecksum: SPLIT! Sent checksum "
-            <<  "[" << DumpChecksum(checksum) << "].\n"
-            << logofs_flush;
-    #endif
-
-    return 1;
-  }
-  else
-  {
-    encodeBuffer.encodeBoolValue(0);
-
-    return 0;
-  }
-}
-
-void ClientChannel::handleSplitPending()
-{
-  #if defined(TEST) || defined(SPLIT)
-
-  int previous = splitState_.pending;
-
-  #endif
-
-  if (clientStore_ -> getSplitTotalSize() == 0)
-  {
-    splitState_.pending = 0;
-
-    #if defined(TEST) || defined(SPLIT)
-    *logofs << "handleSplitPending: SPLIT! Set the pending "
-            << "split flag to " << splitState_.pending
-            << " with split stores empty.\n"
-            << logofs_flush;
-    #endif
-  }
-  else
-  {
-    //
-    // Loop through the stores to find if
-    // there is any split that has become
-    // ready.
-    //
-
-    #if defined(TEST) || defined(SPLIT)
-    *logofs << "handleSplitPending: WARNING! SPLIT! Looping to "
-            << "find if there is any split pending.\n"
-            << logofs_flush;
-    #endif
-
-    splitState_.pending = 0;
-
-    T_list &splitList = splitResources_.getList();
-
-    for (T_list::iterator j = splitList.begin();
-             j != splitList.end(); j++)
-    {
-      int resource = *j;
-
-      SplitStore *splitStore = clientStore_ -> getSplitStore(resource);
-
-      if (splitStore != NULL)
-      {
-        #if defined(TEST) || defined(SPLIT)
-
-        clientStore_ -> dumpSplitStore(resource);
-
-        #endif
-
-        Split *splitMessage = splitStore -> getFirstSplit();
-
-        if (splitMessage != NULL && canSendSplit(splitMessage) == 1)
-        {
-          #if defined(TEST) || defined(SPLIT)
-          *logofs << "handleSplitPending: SPLIT! Found a pending "
-                  << "split in store [" << resource << "].\n"
-                  << logofs_flush;
-          #endif
-
-          splitState_.pending = 1;
-
-          #if defined(TEST) || defined(SPLIT)
-
-          if (splitMessage -> getState() == split_loaded)
-          {
-            *logofs << "handleSplitPending: PANIC! SPLIT! Found a "
-                    << "loaded split in store [" << resource
-                    << "].\n" << logofs_flush;
-
-            HandleCleanup();
-          }
-
-          #endif
-
-          break;
-        }
-      }
-    }
-
-    #if defined(TEST) || defined(SPLIT)
-    *logofs << "handleSplitPending: SPLIT! Set the pending "
-            << "split flag to " << splitState_.pending
-            << " with " << clientStore_ -> getSplitTotalSize()
-            << " splits in the split stores.\n"
-            << logofs_flush;
-    #endif
-  }
-
-  #if defined(TEST) || defined(SPLIT)
-
-  if (splitState_.pending != previous)
-  {
-    *logofs << "handleSplitPending: SPLIT! Pending state "
-            << "changed from " << previous << " to "
-            << splitState_.pending << ".\n"
-            << logofs_flush;
-  }
-
-  #endif
-}
-
-int ClientChannel::handleSplitEvent(EncodeBuffer &encodeBuffer, Split *splitMessage)
-{
-  SplitStore *splitStore;
-
-  int resource = splitMessage -> getResource();
-
-  #if defined(TEST) || defined(INFO)
-
-  splitStore = clientStore_ -> getSplitStore(resource);
-
-  if (splitStore == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "handleSplitEvent: PANIC! The split store can't "
-            << "be NULL handling abort splits.\n"
-            << logofs_flush;
-    #endif
-
-    HandleCleanup();
-  }
-  else if (splitMessage -> getState() != split_loaded)
-  {
-    *logofs << "handleSplitEvent: PANIC! Can't find the split "
-            << "to be aborted.\n" << logofs_flush;
-
-    HandleCleanup();
-  }
-
-  #endif
-
-  //
-  // Send any split that it is possible to
-  // abort until the store is either empty
-  // or the next split can't be aborted.
-  //
-
-  if (proxy -> handleAsyncSwitch(fd_) < 0)
-  {
-    return -1;
-  }
-
-  while ((splitStore = clientStore_ ->
-             getSplitStore(resource)) != NULL &&
-                 (splitMessage = splitStore -> getFirstSplit()) != NULL &&
-                     splitMessage -> getState() == split_loaded)
-  {
-    #if defined(TEST) || defined(SPLIT)
-    *logofs << "handleSplitEvent: SPLIT! Aborting split with "
-            << "checksum [" << DumpChecksum(splitMessage ->
-               getChecksum()) << "] for resource " << resource
-            << " at " << strMsTimestamp() << ".\n"
-            << logofs_flush;
-    #endif
-
-    int any = 0;
-
-    if (handleSplitSend(encodeBuffer, resource, any, any) < 0)
-    {
-      return -1;
-    }
-  }
-
-  #if defined(TEST) || defined(SPLIT)
-
-  if ((splitStore = clientStore_ ->
-          getSplitStore(resource)) == NULL)
-  {
-    *logofs << "handleSplitEvent: SPLIT! The split store ["
-            << resource << "] has been destroyed.\n"
-            << logofs_flush;
-  }
-  else if ((splitMessage = splitStore ->
-               getFirstSplit()) == NULL)
-  {
-    *logofs << "handleSplitEvent: SPLIT! The split store ["
-            << resource << "] is empty.\n"
-            << logofs_flush;
-  }
-  else if (splitMessage -> getState() != split_loaded)
-  {
-    *logofs << "handleSplitEvent: SPLIT! The split at the "
-            << "head of store [" << resource << "] doesn't "
-            << "need to be aborted.\n" << logofs_flush;
-  }
-
-  #endif
-
-  return 1;
-}
-
-int ClientChannel::handleSplitEvent(DecodeBuffer &decodeBuffer)
-{
-  #if defined(TEST) || defined(SPLIT)
-  *logofs << "handleSplitEvent: SPLIT! Handling abort "
-          << "split messages for FD#" << fd_ << " at "
-          << strMsTimestamp() << ".\n" << logofs_flush;
-  #endif
-
-  // Since ProtoStep7 (#issue 108)
-
-  //
-  // Decode the information about the
-  // message to be updated.
-  //
-
-  unsigned char resource;
-
-  decodeBuffer.decodeCachedValue(resource, 8,
-                     serverCache_ -> resourceCache);
-
-  unsigned int loaded;
-
-  decodeBuffer.decodeBoolValue(loaded);
-
-  unsigned char request;
-  unsigned int  size;
-
-  if (loaded == 1)
-  {
-    decodeBuffer.decodeOpcodeValue(request, serverCache_ -> abortOpcodeCache);
-
-    decodeBuffer.decodeValue(size, 32, 14);
-  }
-  else
-  {
-    request = 0;
-    size    = 0;
-  }
-
-  unsigned int value;
-
-  md5_byte_t checksum[MD5_LENGTH];
-
-  for (unsigned int i = 0; i < MD5_LENGTH; i++)
-  {
-    decodeBuffer.decodeValue(value, 8);
-
-    checksum[i] = (unsigned char) value;
-  }
-
-  #if defined(TEST) || defined(SPLIT)
-  *logofs << "handleSplitEvent: SPLIT! Checking split "
-          << "with checksum [" << DumpChecksum(checksum)
-          << "] loaded " << loaded << " request " << (unsigned int)
-             request << " compressed size " << size << " at "
-          << strMsTimestamp() << ".\n" << logofs_flush;
-  #endif
-
-  Split *splitMessage = handleSplitFind(checksum, resource);
-
-  if (splitMessage != NULL)
-  {
-    if (loaded == 1)
-    {
-      #if defined(TEST) || defined(SPLIT)
-      *logofs << "handleSplitEvent: SPLIT! Marked split with "
-              << "checksum [" << DumpChecksum(checksum) << "] "
-              << "as [loaded] at " << strMsTimestamp() << ".\n"
-              << logofs_flush;
-      #endif
-
-      splitMessage -> setState(split_loaded);
-
-      #if defined(TEST) || defined(SPLIT)
-
-      if (splitMessage -> compressedSize() != (int) size)
-      {
-        *logofs << "handleSplitEvent: WARNING! SPLIT! Updating "
-                << "compressed data size from " << splitMessage ->
-                   compressedSize() << " to " << size << ".\n"
-                << logofs_flush;
-      }
-
-      #endif
-
-      splitMessage -> compressedSize(size);
-
-      //
-      // The splits to be aborted are checked by the split
-      // store at the time we are going to send a new chunk
-      // of split data. The splits must be strictly handled
-      // in the same order as they were added to the split
-      // store and the split we want to abort here may be
-      // not at the head of the list.
-      //
-
-      if (splitMessage == clientStore_ ->
-              getSplitStore(resource) -> getFirstSplit())
-      {
-        //
-        // We don't need to flush this packet immediately.
-        // The abort can be sent at any time to the remote
-        // proxy. What's important is that we restart the
-        // agent resource as soon as possible.
-        //
-
-        #if defined(TEST) || defined(SPLIT)
-
-        T_timestamp startTs = getTimestamp();
-
-        *logofs << "handleSplitEvent: SPLIT! Encoding abort "
-                << "split events for FD#" << fd_ << " with "
-                << "resource " << (unsigned) resource << " at "
-                << strMsTimestamp() << ".\n" << logofs_flush;
-        #endif
-
-        if (proxy -> handleAsyncSplit(fd_, splitMessage) < 0)
-        {
-          return -1;
-        }
-
-        #if defined(TEST) || defined(SPLIT)
-        *logofs << "handleSplitEvent: SPLIT! Spent "
-                << diffTimestamp(startTs, getTimestamp()) << " Ms "
-                << "handling abort split events for FD#" << fd_
-                << ".\n" << logofs_flush;
-        #endif
-
-        //
-        // Check if we can clear the pending flag.
-        //
-
-        handleSplitPending();
-      }
-      #if defined(TEST) || defined(SPLIT)
-      else
-      {
-        *logofs << "handleSplitEvent: WARNING! SPLIT! Abort split "
-                << "event not sent because not at the head "
-                << "of the list.\n" << logofs_flush;
-      }
-      #endif
-    }
-    else
-    {
-      #if defined(TEST) || defined(SPLIT)
-      *logofs << "handleSplitEvent: SPLIT! Marked split with "
-              << "checksum [" << DumpChecksum(checksum) << "] "
-              << "as [missed] at " << strMsTimestamp() << ".\n"
-              << logofs_flush;
-      #endif
-
-      splitMessage -> setState(split_missed);
-
-      //
-      // Check if we can set the pending flag.
-      //
-
-      handleSplitPending(resource);
-    }
-  }
-  else
-  {
-    //
-    // The split report came after the split was already
-    // sent or the split store deleted. If the message
-    // had been loaded from disk by the remote side, we
-    // need to update the compressed size in our message
-    // store or the checksum will not match at the time
-    // we will try to save the message store on disk.
-    //
-
-    if (loaded == 1 && size != 0)
-    {
-      #if defined(TEST) || defined(SPLIT)
-      *logofs << "handleSplitEvent: WARNING! SPLIT! Can't find "
-              << "the split. Updating in the message store.\n"
-              << logofs_flush;
-      #endif
-
-      MessageStore *store = clientStore_ -> getRequestStore(request);
-
-      if (store != NULL)
-      {
-        store -> updateData(checksum, size);
-      }
-      #if defined(TEST) || defined(SPLIT)
-      else
-      {
-        #ifdef PANIC
-        *logofs << "handleSplitEvent: PANIC! The message store "
-                << "can't be null.\n" << logofs_flush;
-        #endif
-
-        HandleCleanup();
-      }
-      #endif
-    }
-    #if defined(TEST) || defined(SPLIT)
-    else
-    {
-      *logofs << "handleSplitEvent: WARNING! SPLIT! No need to "
-              << "update the store with loaded " << loaded
-              << " and compressed size " << size << ".\n"
-              << logofs_flush;
-    }
-    #endif
-  }
-
-  return 1;
-}
-
-Split *ClientChannel::handleSplitFind(T_checksum checksum, int resource)
-{
-  //
-  // It can be that we handled all the splits,
-  // restarted the resource and deleted the
-  // store before the event could even reach
-  // our side.
-  //
-
-  SplitStore *splitStore = clientStore_ -> getSplitStore(resource);
-
-  if (splitStore != NULL)
-  {
-    Split *splitMessage;
-
-    T_splits *splitList = splitStore -> getSplits();
-
-    for (T_splits::iterator i = splitList -> begin();
-             i != splitList -> end(); i++)
-    {
-      splitMessage = (*i);
-
-      if (splitMessage -> getChecksum() != NULL)
-      {
-        #if defined(TEST) || defined(SPLIT)
-        *logofs << "handleSplitFind: SPLIT! Comparing with message ["
-                << DumpChecksum(splitMessage -> getChecksum())
-                << "].\n" << logofs_flush;
-        #endif
-
-        if (memcmp(checksum, splitMessage -> getChecksum(), MD5_LENGTH) == 0)
-        {
-          #if defined(TEST) || defined(SPLIT)
-          *logofs << "handleSplitFind: SPLIT! Located split for "
-                  << "checksum [" << DumpChecksum(checksum) << "] "
-                  << "in store [" << splitStore -> getResource()
-                  << "].\n" << logofs_flush;
-          #endif
-
-          return splitMessage;
-        }
-      }
-    }
-  }
-  #if defined(TEST) || defined(SPLIT)
-  else
-  {
-    *logofs << "handleSplitFind: WARNING! SPLIT! The split store "
-            << "was already deleted.\n" << logofs_flush;
-  }
-  #endif
-
-  #if defined(TEST) || defined(SPLIT)
-  *logofs << "handleSplitFind: WARNING! SPLIT! Can't find the "
-          << "split for checksum [" << DumpChecksum(checksum)
-          << "].\n" << logofs_flush;
-  #endif
-
-  return NULL;
-}
-
-int ClientChannel::handleRestart(T_sequence_mode mode, int resource)
-{
-  //
-  // The agent must send a start-split message, followed by the
-  // X messages that may be optionally split by the proxy. Usu-
-  // ally, in the middle of a start-split/end-split sequence is
-  // a single PutImage() or PutPackedImage(), that, in turn,
-  // can generate multiple partial requests, like a SetUnpack-
-  // Colormap() and SetUnpackAlpha() followed by the image that
-  // must be transferred. Multiple requests may be also genera-
-  // ted because the maximum size of a X request has been exce-
-  // eded, so that Xlib has divided the single image in multi-
-  // ple sub-image requests. The agent doesn't need to take care
-  // of that, except tracking the result of the split operation.
-  //
-  // By monitoring the notify events sent by the proxy, the
-  // agent will have to implement its own strategy to deal with
-  // its resources (for example its clients). For example:
-  //
-  // - It will issue a new image request and suspend a client
-  //   if the image was not entirely sent in the main X oputput
-  //   stream.
-  //
-  // - It will choose to commit or discard the messages after
-  //   they are recomposed at the remote side. The set of mes-
-  //   sages that will have to be committed will include all
-  //   messages that were part of the split (the colormap, the
-  //   alpha channel).
-  //
-  // - It will restart its own client, in the case it had been
-  //   suspended.
-  //
-  // A more useful strategy would be to replace the original im-
-  // age with a tiny 'placeholder' if a split took place, and
-  // synchronize the content of the drawable at later time. This
-  // is generally referred as 'lazy encoding'.
-  //
-  // The agent will be able to identify the original split ope-
-  // ration (the one marked with the start-spit) by the small
-  // integer number (0-255) referred to as the 'resource' field.
-  //
-  // Before the proxy will be able to report the status of the
-  // split, the agent will have to close the sequence by issueing
-  // an end-split. The proxy will then report the result of the
-  // operation, so that the agent will have the option of suspend-
-  // ing the client or marking the drawable as dirty and take
-  // care of synchronizing it at later time.
-  //
-  // One of the following cases may be encountered:
-  //
-  // notify_no_split:     All messages were sent in the main out-
-  //                      put stream, so that no split actually
-  //                      took place.
-  //
-  // notify_start_split:  One or more messages were split, so,
-  //                      at discrection of the agent, the client
-  //                      may be suspended until the transferral
-  //                      is completed.
-  //
-  // notify_commit_split: One of the requests that made up the
-  //                      split was recomposed. The agent should
-  //                      either commit the given request or tell
-  //                      the proxy to discard it.
-  //
-  // notify_end_split:    The split was duly completed. The agent
-  //                      can restart the client.
-  //
-  // notify_empty_split:  No more split operation are pending.
-  //                      The agent can use this information to
-  //                      implement specific strategies requiring
-  //                      that all messages have been recomposed
-  //                      at the remote end, like updating the
-  //                      drawables that were not synchronized
-  //                      because of the lazy encoding.
-  //
-  // By checking the split and commit store we can determine if we
-  // need to send a new notification event to the agent. There can
-  // be four different cases:
-  //
-  // - If the split store is not null and not empty, we are still
-  //   in the middle of a split.
-  //
-  // - If the commit store is not empty, we completely recomposed
-  //   a full message and can send a new commit notify.
-  //
-  // - If the split store has become empty, we recomposed all the
-  //   messages added for the given resource, and so will be able
-  //   to restart the resource.
-  //
-  // - If no more messages are in the split stores, we can notify
-  //   an empty split event to the agent.
-  //
-
-  #if defined(TEST) || defined(SPLIT)
-  *logofs << "handleRestart: SPLIT! Handling ["
-          << (mode == sequence_immediate ? "immediate" : "deferred")
-          << "] restart events for resource " << resource << " at "
-          << strMsTimestamp() << ".\n" << logofs_flush;
-  #endif
-
-  SplitStore *splitStore = clientStore_ -> getSplitStore(resource);
-
-  if (mode == sequence_immediate)
-  {
-    //
-    // We have received an end-split request. If the store
-    // was not deleted already, we mark the last split added
-    // as the one ending the row for this resource. If the
-    // commit() function returns 0 it means that the split
-    // store is either empty or that we did not add any split
-    // for this resource. This is because when connected to
-    // an old proxy version we only have a single store for
-    // all the resources.   
-    //
-    // It can happen that all the split messages that were
-    // originally appended to the list were completely sent
-    // before our client had the chance of ending the split
-    // sequence. In this case the split store will be empty
-    // or already deleted and so we will be able to restart
-    // the resource.
-    //
-
-    #if defined(TEST) || defined(SPLIT)
-
-    if (splitStore == NULL)
-    {
-      *logofs << "handleRestart: WARNING! SPLIT! Split store ["
-              << resource << "] was already deleted.\n"
-              << logofs_flush;
-    }
-    else
-    {
-      clientStore_ -> dumpSplitStore(resource);
-    }
-
-    #endif
-
-    if (splitStore == NULL || splitStore -> getSize() == 0)
-    {
-      #if defined(TEST) || defined(SPLIT)
-      *logofs << "handleRestart: SPLIT! Immediate agent split event "
-              << "TYPE#" << (unsigned) opcodeStore_ -> noSplitNotify
-              << " [no split] with resource " << resource
-              << " at " << strMsTimestamp() << ".\n"
-              << logofs_flush;
-      #endif
-
-      if (handleNotify(notify_no_split, sequence_immediate,
-                           resource, nothing, nothing) < 0)
-      {
-        return -1;
-      }
-    }
-    else
-    {
-      #if defined(TEST) || defined(SPLIT)
-      *logofs << "handleRestart: SPLIT! Immediate agent split event "
-              << "TYPE#" << (unsigned) opcodeStore_ -> startSplitNotify
-              << " [start split] with resource " << resource
-              << " at " << strMsTimestamp() << ".\n"
-              << logofs_flush;
-      #endif
-
-      if (handleNotify(notify_start_split, sequence_immediate,
-                           resource, nothing, nothing) < 0)
-      {
-        return -1;
-      }
-    }
-  }
-  else
-  {
-    //
-    // We have completely transferred a message
-    // that was put in the split store.
-    //
-    // The id of the resource can be different
-    // than the index of the store if we are
-    // connected to an old proxy.
-    //
-
-    #if defined(TEST) || defined(SPLIT)
-
-    if (splitStore == NULL)
-    {
-      #ifdef PANIC
-      *logofs << "handleRestart: PANIC! The split store can't "
-              << "be NULL handling deferred restart events.\n"
-              << logofs_flush;
-      #endif
-
-      HandleCleanup();
-    }
-    else
-    {
-      clientStore_ -> dumpSplitStore(resource);
-    }
-
-    #endif
-
-    CommitStore *commitStore = clientStore_ -> getCommitStore();
-
-    #if defined(TEST) || defined(SPLIT)
-
-    clientStore_ -> dumpCommitStore();
-
-    #endif
-
-    //
-    // Check if there is any commit to notify.
-    //
-
-    Split *split;
-
-    T_splits *commitList = commitStore -> getSplits();
-
-    for (T_splits::iterator i = commitList -> begin();
-             i != commitList -> end(); i++)
-    {
-      split = *i;
-
-      if (split -> getState() != split_notified)
-      {
-        #if defined(TEST) || defined(SPLIT) 
-
-        if (split -> getResource() != resource)
-        {
-          #ifdef PANIC
-          *logofs << "handleSplitSend: PANIC! The resource doesn't "
-                  << "match the split store.\n" << logofs_flush;
-          #endif
-
-          HandleCleanup();
-        }
-
-        #endif
-
-        int request  = split -> getRequest();
-        int position = split -> getPosition();
-
-        #if defined(TEST) || defined(SPLIT)
-        *logofs << "handleRestart: SPLIT! Deferred agent split event "
-                << "TYPE#" << (unsigned) opcodeStore_ -> commitSplitNotify
-                << " [commit split] with resource " << resource << " request "
-                << request << " position " << position << " at "
-                << strMsTimestamp() << ".\n" << logofs_flush;
-        #endif
-
-        if (handleNotify(notify_commit_split, sequence_deferred,
-                            resource, request, position) < 0)
-        {
-          return -1;
-        }
-
-        //
-        // Don't send the notification again.
-        //
-
-        split -> setState(split_notified);
-      }
-      #if defined(TEST) || defined(SPLIT)
-      else
-      {
-        *logofs << "handleRestart: SPLIT! Split for request "
-                << split -> getRequest() << " and position "
-                << split -> getPosition() << " was already "
-                << "notified.\n" << logofs_flush;
-      }
-      #endif
-    }
-
-    //
-    // Don't send the end split if we are still
-    // in the middle of a start-split/end-split
-    // sequence. We'll send a no-split at the
-    // time the end-split is received.
-    //
-
-    if (splitStore -> getSize() == 0 &&
-            splitStore -> getResource() != splitState_.resource)
-    {
-      #if defined(TEST) || defined(SPLIT)
-      *logofs << "handleRestart: SPLIT! Deferred agent split event "
-              << "TYPE#" << (unsigned) opcodeStore_ -> endSplitNotify
-              << " [end split] with resource " << resource << " at "
-              << strMsTimestamp() << ".\n" << logofs_flush;
-      #endif
-
-      if (handleNotify(notify_end_split, sequence_deferred,
-                           resource, nothing, nothing) < 0)
-      {
-        return -1;
-      }
-    }
-    #if defined(TEST) || defined(SPLIT)
-    else if (splitStore -> getSize() == 0 &&
-                splitStore -> getResource() == splitState_.resource)
-    {
-      *logofs << "handleRestart: SPLIT! WARNING! The split store "
-              << "for resource " << resource << " was emptied in the "
-              << "split sequence at " << strMsTimestamp() << ".\n"
-              << logofs_flush;
-    }
-    #endif
-  }
-
-  //
-  // Remove the split store if it's empty.
-  //
-
-  if (splitStore != NULL && splitStore -> getSize() == 0 &&
-          splitStore -> getResource() != splitState_.resource)
-  {
-    #if defined(TEST) || defined(SPLIT)
-    *logofs << "handleRestart: SPLIT! Removing the split store ["
-            << resource << "] at " << strMsTimestamp()
-            << ".\n" << logofs_flush;
-    #endif
-
-    handleSplitStoreRemove(&splitResources_, resource);
-
-    if (clientStore_ -> getSplitTotalSize() == 0)
-    {
-      #if defined(TEST) || defined(SPLIT)
-      *logofs << "handleRestart: SPLIT! Deferred agent split event "
-              << "TYPE#" << (unsigned) opcodeStore_ -> emptySplitNotify
-              << " [empty split] for FD#" << fd_ << " at "
-              << strMsTimestamp() << ".\n" << logofs_flush;
-      #endif
-
-      if (handleNotify(notify_empty_split, sequence_deferred,
-                           nothing, nothing, nothing) < 0)
-      {
-        return -1;
-      }
-    }
-
-    #if defined(TEST) || defined(SPLIT)
-    *logofs << "handleRestart: SPLIT! There are " << clientStore_ ->
-               getSplitTotalSize() << " messages and " << clientStore_ ->
-               getSplitTotalStorageSize() << " bytes to send in "
-            << "the split stores.\n" << logofs_flush;
-
-    if ((clientStore_ -> getSplitTotalSize() != 0 &&
-            clientStore_ -> getSplitTotalStorageSize() == 0) ||
-                (clientStore_ -> getSplitTotalSize() == 0 &&
-                    clientStore_ -> getSplitTotalStorageSize() != 0))
-    {
-      #ifdef PANIC
-      *logofs << "handleRestart: PANIC! Inconsistency detected "
-              << "while handling the split stores.\n"
-              << logofs_flush;
-      #endif
-
-      HandleCleanup();
-    }
-
-    #endif
-  }
-
-  return 1;
-}
-
-int ClientChannel::handleTaintLameRequest(unsigned char &opcode, const unsigned char *&buffer,
-                                              unsigned int &size)
-{
-  //
-  // Test the efficiency of the encoding
-  // without these RENDER requests.
-  //
-
-  if (opcode == opcodeStore_ -> renderExtension &&
-          (*(buffer + 1) == X_RenderCompositeGlyphs8 ||
-               *(buffer + 1) == X_RenderCompositeGlyphs16 ||
-                   *(buffer + 1) == X_RenderCompositeGlyphs32 ||
-                       *(buffer + 1) == X_RenderAddGlyphs ||
-                           *(buffer + 1) == X_RenderTrapezoids))
-  {
-    #ifdef TEST
-    *logofs << "handleTaintLameRequest: Tainting request "
-            << "OPCODE#" << (unsigned int) opcode << " MINOR#"
-            << (unsigned int) *(buffer + 1) << " for FD#"
-            << fd_ << ".\n" << logofs_flush;
-    #endif
-
-    opcode = X_NoOperation;
-
-    return 1;
-  }
-
-  return 0;
-}
-
-int ClientChannel::handleTaintSyncRequest(unsigned char &opcode, const unsigned char *&buffer,
-                                              unsigned int &size)
-{
-  //
-  // Should short-circuit other common replies
-  // whose values could be queried only once.
-  // Examples are X_InterAtom, X_ListExtension
-  // and X_QueryExtension.
-  //
-
-  if (taintCounter_ >= control -> TaintThreshold)
-  {
-    #ifdef DEBUG
-    *logofs << "handleTaintSyncRequest: Reset taint counter after "
-            << taintCounter_ << " replies managed.\n"
-            << logofs_flush;
-    #endif
-
-    taintCounter_ = 0;
-
-    return 0;
-  }
-
-  //
-  // Check if we are rolling the counter.
-  // The client sequence number has not
-  // been incremented yet in the loop.
-  //
-
-  unsigned int sequence = (clientSequence_ + 1) & 0xffff;
-
-  #ifdef DEBUG
-  *logofs << "handleTaintSyncRequest: Opcode is " << (unsigned) opcode
-          << " expected client sequence is " << sequence
-          << ".\n" << logofs_flush;
-  #endif
-
-  if (sequence == 0xffff)
-  {
-    return 0;
-  }
-
-  unsigned short t1;
-  unsigned char  t2;
-
-  //
-  // Check if there is a previous reply
-  // pending.
-  //
-
-  if (sequenceQueue_.peek(t1, t2) != 0)
-  {
-    #ifdef DEBUG
-    *logofs << "handleTaintSyncRequest: Skipping taint of reply due to "
-            << "pending request OPCODE#" << t1 << " with sequence "
-            << (unsigned int) t2 << ".\n" << logofs_flush;
-    #endif
-
-    return 0;
-  }
-
-  #ifdef DEBUG
-  *logofs << "handleTaintSyncRequest: Suppressing get input focus "
-          << "request for FD#" << fd_ << " with sequence "
-          << sequence << ".\n" << logofs_flush;
-  #endif
-
-  unsigned char *reply = writeBuffer_.addMessage(32);
-
-  *(reply + 0) = X_Reply;
-
-  PutUINT(sequence, reply + 2, bigEndian_);
-
-  PutULONG(0, reply + 4, bigEndian_);
-
-  //
-  // Set revert-to to none.
-  //
-
-  *(reply + 1) = 0;
-
-  //
-  // Set focus to none.
-  //
-
-  PutULONG(0, reply + 8, bigEndian_);
-
-  //
-  // Save the sequence number, not incremented
-  // yet, we used to auto-generate this reply.
-  //
-
-  lastSequence_ = clientSequence_ + 1;
-
-  #ifdef TEST
-  *logofs << "handleTaintSyncRequest: Registered " << lastSequence_
-          << " as last auto-generated sequence number.\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // Taint the request to a X_NoOperation.
-  //
-
-  opcode = X_NoOperation;
-
-  //
-  // We may assume that the client has finished
-  // drawing and flush immediately, even if this
-  // seems to perceively affect the performance.
-  //
-  // priority_++;
-  //
-
-  if (handleFlush(flush_if_any) < 0)
-  {
-    return -1;
-  }
-
-  taintCounter_++;
-
-  return 1;
-}
-
-int ClientChannel::handleTaintSyncError(unsigned char opcode)
-{
-  if (control -> TaintReplies > 0)
-  {
-    //
-    // By enabling short-circuiting of replies
-    // some window managers can get confused
-    // by some otherwise innocuous X errors.
-    //
-
-    if (opcode == X_GrabKey || opcode == X_ReparentWindow ||
-            opcode == X_ConfigureWindow)
-    {
-      #if defined(TEST) || defined(OPCODES)
-      *logofs << "handleTaintSyncError: WARNING! Suppressed error "
-              << "on OPCODE#" << (unsigned int) opcode << " for FD#"
-              << fd_ << " sequence " << lastSequence_ << " (real was "
-              << serverSequence_ << ").\n" << logofs_flush;
-      #endif
-
-      return 1;
-    }
-  }
-
-  return 0;
-}
-
-int ClientChannel::handleNotify(T_notification_type type, T_sequence_mode mode,
-                                    int resource, int request, int position)
-{
-  if (finish_ == 1)
-  {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "handleNotify: Discarding notification on "
-            << "channel for FD#" << fd_ << ".\n"
-            << logofs_flush;
-    #endif
-
-    return 0;
-  }
-
-  //
-  // Add a new message to the write buffer.
-  //
-
-  unsigned char *event = writeBuffer_.addMessage(32);
-
-  //
-  // Event is ClientMessage, atom and
-  // window are 0, format is 32.
-  //
-
-  *(event + 0) = ClientMessage;
-
-  PutULONG(0, event + 4, bigEndian_);
-  PutULONG(0, event + 8, bigEndian_);
-
-  *(event + 1) = 32;
-
-  //
-  // If the event follows immediately the request (that is the
-  // sequence mode is 'immediate') then the sequence number is
-  // the one of the last request, else it should be the last
-  // sequence number encoded by peer proxy but, as we are ins-
-  // erting events in the stream, we must ensure that the se-
-  // quence we send is not less than the last sequence we have
-  // auto-generated.
-  //
-
-  if (mode == sequence_immediate)
-  {
-    //
-    // Save the sequence number we used
-    // to auto-generate this event.
-    //
-
-    lastSequence_ = clientSequence_;
-
-    #if defined(TEST) || defined(INFO)
-    *logofs << "handleNotify: Registered " << lastSequence_
-            << " as last auto-generated sequence number.\n"
-            << logofs_flush;
-    #endif
-  }
-  else
-  {
-    if (serverSequence_ > lastSequence_)
-    {
-      #ifdef DEBUG
-      *logofs << "handleNotify: Updating last event's sequence "
-              << lastSequence_ << " to X server's sequence number "
-              << serverSequence_ << " for FD#" << fd_ << ".\n"
-              << logofs_flush;
-      #endif
-
-      lastSequence_ = serverSequence_;
-    }
-    #ifdef DEBUG
-    else if (serverSequence_ < lastSequence_)
-    {
-      //
-      // Use our last auto-generated sequence.
-      //
-
-      *logofs << "handleNotify: Tainting sequence number "
-              << serverSequence_ << " to last event's sequence "
-              << lastSequence_ << " for FD#" << fd_ << ".\n"
-              << logofs_flush;
-    }
-    #endif
-  }
-
-  PutUINT(lastSequence_, event + 2, bigEndian_);
-
-  //
-  // Be sure we set to void the fields that
-  // are not significant for the specific
-  // notification message.
-  //
-
-  PutULONG(nothing, event + 16, bigEndian_);
-  PutULONG(nothing, event + 20, bigEndian_);
-  PutULONG(nothing, event + 24, bigEndian_);
-
-  switch (type)
-  {
-    case notify_no_split:
-    {
-      PutULONG(opcodeStore_ -> noSplitNotify,
-                   event + 12, bigEndian_);
-
-      PutULONG(resource, event + 16, bigEndian_);
-
-      break;
-    }
-    case notify_start_split:
-    {
-      PutULONG(opcodeStore_ -> startSplitNotify,
-                   event + 12, bigEndian_);
-
-      PutULONG(resource, event + 16, bigEndian_);
-
-      break;
-    }
-    case notify_commit_split:
-    {
-      PutULONG(opcodeStore_ -> commitSplitNotify,
-                   event + 12, bigEndian_);
-
-      PutULONG(resource, event + 16, bigEndian_);
-
-      PutULONG(request, event + 20, bigEndian_);
-
-      PutULONG(position, event + 24, bigEndian_);
-
-      break;
-    }
-    case notify_end_split:
-    {
-      PutULONG(opcodeStore_ -> endSplitNotify,
-                   event + 12, bigEndian_);
-
-      PutULONG(resource, event + 16, bigEndian_);
-
-      break;
-    }
-    case notify_empty_split:
-    {
-      PutULONG(opcodeStore_ -> emptySplitNotify,
-                   event + 12, bigEndian_);
-      break;
-    }
-    default:
-    {
-      #ifdef PANIC
-      *logofs << "handleNotify: PANIC! Unrecognized notify "
-              << "TYPE#" << type << ".\n"
-              << logofs_flush;
-      #endif
-
-      return -1;
-    }
-  }
-
-  #if defined(TEST) || defined(INFO) || defined (SPLIT)
-
-  *logofs << "handleNotify: Sending "
-          << (mode ==  sequence_immediate ? "immediate " : "deferred ")
-          << "agent notify event TYPE#" << GetULONG(event + 12, bigEndian_)
-          << logofs_flush;
-
-  if (resource != nothing)
-  {
-    *logofs << " with resource " << GetULONG(event + 16, bigEndian_)
-            << logofs_flush;
-
-    if (request != nothing && position != nothing)
-    {
-      *logofs << " request " << GetULONG(event + 20, bigEndian_)
-              << " position " << GetULONG(event + 24, bigEndian_)
-              << logofs_flush;
-    }
-  }
-
-  *logofs << ".\n" << logofs_flush;
-
-  #endif
-
-  //
-  // Send the notification now.
-  //
-
-  if (handleFlush(flush_if_any) < 0)
-  {
-    return -1;
-  }
-
-  return 1;
-}
-
-int ClientChannel::handleCommitSplitRequest(EncodeBuffer &encodeBuffer, const unsigned char opcode,
-                                                const unsigned char *buffer, const unsigned int size)
-{
-  //
-  // Get the data of the request to be
-  // committed.
-  //
-
-  unsigned char request = *(buffer + 5);
-
-  MessageStore *store = clientStore_ -> getRequestStore(request);
-
-  if (store == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "handleCommitSplitRequest: PANIC! Can't commit split for "
-            << "request OPCODE#" << (unsigned int) request
-            << ". No message store found.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Can't commit split for request "
-         << "OPCODE#" << (unsigned int) request
-         << ". No message store found.\n";
-
-    return -1;
-  }
-
-  //
-  // The position in cache of the message
-  // to commit. Encode it as difference in
-  // respect to the last encoded value.
-  //
-
-  unsigned int position = GetULONG(buffer + 8, bigEndian_);
-
-  unsigned char resource = *(buffer + 1);
-  unsigned int  commit   = *(buffer + 4);
-
-  #if defined(TEST) || defined(SPLIT)
-
-  if (commit == 1)
-  {
-    *logofs << "handleCommitSplitRequest: SPLIT! Committing request "
-            << "OPCODE#" << (unsigned) request << " at position "
-            << position << " for FD#" << fd_ << " with resource "
-            << (unsigned) resource << ".\n" << logofs_flush;
-  }
-  else
-  {
-    *logofs << "handleCommitSplitRequest: SPLIT! Discarding request "
-            << "OPCODE#" << (unsigned) request << " at position "
-            << position << " for FD#" << fd_ << " with resource "
-            << (unsigned) resource << ".\n" << logofs_flush;
-  }
-
-  #endif
-
-  encodeBuffer.encodeOpcodeValue(request, clientCache_ -> opcodeCache);
-
-  int diffCommit = position - splitState_.commit;
-
-  splitState_.commit = position;
-
-  encodeBuffer.encodeValue(diffCommit, 32, 5);
-
-  //
-  // Send the resource id and the commit
-  // flag.
-  //
-
-  encodeBuffer.encodeCachedValue(resource, 8,
-                     clientCache_ -> resourceCache);
-
-  encodeBuffer.encodeBoolValue(commit);
-
-  //
-  // Remove the split from the split queue.
-  //
-
-  Split *split = handleSplitCommitRemove(request, resource, splitState_.commit);
-
-  if (split == NULL)
-  {
-    return -1;
-  }
-
-  clientStore_ -> getCommitStore() -> update(split);
-
-  //
-  // Free the split.
-  //
-
-  #if defined(TEST) || defined(SPLIT)
-  *logofs << "handleCommitSplitRequest: SPLIT! Freeing up the "
-          << "committed split.\n" << logofs_flush;
-  #endif
-
-  delete split;
-
-  return 1;
-}
-
-int ClientChannel::handleAbortSplitRequest(EncodeBuffer &encodeBuffer, const unsigned char opcode,
-                                               const unsigned char *buffer, const unsigned int size)
-{
-  unsigned char resource = *(buffer + 1);
-
-  #if defined(TEST) || defined(SPLIT)
-  *logofs << "handleAbortSplitRequest: SPLIT! Handling abort split "
-          << "request for FD#"<< fd_ << " and resource "
-          << (unsigned int) resource << ".\n"
-          << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeCachedValue(resource, 8,
-                     clientCache_ -> resourceCache);
-
-  SplitStore *splitStore = clientStore_ -> getSplitStore(resource);
-
-  if (splitStore == NULL)
-  {
-    #ifdef WARNING
-    *logofs << "handleAbortSplitRequest: WARNING! SPLIT! The split "
-            << "store [" << (unsigned int) resource << "] "
-            << "is already empty.\n" << logofs_flush;
-    #endif
-
-    return 0;
-  }
-
-  //
-  // Loop through the messages in the split
-  // store and discard from the memory cache
-  // the messages that are still incomplete.
-  // Then remove the message from the split
-  // store.
-  //
-
-  #if defined(TEST) || defined(SPLIT)
-
-  clientStore_ -> dumpSplitStore(resource);
-
-  #endif
-
-  int splits = 0;
-
-  Split *splitMessage;
-
-  for (;;)
-  {
-    splitMessage = splitStore -> getFirstSplit();
-
-    if (splitMessage == NULL)
-    {
-      //
-      // Check if we had created the store
-      // but no message was added yet.
-      //
-
-      #ifdef WARNING
-
-      if (splits == 0)
-      {
-        *logofs << "handleAbortSplitRequest: WARNING! SPLIT! The "
-                << "split store [" << (unsigned int) resource
-                << "] is unexpectedly empty.\n"
-                << logofs_flush;
-      }
-
-      #endif
-
-      break;
-    }
-
-    //
-    // Splits already aborted can't be in the
-    // split store.
-    //
-
-    #if defined(TEST) || defined(SPLIT)
-
-    if (splitMessage -> getState() == split_aborted)
-    {
-      *logofs << "handleAbortSplitRequest: PANIC! SPLIT! Found an "
-              << "aborted split in store [" << (unsigned int) resource
-              << "].\n" << logofs_flush;
-
-      HandleCleanup();
-    }
-
-    #endif
-
-    if (splitMessage -> getAction() == IS_HIT)
-    {
-      #if defined(TEST) || defined(SPLIT)
-      *logofs << "handleAbortSplitRequest: SPLIT! Removing the "
-              << "split from the memory cache.\n"
-              << logofs_flush;
-      #endif
-
-      splitMessage -> getStore() -> remove(splitMessage -> getPosition(),
-                                               use_checksum, discard_data);
-    }
-
-    #if defined(TEST) || defined(SPLIT)
-    *logofs << "handleAbortSplitRequest: SPLIT! Removing the "
-            << "split from the split store.\n"
-            << logofs_flush;
-    #endif
-
-    splitMessage = splitStore -> pop();
-
-    #if defined(TEST) || defined(SPLIT)
-    *logofs << "handleAbortSplitRequest: SPLIT! Freeing up the "
-            << "aborted split.\n" << logofs_flush;
-    #endif
-
-    delete splitMessage;
-
-    splits++;
-  }
-
-  //
-  // If the start-split/end-split sequence
-  // was closed, send the notification now,
-  // else wait for the end-split.
-  //
-
-  if (resource != splitState_.resource)
-  {
-    #if defined(TEST) || defined(SPLIT)
-    *logofs << "handleAbortSplitRequest: SPLIT! Sending the "
-            << "deferred [end split] event.\n"
-           << logofs_flush;
-    #endif
-
-    handleRestart(sequence_deferred, resource);
-  }
-  #if defined(TEST) || defined(SPLIT)
-  else
-  {
-    *logofs << "handleAbortSplitRequest: WARNING! SPLIT! Still "
-            << "waiting for the closure of the split "
-            << "sequence.\n" << logofs_flush;
-  }
-  #endif
-
-  //
-  // Check if there is any other store
-  // having splits to send.
-  //
-
-  handleSplitPending();
-
-  return (splits > 0);
-}
-
-int ClientChannel::handleFinishSplitRequest(EncodeBuffer &encodeBuffer, const unsigned char opcode,
-                                                const unsigned char *buffer, const unsigned int size)
-{
-  unsigned char resource = *(buffer + 1);
-
-  #if defined(TEST) || defined(SPLIT)
-  *logofs << "handleFinishSplitRequest: SPLIT! Handling finish split "
-          << "request for FD#"<< fd_ << " and resource "
-          << (unsigned int) resource << ".\n"
-          << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeCachedValue(resource, 8,
-                     clientCache_ -> resourceCache);
-
-  //
-  // We need to get the protocol statistics
-  // for the finish message we are handling
-  // here because sending a new split will
-  // reset the bits counter.
-  //
-
-  int bits = encodeBuffer.diffBits();
-
-  statistics -> addRequestBits(opcode, size << 3, bits);
-
-  SplitStore *splitStore = clientStore_ -> getSplitStore(resource);
-
-  if (splitStore == NULL)
-  {
-    #ifdef WARNING
-    *logofs << "handleFinishSplitRequest: WARNING! SPLIT! The split "
-            << "store [" << (unsigned int) resource << "] "
-            << "is already empty.\n" << logofs_flush;
-    #endif
-
-    return 0;
-  }
-
-  //
-  // Send all the split queued for the given
-  // resource until the split store becomes
-  // empty.
-  //
-
-  #if defined(TEST) || defined(SPLIT)
-
-  clientStore_ -> dumpSplitStore(resource);
-
-  #endif
-
-  Split *splitMessage;
-
-  int total = MESSAGE_DATA_LIMIT;
-
-  int bytes  = total;
-  int splits = 0;
-
-  for (;;)
-  {
-    splitMessage = splitStore -> getFirstSplit();
-
-    if (splitMessage == NULL)
-    {
-      //
-      // We have presumably created the store
-      // after a start split but no message
-      // was added yet.
-      //
-
-      #ifdef WARNING
-      *logofs << "handleFinishSplitRequest: WARNING! SPLIT! The "
-              << "split store [" << (unsigned int) resource
-              << "] is unexpectedly empty.\n"
-              << logofs_flush;
-      #endif
-
-      break;
-    }
-
-    //
-    // Splits already aborted can't be in the
-    // split store.
-    //
-
-    #if defined(TEST) || defined(SPLIT)
-
-    if (splitMessage -> getState() == split_aborted)
-    {
-      *logofs << "handleFinishSplitRequest: PANIC! SPLIT! Found an "
-              << "aborted split in store [" << (unsigned int) resource
-              << "].\n" << logofs_flush;
-
-      HandleCleanup();
-    }
-
-    *logofs << "handleFinishSplitRequest: SPLIT! Sending more "
-            << "data for store [" << (unsigned int) resource
-            << "].\n" << logofs_flush;
-    #endif
-
-    if (handleSplitSend(encodeBuffer, resource, splits, bytes) < 0)
-    {
-      return -1;
-    }
-
-    //
-    // Check if the split store was deleted.
-    //
-
-    if (clientStore_ -> getSplitStore(resource) == NULL)
-    {
-      #if defined(TEST) || defined(SPLIT)
-      *logofs << "handleFinishSplitRequest: SPLIT! Exiting "
-              << "from the finish loop with split store ["
-              << (unsigned int) resource << "] destroyed.\n"
-              << logofs_flush;
-      #endif
-
-      break;
-    }
-  }
-
-  //
-  // Check if there is any other store
-  // having splits to send.
-  //
-
-  handleSplitPending();
-
-  #if defined(TEST) || defined(SPLIT)
-  *logofs << "handleFinishSplitRequest: SPLIT! Sent " << splits
-          << " splits and " << total - bytes << " bytes for FD#" << fd_
-          << " with " << clientStore_ -> getSplitTotalStorageSize()
-          << " bytes and [" << clientStore_ -> getSplitTotalSize()
-          << "] splits remaining.\n" << logofs_flush;
-  #endif
-
-  return (splits > 0);
-}
-
-int ClientChannel::handleConfiguration()
-{
-  #ifdef TEST
-  *logofs << "ClientChannel: Setting new buffer parameters.\n"
-          << logofs_flush;
-  #endif
-
-  readBuffer_.setSize(control -> ClientInitialReadSize,
-                          control -> ClientMaximumBufferSize);
-
-  writeBuffer_.setSize(control -> TransportXBufferSize,
-                           control -> TransportXBufferThreshold,
-                               control -> TransportMaximumBufferSize);
-
-  transport_ -> setSize(control -> TransportXBufferSize,
-                            control -> TransportXBufferThreshold,
-                                control -> TransportMaximumBufferSize);
-
-  return 1;
-}
-
-int ClientChannel::handleFinish()
-{
-  #ifdef TEST
-  *logofs << "ClientChannel: Finishing channel for FD#"
-          << fd_ << ".\n" << logofs_flush;
-  #endif
-
-  congestion_ = 0;
-  priority_   = 0;
-
-  finish_ = 1;
-
-  taintCounter_ = 0;
-
-  splitState_.resource = nothing;
-  splitState_.pending  = 0;
-  splitState_.commit   = 0;
-  splitState_.mode     = split_none;
-
-  transport_ -> finish();
-
-  return 1;
-}
-
-//
-// If differential compression is disabled then use the
-// most simple encoding but handle the image requests
-// and the X_ListExtensions and X_QueryExtension messa-
-// ges (needed to detect the opcode of the shape or the
-// other extensions) in the usual way.
-//
-
-int ClientChannel::handleFastReadRequest(EncodeBuffer &encodeBuffer, const unsigned char &opcode,
-                                             const unsigned char *&buffer, const unsigned int &size)
-{
-  //
-  // All the NX requests are handled in the
-  // main message loop. The X_PutImage can
-  // be handled here only if the split was
-  // not requested (since ProtoStep7 #issue 108).
-  //
-
-  if ((opcode >= X_NXFirstOpcode && opcode <= X_NXLastOpcode) ||
-           (opcode == X_PutImage && splitState_.resource != nothing) ||
-               opcode == X_ListExtensions ||
-                   opcode == X_QueryExtension)
-  {
-    return 0;
-  }
-
-  #ifdef DEBUG
-  *logofs << "handleFastReadRequest: Encoding raw request OPCODE#"
-          << (unsigned int) opcode << " for FD#" << fd_
-          << " with size " << size << ".\n"
-          << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeMemory(buffer, size);
-
-  //
-  // Put request on the fast track
-  // if it needs a reply.
-  //
-
-  switch (opcode)
-  {
-    case X_GetAtomName:
-    case X_GetGeometry:
-    case X_GetInputFocus:
-    case X_GetModifierMapping:
-    case X_GetKeyboardMapping:
-    case X_GetProperty:
-    case X_GetSelectionOwner:
-    case X_GrabPointer:
-    case X_GrabKeyboard:
-    case X_ListExtensions:
-    case X_ListFonts:
-    case X_LookupColor:
-    case X_AllocNamedColor:
-    case X_QueryPointer:
-    case X_GetWindowAttributes:
-    case X_QueryTree:
-    case X_QueryBestSize:
-    case X_QueryColors:
-    case X_QueryFont:
-    case X_TranslateCoords:
-    case X_GetImage:
-    case X_GetPointerMapping:
-    case X_GetKeyboardControl:
-    case X_InternAtom:
-    case X_AllocColor:
-    {
-      sequenceQueue_.push(clientSequence_, opcode);
-
-      priority_++;
-
-      break;
-    }
-    default:
-    {
-      break;
-    }
-  }
-
-  int bits = encodeBuffer.diffBits();
-
-  #if defined(TEST) || defined(OPCODES)
-
-  *logofs << "handleFastReadRequest: Handled raw request OPCODE#" 
-          << (unsigned int) opcode << " (" << DumpOpcode(opcode) << ")"
-          << " for FD#" << fd_ << " sequence " << clientSequence_
-          << ". " << size << " bytes in, " << bits << " bits ("
-          << ((float) bits) / 8 << " bytes) out.\n" << logofs_flush;
-
-  #endif
-
-  statistics -> addRequestBits(opcode, size << 3, bits);
-
-  if (opcode == opcodeStore_ -> renderExtension)
-  {
-    statistics -> addRenderRequestBits(*(buffer + 1), size << 3, bits);
-  }
-
-  return 1;
-}
-
-int ClientChannel::handleFastWriteReply(DecodeBuffer &decodeBuffer, unsigned char &opcode,
-                                            unsigned char *&buffer, unsigned int &size)
-{
-  if ((opcode >= X_NXFirstOpcode &&
-           opcode <= X_NXLastOpcode) ||
-               opcode == X_ListExtensions ||
-                   opcode == X_QueryExtension)
-  {
-    return 0;
-  }
-
-  #ifdef DEBUG
-  *logofs << "handleFastWriteReply: Decoding raw reply OPCODE#"
-          << (unsigned int) opcode << " for FD#" << fd_
-          << ".\n" << logofs_flush;
-  #endif
-
-  buffer = writeBuffer_.addMessage(8);
-
-  #ifndef __sun
-
-  unsigned int *next = (unsigned int *) decodeBuffer.decodeMemory(8);
-
-  *((unsigned int *) buffer)       = *next++;
-  *((unsigned int *) (buffer + 4)) = *next;
-
-  #else /* #ifndef __sun */
-
-  memcpy(buffer, decodeBuffer.decodeMemory(8), 8);
-
-  #endif /* #ifndef __sun */
-
-  size = 32 + (GetULONG(buffer + 4, bigEndian_) << 2);
-
-  writeBuffer_.registerPointer(&buffer);
-
-  if (writeBuffer_.getAvailable() < size - 8 ||
-          (int) size >= control -> TransportFlushBufferSize)
-  {
-    #ifdef DEBUG
-    *logofs << "handleFastWriteReply: Using scratch buffer for OPCODE#"
-            << (unsigned int) opcode << " with size " << size << " and "
-            << writeBuffer_.getLength() << " bytes in buffer.\n"
-            << logofs_flush;
-    #endif
-
-    writeBuffer_.removeMessage(8);
-
-    buffer = writeBuffer_.addScratchMessage(((unsigned char *)
-                             decodeBuffer.decodeMemory(size - 8)) - 8, size);
-  }
-  else
-  {
-    writeBuffer_.addMessage(size - 8);
-
-    #ifndef __sun
-
-    if (size == 32)
-    {
-      next = (unsigned int *) decodeBuffer.decodeMemory(size - 8);
-
-      for (int i = 8; i < 32; i += sizeof(unsigned int))
-      {
-        *((unsigned int *) (buffer + i)) = *next++;
-      }
-    }
-    else
-    {
-      memcpy(buffer + 8, decodeBuffer.decodeMemory(size - 8), size - 8);
-    }
-
-    #else /* #ifndef __sun */
-
-    memcpy(buffer + 8, decodeBuffer.decodeMemory(size - 8), size - 8);
-
-    #endif /* #ifndef __sun */
-  }
-
-  writeBuffer_.unregisterPointer();
-
-  //
-  // We don't need to write our local sequence
-  // number. Replies are always sent with the
-  // original X server's sequence number.
-  //
-
-  #if defined(TEST) || defined(OPCODES)
-  *logofs << "handleFastWriteReply: Handled raw reply OPCODE#"
-          << (unsigned int) opcode << " for FD#" << fd_ << " with sequence "
-          << serverSequence_ << ". Output size is " << size << ".\n"
-          << logofs_flush;
-  #endif
-
-  #ifdef DEBUG
-  *logofs << "handleFastWriteReply: Length of sequence queue is "
-          << sequenceQueue_.length() << ".\n" << logofs_flush;
-  #endif
-
-  statistics -> addRepliedRequest(opcode);
-
-  handleFlush(flush_if_needed);
-
-  return 1;
-}
-
-int ClientChannel::handleFastWriteEvent(DecodeBuffer &decodeBuffer, unsigned char &opcode,
-                                            unsigned char *&buffer, unsigned int &size)
-{
-  #ifdef DEBUG
-  *logofs << "handleFastWriteEvent: Decoding raw "
-          << (opcode == X_Error ? "error" : "event") << " OPCODE#"
-          << (unsigned int) opcode << " for FD#" << fd_
-          << ".\n" << logofs_flush;
-  #endif
-
-  size = 32;
-
-  buffer = writeBuffer_.addMessage(size);
-
-  #ifndef __sun
-
-  unsigned int *next = (unsigned int *) decodeBuffer.decodeMemory(size);
-
-  for (int i = 0; i < 32; i += sizeof(unsigned int))
-  {
-    *((unsigned int *) (buffer + i)) = *next++;
-  }
-
-  #else /* #ifndef __sun */
-
-  memcpy(buffer, decodeBuffer.decodeMemory(size), size);
-
-  #endif /* #ifndef __sun */
-
-  //
-  // Use our local sequence number.
-  //
-
-  PutUINT(lastSequence_, buffer + 2, bigEndian_);
-
-  #if defined(TEST) || defined(OPCODES)
-  *logofs << "handleFastWriteEvent: Handled raw "
-          << (opcode == X_Error ? "error" : "event") << " OPCODE#"
-          << (unsigned int) opcode << " for FD#" << fd_ << " with sequence "
-          << lastSequence_ << ". Output size is " << size << ".\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // Check if we need to suppress the error.
-  //
-
-  if (opcode == X_Error && handleTaintSyncError(*(buffer + 10)) > 0)
-  {
-    #if defined(TEST) || defined(OPCODES)
-    *logofs << "handleFastWriteEvent: WARNING! Suppressed error OPCODE#"
-            << (unsigned int) opcode << " for FD#" << fd_
-            << " with sequence " << lastSequence_ << ".\n"
-            << logofs_flush;
-    #endif
-
-    writeBuffer_.removeMessage(32);
-  }
-
-  handleFlush(flush_if_needed);
-
-  return 1;
-}
-
-int ClientChannel::handleShmemRequest(EncodeBuffer &encodeBuffer, const unsigned char opcode,
-                                          const unsigned char *buffer, const unsigned int size)
-{
-  //
-  // Will push sequence and set
-  // priority according to stage.
-  //
-
-  unsigned int stage = *(buffer + 1);
-
-  #ifdef TEST
-  *logofs << "handleShmemRequest: Encoding shmem request "
-          << "OPCODE#" << (unsigned int) opcode << " for FD#"
-          << fd_ << " with size " << size << " at stage "
-          << stage << ".\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeValue(stage, 2);
-
-  if (stage == 0)
-  {
-    unsigned int enableClient = 0;
-    unsigned int enableServer = 0;
-
-    if (control -> ShmemClient == 1)
-    {
-      enableClient = *(buffer + 4);
-    }
-
-    if (control -> ShmemServer == 1)
-    {
-      enableServer = *(buffer + 5);
-    }
-
-    encodeBuffer.encodeBoolValue(enableClient);
-    encodeBuffer.encodeBoolValue(enableServer);
-
-    unsigned int clientSegment = GetULONG(buffer + 8,  bigEndian_);
-    unsigned int serverSegment = GetULONG(buffer + 12, bigEndian_);
-
-    encodeBuffer.encodeValue(clientSegment, 29, 9);
-    encodeBuffer.encodeValue(serverSegment, 29, 9);
-
-    #ifdef TEST
-    *logofs << "handleShmemRequest: Enable client is "
-            << enableClient << " enable server is " << enableServer
-            << " client segment is " << (void *) clientSegment
-            << " server segment is " << (void *) serverSegment
-            << ".\n" << logofs_flush;
-    #endif
-
-    #ifdef TEST
-    *logofs << "handleShmemRequest: Size of the shared memory "
-            << "segment will be " << control -> ShmemServerSize
-            << ".\n" << logofs_flush;
-    #endif
-  }
-
-  if (stage != 1)
-  {
-    sequenceQueue_.push(clientSequence_, opcodeStore_ ->
-                            getShmemParameters);
-
-    priority_++;
-  }
-
-  return 1;
-}
-
-int ClientChannel::handleShmemReply(DecodeBuffer &decodeBuffer, unsigned char &opcode,
-                                        unsigned char *&buffer, unsigned int &size)
-{
-  #ifdef TEST
-  *logofs << "handleShmemReply: Received shmem parameters "
-          << "reply OPCODE#" << (unsigned int) opcode
-          << ".\n" << logofs_flush;
-  #endif
-
-  size   = 32;
-  buffer = writeBuffer_.addMessage(size);
-
-  unsigned int stage;
-
-  decodeBuffer.decodeValue(stage, 2);
-
-  *(buffer + 1) = stage;
-
-  if (stage == 2)
-  {
-    unsigned int clientEnabled;
-    unsigned int serverEnabled;
-
-    decodeBuffer.decodeBoolValue(clientEnabled);
-    decodeBuffer.decodeBoolValue(serverEnabled);
-
-    //
-    // Client support is not implemented
-    // and not useful. It is here only
-    // for compatibility.
-    //
-
-    clientEnabled = 0;
-
-    *(buffer + 8) = clientEnabled;
-    *(buffer + 9) = serverEnabled;
-
-    PutULONG(0, buffer + 12, bigEndian_);
-
-    if (serverEnabled == 1)
-    {
-      #ifdef TEST
-      *logofs << "handleShmemReply: Enabled shared memory "
-              << "support in X server with segment size "
-              << control -> ShmemServerSize << ".\n"
-              << logofs_flush;
-      #endif
-
-      PutULONG(control -> ShmemServerSize, buffer + 16, bigEndian_);
-    }
-    else
-    {
-      PutULONG(0, buffer + 16, bigEndian_);
-    }
-  }
-  else
-  {
-    *(buffer + 8) = 0;
-    *(buffer + 9) = 0;
-
-    PutULONG(0, buffer + 12, bigEndian_);
-    PutULONG(0, buffer + 16, bigEndian_);
-  }
-
-  return 1;
-}
-
-int ClientChannel::handleFontRequest(EncodeBuffer &encodeBuffer, const unsigned char opcode,
-                                         const unsigned char *buffer, const unsigned int size)
-{
-  #ifdef TEST
-  *logofs << "handleFontRequest: Encoding font request "
-          << "OPCODE#" << (unsigned int) opcode << " for FD#"
-          << fd_ << " with size " << size << ".\n"
-          << logofs_flush;
-  #endif
-
-  sequenceQueue_.push(clientSequence_, opcodeStore_ ->
-                          getFontParameters);
-
-  return 1;
-}
-
-int ClientChannel::handleFontReply(DecodeBuffer &decodeBuffer, unsigned char &opcode,
-                                       unsigned char *&buffer, unsigned int &size)
-{
-  #ifdef TEST
-  *logofs << "handleFontReply: Received font operation "
-          << "reply OPCODE#" << (unsigned int) opcode
-          << ".\n" << logofs_flush;
-  #endif
-
-  unsigned int length;
-
-  decodeBuffer.decodeValue(length, 8);
-
-  size   = 32 + RoundUp4(length + 1);
-  buffer = writeBuffer_.addMessage(size);
-
-  unsigned char *next = buffer + 32;
-
-  *next++ = length;
-
-  decodeBuffer.decodeTextData(next, length);
-
-  #ifdef TEST
-
-  *logofs << "handleFontReply: Received tunneled font server "
-          << "path '";
-
-  for (unsigned int i = 0; i < length; i++)
-  {
-    *logofs << *(buffer + 32 + 1 + i);
-  }
-
-  *logofs << "' for FD#" << fd_ << ".\n" << logofs_flush;
-
-  #endif
-
-  if (fontPort_ == -1)
-  {
-    //
-    // The local side is not going to forward
-    // the font server connections.
-    //
-
-    #ifdef TEST
-    *logofs << "handleFontReply: WARNING! Returning an empty "
-            << "font server path.\n" << logofs_flush;
-    #endif
-
-    writeBuffer_.removeMessage(size);
-
-    size   = 36;
-    buffer = writeBuffer_.addMessage(size);
-
-    //
-    // Set the length of the returned
-    // path to 0.
-    //
-
-    *(buffer + 32) = 0;
-  }
-  #ifdef TEST
-  else
-  {
-    *logofs << "handleFontReply: Returning the received "
-            << "font server path.\n" << logofs_flush;
-  }
-  #endif
-
-  return 1;
-}
-
-int ClientChannel::handleCacheRequest(EncodeBuffer &encodeBuffer, const unsigned char opcode,
-                                          const unsigned char *buffer, const unsigned int size)
-{
-  #ifdef TEST
-  *logofs << "handleCacheRequest: Handling cache request "
-          << "for FD#" << fd_ << ".\n" << logofs_flush;
-  #endif
-
-  enableCache_ = *(buffer + 4);
-  enableSplit_ = *(buffer + 5);
-  enableSave_  = *(buffer + 6);
-  enableLoad_  = *(buffer + 7);
-
-  #ifdef TEST
-  *logofs << "handleCacheRequest: Set cache parameters to "
-          << " cache " << enableCache_ << " split " << enableSplit_
-          << " save " << enableSave_ << " load " << enableLoad_
-          << ".\n" << logofs_flush;
-  #endif
-
-  //
-  // Encode all the parameters as a
-  // single unsigned int so we can
-  // use an int cache.
-  //
-
-  unsigned int mask = enableSave_ << 8 | enableLoad_;
-
-  encodeBuffer.encodeCachedValue(mask, 32, clientCache_ ->
-                     setCacheParametersCache);
-  return 0;
-}
-
-int ClientChannel::handleStartSplitRequest(EncodeBuffer &encodeBuffer, const unsigned char opcode,
-                                               const unsigned char *buffer, const unsigned int size)
-{
-  #if defined(TEST) || defined(SPLIT)
-  *logofs << "handleStartSplitRequest: SPLIT! Handling start split "
-          << "request for FD#"<< fd_ << ".\n" << logofs_flush;
-  #endif
-
-  if (splitState_.resource != nothing)
-  {
-    #ifdef PANIC
-    *logofs << "handleStartSplitRequest: PANIC! SPLIT! Split requested "
-            << "for resource id " << (unsigned int) *(buffer + 1)
-            << " while handling resource " << splitState_.resource
-            << ".\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Split requested for "
-         << "resource id " << (unsigned int) *(buffer + 1)
-         << " while handling resource " << splitState_.resource
-         << ".\n";
-
-    return -1;
-  }
-  else if (fd_ != firstClient_)
-  {
-    //
-    // It can be that an auxiliary channel is the
-    // first to connect, then comes the agent that
-    // is actually using the NX opcodes.
-    //
-
-    #ifdef WARNING
-    *logofs << "handleStartSplitRequest: WARNING SPLIT! Split requested "
-            << "on FD#" << fd_ << " while expecting FD#" << firstClient_
-            << ".\n" << logofs_flush;
-    #endif
-
-    firstClient_ = fd_;
-  }
-
-  //
-  // Set the agent's resource for which we are
-  // going to split the request.
-  //
-
-  splitState_.resource = *(buffer + 1);
-
-  #if defined(TEST) || defined(SPLIT)
-
-  *logofs << "handleStartSplitRequest: SPLIT! Registered id "
-          << splitState_.resource << " as resource "
-          << "waiting for a split.\n" << logofs_flush;
-
-  if (clientStore_ -> getSplitStore(splitState_.resource) != NULL)
-  {
-    *logofs << "handleStartSplitRequest: WARNING! SPLIT! A split "
-            << "store for resource id " << splitState_.resource
-            << " already exists.\n" << logofs_flush;
-
-    clientStore_ -> dumpSplitStore(splitState_.resource);
-  }
-
-  #endif
-
-  //
-  // Send the selected resource to the remote.
-  //
-
-  // Since ProtoStep7 (#issue 108)
-  encodeBuffer.encodeCachedValue(splitState_.resource, 8,
-                     clientCache_ -> resourceCache);
-
-  splitState_.mode = (T_split_mode) *(buffer + 4);
-
-  if (splitState_.mode != NXSplitModeAsync &&
-          splitState_.mode != NXSplitModeSync)
-  {
-    splitState_.mode = (T_split_mode) control -> SplitMode;
-
-    #if defined(TEST) || defined(SPLIT)
-    *logofs << "handleStartSplitRequest: SPLIT! Set split "
-            << "mode to '" << splitState_.mode << "' with "
-            << "provided value '" << (unsigned) *(buffer + 4)
-            << "'.\n" << logofs_flush;
-    #endif
-  }
-
-  #if defined(TEST) || defined(SPLIT)
-
-  if (splitState_.mode == NXSplitModeAsync)
-  {
-    *logofs << "handleStartSplitRequest: SPLIT! Selected split "
-            << "mode is [split_async].\n" << logofs_flush;
-  }
-  else if (splitState_.mode == NXSplitModeSync)
-  {
-    *logofs << "handleStartSplitRequest: SPLIT! Selected split "
-            << "mode is [split_sync].\n" << logofs_flush;
-  }
-
-  clientStore_ -> dumpSplitStores();
-
-  #endif
-
-  return 1;
-}
-
-int ClientChannel::handleEndSplitRequest(EncodeBuffer &encodeBuffer, const unsigned char opcode,
-                                             const unsigned char *buffer, const unsigned int size)
-{
-  #if defined(TEST) || defined(SPLIT)
-  *logofs << "handleEndSplitRequest: SPLIT! Handling end split "
-          << "request for FD#"<< fd_ << ".\n" << logofs_flush;
-  #endif
-
-  //
-  // Verify that the agent resource matches.
-  //
-
-  if (splitState_.resource == nothing)
-  {
-    #ifdef PANIC
-    *logofs << "handleEndSplitRequest: PANIC! SPLIT! Received an end of "
-            << "split for resource id " << (unsigned int) *(buffer + 1)
-            << " without a previous start.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Received an end of split "
-         << "for resource id " << (unsigned int) *(buffer + 1)
-         << " without a previous start.\n";
-
-    return -1;
-  }
-  else if (splitState_.resource != *(buffer + 1))
-  {
-    #ifdef PANIC
-    *logofs << "handleEndSplitRequest: PANIC! SPLIT! Invalid resource id "
-            << (unsigned int) *(buffer + 1) << " received while "
-            << "waiting for resource id " << splitState_.resource
-            << ".\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Invalid resource id "
-         << (unsigned int) *(buffer + 1) << " received while "
-         << "waiting for resource id " << splitState_.resource
-         << ".\n";
-
-    return -1;
-  }
-
-  //
-  // Send the selected resource to the remote.
-  //
-
-  // Since ProtoStep7 (#issue 108)
-  encodeBuffer.encodeCachedValue(splitState_.resource, 8,
-                     clientCache_ -> resourceCache);
-
-  //
-  // Send the split notification events
-  // to the agent.
-  //
-
-  handleRestart(sequence_immediate, splitState_.resource);
-
-  //
-  // Check if we still have splits to send.
-  //
-
-  handleSplitPending();
-
-  #if defined(TEST) || defined(SPLIT)
-  *logofs << "handleEndSplitRequest: SPLIT! Reset id "
-          << splitState_.resource << " as resource "
-          << "selected for splits.\n" << logofs_flush;
-  #endif
-
-  splitState_.resource = nothing;
-  splitState_.mode     = split_none;
-
-  #if defined(TEST) || defined(SPLIT)
-
-  clientStore_ -> dumpSplitStores();
-
-  #endif
-
-  return 1;
-}
-
-void ClientChannel::handleDecodeCharInfo(DecodeBuffer &decodeBuffer, unsigned char *nextDest)
-{
-  unsigned int value;
-
-  decodeBuffer.decodeCachedValue(value, 32,
-                     *serverCache_ -> queryFontCharInfoCache[0], 6);
-
-  PutUINT(value & 0xffff, nextDest, bigEndian_);
-  PutUINT(value >> 16, nextDest + 10, bigEndian_);
-
-  nextDest += 2;
-
-  for (unsigned int i = 1; i < 5; i++)
-  {
-    unsigned int value;
-
-    decodeBuffer.decodeCachedValue(value, 16,
-                       *serverCache_ -> queryFontCharInfoCache[i], 6);
-
-    PutUINT(value, nextDest, bigEndian_);
-
-    nextDest += 2;
-  }
-}
-
-int ClientChannel::setBigEndian(int flag)
-{
-  bigEndian_ = flag;
-
-  return 1;
-}
-
-int ClientChannel::setReferences()
-{
-  #ifdef TEST
-  *logofs << "ClientChannel: Initializing the static "
-          << "members for the client channels.\n"
-          << logofs_flush;
-  #endif
-
-  #ifdef REFERENCES
-
-  references_ = 0;
-
-  #endif
-
-  return 1;
-}
diff --git a/nxcomp/ClientChannel.h b/nxcomp/ClientChannel.h
deleted file mode 100644
index ae92648d5..000000000
--- a/nxcomp/ClientChannel.h
+++ /dev/null
@@ -1,434 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef ClientChannel_H
-#define ClientChannel_H
-
-#include "List.h"
-#include "Channel.h"
-
-#include "SequenceQueue.h"
-
-#include "ClientReadBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-//
-// If defined, the client channel will
-// have the chance of suppressing more
-// opcodes for test purposes.
-//
-
-#undef  LAME
-
-//
-// Define this to log a line when a
-// channel is created or destroyed.
-//
-
-#undef  REFERENCES
-
-//
-// This class implements the X client
-// side compression of the protocol.
-//
-
-class ClientChannel : public Channel
-{
-  public:
-
-  ClientChannel(Transport *transport, StaticCompressor *compressor);
-
-  virtual ~ClientChannel();
-
-  virtual int handleRead(EncodeBuffer &encodeBuffer, const unsigned char *message,
-                             unsigned int length);
-
-  virtual int handleWrite(const unsigned char *message, unsigned int length);
-
-  virtual int handleSplit(EncodeBuffer &encodeBuffer, MessageStore *store,
-                              T_store_action action, int position, const unsigned char opcode,
-                                  const unsigned char *buffer, const unsigned int size);
-
-  virtual int handleSplit(DecodeBuffer &decodeBuffer, MessageStore *store,
-                              T_store_action action, int position, unsigned char &opcode,
-                                  unsigned char *&buffer, unsigned int &size)
-  {
-    return 0;
-  }
-
-  virtual int handleSplit(EncodeBuffer &encodeBuffer);
-
-  virtual int handleSplit(DecodeBuffer &decodeBuffer)
-  {
-    return 0;
-  }
-
-  virtual int handleSplitEvent(EncodeBuffer &encodeBuffer, Split *split);
-
-  virtual int handleSplitEvent(DecodeBuffer &decodeBuffer);
-
-  virtual int handleMotion(EncodeBuffer &encodeBuffer)
-  {
-    return 0;
-  }
-
-  virtual int handleCompletion(EncodeBuffer &encodeBuffer)
-  {
-    return 0;
-  }
-
-  virtual int handleConfiguration();
-
-  virtual int handleFinish();
-
-  virtual int handleAsyncEvents()
-  {
-    return 0;
-  }
-
-  virtual int needSplit() const
-  {
-    #if defined(TEST) || defined(SPLIT)
-    *logofs << "needSplit: SPLIT! Returning pending split "
-            << "flag " << splitState_.pending << " with "
-            << clientStore_ -> getSplitTotalSize()
-            << " splits in the split stores.\n"
-            << logofs_flush;
-    #endif
-
-    return splitState_.pending;
-  }
-
-  virtual int needMotion() const
-  {
-    return 0;
-  }
-
-  virtual T_channel_type getType() const
-  {
-    return channel_x11;
-  }
-
-  int setBigEndian(int flag);
-
-  //
-  // Initialize the static members.
-  //
-
-  static int setReferences();
-
-  private:
-
-  int handleFastReadRequest(EncodeBuffer &encodeBuffer, const unsigned char &opcode,
-                                const unsigned char *&buffer, const unsigned int &size);
-
-  int handleFastWriteReply(DecodeBuffer &decodeBuffer, unsigned char &opcode,
-                               unsigned char *&buffer, unsigned int &size);
-
-  int handleFastWriteEvent(DecodeBuffer &decodeBuffer, unsigned char &opcode,
-                               unsigned char *&buffer, unsigned int &size);
-
-  //
-  // Intercept the request before the opcode
-  // is encoded.
-  //
-
-  int handleTaintRequest(unsigned char &opcode, const unsigned char *&buffer,
-                             unsigned int &size)
-  {
-    if (control -> TaintReplies > 0 &&
-            opcode == X_GetInputFocus)
-    {
-      return handleTaintSyncRequest(opcode, buffer, size);
-    }
-
-    #ifdef LAME
-
-    return handleTaintLameRequest(opcode, buffer, size);
-
-    #endif
-
-    return 0;
-  }
-
-  int handleTaintLameRequest(unsigned char &opcode, const unsigned char *&buffer,
-                                 unsigned int &size);
-
-  int handleTaintSyncRequest(unsigned char &opcode, const unsigned char *&buffer,
-                                 unsigned int &size);
-
-  int handleTaintSyncError(unsigned char opcode);
-
-  //
-  // How to handle sequence counter
-  // in notification event.
-  //
-
-  enum T_sequence_mode
-  {
-    sequence_immediate,
-    sequence_deferred
-  };
-
-  //
-  // Send split notifications to the
-  // agent.
-  //
-
-  int handleRestart(T_sequence_mode mode, int resource);
-
-  int handleNotify(T_notification_type type, T_sequence_mode mode,
-                       int resource, int request, int position);
-
-  //
-  // Other utility functions used in
-  // handling of the image streaming.
-  //
-
-  int mustSplitMessage(int resource)
-  {
-    return (clientStore_ -> getSplitStore(resource) ->
-                getSize() != 0);
-  }
-
-  int canSplitMessage(T_split_mode mode, unsigned int size)
-  {
-    return ((int) size >= control -> SplitDataThreshold &&
-                (clientStore_ -> getSplitTotalStorageSize() < control ->
-                     SplitTotalStorageSize && clientStore_ ->
-                         getSplitTotalSize() < control -> SplitTotalSize));
-  }
-
-  int canSendSplit(Split *split)
-  {
-    return (split -> getMode() != split_sync ||
-                split -> getState() == split_missed ||
-                    split -> getState() == split_loaded);
-  }
-
-  int handleSplitSend(EncodeBuffer &encodeBuffer, int resource,
-                          int &total, int &bytes);
-
-  Split *handleSplitFind(T_checksum checksum, int resource);
-
-  int handleSplitChecksum(EncodeBuffer &encodeBuffer, T_checksum checksum);
-
-  void handleSplitPending(int resource)
-  {
-    if (splitState_.pending == 0)
-    {
-      if (clientStore_ -> getSplitStore(resource) != NULL &&
-              clientStore_ -> getSplitStore(resource) ->
-                  getFirstSplit() != NULL)
-      {
-        splitState_.pending = canSendSplit(clientStore_ ->
-            getSplitStore(resource) -> getFirstSplit());
-
-        #if defined(TEST) || defined(SPLIT)
-        *logofs << "handleSplitPending: SPLIT! Set the pending "
-                << "split flag to " << splitState_.pending
-                << " with " << clientStore_ -> getSplitTotalSize()
-                << " splits in the split stores.\n"
-                << logofs_flush;
-        #endif
-      }
-    }
-  }
-
-  //
-  // Scan all the split stores to find
-  // if there is any split to send.
-  //
-
-  void handleSplitPending();
-
-  //
-  // Handle the MIT-SHM initialization
-  // messages exchanged with the remote
-  // proxy.
-  //
-
-  int handleShmemRequest(EncodeBuffer &encodeBuffer, const unsigned char opcode,
-                             const unsigned char *buffer, const unsigned int size);
-
-  int handleShmemReply(DecodeBuffer &decodeBuffer, unsigned char &opcode,
-                           unsigned char *&buffer, unsigned int &size);
-
-  //
-  // Query the port used to tunnel
-  // the font server connections.
-  //
-
-  int handleFontRequest(EncodeBuffer &encodeBuffer, const unsigned char opcode,
-                            const unsigned char *buffer, const unsigned int size);
-
-  int handleFontReply(DecodeBuffer &decodeBuffer, unsigned char &opcode,
-                          unsigned char *&buffer, unsigned int &size);
-
-  //
-  // Let the agent set the cache
-  // policy for image requests.
-  //
-
-  int handleCacheRequest(EncodeBuffer &encodeBuffer, const unsigned char opcode,
-                             const unsigned char *buffer, const unsigned int size);
-
-  //
-  // Encode the start and end split
-  // requests.
-  //
-
-  int handleStartSplitRequest(EncodeBuffer &encodeBuffer, const unsigned char opcode,
-                                  const unsigned char *buffer, const unsigned int size);
-
-  int handleEndSplitRequest(EncodeBuffer &encodeBuffer, const unsigned char opcode,
-                                const unsigned char *buffer, const unsigned int size);
-
-  //
-  // Empty a split store and send the
-  // restart event.
-  //
-
-  int handleAbortSplitRequest(EncodeBuffer &encodeBuffer, const unsigned char opcode,
-                                  const unsigned char *buffer, const unsigned int size);
-
-  //
-  // Force the proxy to finalize all
-  // the pending split operations and
-  // restart a resource.
-  //
-  
-  int handleFinishSplitRequest(EncodeBuffer &encodeBuffer, const unsigned char opcode,
-                                   const unsigned char *buffer, const unsigned int size);
-
-  //
-  // Tell the remote peer to send the
-  // split requests to the X server.
-  //
-
-  int handleCommitSplitRequest(EncodeBuffer &encodeBuffer, const unsigned char opcode,
-                                   const unsigned char *buffer, const unsigned int size);
-
-  //
-  // Other utilities.
-  //
-
-  void handleDecodeCharInfo(DecodeBuffer &, unsigned char *);
-
-  //
-  // Own read buffer. It is able to identify
-  // full messages read from the X descriptor.
-  //
-
-  ClientReadBuffer readBuffer_;
-
-  //
-  // Sequence number of last request coming
-  // from the X client or the X server.
-  //
-
-  unsigned int clientSequence_;
-  unsigned int serverSequence_;
-
-  //
-  // Last sequence number known by client. It can
-  // be the real sequence generated by server or
-  // the one of the last auto-generated event.
-  //
-
-  unsigned int lastSequence_;
-
-  //
-  // Used to identify replies based on sequence
-  // number of original request.
-  //
-
-  SequenceQueue sequenceQueue_;
-
-  //
-  // This is used to test the synchronous flush
-  // in the proxy.
-  //
-
-  int lastRequest_;
-
-  //
-  // Current resource id selected as target and
-  // other information related to the image split.
-  // The pending and abort flags are set when we
-  // want the proxy to give us a chance to send
-  // more split data. We also save the position
-  // of the last commit operation performed by
-  // channel so we can differentially encode the
-  // position of next message to commit.
-  //
-
-  typedef struct
-  {
-    int resource;
-    int pending;
-    int commit;
-    T_split_mode mode;
-
-  } T_split_state;
-
-  T_split_state splitState_;
-
-  //
-  // List of agent resources.
-  //
-
-  List splitResources_;
-
-  //
-  // How many sync requests we
-  // have tainted so far.
-  //
-
-  int taintCounter_;
-
-  private:
-
-  //
-  // Keep track of object 
-  // creation and deletion.
-  //
-
-  #ifdef REFERENCES
-
-  static int references_;
-
-  #endif
-};
-
-#endif /* ClientChannel_H */
diff --git a/nxcomp/ClientProxy.cpp b/nxcomp/ClientProxy.cpp
deleted file mode 100644
index 3df45331a..000000000
--- a/nxcomp/ClientProxy.cpp
+++ /dev/null
@@ -1,549 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "Socket.h"
-#include "Agent.h"
-
-#include "ClientProxy.h"
-
-#include "ClientChannel.h"
-#include "GenericChannel.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-//
-// Log the operations related to sending
-// and receiving the control tokens.
-//
-
-#undef  TOKEN
-
-ClientProxy::ClientProxy(int proxyFd) : Proxy(proxyFd)
-{
-  fontServerPort_ = NULL;
-
-  #ifdef DEBUG
-  *logofs << "ClientProxy: Created new object at " << this
-          << ".\n" << logofs_flush;
-  #endif
-}
-
-ClientProxy::~ClientProxy()
-{
-  delete [] fontServerPort_;
-
-  #ifdef DEBUG
-  *logofs << "ClientProxy: Deleted object at " << this
-          << ".\n" << logofs_flush;
-  #endif
-}
-
-void ClientProxy::handleDisplayConfiguration(const char *xServerDisplay, int xServerAddrFamily,
-                                                 sockaddr * xServerAddr, unsigned int xServerAddrLength)
-{
-  #ifdef DEBUG
-  *logofs << "ClientProxy: No display configuration to set.\n"
-          << logofs_flush;
-  #endif
-}
-
-void ClientProxy::handlePortConfiguration(ChannelEndPoint &cupsServerPort,
-                                          ChannelEndPoint &smbServerPort,
-                                          ChannelEndPoint &mediaServerPort,
-                                          ChannelEndPoint &httpServerPort,
-                                          const char *fontServerPort)
-{
-  delete [] fontServerPort_;
-
-  fontServerPort_ = new char[strlen(fontServerPort) + 1];
-
-  strcpy(fontServerPort_, fontServerPort);
-
-  #ifdef DEBUG
-  *logofs << "ClientProxy: Set port configuration to font '"
-          << fontServerPort_ << "'.\n"
-          << logofs_flush;
-  #endif
-}
-
-int ClientProxy::handleNewConnection(T_channel_type type, int clientFd)
-{
-  switch (type)
-  {
-    case channel_x11:
-    {
-      return handleNewXConnection(clientFd);
-    }
-    case channel_cups:
-    {
-      return handleNewGenericConnection(clientFd, channel_cups, "CUPS");
-    }
-    case channel_smb:
-    {
-      return handleNewGenericConnection(clientFd, channel_smb, "SMB");
-    }
-    case channel_media:
-    {
-      return handleNewGenericConnection(clientFd, channel_media, "media");
-    }
-    case channel_http:
-    {
-      return handleNewGenericConnection(clientFd, channel_http, "HTTP");
-    }
-    case channel_slave:
-    {
-      return handleNewSlaveConnection(clientFd);
-    }
-    default:
-    {
-      #ifdef PANIC
-      *logofs << "ClientProxy: PANIC! Unsupported channel with type '"
-              << getTypeName(type) << "'.\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Unsupported channel with type '"
-           << getTypeName(type) << "'.\n";
-
-      return -1;
-    }
-  }
-}
-
-int ClientProxy::handleNewConnectionFromProxy(T_channel_type type, int channelId)
-{
-  switch (type)
-  {
-    case channel_font:
-    {
-      int port = atoi(fontServerPort_);
-
-      if (port > 0)
-      {
-        //
-        // Connect on the TCP port number.
-        //
-
-        return handleNewGenericConnectionFromProxyTCP(channelId, channel_font, "localhost",
-                                                      port, "font");
-      }
-      else
-      {
-        //
-        // Connect to the Unix path.
-        //
-
-        return handleNewGenericConnectionFromProxyUnix(channelId, channel_font,
-                                                       fontServerPort_, "font");
-      }
-    }
-    case channel_slave:
-    {
-      return handleNewSlaveConnectionFromProxy(channelId);
-    }
-    default:
-    {
-      #ifdef PANIC
-      *logofs << "ClientProxy: PANIC! Unsupported channel with type '"
-              << getTypeName(type) << "'.\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Unsupported channel with type '"
-           << getTypeName(type) << "'.\n";
-
-      return -1;
-    }
-  }
-}
-
-int ClientProxy::handleNewAgentConnection(Agent *agent)
-{
-  int clientFd = agent -> getLocalFd();
-
-  int channelId = allocateChannelMap(clientFd);
-
-  if (channelId == -1)
-  {
-    #ifdef PANIC
-    *logofs << "ClientProxy: PANIC! Maximum number of available "
-            << "channels exceeded.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Maximum number of available "
-         << "channels exceeded.\n";
-
-    return -1;
-  }
-
-  transports_[channelId] = agent -> getTransport();
-
-  agent_ = channelId;
-
-  return handleNewXConnection(clientFd);
-}
-
-int ClientProxy::handleNewXConnection(int clientFd)
-{
-  int channelId = getChannel(clientFd);
-
-  //
-  // Check if the channel has been
-  // already mapped.
-  //
-
-  if (channelId == -1)
-  {
-    channelId = allocateChannelMap(clientFd);
-
-    if (channelId == -1)
-    {
-      #ifdef PANIC
-      *logofs << "ClientProxy: PANIC! Maximum number of available "
-              << "channels exceeded.\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Maximum number of available "
-           << "channels exceeded.\n";
-
-      return -1;
-    }
-  }
-
-  #ifdef TEST
-  *logofs << "ClientProxy: X client descriptor FD#" << clientFd
-          << " mapped to channel ID#" << channelId << ".\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // Turn queuing off for path proxy-to-X-client.
-  //
-
-  if (control -> OptionClientNoDelay == 1)
-  {
-    SetNoDelay(clientFd, control -> OptionClientNoDelay);
-  }
-
-  //
-  // If requested, set the size of the TCP send
-  // and receive buffers.
-  //
-
-  if (control -> OptionClientSendBuffer != -1)
-  {
-    SetSendBuffer(clientFd, control -> OptionClientSendBuffer);
-  }
-
-  if (control -> OptionClientReceiveBuffer != -1)
-  {
-    SetReceiveBuffer(clientFd, control -> OptionClientReceiveBuffer);
-  }
-
-  if (allocateTransport(clientFd, channelId) < 0)
-  {
-    return -1;
-  }
-
-  //
-  // Starting from protocol level 3 client and server
-  // caches are created in proxy and shared between all
-  // channels. If remote proxy has older protocol level
-  // pointers are NULL and channels must create their
-  // own instances.
-  //
-
-  channels_[channelId] = new ClientChannel(transports_[channelId], compressor_);
-
-  if (channels_[channelId] == NULL)
-  {
-    deallocateTransport(channelId);
-
-    return -1;
-  }
-
-  increaseChannels(channelId);
-
-  //
-  // Propagate channel stores and caches to the new
-  // channel.
-  //
-
-  channels_[channelId] -> setOpcodes(opcodeStore_);
-
-  channels_[channelId] -> setStores(clientStore_, serverStore_);
-
-  channels_[channelId] -> setCaches(clientCache_, serverCache_);
-
-  int port = atoi(fontServerPort_);
-
-  if (port > 0 || *fontServerPort_ != '\0')
-  {
-    channels_[channelId] -> setPorts(1);
-  }
-
-  if (handleControl(code_new_x_connection, channelId) < 0)
-  {
-    return -1;
-  }
-
-  //
-  // Let channel configure itself according
-  // to control parameters.
-  //
-
-  channels_[channelId] -> handleConfiguration();
-
-  return 1;
-}
-
-int ClientProxy::handleNewXConnectionFromProxy(int channelId)
-{
-  #ifdef PANIC
-  *logofs << "ClientProxy: PANIC! Can't create a new X channel "
-          << "with ID#" << channelId << " at this side.\n"
-          << logofs_flush;
-  #endif
-
-  cerr << "Error" << ": Can't create a new X channel "
-       << "with ID#" << channelId << " at this side.\n";
-
-  return -1;
-}
-
-int ClientProxy::handleLoad(T_load_type type)
-{
-  int channelCount = getChannels(channel_x11);
-
-  if ((channelCount == 0 && type == load_if_first) ||
-          (channelCount > 0 && type == load_if_any))
-  {
-    #ifdef TEST
-    *logofs << "ClientProxy: Going to load content of client store.\n"
-            << logofs_flush;
-    #endif
-
-    int result = handleLoadStores();
-
-    if (result == 1)
-    {
-      if (handleControl(code_load_request) < 0)
-      {
-        return -1;
-      }
- 
-      priority_ = 1;
-    }
-    else if (result < 0)
-    {
-      #ifdef WARNING
-      *logofs << "ClientProxy: WARNING! Failed to load content "
-              << "of persistent cache.\n" << logofs_flush;
-      #endif
-
-      //
-      // Don't abort the proxy connection in the case
-      // of a corrupted cache. By not sending the load
-      // message to the remote peer, both sides will
-      // start encoding messages using empty stores.
-      // This behaviour is compatible with old proxy
-      // versions.
-      //
-
-      if (channelCount == 0 && type == load_if_first)
-      {
-        if (handleResetStores() < 0)
-        {
-          #ifdef PANIC
-          *logofs << "ClientProxy: PANIC! Failed to reset message stores.\n"
-                  << logofs_flush;
-          #endif
-
-          return -1;
-        }
-      }
-      else
-      {
-        return -1;
-      }
-    }
-  }
-  else
-  {
-    #ifdef PANIC
-    *logofs << "ClientProxy: PANIC! Can't load the stores with "
-            << channelCount << " remaining channels.\n"
-            << logofs_flush;
-    #endif
-
-    return -1;
-  }
-
-  return 1;
-}
-
-int ClientProxy::handleSave()
-{
-  //
-  // If no more X channels are remaining
-  // then save content of message stores.
-  //
-
-  int channelCount = getChannels(channel_x11);
-
-  if (channelCount == 0)
-  {
-    int result = handleSaveStores();
-
-    if (result == 1)
-    {
-      if (handleControl(code_save_request) < 0)
-      {
-        return -1;
-      }
-
-      priority_ = 1;
-
-      return 1;
-    }
-    else if (result < 0)
-    {
-      #ifdef PANIC
-      *logofs << "ClientProxy: PANIC! Failed to save stores "
-              << "to persistent cache.\n" << logofs_flush;
-      #endif
-
-      return -1;
-    }
-  }
-  else
-  {
-    #ifdef PANIC
-    *logofs << "ClientProxy: PANIC! Can't save the stores with "
-            << channelCount << " remaining channels.\n"
-            << logofs_flush;
-    #endif
-
-    return -1;
-  }
-
-  return 1;
-}
-
-int ClientProxy::handleAsyncEvents()
-{
-  if (canRead() == 1)
-  {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Proxy: WARNING! Reading while writing "
-            << "with data available on the proxy link.\n"
-            << logofs_flush;
-    #endif
-
-    if (handleRead() < 0)
-    {
-      return -1;
-    }
-
-    return 1;
-  }
-
-  return 0;
-}
-
-int ClientProxy::handleLoadFromProxy()
-{
-  #ifdef PANIC
-  *logofs << "ClientProxy: PANIC! Invalid load control message "
-          << "received in proxy.\n" << logofs_flush;
-  #endif
-
-  cerr << "Error" << ": Invalid load control message "
-       << "received in proxy.\n";
-
-  return -1;
-}
-
-int ClientProxy::handleSaveFromProxy()
-{
-  #ifdef PANIC
-  *logofs << "ClientProxy: PANIC! Invalid save control message "
-          << "received in proxy.\n" << logofs_flush;
-  #endif
-
-  cerr << "Error" << ": Invalid save control message "
-       << "received in proxy.\n";
-
-  return -1;
-}
-
-int ClientProxy::handleSaveAllStores(ostream *cachefs, md5_state_t *md5StateStream,
-                                         md5_state_t *md5StateClient) const
-{
-  if (clientStore_ -> saveRequestStores(cachefs, md5StateStream, md5StateClient,
-                                            use_checksum, discard_data) < 0)
-  {
-    return -1;
-  }
-  else if (serverStore_ -> saveReplyStores(cachefs, md5StateStream, md5StateClient,
-                                               discard_checksum, use_data) < 0)
-  {
-    return -1;
-  }
-  else if (serverStore_ -> saveEventStores(cachefs, md5StateStream, md5StateClient,
-                                               discard_checksum, use_data) < 0)
-  {
-    return -1;
-  }
-
-  return 1;
-}
-
-int ClientProxy::handleLoadAllStores(istream *cachefs, md5_state_t *md5StateStream) const
-{
-  if (clientStore_ -> loadRequestStores(cachefs, md5StateStream,
-                                            use_checksum, discard_data) < 0)
-  {
-    return -1;
-  }
-  else if (serverStore_ -> loadReplyStores(cachefs, md5StateStream,
-                                               discard_checksum, use_data) < 0)
-  {
-    return -1;
-  }
-  else if (serverStore_ -> loadEventStores(cachefs, md5StateStream,
-                                               discard_checksum, use_data) < 0)
-  {
-    return -1;
-  }
-
-  return 1;
-}
-
diff --git a/nxcomp/ClientProxy.h b/nxcomp/ClientProxy.h
deleted file mode 100644
index b89785b1a..000000000
--- a/nxcomp/ClientProxy.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef ClientProxy_H
-#define ClientProxy_H
-
-#include "Proxy.h"
-
-//
-// Set the verbosity level.
-//
-
-#undef  TEST
-#undef  DEBUG
-
-class ClientProxy : public Proxy
-{
-  public:
-
-  ClientProxy(int proxyFD);
-
-  virtual ~ClientProxy();
-
-  virtual void handleDisplayConfiguration(const char *xServerDisplay, int xServerAddrFamily,
-                                              sockaddr *xServerAddr, unsigned int xServerAddrLength);
-
-  virtual void handlePortConfiguration(ChannelEndPoint &cupsServerPort,
-                                       ChannelEndPoint &smbServerPort,
-                                       ChannelEndPoint &mediaServerPort,
-                                       ChannelEndPoint &httpServerPort,
-                                       const char *fontServerPort);
-
-  protected:
-
-  //
-  // Create a new channel.
-  //
-
-  virtual int handleNewConnection(T_channel_type type, int clientFd);
-
-  virtual int handleNewConnectionFromProxy(T_channel_type type, int channelId);
-
-  virtual int handleNewAgentConnection(Agent *agent);
-
-  virtual int handleNewXConnection(int clientFd);
-
-  virtual int handleNewXConnectionFromProxy(int channelId);
-
-  //
-  // Implement persistence according
-  // to our proxy mode.
-  //
-
-  virtual int handleLoad(T_load_type type);
-  virtual int handleSave();
-
-  virtual int handleAsyncEvents();
-
-  virtual int handleLoadFromProxy();
-  virtual int handleSaveFromProxy();
-
-  virtual int handleSaveAllStores(ostream *cachefs, md5_state_t *md5StateStream,
-                                      md5_state_t *md5StateClient) const;
-
-  virtual int handleLoadAllStores(istream *cachefs, md5_state_t *md5StateStream) const;
-
-  //
-  // Utility function used to realize
-  // a new connection.
-  //
-
-  protected:
-
-  virtual int checkLocalChannelMap(int channelId)
-  {
-    // Since ProtoStep7 (#issue 108)
-    return ((channelId & control -> ChannelMask) != 0);
-  }
-
-  //
-  // Ports where to forward extended services'
-  // TCP connections.
-  //
-
-  private:
-
-  char *fontServerPort_;
-};
-
-
-#endif /* ClientProxy_H */
diff --git a/nxcomp/ClientReadBuffer.cpp b/nxcomp/ClientReadBuffer.cpp
deleted file mode 100644
index 37502038f..000000000
--- a/nxcomp/ClientReadBuffer.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "ClientReadBuffer.h"
-
-#include "ClientChannel.h"
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-unsigned int ClientReadBuffer::suggestedLength(unsigned int pendingLength)
-{
-  //
-  // Even if the pending data is not
-  // enough to make a complete message,
-  // resize the buffer to accommodate
-  // it all.
-  //
-
-  unsigned int readLength = pendingLength;
-
-  if (pendingLength < remaining_)
-  {
-    readLength = remaining_;
-  }
-
-  return readLength;
-}  
-
-int ClientReadBuffer::locateMessage(const unsigned char *start,
-                                        const unsigned char *end,
-                                            unsigned int &controlLength,
-                                                unsigned int &dataLength,
-                                                    unsigned int &trailerLength)
-{
-  unsigned int size = end - start;
-
-  #ifdef TEST
-  *logofs << "ClientReadBuffer: Locating message for FD#"
-          << transport_ -> fd() << " with " << size
-          << " bytes.\n" << logofs_flush;
-  #endif
-
-  if (firstMessage_)
-  {
-    if (size < 12)
-    {
-      remaining_ = 12 - size;
-
-      #ifdef TEST
-      *logofs << "ClientReadBuffer: No message was located "
-              << "with remaining " << remaining_ << ".\n"
-              << logofs_flush;
-      #endif
-
-      return 0;
-    }
-
-    if (*start == 0x42)
-    {
-      bigEndian_ = 1;
-    }
-    else
-    {
-      bigEndian_ = 0;
-    }
-
-    channel_ -> setBigEndian(bigEndian_);
-
-    dataLength = 12 + RoundUp4(GetUINT(start + 6, bigEndian_)) +
-                          RoundUp4(GetUINT(start + 8, bigEndian_));
-
-    //
-    // Send the data immediately if this is unlikely
-    // to be a X connection attempt.
-    //
-
-    if (dataLength > 4096)
-    {
-      #ifdef WARNING
-      *logofs << "ClientReadBuffer: WARNING! Flushing suspicious X "
-              << "connection with first request of " << dataLength
-              << " bytes.\n" << logofs_flush;
-      #endif
-
-      dataLength = size;
-    }
-  }
-  else
-  {
-    if (size < 4)
-    {
-      remaining_ = 4 - size;
-
-      #ifdef TEST
-      *logofs << "ClientReadBuffer: No message was located "
-              << "with remaining " << remaining_ << ".\n"
-              << logofs_flush;
-      #endif
-
-      return 0;
-    }
-
-    dataLength = (GetUINT(start + 2, bigEndian_) << 2);
-
-    if (dataLength < 4)
-    {
-      #ifdef TEST
-      *logofs << "ClientReadBuffer: WARNING! Assuming length 4 "
-              << "for suspicious message of length " << dataLength
-              << ".\n" << logofs_flush;
-      #endif
-
-      dataLength = 4;
-    }
-  }
-
-  #ifdef TEST
-  *logofs << "ClientReadBuffer: Length of the next message is "
-          << dataLength << ".\n" << logofs_flush;
-  #endif
-
-  if (size < dataLength)
-  {
-    remaining_ = dataLength - size;
-
-    #ifdef TEST
-    *logofs << "ClientReadBuffer: No message was located "
-            << "with remaining " << remaining_ << ".\n"
-            << logofs_flush;
-    #endif
-
-    return 0;
-  }
-
-  firstMessage_ = 0;
-
-  controlLength = 0;
-  trailerLength = 0;
-
-  remaining_ = 0;
-
-  #ifdef TEST
-  *logofs << "ClientReadBuffer: Located message with "
-          << "remaining " << remaining_ << ".\n"
-          << logofs_flush;
-  #endif
-
-  return 1;
-}
diff --git a/nxcomp/ClientReadBuffer.h b/nxcomp/ClientReadBuffer.h
deleted file mode 100644
index c557417fa..000000000
--- a/nxcomp/ClientReadBuffer.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef ClientReadBuffer_H
-#define ClientReadBuffer_H
-
-#include "Control.h"
-#include "ReadBuffer.h"
-
-class ClientChannel;
-
-class ClientReadBuffer : public ReadBuffer
-{
-  public:
-
-  ClientReadBuffer(Transport *transport, ClientChannel *channel)
-
-    : ReadBuffer(transport), firstMessage_(1), channel_(channel)
-  {
-  }
-
-  virtual ~ClientReadBuffer()
-  {
-  }
-
-  protected:
-
-  virtual unsigned int suggestedLength(unsigned int pendingLength);
-
-  virtual int locateMessage(const unsigned char *start,
-                                const unsigned char *end,
-                                    unsigned int &controlLength,
-                                        unsigned int &dataLength,
-                                            unsigned int &trailerLength);
-
-  int bigEndian_;
-
-  int firstMessage_;
-
-  ClientChannel *channel_;
-};
-
-#endif /* ClientReadBuffer_H */
diff --git a/nxcomp/ClientStore.cpp b/nxcomp/ClientStore.cpp
deleted file mode 100644
index e1ba3f4a7..000000000
--- a/nxcomp/ClientStore.cpp
+++ /dev/null
@@ -1,222 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "ClientStore.h"
-
-//
-// Cached request classes.
-//
-
-#include "ChangeProperty.h"
-#include "SendEvent.h"
-#include "CreateGC.h"
-#include "ChangeGC.h"
-#include "CreatePixmap.h"
-#include "SetClipRectangles.h"
-#include "CopyArea.h"
-#include "PolyLine.h"
-#include "PolySegment.h"
-#include "PolyFillRectangle.h"
-#include "PutImage.h"
-#include "TranslateCoords.h"
-#include "GetImage.h"
-#include "ClearArea.h"
-#include "ConfigureWindow.h"
-#include "ShapeExtension.h"
-#include "RenderExtension.h"
-#include "PolyText8.h"
-#include "PolyText16.h"
-#include "ImageText8.h"
-#include "ImageText16.h"
-#include "PolyPoint.h"
-#include "PolyFillArc.h"
-#include "PolyArc.h"
-#include "FillPoly.h"
-#include "InternAtom.h"
-#include "GetProperty.h"
-#include "SetUnpackGeometry.h"
-#include "SetUnpackColormap.h"
-#include "SetUnpackAlpha.h"
-#include "PutPackedImage.h"
-#include "GenericRequest.h"
-
-//
-// Set the verbosity level.
-//
-
-#define WARNING
-#define PANIC
-#undef  TEST
-
-ClientStore::ClientStore(StaticCompressor *compressor)
-
-  : compressor_(compressor)
-{
-  if (logofs == NULL)
-  {
-    logofs = &cout;
-  }
-
-  for (int i = 0; i < CHANNEL_STORE_OPCODE_LIMIT; i++)
-  {
-    requests_[i] = NULL;
-  }
-
-  requests_[X_ChangeProperty]    = new ChangePropertyStore();
-  requests_[X_SendEvent]         = new SendEventStore();
-  requests_[X_CreateGC]          = new CreateGCStore();
-  requests_[X_SetClipRectangles] = new SetClipRectanglesStore();
-  requests_[X_CopyArea]          = new CopyAreaStore();
-  requests_[X_PolyLine]          = new PolyLineStore();
-  requests_[X_PolySegment]       = new PolySegmentStore();
-  requests_[X_PolyFillRectangle] = new PolyFillRectangleStore();
-  requests_[X_PutImage]          = new PutImageStore(compressor);
-  requests_[X_TranslateCoords]   = new TranslateCoordsStore();
-  requests_[X_GetImage]          = new GetImageStore();
-  requests_[X_ClearArea]         = new ClearAreaStore();
-  requests_[X_ConfigureWindow]   = new ConfigureWindowStore();
-  requests_[X_PolyText8]         = new PolyText8Store();
-  requests_[X_PolyText16]        = new PolyText16Store();
-  requests_[X_ImageText8]        = new ImageText8Store();
-  requests_[X_ImageText16]       = new ImageText16Store();
-  requests_[X_PolyPoint]         = new PolyPointStore();
-  requests_[X_PolyFillArc]       = new PolyFillArcStore();
-  requests_[X_PolyArc]           = new PolyArcStore();
-  requests_[X_FillPoly]          = new FillPolyStore();
-  requests_[X_InternAtom]        = new InternAtomStore();
-  requests_[X_GetProperty]       = new GetPropertyStore();
-
-  requests_[X_NXInternalShapeExtension]  = new ShapeExtensionStore(compressor);
-  requests_[X_NXInternalGenericRequest]  = new GenericRequestStore(compressor);
-  requests_[X_NXInternalRenderExtension] = new RenderExtensionStore(compressor);
-  requests_[X_NXSetUnpackGeometry]       = new SetUnpackGeometryStore(compressor);
-  requests_[X_NXPutPackedImage]          = new PutPackedImageStore(compressor);
-
-  // Since ProtoStep7 (#issue 108)
-  requests_[X_ChangeGC]            = new ChangeGCStore();
-  requests_[X_CreatePixmap]        = new CreatePixmapStore();
-  requests_[X_NXSetUnpackColormap] = new SetUnpackColormapStore(compressor);
-  requests_[X_NXSetUnpackAlpha]    = new SetUnpackAlphaStore(compressor);
-
-  for (int i = 0; i < CHANNEL_STORE_RESOURCE_LIMIT; i++)
-  {
-    splits_[i] = NULL;
-  }
-
-  commits_ = new CommitStore(compressor);
-}
-
-ClientStore::~ClientStore()
-{
-  if (logofs == NULL)
-  {
-    logofs = &cout;
-  }
-
-  for (int i = 0; i < CHANNEL_STORE_OPCODE_LIMIT; i++)
-  {
-    delete requests_[i];
-  }
-
-  for (int i = 0; i < CHANNEL_STORE_RESOURCE_LIMIT; i++)
-  {
-    delete splits_[i];
-  }
-
-  delete commits_;
-}
-
-int ClientStore::saveRequestStores(ostream *cachefs, md5_state_t *md5StateStream,
-                                       md5_state_t *md5StateClient, T_checksum_action checksumAction,
-                                           T_data_action dataAction) const
-{
-  for (int i = 0; i < CHANNEL_STORE_OPCODE_LIMIT; i++)
-  {
-    if (requests_[i] != NULL &&
-            requests_[i] -> saveStore(cachefs, md5StateStream, md5StateClient,
-                                          checksumAction, dataAction,
-                                              storeBigEndian()) < 0)
-    {
-      #ifdef WARNING
-      *logofs << "ClientStore: WARNING! Error saving request store "
-              << "for OPCODE#" << (unsigned int) i << ".\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Warning" << ": Error saving request store "
-           << "for opcode '" << (unsigned int) i << "'.\n";
-
-      return -1;
-    }
-  }
-
-  return 1;
-}
-
-int ClientStore::loadRequestStores(istream *cachefs, md5_state_t *md5StateStream,
-                                       T_checksum_action checksumAction, T_data_action dataAction) const
-{
-  for (int i = 0; i < CHANNEL_STORE_OPCODE_LIMIT; i++)
-  {
-    if (requests_[i] != NULL &&
-            requests_[i] -> loadStore(cachefs, md5StateStream,
-                                          checksumAction, dataAction,
-                                              storeBigEndian()) < 0)
-    {
-      #ifdef WARNING
-      *logofs << "ClientStore: WARNING! Error loading request store "
-              << "for OPCODE#" << (unsigned int) i << ".\n"
-              << logofs_flush;
-      #endif
-
-      return -1;
-    }
-  }
-
-  return 1;
-}
-
-void ClientStore::dumpSplitStores() const
-{
-  for (int i = 0; i < CHANNEL_STORE_RESOURCE_LIMIT; i++)
-  {
-    if (splits_[i] != NULL)
-    {
-      splits_[i] -> dump();
-    }
-  }
-
-  if ((getSplitTotalSize() != 0 && getSplitTotalStorageSize() == 0) ||
-          (getSplitTotalSize() == 0 && getSplitTotalStorageSize() != 0))
-  {
-    #ifdef PANIC
-    *logofs << "ClientStore: PANIC! Inconsistency detected "
-            << "while handling the split stores.\n"
-            << logofs_flush;
-    #endif
-
-    HandleCleanup();
-  }
-}
diff --git a/nxcomp/ClientStore.h b/nxcomp/ClientStore.h
deleted file mode 100644
index 009d87d9f..000000000
--- a/nxcomp/ClientStore.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef ClientStore_H
-#define ClientStore_H
-
-#include "Message.h"
-#include "Split.h"
-
-#include "ChannelStore.h"
-
-class StaticCompressor;
-
-class ClientStore : public ChannelStore
-{
-  public:
-
-  ClientStore(StaticCompressor *compressor);
-
-  virtual ~ClientStore();
-
-  //
-  // Get the store based on the index.
-  //
-
-  MessageStore *getRequestStore(unsigned char opcode) const
-  {
-    return requests_[opcode];
-  }
-
-  SplitStore *getSplitStore(int resource) const
-  {
-    return splits_[resource];
-  }
-
-  int getSplitTotalSize() const
-  {
-    return SplitStore::getTotalSize();
-  }
-
-  int getSplitTotalStorageSize() const
-  {
-    return SplitStore::getTotalStorageSize();
-  }
-
-  CommitStore *getCommitStore() const
-  {
-    return commits_;
-  }
-
-  int getCommitSize() const
-  {
-    return commits_ -> getSize();
-  }
-
-  void dumpSplitStore(int resource) const
-  {
-    splits_[resource] -> dump();
-  }
-
-  void dumpCommitStore() const
-  {
-    commits_ -> dump();
-  }
-
-  void dumpSplitStores() const;
-
-  SplitStore *createSplitStore(int resource)
-  {
-    splits_[resource] = new SplitStore(compressor_, commits_, resource);
-
-    return splits_[resource];
-  }
-
-  void destroySplitStore(int resource)
-  {
-    delete splits_[resource];
-
-    splits_[resource] = NULL;
-  }
-
-  //
-  // Actually save the message store
-  // to disk according to proxy mode.
-  //
-
-  int saveRequestStores(ostream *cachefs, md5_state_t *md5StateStream,
-                            md5_state_t *md5StateClient, T_checksum_action checksumAction,
-                                T_data_action dataAction) const;
-
-  int loadRequestStores(istream *cachefs, md5_state_t *md5StateStream,
-                            T_checksum_action checksumAction, T_data_action dataAction) const;
-
-  private:
-
-  //
-  // A client store contains requests.
-  //
-
-  MessageStore *requests_[CHANNEL_STORE_OPCODE_LIMIT];
-
-  //
-  // Client messages being split.
-  //
-
-  SplitStore *splits_[CHANNEL_STORE_RESOURCE_LIMIT];
-
-  //
-  // Messages having been recomposed.
-  //
-
-  CommitStore *commits_;
-
-  //
-  // Passed forward to the other stores.
-  //
-
-  StaticCompressor *compressor_;
-};
-
-#endif /* ClientStore_H */
diff --git a/nxcomp/Colormap.cpp b/nxcomp/Colormap.cpp
deleted file mode 100644
index 8579b7317..000000000
--- a/nxcomp/Colormap.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "Misc.h"
-#include "Unpack.h"
-#include "Colormap.h"
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-int UnpackColormap(unsigned char method, unsigned char *src_data, int src_size,
-                    unsigned char *dst_data, int dst_size)
-{
-  if (*src_data == 0)
-  {
-    if (dst_size != src_size - 1)
-    {
-      #ifdef TEST
-      *logofs << "UnpackColormap: PANIC! Invalid destination size "
-              << dst_size << " with source " << src_size
-              << ".\n" << logofs_flush;
-      #endif
-
-      return -1;
-    }
-
-    #ifdef TEST
-    *logofs << "UnpackColormap: Expanding " << src_size - 1
-            << " bytes of plain colormap data.\n" << logofs_flush;
-    #endif
-
-    memcpy(dst_data, src_data + 1, src_size - 1);
-
-    return 1;
-  }
-
-  unsigned int check_size = dst_size;
-
-  int result = ZDecompress(&unpackStream, dst_data, &check_size,
-                               src_data + 1, src_size - 1);
-
-  if (result != Z_OK)
-  {
-    #ifdef PANIC
-    *logofs << "UnpackColormap: PANIC! Failure decompressing colormap data. "
-            << "Error is '" << zError(result) << "'.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Failure decompressing colormap data. "
-         << "Error is '" << zError(result) << "'.\n";
-
-    return -1;
-  }
-  else if (check_size != (unsigned int) dst_size)
-  {
-    #ifdef PANIC
-    *logofs << "UnpackColormap: PANIC! Size mismatch in colormap data. "
-            << "Resulting size is " << check_size << " with "
-            << "expected size " << dst_size << ".\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Size mismatch in colormap data. "
-         << "Resulting size is " << check_size << " with "
-         << "expected size " << dst_size << ".\n";
-
-    return -1;
-  }
-
-  #ifdef TEST
-  *logofs << "UnpackColormap: Decompressed " << src_size - 1
-          << " bytes to " << dst_size << " bytes of colormap data.\n"
-          << logofs_flush;
-  #endif
-
-  return 1;
-}
diff --git a/nxcomp/Colormap.h b/nxcomp/Colormap.h
deleted file mode 100644
index a96d003fa..000000000
--- a/nxcomp/Colormap.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef Colormap_H
-#define Colormap_H
-
-int UnpackColormap(unsigned char method, unsigned char *src_data, int src_size,
-                       unsigned char *dst_data, int dst_size);
-
-#endif /* Colormap_H */
diff --git a/nxcomp/ConfigureWindow.cpp b/nxcomp/ConfigureWindow.cpp
deleted file mode 100644
index 7b0794269..000000000
--- a/nxcomp/ConfigureWindow.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "ConfigureWindow.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int ConfigureWindowStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                            unsigned int size, int bigEndian) const
-{
-  ConfigureWindowMessage *configureWindow = (ConfigureWindowMessage *) message;
-
-  //
-  // Here is the fingerprint.
-  //
-
-  configureWindow -> window = GetULONG(buffer + 4, bigEndian); 
-
-  configureWindow -> value_mask = GetUINT(buffer + 8, bigEndian);
-
-  //
-  // To increase effectiveness of the caching algorithm 
-  // we remove the unused bytes carried in the data part.
-  //
-
-  if ((int) size > dataOffset)
-  {
-    #ifdef DEBUG
-    *logofs << name() << ": Removing unused bytes from the data payload.\n" << logofs_flush;
-    #endif
-
-    configureWindow -> value_mask &= (1 << 7) - 1;
-
-    unsigned int mask = 0x1;
-    unsigned char *source = (unsigned char *) buffer + CONFIGUREWINDOW_DATA_OFFSET;
-    unsigned long value = 0;
-
-    for (unsigned int i = 0; i < 7; i++)
-    {
-      if (configureWindow -> value_mask & mask)
-      {
-        value = GetULONG(source, bigEndian);
-
-        value &= (1 << CONFIGUREWINDOW_FIELD_WIDTH[i]) - 1;
-
-        PutULONG(value, source, bigEndian);
-
-        source += 4;
-      }
-      mask <<= 1;
-    }
-  }
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed Identity for message at " << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int ConfigureWindowStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                              unsigned int size, int bigEndian) const
-{
-  ConfigureWindowMessage *configureWindow = (ConfigureWindowMessage *) message;
-
-  //
-  // Fill all the message's fields.
-  //
-
-  PutULONG(configureWindow -> window, buffer + 4, bigEndian);
-
-  PutUINT(configureWindow -> value_mask, buffer + 8, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at " << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void ConfigureWindowStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  ConfigureWindowMessage *configureWindow = (ConfigureWindowMessage *) message;
-
-  *logofs << "ConfigureWindow: window " << configureWindow -> window  
-          << ", value_mask " << configureWindow -> value_mask
-          << ", size " << configureWindow -> size_ << ".\n";
-
-  #endif
-}
-
-void ConfigureWindowStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                                unsigned int size, int bigEndian) const
-{
-  md5_append(md5_state_, buffer + 4, 4);
-  md5_append(md5_state_, buffer + 8, 2);
-}
diff --git a/nxcomp/ConfigureWindow.h b/nxcomp/ConfigureWindow.h
deleted file mode 100644
index e02c2aae1..000000000
--- a/nxcomp/ConfigureWindow.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef ConfigureWindow_H
-#define ConfigureWindow_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define CONFIGUREWINDOW_ENABLE_CACHE               1
-#define CONFIGUREWINDOW_ENABLE_DATA                0
-#define CONFIGUREWINDOW_ENABLE_SPLIT               0
-#define CONFIGUREWINDOW_ENABLE_COMPRESS            0
-
-#define CONFIGUREWINDOW_DATA_LIMIT                 32
-#define CONFIGUREWINDOW_DATA_OFFSET                12
-
-#define CONFIGUREWINDOW_CACHE_SLOTS                3000
-#define CONFIGUREWINDOW_CACHE_THRESHOLD            5
-#define CONFIGUREWINDOW_CACHE_LOWER_THRESHOLD      1
-
-//
-// The message class.
-//
-
-class ConfigureWindowMessage : public Message
-{
-  friend class ConfigureWindowStore;
-
-  public:
-
-  ConfigureWindowMessage()
-  {
-  }
-
-  ~ConfigureWindowMessage()
-  {
-  }
-
-  //
-  // Put here the fields which constitute 
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned int   window;
-  unsigned short value_mask;
-};
-
-class ConfigureWindowStore : public MessageStore
-{
-  //
-  // Constructors and destructors.
-  //
-
-  public:
-
-  ConfigureWindowStore() : MessageStore()
-  {
-    enableCache    = CONFIGUREWINDOW_ENABLE_CACHE;
-    enableData     = CONFIGUREWINDOW_ENABLE_DATA;
-    enableSplit    = CONFIGUREWINDOW_ENABLE_SPLIT;
-    enableCompress = CONFIGUREWINDOW_ENABLE_COMPRESS;
-
-    dataLimit  = CONFIGUREWINDOW_DATA_LIMIT;
-    dataOffset = CONFIGUREWINDOW_DATA_OFFSET;
-
-    cacheSlots          = CONFIGUREWINDOW_CACHE_SLOTS;
-    cacheThreshold      = CONFIGUREWINDOW_CACHE_THRESHOLD;
-    cacheLowerThreshold = CONFIGUREWINDOW_CACHE_LOWER_THRESHOLD;
-
-    messages_ -> resize(cacheSlots);
-
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      *i = NULL;
-    }
-
-    temporary_ = NULL;
-  }
-
-  virtual ~ConfigureWindowStore()
-  {
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      destroy(*i);
-    }
-
-    destroy(temporary_);
-  }
-
-  virtual const char *name() const
-  {
-    return "ConfigureWindow";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_ConfigureWindow;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(ConfigureWindowMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  public:
-
-  virtual Message *create() const
-  {
-    return new ConfigureWindowMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new ConfigureWindowMessage((const ConfigureWindowMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (ConfigureWindowMessage *) message;
-  }
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* ConfigureWindow_H */
diff --git a/nxcomp/Control.cpp b/nxcomp/Control.cpp
deleted file mode 100644
index 4469a9bf5..000000000
--- a/nxcomp/Control.cpp
+++ /dev/null
@@ -1,818 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "NX.h"
-#include "NXpack.h"
-
-#include "Control.h"
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-//
-// Flush immediately on prioritized messages.
-//
-
-#define FLUSH_PRIORITY                           0
-
-//
-// Maximum number of bytes sent for each token.
-//
-
-#define TOKEN_SIZE                               1536
-
-//
-// Maximum number of tokens that can be spent
-// by the client proxy before having to block
-// waiting for a token reply.
-//
-
-#define TOKEN_LIMIT                              24
-
-//
-// By default assume the proxy is running as a
-// standalone program.
-//
-
-#define LINK_ENCRYPTED                           0
-
-//
-// Maximum number of pids the proxy will record
-// and kill at shutdown.
-//
-
-#define KILL_LIMIT                               16
-
-//
-// Allocate on the NX client side channels whose
-// ids are a multiple of 8 (starting from 0). All
-// the other ids can be used to allocate channels
-// at the NX server side (X client side).
-//
-
-#define CHANNEL_MASK                             0x07
-
-//
-// Kill session if control parameters cannot be
-// negotiated before this timeout.
-//
-
-#define INIT_TIMEOUT                             60000
-
-//
-// Enter the congestion state if the remote does
-// not reply to a ping within the given amount
-// of time.
-//
-
-#define PING_TIMEOUT                             5000
-
-//
-// Only send one motion event any N milliseconds.
-//
-
-#define MOTION_TIMEOUT                           0
-
-
-//
-// Force an update of the congestion counter if
-// the proxy is idle for this time.
-//
-
-#define IDLE_TIMEOUT                             50
-
-//
-// Close X connection if can't write before this
-// timeout.
-//
-
-#define CHANNEL_TIMEOUT                          10000
-
-//
-// Warn user (or close proxy connection) if don't
-// receive any data before this timeout.
-//
-
-#define PROXY_TIMEOUT                            120000
-
-//
-// How many milliseconds to wait for the shared
-// memory completion event to become available.
-//
-
-#define SHMEM_TIMEOUT                            200
-//
-// Before closing down the proxy, wait for the
-// given amount of miliseconds to let all the
-// running applications to close down their
-// connections.
-//
-// A null timeout will cause the proxy to wait
-// indefinitely, until the watchdog process is
-// killed. This is usually the way the proxy is
-// started by the NX server. If on the other
-// hand a timeout is given and there no channel
-// is remaining, the proxy will be closed down
-// using a small timeout, presently of 500 ms.
-//
-
-#define CLEANUP_TIMEOUT                          3000
-
-//
-// Wait this amount of milliseconds after any
-// iteration of the house-keeping process.
-//
-
-#define KEEPER_TIMEOUT                           60000
-
-//
-// In case of timeout, select can return control
-// to program earlier or later of this amount of
-// ms. Consider this when calculating if timeout
-// is elapsed.
-//
-
-#define LATENCY_TIMEOUT                          1
-
-//
-// Control memory allocation in transport
-// and other classes.
-//
-
-#define TRANSPORT_X_BUFFER_SIZE                  131072
-#define TRANSPORT_PROXY_BUFFER_SIZE              65536
-#define TRANSPORT_GENERIC_BUFFER_SIZE            16384
-
-#define TRANSPORT_X_BUFFER_THRESHOLD             262144
-#define TRANSPORT_PROXY_BUFFER_THRESHOLD         131072
-#define TRANSPORT_GENERIC_BUFFER_THRESHOLD       32768
-
-//
-// Never allow buffers to exceed this limit.
-//
-
-#define TRANSPORT_MAXIMUM_BUFFER_SIZE            393216
-
-//
-// Immediately flush the accumulated data to
-// the X server if the write buffer exceeds
-// this size.
-//
-
-#define TRANSPORT_FLUSH_BUFFER_SIZE              16384
-
-//
-// Defaults used for socket options.
-//
-
-#define OPTION_PROXY_KEEP_ALIVE                  0
-#define OPTION_PROXY_LOW_DELAY                   1
-#define OPTION_PROXY_CLIENT_NO_DELAY             1
-#define OPTION_PROXY_SERVER_NO_DELAY             1
-#define OPTION_CLIENT_NO_DELAY                   1
-#define OPTION_SERVER_NO_DELAY                   1
-
-#define OPTION_PROXY_RECEIVE_BUFFER              -1
-#define OPTION_CLIENT_RECEIVE_BUFFER             -1
-#define OPTION_SERVER_RECEIVE_BUFFER             -1
-
-#define OPTION_PROXY_SEND_BUFFER                 -1
-#define OPTION_CLIENT_SEND_BUFFER                -1
-#define OPTION_SERVER_SEND_BUFFER                -1
-
-#define OPTION_PROXY_RETRY_CONNECT               30
-#define OPTION_PROXY_RETRY_ACCEPT                3
-#define OPTION_SERVER_RETRY_CONNECT              3
-
-//
-// Defaults used for cache persistence.
-//
-
-#define PERSISTENT_CACHE_THRESHOLD               102400
-
-#define PERSISTENT_CACHE_ENABLE_LOAD             1
-#define PERSISTENT_CACHE_ENABLE_SAVE             1
-
-#define PERSISTENT_CACHE_CHECK_ON_SHUTDOWN       0
-
-#define PERSISTENT_CACHE_LOAD_PACKED             1
-#define PERSISTENT_CACHE_LOAD_RENDER             1
-
-#define PERSISTENT_CACHE_DISK_LIMIT              33554432
-
-//
-// Defaults used for image cache.
-//
-
-#define IMAGE_CACHE_ENABLE_LOAD                  0
-#define IMAGE_CACHE_ENABLE_SAVE                  0
-
-#define IMAGE_CACHE_DISK_LIMIT                   33554432
-
-//
-// Suggested defaults for read length parameters
-// used by read buffer classes.
-//
-
-#define CLIENT_INITIAL_READ_SIZE                 8192
-#define CLIENT_MAXIMUM_BUFFER_SIZE               262144
-
-#define SERVER_INITIAL_READ_SIZE                 8192
-#define SERVER_MAXIMUM_BUFFER_SIZE               65536
-
-#define PROXY_INITIAL_READ_SIZE                  65536
-#define PROXY_MAXIMUM_BUFFER_SIZE                262144 + 1024
-
-#define GENERIC_INITIAL_READ_SIZE                8192
-#define GENERIC_MAXIMUM_BUFFER_SIZE              8192
-
-//
-// Calculate bitrate in given time frames.
-// Values are in milliseconds.
-//
-
-#define SHORT_BITRATE_TIME_FRAME                 5000
-#define LONG_BITRATE_TIME_FRAME                  30000
-
-//
-// Bandwidth control. A value of 0 means no
-// limit. Values are stored internally in
-// bytes per second.
-//
-
-#define CLIENT_BITRATE_LIMIT                     0
-#define SERVER_BITRATE_LIMIT                     0
-
-//
-// Default values for cache control. We limit
-// the maximum size of a request to 262144 but
-// we need to consider the replies, whose size
-// may be up to 4MB.
-//
-
-#define MINIMUM_MESSAGE_SIZE                     4
-#define MAXIMUM_MESSAGE_SIZE                     4194304
-#define MAXIMUM_REQUEST_SIZE                     262144
-
-#define CLIENT_TOTAL_STORAGE_SIZE                8388608
-#define SERVER_TOTAL_STORAGE_SIZE                8388608
-
-#define STORE_TIME_LIMIT                         3600
-
-#define STORE_HITS_LOAD_BONUS                    10
-#define STORE_HITS_ADD_BONUS                     20
-#define STORE_HITS_LIMIT                         100
-
-#define STORE_HITS_TOUCH                         1
-#define STORE_HITS_UNTOUCH                       2
-
-//
-// Default parameters for message splitting.
-//
-
-#define SPLIT_MODE                               1
-#define SPLIT_TIMEOUT                            50
-#define SPLIT_TOTAL_SIZE                         128
-#define SPLIT_TOTAL_STORAGE_SIZE                 1048576
-#define SPLIT_DATA_THRESHOLD                     65536
-#define SPLIT_DATA_PACKET_LIMIT                  24576
-
-//
-// Agent related parameters.
-//
-
-#define PACK_METHOD                              63
-#define PACK_QUALITY                             9
-#define HIDE_RENDER                              0
-#define TAINT_REPLIES                            1
-#define TAINT_THRESHOLD                          8
-
-//
-// In current version only X server support is
-// implemented. Note that use of shared memory
-// is negotiated according to options provided
-// by the user.
-//
-
-#define SHMEM_CLIENT                             0
-#define SHMEM_SERVER                             1
-
-//
-// Default size of shared memory segments used
-// in MIT-SHM support.
-//
-
-#define SHMEM_CLIENT_SIZE                        0
-#define SHMEM_SERVER_SIZE                        2097152
-
-//
-// What do we do at the end of session? If this
-// flag is set, we launch a new client letting
-// the user run a new NX session.
-//
-
-#define ENABLE_RESTART_ON_SHUTDOWN               0
-
-//
-// Do we produce a core dump on fatal errors?
-//
-
-#define ENABLE_CORE_DUMP_ON_ABORT                0
-
-//
-// Reopen the log file if it exceeds this size.
-//
-
-#define FILE_SIZE_LIMIT                          60000000
-
-//
-// Check periodically if we need to truncate the
-// log file. By default check every minute.
-//
-
-#define FILE_SIZE_CHECK_TIMEOUT                  60000
-
-//
-// Protocol version compatibility values
-//
-
-const int Control::NX_MIN_PROTO_STEP = 10;
-const int Control::NX_MAX_PROTO_STEP = 10;
-const char* const Control::NXPROXY_COMPATIBILITY_VERSION = "3.5.0";
-
-//
-// Set defaults for control. They should be what
-// you get in case of 'local' connection.
-//
-
-Control::Control()
-{
-  ProxyMode   = proxy_undefined;
-  ProxyStage  = stage_undefined;
-  SessionMode = session_undefined;
-  FlushPolicy = policy_undefined;
-  LinkMode    = link_undefined;
-
-  LinkEncrypted = LINK_ENCRYPTED;
-  FlushPriority = FLUSH_PRIORITY;
-
-  TokenSize  = TOKEN_SIZE;
-  TokenLimit = TOKEN_LIMIT;
-
-  ChannelMask = CHANNEL_MASK;
-
-  InitTimeout   = INIT_TIMEOUT;
-  PingTimeout   = PING_TIMEOUT;
-  MotionTimeout = MOTION_TIMEOUT;
-  IdleTimeout   = IDLE_TIMEOUT;
-
-  ChannelTimeout = CHANNEL_TIMEOUT;
-  ProxyTimeout   = PROXY_TIMEOUT;
-  ShmemTimeout   = SHMEM_TIMEOUT;
-
-  CleanupTimeout  = CLEANUP_TIMEOUT;
-  KeeperTimeout   = KEEPER_TIMEOUT;
-  LatencyTimeout  = LATENCY_TIMEOUT;
-
-  FileSizeLimit        = FILE_SIZE_LIMIT;
-  FileSizeCheckTimeout = FILE_SIZE_CHECK_TIMEOUT;
-
-  EnableRestartOnShutdown = ENABLE_RESTART_ON_SHUTDOWN;
-
-  KillDaemonOnShutdownLimit = KILL_LIMIT;
-
-  KillDaemonOnShutdown = new int[KillDaemonOnShutdownLimit];
-
-  for (int i = 0; i < KILL_LIMIT; i++)
-  {
-    KillDaemonOnShutdown[i] = -1;
-  }
-
-  KillDaemonOnShutdownNumber = 0;
-
-  EnableCoreDumpOnAbort = ENABLE_CORE_DUMP_ON_ABORT;
-
-  //
-  // Collect statistics by default.
-  //
-
-  EnableStatistics = 1;
-
-  //
-  // Memory restrictions if any.
-  //
-
-  LocalMemoryLevel = -1;
-
-  //
-  // Compression must be negotiated between proxies.
-  //
-
-  LocalDeltaCompression   = -1;
-  RemoteDeltaCompression  = -1;
-
-  LocalDataCompression    = -1;
-  LocalStreamCompression  = -1;
-
-  RemoteDataCompression   = -1;
-  RemoteStreamCompression = -1;
-
-  LocalDataCompressionLevel     = -1;
-  LocalDataCompressionThreshold = -1;
-  LocalStreamCompressionLevel   = -1;
-
-  RemoteDataCompressionLevel    = -1;
-  RemoteStreamCompressionLevel  = -1;
-
-  //
-  // Transport buffers' allocation parameters.
-  // 
-
-  TransportXBufferSize            = TRANSPORT_X_BUFFER_SIZE;
-  TransportProxyBufferSize        = TRANSPORT_PROXY_BUFFER_SIZE;
-  TransportGenericBufferSize      = TRANSPORT_GENERIC_BUFFER_SIZE;
-
-  TransportXBufferThreshold       = TRANSPORT_X_BUFFER_THRESHOLD;
-  TransportProxyBufferThreshold   = TRANSPORT_PROXY_BUFFER_THRESHOLD;
-  TransportGenericBufferThreshold = TRANSPORT_GENERIC_BUFFER_THRESHOLD;
-
-  TransportMaximumBufferSize      = TRANSPORT_MAXIMUM_BUFFER_SIZE;
-
-  //
-  // Flush the write buffer if it exceeds
-  // this size.
-  //
-
-  TransportFlushBufferSize = TRANSPORT_FLUSH_BUFFER_SIZE;
-
-  //
-  // Socket options.
-  //
-
-  OptionProxyKeepAlive      = OPTION_PROXY_KEEP_ALIVE;
-  OptionProxyLowDelay       = OPTION_PROXY_LOW_DELAY;
-  OptionProxyClientNoDelay  = OPTION_PROXY_CLIENT_NO_DELAY;
-  OptionProxyServerNoDelay  = OPTION_PROXY_SERVER_NO_DELAY;
-  OptionClientNoDelay       = OPTION_CLIENT_NO_DELAY;
-  OptionServerNoDelay       = OPTION_SERVER_NO_DELAY;
-
-  OptionProxyReceiveBuffer  = OPTION_PROXY_RECEIVE_BUFFER;
-  OptionClientReceiveBuffer = OPTION_CLIENT_RECEIVE_BUFFER;
-  OptionServerReceiveBuffer = OPTION_SERVER_RECEIVE_BUFFER;
-
-  OptionProxySendBuffer     = OPTION_PROXY_SEND_BUFFER;
-  OptionClientSendBuffer    = OPTION_CLIENT_SEND_BUFFER;
-  OptionServerSendBuffer    = OPTION_SERVER_SEND_BUFFER;
-
-  OptionProxyRetryAccept    = OPTION_PROXY_RETRY_ACCEPT;
-  OptionProxyRetryConnect   = OPTION_PROXY_RETRY_CONNECT;
-  OptionServerRetryConnect  = OPTION_SERVER_RETRY_CONNECT;
-
-  //
-  // Base NX directories.
-  //
-
-  HomePath   = NULL;
-  RootPath   = NULL;
-  SystemPath = NULL;
-  TempPath   = NULL;
-  ClientPath = NULL;
-
-  //
-  // Set defaults for handling persistent cache.
-  //
-
-  PersistentCachePath = NULL;
-  PersistentCacheName = NULL;
-
-  PersistentCacheThreshold = PERSISTENT_CACHE_THRESHOLD;
-
-  PersistentCacheEnableLoad = PERSISTENT_CACHE_ENABLE_LOAD;
-  PersistentCacheEnableSave = PERSISTENT_CACHE_ENABLE_SAVE;
-
-  PersistentCacheCheckOnShutdown = PERSISTENT_CACHE_CHECK_ON_SHUTDOWN;
-
-  PersistentCacheLoadPacked = PERSISTENT_CACHE_LOAD_PACKED;
-  PersistentCacheLoadRender = PERSISTENT_CACHE_LOAD_RENDER;
-
-  PersistentCacheDiskLimit = PERSISTENT_CACHE_DISK_LIMIT;
-
-  //
-  // Set defaults for image cache.
-  //
-
-  ImageCachePath = NULL;
-
-  ImageCacheEnableLoad = IMAGE_CACHE_ENABLE_LOAD;
-  ImageCacheEnableSave = IMAGE_CACHE_ENABLE_SAVE;
-
-  ImageCacheDiskLimit = IMAGE_CACHE_DISK_LIMIT;
-
-  //
-  // Set defaults for the read buffers.
-  //
-
-  ClientInitialReadSize    = CLIENT_INITIAL_READ_SIZE;
-  ClientMaximumBufferSize  = CLIENT_MAXIMUM_BUFFER_SIZE;
-
-  ServerInitialReadSize    = SERVER_INITIAL_READ_SIZE;
-  ServerMaximumBufferSize  = SERVER_MAXIMUM_BUFFER_SIZE;
-
-  ProxyInitialReadSize     = PROXY_INITIAL_READ_SIZE;
-  ProxyMaximumBufferSize   = PROXY_MAXIMUM_BUFFER_SIZE;
-
-  GenericInitialReadSize   = GENERIC_INITIAL_READ_SIZE;
-  GenericMaximumBufferSize = GENERIC_MAXIMUM_BUFFER_SIZE;
-
-  ShortBitrateTimeFrame = SHORT_BITRATE_TIME_FRAME;
-  LongBitrateTimeFrame  = LONG_BITRATE_TIME_FRAME;
-
-  //
-  // Bandwidth control.
-  //
-
-  LocalBitrateLimit   = -1;
-
-  ClientBitrateLimit = CLIENT_BITRATE_LIMIT;
-  ServerBitrateLimit = SERVER_BITRATE_LIMIT;
-
-  //
-  // Default parameters for message handling.
-  //
-
-  ClientTotalStorageSize = CLIENT_TOTAL_STORAGE_SIZE;
-  ServerTotalStorageSize = SERVER_TOTAL_STORAGE_SIZE;
-
-  LocalTotalStorageSize  = -1;
-  RemoteTotalStorageSize = -1;
-
-  StoreTimeLimit = STORE_TIME_LIMIT;
-
-  StoreHitsLoadBonus = STORE_HITS_LOAD_BONUS;
-  StoreHitsAddBonus  = STORE_HITS_ADD_BONUS;
-  StoreHitsLimit     = STORE_HITS_LIMIT;
-
-  StoreHitsTouch   = STORE_HITS_TOUCH;
-  StoreHitsUntouch = STORE_HITS_UNTOUCH;
-
-  MinimumMessageSize = MINIMUM_MESSAGE_SIZE;
-  MaximumMessageSize = MAXIMUM_MESSAGE_SIZE;
-  MaximumRequestSize = MAXIMUM_REQUEST_SIZE;
-
-  SplitMode             = SPLIT_MODE;
-  SplitTimeout          = SPLIT_TIMEOUT;
-  SplitTotalSize        = SPLIT_TOTAL_SIZE;
-  SplitTotalStorageSize = SPLIT_TOTAL_STORAGE_SIZE;
-  SplitDataThreshold    = SPLIT_DATA_THRESHOLD;
-  SplitDataPacketLimit  = SPLIT_DATA_PACKET_LIMIT;
-
-  PackMethod     = PACK_METHOD;
-  PackQuality    = PACK_QUALITY;
-  HideRender     = HIDE_RENDER;
-  TaintReplies   = TAINT_REPLIES;
-  TaintThreshold = TAINT_THRESHOLD;
-
-  ShmemClient = SHMEM_CLIENT;
-  ShmemServer = SHMEM_SERVER;
-
-  ShmemClientSize = SHMEM_CLIENT_SIZE;
-  ShmemServerSize = SHMEM_SERVER_SIZE;
-
-  //
-  // Get local version number from compile time
-  // settings. Version of remote proxy will be
-  // checked at connection time.
-  //
-
-  RemoteVersionMajor = -1;
-  RemoteVersionMinor = -1;
-  RemoteVersionPatch = -1;
-  RemoteVersionMaintenancePatch = -1;
-
-  CompatVersionMajor = -1;
-  CompatVersionMinor = -1;
-  CompatVersionPatch = -1;
-  CompatVersionMaintenancePatch = -1;
-
-  LocalVersionMajor = NXMajorVersion();
-  LocalVersionMinor = NXMinorVersion();
-  LocalVersionPatch = NXPatchVersion();
-  LocalVersionMaintenancePatch = NXMaintenancePatchVersion();
-
-  #ifdef TEST
-  *logofs << "Control: Major version is " << LocalVersionMajor
-          << " minor is " << LocalVersionMinor << " patch is "
-          << LocalVersionPatch << " Maintenance version is "
-	  << LocalVersionMaintenancePatch << ".\n" << logofs_flush;
-  #endif
-
-  //
-  // Initialize local implemented methods later
-  // and negotiate remote methods at connection
-  // time.
-  //
-
-  LocalUnpackMethods  = NULL;
-  RemoteUnpackMethods = NULL;
-
-  //
-  // Set to 1 those methods which are implemented.
-  //
-
-  setLocalUnpackMethods();
-
-  //
-  // Set the protocol version at the
-  // time the session is negotiated.
-  //
-
-  protoStep_ = 0;
-}
-
-Control::~Control()
-{
-  if (KillDaemonOnShutdown != NULL)
-  {
-    delete [] KillDaemonOnShutdown;
-  }
-
-  if (HomePath != NULL)
-  {
-    delete [] HomePath;
-  }
-
-  if (RootPath != NULL)
-  {
-    delete [] RootPath;
-  }
-
-  if (SystemPath != NULL)
-  {
-    delete [] SystemPath;
-  }
-
-  if (TempPath != NULL)
-  {
-    delete [] TempPath;
-  }
-
-  if (ClientPath != NULL)
-  {
-    delete [] ClientPath;
-  }
-
-  if (PersistentCachePath != NULL)
-  {
-    delete [] PersistentCachePath;
-  }
-
-  if (PersistentCacheName != NULL)
-  {
-    delete [] PersistentCacheName;
-  }
-
-  if (LocalUnpackMethods != NULL)
-  {
-    delete [] LocalUnpackMethods;
-  }
-
-  if (RemoteUnpackMethods != NULL)
-  {
-    delete [] RemoteUnpackMethods;
-  }
-
-  if (ImageCachePath != NULL)
-  {
-    delete [] ImageCachePath;
-  }
-}
-
-//
-// Set the protocol step based on the
-// remote version.
-//
-
-void Control::setProtoStep(int step)
-{
-  if (isValidProtoStep(step))
-  {
-    protoStep_ = step;
-  }
-  else
-  {
-    #ifdef PANIC
-    *logofs << "Control: PANIC! Invalid protocol step "
-            << "with value " << step << ".\n"
-            << logofs_flush;
-    #endif
-
-    HandleCleanup();
-  }
-}
-
-int Control::getProtoStep()
-{
-  if (isValidProtoStep(protoStep_))
-  {
-    return protoStep_;
-  }
-  else
-  {
-    #ifdef PANIC
-    *logofs << "Control: PANIC! Can't identify the "
-            << "protocol step.\n" << logofs_flush;
-    #endif
-
-    HandleCleanup();
-  }
-}
-
-//
-// Set here the pack/unpack methods that are
-// implemented by this NX proxy.
-//
-
-void Control::setLocalUnpackMethods()
-{
-  LocalUnpackMethods  = new unsigned char[PACK_METHOD_LIMIT];
-  RemoteUnpackMethods = new unsigned char[PACK_METHOD_LIMIT];
-
-  for (int i = 0; i < PACK_METHOD_LIMIT; i++)
-  {
-    LocalUnpackMethods[i]  = 0;
-    RemoteUnpackMethods[i] = 0;
-  }
-
-  LocalUnpackMethods[NO_PACK]                         = 1;
-
-  LocalUnpackMethods[PACK_MASKED_8_COLORS]            = 1;
-  LocalUnpackMethods[PACK_MASKED_64_COLORS]           = 1;
-  LocalUnpackMethods[PACK_MASKED_256_COLORS]          = 1;
-  LocalUnpackMethods[PACK_MASKED_512_COLORS]          = 1;
-  LocalUnpackMethods[PACK_MASKED_4K_COLORS]           = 1;
-  LocalUnpackMethods[PACK_MASKED_32K_COLORS]          = 1;
-  LocalUnpackMethods[PACK_MASKED_64K_COLORS]          = 1;
-  LocalUnpackMethods[PACK_MASKED_256K_COLORS]         = 1;
-  LocalUnpackMethods[PACK_MASKED_2M_COLORS]           = 1;
-  LocalUnpackMethods[PACK_MASKED_16M_COLORS]          = 1;
-
-  LocalUnpackMethods[PACK_RAW_8_BITS]                 = 1;
-  LocalUnpackMethods[PACK_RAW_16_BITS]                = 1;
-  LocalUnpackMethods[PACK_RAW_24_BITS]                = 1;
-
-  LocalUnpackMethods[PACK_COLORMAP_256_COLORS]        = 1;
-
-  LocalUnpackMethods[PACK_JPEG_8_COLORS]              = 1;
-  LocalUnpackMethods[PACK_JPEG_64_COLORS]             = 1;
-  LocalUnpackMethods[PACK_JPEG_256_COLORS]            = 1;
-  LocalUnpackMethods[PACK_JPEG_512_COLORS]            = 1;
-  LocalUnpackMethods[PACK_JPEG_4K_COLORS]             = 1;
-  LocalUnpackMethods[PACK_JPEG_32K_COLORS]            = 1;
-  LocalUnpackMethods[PACK_JPEG_64K_COLORS]            = 1;
-  LocalUnpackMethods[PACK_JPEG_256K_COLORS]           = 1;
-  LocalUnpackMethods[PACK_JPEG_2M_COLORS]             = 1;
-  LocalUnpackMethods[PACK_JPEG_16M_COLORS]            = 1;
-
-  LocalUnpackMethods[PACK_PNG_8_COLORS]               = 1;
-  LocalUnpackMethods[PACK_PNG_64_COLORS]              = 1;
-  LocalUnpackMethods[PACK_PNG_256_COLORS]             = 1;
-  LocalUnpackMethods[PACK_PNG_512_COLORS]             = 1;
-  LocalUnpackMethods[PACK_PNG_4K_COLORS]              = 1;
-  LocalUnpackMethods[PACK_PNG_32K_COLORS]             = 1;
-  LocalUnpackMethods[PACK_PNG_64K_COLORS]             = 1;
-  LocalUnpackMethods[PACK_PNG_256K_COLORS]            = 1;
-  LocalUnpackMethods[PACK_PNG_2M_COLORS]              = 1;
-  LocalUnpackMethods[PACK_PNG_16M_COLORS]             = 1;
-
-  LocalUnpackMethods[PACK_RGB_16M_COLORS]             = 1;
-  LocalUnpackMethods[PACK_RLE_16M_COLORS]             = 1;
-
-  LocalUnpackMethods[PACK_ALPHA]                      = 1;
-  LocalUnpackMethods[PACK_COLORMAP]                   = 1;
-
-  LocalUnpackMethods[PACK_BITMAP_16M_COLORS]          = 1;
-}
diff --git a/nxcomp/Control.h b/nxcomp/Control.h
deleted file mode 100644
index 764fca2c1..000000000
--- a/nxcomp/Control.h
+++ /dev/null
@@ -1,764 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef Control_H
-#define Control_H
-
-#include "NXpack.h"
-
-#include "Misc.h"
-#include "Types.h"
-#include "Timestamp.h"
-#include "Statistics.h"
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-//
-// This is the mode proxy is running.
-//
-
-typedef enum
-{
-  proxy_undefined = -1,
-  proxy_client,
-  proxy_server,
-  proxy_last_tag
-}
-T_proxy_mode;
-
-//
-// Handle advances in the connection
-// procedure.
-//
-
-typedef enum
-{
-  stage_undefined,
-  stage_initializing,
-  stage_connecting,
-  stage_connected,
-  stage_waiting_forwarder_version,
-  stage_waiting_forwarder_options,
-  stage_sending_forwarder_options,
-  stage_waiting_proxy_version,
-  stage_waiting_proxy_options,
-  stage_sending_proxy_options,
-  stage_waiting_proxy_caches,
-  stage_sending_proxy_caches,
-  stage_operational,
-  stage_terminating,
-  stage_terminated
-}
-T_proxy_stage;
-
-//
-// Hint about whether or not the proxy is
-// connected to a NX agen.
-//
-
-typedef enum
-{
-  session_undefined = -1,
-  session_agent,
-  session_shadow,
-  session_proxy,
-  session_last_tag
-}
-T_session_mode;
-
-//
-// Set how data will be written to the peer
-// socket.
-//
-
-typedef enum
-{
-  policy_undefined = -1,
-  policy_immediate,
-  policy_deferred
-}
-T_flush_policy;
-
-//
-// Link mode, after negotiation, will be set to
-// any of the values defined in the NXproto.h.
-//
-
-#define link_undefined  -1;
-
-//
-// This class collects functioning parameters, 
-// to be configurable at run-time. They are for
-// the most part regarding timeouts, transport
-// and message stores handling.
-//
-
-class Control
-{
-  public:
-
-  //
-  // Does proxy run in client mode or server mode?
-  // As soon as we'll have gone through parsing of
-  // the command line options the current mode will
-  // be propagated to the control class.
-  //
-
-  T_proxy_mode ProxyMode;
-
-  //
-  // Goes from initializing to operational.
-  //
-
-  T_proxy_stage ProxyStage;
-
-  //
-  // Hint about type of session currently running.
-  //
-
-  T_session_mode SessionMode;
-
-  //
-  // Either immediate or defferred flushes.
-  //
-
-  T_flush_policy FlushPolicy;
-
-  //
-  // If set, the channels will try to flush the
-  // encoded data whenever there is a prioritized
-  // message. Depending on the flush policy, this
-  // may determine an immediate flush or an event
-  // being generated telling to the agent that it
-  // should flush the proxy link.
-  //
-
-  int FlushPriority;
-
-  //
-  // Id corresponding to link speed negotiated
-  // between proxies.
-  //
-
-  int LinkMode;
-
-  //
-  // Set if the proxy is connected to a program
-  // providing the encryption of the point to
-  // point communication.
-  //
-
-  int LinkEncrypted;
-
-  //
-  // Maximum number of bytes sent for each token.
-  //
-
-  int TokenSize;
-
-  //
-  // Maximum number of tokens that can be spent
-  // by the client proxy before having to block
-  // waiting for a reply.
-  //
-
-  int TokenLimit;
-
-  //
-  // Bitmask used to determine the distribution
-  // of channel ids between the client and server
-  // proxies.
-  //
-
-  int ChannelMask;
-
-  //
-  // Kill session if control parameters cannot
-  // be negotiated before this timeout.
-  //
-
-  int InitTimeout;
-
-  //
-  // Enter the congestion state if the remote does
-  // not reply to the ping within the given amount
-  // of time.
-  //
-
-  int PingTimeout;
-
-  //
-  // Enqueue motion notify events in server channel.
-  //
-
-  int MotionTimeout;
-
-  //
-  // Force an update of the congestion counter if
-  // the proxy is idle for this time.
-  //
-
-  int IdleTimeout;
-
-  //
-  // Close the connection if can't write before
-  // this timeout.
-  //
-
-  int ChannelTimeout;
-
-  //
-  // Close connection if can't write before
-  // this timeout.
-  //
-
-  int ProxyTimeout;
-
-  //
-  // How many milliseconds to wait for the shared
-  // memory completion event to become available.
-  //
-
-  int ShmemTimeout;
-
-  //
-  // Wait for applications to complete at the time
-  // proxy is shut down.
-  //
-
-  int CleanupTimeout;
-
-  //
-  // Wait this amount of milliseconds before any
-  // iteration of the house-keeping process.
-  //
-
-  int KeeperTimeout;
-
-  //
-  // Adjust timeout calculations.
-  //
-
-  int LatencyTimeout;
-
-  //
-  // Maximum allowed size of log files.
-  //
-
-  int FileSizeLimit;
-  int FileSizeCheckTimeout;
-
-  //
-  // What do we do at the end of session? If
-  // this flag is set we launch a new client
-  // letting the user run a new NX session.
-  //
-
-  int EnableRestartOnShutdown;
-
-  //
-  // The client can request the proxy to kill
-  // a number of processes before exiting.
-  //
-
-  int *KillDaemonOnShutdown;
-  int KillDaemonOnShutdownNumber;
-  int KillDaemonOnShutdownLimit;
-
-  //
-  // Do we generate a core dump and exit in
-  // case of program errors?
-  //
-
-  int EnableCoreDumpOnAbort;
-
-  //
-  // Is statistic output enabled?
-  //
-
-  int EnableStatistics;
-
-  //
-  // Version number of local and remote proxy.
-  //
-
-  /* 
-   * LocalVersionMaintenancePatch, RemoteVersionMaintenancePatch
-   * CompatVersionMaintenancePatch
-   *
-   * currently not used, for future compatibility checks
-   */
-  int LocalVersionMajor;
-  int LocalVersionMinor;
-  int LocalVersionPatch;
-  int LocalVersionMaintenancePatch;
-
-  int RemoteVersionMajor;
-  int RemoteVersionMinor;
-  int RemoteVersionPatch;
-  int RemoteVersionMaintenancePatch;
-
-  int CompatVersionMajor;
-  int CompatVersionMinor;
-  int CompatVersionPatch;
-  int CompatVersionMaintenancePatch;
-
-  //
-  // Compatibility version for the proxy
-  //
-
-  static const char* const NXPROXY_COMPATIBILITY_VERSION;
-
-  //
-  // Which unpack methods are implemented in proxy?
-  //
-
-  unsigned char *LocalUnpackMethods;
-  unsigned char *RemoteUnpackMethods;
-
-  //
-  // Memory restriction imposed by user.
-  //
-
-  int LocalMemoryLevel;
-
-  //
-  // Use or not differential compression
-  // and caching of X protocol messages.
-  //
-
-  int LocalDeltaCompression;
-  int RemoteDeltaCompression;
-
-  //
-  // Compression of images and replies.
-  //
-
-  int LocalDataCompression;
-  int LocalDataCompressionLevel;
-
-  int RemoteDataCompression;
-  int RemoteDataCompressionLevel;
-
-  //
-  // Minimum packet size to be compressed.
-  //
-
-  int LocalDataCompressionThreshold;
-
-  //
-  // Compress or not data flowing through the proxy
-  // link. Level should be one of the ZLIB level as
-  // Z_DEFAULT_COMPRESSION or Z_BEST_COMPRESSION.
-  //
-
-  int LocalStreamCompression;
-  int LocalStreamCompressionLevel;
-
-  int RemoteStreamCompression;
-  int RemoteStreamCompressionLevel;
-
-  //
-  // Size of read operations in read buffer classes.
-  //
-
-  int ClientInitialReadSize;
-  int ClientMaximumBufferSize;
-
-  int ServerInitialReadSize;
-  int ServerMaximumBufferSize;
-
-  int ProxyInitialReadSize;
-  int ProxyMaximumBufferSize;
-
-  int GenericInitialReadSize;
-  int GenericMaximumBufferSize;
-
-  //
-  // Set initial size and resize policy of
-  // transport buffers. If maximum size is
-  // exceeded, print a warning.
-  //
-
-  int TransportXBufferSize;
-  int TransportProxyBufferSize;
-  int TransportGenericBufferSize;
-
-  int TransportXBufferThreshold;
-  int TransportProxyBufferThreshold;
-  int TransportGenericBufferThreshold;
-
-  int TransportMaximumBufferSize;
-
-  //
-  // Flush the data produced for the channel
-  // connection if it exceeds this size.
-  //
-
-  int TransportFlushBufferSize;
-
-  //
-  // Socket options.
-  //
-
-  int OptionProxyKeepAlive;
-  int OptionProxyLowDelay;
-  int OptionProxyClientNoDelay;
-  int OptionProxyServerNoDelay;
-  int OptionClientNoDelay;
-  int OptionServerNoDelay;
-
-  int OptionProxyReceiveBuffer;
-  int OptionClientReceiveBuffer;
-  int OptionServerReceiveBuffer;
-
-  int OptionProxySendBuffer;
-  int OptionClientSendBuffer;
-  int OptionServerSendBuffer;
-
-  int OptionProxyRetryAccept;
-  int OptionProxyRetryConnect;
-  int OptionServerRetryConnect;
-
-  //
-  // Calculate current bitrate on proxy link
-  // using these observation periods. Value
-  // is in milliseconds.  
-  //
-
-  int ShortBitrateTimeFrame;
-  int LongBitrateTimeFrame;
-
-  //
-  // Limit the bandwidth usage of the proxy
-  // link.
-  //
-
-  int LocalBitrateLimit;
-
-  int ClientBitrateLimit;
-  int ServerBitrateLimit;
-  
-  //
-  // This is the limit imposed by user on
-  // total cache size.
-  //
-
-  int ClientTotalStorageSize;
-  int ServerTotalStorageSize;
-
-  int LocalTotalStorageSize;
-  int RemoteTotalStorageSize;
-
-  //
-  // Discard messages in store older than
-  // this amount of seconds.
-  //
-
-  int StoreTimeLimit;
-
-  //
-  // Any new message in store starts with
-  // this amount of hits.
-  //
-
-  int StoreHitsAddBonus;
-
-  //
-  // Unless it is loaded from persistent
-  // cache.
-  //
-
-  int StoreHitsLoadBonus;
-
-  //
-  // Stop increasing hits at this threshold.
-  //
-
-  int StoreHitsLimit;
-
-  //
-  // Give a special weight to messages put or
-  // taken from cache during startup time.
-  //
-
-  int StoreHitsStartup;
-
-  //
-  // Weight of touch and untoch operations.
-  //
-
-  int StoreHitsTouch;
-  int StoreHitsUntouch;
-
-  //
-  // Directives on size of messages to cache.
-  //
-
-  int MinimumMessageSize;
-  int MaximumMessageSize;
-
-  //
-  // Maximum size of a single X request.
-  //
-
-  int MaximumRequestSize;
-
-  //
-  // Currently selected streaming mode.
-  //
-
-  int SplitMode;
-
-  //
-  // Send new split data any given amount of
-  // milliseconds.
-  //
-
-  int SplitTimeout;
-
-  //
-  // Maximum number of distinct messages and
-  // maximum size in bytes of the temporary
-  // storage.
-  //
-
-  int SplitTotalSize;
-  int SplitTotalStorageSize;
-
-  //
-  // Don't split messages smaller that this
-  // threshold and send no more than the
-  // given amount of bytes in a single data
-  // shot when streaming the split messages.
-  //
-
-  int SplitDataThreshold;
-  int SplitDataPacketLimit;
-
-  //
-  // Agent related parameters. These values apply
-  // to the agent which, at startup, must query
-  // the user's settings.
-  //
-
-  int PackMethod;
-  int PackQuality;
-  int HideRender;
-  int TaintReplies;
-  int TaintThreshold;
-
-  //
-  // Do we allow shared memory image support in
-  // client and or server?
-  //
-
-  int ShmemClient;
-  int ShmemServer;
-
-  //
-  // Default size of shared memory segments used
-  // in MIT-SHM support.
-  //
-
-  int ShmemClientSize;
-  int ShmemServerSize;
-
-  //
-  // The user's home directory.
-  //
-
-  char *HomePath;
-
-  //
-  // The ".nx" directory, usually in
-  // the user's home.
-  //
-
-  char *RootPath;
-
-  //
-  // Usually the /usr/NX" directory.
-  //
-
-  char *SystemPath;
-
-  //
-  // Usually the "/tmp" directory.
-  //
-
-  char *TempPath;
-
-  //
-  // The complete path to the client.
-  //
-
-  char *ClientPath;
-
-  //
-  // String containing path of cache
-  // file selected for load or save.
-  //
-
-  char *PersistentCachePath;
-
-  //
-  // Name of selected cache file.
-  //
-
-  char *PersistentCacheName;
-
-  //
-  // Minimum size of cache in memory
-  // to proceed to its storage on disk.
-  //
-
-  int PersistentCacheThreshold;
-
-  //
-  // Is persistent cache enabled?
-  //
-
-  int PersistentCacheEnableLoad;
-  int PersistentCacheEnableSave;
-
-  //
-  // This is used just for test because
-  // it requires that client and server
-  // reside on the same machine.
-  //
-
-  int PersistentCacheCheckOnShutdown;
-
-  //
-  // Load packed image and render extension
-  // message stores. This currently depends
-  // on the type of session.
-  //
-
-  int PersistentCacheLoadPacked;
-  int PersistentCacheLoadRender;
-
-  //
-  // Maximum disk consumption of message
-  // caches on disk.
-  //
-
-  int PersistentCacheDiskLimit;
-
-  //
-  // String containing the base path
-  // of image cache files.
-  //
-
-  char *ImageCachePath;
-
-  //
-  // Is image cache enabled?
-  //
-
-  int ImageCacheEnableLoad;
-  int ImageCacheEnableSave;
-
-  //
-  // Maximum disk consumption of image
-  // caches on disk.
-  //
-
-  int ImageCacheDiskLimit;
-
-  //
-  // Only constructor, destructor
-  // and a few utility functions.
-  //
-
-  Control();
-
-  ~Control();
-
-  //
-  // Should not leverage control to find channel
-  // stores' size limits. As most of values in
-  // control, this info must be moved elsewhere.
-  //
-
-  int getUpperStorageSize() const
-  {
-    return (ClientTotalStorageSize >
-                ServerTotalStorageSize ?
-                    ClientTotalStorageSize :
-                        ServerTotalStorageSize);
-  }
-
-  int getLowerStorageSize() const
-  {
-    return (ClientTotalStorageSize <
-                ServerTotalStorageSize ?
-                    ClientTotalStorageSize :
-                        ServerTotalStorageSize);
-  }
-
-  void setProtoStep(int step);
-
-  int getProtoStep();
-
-  private:
-
-  //
-  // Look in Control.cpp.
-  //
-
-  void setLocalUnpackMethods();
-
-  //
-  // Manage the encoding according
-  // to the protocol version.
-  //
-
-  int protoStep_;
-
-  //
-  // Min and max values allowed for protocol step
-  // depending on protocol version compatibility
-  //
-
-  static const int NX_MIN_PROTO_STEP;
-  static const int NX_MAX_PROTO_STEP;
-
-  //
-  // Check the validity of protocol step
-  //
-
-  bool isValidProtoStep(int step)
-  {
-    return ((step >= NX_MIN_PROTO_STEP) && (step <= NX_MAX_PROTO_STEP));
-  }
-
-};
-
-#endif /* Control_H */
diff --git a/nxcomp/CopyArea.cpp b/nxcomp/CopyArea.cpp
deleted file mode 100644
index 3bff8d60e..000000000
--- a/nxcomp/CopyArea.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "CopyArea.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-int CopyAreaStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                     unsigned int size, int bigEndian) const
-{
-  CopyAreaMessage *copyArea = (CopyAreaMessage *) message;
-
-  //
-  // Here is the fingerprint.
-  //
-
-  copyArea -> src_drawable = GetULONG(buffer + 4, bigEndian); 
-  copyArea -> dst_drawable = GetULONG(buffer + 8, bigEndian); 
-  copyArea -> gcontext     = GetULONG(buffer + 12, bigEndian);
-
-  copyArea -> src_x  = GetUINT(buffer + 16, bigEndian);
-  copyArea -> src_y  = GetUINT(buffer + 18, bigEndian);
-  copyArea -> dst_x  = GetUINT(buffer + 20, bigEndian);
-  copyArea -> dst_y  = GetUINT(buffer + 22, bigEndian);
-
-  copyArea -> width  = GetUINT(buffer + 24, bigEndian);
-  copyArea -> height = GetUINT(buffer + 26, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed Identity for message at " << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int CopyAreaStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                       unsigned int size, int bigEndian) const
-{
-  CopyAreaMessage *copyArea = (CopyAreaMessage *) message;
-
-  //
-  // Fill all the message's fields.
-  //
-
-  PutULONG(copyArea -> src_drawable, buffer + 4, bigEndian);
-  PutULONG(copyArea -> dst_drawable, buffer + 8, bigEndian);
-  PutULONG(copyArea -> gcontext,     buffer + 12, bigEndian);
-
-  PutUINT(copyArea -> src_x, buffer + 16, bigEndian);
-  PutUINT(copyArea -> src_y, buffer + 18, bigEndian);
-  PutUINT(copyArea -> dst_x, buffer + 20, bigEndian);
-  PutUINT(copyArea -> dst_y, buffer + 22, bigEndian);
-
-  PutUINT(copyArea -> width,  buffer + 24, bigEndian);
-  PutUINT(copyArea -> height, buffer + 26, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at " << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void CopyAreaStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  CopyAreaMessage *copyArea = (CopyAreaMessage *) message;
-
-  *logofs << name() << ": Identity src_drawable " << copyArea -> src_drawable 
-          << ", dst_drawable " << copyArea -> dst_drawable << ", gcontext " << copyArea -> gcontext
-          << ", src_x " << copyArea -> src_x << ", src_y " << copyArea -> src_y
-          << ", dst_x " << copyArea -> dst_x << ", dst_y " << copyArea -> dst_y
-          << ", width  " << copyArea -> width << ", height " << copyArea -> height
-          << ", size " << copyArea -> size_ << ".\n";
-
-  #endif
-}
-
-void CopyAreaStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                         unsigned int size, int bigEndian) const
-{
-  md5_append(md5_state_, buffer + 16, 12);
-}
-
-void CopyAreaStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                       const Message *cachedMessage,
-                                           ChannelCache *channelCache) const
-{
-  CopyAreaMessage *copyArea       = (CopyAreaMessage *) message;
-  CopyAreaMessage *cachedCopyArea = (CopyAreaMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << copyArea -> src_drawable
-          << " as " << "src_drawable" << " field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeXidValue(copyArea -> src_drawable, clientCache -> drawableCache);
-
-  cachedCopyArea -> src_drawable = copyArea -> src_drawable;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << copyArea -> dst_drawable
-          << " as " << "dst_drawable" << " field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeXidValue(copyArea -> dst_drawable, clientCache -> drawableCache);
-
-  cachedCopyArea -> dst_drawable = copyArea -> dst_drawable;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << copyArea -> gcontext
-          << " as " << "gcontext" << " field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeXidValue(copyArea -> gcontext, clientCache -> gcCache);
-
-  cachedCopyArea -> gcontext = copyArea -> gcontext;
-}
-
-void CopyAreaStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                       ChannelCache *channelCache) const
-{
-  CopyAreaMessage *copyArea = (CopyAreaMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
-
-  copyArea -> src_drawable = value;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << copyArea -> src_drawable
-          << " as " << "src_drawable" << " field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
-
-  copyArea -> dst_drawable = value;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << copyArea -> dst_drawable
-          << " as " << "dst_drawable" << " field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeXidValue(value, clientCache -> gcCache);
-
-  copyArea -> gcontext = value;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << copyArea -> gcontext
-          << " as gcontext field.\n" << logofs_flush;
-  #endif
-}
-
-
diff --git a/nxcomp/CopyArea.h b/nxcomp/CopyArea.h
deleted file mode 100644
index 6b2617875..000000000
--- a/nxcomp/CopyArea.h
+++ /dev/null
@@ -1,192 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef CopyArea_H
-#define CopyArea_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define COPYAREA_ENABLE_CACHE               1
-#define COPYAREA_ENABLE_DATA                0
-#define COPYAREA_ENABLE_SPLIT               0
-#define COPYAREA_ENABLE_COMPRESS            0
-
-#define COPYAREA_DATA_LIMIT                 0
-#define COPYAREA_DATA_OFFSET                28
-
-#define COPYAREA_CACHE_SLOTS                3000
-#define COPYAREA_CACHE_THRESHOLD            5
-#define COPYAREA_CACHE_LOWER_THRESHOLD      1
-
-//
-// The message class.
-//
-
-class CopyAreaMessage : public Message
-{
-  friend class CopyAreaStore;
-
-  public:
-
-  CopyAreaMessage()
-  {
-  }
-
-  ~CopyAreaMessage()
-  {
-  }
-
-  //
-  // Put here the fields which constitute 
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned int   src_drawable;
-  unsigned int   dst_drawable;
-  unsigned int   gcontext;
-  unsigned short src_x;
-  unsigned short src_y;
-  unsigned short dst_x;
-  unsigned short dst_y;
-  unsigned short width;
-  unsigned short height;
-};
-
-class CopyAreaStore : public MessageStore
-{
-  //
-  // Constructors and destructors.
-  //
-
-  public:
-
-  CopyAreaStore() : MessageStore()
-  {
-    enableCache    = COPYAREA_ENABLE_CACHE;
-    enableData     = COPYAREA_ENABLE_DATA;
-    enableSplit    = COPYAREA_ENABLE_SPLIT;
-    enableCompress = COPYAREA_ENABLE_COMPRESS;
-
-    dataLimit  = COPYAREA_DATA_LIMIT;
-    dataOffset = COPYAREA_DATA_OFFSET;
-
-    cacheSlots          = COPYAREA_CACHE_SLOTS;
-    cacheThreshold      = COPYAREA_CACHE_THRESHOLD;
-    cacheLowerThreshold = COPYAREA_CACHE_LOWER_THRESHOLD;
-
-    messages_ -> resize(cacheSlots);
-
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      *i = NULL;
-    }
-
-    temporary_ = NULL;
-  }
-
-  virtual ~CopyAreaStore()
-  {
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      destroy(*i);
-    }
-
-    destroy(temporary_);
-  }
-
-  virtual const char *name() const
-  {
-    return "CopyArea";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_CopyArea;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(CopyAreaMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  public:
-
-  virtual Message *create() const
-  {
-    return new CopyAreaMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new CopyAreaMessage((const CopyAreaMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (CopyAreaMessage *) message;
-  }
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* CopyArea_H */
diff --git a/nxcomp/CreateGC.cpp b/nxcomp/CreateGC.cpp
deleted file mode 100644
index 30a2f674e..000000000
--- a/nxcomp/CreateGC.cpp
+++ /dev/null
@@ -1,190 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "CreateGC.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int CreateGCStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                     unsigned int size, int bigEndian) const
-{
-  CreateGCMessage *createGC = (CreateGCMessage *) message;
-
-  //
-  // Here is the fingerprint.
-  //
-
-  createGC -> gcontext   = GetULONG(buffer + 4, bigEndian);
-  createGC -> drawable   = GetULONG(buffer + 8, bigEndian);
-  createGC -> value_mask = GetULONG(buffer + 12, bigEndian);
-
-  //
-  // Clear the unused bytes carried in the
-  // payload to increase the effectiveness
-  // of the caching algorithm.
-  //
-
-  if ((int) size > dataOffset)
-  {
-    #ifdef DEBUG
-    *logofs << name() << ": Removing unused bytes from the "
-            << "data payload.\n" << logofs_flush;
-    #endif
-
-    createGC -> value_mask &= (1 << 23) - 1;
-
-    unsigned int mask = 0x1;
-    unsigned char *source = (unsigned char *) buffer + CREATEGC_DATA_OFFSET;
-    unsigned long value = 0;
-
-    for (unsigned int i = 0; i < 23; i++)
-    {
-      if (createGC -> value_mask & mask)
-      {
-        value = GetULONG(source, bigEndian);
-
-        value &= (0xffffffff >> (32 - CREATEGC_FIELD_WIDTH[i]));
-
-        PutULONG(value, source, bigEndian);
-
-        source += 4;
-      }
-
-      mask <<= 1;
-    }
-  }
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed identity for message at "
-          << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int CreateGCStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                       unsigned int size, int bigEndian) const
-{
-  CreateGCMessage *createGC = (CreateGCMessage *) message;
-
-  //
-  // Fill all the message's fields.
-  //
-
-  PutULONG(createGC -> gcontext,   buffer + 4, bigEndian);
-  PutULONG(createGC -> drawable,   buffer + 8, bigEndian);
-  PutULONG(createGC -> value_mask, buffer + 12, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at "
-          << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void CreateGCStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  CreateGCMessage *createGC = (CreateGCMessage *) message;
-
-  *logofs << name() << ": Identity gcontext " << createGC -> gcontext << ", drawable "
-                    << createGC -> drawable << ", value_mask " << createGC -> value_mask
-                    << ", size " << createGC -> size_ << ".\n" << logofs_flush;
-  #endif
-}
-
-void CreateGCStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                         unsigned int size, int bigEndian) const
-{
-  //
-  // This didn't include the drawable
-  // in previous versions.
-  //
-
-  md5_append(md5_state_, buffer + 8, 8);
-}
-
-void CreateGCStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                       const Message *cachedMessage,
-                                           ChannelCache *channelCache) const
-{
-  CreateGCMessage *createGC       = (CreateGCMessage *) message;
-  CreateGCMessage *cachedCreateGC = (CreateGCMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  // Since ProtoStep7 (#issue 108)
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << createGC -> gcontext
-          << " as gcontext field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeNewXidValue(createGC -> gcontext, clientCache -> lastId,
-                     clientCache -> lastIdCache, clientCache -> gcCache,
-                         clientCache -> freeGCCache);
-
-  cachedCreateGC -> gcontext = createGC -> gcontext;
-}
-
-void CreateGCStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                       ChannelCache *channelCache) const
-{
-  CreateGCMessage *createGC = (CreateGCMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  // Since ProtoStep7 (#issue 108)
-  decodeBuffer.decodeNewXidValue(value, clientCache -> lastId,
-                     clientCache -> lastIdCache, clientCache -> gcCache,
-                         clientCache -> freeGCCache);
-
-  createGC -> gcontext = value;
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded value " << createGC -> gcontext
-          << " as gcontext field.\n" << logofs_flush;
-  #endif
-}
diff --git a/nxcomp/CreateGC.h b/nxcomp/CreateGC.h
deleted file mode 100644
index 03e27d685..000000000
--- a/nxcomp/CreateGC.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef CreateGC_H
-#define CreateGC_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define CREATEGC_ENABLE_CACHE               1
-#define CREATEGC_ENABLE_DATA                0
-#define CREATEGC_ENABLE_SPLIT               0
-#define CREATEGC_ENABLE_COMPRESS            0
-
-#define CREATEGC_DATA_LIMIT                 144
-#define CREATEGC_DATA_OFFSET                16
-
-#define CREATEGC_CACHE_SLOTS                2000
-#define CREATEGC_CACHE_THRESHOLD            2
-#define CREATEGC_CACHE_LOWER_THRESHOLD      1
-
-//
-// The message class.
-//
-
-class CreateGCMessage : public Message
-{
-  friend class CreateGCStore;
-
-  public:
-
-  CreateGCMessage()
-  {
-  }
-
-  ~CreateGCMessage()
-  {
-  }
-
-  //
-  // Put here the fields which constitute 
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned int gcontext;
-  unsigned int drawable;
-  unsigned int value_mask;
-};
-
-class CreateGCStore : public MessageStore
-{
-  //
-  // Constructors and destructors.
-  //
-
-  public:
-
-  CreateGCStore() : MessageStore()
-  {
-    enableCache    = CREATEGC_ENABLE_CACHE;
-    enableData     = CREATEGC_ENABLE_DATA;
-    enableSplit    = CREATEGC_ENABLE_SPLIT;
-    enableCompress = CREATEGC_ENABLE_COMPRESS;
-
-    dataLimit  = CREATEGC_DATA_LIMIT;
-    dataOffset = CREATEGC_DATA_OFFSET;
-
-    cacheSlots          = CREATEGC_CACHE_SLOTS;
-    cacheThreshold      = CREATEGC_CACHE_THRESHOLD;
-    cacheLowerThreshold = CREATEGC_CACHE_LOWER_THRESHOLD;
-
-    messages_ -> resize(cacheSlots);
-
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      *i = NULL;
-    }
-
-    temporary_ = NULL;
-  }
-
-  virtual ~CreateGCStore()
-  {
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      destroy(*i);
-    }
-
-    destroy(temporary_);
-  }
-
-  virtual const char *name() const
-  {
-    return "CreateGC";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_CreateGC;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(CreateGCMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  public:
-
-  virtual Message *create() const
-  {
-    return new CreateGCMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new CreateGCMessage((const CreateGCMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (CreateGCMessage *) message;
-  }
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* CreateGC_H */
diff --git a/nxcomp/CreatePixmap.cpp b/nxcomp/CreatePixmap.cpp
deleted file mode 100644
index 93ca38fbb..000000000
--- a/nxcomp/CreatePixmap.cpp
+++ /dev/null
@@ -1,276 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "CreatePixmap.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-#include "WriteBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-//
-// Constructors and destructors.
-//
-
-CreatePixmapStore::CreatePixmapStore()
-
-  : MessageStore()
-{
-  enableCache    = CREATEPIXMAP_ENABLE_CACHE;
-  enableData     = CREATEPIXMAP_ENABLE_DATA;
-  enableSplit    = CREATEPIXMAP_ENABLE_SPLIT;
-  enableCompress = CREATEPIXMAP_ENABLE_COMPRESS;
-
-  dataLimit  = CREATEPIXMAP_DATA_LIMIT;
-  dataOffset = CREATEPIXMAP_DATA_OFFSET;
-
-  cacheSlots          = CREATEPIXMAP_CACHE_SLOTS;
-  cacheThreshold      = CREATEPIXMAP_CACHE_THRESHOLD;
-  cacheLowerThreshold = CREATEPIXMAP_CACHE_LOWER_THRESHOLD;
-
-  messages_ -> resize(cacheSlots);
-
-  for (T_messages::iterator i = messages_ -> begin();
-           i < messages_ -> end(); i++)
-  {
-    *i = NULL;
-  }
-
-  temporary_ = NULL;
-}
-
-CreatePixmapStore::~CreatePixmapStore()
-{
-  for (T_messages::iterator i = messages_ -> begin();
-           i < messages_ -> end(); i++)
-  {
-    destroy(*i);
-  }
-
-  destroy(temporary_);
-}
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int CreatePixmapStore::encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                          const unsigned int size, int bigEndian,
-                                              ChannelCache *channelCache) const
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeCachedValue(*(buffer + 1), 8,
-                     clientCache -> depthCache);
-
-  encodeBuffer.encodeNewXidValue(GetULONG(buffer + 4, bigEndian),
-                     clientCache -> lastId, clientCache -> lastIdCache,
-                         clientCache -> drawableCache,
-                             clientCache -> freeDrawableCache);
-
-  encodeBuffer.encodeXidValue(GetULONG(buffer + 8, bigEndian),
-                     clientCache -> windowCache);
-
-  encodeBuffer.encodeCachedValue(GetUINT(buffer + 12, bigEndian), 16,
-                     clientCache -> createPixmapXCache, 8);
-
-  encodeBuffer.encodeCachedValue(GetUINT(buffer + 14, bigEndian), 16,
-                     clientCache -> createPixmapYCache, 8);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded message. Size is "
-          << size << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int CreatePixmapStore::decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                                          unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
-                                              ChannelCache *channelCache) const
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned char cValue;
-  unsigned int  value;
-
-  size = 16;
-
-  buffer = writeBuffer -> addMessage(size);
-
-  decodeBuffer.decodeCachedValue(cValue, 8,
-                     clientCache -> depthCache);
-
-  *(buffer + 1) = cValue;
-
-  decodeBuffer.decodeNewXidValue(value,
-                     clientCache -> lastId, clientCache -> lastIdCache,
-                         clientCache -> drawableCache,
-                             clientCache -> freeDrawableCache);
-
-  PutULONG(value, buffer + 4, bigEndian);
-
-  decodeBuffer.decodeXidValue(value,
-                     clientCache -> windowCache);
-
-  PutULONG(value, buffer + 8, bigEndian);
-
-  decodeBuffer.decodeCachedValue(value, 16,
-                     clientCache -> createPixmapXCache, 8);
-
-  PutUINT(value, buffer + 12, bigEndian);
-
-  decodeBuffer.decodeCachedValue(value, 16,
-                     clientCache -> createPixmapYCache, 8);
-
-  PutUINT(value, buffer + 14, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded message. Size is "
-          << size << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int CreatePixmapStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                         unsigned int size, int bigEndian) const
-{
-  CreatePixmapMessage *createPixmap = (CreatePixmapMessage *) message;
-
-  createPixmap -> depth = *(buffer + 1);
-
-  createPixmap -> id       = GetULONG(buffer + 4, bigEndian);
-  createPixmap -> drawable = GetULONG(buffer + 8, bigEndian);
-
-  createPixmap -> width  = GetUINT(buffer + 12, bigEndian);
-  createPixmap -> height = GetUINT(buffer + 14, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Parsed identity. Size is "
-          << createPixmap -> size_ << " identity is "
-          << createPixmap -> i_size_ << ".\n"
-          << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int CreatePixmapStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                           unsigned int size, int bigEndian) const
-{
-  CreatePixmapMessage *createPixmap = (CreatePixmapMessage *) message;
-
-  *(buffer + 1) = createPixmap -> depth;
-
-  PutULONG(createPixmap -> id,       buffer + 4, bigEndian);
-  PutULONG(createPixmap -> drawable, buffer + 8, bigEndian);
-
-  PutUINT(createPixmap -> width,  buffer + 12, bigEndian);
-  PutUINT(createPixmap -> height, buffer + 14, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Unparsed identity. Size is "
-          << createPixmap -> size_ << " identity is "
-          << createPixmap -> i_size_ << ".\n"
-          << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void CreatePixmapStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  #ifdef WARNING
-  *logofs << name() << ": WARNING! Dump of identity not implemented.\n"
-          << logofs_flush;
-  #endif
-
-  #endif
-}
-
-void CreatePixmapStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                             unsigned int size, int bigEndian) const
-{
-  md5_append(md5_state_, buffer + 1, 1);
-  md5_append(md5_state_, buffer + 8, 8);
-}
-
-void CreatePixmapStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                           const Message *cachedMessage,
-                                               ChannelCache *channelCache) const
-{
-  CreatePixmapMessage *createPixmap       = (CreatePixmapMessage *) message;
-  CreatePixmapMessage *cachedCreatePixmap = (CreatePixmapMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeNewXidValue(createPixmap -> id,
-                     clientCache -> lastId, clientCache -> lastIdCache,
-                         clientCache -> drawableCache,
-                             clientCache -> freeDrawableCache);
-
-  cachedCreatePixmap -> id = createPixmap -> id;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded update. Size is "
-          << createPixmap -> size_ << " identity is "
-          << createPixmap -> i_size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-
-void CreatePixmapStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                           ChannelCache *channelCache) const
-{
-  CreatePixmapMessage *createPixmap = (CreatePixmapMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeNewXidValue(createPixmap -> id,
-                     clientCache -> lastId, clientCache -> lastIdCache,
-                         clientCache -> drawableCache,
-                             clientCache -> freeDrawableCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded update. Size is "
-          << createPixmap -> size_ << " identity is "
-          << createPixmap -> i_size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
diff --git a/nxcomp/CreatePixmap.h b/nxcomp/CreatePixmap.h
deleted file mode 100644
index 0a3212dd9..000000000
--- a/nxcomp/CreatePixmap.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef CreatePixmap_H
-#define CreatePixmap_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define CREATEPIXMAP_ENABLE_CACHE               1
-#define CREATEPIXMAP_ENABLE_DATA                0
-#define CREATEPIXMAP_ENABLE_SPLIT               0
-#define CREATEPIXMAP_ENABLE_COMPRESS            0
-
-#define CREATEPIXMAP_DATA_LIMIT                 16
-#define CREATEPIXMAP_DATA_OFFSET                16
-
-#define CREATEPIXMAP_CACHE_SLOTS                1000
-#define CREATEPIXMAP_CACHE_THRESHOLD            2
-#define CREATEPIXMAP_CACHE_LOWER_THRESHOLD      1
-
-//
-// The message class.
-//
-
-class CreatePixmapMessage : public Message
-{
-  friend class CreatePixmapStore;
-
-  public:
-
-  CreatePixmapMessage()
-  {
-  }
-
-  ~CreatePixmapMessage()
-  {
-  }
-
-  //
-  // Put here the fields which constitute 
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned char depth;
-
-  unsigned int id;
-  unsigned int drawable;
-
-  unsigned short width;
-  unsigned short height;
-};
-
-class CreatePixmapStore : public MessageStore
-{
-  public:
-
-  CreatePixmapStore();
-
-  virtual ~CreatePixmapStore();
-
-  virtual const char *name() const
-  {
-    return "CreatePixmap";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_CreatePixmap;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(CreatePixmapMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  protected:
-
-  virtual Message *create() const
-  {
-    return new CreatePixmapMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new CreatePixmapMessage((const CreatePixmapMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (CreatePixmapMessage *) message;
-  }
-
-  virtual int encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                 const unsigned int size, int bigEndian,
-                                     ChannelCache *channelCache) const;
-
-  virtual int decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                                 unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
-                                     ChannelCache *channelCache) const;
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer, 
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer, 
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer, 
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* CreatePixmap_H */
diff --git a/nxcomp/DecodeBuffer.cpp b/nxcomp/DecodeBuffer.cpp
deleted file mode 100644
index 456dee249..000000000
--- a/nxcomp/DecodeBuffer.cpp
+++ /dev/null
@@ -1,635 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "Misc.h"
-#include "Control.h"
-
-#include "DecodeBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-DecodeBuffer::DecodeBuffer(const unsigned char *data, unsigned int length)
-
-  : buffer_(data), end_(buffer_ + length), nextSrc_(buffer_), srcMask_(0x80)
-{
-  // Since ProtoStep7 (#issue 108)
-  end_ = buffer_ + length - DECODE_BUFFER_POSTFIX_SIZE;
-}
-
-int DecodeBuffer::decodeValue(unsigned int &value, unsigned int numBits,
-                                  unsigned int blockSize, int endOkay)
-{
-  #ifdef DUMP
-  *logofs << "DecodeBuffer: Decoding " << numBits
-          << " bits value with block " << blockSize
-          << " and " << (nextSrc_ - buffer_)
-          << " bytes in buffer.\n" << logofs_flush;
-  #endif
-
-  unsigned int result = 0;
-  unsigned int destMask = 0x1;
-  unsigned int bitsRead = 0;
-
-  if (blockSize == 0)
-    blockSize = numBits;
-
-  unsigned char nextSrcChar = *nextSrc_;
-  unsigned int numBlocks = 1;
-
-  do
-  {
-    if (numBlocks == 4)
-    {
-      blockSize = numBits;
-    }
-
-    unsigned int bitsToRead = (blockSize > numBits - bitsRead ?
-                                   numBits - bitsRead : blockSize);
-    unsigned int count = 0;
-    unsigned char lastBit;
-
-    do
-    {
-      if (nextSrc_ >= end_)
-      {
-        if (!endOkay)
-        {
-          #ifdef PANIC
-          *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [A] "
-                  << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_)
-                  << " end_ = " << (end_ - buffer_) << ".\n"
-                  << logofs_flush;
-          #endif
-
-          //
-          // Label "context" is just used to identify
-          // the routine which detected the problem in
-          // present source file.
-          //
-
-          cerr << "Error" << ": Failure decoding data in context [A].\n";
-
-          HandleAbort();
-        }
-
-        #ifdef PANIC
-        *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [B] "
-                << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_)
-                << " end_ = " << (end_ - buffer_) << ".\n"
-                << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Failure decoding data in context [B].\n";
-
-        HandleAbort();
-      }
-
-      lastBit = (nextSrcChar & srcMask_);
-
-      if (lastBit)
-        result |= destMask;
-
-      srcMask_ >>= 1;
-
-      if (srcMask_ == 0)
-      {
-        srcMask_ = 0x80;
-        nextSrc_++;
-        nextSrcChar = *nextSrc_;
-      }
-
-      destMask <<= 1;
-    }
-    while (bitsToRead > ++count);
-
-    bitsRead += bitsToRead;
-
-    if (bitsRead < numBits)
-    {
-      if (nextSrc_ >= end_)
-      {
-        if (!endOkay)
-        {
-          #ifdef PANIC
-          *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [C] "
-                  << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_)
-                  << " end_ = " << (end_ - buffer_) << ".\n"
-                  << logofs_flush;
-          #endif
-
-          cerr << "Error" << ": Failure decoding data in context [C].\n";
-
-          HandleAbort();
-        }
-
-        #ifdef PANIC
-        *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [D] "
-                << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_)
-                << " end_ = " << (end_ - buffer_) << ".\n"
-                << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Failure decoding data in context [D].\n";
-
-        HandleAbort();
-      }
-
-      unsigned char moreData = (nextSrcChar & srcMask_);
-
-      srcMask_ >>= 1;
-
-      if (srcMask_ == 0)
-      {
-        srcMask_ = 0x80;
-        nextSrc_++;
-        nextSrcChar = *nextSrc_;
-      }
-
-      if (!moreData)
-      {
-        if (lastBit)
-        {
-          do
-          {
-            result |= destMask;
-            destMask <<= 1;
-          }
-          while (numBits > ++bitsRead);
-        }
-        else
-          bitsRead = numBits;
-      }
-    }
-
-    blockSize >>= 1;
-
-    if (blockSize < 2)
-      blockSize = 2;
-
-    numBlocks++;
-  }
-  while (numBits > bitsRead);
-
-  value = result;
-
-  return 1;
-}
-
-int DecodeBuffer::decodeCachedValue(unsigned int &value, unsigned int numBits,
-                                        IntCache &cache, unsigned int blockSize,
-                                            int endOkay)
-{
-  #ifdef DUMP
-  *logofs << "DecodeBuffer: Decoding " << numBits
-          << " bits cached value with block " << blockSize
-          << " and " << (nextSrc_ - buffer_)
-          << " bytes in buffer.\n" << logofs_flush;
-  #endif
-
-  if (nextSrc_ >= end_)
-  {
-    #ifdef PANIC
-    *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [E] "
-            << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_)
-            << " end_ = " << (end_ - buffer_) << ".\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Failure decoding data in context [E].\n";
-
-    HandleAbort();
-  }
-
-  unsigned int index = 0;
-  unsigned char nextSrcChar = *nextSrc_;
-
-  while (!(nextSrcChar & srcMask_))
-  {
-    index++;
-    srcMask_ >>= 1;
-    if (srcMask_ == 0)
-    {
-      srcMask_ = 0x80;
-      nextSrc_++;
-      if (nextSrc_ >= end_)
-      {
-        if (!endOkay)
-        {
-          #ifdef PANIC
-          *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [F] "
-                  << "in decodeCachedValue() nextSrc_ = "
-                  << (nextSrc_ - buffer_) << " end_ = "
-                  << (end_ - buffer_) << ".\n" << logofs_flush;
-          #endif
-
-          cerr << "Error" << ": Failure decoding data in context [F].\n";
-
-          HandleAbort();
-        }
-
-        #ifdef PANIC
-        *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [G] "
-                << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_)
-                << " end_ = " << (end_ - buffer_) << ".\n"
-                << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Failure decoding data in context [G].\n";
-
-        HandleAbort();
-      }
-
-      nextSrcChar = *nextSrc_;
-    }
-  }
-
-  srcMask_ >>= 1;
-
-  if (srcMask_ == 0)
-  {
-    srcMask_ = 0x80;
-    nextSrc_++;
-  }
-
-  if (index == 2)
-  {
-    // Since ProtoStep8 (#issue 108)
-    blockSize = cache.getBlockSize(blockSize);
-
-    if (decodeValue(value, numBits, blockSize, endOkay))
-    {
-      cache.insert(value, IntMask[numBits]);
-
-      return 1;
-    }
-
-    #ifdef PANIC
-    *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [H] "
-            << "in decodeCacheValue() with no value found.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Failure decoding data in context [H].\n";
-
-    HandleAbort();
-  }
-  else
-  {
-    if (index > 2)
-    {
-      index--;
-    }
-
-    if (index > cache.getSize())
-    {
-      #ifdef PANIC
-      *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [I] "
-              << "in decodeCachedValue() index = " << index
-              << " cache size = " << cache.getSize() << ".\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Failure decoding data in context [I].\n";
-
-      HandleAbort();
-    }
-
-    value = cache.get(index);
-
-    return 1;
-  }
-}
-
-int DecodeBuffer::decodeCachedValue(unsigned char &value, unsigned int numBits,
-                                        CharCache &cache, unsigned int blockSize,
-                                            int endOkay)
-{
-  #ifdef DUMP
-  *logofs << "DecodeBuffer: Decoding " << numBits
-          << " bits char cached value with block " << blockSize
-          << " and " << nextSrc_ - buffer_ << " bytes read out of "
-          << end_ - buffer_ << ".\n" << logofs_flush;
-  #endif
-
-  if (nextSrc_ >= end_)
-  {
-    #ifdef TEST
-    *logofs << "DecodeBuffer: End of buffer reached in context [J] with "
-            << nextSrc_ - buffer_ << " bytes read out of "
-            << end_ - buffer_ << ".\n" << logofs_flush;
-    #endif
-
-    return 0;
-  }
-
-  unsigned int index = 0;
-  unsigned char nextSrcChar = *nextSrc_;
-
-  while (!(nextSrcChar & srcMask_))
-  {
-    index++;
-    srcMask_ >>= 1;
-
-    if (srcMask_ == 0)
-    {
-      srcMask_ = 0x80;
-      nextSrc_++;
-
-      if (nextSrc_ >= end_)
-      {
-        if (!endOkay)
-        {
-          #ifdef PANIC
-          *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [K] "
-                  << "in decodeCachedValue() nextSrc_ "
-                  << (nextSrc_ - buffer_) << " end_ " << (end_ - buffer_)
-                  << ".\n" << logofs_flush;
-          #endif
-
-          cerr << "Error" << ": Failure decoding data in context [K].\n";
-
-          HandleAbort();
-        }
-
-        #ifdef TEST
-        *logofs << "DecodeBuffer: End of buffer reached in context [L] with "
-                << nextSrc_ - buffer_ << " bytes read out of "
-                << end_ - buffer_ << ".\n" << logofs_flush;
-        #endif
-
-        return 0;
-      }
-
-      nextSrcChar = *nextSrc_;
-    }
-  }
-
-  srcMask_ >>= 1;
-
-  if (srcMask_ == 0)
-  {
-    srcMask_ = 0x80;
-    nextSrc_++;
-  }
-
-  if (index == 2)
-  {
-    unsigned int temp;
-
-    if (decodeValue(temp, numBits, blockSize, endOkay))
-    {
-      value = (unsigned char) temp;
-
-      cache.insert(value);
-    }
-    else
-    {
-      #ifdef PANIC
-      *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [M] "
-              << "in decodeValue() with index = 2.\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Failure decoding data in context [M].\n";
-
-      HandleAbort();
-    }
-  }
-  else
-  {
-    if (index > 2)
-    {
-      index--;
-    }
-
-    if (index > cache.getSize())
-    {
-      #ifdef PANIC
-      *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [N] "
-              << "in decodeCachedValue() " << "index = " << index
-              << " cache size = " << cache.getSize() << ".\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Failure decoding data in context [N].\n";
-
-      HandleAbort();
-    }
-
-    value = cache.get(index);
-  }
-
-  return 1;
-}
-
-//
-// Simply returns a pointer to the correct spot in
-// the internal buffer. If the caller needs this
-// data to last beyond the lifetime of the internal
-// buffer, it must copy the data in its own memory.
-//
-
-const unsigned char *DecodeBuffer::decodeMemory(unsigned int numBytes)
-{
-  #ifdef DUMP
-  *logofs << "DecodeBuffer: Decoding " << numBytes
-          << " bytes of memory with " << (nextSrc_ - buffer_)
-          << " bytes in buffer.\n" << logofs_flush;
-  #endif
-
-  const unsigned char *result;     
-
-  //
-  // Force ourselves to a byte boundary.
-  // Is up to application to ensure data
-  // is word alligned when needed.
-  //
-
-  if (srcMask_ != 0x80)
-  {
-    srcMask_ = 0x80;
-    nextSrc_++;
-  }
-
-  result = nextSrc_;
-
-  if (numBytes > DECODE_BUFFER_OVERFLOW_SIZE)
-  {
-    #ifdef PANIC
-    *logofs << "DecodeBuffer: PANIC! Can't decode a buffer of "
-            << numBytes << " bytes with limit set to "
-            << DECODE_BUFFER_OVERFLOW_SIZE << ".\n"
-            << logofs_flush;
-
-    *logofs << "DecodeBuffer: PANIC! Assuming failure decoding "
-            << "data in context [O].\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Should never decode buffer of size "
-         << "greater than " << DECODE_BUFFER_OVERFLOW_SIZE
-         << " bytes.\n";
-
-    cerr << "Error" << ": Assuming failure decoding data in "
-         << "context [O].\n";
-
-    HandleAbort();
-  }
-  else if (end_ - nextSrc_ < (int) numBytes)
-  {
-    #ifdef PANIC
-    *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [P] "
-            << "in decodeMemory() " << "with length " << numBytes
-            << " and " << (end_ - nextSrc_)
-            << " bytes remaining.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Failure decoding data in context [P].\n";
-
-    HandleAbort();
-  }
-
-  nextSrc_ += numBytes;
-
-  return result;
-}
-
-void DecodeBuffer::decodeActionValue(unsigned char &value, unsigned short &position,
-                                         ActionCache &cache)
-{
-  unsigned int t;
-
-  decodeCachedValue(t, 15, *(cache.base_[cache.slot_]));
-
-  cache.last_ += t;
-  cache.last_ &= 0x7fff;
-
-  value = cache.last_ >> 13;
-
-  position = cache.last_ & 0x1fff;
-
-  #ifdef DEBUG
-  *logofs << "DecodeBuffer: Decoded value "
-          << (unsigned) value << " and position "
-          << position << " with base " << cache.slot_
-          << ".\n" << logofs_flush;
-  #endif
-
-  #ifdef DEBUG
-  *logofs << "DecodeBuffer: Action block prediction is "
-          << (*(cache.base_[cache.slot_])).getBlockSize(15)
-          << ".\n" << logofs_flush;
-  #endif
-
-  cache.slot_ = (cache.last_ & 0xff);
-}
-
-void DecodeBuffer::decodeNewXidValue(unsigned int &value, unsigned int &lastId,
-                                         IntCache &lastIdCache, IntCache &cache,
-                                             FreeCache &freeCache)
-{
-  decodeCachedValue(value, 29, lastIdCache);
-
-  lastId += (value + 1);
-  lastId &= 0x1fffffff;
-
-  value = lastId;
-
-  cache.push(value, 0x1fffffff);
-
-  freeCache.push(value, 0x1fffffff);
-}
-
-void DecodeBuffer::decodeNewXidValue(unsigned int &value, unsigned int &lastId,
-                                         IntCache &lastIdCache, XidCache &cache,
-                                             FreeCache &freeCache)
-{
-  decodeCachedValue(value, 29, lastIdCache);
-
-  #ifdef DEBUG
-  *logofs << "DecodeBuffer: Decoded new Xid difference "
-          << value << ".\n" << logofs_flush;
-  #endif
-
-  lastId += (value + 1);
-  lastId &= 0x1fffffff;
-
-  value = lastId;
-
-  unsigned int t = (value - cache.last_);
-
-  cache.last_ = value;
-
-  #ifdef DEBUG
-  *logofs << "DecodeBuffer: Decoded new Xid " << value
-          << " with base " << cache.slot_ << ".\n"
-          << logofs_flush;
-  #endif
-
-  cache.slot_ = (value & 0xff);
-
-  cache.base_[cache.slot_] -> push(t, 0x1fffffff);
-
-  freeCache.push(value, 0x1fffffff);
-}
-
-void DecodeBuffer::decodeXidValue(unsigned int &value, XidCache &cache)
-{
-  unsigned int t;
-
-  decodeCachedValue(t, 29, *(cache.base_[cache.slot_]));
-
-  cache.last_ += t;
-  cache.last_ &= 0x1fffffff;
-
-  value = cache.last_;
-
-  #ifdef DEBUG
-  *logofs << "DecodeBuffer: Decoded Xid " << value
-          << " with base " << cache.slot_ << ".\n"
-          << logofs_flush;
-  #endif
-
-  cache.slot_ = (value & 0xff);
-
-  #ifdef DEBUG
-  *logofs << "DecodeBuffer: Xid block prediction is "
-          << (*(cache.base_[cache.slot_])).getBlockSize(29)
-          << ".\n" << logofs_flush;
-  #endif
-}
-
-void DecodeBuffer::decodeFreeXidValue(unsigned int &value, FreeCache &cache)
-{
-  decodeCachedValue(value, 29, cache);
-}
-
diff --git a/nxcomp/DecodeBuffer.h b/nxcomp/DecodeBuffer.h
deleted file mode 100644
index f5f84c54f..000000000
--- a/nxcomp/DecodeBuffer.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef DecodeBuffer_H
-#define DecodeBuffer_H
-
-#include <string.h>
-
-#include "IntCache.h"
-#include "CharCache.h"
-#include "XidCache.h"
-#include "FreeCache.h"
-#include "OpcodeCache.h"
-#include "ActionCache.h"
-
-#define DECODE_BUFFER_OVERFLOW_SIZE        4194304
-
-#define DECODE_BUFFER_POSTFIX_SIZE         1
-
-class DecodeBuffer
-{
-  public:
-
-  DecodeBuffer(const unsigned char *data, unsigned int length);
-
-  ~DecodeBuffer()
-  {
-  }
-
-  int decodeValue(unsigned int &value, unsigned int numBits,
-                      unsigned int blockSize = 0, int endOkay = 0);
-
-  int decodeCachedValue(unsigned int &value, unsigned int numBits,
-                            IntCache &cache, unsigned int blockSize = 0,
-                                int endOkay = 0);
-
-  int decodeCachedValue(unsigned char &value, unsigned int numBits,
-                            CharCache &cache, unsigned int blockSize = 0,
-                                int endOkay = 0);
-
-  void decodeDiffCachedValue(unsigned int &value, unsigned int &previous,
-                                 unsigned int numBits, IntCache &cache,
-                                     unsigned int blockSize = 0)
-  {
-    decodeCachedValue(value, numBits, cache, blockSize);
-
-    previous += (value + 1);
-    previous &= (0xffffffff >> (32 - numBits));
-
-    value = previous;
-  }
-
-  void decodeBoolValue(unsigned int &value)
-  {
-    decodeValue(value, 1);
-  }
-
-  int decodeOpcodeValue(unsigned char &value, OpcodeCache &cache, int endOkay = 0)
-  {
-    int result = decodeCachedValue(value, 8, cache.base_[cache.slot_], 8, endOkay);
-
-    if (result == 1)
-    {
-      cache.slot_ = value;
-    }
-
-    return result;
-  }
-
-  void decodeActionValue(unsigned char &value, unsigned short &position,
-                             ActionCache &cache);
-
-  void decodeNewXidValue(unsigned int &value, unsigned int &lastId,
-                             IntCache &lastIdCache, IntCache &cache,
-                                 FreeCache &freeCache);
-
-  void decodeNewXidValue(unsigned int &value, unsigned int &lastId,
-                             IntCache &lastIdCache, XidCache &cache,
-                                 FreeCache &freeCache);
-
-  void decodeXidValue(unsigned int &value, XidCache &cache);
-
-  void decodeFreeXidValue(unsigned int &value, FreeCache &cache);
-
-  void decodeTextData(unsigned char *buffer, unsigned int numBytes)
-  {
-    decodeMemory(buffer, numBytes);
-  }
-
-  void decodeIntData(unsigned char *buffer, unsigned int numBytes)
-  {
-    decodeMemory(buffer, numBytes);
-  }
-
-  void decodeLongData(unsigned char *buffer, unsigned int numBytes)
-  {
-    decodeMemory(buffer, numBytes);
-  }
-
-  const unsigned char *decodeMemory(unsigned int numBytes);
-
-  void decodeMemory(unsigned char *buffer, unsigned int numBytes)
-  {
-    memcpy(buffer, decodeMemory(numBytes), numBytes);
-  }
-
-  private:
-
-  const unsigned char *buffer_;
-  const unsigned char *end_;
-  const unsigned char *nextSrc_;
-
-  unsigned char srcMask_;
-};
-
-#endif /* DecodeBuffer_H */
diff --git a/nxcomp/EncodeBuffer.cpp b/nxcomp/EncodeBuffer.cpp
deleted file mode 100644
index a259aacb2..000000000
--- a/nxcomp/EncodeBuffer.cpp
+++ /dev/null
@@ -1,619 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "Misc.h"
-#include "Control.h"
-
-#include "EncodeBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-#define ADVANCE_DEST \
-\
-if (destShift_ == 0) \
-{ \
-  destShift_ = 7; nextDest_++; *nextDest_ = 0; \
-} \
-else \
-{ \
-  destShift_--; \
-}
-
-EncodeBuffer::EncodeBuffer()
-{
-  size_ = ENCODE_BUFFER_DEFAULT_SIZE;
-
-  buffer_ = new unsigned char[size_ + ENCODE_BUFFER_PREFIX_SIZE +
-                                  ENCODE_BUFFER_POSTFIX_SIZE] + ENCODE_BUFFER_PREFIX_SIZE;
-  end_ = buffer_ + size_;
-
-  nextDest_  = buffer_;
-  *nextDest_ = 0;
-  destShift_ = 7;
-
-  lastBits_ = 0;
-
-  initialSize_   = ENCODE_BUFFER_DEFAULT_SIZE;
-  thresholdSize_ = ENCODE_BUFFER_DEFAULT_SIZE << 1;
-  maximumSize_   = ENCODE_BUFFER_DEFAULT_SIZE << 4;
-}
-
-EncodeBuffer::~EncodeBuffer()
-{
-  delete [] (buffer_ - ENCODE_BUFFER_PREFIX_SIZE);
-}
-
-void EncodeBuffer::setSize(unsigned int initialSize, unsigned int thresholdSize,
-                               unsigned int maximumSize)
-{
-  initialSize_   = initialSize;
-  thresholdSize_ = thresholdSize;
-  maximumSize_   = maximumSize;
-
-  #ifdef TEST
-  *logofs << "EncodeBuffer: Set buffer sizes to "
-          << initialSize_ << "/" << thresholdSize_
-          << "/" << maximumSize_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-
-void EncodeBuffer::fullReset()
-{
-  if (size_ > initialSize_)
-  {
-    delete [] (buffer_ - ENCODE_BUFFER_PREFIX_SIZE);
-
-    size_ = initialSize_;
-
-    buffer_ = new unsigned char[size_ + ENCODE_BUFFER_PREFIX_SIZE +
-                                    ENCODE_BUFFER_POSTFIX_SIZE] + ENCODE_BUFFER_PREFIX_SIZE;
-  }
-
-  end_ = buffer_ + size_;
-
-  nextDest_  = buffer_;
-  *nextDest_ = 0;
-  destShift_ = 7;
-
-  lastBits_ = 0;
-}
-
-void EncodeBuffer::encodeValue(unsigned int value, unsigned int numBits,
-                                   unsigned int blockSize)
-{
-  #ifdef DUMP
-  *logofs << "EncodeBuffer: Encoding " << numBits
-          << " bits value with block " << blockSize
-          << " and " << (nextDest_ - buffer_)
-          << " bytes in buffer.\n" << logofs_flush;
-  #endif
-
-  value &= IntMask[numBits];
-
-  unsigned int srcMask = 0x1;
-  unsigned int bitsWritten = 0;
-
-  if (blockSize == 0)
-    blockSize = numBits;
-
-  if (end_ - nextDest_ < 8)
-  {
-    growBuffer();
-  }
-
-  unsigned int numBlocks = 1;
-
-  do
-  {
-    if (numBlocks == 4)
-      blockSize = numBits;
-
-    unsigned int bitsToWrite = (blockSize > numBits - bitsWritten ?
-                                    numBits - bitsWritten : blockSize);
-    unsigned int count = 0;
-    unsigned int lastBit;
-
-    do
-    {
-      lastBit = (value & srcMask);
-      if (lastBit)
-        *nextDest_ |= (1 << destShift_);
-      ADVANCE_DEST;
-      srcMask <<= 1;
-    }
-    while (bitsToWrite > ++count);
-
-    bitsWritten += bitsToWrite;
-
-    if (bitsWritten < numBits)
-    {
-      unsigned int tmpMask = srcMask;
-      unsigned int i = bitsWritten;
-
-      if (lastBit)
-      {
-        do
-        {
-          unsigned int nextBit = (value & tmpMask);
-
-          if (!nextBit)
-            break;
-
-          tmpMask <<= 1;
-        }
-        while (numBits > ++i);
-      }
-      else
-      {
-        do
-        {
-          unsigned int nextBit = (value & tmpMask);
-
-          if (nextBit)
-            break;
-
-          tmpMask <<= 1;
-        }
-        while (numBits > ++i);
-      }
-
-      if (i < numBits)
-        *nextDest_ |= (1 << destShift_);
-      else
-        bitsWritten = numBits;
-
-      ADVANCE_DEST;
-    }
-    blockSize >>= 1;
-
-    if (blockSize < 2)
-      blockSize = 2;
-
-    numBlocks++;
-  }
-  while (numBits > bitsWritten);
-}
-
-void EncodeBuffer::encodeCachedValue(unsigned int value, unsigned int numBits,
-                                         IntCache &cache, unsigned int blockSize)
-{
-  #ifdef DUMP
-  *logofs << "EncodeBuffer: Encoding " << numBits
-          << " bits cached value with block " << blockSize
-          << " and " << (nextDest_ - buffer_)
-          << " bytes in buffer.\n" << logofs_flush;
-  #endif
-
-  value &= IntMask[numBits];
-
-  if (end_ - nextDest_ < 8)
-  {
-    growBuffer();
-  }
-
-  blockSize = cache.getBlockSize(blockSize);
-
-  unsigned int index;
-  unsigned int sameDiff;
-
-  #ifdef DUMP
-
-  diffBits();
-
-  #endif
-
-  if (cache.lookup(value, index, IntMask[numBits], sameDiff))
-  {
-    if (index > 1)
-      index++;
-
-    while (destShift_ < index)
-    {
-      index -= destShift_;
-      index--;
-      destShift_ = 7;
-      nextDest_++;
-      *nextDest_ = 0;
-    }
-
-    destShift_ -= index;
-    *nextDest_ |= (1 << destShift_);
-    ADVANCE_DEST;
-
-    #ifdef DUMP
-    *logofs << "EncodeBuffer: Encoded cached int using "
-            << diffBits() << " bits out of " << numBits
-            << ".\n" << logofs_flush;
-    #endif
-  }
-  else
-  {
-    ADVANCE_DEST;
-    ADVANCE_DEST;
-    *nextDest_ |= (1 << destShift_);
-    ADVANCE_DEST;
-
-    //
-    // The attempt is very seldom successful.
-    // Avoid to encode the additional bool.
-    //
-
-    // Since ProtoStep8 (#issue 108)
-    #ifdef DUMP
-    *logofs << "EncodeBuffer: Encoded missed int using "
-            << diffBits() << " bits out of " << numBits
-            << ".\n" << logofs_flush;
-    #endif
-
-    encodeValue(value, numBits, blockSize);
-  }
-}
-
-void EncodeBuffer::encodeCachedValue(unsigned char value, unsigned int numBits,
-                                         CharCache &cache, unsigned int blockSize)
-{
-  #ifdef DUMP
-  *logofs << "EncodeBuffer: Encoding " << numBits
-          << " bits char cached value with block " << blockSize
-          << " and " << (nextDest_ - buffer_)
-          << " bytes in buffer.\n" << logofs_flush;
-  #endif
-
-  value &= IntMask[numBits];
-
-  if (end_ - nextDest_ < 8)
-  {
-    growBuffer();
-  }
-
-  unsigned int index;
-
-  #ifdef DUMP
-
-  diffBits();
-
-  #endif
-
-  if (cache.lookup(value, index))
-  {
-    if (index > 1)
-      index++;
-
-    while (destShift_ < index)
-    {
-      index -= destShift_;
-      index--;
-      destShift_ = 7;
-      nextDest_++;
-      *nextDest_ = 0;
-    }
-
-    destShift_ -= index;
-    *nextDest_ |= (1 << destShift_);
-    ADVANCE_DEST;
-
-    #ifdef DUMP
-    *logofs << "EncodeBuffer: Encoded cached char using "
-            << diffBits() << " bits out of " << numBits
-            << ".\n" << logofs_flush;
-    #endif
-  }
-  else
-  {
-    ADVANCE_DEST;
-    ADVANCE_DEST;
-    *nextDest_ |= (1 << destShift_);
-    ADVANCE_DEST;
-
-    encodeValue(value, numBits, blockSize);
-
-    #ifdef DUMP
-    *logofs << "EncodeBuffer: Encoded missed char using "
-            << diffBits() << " bits out of " << numBits
-            << ".\n" << logofs_flush;
-    #endif
-  }
-}
-
-void EncodeBuffer::encodeMemory(const unsigned char *buffer, unsigned int numBytes)
-{
-  #ifdef DUMP
-  *logofs << "EncodeBuffer: Encoding " << numBytes
-          << " bytes of memory with " << (nextDest_ - buffer_)
-          << " bytes in buffer.\n" << logofs_flush;
-  #endif
-
-  if (numBytes > ENCODE_BUFFER_OVERFLOW_SIZE)
-  {
-    #ifdef PANIC
-    *logofs << "EncodeBuffer: PANIC! Should never encode buffer "
-            << "of size greater than " << ENCODE_BUFFER_OVERFLOW_SIZE
-            << " bytes.\n" << logofs_flush;
-
-    *logofs << "EncodeBuffer: PANIC! Assuming failure encoding data "
-            << "in context [A].\n" << logofs_flush;
-    #endif
-
-    //
-    // Label "context" is just used to identify
-    // the routine which detected the problem in
-    // present source file.
-    //
-
-    cerr << "Error" << ": Should never encode buffer of size "
-         << "greater than " << ENCODE_BUFFER_OVERFLOW_SIZE
-         << " bytes.\n";
-
-    cerr << "Error" << ": Assuming failure encoding data "
-         << "in context [A].\n" ;
-
-    HandleAbort();
-  }
-
-  alignBuffer();
-
-  if (end_ - nextDest_ < (int) numBytes)
-  {
-    growBuffer(numBytes);
-  }
-
-  memcpy(nextDest_, buffer, numBytes);
-
-  nextDest_ += numBytes;
-
-  if (nextDest_ == end_)
-  {
-    growBuffer();
-  }
-  else if (nextDest_ > end_)
-  {
-    #ifdef PANIC
-    *logofs << "EncodeBuffer: PANIC! Assertion failed. Error [B] "
-            << "in encodeMemory() nextDest_ " << (nextDest_ - buffer)
-            << " end_ " << (end_ - buffer) << ".\n"
-            << logofs_flush;
-    #endif
-
-    //
-    // Label "context" is just used to identify
-    // the routine which detected the problem in
-    // present source file.
-    //
-
-    cerr << "Error" << ": Failure encoding raw data "
-         << "in context [B].\n" ;
-
-    HandleAbort();
-  }
-
-  *nextDest_ = 0; 
-}
-
-unsigned int EncodeBuffer::getLength() const
-{
-  unsigned int length = nextDest_ - buffer_;
-
-  if (destShift_ != 7)
-  {
-    length++;
-  }
-
-  // Since ProtoStep7 (#issue 108)
-  if (length > 0)
-  {
-    return length + ENCODE_BUFFER_POSTFIX_SIZE;
-  }
-
-  return length;
-}
-
-unsigned int EncodeBuffer::diffBits()
-{
-  unsigned int bits = ((nextDest_ - buffer_) << 3);
-
-  bits += (7 - destShift_);
-
-  unsigned int diff = bits - lastBits_;
-
-  lastBits_ = bits;
-
-  return diff;
-}
-
-void EncodeBuffer::growBuffer(unsigned int numBytes)
-{
-  if (numBytes == 0)
-  {
-    numBytes = initialSize_;
-  }
-
-  unsigned int bytesInBuffer = nextDest_ - buffer_;
-
-  unsigned int newSize = thresholdSize_;
-
-  while (newSize < bytesInBuffer + numBytes)
-  {
-    newSize <<= 1;
-
-    if (newSize > maximumSize_)
-    {
-      newSize = bytesInBuffer + numBytes + initialSize_;
-    }
-  }
-
-  unsigned char *newBuffer;
-
-  newBuffer = new unsigned char[newSize + ENCODE_BUFFER_PREFIX_SIZE +
-                                    ENCODE_BUFFER_POSTFIX_SIZE] + ENCODE_BUFFER_PREFIX_SIZE;
-
-  if (newBuffer == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "EncodeBuffer: PANIC! Error in context [C] "
-            << "growing buffer to accommodate " << numBytes
-            << " bytes .\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Error in context [C] "
-         << "growing encode buffer to accommodate "
-         << numBytes << " bytes.\n";
-
-    HandleAbort();
-  }
-
-  #ifdef TEST
-  if (newSize >= maximumSize_)
-  {
-    *logofs << "EncodeBuffer: WARNING! Buffer grown to reach "
-            << "size of " << newSize << " bytes.\n"
-            << logofs_flush;
-  }
-  #endif
-
-  //
-  // Prefix should not contain any valid data.
-  // It is proxy that will fill it with control
-  // messages and data length at the time a new
-  // frame is written to socket.
-  //
-
-  memcpy(newBuffer, buffer_, bytesInBuffer + 1);
-
-  newBuffer[bytesInBuffer + 1] = 0;
-
-  delete [] (buffer_ - ENCODE_BUFFER_PREFIX_SIZE);
-
-  buffer_ = newBuffer;
-  size_   = newSize;
-  end_    = buffer_ + size_;
-
-  nextDest_ = buffer_ + bytesInBuffer;
-}
-
-void EncodeBuffer::alignBuffer()
-{
-  if (destShift_ != 7)
-  {
-    destShift_ = 7;
-    nextDest_++;
-
-    if (nextDest_ >= end_)
-    {
-      growBuffer();
-    }
-    
-    *nextDest_ = 0;
-  }
-}
-
-void EncodeBuffer::encodeActionValue(unsigned char value, unsigned short position,
-                                         ActionCache &cache)
-{
-  unsigned int v = (value << 13) | position;
-
-  unsigned int t = (v - cache.last_);
-
-  encodeCachedValue(t, 15, *(cache.base_[cache.slot_]));
-
-  cache.last_ = v;
-
-  #ifdef DEBUG
-  *logofs << "EncodeBuffer: Encoded value "
-          << (unsigned) value << " and position "
-          << position << " with base " << cache.slot_
-          << ".\n" << logofs_flush;
-  #endif
-
-  cache.slot_ = (cache.last_ & 0xff);
-}
-
-void EncodeBuffer::encodeNewXidValue(unsigned int value, unsigned int &lastId,
-                                         IntCache &lastIdCache, IntCache &cache,
-                                             FreeCache &freeCache)
-{
-  encodeCachedValue((value - 1) - lastId, 29, lastIdCache);
-
-  lastId = value;
-
-  cache.push(value, 0x1fffffff);
-
-  freeCache.push(value, 0x1fffffff);
-}
-
-void EncodeBuffer::encodeNewXidValue(unsigned int value, unsigned int &lastId,
-                                         IntCache &lastIdCache, XidCache &cache,
-                                             FreeCache &freeCache)
-{
-  encodeCachedValue((value - 1) - lastId, 29, lastIdCache);
-
-  lastId = value;
-
-  unsigned int t = (value - cache.last_);
-
-  cache.last_ = value;
-
-  #ifdef DEBUG
-  *logofs << "EncodeBuffer: Encoded new Xid " << value
-          << " with base " << cache.slot_ << ".\n"
-          << logofs_flush;
-  #endif
-
-  cache.slot_ = (value & 0xff);
-
-  cache.base_[cache.slot_] -> push(t, 0x1fffffff);
-
-  freeCache.push(value, IntMask[29]);
-}
-
-void EncodeBuffer::encodeXidValue(unsigned int value, XidCache &cache)
-{
-  unsigned int t = (value - cache.last_);
-
-  encodeCachedValue(t, 29, *(cache.base_[cache.slot_]));
-
-  cache.last_ = value;
-
-  #ifdef DEBUG
-  *logofs << "EncodeBuffer: Encoded Xid " << value
-          << " with base " << cache.slot_ << ".\n"
-          << logofs_flush;
-  #endif
-
-  cache.slot_ = (value & 0xff);
-}
-
-void EncodeBuffer::encodeFreeXidValue(unsigned int value, FreeCache &cache)
-{
-  encodeCachedValue(value, 29, cache);
-}
diff --git a/nxcomp/EncodeBuffer.h b/nxcomp/EncodeBuffer.h
deleted file mode 100644
index 67f6ff093..000000000
--- a/nxcomp/EncodeBuffer.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef EncodeBuffer_H
-#define EncodeBuffer_H
-
-#include "IntCache.h"
-#include "CharCache.h"
-#include "XidCache.h"
-#include "FreeCache.h"
-#include "OpcodeCache.h"
-#include "ActionCache.h"
-
-#define ENCODE_BUFFER_DEFAULT_SIZE        16384
-
-//
-// This should match the maximum size of
-// a single message added to write buffer
-// (see WriteBuffer.h).
-//
-
-#define ENCODE_BUFFER_OVERFLOW_SIZE       4194304
-
-//
-// Adjust for the control messages and the
-// frame length added by the proxy.
-//
-
-#define ENCODE_BUFFER_PREFIX_SIZE         64
-
-//
-// The encode routines may write one byte
-// past the nominal end of the encode buffer.
-// This additional byte is included in the
-// payload. This is actually a harmless bug.
-//
-
-#define ENCODE_BUFFER_POSTFIX_SIZE        1
-
-class EncodeBuffer
-{
-  public:
-
-  EncodeBuffer();
-
-  ~EncodeBuffer();
-
-  void setSize(unsigned int initialSize, unsigned int thresholdSize,
-                   unsigned int maximumSize);
-
-  void encodeValue(unsigned int value, unsigned int numBits,
-                       unsigned int blockSize = 0);
-
-  void encodeCachedValue(unsigned int value, unsigned int numBits,
-                             IntCache &cache, unsigned int blockSize = 0);
-
-  void encodeCachedValue(unsigned char value, unsigned int numBits,
-                             CharCache &cache, unsigned int blockSize = 0);
-
-  void encodeDiffCachedValue(const unsigned int value, unsigned int &previous,
-                                 unsigned int numBits, IntCache &cache,
-                                     unsigned int blockSize = 0)
-  {
-    encodeCachedValue((value - 1) - previous, numBits, cache, blockSize);
-
-    previous = value;
-  }
-
-  void encodeBoolValue(unsigned int value)
-  {
-    encodeValue(value, 1);
-  }
-
-  void encodeOpcodeValue(unsigned char value, OpcodeCache &cache)
-  {
-    encodeCachedValue(value, 8, cache.base_[cache.slot_], 8);
-
-    cache.slot_ = value;
-  }
-
-  void encodeActionValue(unsigned char value, ActionCache &cache)
-  {
-    unsigned short position = 0;
-
-    encodeActionValue(value, position, cache);
-  }
-
-  void encodeActionValue(unsigned char value, unsigned short position,
-                             ActionCache &cache);
-
-  void encodeNewXidValue(unsigned int value, unsigned int &lastId,
-                             IntCache &lastIdCache, IntCache &cache,
-                                 FreeCache &freeCache);
-
-  void encodeNewXidValue(unsigned int value, unsigned int &lastId,
-                             IntCache &lastIdCache, XidCache &cache,
-                                 FreeCache &freeCache);
-
-  void encodeXidValue(unsigned int value, XidCache &cache);
-
-  void encodeFreeXidValue(unsigned int value, FreeCache &cache);
-
-  void encodeTextData(const unsigned char *buffer, unsigned int numBytes)
-  {
-    encodeMemory(buffer, numBytes);
-  }
-
-  void encodeIntData(const unsigned char *buffer, unsigned int numBytes)
-  {
-    encodeMemory(buffer, numBytes);
-  }
-
-  void encodeLongData(const unsigned char *buffer, unsigned int numBytes)
-  {
-    encodeMemory(buffer, numBytes);
-  }
-
-  void encodeMemory(const unsigned char *buffer, unsigned int numBytes);
-
-  unsigned char *getData()
-  {
-    return buffer_;
-  }
-
-  unsigned int getLength() const;
-
-  unsigned int getBits() const
-  {
-    return ((nextDest_ - buffer_) << 3) + (7 - destShift_);
-  }
-
-  unsigned int diffBits();
-
-  void fullReset();
-
-  private:
-
-  void growBuffer(unsigned int numBytes = 0);
-
-  void alignBuffer();
-
-  unsigned int size_;
-  unsigned char *buffer_;
-
-  //
-  // This points to the first byte
-  // just beyond end of the buffer.
-  //
-
-  const unsigned char *end_;
-
-  unsigned char *nextDest_;
-  unsigned int destShift_;
-  unsigned int lastBits_;
-
-  unsigned int initialSize_;
-  unsigned int thresholdSize_;
-  unsigned int maximumSize_;
-};
-
-#endif /* EncodeBuffer_H */
diff --git a/nxcomp/FillPoly.cpp b/nxcomp/FillPoly.cpp
deleted file mode 100644
index 85fa8fdd1..000000000
--- a/nxcomp/FillPoly.cpp
+++ /dev/null
@@ -1,235 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "FillPoly.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int FillPolyStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                     unsigned int size, int bigEndian) const
-{
-  FillPolyMessage *fillPoly = (FillPolyMessage *) message;
-
-  //
-  // Here is the fingerprint.
-  //
-
-  fillPoly -> drawable = GetULONG(buffer + 4, bigEndian);
-  fillPoly -> gcontext = GetULONG(buffer + 8, bigEndian);
-
-  fillPoly -> shape = *(buffer + 12);
-  fillPoly -> mode  = *(buffer + 13);
-
-  // Since ProtoStep8 (#issue 108)
-  if (size >= (unsigned int) dataOffset)
-  {
-    fillPoly -> x_origin = GetUINT(buffer + 16, bigEndian);
-    fillPoly -> y_origin = GetUINT(buffer + 18, bigEndian);
-  }
-  else
-  {
-    fillPoly -> x_origin = 0;
-    fillPoly -> y_origin = 0;
-  }
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed Identity for message at " << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int FillPolyStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                       unsigned int size, int bigEndian) const
-{
-  FillPolyMessage *fillPoly = (FillPolyMessage *) message;
-
-  //
-  // Fill all the message's fields.
-  //
-
-  PutULONG(fillPoly -> drawable, buffer + 4, bigEndian);
-  PutULONG(fillPoly -> gcontext, buffer + 8, bigEndian);
-
-  *(buffer + 12) = fillPoly -> shape;
-  *(buffer + 13) = fillPoly -> mode;
-
-  // Since ProtoStep8 (#issue 108)
-  if (size >= (unsigned int) dataOffset)
-  {
-    PutUINT(fillPoly -> x_origin, buffer + 16, bigEndian);
-    PutUINT(fillPoly -> y_origin, buffer + 18, bigEndian);
-  }
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at " << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void FillPolyStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  FillPolyMessage *fillPoly = (FillPolyMessage *) message;
-
-  *logofs << name() << ": Identity drawable " << fillPoly -> drawable
-                    << ", gcontext " << fillPoly -> gcontext << ", shape "
-                    << fillPoly -> shape << ", mode " << fillPoly -> mode
-                    << fillPoly -> size_ << ", x_origin " << fillPoly -> x_origin
-                    << ", y_origin " << fillPoly -> y_origin << ".\n"
-                    << logofs_flush;
-  #endif
-}
-
-void FillPolyStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                         unsigned int size, int bigEndian) const
-{
-  //
-  // Fields shape, mode.
-  //
-
-  md5_append(md5_state_, buffer + 12, 2);
-}
-
-void FillPolyStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                       const Message *cachedMessage,
-                                           ChannelCache *channelCache) const
-{
-  FillPolyMessage *fillPoly       = (FillPolyMessage *) message;
-  FillPolyMessage *cachedFillPoly = (FillPolyMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << fillPoly -> drawable
-          << " as drawable field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeXidValue(fillPoly -> drawable, clientCache -> drawableCache);
-
-  cachedFillPoly -> drawable = fillPoly -> drawable;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << fillPoly -> gcontext
-          << " as gcontext field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeXidValue(fillPoly -> gcontext, clientCache -> gcCache);
-
-  cachedFillPoly -> gcontext = fillPoly -> gcontext;
-
-  // Since ProtoStep8 (#issue 108)
-  if (fillPoly -> size_ >= dataOffset)
-  {
-    #ifdef TEST
-    *logofs << name() << ": Encoding value " << fillPoly -> x_origin
-        << " as x_origin field.\n" << logofs_flush;
-    #endif
-
-    encodeBuffer.encodeCachedValue(fillPoly -> x_origin, 16,
-                 *clientCache -> fillPolyXAbsCache[0], 8);
-
-    cachedFillPoly -> x_origin = fillPoly -> x_origin;
-
-    #ifdef TEST
-    *logofs << name() << ": Encoding value " << fillPoly -> y_origin
-            << " as y_origin field.\n" << logofs_flush;
-    #endif
-
-    encodeBuffer.encodeCachedValue(fillPoly -> y_origin, 16,
-                 *clientCache -> fillPolyYAbsCache[0], 8);
-
-    cachedFillPoly -> y_origin = fillPoly -> y_origin;
-  }
-}
-
-void FillPolyStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                       ChannelCache *channelCache) const
-{
-  FillPolyMessage *fillPoly = (FillPolyMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeXidValue(fillPoly -> drawable, clientCache -> drawableCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded value " << fillPoly -> drawable
-          << " as drawable field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeXidValue(fillPoly -> gcontext, clientCache -> gcCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded value " << fillPoly -> gcontext
-          << " as gcontext field.\n" << logofs_flush;
-  #endif
-
-  // Since ProtoStep8 (#issue 108)
-  if (fillPoly -> size_ >= dataOffset)
-  {
-    unsigned int value;
-
-    decodeBuffer.decodeCachedValue(value, 16,
-                 *clientCache -> fillPolyXAbsCache[0], 8);
-
-    fillPoly -> x_origin = value;
-
-    #ifdef TEST
-    *logofs << name() << ": Decoded value " << fillPoly -> x_origin
-            << " as x_origin field.\n" << logofs_flush;
-    #endif
-
-    decodeBuffer.decodeCachedValue(value, 16,
-                 *clientCache -> fillPolyYAbsCache[0], 8);
-
-    fillPoly -> y_origin = value;
-
-    #ifdef TEST
-    *logofs << name() << ": Decoded value " << fillPoly -> y_origin
-            << " as y_origin field.\n" << logofs_flush;
-    #endif
-  }
-}
-
-
diff --git a/nxcomp/FillPoly.h b/nxcomp/FillPoly.h
deleted file mode 100644
index 4ceb96c09..000000000
--- a/nxcomp/FillPoly.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef FillPoly_H
-#define FillPoly_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define FILLPOLY_ENABLE_CACHE               1
-#define FILLPOLY_ENABLE_DATA                0
-#define FILLPOLY_ENABLE_SPLIT               0
-#define FILLPOLY_ENABLE_COMPRESS            0
-
-#define FILLPOLY_DATA_LIMIT                 512
-
-#define FILLPOLY_CACHE_SLOTS                2000
-#define FILLPOLY_CACHE_THRESHOLD            3
-#define FILLPOLY_CACHE_LOWER_THRESHOLD      1
-
-#define FILLPOLY_DATA_OFFSET_IF_PROTO_STEP_8    20
-
-//
-// The message class.
-//
-
-class FillPolyMessage : public Message
-{
-  friend class FillPolyStore;
-
-  public:
-
-  FillPolyMessage()
-  {
-  }
-
-  ~FillPolyMessage()
-  {
-  }
-
-  //
-  // Put here the fields which constitute 
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned char shape;
-  unsigned char mode;
-  unsigned int  drawable;
-  unsigned int  gcontext;
-
-  unsigned short x_origin;
-  unsigned short y_origin;
-};
-
-class FillPolyStore : public MessageStore
-{
-  //
-  // Constructors and destructors.
-  //
-
-  public:
-
-  FillPolyStore() : MessageStore()
-  {
-    enableCache    = FILLPOLY_ENABLE_CACHE;
-    enableData     = FILLPOLY_ENABLE_DATA;
-    enableSplit    = FILLPOLY_ENABLE_SPLIT;
-    enableCompress = FILLPOLY_ENABLE_COMPRESS;
-
-    dataLimit  = FILLPOLY_DATA_LIMIT;
-
-    // Since ProtoStep8 (#issue 108)
-    dataOffset = FILLPOLY_DATA_OFFSET_IF_PROTO_STEP_8;
-
-    cacheSlots          = FILLPOLY_CACHE_SLOTS;
-    cacheThreshold      = FILLPOLY_CACHE_THRESHOLD;
-    cacheLowerThreshold = FILLPOLY_CACHE_LOWER_THRESHOLD;
-
-    messages_ -> resize(cacheSlots);
-
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      *i = NULL;
-    }
-
-    temporary_ = NULL;
-  }
-
-  virtual ~FillPolyStore()
-  {
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      destroy(*i);
-    }
-
-    destroy(temporary_);
-  }
-
-  virtual const char *name() const
-  {
-    return "FillPoly";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_FillPoly;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(FillPolyMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  public:
-
-  virtual Message *create() const
-  {
-    return new FillPolyMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new FillPolyMessage((const FillPolyMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (FillPolyMessage *) message;
-  }
-
-  virtual int identitySize(const unsigned char *buffer, unsigned int size)
-  {
-    // Since ProtoStep8 (#issue 108)
-    return (size >= FILLPOLY_DATA_OFFSET_IF_PROTO_STEP_8 ?
-                        FILLPOLY_DATA_OFFSET_IF_PROTO_STEP_8 : size);
-  }
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* FillPoly_H */
diff --git a/nxcomp/Fork.cpp b/nxcomp/Fork.cpp
deleted file mode 100644
index 0120cb4a6..000000000
--- a/nxcomp/Fork.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include <unistd.h>
-
-#include "Fork.h"
-#include "Misc.h"
-#include "Timestamp.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-//
-// Only on Cygwin, retry n times waiting a
-// given amount of milliseconds after each
-// attempt.
-//
-
-#define RETRY_LIMIT    30
-#define RETRY_TIMEOUT  1000
-
-int Fork()
-{
-  #ifdef __CYGWIN32__
-
-  int limit   = RETRY_LIMIT;
-  int timeout = RETRY_TIMEOUT;
-
-  #else
-
-  int limit   = 1;
-  int timeout = 0;
-
-  #endif
-
-  int pid = 0;
-
-  for (int i = 0; i < limit; i++)
-  {
-    #ifdef TEST
-    *logofs << "Fork: Trying at " << strMsTimestamp()
-            << ".\n" << logofs_flush;
-    #endif
-
-    //
-    // It could optionally try again only if the
-    // error code is 11, 'Resource temporarily
-    // unavailable'.
-    //
-
-    if ((pid = fork()) >= 0)
-    {
-      break;
-    }
-    else if (i < limit - 1)
-    {
-      #ifdef WARNING
-      *logofs << "Fork: WARNING! Function fork failed. "
-              << "Error is " << EGET() << " '" << ESTR()
-              << "'. Retrying...\n" << logofs_flush;
-      #endif
-
-      usleep(timeout * 1000);
-    }
-  }
-
-  #ifdef TEST
-
-  if (pid <= 0)
-  {
-    *logofs << "Fork: Returning at " << strMsTimestamp()
-            << ".\n" << logofs_flush;
-  }
-
-  #endif
-
-  return pid;
-}
diff --git a/nxcomp/Fork.h b/nxcomp/Fork.h
deleted file mode 100644
index 94238ed90..000000000
--- a/nxcomp/Fork.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-//
-// Try again if the fork() fails, as it can happen
-// often on Cygwin.
-//
-
-extern int Fork();
diff --git a/nxcomp/FreeCache.h b/nxcomp/FreeCache.h
deleted file mode 100644
index bf5c801e5..000000000
--- a/nxcomp/FreeCache.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef FreeCache_H
-#define FreeCache_H
-
-#include "IntCache.h"
-
-class FreeCache : public IntCache
-{
-  public:
-
-  FreeCache(unsigned int size)
-
-    : IntCache(size)
-  {
-  }
-};
-
-#endif /* FreeCache_H */
diff --git a/nxcomp/GenericChannel.cpp b/nxcomp/GenericChannel.cpp
deleted file mode 100644
index 6fc049e70..000000000
--- a/nxcomp/GenericChannel.cpp
+++ /dev/null
@@ -1,491 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include "GenericChannel.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-#include "StaticCompressor.h"
-
-#include "Statistics.h"
-#include "Proxy.h"
-
-extern Proxy *proxy;
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-//
-// Log the important tracepoints related
-// to writing packets to the peer proxy.
-//
-
-#undef  FLUSH
-
-//
-// Define this to log when a channel
-// is created or destroyed.
-//
-
-#undef  REFERENCES
-
-//
-// Here are the static members.
-//
-
-#ifdef REFERENCES
-
-int GenericChannel::references_ = 0;
-
-#endif
-
-GenericChannel::GenericChannel(Transport *transport, StaticCompressor *compressor)
-
-  : Channel(transport, compressor), readBuffer_(transport_, this)
-{
-  #ifdef REFERENCES
-  *logofs << "GenericChannel: Created new object at " 
-          << this << " for FD#" << fd_ << " out of " 
-          << ++references_ << " allocated channels.\n"
-          << logofs_flush;
-  #endif
-}
-
-GenericChannel::~GenericChannel()
-{
-  #ifdef REFERENCES
-  *logofs << "GenericChannel: Deleted object at " 
-          << this << " for FD#" << fd_ << " out of "
-          << --references_ << " allocated channels.\n"
-          << logofs_flush;
-  #endif
-}
-
-//
-// Beginning of handleRead().
-//
-
-int GenericChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *message,
-                                   unsigned int length)
-{
-  #ifdef TEST
-  *logofs << "handleRead: Called for FD#" << fd_
-          << " with " << encodeBuffer.getLength()
-          << " bytes already encoded.\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // Pointer to located message and
-  // its size in bytes.
-  //
-
-  const unsigned char *inputMessage;
-  unsigned int inputLength;
-
-  //
-  // Tag message as generic data in compression
-  // routine. Opcode is not actually transferred
-  // over the network.
-  //
-
-  unsigned char inputOpcode = X_NXInternalGenericData;
-
-  #if defined(TEST) || defined(INFO)
-  *logofs << "handleRead: Trying to read from FD#"
-          << fd_ << " at " << strMsTimestamp() << ".\n"
-          << logofs_flush;
-  #endif
-
-  int result = readBuffer_.readMessage();
-
-  #ifdef DEBUG
-  *logofs << "handleRead: Read result on FD#" << fd_
-          << " is " << result << ".\n"
-          << logofs_flush;
-  #endif
-
-  if (result < 0)
-  {
-    //
-    // Let the proxy close the channel.
-    //
-
-    return -1;
-  }
-  else if (result == 0)
-  {
-    #if defined(TEST) || defined(INFO)
-
-    *logofs << "handleRead: PANIC! No data read from FD#"
-            << fd_ << " while encoding messages.\n"
-            << logofs_flush;
-
-    HandleCleanup();
-
-    #endif
-
-    return 0;
-  }
-
-  #if defined(TEST) || defined(INFO) || defined(FLUSH)
-  *logofs << "handleRead: Encoding messages for FD#" << fd_
-          << " with " << readBuffer_.getLength() << " bytes "
-          << "in the buffer.\n" << logofs_flush;
-  #endif
-
-  //
-  // Divide the available data in multiple
-  // messages and encode them one by one.
-  //
-
-  if (proxy -> handleAsyncSwitch(fd_) < 0)
-  {
-    return -1;
-  }
-
-  while ((inputMessage = readBuffer_.getMessage(inputLength)) != NULL)
-  {
-    encodeBuffer.encodeValue(inputLength, 32, 14);
-
-    if (isCompressed() == 1)
-    {
-      unsigned int compressedDataSize = 0;
-      unsigned char *compressedData   = NULL;
-
-      if (handleCompress(encodeBuffer, inputOpcode, 0,
-                             inputMessage, inputLength, compressedData,
-                                 compressedDataSize) < 0)
-      {
-        return -1;
-      }
-    }
-    else
-    {
-      encodeBuffer.encodeMemory(inputMessage, inputLength);
-    }
-
-    int bits = encodeBuffer.diffBits();
-
-    #if defined(TEST) || defined(OPCODES)
-    *logofs << "handleRead: Handled generic data for FD#" << fd_
-            << ". " << inputLength << " bytes in, " << bits << " bits ("
-            << ((float) bits) / 8 << " bytes) out.\n" << logofs_flush;
-    #endif
-
-    addProtocolBits(inputLength << 3, bits);
-
-    if (isPrioritized() == 1)
-    {
-      priority_++;
-    }
-
-  } // End of while ((inputMessage = readBuffer_.getMessage(inputLength)) != NULL) ...
-
-  //
-  // All data has been read from the read buffer.
-  // We still need to mark the end of the encode
-  // buffer just before sending the frame. This
-  // allows us to accommodate multiple reads in
-  // a single frame.
-  //
-
-  if (priority_ > 0)
-  {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "handleRead: WARNING! Requesting flush "
-            << "because of " << priority_ << " prioritized "
-            << "messages for FD#" << fd_ << ".\n"
-            << logofs_flush;
-    #endif
-
-    if (proxy -> handleAsyncPriority() < 0)
-    {
-      return -1;
-    }
-
-    //
-    // Reset the priority flag.
-    //
-
-    priority_ = 0;
-  }
-
-  //
-  // Flush if we produced enough data.
-  //
-
-  if (proxy -> canAsyncFlush() == 1)
-  {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "handleRead: WARNING! Requesting flush "
-            << "because of enough data or timeout on the "
-            << "proxy link.\n" << logofs_flush;
-    #endif
-
-    if (proxy -> handleAsyncFlush() < 0)
-    {
-      return -1;
-    }
-  }
-
-  #if defined(TEST) || defined(INFO)
-
-  if (transport_ -> pending() != 0 ||
-          readBuffer_.checkMessage() != 0)
-  {
-    *logofs << "handleRead: PANIC! Buffer for X descriptor FD#"
-            << fd_ << " has " << transport_ -> pending()
-            << " bytes to read.\n" << logofs_flush;
-
-    HandleCleanup();
-  }
-
-  #endif
-
-  //
-  // Reset the read buffer.
-  //
-
-  readBuffer_.fullReset();
-
-  return 1;
-}
-
-//
-// End of handleRead().
-//
-
-//
-// Beginning of handleWrite().
-//
-
-int GenericChannel::handleWrite(const unsigned char *message, unsigned int length)
-{
-  #ifdef TEST
-  *logofs << "handleWrite: Called for FD#" << fd_ << ".\n" << logofs_flush;
-  #endif
-
-  //
-  // Create the buffer from which to 
-  // decode messages.
-  //
-
-  DecodeBuffer decodeBuffer(message, length);
-
-  #if defined(TEST) || defined(INFO) || defined(FLUSH)
-  *logofs << "handleWrite: Decoding messages for FD#" << fd_
-          << " with " << length << " bytes in the buffer.\n"
-          << logofs_flush;
-  #endif
-
-  unsigned char *outputMessage;
-  unsigned int outputLength;
-
-  //
-  // Tag message as generic data
-  // in decompression.
-  //
-
-  unsigned char outputOpcode = X_NXInternalGenericData;
-
-  for (;;)
-  {
-    decodeBuffer.decodeValue(outputLength, 32, 14);
-
-    if (outputLength == 0)
-    {
-      break;
-    }
-
-    if (isCompressed() == 1)
-    {
-      if (writeBuffer_.getAvailable() < outputLength ||
-              (int) outputLength >= control -> TransportFlushBufferSize)
-      {
-        #ifdef DEBUG
-        *logofs << "handleWrite: Using scratch buffer for "
-                << "generic data with size " << outputLength << " and "
-                << writeBuffer_.getLength() << " bytes in buffer.\n"
-                << logofs_flush;
-        #endif
-
-        outputMessage = writeBuffer_.addScratchMessage(outputLength);
-      }
-      else
-      {
-        outputMessage = writeBuffer_.addMessage(outputLength);
-      }
-
-      const unsigned char *compressedData = NULL;
-      unsigned int compressedDataSize = 0;
-
-      int decompressed = handleDecompress(decodeBuffer, outputOpcode, 0,
-                                              outputMessage, outputLength, compressedData,
-                                                  compressedDataSize);
-      if (decompressed < 0)
-      {
-        return -1;
-      }
-    }
-    else
-    {
-      #ifdef DEBUG
-      *logofs << "handleWrite: Using scratch buffer for "
-              << "generic data with size " << outputLength << " and "
-              << writeBuffer_.getLength() << " bytes in buffer.\n"
-              << logofs_flush;
-      #endif
-
-      writeBuffer_.addScratchMessage((unsigned char *)
-                       decodeBuffer.decodeMemory(outputLength), outputLength);
-    }
-
-    #if defined(TEST) || defined(OPCODES)
-    *logofs << "handleWrite: Handled generic data for FD#" << fd_
-            << ". "  << outputLength << " bytes out.\n"
-            << logofs_flush;
-    #endif
-
-    handleFlush(flush_if_needed);
-  }
-
-  //
-  // Write any remaining data to socket.
-  //
-
-  if (handleFlush(flush_if_any) < 0)
-  {
-    return -1;
-  }
-
-  return 1;
-}
-
-//
-// End of handleWrite().
-//
-
-//
-// Other members.
-//
-
-int GenericChannel::handleCompletion(EncodeBuffer &encodeBuffer)
-{
-  //
-  // Add the bits telling to the remote
-  // that all data in the frame has been
-  // encoded.
-  //
-
-  if (encodeBuffer.getLength() > 0)
-  {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "handleCompletion: Writing completion bits with "
-            << encodeBuffer.getLength() << " bytes encoded "
-            << "for FD#" << fd_ << ".\n" << logofs_flush;
-    #endif
-
-    encodeBuffer.encodeValue(0, 32, 14);
-
-    return 1;
-  }
-  #if defined(TEST) || defined(INFO)
-  else
-  {
-    *logofs << "handleCompletion: PANIC! No completion to write "
-            << "for FD#" << fd_ << ".\n" << logofs_flush;
-
-    HandleCleanup();
-  }
-  #endif
-
-  return 0;
-}
-
-int GenericChannel::handleConfiguration()
-{
-  #ifdef TEST
-  *logofs << "GenericChannel: Setting new buffer parameters.\n"
-          << logofs_flush;
-  #endif
-
-  readBuffer_.setSize(control -> GenericInitialReadSize,
-                          control -> GenericMaximumBufferSize);
-
-  writeBuffer_.setSize(control -> TransportGenericBufferSize,
-                           control -> TransportGenericBufferThreshold,
-                               control -> TransportMaximumBufferSize);
-
-  transport_ -> setSize(control -> TransportGenericBufferSize,
-                            control -> TransportGenericBufferThreshold,
-                                control -> TransportMaximumBufferSize);
-
-  return 1;
-}
-
-int GenericChannel::handleFinish()
-{
-  #ifdef TEST
-  *logofs << "GenericChannel: Finishing channel for FD#"
-          << fd_ << ".\n" << logofs_flush;
-  #endif
-
-  congestion_ = 0;
-  priority_   = 0;
-
-  finish_ = 1;
-
-  transport_ -> fullReset();
-
-  return 1;
-}
-
-int GenericChannel::setReferences()
-{
-  #ifdef TEST
-  *logofs << "GenericChannel: Initializing the static "
-          << "members for the generic channels.\n"
-          << logofs_flush;
-  #endif
-
-  #ifdef REFERENCES
-
-  references_ = 0;
-
-  #endif
-
-  return 1;
-}
diff --git a/nxcomp/GenericChannel.h b/nxcomp/GenericChannel.h
deleted file mode 100644
index 3df18f444..000000000
--- a/nxcomp/GenericChannel.h
+++ /dev/null
@@ -1,440 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef GenericChannel_H
-#define GenericChannel_H
-
-#include "Channel.h"
-
-#include "Statistics.h"
-
-#include "GenericReadBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#undef  TEST
-#undef  DEBUG
-
-//
-// Define this to log a line when a channel
-// is created or destroyed.
-//
-
-#undef  REFERENCES
-
-//
-// This class implements the client
-// side compression of X protocol.
-//
-
-class GenericChannel : public Channel
-{
-  public:
-
-  GenericChannel(Transport *transport, StaticCompressor *compressor);
-
-  virtual ~GenericChannel();
-
-  virtual int handleRead(EncodeBuffer &encodeBuffer, const unsigned char *message,
-                             unsigned int length);
-
-  virtual int handleWrite(const unsigned char *message, unsigned int length);
-
-
-  virtual int handleSplit(EncodeBuffer &encodeBuffer, MessageStore *store,
-                              T_store_action action, int position, const unsigned char opcode,
-                                  const unsigned char *buffer, const unsigned int size)
-  {
-    return 0;
-  }
-
-  virtual int handleSplit(DecodeBuffer &decodeBuffer, MessageStore *store,
-                              T_store_action action, int position, unsigned char &opcode,
-                                  unsigned char *&buffer, unsigned int &size)
-  {
-    return 0;
-  }
-
-
-  virtual int handleSplit(EncodeBuffer &encodeBuffer)
-  {
-    return 0;
-  }
-
-  virtual int handleSplit(DecodeBuffer &decodeBuffer)
-  {
-    return 0;
-  }
-
-  virtual int handleSplitEvent(EncodeBuffer &encodeBuffer, Split *split)
-  {
-    return 0;
-  }
-
-  virtual int handleSplitEvent(DecodeBuffer &decodeBuffer)
-  {
-    return 0;
-  }
-
-  virtual int handleMotion(EncodeBuffer &encodeBuffer)
-  {
-    return 0;
-  }
-
-  virtual int handleCompletion(EncodeBuffer &encodeBuffer);
-
-  virtual int handleConfiguration();
-
-  virtual int handleFinish();
-
-  virtual int handleAsyncEvents()
-  {
-    return 0;
-  }
-
-  virtual int needSplit() const
-  {
-    return 0;
-  }
-
-  virtual int needMotion() const
-  {
-    return 0;
-  }
-
-  virtual T_channel_type getType() const = 0;
-
-  //
-  // Initialize the static members.
-  //
-
-  static int setReferences();
-
-  protected:
-
-  //
-  // Generic channels are considered to be
-  // in congestion state as soon as the
-  // socket is blocked for write.
-  //
-
-  virtual int isCongested()
-  {
-    return (transport_ -> blocked() == 1);
-  }
-
-  virtual int isReliable()
-  {
-    return 0;
-  }
-
-  //
-  // Model generic channels' encoding and
-  // decoding policy.
-  //
-
-  virtual int isCompressed() = 0;
-
-  //
-  // Return true if the channel contains
-  // time sensitive data.
-  //
-
-  virtual int isPrioritized() = 0;
-
-  //
-  // Record the protocol bits for the
-  // specific service.
-  //
-
-  virtual void addProtocolBits(unsigned int bitsIn, unsigned int bitsOut) = 0;
-
-  //
-  // Channel's own read buffer.
-  //
-
-  GenericReadBuffer readBuffer_;
-
-  private:
-
-  //
-  // Keep track of object's creation
-  // and deletion.
-  //
-
-  #ifdef REFERENCES
-
-  static int references_;
-
-  #endif
-};
-
-class CupsChannel : public GenericChannel
-{
-  public:
-
-  CupsChannel(Transport *transport, StaticCompressor *compressor)
-
-    : GenericChannel(transport, compressor)
-  {
-  }
-
-  virtual ~CupsChannel()
-  {
-  }
-
-  protected:
-
-  virtual T_channel_type getType() const
-  {
-    return channel_cups;
-  }
-
-  virtual int isCompressed()
-  {
-    // Since ProtoStep8 (#issue 108)
-    return 0;
-  }
-
-  virtual int isPrioritized()
-  {
-    return 0;
-  }
-
-  virtual void addProtocolBits(unsigned int bitsIn,
-                                   unsigned int bitsOut)
-  {
-    statistics -> addCupsBits(bitsIn, bitsOut);
-  }
-};
-
-class SmbChannel : public GenericChannel
-{
-  public:
-
-  SmbChannel(Transport *transport, StaticCompressor *compressor)
-
-    : GenericChannel(transport, compressor)
-  {
-  }
-
-  virtual ~SmbChannel()
-  {
-  }
-
-  protected:
-
-  virtual T_channel_type getType() const
-  {
-    return channel_smb;
-  }
-
-  virtual int isCompressed()
-  {
-    // Since ProtoStep8 (#issue 108)
-    return 0;
-  }
-
-  virtual int isPrioritized()
-  {
-    return 0;
-  }
-
-  virtual void addProtocolBits(unsigned int bitsIn,
-                                   unsigned int bitsOut)
-  {
-    statistics -> addSmbBits(bitsIn, bitsOut);
-  }
-};
-
-class MediaChannel : public GenericChannel
-{
-  public:
-
-  MediaChannel(Transport *transport, StaticCompressor *compressor)
-
-    : GenericChannel(transport, compressor)
-  {
-  }
-
-  virtual ~MediaChannel()
-  {
-  }
-
-  protected:
-
-  virtual T_channel_type getType() const
-  {
-    return channel_media;
-  }
-
-  //
-  // Don't try to compress the media data.
-  //
-
-  virtual int isCompressed()
-  {
-    return 0;
-  }
-
-  //
-  // Reduce the latency of media channels
-  // by setting them as prioritized, even
-  // if this will take away bandwidth from
-  // the X channels.
-  //
-
-  virtual int isPrioritized()
-  {
-    return 1;
-  }
-
-  virtual void addProtocolBits(unsigned int bitsIn,
-                                   unsigned int bitsOut)
-  {
-    statistics -> addMediaBits(bitsIn, bitsOut);
-  }
-};
-
-class HttpChannel : public GenericChannel
-{
-  public:
-
-  HttpChannel(Transport *transport, StaticCompressor *compressor)
-
-    : GenericChannel(transport, compressor)
-  {
-  }
-
-  virtual ~HttpChannel()
-  {
-  }
-
-  protected:
-
-  virtual T_channel_type getType() const
-  {
-    return channel_http;
-  }
-
-  virtual int isCompressed()
-  {
-    // Since ProtoStep8 (#issue 108)
-    return 0;
-  }
-
-  virtual int isPrioritized()
-  {
-    return 0;
-  }
-
-  virtual void addProtocolBits(unsigned int bitsIn,
-                                   unsigned int bitsOut)
-  {
-    statistics -> addHttpBits(bitsIn, bitsOut);
-  }
-};
-
-class FontChannel : public GenericChannel
-{
-  public:
-
-  FontChannel(Transport *transport, StaticCompressor *compressor)
-
-    : GenericChannel(transport, compressor)
-  {
-  }
-
-  virtual ~FontChannel()
-  {
-  }
-
-  protected:
-
-  virtual T_channel_type getType() const
-  {
-    return channel_font;
-  }
-
-  virtual int isCompressed()
-  {
-    // Since ProtoStep8 (#issue 108)
-    return 0;
-  }
-
-  virtual int isPrioritized()
-  {
-    return 1;
-  }
-
-  virtual void addProtocolBits(unsigned int bitsIn,
-                                   unsigned int bitsOut)
-  {
-    statistics -> addFontBits(bitsIn, bitsOut);
-  }
-};
-
-class SlaveChannel : public GenericChannel
-{
-  public:
-
-  SlaveChannel(Transport *transport, StaticCompressor *compressor)
-
-    : GenericChannel(transport, compressor)
-  {
-  }
-
-  virtual ~SlaveChannel()
-  {
-  }
-
-  protected:
-
-  virtual T_channel_type getType() const
-  {
-    return channel_slave;
-  }
-
-  virtual int isCompressed()
-  {
-    return 0;
-  }
-
-  virtual int isPrioritized()
-  {
-    return 0;
-  }
-
-  virtual void addProtocolBits(unsigned int bitsIn,
-                                   unsigned int bitsOut)
-  {
-    statistics -> addSlaveBits(bitsIn, bitsOut);
-  }
-};
-
-#endif /* GenericChannel_H */
diff --git a/nxcomp/GenericReadBuffer.cpp b/nxcomp/GenericReadBuffer.cpp
deleted file mode 100644
index 337ae2f61..000000000
--- a/nxcomp/GenericReadBuffer.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "GenericReadBuffer.h"
-
-#include "GenericChannel.h"
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-unsigned int GenericReadBuffer::suggestedLength(unsigned int pendingLength)
-{
-  //
-  // Always read the initial read size.
-  //
-
-  return 0;
-}  
-
-int GenericReadBuffer::locateMessage(const unsigned char *start,
-                                         const unsigned char *end,
-                                             unsigned int &controlLength,
-                                                 unsigned int &dataLength,
-                                                     unsigned int &trailerLength)
-{
-  //
-  // We don't care about the endianess
-  // in generic channels.
-  //
-
-  unsigned int size = end - start;
-
-  #ifdef TEST
-  *logofs << "GenericReadBuffer: Locating message for FD#"
-          << transport_ -> fd() << " with " << size
-          << " bytes.\n" << logofs_flush;
-  #endif
-
-  if (size == 0)
-  {
-    remaining_ = 1;
-
-    return 0;
-  }
-
-  dataLength = size;
-
-  controlLength = 0;
-  trailerLength = 0;
-
-  remaining_ = 0;
-
-  return 1;
-}
diff --git a/nxcomp/GenericReadBuffer.h b/nxcomp/GenericReadBuffer.h
deleted file mode 100644
index 5ea4d939d..000000000
--- a/nxcomp/GenericReadBuffer.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef GenericReadBuffer_H
-#define GenericReadBuffer_H
-
-#include "ReadBuffer.h"
-#include "Control.h"
-
-class GenericChannel;
-
-class GenericReadBuffer : public ReadBuffer
-{
-  public:
-
-  GenericReadBuffer(Transport *transport, GenericChannel *channel)
-
-    : ReadBuffer(transport), channel_(channel)
-  {
-  }
-
-  virtual ~GenericReadBuffer()
-  {
-  }
-
-  protected:
-
-  virtual unsigned int suggestedLength(unsigned int pendingLength);
-
-  virtual int locateMessage(const unsigned char *start,
-                                const unsigned char *end,
-                                    unsigned int &controlLength,
-                                        unsigned int &dataLength,
-                                            unsigned int &trailerLength);
-
-  GenericChannel *channel_;
-};
-
-#endif /* GenericReadBuffer_H */
diff --git a/nxcomp/GenericReply.cpp b/nxcomp/GenericReply.cpp
deleted file mode 100644
index 3d9a0d638..000000000
--- a/nxcomp/GenericReply.cpp
+++ /dev/null
@@ -1,298 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "GenericReply.h"
-
-#include "ServerCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-#include "WriteBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Constructors and destructors.
-//
-
-GenericReplyStore::GenericReplyStore(StaticCompressor *compressor)
-
-  : MessageStore(compressor)
-{
-  enableCache    = GENERICREPLY_ENABLE_CACHE;
-  enableData     = GENERICREPLY_ENABLE_DATA;
-  enableSplit    = GENERICREPLY_ENABLE_SPLIT;
-
-  // Since ProtoStep7 (#issue 108)
-  enableCompress = GENERICREPLY_ENABLE_COMPRESS_IF_PROTO_STEP_7;
-
-  dataLimit  = GENERICREPLY_DATA_LIMIT;
-  dataOffset = GENERICREPLY_DATA_OFFSET;
-
-  cacheSlots          = GENERICREPLY_CACHE_SLOTS;
-  cacheThreshold      = GENERICREPLY_CACHE_THRESHOLD;
-  cacheLowerThreshold = GENERICREPLY_CACHE_LOWER_THRESHOLD;
-
-  messages_ -> resize(cacheSlots);
-
-  for (T_messages::iterator i = messages_ -> begin();
-           i < messages_ -> end(); i++)
-  {
-    *i = NULL;
-  }
-
-  temporary_ = NULL;
-}
-
-GenericReplyStore::~GenericReplyStore()
-{
-  for (T_messages::iterator i = messages_ -> begin();
-           i < messages_ -> end(); i++)
-  {
-    destroy(*i);
-  }
-
-  destroy(temporary_);
-}
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int GenericReplyStore::encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                          const unsigned int size, int bigEndian,
-                                              ChannelCache *channelCache) const
-{
-  ServerCache *serverCache = (ServerCache *) channelCache;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Encoding full message identity.\n"
-          << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeValue(GetULONG(buffer + 4, bigEndian), 32, 15);
-
-  encodeBuffer.encodeCachedValue(*(buffer + 1), 8,
-                     serverCache -> genericReplyCharCache);
-
-  for (unsigned int i = 0; i < 6; i++)
-  {
-    encodeBuffer.encodeCachedValue(GetULONG(buffer + i * 4 + 8, bigEndian), 32,
-                 *serverCache -> genericReplyIntCache[i]);
-  }
-
-  #ifdef DEBUG
-  *logofs << name() << ": Encoded full message identity.\n"
-          << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int GenericReplyStore::decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                                          unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
-                                              ChannelCache *channelCache) const
-{
-  ServerCache *serverCache = (ServerCache *) channelCache;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoding full message identity.\n"
-          << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeValue(size, 32, 15);
-
-  size = 32 + (size << 2);
-
-  buffer = writeBuffer -> addMessage(size);
-
-  decodeBuffer.decodeCachedValue(*(buffer + 1), 8,
-                     serverCache -> genericReplyCharCache);
-
-  unsigned int value;
-
-  for (unsigned int i = 0; i < 6; i++)
-  {
-    decodeBuffer.decodeCachedValue(value, 32,
-                       *serverCache -> genericReplyIntCache[i]);
-
-    PutULONG(value, buffer + i * 4 + 8, bigEndian);
-  }
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded full message identity.\n"
-          << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int GenericReplyStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                          unsigned int size, int bigEndian) const
-{
-  GenericReplyMessage *genericReply = (GenericReplyMessage *) message;
-
-  genericReply -> byte_data = *(buffer + 1);
-
-  for (int i = 0; i < 12; i++)
-  {
-    genericReply -> short_data[i] = GetUINT(buffer + i * 2 + 8, bigEndian);
-  }
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed identity for message at "
-          << message << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int GenericReplyStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                            unsigned int size, int bigEndian) const
-{
-  GenericReplyMessage *genericReply = (GenericReplyMessage *) message;
-
-  *(buffer + 1) = genericReply -> byte_data;
-
-  for (int i = 0; i < 12; i++)
-  {
-    PutUINT(genericReply -> short_data[i], buffer + i * 2 + 8, bigEndian);
-  }
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at "
-          << message << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void GenericReplyStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  GenericReplyMessage *genericReply = (GenericReplyMessage *) message;
-
-  *logofs << name() << ": Identity byte_data "
-          << (unsigned) genericReply -> byte_data;
-
-  for (int i = 0; i < 12; i++)
-  {
-    *logofs << ", short_data[" << i << "]"
-            << (unsigned) genericReply -> short_data[i];
-  }
-
-  *logofs << ", size " << genericReply -> size_ << ".\n";
-
-  #endif
-}
-
-void GenericReplyStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                              unsigned int size, int bigEndian) const
-{
-}
-
-void GenericReplyStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                            const Message *cachedMessage,
-                                                ChannelCache *channelCache) const
-{
-  //
-  // Encode the variant part.
-  //
-
-  GenericReplyMessage *genericReply       = (GenericReplyMessage *) message;
-  GenericReplyMessage *cachedGenericReply = (GenericReplyMessage *) cachedMessage;
-
-  ServerCache *serverCache = (ServerCache *) channelCache;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value "
-          << (unsigned int) genericReply -> byte_data
-          << " as byte_data field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeCachedValue(genericReply -> byte_data, 8,
-                     serverCache -> genericReplyCharCache);
-
-  cachedGenericReply -> byte_data = genericReply -> byte_data;
-
-  for (unsigned int i = 0; i < 12; i++)
-  {
-    #ifdef TEST
-    *logofs << name() << ": Encoding value " << genericReply -> short_data[i]
-            << " as short_data[" << i << "] field.\n" << logofs_flush;
-    #endif
-
-    encodeBuffer.encodeCachedValue(genericReply -> short_data[i], 16,
-                       *serverCache -> genericReplyIntCache[i]);
-
-    cachedGenericReply -> short_data[i] = genericReply -> short_data[i];
-  }
-}
-
-void GenericReplyStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                            ChannelCache *channelCache) const
-{
-  //
-  // Decode the variant part.
-  //
-
-  GenericReplyMessage *genericReply = (GenericReplyMessage *) message;
-
-  ServerCache *serverCache = (ServerCache *) channelCache;
-
-  decodeBuffer.decodeCachedValue(genericReply -> byte_data, 8,
-               serverCache -> genericReplyCharCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded value "
-          << (unsigned int) genericReply -> byte_data
-          << " as byte_data field.\n" << logofs_flush;
-  #endif
-
-  unsigned int value;
-
-  for (unsigned int i = 0; i < 12; i++)
-  {
-    decodeBuffer.decodeCachedValue(value, 16,
-                 *serverCache -> genericReplyIntCache[i]);
-
-    genericReply -> short_data[i] = (unsigned short) value;
-
-    #ifdef TEST
-    *logofs << name() << ": Decoded value " << genericReply -> short_data[i]
-            << " as short_data[" << i << "] field.\n" << logofs_flush;
-    #endif
-  }
-}
diff --git a/nxcomp/GenericReply.h b/nxcomp/GenericReply.h
deleted file mode 100644
index e899b8467..000000000
--- a/nxcomp/GenericReply.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef GenericReply_H
-#define GenericReply_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define GENERICREPLY_ENABLE_CACHE                       1
-#define GENERICREPLY_ENABLE_DATA                        1
-#define GENERICREPLY_ENABLE_SPLIT                       0
-
-#define GENERICREPLY_DATA_LIMIT                         1048576 - 32
-#define GENERICREPLY_DATA_OFFSET                        32
-
-#define GENERICREPLY_CACHE_SLOTS                        400
-#define GENERICREPLY_CACHE_THRESHOLD                    5
-#define GENERICREPLY_CACHE_LOWER_THRESHOLD              1
-
-#define GENERICREPLY_ENABLE_COMPRESS_IF_PROTO_STEP_7    0
-
-//
-// The message class.
-//
-
-class GenericReplyMessage : public Message
-{
-  friend class GenericReplyStore;
-
-  public:
-
-  GenericReplyMessage()
-  {
-  }
-
-  ~GenericReplyMessage()
-  {
-  }
-
-  //
-  // Put here the fields which constitute the
-  // 'identity' part of the message. Starting
-  // from protocol level 3 we use short data
-  // to increase cache efficiency.
-  //
-
-  private:
-
-  unsigned char  byte_data;
-  unsigned int   int_data[6];
-  unsigned short short_data[12];
-};
-
-class GenericReplyStore : public MessageStore
-{
-  public:
-
-  GenericReplyStore(StaticCompressor *compressor);
-
-  virtual ~GenericReplyStore();
-
-  virtual const char *name() const
-  {
-    return "GenericReply";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_NXInternalGenericReply;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(GenericReplyMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  protected:
-
-  virtual Message *create() const
-  {
-    return new GenericReplyMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new GenericReplyMessage((const GenericReplyMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (GenericReplyMessage *) message;
-  }
-
-  virtual int encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                 const unsigned int size, int bigEndian,
-                                     ChannelCache *channelCache) const;
-
-  virtual int decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                                 unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
-                                     ChannelCache *channelCache) const;
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer, 
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer, 
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer, 
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* GenericReply_H */
diff --git a/nxcomp/GenericRequest.cpp b/nxcomp/GenericRequest.cpp
deleted file mode 100644
index 5c342fcf7..000000000
--- a/nxcomp/GenericRequest.cpp
+++ /dev/null
@@ -1,330 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "GenericRequest.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-#include "WriteBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Constructors and destructors.
-//
-
-GenericRequestStore::GenericRequestStore(StaticCompressor *compressor)
-
-  : MessageStore(compressor)
-{
-  enableCache    = GENERICREQUEST_ENABLE_CACHE;
-  enableData     = GENERICREQUEST_ENABLE_DATA;
-  enableSplit    = GENERICREQUEST_ENABLE_SPLIT;
-
-  // Since ProtoStep7 (#issue 108)
-  enableCompress = GENERICREQUEST_ENABLE_COMPRESS_IF_PROTO_STEP_7;
-
-  dataLimit  = GENERICREQUEST_DATA_LIMIT;
-  dataOffset = GENERICREQUEST_DATA_OFFSET;
-
-  cacheSlots          = GENERICREQUEST_CACHE_SLOTS;
-  cacheThreshold      = GENERICREQUEST_CACHE_THRESHOLD;
-  cacheLowerThreshold = GENERICREQUEST_CACHE_LOWER_THRESHOLD;
-
-  messages_ -> resize(cacheSlots);
-
-  for (T_messages::iterator i = messages_ -> begin();
-           i < messages_ -> end(); i++)
-  {
-    *i = NULL;
-  }
-
-  temporary_ = NULL;
-}
-
-GenericRequestStore::~GenericRequestStore()
-{
-  for (T_messages::iterator i = messages_ -> begin();
-           i < messages_ -> end(); i++)
-  {
-    destroy(*i);
-  }
-
-  destroy(temporary_);
-}
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int GenericRequestStore::encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                            const unsigned int size, int bigEndian,
-                                                ChannelCache *channelCache) const
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Encoding full message identity.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeValue(size >> 2, 16, 10);
-
-  encodeBuffer.encodeCachedValue(*(buffer + 1), 8,
-                     clientCache -> genericRequestOpcodeCache);
-
-  for (unsigned int i = 0; i < 8 && (i * 2 + 4) < size; i++)
-  {
-    #ifdef DEBUG
-    *logofs << name() << ": Encoding data[" << i << "] "
-            << "at position " << i * 2 + 4  << " with value "
-            << GetUINT(buffer + (i * 2) + 4, bigEndian)
-            << ".\n" << logofs_flush;
-    #endif
-
-    encodeBuffer.encodeCachedValue(GetUINT(buffer + (i * 2) + 4, bigEndian), 16,
-                       *clientCache -> genericRequestDataCache[i]);
-  }
-
-  #ifdef DEBUG
-  *logofs << name() << ": Encoded full message identity.\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int GenericRequestStore::decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                                            unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
-                                                ChannelCache *channelCache) const
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoding full message identity.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeValue(size, 16, 10);
-
-  size <<= 2;
-
-  buffer = writeBuffer -> addMessage(size);
-
-  decodeBuffer.decodeCachedValue(*(buffer + 1), 8,
-                     clientCache -> genericRequestOpcodeCache);
-
-  unsigned int value;
-
-  for (unsigned int i = 0; i < 8 && (i * 2 + 4) < size; i++)
-  {
-    decodeBuffer.decodeCachedValue(value, 16,
-                       *clientCache -> genericRequestDataCache[i]);
-
-    #ifdef DEBUG
-    *logofs << name() << ": Decoding data[" << i << "] "
-            << "at position " << i * 2 + 4  << " with value "
-            << value << ".\n" << logofs_flush;
-    #endif
-
-    PutUINT(value, buffer + 4 + (i * 2), bigEndian);
-  }
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded full message identity.\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int GenericRequestStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                           unsigned int size, int bigEndian) const
-{
-  GenericRequestMessage *genericRequest = (GenericRequestMessage *) message;
-
-  genericRequest -> opcode = *(buffer + 1);
-
-  for (unsigned int i = 0; i < 8; i++)
-  {
-    if ((i * 2 + 4) < size)
-    {
-      genericRequest -> data[i] = GetUINT(buffer + i * 2 + 4, bigEndian); 
-
-      #ifdef DEBUG
-      *logofs << name() << ": Parsed data[" << i << "] "
-              << "with value " << genericRequest -> data[i]
-              << ".\n" << logofs_flush;
-      #endif
-    }
-    else
-    {
-      genericRequest -> data[i] = 0;
-    }
-  }
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed identity for message at "
-          << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int GenericRequestStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                             unsigned int size, int bigEndian) const
-{
-  GenericRequestMessage *genericRequest = (GenericRequestMessage *) message;
-
-  *(buffer + 1) = genericRequest -> opcode;
-
-  for (unsigned int i = 0; i < 8 && (i * 2 + 4) < size; i++)
-  {
-    #ifdef DEBUG
-    *logofs << name() << ": Unparsed data[" << i << "] "
-            << "with value " << genericRequest -> data[i]
-            << ".\n" << logofs_flush;
-    #endif
-
-    PutUINT(genericRequest -> data[i], buffer + i * 2 + 4, bigEndian);
-  }
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at "
-          << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void GenericRequestStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  GenericRequestMessage *genericRequest = (GenericRequestMessage *) message;
-
-  *logofs << name() << ": Identity opcode " << (unsigned) genericRequest -> opcode;
-
-  for (int i = 0; i < 8; i++)
-  {
-    *logofs << ", data[" << i << "] " << genericRequest -> data[i];
-  }
-
-  *logofs << ", size " << genericRequest -> size_ << ".\n" << logofs_flush;
-
-  #endif
-}
-
-void GenericRequestStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                               unsigned int size, int bigEndian) const
-{
-  //
-  // As data offset can be beyond the real end of
-  // the message, we need to include the message's
-  // size or we will match any message whose size
-  // is less or equal to the data offset.
-  //
-
-  md5_append(md5_state_, buffer + 2,  2);
-}
-
-void GenericRequestStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                             const Message *cachedMessage,
-                                                 ChannelCache *channelCache) const
-{
-  //
-  // Encode the variant part.
-  //
-
-  GenericRequestMessage *genericRequest       = (GenericRequestMessage *) message;
-  GenericRequestMessage *cachedGenericRequest = (GenericRequestMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef TEST
-  *logofs << name() << ": Updating value "
-          << (unsigned) genericRequest -> opcode
-          << " as opcode field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeCachedValue((unsigned int) genericRequest -> opcode, 8,
-                     clientCache -> genericRequestOpcodeCache);
-
-  cachedGenericRequest -> opcode = genericRequest -> opcode;
-
-  for (int i = 0; i < 8 && (i * 2 + 4) < genericRequest -> size_; i++)
-  {
-    #ifdef TEST
-    *logofs << name() << ": Updating data[" << i << "] "
-            << "with value " << genericRequest -> data[i]
-            << ".\n" << logofs_flush;
-    #endif
-
-    encodeBuffer.encodeCachedValue((unsigned int) genericRequest -> data[i], 16,
-                 *clientCache -> genericRequestDataCache[i]);
-
-    cachedGenericRequest -> data[i] = genericRequest -> data[i];
-  }
-}
-
-void GenericRequestStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                             ChannelCache *channelCache) const
-{
-  GenericRequestMessage *genericRequest = (GenericRequestMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeCachedValue(genericRequest -> opcode, 8,
-                     clientCache -> genericRequestOpcodeCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Updated value "
-          << (unsigned) genericRequest -> opcode
-          << " as opcode field.\n" << logofs_flush;
-  #endif
-
-  unsigned int value;
-
-  for (int i = 0; i < 8 && (i * 2 + 4) < genericRequest -> size_; i++)
-  {
-    decodeBuffer.decodeCachedValue(value, 16,
-                 *clientCache -> genericRequestDataCache[i]);
-
-    genericRequest -> data[i] = (unsigned short) value;
-
-    #ifdef TEST
-    *logofs << name() << ": Updated data[" << i << "] "
-            << "with value " << genericRequest -> data[i]
-            << ".\n" << logofs_flush;
-    #endif
-  }
-}
diff --git a/nxcomp/GenericRequest.h b/nxcomp/GenericRequest.h
deleted file mode 100644
index 13ffea718..000000000
--- a/nxcomp/GenericRequest.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef GenericRequest_H
-#define GenericRequest_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define GENERICREQUEST_ENABLE_CACHE                      1
-#define GENERICREQUEST_ENABLE_DATA                       1
-#define GENERICREQUEST_ENABLE_SPLIT                      0
-
-#define GENERICREQUEST_DATA_LIMIT                        262144 - 20
-#define GENERICREQUEST_DATA_OFFSET                       20
-
-#define GENERICREQUEST_CACHE_SLOTS                       400
-#define GENERICREQUEST_CACHE_THRESHOLD                   5
-#define GENERICREQUEST_CACHE_LOWER_THRESHOLD             1
-
-#define GENERICREQUEST_ENABLE_COMPRESS_IF_PROTO_STEP_7   0
-
-//
-// The message class.
-//
-
-class GenericRequestMessage : public Message
-{
-  friend class GenericRequestStore;
-
-  public:
-
-  GenericRequestMessage()
-  {
-  }
-
-  ~GenericRequestMessage()
-  {
-  }
-
-  //
-  // Note that we consider for this message a data offset
-  // of 4 (or 20 starting from protocol 3). Bytes from 9
-  // to 20, if present, are taken as part of identity and
-  // encoded through an array of int caches.
-  //
-
-  private:
-
-  unsigned char  opcode;
-  unsigned short data[8];
-};
-
-class GenericRequestStore : public MessageStore
-{
-  public:
-
-  GenericRequestStore(StaticCompressor *compressor);
-
-  virtual ~GenericRequestStore();
-
-  virtual const char *name() const
-  {
-    return "GenericRequest";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_NXInternalGenericRequest;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(GenericRequestMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  public:
-
-  virtual Message *create() const
-  {
-    return new GenericRequestMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new GenericRequestMessage((const GenericRequestMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (GenericRequestMessage *) message;
-  }
-
-  virtual int encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                 const unsigned int size, int bigEndian,
-                                     ChannelCache *channelCache) const;
-
-  virtual int decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                                 unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
-                                     ChannelCache *channelCache) const;
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* GenericRequest_H */
diff --git a/nxcomp/GetImage.cpp b/nxcomp/GetImage.cpp
deleted file mode 100644
index f6481b61c..000000000
--- a/nxcomp/GetImage.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "GetImage.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int GetImageStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                     unsigned int size, int bigEndian) const
-{
-  GetImageMessage *getImage = (GetImageMessage *) message;
-
-  //
-  // Here is the fingerprint.
-  //
-
-  getImage -> format = *(buffer + 1);
-
-  #ifdef TEST
-  if (getImage -> format != 1 && getImage -> format != 2)
-  {
-    *logofs << name() << ": WARNING! Dirty value " << getImage -> format 
-            << " for field format.\n" << logofs_flush;
-  }
-  #endif
-
-  getImage -> drawable = GetULONG(buffer + 4, bigEndian);
-
-  getImage -> x      = GetUINT(buffer + 8, bigEndian);
-  getImage -> y      = GetUINT(buffer + 10, bigEndian);
-  getImage -> width  = GetUINT(buffer + 12, bigEndian);
-  getImage -> height = GetUINT(buffer + 14, bigEndian);
-
-  getImage -> plane_mask = GetULONG(buffer + 16, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed Identity for message at " << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int GetImageStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                       unsigned int size, int bigEndian) const
-{
-  GetImageMessage *getImage = (GetImageMessage *) message;
-
-  //
-  // Fill all the message's fields.
-  //
-
-  *(buffer + 1) = getImage -> format;
-
-  PutULONG(getImage -> drawable, buffer + 4,  bigEndian);
-
-  PutUINT(getImage -> x,      buffer + 8,  bigEndian);
-  PutUINT(getImage -> y,      buffer + 10, bigEndian);
-  PutUINT(getImage -> width,  buffer + 12, bigEndian);
-  PutUINT(getImage -> height, buffer + 14, bigEndian);
-
-  PutULONG(getImage -> plane_mask, buffer + 16,  bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at " << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void GetImageStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  GetImageMessage *getImage = (GetImageMessage *) message;
-
-  *logofs << name() << ": Identity format " << (unsigned) getImage -> format 
-          << ", drawable " << getImage -> drawable << ", x " << getImage -> x 
-          << ", y " << getImage -> y << ", width " << getImage -> width 
-          << ", height " << getImage -> height << ", plane_mask " 
-          << getImage -> plane_mask << ", size " << getImage -> size_
-          << ".\n" << logofs_flush;
-
-  #endif
-}
-
-void GetImageStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                         unsigned int size, int bigEndian) const
-{
-  md5_append(md5_state_, buffer + 1,  1);
-  md5_append(md5_state_, buffer + 8,  2);
-  md5_append(md5_state_, buffer + 10, 2);
-  md5_append(md5_state_, buffer + 12, 2);
-  md5_append(md5_state_, buffer + 14, 2);
-  md5_append(md5_state_, buffer + 16, 4);
-}
-
-void GetImageStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                       const Message *cachedMessage,
-                                           ChannelCache *channelCache) const
-{
-  GetImageMessage *getImage       = (GetImageMessage *) message;
-  GetImageMessage *cachedGetImage = (GetImageMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << getImage -> drawable
-          << " as drawable field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeXidValue(getImage -> drawable, clientCache -> drawableCache);
-
-  cachedGetImage -> drawable = getImage -> drawable;
-}
-
-void GetImageStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                       ChannelCache *channelCache) const
-{
-  GetImageMessage *getImage = (GetImageMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
-
-  getImage -> drawable = value;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << getImage -> drawable
-          << " as drawable field.\n" << logofs_flush;
-  #endif
-}
-
diff --git a/nxcomp/GetImage.h b/nxcomp/GetImage.h
deleted file mode 100644
index 1c3558d14..000000000
--- a/nxcomp/GetImage.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef GetImage_H
-#define GetImage_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define GETIMAGE_ENABLE_CACHE               1
-#define GETIMAGE_ENABLE_DATA                0
-#define GETIMAGE_ENABLE_SPLIT               0
-#define GETIMAGE_ENABLE_COMPRESS            0
-
-#define GETIMAGE_DATA_LIMIT                 0
-#define GETIMAGE_DATA_OFFSET                20
-
-#define GETIMAGE_CACHE_SLOTS                200
-#define GETIMAGE_CACHE_THRESHOLD            1
-#define GETIMAGE_CACHE_LOWER_THRESHOLD      0
-
-//
-// The message class.
-//
-
-class GetImageMessage : public Message
-{
-  friend class GetImageStore;
-
-  public:
-
-  GetImageMessage()
-  {
-  }
-
-  ~GetImageMessage()
-  {
-  }
-
-  //
-  // Put here the fields which constitute 
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned char      format;
-  unsigned int       drawable;
-  unsigned short int x;
-  unsigned short int y;
-  unsigned short int width;
-  unsigned short int height;
-  unsigned int       plane_mask;
-};
-
-class GetImageStore : public MessageStore
-{
-  //
-  // Constructors and destructors.
-  //
-
-  public:
-
-  GetImageStore() : MessageStore()
-  {
-    enableCache    = GETIMAGE_ENABLE_CACHE;
-    enableData     = GETIMAGE_ENABLE_DATA;
-    enableSplit    = GETIMAGE_ENABLE_SPLIT;
-    enableCompress = GETIMAGE_ENABLE_COMPRESS;
-
-    dataLimit  = GETIMAGE_DATA_LIMIT;
-    dataOffset = GETIMAGE_DATA_OFFSET;
-
-    cacheSlots          = GETIMAGE_CACHE_SLOTS;
-    cacheThreshold      = GETIMAGE_CACHE_THRESHOLD;
-    cacheLowerThreshold = GETIMAGE_CACHE_LOWER_THRESHOLD;
-
-    messages_ -> resize(cacheSlots);
-
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      *i = NULL;
-    }
-
-    temporary_ = NULL;
-  }
-
-  virtual ~GetImageStore()
-  {
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      destroy(*i);
-    }
-
-    destroy(temporary_);
-  }
-
-  virtual const char *name() const
-  {
-    return "GetImage";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_GetImage;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(GetImageMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  public:
-
-  virtual Message *create() const
-  {
-    return new GetImageMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new GetImageMessage((const GetImageMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (GetImageMessage *) message;
-  }
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* GetImage_H */
diff --git a/nxcomp/GetImageReply.cpp b/nxcomp/GetImageReply.cpp
deleted file mode 100644
index 9b99d38e7..000000000
--- a/nxcomp/GetImageReply.cpp
+++ /dev/null
@@ -1,190 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "GetImageReply.h"
-
-#include "ServerCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Constructors and destructors.
-//
-
-GetImageReplyStore::GetImageReplyStore(StaticCompressor *compressor)
-
-  : MessageStore(compressor)
-{
-  enableCache    = GETIMAGEREPLY_ENABLE_CACHE;
-  enableData     = GETIMAGEREPLY_ENABLE_DATA;
-  enableSplit    = GETIMAGEREPLY_ENABLE_SPLIT;
-
-  // Since ProtoStep7 (#issue 108)
-  enableCompress = GETIMAGEREPLY_ENABLE_COMPRESS_IF_PROTO_STEP_7;
-
-  dataLimit  = GETIMAGEREPLY_DATA_LIMIT;
-  dataOffset = GETIMAGEREPLY_DATA_OFFSET;
-
-  cacheSlots          = GETIMAGEREPLY_CACHE_SLOTS;
-  cacheThreshold      = GETIMAGEREPLY_CACHE_THRESHOLD;
-  cacheLowerThreshold = GETIMAGEREPLY_CACHE_LOWER_THRESHOLD;
-
-  messages_ -> resize(cacheSlots);
-
-  for (T_messages::iterator i = messages_ -> begin();
-           i < messages_ -> end(); i++)
-  {
-    *i = NULL;
-  }
-
-  temporary_ = NULL;
-}
-
-GetImageReplyStore::~GetImageReplyStore()
-{
-  for (T_messages::iterator i = messages_ -> begin();
-           i < messages_ -> end(); i++)
-  {
-    destroy(*i);
-  }
-
-  destroy(temporary_);
-}
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int GetImageReplyStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                          unsigned int size, int bigEndian) const
-{
-  GetImageReplyMessage *getImageReply = (GetImageReplyMessage *) message;
-
-  //
-  // Here is the fingerprint.
-  //
-
-  getImageReply -> depth = *(buffer + 1);
-
-  getImageReply -> visual = GetULONG(buffer + 8, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed identity for message at "
-          << message << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int GetImageReplyStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                            unsigned int size, int bigEndian) const
-{
-  GetImageReplyMessage *getImageReply = (GetImageReplyMessage *) message;
-
-  //
-  // Fill all the message's fields.
-  //
-
-  *(buffer + 1) = getImageReply -> depth;
-
-  PutULONG(getImageReply -> visual, buffer + 8, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at "
-          << message << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void GetImageReplyStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  GetImageReplyMessage *getImageReply = (GetImageReplyMessage *) message;
-
-  *logofs << name() << ": Identity depth " << (unsigned) getImageReply -> depth
-          << ",  visual " << getImageReply -> visual << ", size "
-          << getImageReply -> size_ << ".\n";
-
-  #endif
-}
-
-void GetImageReplyStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                              unsigned int size, int bigEndian) const
-{
-  //
-  // Field depth.
-  //
-
-  md5_append(md5_state_, buffer + 1,  1);
-}
-
-void GetImageReplyStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                            const Message *cachedMessage,
-                                                ChannelCache *channelCache) const
-{
-  //
-  // Encode the variant part.
-  //
-
-  GetImageReplyMessage *getImageReply = (GetImageReplyMessage *) message;
-
-  ServerCache *serverCache = (ServerCache *) channelCache;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << getImageReply -> visual
-          << " as visual field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeCachedValue(getImageReply -> visual, 29, 
-                     serverCache -> visualCache);
-}
-
-void GetImageReplyStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                            ChannelCache *channelCache) const
-{
-  //
-  // Decode the variant part.
-  //
-
-  GetImageReplyMessage *getImageReply = (GetImageReplyMessage *) message;
-
-  ServerCache *serverCache = (ServerCache *) channelCache;
-
-  decodeBuffer.decodeCachedValue(getImageReply -> visual, 29, 
-                     serverCache -> visualCache);
-}
diff --git a/nxcomp/GetImageReply.h b/nxcomp/GetImageReply.h
deleted file mode 100644
index d4f7c4267..000000000
--- a/nxcomp/GetImageReply.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef GetImageReply_H
-#define GetImageReply_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define GETIMAGEREPLY_ENABLE_CACHE                       1
-#define GETIMAGEREPLY_ENABLE_DATA                        1
-#define GETIMAGEREPLY_ENABLE_SPLIT                       0
-
-#define GETIMAGEREPLY_DATA_LIMIT                         1048576 - 32
-#define GETIMAGEREPLY_DATA_OFFSET                        32
-
-#define GETIMAGEREPLY_CACHE_SLOTS                        1000
-#define GETIMAGEREPLY_CACHE_THRESHOLD                    20
-#define GETIMAGEREPLY_CACHE_LOWER_THRESHOLD              2
-
-#define GETIMAGEREPLY_ENABLE_COMPRESS_IF_PROTO_STEP_7    0
-
-//
-// The message class.
-//
-
-class GetImageReplyMessage : public Message
-{
-  friend class GetImageReplyStore;
-
-  public:
-
-  GetImageReplyMessage()
-  {
-  }
-
-  ~GetImageReplyMessage()
-  {
-  }
-
-  //
-  // Put here the fields which constitute 
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned char depth;
-  unsigned int  visual;
-};
-
-class GetImageReplyStore : public MessageStore
-{
-  public:
-
-  GetImageReplyStore(StaticCompressor *compressor);
-
-  virtual ~GetImageReplyStore();
-
-  virtual const char *name() const
-  {
-    return "GetImageReply";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_GetImage;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(GetImageReplyMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  protected:
-
-  virtual Message *create() const
-  {
-    return new GetImageReplyMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new GetImageReplyMessage((const GetImageReplyMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (GetImageReplyMessage *) message;
-  }
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer, 
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer, 
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer, 
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* GetImageReply_H */
diff --git a/nxcomp/GetProperty.cpp b/nxcomp/GetProperty.cpp
deleted file mode 100644
index a79ebd64a..000000000
--- a/nxcomp/GetProperty.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "GetProperty.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int GetPropertyStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                        unsigned int size, int bigEndian) const
-{
-  GetPropertyMessage *getProperty = (GetPropertyMessage *) message;
-
-  //
-  // Here is the fingerprint.
-  //
-
-  getProperty -> property_delete = *(buffer + 1);
-
-  getProperty -> window          = GetULONG(buffer + 4,  bigEndian);
-  getProperty -> property        = GetULONG(buffer + 8,  bigEndian);
-  getProperty -> type            = GetULONG(buffer + 12, bigEndian);
-  getProperty -> long_offset     = GetULONG(buffer + 16, bigEndian);
-  getProperty -> long_length     = GetULONG(buffer + 20, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed identity for message at " << message << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int GetPropertyStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                          unsigned int size, int bigEndian) const
-{
-
-  GetPropertyMessage *getProperty = (GetPropertyMessage *) message;
-
-  //
-  // Fill all the message's fields.
-  //
-
-  *(buffer + 1) = getProperty -> property_delete;
-
-  PutULONG(getProperty -> window,      buffer + 4,  bigEndian);
-  PutULONG(getProperty -> property,    buffer + 8,  bigEndian);
-  PutULONG(getProperty -> type,        buffer + 12, bigEndian);
-  PutULONG(getProperty -> long_offset, buffer + 16, bigEndian);
-  PutULONG(getProperty -> long_length, buffer + 20, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at " << message << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void GetPropertyStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  GetPropertyMessage *getProperty = (GetPropertyMessage *) message;
-
-  *logofs << name() << ": Identity property_delete " << (unsigned int) getProperty -> property_delete
-          << ", window " << getProperty -> window << ", property " << getProperty -> property
-          << ", type " << getProperty -> type << ", long-offset " << getProperty -> long_offset
-          << ", long-length " << getProperty -> long_length << ".\n" << logofs_flush;
-
-  #endif
-}
-
-void GetPropertyStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                            unsigned int size, int bigEndian) const
-{
-  md5_append(md5_state_, buffer + 1, 1);
-  md5_append(md5_state_, buffer + 4, 20);
-}
diff --git a/nxcomp/GetProperty.h b/nxcomp/GetProperty.h
deleted file mode 100644
index 46727280b..000000000
--- a/nxcomp/GetProperty.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef GetProperty_H
-#define GetProperty_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define GETPROPERTY_ENABLE_CACHE               1
-#define GETPROPERTY_ENABLE_DATA                0
-#define GETPROPERTY_ENABLE_SPLIT               0
-#define GETPROPERTY_ENABLE_COMPRESS            0
-
-#define GETPROPERTY_DATA_LIMIT                 0
-#define GETPROPERTY_DATA_OFFSET                24
-
-#define GETPROPERTY_CACHE_SLOTS                2000
-#define GETPROPERTY_CACHE_THRESHOLD            2
-#define GETPROPERTY_CACHE_LOWER_THRESHOLD      1
-
-//
-// The message class.
-//
-
-class GetPropertyMessage : public Message
-{
-  friend class GetPropertyStore;
-
-  public:
-
-  GetPropertyMessage()
-  {
-  }
-
-  ~GetPropertyMessage()
-  {
-  }
-
-  //
-  // Put here the fields which constitute 
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned char  property_delete;
-  unsigned long  window;
-  unsigned long  property;
-  unsigned long  type;
-  unsigned long  long_offset;
-  unsigned long  long_length;
-};
-
-class GetPropertyStore : public MessageStore
-{
-
-  //
-  // Constructors and destructors.
-  //
-
-  public:
-
-  GetPropertyStore() : MessageStore()
-  {
-    enableCache    = GETPROPERTY_ENABLE_CACHE;
-    enableData     = GETPROPERTY_ENABLE_DATA;
-    enableSplit    = GETPROPERTY_ENABLE_SPLIT;
-    enableCompress = GETPROPERTY_ENABLE_COMPRESS;
-
-    dataLimit  = GETPROPERTY_DATA_LIMIT;
-    dataOffset = GETPROPERTY_DATA_OFFSET;
-
-    cacheSlots          = GETPROPERTY_CACHE_SLOTS;
-    cacheThreshold      = GETPROPERTY_CACHE_THRESHOLD;
-    cacheLowerThreshold = GETPROPERTY_CACHE_LOWER_THRESHOLD;
-
-    messages_ -> resize(cacheSlots);
-
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      *i = NULL;
-    }
-
-    temporary_ = NULL;
-  }
-
-  virtual ~GetPropertyStore()
-  {
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      destroy(*i);
-    }
-
-    destroy(temporary_);
-  }
-
-  virtual const char *name() const
-  {
-    return "GetProperty";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_GetProperty;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(GetPropertyMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  protected:
-
-  virtual Message *create() const
-  {
-    return new GetPropertyMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new GetPropertyMessage((const GetPropertyMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (GetPropertyMessage *) message;
-  }
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* GetProperty_H */
diff --git a/nxcomp/GetPropertyReply.cpp b/nxcomp/GetPropertyReply.cpp
deleted file mode 100644
index 2d0657a4a..000000000
--- a/nxcomp/GetPropertyReply.cpp
+++ /dev/null
@@ -1,300 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "GetPropertyReply.h"
-
-#include "ServerCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-#include "WriteBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Constructors and destructors.
-//
-
-GetPropertyReplyStore::GetPropertyReplyStore(StaticCompressor *compressor)
-
-  : MessageStore(compressor)
-{
-  enableCache    = GETPROPERTYREPLY_ENABLE_CACHE;
-  enableData     = GETPROPERTYREPLY_ENABLE_DATA;
-  enableSplit    = GETPROPERTYREPLY_ENABLE_SPLIT;
-
-  // Since ProtoStep7 (#issue 108)
-  enableCompress = GETPROPERTYREPLY_ENABLE_COMPRESS_IF_PROTO_STEP_7;
-
-  dataLimit  = GETPROPERTYREPLY_DATA_LIMIT;
-  dataOffset = GETPROPERTYREPLY_DATA_OFFSET;
-
-  cacheSlots          = GETPROPERTYREPLY_CACHE_SLOTS;
-  cacheThreshold      = GETPROPERTYREPLY_CACHE_THRESHOLD;
-  cacheLowerThreshold = GETPROPERTYREPLY_CACHE_LOWER_THRESHOLD;
-
-  messages_ -> resize(cacheSlots);
-
-  for (T_messages::iterator i = messages_ -> begin();
-           i < messages_ -> end(); i++)
-  {
-    *i = NULL;
-  }
-
-  temporary_ = NULL;
-}
-
-GetPropertyReplyStore::~GetPropertyReplyStore()
-{
-  for (T_messages::iterator i = messages_ -> begin();
-           i < messages_ -> end(); i++)
-  {
-    destroy(*i);
-  }
-
-  destroy(temporary_);
-}
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int GetPropertyReplyStore::encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                              const unsigned int size, int bigEndian,
-                                                  ChannelCache *channelCache) const
-{
-  ServerCache *serverCache = (ServerCache *) channelCache;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Encoding full message identity.\n"
-          << logofs_flush;
-  #endif
-
-  unsigned char format = (unsigned int) *(buffer + 1);
-
-  encodeBuffer.encodeCachedValue(format, 8,
-                     serverCache -> getPropertyFormatCache);
-
-  unsigned int numBytes = GetULONG(buffer + 16, bigEndian);
-
-  encodeBuffer.encodeValue(numBytes, 32, 9);
-
-  if (format == 16)
-  {
-    numBytes <<= 1;
-  }
-  else if (format == 32)
-  {
-    numBytes <<= 2;
-  }
-
-  encodeBuffer.encodeCachedValue(GetULONG(buffer + 8, bigEndian), 29,
-                     serverCache -> getPropertyTypeCache, 9);
-
-  encodeBuffer.encodeValue(GetULONG(buffer + 12, bigEndian), 32, 9);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Encoded full message identity.\n"
-          << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int GetPropertyReplyStore::decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                                              unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
-                                                  ChannelCache *channelCache) const
-{
-  ServerCache *serverCache = (ServerCache *) channelCache;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoding full message identity.\n"
-          << logofs_flush;
-  #endif
-
-  unsigned char format;
-
-  decodeBuffer.decodeCachedValue(format, 8,
-                     serverCache -> getPropertyFormatCache);
-
-  unsigned int length;
-
-  decodeBuffer.decodeValue(length, 32, 9);
-
-  unsigned int numBytes = length;
-
-  if (format == 16)
-  {
-    numBytes <<= 1;
-  }
-  else if (format == 32)
-  {
-    numBytes <<= 2;
-  }
-
-  size = 32 + RoundUp4(numBytes);
-
-  buffer = writeBuffer -> addMessage(size);
-
-  *(buffer + 1) = format;
-
-  PutULONG(length, buffer + 16, bigEndian);
-
-  unsigned int value;
-
-  decodeBuffer.decodeCachedValue(value, 29,
-                     serverCache -> getPropertyTypeCache, 9);
-
-  PutULONG(value, buffer + 8, bigEndian);
-
-  decodeBuffer.decodeValue(value, 32, 9);
-
-  PutULONG(value, buffer + 12, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded full message identity.\n"
-          << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int GetPropertyReplyStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                             unsigned int size, int bigEndian) const
-{
-  GetPropertyReplyMessage *getPropertyReply = (GetPropertyReplyMessage *) message;
-
-  getPropertyReply -> format = *(buffer + 1);
-
-  getPropertyReply -> type  = GetULONG(buffer + 8,  bigEndian);
-  getPropertyReply -> after = GetULONG(buffer + 12, bigEndian);
-  getPropertyReply -> items = GetULONG(buffer + 16, bigEndian);
-
-  //
-  // Cleanup the padding bytes.
-  //
-
-  unsigned int uiLengthInBytes;
-  unsigned int uiFormat;
-
-  if ((int) size > GETPROPERTYREPLY_DATA_OFFSET)
-  {
-    uiLengthInBytes = getPropertyReply -> items;
-
-    uiFormat = *(buffer + 1);
-
-    #ifdef DEBUG
-    *logofs << name() << ": length " << uiLengthInBytes
-            << ", format " << uiFormat << ", size "
-            << size << ".\n" << logofs_flush;
-    #endif
-
-    if (uiFormat == 16)
-    {
-      uiLengthInBytes <<= 1;
-    }
-    else if (uiFormat == 32)
-    {
-      uiLengthInBytes <<= 2;
-    }
-
-    unsigned char *end = ((unsigned char *) buffer) + size;
-    unsigned char *pad = ((unsigned char *) buffer) + GETPROPERTYREPLY_DATA_OFFSET + uiLengthInBytes;
-
-    CleanData((unsigned char *) pad, end - pad);
-  }
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed identity for message at "
-          << message << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int GetPropertyReplyStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                               unsigned int size, int bigEndian) const
-{
-  GetPropertyReplyMessage *getPropertyReply = (GetPropertyReplyMessage *) message;
-
-  *(buffer + 1) = getPropertyReply -> format;
-
-  PutULONG(getPropertyReply -> type,  buffer + 8,  bigEndian);
-  PutULONG(getPropertyReply -> after, buffer + 12, bigEndian);
-  PutULONG(getPropertyReply -> items, buffer + 16, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at "
-          << message << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void GetPropertyReplyStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  GetPropertyReplyMessage *getPropertyReply = (GetPropertyReplyMessage *) message;
-
-  *logofs << name() << ": Identity format "
-          << (unsigned) getPropertyReply -> format << ", type "
-          << getPropertyReply -> type << ", after " << getPropertyReply -> after
-          << ", items " << getPropertyReply -> items << ", size "
-          << getPropertyReply -> size_ << ".\n";
-
-  #endif
-}
-
-void GetPropertyReplyStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                                 unsigned int size, int bigEndian) const
-{
-  //
-  // Fields format, type, after, items.
-  //
-
-  md5_append(md5_state_, buffer + 1, 1);
-  md5_append(md5_state_, buffer + 8, 12);
-}
-
-void GetPropertyReplyStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                               const Message *cachedMessage,
-                                                ChannelCache *channelCache) const
-{
-}
-
-void GetPropertyReplyStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                               ChannelCache *channelCache) const
-{
-}
diff --git a/nxcomp/GetPropertyReply.h b/nxcomp/GetPropertyReply.h
deleted file mode 100644
index 01634b408..000000000
--- a/nxcomp/GetPropertyReply.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef GetPropertyReply_H
-#define GetPropertyReply_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define GETPROPERTYREPLY_ENABLE_CACHE                       1
-#define GETPROPERTYREPLY_ENABLE_DATA                        1
-#define GETPROPERTYREPLY_ENABLE_SPLIT                       0
-
-#define GETPROPERTYREPLY_DATA_LIMIT                         1048576 - 32
-#define GETPROPERTYREPLY_DATA_OFFSET                        32
-
-#define GETPROPERTYREPLY_CACHE_SLOTS                        400
-#define GETPROPERTYREPLY_CACHE_THRESHOLD                    5
-#define GETPROPERTYREPLY_CACHE_LOWER_THRESHOLD              1
-
-#define GETPROPERTYREPLY_ENABLE_COMPRESS_IF_PROTO_STEP_7    0
-
-//
-// The message class.
-//
-
-class GetPropertyReplyMessage : public Message
-{
-  friend class GetPropertyReplyStore;
-
-  public:
-
-  GetPropertyReplyMessage()
-  {
-  }
-
-  ~GetPropertyReplyMessage()
-  {
-  }
-
-  //
-  // Put here the fields which constitute 
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned char format;
-  unsigned int  type;
-  unsigned int  after;
-  unsigned int  items;
-};
-
-class GetPropertyReplyStore : public MessageStore
-{
-  public:
-
-  GetPropertyReplyStore(StaticCompressor *compressor);
-
-  virtual ~GetPropertyReplyStore();
-
-  virtual const char *name() const
-  {
-    return "GetPropertyReply";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_GetProperty;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(GetPropertyReplyMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  protected:
-
-  virtual Message *create() const
-  {
-    return new GetPropertyReplyMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new GetPropertyReplyMessage((const GetPropertyReplyMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (GetPropertyReplyMessage *) message;
-  }
-
-  virtual int encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                 const unsigned int size, int bigEndian,
-                                     ChannelCache *channelCache) const;
-
-  virtual int decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                                 unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
-                                     ChannelCache *channelCache) const;
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer, 
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer, 
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer, 
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* GetPropertyReply_H */
diff --git a/nxcomp/ImageText16.cpp b/nxcomp/ImageText16.cpp
deleted file mode 100644
index f3315d4ba..000000000
--- a/nxcomp/ImageText16.cpp
+++ /dev/null
@@ -1,227 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "ImageText16.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int ImageText16Store::parseIdentity(Message *message, const unsigned char *buffer,
-                                       unsigned int size, int bigEndian) const
-{
-  ImageText16Message *imageText16 = (ImageText16Message *) message;
-
-  //
-  // Here is the fingerprint.
-  //
-
-  imageText16 -> len = *(buffer + 1); 
-
-  imageText16 -> drawable = GetULONG(buffer + 4, bigEndian); 
-  imageText16 -> gcontext = GetULONG(buffer + 8, bigEndian);
-
-  imageText16 -> x  = GetUINT(buffer + 12, bigEndian);
-  imageText16 -> y  = GetUINT(buffer + 14, bigEndian);
-
-  if ((int) size > dataOffset)
-  {
-    int pad = (size - dataOffset) - (imageText16 -> len * 2);
- 
-    if (pad > 0)
-    {
-      CleanData((unsigned char *) buffer + size - pad, pad);
-    }
-  }
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed Identity for message at " << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int ImageText16Store::unparseIdentity(const Message *message, unsigned char *buffer,
-                                         unsigned int size, int bigEndian) const
-{
-  ImageText16Message *imageText16 = (ImageText16Message *) message;
-
-  //
-  // Fill all the message's fields.
-  //
-
-  *(buffer + 1) = imageText16 -> len;
-
-  PutULONG(imageText16 -> drawable, buffer + 4, bigEndian);
-  PutULONG(imageText16 -> gcontext, buffer + 8, bigEndian);
-
-  PutUINT(imageText16 -> x, buffer + 12, bigEndian);
-  PutUINT(imageText16 -> y, buffer + 14, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at " << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void ImageText16Store::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  ImageText16Message *imageText16 = (ImageText16Message *) message;
-
-  *logofs << name() << ": Identity len " << (unsigned int) imageText16 -> len
-          << " drawable " << imageText16 -> drawable << ", gcontext " 
-          << imageText16 -> gcontext << ", x " << imageText16 -> x << ", y " 
-          << imageText16 -> y << ", size " << imageText16 -> size_ << ".\n";
-
-  #endif
-}
-
-void ImageText16Store::identityChecksum(const Message *message, const unsigned char *buffer,
-                                           unsigned int size, int bigEndian) const
-{
-  md5_append(md5_state_, buffer + 1,  1);
-}
-
-void ImageText16Store::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                         const Message *cachedMessage,
-                                             ChannelCache *channelCache) const
-{
-  ImageText16Message *imageText16       = (ImageText16Message *) message;
-  ImageText16Message *cachedImageText16 = (ImageText16Message *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << imageText16 -> drawable
-          << " as " << "drawable" << " field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeXidValue(imageText16 -> drawable, clientCache -> drawableCache);
-
-  cachedImageText16 -> drawable = imageText16 -> drawable;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << imageText16 -> gcontext
-          << " as " << "gcontext" << " field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeXidValue(imageText16 -> gcontext, clientCache -> gcCache);
-
-  cachedImageText16 -> gcontext = imageText16 -> gcontext;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << imageText16 -> x
-          << " as " << "x" << " field.\n" << logofs_flush;
-  #endif
-
-  unsigned short int diff_x = imageText16 -> x - cachedImageText16 -> x;
-
-  encodeBuffer.encodeCachedValue(diff_x, 16,
-                     clientCache -> imageTextCacheX);
-
-  cachedImageText16 -> x = imageText16 -> x;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << imageText16 -> y
-          << " as " << "y" << " field.\n" << logofs_flush;
-  #endif
-
-  unsigned short int diff_y = imageText16 -> y - cachedImageText16 -> y;
-
-  encodeBuffer.encodeCachedValue(diff_y, 16,
-                     clientCache -> imageTextCacheY);
-
-  cachedImageText16 -> y = imageText16 -> y;
-}
-
-void ImageText16Store::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                           ChannelCache *channelCache) const
-{
-  ImageText16Message *imageText16 = (ImageText16Message *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
-
-  imageText16 -> drawable = value;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << imageText16 -> drawable
-          << " as " << "drawable" << " field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeXidValue(value, clientCache -> gcCache);
-
-  imageText16 -> gcontext = value;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << imageText16 -> gcontext
-          << " as gcontext field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeCachedValue(value, 16,
-               clientCache -> imageTextCacheX);
-
-  imageText16 -> x += value;
-  imageText16 -> x &= 0xffff;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << imageText16 -> x
-          << " as x field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeCachedValue(value, 16,
-               clientCache -> imageTextCacheY);
-
-  imageText16 -> y += value;
-  imageText16 -> y &= 0xffff;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << imageText16 -> y
-          << " as y field.\n" << logofs_flush;
-  #endif
-}
-
-
diff --git a/nxcomp/ImageText16.h b/nxcomp/ImageText16.h
deleted file mode 100644
index 98462ab35..000000000
--- a/nxcomp/ImageText16.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef ImageText16_H
-#define ImageText16_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define IMAGETEXT16_ENABLE_CACHE               1
-#define IMAGETEXT16_ENABLE_DATA                0
-#define IMAGETEXT16_ENABLE_SPLIT               0
-#define IMAGETEXT16_ENABLE_COMPRESS            0
-
-#define IMAGETEXT16_DATA_LIMIT                 512
-#define IMAGETEXT16_DATA_OFFSET                16
-
-#define IMAGETEXT16_CACHE_SLOTS                3000
-#define IMAGETEXT16_CACHE_THRESHOLD            5
-#define IMAGETEXT16_CACHE_LOWER_THRESHOLD      1
-
-//
-// The message class.
-//
-
-class ImageText16Message : public Message
-{
-  friend class ImageText16Store;
-
-  public:
-
-  ImageText16Message()
-  {
-  }
-
-  ~ImageText16Message()
-  {
-  }
-
-  //
-  // Put here the fields which constitute 
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned char len;
-
-  unsigned int drawable;
-  unsigned int gcontext;
-
-  unsigned short x;
-  unsigned short y;
-};
-
-class ImageText16Store : public MessageStore
-{
-  //
-  // Constructors and destructors.
-  //
-
-  public:
-
-  ImageText16Store() : MessageStore()
-  {
-    enableCache    = IMAGETEXT16_ENABLE_CACHE;
-    enableData     = IMAGETEXT16_ENABLE_DATA;
-    enableSplit    = IMAGETEXT16_ENABLE_SPLIT;
-    enableCompress = IMAGETEXT16_ENABLE_COMPRESS;
-
-    dataLimit  = IMAGETEXT16_DATA_LIMIT;
-    dataOffset = IMAGETEXT16_DATA_OFFSET;
-
-    cacheSlots           = IMAGETEXT16_CACHE_SLOTS;
-    cacheThreshold       = IMAGETEXT16_CACHE_THRESHOLD;
-    cacheLowerThreshold  = IMAGETEXT16_CACHE_LOWER_THRESHOLD;
-
-    messages_ -> resize(cacheSlots);
-
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      *i = NULL;
-    }
-
-    temporary_ = NULL;
-  }
-
-  virtual ~ImageText16Store()
-  {
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      destroy(*i);
-    }
-
-    destroy(temporary_);
-  }
-
-  virtual const char *name() const
-  {
-    return "ImageText16";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_ImageText16;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(ImageText16Message);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  public:
-
-  virtual Message *create() const
-  {
-    return new ImageText16Message();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new ImageText16Message((const ImageText16Message &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (ImageText16Message *) message;
-  }
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-				unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* ImageText16_H */
diff --git a/nxcomp/ImageText8.cpp b/nxcomp/ImageText8.cpp
deleted file mode 100644
index b0d6ac44e..000000000
--- a/nxcomp/ImageText8.cpp
+++ /dev/null
@@ -1,227 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "ImageText8.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int ImageText8Store::parseIdentity(Message *message, const unsigned char *buffer,
-                                       unsigned int size, int bigEndian) const
-{
-  ImageText8Message *imageText8 = (ImageText8Message *) message;
-
-  //
-  // Here is the fingerprint.
-  //
-
-  imageText8 -> len = *(buffer + 1); 
-
-  imageText8 -> drawable = GetULONG(buffer + 4, bigEndian); 
-  imageText8 -> gcontext = GetULONG(buffer + 8, bigEndian);
-
-  imageText8 -> x  = GetUINT(buffer + 12, bigEndian);
-  imageText8 -> y  = GetUINT(buffer + 14, bigEndian);
-
-  if ((int) size > dataOffset)
-  {
-    int pad = (size - dataOffset) - imageText8 -> len;
- 
-    if (pad > 0)
-    {
-      CleanData((unsigned char *) buffer + size - pad, pad);
-    }
-  }
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed Identity for message at " << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int ImageText8Store::unparseIdentity(const Message *message, unsigned char *buffer,
-                                         unsigned int size, int bigEndian) const
-{
-  ImageText8Message *imageText8 = (ImageText8Message *) message;
-
-  //
-  // Fill all the message's fields.
-  //
-
-  *(buffer + 1) = imageText8 -> len;
-
-  PutULONG(imageText8 -> drawable, buffer + 4, bigEndian);
-  PutULONG(imageText8 -> gcontext, buffer + 8, bigEndian);
-
-  PutUINT(imageText8 -> x, buffer + 12, bigEndian);
-  PutUINT(imageText8 -> y, buffer + 14, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at " << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void ImageText8Store::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  ImageText8Message *imageText8 = (ImageText8Message *) message;
-
-  *logofs << name() << ": Identity len " << (unsigned int) imageText8 -> len
-          << " drawable " << imageText8 -> drawable << ", gcontext " 
-          << imageText8 -> gcontext << ", x " << imageText8 -> x << ", y " 
-          << imageText8 -> y << ", size " << imageText8 -> size_ << ".\n";
-
-  #endif
-}
-
-void ImageText8Store::identityChecksum(const Message *message, const unsigned char *buffer,
-                                           unsigned int size, int bigEndian) const
-{
-  md5_append(md5_state_, buffer + 1,  1);
-}
-
-void ImageText8Store::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                         const Message *cachedMessage,
-                                             ChannelCache *channelCache) const
-{
-  ImageText8Message *imageText8       = (ImageText8Message *) message;
-  ImageText8Message *cachedImageText8 = (ImageText8Message *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << imageText8 -> drawable
-          << " as " << "drawable" << " field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeXidValue(imageText8 -> drawable, clientCache -> drawableCache);
-
-  cachedImageText8 -> drawable = imageText8 -> drawable;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << imageText8 -> gcontext
-          << " as " << "gcontext" << " field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeXidValue(imageText8 -> gcontext, clientCache -> gcCache);
-
-  cachedImageText8 -> gcontext = imageText8 -> gcontext;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << imageText8 -> x
-          << " as " << "x" << " field.\n" << logofs_flush;
-  #endif
-
-  unsigned short int diff_x = imageText8 -> x - cachedImageText8 -> x;
-
-  encodeBuffer.encodeCachedValue(diff_x, 16,
-                     clientCache -> imageTextCacheX);
-
-  cachedImageText8 -> x = imageText8 -> x;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << imageText8 -> y
-          << " as " << "y" << " field.\n" << logofs_flush;
-  #endif
-
-  unsigned short int diff_y = imageText8 -> y - cachedImageText8 -> y;
-
-  encodeBuffer.encodeCachedValue(diff_y, 16,
-                     clientCache -> imageTextCacheY);
-
-  cachedImageText8 -> y = imageText8 -> y;
-}
-
-void ImageText8Store::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                           ChannelCache *channelCache) const
-{
-  ImageText8Message *imageText8 = (ImageText8Message *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
-
-  imageText8 -> drawable = value;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << imageText8 -> drawable
-          << " as " << "drawable" << " field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeXidValue(value, clientCache -> gcCache);
-
-  imageText8 -> gcontext = value;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << imageText8 -> gcontext
-          << " as gcontext field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeCachedValue(value, 16,
-               clientCache -> imageTextCacheX);
-
-  imageText8 -> x += value;
-  imageText8 -> x &= 0xffff;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << imageText8 -> x
-          << " as x field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeCachedValue(value, 16,
-               clientCache -> imageTextCacheY);
-
-  imageText8 -> y += value;
-  imageText8 -> y &= 0xffff;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << imageText8 -> y
-          << " as y field.\n" << logofs_flush;
-  #endif
-}
-
-
diff --git a/nxcomp/ImageText8.h b/nxcomp/ImageText8.h
deleted file mode 100644
index aa9ccb5d9..000000000
--- a/nxcomp/ImageText8.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef ImageText8_H
-#define ImageText8_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define IMAGETEXT8_ENABLE_CACHE               1
-#define IMAGETEXT8_ENABLE_DATA                0
-#define IMAGETEXT8_ENABLE_SPLIT               0
-#define IMAGETEXT8_ENABLE_COMPRESS            0
-
-#define IMAGETEXT8_DATA_LIMIT                 256
-#define IMAGETEXT8_DATA_OFFSET                16
-
-#define IMAGETEXT8_CACHE_SLOTS                3000
-#define IMAGETEXT8_CACHE_THRESHOLD            5
-#define IMAGETEXT8_CACHE_LOWER_THRESHOLD      1
-
-//
-// The message class.
-//
-
-class ImageText8Message : public Message
-{
-  friend class ImageText8Store;
-
-  public:
-
-  ImageText8Message()
-  {
-  }
-
-  ~ImageText8Message()
-  {
-  }
-
-  //
-  // Put here the fields which constitute 
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned char len;
-
-  unsigned int drawable;
-  unsigned int gcontext;
-
-  unsigned short x;
-  unsigned short y;
-};
-
-class ImageText8Store : public MessageStore
-{
-  //
-  // Constructors and destructors.
-  //
-
-  public:
-
-  ImageText8Store() : MessageStore()
-  {
-    enableCache    = IMAGETEXT8_ENABLE_CACHE;
-    enableData     = IMAGETEXT8_ENABLE_DATA;
-    enableSplit    = IMAGETEXT8_ENABLE_SPLIT;
-    enableCompress = IMAGETEXT8_ENABLE_COMPRESS;
-
-    dataLimit            = IMAGETEXT8_DATA_LIMIT;
-    dataOffset           = IMAGETEXT8_DATA_OFFSET;
-
-    cacheSlots           = IMAGETEXT8_CACHE_SLOTS;
-    cacheThreshold       = IMAGETEXT8_CACHE_THRESHOLD;
-    cacheLowerThreshold  = IMAGETEXT8_CACHE_LOWER_THRESHOLD;
-
-    messages_ -> resize(cacheSlots);
-
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      *i = NULL;
-    }
-
-    temporary_ = NULL;
-  }
-
-  virtual ~ImageText8Store()
-  {
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      destroy(*i);
-    }
-
-    destroy(temporary_);
-  }
-
-  virtual const char *name() const
-  {
-    return "ImageText8";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_ImageText8;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(ImageText8Message);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  public:
-
-  virtual Message *create() const
-  {
-    return new ImageText8Message();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new ImageText8Message((const ImageText8Message &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (ImageText8Message *) message;
-  }
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-				unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* ImageText8_H */
diff --git a/nxcomp/IntCache.cpp b/nxcomp/IntCache.cpp
deleted file mode 100644
index 362412182..000000000
--- a/nxcomp/IntCache.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include <string.h>
-
-#include "Misc.h"
-#include "IntCache.h"
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-IntCache::IntCache(unsigned int size)
-
-  : size_(size), length_(0), buffer_(new unsigned int[size]),
-        lastDiff_(0), lastValueInserted_(0), predictedBlockSize_(0)
-{
-}
-
-int IntCache::lookup(unsigned int &value, unsigned int &index,
-                         unsigned int mask, unsigned int &sameDiff)
-{
-  for (unsigned int i = 0; i < length_; i++)
-  {
-    if (value == buffer_[i])
-    {
-      index = i;
-      if (i)
-      {
-        unsigned int target = (i >> 1);
-        do
-        {
-          buffer_[i] = buffer_[i - 1];
-          i--;
-        }
-        while (i > target);
-        buffer_[target] = value;
-      }
-      return 1;
-    }
-  }
-  unsigned int insertionPoint;
-  if (2 >= length_)
-    insertionPoint = length_;
-  else
-    insertionPoint = 2;
-  unsigned int start;
-  if (length_ >= size_)
-    start = size_ - 1;
-  else
-  {
-    start = length_;
-    length_++;
-  }
-  for (unsigned int k = start; k > insertionPoint; k--)
-    buffer_[k] = buffer_[k - 1];
-  buffer_[insertionPoint] = value;
-  unsigned int diff = value - lastValueInserted_;
-
-  lastValueInserted_ = (value & mask);
-  value = (diff & mask);
-  sameDiff = (value == lastDiff_);
-  if (!sameDiff)
-  {
-    lastDiff_ = value;
-
-    unsigned int lastChangeIndex = 0;
-    unsigned int lastBitIsOne = (lastDiff_ & 0x1);
-    unsigned int j = 1;
-    for (unsigned int nextMask = 0x2; nextMask & mask; nextMask <<= 1)
-    {
-      unsigned int nextBitIsOne = (lastDiff_ & nextMask);
-      if (nextBitIsOne)
-      {
-        if (!lastBitIsOne)
-        {
-          lastChangeIndex = j;
-          lastBitIsOne = nextBitIsOne;
-        }
-      }
-      else
-      {
-        if (lastBitIsOne)
-        {
-          lastChangeIndex = j;
-          lastBitIsOne = nextBitIsOne;
-        }
-      }
-      j++;
-    }
-    predictedBlockSize_ = lastChangeIndex + 1;
-    if (predictedBlockSize_ < 2)
-      predictedBlockSize_ = 2;
-  }
-  return 0;
-}
-
-void IntCache::insert(unsigned int &value, unsigned int mask)
-{
-  unsigned int insertionPoint;
-  if (2 >= length_)
-    insertionPoint = length_;
-  else
-    insertionPoint = 2;
-  unsigned int start;
-  if (length_ >= size_)
-    start = size_ - 1;
-  else
-  {
-    start = length_;
-    length_++;
-  }
-  for (unsigned int k = start; k > insertionPoint; k--)
-    buffer_[k] = buffer_[k - 1];
-  if (lastDiff_ != value)
-  {
-    lastDiff_ = value;
-    unsigned int lastChangeIndex = 0;
-    unsigned int lastBitIsOne = (lastDiff_ & 0x1);
-    unsigned int j = 1;
-    for (unsigned int nextMask = 0x2; nextMask & mask; nextMask <<= 1)
-    {
-      unsigned int nextBitIsOne = (lastDiff_ & nextMask);
-      if (nextBitIsOne)
-      {
-        if (!lastBitIsOne)
-        {
-          lastChangeIndex = j;
-          lastBitIsOne = nextBitIsOne;
-        }
-      }
-      else
-      {
-        if (lastBitIsOne)
-        {
-          lastChangeIndex = j;
-          lastBitIsOne = nextBitIsOne;
-        }
-      }
-      j++;
-    }
-    predictedBlockSize_ = lastChangeIndex + 1;
-    if (predictedBlockSize_ < 2)
-      predictedBlockSize_ = 2;
-  }
-  lastValueInserted_ += value;
-  lastValueInserted_ &= mask;
-  buffer_[insertionPoint] = lastValueInserted_;
-  value = lastValueInserted_;
-}
-
-void IntCache::push(unsigned int &value, unsigned int mask)
-{
-  //
-  // Using a memmove() appears to be slower.
-  //
-  // memmove((char *) &buffer_[1], (char *) &buffer_[0],
-  //             sizeof(unsigned int) * (size_ - 1));
-  //
-  // if (length_ < size_)
-  // {
-  //   length_++;
-  // }
-  //
-
-  unsigned int start;
-
-  if (length_ >= size_)
-  {
-    start = size_ - 1;
-  }
-  else
-  {
-    start = length_;
-
-    length_++;
-  }
-
-  for (unsigned int k = start; k > 0; k--)
-  {
-    buffer_[k] = buffer_[k - 1];
-  }
-
-  value &= mask;
-
-  buffer_[0] = value;
-}
-
-void IntCache::dump()
-{
-  #ifdef DUMP
-
-  *logofs << "IntCache: Dumping content of cache at "
-          << (void *) this << ":\n" << logofs_flush;
-
-  for (unsigned int i = 0; i < length_; i++)
-  {
-    *logofs << "IntCache: [" << i << "][" << buffer_[i] << "]\n";
-  }
-
-  #endif
-}
diff --git a/nxcomp/IntCache.h b/nxcomp/IntCache.h
deleted file mode 100644
index 69c522325..000000000
--- a/nxcomp/IntCache.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef IntCache_H
-#define IntCache_H
-
-class IntCache
-{
-  public:
-
-  IntCache(unsigned int size);
-
-  ~IntCache()
-  {
-    delete [] buffer_;
-  }
-
-  unsigned int getSize() const
-  {
-    return length_;
-  }
-
-  int lookup(unsigned int &value, unsigned int &index,
-                 unsigned int mask, unsigned int &sameDiff);
-
-  //
-  // This can be inlined as it is only
-  // called by decodeCachedValue().
-  //
-
-  unsigned int get(unsigned int index)
-  {
-    unsigned int result = buffer_[index];
-
-    if (index != 0)
-    {
-      //
-      // Using a memmove() appears to be slower.
-      //
-      // unsigned int target = index >> 1;
-      //
-      // memmove((char *) &buffer_[target + 1], (char *) &buffer_[target],
-      //             sizeof(unsigned int) * (index - target));
-      //
-      // buffer_[target] = result;
-      //
-
-      unsigned int i = index;
-
-      unsigned int target = (i >> 1);
-
-      do
-      {
-        buffer_[i] = buffer_[i - 1];
-
-        i--;
-      }
-      while (i > target);
-
-      buffer_[target] = result;
-    }
-
-    return result;
-  }
-
-  void insert(unsigned int &value, unsigned int mask);
-
-  void push(unsigned int &value, unsigned int mask);
-
-  void dump();
-
-  unsigned int getLastDiff(unsigned int mask) const
-  {
-    return lastDiff_;
-  }
-
-  unsigned int getBlockSize(unsigned int bits) const
-  {
-    if (bits > 0)
-    {
-      return (predictedBlockSize_ < bits ? predictedBlockSize_ : bits);
-    }
-
-    return predictedBlockSize_;
-  }
-
-  private:
-
-  unsigned int size_;
-  unsigned int length_;
-  unsigned int *buffer_;
-  unsigned int lastDiff_;
-  unsigned int lastValueInserted_;
-  unsigned int predictedBlockSize_;
-};
-
-#endif /* IntCache_H */
diff --git a/nxcomp/InternAtom.cpp b/nxcomp/InternAtom.cpp
deleted file mode 100644
index 760d72222..000000000
--- a/nxcomp/InternAtom.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "InternAtom.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int InternAtomStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                       unsigned int size, int bigEndian) const
-{
-  InternAtomMessage *internAtom = (InternAtomMessage *) message;
-
-  //
-  // Here is the fingerprint.
-  //
-
-  internAtom -> only_if_exists = *(buffer + 1);
-  internAtom -> name_length    = GetUINT(buffer + 4, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed identity for message at " << message << ".\n" << logofs_flush;
-  #endif
-
-  //
-  // Clean up padding bytes.
-  //
-
-  if ((int) size > dataOffset)
-  {
-    unsigned char *end = ((unsigned char *) buffer) + size;
-
-    for (unsigned char *pad = ((unsigned char *) buffer) + 8 + 
-                                  internAtom -> name_length; pad < end; pad++)
-    {
-      *pad = 0;
-    }
-  }
-
-  return 1;
-}
-
-int InternAtomStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                         unsigned int size, int bigEndian) const
-{
-  InternAtomMessage *internAtom = (InternAtomMessage *) message;
-
-  //
-  // Fill all the message's fields.
-  //
-
-  *(buffer + 1) = internAtom -> only_if_exists;
-
-  PutUINT(internAtom -> name_length, buffer + 4, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at " << message << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void InternAtomStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  InternAtomMessage *internAtom = (InternAtomMessage *) message;
-
-  *logofs << name() << ": Identity only_if_exists " 
-          << (unsigned int) internAtom -> only_if_exists
-          << ", name_length " << internAtom -> name_length
-          << ", name '";
-
-          for (int i = 0; i < internAtom -> name_length; i++)
-          {
-            *logofs << internAtom -> data_[i];
-          }
-
-          *logofs << "'.\n" << logofs_flush;
-
-  #endif
-}
-
-void InternAtomStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                           unsigned int size, int bigEndian) const
-{
-  md5_append(md5_state_, buffer + 1, 1);
-  md5_append(md5_state_, buffer + 4, 2);
-}
diff --git a/nxcomp/InternAtom.h b/nxcomp/InternAtom.h
deleted file mode 100644
index 6e69eca24..000000000
--- a/nxcomp/InternAtom.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef InternAtom_H
-#define InternAtom_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define INTERNATOM_ENABLE_CACHE               1
-#define INTERNATOM_ENABLE_DATA                0
-#define INTERNATOM_ENABLE_SPLIT               0
-#define INTERNATOM_ENABLE_COMPRESS            0
-
-#define INTERNATOM_DATA_LIMIT                 80
-#define INTERNATOM_DATA_OFFSET                8
-
-#define INTERNATOM_CACHE_SLOTS                2000
-#define INTERNATOM_CACHE_THRESHOLD            2
-#define INTERNATOM_CACHE_LOWER_THRESHOLD      1
-
-//
-// The message class.
-//
-
-class InternAtomMessage : public Message
-{
-  friend class InternAtomStore;
-
-  public:
-
-  InternAtomMessage()
-  {
-  }
-
-  ~InternAtomMessage()
-  {
-  }
-
-  //
-  // Put here the fields which constitute 
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned char  only_if_exists;
-  unsigned short name_length;
-};
-
-class InternAtomStore : public MessageStore
-{
-  //
-  // Constructors and destructors.
-  //
-
-  public:
-
-  InternAtomStore() : MessageStore()
-  {
-    enableCache    = INTERNATOM_ENABLE_CACHE;
-    enableData     = INTERNATOM_ENABLE_DATA;
-    enableSplit    = INTERNATOM_ENABLE_SPLIT;
-    enableCompress = INTERNATOM_ENABLE_COMPRESS;
-
-    dataLimit  = INTERNATOM_DATA_LIMIT;
-    dataOffset = INTERNATOM_DATA_OFFSET;
-
-    cacheSlots          = INTERNATOM_CACHE_SLOTS;
-    cacheThreshold      = INTERNATOM_CACHE_THRESHOLD;
-    cacheLowerThreshold = INTERNATOM_CACHE_LOWER_THRESHOLD;
-
-    messages_ -> resize(cacheSlots);
-
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      *i = NULL;
-    }
-
-    temporary_ = NULL;
-  }
-
-  virtual ~InternAtomStore()
-  {
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      destroy(*i);
-    }
-
-    destroy(temporary_);
-  }
-
-  virtual const char *name() const
-  {
-    return "InternAtom";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_InternAtom;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(InternAtomMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  protected:
-
-  virtual Message *create() const
-  {
-    return new InternAtomMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new InternAtomMessage((const InternAtomMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (InternAtomMessage *) message;
-  }
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* InternAtom_H */
diff --git a/nxcomp/Jpeg.cpp b/nxcomp/Jpeg.cpp
deleted file mode 100644
index 54fa71d21..000000000
--- a/nxcomp/Jpeg.cpp
+++ /dev/null
@@ -1,886 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include <X11/Xmd.h>
-
-#ifdef ANDROID
-#include <strings.h>
-#endif
-#include <unistd.h>
-#include <setjmp.h>
-#include <zlib.h>
-
-#ifdef __cplusplus
-
-extern "C"
-{
-  #include <stdio.h>
-  #include <jpeglib.h>
-}
-
-#else
-
-#include <stdio.h>
-#include <jpeglib.h>
-
-#endif
-
-#include "Misc.h"
-#include "Jpeg.h"
-#include "Unpack.h"
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-#define RGB24_TO_PIXEL(bpp,r,g,b)                               \
-   ((((CARD##bpp)(r) & 0xff) * srcRedMax + 127) / 255           \
-    << srcRedShift |                                            \
-    (((CARD##bpp)(g) & 0xff) * srcGreenMax + 127) / 255         \
-    << srcGreenShift |                                          \
-    (((CARD##bpp)(b) & 0xff) * srcBlueMax + 127) / 255          \
-    << srcBlueShift)
-
-#define RGB24_TO_PIXEL32(r,g,b)                                 \
-  (((CARD32)(r) & 0xff) << srcRedShift |                        \
-   ((CARD32)(g) & 0xff) << srcGreenShift |                      \
-   ((CARD32)(b) & 0xff) << srcBlueShift)
-
-//
-// Functions from Unpack.cpp
-//
-
-extern int Unpack32To32(const T_colormask *colormask, const unsigned int *data,
-                            unsigned int *out, unsigned int *end);
-
-extern int Unpack24To24(const T_colormask *colormask, const unsigned char *data,
-                            unsigned char *out, unsigned char *end);
-
-extern int Unpack16To16(const T_colormask *colormask, const unsigned char *data,
-                            unsigned char *out, unsigned char *end);
-
-//
-// Local functions used for the jpeg decompression.
-//
-
-static void JpegSetSrcManager(j_decompress_ptr cinfo, CARD8 *compressedData, int compressedLen);
-static void JpegInitSource(j_decompress_ptr cinfo);
-static void JpegTermSource(j_decompress_ptr cinfo);
-static void JpegSkipInputData(j_decompress_ptr cinfo, long num_bytes);
-
-static boolean JpegFillInputBuffer(j_decompress_ptr cinfo);
-
-static int DecompressJpeg16(unsigned char *compressedData, int compressedLen,
-                                unsigned int w, unsigned int h, unsigned char *dstBuf, int byteOrder);
-
-static int DecompressJpeg24(unsigned char *compressedData, int compressedLen,
-                                unsigned int w, unsigned int h, unsigned char *dstBuf, int byteOrder);
-
-static int DecompressJpeg32(unsigned char *compressedData, int compressedLen,
-                                unsigned int w, unsigned int h, unsigned char *dstBuf, int byteOrder);
-
-void UnpackJpegErrorHandler(j_common_ptr cinfo);
-
-//
-// Colormap stuff.
-//
-
-CARD16 srcRedMax, srcGreenMax, srcBlueMax;
-CARD8  srcRedShift, srcGreenShift, srcBlueShift;
-
-//
-// Error handler.
-//
-
-static bool jpegError;
-
-jmp_buf UnpackJpegContext;
-
-void UnpackJpegErrorHandler(j_common_ptr cinfo)
-{
-  #ifdef PANIC
-  *logofs << "UnpackJpegErrorHandler: PANIC! Detected error in JPEG decompression.\n"
-          << logofs_flush;
-
-  *logofs << "UnpackJpegErrorHandler: PANIC! Trying to revert to the previous context.\n"
-          << logofs_flush;
-  #endif
-
-  jpegError = 1;
-
-  longjmp(UnpackJpegContext, 1);
-}
-
-//
-// Attributes used for the jpeg decompression.
-//
-
-static struct  jpeg_source_mgr jpegSrcManager;
-static JOCTET  *jpegBufferPtr;
-static size_t  jpegBufferLen;
-
-static char    *tmpBuf;
-static int     tmpBufSize = 0;
-
-int UnpackJpeg(T_geometry *geometry, unsigned char method, unsigned char *srcData,
-                   int srcSize, int dstBpp, int dstWidth, int dstHeight,
-                       unsigned char *dstData, int dstSize)
-{
-  int byteOrder = geometry -> image_byte_order;
-
-  //
-  // Check if data is coming from a failed unsplit.
-  //
-
-  if (srcSize < 2 || (srcData[0] == SPLIT_PATTERN &&
-          srcData[1] == SPLIT_PATTERN))
-  {
-    #ifdef WARNING
-    *logofs << "UnpackJpeg: WARNING! Skipping unpack of dummy data.\n"
-            << logofs_flush;
-    #endif
-
-    return -1;
-  }
-
-  #ifdef DEBUG
-  *logofs << "UnpackJpeg: Decompression. Source size "
-          << srcSize << " bits per plane " << dstBpp
-          << ".\n" << logofs_flush;
-  #endif
-
-  srcRedShift   = ffs(geometry -> red_mask)   - 1;
-  srcGreenShift = ffs(geometry -> green_mask) - 1;
-  srcBlueShift  = ffs(geometry -> blue_mask)  - 1;
-
-  #ifdef DEBUG
-  *logofs << "UnpackJpeg: Red shift " << (int) srcRedShift
-          << " green shift " << (int) srcGreenShift << " blue shift "
-          << (int) srcBlueShift << ".\n" << logofs_flush;
-  #endif
-
-  srcRedMax   = geometry -> red_mask   >> srcRedShift;
-  srcGreenMax = geometry -> green_mask >> srcGreenShift;
-  srcBlueMax  = geometry -> blue_mask  >> srcBlueShift;
-
-  #ifdef DEBUG
-  *logofs << "UnpackJpeg: Red mask " << (void *) geometry -> red_mask
-          << " green mask " << (void *) geometry -> green_mask
-          << " blue mask " << (void *) geometry -> blue_mask
-          << ".\n" << logofs_flush;
-  #endif
-
-  #ifdef DEBUG
-  *logofs << "UnpackJpeg: Red max " << srcRedMax << " green max "
-          << srcGreenMax << " blue max " << srcBlueMax
-          << ".\n" << logofs_flush;
-  #endif
-
-  //
-  // Make enough space in the temporary
-  // buffer to have one complete row of
-  // the image with 3 bytes for a pixel.
-  //
-
-  tmpBufSize = dstWidth * 3;
-  tmpBuf     = new char[tmpBufSize];
-
-  if (tmpBuf == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "UnpackJpeg: PANIC! Cannot allocate "
-            << dstWidth * 3 << " bytes for Jpeg "
-            << "decompressed data.\n" << logofs_flush;
-    #endif
-
-    delete [] tmpBuf;
-
-    return -1;
-  }
-
-  int result = 1;
-
-  switch(dstBpp)
-  {
-    case 8:
-    {
-      //
-      // Simply move the data from srcData to dstData
-      // taking into consideration the correct padding.
-      //
-
-      int row;
-
-      unsigned char * dstBuff = dstData;
-      unsigned char * srcBuff = srcData;
-
-      for (row = 0; row < dstHeight; row++)
-      {
-        memcpy(dstBuff, srcBuff, dstWidth);
-
-        dstBuff += RoundUp4(dstWidth);
-        srcBuff += dstWidth;
-      }
-
-      break;
-    }
-    case 16:
-    {
-      result = DecompressJpeg16(srcData, srcSize, dstWidth,
-                                    dstHeight, dstData, byteOrder);
-      break;
-    }
-    case 24:
-    {
-      result = DecompressJpeg24(srcData, srcSize, dstWidth,
-                                    dstHeight, dstData, byteOrder);
-      break;
-    }
-    case 32:
-    {
-      result = DecompressJpeg32(srcData, srcSize, dstWidth,
-                                    dstHeight, dstData, byteOrder);
-      break;
-    }
-    default:
-    {
-      #ifdef PANIC
-      *logofs << "UnpackJpeg: PANIC! Failed to decode Jpeg image. "
-              << " Unsupported Bpp value " << dstBpp
-              << " for the Jpeg compression"
-              << ".\n" << logofs_flush;
-      #endif
-
-      delete [] tmpBuf;
-
-      result = -1;
-    }
-  }
-
-  #ifdef DEBUG
-  *logofs << "UnpackJpeg: Decompression finished with result "
-          << result << ".\n" << logofs_flush;
-  #endif
-
-  if (result == -1)
-  {
-    delete [] tmpBuf;
-
-    #ifdef PANIC
-    *logofs << "UnpackJpeg: PANIC! Failed to decode Jpeg image using "
-            << dstBpp << " Bpp destination.\n" << logofs_flush;
-    #endif
-
-    return result;
-  }
-
-  //
-  // Apply the correction for the brightness.
-  //
-
-  int maskMethod;
-
-  switch(method)
-  {
-    case PACK_JPEG_8_COLORS:
-    {
-      maskMethod = MASK_8_COLORS;
-
-      break;
-    }
-    case PACK_JPEG_64_COLORS:
-    {
-      maskMethod = MASK_64_COLORS;
-
-      break;
-    }
-    case PACK_JPEG_256_COLORS:
-    {
-      maskMethod = MASK_256_COLORS;
-
-      break;
-    }
-    case PACK_JPEG_512_COLORS:
-    {
-      maskMethod = MASK_512_COLORS;
-
-      break;
-    }
-    case PACK_JPEG_4K_COLORS:
-    {
-      maskMethod = MASK_4K_COLORS;
-
-      break;
-    }
-    case PACK_JPEG_32K_COLORS:
-    {
-      maskMethod = MASK_32K_COLORS;
-
-      break;
-    }
-    case PACK_JPEG_64K_COLORS:
-    {
-      maskMethod = MASK_64K_COLORS;
-
-      break;
-    }
-    case PACK_JPEG_256K_COLORS:
-    {
-      maskMethod = MASK_256K_COLORS;
-
-      break;
-    }
-    case PACK_JPEG_2M_COLORS:
-    {
-      maskMethod = MASK_2M_COLORS;
-
-      break;
-    }
-    case PACK_JPEG_16M_COLORS:
-    {
-      maskMethod = MASK_16M_COLORS;
-
-      break;
-    }
-    default:
-    {
-      delete [] tmpBuf;
-
-      return -1;
-    }
-  }
-
-  const T_colormask *colorMask = MethodColorMask(maskMethod);
-
-  unsigned char *dstBuff = dstData;
-
-  switch (dstBpp)
-  {
-    case 16:
-    {
-      Unpack16To16(colorMask, dstBuff, dstBuff, dstBuff + dstSize);
-
-      break;
-    }
-    case 24:
-    {
-      break;
-    }
-    case 32:
-    {
-      Unpack32To32(colorMask, (unsigned int *) dstBuff, (unsigned int *) dstBuff,
-                       (unsigned int *) (dstBuff + dstSize));
-      break;
-    }
-    default:
-    {
-      delete [] tmpBuf;
-
-      return -1;
-    }
-  }
-
-  delete [] tmpBuf;
-
-  return 1;
-}
-
-//
-// Functions that actually do the Jpeg decompression.
-//
-
-int DecompressJpeg16(unsigned char *compressedData, int compressedLen,
-                         unsigned int w, unsigned int h, unsigned char *dstBuf, int byteOrder)
-{
-  struct jpeg_decompress_struct cinfo;
-  struct jpeg_error_mgr jerr;
-  unsigned char *data;
-  JSAMPROW rowPointer[1];
-
-  unsigned int dx = 0;
-  unsigned int dy = 0;
-
-  #ifdef DEBUG
-  *logofs << "DecompressJpeg16: Decompressing with length "
-          << compressedLen << " width " << w << " height "
-          << h << ".\n" << logofs_flush;
-  #endif
-
-  jpegError = 0;
-
-  cinfo.err = jpeg_std_error(&jerr);
-
-  jerr.error_exit = UnpackJpegErrorHandler;
-
-  if (setjmp(UnpackJpegContext) == 1)
-  {
-    #ifdef TEST
-    *logofs << "DecompressJpeg16: Out of the long jump with error '"
-            << jpegError << "'.\n" << logofs_flush;
-    #endif
-
-    goto AbortDecompressJpeg16;
-  }
-
-  jpeg_create_decompress(&cinfo);
-
-  if (jpegError) goto AbortDecompressJpeg16;
-
-  JpegSetSrcManager(&cinfo, compressedData, compressedLen);
-
-  jpeg_read_header(&cinfo, TRUE);
-
-  if (jpegError) goto AbortDecompressJpeg16;
-
-  cinfo.out_color_space = JCS_RGB;
-
-  jpeg_start_decompress(&cinfo);
-
-  if (jpegError) goto AbortDecompressJpeg16;
-
-  if (cinfo.output_width != w ||
-          cinfo.output_height != h ||
-              cinfo.output_components != 3)
-  {
-    #ifdef PANIC
-    *logofs << "DecompressJpeg16: PANIC! Wrong JPEG data received.\n"
-            << logofs_flush;
-    #endif
-
-    jpeg_destroy_decompress(&cinfo);
-
-    return -1;
-  }
-
-  //
-  // PixelPtr points to dstBuf which is
-  // already padded correctly for the final
-  // image to put
-  //
-
-  data = dstBuf;
-
-  rowPointer[0] = (JSAMPROW) tmpBuf;
-
-  unsigned long pixel;
-
-  while (cinfo.output_scanline < cinfo.output_height)
-  {
-    jpeg_read_scanlines(&cinfo, rowPointer, 1);
-
-    if (jpegError) goto AbortDecompressJpeg16;
-
-    for (dx = 0; dx < w; dx++)
-    {
-      pixel = RGB24_TO_PIXEL(16, tmpBuf[dx * 3], tmpBuf[dx * 3 + 1],
-                                 tmpBuf[dx * 3 + 2]);
-
-      //
-      // Follow the server byte order when arranging data.
-      //
-
-      if (byteOrder == LSBFirst)
-      {
-        data[0] = (unsigned char) (pixel & 0xff);
-        data[1] = (unsigned char) ((pixel >> 8) & 0xff);
-      }
-      else
-      {
-        data[1] = (unsigned char) (pixel & 0xff);
-        data[0] = (unsigned char) ((pixel >> 8) & 0xff);
-      }
-
-      data += 2;
-    }
-
-    //
-    // Move data at the beginning of the
-    // next line.
-    //
-
-    data = data + (RoundUp4(w * 2) - w * 2);
-
-    dy++;
-  }
-
-  AbortDecompressJpeg16:
-
-  if (jpegError == 0)
-  {
-    jpeg_finish_decompress(&cinfo);
-  }
-
-  jpeg_destroy_decompress(&cinfo);
-
-  if (jpegError == 1)
-  {
-    #ifdef PANIC
-    *logofs << "DecompressJpeg16: Failed to decompress JPEG image.\n"
-            << logofs_flush;
-    #endif
-
-    return -1;
-  }
-
-  #ifdef TEST
-  *logofs << "DecompressJpeg16: Decompression finished with "
-          << dy << " lines handled.\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int DecompressJpeg24(unsigned char *compressedData, int compressedLen,
-                         unsigned int w, unsigned int h, unsigned char *dstBuf, int byteOrder)
-{
-  struct jpeg_decompress_struct cinfo;
-  struct jpeg_error_mgr jerr;
-  CARD8 *pixelPtr = NULL;
-  JSAMPROW rowPointer[1];
-
-  unsigned int dx = 0;
-  unsigned int dy = 0;
-
-  #ifdef TEST
-  *logofs << "DecompressJpeg24: Decompressing with length "
-          << compressedLen << " width " << w << " height "
-          << h << ".\n" << logofs_flush;
-  #endif
-
-  jpegError = 0;
-
-  cinfo.err = jpeg_std_error(&jerr);
-
-  jerr.error_exit = UnpackJpegErrorHandler;
-
-  if (setjmp(UnpackJpegContext) == 1)
-  {
-    #ifdef TEST
-    *logofs << "DecompressJpeg24: Out of the long jump with error '"
-            << jpegError << "'.\n" << logofs_flush;
-    #endif
-
-    goto AbortDecompressJpeg24;
-  }
-
-  jpeg_create_decompress(&cinfo);
-
-  if (jpegError) goto AbortDecompressJpeg24;
-
-  JpegSetSrcManager(&cinfo, compressedData, compressedLen);
-
-  jpeg_read_header(&cinfo, TRUE);
-
-  if (jpegError) goto AbortDecompressJpeg24;
-
-  cinfo.out_color_space = JCS_RGB;
-
-  jpeg_start_decompress(&cinfo);
-
-  if (jpegError) goto AbortDecompressJpeg24;
-
-  if (cinfo.output_width != w ||
-          cinfo.output_height != h ||
-              cinfo.output_components != 3)
-  {
-    #ifdef PANIC
-    *logofs << "DecompressJpeg24: PANIC! Wrong JPEG data received.\n"
-            << logofs_flush;
-    #endif
-
-    jpeg_destroy_decompress(&cinfo);
-
-    return -1;
-  }
-
-  //
-  // PixelPtr points to dstBuf which is
-  // already padded correctly for the final
-  // image to put.
-  //
-
-  pixelPtr = (CARD8 *) dstBuf;
-
-  rowPointer[0] = (JSAMPROW) tmpBuf;
-
-  while (cinfo.output_scanline < cinfo.output_height)
-  {
-    jpeg_read_scanlines(&cinfo, rowPointer, 1);
-
-    if (jpegError) goto AbortDecompressJpeg24;
-
-    for (dx = 0; dx < w; dx++)
-    {
-      //
-      // Follow the server byte order when arranging data.
-      //
-
-      if (byteOrder == LSBFirst)
-      {
-        pixelPtr[0] = tmpBuf[dx * 3];
-        pixelPtr[1] = tmpBuf[dx * 3 + 1];
-        pixelPtr[2] = tmpBuf[dx * 3 + 2];
-      }
-      else
-      {
-        pixelPtr[2] = tmpBuf[dx * 3];
-        pixelPtr[1] = tmpBuf[dx * 3 + 1];
-        pixelPtr[0] = tmpBuf[dx * 3 + 2];
-      }
-
-      pixelPtr += 3;
-    }
-
-    //
-    // Go to the next line.
-    //
-
-    pixelPtr = (CARD8 *) (((char *) pixelPtr) + (RoundUp4(w * 3) - w * 3));
-
-    dy++;
-  }
-
-  AbortDecompressJpeg24:
-
-  if (jpegError == 0)
-  {
-    jpeg_finish_decompress(&cinfo);
-  }
-
-  jpeg_destroy_decompress(&cinfo);
-
-  if (jpegError == 1)
-  {
-    #ifdef PANIC
-    *logofs << "DecompressJpeg24: Failed to decompress JPEG image.\n"
-            << logofs_flush;
-    #endif
-
-    return -1;
-  }
-
-  #ifdef TEST
-  *logofs << "DecompressJpeg24: Decompression finished with "
-          << dy << " lines handled.\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int DecompressJpeg32(unsigned char *compressedData, int compressedLen,
-                         unsigned int w, unsigned int h, unsigned char *dstBuf, int byteOrder)
-{
-  struct jpeg_decompress_struct cinfo;
-  struct jpeg_error_mgr jerr;
-  unsigned char *data;
-  JSAMPROW rowPointer[1];
-
-  unsigned int dx = 0;
-  unsigned int dy = 0;
-
-  #ifdef TEST
-  *logofs << "DecompressJpeg32: Decompressing with length "
-          << compressedLen << " width " << w << " height "
-          << h << ".\n" << logofs_flush;
-  #endif
-
-  jpegError = 0;
-
-  cinfo.err = jpeg_std_error(&jerr);
-
-  jerr.error_exit = UnpackJpegErrorHandler;
-
-  if (setjmp(UnpackJpegContext) == 1)
-  {
-    #ifdef TEST
-    *logofs << "DecompressJpeg32: Out of the long jump with error '"
-            << jpegError << "'.\n" << logofs_flush;
-    #endif
-
-    goto AbortDecompressJpeg32;
-  }
-
-  jpeg_create_decompress(&cinfo);
-
-  if (jpegError) goto AbortDecompressJpeg32;
-
-  JpegSetSrcManager(&cinfo, compressedData, compressedLen);
-
-  jpeg_read_header(&cinfo, TRUE);
-
-  if (jpegError) goto AbortDecompressJpeg32;
-
-  cinfo.out_color_space = JCS_RGB;
-
-  jpeg_start_decompress(&cinfo);
-
-  if (jpegError) goto AbortDecompressJpeg32;
-
-  if (cinfo.output_width != w ||
-          cinfo.output_height != h ||
-              cinfo.output_components != 3)
-  {
-    #ifdef PANIC
-    *logofs << "DecompressJpeg32 : PANIC! Wrong JPEG data received.\n"
-            << logofs_flush;
-    #endif
-
-    jpeg_destroy_decompress(&cinfo);
-
-    return -1;
-  }
-
-  //
-  // PixelPtr points to dstBuf which is
-  // already padded correctly for the final
-  // image to put
-  //
-
-  data = dstBuf;
-
-  rowPointer[0] = (JSAMPROW) tmpBuf;
-  
-  unsigned long pixel;
-
-  int i;
-
-  while (cinfo.output_scanline < cinfo.output_height)
-  {
-    jpeg_read_scanlines(&cinfo, rowPointer, 1);
-
-    if (jpegError) goto AbortDecompressJpeg32;
-
-    for (dx = 0; dx < w; dx++)
-    {
-      pixel = RGB24_TO_PIXEL(32, tmpBuf[dx * 3], tmpBuf[dx * 3 + 1],
-                                 tmpBuf[dx * 3 + 2]);
-
-      //
-      // Follow the server byte order when arranging data.
-      //
-
-      if (byteOrder == LSBFirst)
-      {
-        for (i = 0; i < 4; i++)
-        {
-          data[i] = (unsigned char)(pixel & 0xff);
-          pixel >>= 8;
-        }
-      }
-      else
-      {
-        for (i = 3; i >= 0; i--)
-        {
-          data[i] = (unsigned char) (pixel & 0xff);
-          pixel >>= 8;
-        }
-      }
-
-      data += 4;
-    }
-
-    dy++;
-  }
-
-  AbortDecompressJpeg32:
-
-  if (jpegError == 0)
-  {
-    jpeg_finish_decompress(&cinfo);
-  }
-
-  jpeg_destroy_decompress(&cinfo);
-
-  if (jpegError == 1)
-  {
-    #ifdef PANIC
-    *logofs << "DecompressJpeg32: Failed to decompress JPEG image.\n"
-            << logofs_flush;
-    #endif
-
-    return -1;
-  }
-
-  #ifdef TEST
-  *logofs << "DecompressJpeg32: Decompression finished with "
-          << dy << " lines handled.\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-static void JpegInitSource(j_decompress_ptr cinfo)
-{
-  jpegError = 0;
-}
-
-static boolean JpegFillInputBuffer(j_decompress_ptr cinfo)
-{
-  jpegError = 1;
-
-  jpegSrcManager.bytes_in_buffer = jpegBufferLen;
-  jpegSrcManager.next_input_byte = (JOCTET *)jpegBufferPtr;
-
-  return TRUE;
-}
-
-static void JpegSkipInputData(j_decompress_ptr cinfo, long num_bytes)
-{
-  if (num_bytes < 0 || (unsigned long) num_bytes > jpegSrcManager.bytes_in_buffer)
-  {
-    jpegError = 1;
-
-    jpegSrcManager.bytes_in_buffer = jpegBufferLen;
-    jpegSrcManager.next_input_byte = (JOCTET *)jpegBufferPtr;
-  }
-  else
-  {
-    jpegSrcManager.next_input_byte += (size_t) num_bytes;
-    jpegSrcManager.bytes_in_buffer -= (size_t) num_bytes;
-  }
-}
-
-static void JpegTermSource(j_decompress_ptr cinfo)
-{
-}
-
-static void JpegSetSrcManager(j_decompress_ptr cinfo,
-                                  CARD8 *compressedData,
-                                      int compressedLen)
-{
-  jpegBufferPtr = (JOCTET *) compressedData;
-  jpegBufferLen = (size_t) compressedLen;
-
-  jpegSrcManager.init_source       = JpegInitSource;
-  jpegSrcManager.fill_input_buffer = JpegFillInputBuffer;
-  jpegSrcManager.skip_input_data   = JpegSkipInputData;
-  jpegSrcManager.resync_to_restart = jpeg_resync_to_restart;
-  jpegSrcManager.term_source       = JpegTermSource;
-  jpegSrcManager.next_input_byte   = jpegBufferPtr;
-  jpegSrcManager.bytes_in_buffer   = jpegBufferLen;
-
-  cinfo->src = &jpegSrcManager;
-}
diff --git a/nxcomp/Jpeg.h b/nxcomp/Jpeg.h
deleted file mode 100644
index 58a5bffef..000000000
--- a/nxcomp/Jpeg.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef Jpeg_H
-#define Jpeg_H
-
-#include "Misc.h"
-#include "Unpack.h"
-
-int UnpackJpeg(T_geometry *geometry, unsigned char method, unsigned char *srcData,
-                   int srcSize, int dstBpp, int dstWidth, int dstHeight,
-                       unsigned char *dstData, int dstSize);
-
-#endif /* Jpeg_H */
diff --git a/nxcomp/Keeper.cpp b/nxcomp/Keeper.cpp
deleted file mode 100644
index 7e8cd0cd7..000000000
--- a/nxcomp/Keeper.cpp
+++ /dev/null
@@ -1,608 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <dirent.h>
-
-#include "Keeper.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-//
-// Remove the directory if it's empty
-// since more than 30 * 24 h.
-//
-
-#define EMPTY_DIR_TIME  2592000
-
-//
-// Sleep once any ONCE entries.
-//
-
-#define ONCE  2
-
-//
-// Define this to trace messages while
-// they are allocated and deallocated.
-//
-
-#undef REFERENCES
-
-//
-// This is used for reference count.
-//
-
-#ifdef REFERENCES
-
-int File::references_ = 0;
-
-#endif
-
-bool T_older::operator () (File *a, File *b) const
-{
-  return a -> compare(b);
-}
-
-File::File()
-{
-  name_ = NULL;
-
-  size_ = 0;
-  time_ = 0;
-
-  #ifdef REFERENCES
-
-  references_++;
-
-  *logofs << "Keeper: Created new File at "
-          << this << " out of " << references_
-          << " allocated references.\n"
-          << logofs_flush;
-
-  #endif
-}
-
-//
-// TODO: This class can leak industrial amounts of memory.
-// I'm 100% sure that the desctructor is called and that
-// also the string pointed in the File structure is dele-
-// ted. Everything is logged, but still the memory is not
-// freed. This is less a problem on Windows, where the me-
-// mory occupation remains almost constant. Obviously the
-// problem lies in the STL allocators of the GNU libstc++.
-//
-
-File::~File()
-{
-  #ifdef TEST
-  *logofs << "Keeper: Deleting name for File at "
-          << this << ".\n" << logofs_flush;
-  #endif
-
-  delete [] name_;
-
-  #ifdef REFERENCES
-
-  *logofs << "Keeper: Deleted File at " 
-          << this << " out of " << references_ 
-          << " allocated references.\n"
-          << logofs_flush;
-
-  references_--;
-
-  #endif
-}
-
-bool File::compare(File *b) const
-{
-  if (this -> time_ == b -> time_)
-  {
-    return (this -> size_ < b -> size_);
-  }
-
-  return (this -> time_ < b -> time_);
-}
-
-Keeper::Keeper(int caches, int images, const char *root,
-                   int sleep, int parent)
-{
-  caches_ = caches;
-  images_ = images;
-  sleep_  = sleep;
-  parent_ = parent;
-
-  root_ = new char[strlen(root) + 1];
-
-  strcpy(root_, root);
-
-  total_  = 0;
-  signal_ = 0;
-
-  files_ = new T_files;
-}
-
-Keeper::~Keeper()
-{
-  empty();
-
-  delete files_;
-
-  delete [] root_;
-}
-
-int Keeper::cleanupCaches()
-{
-  #ifdef TEST
-  *logofs << "Keeper: Looking for cache directories in '"
-          << root_ << "'.\n" << logofs_flush;
-  #endif
-
-  DIR *rootDir = opendir(root_);
-
-  if (rootDir != NULL)
-  {
-    dirent *dirEntry;
-
-    struct stat fileStat;
-
-    int baseSize = strlen(root_);
-
-    int s = 0;
-
-    while (((dirEntry = readdir(rootDir)) != NULL))
-    {
-      if (s++ % ONCE == 0) usleep(sleep_ * 1000);
-
-      if (signal_ != 0) break;
-
-      if (strcmp(dirEntry -> d_name, "cache") == 0 ||
-              strncmp(dirEntry -> d_name, "cache-", 6) == 0)
-      {
-        char *dirName = new char[baseSize + strlen(dirEntry -> d_name) + 2];
-
-        if (dirName == NULL)
-        {
-          #ifdef WARNING
-          *logofs << "Keeper: WARNING! Can't check directory entry '"
-                  << dirEntry -> d_name << "'.\n" << logofs_flush;
-          #endif
-
-          delete [] dirName;
-
-          continue;
-        }
-
-        strcpy(dirName, root_);
-        strcpy(dirName + baseSize, "/");
-        strcpy(dirName + baseSize + 1, dirEntry -> d_name);
-
-        #ifdef TEST
-        *logofs << "Keeper: Checking directory '" << dirName
-                << "'.\n" << logofs_flush;
-        #endif
-
-        if (stat(dirName, &fileStat) == 0 &&
-                S_ISDIR(fileStat.st_mode) != 0)
-        {
-          //
-          // Add to repository all the "C-" and
-          // "S-" files in the given directory.
-          //
-
-          collect(dirName);
-        }
-
-        delete [] dirName;
-      }
-    }
-
-    closedir(rootDir);
-  }
-  else
-  {
-    #ifdef WARNING
-    *logofs << "Keeper: WARNING! Can't open NX root directory '"
-            << root_ << "'. Error is " << EGET() << " '"
-            << ESTR() << "'.\n" << logofs_flush;
-     #endif
-
-     cerr << "Warning" << ": Can't open NX root directory '"
-          << root_ << "'. Error is " << EGET() << " '"
-          << ESTR() << "'.\n";
-  }
-
-  //
-  // Remove older files.
-  //
-
-  cleanup(caches_);
-
-  //
-  // Empty the repository.
-  //
-
-  empty();
-
-  return 1;
-}
-
-int Keeper::cleanupImages()
-{
-  #ifdef TEST
-  *logofs << "Keeper: Looking for image directory in '"
-          << root_ << "'.\n" << logofs_flush;
-  #endif
-
-  char *imagesPath = new char[strlen(root_) + strlen("/images") + 1];
-
-  if (imagesPath == NULL)
-  {
-    return -1;
-  }
-
-  strcpy(imagesPath, root_);
-  strcat(imagesPath, "/images");
-
-  //
-  // Check if the cache directory does exist.
-  //
-
-  struct stat dirStat;
-
-  if (stat(imagesPath, &dirStat) == -1)
-  {
-    #ifdef WARNING
-    *logofs << "Keeper: WARNING! Can't stat NX images cache directory '"
-            << imagesPath << ". Error is " << EGET() << " '"
-            << ESTR() << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Warning" << ": Can't stat NX images cache directory '"
-         << imagesPath << ". Error is " << EGET() << " '"
-         << ESTR() << "'.\n";
-
-    delete [] imagesPath;
-
-    return -1;
-  }
-
-  //
-  // Check any of the 16 directories in the
-  // images root path.
-  //
-
-  char *digitPath = new char[strlen(imagesPath) + 5];
-
-  strcpy(digitPath, imagesPath);
-
-  for (char digit = 0; digit < 16; digit++)
-  {
-    //
-    // Give up if we received a signal or
-    // our parent is gone.
-    //
-
-    if (signal_ != 0)
-    {
-      #ifdef TEST
-      *logofs << "Keeper: Signal detected. Aborting.\n"
-              << logofs_flush;
-      #endif
-
-      goto KeeperCleanupImagesAbort;
-    }
-    else if (parent_ != getppid() || parent_ == 1)
-    {
-      #ifdef WARNING
-      *logofs << "Keeper: WARNING! Parent process appears "
-              << "to be dead. Returning.\n"
-              << logofs_flush;
-      #endif
-
-      goto KeeperCleanupImagesAbort;
-
-      return 0;
-    }
-
-    sprintf(digitPath + strlen(imagesPath), "/I-%01X", digit);
-
-    //
-    // Add to the repository all the files
-    // in the given directory.
-    //
-
-    collect(digitPath);
-  }
-
-  delete [] imagesPath;
-  delete [] digitPath;
-
-  //
-  // Remove the oldest files.
-  //
-
-  cleanup(images_);
-
-  //
-  // Empty the repository.
-  //
-
-  empty();
-
-  return 1;
-
-KeeperCleanupImagesAbort:
-
-  delete [] imagesPath;
-  delete [] digitPath;
-
-  empty();
-
-  return 0;
-}
-
-int Keeper::collect(const char *path)
-{
-  #ifdef TEST
-  *logofs << "Keeper: Looking for files in directory '"
-          << path << "'.\n" << logofs_flush;
-  #endif
-
-  DIR *cacheDir = opendir(path);
-
-  if (cacheDir != NULL)
-  {
-    File *file;
-
-    dirent *dirEntry;
-
-    struct stat fileStat;
-
-    int baseSize = strlen(path);
-    int fileSize = baseSize + 3 + MD5_LENGTH * 2 + 1;
-
-    int n = 0;
-    int s = 0;
-
-    while (((dirEntry = readdir(cacheDir)) != NULL))
-    {
-      if (s++ % ONCE == 0) usleep(sleep_ * 1000);
-
-      if (signal_ != 0) break;
-
-      if (strcmp(dirEntry -> d_name, ".") == 0 ||
-              strcmp(dirEntry -> d_name, "..") == 0)
-      {
-        continue;
-      }      
-
-      n++;
-
-      if (strlen(dirEntry -> d_name) == (MD5_LENGTH * 2 + 2) &&
-              (strncmp(dirEntry -> d_name, "I-", 2) == 0 ||
-                  strncmp(dirEntry -> d_name, "S-", 2) == 0 ||
-                      strncmp(dirEntry -> d_name, "C-", 2) == 0))
-      {
-        file = new File();
-
-        char *fileName = new char[fileSize];
-
-        if (file == NULL || fileName == NULL)
-        {
-          #ifdef WARNING
-          *logofs << "Keeper: WARNING! Can't add file '"
-                  << dirEntry -> d_name << "' to repository.\n"
-                  << logofs_flush;
-          #endif
-
-          delete [] fileName;
-
-          delete file;
-
-          continue;
-        }
-
-        strcpy(fileName, path);
-        strcpy(fileName + baseSize, "/");
-        strcpy(fileName + baseSize + 1, dirEntry -> d_name);
-
-        file -> name_ = fileName;
-
-        #ifdef DEBUG
-        *logofs << "Keeper: Adding file '" << file -> name_
-                << "'.\n" << logofs_flush;
-        #endif
-
-        if (stat(file -> name_, &fileStat) == -1)
-        {
-          #ifdef WARNING
-          *logofs << "Keeper: WARNING! Can't stat NX file '"
-                  << file -> name_ << ". Error is " << EGET()
-                  << " '" << ESTR() << "'.\n"
-                  << logofs_flush;
-          #endif
-
-          delete file;
-
-          continue;
-        }
-
-        file -> size_ = fileStat.st_size;
-        file -> time_ = fileStat.st_mtime;
-
-        files_ -> insert(T_files::value_type(file));
-
-        total_ += file -> size_;
-      }
-    }
-
-    closedir(cacheDir);
-
-    if (n == 0)
-    {
-      time_t now = time(NULL);
-
-      if (now > 0 && stat(path, &fileStat) == 0)
-      {
-        #ifdef TEST
-        *logofs << "Keeper: Empty NX subdirectory '" << path
-                << "' unused since " << now - fileStat.st_mtime
-                << " S.\n" << logofs_flush;
-        #endif
-
-        if (now - fileStat.st_mtime > EMPTY_DIR_TIME)
-        {
-          #ifdef TEST
-          *logofs << "Keeper: Removing empty NX subdirectory '"
-                  << path << "'.\n" << logofs_flush;
-          #endif
-
-          rmdir(path);
-        }
-      }
-    }
-  }
-  else
-  {
-    #ifdef WARNING
-    *logofs << "Keeper: WARNING! Can't open NX subdirectory '"
-            << path << ". Error is " << EGET() << " '" << ESTR()
-            << "'.\n" << logofs_flush;
-     #endif
-
-     cerr << "Warning" << ": Can't open NX subdirectory '"
-          << path << ". Error is " << EGET() << " '" << ESTR()
-          << "'.\n";
-  }
-
-  return 1;
-}
-
-int Keeper::cleanup(int threshold)
-{
-  #ifdef TEST
-  *logofs << "Keeper: Deleting the oldest files with "
-          << files_ -> size() << " elements threshold "
-          << threshold << " and size " << total_ << ".\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // At least some versions of the standard
-  // library don't allow erasing an element
-  // while looping. This is not the most ef-
-  // ficient way to release the objects, but
-  // it's better than making a copy of the
-  // container.
-  //
-
-  while (total_ > threshold && files_ -> size() > 0)
-  {
-    T_files::iterator i = files_ -> begin();
-
-    File *file = *i;
-
-    #ifdef TEST
-    *logofs << "Keeper: Removing '" << file -> name_
-            << "' with time " << file -> time_ << " and size "
-            << file -> size_ << ".\n" << logofs_flush;
-    #endif
-
-    unlink(file -> name_);
-
-    total_ -= file -> size_;
-
-    #ifdef DEBUG
-    *logofs << "Keeper: Going to delete the file at "
-            << file << " while cleaning up.\n"
-            << logofs_flush;
-    #endif
-
-    delete file;
-
-    #ifdef DEBUG
-    *logofs << "Keeper: Going to erase the element "
-            << "while cleaning up.\n"
-            << logofs_flush;
-    #endif
-
-    files_ -> erase(i);
-  }
-
-  #ifdef TEST
-  *logofs << "Keeper: Bytes in repository are "
-          << total_ << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void Keeper::empty()
-{
-  #ifdef TEST
-  *logofs << "Keeper: Getting rid of files in repository.\n"
-          << logofs_flush;
-  #endif
-
-  while (files_ -> size() > 0)
-  {
-    T_files::iterator i = files_ -> begin();
-
-    File *file = *i;
-
-    #ifdef DEBUG
-    *logofs << "Keeper: Going to delete the file at "
-            << file << " while emptying.\n"
-            << logofs_flush;
-    #endif
-
-    delete file;
-
-    #ifdef DEBUG
-    *logofs << "Keeper: Going to erase the element "
-            << "while emptying.\n"
-            << logofs_flush;
-    #endif
-
-    files_ -> erase(i);
-  }
-
-  total_ = 0;
-
-  #ifdef TEST
-  *logofs << "Keeper: Bytes in repository are "
-          << total_ << ".\n" << logofs_flush;
-  #endif
-}
diff --git a/nxcomp/Keeper.h b/nxcomp/Keeper.h
deleted file mode 100644
index b440beceb..000000000
--- a/nxcomp/Keeper.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef Keeper_H
-#define Keeper_H
-
-#include "Misc.h"
-#include "Types.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-//
-// Define this to check how many file
-// nodes are allocated and deallocated.
-//
-
-#undef  REFERENCES
-
-class Keeper;
-
-class File
-{
-  friend class Keeper;
-
-  public:
-
-  File();
-
-  ~File();
-
-  //
-  // Allow sort by time and size. If time
-  // is the same, keep the bigger element.
-  //
-
-  bool compare(File *b) const;
-
-  private:
-
-  char *name_;
-
-  int    size_;
-  time_t time_;
-
-  #ifdef REFERENCES
-
-  static int references_;
-
-  #endif
-};
-
-class Keeper
-{
-  public:
-
-  Keeper(int caches, int images, const char *root,
-             int sleep, int parent);
-
-  ~Keeper();
-
-  //
-  // Call this just once.
-  //
-
-  int cleanupCaches();
-
-  //
-  // Call this at any given interval.
-  //
-
-  int cleanupImages();
-
-  //
-  // Call this if it's time to exit.
-  //
-
-  void setSignal(int signal)
-  {
-    signal_ = signal;
-  }
-
-  int getSignal()
-  {
-    return signal_;
-  }
-
-  int getParent()
-  {
-    return parent_;
-  }
-
-  private:
-
-  //
-  // Get a list of files in directory.
-  //
-  
-  int collect(const char *path);
-
-  //
-  // Sort the collected files according to
-  // last modification time and delete the
-  // older ones until disk size is below
-  // the threshold.
-  //
-
-  int cleanup(int threshold);
-
-  //
-  // Empty the files repository.
-  //
-
-  void empty();
-
-  //
-  // Size in bytes of total allowed
-  // storage for persistent caches.
-  //
-
-  int caches_;
-
-  //
-  // Size in bytes of total allowed
-  // storage for images cache.
-  //
-
-  int images_;
-
-  //
-  // Path of the NX root directory.
-  //
-
-  char *root_;
-
-  //
-  // The little delay to be introduced
-  // before reading a new entry.
-  //
-
-  int sleep_;
-
-  //
-  // Total size of files in repository.
-  //
-
-  int total_;
-
-  //
-  // The parent process, so we can exit
-  // if it is gone.
-  //
-
-  int parent_;
-
-  //
-  // Set if we need to give up because
-  // of a signal.
-  //
-
-  int signal_;
-
-  //
-  // Repository where to collect files.
-  //
-
-  T_files *files_;
-};
-
-#endif /* Keeper_H */
-
diff --git a/nxcomp/List.cpp b/nxcomp/List.cpp
deleted file mode 100644
index 228f83214..000000000
--- a/nxcomp/List.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "List.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-//
-// Define this to know how many instances
-// are allocated and deallocated.
-//
-
-#undef  REFERENCES
-
-#ifdef REFERENCES
-
-int List::references_ = 0;
-
-#endif
-
-List::List()
-{
-  #ifdef REFERENCES
-
-  references_++;
-
-  *logofs << "List: Created new List at " 
-          << this << " out of " << references_ 
-          << " allocated references.\n" << logofs_flush;
-  #endif
-}
-
-List::~List()
-{
-  #ifdef REFERENCES
-
-  references_--;
-
-  *logofs << "List: Deleted List at " 
-          << this << " out of " << references_ 
-          << " allocated references.\n" << logofs_flush;
-  #endif
-}
-
-void List::remove(int value)
-{
-  for (T_list::iterator i = list_.begin(); i != list_.end(); i++)
-  {
-    if (*i == value)
-    {
-      list_.erase(i);
-
-      return;
-    }
-  }
-
-  #ifdef PANIC
-  *logofs << "List: PANIC! Should not try to remove "
-          << "an element not found in the list.\n"
-          << logofs_flush;
-  #endif
-
-  cerr << "Error" << ": Should not try to remove "
-       << "an element not found in the list.\n";
-
-  HandleAbort();
-}
-
-void List::rotate()
-{
-  if (list_.size() > 1)
-  {
-    int value = *(list_.begin());
-
-    list_.pop_front();
-
-    list_.push_back(value);
-  }
-}
diff --git a/nxcomp/List.h b/nxcomp/List.h
deleted file mode 100644
index 31c80f835..000000000
--- a/nxcomp/List.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef List_H
-#define List_H
-
-#include "Misc.h"
-#include "Types.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-//
-// Define this to log when lists are
-// allocated and deallocated.
-//
-
-#undef  REFERENCES
-
-class List
-{
-  public:
-
-  List();
-
-  ~List();
-
-  int getSize()
-  {
-    return list_.size();
-  }
-
-  T_list &getList()
-  {
-    return list_;
-  }
-
-  T_list copyList()
-  {
-    return list_;
-  }
-
-  void add(int value)
-  {
-    list_.push_back(value);
-  }
-
-  void remove(int value);
-
-  void rotate();
-
-  private:
-
-  //
-  // The list container.
-  //
-
-  T_list list_;
-
-  #ifdef REFERENCES
-
-  static int references_;
-
-  #endif
-};
-
-#endif /* List_H */
diff --git a/nxcomp/ListFontsReply.cpp b/nxcomp/ListFontsReply.cpp
deleted file mode 100644
index 827f68a09..000000000
--- a/nxcomp/ListFontsReply.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "ListFontsReply.h"
-
-#include "ServerCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  DUMP
-#undef  TEST
-#undef  DEBUG
-
-ListFontsReplyStore::ListFontsReplyStore(StaticCompressor *compressor)
-
-  : MessageStore(compressor)
-{
-  enableCache    = LISTFONTSREPLY_ENABLE_CACHE;
-  enableData     = LISTFONTSREPLY_ENABLE_DATA;
-  enableSplit    = LISTFONTSREPLY_ENABLE_SPLIT;
-
-  // Since ProtoStep7 (#issue 108)
-  enableCompress = LISTFONTSREPLY_ENABLE_COMPRESS_IF_PROTO_STEP_7;
-
-  dataLimit  = LISTFONTSREPLY_DATA_LIMIT;
-  dataOffset = LISTFONTSREPLY_DATA_OFFSET;
-
-  cacheSlots          = LISTFONTSREPLY_CACHE_SLOTS;
-  cacheThreshold      = LISTFONTSREPLY_CACHE_THRESHOLD;
-  cacheLowerThreshold = LISTFONTSREPLY_CACHE_LOWER_THRESHOLD;
-
-  messages_ -> resize(cacheSlots);
-
-  for (T_messages::iterator i = messages_ -> begin();
-           i < messages_ -> end(); i++)
-  {
-    *i = NULL;
-  }
-
-  temporary_ = NULL;
-}
-
-ListFontsReplyStore::~ListFontsReplyStore()
-{
-  for (T_messages::iterator i = messages_ -> begin();
-           i < messages_ -> end(); i++)
-  {
-    destroy(*i);
-  }
-
-  destroy(temporary_);
-}
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int ListFontsReplyStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                           unsigned int size, int bigEndian) const
-{
-  ListFontsReplyMessage *listFontsReply = (ListFontsReplyMessage *) message;
-
-  //
-  // Here is the fingerprint.
-  //
-
-  listFontsReply -> number_of_names = GetUINT(buffer + 8, bigEndian);
-
-  //
-  // Clean up padding bytes.
-  //
-
-  if ((int) size > dataOffset)
-  {
-    unsigned int current;
-    unsigned int length;
-    unsigned int nstringInNames; 
-
-    unsigned char *end = NULL;
-    unsigned char *pad = NULL;
-
-    #ifdef DUMP
-
-    *logofs << "\n" << logofs_flush;
-
-    *logofs << "Number of STRING8 " << listFontsReply -> number_of_names << ".\n" << logofs_flush;
-
-    *logofs << "Size " << size << ".\n" << logofs_flush;
-
-    DumpHexData(buffer, size);
-
-    *logofs << "\n" << logofs_flush;
-
-    #endif
-
-    length = LISTFONTSREPLY_DATA_OFFSET;
-
-    for (nstringInNames = 0; 
-             nstringInNames < listFontsReply -> number_of_names &&
-                 listFontsReply -> number_of_names > 0;
-                     nstringInNames++)
-    {
-      //
-      // Start with offset LISTFONTSREPLY_DATA_OFFSET 32.
-      //
-
-      current = buffer[length];
-
-      length += current + 1;
-
-      #ifdef DUMP
-      *logofs << "\nString number : " << nstringInNames << " Current length : "
-              << current << "\n" << logofs_flush;
-      #endif
-    }
-    
-    #ifdef DUMP
-    *logofs << "\nFinal length " << length << "\n" << logofs_flush;
-    #endif
-
-    end = ((unsigned char *) buffer) + size;
-
-    for (pad = ((unsigned char *) buffer) + length; pad < end; pad++)
-    {
-      *pad = 0;
-
-      #ifdef DUMP
-      *logofs << "\nPadding ." << "\n" << logofs_flush;
-      #endif
-    }
-  }
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed identity for message at " << message << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int ListFontsReplyStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                            unsigned int size, int bigEndian) const
-{
-  ListFontsReplyMessage *listFontsReply = (ListFontsReplyMessage *) message;
-
-  //
-  // Fill all the message's fields.
-  //
-
-  PutUINT(listFontsReply -> number_of_names, buffer + 8, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at "
-          << message << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void ListFontsReplyStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  ListFontsReplyMessage *listFontsReply = (ListFontsReplyMessage *) message;
-
-  *logofs << name() << ": Identity number_of_names "
-          << listFontsReply -> number_of_names << ", size "
-          << listFontsReply -> size_ << ".\n";
-
-  #endif
-}
-
-void ListFontsReplyStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                               unsigned int size, int bigEndian) const
-{
-  //
-  // Field number_of_names.
-  //
-
-  md5_append(md5_state_, buffer + 8,  2);
-}
diff --git a/nxcomp/ListFontsReply.h b/nxcomp/ListFontsReply.h
deleted file mode 100644
index c731878e0..000000000
--- a/nxcomp/ListFontsReply.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef ListFontsReply_H
-#define ListFontsReply_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define LISTFONTSREPLY_ENABLE_CACHE                       1
-#define LISTFONTSREPLY_ENABLE_DATA                        1
-#define LISTFONTSREPLY_ENABLE_SPLIT                       0
-
-#define LISTFONTSREPLY_DATA_LIMIT                         1048576 - 32
-#define LISTFONTSREPLY_DATA_OFFSET                        32
-
-#define LISTFONTSREPLY_CACHE_SLOTS                        200
-#define LISTFONTSREPLY_CACHE_THRESHOLD                    20
-#define LISTFONTSREPLY_CACHE_LOWER_THRESHOLD              5
-
-#define LISTFONTSREPLY_ENABLE_COMPRESS_IF_PROTO_STEP_7    0
-
-//
-// The message class.
-//
-
-class ListFontsReplyMessage : public Message
-{
-  friend class ListFontsReplyStore;
-
-  public:
-
-  ListFontsReplyMessage()
-  {
-  }
-
-  ~ListFontsReplyMessage()
-  {
-  }
-
-  //
-  // Put here the fields which constitute 
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned short int number_of_names;
-};
-
-class ListFontsReplyStore : public MessageStore
-{
-  //
-  // Constructors and destructors.
-  //
-
-  public:
-
-  ListFontsReplyStore(StaticCompressor *compressor);
-
-  virtual ~ListFontsReplyStore();
-
-  virtual const char *name() const
-  {
-    return "ListFontsReply";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_ListFonts;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(ListFontsReplyMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  protected:
-
-  virtual Message *create() const
-  {
-    return new ListFontsReplyMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new ListFontsReplyMessage((const ListFontsReplyMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (ListFontsReplyMessage *) message;
-  }
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer, 
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer, 
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer, 
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* ListFontsReply_H */
diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
deleted file mode 100644
index 4592121de..000000000
--- a/nxcomp/Loop.cpp
+++ /dev/null
@@ -1,16689 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include <errno.h>
-#include <signal.h>
-#include <setjmp.h>
-
-#include <math.h>
-#include <ctype.h>
-#include <string.h>
-#include <dirent.h>
-#include <pwd.h>
-
-#include <fcntl.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <sys/resource.h>
-#include <sys/utsname.h>
-#include <sys/un.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include "Misc.h"
-
-#ifdef __sun
-#include <strings.h>
-#endif
-
-//
-// MacOSX 10.4 defines socklen_t. This is
-// intended to ensure compatibility with
-// older versions.
-//
-
-#ifdef __APPLE__
-#include <AvailabilityMacros.h>
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_3
-typedef int socklen_t;
-#endif
-#endif
-
-#ifdef _AIX
-#include <strings.h>
-#include <sys/select.h>
-#endif
-
-#ifndef __CYGWIN32__
-#include <netinet/tcp.h>
-#endif
-
-//
-// NX include files.
-//
-
-#include "NX.h"
-#include "NXalert.h"
-
-#include "Misc.h"
-#include "Control.h"
-#include "Socket.h"
-#include "Statistics.h"
-#include "Auth.h"
-#include "Keeper.h"
-#include "Agent.h"
-
-#include "ClientProxy.h"
-#include "ServerProxy.h"
-
-#include "Message.h"
-#include "ChannelEndPoint.h"
-
-//
-// System specific defines.
-//
-
-
-//
-// HP-UX hides this define.
-//
-
-#if defined(hpux) && !defined(RLIM_INFINITY)
-
-#define RLIM_INFINITY  0x7fffffff
-
-#endif
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Enable log output in signal handler.
-// This is likely to hang the proxy at
-// random, at least on Linux.
-//
-
-#undef UNSAFE
-
-//
-// Let all logs go to the standard error.
-// This is useful to interleave the Xlib
-// log output with the proxy output in a
-// single file.
-//
-
-#undef  MIXED
-
-//
-// Define this to check if the client and
-// server caches match at shutdown. This
-// is a test facility as it requires that
-// both proxies are running on the same
-// host.
-//
-
-#undef  MATCH
-
-//
-// If defined, reduce the size of the log
-// file and be sure it never exceeds the
-// limit.
-//
-
-#undef  QUOTA
-
-//
-// If defined, force very strict limits for
-// the proxy tokens and force the proxy to
-// enter often in congestion state.
-//
-
-#undef  STRICT
-
-//
-// Print a line in the log if the time we
-// spent inside the select or handling the
-// messages exceeded a given time value.
-//
-
-#undef  TIME
-
-//
-// This can be useful when testing the forwarding
-// of the SSHD connection by nxssh to the agent.
-// The debug output will go to a well known file
-// that will be opened also by nxssh when BINDER
-// is enabled there.
-//
-
-#undef  BINDER
-
-//
-// Define this to override the limits on
-// the core dump size.
-//
-
-#define COREDUMPS
-
-//
-// Upper limit of pre-allocated buffers
-// for string parameters.
-//
-
-#define DEFAULT_STRING_LENGTH              256
-
-//
-// Maximum length of remote options data
-// passed by peer proxy at startup.
-//
-
-#define DEFAULT_REMOTE_OPTIONS_LENGTH      512
-
-//
-// Maximum length of NX display string.
-//
-
-#define DEFAULT_DISPLAY_OPTIONS_LENGTH     1024
-
-//
-// Maximum number of cache file names to
-// send to the server side.
-//
-
-#define DEFAULT_REMOTE_CACHE_ENTRIES       100
-
-//
-// Maximum length of remote options string
-// that can be received from the peer proxy.
-//
-
-#define MAXIMUM_REMOTE_OPTIONS_LENGTH      4096
-
-//
-// Macro is true if we determined our proxy
-// mode.
-//
-
-#define WE_SET_PROXY_MODE         (control -> ProxyMode != proxy_undefined)
-
-//
-// Macro is true if our side is the one that
-// should connect to remote.
-//
-
-#define WE_INITIATE_CONNECTION    (connectSocket.enabled())
-
-//
-// Is true if we must provide our credentials
-// to the remote peer.
-//
-
-#define WE_PROVIDE_CREDENTIALS    (control -> ProxyMode == proxy_server)
-
-//
-// Is true if we listen for a local forwarder
-// that will tunnel the traffic through a SSH
-// or HTTP link.
-//
-
-#define WE_LISTEN_FORWARDER       (control -> ProxyMode == proxy_server && \
-                                           listenSocket.enabled())
-
-//
-// You must define FLUSH in Misc.h if
-// you want an immediate flush of the
-// log output.
-//
-
-ostream *logofs = NULL;
-
-//
-// Other stream destriptors used for
-// logging.
-//
-
-ostream *statofs = NULL;
-ostream *errofs  = NULL;
-
-//
-// Save standard error's rdbuf here
-// and restore it when exiting.
-//
-
-static streambuf *errsbuf = NULL;
-
-//
-// Allow faults to be recovered by
-// jumping back into the main loop.
-//
-
-jmp_buf context;
-
-//
-// Provide operational parameters.
-//
-
-Control *control = NULL;
-
-//
-// Collect and print statistics.
-//
-
-Statistics *statistics = NULL;
-
-//
-// Keep data for X11 authentication.
-//
-
-Auth *auth = NULL;
-
-//
-// This class makes the hard work.
-//
-
-Proxy *proxy = NULL;
-
-//
-// Used to handle memory-to-memory
-// transport to the X agent.
-//
-
-Agent *agent = NULL;
-
-//
-// The image cache house-keeping class.
-//
-
-Keeper *keeper = NULL;
-
-//
-// Callback set by the child process
-// to be notified about signals.
-//
-
-int (*handler)(int) = NULL;
-
-//
-// Signal handling functions.
-//
-
-void DisableSignals();
-void EnableSignals();
-void InstallSignals();
-
-static void RestoreSignals();
-static void HandleSignal(int signal);
-
-//
-// Signal handling utilities.
-//
-
-static void InstallSignal(int signal, int action);
-static void RestoreSignal(int signal);
-
-static int HandleChildren();
-
-int HandleChild(int child);
-static int CheckChild(int pid, int status);
-static int WaitChild(int child, const char *label, int force);
-
-int CheckParent(const char *name, const char *type, int parent);
-
-void RegisterChild(int child);
-
-static int CheckAbort();
-
-//
-// Timer handling utilities.
-//
-
-void SetTimer(int timeout);
-void ResetTimer();
-
-static void HandleTimer(int signal);
-
-//
-// Kill or check a running child.
-//
-
-static int KillProcess(int pid, const char *label, int signal, int wait);
-static int CheckProcess(int pid, const char *label);
-
-//
-// Macros used to test the pid of a child.
-//
-
-#define IsFailed(pid)       ((pid) < 0)
-#define IsRunning(pid)      ((pid) > 1)
-#define IsNotRunning(pid)   ((pid) == 0)
-#define IsRestarting(pid)   ((pid) == 1)
-
-#define SetNotRunning(pid)  ((pid) = 0)
-#define SetRestarting(pid)  ((pid) = 1)
-
-//
-// Start or restart the house-keeper process.
-//
-
-static int StartKeeper();
-
-//
-// Cleanup functions.
-//
-
-void CleanupConnections();
-void CleanupListeners();
-void CleanupSockets();
-void CleanupGlobal();
-
-static void CleanupChildren();
-static void CleanupLocal();
-static void CleanupKeeper();
-static void CleanupStreams();
-
-//
-// Loop forever until the connections
-// to the peer proxy is dropped.
-//
-
-static void WaitCleanup();
-
-//
-// Initialization functions.
-//
-
-static int InitBeforeNegotiation();
-static int SetupProxyConnection();
-static int InitAfterNegotiation();
-static int SetupProxyInstance();
-static int SetupAuthInstance();
-static int SetupAgentInstance();
-
-static int SetupTcpSocket();
-static int SetupUnixSocket();
-static int SetupServiceSockets();
-static int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
-                                  unsigned int &xServerAddrLength);
-
-//
-// Setup a listening socket and accept
-// a new connection.
-//
-
-static int ListenConnection(ChannelEndPoint &endPoint, const char *label);
-static int ListenConnectionTCP(const char *host, long port, const char *label);
-static int ListenConnectionUnix(const char *path, const char *label);
-static int ListenConnectionAny(sockaddr *addr, socklen_t addrlen, const char *label);
-static int AcceptConnection(int fd, int domain, const char *label);
-
-//
-// Other convenience functions.
-//
-
-static int PrepareProxyConnectionTCP(char** hostName, long int* portNum, int* timeout, int* proxyFD, int* reason);
-static int PrepareProxyConnectionUnix(char** path, int* timeout, int* proxyFD, int* reason);
-
-static int WaitForRemote(ChannelEndPoint &socketAddress);
-static int ConnectToRemote(ChannelEndPoint &socketAddress);
-
-static int SendProxyOptions(int fd);
-static int SendProxyCaches(int fd);
-static int ReadProxyVersion(int fd);
-static int ReadProxyOptions(int fd);
-static int ReadProxyCaches(int fd);
-static int ReadForwarderVersion(int fd);
-static int ReadForwarderOptions(int fd);
-
-static int ReadRemoteData(int fd, char *buffer, int size, char stop);
-static int WriteLocalData(int fd, const char *buffer, int size);
-
-static void PrintVersionInfo();
-static void PrintProcessInfo();
-static void PrintConnectionInfo();
-static void PrintUsageInfo(const char *option, const int error);
-static void PrintOptionIgnored(const char *type, const char *name, const char *value);
-
-//
-// This is not static to avoid a warning.
-//
-
-void PrintCopyrightInfo();
-
-static const char *GetOptions(const char *options);
-static const char *GetArg(int &argi, int argc, const char **argv);
-static int CheckArg(const char *type, const char *name, const char *value);
-static int ParseArg(const char *type, const char *name, const char *value);
-static int ValidateArg(const char *type, const char *name, const char *value);
-static void SetAndValidateChannelEndPointArg(const char *type, const char *name, const char *value,
-                                             ChannelEndPoint &endPoint);
-static int LowercaseArg(const char *type, const char *name, char *value);
-static int CheckSignal(int signal);
-
-extern "C"
-{
-  int ParseCommandLineOptions(int argc, const char **argv);
-  int ParseEnvironmentOptions(const char *env, int force);
-  int ParseBindOptions(char **host, int *port);
-}
-
-static int ParseFileOptions(const char *file);
-static int ParseRemoteOptions(char *opts);
-static int ParseForwarderOptions(char *opts);
-
-//
-// These functions are used to parse literal
-// values provided by the user and set the
-// control parameters accordingly.
-//
-
-static int ParseLinkOption(const char *opt);
-static int ParseBitrateOption(const char *opt);
-static int ParseCacheOption(const char *opt);
-static int ParseShmemOption(const char *opt);
-static int ParseImagesOption(const char *opt);
-static int ParsePackOption(const char *opt);
-
-//
-// Set host and port where NX proxy is supposed
-// to be listening in case such parameters are
-// given on the command line.
-//
-
-static int ParseHostOption(const char *opt, char *host, long &port);
-
-//
-// Translate a font server port specification
-// to the corresponding Unix socket path.
-//
-
-static int ParseFontPath(char *path);
-
-//
-// Translate a pack method id in a literal.
-//
-
-static int ParsePackMethod(const int method, const int quality);
-
-//
-// Try to increase the size of the allowed
-// core dumps.
-//
-
-static int SetCore();
-
-//
-// Set the proxy mode to either client or
-// server.
-//
-
-static int SetMode(int mode);
-
-//
-// Determine the path of the NX_* directories
-// from the environment.
-//
-
-static int SetDirectories();
-
-//
-// Set the defaults used for the log file and
-// statistics.
-//
-
-static int SetLogs();
-
-//
-// Check if local and remote protocol versions
-// are compatible and, eventually, downgrade
-// local version to the minimum level that is
-// known to work.
-//
-
-static int SetVersion();
-
-//
-// Setup the listening TCP ports used for the
-// additional channels according to user's
-// wishes.
-//
-
-static int SetPorts();
-
-//
-// Set the maximum number of open descriptors.
-//
-
-static int SetDescriptors();
-
-//
-// Set the path used for choosing the cache.
-// It must be selected after determining the
-// session type.
-//
-
-static int SetCaches();
-
-//
-// Initialize, one after the other, all the
-// configuration parameters.
-//
-
-static int SetParameters();
-
-//
-// Set the specific configuration parameter.
-//
-
-static int SetSession();
-static int SetStorage();
-static int SetShmem();
-static int SetPack();
-static int SetImages();
-static int SetLimits();
-
-//
-// Set up the control parameters based on
-// the link speed negotiated between the
-// proxies.
-//
-
-static int SetLink();
-
-static int SetLinkModem();
-static int SetLinkIsdn();
-static int SetLinkAdsl();
-static int SetLinkWan();
-static int SetLinkLan();
-
-//
-// Adjust the compression parameters.
-//
-
-static int SetCompression();
-
-static int SetCompressionModem();
-static int SetCompressionIsdn();
-static int SetCompressionAdsl();
-static int SetCompressionWan();
-static int SetCompressionLan();
-
-//
-// Determine the NX paths based on the
-// user's parameters or the environment.
-//
-
-char *GetClientPath();
-
-static char *GetSystemPath();
-static char *GetHomePath();
-static char *GetTempPath();
-static char *GetRootPath();
-static char *GetCachePath();
-static char *GetImagesPath();
-static char *GetSessionPath();
-static char *GetLastCache(char *list, const char *path);
-
-static int OpenLogFile(char *name, ostream *&stream);
-static int ReopenLogFile(char *name, ostream *&stream, int limit);
-
-//
-// Perform operations on the managed
-// descriptors in the main loop.
-//
-
-static void handleCheckSessionInLoop();
-static void handleCheckBitrateInLoop();
-
-#if defined(TEST) || defined(INFO)
-static void handleCheckSelectInLoop(int &setFDs, fd_set &readSet,
-                                        fd_set &writeSet, T_timestamp selectTs);
-static void handleCheckResultInLoop(int &resultFDs, int &errorFDs, int &setFDs, fd_set &readSet,
-                                        fd_set &writeSet, struct timeval &selectTs,
-                                            struct timeval &startTs);
-static void handleCheckStateInLoop(int &setFDs);
-#endif
-
-static void handleCheckSessionInConnect();
-
-static inline void handleSetReadInLoop(fd_set &readSet, int &setFDs, struct timeval &selectTs);
-static inline void handleSetWriteInLoop(fd_set &writeSet, int &setFDs, struct timeval &selectTs);
-static inline void handleSetListenersInLoop(fd_set &writeSet, int &setFDs);
-static inline void handleSetAgentInLoop(int &setFDs, fd_set &readSet, fd_set &writeSet,
-                                            struct timeval &selectTs);
-
-static void handleAlertInLoop();
-static void handleStatisticsInLoop();
-
-static inline void handleAgentInLoop(int &resultFDs, int &errorFDs, int &setFDs, fd_set &readSet,
-                                         fd_set &writeSet, struct timeval &selectTs);
-static inline void handleAgentLateInLoop(int &resultFDs, int &errorFDs, int &setFDs, fd_set &readSet,
-                                             fd_set &writeSet, struct timeval &selectTs);
-
-static inline void handleReadableInLoop(int &resultFDs, fd_set &readSet);
-static inline void handleWritableInLoop(int &resultFDs, fd_set &writeSet);
-
-static inline void handleRotateInLoop();
-static inline void handleEventsInLoop();
-static inline void handleFlushInLoop();
-
-//
-// Manage the proxy link during the negotiation
-// phase.
-//
-
-static void handleNegotiationInLoop(int &setFDs, fd_set &readSet,
-                                        fd_set &writeSet, T_timestamp &selectTs);
-
-//
-// Print the 'terminating' messages in the
-// session log.
-//
- 
-static inline void handleTerminatingInLoop();
-static inline void handleTerminatedInLoop();
-
-//
-// Monitor the size of the log file.
-//
-
-static void handleLogReopenInLoop(T_timestamp &logsTs, T_timestamp &nowTs);
-
-//
-// Directory where the NX binaries and libraries reside.
-//
-
-static char systemDir[DEFAULT_STRING_LENGTH] = { 0 };
-
-//
-// Directory used for temporary files.
-//
-
-static char tempDir[DEFAULT_STRING_LENGTH] = { 0 };
-
-//
-// Actually the full path to the client.
-//
-
-static char clientDir[DEFAULT_STRING_LENGTH] = { 0 };
-
-//
-// User's home directory.
-//
-
-static char homeDir[DEFAULT_STRING_LENGTH] = { 0 };
-
-//
-// Root of directory structure to be created by proxy.
-//
-
-static char rootDir[DEFAULT_STRING_LENGTH] = { 0 };
-
-//
-// Root of statistics and log files to be created by proxy.
-//
-
-static char sessionDir[DEFAULT_STRING_LENGTH] = { 0 };
-
-//
-// Log files for errors and statistics. Error log is
-// the place where we print also debug informations.
-// Both files are closed, deleted and reopened as
-// their size exceed the limit set in control class.
-// The session log is not reopened, as it is used by
-// the NX client and server to track the advance of
-// the session.
-//
-
-static char errorsFileName[DEFAULT_STRING_LENGTH]  = { 0 };
-static char statsFileName[DEFAULT_STRING_LENGTH]   = { 0 };
-static char sessionFileName[DEFAULT_STRING_LENGTH] = { 0 };
-static char optionsFileName[DEFAULT_STRING_LENGTH] = { 0 };
-
-//
-// String literal representing selected link speed
-// parameter. Value is translated in control values
-// used by proxies to stay synchronized.
-//
-
-static char linkSpeedName[DEFAULT_STRING_LENGTH] = { 0 };
-
-//
-// String literal representing selected
-// cache size.
-//
-
-static char cacheSizeName[DEFAULT_STRING_LENGTH] = { 0 };
-
-//
-// String literal representing selected
-// shared memory segment size.
-//
-
-static char shsegSizeName[DEFAULT_STRING_LENGTH] = { 0 };
-
-//
-// String literal of images cache size.
-//
-
-static char imagesSizeName[DEFAULT_STRING_LENGTH] = { 0 };
-
-//
-// String literal for bandwidth limit.
-//
-
-static char bitrateLimitName[DEFAULT_STRING_LENGTH] = { 0 };
-
-//
-// String literal for image packing method.
-//
-
-static char packMethodName[DEFAULT_STRING_LENGTH] = { 0 };
-
-//
-// Product name provided by the server or client.
-//
-
-static char productName[DEFAULT_STRING_LENGTH] = { 0 };
-
-//
-// Its corresponding value from NXpack.h.
-//
-
-static int packMethod  = -1;
-static int packQuality = -1;
-
-//
-// String literal for session type. Persistent caches
-// are searched in directory whose name matches this
-// parameter.
-//
-
-static char sessionType[DEFAULT_STRING_LENGTH] = { 0 };
-
-//
-// Unique id assigned to session. It is used as
-// name of directory where all files are placed.
-//
-
-static char sessionId[DEFAULT_STRING_LENGTH] = { 0 };
-
-//
-// Set if we already parsed the options.
-//
-
-static int parsedOptions = 0;
-static int parsedCommand = 0;
-
-//
-// Buffer data received from the remote proxy at
-// session negotiation.
-//
-
-static char remoteData[MAXIMUM_REMOTE_OPTIONS_LENGTH] = { 0 };
-static int  remotePosition = 0;
-
-//
-// Main loop file descriptors.
-//
-
-static int tcpFD   = -1;
-static int unixFD  = -1;
-static int cupsFD  = -1;
-static int auxFD   = -1;
-static int smbFD   = -1;
-static int mediaFD = -1;
-static int httpFD  = -1;
-static int fontFD  = -1;
-static int slaveFD = -1;
-static int proxyFD = -1;
-
-//
-// Used for internal communication
-// with the X agent.
-//
-
-static int agentFD[2] = { -1, -1 };
-
-//
-// Flags determining which protocols and
-// ports are forwarded.
-//
-
-int useUnixSocket = 1;
-
-static int useTcpSocket   = 1;
-static int useCupsSocket  = 0;
-static int useAuxSocket   = 0;
-static int useSmbSocket   = 0;
-static int useMediaSocket = 0;
-static int useHttpSocket  = 0;
-static int useFontSocket  = 0;
-static int useSlaveSocket = 0;
-static int useAgentSocket = 0;
-
-//
-// Set if the launchd service is running
-// and its socket must be used as X socket.
-//
-
-static int useLaunchdSocket = 0;
-
-//
-// Set by user if he/she wants to modify
-// the default TCP_NODELAY option as set
-// in control.
-//
-
-static int useNoDelay = -1;
-
-//
-// Set if user wants to override default
-// flush timeout set according to link.
-//
-
-static int usePolicy = -1;
-
-//
-// Set if user wants to hide the RENDER
-// extension or wants to short-circuit
-// some simple replies at client side.
-//
-
-static int useRender = -1;
-static int useTaint  = -1;
-
-//
-// Set if the user wants to reduce the
-// nominal size of the token messages
-// exchanged between the proxies.
-//
-
-static int useStrict = -1;
-
-//
-// Set if the proxy is running as part
-// of SSH on the client.
-//
-
-static int useEncryption = -1;
-
-//
-// Name of Unix socket created by the client proxy to
-// accept client connections. File must be unlinked
-// by cleanup function.
-//
-
-static char unixSocketName[DEFAULT_STRING_LENGTH] = { 0 };
-
-//
-// Other parameters.
-//
-
-static char acceptHost[DEFAULT_STRING_LENGTH]  = { 0 };
-static char displayHost[DEFAULT_STRING_LENGTH] = { 0 };
-static char authCookie[DEFAULT_STRING_LENGTH]  = { 0 };
-
-static int loopbackBind = DEFAULT_LOOPBACK_BIND;
-static int proxyPort = DEFAULT_NX_PROXY_PORT;
-static int xPort     = DEFAULT_NX_X_PORT;
-
-//
-// Used to setup the connection the real
-// X display socket.
-//
-
-static int xServerAddrFamily          = -1;
-static sockaddr *xServerAddr          = NULL;
-static unsigned int xServerAddrLength = 0;
-
-//
-// The representation of a Unix socket path or
-// a bind address, denoting where the local proxy
-// will await the peer connection.
-//
-
-static ChannelEndPoint listenSocket;
-
-//
-// The TCP host and port or Unix file socket where
-// the remote proxy will be contacted.
-//
-
-static ChannelEndPoint connectSocket;
-
-//
-// Helper channels are disabled by default.
-//
-
-static ChannelEndPoint cupsPort;
-static ChannelEndPoint auxPort;
-static ChannelEndPoint smbPort;
-static ChannelEndPoint mediaPort;
-static ChannelEndPoint httpPort;
-static ChannelEndPoint slavePort;
-
-//
-// Can be either a port number or a Unix
-// socket.
-//
-
-static char fontPort[DEFAULT_STRING_LENGTH] = { 0 };
-
-//
-// Host and port where the existing proxy
-// is running.
-//
-
-static char bindHost[DEFAULT_STRING_LENGTH] = { 0 };
-static int  bindPort = -1;
-
-//
-// Pointers to the callback functions and
-// parameter set by the agent
-//
-
-static void (*flushCallback)(void *, int) = NULL;
-static void *flushParameter = NULL;
-
-static void (*statisticsCallback)(void *, int) = NULL;
-static void *statisticsParameter = NULL;
-
-//
-// State variables shared between the init
-// function and the main loop.
-//
-
-T_timestamp initTs;
-T_timestamp startTs;
-T_timestamp logsTs;
-T_timestamp nowTs;
-
-int diffTs;
-
-//
-// This is set to the main proxy process id.
-// 
-
-int lastProxy = 0;
-
-//
-// Set to last dialog process launched by proxy.
-// 
-
-int lastDialog = 0;
-
-//
-// Set to watchdog process launched by proxy.
-// 
-
-int lastWatchdog = 0;
-
-//
-// Set if a cache house-keeper process is running.
-// 
-
-int lastKeeper = 0;
-
-//
-// Let an inner routine register the pid of a slave
-// process.
-//
-
-static int lastChild = 0;
-
-//
-// Exit code of the last child process exited.
-//
-
-static int lastStatus = 0;
-
-//
-// Set if shutdown was requested through a signal.
-//
-
-static int lastKill = 0;
-
-//
-// Set if the agent confirmed the destruction of
-// the NX transport.
-//
-
-static int lastDestroy = 0;
-
-//
-// This is set to the code and local flag of the
-// last requested alert.
-// 
-
-static struct
-{
-  int code;
-  int local;
-
-} lastAlert;
-
-//
-// Manage the current signal masks.
-//
-
-static struct
-{
-  sigset_t saved;
-
-  int blocked;
-  int installed;
-
-  int enabled[32];
-  int forward[32];
-
-  struct sigaction action[32];
-
-} lastMasks;
-
-//
-// Manage the current timer.
-//
-
-static struct
-{
-  struct sigaction action;
-  struct itimerval value;
-  struct timeval   start;
-  struct timeval   next;
-
-} lastTimer;
-
-//
-// This is set to last signal received in handler.
-//
-
-static int lastSignal = 0;
-
-//
-// Set to the last time bytes readable were queried
-// by the agent.
-//
-
-static T_timestamp lastReadableTs = nullTimestamp();
-
-//
-// Here are interfaces declared in NX.h.
-//
-
-int NXTransProxy(int fd, int mode, const char* options)
-{
-  //
-  // Let the log temporarily go to the standard
-  // error. Be also sure we have a jump context,
-  // in the case any subsequent operation will
-  // cause a cleanup.
-  //
-
-  if (logofs == NULL)
-  {
-    logofs = &cerr;
-  }
-
-  if (setjmp(context) == 1)
-  {
-    #ifdef TEST
-    *logofs << "NXTransProxy: Out of the long jump with pid '"
-            << lastProxy << "'.\n" << logofs_flush;
-    #endif
-    
-    return -1;
-  }
-
-  //
-  // Check if have already performed a parsing of
-  // parameters, as in the case we are running as
-  // a stand-alone process. If needed create the
-  // parameters repository
-  //
-
-  if (control == NULL)
-  {
-    control = new Control();
-  }
-
-  lastProxy = getpid();
-
-  #ifdef TEST
-  *logofs << "NXTransProxy: Main process started with pid '"
-          << lastProxy << "'.\n" << logofs_flush;
-  #endif
-
-  SetMode(mode);
-
-  if (mode == NX_MODE_CLIENT)
-  {
-    if (fd != NX_FD_ANY)
-    {
-      #ifdef TEST
-
-      *logofs << "NXTransProxy: Agent descriptor for X client connections is FD#"
-              << fd << ".\n" << logofs_flush;
-
-      *logofs << "NXTransProxy: Disabling listening on further X client connections.\n"
-              << logofs_flush;
-
-      #endif
-
-      useTcpSocket   = 0;
-      useUnixSocket  = 0;
-      useAgentSocket = 1;
-
-      agentFD[1] = fd;
-    }
-  }
-  else if (mode == NX_MODE_SERVER)
-  {
-    if (fd != NX_FD_ANY)
-    {
-      #ifdef TEST
-      *logofs << "NXTransProxy: PANIC! Agent descriptor for X server connections "
-              << "not supported yet.\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Agent descriptor for X server connections "
-           << "not supported yet.\n";
-
-      return -1;
-    }
-  }
-
-  const char *env = GetOptions(options);
-
-  if (ParseEnvironmentOptions(env, 0) < 0)
-  {
-    cerr << "Error" << ": Parsing of NX transport options failed.\n";
-
-    return -1;
-  }
-
-  //
-  // Set the path of the NX directories.
-  //
-
-  SetDirectories();
-
-  //
-  // Open the log files.
-  //
-
-  SetLogs();
-
-  #ifdef TEST
-  *logofs << "NXTransProxy: Going to run the NX transport loop.\n"
-          << logofs_flush;
-  #endif
-
-  WaitCleanup();
-
-  //
-  // This function should never return.
-  //
-
-  exit(0);
-}
-
-void NXTransExit(int code)
-{
-  if (logofs == NULL)
-  {
-    logofs = &cerr;
-  }
-
-  static int recurse;
-
-  if (++recurse > 1)
-  {
-    #ifdef TEST
-    *logofs << "NXTransExit: Aborting process with pid '"
-            << getpid() << "' due to recursion through "
-            << "exit.\n" << logofs_flush;
-    #endif
-
-    abort();
-  }
-
-  #ifdef TEST
-  *logofs << "NXTransExit: Process with pid '"
-          << getpid() << "' called exit with code '"
-          << code << "'.\n" << logofs_flush;
-  #endif
-
-  if (control != NULL)
-  {
-    //
-    // Be sure that there we can detect the
-    // termination of the watchdog.
-    //
-
-    EnableSignals();
-
-    //
-    // Close the NX transport if it was not
-    // shut down already.
-    //
-
-    NXTransDestroy(NX_FD_ANY);
-  }
-
-  exit(code);
-}
-
-int NXTransParseCommandLine(int argc, const char **argv)
-{
-  return ParseCommandLineOptions(argc, argv);
-}
-
-int NXTransParseEnvironment(const char *env, int force)
-{
-  return ParseEnvironmentOptions(env, force);
-}
-
-void NXTransCleanup()
-{
-  HandleCleanup();
-}
-
-void NXTransCleanupForReconnect()
-{
-  HandleCleanupForReconnect();
-}
-
-//
-// Check the parameters for subsequent
-// initialization of the NX transport.
-//
-
-int NXTransCreate(int fd, int mode, const char* options)
-{
-  if (logofs == NULL)
-  {
-    logofs = &cerr;
-  }
-
-  //
-  // Be sure we have a jump context, in the
-  // case a subsequent operation will cause
-  // a cleanup.
-  //
-
-  if (setjmp(context) == 1)
-  {
-    return -1;
-  }
-
-  //
-  // Create the parameters repository
-  //
-
-  if (control != NULL)
-  {
-    #ifdef PANIC
-    *logofs << "NXTransCreate: PANIC! The NX transport seems "
-            << "to be already running.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": The NX transport seems "
-         << "to be already running.\n";
-
-    return -1;
-  }
-
-  control = new Control();
-
-  if (control == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Error creating the NX transport.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Error creating the NX transport.\n";
-
-    return -1;
-  }
-
-  lastProxy = getpid();
-
-  #ifdef TEST
-  *logofs << "NXTransCreate: Caller process running with pid '"
-          << lastProxy << "'.\n" << logofs_flush;
-  #endif
-
-  //
-  // Set the local proxy mode an parse the
-  // display NX options.
-  //
-
-  SetMode(mode);
-
-  const char *env = GetOptions(options);
-
-  if (ParseEnvironmentOptions(env, 0) < 0)
-  {
-    cerr << "Error" << ": Parsing of NX transport options failed.\n";
-
-    return -1;
-  }
-
-  //
-  // Set the path of the NX directories.
-  //
-
-  SetDirectories();
-
-  //
-  // Open the log files.
-  //
-
-  SetLogs();
-
-  //
-  // Use the provided descriptor.
-  //
-
-  proxyFD = fd;
-
-  #ifdef TEST
-  *logofs << "NXTransCreate: Called with NX proxy descriptor '"
-          << proxyFD << "'.\n" << logofs_flush;
-  #endif
-
-  #ifdef TEST
-  *logofs << "NXTransCreate: Creation of the NX transport completed.\n"
-          << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-//
-// Tell the proxy to use the descriptor as the internal
-// connection to the X client side NX agent. This will
-// have the side effect of disabling listening for add-
-// itional X client connections.
-//
-
-int NXTransAgent(int fd[2])
-{
-  //
-  // Be sure we have a jump context, in the
-  // case a subsequent operation will cause
-  // a cleanup.
-  //
-
-  if (logofs == NULL)
-  {
-    logofs = &cerr;
-  }
-
-  if (setjmp(context) == 1)
-  {
-    return -1;
-  }
-
-  if (control == NULL)
-  {
-    cerr << "Error" << ": Can't set the NX agent without a NX transport.\n";
-
-    return -1;
-  }
-  else if (control -> ProxyMode != proxy_client)
-  {
-    #ifdef PANIC
-    *logofs << "NXTransAgent: Invalid mode while setting the NX agent.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Invalid mode while setting the NX agent.\n\n";
-
-    return -1;
-  }
-
-  useTcpSocket   = 0;
-  useUnixSocket  = 0;
-  useAgentSocket = 1;
-
-  agentFD[0] = fd[0];
-  agentFD[1] = fd[1];
-
-  #ifdef TEST
-
-  *logofs << "NXTransAgent: Internal descriptors for agent are FD#"
-          << agentFD[0] << " and FD#" << agentFD[1] << ".\n"
-          << logofs_flush;
-
-  *logofs << "NXTransAgent: Disabling listening for further X client "
-          << "connections.\n" << logofs_flush;
-
-  #endif
-
-  agent = new Agent(agentFD);
-
-  if (agent == NULL || agent -> isValid() != 1)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Error creating the NX memory transport .\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Error creating the NX memory transport.\n";
-
-    HandleCleanup();
-  }
-
-  #ifdef TEST
-  *logofs << "NXTransAgent: Enabling memory-to-memory transport.\n"
-          << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int NXTransClose(int fd)
-{
-  if (logofs == NULL)
-  {
-    logofs = &cerr;
-  }
-
-  /*
-   * Only handle the proxy connection. The X
-   * transport will take care of closing its
-   * end of the socket pair.
-   */
-
-  if (control != NULL && ((agent != NULL &&
-          (fd == agentFD[0] || fd == NX_FD_ANY)) ||
-              (fd == proxyFD || fd == NX_FD_ANY)))
-  {
-    if (proxy != NULL)
-    {
-      #ifdef TEST
-      *logofs << "NXTransClose: Closing down all the X connections.\n"
-              << logofs_flush;
-      #endif
-
-      CleanupConnections();
-    }
-  }
-  #ifdef TEST
-  else
-  {
-    *logofs << "NXTransClose: The NX transport is not running.\n"
-            << logofs_flush;
-  }
-  #endif
-
-  return 1;
-}
-
-//
-// Close down the transport and free the
-// allocated NX resources.
-//
-
-int NXTransDestroy(int fd)
-{
-  if (logofs == NULL)
-  {
-    logofs = &cerr;
-  }
-
-  if (control != NULL && ((agent != NULL &&
-          (fd == agentFD[0] || fd == NX_FD_ANY)) ||
-              (fd == proxyFD || fd == NX_FD_ANY)))
-  {
-    //
-    // Shut down the X connections and
-    // wait the cleanup to complete.
-    //
-
-    if (proxy != NULL)
-    {
-      #ifdef TEST
-      *logofs << "NXTransDestroy: Closing down all the X connections.\n"
-              << logofs_flush;
-      #endif
-
-      CleanupConnections();
-    }
-
-    #ifdef TEST
-    *logofs << "NXTransDestroy: Waiting for the NX transport to terminate.\n"
-            << logofs_flush;
-    #endif
-
-    lastDestroy = 1;
-
-    WaitCleanup();
-  }
-  #ifdef TEST
-  else
-  {
-    *logofs << "NXTransDestroy: The NX transport is not running.\n"
-            << logofs_flush;
-  }
-  #endif
-
-  return 1;
-}
-
-//
-// Assume that the NX transport is valid
-// as long as the control class has not
-// been destroyed.
-//
-
-int NXTransRunning(int fd)
-{
-  return (control != NULL);
-}
-
-int NXTransContinue(struct timeval *selectTs)
-{
-  if (control != NULL)
-  {
-    //
-    // If no timeout is provided use
-    // the default.
-    //
-
-    T_timestamp newTs;
-
-    if (selectTs == NULL)
-    {
-      setTimestamp(newTs, control -> PingTimeout);
-
-      selectTs = &newTs;
-    }
-
-    //
-    // Use empty masks and only get the
-    // descriptors set by the proxy.
-    //
-
-    fd_set readSet;
-    fd_set writeSet;
-
-    int setFDs;
-    int errorFDs;
-    int resultFDs;
-
-    setFDs = 0;
-
-    FD_ZERO(&readSet);
-    FD_ZERO(&writeSet);
-
-    //
-    // Run a new loop. If the transport
-    // is gone avoid sleeping until the
-    // timeout.
-    //
-
-    if (NXTransPrepare(&setFDs, &readSet, &writeSet, selectTs) != 0)
-    {
-      NXTransSelect(&resultFDs, &errorFDs, &setFDs, &readSet, &writeSet, selectTs);
-
-      NXTransExecute(&resultFDs, &errorFDs, &setFDs, &readSet, &writeSet, selectTs);
-    }
-  }
-
-  return (control != NULL);
-}
-
-int NXTransSignal(int signal, int action)
-{
-  if (logofs == NULL)
-  {
-    logofs = &cerr;
-  }
-
-  if (control == NULL)
-  {
-    return 0;
-  }
-
-  if (action == NX_SIGNAL_RAISE)
-  {
-    #ifdef TEST
-    *logofs << "NXTransSignal: Raising signal '" << DumpSignal(signal)
-            << "' in the proxy handler.\n" << logofs_flush;
-    #endif
-
-    HandleSignal(signal);
-
-    return 1;
-  }
-  else if (signal == NX_SIGNAL_ANY)
-  {
-    #ifdef TEST
-    *logofs << "NXTransSignal: Setting action of all signals to '"
-            << action << "'.\n" << logofs_flush;
-    #endif
-
-    for (int i = 0; i < 32; i++)
-    {
-      if (CheckSignal(i) == 1)
-      {
-        NXTransSignal(i, action);
-      }
-    }
-
-    return 1;
-  }
-  else if (CheckSignal(signal) == 1)
-  {
-    #ifdef TEST
-    *logofs << "NXTransSignal: Setting action of signal '"
-            << DumpSignal(signal) << "' to '" << action
-            << "'.\n" << logofs_flush;
-    #endif
-
-    if (action == NX_SIGNAL_ENABLE ||
-            action == NX_SIGNAL_FORWARD)
-    {
-      InstallSignal(signal, action);
-
-      return 1;
-    }
-    else if (action == NX_SIGNAL_DISABLE)
-    {
-      RestoreSignal(signal);
-
-      return 1;
-    }
-  }
-
-  #ifdef WARNING
-  *logofs << "NXTransSignal: WARNING! Unable to perform action '"
-          << action << "' on signal '" << DumpSignal(signal)
-          << "'.\n" << logofs_flush;
-  #endif
-
-  cerr << "Warning" << ": Unable to perform action '" << action
-       << "' on signal '" << DumpSignal(signal)
-       << "'.\n";
-
-  return -1;
-}
-
-int NXTransCongestion(int fd)
-{
-  if (control != NULL && proxy != NULL)
-  {
-    #ifdef DUMP
-
-    int congestion = proxy -> getCongestion(proxyFD);
-
-    *logofs << "NXTransCongestion: Returning " << congestion
-            << " as current congestion level.\n" << logofs_flush;
-
-    return congestion;
-
-    #endif
-
-    return (proxy -> getCongestion(proxyFD));
-  }
-
-  return 0;
-}
-
-int NXTransHandler(int fd, int type, void (*handler)(void *parameter,
-                       int reason), void *parameter)
-{
-  if (logofs == NULL)
-  {
-    logofs = &cerr;
-  }
-
-  switch (type)
-  {
-    case NX_HANDLER_FLUSH:
-    {
-      flushCallback  = handler;
-      flushParameter = parameter;
-
-      break;
-    }
-    case NX_HANDLER_STATISTICS:
-    {
-      //
-      // Reporting of statistics by the agent
-      // still needs to be implemented.
-      //
-
-      statisticsCallback  = handler;
-      statisticsParameter = parameter;
-
-      break;
-    }
-    default:
-    {
-      #ifdef TEST
-      *logofs << "NXTransHandler: WARNING! Failed to set "
-              << "the NX callback for event '" << type << "' to '"
-              << (void *) handler << "' and parameter '"
-              << parameter << "'.\n" << logofs_flush;
-      #endif
-
-      return 0;
-    }
-  }
-
-  #ifdef TEST
-  *logofs << "NXTransHandler: Set the NX "
-          << "callback for event '" << type << "' to '"
-          << (void *) handler << "' and parameter '"
-          << parameter << "'.\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int NXTransRead(int fd, char *data, int size)
-{
-  if (logofs == NULL)
-  {
-    logofs = &cerr;
-  }
-
-  if (control != NULL && agent != NULL &&
-          fd == agentFD[0])
-  {
-    #ifdef DUMP
-    *logofs << "NXTransRead: Dequeuing " << size << " bytes "
-            << "from FD#" << agentFD[0] << ".\n" << logofs_flush;
-    #endif
-
-    int result = agent -> dequeueData(data, size);
-
-    #ifdef DUMP
-
-    if (result < 0 && EGET() == EAGAIN)
-    {
-      *logofs << "NXTransRead: WARNING! Dequeuing from FD#"
-              << agentFD[0] << " would block.\n" << logofs_flush;
-    }
-    else
-    {
-      *logofs << "NXTransRead: Dequeued " << result << " bytes "
-              << "to FD#" << agentFD[0] << ".\n" << logofs_flush;
-    }
-
-    #endif
-
-    return result;
-  }
-  else
-  {
-    #ifdef DUMP
-    *logofs << "NXTransRead: Reading " << size << " bytes "
-            << "from FD#" << fd << ".\n" << logofs_flush;
-    #endif
-
-    return read(fd, data, size);
-  }
-}
-
-int NXTransReadVector(int fd, struct iovec *iovdata, int iovsize)
-{
-  if (logofs == NULL)
-  {
-    logofs = &cerr;
-  }
-
-  if (control != NULL && agent != NULL &&
-          fd == agentFD[0])
-  {
-    #if defined(DUMP)
-
-    if (control -> ProxyStage >= stage_operational &&
-            agent -> localReadable() > 0)
-    {
-      *logofs << "NXTransReadVector: WARNING! Agent has data readable.\n"
-              << logofs_flush;
-    }
-
-    #endif
-
-    char *base;
-
-    int length;
-    int result;
-
-    struct iovec *vector = iovdata;
-    int count = iovsize;
-
-    ESET(0);
-
-    int i = 0;
-    int total = 0;
-
-    for (;  i < count;  i++, vector++)
-    {
-      length = vector -> iov_len;
-      base = (char *) vector -> iov_base;
-
-      while (length > 0)
-      {
-        #ifdef DUMP
-        *logofs << "NXTransReadVector: Dequeuing " << length
-                << " bytes " << "from FD#" << agentFD[0] << ".\n"
-                << logofs_flush;
-        #endif
-
-        result = agent -> dequeueData(base, length);
-
-        #ifdef DUMP
-
-        if (result < 0 && EGET() == EAGAIN)
-        {
-          *logofs << "NXTransReadVector: WARNING! Dequeuing from FD#"
-                  << agentFD[0] << " would block.\n" << logofs_flush;
-        }
-        else
-        {
-          *logofs << "NXTransReadVector: Dequeued " << result
-                  << " bytes " << "from FD#" << agentFD[0] << ".\n"
-                  << logofs_flush;
-        }
-
-        #endif
-
-        if (result < 0 && total == 0)
-        {
-          return result;
-        }
-        else if (result <= 0)
-        {
-          return total;
-        }
-
-        ESET(0);
-
-        length -= result;
-        total  += result;
-        base   += result;
-      }
-    }
-
-    return total;
-  }
-  else
-  {
-    #ifdef DUMP
-    *logofs << "NXTransReadVector: Reading vector with "
-            << iovsize << " elements from FD#" << fd << ".\n"
-            << logofs_flush;
-    #endif
-
-    return readv(fd, iovdata, iovsize);
-  }
-}
-
-int NXTransReadable(int fd, int *readable)
-{
-  if (logofs == NULL)
-  {
-    logofs = &cerr;
-  }
-
-  if (control == NULL || agent == NULL ||
-          fd != agentFD[0])
-  {
-    #ifdef DUMP
-
-    int result = GetBytesReadable(fd, readable);
-
-    if (result == -1)
-    {
-      *logofs << "NXTransReadable: Error detected on FD#"
-              << fd << ".\n" << logofs_flush;
-    }
-    else
-    {
-      *logofs << "NXTransReadable: Returning " << *readable
-              << " bytes as readable from FD#" << fd
-              << ".\n" << logofs_flush;
-    }
-
-    return result;
-
-    #else
-
-    return GetBytesReadable(fd, readable);
-
-    #endif
-  }
-
-  int result = agent -> dequeuableData();
-
-  switch (result)
-  {
-    case 0:
-    {
-      //
-      // The client might have enqueued data to our side
-      // and is now checking for the available events. As
-      // _XEventsQueued() may omit to call _XSelect(), we
-      // handle here the new data that is coming from the
-      // proxy to avoid spinning through this function
-      // again.
-      //
-
-      if (proxy != NULL && proxy -> canRead() == 1)
-      {
-        #if defined(TEST) || defined(INFO)
-        *logofs << "NXTransReadable: WARNING! Trying to "
-                << "read to generate new agent data.\n"
-                << logofs_flush;
-        #endif
-
-        //
-        // Set the context as the function
-        // can cause a cleanup.
-        //
-
-        if (setjmp(context) == 1)
-        {
-          return -1;
-        }
-
-        if (proxy -> handleRead() < 0)
-        {
-          #if defined(TEST) || defined(INFO)
-          *logofs << "NXTransReadable: Failure reading "
-                  << "messages from proxy FD#" << proxyFD
-                  << ".\n" << logofs_flush;
-          #endif
-
-          HandleShutdown();
-        }
-
-        //
-        // Call again the routine. By reading
-        // new control messages from the proxy
-        // the agent channel may be gone.
-        //
-
-        return NXTransReadable(fd, readable);
-      }
-
-      #ifdef DUMP
-      *logofs << "NXTransReadable: Returning " << 0
-              << " bytes as readable from FD#" << fd
-              << " with result 0.\n" << logofs_flush;
-      #endif
-
-      *readable = 0;
-
-      return 0;
-    }
-    case -1:
-    {
-      #ifdef DUMP
-      *logofs << "NXTransReadable: Returning " << 0
-              << " bytes as readable from FD#" << fd
-              << " with result -1.\n" << logofs_flush;
-      #endif
-
-      *readable = 0;
-
-      return -1;
-    }
-    default:
-    {
-      #ifdef DUMP
-      *logofs << "NXTransReadable: Returning " << result
-              << " bytes as readable from FD#" << fd
-              << " with result 0.\n" << logofs_flush;
-      #endif
-
-      *readable = result;
-
-      return 0;
-    }
-  }
-}
-
-int NXTransWrite(int fd, char *data, int size)
-{
-  //
-  // Be sure we have a valid log file.
-  //
-
-  if (logofs == NULL)
-  {
-    logofs = &cerr;
-  }
-
-  if (control != NULL && agent != NULL &&
-          fd == agentFD[0])
-  {
-    int result;
-
-    if (proxy != NULL)
-    {
-      if (proxy -> canRead(agentFD[1]) == 0)
-      {
-        #if defined(DUMP) || defined(TEST)
-        *logofs << "NXTransWrite: WARNING! Delayed enqueuing to FD#"
-                << agentFD[0] << " with proxy unable to read.\n"
-                << logofs_flush;
-        #endif
-
-        ESET(EAGAIN);
-
-        return -1;
-      }
-
-      //
-      // Set the context as the function
-      // can cause a cleanup.
-      //
-
-      if (setjmp(context) == 1)
-      {
-        return -1;
-      }
-
-      //
-      // Don't enqueue the data to the transport
-      // but let the channel borrow the buffer.
-      //
-
-      #ifdef DUMP
-      *logofs << "NXTransWrite: Letting the channel borrow "
-              << size << " bytes from FD#" << agentFD[0]
-              << ".\n" << logofs_flush;
-      #endif
-
-      result = proxy -> handleRead(agentFD[1], data, size);
-
-      if (result == 1)
-      {
-        result = size;
-      }
-      else
-      {
-        if (result == 0)
-        {
-          ESET(EAGAIN);
-        }
-        else
-        {
-          ESET(EPIPE);
-        }
-
-        result = -1;
-      }
-    }
-    else
-    {
-      //
-      // We don't have a proxy connection, yet.
-      // Enqueue the data to the agent transport.
-      //
-
-      #ifdef DUMP
-      *logofs << "NXTransWrite: Enqueuing " << size << " bytes "
-              << "to FD#" << agentFD[0] << ".\n" << logofs_flush;
-      #endif
-
-      result = agent -> enqueueData(data, size);
-    }
-
-    #ifdef DUMP
-
-    if (result < 0)
-    {
-      if (EGET() == EAGAIN)
-      {
-        *logofs << "NXTransWrite: WARNING! Enqueuing to FD#"
-                << agentFD[0] << " would block.\n"
-                << logofs_flush;
-      }
-      else
-      {
-        *logofs << "NXTransWrite: WARNING! Error enqueuing to FD#"
-                << agentFD[0] << ".\n" << logofs_flush;
-      }
-    }
-    else
-    {
-      *logofs << "NXTransWrite: Enqueued " << result << " bytes "
-              << "to FD#" << agentFD[0] << ".\n" << logofs_flush;
-    }
-
-    #endif
-
-    return result;
-  }
-  else
-  {
-    #ifdef DUMP
-    *logofs << "NXTransWrite: Writing " << size << " bytes "
-            << "to FD#" << fd << ".\n" << logofs_flush;
-    #endif
-
-    return write(fd, data, size);
-  }
-}
-
-int NXTransWriteVector(int fd, struct iovec *iovdata, int iovsize)
-{
-  //
-  // Be sure we have a valid log file and a
-  // jump context because we will later call
-  // functions that can perform a cleanup.
-  //
-
-  if (logofs == NULL)
-  {
-    logofs = &cerr;
-  }
-
-  int result = 0;
-
-  if (control != NULL && agent != NULL &&
-          fd == agentFD[0])
-  {
-    //
-    // See the comment in NXTransWrite().
-    //
-
-    if (proxy != NULL)
-    {
-      if (proxy -> canRead(agentFD[1]) == 0)
-      {
-        #if defined(DUMP) || defined(TEST)
-        *logofs << "NXTransWriteVector: WARNING! Delayed enqueuing to FD#"
-                << agentFD[0] << " with proxy unable to read.\n"
-                << logofs_flush;
-        #endif
-
-        ESET(EAGAIN);
-
-        return -1;
-      }
-    }
-
-    //
-    // Set the context as the function
-    // can cause a cleanup.
-    //
-
-    if (setjmp(context) == 1)
-    {
-      return -1;
-    }
-
-    char *base;
-
-    int length;
-
-    struct iovec *vector = iovdata;
-    int count = iovsize;
-
-    ESET(0);
-
-    int i = 0;
-    int total = 0;
-
-    for (;  i < count;  i++, vector++)
-    {
-      length = vector -> iov_len;
-      base = (char *) vector -> iov_base;
-
-      while (length > 0)
-      {
-        if (proxy != NULL)
-        {
-          //
-          // Don't enqueue the data to the transport
-          // but let the channel borrow the buffer.
-          //
-
-          #ifdef DUMP
-          *logofs << "NXTransWriteVector: Letting the channel borrow "
-                  << length << " bytes from FD#" << agentFD[0]
-                  << ".\n" << logofs_flush;
-          #endif
-
-          result = proxy -> handleRead(agentFD[1], base, length);
-
-          if (result == 1)
-          {
-            result = length;
-          }
-          else
-          {
-            if (result == 0)
-            {
-              ESET(EAGAIN);
-            }
-            else
-            {
-              ESET(EPIPE);
-            }
-
-            result = -1;
-          }
-        }
-        else
-        {
-          //
-          // We don't have a proxy connection, yet.
-          // Enqueue the data to the agent transport.
-          //
-
-          #ifdef DUMP
-          *logofs << "NXTransWriteVector: Enqueuing " << length
-                  << " bytes " << "to FD#" << agentFD[0] << ".\n"
-                  << logofs_flush;
-          #endif
-
-          result = agent -> enqueueData(base, length);
-        }
-
-        #ifdef DUMP
-
-        if (result < 0)
-        {
-          if (EGET() == EAGAIN)
-          {
-            *logofs << "NXTransWriteVector: WARNING! Enqueuing to FD#"
-                    << agentFD[0] << " would block.\n"
-                    << logofs_flush;
-          }
-          else
-          {
-            *logofs << "NXTransWriteVector: WARNING! Error enqueuing to FD#"
-                    << agentFD[0] << ".\n" << logofs_flush;
-          }
-        }
-        else
-        {
-          *logofs << "NXTransWriteVector: Enqueued " << result
-                  << " bytes " << "to FD#" << agentFD[0] << ".\n"
-                  << logofs_flush;
-        }
-
-        #endif
-
-        if (result < 0 && total == 0)
-        {
-          return result;
-        }
-        else if (result <= 0)
-        {
-          return total;
-        }
-
-        ESET(0);
-
-        length -= result;
-        total  += result;
-        base   += result;
-      }
-    }
-
-    return total;
-  }
-  else
-  {
-    #ifdef DUMP
-    *logofs << "NXTransWriteVector: Writing vector with "
-            << iovsize << " elements to FD#" << fd << ".\n"
-            << logofs_flush;
-    #endif
-
-    return writev(fd, iovdata, iovsize);
-  }
-}
-
-int NXTransPolicy(int fd, int type)
-{
-  if (control != NULL)
-  {
-    if (usePolicy == -1)
-    {
-      #if defined(TEST) || defined(INFO)
-      *logofs << "NXTransPolicy: Setting flush policy on "
-              << "proxy FD#" << proxyFD << " to '"
-              << DumpPolicy(type == NX_POLICY_DEFERRED ?
-                     policy_deferred : policy_immediate)
-              << "'.\n" << logofs_flush;
-      #endif
-
-      control -> FlushPolicy = (type == NX_POLICY_DEFERRED ?
-                                    policy_deferred : policy_immediate);
-
-      if (proxy != NULL)
-      {
-        proxy -> handleFlush();
-      }
-
-      return 1;
-    }
-    else
-    {
-      #if defined(TEST) || defined(INFO)
-      *logofs << "NXTransPolicy: Ignoring the agent "
-              << "setting with user policy set to '"
-              << DumpPolicy(control -> FlushPolicy)
-              << "'.\n" << logofs_flush;
-      #endif
-
-      return 0;
-    }
-  }
-
-  return 0;
-}
-
-int NXTransFlushable(int fd)
-{
-  if (proxy == NULL || agent == NULL ||
-          fd != agentFD[0])
-  {
-    #ifdef DUMP
-    *logofs << "NXTransFlushable: Returning 0 bytes as "
-            << "flushable for unrecognized FD#" << fd
-            << ".\n" << logofs_flush;
-    #endif
-
-    return 0;
-  }
-  else
-  {
-    #if defined(DUMP) || defined(INFO)
-    *logofs << "NXTransFlushable: Returning " << proxy ->
-               getFlushable(proxyFD) << " as bytes flushable on "
-            << "proxy FD#" << proxyFD << ".\n"
-            << logofs_flush;
-    #endif
-
-    return proxy -> getFlushable(proxyFD);
-  }
-}
-
-int NXTransFlush(int fd)
-{
-  if (proxy != NULL)
-  {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "NXTransFlush: Requesting an immediate flush of "
-            << "proxy FD#" << proxyFD << ".\n"
-            << logofs_flush;
-    #endif
-
-    return proxy -> handleFlush();
-  }
-
-  return 0;
-}
-
-int NXTransChannel(int fd, int channelFd, int type)
-{
-  if (proxy != NULL)
-  {
-    //
-    // Set the context as the function
-    // can cause a cleanup.
-    //
-
-    if (setjmp(context) == 1)
-    {
-      return -1;
-    }
-
-    #if defined(TEST) || defined(INFO)
-    *logofs << "NXTransChannel: Going to create a new channel "
-            << "with type '" << type << "' on FD#" << channelFd
-            << ".\n" << logofs_flush;
-    #endif
-
-    int result = -1;
-
-    switch (type)
-    {
-      case NX_CHANNEL_X11:
-      {
-        if (useUnixSocket == 1 || useTcpSocket == 1 ||
-                useAgentSocket == 1 || useAuxSocket == 1)
-        {
-          result = proxy -> handleNewConnection(channel_x11, channelFd);
-        }
-
-        break;
-      }
-      case NX_CHANNEL_CUPS:
-      {
-        if (useCupsSocket == 1)
-        {
-          result = proxy -> handleNewConnection(channel_cups, channelFd);
-        }
-
-        break;
-      }
-      case NX_CHANNEL_SMB:
-      {
-        if (useSmbSocket == 1)
-        {
-          result = proxy -> handleNewConnection(channel_smb, channelFd);
-        }
-
-        break;
-      }
-      case NX_CHANNEL_MEDIA:
-      {
-        if (useMediaSocket == 1)
-        {
-          result = proxy -> handleNewConnection(channel_media, channelFd);
-        }
-
-        break;
-      }
-      case NX_CHANNEL_HTTP:
-      {
-        if (useHttpSocket == 1)
-        {
-          result = proxy -> handleNewConnection(channel_http, channelFd);
-        }
-
-        break;
-      }
-      case NX_CHANNEL_FONT:
-      {
-        if (useFontSocket == 1)
-        {
-          result = proxy -> handleNewConnection(channel_font, channelFd);
-        }
-
-        break;
-      }
-      case NX_CHANNEL_SLAVE:
-      {
-        if (useSlaveSocket == 1)
-        {
-          result = proxy -> handleNewConnection(channel_slave, channelFd);
-        }
-
-        break;
-      }
-      default:
-      {
-        #ifdef WARNING
-        *logofs << "NXTransChannel: WARNING! Unrecognized channel "
-                << "type '" << type << "'.\n" << logofs_flush;
-        #endif
-
-        break;
-      }
-    }
-
-    #ifdef WARNING
-
-    if (result != 1)
-    {
-      *logofs << "NXTransChannel: WARNING! Could not create the "
-                << "new channel with type '" << type << "' on FD#"
-                << channelFd << ".\n" << logofs_flush;
-    }
-
-    #endif
-
-    return result;
-  }
-
-  return 0;
-}
-
-const char *NXTransFile(int type)
-{
-  char *name = NULL;
-
-  switch (type)
-  {
-    case NX_FILE_SESSION:
-    {
-      name = sessionFileName;
-
-      break;
-    }
-    case NX_FILE_ERRORS:
-    {
-      name = errorsFileName;
-
-      break;
-    }
-    case NX_FILE_OPTIONS:
-    {
-      name = optionsFileName;
-
-      break;
-    }
-    case NX_FILE_STATS:
-    {
-      name = statsFileName;
-
-      break;
-    }
-  }
-
-  if (name != NULL && *name != '\0')
-  {
-    return name;
-  }
-
-  return NULL;
-}
-
-long NXTransTime()
-{
-  static T_timestamp last = getTimestamp();
-
-  T_timestamp now = getTimestamp();
-
-  long diff = diffTimestamp(last, now);
-
-  last = now;
-
-  return diff;
-}
-
-int NXTransAlert(int code, int local)
-{
-  if (proxy != NULL)
-  {
-    #if defined(DUMP) || defined(INFO)
-    *logofs << "NXTransAlert: Requesting a NX dialog with code "
-            << code << " and local " << local << ".\n"
-            << logofs_flush;
-    #endif
-
-    if (local == 0)
-    {
-      //
-      // Set the context as the function
-      // can cause a cleanup.
-      //
-
-      if (setjmp(context) == 1)
-      {
-        return -1;
-      }
-
-      proxy -> handleAlert(code);
-    }
-    else
-    {
-      //
-      // Show the alert at the next loop.
-      //
-
-      HandleAlert(code, local);
-    }
-
-    return 1;
-  }
-  #if defined(DUMP) || defined(INFO)
-  else
-  {
-    if (logofs == NULL)
-    {
-      logofs = &cerr;
-    }
-
-    *logofs << "NXTransAlert: Can't request an alert without "
-            << "a valid NX transport.\n" << logofs_flush;
-  }
-  #endif
-
-  return 0;
-}
-
-//
-// Prepare the file sets and the timeout
-// for a later execution of the select().
-//
-
-int NXTransPrepare(int *setFDs, fd_set *readSet,
-                       fd_set *writeSet, struct timeval *selectTs)
-{
-  if (logofs == NULL)
-  {
-    logofs = &cerr;
-  }
-
-  //
-  // Control is NULL if the NX transport was
-  // reset or was never created. If control
-  // is valid then prepare to jump back when
-  // the transport is destroyed.
-  //
-
-  if (control == NULL || setjmp(context) == 1)
-  {
-    return 0;
-  }
-
-  #if defined(TEST) || defined(INFO)
-  *logofs << "\nNXTransPrepare: Going to prepare the NX transport.\n"
-          << logofs_flush;
-  #endif
-
-  if (control -> ProxyStage < stage_operational)
-  {
-    handleNegotiationInLoop(*setFDs, *readSet, *writeSet, *selectTs);
-  }
-  else
-  {
-    #if defined(TEST) || defined(INFO)
-
-    if (isTimestamp(*selectTs) == 0)
-    {
-      *logofs << "Loop: WARNING! Preparing the select with requested "
-              << "timeout of " << selectTs -> tv_sec << " S and "
-              << (double) selectTs -> tv_usec / 1000 << " Ms.\n"
-              << logofs_flush;
-    }
-    else
-    {
-      *logofs << "Loop: Preparing the select with requested "
-              << "timeout of " << selectTs -> tv_sec << " S and "
-              << (double) selectTs -> tv_usec / 1000 << " Ms.\n"
-              << logofs_flush;
-    }
-
-    #endif
-
-    //
-    // Set descriptors of listening sockets.
-    //
-
-    handleSetListenersInLoop(*readSet, *setFDs);
-
-    //
-    // Set descriptors of both proxy and X
-    // connections.
-    //
-
-    handleSetReadInLoop(*readSet, *setFDs, *selectTs);
-
-    //
-    // Find out which file descriptors have
-    // data to write.
-    //
-
-    handleSetWriteInLoop(*writeSet, *setFDs, *selectTs);
-  }
-
-  //
-  // Prepare the masks for handling the memory-
-  // to-memory transport. This is required even
-  // during session negotiation.
-  //
-
-  if (agent != NULL)
-  {
-    handleSetAgentInLoop(*setFDs, *readSet, *writeSet, *selectTs);
-  }
-
-  //
-  // Register time spent handling messages.
-  //
-
-  nowTs = getNewTimestamp();
-
-  diffTs = diffTimestamp(startTs, nowTs);
-
-  #ifdef TEST
-  *logofs << "Loop: Mark - 0 - at " << strMsTimestamp()
-          << " with " << diffTs << " Ms elapsed.\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // TODO: Should add the read time in two
-  // parts otherwise the limits are checked
-  // before the counters are updated with
-  // time spent in the last loop.
-  //
-
-  if (control -> ProxyStage >= stage_operational)
-  {
-    statistics -> addReadTime(diffTs);
-  }
-
-  startTs = nowTs;
-
-  #ifdef DEBUG
-  *logofs << "Loop: New timestamp is " << strMsTimestamp(startTs)
-          << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-//
-// Let's say that we call select() to find out
-// if any of the handled descriptors has data,
-// but actually things are a bit more complex
-// than that.
-//
-
-int NXTransSelect(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
-                      fd_set *writeSet, struct timeval *selectTs)
-{
-  #ifdef TIME
-
-  static T_timestamp lastTs;
-
-  #endif
-
-  if (logofs == NULL)
-  {
-    logofs = &cerr;
-  }
-
-  //
-  // Control is NULL if the NX transport was
-  // reset or never created. If control is
-  // valid then prepare for jumping back in
-  // the case of an error.
-  //
-
-  if (control == NULL || setjmp(context) == 1)
-  {
-    *resultFDs = select(*setFDs, readSet, writeSet, NULL, selectTs);
-
-    *errorFDs = errno;
-
-    return 0;
-  }
-
-  #if defined(TEST) || defined(INFO)
-  *logofs << "\nNXTransSelect: Going to select the NX descriptors.\n"
-          << logofs_flush;
-  #endif
-
-  #if defined(TEST) || defined(INFO)
-
-  handleCheckSelectInLoop(*setFDs, *readSet, *writeSet, *selectTs);
-
-  #endif
-
-  #ifdef TIME
-
-  diffTs = diffTimestamp(lastTs, getNewTimestamp());
-
-  if (diffTs > 20)
-  {
-    *logofs << "Loop: TIME! Spent " << diffTs
-            << " Ms handling messages for proxy FD#"
-            << proxyFD << ".\n" << logofs_flush;
-  }
-
-  lastTs = getNewTimestamp();
-
-  #endif
-
-  #if defined(TEST) || defined(INFO)
-
-  if (isTimestamp(*selectTs) == 0)
-  {
-    *logofs << "Loop: WARNING! Executing the select with requested "
-            << "timeout of " << selectTs -> tv_sec << " S and "
-            << (double) selectTs -> tv_usec / 1000 << " Ms.\n"
-            << logofs_flush;
-  }
-  else if (proxy != NULL && proxy -> getFlushable(proxyFD) > 0)
-  {
-    *logofs << "Loop: WARNING! Proxy FD#" << proxyFD
-            << " has " << proxy -> getFlushable(proxyFD)
-            << " bytes to write but timeout is "
-            << selectTs -> tv_sec << " S and "
-            << selectTs -> tv_usec / 1000 << " Ms.\n"
-            << logofs_flush;
-  }
-
-  #endif
-
-  //
-  // Wait for the selected sockets
-  // or the timeout.
-  //
-
-  ESET(0);
-
-  *resultFDs = select(*setFDs, readSet, writeSet, NULL, selectTs);
-
-  *errorFDs = EGET();
-
-  #ifdef TIME
-
-  diffTs = diffTimestamp(lastTs, getNewTimestamp());
-
-  if (diffTs > 100)
-  {
-    *logofs << "Loop: TIME! Spent " << diffTs
-            << " Ms waiting for new data for proxy FD#"
-            << proxyFD << ".\n" << logofs_flush;
-  }
-
-  lastTs = getNewTimestamp();
-
-  #endif
-
-  //
-  // Check the result of the select.
-  //
-
-  #if defined(TEST) || defined(INFO)
-
-  handleCheckResultInLoop(*resultFDs, *errorFDs, *setFDs, *readSet, *writeSet, *selectTs, startTs);
-
-  #endif
-
-  //
-  // Get time spent in select. The accouting is done
-  // in milliseconds. This is a real problem on fast
-  // machines where each loop is unlikely to take
-  // more than 500 us, so consider that the results
-  // can be inaccurate.
-  //
-
-  nowTs = getNewTimestamp();
-
-  diffTs = diffTimestamp(startTs, nowTs);
-
-  #ifdef TEST
-  *logofs << "Loop: Out of select after " << diffTs << " Ms "
-          << "at " << strMsTimestamp(nowTs) << " with result "
-          << *resultFDs << ".\n" << logofs_flush;
-  #endif
-
-  startTs = nowTs;
-
-  #ifdef DEBUG
-  *logofs << "Loop: New timestamp is " << strMsTimestamp(startTs)
-          << ".\n" << logofs_flush;
-  #endif
-
-  if (control -> ProxyStage >= stage_operational)
-  {
-    statistics -> addIdleTime(diffTs);
-  }
-
-  if (*resultFDs < 0)
-  {
-    //
-    // Check if the call was interrupted or if any of the
-    // managed descriptors has become invalid. This can
-    // happen to the X11 code, before the descriptor is
-    // removed from the managed set.
-    //
-
-    #ifdef __sun
-
-    if (*errorFDs == EINTR || *errorFDs == EBADF ||
-            *errorFDs == EINVAL)
-
-    #else
-
-    if (*errorFDs == EINTR || *errorFDs == EBADF)
-
-    #endif
-
-    {
-      #ifdef TEST
-
-      if (*errorFDs == EINTR)
-      {
-        *logofs << "Loop: Select failed due to EINTR error.\n"
-                << logofs_flush;
-      }
-      else
-      {
-        *logofs << "Loop: WARNING! Call to select failed. Error is "
-                << EGET() << " '" << ESTR() << "'.\n"
-                << logofs_flush;
-      }
-
-      #endif
-    }
-    else
-    {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Call to select failed. Error is "
-              << EGET() << " '" << ESTR() << "'.\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Call to select failed. Error is "
-           << EGET() << " '" << ESTR() << "'.\n";
-
-      HandleCleanup();
-    }
-  }
-
-  return 1;
-}
-
-//
-// Perform the required actions on all
-// the descriptors having I/O pending.
-//
-
-int NXTransExecute(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
-                       fd_set *writeSet, struct timeval *selectTs)
-{
-  if (logofs == NULL)
-  {
-    logofs = &cerr;
-  }
-
-  //
-  // Control is NULL if the NX transport was
-  // reset or never created. If control is
-  // valid then prepare for jumping back in
-  // the case of an error.
-  //
-
-  if (control == NULL || setjmp(context) == 1)
-  {
-    return 0;
-  }
-
-  #if defined(TEST) || defined(INFO)
-  *logofs << "\nNXTransExecute: Going to execute I/O on the NX descriptors.\n"
-          << logofs_flush;
-  #endif
-
-  if (control -> ProxyStage >= stage_operational)
-  {
-    //
-    // Check if I/O is possible on the proxy and
-    // local agent descriptors.
-    //
-
-    if (agent != NULL)
-    {
-      handleAgentInLoop(*resultFDs, *errorFDs, *setFDs, *readSet, *writeSet, *selectTs);
-    }
-
-    #ifdef TEST
-    *logofs << "Loop: Mark - 1 - at " << strMsTimestamp()
-            << " with " << diffTimestamp(startTs, getTimestamp())
-            << " Ms elapsed.\n" << logofs_flush;
-    #endif
-
-    //
-    // Rotate the channel that will be handled
-    // first.
-    //
-
-    handleRotateInLoop();
-
-    //
-    // Flush any data on newly writable sockets.
-    //
-
-    handleWritableInLoop(*resultFDs, *writeSet);
-
-    #ifdef TEST
-    *logofs << "Loop: Mark - 2 - at " << strMsTimestamp()
-            << " with " << diffTimestamp(startTs, getTimestamp())
-            << " Ms elapsed.\n" << logofs_flush;
-    #endif
-
-    //
-    // Check if any socket has become readable.
-    //
-
-    handleReadableInLoop(*resultFDs, *readSet);
-
-    #ifdef TEST
-    *logofs << "Loop: Mark - 3 - at " << strMsTimestamp()
-            << " with " << diffTimestamp(startTs, getTimestamp())
-            << " Ms elapsed.\n" << logofs_flush;
-    #endif
-
-    //
-    // Handle the scheduled events on channels.
-    //
-    // - Restart, if possible, any client that was
-    //   put to sleep.
-    //
-    // - Check if there are pointer motion events to
-    //   flush. This applies only to X server side.
-    //
-    // - Check if any channel has exited the conges-
-    //   tion state.
-    //
-    // - Check if there are images that are currently
-    //   being streamed.
-    //
-
-    handleEventsInLoop();
-
-    #ifdef TEST
-    *logofs << "Loop: Mark - 4 - at " << strMsTimestamp()
-            << " with " << diffTimestamp(startTs, getTimestamp())
-            << " Ms elapsed.\n" << logofs_flush;
-    #endif
-
-    //
-    // Check if user sent a signal to produce
-    // statistics.
-    //
-
-    handleStatisticsInLoop();
-
-    //
-    // We may have flushed the proxy link or
-    // handled data coming from the remote.
-    // Post-process the masks and set the
-    // selected agent descriptors as ready.
-    //
-
-    if (agent != NULL)
-    {
-      handleAgentLateInLoop(*resultFDs, *errorFDs, *setFDs, *readSet, *writeSet, *selectTs);
-    }
-
-    #ifdef TEST
-    *logofs << "Loop: Mark - 5 - at " << strMsTimestamp()
-            << " with " << diffTimestamp(startTs, getTimestamp())
-            << " Ms elapsed.\n" << logofs_flush;
-    #endif
-
-    //
-    // Check if there is any data to flush.
-    // Agents should flush the proxy link
-    // explicitly.
-    //
-
-    handleFlushInLoop();
-
-    #ifdef TEST
-    *logofs << "Loop: Mark - 6 - at " << strMsTimestamp()
-            << " with " << diffTimestamp(startTs, getTimestamp())
-            << " Ms elapsed.\n" << logofs_flush;
-    #endif
-  }
-
-  //
-  // Check if we have an alert to show.
-  //
-
-  handleAlertInLoop();
-
-  if (control -> ProxyStage >= stage_operational)
-  {
-    //
-    // Check if it's time to give up.
-    //
-
-    handleCheckSessionInLoop();
-
-    //
-    // Check if local proxy is consuming
-    // too many resources.
-    //
-
-    handleCheckBitrateInLoop();
-
-    //
-    // Check coherency of internal state.
-    //
-
-    #if defined(TEST) || defined(INFO)
-
-    handleCheckStateInLoop(*setFDs);
-
-    #endif
-
-    #ifdef TEST
-    *logofs << "Loop: Mark - 7 - at " << strMsTimestamp()
-            << " with " << diffTimestamp(startTs, getTimestamp())
-            << " Ms elapsed.\n" << logofs_flush;
-    #endif
-  }
-
-  //
-  // Truncate the logs if needed.
-  //
-
-  handleLogReopenInLoop(logsTs, nowTs);
-
-  return 1;
-}
-
-//
-// Initialize the connection parameters and
-// prepare for negotiating the link with the
-// remote proxy.
-//
-
-int InitBeforeNegotiation()
-{
-  //
-  // Disable limits on core dumps.
-  //
-
-  SetCore();
-
-  //
-  // Install the signal handlers.
-  //
-
-  InstallSignals();
-
-  //
-  // Track how much time we spent in initialization.
-  //
-
-  nowTs = getNewTimestamp();
-
-  startTs = nowTs;
-  initTs  = nowTs;
-
-  #ifdef TEST
-  *logofs << "Loop: INIT! Taking mark for initialization at "
-          << strMsTimestamp(initTs) << ".\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // If not explicitly specified, determine if local
-  // mode is client or server according to parameters
-  // provided so far.
-  //
-
-  if (WE_SET_PROXY_MODE == 0)
-  {
-    cerr << "Error" << ": Please specify either the -C or -S option.\n";
-
-    HandleCleanup();
-  }
-
-  //
-  // Start a watchdog. If initialization cannot
-  // be completed before timeout, then clean up
-  // everything and exit.
-  //
-
-  if (control -> ProxyMode == proxy_client)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Starting watchdog process with timeout of "
-            << control -> InitTimeout / 1000 << " seconds.\n"
-            << logofs_flush;
-    #endif
-
-    lastWatchdog = NXTransWatchdog(control -> InitTimeout);
-
-    if (IsFailed(lastWatchdog))
-    {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Can't start the NX watchdog process.\n"
-              << logofs_flush;
-      #endif
-
-      SetNotRunning(lastWatchdog);
-    }
-    #ifdef TEST
-    else
-    {
-      *logofs << "Loop: Watchdog started with pid '"
-              << lastWatchdog << "'.\n" << logofs_flush;
-    }
-    #endif
-  }
-
-  //
-  // Print preliminary info.
-  //
-
-  PrintProcessInfo();
-
-  //
-  // Set cups, multimedia and other
-  // auxiliary ports.
-  //
-
-  SetPorts();
-
-  //
-  // Increase the number of maximum open
-  // file descriptors for this process.
-  //
-
-  SetDescriptors();
-
-  //
-  // Set local endianess.
-  //
-
-  unsigned int test = 1;
-
-  setHostBigEndian(*((unsigned char *) (&test)) == 0);
-
-  #ifdef TEST
-  *logofs << "Loop: Local host is "
-          << (hostBigEndian() ? "big endian" : "little endian")
-          << ".\n" << logofs_flush;
-  #endif
-
-  if (control -> ProxyMode == proxy_client)
-  {
-    //
-    // Listen on sockets that mimic an X display to
-    // which X clients will be able to connect (e.g.
-    // unix:8 and/or localhost:8).
-    //
-
-    if (useTcpSocket == 1)
-    {
-      SetupTcpSocket();
-    }
-
-    if (useUnixSocket == 1)
-    {
-      SetupUnixSocket();
-    }
-  }
-  else
-  {
-    //
-    // Don't listen for X connections.
-    //
-
-    useUnixSocket  = 0;
-    useTcpSocket   = 0;
-    useAgentSocket = 0;
-
-    //
-    // Get ready to open the local display.
-    //
-
-    SetupDisplaySocket(xServerAddrFamily, xServerAddr, xServerAddrLength);
-  }
-
-  //
-  // If we are the NX server-side proxy we need to
-  // complete our initializazion. We will mandate
-  // our parameters at the time the NX client will
-  // connect.
-  //
-
-  if (control -> ProxyMode == proxy_client)
-  {
-    SetParameters();
-  }
-
-  return 1;
-}
-
-int SetupProxyConnection()
-{
-
-  if (proxyFD == -1)
-  {
-
-    char *socketUri = NULL;
-
-    // Let's make sure, the default value for listenSocket is properly set. Doing this
-    // here, because we have to make sure that we call it after the connectSocket
-    // declaration is really really complete.
-
-    if (listenSocket.disabled() && connectSocket.disabled())
-    {
-      char listenPortValue[20] = { 0 };
-      sprintf(listenPortValue, "%ld", (long)(proxyPort + DEFAULT_NX_PROXY_PORT_OFFSET));
-
-      SetAndValidateChannelEndPointArg("local", "listen", listenPortValue, listenSocket);
-    }
-
-    #ifdef TEST
-    connectSocket.getSpec(&socketUri);
-    *logofs << "Loop: connectSocket is "<< ( connectSocket.enabled() ? "enabled" : "disabled") << ". "
-            << "The socket URI is '"<< ( socketUri != NULL ? socketUri : "<unset>") << "'.\n" << logofs_flush;
-    listenSocket.getSpec(&socketUri);
-    *logofs << "Loop: listenSocket is "<< ( listenSocket.enabled() ? "enabled" : "disabled") << ". "
-            << "The socket URI is '"<< ( socketUri != NULL ? socketUri : "<unset>") << "'.\n" << logofs_flush;
-    free(socketUri);
-    socketUri = NULL;
-    #endif
-
-    if (WE_INITIATE_CONNECTION)
-    {
-      if (connectSocket.getSpec(&socketUri))
-      {
-        #ifdef TEST
-        *logofs << "Loop: Going to connect to '" << socketUri
-                << "'.\n" << logofs_flush;
-        #endif
-        free(socketUri);
-
-        proxyFD = ConnectToRemote(connectSocket);
-
-        #ifdef TEST
-        *logofs << "Loop: Connected to remote proxy on FD#"
-                << proxyFD << ".\n" << logofs_flush;
-        #endif
-
-        cerr << "Info" << ": Connected to remote proxy on FD#"
-             << proxyFD << ".\n";
-      }
-    }
-    else
-    {
-
-      if (listenSocket.isTCPSocket() && (listenSocket.getTCPPort() < 0))
-      {
-        listenSocket.setSpec(DEFAULT_NX_PROXY_PORT_OFFSET + proxyPort);
-      }
-
-      if (listenSocket.getSpec(&socketUri))
-      {
-        #ifdef TEST
-        *logofs << "Loop: Going to wait for connection at '"
-                << socketUri << "'.\n" << logofs_flush;
-        #endif
-        free(socketUri);
-
-        proxyFD = WaitForRemote(listenSocket);
-
-        #ifdef TEST
-        if (WE_LISTEN_FORWARDER)
-        {
-          *logofs << "Loop: Connected to remote forwarder on FD#"
-                  << proxyFD << ".\n" << logofs_flush;
-        }
-        else
-        {
-          *logofs << "Loop: Connected to remote proxy on FD#"
-                  << proxyFD << ".\n" << logofs_flush;
-        }
-        #endif
-
-      }
-    }
-  }
-  #ifdef TEST
-  else
-  {
-    *logofs << "Loop: Using the inherited connection on FD#"
-            << proxyFD << ".\n" << logofs_flush;
-  }
-  #endif
-
-  //
-  // Set TCP_NODELAY on proxy descriptor
-  // to reduce startup time. Option will
-  // later be disabled if needed.
-  //
-  // either listenSocket or connectSocket is used here...
-
-  if(listenSocket.isTCPSocket() || connectSocket.isTCPSocket())
-
-    SetNoDelay(proxyFD, 1);
-
-  //
-  // We need non-blocking input since the
-  // negotiation phase.
-  //
-
-  SetNonBlocking(proxyFD, 1);
-
-  return 1;
-}
-
-//
-// Create the required proxy and channel classes
-// and get ready for handling the encoded traffic.
-//
-
-int InitAfterNegotiation()
-{
-  #ifdef TEST
-  *logofs << "Loop: Connection with remote proxy completed.\n"
-          << logofs_flush;
-  #endif
-
-  cerr << "Info" << ": Connection with remote proxy completed.\n"
-        << logofs_flush;
-
-  //
-  // If we are the server proxy we completed
-  // our initializazion phase according to
-  // the values provided by the client side.
-  //
-
-  if (control -> ProxyMode == proxy_server)
-  {
-    SetParameters();
-  }
-
-  //
-  // Set up the listeners for the additional
-  // services.
-  //
-
-  SetupServiceSockets();
-
-  //
-  // Create the proxy class and the statistics
-  // repository and pass all the configuration
-  // data we negotiated with the remote peer.
-  //
-
-  SetupProxyInstance();
-
-  //
-  // We completed both parsing of user's parameters
-  // and handlshaking with remote proxy. Now print
-  // a brief summary including the most significant
-  // control values.
-  //
-
-  PrintConnectionInfo();
-
-  //
-  // Cancel the initialization watchdog.
-  //
-
-  if (IsRunning(lastWatchdog))
-  {
-    KillProcess(lastWatchdog, "watchdog", SIGTERM, 1);
-
-    SetNotRunning(lastWatchdog);
-
-    lastSignal = 0;
-  }
-
-  //
-  // Start the house-keeper process. It will
-  // remove the oldest persistent caches, if
-  // the amount of storage exceed the limits
-  // set by the user.
-  //
-
-  StartKeeper();
-
-  //
-  // Set the log size check timestamp.
-  //
-
-  nowTs = getNewTimestamp();
-
-  logsTs = nowTs;
-
-  //
-  // TODO: Due to the way the new NX transport is working,
-  // the accounting of time spent handling messages must
-  // be rewritten. In particular, at the moment it only
-  // shows the time spent encoding and decoding messages
-  // in the main loop, after executing a select. It doesn't
-  // take into account the time spent in the NXTrans* calls
-  // where messages can be encoded and decoded implicitly,
-  // on demand of the agent. When the agent transport is
-  // in use, these calls constitute the vast majority of
-  // the encoding activity. The result is that the number
-  // of KB encoded per second shown by the proxy statistics
-  // is actually much lower than the real throughput gene-
-  // rated by the proxy.
-  //
-
-  #ifdef TEST
-  *logofs << "Loop: INIT! Completed initialization at "
-          << strMsTimestamp(nowTs) << " with "
-          << diffTimestamp(initTs, nowTs) << " Ms "
-          << "since the init mark.\n" << logofs_flush;
-  #endif
-
-  initTs = getNewTimestamp();
-
-  //
-  // We can now start handling binary data from
-  // our peer proxy.
-  //
-
-  if (agent == NULL)
-  {
-    cerr << "Session" << ": Session started at '"
-         << strTimestamp() << "'.\n";
-  }
-
-  return 1;
-}
-
-int SetMode(int mode)
-{
-  //
-  // Set the local proxy mode.
-  //
-
-  if (control -> ProxyMode == proxy_undefined)
-  {
-    if (mode == NX_MODE_CLIENT)
-    {
-      #ifdef TEST
-      *logofs << "Loop: INIT! Initializing with mode "
-              << "NX_MODE_CLIENT at " << strMsTimestamp()
-              << ".\n" << logofs_flush;
-      #endif
-
-      control -> ProxyMode = proxy_client;
-    }
-    else if (mode == NX_MODE_SERVER)
-    {
-      #ifdef TEST
-      *logofs << "Loop: INIT! Initializing with mode "
-              << "NX_MODE_SERVER at " << strMsTimestamp()
-              << ".\n" << logofs_flush;
-      #endif
-
-      control -> ProxyMode = proxy_server;
-    }
-    else
-    {
-      cerr << "Error" << ": Please specify either "
-           << "the -C or -S option.\n";
-
-      HandleCleanup();
-    }
-  }
-
-  return 1;
-}
-
-int SetupProxyInstance()
-{
-  if (control -> ProxyMode == proxy_client)
-  {
-    proxy = new ClientProxy(proxyFD);
-  }
-  else
-  {
-    proxy = new ServerProxy(proxyFD);
-  }
-
-  if (proxy == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Error creating the NX proxy.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Error creating the NX proxy.\n";
-
-    HandleCleanup();
-  }
-
-  //
-  // Create the statistics repository.
-  //
-
-  statistics = new Statistics(proxy);
-
-  if (statistics == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Error creating the NX statistics.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Error creating the NX statistics.\n";
-
-    HandleCleanup();
-  }
-
-  //
-  // If user gave us a proxy cookie than create the
-  // X11 authorization repository and find the real
-  // cookie to be used for our X display.
-  //
-
-  SetupAuthInstance();
-
-  //
-  // Reset the static members in channels.
-  //
-
-  proxy -> handleChannelConfiguration();
-
-  //
-  // Inform the proxies about the ports where they
-  // will have to forward the network connections.
-  //
-
-  proxy -> handleDisplayConfiguration(displayHost, xServerAddrFamily,
-                                          xServerAddr, xServerAddrLength);
-
-  proxy -> handlePortConfiguration(cupsPort, smbPort, mediaPort,
-                                       httpPort, fontPort);
-
-  //
-  // We handed over the sockaddr structure we
-  // created when we set up the display socket
-  // to the proxy.
-  //
-
-  xServerAddr = NULL;
-
-  //
-  // Set socket options on proxy link, then propagate link
-  // configuration to proxy. This includes translating some
-  // control parameters in 'local' and 'remote'. Finally
-  // adjust cache parameters according to pack method and
-  // session type selected by user.
-  //
-
-  if (proxy -> handleSocketConfiguration() < 0 ||
-          proxy -> handleLinkConfiguration() < 0 ||
-              proxy -> handleCacheConfiguration() < 0)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Error configuring the NX transport.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Error configuring the NX transport.\n";
-
-    HandleCleanup();
-  }
-
-  //
-  // Load the message stores from the persistent
-  // cache.
-  //
-
-  proxy -> handleLoad(load_if_first);
-
-  //
-  // Inform the proxy that from now on it can
-  // start handling the encoded data.
-  //
-
-  proxy -> setOperational();
-
-  //
-  // Are we going to use an internal IPC connection
-  // with an agent? In this case create the channel
-  // by using the socket descriptor provided by the
-  // caller at the proxy initialization.
-  //
-
-  SetupAgentInstance();
-
-  //
-  // Check if we need to verify the existence of
-  // a matching client cache at shutdown.
-  //
-
-  #ifdef MATCH
-
-  control -> PersistentCacheCheckOnShutdown = 1;
-
-  #endif
-
-  //
-  // Flush any data produced so far.
-  //
-
-  proxy -> handleFlush();
-
-  #if defined(TEST) || defined(INFO)
-
-  if (proxy -> getFlushable(proxyFD) > 0)
-  {
-    *logofs << "Loop: WARNING! Proxy FD#" << proxyFD << " has data "
-            << "to flush after setup of the NX transport.\n"
-            << logofs_flush;
-  }
-
-  #endif
-
-  return 1;
-}
-
-int SetupAuthInstance()
-{
-  //
-  // If user gave us a proxy cookie, then create the
-  // X11 authorization repository and find the real
-  // cookie to be used for our X display.
-  //
-
-  if (control -> ProxyMode == proxy_server)
-  {
-    if (authCookie != NULL && *authCookie != '\0')
-    {
-      if (useLaunchdSocket == 1)
-      {
-        //
-        // If we are going to retrieve the X11 autho-
-        // rization through the launchd service, make
-        // a connection to its socket to trigger the
-        // X server starting.
-        //
-
-        sockaddr_un launchdAddrUnix;
-
-        unsigned int launchdAddrLength = sizeof(sockaddr_un);
-
-        int launchdAddrFamily = AF_UNIX;
-
-        launchdAddrUnix.sun_family = AF_UNIX;
-
-        const int launchdAddrNameLength = 108;
-
-        int success = -1;
-
-        strncpy(launchdAddrUnix.sun_path, displayHost, launchdAddrNameLength);
-
-        *(launchdAddrUnix.sun_path + launchdAddrNameLength - 1) = '\0';
-
-        #ifdef TEST
-        *logofs << "Loop: Connecting to launchd service "
-                << "on Unix port '" << displayHost << "'.\n" << logofs_flush;
-        #endif
-
-        int launchdFd = socket(launchdAddrFamily, SOCK_STREAM, PF_UNSPEC);
-
-        if (launchdFd < 0)
-        {
-          #ifdef PANIC
-          *logofs << "Loop: PANIC! Call to socket failed. "
-                  << "Error is " << EGET() << " '" << ESTR()
-                  << "'.\n" << logofs_flush;
-          #endif
-        }
-        else if ((success = connect(launchdFd, (sockaddr *) &launchdAddrUnix, launchdAddrLength)) < 0)
-        {
-          #ifdef WARNING
-          *logofs << "Loop: WARNING! Connection to launchd service "
-                  << "on Unix port '" << displayHost << "' failed "
-                  << "with error " << EGET() << ", '" << ESTR() << "'.\n"
-                  << logofs_flush;
-          #endif
-        }
-
-        if (launchdFd >= 0)
-        {
-          close(launchdFd);
-        }
-
-        //
-        // The real cookie will not be available
-        // until the X server starts. Query for the
-        // cookie in a loop, unless the connection
-        // to the launchd service failed.
-        //
-
-        int attempts = (success < 0 ? 1 : 10);
-
-        for (int i = 0; i < attempts; i++)
-        {
-          delete auth;
-
-          auth = new Auth(displayHost, authCookie);
-
-          if (auth != NULL && auth -> isFake() == 1)
-          {
-            usleep(200000);
-
-            continue;
-          }
-
-          break;
-        }
-      }
-      else
-      {
-        auth = new Auth(displayHost, authCookie);
-      }
-
-      if (auth == NULL || auth -> isValid() != 1)
-      {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Error creating the X authorization.\n"
-                << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Error creating the X authorization.\n";
-
-        HandleCleanup();
-      }
-      else if (auth -> isFake() == 1)
-      {
-        #ifdef WARNING
-        *logofs << "Loop: WARNING! Could not retrieve the X server "
-                << "authentication cookie.\n"
-                << logofs_flush;
-        #endif
-
-        cerr << "Warning" << ": Failed to read data from the X "
-             << "auth command.\n";
-
-        cerr << "Warning" << ": Generated a fake cookie for X "
-             << "authentication.\n";
-      }
-    }
-    else
-    {
-      #ifdef TEST
-      *logofs << "Loop: No proxy cookie was provided for "
-              << "authentication.\n" << logofs_flush;
-      #endif
-
-      cerr << "Info" << ": No proxy cookie was provided for "
-           << "authentication.\n";
-
-      #ifdef TEST
-      *logofs << "Loop: Forwarding the real X authorization "
-              << "cookie.\n" << logofs_flush;
-      #endif
-
-      cerr << "Info" << ": Forwarding the real X authorization "
-           << "cookie.\n";
-    }
-  }
-
-  return 1;
-}
-
-int SetupAgentInstance()
-{
-  if (control -> ProxyMode == proxy_client &&
-          useAgentSocket == 1)
-  {
-    //
-    // This will temporarily disable signals to safely
-    // load the cache, then will send a control packet
-    // to the remote end, telling that cache has to be
-    // loaded, so it's important that proxy is already
-    // set in operational state.
-    //
-
-    int result;
-
-    if (agent != NULL)
-    {
-      result = proxy -> handleNewAgentConnection(agent);
-    }
-    else
-    {
-      result = proxy -> handleNewConnection(channel_x11, agentFD[1]);
-    }
-
-    if (result < 0)
-    {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Error creating the NX agent connection.\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Error creating the NX agent connection.\n";
-
-      HandleCleanup();
-    }
-  }
-
-  return 1;
-}
-
-int SetupTcpSocket()
-{
-  //
-  // Open TCP socket emulating local display.
-  //
-
-  return ListenConnectionTCP((loopbackBind ? "localhost" : "*"), X_TCP_PORT + proxyPort, "X11");
-}
-
-int SetupUnixSocket()
-{
-  //
-  // Open UNIX domain socket for display.
-  //
-
-  if (!control->TempPath) {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Temporal path is null.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Temporal path is null.\n";
-    HandleCleanup();
-  }
-
-  unsigned int required = snprintf(unixSocketName, DEFAULT_STRING_LENGTH, "%s/.X11-unix", control->TempPath);
-  if (required < sizeof(unixSocketName)) {
-
-    // No need to execute the following actions conditionally
-    mkdir(unixSocketName, (0777 | S_ISVTX));
-    chmod(unixSocketName, (0777 | S_ISVTX));
-
-    required = snprintf(unixSocketName, DEFAULT_STRING_LENGTH, "%s/.X11-unix/X%d", control->TempPath, proxyPort);
-    if (required < sizeof(unixSocketName)) {
-
-      unixFD = ListenConnectionUnix(unixSocketName, "x11");
-      if (unixFD >= 0)
-        chmod(unixSocketName, 0777);
-      return unixFD;
-    }
-  }
-
-  unixSocketName[0] = '\0'; // Just in case!
-
-  #ifdef PANIC
-  *logofs << "Loop: PANIC! path for unix socket is too long.\n" << logofs_flush;
-  #endif
-
-  cerr << "Error" << ": path for Unix socket is too long.\n";
-  HandleCleanup();
-}
-
-//
-// The following is a dumb copy-paste. The
-// nxcompsh library should offer a better
-// implementation.
-//
-
-int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
-                           unsigned int &xServerAddrLength)
-{
-  xServerAddrFamily = AF_INET;
-  xServerAddr = NULL;
-  xServerAddrLength = 0;
-
-  char *display;
-
-  if (*displayHost == '\0')
-  {
-    //
-    // Assume DISPLAY as the X server to which
-    // we will forward the proxied connections.
-    // This means that NX parameters have been
-    // passed through other means.
-    //
-
-    display = getenv("DISPLAY");
-
-    if (display == NULL || *display == '\0')
-    {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Host X server DISPLAY is not set.\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Host X server DISPLAY is not set.\n";
-
-      HandleCleanup();
-    }
-    else if (strncasecmp(display, "nx/nx,", 6) == 0 ||
-                 strncasecmp(display, "nx,", 3) == 0 ||
-                     strncasecmp(display, "nx/nx:", 6) == 0 ||
-                         strncasecmp(display, "nx:", 3) == 0)
-    {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! NX transport on host X server '"
-              << display << "' not supported.\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": NX transport on host X server '"
-           << display << "' not supported.\n";
-
-      cerr << "Error" << ": Please run the local proxy specifying "
-           << "the host X server to connect to.\n";
-
-      HandleCleanup();
-    }
-    else if (strlen(display) >= DEFAULT_STRING_LENGTH)
-    {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Host X server DISPLAY cannot exceed "
-              << DEFAULT_STRING_LENGTH << " characters.\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Host X server DISPLAY cannot exceed "
-           << DEFAULT_STRING_LENGTH << " characters.\n";
-
-      HandleCleanup();
-    }
-
-    strcpy(displayHost, display);
-  }
-
-  display = new char[strlen(displayHost) + 1];
-
-  if (display == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Out of memory handling DISPLAY variable.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Out of memory handling DISPLAY variable.\n";
-
-    HandleCleanup();
-  }
-
-  strcpy(display, displayHost);
-
-  #ifdef __APPLE__
-
-  if ((strncasecmp(display, "/tmp/launch", 11) == 0) || (strncasecmp(display, "/private/tmp/com.apple.launchd", 30) == 0))
-  {
-    #ifdef TEST
-    *logofs << "Loop: Using launchd service on socket '"
-            << display << "'.\n" << logofs_flush;
-    #endif
-
-    useLaunchdSocket = 1;
-  }
-
-  #endif
-
-  char *separator = strrchr(display, ':');
-
-  if ((separator == NULL) || !isdigit(*(separator + 1)))
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Invalid display '" << display << "'.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Invalid display '" << display << "'.\n";
-
-    HandleCleanup();
-  }
-
-  *separator = '\0';
-
-  xPort = atoi(separator + 1);
-
-  #ifdef TEST
-  *logofs << "Loop: Using local X display '" << displayHost
-          << "' with host '" << display << "' and port '"
-          << xPort << "'.\n" << logofs_flush;
-  #endif
-
-  #ifdef __APPLE__
-
-  if (separator == display || strcmp(display, "unix") == 0 ||
-          useLaunchdSocket == 1)
-
-  #else
-
-  if (separator == display || strcmp(display, "unix") == 0)
-
-  #endif
-  {
-    //
-    // UNIX domain port.
-    //
-
-    #ifdef TEST
-    *logofs << "Loop: Using real X server on UNIX domain socket.\n"
-            << logofs_flush;
-    #endif
-
-    sockaddr_un *xServerAddrUNIX = new sockaddr_un;
-
-    xServerAddrFamily = AF_UNIX;
-    xServerAddrUNIX -> sun_family = AF_UNIX;
-
-    //
-    // The scope of this function is to fill either the sockaddr_un
-    // (when the display is set to the Unix Domain socket) or the
-    // sockaddr_in structure (when connecting by TCP) only once, so
-    // that the structure will be later used at the time the server
-    // proxy will try to forward the connection to the X server. We
-    // don't need to verify that the socket does exist at the pre-
-    // sent moment. The method that forwards the connection will
-    // perform the required checks and will retry, if needed. Anyway
-    // we need to select the name of the socket, so we check if the
-    // well-known directory exists and take that as an indication of
-    // where the socket will be created.
-    //
-
-    // Try abstract X11 socket first (via a test connect), if that fails
-    // fall back to Unix domain socket file.
-
-    #ifdef __linux__
-    int testSocketFD;
-    testSocketFD = socket(xServerAddrFamily, SOCK_STREAM, PF_UNSPEC);
-
-    int len = sprintf(unixSocketName + 1, "/tmp/.X11-unix/X%d", xPort);
-    unixSocketName[0] = '\0';
-
-    sockaddr_un *xServerAddrABSTRACT = new sockaddr_un;
-    memset(xServerAddrABSTRACT, 0, xServerAddrLength);
-    xServerAddrABSTRACT -> sun_family = AF_UNIX;
-    memcpy(xServerAddrABSTRACT -> sun_path, unixSocketName, len+1);
-    xServerAddrLength = len +3;
-
-    int ret = connect(testSocketFD, (struct sockaddr *) xServerAddrABSTRACT, xServerAddrLength);
-    if (ret == 0) {
-
-        cerr << "Info" << ": Using abstract X11 socket in kernel namespace "
-             << "for accessing DISPLAY=:" << xPort << ".\n";
-
-        close(testSocketFD);
-        xServerAddr = (sockaddr *) xServerAddrABSTRACT;
-        return 1;
-
-    } else {
-
-        cerr << "Info" << ": Falling back to file system X11 socket "
-             << "for accessing DISPLAY=:" << xPort << ".\n";
-
-    #endif
-
-    struct stat statInfo;
-
-    char unixSocketDir[DEFAULT_STRING_LENGTH];
-
-    snprintf(unixSocketDir, DEFAULT_STRING_LENGTH - 1, "%s/.X11-unix",
-                 control -> TempPath);
-
-    #ifdef __APPLE__
-
-    if (useLaunchdSocket == 1)
-    {
-      char *slash = rindex(display, '/');
-
-      if (slash != NULL)
-      {
-        *slash = '\0';
-      }
-
-      snprintf(unixSocketDir, DEFAULT_STRING_LENGTH - 1, "%s", display);
-    }
-
-    #endif
-
-    *(unixSocketDir + DEFAULT_STRING_LENGTH - 1) = '\0';
-
-    #ifdef TEST
-    *logofs << "Loop: Assuming X socket in directory '"
-            << unixSocketDir << "'.\n" << logofs_flush;
-    #endif
-
-    if (stat(unixSocketDir, &statInfo) < 0)
-    {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Can't determine the location of "
-              << "the X display socket.\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Can't determine the location of "
-           << "the X display socket.\n";
-
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Error " << EGET() << " '" << ESTR()
-              << "' checking '" << unixSocketDir << "'.\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Error " << EGET() << " '" << ESTR()
-           << "' checking '" << unixSocketDir << "'.\n";
-
-      HandleCleanup();
-    }
-
-    sprintf(unixSocketName, "%s/X%d", unixSocketDir, xPort);
-
-    #ifdef __APPLE__
-
-    if (useLaunchdSocket == 1)
-    {
-      strncpy(unixSocketName, displayHost, DEFAULT_STRING_LENGTH - 1);
-    }
-
-    #endif
-
-    #ifdef TEST
-    *logofs << "Loop: Assuming X socket name '" << unixSocketName
-            << "'.\n" << logofs_flush;
-    #endif
-
-    strcpy(xServerAddrUNIX -> sun_path, unixSocketName);
-
-    xServerAddr = (sockaddr *) xServerAddrUNIX;
-    xServerAddrLength = sizeof(sockaddr_un);
-
-    #ifdef __linux__
-
-    }
-    #endif
-  }
-  else
-  {
-    //
-    // TCP port.
-    //
-
-    #ifdef TEST
-    *logofs << "Loop: Using real X server on TCP port.\n"
-            << logofs_flush;
-    #endif
-
-    xServerAddrFamily = AF_INET;
-
-    int xServerIPAddr = GetHostAddress(display);
-
-    if (xServerIPAddr == 0)
-    {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Unknown display host '" << display
-              << "'.\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Unknown display host '" << display
-           << "'.\n";
-
-      HandleCleanup();
-    }
-
-    sockaddr_in *xServerAddrTCP = new sockaddr_in;
-
-    xServerAddrTCP -> sin_family = AF_INET;
-    xServerAddrTCP -> sin_port = htons(X_TCP_PORT + xPort);
-    xServerAddrTCP -> sin_addr.s_addr = xServerIPAddr;
-
-    xServerAddr = (sockaddr *) xServerAddrTCP;
-    xServerAddrLength = sizeof(sockaddr_in);
-  }
-
-  delete [] display;
-
-  return 1;
-}
-
-int SetupServiceSockets()
-{
-  if (control -> ProxyMode == proxy_client)
-  {
-    if (useCupsSocket)
-    {
-      if ((cupsFD = ListenConnection(cupsPort, "CUPS")) < 0)
-      {
-        useCupsSocket = 0;
-      }
-    }
-
-    if (useAuxSocket)
-    {
-      if ((auxFD = ListenConnection(auxPort, "auxiliary X11")) < 0)
-      {
-        useAuxSocket = 0;
-      }
-    }
-
-    if (useSmbSocket)
-    {
-      if ((smbFD = ListenConnection(smbPort, "SMB")) < 0)
-      {
-        useSmbSocket = 0;
-      }
-    }
-
-    if (useMediaSocket)
-    {
-      if ((mediaFD = ListenConnection(mediaPort, "media")) < 0)
-      {
-        useMediaSocket = 0;
-      }
-    }
-
-    if (useHttpSocket)
-    {
-      if ((httpFD = ListenConnection(httpPort, "http")) < 0)
-      {
-        useHttpSocket = 0;
-      }
-    }
-
-    useFontSocket = 0;
-  }
-  else
-  {
-    //
-    // Get ready to listen for the font server connections
-    //
-
-    if (useFontSocket)
-    {
-      // Since ProtoStep7 (#issue 108)
-      int port = atoi(fontPort);
-
-      if ((fontFD = ListenConnectionTCP("localhost", port, "font")) < 0)
-      {
-        useFontSocket = 0;
-      }
-    }
-
-    useCupsSocket  = 0;
-    useAuxSocket   = 0;
-    useSmbSocket   = 0;
-    useMediaSocket = 0;
-    useHttpSocket  = 0;
-  }
-
-  //
-  // Slave channels can be originated
-  // by both sides.
-  //
-
-  if (useSlaveSocket)
-  {
-    // Since ProtoStep7 (#issue 108)
-    if ((slaveFD = ListenConnection(slavePort, "slave")) < 0)
-    {
-      useSlaveSocket = 0;
-    }
-  }
-
-  return 1;
-}
-
-int ListenConnectionAny(sockaddr *addr, socklen_t addrlen, const char *label)
-{
-  int newFD = socket(addr->sa_family, SOCK_STREAM, PF_UNSPEC);
-
-  if (newFD == -1)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Call to socket failed for " << label
-            << " socket. Error is " << EGET() << " '"
-            << ESTR() << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Call to socket failed for " << label
-         << " socket. Error is " << EGET() << " '"
-         << ESTR() << "'.\n";
-
-    goto SetupSocketError;
-  }
-
-  if (addr->sa_family == AF_INET)
-    if (SetReuseAddress(newFD) < 0)
-    {
-      // SetReuseAddress already warns with an error
-      goto SetupSocketError;
-    }
-
-  if (bind(newFD, addr, addrlen) == -1)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Call to bind failed for " << label
-            << ". Error is " << EGET()
-            << " '" << ESTR() << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Call to bind failed for " << label
-         << ". Error is " << EGET()
-         << " '" << ESTR() << "'.\n";
-    goto SetupSocketError;
-  }
-
-  if (listen(newFD, 8) == -1)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Call to listen failed for " << label
-            << ". Error is " << EGET()
-            << " '" << ESTR() << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Call to listen failed for " << label
-         << ". Error is " << EGET()
-         << " '" << ESTR() << "'.\n";
-
-    goto SetupSocketError;
-  }
-
-  return newFD;
-
-SetupSocketError:
-
-  if (newFD != -1)
-  {
-    close(newFD);
-  }
-
-  //
-  // May optionally return. The session would
-  // continue without the service. The problem
-  // with this approach is that it would make
-  // harder to track problems with allocation
-  // of ports in clients and server.
-  //
-
-  HandleCleanup();
-  return -1;
-}
-
-int ListenConnectionUnix(const char *path, const char *label)
-{
-
-  sockaddr_un unixAddr;
-  unixAddr.sun_family = AF_UNIX;
-#ifdef UNIX_PATH_MAX
-  if (strlen(path) >= UNIX_PATH_MAX)
-#else
-  if (strlen(path) >= sizeof(unixAddr.sun_path))
-#endif
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Socket path \"" << path << "\" for "
-            << label << " is too long.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Socket path \"" << path << "\" for "
-         << label << " is too long.\n";
-
-    HandleCleanup();
-    return -1;
-  }
-
-  strcpy(unixAddr.sun_path, path);
-  return ListenConnectionAny((sockaddr *)&unixAddr, sizeof(unixAddr), label);
-}
-
-int ListenConnectionTCP(const char *host, long port, const char *label)
-{
-  sockaddr_in tcpAddr;
-  tcpAddr.sin_family = AF_INET;
-  tcpAddr.sin_port = htons(port);
-
-  if (loopbackBind ||
-      !host ||
-      !strcmp(host, "") ||
-      !strcmp(host, "localhost")) {
-    tcpAddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-  }
-  else if(strcmp(host, "*") == 0) {
-    tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-  }
-  else {
-    int ip = tcpAddr.sin_addr.s_addr = GetHostAddress(host);
-    if (ip == 0)
-    {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Unknown " << label << " host '" << host
-              << "'.\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Unknown " << label << " host '" << host
-           << "'.\n";
-
-      HandleCleanup();
-      return -1;
-    }
-  }
-
-  return ListenConnectionAny((sockaddr *)&tcpAddr, sizeof(tcpAddr), label);
-}
-
-int ListenConnection(ChannelEndPoint &endpoint, const char *label)
-{
-  char *unixPath, *host;
-  long port;
-  if (endpoint.getUnixPath(&unixPath)) {
-    return ListenConnectionUnix(unixPath, label);
-  }
-  else if (endpoint.getTCPHostAndPort(&host, &port)) {
-    return ListenConnectionTCP(host, port, label);
-  }
-  return -1;
-}
-
-static int AcceptConnection(int fd, int domain, const char *label)
-{
-  struct sockaddr newAddr;
-
-  socklen_t addrLen = sizeof(newAddr);
-
-  #ifdef TEST
-
-  if (domain == AF_UNIX)
-  {
-    *logofs << "Loop: Going to accept new Unix " << label
-            << " connection on FD#" << fd << ".\n"
-            << logofs_flush;
-  }
-  else
-  {
-    *logofs << "Loop: Going to accept new TCP " << label
-            << " connection on FD#" << fd << ".\n"
-            << logofs_flush;
-  }
-
-  #endif
-
-  int newFD = accept(fd, &newAddr, &addrLen);
-
-  if (newFD < 0)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Call to accept failed for "
-            << label << " connection. Error is " << EGET()
-            << " '" << ESTR() << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Call to accept failed for "
-         << label << " connection. Error is " << EGET()
-         << " '" << ESTR() << "'.\n";
-  }
-
-  return newFD;
-}
-
-void HandleShutdown()
-{
-  if (proxy -> getShutdown() == 0)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! No shutdown of proxy link "
-            << "performed by remote proxy.\n"
-            << logofs_flush;
-    #endif
-
-    //
-    // Close the socket before showing the alert.
-    // It seems that the closure of the socket can
-    // sometimes take several seconds, even after
-    // the connection is broken. The result is that
-    // the dialog can be shown long after the user
-    // has gone after the failed session. Note that
-    // disabling the linger timeout does not seem
-    // to make any difference.
-    //
-
-    CleanupSockets();
-
-    cerr << "Error" << ": Connection with remote peer broken.\n";
-
-    #ifdef TEST
-    *logofs << "Loop: Bytes received so far are "
-            << (unsigned long long) statistics -> getBytesIn()
-            << ".\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Please check the state of your "
-         << "network and retry.\n";
-
-    handleTerminatingInLoop();
-
-    if (control -> ProxyMode == proxy_server)
-    {
-      #ifdef TEST
-      *logofs << "Loop: Showing the proxy abort dialog.\n"
-              << logofs_flush;
-      #endif
-
-      HandleAlert(ABORT_PROXY_CONNECTION_ALERT, 1);
-
-      handleAlertInLoop();
-    }
-  }
-  #ifdef TEST
-  else
-  {
-    *logofs << "Loop: Finalized the remote proxy shutdown.\n"
-            << logofs_flush;
-  }
-  #endif
-
-  HandleCleanup();
-}
-
-
-void WaitCleanup()
-{
-  T_timestamp selectTs;
-
-  while (NXTransRunning(NX_FD_ANY))
-  {
-    setTimestamp(selectTs, control -> PingTimeout);
-
-    NXTransContinue(&selectTs);
-  }
-}
-
-int KillProcess(int pid, const char *label, int signal, int wait)
-{
-  if (pid > 0)
-  {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Killing the " << label << " process '"
-            << pid << "' from process with pid '" << getpid()
-            << "' with signal '" << DumpSignal(signal)
-            << "'.\n" << logofs_flush;
-    #endif
-
-    signal = (signal == 0 ? SIGTERM : signal);
-
-    if (kill(pid, signal) < 0 && EGET() != ESRCH)
-    {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Couldn't kill the " << label
-              << " process with pid '" << pid << "'.\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Couldn't kill the " << label
-           << " process with pid '" << pid << "'.\n";
-    }
-
-    if (wait == 1)
-    {
-      WaitChild(pid, label, 1);
-    }
-
-    return 1;
-  }
-  else
-  {
-    #ifdef TEST
-    *logofs << "Loop: No " << label << " process "
-            << "to kill with pid '" << pid
-            << "'.\n" << logofs_flush;
-    #endif
-
-    return 0;
-  }
-}
-
-int CheckProcess(int pid, const char *label)
-{
-  #if defined(TEST) || defined(INFO)
-  *logofs << "Loop: Checking the " << label << " process '"
-          << pid << "' from process with pid '" << getpid()
-          << "'.\n" << logofs_flush;
-  #endif
-
-  if (kill(pid, SIGCONT) < 0 && EGET() == ESRCH)
-  {
-    #ifdef WARNING
-    *logofs << "Loop: WARNING! The " << label << " process "
-            << "with pid '" << pid << "' has exited.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Warning" << ": The " << label << " process "
-         << "with pid '" << pid << "' has exited.\n";
-
-    return 0;
-  }
-
-  return 1;
-}
-
-int StartKeeper()
-{
-  #if defined(TEST) || defined(INFO)
-
-  if (IsRunning(lastKeeper) == 1 ||
-          IsRestarting(lastKeeper) == 1)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! The house-keeping process is "
-            << "alreay running with pid '" << lastKeeper
-            << "'.\n" << logofs_flush;
-    #endif
-
-    HandleCleanup();
-  }
-
-  #endif
-
-  //
-  // Don't care harvesting the persistent caches if
-  // the memory cache is not enabled. If the memory
-  // cache is not enabled neither we produced per-
-  // sistent caches. The user can still delete any
-  // persistent cache produced by the previous runs
-  // by using the client GUI.
-  //
-  // TODO: At the moment the user doesn't have a way
-  // to specify the amount of disk space to use for
-  // the persistent caches, but only the amount of
-  // space to use for images.
-  //
-
-  if (control -> LocalTotalStorageSize > 0)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Starting the house-keeping process with "
-            << "storage size " << control -> PersistentCacheDiskLimit
-            << ".\n" << logofs_flush;
-    #endif
-
-    lastKeeper = NXTransKeeper(control -> PersistentCacheDiskLimit,
-                                   0, control -> RootPath);
-
-    if (IsFailed(lastKeeper))
-    {
-      #ifdef WARNING
-      *logofs << "Loop: WARNING! Failed to start the NX keeper process.\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Warning" << ": Failed to start the NX keeper process.\n";
-
-      SetNotRunning(lastKeeper);
-    }
-    #ifdef TEST
-    else
-    {
-      *logofs << "Loop: Keeper started with pid '"
-              << lastKeeper << "'.\n" << logofs_flush;
-    }
-    #endif
-  }
-  #ifdef TEST
-  else
-  {
-    *logofs << "Loop: Nothing to do for the keeper process "
-            << "with persistent cache not enabled.\n"
-            << logofs_flush;
-  }
-  #endif
-
-  return 1;
-}
-
-void HandleCleanupForReconnect()
-{
-  #ifdef TEST
-  *logofs << "Loop: Going to clean up system resources for Reconnect "
-          << "in process '" << getpid() << "'.\n"
-          << logofs_flush;
-  #endif
-  handleTerminatedInLoop();
-  DisableSignals();
-  if (control)
-    CleanupChildren();
-  CleanupListeners();
-  CleanupSockets();
-  CleanupKeeper();
-  CleanupStreams();
-  CleanupLocal();
-  CleanupGlobal();
-  RestoreSignals();
-  ServerCache::lastInitReply.set(0,NULL);
-  ServerCache::lastKeymap.set(0,NULL);
-  ServerCache::getKeyboardMappingLastMap.set(0,NULL);
-}
-void HandleCleanup(int code)
-{
-  #ifdef TEST
-  *logofs << "Loop: Going to clean up system resources "
-          << "in process '" << getpid() << "'.\n"
-          << logofs_flush;
-  #endif
-
-  handleTerminatedInLoop();
-
-  //
-  // Suspend any signal while cleaning up.
-  //
-
-  DisableSignals();
-
-  if (getpid() == lastProxy)
-  {
-    //
-    // Terminate all the children.
-    //
-
-    CleanupChildren();
-  
-    //
-    // Close all listeners.
-    //
-
-    CleanupListeners();
-
-    //
-    // Close all sockets.
-    //
-
-    CleanupSockets();
-
-    //
-    // Release the global objects.
-    //
-
-    CleanupGlobal();
-
-    //
-    // Restore the original signal handlers.
-    //
-
-    RestoreSignals();
-  }
-
-  //
-  // This is our last chance to print a message. If this
-  // is the process which created the transport we will
-  // jump back into the loop, letting the caller find out
-  // that the connection is broken, otherwise we assume
-  // that this is a child of the proxy and so we will
-  // safely exit.
-  //
-
-  #ifdef TEST
-
-  if (getpid() == lastProxy)
-  {
-    *logofs << "Loop: Reverting to loop context in process with "
-            << "pid '" << getpid() << "' at " << strMsTimestamp()
-            << ".\n" << logofs_flush;
-  }
-  else
-  {
-    *logofs << "Loop: Exiting from child process with pid '"
-            << getpid() << "' at " << strMsTimestamp()
-            << ".\n" << logofs_flush;
-  }
-
-  #endif
-
-  if (getpid() == lastProxy)
-  {
-    //
-    // Reset all values to their default.
-    //
-
-    CleanupLocal();
-
-    CleanupStreams();
-
-    longjmp(context, 1);
-  }
-  else
-  {
-    //
-    // Give a last chance to the process
-    // to cleanup the ancillary classes.
-    //
-
-    CleanupKeeper();
-
-    CleanupStreams();
-
-    exit(code);
-  }
-}
-
-void CleanupKeeper()
-{
-  if (keeper != NULL)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Freeing up keeper in process "
-            << "with pid '" << getpid() << "'.\n"
-            << logofs_flush;
-    #endif
-
-    delete keeper;
-
-    keeper = NULL;
-  }
-}
-
-void CleanupStreams()
-{
-  //
-  // TODO: The cleanup procedure skips deletion of
-  // the I/O streams under Windows. This is intended
-  // to avoid a strange segfault occurring randomly,
-  // at the time the proxy is being shut down.
-  //
-
-  #ifndef __CYGWIN32__
-
-  #ifdef TEST
-  *logofs << "Loop: Freeing up streams in process "
-          << "with pid '" << getpid() << "'.\n"
-          << logofs_flush;
-  #endif
-
-  if (logofs != NULL && logofs != &cerr &&
-          *errorsFileName != '\0')
-  {
-    *logofs << flush;
-
-    delete logofs;
-
-    //
-    // Let the log go again to the standard
-    // error.
-    //
-
-    logofs = &cerr;
-  }
-
-  if (statofs != NULL && statofs != &cerr &&
-          *statsFileName != '\0')
-  {
-    *statofs << flush;
-
-    delete statofs;
-
-    statofs = NULL;
-  }
-
-  if (errofs != NULL)
-  {
-    *errofs << flush;
-
-    if (errofs == &cerr)
-    {
-      errofs = NULL;
-    }
-    else if (errsbuf != NULL)
-    {
-      cerr.rdbuf(errsbuf);
-
-      errsbuf = NULL;
-
-      delete errofs;
-    }
-
-    errofs = NULL;
-  }
-
-  #endif /* #ifndef __CYGWIN32__ */
-
-  //
-  // Reset these as they can't be reset
-  // in CleanupLocal().
-  //
-
-  *sessionFileName = '\0';
-  *errorsFileName  = '\0';
-  *optionsFileName = '\0';
-  *statsFileName   = '\0';
-}
-
-void CleanupChildren()
-{
-  //
-  // Remove any watchdog.
-  //
-
-  if (IsRunning(lastWatchdog))
-  {
-    KillProcess(lastWatchdog, "watchdog", SIGTERM, 1);
-
-    SetNotRunning(lastWatchdog);
-
-    lastSignal = 0;
-  }
-
-  //
-  // Kill the cache house-keeping process.
-  //
-
-  if (IsRunning(lastKeeper))
-  {
-    KillProcess(lastKeeper, "house-keeping", SIGTERM, 1);
-
-    SetNotRunning(lastKeeper);
-  }
-
-  //
-  // Let any running dialog to continue until it is
-  // closed by the user. In general this is the exp-
-  // ected behaviour, as for example when we are
-  // exiting because the link was abrouptedly shut
-  // down.
-  //
-
-  if (IsRunning(lastDialog))
-  {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: WARNING! Leaving the dialog process '"
-            << lastDialog << "' running in process "
-            << "with pid '" << getpid() << "'.\n"
-            << logofs_flush;
-    #endif
-
-    SetNotRunning(lastDialog);
-  }
-
-  //
-  // Give user a chance to start a new session.
-  //
-
-  if (control -> EnableRestartOnShutdown == 1)
-  {
-    #ifdef WARNING
-    *logofs << "Loop: WARNING! Respawning the NX client "
-            << "on display '" << displayHost << "'.\n"
-            << logofs_flush;
-    #endif
-
-    NXTransClient(displayHost);
-  }
-
-  for (int i = 0; i < control -> KillDaemonOnShutdownNumber; i++)
-  {
-    #ifdef WARNING
-    *logofs << "Loop: WARNING! Killing the NX daemon with "
-            << "pid '" << control -> KillDaemonOnShutdown[i]
-            << "'.\n" << logofs_flush;
-    #endif
-
-    KillProcess(control -> KillDaemonOnShutdown[i], "daemon", SIGTERM, 0);
-  }    
-}
-
-void CleanupGlobal()
-{
-  if (proxy != NULL)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Freeing up proxy in process "
-            << "with pid '" << getpid() << "'.\n"
-            << logofs_flush;
-    #endif
-
-    delete proxy;
-
-    proxy = NULL;
-  }
-
-  if (agent != NULL)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Freeing up agent in process "
-            << "with pid '" << getpid() << "'.\n"
-            << logofs_flush;
-    #endif
-
-    delete agent;
-
-    agent = NULL;
-  }
-
-  if (auth != NULL)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Freeing up auth data in process "
-            << "with pid '" << getpid() << "'.\n"
-            << logofs_flush;
-    #endif
-
-    delete auth;
-
-    auth = NULL;
-  }
-
-  if (statistics != NULL)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Freeing up statistics in process "
-            << "with pid '" << getpid() << "'.\n"
-            << logofs_flush;
-    #endif
-
-    delete statistics;
-
-    statistics = NULL;
-  }
-
-  if (control != NULL)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Freeing up control in process "
-            << "with pid '" << getpid() << "'.\n"
-            << logofs_flush;
-    #endif
-
-    delete control;
-
-    control = NULL;
-  }
-}
-
-void CleanupConnections()
-{
-  if (proxy -> getChannels(channel_x11) != 0)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Closing any remaining X connections.\n"
-            << logofs_flush;
-    #endif
-
-    proxy -> handleCloseAllXConnections();
-
-    #ifdef TEST
-    *logofs << "Loop: Closing any remaining listener.\n"
-            << logofs_flush;
-    #endif
-
-    proxy -> handleCloseAllListeners();
-  }
-
-  proxy -> handleFinish();
-}
-
-void CleanupListeners()
-{
-  if (useTcpSocket == 1)
-  {
-    if (tcpFD != -1)
-    {
-      #ifdef TEST
-      *logofs << "Loop: Closing TCP listener in process "
-              << "with pid '" << getpid() << "'.\n"
-              << logofs_flush;
-      #endif
-
-      close(tcpFD);
-
-      tcpFD = -1;
-    }
-
-    useTcpSocket = 0;
-  }
-
-  if (useUnixSocket == 1)
-  {
-    if (unixFD != -1)
-    {
-      #ifdef TEST
-      *logofs << "Loop: Closing UNIX listener in process "
-              << "with pid '" << getpid() << "'.\n"
-              << logofs_flush;
-      #endif
-
-      close(unixFD);
-
-      unixFD = -1;
-    }
-
-    if (*unixSocketName != '\0')
-    {
-      #ifdef TEST
-      *logofs << "Loop: Going to remove the Unix domain socket '"
-              << unixSocketName << "' in process " << "with pid '"
-              << getpid() << "'.\n" << logofs_flush;
-      #endif
-
-      unlink(unixSocketName);
-    }
-
-    useUnixSocket = 0;
-  }
-
-  if (useAgentSocket == 1)
-  {
-    //
-    // There is no listener for the
-    // agent descriptor.
-    //
-
-    useAgentSocket = 0;
-  }
-
-  if (useCupsSocket == 1)
-  {
-    if (cupsFD != -1)
-    {
-      #ifdef TEST
-      *logofs << "Loop: Closing CUPS listener in process "
-              << "with pid '" << getpid() << "'.\n"
-              << logofs_flush;
-      #endif
-
-      close(cupsFD);
-
-      cupsFD = -1;
-    }
-
-    useCupsSocket = 0;
-  }
-
-  if (useAuxSocket == 1)
-  {
-    if (auxFD != -1)
-    {
-      #ifdef TEST
-      *logofs << "Loop: Closing auxiliary X11 listener "
-              << "in process " << "with pid '" << getpid()
-              << "'.\n" << logofs_flush;
-      #endif
-
-      close(auxFD);
-
-      auxFD = -1;
-    }
-
-    useAuxSocket = 0;
-  }
-
-  if (useSmbSocket == 1)
-  {
-    if (smbFD != -1)
-    {
-      #ifdef TEST
-      *logofs << "Loop: Closing SMB listener in process "
-              << "with pid '" << getpid() << "'.\n"
-              << logofs_flush;
-      #endif
-
-      close(smbFD);
-
-      smbFD = -1;
-    }
-
-    useSmbSocket = 0;
-  }
-
-  if (useMediaSocket == 1)
-  {
-    if (mediaFD != -1)
-    {
-      #ifdef TEST
-      *logofs << "Loop: Closing multimedia listener in process "
-              << "with pid '" << getpid() << "'.\n"
-              << logofs_flush;
-      #endif
-
-      close(mediaFD);
-
-      mediaFD = -1;
-    }
-
-    useMediaSocket = 0;
-  }
-
-  if (useHttpSocket == 1)
-  {
-    if (httpFD != -1)
-    {
-      #ifdef TEST
-      *logofs << "Loop: Closing http listener in process "
-              << "with pid '" << getpid() << "'.\n"
-              << logofs_flush;
-      #endif
-
-      close(httpFD);
-
-      httpFD = -1;
-    }
-
-    useHttpSocket = 0;
-  }
-
-  if (useFontSocket == 1)
-  {
-    if (fontFD != -1)
-    {
-      #ifdef TEST
-      *logofs << "Loop: Closing font server listener in process "
-              << "with pid '" << getpid() << "'.\n"
-              << logofs_flush;
-      #endif
-
-      close(fontFD);
-
-      fontFD = -1;
-    }
-
-    useFontSocket = 0;
-  }
-
-  if (useSlaveSocket == 1)
-  {
-    if (slaveFD != -1)
-    {
-      #ifdef TEST
-      *logofs << "Loop: Closing slave listener in process "
-              << "with pid '" << getpid() << "'.\n"
-              << logofs_flush;
-      #endif
-
-      close(slaveFD);
-
-      slaveFD = -1;
-    }
-
-    useSlaveSocket = 0;
-  }
-}
-
-void CleanupSockets()
-{
-  if (proxyFD != -1)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Closing proxy FD in process "
-            << "with pid '" << getpid() << "'.\n"
-            << logofs_flush;
-    #endif
-
-    close(proxyFD);
-
-    proxyFD = -1;
-  }
-
-  if (agentFD[1] != -1)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Closing agent FD in process "
-            << "with pid '" << getpid() << "'.\n"
-            << logofs_flush;
-    #endif
-
-    close(agentFD[1]);
-
-    agentFD[0] = -1;
-    agentFD[1] = -1;
-  }
-}
-
-void CleanupLocal()
-{
-  *homeDir    = '\0';
-  *rootDir    = '\0';
-  *tempDir    = '\0';
-  *systemDir  = '\0';
-  *sessionDir = '\0';
-
-  *linkSpeedName    = '\0';
-  *cacheSizeName    = '\0';
-  *shsegSizeName    = '\0';
-  *imagesSizeName   = '\0';
-  *bitrateLimitName = '\0';
-  *packMethodName   = '\0';
-  *productName      = '\0';
-
-  packMethod  = -1;
-  packQuality = -1;
-
-  *sessionType = '\0';
-  *sessionId   = '\0';
-
-  parsedOptions = 0;
-  parsedCommand = 0;
-
-  *remoteData = '\0';
-  remotePosition = 0;
-
-  tcpFD   = -1;
-  unixFD  = -1;
-  cupsFD  = -1;
-  auxFD   = -1;
-  smbFD   = -1;
-  mediaFD = -1;
-  httpFD  = -1;
-  fontFD  = -1;
-  slaveFD = -1;
-  proxyFD = -1;
-
-  agentFD[0] = -1;
-  agentFD[1] = -1;
-
-  useUnixSocket  = 1;
-  useTcpSocket   = 1;
-  useCupsSocket  = 0;
-  useAuxSocket   = 0;
-  useSmbSocket   = 0;
-  useMediaSocket = 0;
-  useHttpSocket  = 0;
-  useFontSocket  = 0;
-  useSlaveSocket = 0;
-  useAgentSocket = 0;
-
-  useNoDelay = -1;
-  usePolicy  = -1;
-  useRender  = -1;
-  useTaint   = -1;
-
-  *unixSocketName = '\0';
-
-  *acceptHost  = '\0';
-  *displayHost = '\0';
-  *authCookie  = '\0';
-
-  proxyPort = DEFAULT_NX_PROXY_PORT;
-  xPort     = DEFAULT_NX_X_PORT;
-
-  xServerAddrFamily = -1;
-  xServerAddrLength = 0;
-
-  delete xServerAddr;
-
-  xServerAddr = NULL;
-
-  listenSocket.disable();
-  connectSocket.disable();
-
-  cupsPort.disable();
-  auxPort.disable();
-  smbPort.disable();
-  mediaPort.disable();
-  httpPort.disable();
-  slavePort.disable();
-
-  *fontPort = '\0';
-
-  *bindHost = '\0';
-  bindPort = -1;
-
-  initTs  = nullTimestamp();
-  startTs = nullTimestamp();
-  logsTs  = nullTimestamp();
-  nowTs   = nullTimestamp();
-
-  diffTs = 0;
-
-  lastProxy    = 0;
-  lastDialog   = 0;
-  lastWatchdog = 0;
-  lastKeeper   = 0;
-  lastStatus   = 0;
-  lastKill     = 0;
-  lastDestroy  = 0;
-
-  lastReadableTs = nullTimestamp();
-
-  lastAlert.code  = 0;
-  lastAlert.local = 0;
-
-  lastMasks.blocked   = 0;
-  lastMasks.installed = 0;
-
-  memset(&lastMasks.saved, 0, sizeof(sigset_t));
-
-  for (int i = 0; i < 32; i++)
-  {
-    lastMasks.enabled[i] = 0;
-    lastMasks.forward[i] = 0;
-
-    memset(&lastMasks.action[i], 0, sizeof(struct sigaction));
-  }
-
-  lastSignal = 0;
-
-  memset(&lastTimer.action, 0, sizeof(struct sigaction));
-  memset(&lastTimer.value,  0, sizeof(struct itimerval));
-
-  lastTimer.start = nullTimestamp();
-  lastTimer.next  = nullTimestamp();
-}
-
-int CheckAbort()
-{
-  if (lastSignal != 0)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Aborting the procedure due to signal '"
-            << lastSignal << "', '" << DumpSignal(lastSignal)
-            << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Info" << ": Aborting the procedure due to signal '"
-         << lastSignal << "'.\n";
-
-    lastSignal = 0;
-
-    return 1;
-  }
-
-  return 0;
-}
-
-void HandleAbort()
-{
-  if (logofs == NULL)
-  {
-    logofs = &cerr;
-  }
-
-  *logofs << flush;
-
-  handleTerminatingInLoop();
-
-  if (lastSignal == SIGHUP)
-  {
-    lastSignal = 0;
-  }
-
-  //
-  // The current default is to just quit the program.
-  // Code has not been updated to deal with the new
-  // NX transport loop.
-  //
-
-  if (control -> EnableCoreDumpOnAbort == 1)
-  {
-    if (agent != NULL)
-    {
-      cerr << "Session" << ": Terminating session at '"
-           << strTimestamp() << "'.\n";
-    }
-
-    cerr << "Error" << ": Generating a core file to help "
-         << "the investigations.\n";
-
-    cerr << "Session" << ": Session terminated at '"
-         << strTimestamp() << "'.\n";
-
-    cerr << flush;
-
-    signal(SIGABRT, SIG_DFL);
-
-    raise(SIGABRT);
-  }
-
-  #ifdef TEST
-  *logofs << "Loop: Showing the proxy abort dialog.\n"
-          << logofs_flush;
-  #endif
-
-  if (control -> ProxyMode == proxy_server)
-  {
-    //
-    // Close the socket before showing the alert.
-    // It seems that the closure of the socket can
-    // sometimes take several seconds, even after
-    // the connection is broken.
-    //
-
-    CleanupSockets();
-
-    if (lastKill == 0)
-    {
-      HandleAlert(ABORT_PROXY_CONNECTION_ALERT, 1);
-    }
-    else
-    {
-      HandleAlert(ABORT_PROXY_SHUTDOWN_ALERT, 1);
-    }
-
-    handleAlertInLoop();
-  }
-
-  HandleCleanup();
-}
-
-void HandleAlert(int code, int local)
-{
-  if (lastAlert.code == 0)
-  {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Requesting an alert dialog with code "
-            << code << " and local " << local << ".\n"
-            << logofs_flush;
-    #endif
-
-    lastAlert.code  = code;
-    lastAlert.local = local;
-  }
-  #if defined(TEST) || defined(INFO)
-  else
-  {
-    *logofs << "Loop: WARNING! Alert dialog already requested "
-            << "with code " << lastAlert.code << ".\n"
-            << logofs_flush;
-  }
-  #endif
-
-  return;
-}
-
-void FlushCallback(int length)
-{
-  if (flushCallback != NULL)
-  {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Reporting a flush request at "
-            << strMsTimestamp() << " with " << length
-            << " bytes written.\n" << logofs_flush;
-    #endif
-
-    (*flushCallback)(flushParameter, length);
-  }
-  #if defined(TEST) || defined(INFO)
-  else if (control -> ProxyMode == proxy_client)
-  {
-    *logofs << "Loop: WARNING! Can't find a flush "
-            << "callback in process with pid '" << getpid()
-            << "'.\n" << logofs_flush;
-  }
-  #endif
-}
-
-void KeeperCallback()
-{
-  if (IsRunning(lastKeeper) == 0)
-  {
-    //
-    // Let the house-keeping process take care
-    // of the persistent image cache.
-    //
-
-    if (control -> ImageCacheEnableLoad == 1 ||
-            control -> ImageCacheEnableSave == 1)
-    {
-      #ifdef TEST
-      *logofs << "Loop: Starting the house-keeping process with "
-              << "image storage size " << control -> ImageCacheDiskLimit
-              << ".\n" << logofs_flush;
-      #endif
-
-      lastKeeper = NXTransKeeper(0, control -> ImageCacheDiskLimit,
-                                     control -> RootPath);
-
-      if (IsFailed(lastKeeper))
-      {
-        #ifdef WARNING
-        *logofs << "Loop: WARNING! Can't start the NX keeper process.\n"
-                << logofs_flush;
-        #endif
-
-        SetNotRunning(lastKeeper);
-      }
-      #ifdef TEST
-      else
-      {
-        *logofs << "Loop: Keeper started with pid '"
-                << lastKeeper << "'.\n" << logofs_flush;
-      }
-      #endif
-    }
-    #ifdef TEST
-    else
-    {
-      *logofs << "Loop: Nothing to do for the keeper process "
-              << "with image cache not enabled.\n"
-              << logofs_flush;
-    }
-    #endif
-  }
-  #ifdef TEST
-  else
-  {
-    *logofs << "Loop: Nothing to do with the keeper process "
-            << "already running.\n" << logofs_flush;
-  }
-  #endif
-}
-
-void InstallSignals()
-{
-  #ifdef TEST
-  *logofs << "Loop: Installing signals in process with pid '"
-          << getpid() << "'.\n" << logofs_flush;
-  #endif
-
-  for (int i = 0; i < 32; i++)
-  {
-    if (CheckSignal(i) == 1 &&
-          lastMasks.enabled[i] == 0)
-    {
-      InstallSignal(i, NX_SIGNAL_ENABLE);
-    }
-  }
-
-  lastMasks.installed = 1;
-}
-
-void RestoreSignals()
-{
-  #ifdef TEST
-  *logofs << "Loop: Restoring signals in process with pid '"
-          << getpid() << "'.\n" << logofs_flush;
-  #endif
-
-  if (lastMasks.installed == 1)
-  {
-    //
-    // Need to keep monitoring the children.
-    //
-
-    for (int i = 0; i < 32; i++)
-    {
-      if (lastMasks.enabled[i] == 1)
-      {
-        RestoreSignal(i);
-      }
-    }
-  }
-
-  lastMasks.installed = 0;
-
-  if (lastMasks.blocked == 1)
-  {
-    EnableSignals();
-  }
-}
-
-void DisableSignals()
-{
-  if (lastMasks.blocked == 0)
-  {
-    sigset_t newMask;
-
-    sigemptyset(&newMask);
-
-    //
-    // Block also the other signals that may be
-    // installed by the agent, that are those
-    // signals for which the function returns 2.
-    //
-
-    for (int i = 0; i < 32; i++)
-    {
-      if (CheckSignal(i) > 0)
-      {
-        #ifdef DUMP
-        *logofs << "Loop: Disabling signal " << i << " '"
-                << DumpSignal(i) << "' in process with pid '"
-                << getpid() << "'.\n" << logofs_flush;
-        #endif
-
-        sigaddset(&newMask, i);
-      }
-    }
-
-    sigprocmask(SIG_BLOCK, &newMask, &lastMasks.saved);
-
-    lastMasks.blocked++;
-  }
-  #ifdef TEST
-  else
-  {
-    *logofs << "Loop: WARNING! Signals were already blocked in "
-            << "process with pid '" << getpid() << "'.\n"
-            << logofs_flush;
-  }
-  #endif
-}
-
-void EnableSignals()
-{
-  if (lastMasks.blocked == 1)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Enabling signals in process with pid '"
-            << getpid() << "'.\n" << logofs_flush;
-    #endif
-
-    sigprocmask(SIG_SETMASK, &lastMasks.saved, NULL);
-
-    lastMasks.blocked = 0;
-  }
-  else
-  {
-    #ifdef WARNING
-    *logofs << "Loop: WARNING! Signals were not blocked in "
-            << "process with pid '" << getpid() << "'.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Warning" << ": Signals were not blocked in "
-         << "process with pid '" << getpid() << "'.\n";
-  }
-}
-
-void InstallSignal(int signal, int action)
-{
-  if (lastMasks.enabled[signal] == 1)
-  {
-    if (action == NX_SIGNAL_FORWARD)
-    {
-      #ifdef TEST
-      *logofs << "Loop: Forwarding handler for signal " << signal
-              << " '" << DumpSignal(signal) << "' in process "
-              << "with pid '" << getpid() << "'.\n"
-              << logofs_flush;
-      #endif
-
-      lastMasks.forward[signal] = 1;
-
-      return;
-    }
-    #ifdef TEST
-    else
-    {
-      *logofs << "Loop: Reinstalling handler for signal " << signal
-              << " '" << DumpSignal(signal) << "' in process "
-              << "with pid '" << getpid() << "'.\n"
-              << logofs_flush;
-    }
-    #endif
-  }
-  #ifdef TEST
-  else
-  {
-    *logofs << "Loop: Installing handler for signal " << signal
-            << " '" << DumpSignal(signal) << "' in process "
-            << "with pid '" << getpid() << "'.\n"
-            << logofs_flush;
-  }
-  #endif
-
-  if (signal == SIGALRM && isTimestamp(lastTimer.start))
-  {
-    ResetTimer();
-  }
-
-  struct sigaction newAction;
-
-  memset(&newAction, 0, sizeof(newAction));
-
-  newAction.sa_handler = HandleSignal;
-
-  sigemptyset(&(newAction.sa_mask));
-
-  if (signal == SIGCHLD)
-  {
-    newAction.sa_flags = SA_NOCLDSTOP;
-  }
-  else
-  {
-    newAction.sa_flags = 0;
-  }
-
-  sigaction(signal, &newAction, &lastMasks.action[signal]);
-
-  lastMasks.enabled[signal] = 1;
-
-  if (action == NX_SIGNAL_FORWARD)
-  {
-    lastMasks.forward[signal] = 1;
-  }
-}
-
-void RestoreSignal(int signal)
-{
-  if (lastMasks.enabled[signal] == 0)
-  {
-    #ifdef WARNING
-    *logofs << "Loop: WARNING! Signal '" << DumpSignal(signal)
-            << " not installed in process with pid '"
-            << getpid() << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Warning" << ": Signal '" << DumpSignal(signal)
-         << " not installed in process with pid '"
-         << getpid() << "'.\n";
-
-    return;
-  }
-
-  #ifdef TEST
-  *logofs << "Loop: Restoring handler for signal " << signal
-          << " '" << DumpSignal(signal) << "' in process "
-          << "with pid '" << getpid() << "'.\n"
-          << logofs_flush;
-  #endif
-
-  if (signal == SIGALRM && isTimestamp(lastTimer.start))
-  {
-    ResetTimer();
-  }
-
-  sigaction(signal, &lastMasks.action[signal], NULL);
-
-  lastMasks.enabled[signal] = 0;
-  lastMasks.forward[signal] = 0;
-}
-
-void HandleSignal(int signal)
-{
-  if (logofs == NULL)
-  {
-    logofs = &cerr;
-  }
-
-  #if defined(UNSAFE) && (defined(TEST) || defined(INFO))
-
-  if (lastSignal != 0)
-  {
-    *logofs << "Loop: WARNING! Last signal is '" << lastSignal
-            << "', '" << DumpSignal(signal) << "' and not zero "
-            << "in process with pid '" << getpid() << "'.\n"
-            << logofs_flush;
-  }
-
-  *logofs << "Loop: Signal '" << signal << "', '"
-          << DumpSignal(signal) << "' received in process "
-          << "with pid '" << getpid() << "'.\n" << logofs_flush;
-
-  #endif
-
-  if (getpid() != lastProxy && handler != NULL)
-  {
-    #if defined(UNSAFE) && (defined(TEST) || defined(INFO))
-    *logofs << "Loop: Calling slave handler in process "
-            << "with pid '" << getpid() << "'.\n"
-            << logofs_flush;
-    #endif
-
-    if ((*handler)(signal) == 0)
-    {
-      return;
-    }
-  }
-
-  switch (signal)
-  {
-    case SIGUSR1:
-    {
-      if (proxy != NULL && lastSignal == 0)
-      {
-        lastSignal = SIGUSR1;
-      }
-
-      break;
-    }
-    case SIGUSR2:
-    {
-      if (proxy != NULL && lastSignal == 0)
-      {
-        lastSignal = SIGUSR2;
-      }
-
-      break;
-    }
-    case SIGPIPE:
-    {
-      //
-      // It can happen that SIGPIPE is delivered
-      // to the proxy even in the case some other
-      // descriptor is unexpectedly closed.
-      //
-      // if (agentFD[1] != -1)
-      // {
-      //   cerr << "Info" << ": Received signal 'SIGPIPE'. "
-      //        << "Closing agent conection.\n";
-      //
-      //   shutdown(agentFD[1], SHUT_RDWR);
-      // }
-      //
-
-      break;
-    }
-    case SIGALRM:
-    {
-      //
-      // Nothing to do. Just wake up the
-      // process on blocking operations.
-      //
-
-      break;
-    }
-    case SIGCHLD:
-    {
-      //
-      // Check if any of our children has exited.
-      //
-
-      if (HandleChildren() != 0)
-      {
-        signal = 0;
-      }
-
-      //
-      // Don't save this signal or it will override
-      // any previous signal sent by child before
-      // exiting.
-      //
-
-      break;
-    }
-
-    #ifdef __CYGWIN32__
-
-    case 12:
-    {
-      //
-      // Nothing to do. This signal is what is delivered
-      // by the Cygwin library when trying use a shared
-      // memory function if the daemon is not running.
-      //
-
-      #ifdef TEST
-      *logofs << "Loop: WARNING! Received signal '12' in "
-              << "process with pid '" << getpid() << "'.\n"
-              << logofs_flush;
-
-      *logofs << "Loop: WARNING! Please check that the "
-              << "cygserver daemon is running.\n"
-              << logofs_flush;
-      #endif
-
-      break;
-    }
-
-    #endif
-
-    default:
-    {
-      //
-      // Register the signal so we can handle it
-      // inside the main loop. We will probably
-      // dispose any resource and exit.
-      //
-
-      if (getpid() == lastProxy)
-      {
-        #if defined(UNSAFE) && defined(TEST)
-        *logofs << "Loop: Registering end of session request "
-                << "due to signal '" << signal << "', '"
-                << DumpSignal(signal) << "'.\n"
-                << logofs_flush;
-        #endif
-
-        lastSignal = signal;
-      }
-      else
-      {
-        //
-        // This is a child, so exit immediately.
-        //
-
-        HandleCleanup();
-      }
-    }
-  }
-
-  if (signal != 0 && lastMasks.forward[signal] == 1)
-  {
-    if (lastMasks.action[signal].sa_handler != NULL &&
-            lastMasks.action[signal].sa_handler != HandleSignal)
-    {
-      #if defined(UNSAFE) && defined(TEST)
-      *logofs << "Loop: Forwarding signal '" << signal << "', '"
-              << DumpSignal(signal) << "' to previous handler.\n"
-              << logofs_flush;
-      #endif
-
-      lastMasks.action[signal].sa_handler(signal);
-    }
-    #ifdef WARNING
-    else if (lastMasks.action[signal].sa_handler == NULL)
-    {
-      *logofs << "Loop: WARNING! Parent requested to forward "
-              << "signal '" << signal << "', '" << DumpSignal(signal)
-              << "' but didn't set a handler.\n" << logofs_flush;
-    }
-    #endif
-  }
-}
-
-int HandleChildren()
-{
-  //
-  // Try to waitpid() for each child because the
-  // call might have return ECHILD and so we may
-  // have lost any of the processes.
-  //
-
-  if (IsRunning(lastDialog) && HandleChild(lastDialog) == 1)
-  {
-    #if defined(UNSAFE) && defined(TEST)
-    *logofs << "Loop: Resetting pid of last dialog process "
-            << "in handler.\n" << logofs_flush;
-    #endif
-
-    SetNotRunning(lastDialog);
-
-    if (proxy != NULL)
-    {
-      proxy -> handleResetAlert();
-    }
-
-    return 1;
-  }
-
-  if (IsRunning(lastWatchdog) && HandleChild(lastWatchdog) == 1)
-  {
-    #if defined(UNSAFE) && defined(TEST)
-    *logofs << "Loop: Watchdog is gone. Setting the last "
-            << "signal to SIGHUP.\n" << logofs_flush;
-    #endif
-
-    lastSignal = SIGHUP;
-
-    #if defined(UNSAFE) && defined(TEST)
-    *logofs << "Loop: Resetting pid of last watchdog process "
-            << "in handler.\n" << logofs_flush;
-    #endif
-
-    SetNotRunning(lastWatchdog);
-
-    return 1;
-  }
-
-  //
-  // The house-keeping process exits after a
-  // number of iterations to keep the memory
-  // pollution low. It is restarted on demand
-  // by the lower layers, using the callback
-  // function.
-  //
-
-  if (IsRunning(lastKeeper) && HandleChild(lastKeeper) == 1)
-  {
-    #if defined(UNSAFE) && defined(TEST)
-    *logofs << "Loop: Resetting pid of last house-keeping "
-            << "process in handler.\n" << logofs_flush;
-    #endif
-
-    SetNotRunning(lastKeeper);
-
-    return 1;
-  }
-
-  //
-  // The pid will be checked by the code
-  // that registered the child.
-  //
-
-  if (IsRunning(lastChild))
-  {
-    #if defined(UNSAFE) && defined(TEST)
-    *logofs << "Loop: Resetting pid of last child process "
-            << "in handler.\n" << logofs_flush;
-    #endif
-
-    SetNotRunning(lastChild);
-
-    return 1;
-  }
-
-  proxy->checkSlaves();
-
-  //
-  // This can actually happen either because we
-  // reset the pid of the child process as soon
-  // as we kill it, or because of a child process
-  // of our parent.
-  //
-
-  #if defined(UNSAFE) && (defined(TEST) || defined(INFO))
-  *logofs << "Loop: Ignoring signal received for the "
-          << "unregistered child.\n" << logofs_flush;
-  #endif
-
-  return 0;
-}
-
-int HandleChild(int child)
-{
-  int pid;
-
-  int status  = 0;
-  int options = WNOHANG | WUNTRACED;
-
-  while ((pid = waitpid(child, &status, options)) &&
-             pid == -1 && EGET() == EINTR);
-
-  return CheckChild(pid, status);
-}
-
-int WaitChild(int child, const char* label, int force)
-{
-  int pid;
-
-  int status  = 0;
-  int options = WUNTRACED;
-
-  for (;;)
-  {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Waiting for the " << label
-            << " process '" << child << "' to die.\n"
-            << logofs_flush;
-    #endif
-
-    pid = waitpid(child, &status, options);
-
-    if (pid == -1 && EGET() == EINTR)
-    {
-      if (force == 0)
-      {
-        return 0;
-      }
-
-      #ifdef WARNING
-      *logofs << "Loop: WARNING! Ignoring signal while "
-              << "waiting for the " << label << " process '"
-              << child << "' to die.\n"
-              << logofs_flush;
-      #endif
-
-      continue;
-    }
-
-    break;
-  }
-
-  return (EGET() == ECHILD ? 1 : CheckChild(pid, status));
-}
-
-int CheckChild(int pid, int status)
-{
-  lastStatus = 0;
-
-  if (pid > 0)
-  {
-    if (WIFSTOPPED(status))
-    {
-      #if defined(UNSAFE) && defined(TEST)
-      *logofs << "Loop: Child process '" << pid << "' was stopped "
-              << "with signal " << (WSTOPSIG(status)) << ".\n"
-              << logofs_flush;
-      #endif
-
-      return 0;
-    }
-    else
-    {
-      if (WIFEXITED(status))
-      {
-        #if defined(UNSAFE) && defined(TEST)
-        *logofs << "Loop: Child process '" << pid << "' exited "
-                << "with status '" << (WEXITSTATUS(status))
-                << "'.\n" << logofs_flush;
-        #endif
-
-        lastStatus = WEXITSTATUS(status);
-      }
-      else if (WIFSIGNALED(status))
-      {
-        if (CheckSignal(WTERMSIG(status)) != 1)
-        {
-          #ifdef WARNING
-          *logofs << "Loop: WARNING! Child process '" << pid
-                  << "' died because of signal " << (WTERMSIG(status))
-                  << ", '" << DumpSignal(WTERMSIG(status)) << "'.\n"
-                  << logofs_flush;
-          #endif
-
-          cerr << "Warning" << ": Child process '" << pid
-               << "' died because of signal " << (WTERMSIG(status))
-               << ", '" << DumpSignal(WTERMSIG(status)) << "'.\n";
-        }
-        #if defined(UNSAFE) && defined(TEST)
-        else
-        {
-          *logofs << "Loop: Child process '" << pid
-                  << "' died because of signal " << (WTERMSIG(status))
-                  << ", '" << DumpSignal(WTERMSIG(status)) << "'.\n"
-                  << logofs_flush;
-        }
-        #endif
-
-        lastStatus = 1;
-      }
-
-      return 1;
-    }
-  }
-  else if (pid < 0)
-  {
-    if (EGET() != ECHILD)
-    {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Call to waitpid failed. "
-              << "Error is " << EGET() << " '" << ESTR()
-              << "'.\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Call to waitpid failed. "
-           << "Error is " << EGET() << " '" << ESTR()
-           << "'.\n";
-
-      HandleCleanup();
-    }
-
-    //
-    // This can happen when the waitpid() is
-    // blocking, as the SIGCHLD is received
-    // within the call.
-    //
-
-    #ifdef TEST
-    *logofs << "Loop: No more children processes running.\n"
-            << logofs_flush;
-    #endif
-
-    return 1;
-  }
-
-  return 0;
-}
-
-void RegisterChild(int child)
-{
-  #if defined(TEST) || defined(INFO)
-
-  if (IsNotRunning(lastChild))
-  {
-    *logofs << "Loop: Registering child process '" << child
-            << "' in process with pid '" << getpid()
-            << "'.\n" << logofs_flush;
-  }
-  else
-  {
-    *logofs << "Loop: WARNING! Overriding registered child '"
-            << lastChild << "' with new child '" << child
-            << "' in process with pid '" << getpid()
-            << "'.\n" << logofs_flush;
-  }
-
-  #endif
-
-  lastChild = child;
-}
-
-int CheckParent(const char *name, const char *type, int parent)
-{
-  if (parent != getppid() || parent == 1)
-  {
-    #ifdef WARNING
-    *logofs << name << ": WARNING! Parent process appears "
-            << "to be dead. Exiting " << type << ".\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Warning" << ": Parent process appears "
-         << "to be dead. Exiting " << type << ".\n";
-
-    return 0;
-  }
-
-  return 1;
-}
-
-void HandleTimer(int signal)
-{
-  if (signal == SIGALRM)
-  {
-    if (isTimestamp(lastTimer.start))
-    {
-      #if defined(UNSAFE) && defined(TEST)
-      *logofs << "Loop: Timer expired at " << strMsTimestamp()
-              << " in process with pid '" << getpid() << "'.\n"
-              << logofs_flush;
-      #endif
-
-      if (proxy != NULL)
-      {
-        proxy -> handleTimer();
-      }
-
-      ResetTimer();
-    }
-    else
-    {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Inconsistent timer state "
-              << " in process with pid '" << getpid() << "'.\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Inconsistent timer state "
-           << " in process with pid '" << getpid() << "'.\n";
-    }
-  }
-  else
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Inconsistent signal '"
-            << signal << "', '" << DumpSignal(signal)
-            << "' received in process with pid '"
-            << getpid() << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Inconsistent signal '"
-         << signal << "', '" << DumpSignal(signal)
-         << "' received in process with pid '"
-         << getpid() << "'.\n";
-  }
-}
-
-void SetTimer(int value)
-{
-  getNewTimestamp();
-
-  if (isTimestamp(lastTimer.start))
-  {
-    int diffTs = diffTimestamp(lastTimer.start, getTimestamp());
-
-    if (diffTs > lastTimer.next.tv_usec / 1000 * 2)
-    {
-      #ifdef WARNING
-      *logofs << "Loop: WARNING! Timer missed to expire at "
-              << strMsTimestamp() << " in process with pid '"
-              << getpid() << "'.\n" << logofs_flush;
-      #endif
-
-      cerr << "Warning" << ": Timer missed to expire at "
-           << strMsTimestamp() << " in process with pid '"
-           << getpid() << "'.\n";
-
-      HandleTimer(SIGALRM);
-    }
-    else
-    {
-      #ifdef TEST
-      *logofs << "Loop: Timer already running at "
-              << strMsTimestamp() << " in process with pid '"
-              << getpid() << "'.\n" << logofs_flush;
-      #endif
-
-      return;
-    }
-  }
-
-  //
-  // Save the former handler.
-  //
-
-  struct sigaction action;
-
-  memset(&action, 0, sizeof(action));
-
-  action.sa_handler = HandleTimer;
-
-  sigemptyset(&action.sa_mask);
-
-  action.sa_flags = 0;
-
-  sigaction(SIGALRM, &action, &lastTimer.action);
-
-  //
-  // Start the timer.
-  //
-
-  lastTimer.next = getTimestamp(value);
-
-  struct itimerval timer;
-
-  timer.it_interval = lastTimer.next;
-  timer.it_value    = lastTimer.next;
-
-  #ifdef TEST
-  *logofs << "Loop: Timer set to " << lastTimer.next.tv_sec
-          << " S and " << lastTimer.next.tv_usec / 1000
-          << " Ms at " << strMsTimestamp() << " in process "
-          << "with pid '" << getpid() << "'.\n"
-          << logofs_flush;
-  #endif
-
-  if (setitimer(ITIMER_REAL, &timer, &lastTimer.value) < 0)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Call to setitimer failed. "
-            << "Error is " << EGET() << " '" << ESTR()
-            << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Call to setitimer failed. "
-         << "Error is " << EGET() << " '" << ESTR()
-         << "'.\n";
-
-    lastTimer.next = nullTimestamp();
-
-    return;
-  }
-
-  lastTimer.start = getTimestamp();
-}
-
-void ResetTimer()
-{
-  if (isTimestamp(lastTimer.start) == 0)
-  {
-    #if defined(UNSAFE) && defined(TEST)
-    *logofs << "Loop: Timer not running in process "
-            << "with pid '" << getpid() << "'.\n"
-            << logofs_flush;
-    #endif
-
-    return;
-  }
-
-  #if defined(UNSAFE) && defined(TEST)
-  *logofs << "Loop: Timer reset at " << strMsTimestamp()
-          << " in process with pid '" << getpid()
-          << "'.\n" << logofs_flush;
-  #endif
-
-  //
-  // Restore the old signal mask and timer.
-  //
-
-  if (setitimer(ITIMER_REAL, &lastTimer.value, NULL) < 0)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Call to setitimer failed. "
-            << "Error is " << EGET() << " '" << ESTR()
-            << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Call to setitimer failed. "
-         << "Error is " << EGET() << " '" << ESTR()
-         << "'.\n";
-  }
-
-  if (sigaction(SIGALRM, &lastTimer.action, NULL) < 0)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Call to sigaction failed. "
-            << "Error is " << EGET() << " '" << ESTR()
-            << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Call to sigaction failed. "
-         << "Error is " << EGET() << " '" << ESTR()
-         << "'.\n";
-  }
-
-  lastTimer.start = lastTimer.next = nullTimestamp();
-}
-
-//
-// Open TCP or UNIX file socket to listen for remote proxy
-// and block until remote connects. If successful close
-// the listening socket and return FD on which the other
-// party is connected.
-//
-
-int WaitForRemote(ChannelEndPoint &socketAddress)
-{
-  char hostLabel[DEFAULT_STRING_LENGTH] = { 0 };
-  char *socketUri = NULL;
-
-  int retryAccept  = -1;
-
-  int proxyFD = -1;
-  int newFD   = -1;
-
-  int acceptIPAddr = 0;
-
-  if (socketAddress.isTCPSocket())
-  {
-
-    //
-    // Get IP address of host to be awaited.
-    //
-
-    if (*acceptHost != '\0')
-    {
-      acceptIPAddr = GetHostAddress(acceptHost);
-
-      if (acceptIPAddr == 0)
-      {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Cannot accept connections from unknown host '"
-                << acceptHost << "'.\n" << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Cannot accept connections from unknown host '"
-             << acceptHost << "'.\n";
-
-        goto WaitForRemoteError;
-      }
-      snprintf(hostLabel, sizeof(hostLabel), "'%s'", acceptHost);
-    }
-    else
-    {
-      strcpy(hostLabel, "any host");
-    }
-
-    long bindPort;
-    if (socketAddress.getTCPHostAndPort(NULL, &bindPort))
-    {
-      socketAddress.setSpec(loopbackBind ? "localhost" : "*", bindPort);
-    }
-    else
-    {
-      // This should never happen
-      cerr << "Error" << ": Unable to change bind host\n";
-    }
-  }
-  else if (socketAddress.isUnixSocket())
-    strcpy(hostLabel, "this host");
-  else
-    strcpy(hostLabel, "unknown origin (something went wrong!!!)");
-
-
-  proxyFD = ListenConnection(socketAddress, "NX");
-
-  socketAddress.getSpec(&socketUri);
-  #ifdef TEST
-  *logofs << "Loop: Waiting for connection from "
-          << hostLabel  << " on socket '" << socketUri
-          << "'.\n" << logofs_flush;
-  #endif
-  cerr << "Info" << ": Waiting for connection from "
-       << hostLabel << " on socket '" << socketUri
-       << "'.\n";
-  free(socketUri);
-
-  //
-  // How many times to loop waiting for connections
-  // from the selected host? Each loop wait for at
-  // most 20 seconds so a default value of 3 gives
-  // a timeout of 1 minute.
-  //
-  // TODO: Handling of timeouts and retry attempts
-  // must be rewritten.
-  //
-
-  retryAccept = control -> OptionProxyRetryAccept;
-
-  for (;;)
-  {
-    fd_set readSet;
-
-    FD_ZERO(&readSet);
-    FD_SET(proxyFD, &readSet);
-
-    T_timestamp selectTs;
-
-    selectTs.tv_sec  = 20;
-    selectTs.tv_usec = 0;
-
-    int result = select(proxyFD + 1, &readSet, NULL, NULL, &selectTs);
-
-    getNewTimestamp();
-
-    if (result == -1)
-    {
-      if (EGET() == EINTR)
-      {
-        if (CheckAbort() != 0)
-        {
-          goto WaitForRemoteError;
-        }
-
-        continue;
-      }
- 
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Call to select failed. Error is "
-              << EGET() << " '" << ESTR() << "'.\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Call to select failed. Error is "
-           << EGET() << " '" << ESTR() << "'.\n";
-
-      goto WaitForRemoteError;
-    }
-    else if (result > 0 && FD_ISSET(proxyFD, &readSet))
-    {
-
-      sockaddr_in newAddrINET;
-
-      if (socketAddress.isUnixSocket())
-      {
-        socklen_t addrLen = sizeof(sockaddr_un);
-        newFD = accept(proxyFD, NULL, &addrLen);
-      }
-      else if (socketAddress.isTCPSocket())
-      {
-        socklen_t addrLen = sizeof(sockaddr_in);
-        newFD = accept(proxyFD, (sockaddr *) &newAddrINET, &addrLen);
-      }
-      if (newFD == -1)
-      {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Call to accept failed. Error is "
-                << EGET() << " '" << ESTR() << "'.\n"
-                << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Call to accept failed. Error is "
-             << EGET() << " '" << ESTR() << "'.\n";
-
-        goto WaitForRemoteError;
-      }
-
-      if (socketAddress.isUnixSocket())
-      {
-
-        char * unixPath = NULL;
-        socketAddress.getUnixPath(&unixPath);
-        #ifdef TEST
-        *logofs << "Loop: Accepted connection from this host on Unix file socket '"
-                << unixPath << "'.\n"
-                << logofs_flush;
-        #endif
-
-        cerr << "Info" << ": Accepted connection from this host on Unix file socket '"
-             << unixPath << "'.\n";
-        free(unixPath);
-
-        break;
-      }
-      else if (socketAddress.isTCPSocket())
-      {
-
-        char *connectedHost = inet_ntoa(newAddrINET.sin_addr);
-
-        if (*acceptHost == '\0' || (int) newAddrINET.sin_addr.s_addr == acceptIPAddr)
-        {
-
-          #ifdef TEST
-
-          unsigned int connectedPort = ntohs(newAddrINET.sin_port);
-
-          *logofs << "Loop: Accepted connection from '" << connectedHost
-                  << "' with port '" << connectedPort << "'.\n"
-                  << logofs_flush;
-          #endif
-
-          cerr << "Info" << ": Accepted connection from '"
-               << connectedHost << "'.\n";
-
-          break;
-        }
-        else
-        {
-          #ifdef PANIC
-          *logofs << "Loop: WARNING! Refusing connection from '" << connectedHost
-                  << "' on port '" << socketAddress.getTCPPort() << "'.\n" << logofs_flush;
-          #endif
-
-          cerr << "Warning" << ": Refusing connection from '"
-               << connectedHost << "'.\n";
-	}
-
-        //
-        // Not the best way to elude a DOS attack...
-        //
-
-        sleep(5);
-
-        close(newFD);
-
-      }
-
-    }
-
-    if (--retryAccept == 0)
-    {
-      if (socketAddress.isUnixSocket())
-      {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Connection via Unix file socket from this host "
-                << "could not be established.\n"
-                << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Connection via Unix file socket from this host "
-             << "could not be established.\n";
-      }
-      else if (*acceptHost == '\0')
-      {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Connection with remote host "
-                << "could not be established.\n"
-                << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Connection with remote host "
-             << "could not be established.\n";
-      }
-      else
-      {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Connection with remote host '"
-                << acceptHost << "' could not be established.\n"
-                << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Connection with remote host '"
-             << acceptHost << "' could not be established.\n";
-      }
-
-      goto WaitForRemoteError;
-    }
-    else
-    {
-      handleCheckSessionInConnect();
-    }
-  }
-
-  close(proxyFD);
-
-  return newFD;
-
-WaitForRemoteError:
-
-  close(proxyFD);
-
-  HandleCleanup();
-}
-
-int PrepareProxyConnectionTCP(char** hostName, long int* portNum, int* timeout, int* proxyFD, int* reason)
-{
-
-  if (!proxyFD)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Implementation error (PrepareProxyConnectionTCP). "
-            << "'proxyFD' must not be a NULL pointer.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ":  Implementation error (PrepareProxyConnectionTCP). "
-            << "'proxyFD' must not be a NULL pointer.\n";
-
-    return -1;
-  }
-
-  if (!reason)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Implementation error (PrepareProxyConnectionTCP). "
-            << "'reason' must not be a NULL pointer.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ":  Implementation error (PrepareProxyConnectionTCP). "
-            << "'reason' must not be a NULL pointer.\n";
-
-    return -1;
-  }
-
-  int remoteIPAddr = GetHostAddress(*hostName);
-  if (remoteIPAddr == 0)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Unknown remote host '"
-            << *hostName << "'.\n" << logofs_flush;
-    #endif
-        cerr << "Error" << ": Unknown remote host '"
-         << *hostName << "'.\n";
-
-    HandleCleanup();
-  }
-
-  #ifdef TEST
-  *logofs << "Loop: Connecting to remote host '" 
-          << *hostName << ":" << *portNum << "'.\n"
-          << logofs_flush;
-  #endif
-
-  cerr << "Info" << ": Connecting to remote host '"
-       << *hostName << ":" << *portNum << "'.\n"
-       << logofs_flush;
-
-  *proxyFD = -1;
-  *reason = -1;
-
-  sockaddr_in addr;
-  addr.sin_family = AF_INET;
-  addr.sin_port = htons(*portNum);
-  addr.sin_addr.s_addr = remoteIPAddr;
-
-  *proxyFD = socket(AF_INET, SOCK_STREAM, PF_UNSPEC);
-  *reason = EGET();
-
-  if (*proxyFD == -1)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Call to socket failed. "
-            << "Error is " << *reason << " '" << ESTR()
-            << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Call to socket failed. "
-         << "Error is " << *reason << " '" << ESTR()
-         << "'.\n";
-    return -1;
-
-  }
-  else if (SetReuseAddress(*proxyFD) < 0)
-  {
-    return -1;
-  }
-
-  //
-  // Ensure operation is timed out
-  // if there is a network problem.
-  //
-
-  if (timeout)
-    SetTimer(*timeout);
-  else
-    SetTimer(20000);
-
-  int result = connect(*proxyFD, (sockaddr *) &addr, sizeof(sockaddr_in));
-
-  *reason = EGET();
-
-  ResetTimer();
-
-  return result;
-
-}
-
-int PrepareProxyConnectionUnix(char** path, int* timeout, int* proxyFD, int* reason)
-{
-
-  if (!proxyFD)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Implementation error (PrepareProxyConnectionUnix). "
-            << "proxyFD must not be a NULL pointer.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ":  Implementation error (PrepareProxyConnectionUnix). "
-            << "proxyFD must not be a NULL pointer.\n";
-
-    return -1;
-  }
-
-  if (!reason)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Implementation error (PrepareProxyConnectionUnix). "
-            << "'reason' must not be a NULL pointer.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ":  Implementation error (PrepareProxyConnectionUnix). "
-            << "'reason' must not be a NULL pointer.\n";
-
-    return -1;
-  }
-
-  /* FIXME: Add socket file existence and permission checks */
-
-  *proxyFD = -1;
-  *reason = -1;
-
-  sockaddr_un addr;
-  addr.sun_family = AF_UNIX;
-  strncpy(addr.sun_path, *path, 108 - 1);
-
-  *proxyFD = socket(AF_UNIX, SOCK_STREAM, PF_UNSPEC);
-  *reason = EGET();
-
-  if (*proxyFD == -1)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Call to socket failed. "
-            << "Error is " << *reason << " '" << ESTR()
-            << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Call to socket failed. "
-         << "Error is " << *reason << " '" << ESTR()
-         << "'.\n";
-
-    return -1;
-  }
-
-  //
-  // Ensure operation is timed out
-  // if there is a network problem.
-  //
-
-  if (timeout)
-    SetTimer(*timeout);
-  else
-    SetTimer(20000);
-
-  int result = connect(*proxyFD, (sockaddr *) &addr, sizeof(sockaddr_un));
-
-  *reason = EGET();
-
-  ResetTimer();
-
-  return result;
-}
-
-//
-// Connect to remote proxy. If successful
-// return FD of connection, else return -1.
-//
-
-int ConnectToRemote(ChannelEndPoint &socketAddress)
-{
-
-  //
-  // How many times we retry to connect to remote
-  // host / Unix domain socket in case of failure?
-  //
-
-  int retryConnect = control -> OptionProxyRetryConnect;
-
-  //
-  // Show an alert after 20 seconds and use the
-  // same timeout to interrupt the connect. The
-  // retry timeout is incremental, starting from
-  // 100 miliseconds up to 1 second.
-  //
-
-  int alertTimeout   = 20000;
-  int connectTimeout = 20000;
-  int retryTimeout   = 100;
-
-  T_timestamp lastRetry = getNewTimestamp();
-
-  int result = -1;
-  int reason = -1;
-  int proxyFD = -1;
-
-  char *hostName = NULL;
-  long int portNum = -1;
-  char *unixPath = NULL;
-
-  for (;;)
-  {
-
-    #ifdef DEBUG
-    *logofs << "Loop: Timer set to " << connectTimeout / 1000
-            << " S " << "with retry set to " << retryConnect
-            << " in process with pid '" << getpid()
-            << "'.\n" << logofs_flush;
-    #endif
-
-    if (socketAddress.getUnixPath(&unixPath))
-      result = PrepareProxyConnectionUnix(&unixPath, &connectTimeout, &proxyFD, &reason);
-    else if (socketAddress.getTCPHostAndPort(&hostName, &portNum))
-      result = PrepareProxyConnectionTCP(&hostName, &portNum, &connectTimeout, &proxyFD, &reason);
-
-    if (result < 0)
-    {
-      close(proxyFD);
-
-      if (CheckAbort() != 0)
-      {
-        goto ConnectToRemoteError;
-      }
-      else if (--retryConnect == 0)
-      {
-        ESET(reason);
-
-        if (socketAddress.isUnixSocket())
-        {
-          #ifdef PANIC
-          *logofs << "Loop: PANIC! Connection to Unix file socket '"
-                  << unixPath << "' failed. Error is "
-                  << EGET() << " '" << ESTR() << "'.\n"
-                  << logofs_flush;
-          #endif
-
-          cerr << "Error" << ": Connection to Unix file socket '"
-                  << unixPath << "' failed. Error is "
-                  << EGET() << " '" << ESTR() << "'.\n";
-        }
-        else
-        {
-
-          #ifdef PANIC
-          *logofs << "Loop: PANIC! Connection to '" << hostName
-                  << ":" << portNum << "' failed. Error is "
-                  << EGET() << " '" << ESTR() << "'.\n"
-                  << logofs_flush;
-          #endif
-
-          cerr << "Error" << ": Connection to '" << hostName
-               << ":" << portNum << "' failed. Error is "
-               << EGET() << " '" << ESTR() << "'.\n";
-        }
-        goto ConnectToRemoteError;
-      }
-      else
-      {
-        #ifdef TEST
-        *logofs << "Loop: Sleeping " << retryTimeout
-                << " ms before retrying.\n"
-                << logofs_flush;
-        #endif
-
-        usleep(retryTimeout * 1000);
-
-        retryTimeout <<= 1;
-
-        if (retryTimeout > 1000 * 1000)
-        {
-          retryTimeout = 1000 * 1000;
-        }
-      }
-
-      //
-      // Check if it is time to show an alert dialog.
-      //
-
-      if (diffTimestamp(lastRetry, getNewTimestamp()) >=
-              (alertTimeout - control -> LatencyTimeout))
-      {
-        if (IsNotRunning(lastDialog))
-        {
-          handleCheckSessionInConnect();
-
-          //
-          // Wait for the dialog process to die
-          // unless a signal is received.
-          //
-
-          while (IsRunning(lastDialog))
-          {
-            WaitChild(lastDialog, "dialog", 0);
-
-            if (CheckAbort() != 0)
-            {
-              //
-              // The client ignores the TERM signal
-              // on Windows.
-              //
-
-              #ifdef __CYGWIN32__
-
-              KillProcess(lastDialog, "dialog", SIGKILL, 1);
-
-              #else
-
-              KillProcess(lastDialog, "dialog", SIGTERM, 1);
-
-              #endif
-
-              goto ConnectToRemoteError;
-            }
-          }
-
-          lastRetry = getTimestamp();
-        }
-      }
-      #ifdef TEST
-      {
-        *logofs << "Loop: Not showing the dialog with "
-                << (diffTimestamp(lastRetry, getTimestamp()) / 1000)
-                << " seconds elapsed.\n" << logofs_flush;
-      }
-      #endif
-
-      ESET(reason);
-
-      #ifdef TEST
-      if (unixPath && unixPath[0] != '\0' )
-      {
-        *logofs << "Loop: Connection to Unix socket file '"
-                << unixPath << "' failed with error '"
-                << ESTR() << "'. Retrying.\n"
-                << logofs_flush;
-      }
-      else
-      {
-        *logofs << "Loop: Connection to '" << hostName
-                << ":" << portNum << "' failed with error '"
-                << ESTR() << "'. Retrying.\n"
-                << logofs_flush;
-      }
-      #endif
-    }
-    else
-    {
-      //
-      // Connection was successful.
-      //
-
-      break;
-    }
-  }
-
-  return proxyFD;
-
-ConnectToRemoteError:
-
-  if (proxyFD != -1)
-  {
-    close(proxyFD);
-  }
-
-  HandleCleanup();
-}
-
-//
-// Make a string of options for the remote
-// proxy and write it to the descriptor.
-// The string includes the local version.
-//
-
-int SendProxyOptions(int fd)
-{
-  char options[DEFAULT_REMOTE_OPTIONS_LENGTH];
-
-  //
-  // Send the "compatibility" version first, then our
-  // actual version. Old proxies will take the first
-  // value and ignore the second.
-  //
-
-  sprintf(options, "NXPROXY-%s-%i.%i.%i",
-              control -> NXPROXY_COMPATIBILITY_VERSION,
-                  control -> LocalVersionMajor,
-                      control -> LocalVersionMinor,
-                          control -> LocalVersionPatch);
-
-  //
-  // If you want to send options from proxy
-  // initiating the connection use something
-  // like this:
-  //
-  // if (WE_PROVIDE_CREDENTIALS)
-  // {
-  //   sprintf(options + strlen(options), "%s=%s", option, value);
-  // }
-  //
-  // If you want to send options according to
-  // local proxy mode use something like this:
-  //
-  // if (control -> ProxyMode == proxy_client)
-  // {
-  //   sprintf(options + strlen(options), "%s=%s", option, value);
-  // }
-  //
-
-  //
-  // Send the authorization cookie if any. We assume
-  // user can choose to not provide any auth cookie
-  // and allow any connection to be accepted.
-  //
-
-  if (WE_PROVIDE_CREDENTIALS && *authCookie != '\0')
-  {
-    sprintf(options + strlen(options), " cookie=%s,", authCookie);
-  }
-  else
-  {
-    sprintf(options + strlen(options), " ");
-  }
-
-  //
-  // Now link characteristics and compression
-  // options. Delta compression, as well as
-  // preferred pack method, are imposed by
-  // client proxy.
-  //
-
-  if (control -> ProxyMode == proxy_client)
-  {
-    sprintf(options + strlen(options), "link=%s,pack=%s,cache=%s,",
-                linkSpeedName, packMethodName, cacheSizeName);
-
-    if (*bitrateLimitName != '\0')
-    {
-      sprintf(options + strlen(options), "limit=%s,",
-                  bitrateLimitName);
-    }
-
-    //
-    // Let the user disable the render extension
-    // and let the X client proxy know if it can
-    // short-circuit the X replies. Also pass
-    // along the session type to ensure that the
-    // remote proxy gets the right value.
-    //
-
-    sprintf(options + strlen(options), "render=%d,taint=%d,",
-                (control -> HideRender == 0),
-                    control -> TaintReplies);
-
-    if (*sessionType != '\0')
-    {
-      sprintf(options + strlen(options), "type=%s,", sessionType);
-    }
-    else
-    {
-      sprintf(options + strlen(options), "type=default,");
-    }
-
-    //
-    // Add the 'strict' option, if needed.
-    //
-
-    // Since ProtoStep7 (#issue 108)
-    if (useStrict != -1)
-    {
-      sprintf(options + strlen(options), "strict=%d,", useStrict);
-    }
-
-    //
-    // Tell the remote the size of the shared
-    // memory segment.
-    //
-
-    // Since ProtoStep7 (#issue 108)
-    if (*shsegSizeName != '\0')
-    {
-      sprintf(options + strlen(options), "shseg=%s,", shsegSizeName);
-    }
-
-    //
-    // Send image cache parameters.
-    //
-
-    sprintf(options + strlen(options), "images=%s,", imagesSizeName);
-
-    sprintf(options + strlen(options), "delta=%d,stream=%d,data=%d ",
-                control -> LocalDeltaCompression,
-                    control -> LocalStreamCompressionLevel,
-                        control -> LocalDataCompressionLevel);
-  }
-  else
-  {
-    //
-    // If no special compression level was selected,
-    // server side will use compression levels set
-    // by client.
-    //
-
-    if (control -> LocalStreamCompressionLevel < 0)
-    {
-      sprintf(options + strlen(options), "stream=default,");
-    }
-    else
-    {
-      sprintf(options + strlen(options), "stream=%d,",
-                  control -> LocalStreamCompressionLevel);
-    }
-
-    if (control -> LocalDataCompressionLevel < 0)
-    {
-      sprintf(options + strlen(options), "data=default ");
-    }
-    else
-    {
-      sprintf(options + strlen(options), "data=%d ",
-                  control -> LocalDataCompressionLevel);
-    }
-  }
-
-  #ifdef TEST
-  *logofs << "Loop: Sending remote options '"
-          << options << "'.\n" << logofs_flush;
-  #endif
-
-  return WriteLocalData(fd, options, strlen(options));
-}
-
-int ReadProxyVersion(int fd)
-{
-  #ifdef TEST
-  *logofs << "Loop: Going to read the remote proxy version "
-          << "from FD#" << fd << ".\n" << logofs_flush;
-  #endif
-
-  //
-  // Read until the first space in string.
-  // We expect the remote version number.
-  //
-
-  char options[DEFAULT_REMOTE_OPTIONS_LENGTH];
-
-  int result = ReadRemoteData(fd, options, sizeof(options), ' ');
-
-  if (result <= 0)
-  {
-    if (result < 0)
-    {
-      if (control -> ProxyMode == proxy_server)
-      {
-        HandleAlert(ABORT_PROXY_NEGOTIATION_ALERT, 1);
-      }
-
-      handleAlertInLoop();
-    }
-
-    return result;
-  }
-
-  #ifdef TEST
-  *logofs << "Loop: Received remote version string '"
-          << options << "' from FD#" << fd << ".\n"
-          << logofs_flush;
-  #endif
-
-  if (strncmp(options, "NXPROXY-", strlen("NXPROXY-")) != 0)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Parse error in remote options string '"
-            << options << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Parse error in remote options string '"
-         << options << "'.\n";
-
-    return -1;
-  }
-
-  //
-  // Try to determine if this is a pre-2.0.0
-  // version advertising itself as compatible
-  // with the 1.2.2.
-  //
-
-  int major = -1;
-  int minor = -1;
-  int patch = -1;
-
-  sscanf(options, "NXPROXY-%i.%i.%i-%i.%i.%i", &(control -> RemoteVersionMajor),
-             &(control -> RemoteVersionMinor), &(control -> RemoteVersionPatch),
-                 &major, &minor, &patch);
-
-  if (control -> RemoteVersionMajor == 1 &&
-          control -> RemoteVersionMinor == 2 &&
-              control -> RemoteVersionPatch == 2 &&
-                  major != -1 && minor != -1 && patch != -1)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Read trailing remote version '" << major
-            << "." << minor << "." << patch << "'.\n"
-            << logofs_flush;
-    #endif
-
-    control -> CompatVersionMajor = major;
-    control -> CompatVersionMinor = minor;
-    control -> CompatVersionPatch = patch;
-
-    control -> RemoteVersionMajor = major;
-    control -> RemoteVersionMinor = minor;
-    control -> RemoteVersionPatch = patch;
-  }
-  else
-  {
-    //
-    // We read the remote version at the first
-    // round. If the second version is missing,
-    // we will retain the values read before.
-    //
-
-    sscanf(options, "NXPROXY-%i.%i.%i-%i.%i.%i", &(control -> CompatVersionMajor),
-               &(control -> CompatVersionMinor), &(control -> CompatVersionPatch),
-                   &(control -> RemoteVersionMajor), &(control -> RemoteVersionMinor),
-                       &(control -> RemoteVersionPatch));
-  }
-
-  *logofs << "Loop: Identified remote version '" << control -> RemoteVersionMajor
-          << "." << control -> RemoteVersionMinor << "." << control -> RemoteVersionPatch
-          << "'.\n" << logofs_flush;
-
-  *logofs << "Loop: Remote compatibility version '" << control -> CompatVersionMajor
-          << "." << control -> CompatVersionMinor << "." << control -> CompatVersionPatch
-          << "'.\n" << logofs_flush;
-
-  *logofs << "Loop: Local version '" << control -> LocalVersionMajor
-          << "." << control -> LocalVersionMinor << "." << control -> LocalVersionPatch
-          << "'.\n" << logofs_flush;
-
-  if (SetVersion() < 0)
-  {
-    if (control -> ProxyMode == proxy_server)
-    {
-      HandleAlert(WRONG_PROXY_VERSION_ALERT, 1);
-    }
-
-    handleAlertInLoop();
-
-    return -1;
-  }
-
-  return 1;
-}
-
-int ReadProxyOptions(int fd)
-{
-  #ifdef TEST
-  *logofs << "Loop: Going to read the remote proxy options "
-          << "from FD#" << fd << ".\n" << logofs_flush;
-  #endif
-
-  char options[DEFAULT_REMOTE_OPTIONS_LENGTH];
-
-  int result = ReadRemoteData(fd, options, sizeof(options), ' ');
-
-  if (result <= 0)
-  {
-    return result;
-  }
-
-  #ifdef TEST
-  *logofs << "Loop: Received remote options string '"
-          << options << "' from FD#" << fd << ".\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // Get the remote options, delimited by a space character.
-  // Note that there will be a further initialization phase
-  // at the time proxies negotiate cache file to restore.
-  //
-
-  if (ParseRemoteOptions(options) < 0)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Couldn't negotiate a valid "
-            << "session with remote NX proxy.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Couldn't negotiate a valid "
-         << "session with remote NX proxy.\n";
-
-    return -1;
-  }
-
-  return 1;
-}
-
-int SendProxyCaches(int fd)
-{
-  #ifdef TEST
-  *logofs << "Loop: Synchronizing local and remote caches.\n"
-          << logofs_flush;
-  #endif
-
-  if (control -> ProxyMode == proxy_client)
-  {
-    //
-    // Prepare a list of caches matching this
-    // session type and send it to the remote.
-    //
-
-    #ifdef TEST
-    *logofs << "Loop: Going to send the list of local caches.\n"
-            << logofs_flush;
-    #endif
-
-    SetCaches();
-
-    int entries = DEFAULT_REMOTE_CACHE_ENTRIES;
-
-    const char prefix = 'C';
-
-    if (control -> LocalDeltaCompression == 0 ||
-            control -> PersistentCacheEnableLoad == 0)
-    {
-      #ifdef TEST
-      *logofs << "Loop: Writing an empty list to FD#" << fd
-              << ".\n" << logofs_flush;
-      #endif
-
-      return WriteLocalData(fd, "cachelist=none ", strlen("cachelist=none "));
-    }
-
-    int count = 0;
-
-    #ifdef TEST
-    *logofs << "Loop: Looking for cache files in directory '"
-            << control -> PersistentCachePath << "'.\n" << logofs_flush;
-    #endif
-
-    DIR *cacheDir = opendir(control -> PersistentCachePath);
-
-    if (cacheDir != NULL)
-    {
-      dirent *dirEntry;
-
-      int prologue = 0;
-
-      while (((dirEntry = readdir(cacheDir)) != NULL) && (count < entries))
-      {
-        if (*dirEntry -> d_name == prefix &&
-                strlen(dirEntry -> d_name) == (MD5_LENGTH * 2 + 2))
-        {
-          if (prologue == 0)
-          {
-            WriteLocalData(fd, "cachelist=", strlen("cachelist="));
-
-            prologue = 1;
-          }
-          else
-          {
-            WriteLocalData(fd, ",", strlen(","));
-          }
-
-          #ifdef TEST
-          *logofs << "Loop: Writing entry '" << control -> PersistentCachePath
-                  << "/" << dirEntry -> d_name << "' to FD#" << fd
-                  << ".\n" << logofs_flush;
-          #endif
-
-          //
-          // Write cache file name to the socket,
-          // including leading 'C-' or 'S-'.
-          //
-
-          WriteLocalData(fd, dirEntry -> d_name, MD5_LENGTH * 2 + 2);
-
-          count++;
-        }
-      }
-
-      closedir(cacheDir);
-    }
-
-    if (count == 0)
-    {
-      #ifdef TEST
-      *logofs << "Loop: Writing an empty list to FD#" << fd
-              << ".\n" << logofs_flush;
-      #endif
-
-      return WriteLocalData(fd, "cachelist=none ", strlen("cachelist=none "));
-    }
-    else
-    {
-      return WriteLocalData(fd, " ", 1);
-    }
-  }
-  else
-  {
-    //
-    // Send back the selected cache name.
-    //
-
-    #ifdef TEST
-    *logofs << "Loop: Going to send the selected cache.\n"
-            << logofs_flush;
-    #endif
-
-    char buffer[DEFAULT_STRING_LENGTH];
-
-    if (control -> PersistentCacheName != NULL)
-    {
-      #ifdef TEST
-      *logofs << "Loop: Name of selected cache file is '"
-              << control -> PersistentCacheName << "'.\n"
-              << logofs_flush;
-      #endif
-
-      sprintf(buffer, "cachefile=%s%s ",
-                  *(control -> PersistentCacheName) == 'C' ? "S-" : "C-",
-                      control -> PersistentCacheName + 2);
-    }
-    else
-    {
-      #ifdef TEST
-      *logofs << "Loop: No valid cache file was selected.\n"
-              << logofs_flush;
-      #endif
-
-      sprintf(buffer, "cachefile=none ");
-    }
-
-    #ifdef TEST
-    *logofs << "Loop: Sending string '" << buffer
-            << "' as selected cache file.\n"
-            << logofs_flush;
-    #endif
-
-    return WriteLocalData(fd, buffer, strlen(buffer));
-  }
-}
-
-int ReadProxyCaches(int fd)
-{
-  if (control -> ProxyMode == proxy_client)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Going to receive the selected proxy cache.\n"
-            << logofs_flush;
-    #endif
-
-    //
-    // We will read the name of cache plus the stop character.
-    //
-
-    char buffer[DEFAULT_STRING_LENGTH];
-
-    //
-    // Leave space for a trailing null.
-    //
-
-    int result = ReadRemoteData(fd, buffer, sizeof("cachefile=") + MD5_LENGTH * 2 + 3, ' ');
-
-    if (result <= 0)
-    {
-      return result;
-    }
-
-    char *cacheName = strstr(buffer, "cachefile=");
-
-    if (cacheName == NULL)
-    {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Invalid cache file option '"
-              << buffer << "' provided by remote proxy.\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Invalid cache file option '"
-           << buffer << "' provided by remote proxy.\n";
-
-      HandleCleanup();
-    }
-
-    cacheName += strlen("cachefile=");
-
-    if (control -> PersistentCacheName != NULL)
-    {
-      delete [] control -> PersistentCacheName;
-    }
-
-    control -> PersistentCacheName = NULL;
-
-    if (strncasecmp(cacheName, "none", strlen("none")) == 0)
-    {
-      #ifdef TEST
-      *logofs << "Loop: No cache file selected by remote proxy.\n"
-              << logofs_flush;
-      #endif
-    }
-    else if (strlen(cacheName) != MD5_LENGTH * 2 + 3 ||
-                 *(cacheName + MD5_LENGTH * 2 + 2) != ' ')
-    {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Invalid cache file name '"
-              << cacheName << "' provided by remote proxy.\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Invalid cache file name '"
-           << cacheName << "' provided by remote proxy.\n";
-
-      HandleCleanup();
-    }
-    else
-    {
-      //
-      // It is "C-" + 32 + "\0".
-      //
-
-      control -> PersistentCacheName = new char[MD5_LENGTH * 2 + 3];
-
-      *(cacheName + MD5_LENGTH * 2 + 2) = '\0';
-
-      strcpy(control -> PersistentCacheName, cacheName);
-
-      #ifdef TEST
-      *logofs << "Loop: Cache file '" << control -> PersistentCacheName
-              << "' selected by remote proxy.\n" << logofs_flush;
-      #endif
-    }
-  }
-  else
-  {
-    #ifdef TEST
-    *logofs << "Loop: Going to receive the list of remote caches.\n"
-            << logofs_flush;
-    #endif
-
-    SetCaches();
-
-    int size = ((MD5_LENGTH * 2 + 2) + strlen(",")) * DEFAULT_REMOTE_CACHE_ENTRIES +
-                   strlen("cachelist=") + strlen(" ") + 1;
-
-    char *buffer = new char[size];
-
-    int result = ReadRemoteData(fd, buffer, size - 1, ' ');
-
-    if (result <= 0)
-    {
-      delete [] buffer;
-
-      return result;
-    }
-
-    #ifdef TEST
-    *logofs << "Loop: Read list of caches from remote side as '"
-            << buffer << "'.\n" << logofs_flush;
-    #endif
-
-    //
-    // Prepare the buffer. What we want is a list
-    // like "cache1,cache2,cache2" terminated by
-    // null.
-    //
-
-    *(buffer + strlen(buffer) - 1) = '\0';
-
-    if (strncasecmp(buffer, "cachelist=", strlen("cachelist=")) != 0)
-    {
-      #ifdef PANIC
-      *logofs << "Loop: Wrong format for list of cache files "
-              << "read from FD#" << fd << ".\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Wrong format for list of cache files.\n";
-
-      delete [] buffer;
-
-      return -1;
-    }
-
-    control -> PersistentCacheName = GetLastCache(buffer, control -> PersistentCachePath);
-
-    //
-    // Get rid of list of caches.
-    //
-
-    delete [] buffer;
-  }
-
-  return 1;
-}
-
-int ReadForwarderVersion(int fd)
-{
-  #ifdef TEST
-  *logofs << "Loop: Going to negotiate the forwarder version.\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // Check if we actually expect the session cookie.
-  //
-
-  if (*authCookie == '\0')
-  {
-    #ifdef TEST
-    *logofs << "Loop: No authentication cookie required "
-            << "from FD#" << fd << ".\n" << logofs_flush;
-    #endif
-
-    return 1;
-  }
-
-  char options[DEFAULT_REMOTE_OPTIONS_LENGTH];
-
-  int result = ReadRemoteData(fd, options, sizeof(options), ' ');
-
-  if (result <= 0)
-  {
-    return result;
-  }
-
-  #ifdef TEST
-  *logofs << "Loop: Received forwarder version string '" << options
-          << "' from FD#" << fd << ".\n" << logofs_flush;
-  #endif
-
-  if (strncmp(options, "NXSSH-", strlen("NXSSH-")) != 0)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Parse error in forwarder options string '"
-            << options << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Parse error in forwarder options string '"
-         << options << "'.\n";
-
-    return -1;
-  }
-
-  //
-  // Accept whatever forwarder version.
-  //
-
-  sscanf(options, "NXSSH-%i.%i.%i", &(control -> RemoteVersionMajor),
-             &(control -> RemoteVersionMinor), &(control -> RemoteVersionPatch));
-
-  #ifdef TEST
-  *logofs << "Loop: Read forwarder version '" << control -> RemoteVersionMajor
-          << "." << control -> RemoteVersionMinor << "." << control -> RemoteVersionPatch
-          << "'.\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int ReadForwarderOptions(int fd)
-{
-  //
-  // Get the forwarder cookie.
-  //
-
-  if (*authCookie == '\0')
-  {
-    #ifdef TEST
-    *logofs << "Loop: No authentication cookie required "
-            << "from FD#" << fd << ".\n" << logofs_flush;
-    #endif
-
-    return 1;
-  }
-
-  char options[DEFAULT_REMOTE_OPTIONS_LENGTH];
-
-  int result = ReadRemoteData(fd, options, sizeof(options), ' ');
-
-  if (result <= 0)
-  {
-    return result;
-  }
-
-  #ifdef TEST
-  *logofs << "Loop: Received forwarder options string '"
-          << options << "' from FD#" << fd << ".\n"
-          << logofs_flush;
-  #endif
-
-  if (ParseForwarderOptions(options) < 0)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Couldn't negotiate a valid "
-            << "cookie with the NX forwarder.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Couldn't negotiate a valid "
-         << "cookie with the NX forwarder.\n";
-
-    return -1;
-  }
-
-  return 1;
-}
-
-int ReadRemoteData(int fd, char *buffer, int size, char stop)
-{
-  #ifdef TEST
-  *logofs << "Loop: Going to read remote data from FD#"
-          << fd << ".\n" << logofs_flush;
-  #endif
-
-  if (size >= MAXIMUM_REMOTE_OPTIONS_LENGTH)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Maximum remote options buffer "
-            << "limit exceeded.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Maximum remote options buffer "
-         << "limit exceeded.\n";
-
-    HandleCleanup();
-  }
-
-  while (remotePosition < (size - 1))
-  {
-    int result = read(fd, remoteData + remotePosition, 1);
-
-    getNewTimestamp();
-
-    if (result <= 0)
-    {
-      if (result == -1)
-      {
-        if (EGET() == EAGAIN)
-        {
-          #ifdef TEST
-          *logofs << "Loop: Reading data from FD#" << fd
-                  << " would block.\n" << logofs_flush;
-          #endif
-
-          return 0;
-        }
-        else if (EGET() == EINTR)
-        {
-          if (CheckAbort() != 0)
-          {
-            return -1;
-          }
-
-          continue;
-        }
-      }
-
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! The remote NX proxy closed "
-              << "the connection.\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": The remote NX proxy closed "
-           << "the connection.\n";
-
-      return -1;
-    }
-    else if (*(remoteData + remotePosition) == stop)
-    {
-      #ifdef TEST
-      *logofs << "Loop: Read stop character from FD#"
-              << fd << ".\n" << logofs_flush;
-      #endif
-
-      remotePosition++;
-
-      //
-      // Copy the fake terminating null
-      // in the buffer.
-      //
-
-      *(remoteData + remotePosition) = '\0';
-
-      memcpy(buffer, remoteData, remotePosition + 1);
-
-      #ifdef TEST
-      *logofs << "Loop: Remote string '" << remoteData
-              << "' read from FD#" << fd << ".\n"
-              << logofs_flush;
-      #endif
-
-      int t = remotePosition;
-
-      remotePosition = 0;
-
-      return t;
-    }
-    else
-    {
-      //
-      // Make sure string received
-      // from far end is printable.
-      //
-
-      if (isgraph(*(remoteData + remotePosition)) == 0)
-      {
-        #ifdef WARNING
-        *logofs << "Loop: WARNING! Non printable character decimal '"
-                << (unsigned int) *(remoteData + remotePosition)
-                << "' received in remote data from FD#"
-                << fd << ".\n" << logofs_flush;
-        #endif
-
-        cerr << "Warning" << ": Non printable character decimal '"
-                << (unsigned int) *(remoteData + remotePosition)
-                << "' received in remote data from FD#"
-                << fd << ".\n" << logofs_flush;
-
-        *(remoteData + remotePosition) = ' ';
-      }
-
-      #ifdef DEBUG
-      *logofs << "Loop: Read a further character "
-              << "from FD#" << fd << ".\n"
-              << logofs_flush;
-      #endif
-
-      remotePosition++;
-    }
-  }
-
-  *(remoteData + remotePosition) = '\0';
-
-  #ifdef PANIC
-  *logofs << "Loop: PANIC! Stop character missing "
-          << "from FD#" << fd << " after " << remotePosition 
-          << " characters read in string '" << remoteData
-          << "'.\n" << logofs_flush;
-  #endif
-
-  cerr << "Error" << ": Stop character missing "
-       << "from FD#" << fd << " after " << remotePosition 
-       << " characters read in string '" << remoteData
-       << "'.\n";
-
-  memcpy(buffer, remoteData, remotePosition);
-
-  remotePosition = 0;
-
-  return -1;
-}
-
-static int
-hexval(char c) {
-  if ((c >= '0') && (c <= '9'))
-    return c - '0';
-  if ((c >= 'a') && (c <= 'f'))
-    return c - 'a' + 10;
-  if ((c >= 'A') && (c <= 'F'))
-    return c - 'A' + 10;
-  return -1;
-}
-
-static void
-URLDecodeInPlace(char *str) {
-  if (str) {
-    char *to = str;
-    while (str[0]) {
-      if ((str[0] == '%') &&
-          (hexval(str[1]) >= 0) &&
-          (hexval(str[2]) >= 0)) {
-        *(to++) = hexval(str[1]) * 16 + hexval(str[2]);
-        str += 3;
-      }
-      else
-        *(to++) = *(str++);
-    }
-    *to = '\0';
-  }
-}
-
-int WriteLocalData(int fd, const char *buffer, int size)
-{
-  int position = 0;
-  int ret = 0;
-  fd_set writeSet;
-  struct timeval selectTs = {30, 0};
-
-  while (position < size)
-  {
-
-    // A write to a non-blocking socket may fail with EAGAIN. The problem is
-    // that cache data is done in several writes, and there's no easy way
-    // to handle failure without rewriting a significant amount of code.
-    //
-    // Bailing out of the outer loop would result in restarting the sending
-    // of the entire cache list, which would confuse the other side.
-
-    FD_ZERO(&writeSet);
-    FD_SET(fd, &writeSet);
-
-    ret = select(fd+1, NULL, &writeSet, NULL, &selectTs);
-
-    #ifdef DEBUG
-    *logofs << "Loop: WriteLocalData: select() returned with a code of " << ret << " and remaining timeout of "
-            << selectTs.tv_sec << " sec, " << selectTs.tv_usec << "usec\n" << logofs_flush;
-    #endif
-
-    if ( ret < 0 )
-    {
-      *logofs << "Loop: Error in select() when writing data to FD#" << fd << ": " << strerror(EGET()) << "\n" << logofs_flush;
-
-      if ( EGET() == EINTR )
-        continue;
-
-      return -1;
-    }
-    else if ( ret == 0 )
-    {
-      *logofs << "Loop: Timeout expired in select() when writing data to FD#" << fd << ": " << strerror(EGET()) << "\n" << logofs_flush;
-      return -1;
-    }
-
-    int result = write(fd, buffer + position, size - position);
-
-    getNewTimestamp();
-
-    if (result <= 0)
-    {
-      if (result < 0 && (EGET() == EINTR || EGET() == EAGAIN || EGET() == EWOULDBLOCK))
-      {
-        continue;
-      }
-
-      #ifdef TEST
-      *logofs << "Loop: Error writing data to FD#"
-              << fd << ".\n" << logofs_flush;
-      #endif
-
-      return -1;
-    }
-
-    position += result;
-  }
-
-  return position;
-}
-
-//
-// Parse the string passed by calling process in
-// the environment. This is not necessarily the
-// content of DISPLAY variable, but can be the
-// parameters passed when creating the process
-// or thread.
-//
-
-int ParseEnvironmentOptions(const char *env, int force)
-{
-  //
-  // Be sure log file is valid.
-  //
-
-  if (logofs == NULL)
-  {
-    logofs = &cerr;
-  }
-
-  //
-  // Be sure we have a parameters repository
-  // and a context to jump into because this
-  // can be called before creating the proxy.
-  //
-
-  if (control == NULL)
-  {
-    control = new Control();
-  }
-
-  if (setjmp(context) == 1)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Out of the long jump while parsing "
-            << "the environment options.\n"
-            << logofs_flush;
-    #endif
-    
-    return -1;
-  }
-
-  if (force == 0 && parsedOptions == 1)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Skipping a further parse of environment "
-            << "options string '" << (env != NULL ? env : "")
-            << "'.\n" << logofs_flush;
-    #endif
-
-    return 1;
-  }
-
-  if (env == NULL || *env == '\0')
-  {
-    #ifdef TEST
-    *logofs << "Loop: Nothing to do with empty environment "
-            << "options string '" << (env != NULL ? env : "")
-            << "'.\n" << logofs_flush;
-    #endif
-
-    return 0;
-  }
-
-  #ifdef TEST
-  *logofs << "Loop: Going to parse the environment options "
-          << "string '" << env << "'.\n"
-          << logofs_flush;
-  #endif
-
-  parsedOptions = 1;
-
-  //
-  // Copy the string passed as parameter
-  // because we need to modify it.
-  //
-
-  char opts[DEFAULT_DISPLAY_OPTIONS_LENGTH];
-
-  #ifdef VALGRIND
-
-  memset(opts, '\0', DEFAULT_DISPLAY_OPTIONS_LENGTH);
-
-  #endif
-
-  if (strlen(env) >= DEFAULT_DISPLAY_OPTIONS_LENGTH)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Environment options string '" << env
-            << "' exceeds length of " << DEFAULT_DISPLAY_OPTIONS_LENGTH
-            << " characters.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Environment options string '" << env
-         << "' exceeds length of " << DEFAULT_DISPLAY_OPTIONS_LENGTH
-         << " characters.\n";
-
-    return -1;
-  }
-
-  strcpy(opts, env);
-
-  char *nextOpts = opts;
-
-  //
-  // Ensure that DISPLAY environment variable
-  // (roughly) follows the X convention for
-  // transport notation.
-  //
-
-  if (strncasecmp(opts, "nx/nx,:", 7) == 0 ||
-          strncasecmp(opts, "nx,:", 4) == 0)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Parse error in options string '"
-            << opts << "' at 'nx,:'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Parse error in options string '"
-         << opts << "' at 'nx,:'.\n";
-
-    return -1;
-  }
-  else if (strncasecmp(opts, "nx/nx,", 6) == 0)
-  {
-    nextOpts += 6;
-  }
-  else if (strncasecmp(opts, "nx,", 3) == 0)
-  {
-    nextOpts += 3;
-  }
-  else if (strncasecmp(opts, "nx:", 3) == 0)
-  {
-    nextOpts += 3;
-  }
-  else if (force == 0)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Ignoring host X server display string '"
-            << opts << "'.\n" << logofs_flush;
-    #endif
-
-    return 0;
-  }
-
-  //
-  // Save here the name of the options file and
-  // parse it after all the other options.
-  //
-
-  char fileOptions[DEFAULT_STRING_LENGTH] = { 0 };
-
-  //
-  // The options string is intended to be a series
-  // of name/value tuples in the form name=value
-  // separated by the ',' character ended by a ':'
-  // followed by remote NX proxy port.
-  //
-
-  char *name;
-  char *value;
-
-  value = strrchr(nextOpts, ':');
-
-  if (value != NULL)
-  {
-    char *check = value + 1;
-
-    if (*check == '\0' || isdigit(*check) == 0)
-    {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Can't identify NX port in string '"
-              << value << "'.\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Can't identify NX port in string '"
-           << value << "'.\n";
-
-      return -1;
-    }
-
-    proxyPort = atoi(check);
-
-    //
-    // Get rid of the port specification.
-    //
-
-    *value = '\0';
-  }
-  else if (proxyPort == DEFAULT_NX_PROXY_PORT && force == 0)
-  {
-    //
-    // Complain only if user didn't specify
-    // the port on the command line.
-    //
-
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Can't identify NX port in string '"
-            << opts << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Can't identify NX port in string '"
-         << opts << "'.\n";
-
-    return -1;
-  }
-
-  #ifdef TEST
-  *logofs << "Loop: Parsing options string '"
-          << nextOpts << "'.\n" << logofs_flush;
-  #endif
-
-  //
-  // Now all the other optional parameters.
-  //
-
-  name = strtok(nextOpts, "=");
-
-  char connectHost[DEFAULT_STRING_LENGTH] = { 0 };
-  long connectPort = -1;
-
-  while (name)
-  {
-    value = strtok(NULL, ",");
-    URLDecodeInPlace(value);
-
-    if (CheckArg("environment", name, value) < 0)
-    {
-      return -1;
-    }
-
-    if (strcasecmp(name, "options") == 0)
-    {
-      strncpy(fileOptions, value, DEFAULT_STRING_LENGTH - 1);
-    }
-    else if (strcasecmp(name, "display") == 0)
-    {
-      strncpy(displayHost, value, DEFAULT_STRING_LENGTH - 1);
-    }
-    else if (strcasecmp(name, "link") == 0)
-    {
-
-      if (control -> ProxyMode == proxy_server)
-      {
-        PrintOptionIgnored("local", name, value);
-      }
-      else if (ParseLinkOption(value) < 0)
-      {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Can't identify 'link' option in string '"
-                << value << "'.\n" << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Can't identify 'link' option in string '"
-             << value << "'.\n";
-        if (ParseLinkOption("adsl") < 0)
-           return -1;
-      }
-    }
-    else if (strcasecmp(name, "limit") == 0)
-    {
-      if (control -> ProxyMode == proxy_server)
-      {
-        PrintOptionIgnored("local", name, value);
-      }
-      else if (ParseBitrateOption(value) < 0)
-      {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Can't identify option 'limit' in string '"
-                << value << "'.\n" << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Can't identify option 'limit' in string '"
-             << value << "'.\n";
-
-        return -1;
-      }
-    }
-    else if (strcasecmp(name, "type") == 0)
-    {
-      //
-      // Type of session, for example "desktop",
-      // "application", "windows", etc.
-      //
-
-      if (control -> ProxyMode == proxy_server)
-      {
-        PrintOptionIgnored("local", name, value);
-      }
-      else
-      {
-        if (strcasecmp(value, "default") == 0)
-        {
-          *sessionType = '\0';
-        }
-        else
-        {
-          strncpy(sessionType, value, DEFAULT_STRING_LENGTH - 1);
-        }
-      }
-    }
-    else if (strcasecmp(name, "listen") == 0)
-    {
-      char *socketUri = NULL;
-      if (connectSocket.getSpec(&socketUri))
-      {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Can't handle 'listen' and 'connect' parameters "
-                << "at the same time.\n" << logofs_flush;
-
-        *logofs << "Loop: PANIC! Refusing 'listen' parameter with 'connect' being '"
-                << socketUri << "'.\n" << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Can't handle 'listen' and 'connect' parameters "
-             << "at the same time.\n";
-
-        cerr << "Error" << ": Refusing 'listen' parameter with 'connect' being '"
-             << socketUri << "'.\n";
-
-        free(socketUri);
-        return -1;
-      }
-
-      SetAndValidateChannelEndPointArg("local", name, value, listenSocket);
-
-    }
-    else if (strcasecmp(name, "loopback") == 0)
-    {
-      loopbackBind = ValidateArg("local", name, value);
-    }
-    else if (strcasecmp(name, "accept") == 0)
-    {
-      char *socketUri = NULL;
-      if (connectSocket.getSpec(&socketUri))
-      {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Can't handle 'accept' and 'connect' parameters "
-                << "at the same time.\n" << logofs_flush;
-
-        *logofs << "Loop: PANIC! Refusing 'accept' parameter with 'connect' being '"
-                << socketUri << "'.\n" << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Can't handle 'accept' and 'connect' parameters "
-             << "at the same time.\n";
-
-        cerr << "Error" << ": Refusing 'accept' parameter with 'connect' being '"
-             << socketUri << "'.\n";
-
-	free(socketUri);
-        return -1;
-      }
-
-      strncpy(acceptHost, value, DEFAULT_STRING_LENGTH - 1);
-    }
-    else if (strcasecmp(name, "connect") == 0)
-    {
-      if (*acceptHost != '\0')
-      {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Can't handle 'connect' and 'accept' parameters "
-                << "at the same time.\n" << logofs_flush;
-
-        *logofs << "Loop: PANIC! Refusing 'connect' parameter with 'accept' being '"
-                << acceptHost << "'.\n" << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Can't handle 'connect' and 'accept' parameters "
-             << "at the same time.\n";
-
-        cerr << "Error" << ": Refusing 'connect' parameter with 'accept' being '"
-             << acceptHost << "'.\n";
-
-        return -1;
-      }
-      if ((strncmp(value, "tcp:", 4) == 0) || (strncmp(value, "unix:", 5) == 0))
-        SetAndValidateChannelEndPointArg("local", name, value, connectSocket);
-      else
-        // if the "connect" parameter does not start with "unix:" or "tcp:" assume
-        // old parameter usage style (providing hostname string only).
-        strcpy(connectHost, value);
-    }
-    else if (strcasecmp(name, "port") == 0)
-    {
-      connectPort = ValidateArg("local", name, value);
-    }
-    else if (strcasecmp(name, "retry") == 0)
-    {
-      control -> OptionProxyRetryConnect  = ValidateArg("local", name, value);
-      control -> OptionServerRetryConnect = ValidateArg("local", name, value);
-    }
-    else if (strcasecmp(name, "session") == 0)
-    {
-      strncpy(sessionFileName, value, DEFAULT_STRING_LENGTH - 1);
-    }
-    else if (strcasecmp(name, "errors") == 0)
-    {
-      //
-      // The old name of the parameter was 'log'
-      // but the default name for the file is
-      // 'errors' so it is more logical to use
-      // the same name.
-      //
-
-      strncpy(errorsFileName, value, DEFAULT_STRING_LENGTH - 1);
-    }
-    else if (strcasecmp(name, "root") == 0)
-    {
-      strncpy(rootDir, value, DEFAULT_STRING_LENGTH - 1);
-    }
-    else if (strcasecmp(name, "id") == 0)
-    {
-      strncpy(sessionId, value, DEFAULT_STRING_LENGTH - 1);
-    }
-    else if (strcasecmp(name, "stats") == 0)
-    {
-      control -> EnableStatistics = 1;
-
-      strncpy(statsFileName, value, DEFAULT_STRING_LENGTH - 1);
-    }
-    else if (strcasecmp(name, "cookie") == 0)
-    {
-      LowercaseArg("local", name, value);
-
-      strncpy(authCookie, value, DEFAULT_STRING_LENGTH - 1);
-    }
-    else if (strcasecmp(name, "nodelay") == 0)
-    {
-      useNoDelay = ValidateArg("local", name, value);
-    }
-    else if (strcasecmp(name, "policy") == 0)
-    {
-      if (control -> ProxyMode == proxy_server)
-      {
-        PrintOptionIgnored("local", name, value);
-      }
-      else
-      {
-        usePolicy = ValidateArg("local", name, value);
-      }
-    }
-    else if (strcasecmp(name, "render") == 0)
-    {
-      if (control -> ProxyMode == proxy_server)
-      {
-        PrintOptionIgnored("local", name, value);
-      }
-      else
-      {
-        useRender = ValidateArg("local", name, value);
-      }
-    }
-    else if (strcasecmp(name, "taint") == 0)
-    {
-      if (control -> ProxyMode == proxy_server)
-      {
-        PrintOptionIgnored("local", name, value);
-      }
-      else
-      {
-        useTaint = ValidateArg("local", name, value);
-      }
-    }
-    else if (strcasecmp(name, "delta") == 0)
-    {
-      if (control -> ProxyMode == proxy_server)
-      {
-        PrintOptionIgnored("local", name, value);
-      }
-      else
-      {
-        control -> LocalDeltaCompression = ValidateArg("local", name, value);
-      }
-    }
-    else if (strcasecmp(name, "data") == 0)
-    {
-      control -> LocalDataCompressionLevel = ValidateArg("local", name, value);
-
-      if (control -> LocalDataCompressionLevel == 0)
-      {
-        control -> LocalDataCompression = 0;
-      }
-      else
-      {
-        control -> LocalDataCompression = 1;
-      }
-    }
-    else if (strcasecmp(name, "stream") == 0)
-    {
-      control -> LocalStreamCompressionLevel = ValidateArg("local", name, value);
-
-      if (control -> LocalStreamCompressionLevel == 0)
-      {
-        control -> LocalStreamCompression = 0;
-      }
-      else
-      {
-        control -> LocalStreamCompression = 1;
-      }
-    }
-    else if (strcasecmp(name, "memory") == 0)
-    {
-      control -> LocalMemoryLevel = ValidateArg("local", name, value);
-    }
-    else if (strcasecmp(name, "cache") == 0)
-    {
-      if (control -> ProxyMode == proxy_server)
-      {
-        PrintOptionIgnored("local", name, value);
-      }
-      else if (ParseCacheOption(value) < 0)
-      {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Can't identify cache size for string '"
-                << value << "'.\n" << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Can't identify cache size for string '"
-             << value << "'.\n";
-
-        return -1;
-      }
-    }
-    else if (strcasecmp(name, "images") == 0)
-    {
-      if (control -> ProxyMode == proxy_server)
-      {
-        PrintOptionIgnored("local", name, value);
-      }
-      else if (ParseImagesOption(value) < 0)
-      {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Can't identify images cache size for string '"
-                << value << "'.\n" << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Can't identify images cache size for string '"
-             << value << "'.\n";
-
-        return -1;
-      }
-    }
-    else if (strcasecmp(name, "shseg") == 0)
-    {
-      //
-      // The 'shmem' option is used by the agent, together
-      // with 'shpix' literal. We make the 'shseg' option
-      // specific to the proxy and use it to determine the
-      // size of the shared memory segment, or otherwise 0,
-      // if the use of the shared memory extension should
-      // not be enabled on the real X server.
-      //
- 
-      if (control -> ProxyMode == proxy_server)
-      {
-        PrintOptionIgnored("local", name, value);
-      }
-      else if (ParseShmemOption(value) < 0)
-      {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Can't identify size of shared memory "
-                << "segment in string '" << value << "'.\n"
-                << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Can't identify size of shared memory "
-             << "segment in string '" << value << "'.\n";
-
-        return -1;
-      }
-    }
-    else if (strcasecmp(name, "load") == 0)
-    {
-      if (control -> ProxyMode == proxy_server)
-      {
-        PrintOptionIgnored("local", name, value);
-      }
-      else
-      {
-        control -> PersistentCacheEnableLoad = ValidateArg("local", name, value);
-
-        if (control -> PersistentCacheEnableLoad > 0)
-        {
-          control -> PersistentCacheEnableLoad = 1;
-        }
-        else
-        {
-          if (control -> PersistentCacheName != NULL)
-          {
-            delete [] control -> PersistentCacheName;
-          }
-
-          control -> PersistentCacheName = NULL;
-
-          control -> PersistentCacheEnableLoad = 0;
-        }
-      }
-    }
-    else if (strcasecmp(name, "save") == 0)
-    {
-      if (control -> ProxyMode == proxy_server)
-      {
-        PrintOptionIgnored("local", name, value);
-      }
-      else
-      {
-        control -> PersistentCacheEnableSave = ValidateArg("local", name, value);
-
-        if (control -> PersistentCacheEnableSave > 0)
-        {
-          control -> PersistentCacheEnableSave = 1;
-        }
-        else
-        {
-          if (control -> PersistentCacheName != NULL)
-          {
-            delete [] control -> PersistentCacheName;
-          }
-
-          control -> PersistentCacheName = NULL;
-
-          control -> PersistentCacheEnableSave = 0;
-        }
-      }
-    }
-    else if (strcasecmp(name, "cups") == 0)
-    {
-      SetAndValidateChannelEndPointArg("local", name, value, cupsPort);
-    }
-    else if (strcasecmp(name, "sync") == 0)
-    {
-      #ifdef WARNING
-      *logofs << "Loop: WARNING! No 'sync' channel in current version. "
-              << "Assuming 'cups' channel.\n" << logofs_flush;
-      #endif
-
-      cerr << "Warning" << ": No 'sync' channel in current version. "
-           << "Assuming 'cups' channel.\n";
-
-      SetAndValidateChannelEndPointArg("local", name, value, cupsPort);
-    }
-    else if (strcasecmp(name, "keybd") == 0 ||
-                 strcasecmp(name, "aux") == 0)
-    {
-      SetAndValidateChannelEndPointArg("local", name, value, auxPort);
-    }
-    else if (strcasecmp(name, "samba") == 0 ||
-                 strcasecmp(name, "smb") == 0)
-    {
-      SetAndValidateChannelEndPointArg("local", name, value, smbPort);
-    }
-    else if (strcasecmp(name, "media") == 0)
-    {
-      SetAndValidateChannelEndPointArg("local", name, value, mediaPort);
-    }
-    else if (strcasecmp(name, "http") == 0)
-    {
-      SetAndValidateChannelEndPointArg("local", name, value, httpPort);
-    }
-    else if (strcasecmp(name, "font") == 0)
-    {
-      strncpy(fontPort, value, DEFAULT_STRING_LENGTH - 1);
-    }
-    else if (strcasecmp(name, "slave") == 0)
-    {
-      SetAndValidateChannelEndPointArg("local", name, value, slavePort);
-    }
-    else if (strcasecmp(name, "mask") == 0)
-    {
-      control -> ChannelMask = ValidateArg("local", name, value);
-    }
-    else if (strcasecmp(name, "timeout") == 0)
-    {
-      int timeout = ValidateArg("local", name, value);
-
-      if (timeout == 0)
-      {
-        #ifdef TEST
-        *logofs << "Loop: Disabling timeout on broken "
-                << "proxy connection.\n" << logofs_flush;
-        #endif
-
-        control -> ProxyTimeout = 0;
-      }
-      else
-      {
-        control -> ProxyTimeout = timeout * 1000;
-      }
-    }
-    else if (strcasecmp(name, "cleanup") == 0)
-    {
-      int cleanup = ValidateArg("local", name, value);
-
-      if (cleanup == 0)
-      {
-        #ifdef TEST
-        *logofs << "Loop: Disabling grace timeout on "
-                << "proxy shutdown.\n" << logofs_flush;
-        #endif
-
-        control -> CleanupTimeout = 0;
-      }
-      else
-      {
-        control -> CleanupTimeout = cleanup * 1000;
-      }
-    }
-    else if (strcasecmp(name, "pack") == 0)
-    {
-      if (control -> ProxyMode == proxy_server)
-      {
-        PrintOptionIgnored("local", name, value);
-      }
-      else if (ParsePackOption(value) < 0)
-      {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Can't identify pack method for string '"
-                << value << "'.\n" << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Can't identify pack method for string '"
-             << value << "'.\n";
-        if (ParsePackOption("nopack")<0)
-           return -1;
-      }
-    }
-    else if (strcasecmp(name, "core") == 0)
-    {
-      control -> EnableCoreDumpOnAbort = ValidateArg("local", name, value);
-    }
-    else if (strcasecmp(name, "kill") == 0)
-    {
-      if (control -> KillDaemonOnShutdownNumber <
-              control -> KillDaemonOnShutdownLimit)
-      {
-        #ifdef TEST
-        *logofs << "Loop: WARNING! Adding process with pid '"
-                << ValidateArg("local", name, value) << " to the "
-                << "daemons to kill at shutdown.\n"
-                << logofs_flush;
-        #endif
-
-        control -> KillDaemonOnShutdown[control ->
-                       KillDaemonOnShutdownNumber] =
-                           ValidateArg("local", name, value);
-
-        control -> KillDaemonOnShutdownNumber++;
-      }
-      else
-      {
-        #ifdef WARNING
-        *logofs << "Loop: WARNING! Number of daemons to kill "
-                << "at shutdown exceeded.\n" << logofs_flush;
-        #endif
-
-        cerr << "Warning" << ": Number of daemons to kill "
-             << "at shutdown exceeded.\n";
-      }
-    }
-    else if (strcasecmp(name, "strict") == 0)
-    {
-      if (control -> ProxyMode == proxy_server)
-      {
-        PrintOptionIgnored("local", name, value);
-      }
-      else
-      {
-        useStrict = ValidateArg("local", name, value);
-      }
-    }
-    else if (strcasecmp(name, "encryption") == 0)
-    {
-      useEncryption = ValidateArg("local", name, value);
-    }
-    else if (strcasecmp(name, "product") == 0)
-    {
-      strncpy(productName, value, DEFAULT_STRING_LENGTH - 1);
-    }
-    else if (strcasecmp(name, "rootless") == 0 ||
-                 strcasecmp(name, "geometry") == 0 ||
-                     strcasecmp(name, "resize") == 0 ||
-                         strcasecmp(name, "fullscreen") == 0 ||
-                             strcasecmp(name, "keyboard") == 0 ||
-                                 strcasecmp(name, "clipboard") == 0 ||
-                                     strcasecmp(name, "streaming") == 0 ||
-                                         strcasecmp(name, "backingstore") == 0 ||
-                                             strcasecmp(name, "sleep") == 0 ||
-                                                 strcasecmp(name, "tolerancechecks") == 0)
-    {
-      #ifdef DEBUG
-      *logofs << "Loop: Ignoring agent option '" << name
-              << "' with value '" << value << "'.\n"
-              << logofs_flush;
-      #endif
-    }
-    else if (strcasecmp(name, "composite") == 0 ||
-                 strcasecmp(name, "shmem") == 0 ||
-                     strcasecmp(name, "shpix") == 0 ||
-                         strcasecmp(name, "kbtype") == 0 ||
-                             strcasecmp(name, "client") == 0 ||
-                                 strcasecmp(name, "shadow") == 0 ||
-                                     strcasecmp(name, "shadowuid") == 0 ||
-                                         strcasecmp(name, "shadowmode") == 0 ||
-                                             strcasecmp(name, "clients") == 0 ||
-                                                 strcasecmp(name, "xinerama") == 0)
-    {
-      #ifdef DEBUG
-      *logofs << "Loop: Ignoring agent option '" << name
-              << "' with value '" << value << "'.\n"
-              << logofs_flush;
-      #endif
-    }
-    else if (strcasecmp(name, "defer") == 0 ||
-                 strcasecmp(name, "tile") == 0 ||
-                     strcasecmp(name, "menu") == 0 ||
-                        strcasecmp(name, "state") == 0 )
-    {
-      #ifdef DEBUG
-      *logofs << "Loop: Ignoring agent option '" << name
-              << "' with value '" << value << "'.\n"
-              << logofs_flush;
-      #endif
-    }
-    else
-    {
-      #ifdef WARNING
-      *logofs << "Loop: WARNING! Ignoring unknown option '"
-              << name << "' with value '" << value << "'.\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Warning" << ": Ignoring unknown option '"
-           << name << "' with value '" << value << "'.\n";
-    }
-
-    name = strtok(NULL, "=");
-
-  } // End of while (name) ...
-
-  // Assemble the connectSocket channel end point if parameter values have been old-school...
-  if (connectSocket.disabled() && (connectHost[0] != '\0') && (proxyPort > 0 || connectPort > 0))
-  {
-    if (connectPort < 0)
-      connectPort = proxyPort + DEFAULT_NX_PROXY_PORT_OFFSET;
-
-    char tcpHostAndPort[DEFAULT_STRING_LENGTH] = { 0 };
-    sprintf(tcpHostAndPort, "tcp:%s:%ld", connectHost, connectPort);
-    SetAndValidateChannelEndPointArg("local", name, tcpHostAndPort, connectSocket);
-  }
-
-  #ifdef TEST
-  *logofs << "Loop: Completed parsing of string '"
-          << env << "'.\n" << logofs_flush;
-  #endif
-
-  if ((*fileOptions != '\0') && (strncmp(fileOptions, "/dev/", 5) != 0) && (strncmp(fileOptions, "/proc/", 6) != 0) && (strncmp(fileOptions, "/sys/", 5) != 0))
-  {
-    if (strcmp(fileOptions, optionsFileName) != 0)
-    {
-      #ifdef TEST
-      *logofs << "Loop: Reading options from '" << fileOptions
-              << "'.\n" << logofs_flush;
-      #endif
-
-      if (ParseFileOptions(fileOptions) < 0)
-      {
-        return -1;
-      }
-    }
-    #ifdef WARNING
-    else
-    {
-      *logofs << "Loop: WARNING! Name of the options file "
-              << "specified multiple times. Not parsing "
-              << "again.\n" << logofs_flush;
-    }
-    #endif
-
-    if (*optionsFileName == '\0')
-    {
-      strncpy(optionsFileName, value, DEFAULT_STRING_LENGTH - 1);
-
-      #ifdef TEST
-      *logofs << "Loop: Assuming name of options file '"
-              << optionsFileName << "'.\n"
-              << logofs_flush;
-      #endif
-    }
-  }
-
-  //
-  // If port where proxy is acting as an X server
-  // was not specified assume the same port where
-  // proxy is listening for the remote peer.
-  //
-
-  if (xPort == DEFAULT_NX_X_PORT)
-  {
-    xPort = proxyPort;
-  }
-
-  return 1;
-}
-
-//
-// Parse the command line options passed by user when
-// running proxy in stand alone mode. Note that passing
-// parameters this way is strongly discouraged. These
-// command line switch can change (and they do often).
-// Please, use the form "option=value" instead and set
-// the DISPLAY environment variable.
-//
-
-int ParseCommandLineOptions(int argc, const char **argv)
-{
-  //
-  // Be sure log file is valid.
-  //
-
-  if (logofs == NULL)
-  {
-    logofs = &cerr;
-  }
-
-  if (setjmp(context) == 1)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Out of the long jump while parsing "
-            << "the command line options.\n"
-            << logofs_flush;
-    #endif
-    
-    return -1;
-  }
-
-  //
-  // Be sure we have a parameters repository
-  //
-
-  if (control == NULL)
-  {
-    control = new Control();
-  }
-
-  if (parsedCommand == 1)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Skipping a further parse of command line options.\n"
-            << logofs_flush;
-    #endif
-
-    return 1;
-  }
-
-  #ifdef TEST
-  *logofs << "Loop: Going to parse the command line options.\n"
-          << logofs_flush;
-  #endif
-
-  parsedCommand = 1;
-
-  //
-  // Print out arguments.
-  //
-
-  #ifdef TEST
-
-  *logofs << "Loop: Argc is " << argc << ".\n" << logofs_flush;
-
-  for (int argi = 0; argi < argc; argi++)
-  {
-    *logofs << "Loop: Argv[" << argi << "] is " << argv[argi]
-            << ".\n" << logofs_flush;
-  }
-
-  #endif
-
-  //
-  // Shall use getopt here.
-  //
-
-  for (int argi = 1; argi < argc; argi++)
-  {
-    const char *nextArg = argv[argi];
-
-    if (*nextArg == '-')
-    {
-      switch (*(nextArg + 1))
-      {
-        case 'h':
-        {
-          PrintUsageInfo(nextArg, 0);
-
-          return -1;
-        }
-        case 'C':
-        {
-          //
-          // Start proxy in CLIENT mode.
-          //
-
-          if (WE_SET_PROXY_MODE == 0)
-          {
-            #ifdef TEST
-            *logofs << "Loop: Setting local proxy mode to proxy_client.\n"
-                    << logofs_flush;
-            #endif
-
-            control -> ProxyMode = proxy_client;
-          }
-          else if (control -> ProxyMode != proxy_client)
-          {
-            #ifdef PANIC
-            *logofs << "Loop: PANIC! Can't redefine local proxy to "
-                    << "client mode.\n" << logofs_flush;
-            #endif
-
-            cerr << "Error" << ": Can't redefine local proxy to "
-                 << "client mode.\n";
-
-            return -1;
-          }
-
-          break;
-        }
-        case 'S':
-        {
-          //
-          // Start proxy in SERVER mode.
-          //
-
-          if (WE_SET_PROXY_MODE == 0)
-          {
-            #ifdef TEST
-            *logofs << "Loop: Setting local proxy mode to proxy_server.\n"
-                    << logofs_flush;
-            #endif
-
-            control -> ProxyMode = proxy_server;
-          }
-          else if (control -> ProxyMode != proxy_server)
-          {
-            #ifdef PANIC
-            *logofs << "Loop: PANIC! Can't redefine local proxy to "
-                    << "server mode.\n" << logofs_flush;
-            #endif
-
-            cerr << "Error" << ": Can't redefine local proxy to "
-                 << "server mode.\n";
-
-            return -1;
-          }
-
-          break;
-        }
-        case 'v':
-        {
-          PrintVersionInfo();
-
-          return -1;
-        }
-        default:
-        {
-          PrintUsageInfo(nextArg, 1);
-
-          //
-          // Function GetArg() is not used anymore.
-          // Add a dummy call to avoid the warning.
-          //
-
-          if (0)
-          {
-            GetArg(argi, argc, argv);
-          }
-
-          return -1;
-        }
-      }
-    }
-    else
-    {
-      if (nextArg)
-      {
-        //
-        // Try to parse the option as a remote host:port
-        // specification as in 'localhost:8'. Such a
-        // parameter can be specified at the end of the
-        // command line at the connecting side.
-        //
-
-        char cHost[DEFAULT_STRING_LENGTH] = { '\0' };
-        long cPort = 0;
-
-        if (ParseHostOption(nextArg, cHost, cPort) > 0)
-          {
-            //
-            // Assume port is at a proxied display offset.
-            //
-
-            proxyPort = cPort;
-
-            cPort += DEFAULT_NX_PROXY_PORT_OFFSET;
-            connectSocket.setSpec(cHost, cPort);
-
-          }
-        else if (ParseEnvironmentOptions(nextArg, 1) < 0)
-        {
-          return -1;
-        }
-      }
-    }
-  }
-
-  return 1;
-}
-
-//
-// Set the variable to the values of host and
-// port where this proxy is going to hook to
-// an existing proxy.
-//
-
-int ParseBindOptions(char **host, int *port)
-{
-  if (*bindHost != '\0')
-  {
-    *host = bindHost;
-    *port = bindPort;
-
-    return 1;
-  }
-  else
-  {
-    return 0;
-  }
-}
-
-//
-// Read options from file and merge with environment.
-//
-
-int ParseFileOptions(const char *file)
-{
-  char *fileName;
-
-  if (*file != '/' && *file != '.')
-  {
-    char *filePath = GetSessionPath();
-
-    if (filePath == NULL)
-    {
-      cerr << "Error" << ": Cannot determine directory for NX option file.\n";
-
-      HandleCleanup();
-    }
-
-    fileName = new char[strlen(filePath) + strlen("/") +
-                            strlen(file) + 1];
-
-    strcpy(fileName, filePath);
-
-    strcat(fileName, "/");
-    strcat(fileName, file);
-
-    delete [] filePath;
-  }
-  else
-  {
-    fileName = new char[strlen(file) + 1];
-
-    strcpy(fileName, file);
-  }
-
-  #ifdef TEST
-  *logofs << "Loop: Going to read options from file '"
-          << fileName << "'.\n" << logofs_flush;
-  #endif
-
-  FILE *filePtr = fopen(fileName, "r");
-
-  if (filePtr == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Can't open options file '" << fileName
-            << "'. Error is " << EGET() << " '" << ESTR() << "'.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Can't open options file '" << fileName
-         << "'. Error is " << EGET() << " '" << ESTR() << "'.\n";
-
-    delete [] fileName;
-
-    return -1;
-  }
-
-  char options[DEFAULT_DISPLAY_OPTIONS_LENGTH];
-
-  #ifdef VALGRIND
-
-  memset(options, '\0', DEFAULT_DISPLAY_OPTIONS_LENGTH);
-
-  #endif
-
-  if (fgets(options, DEFAULT_DISPLAY_OPTIONS_LENGTH, filePtr) == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Can't read options from file '" << fileName
-            << "'. Error is " << EGET() << " '" << ESTR() << "'.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Can't read options from file '" << fileName
-         << "'. Error is " << EGET() << " '" << ESTR() << "'.\n";
-
-    fclose(filePtr);
-
-    delete [] fileName;
-
-    return -1;
-  }
-
-  fclose(filePtr);
-
-  //
-  // Purge the newline and the other non-
-  // printable characters in the string.
-  //
-
-  char *next = options;
-  
-  while (*next != '\0')
-  {
-    if (isprint(*next) == 0)
-    {
-      *next = '\0';
-    }
-
-    next++;
-  }
-
-  #ifdef TEST
-  *logofs << "Loop: Read options '" << options << "' from file '"
-          << fileName << "'.\n" << logofs_flush;
-  #endif
-
-  if (ParseEnvironmentOptions(options, 1) < 0)
-  {
-    delete [] fileName;
-
-    return -1;
-  }
-
-  delete [] fileName;
-
-  return 1;
-}
-
-//
-// Parse the option string passed from the
-// remote proxy at startup.
-//
-
-int ParseRemoteOptions(char *opts)
-{
-  #ifdef TEST
-  *logofs << "Loop: Going to parse the remote options "
-          << "string '" << opts << "'.\n"
-          << logofs_flush;
-  #endif
-
-  char *name;
-  char *value;
-
-  //
-  // The options string is intended to be a series
-  // of name/value tuples in the form name=value
-  // separated by the ',' character.
-  //
-
-  int hasCookie = 0;
-  int hasLink   = 0;
-  int hasPack   = 0;
-  int hasCache  = 0;
-  int hasImages = 0;
-  int hasDelta  = 0;
-  int hasStream = 0;
-  int hasData   = 0;
-  int hasType   = 0;
-
-  //
-  // Get rid of the terminating space.
-  //
-
-  if (*(opts + strlen(opts) - 1) == ' ')
-  {
-    *(opts + strlen(opts) - 1) = '\0';
-  }
-
-  name = strtok(opts, "=");
-
-  while (name)
-  {
-    value = strtok(NULL, ",");
-
-    if (CheckArg("remote", name, value) < 0)
-    {
-      return -1;
-    }
-
-    if (strcasecmp(name, "cookie") == 0)
-    {
-      if (WE_PROVIDE_CREDENTIALS)
-      {
-        #ifdef WARNING
-        *logofs << "Loop: WARNING! Ignoring remote option 'cookie' "
-                << "with value '" << value << "' when initiating "
-                << "connection.\n" << logofs_flush;
-        #endif
-
-        cerr << "Warning" << ": Ignoring remote option 'cookie' "
-             << "with value '" << value << "' when initiating "
-             << "connection.\n";
-      }
-      else if (strncasecmp(authCookie, value, strlen(authCookie)) != 0)
-      {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Authentication cookie '" << value
-                << "' doesn't match '" << authCookie << "'.\n"
-                << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Authentication cookie '" << value
-             << "' doesn't match '" << authCookie << "'.\n";
-
-        return -1;
-      }
-
-      hasCookie = 1;
-    }
-    else if (strcasecmp(name, "link") == 0)
-    {
-      if (control -> ProxyMode == proxy_client)
-      {
-        PrintOptionIgnored("remote", name, value);
-      }
-      else
-      {
-        if (*linkSpeedName != '\0' && strcasecmp(linkSpeedName, value) != 0)
-        {
-          #ifdef WARNING
-          *logofs << "Loop: WARNING! Overriding option 'link' "
-                  << "with new value '" << value << "'.\n"
-                  << logofs_flush;
-          #endif
-
-          cerr << "Warning" << ": Overriding option 'link' "
-               << "with new value '" << value << "'.\n";
-        }
-
-        if (ParseLinkOption(value) < 0)
-        {
-          #ifdef PANIC
-          *logofs << "Loop: PANIC! Can't identify remote 'link' "
-                  << "option in string '" << value << "'.\n"
-                  << logofs_flush;
-          #endif
-
-          cerr << "Error" << ": Can't identify remote 'link' "
-               << "option in string '" << value << "'.\n";
-
-          return -1;
-        }
-      }
-
-      hasLink = 1;
-    }
-    else if (strcasecmp(name, "pack") == 0)
-    {
-      if (control -> ProxyMode == proxy_client)
-      {
-        PrintOptionIgnored("remote", name, value);
-      }
-      else
-      {
-        if (*packMethodName != '\0' && strcasecmp(packMethodName, value) != 0)
-        {
-          #ifdef WARNING
-          *logofs << "Loop: WARNING! Overriding option 'pack' "
-                  << "with remote value '" << value << "'.\n"
-                  << logofs_flush;
-          #endif
-
-          cerr << "Warning" << ": Overriding option 'pack' "
-               << "with remote value '" << value << "'.\n";
-        }
-
-        if (ParsePackOption(value) < 0)
-        {
-          #ifdef PANIC
-          *logofs << "Loop: PANIC! Invalid pack option '"
-                  << value << "' requested by remote.\n"
-                  << logofs_flush;
-          #endif
-
-          cerr << "Error" << ": Invalid pack option '"
-               << value << "' requested by remote.\n";
-
-          return -1;
-        }
-      }
-
-      hasPack = 1;
-    }
-    else if (strcasecmp(name, "cache") == 0)
-    {
-      if (control -> ProxyMode == proxy_client)
-      {
-        PrintOptionIgnored("remote", name, value);
-      }
-      else
-      {
-        //
-        // Cache size is sent as a hint of how much memory
-        // the remote proxy is going to consume. A very low
-        // powered thin client could choose to refuse the
-        // connection.
-        //
-
-        if (ParseCacheOption(value) < 0)
-        {
-          #ifdef PANIC
-          *logofs << "Loop: PANIC! Can't identify remote 'cache' "
-                  << "option in string '" << value << "'.\n"
-                  << logofs_flush;
-          #endif
-
-          cerr << "Error" << ": Can't identify remote 'cache' "
-               << "option in string '" << value << "'.\n";
-
-          return -1;
-        }
-      }
-
-      hasCache = 1;
-    }
-    else if (strcasecmp(name, "images") == 0)
-    {
-      if (control -> ProxyMode == proxy_client)
-      {
-        PrintOptionIgnored("remote", name, value);
-      }
-      else
-      {
-        //
-        // Images cache size is sent as a hint.
-        // There is no obbligation for the local
-        // proxy to use the persistent cache.
-        //
-
-        if (ParseImagesOption(value) < 0)
-        {
-          #ifdef PANIC
-          *logofs << "Loop: PANIC! Can't identify remote 'images' "
-                  << "option in string '" << value << "'.\n"
-                  << logofs_flush;
-          #endif
-
-          cerr << "Error" << ": Can't identify remote 'images' "
-               << "option in string '" << value << "'.\n";
-
-          return -1;
-        }
-      }
-
-      hasImages = 1;
-    }
-    else if (strcasecmp(name, "limit") == 0)
-    {
-      if (control -> ProxyMode == proxy_client)
-      {
-        PrintOptionIgnored("remote", name, value);
-      }
-      else
-      {
-        if (*bitrateLimitName != '\0' &&
-                strcasecmp(bitrateLimitName, value) != 0)
-        {
-          #ifdef WARNING
-          *logofs << "Loop: WARNING! Overriding option 'limit' "
-                  << "with new value '" << value << "'.\n"
-                  << logofs_flush;
-          #endif
-
-          cerr << "Warning" << ": Overriding option 'limit' "
-               << "with new value '" << value << "'.\n";
-        }
-
-        if (ParseBitrateOption(value) < 0)
-        {
-          #ifdef PANIC
-          *logofs << "Loop: PANIC! Can't identify 'limit' "
-                  << "option in string '" << value << "'.\n"
-                  << logofs_flush;
-          #endif
-
-          cerr << "Error" << ": Can't identify 'limit' "
-               << "option in string '" << value << "'.\n";
-
-          return -1;
-        }
-      }
-
-    }
-    else if (strcasecmp(name, "render") == 0)
-    {
-      if (control -> ProxyMode == proxy_client)
-      {
-        PrintOptionIgnored("remote", name, value);
-      }
-      else
-      {
-        useRender = ValidateArg("remote", name, value);
-      }
-
-    }
-    else if (strcasecmp(name, "taint") == 0)
-    {
-      if (control -> ProxyMode == proxy_client)
-      {
-        PrintOptionIgnored("remote", name, value);
-      }
-      else
-      {
-        useTaint = ValidateArg("remote", name, value);
-      }
-
-    }
-    else if (strcasecmp(name, "type") == 0)
-    {
-      if (control -> ProxyMode == proxy_client)
-      {
-        PrintOptionIgnored("remote", name, value);
-      }
-      else
-      {
-        if (strcasecmp(value, "default") == 0)
-        {
-          *sessionType = '\0';
-        }
-        else
-        {
-          strncpy(sessionType, value, DEFAULT_STRING_LENGTH - 1);
-        }
-      }
-
-      hasType = 1;
-    }
-    else if (strcasecmp(name, "strict") == 0)
-    {
-      if (control -> ProxyMode == proxy_client)
-      {
-        PrintOptionIgnored("remote", name, value);
-      }
-      else
-      {
-        useStrict = ValidateArg("remote", name, value);
-      }
-
-    }
-    else if (strcasecmp(name, "shseg") == 0)
-    {
-      if (control -> ProxyMode == proxy_client)
-      {
-        PrintOptionIgnored("remote", name, value);
-      }
-      else if (ParseShmemOption(value) < 0)
-      {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Can't identify size of shared memory "
-                << "segment in string '" << value << "'.\n"
-               << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Can't identify size of shared memory "
-             << "segment in string '" << value << "'.\n";
-
-        return -1;
-      }
-
-    }
-    else if (strcasecmp(name, "delta") == 0)
-    {
-      if (control -> ProxyMode == proxy_client)
-      {
-        PrintOptionIgnored("remote", name, value);
-      }
-      else
-      {
-        control -> RemoteDeltaCompression = ValidateArg("remote", name, value);
-
-        //
-        // Follow for delta compression the
-        // same settings as the client proxy.
-        //
-
-        control -> LocalDeltaCompression  = control -> RemoteDeltaCompression;
-      }
-
-      hasDelta = 1;
-    }
-    else if (strcasecmp(name, "stream") == 0)
-    {
-      //
-      // If remote side didn't choose its own
-      // stream compression level then assume
-      // local settings.
-      //
-
-      if (strcasecmp(value, "default") == 0)
-      {
-        //
-        // This applies only at client side.
-        //
-
-        control -> RemoteStreamCompression =
-            control -> LocalStreamCompression;
-
-        control -> RemoteStreamCompressionLevel =
-            control -> LocalStreamCompressionLevel;
-      }
-      else
-      {
-        control -> RemoteStreamCompressionLevel = ValidateArg("remote", name, value);
-
-        if (control -> RemoteStreamCompressionLevel > 0)
-        {
-          control -> RemoteStreamCompression = 1;
-        }
-        else
-        {
-          control -> RemoteStreamCompression = 0;
-        }
-
-        if (control -> LocalStreamCompressionLevel < 0)
-        {
-          control -> LocalStreamCompressionLevel = ValidateArg("remote", name, value);
-
-          if (control -> LocalStreamCompressionLevel > 0)
-          {
-            control -> LocalStreamCompression = 1;
-          }
-          else
-          {
-            control -> LocalStreamCompression = 0;
-          }
-        }
-      }
-
-      hasStream = 1;
-    }
-    else if (strcasecmp(name, "data") == 0)
-    {
-      //
-      // Apply the same to data compression level.
-      //
-
-      if (strcasecmp(value, "default") == 0)
-      {
-        control -> RemoteDataCompression =
-            control -> LocalDataCompression;
-
-        control -> RemoteDataCompressionLevel =
-            control -> LocalDataCompressionLevel;
-      }
-      else
-      {
-        control -> RemoteDataCompressionLevel = ValidateArg("remote", name, value);
-
-        if (control -> RemoteDataCompressionLevel > 0)
-        {
-          control -> RemoteDataCompression = 1;
-        }
-        else
-        {
-          control -> RemoteDataCompression = 0;
-        }
-
-        if (control -> LocalDataCompressionLevel < 0)
-        {
-          control -> LocalDataCompressionLevel = ValidateArg("remote", name, value);
-
-          if (control -> LocalDataCompressionLevel > 0)
-          {
-            control -> LocalDataCompression = 1;
-          }
-          else
-          {
-            control -> LocalDataCompression = 0;
-          }
-        }
-      }
-
-      hasData = 1;
-    }
-    else if (strcasecmp(name, "flush") == 0)
-    {
-      //
-      // This option has no effect in recent
-      // versions.
-      //
-
-      #ifdef DEBUG
-      *logofs << "Loop: Ignoring obsolete remote option '"
-              << name << "' with value '" << value
-              << "'.\n" << logofs_flush;
-      #endif
-    }
-    else
-    {
-      #ifdef WARNING
-      *logofs << "Loop: WARNING! Ignoring unknown remote option '"
-              << name << "' with value '" << value << "'.\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Warning" << ": Ignoring unknown remote option '"
-           << name << "' with value '" << value << "'.\n";
-    }
-
-    name = strtok(NULL, "=");
-
-  } // End of while (name) ...
-
-  //
-  // If we are client side, we need remote 'stream'
-  // and 'data' options. If we are server, we need
-  // all the above plus 'link' and some others.
-  //
-
-  char missing[DEFAULT_STRING_LENGTH];
-
-  *missing = '\0';
-
-  if (control -> ProxyMode == proxy_client)
-  {
-    if (hasStream == 0)
-    {
-      strcpy(missing, "stream");
-    }
-    else if (hasData == 0)
-    {
-      strcpy(missing, "data");
-    }
-  }
-  else
-  {
-    //
-    // Don't complain if the optional 'flush',
-    // 'render' and 'taint' options are not
-    // provided.
-    //
-
-    if (hasLink == 0)
-    {
-      strcpy(missing, "link");
-    }
-    else if (hasCache == 0)
-    {
-      strcpy(missing, "cache");
-    }
-    else if (hasPack == 0)
-    {
-      strcpy(missing, "pack");
-    }
-    else if (hasDelta == 0)
-    {
-      strcpy(missing, "delta");
-    }
-    else if (hasStream == 0)
-    {
-      strcpy(missing, "stream");
-    }
-    else if (hasData == 0)
-    {
-      strcpy(missing, "data");
-    }
-    else if (hasType == 0)
-    {
-      strcpy(missing, "type");
-    }
-    else if (hasImages == 0)
-    {
-      strcpy(missing, "images");
-    }
-  }
-
-  if (WE_PROVIDE_CREDENTIALS == 0)
-  {
-    //
-    // Can be that user doesn't have requested to
-    // check the authorization cookie provided by
-    // the connecting peer.
-    //
-
-    if (hasCookie == 0 && *authCookie != '\0')
-    {
-      strcpy(missing, "cookie");
-    }
-  }
-
-  if (*missing != '\0')
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! The remote peer didn't specify the option '"
-            << missing << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": The remote peer didn't specify the option '"
-         << missing << "'.\n";
-
-    return -1;
-  }
-
-  return 1;
-}
-
-//
-// Parse the cookie provided by the NX proxy
-// connection forwarder.
-//
-
-int ParseForwarderOptions(char *opts)
-{
-  #ifdef TEST
-  *logofs << "Loop: Going to parse the forwarder options "
-          << "string '" << opts << "'.\n"
-          << logofs_flush;
-  #endif
-
-  char *name;
-  char *value;
-
-  int hasCookie = 0;
-
-  //
-  // Get rid of the terminating space.
-  //
-
-  if (*(opts + strlen(opts) - 1) == ' ')
-  {
-    *(opts + strlen(opts) - 1) = '\0';
-  }
-
-  name = strtok(opts, "=");
-
-  while (name)
-  {
-    value = strtok(NULL, ",");
-
-    if (CheckArg("forwarder", name, value) < 0)
-    {
-      return -1;
-    }
-
-    if (strcasecmp(name, "cookie") == 0)
-    {
-      if (strncasecmp(authCookie, value, strlen(authCookie)) != 0)
-      {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! The NX forwarder cookie '" << value
-                << "' doesn't match '" << authCookie << "'.\n"
-                << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": The NX forwarder cookie '" << value
-             << "' doesn't match '" << authCookie << "'.\n";
-
-        return -1;
-      }
-
-      hasCookie = 1;
-    }
-    else
-    {
-      #ifdef WARNING
-      *logofs << "Loop: WARNING! Ignoring unknown forwarder option '"
-              << name << "' with value '" << value << "'.\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Warning" << ": Ignoring unknown forwarder option '"
-           << name << "' with value '" << value << "'.\n";
-    }
-
-    name = strtok(NULL, "=");
-
-  } // End of while (name) ...
-
-  if (hasCookie == 0)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! The NX forwarder didn't provide "
-            << "the authentication cookie.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": The NX forwarder didn't provide "
-         << "the authentication cookie.\n";
-
-    return -1;
-  }
-
-  return 1;
-}
-
-int SetCore()
-{
-  #ifdef COREDUMPS
-
-  rlimit rlim;
-
-  if (getrlimit(RLIMIT_CORE, &rlim))
-  {
-    #ifdef TEST
-    *logofs << "Loop: Cannot read RLIMIT_CORE. Error is '"
-            << ESTR() << "'.\n" << logofs_flush;
-    #endif
-
-    return -1;
-  }
-
-  if (rlim.rlim_cur < rlim.rlim_max)
-  {
-    rlim.rlim_cur = rlim.rlim_max;
-
-    if (setrlimit(RLIMIT_CORE, &rlim))
-    {
-      #ifdef TEST
-      *logofs << "Loop: Cannot set RLIMIT_CORE. Error is '"
-              << ESTR() << "'.\n" << logofs_flush;
-      #endif
-
-      return -2;
-    }
-  }
-
-  #ifdef TEST
-  *logofs << "Loop: RLIMIT_CORE is "<< rlim.rlim_max
-          << ".\n" << logofs_flush;
-  #endif
-
-  #endif // #ifdef COREDUMPS
-
-  return 1;
-}
-
-char *GetLastCache(char *listBuffer, const char *searchPath)
-{
-  if (listBuffer == NULL || searchPath == NULL ||
-          strncmp(listBuffer, "cachelist=", strlen("cachelist=")) != 0)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Invalid parameters '" << listBuffer << "' and '"
-            << (searchPath != NULL ? searchPath : "")
-            << "'. Can't select any cache.\n" << logofs_flush;
-    #endif
-
-    return NULL;
-  }
-
-  char *selectedName = new char[MD5_LENGTH * 2 + 3];
-
-  *selectedName = '\0';
-
-  const char *localPrefix;
-  const char *remotePrefix;
-
-  if (control -> ProxyMode == proxy_client)
-  {
-    localPrefix  = "C-";
-    remotePrefix = "S-";
-  }
-  else
-  {
-    localPrefix  = "S-";
-    remotePrefix = "C-";
-  }
-
-  //
-  // Get rid of prefix.
-  //
-
-  listBuffer += strlen("cachelist=");
-
-  char *fileName;
-
-  fileName = strtok(listBuffer, ",");
-
-  //
-  // It is "/path/to/file" + "/" + "C-" + 32 + "\0".
-  //
-
-  char fullPath[strlen(searchPath) + MD5_LENGTH * 2 + 4];
-
-  time_t selectedTime = 0;
-
-  struct stat fileStat;
-
-  while (fileName)
-  {
-    if (strncmp(fileName, "none", strlen("none")) == 0)
-    {
-      #ifdef TEST
-      *logofs << "Loop: No cache files seem to be available.\n"
-              << logofs_flush;
-      #endif
-
-      delete [] selectedName;
-
-      return NULL;
-    }
-    else if (strlen(fileName) != MD5_LENGTH * 2 + 2 ||
-                 strncmp(fileName, remotePrefix, 2) != 0)
-    {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Bad cache file name '"
-               << fileName << "'.\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Bad cache file name '"
-           << fileName << "'.\n";
-
-      delete [] selectedName;
-
-      HandleCleanup();
-    }
-
-    #ifdef TEST
-    *logofs << "Loop: Parsing remote cache name '"
-            << fileName << "'.\n" << logofs_flush;
-    #endif
-
-    //
-    // Prefix, received as "S-", becomes
-    // "C-" and viceversa.
-    //
-
-    *fileName = *localPrefix;
-
-    strcpy(fullPath, searchPath);
-    strcat(fullPath, "/");
-    strcat(fullPath, fileName);
-
-    if (stat(fullPath, &fileStat) == 0)
-    {
-      #ifdef TEST
-      *logofs << "Loop: Found a matching cache '"
-              << fullPath << "'.\n" << logofs_flush;
-      #endif
-
-      if (fileStat.st_mtime >= selectedTime)
-      {
-        strcpy(selectedName, fileName);
-
-        selectedTime = fileStat.st_mtime;
-      }
-    }
-    #ifdef TEST
-    else
-    {
-      *logofs << "Loop: Can't get stats of file '"
-              << fullPath << "'.\n" << logofs_flush;
-    }
-    #endif
-
-    fileName = strtok(NULL, ",");
-  }
-
-  if (*selectedName != '\0')
-  {
-    return selectedName;
-  }
-  else
-  {
-    delete [] selectedName;
-
-    return NULL;
-  }
-}
-
-char *GetTempPath()
-{
-  if (*tempDir == '\0')
-  {
-    //
-    // Check the NX_TEMP environment, first,
-    // then the TEMP variable.
-    //
-
-    const char *tempEnv = getenv("NX_TEMP");
-
-    if (tempEnv == NULL || *tempEnv == '\0')
-    {
-      #ifdef TEST
-      *logofs << "Loop: WARNING! No environment for NX_TEMP.\n"
-              << logofs_flush;
-      #endif
-
-      tempEnv = getenv("TEMP");
-
-      if (tempEnv == NULL || *tempEnv == '\0')
-      {
-        #ifdef TEST
-        *logofs << "Loop: WARNING! No environment for TEMP.\n"
-                << logofs_flush;
-        #endif
-
-        tempEnv = "/tmp";
-      }
-    }
-
-    if (strlen(tempEnv) > DEFAULT_STRING_LENGTH - 1)
-    {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Invalid value for the NX "
-              << "temporary directory '" << tempEnv
-              << "'.\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Invalid value for the NX "
-           << "temporary directory '" << tempEnv
-           << "'.\n";
-
-      HandleCleanup();
-    }
-
-    strcpy(tempDir, tempEnv);
-
-    #ifdef TEST
-    *logofs << "Loop: Assuming temporary NX directory '"
-            << tempDir << "'.\n" << logofs_flush;
-    #endif
-  }
-
-  char *tempPath = new char[strlen(tempDir) + 1];
-
-  if (tempPath == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Can't allocate memory "
-            << "for the temp path.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Can't allocate memory "
-         << "for the temp path.\n";
-
-    HandleCleanup();
-  }
-
-  strcpy(tempPath, tempDir);
-
-  return tempPath;
-}
-
-char *GetClientPath()
-{
-  if (*clientDir == '\0')
-  {
-    //
-    // Check the NX_CLIENT environment.
-    //
-
-    const char *clientEnv = getenv("NX_CLIENT");
-
-    if (clientEnv == NULL || *clientEnv == '\0')
-    {
-      #ifdef TEST
-      *logofs << "Loop: WARNING! No environment for NX_CLIENT.\n"
-              << logofs_flush;
-      #endif
-
-      //
-      // Try to guess the location of the client.
-      //
-
-      clientEnv = "/usr/NX/bin/nxclient";
-
-      #ifdef __APPLE__
-
-      clientEnv = "/Applications/NX Client for OSX.app/Contents/MacOS/nxclient";
-
-      #endif
-
-      #ifdef __CYGWIN32__
-
-      clientEnv = "C:\\Program Files\\NX Client for Windows\\nxclient";
-
-      #endif
-    }
-
-    if (strlen(clientEnv) > DEFAULT_STRING_LENGTH - 1)
-    {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Invalid value for the NX "
-              << "client directory '" << clientEnv
-              << "'.\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Invalid value for the NX "
-           << "client directory '" << clientEnv
-           << "'.\n";
-
-      HandleCleanup();
-    }
-
-    strcpy(clientDir, clientEnv);
-
-    #ifdef TEST
-    *logofs << "Loop: Assuming NX client location '"
-            << clientDir << "'.\n" << logofs_flush;
-    #endif
-  }
-
-  char *clientPath = new char[strlen(clientDir) + 1];
-
-  if (clientPath == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Can't allocate memory "
-            << "for the client path.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Can't allocate memory "
-         << "for the client path.\n";
-
-    HandleCleanup();
-  }
-
-  strcpy(clientPath, clientDir);
-
-  return clientPath;
-}
-
-char *GetSystemPath()
-{
-  if (*systemDir == '\0')
-  {
-    //
-    // Check the NX_SYSTEM environment.
-    //
-
-    const char *systemEnv = getenv("NX_SYSTEM");
-
-    if (systemEnv == NULL || *systemEnv == '\0')
-    {
-      #ifdef TEST
-      *logofs << "Loop: WARNING! No environment for NX_SYSTEM.\n"
-              << logofs_flush;
-      #endif
-
-      systemEnv = "/usr/NX";
-    }
-
-    if (strlen(systemEnv) > DEFAULT_STRING_LENGTH - 1)
-    {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Invalid value for the NX "
-              << "system directory '" << systemEnv
-              << "'.\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Invalid value for the NX "
-           << "system directory '" << systemEnv
-           << "'.\n";
-
-      HandleCleanup();
-    }
-
-    strcpy(systemDir, systemEnv);
-
-    #ifdef TEST
-    *logofs << "Loop: Assuming system NX directory '"
-            << systemDir << "'.\n" << logofs_flush;
-    #endif
-  }
-
-  char *systemPath = new char[strlen(systemDir) + 1];
-
-  if (systemPath == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Can't allocate memory "
-            << "for the system path.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Can't allocate memory "
-         << "for the system path.\n";
-
-    HandleCleanup();
-  }
-
-  strcpy(systemPath, systemDir);
-
-  return systemPath;
-}
-
-char *GetHomePath()
-{
-  if (*homeDir == '\0')
-  {
-    //
-    // Check the NX_HOME environment.
-    //
-
-    const char *homeEnv = getenv("NX_HOME");
-
-    if (homeEnv == NULL || *homeEnv == '\0')
-    {
-      #ifdef TEST
-      *logofs << "Loop: WARNING! No environment for NX_HOME.\n"
-              << logofs_flush;
-      #endif
-
-      homeEnv = getenv("HOME");
-
-      if (homeEnv == NULL || *homeEnv == '\0')
-      {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! No environment for HOME.\n"
-                << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": No environment for HOME.\n";
-
-        HandleCleanup();
-      }
-    }
-
-    if (strlen(homeEnv) > DEFAULT_STRING_LENGTH - 1)
-    {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Invalid value for the NX "
-              << "home directory '" << homeEnv
-              << "'.\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Invalid value for the NX "
-           << "home directory '" << homeEnv
-           << "'.\n";
-
-      HandleCleanup();
-    }
-
-    strcpy(homeDir, homeEnv);
-
-    #ifdef TEST
-    *logofs << "Loop: Assuming NX user's home directory '"
-            << homeDir << "'.\n" << logofs_flush;
-    #endif
-  }
-
-  char *homePath = new char[strlen(homeDir) + 1];
-
-  if (homePath == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Can't allocate memory "
-            << "for the home path.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Can't allocate memory "
-         << "for the home path.\n";
-
-    HandleCleanup();
-  }
-
-  strcpy(homePath, homeDir);
-
-  return homePath;
-}
-
-char *GetRootPath()
-{
-  if (*rootDir == '\0')
-  {
-    //
-    // Check the NX_ROOT environment.
-    //
-
-    const char *rootEnv = getenv("NX_ROOT");
-
-    if (rootEnv == NULL || *rootEnv == '\0')
-    {
-      #ifdef TEST
-      *logofs << "Loop: WARNING! No environment for NX_ROOT.\n"
-              << logofs_flush;
-      #endif
-
-      //
-      // We will determine the root NX directory
-      // based on the NX_HOME or HOME directory
-      // settings.
-      //
-
-      const char *homeEnv = GetHomePath();
-
-      if (strlen(homeEnv) > DEFAULT_STRING_LENGTH -
-              strlen("/.nx") - 1)
-      {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Invalid value for the NX "
-                << "home directory '" << homeEnv
-                << "'.\n" << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Invalid value for the NX "
-             << "home directory '" << homeEnv
-             << "'.\n";
-
-        HandleCleanup();
-      }
-
-      #ifdef TEST
-      *logofs << "Loop: Assuming NX root directory in "
-              << "the user's home '" << homeEnv
-              << "'.\n" << logofs_flush;
-      #endif
-
-      strcpy(rootDir, homeEnv);
-      strcat(rootDir, "/.nx");
-
-      delete [] homeEnv;
-
-      //
-      // Create the NX root directory.
-      //
-
-      struct stat dirStat;
-
-      if ((stat(rootDir, &dirStat) == -1) && (EGET() == ENOENT))
-      {
-        if (mkdir(rootDir, 0700) < 0 && (EGET() != EEXIST))
-        {
-          #ifdef PANIC
-          *logofs << "Loop: PANIC! Can't create directory '"
-                  << rootDir << ". Error is " << EGET() << " '"
-                  << ESTR() << "'.\n" << logofs_flush;
-          #endif
-
-          cerr << "Error" << ": Can't create directory '"
-               << rootDir << ". Error is " << EGET() << " '"
-               << ESTR() << "'.\n";
-
-          HandleCleanup();
-        }
-      }
-    }
-    else
-    {
-      if (strlen(rootEnv) > DEFAULT_STRING_LENGTH - 1)
-      {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Invalid value for the NX "
-                << "root directory '" << rootEnv
-                << "'.\n" << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Invalid value for the NX "
-             << "root directory '" << rootEnv
-             << "'.\n";
-
-        HandleCleanup();
-      }
-
-      strcpy(rootDir, rootEnv);
-    }
-        
-    #ifdef TEST
-    *logofs << "Loop: Assuming NX root directory '"
-            << rootDir << "'.\n" << logofs_flush;
-    #endif
-  }
-
-  char *rootPath = new char[strlen(rootDir) + 1];
-
-  if (rootPath == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Can't allocate memory "
-            << "for the root path.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Can't allocate memory "
-         << "for the root path.\n";
-
-    HandleCleanup();
-  }
-
-  strcpy(rootPath, rootDir);
-
-  return rootPath;
-}
-
-char *GetCachePath()
-{
-  char *rootPath = GetRootPath();
-
-  char *cachePath;
-
-  if (*sessionType != '\0')
-  {
-    cachePath = new char[strlen(rootPath) + strlen("/cache-") +
-                             strlen(sessionType) + 1];
-  }
-  else
-  {
-    cachePath = new char[strlen(rootPath) + strlen("/cache") + 1];
-  }
-
-  strcpy(cachePath, rootPath);
-
-  if (*sessionType != '\0')
-  {
-    strcat(cachePath, "/cache-");
-
-    strcat(cachePath, sessionType);
-  }
-  else
-  {
-    strcat(cachePath, "/cache");
-  }
-
-  //
-  // Create the cache directory if needed.
-  //
-
-  struct stat dirStat;
-
-  if ((stat(cachePath, &dirStat) == -1) && (EGET() == ENOENT))
-  {
-    if (mkdir(cachePath, 0700) < 0 && (EGET() != EEXIST))
-    {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Can't create directory '" << cachePath
-              << ". Error is " << EGET() << " '" << ESTR() << "'.\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Can't create directory '" << cachePath
-           << ". Error is " << EGET() << " '" << ESTR() << "'.\n";
-
-      delete [] rootPath;
-      delete [] cachePath;
-
-      return NULL;
-    }
-  }
-
-  delete [] rootPath;
-
-  return cachePath;
-}
-
-char *GetImagesPath()
-{
-  char *rootPath = GetRootPath();
-
-  char *imagesPath = new char[strlen(rootPath) + strlen("/images") + 1];
-
-  strcpy(imagesPath, rootPath);
-
-  strcat(imagesPath, "/images");
-
-  //
-  // Create the cache directory if needed.
-  //
-
-  struct stat dirStat;
-
-  if ((stat(imagesPath, &dirStat) == -1) && (EGET() == ENOENT))
-  {
-    if (mkdir(imagesPath, 0700) < 0 && (EGET() != EEXIST))
-    {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Can't create directory '" << imagesPath
-              << ". Error is " << EGET() << " '" << ESTR() << "'.\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Can't create directory '" << imagesPath
-           << ". Error is " << EGET() << " '" << ESTR() << "'.\n";
-
-      delete [] rootPath;
-      delete [] imagesPath;
-
-      return NULL;
-    }
-  }
-
-  //
-  // Create 16 directories in the path to
-  // hold the images whose name begins with
-  // the corresponding hexadecimal digit.
-  //
-
-  char *digitPath = new char[strlen(imagesPath) + 5];
-
-  strcpy(digitPath, imagesPath);
-
-  //
-  // Image paths have format "[path][/I-c][\0]",
-  // where c is the first digit of the checksum.
-  //
-
-  for (char digit = 0; digit < 16; digit++)
-  {
-    sprintf(digitPath + strlen(imagesPath), "/I-%01X", digit);
-
-    if ((stat(digitPath, &dirStat) == -1) && (EGET() == ENOENT))
-    {
-      if (mkdir(digitPath, 0700) < 0 && (EGET() != EEXIST))
-      {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Can't create directory '" << digitPath
-                << ". Error is " << EGET() << " '" << ESTR() << "'.\n"
-                << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Can't create directory '" << digitPath
-             << ". Error is " << EGET() << " '" << ESTR() << "'.\n";
-
-        delete [] rootPath;
-        delete [] imagesPath;
-        delete [] digitPath;
-
-        return NULL;
-      }
-    }
-  }
-
-  delete [] rootPath;
-  delete [] digitPath;
-
-  return imagesPath;
-}
-
-char *GetSessionPath()
-{
-  if (*sessionDir == '\0')
-  {
-    char *rootPath = GetRootPath();
-
-    strcpy(sessionDir, rootPath);
-
-    if (control -> ProxyMode == proxy_client)
-    {
-      strcat(sessionDir, "/C-");
-    }
-    else
-    {
-      strcat(sessionDir, "/S-");
-    }
-
-    if (*sessionId == '\0')
-    {
-      char port[DEFAULT_STRING_LENGTH];
-
-      sprintf(port, "%d", proxyPort);
-
-      strcpy(sessionId, port);
-    }
-
-    strcat(sessionDir, sessionId);
-
-    struct stat dirStat;
-
-    if ((stat(sessionDir, &dirStat) == -1) && (EGET() == ENOENT))
-    {
-      if (mkdir(sessionDir, 0700) < 0 && (EGET() != EEXIST))
-      {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Can't create directory '" << sessionDir
-                << ". Error is " << EGET() << " '" << ESTR() << "'.\n"
-                << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Can't create directory '" << sessionDir
-             << ". Error is " << EGET() << " '" << ESTR() << "'.\n";
-
-        delete [] rootPath;
-
-        return NULL;
-      }
-    }
-
-    #ifdef TEST
-    *logofs << "Loop: Root of NX session is '" << sessionDir
-            << "'.\n" << logofs_flush;
-    #endif
-
-    delete [] rootPath;
-  }
-
-  char *sessionPath = new char[strlen(sessionDir) + 1];
-
-  strcpy(sessionPath, sessionDir);
-
-  return sessionPath;
-}
-
-//
-// Identify requested link characteristics
-// and set control parameters accordingly.
-//
-
-int ParseLinkOption(const char *opt)
-{
-  //
-  // Normalize the user input.
-  //
-
-  if (strcasecmp(opt, "modem") == 0 ||
-          strcasecmp(opt, "33k") == 0 ||
-              strcasecmp(opt, "56k") == 0)
-  {
-    strcpy(linkSpeedName, "MODEM");
-  }
-  else if (strcasecmp(opt, "isdn")  == 0 ||
-               strcasecmp(opt, "64k")  == 0 ||
-                   strcasecmp(opt, "128k") == 0)
-  {
-    strcpy(linkSpeedName, "ISDN");
-  }
-  else if (strcasecmp(opt, "adsl") == 0 ||
-               strcasecmp(opt, "256k") == 0 ||
-                   strcasecmp(opt, "640k") == 0)
-  {
-    strcpy(linkSpeedName, "ADSL");
-  }
-  else if (strcasecmp(opt, "wan")  == 0 ||
-               strcasecmp(opt, "1m")  == 0 ||
-                   strcasecmp(opt, "2m")  == 0 ||
-                       strcasecmp(opt, "34m") == 0)
-  {
-    strcpy(linkSpeedName, "WAN");
-  }
-  else if (strcasecmp(opt, "lan")   == 0 ||
-               strcasecmp(opt, "10m")   == 0 ||
-                   strcasecmp(opt, "100m")  == 0 ||
-                       strcasecmp(opt, "local") == 0)
-  {
-    strcpy(linkSpeedName, "LAN");
-  }
-
-  if (strcasecmp(linkSpeedName, "modem") != 0 &&
-          strcasecmp(linkSpeedName, "isdn")  != 0 &&
-              strcasecmp(linkSpeedName, "adsl")  != 0 &&
-                  strcasecmp(linkSpeedName, "wan")   != 0 &&
-                      strcasecmp(linkSpeedName, "lan")   != 0)
-  {
-    return -1;
-  }
-
-  return 1;
-}
-
-int ParsePackOption(const char *opt)
-{
-  #ifdef DEBUG
-  *logofs << "Loop: Pack method is " << packMethod
-          << " quality is " << packQuality << ".\n"
-          << logofs_flush;
-  #endif
-
-  #ifdef DEBUG
-  *logofs << "Loop: Parsing pack method '" << opt
-          << "'.\n" << logofs_flush;
-  #endif
-
-  if (strcasecmp(opt, "0") == 0 ||
-          strcasecmp(opt, "none") == 0 ||
-              strcasecmp(opt, "nopack") == 0 ||
-                  strcasecmp(opt, "no-pack") == 0)
-  {
-    packMethod = PACK_NONE;
-  }
-  else if (strcasecmp(opt, "8") == 0)
-  {
-    packMethod = PACK_MASKED_8_COLORS;
-  }
-  else if (strcasecmp(opt, "64") == 0)
-  {
-    packMethod = PACK_MASKED_64_COLORS;
-  }
-  else if (strcasecmp(opt, "256") == 0)
-  {
-    packMethod = PACK_MASKED_256_COLORS;
-  }
-  else if (strcasecmp(opt, "512") == 0)
-  {
-    packMethod = PACK_MASKED_512_COLORS;
-  }
-  else if (strcasecmp(opt, "4k") == 0)
-  {
-    packMethod = PACK_MASKED_4K_COLORS;
-  }
-  else if (strcasecmp(opt, "32k") == 0)
-  {
-    packMethod = PACK_MASKED_32K_COLORS;
-  }
-  else if (strcasecmp(opt, "64k") == 0)
-  {
-    packMethod = PACK_MASKED_64K_COLORS;
-  }
-  else if (strcasecmp(opt, "256k") == 0)
-  {
-    packMethod = PACK_MASKED_256K_COLORS;
-  }
-  else if (strcasecmp(opt, "2m") == 0)
-  {
-    packMethod = PACK_MASKED_2M_COLORS;
-  }
-  else if (strcasecmp(opt, "16m") == 0)
-  {
-    packMethod = PACK_MASKED_16M_COLORS;
-  }
-  else if (strncasecmp(opt, "8-jpeg", strlen("8-jpeg")) == 0)
-  {
-    packMethod = PACK_JPEG_8_COLORS;
-  }
-  else if (strncasecmp(opt, "64-jpeg", strlen("64-jpeg")) == 0)
-  {
-    packMethod = PACK_JPEG_64_COLORS;
-  }
-  else if (strncasecmp(opt, "256-jpeg", strlen("256-jpeg")) == 0)
-  {
-    packMethod = PACK_JPEG_256_COLORS;
-  }
-  else if (strncasecmp(opt, "512-jpeg", strlen("512-jpeg")) == 0)
-  {
-    packMethod = PACK_JPEG_512_COLORS;
-  }
-  else if (strncasecmp(opt, "4k-jpeg", strlen("4k-jpeg")) == 0)
-  {
-    packMethod = PACK_JPEG_4K_COLORS;
-  }
-  else if (strncasecmp(opt, "32k-jpeg", strlen("32k-jpeg")) == 0)
-  {
-    packMethod = PACK_JPEG_32K_COLORS;
-  }
-  else if (strncasecmp(opt, "64k-jpeg", strlen("64k-jpeg")) == 0)
-  {
-    packMethod = PACK_JPEG_64K_COLORS;
-  }
-  else if (strncasecmp(opt, "256k-jpeg", strlen("256k-jpeg")) == 0)
-  {
-    packMethod = PACK_JPEG_256K_COLORS;
-  }
-  else if (strncasecmp(opt, "2m-jpeg", strlen("2m-jpeg")) == 0)
-  {
-    packMethod = PACK_JPEG_2M_COLORS;
-  }
-  else if (strncasecmp(opt, "16m-jpeg", strlen("16m-jpeg")) == 0)
-  {
-    packMethod = PACK_JPEG_16M_COLORS;
-  }
-  else if (strncasecmp(opt, "8-png", strlen("8-png")) == 0)
-  {
-    packMethod = PACK_PNG_8_COLORS;
-  }
-  else if (strncasecmp(opt, "64-png", strlen("64-png")) == 0)
-  {
-    packMethod = PACK_PNG_64_COLORS;
-  }
-  else if (strncasecmp(opt, "256-png", strlen("256-png")) == 0)
-  {
-    packMethod = PACK_PNG_256_COLORS;
-  }
-  else if (strncasecmp(opt, "512-png", strlen("512-png")) == 0)
-  {
-    packMethod = PACK_PNG_512_COLORS;
-  }
-  else if (strncasecmp(opt, "4k-png", strlen("4k-png")) == 0)
-  {
-    packMethod = PACK_PNG_4K_COLORS;
-  }
-  else if (strncasecmp(opt, "32k-png", strlen("32k-png")) == 0)
-  {
-    packMethod = PACK_PNG_32K_COLORS;
-  }
-  else if (strncasecmp(opt, "64k-png", strlen("64k-png")) == 0)
-  {
-    packMethod = PACK_PNG_64K_COLORS;
-  }
-  else if (strncasecmp(opt, "256k-png", strlen("256k-png")) == 0)
-  {
-    packMethod = PACK_PNG_256K_COLORS;
-  }
-  else if (strncasecmp(opt, "2m-png", strlen("2m-png")) == 0)
-  {
-    packMethod = PACK_PNG_2M_COLORS;
-  }
-  else if (strncasecmp(opt, "16m-png", strlen("16m-png")) == 0)
-  {
-    packMethod = PACK_PNG_16M_COLORS;
-  }
-  else if (strncasecmp(opt, "16m-rgb", strlen("16m-rgb")) == 0 ||
-               strncasecmp(opt, "rgb", strlen("rgb")) == 0)
-  {
-    packMethod = PACK_RGB_16M_COLORS;
-  }
-  else if (strncasecmp(opt, "16m-rle", strlen("16m-rle")) == 0 ||
-               strncasecmp(opt, "rle", strlen("rle")) == 0)
-  {
-    packMethod = PACK_RLE_16M_COLORS;
-  }
-  else if (strncasecmp(opt, "16m-bitmap", strlen("16m-bitmap")) == 0 ||
-               strncasecmp(opt, "bitmap", strlen("bitmap")) == 0)
-  {
-    packMethod = PACK_BITMAP_16M_COLORS;
-  }
-  else if (strncasecmp(opt, "lossy", strlen("lossy")) == 0)
-  {
-    packMethod = PACK_LOSSY;
-  }
-  else if (strncasecmp(opt, "lossless", strlen("lossless")) == 0)
-  {
-    packMethod = PACK_LOSSLESS;
-  }
-  else if (strncasecmp(opt, "adaptive", strlen("adaptive")) == 0)
-  {
-    packMethod = PACK_ADAPTIVE;
-  }
-  else
-  {
-    return -1;
-  }
-
-  if (packMethod == PACK_NONE)
-  {
-    strcpy(packMethodName, "none");
-  }
-  else
-  {
-    strcpy(packMethodName, opt);
-  }
-
-  if (packMethod == PACK_RGB_16M_COLORS ||
-          packMethod == PACK_RLE_16M_COLORS ||
-              packMethod == PACK_BITMAP_16M_COLORS ||
-                  (packMethod >= PACK_JPEG_8_COLORS &&
-                      packMethod <= PACK_JPEG_16M_COLORS) ||
-                          (packMethod >= PACK_PNG_8_COLORS &&
-                              packMethod <= PACK_PNG_16M_COLORS) ||
-                                  packMethod == PACK_LOSSY ||
-                                      packMethod == PACK_LOSSLESS ||
-                                          packMethod == PACK_ADAPTIVE)
-  {
-    const char *dash = strrchr(opt, '-');
-
-    if (dash != NULL && strlen(dash) == 2 &&
-            *(dash + 1) >= '0' && *(dash + 1) <= '9')
-    {
-      packQuality = atoi(dash + 1);
-
-      #ifdef DEBUG
-      *logofs << "Loop: Using pack quality '"
-              << packQuality << "'.\n" << logofs_flush;
-      #endif
-    }
-  }
-  else
-  {
-    packQuality = 0;
-  }
-
-  return 1;
-}
-
-int ParsePackMethod(const int method, const int quality)
-{
-  switch (method)
-  {
-    case PACK_NONE:
-    {
-      strcpy(packMethodName, "none");
-
-      break;
-    }
-    case PACK_MASKED_8_COLORS:
-    {
-      strcpy(packMethodName, "8");
-
-      break;
-    }
-    case PACK_MASKED_64_COLORS:
-    {
-      strcpy(packMethodName, "64");
-
-      break;
-    }
-    case PACK_MASKED_256_COLORS:
-    {
-      strcpy(packMethodName, "256");
-
-      break;
-    }
-    case PACK_MASKED_512_COLORS:
-    {
-      strcpy(packMethodName, "512");
-
-      break;
-    }
-    case PACK_MASKED_4K_COLORS:
-    {
-      strcpy(packMethodName, "4k");
-
-      break;
-    }
-    case PACK_MASKED_32K_COLORS:
-    {
-      strcpy(packMethodName, "32k");
-
-      break;
-    }
-    case PACK_MASKED_64K_COLORS:
-    {
-      strcpy(packMethodName, "64k");
-
-      break;
-    }
-    case PACK_MASKED_256K_COLORS:
-    {
-      strcpy(packMethodName, "256k");
-
-      break;
-    }
-    case PACK_MASKED_2M_COLORS:
-    {
-      strcpy(packMethodName, "2m");
-
-      break;
-    }
-    case PACK_MASKED_16M_COLORS:
-    {
-      strcpy(packMethodName, "16m");
-
-      break;
-    }
-    case PACK_JPEG_8_COLORS:
-    {
-      strcpy(packMethodName, "8-jpeg");
-
-      break;
-    }
-    case PACK_JPEG_64_COLORS:
-    {
-      strcpy(packMethodName, "64-jpeg");
-
-      break;
-    }
-    case PACK_JPEG_256_COLORS:
-    {
-      strcpy(packMethodName, "256-jpeg");
-
-      break;
-    }
-    case PACK_JPEG_512_COLORS:
-    {
-      strcpy(packMethodName, "512-jpeg");
-
-      break;
-    }
-    case PACK_JPEG_4K_COLORS:
-    {
-      strcpy(packMethodName, "4k-jpeg");
-
-      break;
-    }
-    case PACK_JPEG_32K_COLORS:
-    {
-      strcpy(packMethodName, "32k-jpeg");
-
-      break;
-    }
-    case PACK_JPEG_64K_COLORS:
-    {
-      strcpy(packMethodName, "64k-jpeg");
-
-      break;
-    }
-    case PACK_JPEG_256K_COLORS:
-    {
-      strcpy(packMethodName, "256k-jpeg");
-
-      break;
-    }
-    case PACK_JPEG_2M_COLORS:
-    {
-      strcpy(packMethodName, "2m-jpeg");
-
-      break;
-    }
-    case PACK_JPEG_16M_COLORS:
-    {
-      strcpy(packMethodName, "16m-jpeg");
-
-      break;
-    }
-    case PACK_PNG_8_COLORS:
-    {
-      strcpy(packMethodName, "8-png");
-
-      break;
-    }
-    case PACK_PNG_64_COLORS:
-    {
-      strcpy(packMethodName, "64-png");
-
-      break;
-    }
-    case PACK_PNG_256_COLORS:
-    {
-      strcpy(packMethodName, "256-png");
-
-      break;
-    }
-    case PACK_PNG_512_COLORS:
-    {
-      strcpy(packMethodName, "512-png");
-
-      break;
-    }
-    case PACK_PNG_4K_COLORS:
-    {
-      strcpy(packMethodName, "4k-png");
-
-      break;
-    }
-    case PACK_PNG_32K_COLORS:
-    {
-      strcpy(packMethodName, "32k-png");
-
-      break;
-    }
-    case PACK_PNG_64K_COLORS:
-    {
-      strcpy(packMethodName, "64k-png");
-
-      break;
-    }
-    case PACK_PNG_256K_COLORS:
-    {
-      strcpy(packMethodName, "256k-png");
-
-      break;
-    }
-    case PACK_PNG_2M_COLORS:
-    {
-      strcpy(packMethodName, "2m-png");
-
-      break;
-    }
-    case PACK_PNG_16M_COLORS:
-    {
-      strcpy(packMethodName, "16m-png");
-
-      break;
-    }
-    case PACK_RGB_16M_COLORS:
-    {
-      strcpy(packMethodName, "16m-rgb");
-
-      break;
-    }
-    case PACK_RLE_16M_COLORS:
-    {
-      strcpy(packMethodName, "16m-rle");
-
-      break;
-    }
-    case PACK_BITMAP_16M_COLORS:
-    {
-      strcpy(packMethodName, "16m-bitmap");
-
-      break;
-    }
-    case PACK_LOSSY:
-    {
-      strcpy(packMethodName, "lossy");
-
-      break;
-    }
-    case PACK_LOSSLESS:
-    {
-      strcpy(packMethodName, "lossless");
-
-      break;
-    }
-    case PACK_ADAPTIVE:
-    {
-      strcpy(packMethodName, "adaptive");
-
-      break;
-    }
-    default:
-    {
-      return -1;
-    }
-  }
-
-  if (quality < 0 || quality > 9)
-  {
-    return -1;
-  }
-
-  if (packMethod == PACK_RGB_16M_COLORS ||
-          packMethod == PACK_RLE_16M_COLORS ||
-              packMethod == PACK_BITMAP_16M_COLORS ||
-                  (packMethod >= PACK_JPEG_8_COLORS &&
-                      packMethod <= PACK_JPEG_16M_COLORS) ||
-                          (packMethod >= PACK_PNG_8_COLORS &&
-                              packMethod <= PACK_PNG_16M_COLORS) ||
-                                  packMethod == PACK_LOSSY ||
-                                      packMethod == PACK_LOSSLESS ||
-                                          packMethod == PACK_ADAPTIVE)
-  {
-    sprintf(packMethodName + strlen(packMethodName),
-                "-%d", quality);
-  }
-
-  packMethod  = method;
-  packQuality = quality;
-
-  control -> PackMethod  = packMethod;
-  control -> PackQuality = packQuality;
-
-  return 1;
-}
-
-int SetDirectories()
-{
-  //
-  // Determine the location of the user's NX
-  // directory and the other relevant paths.
-  // The functions below will check the pa-
-  // rameters passed to the program and will
-  // query the environment, if needed.
-  //
-
-  control -> HomePath   = GetHomePath();
-  control -> RootPath   = GetRootPath();
-  control -> SystemPath = GetSystemPath();
-  control -> TempPath   = GetTempPath();
-  control -> ClientPath = GetClientPath();
-
-  return 1;
-}
-
-int SetLogs()
-{
-  //
-  // So far we used stderr (or stdout under
-  // WIN32). Now use the files selected by
-  // the user.
-  //
-
-  if (*statsFileName == '\0')
-  {
-    strcpy(statsFileName, "stats");
-
-    #ifdef TEST
-    *logofs << "Loop: Assuming default statistics file '"
-            << statsFileName << "'.\n" << logofs_flush;
-    #endif
-  }
-  #ifdef TEST
-  else
-  {
-    *logofs << "Loop: Name selected for statistics is '"
-            << statsFileName << "'.\n" << logofs_flush;
-  }
-  #endif
-
-  if (OpenLogFile(statsFileName, statofs) < 0)
-  {
-    HandleCleanup();
-  }
-
-  #ifndef MIXED
-
-  if (*errorsFileName == '\0')
-  {
-    strcpy(errorsFileName, "errors");
-
-    #ifdef TEST
-    *logofs << "Loop: Assuming default log file name '"
-            << errorsFileName << "'.\n" << logofs_flush;
-    #endif
-  }
-  #ifdef TEST
-  else
-  {
-    *logofs << "Loop: Name selected for log file is '"
-            << errorsFileName << "'.\n" << logofs_flush;
-  }
-  #endif
-
-  //
-  // Share the bebug output with the nxssh binder
-  // process. The file must be made writable by
-  // everybody because the nxssh process is run by
-  // nxserver as the nx user.
-  //
-
-  #ifdef BINDER
-
-  strcpy(errorsFileName, "/tmp/errors");
-
-  ostream *tmpfs = new ofstream(errorsFileName, ios::out);
-
-  delete tmpfs;
-
-  chmod(errorsFileName, S_IRUSR | S_IWUSR | S_IRGRP |
-            S_IWGRP | S_IROTH | S_IWOTH);
-
-  #endif
-                
-  if (OpenLogFile(errorsFileName, logofs) < 0)
-  {
-    HandleCleanup();
-  }
-
-  //
-  // By default the session log is the standard error
-  // of the process. It is anyway required to set the
-  // option when running inside SSH, otherwise the
-  // output will go to the same file as the SSH log,
-  // depending where the NX client has redirected the
-  // output.
-  //
-
-  if (*sessionFileName != '\0')
-  {
-    #ifdef TEST
-    *logofs << "Loop: Name selected for session file is '"
-            << sessionFileName << "'.\n" << logofs_flush;
-    #endif
-
-    if (errofs != NULL)
-    {
-      #ifdef WARNING
-      *logofs << "Loop: WARNING! Unexpected value for stream errofs.\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Warning" << ": Unexpected value for stream errofs.\n";
-    }
-
-    if (errsbuf != NULL)
-    {
-      #ifdef WARNING
-      *logofs << "Loop: WARNING! Unexpected value for buffer errsbuf.\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Warning" << ": Unexpected value for buffer errsbuf.\n";
-    }
-
-    errofs  = NULL;
-    errsbuf = NULL;
-
-    if (OpenLogFile(sessionFileName, errofs) < 0)
-    {
-      HandleCleanup();
-    }
-
-    //
-    // Redirect the standard error to the file.
-    //
-
-    errsbuf = cerr.rdbuf(errofs -> rdbuf());
-  }
-
-  #endif
-
-  return 1;
-}
-
-int SetPorts()
-{
-  //
-  // Depending on the proxy side, we need to determine on which
-  // port to listen for the given protocol or to which port we
-  // will have to forward the connection. Three possibilities
-  // are given for each supported protocol:
-  //
-  // Port <= 0: Disable port forwarding.
-  // Port == 1: Use the default port.
-  // Port >  1: Use the specified port.
-  //
-  // At the connectiong side the user should always explicitly
-  // set the ports where the connections will be forwarded. This
-  // is both for security reasons and because, when running both
-  // proxies on the same host, there is a concrete possibility
-  // that, by using the default ports, the connection will be
-  // forwarded to the same port where the peer proxy is listen-
-  // ing, causing a loop.
-  //
-
-  useCupsSocket = 0;
-  if (cupsPort.enabled()) {
-    if (control -> ProxyMode == proxy_client) {
-      cupsPort.setDefaultTCPPort(DEFAULT_NX_CUPS_PORT_OFFSET + proxyPort);
-      useCupsSocket = 1;
-    }
-    else
-      cupsPort.setDefaultTCPPort(631);
-  }
-
-#ifdef TEST
-  *logofs << "Loop: cups port: " << cupsPort << "\n"
-            << logofs_flush;
-#endif
-
-  useAuxSocket = 0;
-  if (auxPort.enabled()) {
-    if (control -> ProxyMode == proxy_client) {
-      auxPort.setDefaultTCPPort(DEFAULT_NX_AUX_PORT_OFFSET + proxyPort);
-      useAuxSocket = 1;
-    }
-    else {
-      auxPort.setDefaultTCPPort(1);
-
-      if (auxPort.getTCPPort() != 1) {
-
-#ifdef WARNING
-        *logofs << "Loop: WARNING! Overriding auxiliary X11 "
-                << "port with new value '" << 1 << "'.\n"
-                << logofs_flush;
-#endif
-
-        cerr << "Warning" << ": Overriding auxiliary X11 "
-             << "port with new value '" << 1 << "'.\n";
-
-	auxPort.setSpec("1");
-      }
-    }
-  }
-
-#ifdef TEST
-  *logofs << "Loop: aux port: " << auxPort << "\n"
-	  << logofs_flush;
-#endif
-
-  useSmbSocket = 0;
-  if (smbPort.enabled()) {
-    if (control -> ProxyMode == proxy_client) {
-      auxPort.setDefaultTCPPort(DEFAULT_NX_SMB_PORT_OFFSET + proxyPort);
-      useAuxSocket = 1;
-    }
-    else
-      auxPort.setDefaultTCPPort(139);
-  }
-
-
-#ifdef TEST
-  *logofs << "Loop: smb port: " << smbPort << "\n"
-	  << logofs_flush;
-#endif
-
-  useMediaSocket = 0;
-  if (mediaPort.enabled()) {
-    if (control -> ProxyMode == proxy_client) {
-      mediaPort.setDefaultTCPPort(DEFAULT_NX_MEDIA_PORT_OFFSET + proxyPort);
-      useMediaSocket = 1;
-    }
-    else if (mediaPort.getTCPPort() == 1) {
-#ifdef PANIC
-      *logofs << "Loop: PANIC! No port specified for multimedia connections.\n"
-              << logofs_flush;
-#endif
-
-      cerr << "Error" << ": No port specified for multimedia connections.\n";
-
-      HandleCleanup();
-    }
-  }
-
-#ifdef TEST
-  *logofs << "Loop: Using multimedia port '" << mediaPort
-	  << "'.\n" << logofs_flush;
-#endif
-
-  useHttpSocket = 0;
-  if (httpPort.enabled()) {
-    if (control -> ProxyMode == proxy_client) {
-      httpPort.setDefaultTCPPort(DEFAULT_NX_HTTP_PORT_OFFSET + proxyPort);
-      useHttpSocket = 1;
-    }
-    else
-      httpPort.setDefaultTCPPort(80);
-  }
-
-#ifdef TEST
-  *logofs << "Loop: Using HTTP port '" << httpPort
-	  << "'.\n" << logofs_flush;
-#endif
-
-  if (ParseFontPath(fontPort) <= 0)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Disabling font server connections.\n"
-            << logofs_flush;
-    #endif
-
-    *fontPort = '\0';
-
-    useFontSocket = 0;
-  }
-  else
-  {
-    //
-    // We don't know yet if the remote proxy supports
-    // the font server connections. If needed, we will
-    // disable the font server connections at later
-    // time.
-    //
-
-    if (control -> ProxyMode == proxy_server)
-    {
-      useFontSocket = 1;
-    }
-    else
-    {
-      useFontSocket = 0;
-    }
-
-    #ifdef TEST
-    *logofs << "Loop: Using font server port '" << fontPort
-            << "'.\n" << logofs_flush;
-    #endif
-  }
-
-  useSlaveSocket = 0;
-  if (slavePort.enabled()) {
-    useSlaveSocket = 1;
-    if (control -> ProxyMode == proxy_client)
-      slavePort.setDefaultTCPPort(DEFAULT_NX_SLAVE_PORT_CLIENT_OFFSET + proxyPort);
-    else
-      slavePort.setDefaultTCPPort(DEFAULT_NX_SLAVE_PORT_SERVER_OFFSET + proxyPort);
-  }
-
-#ifdef TEST
-  *logofs << "Loop: Using slave port '" << slavePort
-	  << "'.\n" << logofs_flush;
-#endif
-
-  return 1;
-}
-
-int SetDescriptors()
-{
-  unsigned int limit = 0;
-
-  #ifdef RLIMIT_NOFILE
-
-  rlimit limits;
-
-  if (getrlimit(RLIMIT_NOFILE, &limits) == 0)
-  {
-    if (limits.rlim_max == RLIM_INFINITY)
-    {
-      limit = 0;
-    }
-    else
-    {
-      limit = (unsigned int) limits.rlim_max;
-    }
-  }
-
-  #endif
-
-  #ifdef _SC_OPEN_MAX
-
-  if (limit == 0)
-  {
-    limit = sysconf(_SC_OPEN_MAX);
-  }
-
-  #endif
-
-  #ifdef FD_SETSIZE
-
-  if (limit > FD_SETSIZE)
-  {
-    limit = FD_SETSIZE;
-  }
-
-  #endif
-
-  #ifdef RLIMIT_NOFILE
-
-  if (limits.rlim_cur < limit)
-  {
-    limits.rlim_cur = limit;
-
-    setrlimit(RLIMIT_NOFILE, &limits);
-  }
-
-  #endif
-
-  if (limit == 0)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Cannot determine number of available "
-            << "file descriptors.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Cannot determine number of available "
-         << "file descriptors.\n";
-
-    return -1;
-  }
-
-  return 1;
-}
-
-//
-// Find the directory containing the caches
-// matching the session type.
-//
-
-int SetCaches()
-{
-  if ((control -> PersistentCachePath = GetCachePath()) == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Error getting or creating the cache path.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Error getting or creating the cache path.\n";
-
-    HandleCleanup();
-  }
-
-  #ifdef TEST
-  *logofs << "Loop: Path of cache files is '" << control -> PersistentCachePath
-          << "'.\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-//
-// Initialize all configuration parameters.
-//
-
-int SetParameters()
-{
-  //
-  // Find out the type of session.
-  //
-
-  SetSession();
-
-  //
-  // Initialize the network and compression
-  // parameters according to the settings
-  // suggested by the user.
-  //
-
-  SetLink();
-
-  //
-  // Set compression according to link speed.
-  //
-
-  SetCompression();
-
-  //
-  // Be sure that we have a literal for current
-  // cache size. Value will reflect control's
-  // default unless we already parsed a 'cache'
-  // option. Server side has no control on size
-  // of cache but is informed at session nego-
-  // tiation about how much memory is going to
-  // be used.
-  //
-
-  SetStorage();
-
-  //
-  // Set size of shared memory segments.
-  //
-
-  SetShmem();
-
-  //
-  // Make adjustments to cache based
-  // on the pack method.
-  //
-
-  SetPack();
-
-  //
-  // Set disk-based image cache.
-  //
-
-  SetImages();
-
-  //
-  // Set CPU and bandwidth limits.
-  //
-
-  SetLimits();
-
-  return 1;
-}
-
-//
-// According to session literal determine
-// the type of traffic that is going to be
-// transported. Literals should be better
-// standardized in future NX versions.
-//
-
-int SetSession()
-{
-  if (strncmp(sessionType, "agent", strlen("agent")) == 0 ||
-          strncmp(sessionType, "desktop", strlen("desktop")) == 0 ||
-              strncmp(sessionType, "rootless", strlen("rootless")) == 0 ||
-                  strncmp(sessionType, "console", strlen("console")) == 0 ||
-                      strncmp(sessionType, "default", strlen("default")) == 0 ||
-                          strncmp(sessionType, "gnome", strlen("gnome")) == 0 ||
-                              strncmp(sessionType, "kde", strlen("kde")) == 0 ||
-                                  strncmp(sessionType, "cde", strlen("cde")) == 0 ||
-                                      strncmp(sessionType, "xdm", strlen("xdm")) == 0)
-  {
-    control -> SessionMode = session_agent;
-  }
-  else if (strncmp(sessionType, "win", strlen("win")) == 0 ||
-               strncmp(sessionType, "vnc", strlen("vnc")) == 0)
-  {
-    control -> SessionMode = session_agent;
-  }
-  else if (strncmp(sessionType, "shadow", strlen("shadow")) == 0)
-  {
-    control -> SessionMode = session_shadow;
-  }
-  else if (strncmp(sessionType, "proxy", strlen("proxy")) == 0 ||
-               strncmp(sessionType, "application", strlen("application")) == 0 ||
-                   strncmp(sessionType, "raw", strlen("raw")) == 0)
-  {
-    control -> SessionMode = session_proxy;
-  }
-  else
-  {
-    //
-    // If the session type is not passed or
-    // it is not among the recognized strings,
-    // we assume that the proxy is connected
-    // to the agent.
-    //
-
-    //
-    // Since ProtoStep8 (#issue 108) and also
-    // with older "unix-" sessions
-    //
-
-    if (*sessionType != '\0')
-    {
-      #ifdef WARNING
-      *logofs << "Loop: WARNING! Unrecognized session type '"
-              << sessionType << "'. Assuming agent session.\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Warning" << ": Unrecognized session type '"
-           << sessionType << "'. Assuming agent session.\n";
-    }
-
-    control -> SessionMode = session_agent;
-  }
-
-  #if defined(TEST) || defined(INFO)
-  *logofs << "Loop: Assuming session type '"
-          << DumpSession(control -> SessionMode) << "' with "
-          << "string '" << sessionType << "'.\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // By default the policy is immediate. Agents
-  // will set a different policy, if they like.
-  // Anyway we need to check if the user has
-  // provided a custom flush policy.
-  //
-
-  if (usePolicy != -1)
-  {
-    if (usePolicy > 0)
-    {
-      control -> FlushPolicy = policy_deferred;
-    }
-    else
-    {
-      control -> FlushPolicy = policy_immediate;
-    }
-
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: WARNING! Forcing flush policy to '"
-            << DumpPolicy(control -> FlushPolicy)
-            << ".\n" << logofs_flush;
-    #endif
-  }
-  else
-  {
-    control -> FlushPolicy = policy_immediate;
-
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Setting initial flush policy to '"
-            << DumpPolicy(control -> FlushPolicy)
-            << "'.\n" << logofs_flush;
-    #endif
-  }
-
-  //
-  // Check if the proxy library is run inside
-  // another program providing encryption, as
-  // it is the case of the SSH client.
-  //
-
-  if (useEncryption != -1)
-  {
-    if (useEncryption > 0)
-    {
-      control -> LinkEncrypted = 1;
-    }
-    else
-    {
-      control -> LinkEncrypted = 0;
-    }
-  }
-
-  if (control -> LinkEncrypted == 1)
-  {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Proxy running as part of an "
-            << "encrypting client.\n"
-            << logofs_flush;
-    #endif
-  }
-  else
-  {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Assuming proxy running as a "
-            << "standalone program.\n"
-            << logofs_flush;
-    #endif
-  }
-
-  //
-  // Check if the system administrator has
-  // enabled the respawn of the client at
-  // the end of session.
-  //
-
-  if (control -> ProxyMode == proxy_server)
-  {
-    struct stat fileStat;
-
-    char fileName[DEFAULT_STRING_LENGTH];
-
-    snprintf(fileName, DEFAULT_STRING_LENGTH - 1,
-                 "%s/share/noexit", control -> SystemPath);
-
-    *(fileName + DEFAULT_STRING_LENGTH - 1) = '\0';
-
-    if (stat(fileName, &fileStat) == 0)
-    {
-      #ifdef TEST
-      *logofs << "Loop: Enabling respawn of client at session shutdown.\n"
-              << logofs_flush;
-      #endif
-
-      control -> EnableRestartOnShutdown = 1;
-    }
-  }
-
-  return 1;
-}
-
-int SetStorage()
-{
-  //
-  // If differential compression is disabled
-  // we don't need a cache at all.
-  //
-
-  if (control -> LocalDeltaCompression == 0)
-  {
-    control -> ClientTotalStorageSize = 0;
-    control -> ServerTotalStorageSize = 0;
-  }
-
-  //
-  // Set a a cache size literal.
-  //
-
-  int size = control -> getUpperStorageSize();
-
-  if (size / 1024 > 0)
-  {
-    sprintf(cacheSizeName, "%dk", size / 1024);
-  }
-  else
-  { 
-    sprintf(cacheSizeName, "%d", size);
-  }
-
-  if (control -> ProxyMode == proxy_client)
-  {
-    control -> LocalTotalStorageSize =
-        control -> ClientTotalStorageSize;
-
-    control -> RemoteTotalStorageSize =
-        control -> ServerTotalStorageSize;
-  }
-  else
-  {
-    control -> LocalTotalStorageSize =
-        control -> ServerTotalStorageSize;
-
-    control -> RemoteTotalStorageSize =
-        control -> ClientTotalStorageSize;
-  }
-
-  #ifdef DEBUG
-  *logofs << "Loop: Storage size limit is "
-          << control -> ClientTotalStorageSize
-          << " at client and "
-          << control -> ServerTotalStorageSize
-          << " at server.\n"
-          << logofs_flush;
-  #endif
-
-  #ifdef DEBUG
-  *logofs << "Loop: Storage local limit set to "
-          << control -> LocalTotalStorageSize
-          << " remote limit set to "
-          << control -> RemoteTotalStorageSize
-          << ".\n" << logofs_flush;
-  #endif
-
-  //
-  // Never reserve for split store more than
-  // half the memory available for messages.
-  //
-
-  if (size > 0 && control ->
-          SplitTotalStorageSize > size / 2)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Reducing size of split store to "
-            << size / 2 << " bytes.\n"
-            << logofs_flush;
-    #endif
-
-    control -> SplitTotalStorageSize = size / 2;
-  }
-
-  //
-  // Don't load render from persistent
-  // cache if extension is hidden or
-  // not supported by agent.
-  //
-
-  if (control -> HideRender == 1)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Not loading render extension "
-            << "from persistent cache.\n"
-            << logofs_flush;
-    #endif
-
-    control -> PersistentCacheLoadRender = 0;
-  }
-
-  return 1;
-}
-
-int SetShmem()
-{
-  //
-  // If not set, adjust the size of the shared
-  // memory segment according to size of the
-  // message cache.
-  //
-
-  if (*shsegSizeName == '\0')
-  {
-    int size = control -> getUpperStorageSize();
-
-    const int mega = 1048576;
-
-    if (size > 0)
-    {
-      if (size <= 1 * mega)
-      {
-        size = 0;
-      }
-      else if (size <= 2 * mega)
-      {
-        size = 524288;
-      }
-      else if (size < 4 * mega)
-      {
-        size = 1048576;
-      }
-      else
-      {
-        size = size / 4;
-      }
-
-      if (size > 4194304)
-      {
-        size = 4194304;
-      }
-
-      control -> ShmemClientSize = size;
-      control -> ShmemServerSize = size;
-    }
-    else
-    {
-      //
-      // The delta compression is disabled.
-      // Use a default segment size of 2 MB.
-      //
-
-      control -> ShmemServerSize = 2 * mega;
-    }
-  }
-
-  //
-  // Client side shared memory support is
-  // not useful and not implemented.
-  //
-
-  if (control -> ShmemServerSize >= 524288)
-  {
-    control -> ShmemServer = 1;
-
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Set initial shared memory size "
-            << "to " << control -> ShmemServerSize
-            << " bytes.\n" << logofs_flush;
-    #endif
-  }
-  else
-  {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Disabled use of the shared memory "
-            << "extension.\n" << logofs_flush;
-    #endif
-
-    control -> ShmemServer = 0;
-  }
-
-  // For android, no shared memory available
-  control -> ShmemServer = 0;
-  control -> ShmemClientSize = 0;
-
-  return 1;
-}
-
-//
-// Adjust the pack method according to the
-// type of the session.
-//
-
-int SetPack()
-{
-  #ifdef TEST
-  *logofs << "Loop: Setting pack with initial method "
-          << packMethod << " and quality " << packQuality
-          << ".\n" << logofs_flush;
-  #endif
-
-  //
-  // Check if this is a proxy session and, in
-  // this case, set the pack method to none.
-  // Packed images are not supported by plain
-  // X applications.
-  //
-
-  if (control -> SessionMode == session_proxy)
-  {
-    #ifdef TEST
-    *logofs << "Loop: WARNING! Disabling pack with proxy session.\n"
-            << logofs_flush;
-    #endif
-
-    packMethod = PACK_NONE;
-  }
-
-  //
-  // Adjust the internal settings according
-  // to the newly selected pack method.
-  //
-
-  ParsePackMethod(packMethod, packQuality);
-
-  //
-  // Don't load messages from persistent
-  // cache if packed images are disabled.
-  //
-
-  if (control -> PackMethod == PACK_NONE)
-  {
-    control -> PersistentCacheLoadPacked = 0;
-
-    #ifdef TEST
-    *logofs << "Loop: Not loading packed images "
-            << "from persistent cache.\n"
-            << logofs_flush;
-    #endif
-  }
-
-  return 1;
-}
-
-//
-// Set the disk-based image cache parameters
-// according to the user's wishes.
-//
-
-int SetImages()
-{
-  //
-  // Be sure we disable the image cache if we
-  // are connecting to plain X clients.
-  //
-
-  if (control -> SessionMode == session_proxy)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Disabling image cache with "
-            << "session '" << DumpSession(control ->
-               SessionMode) << "'.\n" << logofs_flush;
-    #endif
-
-    sprintf(imagesSizeName, "0");
-
-    control -> ImageCacheEnableLoad = 0;
-    control -> ImageCacheEnableSave = 0;
-
-    return 1;
-  }
-
-  int size = control -> ImageCacheDiskLimit;
-
-  if (size / 1024 > 0)
-  {
-    sprintf(imagesSizeName, "%dk", size / 1024);
-  }
-  else
-  {
-    sprintf(imagesSizeName, "%d", size);
-  }
-
-  if (size > 0)
-  {
-    control -> ImageCacheEnableLoad = 1;
-    control -> ImageCacheEnableSave = 1;
-
-    if (control -> ProxyMode == proxy_server)
-    {
-      if ((control -> ImageCachePath = GetImagesPath()) == NULL)
-      {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Error getting or creating image cache path.\n"
-                << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Error getting or creating image cache path.\n";
-
-        HandleCleanup();
-      }
-
-      #ifdef TEST
-      *logofs << "Loop: Path of image cache files is '" << control -> ImageCachePath
-              << "'.\n" << logofs_flush;
-      #endif
-    }
-  }
-  else
-  {
-    #ifdef TEST
-    *logofs << "Loop: Disabling the persistent image cache.\n"
-            << logofs_flush;
-    #endif
-
-    control -> ImageCacheEnableLoad = 0;
-    control -> ImageCacheEnableSave = 0;
-  }
-
-  return 1;
-}
-
-int SetVersion()
-{
-  //
-  // Normalize the different proxy versions.
-  //
-
-  int local = (control -> LocalVersionMajor << 24) |
-                  (control -> LocalVersionMinor << 16) |
-                      control -> LocalVersionPatch;
-
-  int remote = (control -> RemoteVersionMajor << 24) |
-                   (control -> RemoteVersionMinor << 16) |
-                       control -> RemoteVersionPatch;
-
-  int major = -1;
-  int minor = -1;
-  int patch = -1;
-
-  if (control -> RemoteVersionMajor <= 1)
-  {
-    //
-    // The remote proxy uses a different
-    // logic to determine the version so
-    // we default to the compatibility
-    // version.
-    //
-
-    major = control -> CompatVersionMajor;
-    minor = control -> CompatVersionMinor;
-    patch = control -> CompatVersionPatch;
-
-    #ifdef TEST
-    *logofs << "Loop: Using compatibility version '"
-            << major << "." << minor << "." << patch
-            << "'.\n" << logofs_flush;
-    #endif
-  }
-  else if (control -> LocalVersionMajor >
-               control -> RemoteVersionMajor)
-  {
-    //
-    // We use a more recent version. Let's
-    // negotiate the version based on the
-    // version supported by the remote.
-    //
-
-    major = control -> RemoteVersionMajor;
-    minor = control -> RemoteVersionMinor;
-    patch = control -> RemoteVersionPatch;
-
-    #ifdef TEST
-    *logofs << "Loop: Using remote version '"
-            << major << "." << minor << "." << patch
-            << "'.\n" << logofs_flush;
-    #endif
-  }
-  else
-  {
-    //
-    // We support a major version that is
-    // equal or older than the remote. We
-    // assume the smaller version between
-    // the two, including the minor and
-    // the patch numbers.
-    //
-
-    if (local > remote)
-    {
-      major = control -> RemoteVersionMajor;
-      minor = control -> RemoteVersionMinor;
-      patch = control -> RemoteVersionPatch;
-
-      #ifdef TEST
-      *logofs << "Loop: Using remote version '"
-              << major << "." << minor << "." << patch
-              << "'.\n" << logofs_flush;
-      #endif
-    }
-    else
-    {
-      major = control -> LocalVersionMajor;
-      minor = control -> LocalVersionMinor;
-      patch = control -> LocalVersionPatch;
-
-      #ifdef TEST
-      *logofs << "Loop: Using local version '"
-              << major << "." << minor << "." << patch
-              << "'.\n" << logofs_flush;
-      #endif
-    }
-  }
-
-  //
-  // Handle versions from 3.5.0. The protocol
-  // step 10 is the minimum supported version.
-  //
-
-  int step = 0;
-
-  if (major == 3)
-  {
-    if (minor >= 5)
-    {
-      step = 10;
-    }
-  }
-  else if (major > 3)
-  {
-    step = 10;
-  }
-
-  if (step == 0)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Unable to set the protocol step value from "
-         << "the negotiated protocol version " << major << "." << minor
-         << "." << patch << ".\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Unable to set the protocol step value from "
-         << "the negotiated protocol version " << major << "." << minor
-         << "." << patch << ".\n";
-
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Incompatible remote version "
-            << control -> RemoteVersionMajor << "." << control -> RemoteVersionMinor
-            << "." << control -> RemoteVersionPatch << " with local version "
-            << control -> LocalVersionMajor << "." << control -> LocalVersionMinor
-            << "." << control -> LocalVersionPatch << ".\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Incompatible remote version "
-         << control -> RemoteVersionMajor << "." << control -> RemoteVersionMinor
-         << "." << control -> RemoteVersionPatch << " with local version "
-         << control -> LocalVersionMajor << "." << control -> LocalVersionMinor
-         << "." << control -> LocalVersionPatch << ".\n";
-
-    return -1;
-  }
-
-  #ifdef TEST
-  *logofs << "Loop: Using NX protocol step "
-          << step << ".\n" << logofs_flush;
-  #endif
-
-  control -> setProtoStep(step);
-
-  //
-  // Ignore the differences in patch version
-  // and print a warning if the local version
-  // is different or obsolete compared to
-  // the remote.
-  //
-
-  local  &= 0xffff0000;
-  remote &= 0xffff0000;
-
-  if (local != remote)
-  {
-    #ifdef WARNING
-    *logofs << "Loop: WARNING! Connected to remote version "
-            << control -> RemoteVersionMajor << "." << control -> RemoteVersionMinor
-            << "." << control -> RemoteVersionPatch << " with local version "
-            << control -> LocalVersionMajor << "." << control -> LocalVersionMinor
-            << "." << control -> LocalVersionPatch << ".\n" << logofs_flush;
-    #endif
-
-    cerr << "Warning" << ": Connected to remote version "
-         << control -> RemoteVersionMajor << "." << control -> RemoteVersionMinor
-         << "." << control -> RemoteVersionPatch << " with local version "
-         << control -> LocalVersionMajor << "." << control -> LocalVersionMinor
-         << "." << control -> LocalVersionPatch << ".\n" << logofs_flush;
-  }
-
-  if (local < remote)
-  {
-    cerr << "Warning" << ": Consider checking https://github.com/ArcticaProject/nx-libs/releases for updates.\n";
-  }
-
-  //
-  // Now that we are aware of the remote
-  // version, let's adjust the options to
-  // be compatible with the remote proxy.
-  //
-
-  if (control -> ProxyMode == proxy_client)
-  {
-    //
-    // Since ProtoStep8 (#issue 108)
-    //
-    // Now it's assumed that the remote is
-    // able to handle the selected pack
-    // method
-    //
-
-    #ifdef TEST
-    *logofs << __FILE__ << " : " << __LINE__ << " - "
-            << "step = " << control -> getProtoStep()
-            << " packMethod = " << packMethod
-            << " packQuality = " << packQuality
-            << ".\n"  << logofs_flush;
-    #endif
-
-    //
-    // Update the pack method name.
-    //
-
-    ParsePackMethod(packMethod, packQuality);
-  }
-
-  //
-  // At the moment the image cache is not used by the
-  // agent. Proxy versions older than 3.0.0 assumed
-  // that it was enabled and sent specific bits as part
-  // of the encoding. Conversely, it is advisable to
-  // disable the cache right now. By not enabling the
-  // the image cache, the house-keeping process will
-  // only take care of cleaning up the "cache-" direc-
-  // tories.
-  //
-
-  //
-  // Considering that compatibility with older versions
-  // has been set to cover as far as 3.5.0, the cache can
-  // be disabled at this point without any concern
-  //
-
-  // Since ProtoStep8 (#issue 108)
-  #ifdef TEST
-  *logofs << "Loop: Disabling image cache with protocol "
-          << "step '" << control -> getProtoStep()
-          << "'.\n"  << logofs_flush;
-  #endif
-
-  sprintf(imagesSizeName, "0");
-
-  control -> ImageCacheEnableLoad = 0;
-  control -> ImageCacheEnableSave = 0;
-
-  return 1;
-}
-
-//
-// Identify the requested link settings
-// and update the control parameters
-// accordingly.
-//
-
-int SetLink()
-{
-  #ifdef TEST
-  *logofs << "Loop: Setting link with initial value "
-          << linkSpeedName << ".\n" << logofs_flush;
-  #endif
-
-  if (*linkSpeedName == '\0')
-  {
-    strcpy(linkSpeedName, "lan");
-  }
-  
-  #ifdef TEST
-  *logofs << "Loop: Link speed is " << linkSpeedName
-          << ".\n" << logofs_flush;
-  #endif
-
-  if (strcasecmp(linkSpeedName, "modem") == 0)
-  {
-    SetLinkModem();
-  }
-  else if (strcasecmp(linkSpeedName, "isdn") == 0)
-  {
-    SetLinkIsdn();
-  }
-  else if (strcasecmp(linkSpeedName, "adsl") == 0)
-  {
-    SetLinkAdsl();
-  }
-  else if (strcasecmp(linkSpeedName, "wan") == 0)
-  {
-    SetLinkWan();
-  }
-  else if (strcasecmp(linkSpeedName, "lan") == 0)
-  {
-    SetLinkLan();
-  }
-  else
-  {
-    return -1;
-  }
-
-  //
-  // Set TCP_NODELAY according to the user's
-  // wishes.
-  //
-
-  if (useNoDelay != -1)
-  {
-    control -> OptionProxyClientNoDelay = useNoDelay;
-    control -> OptionProxyServerNoDelay = useNoDelay;
-  }
-
-  //
-  // Select the image compression method.
-  //
-
-  if (packMethod == -1)
-  {
-    packMethod = control -> PackMethod;
-  }
-
-  if (packQuality == -1)
-  {
-    packQuality = control -> PackQuality;
-  }
-
-  if (ParsePackMethod(packMethod, packQuality) < 0)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Unrecognized pack method id "
-            << packMethod << " with quality " << packQuality
-            << ".\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Unrecognized pack method id "
-         << packMethod << " with quality " << packQuality
-         << ".\n";
-
-    HandleCleanup();
-  }
-
-  //
-  // Check if the user disabled the ability
-  // to generate simple replies at the client
-  // side.
-  //
-
-  if (control -> SessionMode == session_proxy)
-  {
-    if (useTaint != -1)
-    {
-      control -> TaintReplies = (useTaint == 1);
-    }
-    else
-    {
-      #ifdef WARNING
-      *logofs << "Loop: WARNING! Forcing taint of replies "
-              << "with a proxy session.\n"
-              << logofs_flush;
-      #endif
-
-      control -> TaintReplies = 1;
-    }
-  }
-  else
-  {
-    //
-    // There is no need to taint the
-    // replies if we have an agent.
-    //
-
-    control -> TaintReplies = 0;
-  }
-
-  //
-  // Be sure that the requests needing a reply
-  // are flushed immediately. Normal X clients
-  // use so many replies to make the queuing
-  // completely useless.
-  //
-
-  if (control -> SessionMode == session_proxy)
-  {
-    #ifdef WARNING
-    *logofs << "Loop: WARNING! Forcing flush on priority "
-            << "with a proxy session.\n"
-            << logofs_flush;
-    #endif
-
-    control -> FlushPriority = 1;
-  }
-
-  return 1;
-}
-
-//
-// Parameters for MODEM 28.8/33.6/56 Kbps.
-//
-
-int SetLinkModem()
-{
-  #ifdef TEST
-  *logofs << "Loop: Setting parameters for MODEM.\n"
-          << logofs_flush;
-  #endif
-
-  control -> LinkMode = LINK_TYPE_MODEM;
-
-  control -> TokenSize  = 256;
-  control -> TokenLimit = 24;
-
-  control -> SplitMode             = 1;
-  control -> SplitTotalSize        = 128;
-  control -> SplitTotalStorageSize = 1048576;
-
-  control -> SplitTimeout   = 50;
-  control -> MotionTimeout  = 50;
-  control -> IdleTimeout    = 50;
-
-  control -> PackMethod  = PACK_ADAPTIVE;
-  control -> PackQuality = 3;
-
-  return 1;
-}
-
-//
-// Parameters for ISDN 64/128 Kbps.
-//
-
-int SetLinkIsdn()
-{
-  #ifdef TEST
-  *logofs << "Loop: Setting parameters for ISDN.\n"
-          << logofs_flush;
-  #endif
-
-  control -> LinkMode = LINK_TYPE_ISDN;
-
-  control -> TokenSize  = 384;
-  control -> TokenLimit = 24;
-
-  control -> SplitMode             = 1;
-  control -> SplitTotalSize        = 128;
-  control -> SplitTotalStorageSize = 1048576;
-
-  control -> SplitTimeout   = 50;
-  control -> MotionTimeout  = 20;
-  control -> IdleTimeout    = 50;
-
-  control -> PackMethod  = PACK_ADAPTIVE;
-  control -> PackQuality = 5;
-
-  return 1;
-}
-
-//
-// Parameters for ADSL 256 Kbps.
-//
-
-int SetLinkAdsl()
-{
-  #ifdef TEST
-  *logofs << "Loop: Setting parameters for ADSL.\n"
-          << logofs_flush;
-  #endif
-
-  control -> LinkMode = LINK_TYPE_ADSL;
-
-  control -> TokenSize  = 1536;
-  control -> TokenLimit = 24;
-
-  control -> SplitMode             = 1;
-  control -> SplitTotalSize        = 128;
-  control -> SplitTotalStorageSize = 1048576;
-
-  control -> SplitTimeout   = 50;
-  control -> MotionTimeout  = 10;
-  control -> IdleTimeout    = 50;
-
-  control -> PackMethod  = PACK_ADAPTIVE;
-  control -> PackQuality = 7;
-
-  return 1;
-}
-
-//
-// Parameters for XDSL/FDDI/ATM 1/2/34 Mbps WAN.
-//
-
-int SetLinkWan()
-{
-  #ifdef TEST
-  *logofs << "Loop: Setting parameters for WAN.\n"
-          << logofs_flush;
-  #endif
-
-  control -> LinkMode = LINK_TYPE_WAN;
-
-  control -> TokenSize  = 1536;
-  control -> TokenLimit = 24;
-
-  control -> SplitMode             = 1;
-  control -> SplitTotalSize        = 128;
-  control -> SplitTotalStorageSize = 1048576;
-
-  control -> SplitTimeout   = 50;
-  control -> MotionTimeout  = 5;
-  control -> IdleTimeout    = 50;
-
-  control -> PackMethod  = PACK_ADAPTIVE;
-  control -> PackQuality = 9;
-
-  return 1;
-}
-
-//
-// Parameters for LAN 10/100 Mbps.
-//
-
-int SetLinkLan()
-{
-  #ifdef TEST
-  *logofs << "Loop: Setting parameters for LAN.\n"
-          << logofs_flush;
-  #endif
-
-  control -> LinkMode = LINK_TYPE_LAN;
-
-  control -> TokenSize  = 1536;
-  control -> TokenLimit = 24;
-
-  control -> SplitMode             = 1;
-  control -> SplitTotalSize        = 128;
-  control -> SplitTotalStorageSize = 1048576;
-
-  control -> SplitTimeout   = 50;
-  control -> MotionTimeout  = 0;
-  control -> IdleTimeout    = 50;
-
-  control -> PackMethod  = PACK_ADAPTIVE;
-  control -> PackQuality = 9;
-
-  return 1;
-}
-
-//
-// Identify the requested link type and set
-// the control parameters accordingly.
-//
-
-int SetCompression()
-{
-  if (strcasecmp(linkSpeedName, "modem") == 0)
-  {
-    SetCompressionModem();
-  }
-  else if (strcasecmp(linkSpeedName, "isdn") == 0)
-  {
-    SetCompressionIsdn();
-  }
-  else if (strcasecmp(linkSpeedName, "adsl") == 0)
-  {
-    SetCompressionAdsl();
-  }
-  else if (strcasecmp(linkSpeedName, "wan") == 0)
-  {
-    SetCompressionWan();
-  }
-  else if (strcasecmp(linkSpeedName, "lan") == 0)
-  {
-    SetCompressionLan();
-  }
-  else
-  {
-    return -1;
-  }
-
-  if (control -> LocalDeltaCompression < 0)
-  {
-    control -> LocalDeltaCompression = 1;
-  }
-
-  //
-  // If we didn't set remote delta compression
-  // (as it should always be the case at client
-  // side) assume value of local side.
-  //
-
-  if (control -> RemoteDeltaCompression < 0)
-  {
-    control -> RemoteDeltaCompression =
-        control -> LocalDeltaCompression;
-  }
-
-  //
-  // If we didn't set remote compression levels
-  // assume values of local side.
-  //
-
-  if (control -> RemoteStreamCompression < 0)
-  {
-    control -> RemoteStreamCompressionLevel =
-        control -> LocalStreamCompressionLevel;
-
-    if (control -> RemoteStreamCompressionLevel > 0)
-    {
-      control -> RemoteStreamCompression = 1;
-    }
-    else
-    {
-      control -> RemoteStreamCompression = 0;
-    }
-  }
-
-  if (control -> RemoteDataCompression < 0)
-  {
-    control -> RemoteDataCompressionLevel =
-        control -> LocalDataCompressionLevel;
-
-    if (control -> RemoteDataCompressionLevel > 0)
-    {
-      control -> RemoteDataCompression = 1;
-    }
-    else
-    {
-      control -> RemoteDataCompression = 0;
-    }
-  }
-
-  return 1;
-}
-
-//
-// Compression for MODEM.
-//
-
-int SetCompressionModem()
-{
-  if (control -> LocalDataCompression < 0)
-  {
-    control -> LocalDataCompression      = 1;
-    control -> LocalDataCompressionLevel = 1;
-  }
-
-  if (control -> LocalDataCompressionThreshold < 0)
-  {
-    control -> LocalDataCompressionThreshold = 32;
-  }
-
-  if (control -> LocalStreamCompression < 0)
-  {
-    control -> LocalStreamCompression      = 1;
-    control -> LocalStreamCompressionLevel = 9;
-  }
-
-  return 1;
-}
-
-//
-// Compression for ISDN.
-//
-
-int SetCompressionIsdn()
-{
-  if (control -> LocalDataCompression < 0)
-  {
-    control -> LocalDataCompression      = 1;
-    control -> LocalDataCompressionLevel = 1;
-  }
-
-  if (control -> LocalDataCompressionThreshold < 0)
-  {
-    control -> LocalDataCompressionThreshold = 32;
-  }
-
-  if (control -> LocalStreamCompression < 0)
-  {
-    control -> LocalStreamCompression      = 1;
-    control -> LocalStreamCompressionLevel = 6;
-  }
-
-  return 1;
-}
-
-//
-// Compression for ADSL.
-//
-
-int SetCompressionAdsl()
-{
-  if (control -> LocalDataCompression < 0)
-  {
-    control -> LocalDataCompression      = 1;
-    control -> LocalDataCompressionLevel = 1;
-  }
-
-  if (control -> LocalDataCompressionThreshold < 0)
-  {
-    control -> LocalDataCompressionThreshold = 32;
-  }
-
-  if (control -> LocalStreamCompression < 0)
-  {
-    control -> LocalStreamCompression      = 1;
-    control -> LocalStreamCompressionLevel = 4;
-  }
-
-  return 1;
-}
-
-//
-// Compression for WAN.
-//
-
-int SetCompressionWan()
-{
-  if (control -> LocalDataCompression < 0)
-  {
-    control -> LocalDataCompression      = 1;
-    control -> LocalDataCompressionLevel = 1;
-  }
-
-  if (control -> LocalDataCompressionThreshold < 0)
-  {
-    control -> LocalDataCompressionThreshold = 32;
-  }
-
-  if (control -> LocalStreamCompression < 0)
-  {
-    control -> LocalStreamCompression      = 1;
-    control -> LocalStreamCompressionLevel = 1;
-  }
-
-  return 1;
-}
-
-//
-// Compression for LAN.
-//
-
-int SetCompressionLan()
-{
-  //
-  // Disable delta compression if not
-  // explicitly enabled.
-  //
-
-  if (control -> LocalDeltaCompression < 0)
-  {
-    control -> LocalDeltaCompression = 0;
-  }
-
-  if (control -> LocalDataCompression < 0)
-  {
-    control -> LocalDataCompression      = 0;
-    control -> LocalDataCompressionLevel = 0;
-  }
-
-  if (control -> LocalDataCompressionThreshold < 0)
-  {
-    control -> LocalDataCompressionThreshold = 0;
-  }
-
-  if (control -> LocalStreamCompression < 0)
-  {
-    control -> LocalStreamCompression      = 0;
-    control -> LocalStreamCompressionLevel = 0;
-  }
-
-  return 1;
-}
-
-int SetLimits()
-{
-  //
-  // Check if the user requested strict
-  // control flow parameters.
-  //
-
-  if (useStrict == 1)
-  {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: LIMIT! Decreasing the token limit "
-            << "to " << control -> TokenLimit / 2
-            << " with option 'strict'.\n"
-            << logofs_flush;
-    #endif
-
-    control -> TokenLimit /= 2;
-  }
-
-  #ifdef STRICT
-
-  control -> TokenLimit = 1;
-
-  #if defined(TEST) || defined(INFO)
-  *logofs << "Loop: WARNING! LIMIT! Setting the token limit "
-          << "to " << control -> TokenLimit
-          << " to simulate the proxy congestion.\n"
-          << logofs_flush;
-  #endif
-
-  #endif
-
-  //
-  // Reduce the size of the log file.
-  //
-
-  #ifdef QUOTA
-
-  control -> FileSizeLimit = 8388608;
-
-  #endif
-
-  //
-  // Check the bitrate limits.
-  //
-
-  if (control -> LocalBitrateLimit == -1)
-  {
-    if (control -> ProxyMode == proxy_client)
-    {
-      control -> LocalBitrateLimit =
-          control -> ClientBitrateLimit;
-    }
-    else
-    {
-      control -> LocalBitrateLimit =
-          control -> ServerBitrateLimit;
-    }
-  }
-
-  #if defined(TEST) || defined(INFO)
-  *logofs << "Loop: LIMIT! Setting client bitrate limit "
-          << "to " << control -> ClientBitrateLimit
-          << " server bitrate limit to " << control ->
-             ServerBitrateLimit << " with local limit "
-          << control -> LocalBitrateLimit << ".\n"
-          << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-//
-// These functions are used to parse literal
-// values provided by the user and set the
-// control parameters accordingly.
-//
-
-int ParseCacheOption(const char *opt)
-{
-  int size = ParseArg("", "cache", opt);
-
-  if (size < 0)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Invalid value '"
-            << opt << "' for option 'cache'.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Invalid value '"
-         << opt << "' for option 'cache'.\n";
-
-    return -1;
-  }
-
-  #ifdef TEST
-  *logofs << "Loop: Setting size of cache to "
-          << size << " bytes.\n" << logofs_flush;
-  #endif
-
-  control -> ClientTotalStorageSize = size;
-  control -> ServerTotalStorageSize = size;
-
-  strcpy(cacheSizeName, opt);
-
-  if (size == 0)
-  {
-    #ifdef WARNING
-    *logofs << "Loop: WARNING! Disabling NX delta compression.\n"
-            << logofs_flush;
-    #endif
-
-    control -> LocalDeltaCompression = 0;
-
-    #ifdef WARNING
-    *logofs << "Loop: WARNING! Disabling use of NX persistent cache.\n"
-            << logofs_flush;
-    #endif
-
-    control -> PersistentCacheEnableLoad = 0;
-    control -> PersistentCacheEnableSave = 0;
-  }
-
-  return 1;
-}
-
-int ParseImagesOption(const char *opt)
-{
-  int size = ParseArg("", "images", opt);
-
-  if (size < 0)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Invalid value '"
-            << opt << "' for option 'images'.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Invalid value '"
-         << opt << "' for option 'images'.\n";
-
-    return -1;
-  }
-
-  #ifdef TEST
-  *logofs << "Loop: Setting size of images cache to "
-          << size << " bytes.\n" << logofs_flush;
-  #endif
-
-  control -> ImageCacheDiskLimit = size;
-
-  strcpy(imagesSizeName, opt);
-
-  return 1;
-}
-
-int ParseShmemOption(const char *opt)
-{
-  int size = ParseArg("", "shseg", opt);
-
-  if (size < 0)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Invalid value '"
-            << opt << "' for option 'shseg'.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Invalid value '"
-         << opt << "' for option 'shseg'.\n";
-
-    return -1;
-  }
-
-  control -> ShmemClientSize = size;
-  control -> ShmemServerSize = size;
-
-  #if defined(TEST) || defined(INFO)
-  *logofs << "Loop: Set shared memory size to "
-          << control -> ShmemServerSize << " bytes.\n"
-          << logofs_flush;
-  #endif
-
-  strcpy(shsegSizeName, opt);
-
-  return 1;
-}
-
-int ParseBitrateOption(const char *opt)
-{
-  int bitrate = ParseArg("", "limit", opt);
-
-  if (bitrate < 0)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Invalid value '"
-            << opt << "' for option 'limit'.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Invalid value '"
-         << opt << "' for option 'limit'.\n";
-
-    return -1;
-  }
-
-  strcpy(bitrateLimitName, opt);
-
-  if (bitrate == 0)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Disabling bitrate limit on proxy link.\n"
-            << logofs_flush;
-    #endif
-
-    control -> LocalBitrateLimit = 0;
-  }
-  else
-  {
-    #ifdef TEST
-    *logofs << "Loop: Setting bitrate to " << bitrate
-            << " bits per second.\n" << logofs_flush;
-    #endif
-
-    //
-    // Internal representation is in bytes
-    // per second.
-    //
-
-    control -> LocalBitrateLimit = bitrate >> 3;
-  }
-
-  return 1;
-}
-
-int ParseHostOption(const char *opt, char *host, long &port)
-{
-  #ifdef TEST
-  *logofs << "Loop: Trying to parse options string '" << opt
-          << "' as a remote NX host.\n" << logofs_flush;
-  #endif
-
-  if (opt == NULL || *opt == '\0')
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! No host parameter provided.\n"
-            << logofs_flush;
-    #endif
-
-    return 0;
-  }
-  else if (strlen(opt) >= DEFAULT_STRING_LENGTH)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Host parameter exceeds length of "
-            << DEFAULT_STRING_LENGTH << " characters.\n"
-            << logofs_flush;
-    #endif
-
-    return 0;
-  }
-
-  //
-  // Look for a host name followed
-  // by a colon followed by port.
-  //
-
-  int newPort = port;
-
-  const char *separator = strrchr(opt, ':');
-
-  if (separator != NULL)
-  {
-    const char *check = separator + 1;
-
-    while (*check != '\0' && *check != ',' &&
-               *check != '=' && isdigit(*check) != 0)
-    {
-      check++;
-    }
-
-    newPort = atoi(separator + 1);
-
-    if (newPort < 0 || *check != '\0')
-    {
-      #ifdef TEST
-      *logofs << "Loop: Can't identify remote NX port in string '"
-              << separator << "'.\n" << logofs_flush;
-      #endif
-
-      return 0;
-    }
-  }
-  else if (newPort < 0)
-  {
-    //
-    // Complain if port was not passed
-    // by other means.
-    //
-
-    #ifdef TEST
-    *logofs << "Loop: Can't identify remote NX port in string '"
-            << opt << "'.\n" << logofs_flush;
-    #endif
-
-    return 0;
-  }
-  else
-  {
-    separator = opt + strlen(opt);
-  }
-
-  char newHost[DEFAULT_STRING_LENGTH] = { 0 };
-
-  strncpy(newHost, opt, strlen(opt) - strlen(separator));
-
-  *(newHost + strlen(opt) - strlen(separator)) = '\0';
-
-  const char *check = newHost;
-
-  while (*check != '\0' && *check != ',' &&
-             *check != '=')
-  {
-    check++;
-  }
-
-  if (*check != '\0')
-  {
-    #ifdef TEST
-    *logofs << "Loop: Can't identify remote NX host in string '"
-            << newHost << "'.\n" << logofs_flush;
-    #endif
-
-    return 0;
-  }
-  else if (*acceptHost != '\0')
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Can't manage to connect and accept connections "
-            << "at the same time.\n" << logofs_flush;
-
-    *logofs << "Loop: PANIC! Refusing remote NX host with string '"
-            << opt << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Can't manage to connect and accept connections "
-         << "at the same time.\n";
-
-    cerr << "Error" << ": Refusing remote NX host with string '"
-         << opt << "'.\n";
-
-    return -1;
-  }
-
-  if (*host != '\0' && strcmp(host, newHost) != 0)
-  {
-    #ifdef WARNING
-    *logofs << "Loop: WARNING! Overriding remote NX host '"
-            << host << "' with new value '" << newHost
-            << "'.\n" << logofs_flush;
-    #endif
-  }
-
-  strcpy(host, newHost);
-
-  if (port != -1 && port != newPort)
-  {
-    #ifdef WARNING
-    *logofs << "Loop: WARNING! Overriding remote NX port '"
-            << port << "' with new value '" << newPort
-            << "'.\n" << logofs_flush;
-    #endif
-  }
-
-  #ifdef TEST
-  *logofs << "Loop: Parsed options string '" << opt
-          << "' with host '" << newHost << "' and port '"
-          << newPort << "'.\n" << logofs_flush;
-  #endif
-
-  port = newPort;
-
-  return 1;
-}
-
-int ParseFontPath(char *path)
-{
-  char oldPath[DEFAULT_STRING_LENGTH];
-
-  strcpy(oldPath, path);
-
-  if (path == NULL || *path == '\0' || strcmp(path, "0") == 0)
-  {
-    return 0;
-  }
-
-  #ifdef TEST
-  *logofs << "Loop: Parsing font server option '" << path
-          << "'.\n" << logofs_flush;
-  #endif
-
-  //
-  // Convert the value to our default port.
-  //
-
-  if (strcmp(fontPort, "1") == 0)
-  {
-    if (control -> ProxyMode == proxy_server)
-    {
-      snprintf(fontPort, DEFAULT_STRING_LENGTH - 1, "%d",
-                   DEFAULT_NX_FONT_PORT_OFFSET + proxyPort);
-    }
-    else
-    {
-      //
-      // Let the client use the well-known
-      // "unix/:7100" font path.
-      //
-
-      snprintf(fontPort, DEFAULT_STRING_LENGTH - 1, "unix/:7100");
-    }
-  }
-
-  //
-  // Check if a simple numaric value was given.
-  //
-
-  if (atoi(path) > 0)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Assuming numeric TCP port '" << atoi(path)
-            << "' for font server.\n" << logofs_flush;
-    #endif
-
-    return 1;
-  }
-
-  //
-  // Let's assume that a port specification "unix/:7100"
-  // corresponds to "$TEMP/.font-unix/fs7100" and a port
-  // "unix/:-1" corresponds to "$TEMP/.font-unix/fs-1".
-  //
-
-  if (strncmp("unix/:", path, 6) == 0)
-  {
-    snprintf(path, DEFAULT_STRING_LENGTH - 1, "%s/.font-unix/fs%s",
-                 control -> TempPath, oldPath + 6);
-
-    *(path + DEFAULT_STRING_LENGTH - 1) = '\0';
-
-    #ifdef TEST
-    *logofs << "Loop: Assuming Unix socket '" << path
-            << "' for font server.\n" << logofs_flush;
-    #endif
-  }
-  else if (strncmp("tcp/:", path, 5) == 0)
-  {
-    snprintf(path, DEFAULT_STRING_LENGTH - 1, "%d", atoi(oldPath + 5));
-
-    *(path + DEFAULT_STRING_LENGTH - 1) = '\0';
-
-    if (atoi(path) <= 0)
-    {
-      goto ParseFontPathError;
-    }
-
-    #ifdef TEST
-    *logofs << "Loop: Assuming TCP port '" << atoi(path)
-            << "' for font server.\n" << logofs_flush;
-    #endif
-  }
-  else
-  {
-    //
-    // Accept an absolute file path as
-    // a valid Unix socket.
-    //
-
-    if (*path != '/')
-    {
-      goto ParseFontPathError;
-    }
-
-    #ifdef TEST
-    *logofs << "Loop: Assuming Unix socket '" << path
-            << "' for font server.\n" << logofs_flush;
-    #endif
-  }
-
-  return 1;
-
-ParseFontPathError:
-
-  #ifdef TEST
-  *logofs << "Loop: Unable to determine the font server "
-          << "port in string '" << path << "'.\n"
-          << logofs_flush;
-  #endif
-
-  return -1;
-}
-
-int OpenLogFile(char *name, ostream *&stream)
-{
-  if (name == NULL || *name == '\0')
-  {
-    #ifdef TEST
-    *logofs << "Loop: WARNING! No name provided for output. Using standard error.\n"
-            << logofs_flush;
-    #endif
-
-    if (stream == NULL)
-    {
-      stream = &cerr;
-    }
-
-    return 1;
-  }
-
-  if (stream == NULL || stream == &cerr)
-  {
-    if (*name != '/' && *name != '.')
-    {
-      char *filePath = GetSessionPath();
-
-      if (filePath == NULL)
-      {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Cannot determine directory of NX session file.\n"
-                << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Cannot determine directory of NX session file.\n";
-
-        return -1;
-      }
-
-      if (strlen(filePath) + strlen("/") +
-              strlen(name) + 1 > DEFAULT_STRING_LENGTH)
-      {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Full name of NX file '" << name
-                << " would exceed length of " << DEFAULT_STRING_LENGTH
-                << " characters.\n" << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Full name of NX file '" << name
-             << " would exceed length of " << DEFAULT_STRING_LENGTH
-             << " characters.\n";
-
-        return -1;
-      }
-
-      char *file = new char[strlen(filePath) + strlen("/") +
-                                strlen(name) + 1];
-
-      //
-      // Transform name in a fully qualified name.
-      //
-
-      strcpy(file, filePath);
-      strcat(file, "/");
-      strcat(file, name);
-
-      strcpy(name, file);
-
-      delete [] filePath;
-      delete [] file;
-    }
-
-    mode_t fileMode = umask(0077);
-
-    for (;;)
-    {
-      if ((stream = new ofstream(name, ios::app)) != NULL)
-      {
-        break;
-      }
-
-      usleep(200000);
-    }
-
-    umask(fileMode);
-  }
-  else
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Bad stream provided for output.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Bad stream provided for output.\n";
-
-    return -1;
-  }
-
-  return 1;
-}
-
-int ReopenLogFile(char *name, ostream *&stream, int limit)
-{
-  if (*name != '\0' && limit >= 0)
-  {
-    struct stat fileStat;
-
-    if (limit > 0)
-    {
-      //
-      // This is used for the log file, if the
-      // size exceeds the limit.
-      //
-
-      if (stat(name, &fileStat) != 0)
-      {
-        #ifdef WARNING
-        *logofs << "Loop: WARNING! Can't get stats of file '"
-                << name  << "'. Error is " << EGET() 
-                << " '" << ESTR() << "'.\n" << logofs_flush;
-        #endif
-
-        return 0;
-      }
-      else if (fileStat.st_size < (long) limit)
-      {
-        return 0;
-      }
-    }
-
-    #ifdef TEST
-    *logofs << "Loop: Deleting file '" << name
-            << "' with size " << fileStat.st_size
-            << ".\n" << logofs_flush;
-    #endif
-
-    //
-    // Create a new stream over the previous
-    // file. Trying to delete the file fails
-    // to work on recent Cygwin installs.
-    //
-
-    *stream << flush;
-
-    delete stream;
-
-    mode_t fileMode = umask(0077);
-
-    for (;;)
-    {
-      if ((stream = new ofstream(name, ios::out)) != NULL)
-      {
-        break;
-      }
-
-      usleep(200000);
-    }
-
-    umask(fileMode);
-
-    #ifdef TEST
-    *logofs << "Loop: Reopened file '" << name
-            << "'.\n" << logofs_flush;
-    #endif
-  }
-
-  return 1;
-}
-
-void PrintProcessInfo()
-{
-  if (agent == NULL)
-  {
-
-    cerr << endl;
-
-    PrintVersionInfo();
-
-    cerr << endl;
-
-    cerr << GetCopyrightInfo()
-         << endl
-         << GetOtherCopyrightInfo()
-         << endl
-         << "See https://github.com/ArcticaProject/nx-libs for more information." << endl << endl;
-  }
-
-  //
-  // People get confused by the fact that client
-  // mode is running on NX server and viceversa.
-  // Let's adopt an user-friendly naming conven-
-  // tion here.
-  //
-
-  cerr << "Info: Proxy running in "
-       << (control -> ProxyMode == proxy_client ? "client" : "server")
-       << " mode with pid '" << getpid() << "'.\n";
-
-  if (agent == NULL)
-  {
-    cerr << "Session" << ": Starting session at '"
-         << strTimestamp() << "'.\n";
-  }
-
-  #ifdef TEST
-
-  if (*errorsFileName != '\0')
-  {
-    cerr << "Info" << ": Using errors file '" << errorsFileName << "'.\n";
-  }
-
-  if (*statsFileName != '\0')
-  {
-    cerr << "Info" << ": Using stats file '" << statsFileName << "'.\n";
-  }
-
-  #endif
-}
-
-void PrintConnectionInfo()
-{
-  cerr << "Info" << ": Using "
-       << linkSpeedName << " link parameters "
-       << control -> TokenSize
-       << "/" << control -> TokenLimit
-       << "/" << control -> FlushPolicy + 1
-       << "/" << control -> FlushPriority
-       << ".\n";
-
-  if (control -> ProxyMode == proxy_client)
-  {
-    cerr << "Info" << ": Using agent parameters "
-         << control -> PingTimeout
-         << "/" << control -> MotionTimeout
-         << "/" << control -> IdleTimeout
-         << "/" << control -> TaintReplies
-         << "/" << control -> HideRender
-         << ".\n";
-  }
-
-  if (control -> LocalDeltaCompression == 1)
-  {
-    cerr << "Info" << ": Using cache parameters "
-         << control -> MinimumMessageSize
-         << "/" << control -> MaximumMessageSize / 1024 << "KB"
-         << "/" << control -> ClientTotalStorageSize / 1024 << "KB"
-         << "/" << control -> ServerTotalStorageSize / 1024 << "KB"
-         << ".\n";
-  }
-
-  if (control -> ImageCacheEnableLoad == 1 ||
-          control -> ImageCacheEnableSave == 1)
-  {
-    cerr << "Info" << ": Using image streaming parameters "
-         << control -> SplitTimeout
-         << "/" << control -> SplitTotalSize
-         << "/" << control -> SplitTotalStorageSize / 1024 << "KB"
-         << "/" << control -> SplitDataThreshold
-         << "/" << control -> SplitDataPacketLimit
-         << ".\n";
-
-    cerr << "Info" << ": Using image cache parameters "
-         << control -> ImageCacheEnableLoad
-         << "/" << control -> ImageCacheEnableSave
-         << "/" << control -> ImageCacheDiskLimit / 1024 << "KB"
-         << ".\n";
-  }
-
-  cerr << "Info" << ": Using pack method '"
-       << packMethodName << "' with session '"
-       << sessionType << "'.\n";
-
-  if (*productName != '\0')
-  {
-    cerr << "Info" << ": Using product '" << productName
-         << "'.\n" << logofs_flush;
-  }
-
-  if (control -> LocalDeltaCompression == 0)
-  {
-    cerr << "Info" << ": Not using NX delta compression.\n";
-  }
-
-  if (control -> LocalDataCompression == 1 ||
-          control -> RemoteDataCompression == 1)
-  {
-    cerr << "Info" << ": Using ZLIB data compression "
-         << control -> LocalDataCompressionLevel
-         << "/" << control -> RemoteDataCompressionLevel
-         << "/" << control -> LocalDataCompressionThreshold
-         << ".\n";
-  }
-  else
-  {
-    cerr << "Info" << ": Not using ZLIB data compression.\n";
-  }
-
-  if (control -> LocalStreamCompression == 1 ||
-          control -> RemoteStreamCompression == 1)
-  {
-    cerr << "Info" << ": Using ZLIB stream compression "
-         << control -> LocalStreamCompressionLevel
-         << "/" << control -> RemoteStreamCompressionLevel
-         << ".\n";
-  }
-  else
-  {
-    cerr << "Info" << ": Not using ZLIB stream compression.\n";
-  }
-
-  if (control -> LocalBitrateLimit > 0)
-  {
-    cerr << "Info" << ": Using bandwidth limit of "
-         << bitrateLimitName << " bits per second.\n";
-  }
-
-  if (control -> PersistentCacheName != NULL)
-  {
-    cerr << "Info" << ": Using cache file '"
-         << control -> PersistentCachePath << "/"
-         << control -> PersistentCacheName << "'.\n";
-  }
-  else
-  {
-    if (control -> PersistentCacheEnableLoad == 0 ||
-            control -> LocalDeltaCompression == 0)
-    {
-      cerr << "Info" << ": Not using a persistent cache.\n";
-    }
-    else
-    {
-      cerr << "Info" << ": No suitable cache file found.\n";
-    }
-  }
-
-  if (control -> ProxyMode == proxy_client &&
-          (useUnixSocket > 0 || useTcpSocket > 0 ||
-              useAgentSocket > 0))
-  {
-    cerr << "Info" << ": Listening to X11 connections "
-         << "on display ':" << xPort << "'.\n";
-  }
-  else if (control -> ProxyMode == proxy_server)
-  {
-    cerr << "Info" << ": Forwarding X11 connections "
-         << "to display '" << displayHost << "'.\n";
-  }
-
-  if (control -> ProxyMode == proxy_client &&
-      useCupsSocket > 0 && cupsPort.enabled())
-  {
-    cerr << "Info" << ": Listening to CUPS connections "
-         << "on port '" << cupsPort << "'.\n";
-  }
-  else if (control -> ProxyMode == proxy_server &&
-           cupsPort.enabled())
-  {
-    cerr << "Info" << ": Forwarding CUPS connections "
-         << "to port '" << cupsPort << "'.\n";
-  }
-
-  if (control -> ProxyMode == proxy_client &&
-      useAuxSocket > 0 && auxPort.enabled())
-  {
-    cerr << "Info" << ": Listening to auxiliary X11 connections "
-         << "on port '" << auxPort << "'.\n";
-  }
-  else if (control -> ProxyMode == proxy_server &&
-           auxPort.enabled())
-  {
-    cerr << "Info" << ": Forwarding auxiliary X11 connections "
-         << "to display '" << displayHost << "'.\n";
-  }
-
-  if (control -> ProxyMode == proxy_client &&
-      useSmbSocket > 0 && smbPort.enabled())
-  {
-    cerr << "Info" << ": Listening to SMB connections "
-         << "on port '" << smbPort << "'.\n";
-  }
-  else if (control -> ProxyMode == proxy_server &&
-           smbPort.enabled())
-  {
-    cerr << "Info" << ": Forwarding SMB connections "
-         << "to port '" << smbPort << "'.\n";
-  }
-
-  if (control -> ProxyMode == proxy_client &&
-      useMediaSocket > 0 && mediaPort.enabled())
-  {
-    cerr << "Info" << ": Listening to multimedia connections "
-         << "on port '" << mediaPort << "'.\n";
-  }
-  else if (control -> ProxyMode == proxy_server &&
-           mediaPort.enabled())
-  {
-    cerr << "Info" << ": Forwarding multimedia connections "
-         << "to port '" << mediaPort << "'.\n";
-  }
-
-  if (control -> ProxyMode == proxy_client &&
-      useHttpSocket > 0 && httpPort.enabled())
-  {
-    cerr << "Info" << ": Listening to HTTP connections "
-         << "on port '" << httpPort << "'.\n";
-  }
-  else if (control -> ProxyMode == proxy_server &&
-           httpPort.enabled())
-  {
-    cerr << "Info" << ": Forwarding HTTP connections "
-         << "to port '" << httpPort << "'.\n";
-  }
-
-  if (control -> ProxyMode == proxy_server &&
-          useFontSocket > 0 && *fontPort != '\0')
-  {
-    cerr << "Info" << ": Listening to font server connections "
-         << "on port '" << fontPort << "'.\n";
-  }
-  else if (control -> ProxyMode == proxy_client &&
-               *fontPort != '\0')
-  {
-    cerr << "Info" << ": Forwarding font server connections "
-         << "to port '" << fontPort << "'.\n";
-  }
-
-  if (useSlaveSocket > 0 && slavePort.enabled())
-  {
-    cerr << "Info" << ": Listening to slave connections "
-         << "on port '" << slavePort << "'.\n";
-  }
-}
-
-void PrintVersionInfo()
-{
-  cerr << "NXPROXY - " << "Version "
-       << control -> LocalVersionMajor << "."
-       << control -> LocalVersionMinor << "."
-       << control -> LocalVersionPatch << "."
-       << control -> LocalVersionMaintenancePatch;
-
-  cerr << endl;
-}
-
-void PrintCopyrightInfo()
-{
-  cerr << endl;
-
-  PrintVersionInfo();
-
-  cerr << endl;
-
-  cerr << GetCopyrightInfo();
-
-  //
-  // Print third party's copyright info.
-  //
-
-  cerr << endl;
-
-  cerr << GetOtherCopyrightInfo();
-
-  cerr << endl;
-}
-
-void PrintOptionIgnored(const char *type, const char *name, const char *value)
-{
-  if (control -> ProxyMode == proxy_server)
-  {
-    #ifdef WARNING
-    *logofs << "Loop: WARNING! Ignoring " << type
-            << " option '" << name << "' with value '"
-            << value << "' at " << "NX client side.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Warning" << ": Ignoring " << type
-         << " option '" << name << "' with value '"
-         << value << "' at " << "NX client side.\n";
-  }
-  else
-  {
-    #ifdef WARNING
-    *logofs << "Loop: WARNING! Ignoring " << type
-            << " option '" << name << "' with value '"
-            << value << "' at " << "NX server side.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Warning" << ": Ignoring " << type
-         << " option '" << name << "' with value '"
-         << value << "' at " << "NX server side.\n";
-  }
-}
-
-const char *GetOptions(const char *options)
-{
-  if (options != NULL)
-  {
-    if (strncasecmp(options, "nx/nx,", 6) != 0 &&
-            strncasecmp(options, "nx,", 3) != 0 &&
-                strncasecmp(options, "nx:", 3) != 0)
-    {
-      #ifdef TEST
-      *logofs << "Loop: PANIC! Display options string '" << options
-              << "' must start with 'nx' or 'nx/nx' prefix.\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Display options string '" << options
-           << "' must start with 'nx' or 'nx/nx' prefix.\n";
-
-      HandleCleanup();
-    }
-  }
-  else
-  {
-    options = getenv("DISPLAY");
-  }
-
-  return options;
-}
-
-const char *GetArg(int &argi, int argc, const char **argv)
-{
-  //
-  // Skip "-" and flag character.
-  //
-
-  const char *arg = argv[argi] + 2;
-
-  if (*arg == 0)
-  {
-    if (argi + 1 == argc)
-    {
-      return NULL;
-    }
-    else
-    {
-      argi++;
-
-      return (*argv[argi] == '-' ? NULL : argv[argi]);
-    }
-  }
-  else
-  {
-    return (*arg == '-' ? NULL : arg);
-  }
-}
-
-int CheckArg(const char *type, const char *name, const char *value)
-{
-  #ifdef TEST
-  *logofs << "Loop: Parsing " << type << " option '" << name
-          << "' with value '" << (value ? value : "(null)")
-          << "'.\n" << logofs_flush;
-  #endif
-
-  if (value == NULL || strstr(value, "=") != NULL)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Error in " << type << " option '"
-            << name << "'. No value found.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Error in " << type << " option '"
-         << name << "'. No value found.\n";
-
-    return -1;
-  }
-  else if (strstr(name, ",") != NULL)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Parse error at " << type << " option '"
-            << name << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Parse error at " << type << " option '"
-         << name << "'.\n";
-
-    return -1;
-  }
-  else if (strlen(value) >= DEFAULT_STRING_LENGTH)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Value '" << value << "' of "
-            << type << " option '" << name << "' exceeds length of "
-            << DEFAULT_STRING_LENGTH << " characters.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Value '" << value << "' of "
-         << type << " option '" << name << "' exceeds length of "
-         << DEFAULT_STRING_LENGTH << " characters.\n";
-
-    return -1;
-  }
-
-  return 1;
-}
-
-int ParseArg(const char *type, const char *name, const char *value)
-{
-  if (strcasecmp(value, "0") == 0)
-  {
-    return 0;
-  }
-
-  //
-  // Find the base factor.
-  //
-
-  double base;
-
-  const char *id = value + strlen(value) - 1;
-
-  if (strcasecmp(id, "g") == 0)
-  {
-    base = 1024 * 1024 * 1024;
-  }
-  else if (strcasecmp(id, "m") == 0)
-  {
-    base = 1024 * 1024;
-  }
-  else if (strcasecmp(id, "k") == 0)
-  {
-    base = 1024;
-  }
-  else if (strcasecmp(id, "b") == 0 || isdigit(*id) == 1)
-  {
-    base = 1;
-  }
-  else
-  {
-    return -1;
-  }
-
-  char *string = new char[strlen(value)];
-
-  strncpy(string, value, strlen(value) - 1);
-
-  *(string + (strlen(value) - 1)) = '\0';
-
-  #ifdef TEST
-
-  *logofs << "Loop: Parsing integer option '" << name
-          << "' from string '" << string << "' with base set to ";
-
-  switch (tolower(*id))
-  {
-    case 'k':
-    case 'm':
-    case 'g':
-    {
-      *logofs << (char) toupper(*id);
-    }
-    break;
-  }
-
-  *logofs << ".\n" << logofs_flush;
-
-  #endif
-
-  double result = atof(string) * base;
-
-  if (result < 0 || result > (((unsigned) -1) >> 1))
-  {
-    delete [] string;
-
-    return -1;
-  }
-
-  delete [] string;
-
-  #ifdef TEST
-  *logofs << "Loop: Integer option parsed to '"
-          << (int) result << "'.\n" << logofs_flush;
-  #endif
-
-  return (int) result;
-}
-
-void SetAndValidateChannelEndPointArg(const char *type, const char *name, const char *value,
-                                      ChannelEndPoint &endPoint) {
-  endPoint.setSpec(value);
-  if (!endPoint.validateSpec()) {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Invalid " << type
-            << " option '" << name << "' with value '"
-            << value << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Invalid " << type
-         << " option '" << name << "' with value '"
-         << value << "'.\n";
-
-    HandleCleanup();
-  }
-}
-
-
-int ValidateArg(const char *type, const char *name, const char *value)
-{
-  int number = atoi(value);
-
-  if (number < 0)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Invalid " << type
-            << " option '" << name << "' with value '"
-            << value << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Invalid " << type
-         << " option '" << name << "' with value '"
-         << value << "'.\n";
-
-    HandleCleanup();
-  }
-
-  return number;
-} 
-
-int LowercaseArg(const char *type, const char *name, char *value)
-{
-  char *next = value;
-
-  while (*next != '\0')
-  {
-    *next = tolower(*next);
-
-    next++;
-  }
-
-  return 1;
-}
-
-int CheckSignal(int signal)
-{
-  //
-  // Return 1 if the signal needs to be handled
-  // by the proxy, 2 if the signal just needs to
-  // be blocked to avoid interrupting a system
-  // call.
-  //
-
-  switch (signal)
-  {
-    case SIGCHLD:
-    case SIGUSR1:
-    case SIGUSR2:
-    case SIGHUP:
-    case SIGINT:
-    case SIGTERM:
-    case SIGPIPE:
-    case SIGALRM:
-    {
-      return 1;
-    }
-    case SIGVTALRM:
-    case SIGWINCH:
-    case SIGIO:
-    case SIGTSTP:
-    case SIGTTIN:
-    case SIGTTOU:
-    {
-      return 2;
-    }
-    default:
-    {
-      #ifdef __CYGWIN32__
-
-      //
-      // This signal can be raised by the Cygwin
-      // library.
-      //
-
-      if (signal == 12)
-      {
-        return 1;
-      }
-
-      #endif
-
-      return 0;
-    }
-  }
-}
-
-static void PrintUsageInfo(const char *option, int error)
-{
-  if (error == 1)
-  {
-    cerr << "Error" << ": Invalid command line option '" << option << "'.\n";
-  }
-
-  cerr << GetUsageInfo();
-
-  if (error == 1)
-  {
-    cerr << "Error" << ": NX transport initialization failed.\n";
-  }
-}
-
-static void handleCheckSessionInLoop()
-{
-  //
-  // Check if we completed the shutdown procedure
-  // and the remote confirmed the shutdown. The
-  // tear down should be always initiated by the
-  // agent, but the X server side may unilateral-
-  // ly shut down the link without our permission.
-  //
-
-  if (proxy -> getShutdown() > 0)
-  {
-    #ifdef TEST
-    *logofs << "Loop: End of NX transport requested "
-            << "by remote.\n" << logofs_flush;
-    #endif
-
-    handleTerminatingInLoop();
-
-    if (control -> ProxyMode == proxy_server)
-    {
-      #ifdef TEST
-      *logofs << "Loop: Bytes received so far are "
-              << (unsigned long long) statistics -> getBytesIn()
-              << ".\n" << logofs_flush;
-      #endif
-
-      if (statistics -> getBytesIn() < 1024)
-      {
-        cerr << "Info" << ": Your session was closed before reaching "
-             << "a usable state.\n";
-        cerr << "Info" << ": This can be due to the local X server "
-             << "refusing access to the client.\n";
-        cerr << "Info" << ": Please check authorization provided "
-             << "by the remote X application.\n";
-      }
-    }
-
-    #ifdef TEST
-    *logofs << "Loop: Shutting down the NX transport.\n"
-            << logofs_flush;
-    #endif
- 
-    HandleCleanup();
-  }
-  else if (proxy -> handlePing() < 0)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Failure handling the ping for "
-            << "proxy FD#" << proxyFD << ".\n"
-            << logofs_flush;
-    #endif
-
-    HandleShutdown();
-  }
-
-  //
-  // Check if the watchdog has exited and we didn't
-  // get the SIGCHLD. This can happen if the parent
-  // has overridden our signal handlers.
-  //
-
-  if (IsRunning(lastWatchdog) && CheckProcess(lastWatchdog, "watchdog") == 0)
-  {
-    #ifdef WARNING
-    *logofs << "Loop: WARNING! Watchdog is gone unnoticed. "
-            << "Setting the last signal to SIGTERM.\n"
-            << logofs_flush;
-    #endif
-
-    lastSignal = SIGTERM;
-
-    #ifdef WARNING
-    *logofs << "Loop: WARNING! Resetting pid of last "
-            << "watchdog process.\n" << logofs_flush;
-    #endif
-
-    SetNotRunning(lastWatchdog);
-  }
-
-  //
-  // Let the client proxy find out if the agent's
-  // channel is gone. This is the normal shutdown
-  // procedure in the case of an internal connect-
-  // ion to the agent.
-  // 
-
-  int cleanup = 0;
-
-  if (control -> ProxyMode == proxy_client &&
-          agent != NULL && proxy -> getType(agentFD[1]) ==
-              channel_none && lastKill == 0 && lastDestroy == 1)
-  {
-    #ifdef TEST
-    *logofs << "Loop: End of NX transport requested "
-            << "by agent.\n" << logofs_flush;
-    #endif
-
-    #ifdef TEST
-    *logofs << "Loop: Bytes sent so far are "
-            << (unsigned long long) statistics -> getBytesOut()
-            << ".\n" << logofs_flush;
-    #endif
-
-    if (statistics -> getBytesOut() < 1024)
-    {
-      cerr << "Info" << ": Your session has died before reaching "
-           << "an usable state.\n";
-      cerr << "Info" << ": This can be due to the remote X server "
-           << "refusing access to the client.\n";
-      cerr << "Info" << ": Please check the authorization provided "
-           << "by your X application.\n";
-    }
-
-    cleanup = 1;
-  }
-
-  //
-  // Check if the user requested the end of the
-  // session by sending a signal to the proxy.
-  // All signals are handled in the main loop
-  // so we need to reset the value to get ready
-  // for the next iteration.
-  //
-
-  int signal = 0;
-
-  if (lastSignal != 0)
-  {
-    switch (lastSignal)
-    {
-      case SIGCHLD:
-      case SIGUSR1:
-      case SIGUSR2:
-      {
-        break;
-      }
-      default:
-      {
-        signal = lastSignal;
-
-        cleanup = 1;
-
-        break;
-      }
-    }
-
-    lastSignal = 0;
-  }
-
-  if (cleanup == 1)
-  {
-    //
-    // The first time termination signal is received
-    // disable all further connections, close down any
-    // X channel and wait for a second signal.
-    //
-
-    if (lastKill == 0)
-    {
-      //
-      // Don't print a message if cleanup is
-      // due to normal termination of agent.
-      //
-
-      if (signal != 0)
-      {
-        #ifdef TEST
-        *logofs << "Loop: End of NX transport requested by signal '"
-                << signal << "' '" << DumpSignal(signal)
-                << "'.\n" << logofs_flush;
-        #endif
-
-        handleTerminatingInLoop();
-      }
-
-      //
-      // Disable any further connection.
-      //
-
-      CleanupListeners();
-
-      //
-      // Close all the remaining X channels and
-      // let proxies save their persistent cache
-      // on disk.
-      //
-
-      CleanupConnections();
-
-      //
-      // We'll need to wait for the X channels
-      // to be shut down before waiting for the
-      // cleanup signal.
-      //
-
-      lastKill = 1;
-    }
-    else if (lastKill == 2)
-    {
-      #ifdef TEST
-      *logofs << "Loop: Shutting down the NX transport.\n"
-              << logofs_flush;
-      #endif
-
-      proxy -> handleShutdown();
-
-      HandleCleanup();
-    }
-  }
-
-  if (lastKill == 1 && proxy -> getChannels(channel_x11) == 0)
-  {
-    //
-    // Save the message stores to the
-    // persistent cache.
-    //
-
-    proxy -> handleSave();
-
-    //
-    // Run a watchdog process so we can finally
-    // give up at the time the watchdog exits.
-    //
-
-    if (IsNotRunning(lastWatchdog))
-    {
-      int timeout = control -> CleanupTimeout;
-
-      if (timeout > 0)
-      {
-        if (proxy -> getChannels() == 0)
-        {
-          timeout = 500;
-        }
-
-        #ifdef TEST
-        *logofs << "Loop: Starting watchdog process with timeout "
-                << "of " << timeout << " Ms.\n"
-                << logofs_flush;
-        #endif
-      }
-      #ifdef TEST
-      else
-      {
-        *logofs << "Loop: Starting watchdog process without "
-                << "a timeout.\n" << logofs_flush;
-      }
-      #endif
-
-      lastWatchdog = NXTransWatchdog(timeout);
-
-      if (IsFailed(lastWatchdog))
-      {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Can't start the NX watchdog "
-                << "process in shutdown.\n" << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Can't start the NX watchdog "
-             << "process in shutdown.\n";
-
-        HandleCleanup();
-      }
-      #ifdef TEST
-      else
-      {
-        *logofs << "Loop: Watchdog started with pid '"
-                << lastWatchdog << "'.\n" << logofs_flush;
-      }
-      #endif
-    }
-    else
-    {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Previous watchdog detected "
-              << "in shutdown with pid '" << lastWatchdog
-              << "'.\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Previous watchdog detected "
-           << "in shutdown with pid '" << lastWatchdog
-           << "'.\n";
-
-      HandleCleanup();
-    }
-
-    if (control -> CleanupTimeout > 0)
-    {
-      #ifdef TEST
-      *logofs << "Loop: Waiting the cleanup timeout to complete.\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Info" << ": Waiting the cleanup timeout to complete.\n";
-    }
-    else
-    {
-      //
-      // The NX server will kill the watchdog
-      // process after having shut down the
-      // service channels.
-      //
-
-      cerr << "Info" << ": Watchdog running with pid '" << lastWatchdog
-           << "'.\n";
-
-      #ifdef TEST
-      *logofs << "Loop: Waiting the watchdog process to complete.\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Info" << ": Waiting the watchdog process to complete.\n";
-    }
-
-    lastKill = 2;
-  }
-}
-
-static void handleCheckBitrateInLoop()
-{
-  static long int slept = 0;
-
-  #ifdef TEST
-  *logofs << "Loop: Bitrate is " << statistics -> getBitrateInShortFrame()
-          << " B/s and " << statistics -> getBitrateInLongFrame()
-          << " B/s in " << control -> ShortBitrateTimeFrame / 1000
-          << "/" << control -> LongBitrateTimeFrame / 1000
-          << " seconds timeframes.\n" << logofs_flush;
-  #endif
-
-  //
-  // This can be improved. We may not jump out
-  // of the select often enough to guarantee
-  // the necessary accuracy.
-  //
-
-  if (control -> LocalBitrateLimit > 0)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Calculating bandwidth usage with limit "
-            << control -> LocalBitrateLimit << ".\n"
-            << logofs_flush;
-    #endif
-
-    int reference = (statistics -> getBitrateInLongFrame() +
-                         statistics -> getBitrateInShortFrame()) / 2;
-
-    if (reference > control -> LocalBitrateLimit)
-    {
-      double ratio = ((double) reference) /
-                         ((double) control -> LocalBitrateLimit);
-
-      if (ratio > 1.2)
-      {
-        ratio = 1.2;
-      }
-
-      slept += (unsigned int) (pow(50000, ratio) / 1000);
-
-      if (slept > 2000)
-      {
-        #ifdef WARNING
-        *logofs << "Loop: WARNING! Sleeping due to "
-                << "reference bitrate of " << reference
-                << " B/s.\n" << logofs_flush;
-        #endif
-
-        cerr << "Warning" << ": Sleeping due to "
-             << "reference bitrate of " << reference
-             << " B/s.\n";
-
-        slept %= 2000;
-      }
-
-      T_timestamp idleTs = getNewTimestamp();
-
-      usleep((unsigned int) pow(50000, ratio));
-
-      int diffTs = diffTimestamp(idleTs, getNewTimestamp());
-
-      statistics -> addIdleTime(diffTs);
-
-      statistics -> subReadTime(diffTs);
-    }
-  }
-}
-
-#if defined(TEST) || defined(INFO)
-
-static void handleCheckStateInLoop(int &setFDs)
-{
-  int fdLength;
-  int fdPending;
-  int fdSplits;
-
-  for (int j = 0; j < setFDs; j++)
-  {
-    if (j != proxyFD)
-    {
-      fdPending = proxy -> getPending(j);
-
-      if (fdPending > 0)
-      {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Buffer for descriptor FD#"
-                << j << " has pending bytes to read.\n"
-                << logofs_flush;
-        #endif
-
-        HandleCleanup();
-      }
-
-      fdLength = proxy -> getLength(j);
-
-      if (fdLength > 0)
-      {
-        #ifdef TEST
-        *logofs << "Loop: WARNING! Buffer for descriptor FD#"
-                << j << " has " << fdLength << " bytes to write.\n"
-                << logofs_flush;
-        #endif
-      }
-    }
-  }
-
-  fdPending = proxy -> getPending(proxyFD);
-
-  if (fdPending > 0)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Buffer for proxy descriptor FD#"
-            << proxyFD << " has pending bytes to read.\n"
-            << logofs_flush;
-    #endif
-
-    HandleCleanup();
-  }
-
-  fdLength = proxy -> getFlushable(proxyFD);
-
-  if (fdLength > 0)
-  {
-    if (control -> FlushPolicy == policy_immediate &&
-            proxy -> getBlocked(proxyFD) == 0)
-    {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Buffer for proxy descriptor FD#"
-              << proxyFD << " has " << fdLength << " bytes "
-              << "to write with policy 'immediate'.\n"
-              << logofs_flush;
-      #endif
-
-      HandleCleanup();
-    }
-    else
-    {
-      #ifdef TEST
-      *logofs << "Loop: WARNING! Buffer for proxy descriptor FD#"
-              << proxyFD << " has " << fdLength << " bytes "
-              << "to write.\n" << logofs_flush;
-      #endif
-    }
-  }
-
-  fdSplits = proxy -> getSplitSize();
-
-  if (fdSplits > 0)
-  {
-    #ifdef WARNING
-    *logofs << "Loop: WARNING! Proxy descriptor FD#" << proxyFD
-            << " has " << fdSplits << " splits to send.\n"
-            << logofs_flush;
-    #endif
-  }
-}
-
-static void handleCheckSelectInLoop(int &setFDs, fd_set &readSet,
-                                        fd_set &writeSet, T_timestamp selectTs)
-{
-  #if defined(TEST) || defined(INFO)
-  *logofs << "Loop: Maximum descriptors is ["
-          << setFDs << "] at " << strMsTimestamp()
-          << ".\n" << logofs_flush;
-  #endif
-
-  int i;
-
-  if (setFDs > 0)
-  {
-    i = 0;
-
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Selected for read are ";
-    #endif
-
-    for (int j = 0; j < setFDs; j++)
-    {
-      if (FD_ISSET(j, &readSet))
-      {
-        #if defined(TEST) || defined(INFO)
-        *logofs << "[" << j << "]" << logofs_flush;
-        #endif
-
-        i++;
-      }
-    }
-
-    if (i > 0)
-    {
-      #if defined(TEST) || defined(INFO)
-      *logofs << ".\n" << logofs_flush;
-      #endif
-    }
-    else
-    {
-      #if defined(TEST) || defined(INFO)
-      *logofs << "[none].\n" << logofs_flush;
-      #endif
-    }
-
-    i = 0;
-
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Selected for write are ";
-    #endif
-
-    for (int j = 0; j < setFDs; j++)
-    {
-      if (FD_ISSET(j, &writeSet))
-      {
-        #if defined(TEST) || defined(INFO)
-        *logofs << "[" << j << "]" << logofs_flush;
-        #endif
-
-        i++;
-      }
-    }
-
-    if (i > 0)
-    {
-      #if defined(TEST) || defined(INFO)
-      *logofs << ".\n" << logofs_flush;
-      #endif
-    }
-    else
-    {
-      #if defined(TEST) || defined(INFO)
-      *logofs << "[none].\n" << logofs_flush;
-      #endif
-    }
-  }
-
-  #if defined(TEST) || defined(INFO)
-  *logofs << "Loop: Select timeout is "
-          << selectTs.tv_sec << " S and "
-          << (double) selectTs.tv_usec / 1000
-          << " Ms.\n" << logofs_flush;
-  #endif
-}
-
-static void handleCheckResultInLoop(int &resultFDs, int &errorFDs, int &setFDs, fd_set &readSet,
-                                        fd_set &writeSet, struct timeval &selectTs,
-                                            struct timeval &startTs)
-{
-  int diffTs = diffTimestamp(startTs, getNewTimestamp());
-
-  #if defined(TEST) || defined(INFO)
-
-  if (diffTs >= (control -> PingTimeout -
-                     (control -> LatencyTimeout * 4)))
-  {
-    *logofs << "Loop: Select result is [" << resultFDs
-            << "] at " << strMsTimestamp() << " with no "
-            << "communication within " << diffTs
-            << " Ms.\n" << logofs_flush;
-  }
-  else
-  {
-    *logofs << "Loop: Select result is [" << resultFDs
-            << "] error is [" << errorFDs << "] at "
-            << strMsTimestamp() << " after " << diffTs
-            << " Ms.\n" << logofs_flush;
-  }
-
-  #endif
-
-  int i;
-
-  if (resultFDs > 0)
-  {
-    i = 0;
-
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Selected for read are ";
-    #endif
-
-    for (int j = 0; j < setFDs; j++)
-    {
-      if (FD_ISSET(j, &readSet))
-      {
-        #if defined(TEST) || defined(INFO)
-        *logofs << "[" << j << "]" << logofs_flush;
-        #endif
-
-        i++;
-      }
-    }
-
-    if (i > 0)
-    {
-      #if defined(TEST) || defined(INFO)
-      *logofs << ".\n" << logofs_flush;
-      #endif
-    }
-    else
-    {
-      #if defined(TEST) || defined(INFO)
-      *logofs << "[none].\n" << logofs_flush;
-      #endif
-    }
-
-    i = 0;
-
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Selected for write are ";
-    #endif
-
-    for (int j = 0; j < setFDs; j++)
-    {
-      if (FD_ISSET(j, &writeSet))
-      {
-        #if defined(TEST) || defined(INFO)
-        *logofs << "[" << j << "]" << logofs_flush;
-        #endif
-
-        i++;
-      }
-    }
-
-    if (i > 0)
-    {
-      #if defined(TEST) || defined(INFO)
-      *logofs << ".\n" << logofs_flush;
-      #endif
-    }
-    else
-    {
-      #if defined(TEST) || defined(INFO)
-      *logofs << "[none].\n" << logofs_flush;
-      #endif
-    }
-  }
-}
-
-#endif
-
-static void handleCheckSessionInConnect()
-{
-  #ifdef TEST
-  *logofs << "Loop: Going to check session in connect.\n"
-          << logofs_flush;
-  #endif
-
-  if (control -> ProxyMode == proxy_client)
-  {
-    HandleAlert(FAILED_PROXY_CONNECTION_CLIENT_ALERT, 1);
-  }
-  else if (IsNotRunning(lastDialog))
-  {
-    HandleAlert(FAILED_PROXY_CONNECTION_SERVER_ALERT, 1);
-  }
-
-  handleAlertInLoop();
-}
-
-static void handleStatisticsInLoop()
-{
-  if (lastSignal == 0)
-  {
-    return;
-  }
-
-  int mode = NO_STATS;
-
-  if (control -> EnableStatistics == 1)
-  {
-    if (lastSignal == SIGUSR1)
-    {
-      //
-      // Print overall statistics.
-      //
-
-      mode = TOTAL_STATS;
-    }
-    else if (lastSignal == SIGUSR2)
-    {
-      //
-      // Print partial statistics.
-      //
-
-      mode = PARTIAL_STATS;
-    }
-
-    if (mode == TOTAL_STATS || mode == PARTIAL_STATS)
-    {
-      #ifdef TEST
-      *logofs << "Loop: Going to request proxy statistics "
-              << "with signal '" << DumpSignal(lastSignal)
-              << "'.\n" << logofs_flush;
-      #endif
-
-      if (proxy != NULL)
-      {
-        if (ReopenLogFile(statsFileName, statofs, 0) < 0)
-        {
-          HandleCleanup();
-        }
-
-        proxy -> handleStatistics(mode, statofs);
-      }
-    }
-  }
-}
-
-static void handleNegotiationInLoop(int &setFDs, fd_set &readSet,
-                                        fd_set &writeSet, T_timestamp &selectTs)
-{
-  int yield = 0;
-
-  while (yield == 0)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Going to run a new negotiation loop "
-            << "with stage " << control -> ProxyStage
-            << " at " << strMsTimestamp() << ".\n"
-            << logofs_flush;
-    #endif
-
-    switch (control -> ProxyStage)
-    {
-      case stage_undefined:
-      {
-        #ifdef TEST
-        *logofs << "Loop: Handling negotiation with '"
-                << "stage_undefined" << "'.\n"
-                << logofs_flush;
-        #endif
-
-        control -> ProxyStage = stage_initializing;
-
-        break;
-      }
-      case stage_initializing:
-      {
-        #ifdef TEST
-        *logofs << "Loop: Handling negotiation with '"
-                << "stage_initializing" << "'.\n"
-                << logofs_flush;
-        #endif
-
-        InitBeforeNegotiation();
-
-        control -> ProxyStage = stage_connecting;
-
-        break;
-      }
-      case stage_connecting:
-      {
-        #ifdef TEST
-        *logofs << "Loop: Handling negotiation with '"
-                << "stage_connecting" << "'.\n"
-                << logofs_flush;
-        #endif
-
-        SetupProxyConnection();
-
-        control -> ProxyStage = stage_connected;
-
-        break;
-      }
-      case stage_connected:
-      {
-        #ifdef TEST
-        *logofs << "Loop: Handling negotiation with '"
-                << "stage_connected" << "'.\n"
-                << logofs_flush;
-        #endif
-
-        //
-        // Server side proxy must always be the one that
-        // sends its version and options first, so, in
-        // some way, client side can be the the one that
-        // has the last word on the matter.
-        //
-
-        if (control -> ProxyMode == proxy_server)
-        {
-          //
-          // Check if we have been listening for a
-          // forwarder. In this case it will have to
-          // authenticate itself.
-          //
-
-          if (WE_LISTEN_FORWARDER)
-          {
-            control -> ProxyStage = stage_waiting_forwarder_version;
-
-            break;
-          }
-
-          control -> ProxyStage = stage_sending_proxy_options;
-        }
-        else
-        {
-          //
-          // The X client side is the side that has to wait
-          // for the authorization cookie and any remote
-          // option.
-          //
-
-          control -> ProxyStage = stage_waiting_proxy_version;
-        }
-
-        break;
-      }
-      case stage_sending_proxy_options:
-      {
-        #ifdef TEST
-        *logofs << "Loop: Handling negotiation with '"
-                << "stage_sending_proxy_options" << "'.\n"
-                << logofs_flush;
-        #endif
-
-        if (SendProxyOptions(proxyFD) < 0)
-        {
-          goto handleNegotiationInLoopError;
-        }
-
-        if (control -> ProxyMode == proxy_server)
-        {
-          control -> ProxyStage = stage_waiting_proxy_version;
-        }
-        else
-        {
-          control -> ProxyStage = stage_sending_proxy_caches;
-        }
-
-        break;
-      }
-      case stage_waiting_forwarder_version:
-      {
-        #ifdef TEST
-        *logofs << "Loop: Handling negotiation with '"
-                << "stage_waiting_forwarder_version" << "'.\n"
-                << logofs_flush;
-        #endif
-
-        int result = ReadForwarderVersion(proxyFD);
-
-        if (result == 0)
-        {
-          yield = 1;
-        }
-        else if (result == 1)
-        {
-          control -> ProxyStage = stage_waiting_forwarder_options;
-        }
-        else
-        {
-          goto handleNegotiationInLoopError;
-        }
-
-        break;
-      }
-      case stage_waiting_forwarder_options:
-      {
-        #ifdef TEST
-        *logofs << "Loop: Handling negotiation with '"
-                << "stage_waiting_forwarder_options" << "'.\n"
-                << logofs_flush;
-        #endif
-
-        int result = ReadForwarderOptions(proxyFD);
-
-        if (result == 0)
-        {
-          yield = 1;
-        }
-        else if (result == 1)
-        {
-          control -> ProxyStage = stage_sending_proxy_options;
-        }
-        else
-        {
-          goto handleNegotiationInLoopError;
-        }
-
-        break;
-      }
-      case stage_waiting_proxy_version:
-      {
-        #ifdef TEST
-        *logofs << "Loop: Handling negotiation with '"
-                << "stage_waiting_proxy_version" << "'.\n"
-                << logofs_flush;
-        #endif
-
-        int result = ReadProxyVersion(proxyFD);
-
-        if (result == 0)
-        {
-          yield = 1;
-        }
-        else if (result == 1)
-        {
-          control -> ProxyStage = stage_waiting_proxy_options;
-        }
-        else
-        {
-          goto handleNegotiationInLoopError;
-        }
-
-        break;
-      }
-      case stage_waiting_proxy_options:
-      {
-        #ifdef TEST
-        *logofs << "Loop: Handling negotiation with '"
-                << "stage_waiting_proxy_options" << "'.\n"
-                << logofs_flush;
-        #endif
-
-        int result = ReadProxyOptions(proxyFD);
-
-        if (result == 0)
-        {
-          yield = 1;
-        }
-        else if (result == 1)
-        {
-          if (control -> ProxyMode == proxy_server)
-          {
-            control -> ProxyStage = stage_waiting_proxy_caches;
-          }
-          else
-          {
-            control -> ProxyStage = stage_sending_proxy_options;
-          }
-        }
-        else
-        {
-          goto handleNegotiationInLoopError;
-        }
-
-        break;
-      }
-      case stage_sending_proxy_caches:
-      {
-        #ifdef TEST
-        *logofs << "Loop: Handling negotiation with '"
-                << "stage_sending_proxy_caches" << "'.\n"
-                << logofs_flush;
-        #endif
-
-        if (SendProxyCaches(proxyFD) < 0)
-        {
-          goto handleNegotiationInLoopError;
-        }
-
-        if (control -> ProxyMode == proxy_server)
-        {
-          control -> ProxyStage = stage_operational;
-        }
-        else
-        {
-          control -> ProxyStage = stage_waiting_proxy_caches;
-        }
-
-        break;
-      }
-      case stage_waiting_proxy_caches:
-      {
-        #ifdef TEST
-        *logofs << "Loop: Handling negotiation with '"
-                << "stage_waiting_proxy_caches" << "'.\n"
-                << logofs_flush;
-        #endif
-
-        int result = ReadProxyCaches(proxyFD);
-
-        if (result == 0)
-        {
-          yield = 1;
-        }
-        else if (result == 1)
-        {
-          if (control -> ProxyMode == proxy_server)
-          {
-            control -> ProxyStage = stage_sending_proxy_caches;
-          }
-          else
-          {
-            control -> ProxyStage = stage_operational;
-          }
-        }
-        else
-        {
-          goto handleNegotiationInLoopError;
-        }
-
-        break;
-      }
-      case stage_operational:
-      {
-        #ifdef TEST
-        *logofs << "Loop: Handling negotiation with '"
-                << "stage_operational" << "'.\n"
-                << logofs_flush;
-        #endif
-
-        InitAfterNegotiation();
-
-        yield = 1;
-
-        break;
-      }
-      default:
-      {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Unmanaged case '" << control -> ProxyStage
-                << "' while handling negotiation.\n" << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Unmanaged case '" << control -> ProxyStage
-             << "' while handling negotiation.\n";
-
-        HandleCleanup();
-      }
-    }
-  }
-
-  //
-  // Check if the user requested the end of
-  // the session.
-  //
-  
-  if (CheckAbort() != 0)
-  {
-    HandleCleanup();
-  }
-
-  //
-  // Select the proxy descriptor so that we
-  // can proceed negotiating the session.
-  //
-
-  FD_SET(proxyFD, &readSet);
-
-  if (proxyFD >= setFDs)
-  {
-    setFDs = proxyFD + 1;
-  }
-
-  setMinTimestamp(selectTs, control -> PingTimeout);
-
-  #ifdef TEST
-  *logofs << "Loop: Selected proxy FD#" << proxyFD << " in negotiation "
-          << "phase with timeout of " << selectTs.tv_sec << " S and "
-          << selectTs.tv_usec << " Ms.\n" << logofs_flush;
-  #endif
-
-  return;
-
-handleNegotiationInLoopError:
-
-  #ifdef PANIC
-  *logofs << "Loop: PANIC! Failure negotiating the session in stage '"
-          << control -> ProxyStage << "'.\n" << logofs_flush;
-  #endif
-
-  cerr << "Error" << ": Failure negotiating the session in stage '"
-       << control -> ProxyStage << "'.\n";
-
-
-  if (control -> ProxyMode == proxy_server &&
-          control -> ProxyStage == stage_waiting_proxy_version)
-  {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Wrong version or invalid session "
-            << "authentication cookie.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Wrong version or invalid session "
-         << "authentication cookie.\n";
-  }
-
-  handleTerminatingInLoop();
-
-  HandleCleanup();
-}
-
-static void handleTerminatingInLoop()
-{
-  if (getpid() == lastProxy)
-  {
-    if (control -> ProxyStage < stage_terminating)
-    {
-      if (agent == NULL)
-      {
-        cerr << "Session" << ": Terminating session at '"
-             << strTimestamp() << "'.\n";
-      }
-
-      control -> ProxyStage = stage_terminating;
-    }
-  }
-}
-
-static void handleTerminatedInLoop()
-{
-  if (getpid() == lastProxy)
-  {
-    if (control -> ProxyStage < stage_terminated)
-    {
-      if (agent == NULL)
-      {
-        cerr << "Session" << ": Session terminated at '"
-             << strTimestamp() << "'.\n";
-      }
-
-      control -> ProxyStage = stage_terminated;
-    }
-  }
-}
-
-static void handleAlertInLoop()
-{
-  if (lastAlert.code == 0)
-  {
-    return;
-  }
-
-  //
-  // Since ProtoStep7 (#issue 108)
-  //
-  // Now the remote proxy should always
-  // be able to handle the alert
-  //
-
-  if (lastAlert.local == 0)
-  {
-    if (proxy != NULL)
-    {
-      #if defined(TEST) || defined(INFO)
-      *logofs << "Loop: Requesting a remote alert with code '"
-              << lastAlert.code << "'.\n" << logofs_flush;
-      #endif
-
-      if (proxy -> handleAlert(lastAlert.code) < 0)
-      {
-        HandleShutdown();
-      }
-    }
-  }
-  else
-  {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Handling a local alert with code '"
-            << lastAlert.code << "'.\n" << logofs_flush;
-    #endif
-
-    if (control -> ProxyMode == proxy_client)
-    {
-      //
-      // If we are at X client side and server
-      // proxy is not responding, we don't have
-      // any possibility to interact with user.
-      //
-
-      if (lastAlert.code != CLOSE_DEAD_PROXY_CONNECTION_CLIENT_ALERT &&
-              lastAlert.code != RESTART_DEAD_PROXY_CONNECTION_CLIENT_ALERT &&
-                  lastAlert.code != FAILED_PROXY_CONNECTION_CLIENT_ALERT)
-      {
-        //
-        // Let the server proxy show the dialog.
-        //
-
-        if (proxy != NULL &&
-                proxy -> handleAlert(lastAlert.code) < 0)
-        {
-          HandleShutdown();
-        }
-      }
-    }
-    else
-    {
-      char caption[DEFAULT_STRING_LENGTH];
-
-      strcpy(caption, ALERT_CAPTION_PREFIX);
-
-      int length = strlen(sessionId);
-
-      //
-      // Get rid of the trailing MD5 from session id.
-      //
-
-      if (length > (MD5_LENGTH * 2 + 1) &&
-              *(sessionId + (length - (MD5_LENGTH * 2 + 1))) == '-')
-      {
-        strncat(caption, sessionId, length - (MD5_LENGTH * 2 + 1));
-      }
-      else
-      {
-        strcat(caption, sessionId);
-      }
-
-      //
-      // Use the display to which we are forwarding
-      // the remote X connections.
-      // 
-
-      char *display = displayHost;
-
-      int replace = 1;
-      int local   = 1;
-
-      const char *message;
-      const char *type;
-
-      switch (lastAlert.code)
-      {
-        case CLOSE_DEAD_X_CONNECTION_CLIENT_ALERT:
-        {
-          message = CLOSE_DEAD_X_CONNECTION_CLIENT_ALERT_STRING;
-          type    = CLOSE_DEAD_X_CONNECTION_CLIENT_ALERT_TYPE;
-
-          break;
-        }
-        case CLOSE_DEAD_X_CONNECTION_SERVER_ALERT:
-        {
-          message = CLOSE_DEAD_X_CONNECTION_SERVER_ALERT_STRING;
-          type    = CLOSE_DEAD_X_CONNECTION_SERVER_ALERT_TYPE;
-
-          break;
-        }
-        case CLOSE_DEAD_PROXY_CONNECTION_SERVER_ALERT:
-        {
-          message = CLOSE_DEAD_PROXY_CONNECTION_SERVER_ALERT_STRING;
-          type    = CLOSE_DEAD_PROXY_CONNECTION_SERVER_ALERT_TYPE;
-
-          break;
-        }
-        case RESTART_DEAD_PROXY_CONNECTION_SERVER_ALERT:
-        {
-          message = RESTART_DEAD_PROXY_CONNECTION_SERVER_ALERT_STRING;
-          type    = RESTART_DEAD_PROXY_CONNECTION_SERVER_ALERT_TYPE;
-
-          break;
-        }
-        case CLOSE_UNRESPONSIVE_X_SERVER_ALERT:
-        {
-          message = CLOSE_UNRESPONSIVE_X_SERVER_ALERT_STRING;
-          type    = CLOSE_UNRESPONSIVE_X_SERVER_ALERT_TYPE;
-
-          break;
-        }
-        case WRONG_PROXY_VERSION_ALERT:
-        {
-          message = WRONG_PROXY_VERSION_ALERT_STRING;
-          type    = WRONG_PROXY_VERSION_ALERT_TYPE;
-
-          break;
-        }
-        case FAILED_PROXY_CONNECTION_SERVER_ALERT:
-        {
-          message = FAILED_PROXY_CONNECTION_SERVER_ALERT_STRING;
-          type    = FAILED_PROXY_CONNECTION_SERVER_ALERT_TYPE;
-
-          break;
-        }
-        case MISSING_PROXY_CACHE_ALERT:
-        {
-          message = MISSING_PROXY_CACHE_ALERT_STRING;
-          type    = MISSING_PROXY_CACHE_ALERT_TYPE;
-
-          break;
-        }
-        case ABORT_PROXY_CONNECTION_ALERT:
-        {
-          message = ABORT_PROXY_CONNECTION_ALERT_STRING;
-          type    = ABORT_PROXY_CONNECTION_ALERT_TYPE;
-
-          break;
-        }
-        case DISPLACE_MESSAGE_ALERT:
-        {
-          message = DISPLACE_MESSAGE_ALERT_STRING;
-          type    = DISPLACE_MESSAGE_ALERT_TYPE;
-
-          break;
-        }
-        case GREETING_MESSAGE_ALERT:
-        {
-          message = GREETING_MESSAGE_ALERT_STRING;
-          type    = GREETING_MESSAGE_ALERT_TYPE;
-
-          break;
-        }
-        case START_RESUME_SESSION_ALERT:
-        {
-          message = START_RESUME_SESSION_ALERT_STRING;
-          type    = START_RESUME_SESSION_ALERT_TYPE;
-
-          break;
-        }
-        case FAILED_RESUME_DISPLAY_ALERT:
-        {
-          message = FAILED_RESUME_DISPLAY_ALERT_STRING;
-          type    = FAILED_RESUME_DISPLAY_ALERT_TYPE;
-
-          break;
-        }
-        case FAILED_RESUME_DISPLAY_BROKEN_ALERT:
-        {
-          message = FAILED_RESUME_DISPLAY_BROKEN_STRING;
-          type    = FAILED_RESUME_DISPLAY_BROKEN_TYPE;
-
-          break;
-        }
-        case FAILED_RESUME_VISUALS_ALERT:
-        {
-          message = FAILED_RESUME_VISUALS_ALERT_STRING;
-          type    = FAILED_RESUME_VISUALS_ALERT_TYPE;
-
-          break;
-        }
-        case FAILED_RESUME_COLORMAPS_ALERT:
-        {
-          message = FAILED_RESUME_COLORMAPS_ALERT_STRING;
-          type    = FAILED_RESUME_COLORMAPS_ALERT_TYPE;
-
-          break;
-        }
-        case FAILED_RESUME_PIXMAPS_ALERT:
-        {
-          message = FAILED_RESUME_PIXMAPS_ALERT_STRING;
-          type    = FAILED_RESUME_PIXMAPS_ALERT_TYPE;
-
-          break;
-        }
-        case FAILED_RESUME_DEPTHS_ALERT:
-        {
-          message = FAILED_RESUME_DEPTHS_ALERT_STRING;
-          type    = FAILED_RESUME_DEPTHS_ALERT_TYPE;
-
-          break;
-        }
-        case FAILED_RESUME_RENDER_ALERT:
-        {
-          message = FAILED_RESUME_RENDER_ALERT_STRING;
-          type    = FAILED_RESUME_RENDER_ALERT_TYPE;
-
-          break;
-        }
-        case FAILED_RESUME_FONTS_ALERT:
-        {
-          message = FAILED_RESUME_FONTS_ALERT_STRING;
-          type    = FAILED_RESUME_FONTS_ALERT_TYPE;
-
-          break;
-        }
-        case INTERNAL_ERROR_ALERT:
-        {
-          message = INTERNAL_ERROR_ALERT_STRING;
-          type    = INTERNAL_ERROR_ALERT_TYPE;
-
-          break;
-        }
-        case ABORT_PROXY_NEGOTIATION_ALERT:
-        {
-          message = ABORT_PROXY_NEGOTIATION_ALERT_STRING;
-          type    = ABORT_PROXY_NEGOTIATION_ALERT_TYPE;
-
-          break;
-        }
-        case ABORT_PROXY_SHUTDOWN_ALERT:
-        {
-          message = ABORT_PROXY_SHUTDOWN_ALERT_STRING;
-          type    = ABORT_PROXY_SHUTDOWN_ALERT_TYPE;
-
-          break;
-        }
-        case FAILED_XDMCP_CONNECTION_ALERT:
-        {
-          message = FAILED_XDMCP_CONNECTION_ALERT_STRING;
-          type    = FAILED_XDMCP_CONNECTION_ALERT_TYPE;
-
-          break;
-        }
-        default:
-        {
-          if (lastAlert.code > LAST_PROTO_STEP_7_ALERT)
-          {
-            #ifdef WARNING
-            *logofs << "Loop: WARNING! An unrecognized alert type '"
-                    << lastAlert.code << "' was requested.\n"
-                    << logofs_flush;
-            #endif
-
-            cerr << "Warning" << ": An unrecognized alert type '"
-                 << lastAlert.code << "' was requested.\n";
-          }
-          #ifdef WARNING
-          else
-          {
-            *logofs << "Loop: WARNING! Ignoring obsolete alert type '"
-                    << lastAlert.code << "'.\n" << logofs_flush;
-          }
-          #endif
-
-          message = NULL;
-          type    = NULL;
-
-          replace = 0;
-
-          break;
-        }
-      }
-
-      if (replace == 1 && IsRunning(lastDialog))
-      {
-        #if defined(TEST) || defined(INFO)
-        *logofs << "Loop: Killing the previous dialog with pid '"
-                << lastDialog << "'.\n" << logofs_flush;
-        #endif
-
-        //
-        // The client ignores the TERM signal
-        // on Windows.
-        //
-
-        #ifdef __CYGWIN32__
-
-        KillProcess(lastDialog, "dialog", SIGKILL, 0);
-
-        #else
-
-        KillProcess(lastDialog, "dialog", SIGTERM, 0);
-
-        #endif
-
-        SetNotRunning(lastDialog);
-
-        if (proxy != NULL)
-        {
-          proxy -> handleResetAlert();
-        }
-      }
-
-      if (message != NULL && type != NULL)
-      {
-        lastDialog = NXTransDialog(caption, message, 0, type, local, display);
-
-        if (IsFailed(lastDialog))
-        {
-          #ifdef PANIC
-          *logofs << "Loop: PANIC! Can't start the NX dialog process.\n"
-                  << logofs_flush;
-          #endif
-
-          SetNotRunning(lastDialog);
-        }
-        #if defined(TEST) || defined(INFO)
-        else
-        {
-          *logofs << "Loop: Dialog started with pid '"
-                  << lastDialog << "'.\n" << logofs_flush;
-        }
-        #endif
-      }
-      #if defined(TEST) || defined(INFO)
-      else
-      {
-        *logofs << "Loop: No new dialog required for code '"
-                << lastAlert.code << "'.\n" << logofs_flush;
-      }
-      #endif
-    }
-  }
-
-  //
-  // Reset state.
-  //
-
-  lastAlert.code  = 0;
-  lastAlert.local = 0;
-}
-
-static inline void handleSetAgentInLoop(int &setFDs, fd_set &readSet,
-                                            fd_set &writeSet, struct timeval &selectTs)
-{
-  #ifdef TEST
-  *logofs << "Loop: Preparing the masks for the agent descriptors.\n"
-          << logofs_flush;
-  #endif
-
-  agent -> saveChannelState();
-
-  agent -> saveReadMask(&readSet);
-  agent -> saveWriteMask(&writeSet);
-
-  if (control -> ProxyStage >= stage_operational)
-  {
-    if (agent -> remoteCanRead(&readSet) ||
-            agent -> remoteCanWrite(&writeSet) ||
-                agent -> localCanRead() ||
-                    agent -> proxyCanRead())
-    {
-      #ifdef TEST
-      *logofs << "Loop: Setting a null timeout with agent descriptors ready.\n"
-              << logofs_flush;
-      #endif
-
-      //
-      // Force a null timeout so we'll bail out
-      // of the select immediately. We will ac-
-      // comodate the result code later.
-      //
-
-      selectTs.tv_sec  = 0;
-      selectTs.tv_usec = 0;
-    }
-  }
-
-  #ifdef TEST
-  *logofs << "Loop: Clearing the read and write agent descriptors.\n"
-          << logofs_flush;
-  #endif
-
-  agent -> clearReadMask(&readSet);
-  agent -> clearWriteMask(&writeSet);
-}
-
-static inline void handleAgentInLoop(int &resultFDs, int &errorFDs, int &setFDs, fd_set &readSet,
-                                         fd_set &writeSet, struct timeval &selectTs)
-{
-  #if defined(TEST) || defined(INFO)
-  *logofs << "Loop: Setting proxy and local agent descriptors.\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // Check if I/O is possible on the local
-  // agent or the proxy descriptor.
-  //
-  
-  if (resultFDs >= 0)
-  {
-    //
-    // Save if the proxy can read from the
-    // the agent descriptor.
-    //
-
-    agent -> saveChannelState();
-
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Values were resultFDs " << resultFDs
-            << " errorFDs " << errorFDs << " setFDs "
-            << setFDs << ".\n" << logofs_flush;
-    #endif
-
-    if (agent -> localCanRead() == 1)
-    {
-      #if defined(TEST) || defined(INFO)
-      *logofs << "Loop: Setting agent descriptor FD#" << agent ->
-                 getLocalFd() << " as ready to read.\n"
-              << logofs_flush;
-      #endif
-
-      agent -> setLocalRead(&readSet, &resultFDs);
-    }
-
-    #if defined(TEST) || defined(INFO)
-
-    if (agent -> proxyCanRead(&readSet) == 0 &&
-            agent -> proxyCanRead() == 1)
-    {
-      *logofs << "Loop: WARNING! Can read from proxy FD#"
-              << proxyFD << " but the descriptor "
-              << "is not selected.\n" << logofs_flush;
-    }
-
-    if (agent -> proxyCanRead(&readSet) == 1)
-    {
-      *logofs << "Loop: Setting proxy descriptor FD#" << agent ->
-                 getProxyFd() << " as ready to read.\n"
-              << logofs_flush;
-    }
-
-    #endif
-
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Values are now resultFDs " << resultFDs
-            << " errorFDs " << errorFDs << " setFDs "
-            << setFDs << ".\n" << logofs_flush;
-    #endif
-  }
-}
-
-static inline void handleAgentLateInLoop(int &resultFDs, int &errorFDs, int &setFDs, fd_set &readSet,
-                                             fd_set &writeSet, struct timeval &selectTs)
-{
-  #if defined(TEST) || defined(INFO)
-  *logofs << "Loop: Setting remote agent descriptors.\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // We reset the masks before calling our select.
-  // We now set the descriptors that are ready but
-  // only if they were set in the original mask.
-  // We do this after having executed our loop as
-  // we may have produced more data and the agent
-  // descriptors may have become readable or writ-
-  // able in the meanwhile.
-  //
-  
-  if (resultFDs >= 0)
-  {
-    //
-    // Save if the proxy can read from the
-    // the agent descriptor.
-    //
-
-    agent -> saveChannelState();
-
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Values were resultFDs " << resultFDs
-            << " errorFDs " << errorFDs << " setFDs "
-            << setFDs << ".\n" << logofs_flush;
-    #endif
-
-    if (agent -> remoteCanRead(agent ->
-            getSavedReadMask()) == 1)
-    {
-      #if defined(TEST) || defined(INFO)
-      *logofs << "Loop: Setting agent descriptor FD#" << agent ->
-                 getRemoteFd() << " as ready to read.\n"
-              << logofs_flush;
-      #endif
-
-      agent -> setRemoteRead(&readSet, &resultFDs);
-    }
-
-    if (agent -> remoteCanWrite(agent ->
-            getSavedWriteMask()) == 1)
-    {
-      #if defined(TEST) || defined(INFO)
-      *logofs << "Loop: Setting agent descriptor FD#" << agent ->
-                 getRemoteFd() << " as ready to write.\n"
-              << logofs_flush;
-      #endif
-
-      agent -> setRemoteWrite(&writeSet, &resultFDs);
-    }
-
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Values are now resultFDs " << resultFDs
-            << " errorFDs " << errorFDs << " setFDs "
-            << setFDs << ".\n" << logofs_flush;
-    #endif
-  }
-}
-
-static inline void handleReadableInLoop(int &resultFDs, fd_set &readSet)
-{
-  if (resultFDs > 0)
-  {
-    T_channel_type type = channel_none;
-
-    const char *label = NULL;
-    int domain  = -1;
-    int fd      = -1;
-
-    if (tcpFD != -1 && FD_ISSET(tcpFD, &readSet))
-    {
-      type   = channel_x11;
-      label  = "X";
-      domain = AF_INET;
-      fd     = tcpFD;
-
-      resultFDs--;
-    }
-
-    if (unixFD != -1 && FD_ISSET(unixFD, &readSet))
-    {
-      type   = channel_x11;
-      label  = "X";
-      domain = AF_UNIX;
-      fd     = unixFD;
-
-      resultFDs--;
-    }
-
-    if (cupsFD != -1 && FD_ISSET(cupsFD, &readSet))
-    {
-      type   = channel_cups;
-      label  = "CUPS";
-      domain = AF_INET;
-      fd     = cupsFD;
-
-      resultFDs--;
-    }
-
-    if (auxFD != -1 && FD_ISSET(auxFD, &readSet))
-    {
-      //
-      // Starting from version 1.5.0 we create real X
-      // connections for the keyboard channel, so they
-      // can use the fake authorization cookie. This
-      // means that there is not such a thing like a
-      // channel_aux anymore.
-      //
-
-      type   = channel_x11;
-      label  = "auxiliary X11";
-      domain = AF_INET;
-      fd     = auxFD;
-
-      resultFDs--;
-    }
-
-    if (smbFD != -1 && FD_ISSET(smbFD, &readSet))
-    {
-      type   = channel_smb;
-      label  = "SMB";
-      domain = AF_INET;
-      fd     = smbFD;
-
-      resultFDs--;
-    }
-
-    if (mediaFD != -1 && FD_ISSET(mediaFD, &readSet))
-    {
-      type   = channel_media;
-      label  = "media";
-      domain = AF_INET;
-      fd     = mediaFD;
-
-      resultFDs--;
-    }
-
-    if (httpFD != -1 && FD_ISSET(httpFD, &readSet))
-    {
-      type   = channel_http;
-      label  = "HTTP";
-      domain = AF_INET;
-      fd     = httpFD;
-
-      resultFDs--;
-    }
-
-    if (fontFD != -1 && FD_ISSET(fontFD, &readSet))
-    {
-      type   = channel_font;
-      label  = "font server";
-      domain = AF_INET;
-      fd     = fontFD;
-
-      resultFDs--;
-    }
-
-    if (slaveFD != -1 && FD_ISSET(slaveFD, &readSet))
-    {
-      type   = channel_slave;
-      label  = "slave";
-      domain = AF_INET;
-      fd     = slaveFD;
-
-      resultFDs--;
-    }
-
-    if (type != channel_none)
-    {
-      int newFD = AcceptConnection(fd, domain, label);
-
-      if (newFD != -1)
-      {
-        if (proxy -> handleNewConnection(type, newFD) < 0)
-        {
-          #ifdef PANIC
-          *logofs << "Loop: PANIC! Error creating new " << label
-                  << " connection.\n" << logofs_flush;
-          #endif
-
-          cerr << "Error" << ": Error creating new " << label
-               << " connection.\n";
-
-          close(newFD);
-
-          //
-          // Don't kill the proxy in the case of an error.
-          //
-          // HandleCleanup();
-          //
-        }
-        else if (proxy -> getReadable(newFD) > 0)
-        {
-          //
-          // Add the descriptor, so we can try
-          // to read immediately.
-          //
-
-          #ifdef TEST
-          *logofs << "Loop: Trying to read immediately "
-                  << "from descriptor FD#" << newFD
-                  << ".\n" << logofs_flush;
-          #endif
-
-          FD_SET(newFD, &readSet);
-
-          resultFDs++;
-        }
-        #ifdef TEST
-        else
-        {
-          *logofs << "Loop: Nothing to read immediately "
-                  << "from descriptor FD#" << newFD
-                  << ".\n" << logofs_flush;
-        }
-        #endif
-      }
-    }
-  }
-
-  #ifdef DEBUG
-  *logofs << "Loop: Going to check the readable descriptors.\n"
-          << logofs_flush;
-  #endif
-
-  if (proxy -> handleRead(resultFDs, readSet) < 0)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Failure reading from descriptors "
-            << "for proxy FD#" << proxyFD << ".\n"
-            << logofs_flush;
-    #endif
-
-    HandleShutdown();
-  }
-}
-
-static inline void handleWritableInLoop(int &resultFDs, fd_set &writeSet)
-{
-  #ifdef DEBUG
-  *logofs << "Loop: Going to check the writable descriptors.\n"
-          << logofs_flush;
-  #endif
-
-  if (resultFDs > 0 && proxy -> handleFlush(resultFDs, writeSet) < 0)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Failure writing to descriptors "
-            << "for proxy FD#" << proxyFD << ".\n"
-            << logofs_flush;
-    #endif
-
-    HandleShutdown();
-  }
-}
-
-static inline void handleFlushInLoop()
-{
-  #ifdef DEBUG
-  *logofs << "Loop: Going to flush any data to the proxy.\n"
-          << logofs_flush;
-  #endif
-
-  if (agent == NULL || control ->
-          FlushPolicy == policy_immediate)
-  {
-    #if defined(TEST) || defined(INFO)
-
-    if (usePolicy == -1 && control ->
-            ProxyMode == proxy_client)
-    {
-      *logofs << "Loop: WARNING! Flushing the proxy link "
-              << "on behalf of the agent.\n" << logofs_flush;
-    }
-
-    #endif
-
-    if (proxy -> handleFlush() < 0)
-    {
-      #ifdef TEST
-      *logofs << "Loop: Failure flushing the proxy FD#"
-              << proxyFD << ".\n" << logofs_flush;
-      #endif
-
-      HandleShutdown();
-    }
-  }
-}
-
-static inline void handleRotateInLoop()
-{
-  #ifdef DEBUG
-  *logofs << "Loop: Going to rotate channels "
-          << "for proxy FD#" << proxyFD << ".\n"
-          << logofs_flush;
-  #endif
-
-  proxy -> handleRotate();
-}
-
-static inline void handleEventsInLoop()
-{
-  #ifdef DEBUG
-  *logofs << "Loop: Going to check channel events "
-          << "for proxy FD#" << proxyFD << ".\n"
-          << logofs_flush;
-  #endif
-
-  if (proxy -> handleEvents() < 0)
-  {
-    #ifdef TEST
-    *logofs << "Loop: Failure handling channel events "
-            << "for proxy FD#" << proxyFD << ".\n"
-            << logofs_flush;
-    #endif
-
-    HandleShutdown();
-  }
-}
-
-static void handleLogReopenInLoop(T_timestamp &logsTs, T_timestamp &nowTs)
-{
-  //
-  // If need to limit the size of the
-  // log file, check the size at each
-  // loop.
-  //
-
-  #ifndef QUOTA
-
-  if (diffTimestamp(logsTs, nowTs) > control -> FileSizeCheckTimeout)
-
-  #endif
-  {
-    #ifdef DEBUG
-    *logofs << "Loop: Checking size of log file '"
-            << errorsFileName << "'.\n" << logofs_flush;
-    #endif
-
-    #ifndef MIXED
-
-    if (ReopenLogFile(errorsFileName, logofs, control -> FileSizeLimit) < 0)
-    {
-      HandleShutdown();
-    }
-
-    #endif
-
-    //
-    // Reset to current timestamp.
-    //
-
-    logsTs = nowTs;
-  }
-}
-
-static inline void handleSetReadInLoop(fd_set &readSet, int &setFDs, struct timeval &selectTs)
-{
-  proxy -> setReadDescriptors(&readSet, setFDs, selectTs);
-}
-
-static inline void handleSetWriteInLoop(fd_set &writeSet, int &setFDs, struct timeval &selectTs)
-{
-  proxy -> setWriteDescriptors(&writeSet, setFDs, selectTs);
-}
-
-static void handleSetListenersInLoop(fd_set &readSet, int &setFDs)
-{
-  //
-  // Set descriptors of listening sockets.
-  //
-
-  if (control -> ProxyMode == proxy_client)
-  {
-    if (useTcpSocket == 1)
-    {
-      FD_SET(tcpFD, &readSet);
-
-      if (tcpFD >= setFDs)
-      {
-        setFDs = tcpFD + 1;
-      }
-
-      #ifdef DEBUG
-      *logofs << "Loop: Selected listener tcpFD " << tcpFD
-              << " with setFDs " << setFDs << ".\n"
-              << logofs_flush;
-      #endif
-    }
-
-    if (useUnixSocket == 1)
-    {
-      FD_SET(unixFD, &readSet);
-
-      if (unixFD >= setFDs)
-      {
-        setFDs = unixFD + 1;
-      }
-
-      #ifdef DEBUG
-      *logofs << "Loop: Selected listener unixFD " << unixFD
-              << " with setFDs " << setFDs << ".\n"
-              << logofs_flush;
-      #endif
-    }
-
-    if (useCupsSocket == 1)
-    {
-      FD_SET(cupsFD, &readSet);
-
-      if (cupsFD >= setFDs)
-      {
-        setFDs = cupsFD + 1;
-      }
-
-      #ifdef DEBUG
-      *logofs << "Loop: Selected listener cupsFD " << cupsFD
-              << " with setFDs " << setFDs << ".\n"
-              << logofs_flush;
-      #endif
-    }
-
-    if (useAuxSocket == 1)
-    {
-      FD_SET(auxFD, &readSet);
-
-      if (auxFD >= setFDs)
-      {
-        setFDs = auxFD + 1;
-      }
-
-      #ifdef DEBUG
-      *logofs << "Loop: Selected listener auxFD " << auxFD
-              << " with setFDs " << setFDs << ".\n"
-              << logofs_flush;
-      #endif
-    }
-
-    if (useSmbSocket == 1)
-    {
-      FD_SET(smbFD, &readSet);
-
-      if (smbFD >= setFDs)
-      {
-        setFDs = smbFD + 1;
-      }
-
-      #ifdef DEBUG
-      *logofs << "Loop: Selected listener smbFD " << smbFD
-              << " with setFDs " << setFDs << ".\n"
-              << logofs_flush;
-      #endif
-    }
-
-    if (useMediaSocket == 1)
-    {
-      FD_SET(mediaFD, &readSet);
-
-      if (mediaFD >= setFDs)
-      {
-        setFDs = mediaFD + 1;
-      }
-
-      #ifdef DEBUG
-      *logofs << "Loop: Selected listener mediaFD " << mediaFD
-              << " with setFDs " << setFDs << ".\n"
-              << logofs_flush;
-      #endif
-    }
-
-    if (useHttpSocket == 1)
-    {
-      FD_SET(httpFD, &readSet);
-
-      if (httpFD >= setFDs)
-      {
-        setFDs = httpFD + 1;
-      }
-
-      #ifdef DEBUG
-      *logofs << "Loop: Selected listener httpFD " << httpFD
-              << " with setFDs " << setFDs << ".\n"
-              << logofs_flush;
-      #endif
-    }
-  }
-  else
-  {
-    if (useFontSocket == 1)
-    {
-      FD_SET(fontFD, &readSet);
-
-      if (fontFD >= setFDs)
-      {
-        setFDs = fontFD + 1;
-      }
-
-      #ifdef DEBUG
-      *logofs << "Loop: Selected listener fontFD " << fontFD
-              << " with setFDs " << setFDs << ".\n"
-              << logofs_flush;
-      #endif
-    }
-  }
-
-  if (useSlaveSocket == 1)
-  {
-    FD_SET(slaveFD, &readSet);
-
-    if (slaveFD >= setFDs)
-    {
-      setFDs = slaveFD + 1;
-    }
-
-    #ifdef DEBUG
-    *logofs << "Loop: Selected listener slaveFD " << slaveFD
-            << " with setFDs " << setFDs << ".\n"
-            << logofs_flush;
-    #endif
-  }
-}
diff --git a/nxcomp/MD5.c b/nxcomp/MD5.c
deleted file mode 100644
index e49d3cf58..000000000
--- a/nxcomp/MD5.c
+++ /dev/null
@@ -1,399 +0,0 @@
-/*
-  Copyright (C) 1999, 2000, 2002 Aladdin Enterprises.  All rights reserved.
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  L. Peter Deutsch
-  ghost@aladdin.com
-
- */
-/* $Id: md5.c,v 1.6 2002/04/13 19:20:28 lpd Exp $ */
-/*
-  Independent implementation of MD5 (RFC 1321).
-
-  This code implements the MD5 Algorithm defined in RFC 1321, whose
-  text is available at
-	http://www.ietf.org/rfc/rfc1321.txt
-  The code is derived from the text of the RFC, including the test suite
-  (section A.5) but excluding the rest of Appendix A.  It does not include
-  any code or documentation that is identified in the RFC as being
-  copyrighted.
-
-  The original and principal author of md5.c is L. Peter Deutsch
-  <ghost@aladdin.com>.  Other authors are noted in the change history
-  that follows (in reverse chronological order):
-
-  2002-04-13 lpd Clarified derivation from RFC 1321; now handles byte order
-	either statically or dynamically; added missing #include <string.h>
-	in library.
-  2002-03-11 lpd Corrected argument list for main(), and added int return
-	type, in test program and T value program.
-  2002-02-21 lpd Added missing #include <stdio.h> in test program.
-  2000-07-03 lpd Patched to eliminate warnings about "constant is
-	unsigned in ANSI C, signed in traditional"; made test program
-	self-checking.
-  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
-  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5).
-  1999-05-03 lpd Original version.
- */
-
-#include "MD5.h"
-
-#include <string.h>
-
-/*
- * Try to determine the CPU endianess
- * at compile time.
- */
-
-#if defined(__linux) || defined(__CYGWIN32__)
-
-#include <endian.h>
-
-#if (__BYTE_ORDER == __LITTLE_ENDIAN)
-#define ARCH_IS_BIG_ENDIAN 0
-#else
-#define ARCH_IS_BIG_ENDIAN 1
-#endif
-
-#endif /* #if defined(__linux) || defined(__CYGWIN32__) */
-
-#undef BYTE_ORDER	/* 1 = big-endian, -1 = little-endian, 0 = unknown */
-#ifdef ARCH_IS_BIG_ENDIAN
-#  define BYTE_ORDER (ARCH_IS_BIG_ENDIAN ? 1 : -1)
-#else
-#  define BYTE_ORDER 0
-#endif
-
-#define T_MASK ((md5_word_t)~0)
-#define T1 /* 0xd76aa478 */ (T_MASK ^ 0x28955b87)
-#define T2 /* 0xe8c7b756 */ (T_MASK ^ 0x173848a9)
-#define T3    0x242070db
-#define T4 /* 0xc1bdceee */ (T_MASK ^ 0x3e423111)
-#define T5 /* 0xf57c0faf */ (T_MASK ^ 0x0a83f050)
-#define T6    0x4787c62a
-#define T7 /* 0xa8304613 */ (T_MASK ^ 0x57cfb9ec)
-#define T8 /* 0xfd469501 */ (T_MASK ^ 0x02b96afe)
-#define T9    0x698098d8
-#define T10 /* 0x8b44f7af */ (T_MASK ^ 0x74bb0850)
-#define T11 /* 0xffff5bb1 */ (T_MASK ^ 0x0000a44e)
-#define T12 /* 0x895cd7be */ (T_MASK ^ 0x76a32841)
-#define T13    0x6b901122
-#define T14 /* 0xfd987193 */ (T_MASK ^ 0x02678e6c)
-#define T15 /* 0xa679438e */ (T_MASK ^ 0x5986bc71)
-#define T16    0x49b40821
-#define T17 /* 0xf61e2562 */ (T_MASK ^ 0x09e1da9d)
-#define T18 /* 0xc040b340 */ (T_MASK ^ 0x3fbf4cbf)
-#define T19    0x265e5a51
-#define T20 /* 0xe9b6c7aa */ (T_MASK ^ 0x16493855)
-#define T21 /* 0xd62f105d */ (T_MASK ^ 0x29d0efa2)
-#define T22    0x02441453
-#define T23 /* 0xd8a1e681 */ (T_MASK ^ 0x275e197e)
-#define T24 /* 0xe7d3fbc8 */ (T_MASK ^ 0x182c0437)
-#define T25    0x21e1cde6
-#define T26 /* 0xc33707d6 */ (T_MASK ^ 0x3cc8f829)
-#define T27 /* 0xf4d50d87 */ (T_MASK ^ 0x0b2af278)
-#define T28    0x455a14ed
-#define T29 /* 0xa9e3e905 */ (T_MASK ^ 0x561c16fa)
-#define T30 /* 0xfcefa3f8 */ (T_MASK ^ 0x03105c07)
-#define T31    0x676f02d9
-#define T32 /* 0x8d2a4c8a */ (T_MASK ^ 0x72d5b375)
-#define T33 /* 0xfffa3942 */ (T_MASK ^ 0x0005c6bd)
-#define T34 /* 0x8771f681 */ (T_MASK ^ 0x788e097e)
-#define T35    0x6d9d6122
-#define T36 /* 0xfde5380c */ (T_MASK ^ 0x021ac7f3)
-#define T37 /* 0xa4beea44 */ (T_MASK ^ 0x5b4115bb)
-#define T38    0x4bdecfa9
-#define T39 /* 0xf6bb4b60 */ (T_MASK ^ 0x0944b49f)
-#define T40 /* 0xbebfbc70 */ (T_MASK ^ 0x4140438f)
-#define T41    0x289b7ec6
-#define T42 /* 0xeaa127fa */ (T_MASK ^ 0x155ed805)
-#define T43 /* 0xd4ef3085 */ (T_MASK ^ 0x2b10cf7a)
-#define T44    0x04881d05
-#define T45 /* 0xd9d4d039 */ (T_MASK ^ 0x262b2fc6)
-#define T46 /* 0xe6db99e5 */ (T_MASK ^ 0x1924661a)
-#define T47    0x1fa27cf8
-#define T48 /* 0xc4ac5665 */ (T_MASK ^ 0x3b53a99a)
-#define T49 /* 0xf4292244 */ (T_MASK ^ 0x0bd6ddbb)
-#define T50    0x432aff97
-#define T51 /* 0xab9423a7 */ (T_MASK ^ 0x546bdc58)
-#define T52 /* 0xfc93a039 */ (T_MASK ^ 0x036c5fc6)
-#define T53    0x655b59c3
-#define T54 /* 0x8f0ccc92 */ (T_MASK ^ 0x70f3336d)
-#define T55 /* 0xffeff47d */ (T_MASK ^ 0x00100b82)
-#define T56 /* 0x85845dd1 */ (T_MASK ^ 0x7a7ba22e)
-#define T57    0x6fa87e4f
-#define T58 /* 0xfe2ce6e0 */ (T_MASK ^ 0x01d3191f)
-#define T59 /* 0xa3014314 */ (T_MASK ^ 0x5cfebceb)
-#define T60    0x4e0811a1
-#define T61 /* 0xf7537e82 */ (T_MASK ^ 0x08ac817d)
-#define T62 /* 0xbd3af235 */ (T_MASK ^ 0x42c50dca)
-#define T63    0x2ad7d2bb
-#define T64 /* 0xeb86d391 */ (T_MASK ^ 0x14792c6e)
-
-
-static void
-md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
-{
-    md5_word_t
-	a = pms->abcd[0], b = pms->abcd[1],
-	c = pms->abcd[2], d = pms->abcd[3];
-    md5_word_t t;
-#if BYTE_ORDER > 0
-    /* Define storage only for big-endian CPUs. */
-    md5_word_t X[16];
-#else
-    /* Define storage for little-endian or both types of CPUs. */
-    md5_word_t xbuf[16];
-    const md5_word_t *X;
-#endif
-
-    {
-#if BYTE_ORDER == 0
-	/*
-	 * Determine dynamically whether this is a big-endian or
-	 * little-endian machine, since we can use a more efficient
-	 * algorithm on the latter.
-	 */
-	static const int w = 1;
-
-	if (*((const md5_byte_t *)&w)) /* dynamic little-endian */
-#endif
-#if BYTE_ORDER <= 0		/* little-endian */
-	{
-	    /*
-	     * On little-endian machines, we can process properly aligned
-	     * data without copying it.
-	     */
-	    if (!((data - (const md5_byte_t *)0) & 3)) {
-		/* data are properly aligned */
-		X = (const md5_word_t *)data;
-	    } else {
-		/* not aligned */
-		memcpy(xbuf, data, 64);
-		X = xbuf;
-	    }
-	}
-#endif
-#if BYTE_ORDER == 0
-	else			/* dynamic big-endian */
-#endif
-#if BYTE_ORDER >= 0		/* big-endian */
-	{
-	    /*
-	     * On big-endian machines, we must arrange the bytes in the
-	     * right order.
-	     */
-	    const md5_byte_t *xp = data;
-	    int i;
-
-#  if BYTE_ORDER == 0
-	    X = xbuf;		/* (dynamic only) */
-#  else
-#    define xbuf X		/* (static only) */
-#  endif
-	    for (i = 0; i < 16; ++i, xp += 4)
-		xbuf[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24);
-	}
-#endif
-    }
-
-#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
-
-    /* Round 1. */
-    /* Let [abcd k s i] denote the operation
-       a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */
-#define F(x, y, z) (((x) & (y)) | (~(x) & (z)))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + F(b,c,d) + X[k] + Ti;\
-  a = ROTATE_LEFT(t, s) + b
-    /* Do the following 16 operations. */
-    SET(a, b, c, d,  0,  7,  T1);
-    SET(d, a, b, c,  1, 12,  T2);
-    SET(c, d, a, b,  2, 17,  T3);
-    SET(b, c, d, a,  3, 22,  T4);
-    SET(a, b, c, d,  4,  7,  T5);
-    SET(d, a, b, c,  5, 12,  T6);
-    SET(c, d, a, b,  6, 17,  T7);
-    SET(b, c, d, a,  7, 22,  T8);
-    SET(a, b, c, d,  8,  7,  T9);
-    SET(d, a, b, c,  9, 12, T10);
-    SET(c, d, a, b, 10, 17, T11);
-    SET(b, c, d, a, 11, 22, T12);
-    SET(a, b, c, d, 12,  7, T13);
-    SET(d, a, b, c, 13, 12, T14);
-    SET(c, d, a, b, 14, 17, T15);
-    SET(b, c, d, a, 15, 22, T16);
-#undef SET
-
-     /* Round 2. */
-     /* Let [abcd k s i] denote the operation
-          a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */
-#define G(x, y, z) (((x) & (z)) | ((y) & ~(z)))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + G(b,c,d) + X[k] + Ti;\
-  a = ROTATE_LEFT(t, s) + b
-     /* Do the following 16 operations. */
-    SET(a, b, c, d,  1,  5, T17);
-    SET(d, a, b, c,  6,  9, T18);
-    SET(c, d, a, b, 11, 14, T19);
-    SET(b, c, d, a,  0, 20, T20);
-    SET(a, b, c, d,  5,  5, T21);
-    SET(d, a, b, c, 10,  9, T22);
-    SET(c, d, a, b, 15, 14, T23);
-    SET(b, c, d, a,  4, 20, T24);
-    SET(a, b, c, d,  9,  5, T25);
-    SET(d, a, b, c, 14,  9, T26);
-    SET(c, d, a, b,  3, 14, T27);
-    SET(b, c, d, a,  8, 20, T28);
-    SET(a, b, c, d, 13,  5, T29);
-    SET(d, a, b, c,  2,  9, T30);
-    SET(c, d, a, b,  7, 14, T31);
-    SET(b, c, d, a, 12, 20, T32);
-#undef SET
-
-     /* Round 3. */
-     /* Let [abcd k s t] denote the operation
-          a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */
-#define H(x, y, z) ((x) ^ (y) ^ (z))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + H(b,c,d) + X[k] + Ti;\
-  a = ROTATE_LEFT(t, s) + b
-     /* Do the following 16 operations. */
-    SET(a, b, c, d,  5,  4, T33);
-    SET(d, a, b, c,  8, 11, T34);
-    SET(c, d, a, b, 11, 16, T35);
-    SET(b, c, d, a, 14, 23, T36);
-    SET(a, b, c, d,  1,  4, T37);
-    SET(d, a, b, c,  4, 11, T38);
-    SET(c, d, a, b,  7, 16, T39);
-    SET(b, c, d, a, 10, 23, T40);
-    SET(a, b, c, d, 13,  4, T41);
-    SET(d, a, b, c,  0, 11, T42);
-    SET(c, d, a, b,  3, 16, T43);
-    SET(b, c, d, a,  6, 23, T44);
-    SET(a, b, c, d,  9,  4, T45);
-    SET(d, a, b, c, 12, 11, T46);
-    SET(c, d, a, b, 15, 16, T47);
-    SET(b, c, d, a,  2, 23, T48);
-#undef SET
-
-     /* Round 4. */
-     /* Let [abcd k s t] denote the operation
-          a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */
-#define I(x, y, z) ((y) ^ ((x) | ~(z)))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + I(b,c,d) + X[k] + Ti;\
-  a = ROTATE_LEFT(t, s) + b
-     /* Do the following 16 operations. */
-    SET(a, b, c, d,  0,  6, T49);
-    SET(d, a, b, c,  7, 10, T50);
-    SET(c, d, a, b, 14, 15, T51);
-    SET(b, c, d, a,  5, 21, T52);
-    SET(a, b, c, d, 12,  6, T53);
-    SET(d, a, b, c,  3, 10, T54);
-    SET(c, d, a, b, 10, 15, T55);
-    SET(b, c, d, a,  1, 21, T56);
-    SET(a, b, c, d,  8,  6, T57);
-    SET(d, a, b, c, 15, 10, T58);
-    SET(c, d, a, b,  6, 15, T59);
-    SET(b, c, d, a, 13, 21, T60);
-    SET(a, b, c, d,  4,  6, T61);
-    SET(d, a, b, c, 11, 10, T62);
-    SET(c, d, a, b,  2, 15, T63);
-    SET(b, c, d, a,  9, 21, T64);
-#undef SET
-
-     /* Then perform the following additions. (That is increment each
-        of the four registers by the value it had before this block
-        was started.) */
-    pms->abcd[0] += a;
-    pms->abcd[1] += b;
-    pms->abcd[2] += c;
-    pms->abcd[3] += d;
-}
-
-void
-md5_init(md5_state_t *pms)
-{
-    pms->count[0] = pms->count[1] = 0;
-    pms->abcd[0] = 0x67452301;
-    pms->abcd[1] = /*0xefcdab89*/ T_MASK ^ 0x10325476;
-    pms->abcd[2] = /*0x98badcfe*/ T_MASK ^ 0x67452301;
-    pms->abcd[3] = 0x10325476;
-}
-
-void
-md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes)
-{
-    const md5_byte_t *p = data;
-    int left = nbytes;
-    int offset = (pms->count[0] >> 3) & 63;
-    md5_word_t nbits = (md5_word_t)(nbytes << 3);
-
-    if (nbytes <= 0)
-	return;
-
-    /* Update the message length. */
-    pms->count[1] += nbytes >> 29;
-    pms->count[0] += nbits;
-    if (pms->count[0] < nbits)
-	pms->count[1]++;
-
-    /* Process an initial partial block. */
-    if (offset) {
-	int copy = (offset + nbytes > 64 ? 64 - offset : nbytes);
-
-	memcpy(pms->buf + offset, p, copy);
-	if (offset + copy < 64)
-	    return;
-	p += copy;
-	left -= copy;
-	md5_process(pms, pms->buf);
-    }
-
-    /* Process full blocks. */
-    for (; left >= 64; p += 64, left -= 64)
-	md5_process(pms, p);
-
-    /* Process a final partial block. */
-    if (left)
-	memcpy(pms->buf, p, left);
-}
-
-void
-md5_finish(md5_state_t *pms, md5_byte_t digest[16])
-{
-    static const md5_byte_t pad[64] = {
-	0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    };
-    md5_byte_t data[8];
-    int i;
-
-    /* Save the length before padding. */
-    for (i = 0; i < 8; ++i)
-	data[i] = (md5_byte_t)(pms->count[i >> 2] >> ((i & 3) << 3));
-    /* Pad to 56 bytes mod 64. */
-    md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1);
-    /* Append the length. */
-    md5_append(pms, data, 8);
-    for (i = 0; i < 16; ++i)
-	digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3));
-}
diff --git a/nxcomp/MD5.h b/nxcomp/MD5.h
deleted file mode 100644
index 698c995d8..000000000
--- a/nxcomp/MD5.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-  Copyright (C) 1999, 2002 Aladdin Enterprises.  All rights reserved.
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  L. Peter Deutsch
-  ghost@aladdin.com
-
- */
-/* $Id: md5.h,v 1.4 2002/04/13 19:20:28 lpd Exp $ */
-/*
-  Independent implementation of MD5 (RFC 1321).
-
-  This code implements the MD5 Algorithm defined in RFC 1321, whose
-  text is available at
-	http://www.ietf.org/rfc/rfc1321.txt
-  The code is derived from the text of the RFC, including the test suite
-  (section A.5) but excluding the rest of Appendix A.  It does not include
-  any code or documentation that is identified in the RFC as being
-  copyrighted.
-
-  The original and principal author of md5.h is L. Peter Deutsch
-  <ghost@aladdin.com>.  Other authors are noted in the change history
-  that follows (in reverse chronological order):
-
-  2002-04-13 lpd Removed support for non-ANSI compilers; removed
-	references to Ghostscript; clarified derivation from RFC 1321;
-	now handles byte order either statically or dynamically.
-  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
-  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5);
-	added conditionalization for C++ compilation from Martin
-	Purschke <purschke@bnl.gov>.
-  1999-05-03 lpd Original version.
- */
-
-#ifndef md5_INCLUDED
-#  define md5_INCLUDED
-
-/*
- * This package supports both compile-time and run-time determination of CPU
- * byte order.  If ARCH_IS_BIG_ENDIAN is defined as 0, the code will be
- * compiled to run only on little-endian CPUs; if ARCH_IS_BIG_ENDIAN is
- * defined as non-zero, the code will be compiled to run only on big-endian
- * CPUs; if ARCH_IS_BIG_ENDIAN is not defined, the code will be compiled to
- * run on either big- or little-endian CPUs, but will run slightly less
- * efficiently on either one than if ARCH_IS_BIG_ENDIAN is defined.
- */
-
-typedef unsigned char md5_byte_t; /* 8-bit byte */
-typedef unsigned int md5_word_t; /* 32-bit word */
-
-/* Define the state of the MD5 Algorithm. */
-typedef struct md5_state_s {
-    md5_word_t count[2];	/* message length in bits, lsw first */
-    md5_word_t abcd[4];		/* digest buffer */
-    md5_byte_t buf[64];		/* accumulate block */
-} md5_state_t;
-
-#ifdef __cplusplus
-extern "C" 
-{
-#endif
-
-/* Initialize the algorithm. */
-void md5_init(md5_state_t *pms);
-
-/* Append a string to the message. */
-void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes);
-
-/* Finish the message and return the digest. */
-void md5_finish(md5_state_t *pms, md5_byte_t digest[16]);
-
-#ifdef __cplusplus
-}  /* end extern "C" */
-#endif
-
-#endif /* md5_INCLUDED */
diff --git a/nxcomp/Makefile.am b/nxcomp/Makefile.am
new file mode 100644
index 000000000..ae5991c3d
--- /dev/null
+++ b/nxcomp/Makefile.am
@@ -0,0 +1,21 @@
+SUBDIRS = src
+
+pkgconfig_DATA = nxcomp.pc
+
+MAINTAINERCLEANFILES =			\
+    $(srcdir)/autom4te.cache/*		\
+    $(srcdir)/build-aux/*		\
+    $(srcdir)/Makefile.in		\
+    $(srcdir)/src/Makefile.in		\
+    $(srcdir)/aclocal.m4		\
+    $(srcdir)/config.h.in		\
+    $(srcdir)/config.h.in~		\
+    $(srcdir)/configure			\
+    $(srcdir)/m4/libtool.m4		\
+    $(srcdir)/m4/lt~obsolete.m4		\
+    $(srcdir)/m4/ltoptions.m4		\
+    $(srcdir)/m4/ltsugar.m4		\
+    $(srcdir)/m4/ltversion.m4		\
+    $(NULL)
+
+DISTCLEANFILES=$(MAINTAINERCLEANFILES)
diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in
deleted file mode 100644
index f18875524..000000000
--- a/nxcomp/Makefile.in
+++ /dev/null
@@ -1,333 +0,0 @@
-#/**************************************************************************/
-#/*                                                                        */
-#/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-#/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-#/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-#/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-#/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-#/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-#/*                                                                        */
-#/* NXCOMP, NX protocol compression and NX extensions to this software     */
-#/* are copyright of the aforementioned persons and companies.             */
-#/*                                                                        */
-#/* Redistribution and use of the present software is allowed according    */
-#/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-#/* source distribution.                                                   */
-#/*                                                                        */
-#/* All rights reserved.                                                   */
-#/*                                                                        */
-#/* NOTE: This software has received contributions from various other      */
-#/* contributors, only the core maintainers and supporters are listed as   */
-#/* copyright holders. Please contact us, if you feel you should be listed */
-#/* as copyright holder, as well.                                          */
-#/*                                                                        */
-#/**************************************************************************/
-
-#
-# Get these values from the configure script. The
-# version printed by the program should be derived
-# from the CHANGELOG. For example we may use the
-# following command:
-#
-# head -n 3 CHANGELOG | grep 'nxcomp-' | cut -d '-' -f 2-3
-#
-
-VERSION=@VERSION@
-LIBVERSION=@LIBVERSION@
-
-#
-# We would really like to enable all warnings, -Wredundant-decls,
-# though, gives a warning caused by pthread.h and unistd.h and
-# GCC 3.4 was changed in a way that it now complains about some
-# of the -W directives we used before (-Wmissing-declarations,
-# -Wnested-externs, -Wstrict-prototypes and -Wmissing-prototypes).
-#
-
-CXX         = @CXX@
-CXXFLAGS    = @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \
-              -Wall -Wpointer-arith
-CXXINCLUDES =
-CXXDEFINES  =
-
-CPPFLAGS    = @CPPFLAGS@
-
-#
-# C programs have their own CFLAGS.
-# 
-
-CC          = @CC@
-CCFLAGS     = @CFLAGS@ @X_CFLAGS@ @DEFS@ \
-              -Wall -Wpointer-arith
-CCINCLUDES  =
-CCDEFINES   =
-
-LDFLAGS     = @LDFLAGS@
-LIBS        = @LIBS@
-
-#
-# Other autoconfigured settings, not used at the moment.
-#
-
-srcdir       = @srcdir@
-prefix       = @prefix@
-datarootdir  = @datarootdir@
-datadir      = @datadir@
-exec_prefix  = @exec_prefix@
-bindir       = @bindir@
-man1dir      = @mandir@/man1
-VPATH        = @srcdir@
-libdir       = @libdir@
-includedir   = @includedir@
-pkgconfigdir = @pkgconfigdir@
-
-INSTALL         = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA    = @INSTALL_DATA@
-INSTALL_LINK    = cp -av
-DESTDIR         =
-RM_FILE         = rm -f
-
-#
-# This should be autodetected.
-#
-
-MAKEDEPEND     = @MAKEDEPEND@
-DEPENDINCLUDES = -I/usr/include/c++ -I/usr/include/g++ -I/usr/include/g++-3 
-
-.SUFFIXES: .cpp.c
-
-.cpp.o:
-	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CXXINCLUDES) $(CXXDEFINES) $<
-.c.o:
-	$(CC) -c $(CPPFLAGS) $(CCFLAGS) $(CCINCLUDES) $(CCDEFINES) $<
-
-LIBRARY = Xcomp
-
-LIBNAME    = lib$(LIBRARY)
-ifeq ($(shell uname),Darwin)
-LIBFULL    = lib$(LIBRARY).$(VERSION).dylib
-LIBLOAD    = lib$(LIBRARY).$(LIBVERSION).dylib
-LIBSHARED  = lib$(LIBRARY).dylib
-COMP_VER   = $(shell echo '$(VERSION)' | cut -d '.' -f 1-3)
-LIBFLAGS   = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(COMP_VER)
-else
-LIBFULL    = lib$(LIBRARY).so.$(VERSION)
-LIBLOAD    = lib$(LIBRARY).so.$(LIBVERSION)
-LIBSHARED  = lib$(LIBRARY).so
-LIBFLAGS   =
-endif
-LIBARCHIVE = lib$(LIBRARY).a
-
-LIBCYGSHARED  = cyg$(LIBRARY).dll
-LIBCYGARCHIVE = lib$(LIBRARY).dll.a
-
-all: depend @ALL@
-
-MSRC   =
-
-CSRC   = MD5.c					\
-	 Pack.c					\
-	 Vars.c					\
-	 Version.c
-
-CXXSRC = Loop.cpp 				\
-	 Children.cpp				\
-	 Control.cpp				\
-	 Misc.cpp				\
-	 Socket.cpp				\
-	 Fork.cpp				\
-	 Pipe.cpp				\
-	 List.cpp				\
-	 Keeper.cpp				\
-	 Timestamp.cpp				\
-	 Transport.cpp				\
-	 Statistics.cpp				\
-	 Auth.cpp				\
-	 Agent.cpp				\
-	 Proxy.cpp				\
-	 Channel.cpp				\
-	 Message.cpp				\
-	 Split.cpp				\
-	 ClientProxy.cpp			\
-	 ServerProxy.cpp			\
-	 OpcodeStore.cpp			\
-	 ClientStore.cpp			\
-	 ServerStore.cpp			\
-	 ChannelCache.cpp			\
-	 ClientCache.cpp			\
-	 ServerCache.cpp			\
-	 ClientChannel.cpp			\
-	 ServerChannel.cpp			\
-	 GenericChannel.cpp			\
-	 ChannelEndPoint.cpp			\
-	 ReadBuffer.cpp				\
-	 ProxyReadBuffer.cpp			\
-	 ClientReadBuffer.cpp			\
-	 ServerReadBuffer.cpp			\
-	 GenericReadBuffer.cpp			\
-	 EncodeBuffer.cpp			\
-	 DecodeBuffer.cpp			\
-	 WriteBuffer.cpp			\
-	 SequenceQueue.cpp			\
-	 IntCache.cpp				\
-	 CharCache.cpp				\
-	 XidCache.cpp				\
-	 ActionCache.cpp			\
-	 BlockCache.cpp				\
-	 BlockCacheSet.cpp			\
-	 StaticCompressor.cpp			\
-	 Unpack.cpp				\
-	 Alpha.cpp				\
-	 Colormap.cpp				\
-	 Jpeg.cpp				\
-	 Pgn.cpp				\
-	 Bitmap.cpp				\
-	 Rgb.cpp				\
-	 Rle.cpp				\
-	 Z.cpp					\
-	 ChangeProperty.cpp			\
-	 SendEvent.cpp				\
-	 ChangeGC.cpp				\
-	 CreateGC.cpp				\
-	 CreatePixmap.cpp			\
-	 SetClipRectangles.cpp			\
-	 CopyArea.cpp				\
-	 PolyLine.cpp				\
-	 PolySegment.cpp			\
-	 PolyFillRectangle.cpp			\
-	 PutImage.cpp				\
-	 TranslateCoords.cpp			\
-	 GetImage.cpp				\
-	 ClearArea.cpp				\
-	 ConfigureWindow.cpp			\
-	 PolyText8.cpp				\
-	 PolyText16.cpp				\
-	 ImageText8.cpp				\
-	 ImageText16.cpp			\
-	 PolyPoint.cpp				\
-	 PolyFillArc.cpp			\
-	 PolyArc.cpp				\
-	 FillPoly.cpp				\
-	 InternAtom.cpp				\
-	 GetProperty.cpp			\
-	 SetUnpackGeometry.cpp			\
-	 SetUnpackColormap.cpp			\
-	 SetUnpackAlpha.cpp			\
-	 PutPackedImage.cpp			\
-	 ShapeExtension.cpp			\
-	 RenderExtension.cpp			\
-	 GenericRequest.cpp			\
-	 QueryFontReply.cpp			\
-	 ListFontsReply.cpp			\
-	 GetImageReply.cpp			\
-	 GetPropertyReply.cpp			\
-	 GenericReply.cpp			\
-	 RenderGenericRequest.cpp		\
-	 RenderCreatePicture.cpp		\
-	 RenderChangePicture.cpp		\
-	 RenderFreePicture.cpp			\
-	 RenderPictureClip.cpp			\
-	 RenderPictureTransform.cpp		\
-	 RenderPictureFilter.cpp		\
-	 RenderCreateGlyphSet.cpp		\
-	 RenderFreeGlyphSet.cpp			\
-	 RenderAddGlyphs.cpp			\
-	 RenderComposite.cpp			\
-	 RenderCompositeGlyphs.cpp		\
-	 RenderFillRectangles.cpp		\
-	 RenderTrapezoids.cpp			\
-	 RenderTriangles.cpp
-
-MOBJ   = $(MSRC:.c=.o)
-COBJ   = $(CSRC:.c=.o)
-CXXOBJ = $(CXXSRC:.cpp=.o)
-
-$(LIBFULL):	 $(CXXOBJ) $(COBJ)
-		 $(CXX) -o $@ $(LDFLAGS) $(LIBFLAGS) $(CXXOBJ) $(COBJ) $(LIBS)
-
-$(LIBLOAD):	 $(LIBFULL)
-		 rm -f $(LIBLOAD)
-		 ln -s $(LIBFULL) $(LIBLOAD)
-
-$(LIBSHARED):	 $(LIBFULL)
-		 rm -f $(LIBSHARED)
-		 ln -s $(LIBFULL) $(LIBSHARED)
-
-$(LIBARCHIVE):	 $(CXXOBJ) $(COBJ)
-		 rm -f  $(LIBARCHIVE)
-		 ar clq $(LIBARCHIVE) $(CXXOBJ) $(COBJ)
-		 ranlib $(LIBARCHIVE)
-
-$(LIBCYGSHARED): $(LIBARCHIVE)
-		 $(CC) -shared -o $(LIBCYGSHARED) \
-		 -Wl,--out-implib=$(LIBCYGARCHIVE) \
-		 -Wl,--export-all-symbols \
-		 -Wl,--enable-auto-import \
-		 -Wl,--whole-archive $(LIBARCHIVE) \
-		 -Wl,--no-whole-archive $(LIBS) \
-		 $(LDFLAGS)
-
-$(LIBCYGARCHIVE): $(LIBCYGSHARED)
-
-depends:	depend.status
-
-depend:		depend.status
-
-depend.status:	
-		if [ -n "$(MAKEDEPEND)" ] && [ -x "$(MAKEDEPEND)" ] ; then \
-			$(MAKEDEPEND) $(CXXINCLUDES) $(CCINCLUDES) \
-			$(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) \
-			$(CXXSRC) 2>/dev/null; \
-		fi
-		touch depend.status
-
-install:	install.bin install.lib install.man
-
-install.bin:
-
-install.lib: all
-	./mkinstalldirs $(DESTDIR)${libdir}
-	./mkinstalldirs $(DESTDIR)${includedir}/nx
-	./mkinstalldirs $(DESTDIR)${pkgconfigdir}
-	$(INSTALL_DATA) $(LIBFULL)              $(DESTDIR)${libdir}
-	$(INSTALL_LINK) $(LIBLOAD)              $(DESTDIR)${libdir}
-	$(INSTALL_LINK) $(LIBSHARED)            $(DESTDIR)${libdir}
-	$(INSTALL_DATA) $(LIBARCHIVE)           $(DESTDIR)${libdir}
-	$(INSTALL_DATA) MD5.h                   $(DESTDIR)${includedir}/nx
-	$(INSTALL_DATA) NX.h                    $(DESTDIR)${includedir}/nx
-	$(INSTALL_DATA) NXalert.h               $(DESTDIR)${includedir}/nx
-	$(INSTALL_DATA) NXpack.h                $(DESTDIR)${includedir}/nx
-	$(INSTALL_DATA) NXproto.h               $(DESTDIR)${includedir}/nx
-	$(INSTALL_DATA) NXvars.h                $(DESTDIR)${includedir}/nx
-	$(INSTALL_DATA) nxcomp.pc               $(DESTDIR)${pkgconfigdir}
-	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
-
-install.man:
-
-uninstall:	uninstall.bin uninstall.lib uninstall.man
-
-uninstall.bin:
-
-uninstall.lib:
-	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
-	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBLOAD)
-	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBSHARED)
-	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBARCHIVE)
-	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXalert.h
-	$(RM_FILE) $(DESTDIR)${includedir}/nx/NX.h
-	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXpack.h
-	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXproto.h
-	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXvars.h
-	$(RM_FILE) $(DESTDIR)${includedir}/nx/MD5.h
-	$(RM_FILE) $(DESTDIR)${pkgconfigdir}/nxcomp.pc
-	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
-
-uninstall.man:
-
-clean:
-		-rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* *.pc \
-		@ALL@
-
-distclean:	clean
-		-rm -rf autom4te.cache config.status config.log \
-		config.cache depend.status Makefile tags configure
diff --git a/nxcomp/Message.cpp b/nxcomp/Message.cpp
deleted file mode 100644
index 530b6b5a8..000000000
--- a/nxcomp/Message.cpp
+++ /dev/null
@@ -1,2339 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include <cstdio>
-#include <unistd.h>
-#include <cstring>
-
-#include <algorithm>
-
-#include "Misc.h"
-
-//
-// We need channel's cache data.
-//
-
-#include "Message.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-//
-// Set the verbosity level. You also
-// need to define DUMP in Misc.cpp
-// if DUMP is defined here.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Define this to log when messages
-// are allocated and deallocated.
-//
-
-#undef  REFERENCES
-
-//
-// Keep track of how many bytes are
-// occupied by cache.
-//
-
-int MessageStore::totalLocalStorageSize_  = 0;
-int MessageStore::totalRemoteStorageSize_ = 0;
-
-//
-// These are used for reference count.
-//
-
-#ifdef REFERENCES
-
-int Message::references_        = 0;
-int MessageStore::references_   = 0;
-
-#endif
-
-//
-// Here are the methods to handle cached messages.
-//
-
-MessageStore::MessageStore(StaticCompressor *compressor)
-
-  : compressor_(compressor)
-{
-  //
-  // Public members.
-  //
-
-  enableCache    = MESSAGE_ENABLE_CACHE;
-  enableData     = MESSAGE_ENABLE_DATA;
-  enableSplit    = MESSAGE_ENABLE_SPLIT;
-  enableCompress = MESSAGE_ENABLE_COMPRESS;
-
-  dataLimit  = MESSAGE_DATA_LIMIT;
-  dataOffset = MESSAGE_DATA_OFFSET;
-
-  cacheSlots          = MESSAGE_CACHE_SLOTS;
-  cacheThreshold      = MESSAGE_CACHE_THRESHOLD;
-  cacheLowerThreshold = MESSAGE_CACHE_LOWER_THRESHOLD;
-
-  #ifdef TEST
-  *logofs << "MessageStore: Static compressor is at "
-          << compressor_ << ".\n" << logofs_flush;
-  #endif
-
-  md5_state_ = new md5_state_t();
-
-  #ifdef DEBUG
-  *logofs << "MessageStore: Created MD5 state for object at " 
-          << this << ".\n" << logofs_flush;
-  #endif
-
-  lastAdded   = cacheSlots;
-  lastHit     = 0;
-  lastRemoved = 0;
-  lastRated   = nothing;
-  lastAction  = is_discarded;
-
-  //
-  // Private members.
-  //
-
-  localStorageSize_  = 0;
-  remoteStorageSize_ = 0;
-
-  #ifdef TEST
-  *logofs << "MessageStore: Size of total cache is " 
-          << totalLocalStorageSize_ << " bytes at local side and " 
-          << totalRemoteStorageSize_ << " bytes at remote side.\n" 
-          << logofs_flush;
-  #endif
-
-  messages_  = new T_messages();
-  checksums_ = new T_checksums();
-
-  temporary_ = NULL;
-
-  #ifdef REFERENCES
-
-  references_++;
-
-  *logofs << "MessageStore: Created new store at " 
-          << this << "out of " << references_
-          << " allocated stores.\n" << logofs_flush;
-
-  #endif
-}
-
-MessageStore::~MessageStore()
-{
-  //
-  // The virtual destructor of specialized class
-  // must get rid of both messages in container
-  // and temporary.
-  //
-
-  #ifdef DEBUG
-  *logofs << "MessageStore: Deleting MD5 state for object at "
-          << this << ".\n" << logofs_flush;
-  #endif
-
-  delete md5_state_;
-
-  delete messages_;
-  delete checksums_;
-
-  //
-  // Update the static members tracking
-  // size of total memory allocated for
-  // all stores.
-  //
-
-  totalLocalStorageSize_  -= localStorageSize_;
-  totalRemoteStorageSize_ -= remoteStorageSize_;
-
-  #ifdef TEST
-  *logofs << "MessageStore: Size of total cache is " 
-          << totalLocalStorageSize_ << " bytes at local side and " 
-          << totalRemoteStorageSize_ << " bytes at remote side.\n" 
-          << logofs_flush;
-  #endif
-
-  #ifdef REFERENCES
-
-  references_--;
-
-  *logofs << "MessageStore: Deleted store at " 
-          << this << " out of " << references_
-          << " allocated stores.\n" << logofs_flush;
-
-  #endif
-}
-
-//
-// Here are the methods to parse and cache
-// messages in the message stores.
-//
-
-int MessageStore::parse(Message *message, int split, const unsigned char *buffer,
-                            unsigned int size, T_checksum_action checksumAction,
-                                T_data_action dataAction, int bigEndian)
-{
-  //
-  // Save the message size as received on the link.
-  // This information will be used to create an ap-
-  // propriate buffer at the time the message will
-  // be unparsed.
-  //
-
-  message -> size_   = size;
-  message -> i_size_ = identitySize(buffer, size);
-  message -> c_size_ = 0;
-
-  validateSize(size);
-
-  if (checksumAction == use_checksum)
-  {
-    beginChecksum(message);
-
-    parseIdentity(message, buffer, size, bigEndian);
-
-    identityChecksum(message, buffer, size, bigEndian);
-
-    parseData(message, split, buffer, size, checksumAction, dataAction, bigEndian);
-
-    endChecksum(message);
-  }
-  else
-  {
-    parseIdentity(message, buffer, size, bigEndian);
-
-    parseData(message, split, buffer, size, checksumAction, dataAction, bigEndian);
-  }
-
-  return 1;
-}
-
-int MessageStore::parse(Message *message, const unsigned char *buffer,
-                            unsigned int size, const unsigned char *compressedData,
-                                const unsigned int compressedDataSize,
-                                    T_checksum_action checksumAction,
-                                        T_data_action dataAction, int bigEndian)
-{
-  int offset = identitySize(buffer, size);
-
-  message -> size_   = size;
-  message -> i_size_ = offset;
-  message -> c_size_ = compressedDataSize + offset;
-
-  validateSize(message -> size_ - offset, compressedDataSize);
-
-  if (checksumAction == use_checksum)
-  {
-    beginChecksum(message);
-
-    parseIdentity(message, buffer, size, bigEndian);
-
-    identityChecksum(message, buffer, size, bigEndian);
-
-    parseData(message, buffer, size, compressedData, compressedDataSize,
-                  checksumAction, dataAction, bigEndian);
-
-    endChecksum(message);
-  }
-  else
-  {
-    parseIdentity(message, buffer, size, bigEndian);
-
-    parseData(message, buffer, size, compressedData, compressedDataSize,
-                  checksumAction, dataAction, bigEndian);
-  }
-
-  return 1;
-}
-
-int MessageStore::parseData(Message *message, int split, const unsigned char *buffer,
-                                unsigned int size, T_checksum_action checksumAction,
-                                    T_data_action dataAction, int bigEndian)
-{
-  if ((int) size > message -> i_size_)
-  {
-    unsigned int dataSize = size - message -> i_size_;
-
-    if (checksumAction == use_checksum)
-    {
-      #ifdef DEBUG
-      *logofs << name() << ": Calculating checksum of object at "
-              << message << " with data size " << dataSize
-              << ".\n" << logofs_flush;
-      #endif
-
-      dataChecksum(message, buffer, size, bigEndian);
-    }
-
-    if (dataAction == discard_data)
-    {
-      #ifdef DEBUG
-      *logofs << name() << ": Discarded " << dataSize
-              << " bytes of plain data. Real size is "
-              << message -> size_ << " compressed size is "
-              << message -> c_size_ << ".\n" << logofs_flush;
-      #endif
-
-      return 1;
-    }
-
-    //
-    // Accept anyway data beyond the
-    // expected limit.
-    //
-
-    #ifdef TEST
-
-    if (dataSize > (unsigned int) dataLimit)
-    {
-      *logofs << name() << ": WARNING! Data is " << dataSize
-              << " bytes. Ignoring the established limit.\n"
-              << logofs_flush;
-    }
-
-    #endif
-
-    if (dataSize != message -> data_.size())
-    {
-      #ifdef DEBUG
-      *logofs << name() << ": Data will be resized from "
-              << message -> data_.size() << " to hold a plain buffer of "
-              << dataSize << " bytes.\n" << logofs_flush;
-      #endif
-
-      message -> data_.clear();
-
-      message -> data_.resize(dataSize);
-    }
-
-    if (split == 0)
-    {
-      memcpy(message -> data_.begin(), buffer + message -> i_size_, dataSize);
-    }
-    #ifdef TEST
-    else
-    {
-      *logofs << name() << ": Not copied " << dataSize
-              << " bytes of fake data for the split message.\n"
-              << logofs_flush;
-    }
-    #endif
-
-    #ifdef DEBUG
-    *logofs << name() << ": Parsed " << dataSize
-            << " bytes of plain data. Real size is "
-            << message -> size_ << " compressed size is "
-            << message -> c_size_ << ".\n" << logofs_flush;
-    #endif
-  }
-
-  return 1;
-}
-
-//
-// Store the data part in compressed format.
-//
-
-int MessageStore::parseData(Message *message, const unsigned char *buffer,
-                                unsigned int size, const unsigned char *compressedData,
-                                    const unsigned int compressedDataSize,
-                                        T_checksum_action checksumAction,
-                                             T_data_action dataAction, int bigEndian)
-{
-  if ((int) size > message -> i_size_)
-  {
-    unsigned int dataSize = size - message -> i_size_;
-
-    if (checksumAction == use_checksum)
-    {
-      #ifdef DEBUG
-      *logofs << name() << ": Calculating checksum of object at "
-              << message << " with data size " << dataSize
-              << ".\n" << logofs_flush;
-      #endif
-
-      dataChecksum(message, buffer, size, bigEndian);
-    }
-
-    if (dataAction == discard_data)
-    {
-      #ifdef DEBUG
-      *logofs << name() << ": Discarded " << dataSize
-              << " bytes of compressed data. Real size is "
-              << message -> size_ << " compressed size is "
-              << message -> c_size_ << ".\n" << logofs_flush;
-      #endif
-
-      return 1;
-    }
-
-    #ifdef WARNING
-    if (dataSize > (unsigned int) dataLimit)
-    {
-      *logofs << name() << ": WARNING! Data is " << dataSize
-              << " bytes. Ignoring the established limit!\n"
-              << logofs_flush;
-    }
-    #endif
-
-    dataSize = compressedDataSize;
-
-    if (dataSize != message -> data_.size())
-    {
-      #ifdef DEBUG
-      *logofs << name() << ": Data will be resized from "
-              << message -> data_.size() << " to hold a compressed buffer of "
-              << dataSize << " bytes.\n" << logofs_flush;
-      #endif
-
-      message -> data_.clear();
-
-      message -> data_.resize(compressedDataSize);
-    }
-
-    memcpy(message -> data_.begin(), compressedData, compressedDataSize);
-
-    #ifdef DEBUG
-    *logofs << name() << ": Parsed " << dataSize
-            << " bytes of compressed data. Real size is "
-            << message -> size_ << " compressed size is "
-            << message -> c_size_ << ".\n" << logofs_flush;
-    #endif
-  }
-
-  return 1;
-}
-
-int MessageStore::unparseData(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian)
-{
-  //
-  // Copy data, if any, to the buffer.
-  //
-
-  if ((int) size > message -> i_size_)
-  {
-    //
-    // Check if message has been stored
-    // in compressed format.
-    //
-
-    if (message -> c_size_ == 0)
-    {
-      memcpy(buffer + message -> i_size_, message -> data_.begin(), size - message -> i_size_);
-
-      #ifdef DEBUG
-      *logofs << name() << ": Unparsed " << message -> size_ - message -> i_size_
-              << " bytes of data to a buffer of " << message -> size_ - message -> i_size_
-              << ".\n" << logofs_flush;
-      #endif
-    }
-    else
-    {
-      #ifdef DEBUG
-      *logofs << name() << ": Using static compressor at " << (void *) compressor_
-              << ".\n" << logofs_flush;
-      #endif
-
-      if (compressor_ ->
-              decompressBuffer(buffer + message -> i_size_,
-                                   size - message -> i_size_,
-                                       message -> data_.begin(),
-                                           message -> c_size_ - message -> i_size_) < 0)
-      {
-        #ifdef PANIC
-        *logofs << name() << ": PANIC! Data decompression failed.\n"
-                << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Data decompression failed.\n";
-
-        return -1;
-      }
-
-      #ifdef DEBUG
-      *logofs << name() << ": Unparsed " << message -> c_size_ - message -> i_size_
-              << " bytes of compressed data to a buffer of "
-              << message -> size_ - message -> i_size_ << ".\n" << logofs_flush;
-      #endif
-    }
-  }
-
-  //
-  // We could write size to the buffer but this
-  // is something the channel class is doing by
-  // itself.
-  //
-  // PutUINT(size >> 2, buffer + 2, bigEndian);
-  //
-
-  return 1;
-}
-
-void MessageStore::dumpData(const Message *message) const
-{
-  #ifdef DUMP
-
-  *logofs << name() << ": Dumping enumerated data:\n" << logofs_flush; 
-
-  DumpData(message -> data_.begin(), message -> data_.size());
-
-  #endif
-
-  #ifdef DUMP
-
-  *logofs << name() << ": Dumping checksum data:\n" << logofs_flush; 
-
-  DumpData(message -> md5_digest_, MD5_LENGTH);
-
-  #endif
-}
-
-T_checksum MessageStore::getChecksum(const unsigned char *buffer,
-                                         unsigned int size, int bigEndian)
-{
-  Message *message = getTemporary();
-
-  message -> size_   = size;
-  message -> i_size_ = identitySize(buffer, size);
-  message -> c_size_ = 0;
-
-  validateSize(size);
-
-  beginChecksum(message);
-
-  //
-  // We don't need to extract the identity
-  // data from the buffer.
-  //
-  // parseIdentity(message, buffer, size, bigEndian);
-  //
-
-  identityChecksum(message, buffer, size, bigEndian);
-
-  parseData(message, 0, buffer, size, use_checksum, discard_data, bigEndian);
-
-  endChecksum(message);
-
-  //
-  // The caller will have to explicitly
-  // deallocated the memory after use.
-  //
-
-  T_checksum checksum = new md5_byte_t[MD5_LENGTH];
-
-  memcpy(checksum, message -> md5_digest_, MD5_LENGTH);
-
-  return checksum;
-}
-
-int MessageStore::clean(T_checksum_action checksumAction)
-{
-  int position = lastRemoved + 1;
-
-  if (position >= cacheSlots)
-  {
-    position = 0;
-  }
-
-  #ifdef DEBUG
-  *logofs << name() << ": Searching a message to remove "
-          << "starting at position " << position
-          << " with " << checksums_ -> size()
-          << " elements in cache.\n"
-          << logofs_flush;
-  #endif
-
-  while (position != lastRemoved)
-  {
-    #ifdef DEBUG
-    *logofs << name() << ": Examining position "
-            << position << ".\n" << logofs_flush;
-    #endif
-
-    if ((*messages_)[position] != NULL)
-    {
-      if (getRating((*messages_)[position], rating_for_clean) == 0)
-      {
-        break;
-      }
-      else
-      {
-        untouch((*messages_)[position]);
-      }
-    }
-
-    if (++position == cacheSlots)
-    {
-      #ifdef DEBUG
-      *logofs << name() << ": Rolled position at "
-              << strMsTimestamp() << ".\n"
-              << logofs_flush;
-      #endif
-
-      position = 0;
-    }
-  }
-
-  //
-  // If no message is a good candidate,
-  // then try the object at the next slot
-  // in respect to last element removed.
-  //
-
-  if (position == lastRemoved)
-  {
-    position = lastRemoved + 1;
-
-    if (position >= cacheSlots)
-    {
-      position = 0;
-    }
-
-    if ((*messages_)[position] == NULL ||
-            (*messages_)[position] -> locks_ != 0)
-    {
-      #ifdef DEBUG
-      *logofs << name() << ": WARNING! No message found "
-            << "to be actually removed.\n"
-            << logofs_flush;
-      #endif
-
-      return nothing;
-    }
-
-    #ifdef DEBUG
-    *logofs << name() << ": WARNING! Assuming object "
-            << "at position " << position << ".\n"
-            << logofs_flush;
-    #endif
-  }
-
-  return position;
-}
-
-//
-// This is the insertion method used at local side 
-// side. Cache at remote side side will be kept in
-// sync by telling the to other party where to 
-// store the message. 
-//
-
-int MessageStore::findOrAdd(Message *message, T_checksum_action checksumAction,
-                                T_data_action dataAction, int &added, int &locked)
-{
-  if (checksumAction != use_checksum)
-  {
-    #ifdef PANIC
-    *logofs << name() << ": PANIC! Internal error in context [A]. "
-            << "Cannot find or add message to repository "
-            << "without using checksum.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Internal error in context [A]. "
-         << "Cannot find or add message to repository "
-         << "without using checksum.\n";
-
-    HandleAbort();
-  }
-
-  //
-  // Set added to true only if message
-  // is inserted in cache.
-  //
-
-  added  = 0;
-  locked = 0;
-
-  //
-  // First of all figure out where to
-  // store this object.
-  //
-
-  #ifdef DEBUG
-  *logofs << name() << ": Searching an empty slot "
-          << "with last rated " << lastRated << " and "
-          << "last added " << lastAdded << ".\n"
-          << logofs_flush;
-  #endif
-
-  int position = lastRated;
-
-  if (position == nothing)
-  {
-    position = lastAdded + 1;
-
-    if (position >= cacheSlots)
-    {
-      position = 0;
-    }
-
-    #ifdef DEBUG
-    *logofs << name() << ": Searching an empty slot "
-            << "starting at position " << position
-            << " with " << checksums_ -> size()
-            << " elements in cache.\n"
-            << logofs_flush;
-    #endif
-
-    while (position != lastAdded)
-    {
-      #ifdef DEBUG
-      *logofs << name() << ": Examining position "
-              << position << ".\n" << logofs_flush;
-      #endif
-
-      if ((*messages_)[position] == NULL)
-      {
-        break;
-      }
-      else if (getRating((*messages_)[position], rating_for_insert) == 0)
-      {
-        break;
-      }
-      else
-      {
-        untouch((*messages_)[position]);
-      }
-
-      if (++position == cacheSlots)
-      {
-        #ifdef DEBUG
-        *logofs << name() << ": Rolled position at "
-                << strMsTimestamp() << ".\n"
-                << logofs_flush;
-        #endif
-
-        position = 0;
-      }
-    }
-  }
-  #ifdef DEBUG
-  else
-  {
-    *logofs << name() << ": Using last rated position "
-            << position << ".\n" << logofs_flush;
-  }
-  #endif
-
-  //
-  // If we made an extensive check but did not
-  // find neither a free slot or a message to
-  // replace, assume slot at next position in
-  // respect to last added. This can happen if
-  // all objects in repository have got an hit
-  // recently.
-  //
-
-  if (position == lastAdded)
-  {
-    position = lastAdded + 1;
-
-    if (position >= cacheSlots)
-    {
-      position = 0;
-    }
-
-    #ifdef DEBUG
-    *logofs << name() << ": WARNING! Assuming slot "
-            << "at position " << position << ".\n"
-            << logofs_flush;
-    #endif
-  }
-  #ifdef DEBUG
-  else
-  {
-    *logofs << name() << ": Found candidate slot "
-            << "at position " << position << ".\n"
-            << logofs_flush;
-  }
-  #endif
-
-  //
-  // Save the search result so if the message
-  // is found in cache, we can use the slot
-  // at next run.
-  //
-
-  lastRated = position;
-
-  if ((*messages_)[position] != NULL &&
-          (*messages_)[position] -> locks_ != 0)
-  {
-    #ifdef WARNING
-    *logofs << name() << ": WARNING! Insertion at position "
-            << position << " would replace a locked message. "
-            << "Forcing channel to discard the message.\n"
-            << logofs_flush;
-    #endif
-
-    #ifdef TEST
-    *logofs << name() << ": Invalidating rating of object "
-            << "at position " << position << ".\n"
-            << logofs_flush;
-    #endif
-
-    return (lastRated = nothing);
-  }
-
-  if (checksumAction == use_checksum)
-  {
-    T_checksum checksum = getChecksum(message);
-
-    #ifdef TEST
-    *logofs << name() << ": Searching checksum ["
-            << DumpChecksum(checksum) << "] in repository.\n"
-            << logofs_flush;
-
-    #endif
-
-    pair<T_checksums::iterator, bool> result;
-
-    result = checksums_ -> insert(T_checksums::value_type(checksum, position));
-
-    //
-    // Message was found in cache or
-    // insertion couldn't take place.
-    //
-
-    if (result.second == 0)
-    {
-      if (result.first == checksums_ -> end())
-      {
-        #ifdef PANIC
-        *logofs << name() << ": PANIC! Failed to insert object "
-                << "in the cache.\n" << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Failed to insert object of type "
-             << name() << " in the cache.\n";
-
-        return nothing;
-      }
-
-      //
-      // Message is in cache.
-      //
-
-      #ifdef TEST
-      *logofs << name() << ": Object is already in cache "
-              << "at position " << (result.first) -> second
-              << ".\n" << logofs_flush;
-      #endif
-
-      #ifdef DEBUG
-
-      printStorageSize();
-
-      #endif
-
-      //
-      // Message is locked, probably because
-      // it has not completely recomposed at
-      // remote side after a split.
-      //
-
-      if ((*messages_)[(result.first) -> second] -> locks_ != 0)
-      {
-        #ifdef TEST
-        *logofs << name() << ": WARNING! Object at position "
-                << (result.first) -> second << " is locked.\n"
-                << logofs_flush;
-        #endif
-
-        locked = 1;
-      }
-
-      //
-      // Object got a hit, so prevent
-      // its removal.
-      //
-
-      if (lastRated == (result.first) -> second)
-      {
-        #ifdef TEST
-        *logofs << name() << ": Resetting rating of object "
-                << "at position " << (result.first) -> second
-                << ".\n" << logofs_flush;
-        #endif
-
-        lastRated = nothing;
-      }
-
-      return (result.first) -> second;
-    }
-
-    #ifdef DEBUG
-    *logofs << name() << ": Could not find message in cache.\n"
-            << logofs_flush;
-    #endif
-  }
-
-  //
-  // Message not found in hash table (or insertion
-  // of checksum in hash table was not requested).
-  // Message was added to cache.
-  //
-
-  added = 1;
-
-  //
-  // Log data about the missed message.
-  //
-
-  #ifdef TEST
-
-  if (opcode() == X_PutImage || opcode() == X_NXPutPackedImage)
-  {
-    #ifdef WARNING
-    *logofs << name() << ": WARNING! Dumping identity of "
-            << "missed image object of type " << name()
-            << ".\n" << logofs_flush;
-    #endif
-
-    dumpIdentity(message);
-  }
-
-  #endif
-
-  if ((*messages_)[position] != NULL)
-  {
-    #ifdef DEBUG
-    *logofs << name() << ": The message replaces "
-            << "the old one at position " << position
-            << ".\n" << logofs_flush;
-    #endif
-
-    remove(position, checksumAction, dataAction);
-  }
-
-  (*messages_)[position] = message;
-
-  //
-  // We used the slot. Perform a new
-  // search at next run.
-  //
-
-  lastRated = nothing;
-
-  #ifdef TEST
-  *logofs << name() << ": Stored message object of size "
-          << plainSize(position) << " (" << message -> size_
-          << "/" << message -> c_size_ << ") at position "
-          << position << ".\n" << logofs_flush;
-  #endif
-
-  unsigned int localSize;
-  unsigned int remoteSize;
-
-  storageSize(message, localSize, remoteSize);
-
-  localStorageSize_  += localSize;
-  remoteStorageSize_ += remoteSize;
-
-  totalLocalStorageSize_  += localSize;
-  totalRemoteStorageSize_ += remoteSize;
-
-  #ifdef DEBUG
-
-  printStorageSize();
-
-  #endif
-
-  //
-  // Set hits and timestamp at insertion in cache.
-  //
-
-  message -> hits_ = control -> StoreHitsAddBonus;
-  message -> last_ = (getTimestamp()).tv_sec;
-
-  message -> locks_ = 0;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Set last hit of object at " 
-          << strMsTimestamp() << " with a bonus of "
-          << message -> hits_ << ".\n" << logofs_flush;
-  #endif
-
-  return position;
-}
-
-//
-// Add a parsed message to repository. It is normally used
-// at decoding side or at encoding side when we load store
-// from disk. To handle messages coming from network, the
-// encoding side uses the optimized method findOrAdd().
-//
-
-int MessageStore::add(Message *message, const int position,
-                          T_checksum_action checksumAction, T_data_action dataAction)
-{
-  if (position < 0 || position >= cacheSlots)
-  {
-    #ifdef PANIC
-    *logofs << name() << ": PANIC! Cannot add a message "
-            << "at non existing position " << position
-            << ".\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Cannot add a message "
-         << "at non existing position " << position
-         << ".\n";
-
-    HandleAbort();
-  }
-
-  if ((*messages_)[position] != NULL)
-  {
-    #ifdef DEBUG
-    *logofs << name() << ": The message will replace "
-            << "the old one at position " << position
-            << ".\n" << logofs_flush;
-    #endif
-
-    remove(position, checksumAction, dataAction);
-  }
-
-  #ifdef DEBUG
-  *logofs << name() << ": Inserting object in repository at position "
-          << position << ".\n" << logofs_flush;
-  #endif
-
-  (*messages_)[position] = message;
-
-  //
-  // Get the object's checksum value
-  // and insert it in the table.
-  //
-
-  if (checksumAction == use_checksum)
-  {
-    #ifdef DEBUG
-    *logofs << name() << ": Inserting object's checksum in repository.\n";
-    #endif
-
-    T_checksum checksum = getChecksum(message);
-
-    checksums_ -> insert(T_checksums::value_type(checksum, position));
-  }
-
-  #ifdef DEBUG
-  *logofs << name() << ": Stored message object of size "
-          << plainSize(position) << " (" << message -> size_ 
-          << "/" << message -> c_size_ << ") at position "
-          << position << ".\n" << logofs_flush;
-  #endif
-
-  unsigned int localSize;
-  unsigned int remoteSize;
-
-  storageSize(message, localSize, remoteSize);
-
-  localStorageSize_  += localSize;
-  remoteStorageSize_ += remoteSize;
-
-  totalLocalStorageSize_  += localSize;
-  totalRemoteStorageSize_ += remoteSize;
-
-  #ifdef DEBUG
-
-  printStorageSize();
-
-  #endif
-
-  //
-  // Set hits and timestamp at insertion in cache.
-  //
-
-  message -> hits_ = control -> StoreHitsAddBonus;
-  message -> last_ = (getTimestamp()).tv_sec;
-
-  message -> locks_ = 0;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Set last hit of object at " 
-          << strMsTimestamp() << " with a bonus of "
-          << message -> hits_ << ".\n" << logofs_flush;
-  #endif
-
-  return position;
-}
-
-//
-// The following functions don't modify data,
-// so they are supposed to be called only at
-// the encoding side.
-//
-
-void MessageStore::updateData(const int position, unsigned int dataSize,
-                                  unsigned int compressedDataSize)
-{
-  Message *message = (*messages_)[position];
-
-  validateSize(dataSize, compressedDataSize);
-
-  if (compressedDataSize != 0)
-  {
-    unsigned int localSize;
-    unsigned int remoteSize;
-
-    storageSize(message, localSize, remoteSize);
-
-    localStorageSize_  -= localSize;
-    remoteStorageSize_ -= remoteSize;
-
-    totalLocalStorageSize_  -= localSize;
-    totalRemoteStorageSize_ -= remoteSize;
-
-    message -> c_size_ = compressedDataSize + message -> i_size_;
-
-    #ifdef TEST
-
-    if (message -> size_ != (int) (dataSize + message -> i_size_))
-    {
-      #ifdef PANIC
-      *logofs << name() << ": PANIC! Size of object looks "
-              << message -> size_ << " bytes while it "
-              << "should be " << dataSize + message -> i_size_
-              << ".\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Size of object looks "
-           << message -> size_ << " bytes while it "
-           << "should be " << dataSize + message -> i_size_
-           << ".\n";
-
-      HandleAbort();
-    }
-
-    #endif
-
-    storageSize(message, localSize, remoteSize);
-
-    localStorageSize_  += localSize;
-    remoteStorageSize_ += remoteSize;
-
-    totalLocalStorageSize_  += localSize;
-    totalRemoteStorageSize_ += remoteSize;
-
-    #ifdef DEBUG
-
-    printStorageSize();
-
-    #endif
-  }
-}
-
-void MessageStore::updateData(const T_checksum checksum, unsigned int compressedDataSize)
-{
-  #ifdef TEST
-  *logofs << name() << ": Searching checksum ["
-          << DumpChecksum(checksum) << "] in repository.\n"
-          << logofs_flush;
-  #endif
-
-  T_checksums::iterator found = checksums_ -> find(checksum);
-
-  if (found != checksums_ -> end())
-  {
-    Message *message = (*messages_)[found -> second];
-
-    #ifdef TEST
-    *logofs << name() << ": Message found in cache at "
-            << "position " << found -> second << " with size "
-            << message -> size_ << " and compressed size "
-            << message -> c_size_ << ".\n" << logofs_flush;
-    #endif
-
-    updateData(found -> second, message -> size_ -
-                   message -> i_size_, compressedDataSize);
-  }
-  #ifdef TEST
-  else if (checksums_ -> size() > 0)
-  {
-    *logofs << name() << ": WARNING! Can't locate the "
-            << "checksum [" << DumpChecksum(checksum)
-            << "] for the update.\n" << logofs_flush;
-  }
-  #endif
-}
-
-//
-// This function replaces the data part of the message
-// and updates the information about its size. Split
-// messages are advertised to the decoding side with
-// their uncompressed size, data is then compressed
-// before sending the first chunk. This function is
-// called by the decoding side after the split message
-// is fully recomposed to replace the dummy data and
-// set the real size.
-//
-
-void MessageStore::updateData(const int position, const unsigned char *newData,
-                                  unsigned int dataSize, unsigned int compressedDataSize)
-{
-  Message *message = (*messages_)[position];
-
-  validateSize(dataSize, compressedDataSize);
-
-  #ifdef TEST
-
-  if (message -> size_ != (int) (dataSize + message -> i_size_))
-  {
-    #ifdef PANIC
-    *logofs << name() << ": PANIC! Data of object looks "
-            << dataSize << " bytes while it " << "should be "
-            << message -> size_ - message -> i_size_
-            << ".\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Data of object looks "
-         << dataSize << " bytes while it " << "should be "
-         << message -> size_ - message -> i_size_
-         << ".\n";
-
-    HandleAbort();
-  }
-
-  #endif
-
-  //
-  // A compressed data size of 0 means that
-  // message's data was not compressed.
-  //
-
-  if (compressedDataSize != 0)
-  {
-    unsigned int localSize;
-    unsigned int remoteSize;
-
-    storageSize(message, localSize, remoteSize);
-
-    localStorageSize_  -= localSize;
-    remoteStorageSize_ -= remoteSize;
-
-    totalLocalStorageSize_  -= localSize;
-    totalRemoteStorageSize_ -= remoteSize;
-
-    if (message -> c_size_ != (int) compressedDataSize +
-            message -> i_size_)
-    {
-      #ifdef TEST
-      *logofs << name() << ": Resizing data of message at "
-              << "position " << position << " from " << message ->
-                  c_size_ << " to " << compressedDataSize +
-                  message -> i_size_ << " bytes.\n"
-              << logofs_flush;
-      #endif
-
-      message -> data_.clear();
-
-      message -> data_.resize(compressedDataSize);
-    }
-
-    memcpy(message -> data_.begin(), newData, compressedDataSize);
-
-    #ifdef TEST
-    *logofs << name() << ": Data of message at position "
-            << position << " has size " << message -> data_.size()
-            << " and capacity " << message -> data_.capacity()
-            << ".\n" << logofs_flush;
-    #endif
-
-    message -> c_size_ = compressedDataSize + message -> i_size_;
-
-    storageSize(message, localSize, remoteSize);
-
-    localStorageSize_  += localSize;
-    remoteStorageSize_ += remoteSize;
-
-    totalLocalStorageSize_  += localSize;
-    totalRemoteStorageSize_ += remoteSize;
-
-    #ifdef DEBUG
-
-    printStorageSize();
-
-    #endif
-  }
-  else
-  {
-    #ifdef TEST
-    *logofs << name() << ": No changes to data size for message "
-            << "at position " << position << ".\n" << logofs_flush;
-    #endif
-
-    memcpy(message -> data_.begin(), newData, dataSize);
-  }
-}
-
-int MessageStore::remove(const int position, T_checksum_action checksumAction,
-                             T_data_action dataAction)
-{
-  Message *message;
-
-  if (position < 0 || position >= cacheSlots ||
-          (message = (*messages_)[position]) == NULL)
-  {
-    #ifdef PANIC
-    *logofs << name() << ": PANIC! Cannot remove "
-            << "a non existing message at position "
-            << position << ".\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Cannot remove "
-         << "a non existing message at position "
-         << position << ".\n";
-
-    HandleAbort();
-  }
-
-  #if defined(TEST) || defined(INFO)
-
-  if (opcode() == X_PutImage || opcode() == X_NXPutPackedImage)
-  {
-    #ifdef WARNING
-    *logofs << name() << ": WARNING! Discarding image object "
-            << "of type " << name() << " at position "
-            << position << ".\n" << logofs_flush;
-    #endif
-  }
-
-  #endif
-
-  //
-  // The checksum is only stored at the encoding
-  // side.
-  //
-
-  if (checksumAction == use_checksum)
-  {
-    #ifdef DEBUG
-    *logofs << name() << ": Removing checksum for object at "
-            << "position " << position << ".\n" << logofs_flush;
-    #endif
-
-    //
-    // TODO: If we had stored the iterator and
-    // not the pointer to the message, we could
-    // have removed the message without having
-    // to look up the checksum.
-    //
-
-    T_checksum checksum = getChecksum(message);
-
-    #ifdef TEST
-    *logofs << name() << ": Searching checksum ["
-            << DumpChecksum(checksum) << "] in repository.\n"
-            << logofs_flush;
-    #endif
-
-    T_checksums::iterator found = checksums_ -> find(checksum);
-
-    if (found == checksums_ -> end())
-    {
-      #ifdef PANIC
-      *logofs << name() << ": PANIC! No checksum found for "
-              << "object at position " << position << ".\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": No checksum found for "
-           << "object at position " << position << ".\n";
-
-      HandleAbort();
-    }
-
-    #ifdef TEST
-
-    else if (position != found -> second)
-    {
-      #ifdef PANIC
-      *logofs << name() << ": PANIC! Value of position for object "
-              << "doesn't match position " << position << ".\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Value of position for object "
-           << "doesn't match position " << position << ".\n";
-
-      HandleAbort();
-    }
-
-    #endif
-
-    checksums_ -> erase(found);
-  }
-
-  #ifdef DEBUG
-  *logofs << name() << ": Removing message at position "
-          << position << " of size " << plainSize(position)
-          << " (" << message -> size_ << "/" << message -> c_size_
-          << ").\n" << logofs_flush;
-  #endif
-
-  unsigned int localSize;
-  unsigned int remoteSize;
-
-  storageSize(message, localSize, remoteSize);
-
-  localStorageSize_  -= localSize;
-  remoteStorageSize_ -= remoteSize;
-
-  totalLocalStorageSize_  -= localSize;
-  totalRemoteStorageSize_ -= remoteSize;
-
-  recycle(message);
-
-  (*messages_)[position] = NULL;
-
-  #ifdef DEBUG
-
-  printStorageSize();
-
-  #endif
-
-  return position;
-}
-
-//
-// This should only be called at encoding side.
-// The decoding side can't rely on the counter
-// as it is decremented by the encoding side
-// every time the repository is searched for a
-// message to be removed.
-//
-
-int MessageStore::getRating(Message *message, T_rating type) const
-{
-  if (message -> locks_ != 0)
-  {
-    #ifdef TEST
-    *logofs << name() << ": Rate set to -1 as locks of object are "
-            << (int) message -> locks_ << ".\n"
-            << logofs_flush;
-    #endif
-
-    return -1;
-  }
-  else if ((type == rating_for_clean ||
-                (int) checksums_ -> size() == cacheSlots) &&
-                    message -> hits_ <= control -> StoreHitsLoadBonus)
-  {
-    //
-    // We don't have any free slot or we exceeded the
-    // available storage size. This is likely to happen
-    // after having loaded objects from persistent cache.
-    // It's not a bad idea to discard some messages that
-    // were restored but never referenced.
-    //
-
-    #ifdef TEST
-
-    if (type == rating_for_clean)
-    {
-      *logofs << name() << ": Rate set to 0 with hits "
-              << message -> hits_ << " as maximum storage size "
-              << "was exceeded.\n" << logofs_flush;
-    }
-    else
-    {
-      *logofs << name() << ": Rate set to 0 with hits "
-              << message -> hits_ << " as there are no available "
-              << "slots in store.\n" << logofs_flush;
-    }
-
-    #endif
-
-    return 0;
-  }
-  else if (type == rating_for_clean &&
-               (getTimestamp()).tv_sec - message -> last_ >=
-                   control -> StoreTimeLimit)
-  {
-    #ifdef TEST
-    *logofs << name() << ": Rate set to 0 as last hit of object was "
-            << (getTimestamp()).tv_sec - message -> last_
-            << " seconds ago with limit set to " << control ->
-               StoreTimeLimit << ".\n" << logofs_flush;
-    #endif
-
-    return 0;
-  }
-  else
-  {
-    #ifdef TEST
-    if (message -> hits_ < 0)
-    {
-      *logofs << name() << ": PANIC! Rate of object shouldn't be "
-              << message -> hits_ << ".\n" << logofs_flush;
-
-      cerr << "Error" << ": Rate of object of type " << name()
-           << " shouldn't be " << message -> hits_ << ".\n";
-
-      HandleAbort();
-    }
-    #endif
-
-    #ifdef TEST
-    *logofs << name() << ": Rate of object is " << message -> hits_
-            << " with last hit " << (getTimestamp()).tv_sec -
-               message -> last_ << " seconds ago.\n"
-            << logofs_flush;
-    #endif
-
-    return message -> hits_;
-  }
-}
-
-int MessageStore::touch(Message *message) const
-{
-  message -> last_ = (getTimestamp()).tv_sec;
-
-  message -> hits_ += control -> StoreHitsTouch;
-
-  if (message -> hits_ > control -> StoreHitsLimit)
-  {
-    message -> hits_ = control -> StoreHitsLimit;
-  }
-
-  #ifdef TEST
-  *logofs << name() << ": Increased hits of object to "
-          << message -> hits_ << " at " << strMsTimestamp()
-          << ".\n" << logofs_flush;
-  #endif
-
-  return message -> hits_;
-}
-
-int MessageStore::untouch(Message *message) const
-{
-  message -> hits_ -= control -> StoreHitsUntouch;
-
-  if (message -> hits_ < 0)
-  {
-    message -> hits_ = 0;
-  }
-
-  #ifdef TEST
-  *logofs << name() << ": Decreased hits of object to " 
-          << message -> hits_ << ".\n"
-          << logofs_flush;
-  #endif
-
-  return message -> hits_;
-}
-
-int MessageStore::lock(const int position) const
-{
-  Message *message = (*messages_)[position];
-
-  if (message == NULL)
-  {
-    #ifdef PANIC
-    *logofs << name() << ": PANIC! Can't lock the null "
-            << "object at position " << position
-            << ".\n" << logofs_flush;
-    #endif
-
-    return -1;
-  }
-
-  #ifdef DEBUG
-  *logofs << name() << ": Increasing locks of object to " 
-          << (int) message -> locks_ + 1 << ".\n"
-          << logofs_flush;
-  #endif
-
-  return ++(message -> locks_);
-}
-
-int MessageStore::unlock(const int position) const
-{
-  Message *message = (*messages_)[position];
-
-  if (message == NULL)
-  {
-    #ifdef PANIC
-    *logofs << name() << ": PANIC! Can't unlock the null "
-            << "object at position " << position
-            << ".\n" << logofs_flush;
-    #endif
-
-    return -1;
-  }
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decreasing locks of object to " 
-          << (int) message -> locks_ - 1 << ".\n"
-          << logofs_flush;
-  #endif
-
-  return --(message -> locks_);
-}
-
-int MessageStore::saveStore(ostream *cachefs, md5_state_t *md5StateStream,
-                                md5_state_t *md5StateClient, T_checksum_action checksumAction,
-                                    T_data_action dataAction, int bigEndian)
-{
-  Message *message;
-
-  #ifdef TEST
-  *logofs << name() << ": Opcode of this store is "
-          << (unsigned int) opcode() << " default size of "
-          << "identity is " << dataOffset << ".\n"
-          << logofs_flush;
-  #endif
-
-  unsigned char *identityBuffer = new unsigned char[dataOffset];
-  unsigned char *sizeBuffer     = new unsigned char[4 * 2];
-  unsigned char *positionBuffer = new unsigned char[4];
-  unsigned char *opcodeBuffer   = new unsigned char[4];
-
-  #ifdef DUMP
-
-  char *md5ClientDump = new char[dataOffset * 2 + 128];
-
-  #endif
-
-  unsigned char value;
-
-  int offset;
-
-  int failed = 0;
-
-  for (int position = 0; position < cacheSlots; position++)
-  {
-    message = (*messages_)[position];
-
-    //
-    // Don't save split messages.
-    //
-
-    if (message != NULL && message -> locks_ == 0)
-    {
-      //
-      // Use the total size if offset is
-      // beyond the real end of message.
-      //
-
-      offset = dataOffset;
-
-      if (offset > message -> size_)
-      {
-        offset = message -> size_;
-      }
-        
-      #ifdef TEST
-      *logofs << name() << ": Going to save message at position "
-              << position << ".\n" << logofs_flush;
-      #endif
-
-      value = 1;
-
-      PutULONG(position, positionBuffer, bigEndian);
-      PutULONG(opcode(), opcodeBuffer, bigEndian);
-
-      md5_append(md5StateClient, positionBuffer, 4);
-      md5_append(md5StateClient, opcodeBuffer, 4);
-
-      #ifdef DUMP
-
-      *logofs << "Name=" << name() << logofs_flush;
-
-      sprintf(md5ClientDump," Pos=%d Op=%d\n", position, opcode());
-
-      *logofs << md5ClientDump << logofs_flush;
-
-      #endif
-
-      if (PutData(cachefs, &value, 1) < 0)
-      {
-        #ifdef DEBUG
-        *logofs << name() << ": PANIC! Failure writing " << 1
-                << " bytes.\n" << logofs_flush;
-        #endif
-
-        failed = 1;
-
-        break;
-      }
-
-      md5_append(md5StateStream, &value, 1);
-
-      PutULONG(message -> size_, sizeBuffer, bigEndian);
-      PutULONG(message -> c_size_, sizeBuffer + 4, bigEndian);
-
-      //
-      // Note that the identity size is not saved with
-      // the message and will be determined from the
-      // data read when restoring the identity.
-      //
-
-      if (PutData(cachefs, sizeBuffer, 4 * 2) < 0)
-      {
-        #ifdef DEBUG
-        *logofs << name() << ": PANIC! Failure writing " << 4 * 2
-                << " bytes.\n" << logofs_flush;
-        #endif
-
-        failed = 1;
-
-        break;
-      }
-
-      md5_append(md5StateStream, sizeBuffer, 4 * 2);
-      md5_append(md5StateClient, sizeBuffer, 4 * 2);
-
-      #ifdef DUMP
-
-      sprintf(md5ClientDump, "size = %d c_size = %d\n",
-                  message -> size_, message -> c_size_);
-
-      *logofs << md5ClientDump << logofs_flush;
-
-      #endif
-
-      //
-      // Prepare a clean buffer for unparse.
-      //
-
-      CleanData(identityBuffer, offset);
-
-      unparseIdentity(message, identityBuffer, offset, bigEndian);
-
-      if (PutData(cachefs, identityBuffer, offset) < 0)
-      {
-        #ifdef DEBUG
-        *logofs << name() << ": PANIC! Failure writing " << offset
-                << " bytes.\n" << logofs_flush;
-        #endif
-
-        failed = 1;
-
-        break;
-      }
-
-      md5_append(md5StateStream, identityBuffer, offset);
-      md5_append(md5StateClient, identityBuffer, offset);
-
-      #ifdef DUMP
-
-      for (int i = 0; i < offset; i++)
-      {
-        sprintf(md5ClientDump + (i * 2), "%02X", identityBuffer[i]);
-      }
-
-      *logofs << "Identity = " << md5ClientDump << "\n" << logofs_flush;
-
-      #endif
-
-      //
-      // Set the real identity size before
-      // saving the data.
-      //
-
-      offset = message -> i_size_;
-
-      if (offset > message -> size_)
-      {
-        offset = message -> size_;
-      }
-
-      if (checksumAction == use_checksum)
-      {
-        if (PutData(cachefs, message -> md5_digest_, MD5_LENGTH) < 0)
-        {
-          #ifdef DEBUG
-          *logofs << name() << ": PANIC! Failure writing " << MD5_LENGTH
-                  << " bytes.\n" << logofs_flush;
-          #endif
-
-          failed = 1;
-
-          break;
-        }
-
-        md5_append(md5StateStream, message -> md5_digest_, MD5_LENGTH);
-      }
-      else if (dataAction == use_data)
-      {
-        int dataSize = (message -> c_size_ == 0 ?
-                             message -> size_ - offset :
-                                 message -> c_size_ - offset);
-        if (dataSize > 0)
-        {
-          if (PutData(cachefs, message -> data_.begin(), dataSize) < 0)
-          {
-            #ifdef DEBUG
-            *logofs << name() << ": PANIC! Failure writing " << dataSize
-                    << " bytes.\n" << logofs_flush;
-            #endif
-
-            failed = 1;
-
-            break;
-          }
-
-          md5_append(md5StateStream, message -> data_.begin(), dataSize);
-        }
-      }
-    }
-    else
-    {
-      #ifdef TEST
-      *logofs << name() << ": Not saving message at position "
-              << position << ".\n" << logofs_flush;
-      #endif
-
-      value = 0;
-
-      if (PutData(cachefs, &value, 1) < 0)
-      {
-        #ifdef DEBUG
-        *logofs << name() << ": PANIC! Failure writing " << 1
-                << " bytes.\n" << logofs_flush;
-        #endif
-
-        failed = 1;
-
-        break;
-      }
-
-      md5_append(md5StateStream, &value, 1);
-    }
-  }
-
-  if (failed == 1)
-  {
-    #ifdef PANIC
-    *logofs << name() << ": PANIC! Write to persistent cache file failed.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Write to persistent cache file failed.\n";
-  }
-
-  delete [] identityBuffer;
-  delete [] sizeBuffer;
-  delete [] positionBuffer;
-  delete [] opcodeBuffer;
-
-  #ifdef DUMP
-
-  delete [] md5ClientDump;
-
-  #endif
-
-  return (failed == 0 ? 1 : -1);
-}
-
-int MessageStore::loadStore(istream *cachefs, md5_state_t *md5StateStream,
-                                T_checksum_action checksumAction, T_data_action dataAction,
-                                    int bigEndian)
-{
-  Message *message;
-
-  #ifdef TEST
-  *logofs << name() << ": Opcode of this store is "
-          << (unsigned int) opcode() << " default size of "
-          << "identity is " << dataOffset << " slots are "
-          << cacheSlots << ".\n" << logofs_flush;
-  #endif
-
-  //
-  // If packed images or the render extension has been
-  // disabled we don't need to restore these messages
-  // in the cache. Encoding of RENDER in 1.4.0 is also
-  // changed so we want to skip messages saved using
-  // the old format. We want to restore all the other
-  // messages so we'll need to skip these one by one.
-  //
-
-  int skip = 0;
-
-  if ((opcode() == X_NXPutPackedImage &&
-          control -> PersistentCacheLoadPacked == 0) ||
-              (opcode() == X_NXInternalRenderExtension &&
-                  control -> PersistentCacheLoadRender == 0))
-  {
-    #ifdef TEST
-    *logofs << name() << ": All messages for OPCODE#"
-            << (unsigned int) opcode() << " will be discarded.\n"
-            << logofs_flush;
-    #endif
-
-    skip = 1;
-  }
-
-  unsigned char *identityBuffer = new unsigned char[dataOffset];
-  unsigned char *sizeBuffer     = new unsigned char[4 * 2];
-
-  unsigned char value;
-
-  int offset;
-
-  int failed = 0;
-
-  for (int position = 0; position < cacheSlots; position++)
-  {
-    if (GetData(cachefs, &value, 1) < 0)
-    {
-      #ifdef DEBUG
-      *logofs << name() << ": PANIC! Failure reading " << 1
-              << " bytes.\n" << logofs_flush;
-      #endif
-
-      failed = 1;
-
-      break;
-    }
-
-    md5_append(md5StateStream, &value, 1);
-
-    if (value == 1)
-    {
-      #ifdef TEST
-      *logofs << name() << ": Going to load message at position "
-              << position << ".\n" << logofs_flush;
-      #endif
-
-      if (GetData(cachefs, sizeBuffer, 4 * 2) < 0)
-      {
-        #ifdef DEBUG
-        *logofs << name() << ": PANIC! Failure reading " << 4 * 2
-                << " bytes.\n" << logofs_flush;
-        #endif
-
-        failed = 1;
-
-        break;
-      }
-
-      md5_append(md5StateStream, sizeBuffer, 4 * 2);
-
-      message = getTemporary();
-
-      if (message == NULL)
-      {
-        #ifdef PANIC
-        *logofs << name() << ": PANIC! Can't access temporary storage "
-                << "for message in context [B].\n" << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Can't access temporary storage "
-             << "for message in context [B].\n";
-
-        failed = 1;
-
-        break;
-      }
-
-      message -> size_   = GetULONG(sizeBuffer, bigEndian);
-      message -> c_size_ = GetULONG(sizeBuffer + 4, bigEndian);
-
-      #ifdef DEBUG
-      *logofs << name() << ": Size is " << message -> size_
-              << " compressed size is " << message -> c_size_
-              << ".\n" << logofs_flush;
-      #endif
-
-      //
-      // Use the total size if offset is
-      // beyond the real end of message.
-      //
-
-      offset = dataOffset;
-
-      if (offset > message -> size_)
-      {
-        offset = message -> size_;
-      }
-
-      if (GetData(cachefs, identityBuffer, offset) < 0)
-      {
-        #ifdef DEBUG
-        *logofs << name() << ": PANIC! Failure reading " << offset
-                << " bytes.\n" << logofs_flush;
-        #endif
-
-        failed = 1;
-
-        break;
-      }
-
-      md5_append(md5StateStream, identityBuffer, offset);
-
-      //
-      // Get the real identity size based on the value
-      // reported by the message store. The dataOffset
-      // value is guaranteed to be greater or equal to
-      // the maximum identity size of the messages in
-      // the major store.
-      //
-
-      offset = identitySize(identityBuffer, offset);
-
-      if (offset > message -> size_)
-      {
-        offset = message -> size_;
-      }
-
-      message -> i_size_ = offset;
-
-      //
-      // Get identity of message from the buffer we just
-      // created. Don't calculate neither checksum nor
-      // data, restore them from stream. Don't pass the
-      // message's size but the default size of identity.
-      //
-
-      parseIdentity(message, identityBuffer, offset, bigEndian);
-
-      if (checksumAction == use_checksum)
-      {
-        if (message -> md5_digest_ == NULL)
-        {
-          message -> md5_digest_ = new md5_byte_t[MD5_LENGTH];
-        }
-
-        if (GetData(cachefs, message -> md5_digest_, MD5_LENGTH) < 0)
-        {
-          #ifdef DEBUG
-          *logofs << name() << ": PANIC! Failure reading " << MD5_LENGTH
-                  << " bytes.\n" << logofs_flush;
-          #endif
-
-          failed = 1;
-
-          break;
-        }
-
-        //
-        // Add message's checksum to checksum that will
-        // be saved together with this cache. Checksum
-        // will be verified when cache file is restored
-        // to ensure file is not corrupted.
-        //
-
-        md5_append(md5StateStream, message -> md5_digest_, MD5_LENGTH);
-
-        if (skip == 1)
-        {
-          #ifdef TEST
-          *logofs << name() << ": Discarding message for OPCODE#"
-                  << (unsigned int) opcode() << ".\n"
-                  << logofs_flush;
-          #endif
-          
-          continue;
-        }
-      }
-      else if (dataAction == use_data)
-      {
-        //
-        // Restore the data part.
-        //
-
-        int dataSize = (message -> c_size_ == 0 ?
-                             message -> size_ - offset :
-                                 message -> c_size_ - offset);
-
-        if (dataSize < 0 || dataSize > control -> MaximumMessageSize)
-        {
-          #ifdef PANIC
-          *logofs << name() << ": PANIC! Bad data size "
-                  << dataSize << " loading persistent cache.\n"
-                  << logofs_flush;
-          #endif
-
-          cerr << "Error" << ": Bad data size " << dataSize
-               << " loading persistent cache.\n";
-
-          failed = 1;
-
-          break;
-        }
-        else if (dataSize > 0)
-        {
-          //
-          // If need to skip the message let anyway
-          // it to be part of the calculated MD5.
-          //
-
-          if (skip == 1)
-          {
-            unsigned char *dummy = new unsigned char[dataSize];
-
-            if (dummy == NULL)
-            {
-              #ifdef PANIC
-              *logofs << name() << ": PANIC! Can't allocate dummy buffer "
-                      << "of size " << dataSize << " loading cache.\n"
-                      << logofs_flush;
-              #endif
-
-              cerr << "Error" << ": Can't allocate dummy buffer "
-                   << "of size " << dataSize << " loading cache.\n";
-
-              failed = 1;
-
-              break;
-            }
-
-            if (GetData(cachefs, dummy, dataSize) < 0)
-            {
-              #ifdef DEBUG
-              *logofs << name() << ": PANIC! Failure reading " << dataSize
-                      << " bytes.\n" << logofs_flush;
-              #endif
-
-              failed = 1;
-
-              break;
-            }
-
-            md5_append(md5StateStream, dummy, dataSize);
-
-            delete [] dummy;
-
-            #ifdef TEST
-            *logofs << name() << ": Discarding message for OPCODE#"
-                    << (unsigned int) opcode() << ".\n"
-                    << logofs_flush;
-            #endif
-
-            continue;
-          }
-          else
-          {
-            message -> data_.clear();
-
-            message -> data_.resize(dataSize);
-
-            if (GetData(cachefs, message -> data_.begin(), dataSize) < 0)
-            {
-              #ifdef DEBUG
-              *logofs << name() << ": PANIC! Failure reading " << dataSize
-                      << " bytes.\n" << logofs_flush;
-              #endif
-
-              failed = 1;
-
-              break;
-            }
-
-            //
-            // Add message's data to cache checksum.
-            //
-
-            md5_append(md5StateStream, message -> data_.begin(), dataSize);
-          }
-        }
-        else
-        {
-          //
-          // We are here if data part is zero.
-          //
-
-          if (skip == 1)
-          {
-            #ifdef TEST
-            *logofs << name() << ": Discarding message for OPCODE#"
-                    << (unsigned int) opcode() << ".\n"
-                    << logofs_flush;
-            #endif
-
-            continue;
-          }
-        }
-      }
-
-      int added;
-
-      added = add(message, position, checksumAction, dataAction);
-
-      if (added != position)
-      {
-        #ifdef PANIC
-        *logofs << name() << ": PANIC! Can't store message "
-                << "in the cache at position " << position
-                << ".\n" << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Can't store message "
-             << "in the cache at position " << position
-             << ".\n";
-
-        failed = 1;
-
-        break;
-      }
-      else
-      {
-        //
-        // Replace default value of hits set by add
-        // function. Messages read from cache start
-        // with a lower bonus than fresh messages
-        // inserted.
-        //
-
-        message -> hits_ = control -> StoreHitsLoadBonus;
-
-        #ifdef DEBUG
-        *logofs << name() << ": Updated last hit of object at " 
-                << strMsTimestamp() << " with a bonus of "
-                << message -> hits_ << ".\n" << logofs_flush;
-        #endif
-
-        resetTemporary();
-      }
-    }
-    else if ((*messages_)[position] != NULL)
-    {
-      #ifdef TEST
-      *logofs << name() << ": Going to remove message at position "
-              << position << ".\n" << logofs_flush;
-      #endif
-
-      int removed;
-
-      removed = remove(position, checksumAction, dataAction);
-
-      if (removed != position)
-      {
-        #ifdef PANIC
-        *logofs << name() << ": PANIC! Can't remove message from cache "
-                << "at position " << position << ".\n"
-                << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Can't remove message from cache "
-             << "at position " << position << ".\n";
-
-        failed = 1;
-
-        break;
-      }
-    }
-    #ifdef TEST
-    else
-    {
-      *logofs << name() << ": Not loading message at position "
-              << position << ".\n" << logofs_flush;
-    }
-    #endif
-  }
-
-  #ifdef WARNING
-
-  if (failed == 1)
-  {
-    *logofs << name() << ": WARNING! Read from persistent cache file failed.\n"
-            << logofs_flush;
-  }
-
-  #endif
-
-  delete [] identityBuffer;
-  delete [] sizeBuffer;
-
-  return (failed == 0 ? 1 : -1);
-}
-
-void MessageStore::storageSize(const Message *message, unsigned int &local,
-                                   unsigned int &remote) const
-{
-  local = remote = storage();
-
-  //
-  // Encoding side includes 48 bytes for
-  // the map of checksums and 24 bytes
-  // of adjustment for total overhead.
-  //
-
-  local += MD5_LENGTH + 48 + 24;
-
-  //
-  // At decoding side we include size of
-  // data part and 24 bytes of adjustment
-  // for total overhead.
-  //
-
-  if (message -> c_size_ == 0)
-  {
-    remote += message -> size_ + 24;
-  }
-  else
-  {
-    remote += message -> c_size_ + 24;
-  }
-
-  //
-  // Check if we are the encoding or the
-  // decoding side and, if needed, swap
-  // the values.
-  //
-
-  if (message -> md5_digest_ == NULL)
-  {
-    unsigned int t = local;
-
-    local = remote;
-
-    remote = t;
-  }
-}
-
-void MessageStore::printStorageSize()
-{
-  #ifdef TEST
-
-  *logofs << name() << ": There are "
-          << checksums_ -> size() << " checksums in this store "
-          << "out of " << cacheSlots << " slots.\n"
-          << logofs_flush;
-
-  *logofs << name() << ": Size of this store is "
-          << localStorageSize_ << " bytes at local side and "
-          << remoteStorageSize_ << " bytes at remote side.\n"
-          << logofs_flush;
-
-  *logofs << name() << ": Size of total cache is "
-          << totalLocalStorageSize_ << " bytes at local side and "
-          << totalRemoteStorageSize_ << " bytes at remote side.\n"
-          << logofs_flush;
-
-  #endif
-}
diff --git a/nxcomp/Message.h b/nxcomp/Message.h
deleted file mode 100644
index 30883f101..000000000
--- a/nxcomp/Message.h
+++ /dev/null
@@ -1,1089 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef Message_H
-#define Message_H
-
-#include <X11/Xproto.h>
-
-#include "NXproto.h"
-
-#include "Misc.h"
-#include "Control.h"
-
-#include "Types.h"
-#include "Timestamp.h"
-
-#include "ActionCache.h"
-
-#include "StaticCompressor.h"
-
-//
-// Forward class declarations.
-//
-
-class ChannelCache;
-
-class EncodeBuffer;
-class DecodeBuffer;
-
-class WriteBuffer;
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-//
-// Define this to know how many messages
-// are allocated and deallocated.
-//
-
-#undef  REFERENCES
-
-//
-// Set default values.  We limit the maximum
-// size of a request to 262144 but we need to
-// consider the replies, whose size may be up
-// to 4MB.
-//
-
-#define MESSAGE_ENABLE_CACHE                        0
-#define MESSAGE_ENABLE_DATA                         0
-#define MESSAGE_ENABLE_SPLIT                        0
-#define MESSAGE_ENABLE_COMPRESS                     0
-
-#define MESSAGE_DATA_LIMIT                          4194304 - 4
-#define MESSAGE_DATA_OFFSET                         4
-
-#define MESSAGE_CACHE_SLOTS                         6000
-#define MESSAGE_CACHE_THRESHOLD                     50
-#define MESSAGE_CACHE_LOWER_THRESHOLD               5
-
-//
-// Base message class.
-//
-
-class Message
-{
-  friend class MessageStore;
-  friend class RenderExtensionStore;
-
-  public:
-
-  Message()
-  {
-    hits_  = 0;
-    last_  = 0;
-    locks_ = 0;
-
-    size_   = 0;
-    c_size_ = 0;
-
-    md5_digest_ = NULL;
-
-    #ifdef REFERENCES
-
-    references_++;
-
-    *logofs << "Message: Created new message at "
-            << this << " out of " << references_
-            << " allocated messages.\n"
-            << logofs_flush;
-
-    #endif
-  }
-
-  Message(const Message &message)
-  {
-    size_   = message.size_;
-    c_size_ = message.c_size_;
-    i_size_ = message.i_size_;
-
-    hits_  = message.hits_;
-    last_  = message.last_;
-    locks_ = message.locks_;
-
-    data_ = message.data_;
-
-    #ifdef REFERENCES
-
-    references_++;
-
-    *logofs << "Message: Creating new copied message at "
-            << this << " out of " << references_
-            << " allocated messages.\n"
-            << logofs_flush;
-    #endif
-
-    if (message.md5_digest_ != NULL)
-    {
-      md5_digest_ = new md5_byte_t[MD5_LENGTH];
-
-      memcpy(md5_digest_, message.md5_digest_, MD5_LENGTH);
-
-      #ifdef DEBUG
-      *logofs << "Message: Created MD5 digest for object at "
-              << this << ".\n" << logofs_flush;
-      #endif
-    }
-    else
-    {
-      md5_digest_ = NULL;
-    }
-  }
-
-  ~Message()
-  {
-    #ifdef DEBUG
-    if (md5_digest_ != NULL)
-    {
-      *logofs << "Message: Deleted MD5 digest for object at "
-              << this << ".\n" << logofs_flush;
-    }
-    #endif
-
-    delete [] md5_digest_;
-
-    #ifdef REFERENCES
-
-    references_--;
-
-    *logofs << "Message: Deleted message at "
-            << this << " out of " << references_
-            << " allocated messages.\n"
-            << logofs_flush;
-    #endif
-  }
-
-  //
-  // This is the original message size 
-  // including the data part regardless
-  // data is still stored in the object.
-  //
-
-  int size_;
-
-  //
-  // This is the size of the identity.
-  //
-
-  int i_size_;
-
-  //
-  // This is the size, including identity,
-  // after message has been 'updated' to 
-  // reflect storage of data in compressed
-  // format.
-  //
-
-  int c_size_;
-
-  protected:
-
-  //
-  // This is the data part.
-  //
-
-  T_data data_;
-
-  //
-  // Time of last hit.
-  //
-
-  time_t last_;
-
-  //
-  // This is the number of cache hits 
-  // registered for the object.
-  //
-
-  short int hits_;
-
-  //
-  // This is used to mark messages
-  // that have been split. 
-  //
-
-  short int locks_;
-
-  //
-  // This is the MD5 checksum.
-  //
-
-  md5_byte_t *md5_digest_;
-
-  //
-  // Keep a reference counter
-  // of allocated objects.
-  //
-
-  #ifdef REFERENCES
-
-  static int references_;
-
-  #endif
-};
-
-//
-// Repository of messages.
-//
-
-class MessageStore
-{
-  public:
-
-  //
-  // Enable or disable cache of messages in store.
-  //
-
-  int enableCache;
-
-  //
-  // Does message have a distinct data part.
-  //
-
-  int enableData;
-
-  //
-  // Enable or disable split of data part.
-  //
-
-  int enableSplit;
-
-  //
-  // Enable or disable compression of data part.
-  //
-
-  int enableCompress;
-
-  //
-  // Set starting point of data part in the message.
-  //
-
-  int dataOffset;
-
-  //
-  // Set maximum size for the data part of each message.
-  //
-
-  int dataLimit;
-
-  //
-  // Set maximum elements in cache.
-  //
-
-  int cacheSlots;
-
-  //
-  // Set the percentage of total cache memory which
-  // a given type of message is allowed to occupy.
-  // When threshold is exceeded store is cleaned to
-  // make room for a new message of the same type.
-  //
-
-  int cacheThreshold;
-
-  //
-  // Don't clean the store if percentage of cache
-  // memory occupied by messages of this type is
-  // below the threshold.
-  //
-
-  int cacheLowerThreshold;
-
-  //
-  // Last operation performed on cache.
-  //
-
-  T_store_action lastAction;
-
-  //
-  // Position of last element stored in cache.
-  //
-
-  short int lastAdded;
-
-  //
-  // Positions of last element found in cache.
-  //
-
-  short int lastHit;
-
-  //
-  // Position of last element erased.
-  //
-
-  short int lastRemoved;
-
-  //
-  // Used to encode the the action to
-  // perform on the store and the slot
-  // involved.
-  //
-
-  ActionCache lastActionCache;
-
-  //
-  // Position in cache where next insertion
-  // is going to take place.
-  //
-
-  short int lastRated;
-
-  //
-  // Constructors and destructors.
-  //
-
-  public:
-
-  MessageStore(StaticCompressor *compressor = NULL);
-
-  virtual ~MessageStore();
-
-  virtual const char *name() const = 0;
-
-  virtual unsigned char opcode() const = 0;
-
-  virtual unsigned int storage() const = 0;
-
-  //
-  // These are members that must be specialized.
-  //
-
-  public:
-
-  virtual Message *create() const = 0;
-
-  virtual Message *create(const Message &message) const = 0;
-
-  virtual void destroy(Message *message) const = 0;
-
-  void validateSize(int size)
-  {
-    if (size < control -> MinimumMessageSize ||
-            size > control -> MaximumMessageSize)
-    {
-      *logofs << name() << ": PANIC! Invalid size " << size
-              << " for message.\n" << logofs_flush;
-
-      cerr << "Error" << ": Invalid size " << size
-           << " for message opcode " << opcode() << ".\n";
-
-      HandleAbort();
-    }
-  }
-
-  void validateSize(int dataSize, int compressedDataSize)
-  {
-    if (dataSize < 0 || dataSize > control ->
-            MaximumMessageSize - 4 || compressedDataSize < 0 ||
-                compressedDataSize >= dataSize)
-    {
-      *logofs << name() << ": PANIC! Invalid data size "
-              << dataSize << " and compressed data size "
-              << compressedDataSize << " for message.\n"
-              << logofs_flush;
-
-      cerr << "Error" << ": Invalid data size "
-           << dataSize << " and compressed data size "
-           << compressedDataSize << " for message "
-           << "opcode " << (unsigned) opcode() << ".\n";
-
-      HandleAbort();
-    }
-  }
-
-  //
-  // Determine if the message can be stored
-  // in the cache.
-  //
-
-  virtual int validateMessage(const unsigned char *buffer, int size)
-  {
-    return (size >= control -> MinimumMessageSize &&
-                size <= control -> MaximumMessageSize);
-  }
-
-  //
-  // Get data offset based on major and minor
-  // opcode of the message.
-  //
-
-  virtual int identitySize(const unsigned char *buffer, unsigned int size)
-  {
-    return dataOffset;
-  }
-
-  //
-  // Encode identity and data using the
-  // specific message encoding.
-  //
-  // Some messages do not implement these
-  // methods because the encoding is done
-  // directly in the channel loop. Should
-  // move the encoding methods in in the
-  // message classes.
-  //
-
-  virtual int encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                 unsigned int size, int bigEndian,
-                                     ChannelCache *channelCache) const
-  {
-    return 1;
-  }
-
-  virtual int decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                                 unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
-                                      ChannelCache *channelCache) const
-  {
-    return 1;
-  }
-
-  //
-  // Encode differences between message
-  // in cache and the one to be encoded.
-  //
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage, ChannelCache *channelCache) const
-  {
-  }
-
-  //
-  // Decode differences and update the
-  // cached version of the same message.
-  //
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const
-  {
-  }
-
-  //
-  // Post process the message information
-  // contained in the store by either up-
-  // dating the size record or the actual
-  // data part once the message has been
-  // completely sent to our peer.
-  //
-
-  void updateData(const int position, unsigned int dataSize,
-                      unsigned int compressedDataSize);
-
-  void updateData(const T_checksum checksum, unsigned int compressedDataSize);
-
-  void updateData(const int position, const unsigned char *newData,
-                      unsigned int dataSize, unsigned int compressedDataSize);
-
-  //
-  // These members, used internally
-  // in the message store class, are
-  // mandatory.
-  //
-
-  protected:
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const = 0;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const = 0;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-                                    unsigned int size, int bigEndian) const = 0;
-
-  virtual void dumpIdentity(const Message *message) const = 0;
-
-  //
-  // Design should preserve these from being
-  // virtual.
-  //
-
-  int parseData(Message *message, int split, const unsigned char *buffer,
-                    unsigned int size, T_checksum_action checksumAction,
-                        T_data_action dataAction, int bigEndian);
-
-  int parseData(Message *message, const unsigned char *buffer,
-                    unsigned int size, const unsigned char *compressedData,
-                        const unsigned int compressedDataSize, T_checksum_action checksumAction,
-                            T_data_action dataAction, int bigEndian);
-
-  int unparseData(const Message *message, unsigned char *buffer,
-                      unsigned int size, int bigEndian);
-
-  //
-  // Manage efficient allocation of messages
-  // in the heap.
-  //
-
-  void recycle(Message *message)
-  {
-    #ifdef TEST
-
-    if (message == NULL)
-    {
-      *logofs << name() << ": PANIC! Cannot recycle a null message.\n"
-              << logofs_flush;
-
-      cerr << "Error" << ": Cannot recycle a null message.\n";
-
-      HandleAbort();
-    }
-
-    #endif
-
-    if (temporary_ == NULL)
-    {
-      //
-      // Be careful when reusing the message as
-      // it can contain valid data that must be
-      // explicitly deallocated if not needed.
-      // Note also that you cannot count on the
-      // initialization made in costructor.
-      //
-
-      temporary_ = message;
-    }
-    else
-    {
-      destroy(message);
-    }
-  }
-
-  void beginChecksum(Message *message)
-  {
-    if (message -> md5_digest_ == NULL)
-    {
-      message -> md5_digest_ = new md5_byte_t[MD5_LENGTH];
-
-      #ifdef DEBUG
-      *logofs << name() << ": Created MD5 digest structure "
-              << "for object at " << message << ".\n"
-              << logofs_flush;
-      #endif
-    }
-    #ifdef DEBUG
-    else
-    {
-      *logofs << name() << ": Using existing MD5 digest structure "
-              << "for object at " << message << ".\n"
-              << logofs_flush;
-    }
-    #endif
-
-    #ifdef DEBUG
-    *logofs << name() << ": Prepared MD5 digest for object at "
-            << message << ".\n" << logofs_flush;
-    #endif
-
-    md5_init(md5_state_);
-  }
-
-  void endChecksum(Message *message)
-  {
-    md5_finish(md5_state_, message -> md5_digest_);
-
-    #ifdef DEBUG
-    *logofs << name() << ": Calculated checksum for object at "
-            << message << ".\n" << logofs_flush;
-    #endif
-  }
-
-  void dataChecksum(Message *message, const unsigned char *buffer,
-                        unsigned int size, int bigEndian)
-  {
-    //
-    // Messages that have a data part starting
-    // at an offset possibly beyond the end of
-    // the message, must include the size in
-    // the identity checksum.
-    //
-
-    if ((int) size > message -> i_size_)
-    {
-      md5_append(md5_state_, buffer + message -> i_size_,
-                     size - message -> i_size_);
-    }
-  }
-
-  //
-  // Repository handling methods.
-  //
-
-  public:
-
-  //
-  // Extract identity and data from buffer.
-  // The size field will be updated at the
-  // time of data parsing.
-  //
-
-  int parse(Message *message, int split, const unsigned char *buffer, unsigned int size,
-                T_checksum_action checksumAction, T_data_action dataAction, int bigEndian);
-
-  int parse(Message *message, const unsigned char *buffer, unsigned int size,
-                const unsigned char *compressedData, const unsigned int compressedDataSize,
-                     T_checksum_action checksumAction, T_data_action dataAction, int bigEndian);
-
-  //
-  // From identity and data write the
-  // final message to the raw buffer.
-  //
-
-  int unparse(const Message *message, unsigned char *buffer,
-                  unsigned int size, int bigEndian)
-  {
-    return (unparseData(message, buffer, size, bigEndian) &&
-                unparseIdentity(message, buffer, size, bigEndian));
-  }
-
-  void dump(const Message *message) const
-  {
-    dumpIdentity(message);
-
-    dumpData(message);
-  }
-
-  void dumpData(const Message *message) const;
-
-  //
-  // This returns the original message size as it
-  // was received on the link. It takes in account
-  // the data part, regardless data is still stored
-  // in the message object. This information will
-  // be used at the time message is unparsed.
-  //
-
-  int plainSize(const int position) const
-  {
-    return (*messages_)[position] -> size_;
-  }
-
-  //
-  // This returns either the size of identity plus
-  // the compressed data part or 0 if message is
-  // stored in uncompressed format.
-  //
-
-  int compressedSize(const int position) const
-  {
-    return (*messages_)[position] -> c_size_;
-  }
-
-  //
-  // Returns a pointer to message
-  // given its position in cache.
-  //
-
-  Message *get(const int position) const
-  {
-    if (position < 0 || position >= cacheSlots)
-    {
-      #ifdef PANIC
-      *logofs << name() << ": PANIC! Requested position "
-              << position << " is not inside the "
-              << "container.\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Requested position "
-           << position << " is not inside the"
-           << "container.\n";
-
-      HandleAbort();
-    }
-    else if ((*messages_)[position] == NULL)
-    {
-      #ifdef PANIC
-      *logofs << name() << ": PANIC! Message at position "
-              << position << " is NULL.\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Message at position "
-           << position << " is NULL.\n";
-
-      HandleAbort();
-    }
-
-    return (*messages_)[position];
-  }
-
-  //
-  // This is the method called at encoding
-  // side to add a message to cache.
-  //
-
-  int findOrAdd(Message *message, T_checksum_action checksumAction,
-                    T_data_action dataAction, int &added, int &locked);
-
-  //
-  // Utility interfaces to message insertion
-  // and deletion.
-  //
-
-  int add(Message *message, const int position,
-              T_checksum_action checksumAction, T_data_action dataAction);
-
-  int remove(const int position, T_checksum_action checksumAction,
-                 T_data_action dataAction);
-
-  //
-  // Make space in the repository by remove
-  // the first suitable message object.
-  //
-
-  int clean(T_checksum_action checksumAction);
-
-  //
-  // Increase or decrease the "rating" of
-  // the message object.
-  //
-
-  int touch(Message *message) const;
-  int untouch(Message *message) const;
-
-  int getTouches(const int position) const
-  {
-    Message *message = (*messages_)[position];
-
-    if (message == NULL)
-    {
-      return 0;
-    }
-
-    return message -> hits_;
-  }
-
-  //
-  // Gives a 'weight' to the cached message. A zero
-  // value means object can be safely removed. A value
-  // greater than zero means it is advisable to retain
-  // the object. A negative result means it is mandato-
-  // ry to keep object in cache.
-  //
-
-  int getRating(Message *message, T_rating type) const;
-
-  //
-  // Increase or decrease locks of message at given
-  // position. A locked message will not be removed
-  // from the message store until the lock counter
-  // is zero.
-  //
-
-  int lock(const int position) const;
-  int unlock(const int position) const;
-
-  int getLocks(const int position) const
-  {
-    Message *message = (*messages_)[position];
-
-    if (message == NULL)
-    {
-      return 0;
-    }
-
-    return message -> locks_;
-  }
-
-  T_checksum const getChecksum(const int position) const
-  {
-    return getChecksum(get(position));
-  }
-
-  T_checksum const getChecksum(const Message *message) const
-  {
-    if (message -> md5_digest_ == NULL)
-    {
-      #ifdef PANIC
-      *logofs << name() << ": PANIC! Checksum not initialized "
-              << "for object at " << message << ".\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Checksum not initialized "
-           << "for object at " << message << ".\n";
-
-      HandleAbort();
-    }
-
-    #ifdef DEBUG
-    *logofs << name() << ": Got checksum for object at " 
-            << message << ".\n" << logofs_flush;
-    #endif
-
-    return message -> md5_digest_;
-  }
-
-  //
-  // Calculate the checksum on the fly based the
-  // opcode in the buffer. Useful in the case a
-  // message was not processed or was not stored
-  // in the cache. The returned checksum must be
-  // explicitly deallocated by the caller, after
-  // use.
-  //
-
-  T_checksum getChecksum(const unsigned char *buffer,
-                             unsigned int size, int bigEndian);
-
-  const unsigned char *getData(const Message *message) const
-  {
-    return message -> data_.begin();
-  }
-
-  int plainSize(const Message *message) const
-  {
-    return message -> size_;
-  }
-
-  int identitySize(Message *message)
-  {
-    return message -> i_size_;
-  }
-
-  int compressedSize(const Message *message) const
-  {
-    return message -> c_size_;
-  }
-
-  Message *getTemporary()
-  {
-    if (temporary_ == NULL)
-    {
-      temporary_ = create();
-    }
-
-    return temporary_;
-  }
-
-  void resetTemporary()
-  {
-    temporary_ = NULL;
-  }
-
-  //
-  // On side where we don't have checksums, we
-  // count how many messages are in the array.
-  // This is obviously expensive and should be
-  // only performed when reporting statistics.
-  //
-
-  int getSize() const
-  {
-    int size = checksums_ -> size();
-
-    if (size == 0)
-    {
-      for (int i = 0; i < cacheSlots; i++)
-      {
-        if ((*messages_)[i] != NULL)
-        {
-          size++;
-        }
-      }
-    }
-
-    return size;
-  }
-
-  int getLocalStorageSize() const
-  {
-    return localStorageSize_;
-  }
-
-  int getRemoteStorageSize() const
-  {
-    return remoteStorageSize_;
-  }
-
-  int getLocalTotalStorageSize() const
-  {
-    return totalLocalStorageSize_;
-  }
-
-  int getRemoteTotalStorageSize() const
-  {
-    return totalRemoteStorageSize_;
-  }
-
-  static int getCumulativeTotalStorageSize()
-  {
-    return (totalLocalStorageSize_ > totalRemoteStorageSize_ ?
-                totalLocalStorageSize_ : totalRemoteStorageSize_);
-  }
-
-  int saveStore(ostream *cachefs, md5_state_t *md5_state_stream,
-                    md5_state_t *md5_state_client, T_checksum_action checksumAction,
-                        T_data_action dataAction, int bigEndian);
-
-  int loadStore(istream *cachefs, md5_state_t *md5_state_stream,
-                    T_checksum_action checksumAction, T_data_action dataAction,
-                        int bigEndian);
-
-  protected:
-
-  //
-  // Estimate the memory requirements of given
-  // instance of message. Size includes memory
-  // allocated from heap to store checksum and
-  // data.
-  //
-
-  void storageSize(const Message *message, unsigned int &local,
-                       unsigned int &remote) const;
-
-  //
-  // Just used for debug.
-  //
-
-  void printStorageSize();
-
-  //
-  // Repositories where to save cached messages.
-  // First is a vector of pointers, the second
-  // is a hash table used for fast lookups.
-  //
-
-  T_messages  *messages_;
-  T_checksums *checksums_;
-
-  //
-  // A message object to be used as a temporary.
-  // Reuse the temporary object if possible, if
-  // not, create a new instance.
-  //
-
-  Message *temporary_;
-
-  //
-  // Used to calculate message's checksum.
-  //
-
-  md5_state_t *md5_state_;
-
-  private:
-
-  //
-  // Used to compress data payload.
-  //
-
-  StaticCompressor *compressor_;
-
-  //
-  // Keep track of how many bytes 
-  // are taken by cache.
-  //
-
-  int localStorageSize_;
-  int remoteStorageSize_;
-
-  static int totalLocalStorageSize_;
-  static int totalRemoteStorageSize_;
-
-  //
-  // Used to track object allocation and deallocation.
-  //
-
-  #ifdef REFERENCES
-
-  static int references_;
-
-  #endif
-};
-
-//
-// This is an ancillary class of the message
-// store, used to encode extensions based on
-// the minor opcode.
-//
-
-class MinorMessageStore
-{
-  public:
-
-  virtual ~MinorMessageStore()
-  {
-  }
-
-  virtual const char *name() const = 0;
-
-  virtual int identitySize(const unsigned char *buffer, unsigned int size) = 0;
-
-  virtual int encodeMessage(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                const unsigned int size, int bigEndian,
-                                    ChannelCache *channelCache) const
-  {
-    return 1;
-  }
-
-  virtual int decodeMessage(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                                unsigned int &size, unsigned char type, int bigEndian,
-                                    WriteBuffer *writeBuffer, ChannelCache *channelCache) const
-  {
-    return 1;
-  }
-
-  virtual void encodeData(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                              unsigned int size, int bigEndian,
-                                  ChannelCache *channelCache) const
-  {
-  }
-
-  virtual void decodeData(DecodeBuffer &decodeBuffer, unsigned char *buffer,
-                              unsigned int size, int bigEndian,
-                                  ChannelCache *channelCache) const
-  {
-  }
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const = 0;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const = 0;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const
-  {
-  }
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const
-  {
-  }
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-                                    unsigned int size, md5_state_t *md5_state,
-                                        int bigEndian) const = 0;
-};
-
-#endif /* Message_H */
-
diff --git a/nxcomp/Misc.cpp b/nxcomp/Misc.cpp
deleted file mode 100644
index 09a0b29d2..000000000
--- a/nxcomp/Misc.cpp
+++ /dev/null
@@ -1,1930 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include <cstdio>
-#include <cctype>
-#include <cstdlib>
-#include <unistd.h>
-#include <csignal>
-
-#include <errno.h>
-#include <string.h>
-
-#include "NXproto.h"
-
-#include "MD5.h"
-
-#include "Misc.h"
-#include "Proxy.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#define OPCODES
-#undef  TEST
-#undef  DEBUG
-
-//
-// By default nxproxy binds to all network interfaces, setting
-// DEFAULT_LOOPBACK_BIND to 1 enables binding to the loopback
-// device only.
-//
-
-const int DEFAULT_LOOPBACK_BIND = 0;
-
-//
-// TCP port offset applied to any NX port specification.
-//
-
-const int DEFAULT_NX_PROXY_PORT_OFFSET = 4000;
-
-//
-// Default TCP port used by client proxy to listen to  
-// X clients and by server proxy to connect to remote.
-//
-
-const int DEFAULT_NX_PROXY_PORT = 8;
-
-//
-// Default X display number that client proxy imitates.
-//
-
-const int DEFAULT_NX_X_PORT = 8;
-
-//
-// Default ports used for listening for cups, samba, http,
-// multimedia and auxiliary X connections. Arbitrary ports
-// can be used by passing the service's port at the proxy
-// startup. By default ports are determined by adding the
-// offset below to the offset of the proxied display. For
-// example, if the proxy is impersonating the display :8,
-// SMB tunnels can be created by connecting to port 3008.
-//
-// Considering that the NX server uses to start the first
-// session at display offset 1000, we must lower the CUPS
-// and SMB ports to avoid interference with normal X ses-
-// sions run on the server.
-//
-// Font server connections are used to let the X server on
-// the client connect to a font server on the NX server.
-//
-// Slave channels can be originated by both sides so we need
-// different offsets in the case the user runs both proxies
-// on the same host.
-//
-
-const int DEFAULT_NX_CUPS_PORT_OFFSET  = 2000;
-const int DEFAULT_NX_SMB_PORT_OFFSET   = 3000;
-const int DEFAULT_NX_MEDIA_PORT_OFFSET = 7000;
-const int DEFAULT_NX_AUX_PORT_OFFSET   = 8000;
-const int DEFAULT_NX_HTTP_PORT_OFFSET  = 9000;
-const int DEFAULT_NX_FONT_PORT_OFFSET  = 10000;
-
-const int DEFAULT_NX_SLAVE_PORT_CLIENT_OFFSET = 11000;
-const int DEFAULT_NX_SLAVE_PORT_SERVER_OFFSET = 12000;
-
-//
-// Usage info and copyright.
-//
-
-static const char UsageInfo[] =
-"\n\
-  Usage: nxproxy [OPTIONS] host:port\n\
-\n\
-  -C           Specify that nxproxy has to run on the 'X client'\n\
-               side, listening for connections and impersonating\n\
-               an X server.\n\
-\n\
-  -S           Specify that nxproxy has to run in 'X server' mode,\n\
-               thus forwarding the connections to daemons running\n\
-               on the client.\n\
-\n\
-  -h           Print this message.\n\
-\n\
-  -v           Print version information.\n\
-\n\
-  host:port    Put at the end, specifies the host and port of the\n\
-               listening proxy.\n\
-\n\
-  name=value   Set the NX option to the provided value.\n\
-\n\
-  Multiple NX options can be specified in the DISPLAY environment\n\
-  or on the command line, by using the nx/nx,option=value notation.\n\
-\n\
-  Options:\n\
-\n\
-  link=s       An indication of the link speed that is going to be\n\
-               used between the proxies. Usually the compression\n\
-               and the other link parameters depend on this setting.\n\
-               The value can be either 'modem', 'isdn', 'adsl',\n\
-               'wan', 'lan', 'local' or a bandwidth specification,\n\
-               like for example '56k', '1m', '100m', etc.\n\
-\n\
-  type=s       Type of session, for example 'windows', 'unix-kde'.\n\
-               'unix-application', etc.\n\
-\n\
-  display=s    Specify the real display where X connections have\n\
-               to be forwarded by the proxy running on the client.\n\
-\n\
-  listen=n     Local port used for accepting the proxy connection.\n\
-\n\
-  loopback=b   Bind to the loopback device only.\n\
-\n\
-  accept=s     Name or IP of host that can connect to the proxy.\n\
-\n\
-  connect=s    Name or IP of host that the proxy will connect to.\n\
-\n\
-  port=n       Remote port used for the connection.\n\
-\n\
-  retry=n      Number of connection atempts.\n\
-\n\
-  root=s       The root directory for the session. Usually is the\n\
-               C-* or S-* in the .nx directory in the user's home,\n\
-               with '*' being the virtual display.\n\
-\n\
-  session=s    Name of the session file. The default is the name\n\
-               'session' in the session directory.\n\
-\n\
-  errors=s     Name of the log file used by the proxy. The default\n\
-               is the name 'errors' in the session directory.\n\
-\n\
-  stats=s      Name of the file where are written the proxy stat-\n\
-               istics. The default is a file 'stats' in the session\n\
-               directory. The proxy replaces the data in the file\n\
-               whenever it receives a SIGUSR1 or SIGUSR2 signal:\n\
-\n\
-               SIGUSR1    Gives total statistics, i.e. statistics\n\
-                          collected since the beginning of the\n\
-                          session.\n\
-\n\
-               SIGUSR2    Gives partial statistics, i.e. statist-\n\
-                          ics collected since the last time this\n\
-                          signal was received.\n\
-\n\
-  cookie=s     Use the provided cookie for authenticating to the\n\
-               remote proxy. The same cookie is used as the fake\n\
-               value used for the X authorization. The fake cookie\n\
-               is replaced on the X server side with the real cookie\n\
-               to be used for the display, so that the real cookie\n\
-               doesn't have to travel over the net. When not using\n\
-               a proxy cookie, any host will be able to connect to\n\
-               the proxy. See also the 'accept' parameter.\n\
-\n\
-  nodelay=b    A boolean indicating if TCP_NODELAY has to be set\n\
-               on the proxy link. Old Linux kernels had problems\n\
-               with handling TCP_NODELAY on PPP links.\n\
-\n\
-  policy=b     Let or not the agent decide when it is the best time\n\
-               to flush the proxy link. If set to 0, the proxy will\n\
-               flush any encoded data immediately. The option has\n\
-               only effect on the X client side proxy.\n\
-\n\
-  render=b     Enable or disable use of the RENDER extension.\n\
-\n\
-  taint=b      Try to suppress trivial sources of X roundtrips by\n\
-               generating the reply on the X client side.\n\
-\n\
-  delta=b      Enable X differential compression.\n\
-\n\
-  data=n       Enable or disable the ZLIB data compression. It is\n\
-               possible to specify a value between 0 and 9. Usual-\n\
-               ly the value is chosen automatically based on the\n\
-               requested link setting.\n\
-\n\
-  stream=n     Enable or disable the ZLIB stream compression. The\n\
-               value, between 0 and 9, is usually determined accor-\n\
-               ding to the requested link setting.\n\
-\n\
-  limit=n      Specify a bitrate limit allowed for this session.\n\
-\n\
-  memory=n     Trigger memory optimizations used to keep small the\n\
-               size of X buffers. This is useful on embedded plat-\n\
-               forms, or where memory is scarce.\n\
-\n\
-  cache=n      Size of the in-memory X message cache. Setting the\n\
-               value to 0 will disable the memory cache as well\n\
-               as the NX differential compression.\n\
-\n\
-  images=n     Size of the persistent image cache.\n\
-\n\
-  shseg=n      Enable the use of the MIT-SHM extension between the\n\
-               NX client proxy and the real X server. A value greater\n\
-               than 1 is assumed to be the size of requested shared\n\
-               memory segment. By default, the size of the segment is\n\
-               determined based on the size of the in-memory cache.\n\
-\n\
-  load=b       Enable loading a persistent X message cache at the\n\
-               proxy startup.\n\
-\n\
-  save=b       Enable saving a persistent X message cache at the\n\
-               end of session.\n\
-\n\
-  cups=n       Enable or disable forwarding of CUPS connections,\n\
-               by listening on the optional port 'n'.\n\
-\n\
-  aux=n        Enable or disable forwarding of the auxiliary X chan-\n\
-               nel used for controlling the keyboard. The 'keybd=n'\n\
-               form is accepted for backward compatibility.\n\
-\n\
-  smb=n        Enable or disable forwarding of SMB connections. The\n\
-               'samba=n' form is accepted for backward compatibility.\n\
-\n\
-  media=n      Enable forwarding of audio connections.\n\
-\n\
-  http=n       Enable forwarding of HTTP connections.\n\
-\n\
-  font=n       Enable forwarding of reversed connections to a font\n\
-               server running on the NX server.\n\
-\n\
-  file=n       Enable forwarding of file transfer connections.\n\
-\n\
-  mask=n       Determine the distribution of channel ids between the\n\
-               proxies. By default, channels whose ids are multiple\n\
-               of 8 (starting from 0) are reserved for the NX client\n\
-               side. All the other channels can be allocated by the\n\
-               NX server side.\n\
-\n\
-  timeout=t    Specify the keep-alive timeout used by proxies to\n\
-               determine if there is a network problem preventing\n\
-               communication with the remote peer. A value of 0\n\
-               disables the check.\n\
-\n\
-  cleanup=t    Specify the number of seconds the proxy has to wait\n\
-               at session shutdown before closing all channels.\n\
-               The feature is used by the NX server to ensure that\n\
-               services are disconnected before shutting down the\n\
-               link.\n\
-\n\
-  pack=s       Determine the method used to compress images.\n\
-\n\
-  product=s    The product id of the client or server. The value is\n\
-               ignored by the proxy, but the client or server can\n\
-               provide it to facilitate the support.\n\
-\n\
-  core=b       Enable production of core dumps when aborting the\n\
-               proxy connection.\n\
-\n\
-  options=s    Specify an additional file containing options that\n\
-               has to be merged with option read from the command\n\
-               line or the environment.\n\
-\n\
-  kill=n       Add the given process to the list of daemons that\n\
-               must be terminated at session shutdown. Multiple\n\
-               'kill=n' options can be specified. The proxy will\n\
-               send them a SIGTERM signal just before exiting.\n\
-\n\
-  strict=b     Optimize for responsiveness, rather than for the best\n\
-               use of all the available bandwidth.\n\
-\n\
-  encryption=b Should be set to 1 if the proxy is running as part of\n\
-               a program providing encryption of the point to point\n\
-               communication.\n\
-\n\
-rootless=b\n\
-geometry=s\n\
-resize=b\n\
-fullscreen=b\n\
-keyboard=s\n\
-clipboard=s\n\
-streaming=n\n\
-backingstore=n\n\
-composite=n\n\
-xinerama=n\n\
-shmem=b\n\
-shpix=b\n\
-kbtype=s\n\
-client=s\n\
-shadow=n\n\
-shadowuid=n\n\
-shadowmode=s\n\
-defer=n\n\
-tile=s\n\
-menu=n\n\
-sleep=n\n\
-tolerancechecks=s\n\
-               These options are interpreted by the NX agent. They\n\
-               are ignored by the proxy.\n\
-\n\
-  Environment:\n\
-\n\
-  NX_ROOT      The root NX directory is the place where the session\n\
-               directory and the cache files are created. This is\n\
-               usually overridden by passing the 'root=' option. By\n\
-               default, the root NX directory is assumed to be the\n\
-               directory '.nx' in the user's home.\n\
-\n\
-  NX_SYSTEM    The directory where NX programs and libraries reside.\n\
-               If not set, the value is assumed to be '/usr/NX'.\n\
-               Programs, libraries and data files are respectedly\n\
-               searched in the 'bin', 'lib' and 'share' subdirecto-\n\
-               ries.\n\
-\n\
-  NX_HOME      The NX user's home directory. If NX_ROOT is not set\n\
-               or invalid, the user's NX directory is created here.\n\
-\n\
-  NX_TEMP      The directory where the X11 Unix Domain Sockets and\n\
-               all temporary files are to be created.\n\
-\n\
-  NX_CLIENT    The full path to the nxclient executable. If the va-\n\
-               riable is not set, the nxclient executable will be\n\
-               run assuming that the program is in the system path.\n\
-               This can be useful on platforms like Windows and the\n\
-               Mac where nxclient is located in a different direct-\n\
-               ory compared to the other programs, to make easier\n\
-               for the user to execute the program from the shell.\n\
-\n\
-  NX_SLAVE_CMD The full path to the slave channel handler. When the\n\
-               slave channel is enabled, the agent will listen on a\n\
-               port and forward the connection to the NX_SLAVE_CMD\n\
-               program. This can be used to implement agent/proxy\n\
-               communication for applications such as serial port and\n\
-               USB forwarding.\n\
-\n\
-  Shell environment:\n\
-\n\
-  HOME         The variable is checked in the case NX_HOME is not\n\
-               set, null or invalid.\n\
-\n\
-  TEMP         The variable is checked whenever the NX_TEMP direct-\n\
-               ory is not set, null or invalid.\n\
-\n\
-  PATH         The path where all executables are searched, except\n\
-               nxclient. If NX_CLIENT is not set, also the client\n\
-               executable is searched in the system path.\n\
-\n\
-  LD_LIBRARY_PATH\n\
-               System-wide library search order. This should be set\n\
-               by the program invoking the proxy.\n\
-\n\
-  DISPLAY      On the X server side, the DISPLAY variable indicates\n\
-               the location of the X11 server. When nxcomp is used\n\
-               as a transport library, the DISPLAY may represent a\n\
-               NX transport specification and options can passed in\n\
-               the form nx/nx,option=value...\n\
-\n\
-  XAUTHORITY   This is the file containing the X11 authorization\n\
-               cookie. If not set, the file is assumed to be in\n\
-               the user's home (either NX_HOME or HOME).\n\
-\n\
-";
-
-const char *GetUsageInfo()
-{
-  return UsageInfo;
-}
-
-static const char CopyrightInfo[] =
-"\
-Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)\n\
-Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>\n\
-Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>\n\
-Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>\n\
-Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n\
-Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)\n\
-\n\
-NXCOMP, NX protocol compression and NX extensions to this software\n\
-are copyright of the aforementioned persons and companies.\n\
-\n\
-Redistribution and use of the present software is allowed according\n\
-to terms specified in the file LICENSE.nxcomp which comes in the\n\
-source distribution.\n\
-\n\
-All rights reserved.\n\
-\n\
-NOTE: This software has received contributions from various other\n\
-contributors, only the core maintainers and supporters are listed as\n\
-copyright holders. Please contact us, if you feel you should be listed\n\
-as copyright holder, as well.\n\
-";
-
-const char *GetCopyrightInfo()
-{
-  return CopyrightInfo;
-}
-
-static const char OtherCopyrightInfo[] =
-"\
-NX protocol compression is derived from DXPC project.\n\
-\n\
-Copyright (c) 1995,1996 Brian Pane\n\
-Copyright (c) 1996,1997 Zachary Vonler and Brian Pane\n\
-Copyright (c) 1999 Kevin Vigor and Brian Pane\n\
-Copyright (c) 2000,2003 Gian Filippo Pinzari and Brian Pane\n\
-\n\
-All rights reserved.\n\
-";
-
-const char *GetOtherCopyrightInfo()
-{
-  return OtherCopyrightInfo;
-}
-
-int _hostBigEndian  = 0;
-int _storeBigEndian = 0;
-
-const unsigned int IntMask[33] =
-{
-  0x00000000,
-  0x00000001,
-  0x00000003,
-  0x00000007,
-  0x0000000f,
-  0x0000001f,
-  0x0000003f,
-  0x0000007f,
-  0x000000ff,
-  0x000001ff,
-  0x000003ff,
-  0x000007ff,
-  0x00000fff,
-  0x00001fff,
-  0x00003fff,
-  0x00007fff,
-  0x0000ffff,
-  0x0001ffff,
-  0x0003ffff,
-  0x0007ffff,
-  0x000fffff,
-  0x001fffff,
-  0x003fffff,
-  0x007fffff,
-  0x00ffffff,
-  0x01ffffff,
-  0x03ffffff,
-  0x07ffffff,
-  0x0fffffff,
-  0x1fffffff,
-  0x3fffffff,
-  0x7fffffff,
-  0xffffffff
-};
-
-unsigned int GetUINT(unsigned const char *buffer, int bigEndian)
-{
-  //
-  // It doesn't work on SPARCs if the buffer
-  // is not aligned to the word boundary. We
-  // should check the CPU, not the OS as this
-  // surely applies to other architectures.
-  //
-
-  #ifndef __sun
-
-  if (_hostBigEndian == bigEndian)
-  {
-    return *((unsigned short *) buffer);
-  }
-
-  #else
-
-  if (_hostBigEndian == bigEndian && ((unsigned int) buffer) & 0x1 == 0)
-  {
-    return *((unsigned short *) buffer);
-  }
-
-  #endif
-
-  unsigned int result;
-
-  if (bigEndian)
-  {
-    result = *buffer;
-
-    result <<= 8;
-
-    result += buffer[1];
-  }
-  else
-  {
-    result = buffer[1];
-
-    result <<= 8;
-
-    result += *buffer;
-  }
-
-  return result;
-}
-
-unsigned int GetULONG(unsigned const char *buffer, int bigEndian)
-{
-  //
-  // It doesn't work on SPARCs if the buffer
-  // is not aligned to word the boundary.
-  //
-
-  #ifndef __sun
-
-  if (_hostBigEndian == bigEndian)
-  {
-    return *((unsigned int *) buffer);
-  }
-
-  #else
-
-  if (_hostBigEndian == bigEndian && ((unsigned int) buffer) & 0x3 == 0)
-  {
-    return *((unsigned int *) buffer);
-  }
-
-  #endif
-
-  const unsigned char *next = (bigEndian ? buffer : buffer + 3);
-
-  unsigned int result = 0;
-
-  for (int i = 0; i < 4; i++)
-  {
-    result <<= 8;
-
-    result += *next;
-
-    if (bigEndian)
-    {
-      next++;
-    }
-    else
-    {
-      next--;
-    }
-  }
-
-  return result;
-}
-
-void PutUINT(unsigned int value, unsigned char *buffer, int bigEndian)
-{
-  if (_hostBigEndian == bigEndian)
-  {
-    *((unsigned short *) buffer) = value;
-
-    return;
-  }
-
-  if (bigEndian)
-  {
-    buffer[1] = (unsigned char) (value & 0xff);
-
-    value >>= 8;
-
-    *buffer = (unsigned char) value;
-  }
-  else
-  {
-    *buffer = (unsigned char) (value & 0xff);
-
-    value >>= 8;
-
-    buffer[1] = (unsigned char) value;
-  }
-}
-
-void PutULONG(unsigned int value, unsigned char *buffer, int bigEndian)
-{
-  if (_hostBigEndian == bigEndian)
-  {
-    *((unsigned int *) buffer) = value;
-
-    return;
-  }
-
-  if (bigEndian)
-  {
-    buffer += 3;
-
-    for (int i = 4; i > 0; i--)
-    {
-      *buffer-- = (unsigned char) (value & 0xff);
-
-      value >>= 8;
-    }
-  }
-  else
-  {
-    for (int i = 4; i > 0; i--)
-    {
-      *buffer++ = (unsigned char) (value & 0xff);
-
-      value >>= 8;
-    }
-  }
-}
-
-int CheckData(istream *fs)
-{
-  if (fs == NULL || fs -> fail())
-  {
-    return -1;
-  }
-
-  return 1;
-}
-
-int CheckData(ostream *fs)
-{
-  if (fs == NULL || fs -> fail())
-  {
-    return -1;
-  }
-
-  return 1;
-}
-
-int PutData(ostream *fs, const unsigned char *buffer, int size)
-{
-  fs -> write((char *) buffer, size);
-
-  #ifdef DEBUG
-  *logofs << "PutData: Written " << size << " bytes with eof "
-          << fs -> eof() << " fail " << fs -> fail() << " and bad "
-          << fs -> bad() << ".\n" << logofs_flush;
-  #endif
-
-  if (fs -> fail())
-  {
-    return -1;
-  }
-
-  return size;
-}
-
-int GetData(istream *fs, unsigned char *buffer, int size)
-{
-  fs -> read((char *) buffer, size);
-
-  #ifdef DEBUG
-  *logofs << "GetData: Read " << size << " bytes with eof "
-          << fs -> eof() << " fail " << fs -> fail()
-          << " and bad " << fs -> bad() << ".\n"
-          << logofs_flush;
-  #endif
-
-  #ifdef __APPLE__
-
-  if (fs -> bad())
-  {
-    return -1;
-  }
-
-  #else
-
-  if (fs -> fail())
-  {
-    return -1;
-  }
-
-  #endif
-
-  return size;
-}
-
-int FlushData(ostream *fs)
-{
-  fs -> flush();
-
-  if (fs -> fail())
-  {
-    return -1;
-  }
-
-  return 1;
-}
-
-unsigned int RoundUp2(unsigned int x)
-{
-  unsigned int y = x / 2;
-
-  y *= 2;
-
-  if (y != x)
-  {
-    y += 2;
-  }
-
-  return y;
-}
-
-unsigned int RoundUp4(unsigned int x)
-{
-  unsigned int y = x / 4;
-
-  y *= 4;
-
-  if (y != x)
-  {
-    y += 4;
-  }
-
-  return y;
-}
-
-unsigned int RoundUp8(unsigned int x)
-{
-  unsigned int y = x / 8;
-
-  y *= 8;
-
-  if (y != x)
-  {
-    y += 8;
-  }
-
-  return y;
-}
-
-const char *DumpSignal(int signal)
-{
-  switch (signal)
-  {
-    case SIGCHLD:
-    {
-      return "SIGCHLD";
-    }
-    case SIGUSR1:
-    {
-      return "SIGUSR1";
-    }
-    case SIGUSR2:
-    {
-      return "SIGUSR2";
-    }
-    case SIGHUP:
-    {
-      return "SIGHUP";
-    }
-    case SIGINT:
-    {
-      return "SIGINT";
-    }
-    case SIGTERM:
-    {
-      return "SIGTERM";
-    }
-    case SIGPIPE:
-    {
-      return "SIGPIPE";
-    }
-    case SIGALRM:
-    {
-      return "SIGALRM";
-    }
-    case SIGVTALRM:
-    {
-      return "SIGVTALRM";
-    }
-    case SIGWINCH:
-    {
-      return "SIGWINCH";
-    }
-    case SIGIO:
-    {
-      return "SIGIO";
-    }
-    case SIGTSTP:
-    {
-      return "SIGTSTP";
-    }
-    case SIGTTIN:
-    {
-      return "SIGTTIN";
-    }
-    case SIGTTOU:
-    {
-      return "SIGTTOU";
-    }
-    case SIGSEGV:
-    {
-      return "SIGSEGV";
-    }
-    case SIGABRT:
-    {
-      return "SIGABRT";
-    }
-    default:
-    {
-      return "Unknown";
-    }
-  }
-}
-
-const char *DumpPolicy(int type)
-{
-  switch ((T_flush_policy) type)
-  {
-    case policy_immediate:
-    {
-      return "immediate";
-    }
-    case policy_deferred:
-    {
-      return "deferred";
-    }
-    default:
-    {
-      #ifdef PANIC
-      *logofs << "Misc: PANIC! Unknown policy type '"
-              << type << "'.\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Unknown policy type '"
-           << type << "'.\n";
-
-      HandleCleanup();
-    }
-  }
-}
-
-const char *DumpAction(int type)
-{
-  T_store_action action = (T_store_action) type;
-
-  if (action == IS_HIT)
-  {
-    return "is_hit";
-  }
-  else if (action == IS_ADDED)
-  {
-    return "is_added";
-  }
-  else if (action == is_discarded)
-  {
-    return "is_discarded";
-  }
-  else if (action == is_removed)
-  {
-    return "is_removed";
-  }
-  else
-  {
-    #ifdef PANIC
-    *logofs << "Misc: PANIC! Unknown store action '"
-            << type << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Unknown store action '"
-         << type << "'.\n";
-
-    HandleCleanup();
-  }
-}
-
-const char *DumpState(int type)
-{
-  switch ((T_split_state) type)
-  {
-    case split_added:
-    {
-      return "split_added";
-    }
-    case split_missed:
-    {
-      return "split_missed";
-    }
-    case split_loaded:
-    {
-      return "split_loaded";
-    }
-    case split_aborted:
-    {
-      return "split_aborted";
-    }
-    case split_notified:
-    {
-      return "split_notified";
-    }
-    default:
-    {
-      #ifdef PANIC
-      *logofs << "Misc: PANIC! Unknown split state '"
-              << type << "'.\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Unknown split state '"
-           << type << "'.\n";
-
-      HandleCleanup();
-    }
-  }
-}
-
-const char *DumpControl(int code)
-{
-  switch ((T_proxy_code) code)
-  {
-    case code_new_x_connection:
-    {
-      return "code_new_x_connection";
-    }
-    case code_new_cups_connection:
-    {
-      return "code_new_cups_connection";
-    }
-    case code_new_aux_connection:
-    {
-      return "code_new_aux_connection";
-    }
-    case code_new_smb_connection:
-    {
-      return "code_new_smb_connection";
-    }
-    case code_new_media_connection:
-    {
-      return "code_new_media_connection";
-    }
-    case code_switch_connection:
-    {
-      return "code_switch_connection";
-    }
-    case code_drop_connection:
-    {
-      return "code_drop_connection";
-    }
-    case code_finish_connection:
-    {
-      return "code_finish_connection";
-    }
-    case code_begin_congestion:
-    {
-      return "code_begin_congestion";
-    }
-    case code_end_congestion:
-    {
-      return "code_end_congestion";
-    }
-    case code_alert_request:
-    {
-      return "code_alert_request";
-    }
-    case code_alert_reply:
-    {
-      return "code_alert_reply";
-    }
-    case code_reset_request:
-    {
-      return "code_reset_request";
-    }
-    case code_reset_reply:
-    {
-      return "code_reset_reply";
-    }
-    case code_load_request:
-    {
-      return "code_load_request";
-    }
-    case code_load_reply:
-    {
-      return "code_load_reply";
-    }
-    case code_save_request:
-    {
-      return "code_save_request";
-    }
-    case code_save_reply:
-    {
-      return "code_save_reply";
-    }
-    case code_shutdown_request:
-    {
-      return "code_shutdown_request";
-    }
-    case code_shutdown_reply:
-    {
-      return "code_shutdown_reply";
-    }
-    case code_control_token_request:
-    {
-      return "code_control_token_request";
-    }
-    case code_control_token_reply:
-    {
-      return "code_control_token_reply";
-    }
-    case code_configuration_request:
-    {
-      return "code_configuration_request";
-    }
-    case code_configuration_reply:
-    {
-      return "code_configuration_reply";
-    }
-    case code_statistics_request:
-    {
-      return "code_statistics_request";
-    }
-    case code_statistics_reply:
-    {
-      return "code_statistics_reply";
-    }
-    case code_new_http_connection:
-    {
-      return "code_new_http_connection";
-    }
-    case code_sync_request:
-    {
-      return "code_sync_request";
-    }
-    case code_sync_reply:
-    {
-      return "code_sync_reply";
-    }
-    case code_new_font_connection:
-    {
-      return "code_new_font_connection";
-    }
-    case code_new_slave_connection:
-    {
-      return "code_new_slave_connection";
-    }
-    case code_finish_listeners:
-    {
-      return "code_finish_listeners";
-    }
-    case code_split_token_request:
-    {
-      return "code_split_token_request";
-    }
-    case code_split_token_reply:
-    {
-      return "code_split_token_reply";
-    }
-    case code_data_token_request:
-    {
-      return "code_data_token_request";
-    }
-    case code_data_token_reply:
-    {
-      return "code_data_token_reply";
-    }
-    default:
-    {
-      #ifdef WARNING
-      *logofs << "Misc: WARNING! Unknown control code '"
-              << code << "'.\n" << logofs_flush;
-      #endif
-
-      cerr << "Warning" << ": Unknown control code '"
-           << code << "'.\n";
-
-      return "unknown";
-    }
-  }
-}
-
-const char *DumpSession(int code)
-{
-  switch ((T_session_mode) code)
-  {
-    case session_agent:
-    {
-      return "session_agent";
-    }
-    case session_shadow:
-    {
-      return "session_shadow";
-    }
-    case session_proxy:
-    {
-      return "session_proxy";
-    }
-    default:
-    {
-      #ifdef WARNING
-      *logofs << "Misc: WARNING! Unknown session type '"
-              << code << "'.\n" << logofs_flush;
-      #endif
-
-      cerr << "Warning" << ": Unknown session type '"
-           << code << "'.\n";
-
-      return "unknown";
-    }
-  }
-}
-
-const char *DumpToken(int type)
-{
-  switch ((T_token_type) type)
-  {
-    case token_control:
-    {
-      return "token_control";
-    }
-    case token_split:
-    {
-      return "token_split";
-    }
-    case token_data:
-    {
-      return "token_data";
-    }
-    default:
-    {
-      #ifdef WARNING
-      *logofs << "Misc: WARNING! Unknown token type '"
-              << type << "'.\n" << logofs_flush;
-      #endif
-
-      cerr << "Warning" << ": Unknown token type '"
-           << type << "'.\n";
-
-      return "unknown";
-    }
-  }
-}
-
-//
-// Always include this in code as it is generally
-// needed to test channels and split store.
-//
-
-const char *DumpChecksum(const void *checksum)
-{
-  static char string[MD5_LENGTH * 2 + 1];
-
-  if (checksum != NULL)
-  {
-    for (unsigned int i = 0; i < MD5_LENGTH; i++)
-    {
-      sprintf(string + (i * 2), "%02X", ((unsigned char *) checksum)[i]);
-    }
-  }
-  else
-  {
-    strcpy(string, "null");
-  }
-
-  return string;
-}
-
-//
-// Define OPCODES here and in the channel
-// if you want to log the opcode literal.
-//
-
-#ifdef OPCODES
-
-const char *DumpOpcode(const int &opcode)
-{
-  switch (opcode)
-  {
-    case X_CreateWindow:
-    {
-      return "X_CreateWindow";
-    }
-    case X_ChangeWindowAttributes:
-    {
-      return "X_ChangeWindowAttributes";
-    }
-    case X_GetWindowAttributes:
-    {
-      return "X_GetWindowAttributes";
-    }
-    case X_DestroyWindow:
-    {
-      return "X_DestroyWindow";
-    }
-    case X_DestroySubwindows:
-    {
-      return "X_DestroySubwindows";
-    }
-    case X_ChangeSaveSet:
-    {
-      return "X_ChangeSaveSet";
-    }
-    case X_ReparentWindow:
-    {
-      return "X_ReparentWindow";
-    }
-    case X_MapWindow:
-    {
-      return "X_MapWindow";
-    }
-    case X_MapSubwindows:
-    {
-      return "X_MapSubwindows";
-    }
-    case X_UnmapWindow:
-    {
-      return "X_UnmapWindow";
-    }
-    case X_UnmapSubwindows:
-    {
-      return "X_UnmapSubwindows";
-    }
-    case X_ConfigureWindow:
-    {
-      return "X_ConfigureWindow";
-    }
-    case X_CirculateWindow:
-    {
-      return "X_CirculateWindow";
-    }
-    case X_GetGeometry:
-    {
-      return "X_GetGeometry";
-    }
-    case X_QueryTree:
-    {
-      return "X_QueryTree";
-    }
-    case X_InternAtom:
-    {
-      return "X_InternAtom";
-    }
-    case X_GetAtomName:
-    {
-      return "X_GetAtomName";
-    }
-    case X_ChangeProperty:
-    {
-      return "X_ChangeProperty";
-    }
-    case X_DeleteProperty:
-    {
-      return "X_DeleteProperty";
-    }
-    case X_GetProperty:
-    {
-      return "X_GetProperty";
-    }
-    case X_ListProperties:
-    {
-      return "X_ListProperties";
-    }
-    case X_SetSelectionOwner:
-    {
-      return "X_SetSelectionOwner";
-    }
-    case X_GetSelectionOwner:
-    {
-      return "X_GetSelectionOwner";
-    }
-    case X_ConvertSelection:
-    {
-      return "X_ConvertSelection";
-    }
-    case X_SendEvent:
-    {
-      return "X_SendEvent";
-    }
-    case X_GrabPointer:
-    {
-      return "X_GrabPointer";
-    }
-    case X_UngrabPointer:
-    {
-      return "X_UngrabPointer";
-    }
-    case X_GrabButton:
-    {
-      return "X_GrabButton";
-    }
-    case X_UngrabButton:
-    {
-      return "X_UngrabButton";
-    }
-    case X_ChangeActivePointerGrab:
-    {
-      return "X_ChangeActivePointerGrab";
-    }
-    case X_GrabKeyboard:
-    {
-      return "X_GrabKeyboard";
-    }
-    case X_UngrabKeyboard:
-    {
-      return "X_UngrabKeyboard";
-    }
-    case X_GrabKey:
-    {
-      return "X_GrabKey";
-    }
-    case X_UngrabKey:
-    {
-      return "X_UngrabKey";
-    }
-    case X_AllowEvents:
-    {
-      return "X_AllowEvents";
-    }
-    case X_GrabServer:
-    {
-      return "X_GrabServer";
-    }
-    case X_UngrabServer:
-    {
-      return "X_UngrabServer";
-    }
-    case X_QueryPointer:
-    {
-      return "X_QueryPointer";
-    }
-    case X_GetMotionEvents:
-    {
-      return "X_GetMotionEvents";
-    }
-    case X_TranslateCoords:
-    {
-      return "X_TranslateCoords";
-    }
-    case X_WarpPointer:
-    {
-      return "X_WarpPointer";
-    }
-    case X_SetInputFocus:
-    {
-      return "X_SetInputFocus";
-    }
-    case X_GetInputFocus:
-    {
-      return "X_GetInputFocus";
-    }
-    case X_QueryKeymap:
-    {
-      return "X_QueryKeymap";
-    }
-    case X_OpenFont:
-    {
-      return "X_OpenFont";
-    }
-    case X_CloseFont:
-    {
-      return "X_CloseFont";
-    }
-    case X_QueryFont:
-    {
-      return "X_QueryFont";
-    }
-    case X_QueryTextExtents:
-    {
-      return "X_QueryTextExtents";
-    }
-    case X_ListFonts:
-    {
-      return "X_ListFonts";
-    }
-    case X_ListFontsWithInfo:
-    {
-      return "X_ListFontsWithInfo";
-    }
-    case X_SetFontPath:
-    {
-      return "X_SetFontPath";
-    }
-    case X_GetFontPath:
-    {
-      return "X_GetFontPath";
-    }
-    case X_CreatePixmap:
-    {
-      return "X_CreatePixmap";
-    }
-    case X_FreePixmap:
-    {
-      return "X_FreePixmap";
-    }
-    case X_CreateGC:
-    {
-      return "X_CreateGC";
-    }
-    case X_ChangeGC:
-    {
-      return "X_ChangeGC";
-    }
-    case X_CopyGC:
-    {
-      return "X_CopyGC";
-    }
-    case X_SetDashes:
-    {
-      return "X_SetDashes";
-    }
-    case X_SetClipRectangles:
-    {
-      return "X_SetClipRectangles";
-    }
-    case X_FreeGC:
-    {
-      return "X_FreeGC";
-    }
-    case X_ClearArea:
-    {
-      return "X_ClearArea";
-    }
-    case X_CopyArea:
-    {
-      return "X_CopyArea";
-    }
-    case X_CopyPlane:
-    {
-      return "X_CopyPlane";
-    }
-    case X_PolyPoint:
-    {
-      return "X_PolyPoint";
-    }
-    case X_PolyLine:
-    {
-      return "X_PolyLine";
-    }
-    case X_PolySegment:
-    {
-      return "X_PolySegment";
-    }
-    case X_PolyRectangle:
-    {
-      return "X_PolyRectangle";
-    }
-    case X_PolyArc:
-    {
-      return "X_PolyArc";
-    }
-    case X_FillPoly:
-    {
-      return "X_FillPoly";
-    }
-    case X_PolyFillRectangle:
-    {
-      return "X_PolyFillRectangle";
-    }
-    case X_PolyFillArc:
-    {
-      return "X_PolyFillArc";
-    }
-    case X_PutImage:
-    {
-      return "X_PutImage";
-    }
-    case X_GetImage:
-    {
-      return "X_GetImage";
-    }
-    case X_PolyText8:
-    {
-      return "X_PolyText8";
-    }
-    case X_PolyText16:
-    {
-      return "X_PolyText16";
-    }
-    case X_ImageText8:
-    {
-      return "X_ImageText8";
-    }
-    case X_ImageText16:
-    {
-      return "X_ImageText16";
-    }
-    case X_CreateColormap:
-    {
-      return "X_CreateColormap";
-    }
-    case X_FreeColormap:
-    {
-      return "X_FreeColormap";
-    }
-    case X_CopyColormapAndFree:
-    {
-      return "X_CopyColormapAndFree";
-    }
-    case X_InstallColormap:
-    {
-      return "X_InstallColormap";
-    }
-    case X_UninstallColormap:
-    {
-      return "X_UninstallColormap";
-    }
-    case X_ListInstalledColormaps:
-    {
-      return "X_ListInstalledColormaps";
-    }
-    case X_AllocColor:
-    {
-      return "X_AllocColor";
-    }
-    case X_AllocNamedColor:
-    {
-      return "X_AllocNamedColor";
-    }
-    case X_AllocColorCells:
-    {
-      return "X_AllocColorCells";
-    }
-    case X_AllocColorPlanes:
-    {
-      return "X_AllocColorPlanes";
-    }
-    case X_FreeColors:
-    {
-      return "X_FreeColors";
-    }
-    case X_StoreColors:
-    {
-      return "X_StoreColors";
-    }
-    case X_StoreNamedColor:
-    {
-      return "X_StoreNamedColor";
-    }
-    case X_QueryColors:
-    {
-      return "X_QueryColors";
-    }
-    case X_LookupColor:
-    {
-      return "X_LookupColor";
-    }
-    case X_CreateCursor:
-    {
-      return "X_CreateCursor";
-    }
-    case X_CreateGlyphCursor:
-    {
-      return "X_CreateGlyphCursor";
-    }
-    case X_FreeCursor:
-    {
-      return "X_FreeCursor";
-    }
-    case X_RecolorCursor:
-    {
-      return "X_RecolorCursor";
-    }
-    case X_QueryBestSize:
-    {
-      return "X_QueryBestSize";
-    }
-    case X_QueryExtension:
-    {
-      return "X_QueryExtension";
-    }
-    case X_ListExtensions:
-    {
-      return "X_ListExtensions";
-    }
-    case X_ChangeKeyboardMapping:
-    {
-      return "X_ChangeKeyboardMapping";
-    }
-    case X_GetKeyboardMapping:
-    {
-      return "X_GetKeyboardMapping";
-    }
-    case X_ChangeKeyboardControl:
-    {
-      return "X_ChangeKeyboardControl";
-    }
-    case X_GetKeyboardControl:
-    {
-      return "X_GetKeyboardControl";
-    }
-    case X_Bell:
-    {
-      return "X_Bell";
-    }
-    case X_ChangePointerControl:
-    {
-      return "X_ChangePointerControl";
-    }
-    case X_GetPointerControl:
-    {
-      return "X_GetPointerControl";
-    }
-    case X_SetScreenSaver:
-    {
-      return "X_SetScreenSaver";
-    }
-    case X_GetScreenSaver:
-    {
-      return "X_GetScreenSaver";
-    }
-    case X_ChangeHosts:
-    {
-      return "X_ChangeHosts";
-    }
-    case X_ListHosts:
-    {
-      return "X_ListHosts";
-    }
-    case X_SetAccessControl:
-    {
-      return "X_SetAccessControl";
-    }
-    case X_SetCloseDownMode:
-    {
-      return "X_SetCloseDownMode";
-    }
-    case X_KillClient:
-    {
-      return "X_KillClient";
-    }
-    case X_RotateProperties:
-    {
-      return "X_RotateProperties";
-    }
-    case X_ForceScreenSaver:
-    {
-      return "X_ForceScreenSaver";
-    }
-    case X_SetPointerMapping:
-    {
-      return "X_SetPointerMapping";
-    }
-    case X_GetPointerMapping:
-    {
-      return "X_GetPointerMapping";
-    }
-    case X_SetModifierMapping:
-    {
-      return "X_SetModifierMapping";
-    }
-    case X_GetModifierMapping:
-    {
-      return "X_GetModifierMapping";
-    }
-    case X_NoOperation:
-    {
-      return "X_NoOperation";
-    }
-    case X_NXInternalGenericData:
-    {
-      return "X_NXInternalGenericData";
-    }
-    //
-    // case X_NXInternalGenericReply:
-    // {
-    //   return "X_NXInternalGenericReply";
-    // }
-    //
-    case X_NXInternalGenericRequest:
-    {
-      return "X_NXInternalGenericRequest";
-    }
-    case X_NXInternalShapeExtension:
-    {
-      return "X_NXInternalShapeExtension";
-    }
-    case X_NXGetControlParameters:
-    {
-      return "X_NXGetControlParameters";
-    }
-    case X_NXGetCleanupParameters:
-    {
-      return "X_NXGetCleanupParameters";
-    }
-    case X_NXGetImageParameters:
-    {
-      return "X_NXGetImageParameters";
-    }
-    case X_NXGetUnpackParameters:
-    {
-      return "X_NXGetUnpackParameters";
-    }
-    case X_NXGetShmemParameters:
-    {
-      return "X_NXGetShmemParameters";
-    }
-    case X_NXGetFontParameters:
-    {
-      return "X_NXGetFontParameters";
-    }
-    case X_NXSetExposeParameters:
-    {
-      return "X_NXSetExposeParameters";
-    }
-    case X_NXSetCacheParameters:
-    {
-      return "X_NXSetCacheParameters";
-    }
-    case X_NXStartSplit:
-    {
-      return "X_NXStartSplit";
-    }
-    case X_NXEndSplit:
-    {
-      return "X_NXEndSplit";
-    }
-    case X_NXSplitData:
-    {
-      return "X_NXSplitData";
-    }
-    case X_NXSplitEvent:
-    {
-      return "X_NXSplitEvent";
-    }
-    case X_NXCommitSplit:
-    {
-      return "X_NXCommitSplit";
-    }
-    case X_NXFinishSplit:
-    {
-      return "X_NXFinishSplit";
-    }
-    case X_NXAbortSplit:
-    {
-      return "X_NXAbortSplit";
-    }
-    case X_NXFreeSplit:
-    {
-      return "X_NXFreeSplit";
-    }
-    case X_NXSetUnpackGeometry:
-    {
-      return "X_NXSetUnpackGeometry";
-    }
-    case X_NXSetUnpackColormap:
-    {
-      return "X_NXSetUnpackColormap";
-    }
-    case X_NXSetUnpackAlpha:
-    {
-      return "X_NXSetUnpackAlpha";
-    }
-    case X_NXPutPackedImage:
-    {
-      return "X_NXPutPackedImage";
-    }
-    case X_NXFreeUnpack:
-    {
-      return "X_NXFreeUnpack";
-    }
-    default:
-    {
-      if (opcode > 127)
-      {
-        return "Extension";
-      }
-      else
-      {
-        return "?";
-      }
-    }
-  }
-}
-
-#else /* #ifdef OPCODES */
-
-const char *DumpOpcode(const int &opcode)
-{
-  return "?";
-}
-
-#endif /* #ifdef OPCODES */
-
-void DumpData(const unsigned char *buffer, unsigned int size)
-{
-  if (buffer != NULL)
-  {
-    unsigned int i = 0;
-
-    while (i < size)
-    {
-      *logofs << "[" << i << "]\t";
-
-      for (unsigned int ii = 0; i < size && ii < 8; i++, ii++)
-      {
-        *logofs << (unsigned int) (buffer[i]) << "\t";
-      }
-
-      *logofs << "\n" << logofs_flush;
-    }
-  }
-}
-
-void DumpChecksum(const unsigned char *buffer, unsigned int size)
-{
-  if (buffer != NULL)
-  {
-    md5_byte_t md5_digest[MD5_LENGTH];
-
-    md5_state_t md5_state;
-
-    md5_init(&md5_state);
-
-    md5_append(&md5_state, buffer, size);
-
-    md5_finish(&md5_state, md5_digest);
-
-    char md5_string[MD5_LENGTH * 2 + 1];
-
-    for (unsigned int i = 0; i < MD5_LENGTH; i++)
-    {
-      sprintf(md5_string + (i * 2), "%02X", md5_digest[i]);
-    }
-
-    *logofs << "[" << md5_string << "]" << logofs_flush;
-  }
-}
-
-void DumpBlockChecksums(const unsigned char *buffer,
-                            unsigned int size, unsigned int block)
-{
-  for (unsigned int i = 0; i < (size / block); i++)
-  {
-    *logofs << "[" << i * block << "]";
-
-    DumpChecksum(buffer + (i * block), block);
-
-    *logofs << "\n";
-  }
-
-  if (size % block > 0)
-  {
-    *logofs << "[" << size / block * block << "]";
-
-    DumpChecksum(buffer + (size / block * block), size % block);
-
-    *logofs << "\n";
-  }
-}
-
-void DumpHexData(const unsigned char *buffer, unsigned int size)
-{
-  char message [65536];
-  char ascii   [17];
-
-  unsigned int index = 0;
-  unsigned int linescan = 0;
-  unsigned int index_ascii = 0;
-
-  sprintf  (message,"\n####  Start Dump Buffer of [%.5d] Bytes ####\n\n",size);
-
-  *logofs << message << logofs_flush;
-
-  // 
-  // "Index    0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f  Ascii           "
-  // "-----   -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --  ----------------"
-  // "00000 : 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................"
-  // 
-
-  sprintf (message,"Index   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f  Ascii           \n");
-  *logofs << message << logofs_flush;
-  sprintf (message,"-----  -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --  ----------------\n");
-  *logofs << message << logofs_flush;
-
-  index = 0;
-
-  while (index < size)
-  {
-    memset (ascii, ' ', sizeof(ascii));
-
-    ascii[16] = '\0';
-
-    sprintf  (message,"%.5d  ", index);
-
-    for (index_ascii = 0, linescan = index;
-             ((index < (linescan + 16)) && (index < size)); 
-                  index++, index_ascii++)
-    {
-      if (isprint(buffer [index]))
-      {
-        ascii[index_ascii] = buffer [index];
-      }
-      else
-      {
-        ascii[index_ascii] = '.';
-      }
-
-      sprintf  (&message [strlen (message)],"%.2x ", (unsigned char) buffer [index]);
-    }
-
-    for (linescan = index_ascii; linescan < 16; linescan++)
-    {
-      strcat (&message [strlen (message)], "   ");
-    }
-
-    sprintf  (&message [strlen (message)]," %s\n", ascii);
-
-    *logofs << message << logofs_flush;
-  } 
-
-  sprintf  (message,"\n####  End Dump Buffer ####\n\n");
-
-  *logofs << message << logofs_flush;
-}
diff --git a/nxcomp/Misc.h b/nxcomp/Misc.h
deleted file mode 100644
index 997630137..000000000
--- a/nxcomp/Misc.h
+++ /dev/null
@@ -1,279 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef Misc_H
-#define Misc_H
-
-#include <iostream>
-#include <fstream>
-
-#include <cerrno>
-#include <cstring>
-
-#ifdef __sun
-
-#include <strings.h>
-
-#endif
-
-using namespace std;
-
-//
-// This is MD5 length.
-//
-
-#define MD5_LENGTH          16
-
-//
-// Error handling macros.
-//
-
-#define ESET(e)  (errno = (e))
-#define EGET()   (errno)
-#define ESTR()   strerror(errno)
-
-//
-// TCP port offset applied to NX port specification.
-//
-
-extern const int DEFAULT_NX_PROXY_PORT_OFFSET;
-
-//
-// Default TCP port used by client proxy to listen
-// to X clients and by server proxy to connect to
-// remote.
-//
-
-extern const int DEFAULT_NX_PROXY_PORT;
-
-//
-// Default X display number that client
-// proxy imitates.
-//
-
-extern const int DEFAULT_NX_X_PORT;
-
-//
-// Establish the port offsets for the additional
-// services.
-//
-
-extern const int DEFAULT_NX_CUPS_PORT_OFFSET;
-extern const int DEFAULT_NX_SMB_PORT_OFFSET;
-extern const int DEFAULT_NX_MEDIA_PORT_OFFSET;
-extern const int DEFAULT_NX_AUX_PORT_OFFSET;
-extern const int DEFAULT_NX_HTTP_PORT_OFFSET;
-extern const int DEFAULT_NX_FONT_PORT_OFFSET;
-
-//
-// Slave channels can be originated by both sides
-// so they need to have different port offsets
-// in the case the user runs both proxies on the
-// same host.
-//
-
-extern const int DEFAULT_NX_SLAVE_PORT_CLIENT_OFFSET;
-extern const int DEFAULT_NX_SLAVE_PORT_SERVER_OFFSET;
-
-//
-// NX proxy binds to all network interfaces by default
-// With the -loopback parameter, you can switch
-// over to binding to the loopback device only.
-//
-
-extern const int DEFAULT_LOOPBACK_BIND;
-
-//
-// Return strings containing various info.
-//
-
-const char *GetUsageInfo();
-const char *GetCopyrightInfo();
-const char *GetOtherCopyrightInfo();
-
-//
-// Define this if you want immediate flush of
-// the log output.
-//
-
-#define FLUSH_LOGOFS
-
-//
-// Global objects providing shared functions.
-//
-
-class Auth;
-class Control;
-class Statistics;
-
-extern Auth       *auth;
-extern Control    *control;
-extern Statistics *statistics;
-
-//
-// Log file.
-//
-
-extern ostream *logofs;
-
-//
-// Cleanup code.
-//
-
-void HandleAbort() __attribute__((noreturn));
-void HandleShutdown() __attribute__((noreturn));
-
-extern "C"
-{
-  void HandleCleanup(int code = 0) __attribute__((noreturn));
-  void HandleCleanupForReconnect();
-}
-
-//
-// Manage signal handlers.
-//
-
-void DisableSignals();
-void EnableSignals();
-
-//
-// Manage timers.
-//
-
-void SetTimer(int value);
-void ResetTimer();
-
-//
-// Show a dialog asking the user if he/she
-// wants to close the current session. Look
-// in the alerts file for the known critical
-// events.
-//
-
-void HandleAlert(int code, int local);
-
-//
-// Run the callback registered by the proxy
-// or the agent.
-//
-
-void KeeperCallback();
-void FlushCallback(int length);
-
-//
-// Return the string literal corresponding
-// the value.
-//
-
-const char *DumpSignal(int signal);
-const char *DumpPolicy(int type);
-const char *DumpControl(int code);
-const char *DumpSession(int code);
-const char *DumpAction(int type);
-const char *DumpState(int type);
-const char *DumpToken(int type);
-
-//
-// Print out content of buffer to log file.
-// You need to define DUMP or OPCODES in
-// the source to have these compiled.
-//
-
-const char *DumpOpcode(const int &opcode);
-const char *DumpChecksum(const void *checksum);
-
-void DumpData(const unsigned char *data, unsigned int length);
-void DumpHexData(const unsigned char *data, unsigned int length);
-void DumpChecksum(const unsigned char *data, unsigned int length);
-void DumpBlockChecksums(const unsigned char *data, unsigned int length,
-                            unsigned int block);
-
-//
-// Defines logofs_flush as an empty string to
-// avoid calling the corresponding ostream's
-// flush() function.
-//
-
-#ifdef FLUSH_LOGOFS
-
-#define logofs_flush "" ; logofs -> flush()
-
-#else
-
-#define logofs_flush ""
-
-#endif
-
-//
-// Is the host where local proxy is running
-// big-endian?
-//
-
-extern int _hostBigEndian;
-extern int _storeBigEndian;
-
-inline void setHostBigEndian(int flag)
-{
-  _hostBigEndian = flag;
-}
-
-inline int hostBigEndian()
-{
-  return _hostBigEndian;
-}
-
-inline int storeBigEndian()
-{
-  return _storeBigEndian;
-}
-
-extern const unsigned int IntMask[33];
-
-unsigned int GetUINT(unsigned const char *buffer, int bigEndian);
-unsigned int GetULONG(unsigned const char *buffer, int bigEndian);
-void PutUINT(unsigned int value, unsigned char *buffer, int bigEndian);
-void PutULONG(unsigned int value, unsigned char *buffer, int bigEndian);
-
-inline void CleanData(unsigned char *buffer, int size)
-{
-  unsigned char *end = buffer + size;
-
-  while (buffer < end)
-  {
-    *buffer++ = 0x00;
-  }
-}
-  
-int CheckData(istream *fs);
-int CheckData(ostream *fs);
-int PutData(ostream *fs, const unsigned char *buffer, int size);
-int GetData(istream *fs, unsigned char *buffer, int size);
-int FlushData(ostream *fs);
-
-unsigned int RoundUp2(unsigned int x);
-unsigned int RoundUp4(unsigned int x);
-unsigned int RoundUp8(unsigned int x);
-
-#endif /* Misc_H */
diff --git a/nxcomp/NX.h b/nxcomp/NX.h
deleted file mode 100644
index 7ec79b4b1..000000000
--- a/nxcomp/NX.h
+++ /dev/null
@@ -1,471 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef NX_H
-#define NX_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <unistd.h>
-
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/select.h>
-#include <sys/uio.h>
-
-#define NX_FD_ANY                      -1
-
-#define NX_MODE_ANY                    -1
-#define NX_MODE_CLIENT                  1
-#define NX_MODE_SERVER                  2
-
-#define NX_DISPLAY_ANY                  NULL
-
-#define NX_SIGNAL_ANY                  -1
-#define NX_SIGNAL_ENABLE                1
-#define NX_SIGNAL_DISABLE               2
-#define NX_SIGNAL_RAISE                 3
-#define NX_SIGNAL_FORWARD               4
-
-#define NX_POLICY_IMMEDIATE             1
-#define NX_POLICY_DEFERRED              2
-
-#define NX_ALERT_REMOTE                 0
-#define NX_ALERT_LOCAL                  1
-
-#define NX_HANDLER_FLUSH                0
-#define NX_HANDLER_STATISTICS           1
-
-#define NX_STATISTICS_PARTIAL           0
-#define NX_STATISTICS_TOTAL             1
-
-#define NX_CHANNEL_X11                  0
-#define NX_CHANNEL_CUPS                 1
-#define NX_CHANNEL_SMB                  2
-#define NX_CHANNEL_MEDIA                3
-#define NX_CHANNEL_HTTP                 4
-#define NX_CHANNEL_FONT                 5
-#define NX_CHANNEL_SLAVE                6
-
-#define NX_FILE_SESSION                 0
-#define NX_FILE_ERRORS                  1
-#define NX_FILE_OPTIONS                 2
-#define NX_FILE_STATS                   3
-
-/*
- * The following are the new interfaces to the NX transport. The
- * NX proxy software is now intended to be run as a library of a
- * higher level communication manager (nxssh, nxhttp, nxrtp, etc,
- * not only nxproxy). This is a work-in-progress, so expect these
- * interfaces to change in future. At the present moment, as an
- * example, there is no provision for creating and managing mul-
- * tiple proxy connections.
- */
-
-/*
- * Attach a NX transport to the provided descriptor. This should be
- * done after having created a pair of connected sockets.
- */
-
-extern int NXTransCreate(int fd, int mode, const char *options);
-
-/*
- * Tell the proxy to use the second descriptor as its own end of
- * the internal connection to the NX agent. The NX agent will use
- * the first descriptor. Setting an agent connection will have the
- * effect of disabling further X client connections and, if it is
- * possible, will trigger the use of the memory-to-memory transport.
- */
-
-extern int NXTransAgent(int fd[2]);
-
-/*
- * Prepare the file sets and the timeout for a later execution of
- * the select(). The masks and the timeout must persist across all
- * the calls, so if you don't need any of the values, it is requi-
- * red that you create empty masks and a default timeout. To save
- * a check at each run, all the functions below assume that valid
- * pointers are passed.
- */
-
-extern int NXTransPrepare(int *maxfds, fd_set *readfds,
-                              fd_set *writefds, struct timeval *timeout);
-
-/*
- * Call select() to find out the descriptors in the sets having
- * pending data.
- */
-
-extern int NXTransSelect(int *result, int *error, int *maxfds, fd_set *readfds,
-                             fd_set *writefds, struct timeval *timeout);
-
-/*
- * Perform the required I/O on all the NX descriptors having pen-
- * ding data. This can include reading and writing to the NX chan-
- * nels, encoding and decoding the proxy data or managing any of
- * the other NX resources.
- */
-
-extern int NXTransExecute(int *result, int *error, int *maxfds, fd_set *readfds,
-                              fd_set *writefds, struct timeval *timeout);
-
-/*
- * Run an empty loop, giving to the NX transport a chance to check
- * its descriptors.
- */
-
-extern int NXTransContinue(struct timeval *timeout);
-
-/*
- * Perform I/O on the given descriptors. If memory-to-memory trans-
- * port has been activated and the descriptor is recognized as a
- * valid agent connection, then the functions will read and write
- * the data directly to the proxy buffer, otherwise the correspond-
- * ing network operation will be performed.
- */
-
-extern int NXTransRead(int fd, char *data, int size);
-extern int NXTransWrite(int fd, char *data, int size);
-extern int NXTransReadable(int fd, int *readable);
-
-extern int NXTransReadVector(int fd, struct iovec *iovdata, int iovsize);
-extern int NXTransWriteVector(int fd, struct iovec *iovdata, int iovsize);
-
-extern int NXTransClose(int fd);
-
-/*
- * Return true if the NX transport is running. The fd parameter can
- * be either the local descriptor attached to the NX transport or
- * NX_FD_ANY.
- */
-
-extern int NXTransRunning(int fd);
-
-/*
- * Close down the NX transport and free all the allocated resources.
- * The fd parameter can be either the local descriptor or NX_FD_ANY.
- * This must be explicitly called by the agent before the proxy can
- * start the tear down procedure.
- */
-
-extern int NXTransDestroy(int fd);
-
-/*
- * Tell to the proxy how to handle the standard POSIX signals. For
- * example, given the SIGINT signal, the caller can specify any of
- * the following actions:
- *
- * NX_SIGNAL_ENABLE:  A signal handler will have to be installed by
- *                    the library, so that it can be intercepted by
- *                    the proxy.
- *
- * NX_SIGNAL_DISABLE: The signal will be handled by the caller and,
- *                    eventually, forwarded to the proxy by calling
- *                    NXTransSignal() explicitly.
- *
- * NX_SIGNAL_RAISE:   The signal must be handled now, as if it had
- *                    been delivered by the operating system. This
- *                    function can be called by the agent with the
- *                    purpose of propagating a signal to the proxy.
- *
- * NX_SIGNAL_FORWARD: A signal handler will have to be installed by
- *                    the library but the library will have to call
- *                    the original signal handler when the signal
- *                    is received.
- *
- * As a rule of thumb, agents should let the proxy handle SIGUSR1
- * and SIGUSR2, used for producing the NX protocol statistics, and
- * SIGHUP, used for disconnecting the NX transport.
- *
- * The following signals are blocked by default upon creation of the
- * NX transport:
- *
- * SIGCHLD    These signals should be always put under the control
- * SIGUSR1    of the proxy. If agents are intercepting them, agents
- * SIGUSR2    should later call NXTransSignal(..., NX_SIGNAL_RAISE)
- * SIGHUP     to forward the signal to the proxy. As an alternative
- *            they can specify a NX_SIGNAL_FORWARD action, so they,
- *            in turn, can be notified about the signal. This can
- *            be especially useful for SIGCHLD.
- *
- * SIGINT     These signals should be intercepted by agents. Agents
- * SIGTERM    should ensure that NXTransDestroy() is called before
- *            exiting, to give the proxy a chance to shut down the
- *            NX transport.
- *
- * SIGPIPE    This signal is blocked by the proxy, but not used to
- *            implement any functionality. It can be handled by the
- *            NX agent without affecting the proxy.
- *
- * SIGALRM    This is now used by the proxy and agents should not
- *            redefine it. Agents can use the signal to implement
- *            their own timers but should not interleave calls to
- *            the NX transport and should restore the old handler
- *            when the timeout is raised.
- *
- * SIGVTALRM  These signals are not used but may be used in future
- * SIGWINCH   versions of the library.
- * SIGIO
- * SIGTSTP
- * SIGTTIN
- * SIGTTOU
- *
- * By calling NXTransSignal(..., NX_SIGNAL_DISABLE) nxcomp will res-
- * tore the signal handler that was saved at the time the proxy hand-
- * ler was installed. This means that you should call the function
- * just after the XOpenDisplay() or any other function used to init-
- * ialize the NX transport.
- */
- 
-extern int NXTransSignal(int signal, int action);
-
-/*
- * Return a value between 0 and 9 indicating the congestion level
- * based on the tokens still available. A value of 9 means that
- * the link is congested and no further data can be sent.
- */
-
-extern int NXTransCongestion(int fd);
-
-/*
- * Let the application to be notified by the proxy when an event oc-
- * curs. The parameter, as set at the time the handler is installed,
- * is passed each time to the callback function. The parameter is
- * presumably the display pointer, given that at the present moment
- * the NX transport doesn't have access to the display structure and
- * so wouldn't be able to determine the display to pass to the call-
- * back function.
- *
- * NX_HANDLER_FLUSH:      The handler function is called when some
- *                        more data has been written to the proxy
- *                        link.
- *
- * The data is the number of bytes written.
- *
- * NX_HANDLER_STATISTICS: This handler is called to let the agent
- *                        include arbitrary data in the transport
- *                        statistics. The parameter, in this case,
- *                        is a pointer to a pointer to a null term-
- *                        inated string. The pointer is set at the
- *                        time the handler is registered. The point-
- *                        ed string will have to be filled by the
- *                        agent with its statistics data.
- *
- * The data can be NX_STATISTICS_PARTIAL or NX_STATISTICS_TOTAL. The
- * agent can refer to the value by using the  NXStatisticsPartial and
- * NXStatisticsTotal constants defined in NXvars.h.
- *
- * Note that these interfaces are used by Xlib and nxcompext. Agents
- * should never call these interfaces directly, but use the nxcompext
- * wrapper.
- */
-
-extern int NXTransHandler(int fd, int type, void (*handler)(void *parameter,
-                              int reason), void *parameter);
-
-/*
- * Set the policy to be used by the NX transport to write data to the
- * proxy link:
- *
- * NX_POLICY_IMMEDIATE: When set to immediate, the proxy will try to
- *                      write the data just after having encoded it.
- *
- * NX_POLICY_DEFERRED:  When policy is set to deferred, data will be
- *                      accumulated in a buffer and written to the
- *                      remote proxy when NXTransFlush() is called by
- *                      the agent.
- */
-
-extern int NXTransPolicy(int fd, int type);
-
-/*
- * Query the number of bytes that have been accumulated for a deferred
- * flush.
- */
-
-extern int NXTransFlushable(int fd);
-
-/*
- * Tell to the NX transport to write all the accumulated data to the
- * remote proxy.
- */
-
-extern int NXTransFlush(int fd);
-
-/*
- * Create a new channel of the given type. It returns 1 on success,
- * 0 if the NX transport is not running, or -1 in the case of error.
- * On success, the descriptor provided by the caller can be later
- * used for the subsequent I/O. The type parameter not only tells to
- * the proxy the remote port where the channel has to be connected,
- * but also gives a hint about the type of data that will be carried
- * by the channel, so that the proxy can try to optimize the traffic
- * on the proxy link.
- *
- * NX_CHANNEL_X:     The channel will carry X traffic and it
- *                   will be connected to the remote X display.
- *
- * NX_CHANNEL_CUPS:  The channel will carry CUPS/IPP protocol.
- *
- * NX_CHANNEL_SMB:   The channel will carry SMB/CIFS protocol.
- *
- * NX_CHANNEL_MEDIA: The channel will transport audio or other
- *                   multimedia data.
- *
- * NX_CHANNEL_HTTP:  The channel will carry HTTP protocol.
- *
- * NX_CHANNEL_FONT:  The channel will forward a X font server
- *                   connection.
- *
- * Only a proxy running at the NX server/X client side will be able
- * to create a X, CUPS, SMB, MEDIA and HTTP channel. A proxy running
- * at the NX client/X server side can create font server connections.
- * The channel creation will also fail if the remote end has not been
- * set up to forward the connection.
- *
- * To create a new channel the agent will have to set up a socketpair
- * and pass to the proxy one of the socket descriptors.
- *
- * Example:
- *
- * #include <sys/types.h>
- * #include <sys/socket.h>
- *
- * int fds[2];
- *
- * if (socketpair(PF_LOCAL, SOCK_STREAM, 0, fds) < 0)
- * {
- *   ...
- * }
- * else
- * {
- *   //
- *   // Use fds[0] locally and let the
- *   // proxy use fds[1].
- *   //
- *
- *   if (NXTransChannel(NX_FD_ANY, fds[1], NX_CHANNEL_X) <= 0)
- *   {
- *     ...
- *   }
- *
- *   //
- *   // The agent can now use fds[0] in
- *   // read(), write() and select()
- *   // system calls.
- *   //
- *
- *   ...
- * }
- *
- * Note that all the I/O on the descriptor should be non-blocking, to
- * give a chance to the NX transport to run in the background and handle
- * the data that will be fed to the agent's side of the socketpair. This
- * will happen automatically, as long as the agent uses the XSelect()
- * version of the select() function (as it is normal whenever performing
- * Xlib I/O). In all the other cases, like presumably in the agent's main
- * loop, the agent will have to loop through NXTransPrepare(), NXTrans-
- * Select() and NXTransExecute() functions explicitly, adding to the sets
- * the descriptors that are awaited by the agent. Please check the imple-
- * mentation of _XSelect() in nx-X11/lib/X11/XlibInt.c for an example.
- */
-
-extern int NXTransChannel(int fd, int channelfd, int type);
-
-/*
- * Return the name of the files used by the proxy for the current session.
- *
- * The type parameter can be:
- *
- * NX_FILE_SESSION:  Usually the file 'session' in the user's session
- *                   directory.
- *
- * NX_FILE_ERRORS:   The file used for the diagnostic output. Usually
- *                   the file 'errors' in the session directory.
- *
- * NX_FILE_OPTIONS:  The file containing the NX options, if any.
- *
- * NX_FILE_STATS:    The file used for the statistics output.
- *
- * The returned string is allocated in static memory. The caller should
- * copy the string upon returning from the function, without freeing the
- * pointer.
- */
-
-extern const char *NXTransFile(int type);
-
-/*
- * Return the time in milliseconds elapsed since the last call to this
- * same function.
- */
-
-extern long NXTransTime(void);
-
-/*
- * Other interfaces to the internal transport functions.
- */
-
-extern int NXTransProxy(int fd, int mode, const char *display);
-
-extern int NXTransClient(const char *display);
-
-extern int NXTransDialog(const char *caption, const char *message,
-                           const char *window, const char *type, int local,
-                               const char *display);
-
-extern int NXTransAlert(int code, int local);
-
-extern int NXTransWatchdog(int timeout);
-
-extern int NXTransKeeper(int caches, int images, const char *root);
-
-extern void NXTransExit(int code) __attribute__((noreturn));
-
-extern int NXTransParseCommandLine(int argc, const char **argv);
-extern int NXTransParseEnvironment(const char *env, int force);
-
-extern void NXTransCleanup(void) __attribute__((noreturn));
-
-/*
- * Cleans up the global and local state
- * (the same way as NXTransCleanup does)
- * but does not exit the process
- * Needed for IOS platform
- */
-extern void NXTransCleanupForReconnect(void);
-
-extern const char* NXVersion(void);
-extern int NXMajorVersion(void);
-extern int NXMinorVersion(void);
-extern int NXPatchVersion(void);
-extern int NXMaintenancePatchVersion(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* NX_H */
diff --git a/nxcomp/NXalert.h b/nxcomp/NXalert.h
deleted file mode 100644
index dca2f44ca..000000000
--- a/nxcomp/NXalert.h
+++ /dev/null
@@ -1,276 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef NXalert_H
-#define NXalert_H
-
-#define ALERT_CAPTION_PREFIX                                 "NX - "
-
-#define INTERNAL_ERROR_ALERT                                 1
-#define INTERNAL_ERROR_ALERT_TYPE                            "error"
-#define INTERNAL_ERROR_ALERT_STRING                          \
-"\
-An unrecoverable internal error was detected.\n\
-Press OK to terminate the current session.\n\
-"
-
-#define CLOSE_DEAD_X_CONNECTION_CLIENT_ALERT                 2
-#define CLOSE_DEAD_X_CONNECTION_CLIENT_ALERT_TYPE            "yesno"
-#define CLOSE_DEAD_X_CONNECTION_CLIENT_ALERT_STRING          \
-"\
-One of the applications currently in use is not responding.\n\
-Do you want to terminate the current session?\n\
-"
-
-#define CLOSE_DEAD_X_CONNECTION_SERVER_ALERT                 3
-#define CLOSE_DEAD_X_CONNECTION_SERVER_ALERT_TYPE            "yesno"
-#define CLOSE_DEAD_X_CONNECTION_SERVER_ALERT_STRING          \
-"\
-One of the applications did not behave correctly and caused\n\
-the X server to stop responding in a timely fashion. Do you\n\
-want to terminate the current session?\n\
-"
-
-#define CLOSE_DEAD_PROXY_CONNECTION_CLIENT_ALERT             4
-#define CLOSE_DEAD_PROXY_CONNECTION_CLIENT_ALERT_TYPE        NULL
-#define CLOSE_DEAD_PROXY_CONNECTION_CLIENT_ALERT_STRING      NULL
-
-#define CLOSE_DEAD_PROXY_CONNECTION_SERVER_ALERT             5
-#define CLOSE_DEAD_PROXY_CONNECTION_SERVER_ALERT_TYPE        "yesno"
-#define CLOSE_DEAD_PROXY_CONNECTION_SERVER_ALERT_STRING      \
-"\
-No response received from the remote server.\n\
-Do you want to terminate the current session?\n\
-"
-
-#define RESTART_DEAD_PROXY_CONNECTION_CLIENT_ALERT           6
-#define RESTART_DEAD_PROXY_CONNECTION_CLIENT_ALERT_TYPE      NULL
-#define RESTART_DEAD_PROXY_CONNECTION_CLIENT_ALERT_STRING    NULL
-
-#define RESTART_DEAD_PROXY_CONNECTION_SERVER_ALERT           7
-#define RESTART_DEAD_PROXY_CONNECTION_SERVER_ALERT_TYPE      "yesno"
-#define RESTART_DEAD_PROXY_CONNECTION_SERVER_ALERT_STRING    \
-"\
-Connection with remote server was shut down. NX will try\n\
-to establish a new server connection. Session could have\n\
-been left in a unusable state. Do you want to terminate\n\
-the session?\n\
-"
-
-#define CLOSE_UNRESPONSIVE_X_SERVER_ALERT                    8
-#define CLOSE_UNRESPONSIVE_X_SERVER_ALERT_TYPE               "panic"
-#define CLOSE_UNRESPONSIVE_X_SERVER_ALERT_STRING             \
-"\
-You pressed the key sequence CTRL+ALT+SHIFT+ESC.\n\
-This is probably because your X server has become\n\
-unresponsive. Session will be terminated in 30\n\
-seconds unless you abort the procedure by pressing\n\
-the Cancel button.\n\
-"
-
-#define WRONG_PROXY_VERSION_ALERT                            9
-#define WRONG_PROXY_VERSION_ALERT_TYPE                       "ok"
-#define WRONG_PROXY_VERSION_ALERT_STRING                     \
-"\
-Local NX libraries version " VERSION " do not match the NX\n\
-version of the remote server. Please check the error\n\
-log on the server to find out which client version you\n\
-need to install to be able to access this server.\n\
-"
-
-#define FAILED_PROXY_CONNECTION_CLIENT_ALERT                 10
-#define FAILED_PROXY_CONNECTION_CLIENT_ALERT_TYPE            NULL
-#define FAILED_PROXY_CONNECTION_CLIENT_ALERT_STRING          NULL
-
-#define FAILED_PROXY_CONNECTION_SERVER_ALERT                 11
-#define FAILED_PROXY_CONNECTION_SERVER_ALERT_TYPE            "yesno"
-#define FAILED_PROXY_CONNECTION_SERVER_ALERT_STRING          \
-"\
-Could not yet establish the connection to the remote\n\
-proxy. Do you want to terminate the current session?\n\
-"
-
-#define MISSING_PROXY_CACHE_ALERT                            12
-#define MISSING_PROXY_CACHE_ALERT_TYPE                       "ok"
-#define MISSING_PROXY_CACHE_ALERT_STRING                     \
-"\
-NX was unable to negotiate a cache for this session.\n\
-This may happen if this is the first time you run a\n\
-session on this server or if cache was corrupted or\n\
-produced by an incompatible NX version.\n\
-"
-
-#define ABORT_PROXY_CONNECTION_ALERT                         13
-#define ABORT_PROXY_CONNECTION_ALERT_TYPE                    "ok"
-#define ABORT_PROXY_CONNECTION_ALERT_STRING                  \
-"\
-The connection with the remote server was shut down.\n\
-Please check the state of your network connection.\n\
-"
-
-/*
- * The one below is a special alert, used to close
- * a previous alert that is running on the given
- * side. This can be used to get rid of a message
- * that has ceased to hold true.
- */
-
-#define DISPLACE_MESSAGE_ALERT                               14
-#define DISPLACE_MESSAGE_ALERT_TYPE                          NULL
-#define DISPLACE_MESSAGE_ALERT_STRING                        NULL
-
-/*
- * These are the other alert messages that were
- * added in the 1.5.0 release. The first is never
- * shown and is intended just for testing.
- */
-
-#define GREETING_MESSAGE_ALERT                               15
-#define GREETING_MESSAGE_ALERT_TYPE                          "ok"
-#define GREETING_MESSAGE_ALERT_STRING                        \
-"\
-Welcome to NX from the NoMachine team. We really\n\
-hope you will enjoy this wonderful software as much\n\
-as we had fun making it ;-).\n\
-"
-
-/*
- * These alerts are intended to notify the user
- * of the reason why the agent failed to resume
- * the session.
- */
-
-#define START_RESUME_SESSION_ALERT                           16
-#define START_RESUME_SESSION_ALERT_TYPE                      "ok"
-#define START_RESUME_SESSION_ALERT_STRING                    \
-"\
-You appear to run your NX session across a slow network\n\
-connection. Resuming the session may require some time.\n\
-Please wait.\
-"
-
-#define FAILED_RESUME_DISPLAY_ALERT                          17
-#define FAILED_RESUME_DISPLAY_ALERT_TYPE                     "error"
-#define FAILED_RESUME_DISPLAY_ALERT_STRING                   \
-"\
-Failed to open the display. Can't resume the NX\n\
-session on this display.\n\
-"
-
-#define FAILED_RESUME_DISPLAY_BROKEN_ALERT                   18
-#define FAILED_RESUME_DISPLAY_BROKEN_TYPE                    "error"
-#define FAILED_RESUME_DISPLAY_BROKEN_STRING                  \
-"\
-The display connection was broken while trying to\n\
-resume the session. Please, check your network\n\
-connection and try again.\n\
-"
-
-#define FAILED_RESUME_VISUALS_ALERT                          19
-#define FAILED_RESUME_VISUALS_ALERT_TYPE                     "error"
-#define FAILED_RESUME_VISUALS_ALERT_STRING                   \
-"\
-Failed to restore all the required visuals.\n\
-Can't resume the NX session on this display.\n\
-"
-
-#define FAILED_RESUME_COLORMAPS_ALERT                        20
-#define FAILED_RESUME_COLORMAPS_ALERT_TYPE                   "error"
-#define FAILED_RESUME_COLORMAPS_ALERT_STRING                 \
-"\
-The number of available colormaps is different\n\
-on the new display. Can't resume the NX session\n\
-on this display.\n\
-"
-
-#define FAILED_RESUME_PIXMAPS_ALERT                          21
-#define FAILED_RESUME_PIXMAPS_ALERT_TYPE                     "error"
-#define FAILED_RESUME_PIXMAPS_ALERT_STRING                   \
-"\
-Failed to restore all the required pixmap formats.\n\
-Can't resume the NX session on this display.\n\
-"
-
-#define FAILED_RESUME_DEPTHS_ALERT                           22
-#define FAILED_RESUME_DEPTHS_ALERT_TYPE                      "error"
-#define FAILED_RESUME_DEPTHS_ALERT_STRING                    \
-"\
-Failed to restore all the required screen depths.\n\
-Can't resume the NX session on this display.\n\
-"
-
-#define FAILED_RESUME_RENDER_ALERT                           23
-#define FAILED_RESUME_RENDER_ALERT_TYPE                      "error"
-#define FAILED_RESUME_RENDER_ALERT_STRING                    \
-"\
-The render extension is missing or an incompatible\n\
-version was detected on your X server. Can't resume\n\
-the NX session on this display.\n\
-"
-
-#define FAILED_RESUME_FONTS_ALERT                            24
-#define FAILED_RESUME_FONTS_ALERT_TYPE                       "error"
-#define FAILED_RESUME_FONTS_ALERT_STRING                     \
-"\
-One or more of the fonts that are in use by the\n\
-session are missing. Can't resume the NX session\n\
-on this display.\n\
-"
-
-#define ABORT_PROXY_NEGOTIATION_ALERT                        62
-#define ABORT_PROXY_NEGOTIATION_ALERT_TYPE                   "ok"
-#define ABORT_PROXY_NEGOTIATION_ALERT_STRING                 \
-"\
-The remote proxy closed the connection while negotiating\n\
-the session. This may be due to the wrong authentication\n\
-credentials passed to the server.\n\
-"
-
-#define ABORT_PROXY_SHUTDOWN_ALERT                           64
-#define ABORT_PROXY_SHUTDOWN_ALERT_TYPE                      "ok"
-#define ABORT_PROXY_SHUTDOWN_ALERT_STRING                    \
-"\
-No response received from the remote proxy while\n\
-waiting for the session shutdown.\n\
-"
-
-#define FAILED_XDMCP_CONNECTION_ALERT                        65
-#define FAILED_XDMCP_CONNECTION_ALERT_TYPE                   "ok"
-#define FAILED_XDMCP_CONNECTION_ALERT_STRING                 \
-"\
-The XDM host that was contacted by the NX server doesn't\n\
-seem to be able to start the session. Please check your\n\
-server configuration.\n\
-"
-
-/*
- * Used to handle the backward compatibility.
- * Update the numbers if you add a new alert. 
- */
-
-#define LAST_PROTO_STEP_6_ALERT  63
-#define LAST_PROTO_STEP_7_ALERT  65
-
-#endif /* NXalert_H */
diff --git a/nxcomp/NXmitshm.h b/nxcomp/NXmitshm.h
deleted file mode 100644
index 939d488fb..000000000
--- a/nxcomp/NXmitshm.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef NXmitshm_H
-#define NXmitshm_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Import opcodes from <X11/extensions/XShm.h>
- * to get rid of weird dependencies from other
- * headers of X environment.
- */
-
-#define X_ShmQueryVersion		0
-#define X_ShmAttach			1
-#define X_ShmDetach			2
-#define X_ShmPutImage			3
-#define X_ShmGetImage			4
-#define X_ShmCreatePixmap		5
-
-#define ShmCompletion			0
-#define ShmNumberEvents			(ShmCompletion + 1)
-
-#define BadShmSeg			0
-#define ShmNumberErrors			(BadShmSeg + 1)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* NXmitshm_H */
diff --git a/nxcomp/NXpack.h b/nxcomp/NXpack.h
deleted file mode 100644
index 3eade6855..000000000
--- a/nxcomp/NXpack.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef NXpack_H
-#define NXpack_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define MASK_METHOD_LIMIT                       10
-
-#define NO_MASK                                 0
-
-#define MASK_8_COLORS                           1
-#define MASK_64_COLORS                          2
-#define MASK_256_COLORS                         3
-#define MASK_512_COLORS                         4
-#define MASK_4K_COLORS                          5
-#define MASK_32K_COLORS                         6
-#define MASK_64K_COLORS                         7
-#define MASK_256K_COLORS                        8
-#define MASK_2M_COLORS                          9
-#define MASK_16M_COLORS                         10
-
-#define PACK_METHOD_LIMIT                       128
-
-#define NO_PACK                                 0
-
-#define PACK_MASKED_8_COLORS                    1
-#define PACK_MASKED_64_COLORS                   2
-#define PACK_MASKED_256_COLORS                  3
-#define PACK_MASKED_512_COLORS                  4
-#define PACK_MASKED_4K_COLORS                   5
-#define PACK_MASKED_32K_COLORS                  6
-#define PACK_MASKED_64K_COLORS                  7
-#define PACK_MASKED_256K_COLORS                 8
-#define PACK_MASKED_2M_COLORS                   9
-#define PACK_MASKED_16M_COLORS                  10
-
-#define PACK_RAW_8_BITS                         3
-#define PACK_RAW_16_BITS                        7
-#define PACK_RAW_24_BITS                        10
-
-#define PACK_COLORMAP_256_COLORS                11
-
-#define PACK_JPEG_8_COLORS                      26
-#define PACK_JPEG_64_COLORS                     27
-#define PACK_JPEG_256_COLORS                    28
-#define PACK_JPEG_512_COLORS                    29
-#define PACK_JPEG_4K_COLORS                     30
-#define PACK_JPEG_32K_COLORS                    31
-#define PACK_JPEG_64K_COLORS                    32
-#define PACK_JPEG_256K_COLORS                   33
-#define PACK_JPEG_2M_COLORS                     34
-#define PACK_JPEG_16M_COLORS                    35
-
-#define PACK_PNG_8_COLORS                       37
-#define PACK_PNG_64_COLORS                      38
-#define PACK_PNG_256_COLORS                     39
-#define PACK_PNG_512_COLORS                     40
-#define PACK_PNG_4K_COLORS                      41
-#define PACK_PNG_32K_COLORS                     42
-#define PACK_PNG_64K_COLORS                     43
-#define PACK_PNG_256K_COLORS                    44
-#define PACK_PNG_2M_COLORS                      45
-#define PACK_PNG_16M_COLORS                     46
-
-#define PACK_RGB_16M_COLORS                     63
-#define PACK_RLE_16M_COLORS                     64
-
-#define PACK_ALPHA                              65
-#define PACK_COLORMAP                           66
-
-#define PACK_BITMAP_16M_COLORS                  67
-
-/*
- * Not really pack methods. These values
- * allow dynamic selection of the pack
- * method by the agent.
- */
-
-#define PACK_NONE                               0
-#define PACK_LOSSY                              253
-#define PACK_LOSSLESS                           254
-#define PACK_ADAPTIVE                           255
-
-/*
- * Reduce the number of colors in the
- * image by applying a mask.
- */
-
-typedef struct
-{
-  unsigned int color_mask;
-  unsigned int correction_mask;
-  unsigned int white_threshold;
-  unsigned int black_threshold;
-
-} ColorMask;
-
-extern const ColorMask Mask8TrueColor;
-extern const ColorMask Mask64TrueColor;
-extern const ColorMask Mask512TrueColor;
-extern const ColorMask Mask4KTrueColor;
-extern const ColorMask Mask32KTrueColor;
-extern const ColorMask Mask256KTrueColor;
-extern const ColorMask Mask2MTrueColor;
-extern const ColorMask Mask16MTrueColor;
-
-const ColorMask *MethodColorMask(unsigned int method);
-
-int MethodBitsPerPixel(unsigned int method);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* NXpack_H */
diff --git a/nxcomp/NXproto.h b/nxcomp/NXproto.h
deleted file mode 100644
index 7b988bdbf..000000000
--- a/nxcomp/NXproto.h
+++ /dev/null
@@ -1,447 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef NXproto_H
-#define NXproto_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xproto.h>
-
-/*
- * Force the size to match the wire protocol.
- */
- 
-#define Drawable CARD32
-#define GContext CARD32
-
-#define sz_xNXGetControlParametersReq           4
-#define sz_xNXGetCleanupParametersReq           4
-#define sz_xNXGetImageParametersReq             4
-#define sz_xNXGetUnpackParametersReq            8
-#define sz_xNXGetShmemParametersReq             16
-#define sz_xNXGetFontParametersReq              4
-#define sz_xNXSetExposeParametersReq            8
-#define sz_xNXSetCacheParametersReq             8
-#define sz_xNXStartSplitReq                     8
-#define sz_xNXEndSplitReq                       4
-#define sz_xNXCommitSplitReq                    12
-#define sz_xNXSetUnpackGeometryReq              24
-#define sz_xNXSetUnpackColormapReq              16
-#define sz_xNXSetUnpackAlphaReq                 16
-#define sz_xNXPutPackedImageReq                 40
-#define sz_xNXFreeUnpackReq                     4
-#define sz_xNXFinishSplitReq                    4
-#define sz_xNXAbortSplitReq                     4
-#define sz_xNXFreeSplitReq                      4
-
-#define sz_xGetControlParametersReply           32
-#define sz_xGetCleanupParametersReply           32
-#define sz_xGetImageParametersReply             32
-#define sz_xGetUnpackParametersReply            32
-#define sz_xGetShmemParametersReply             32
-
-#define LINK_TYPE_LIMIT                         5
-
-#define LINK_TYPE_NONE                          0
-#define LINK_TYPE_MODEM                         1
-#define LINK_TYPE_ISDN                          2
-#define LINK_TYPE_ADSL                          3
-#define LINK_TYPE_WAN                           4
-#define LINK_TYPE_LAN                           5
-
-/*
- * NX Replies.
- */
-
-/*
- * The following reply has 4 new boolean
- * fields in the last protocol version.
- */
-
-typedef struct _NXGetControlParametersReply {
-    BYTE   type; /* Is X_Reply. */
-    CARD8  linkType;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32; /* Is 0. */
-    CARD8  localMajor;
-    CARD8  localMinor;
-    CARD8  localPatch;
-    CARD8  remoteMajor;
-    CARD8  remoteMinor;
-    CARD8  remotePatch;
-    CARD16 splitTimeout B16;
-    CARD16 motionTimeout B16;
-    CARD8  splitMode;
-    CARD8  pad1;
-    CARD32 splitSize B32;
-    CARD8  packMethod;
-    CARD8  packQuality;
-    CARD8  dataLevel;
-    CARD8  streamLevel;
-    CARD8  deltaLevel;
-    CARD8  loadCache;
-    CARD8  saveCache;
-    CARD8  startupCache;
-} xNXGetControlParametersReply;
-
-typedef struct _NXGetCleanupParametersReply {
-    BYTE   type; /* Is X_Reply. */
-    BYTE   pad;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32; /* Is 0. */
-    BOOL   cleanGet;
-    BOOL   cleanAlloc;
-    BOOL   cleanFlush;
-    BOOL   cleanSend;
-    BOOL   cleanImages;
-    BYTE   pad1, pad2, pad3;
-    CARD32 pad4 B32;
-    CARD32 pad5 B32;
-    CARD32 pad6 B32;
-    CARD32 pad7 B32;
-} xNXGetCleanupParametersReply;
-
-typedef struct _NXGetImageParametersReply {
-    BYTE   type; /* Is X_Reply. */
-    BYTE   pad;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32; /* Is 0. */
-    BOOL   imageSplit;
-    BOOL   imageMask;
-    BOOL   imageFrame;
-    CARD8  imageMaskMethod;
-    CARD8  imageSplitMethod;
-    BYTE   pad1, pad2, pad3;
-    CARD32 pad4 B32;
-    CARD32 pad5 B32;
-    CARD32 pad6 B32;
-    CARD32 pad7 B32;
-} xNXGetImageParametersReply;
-
-/*
- * Data is made of PACK_METHOD_LIMIT values of
- * type BOOL telling which unpack capabilities
- * are implemented in proxy.
- */
-
-typedef struct _NXGetUnpackParametersReply {
-    BYTE   type; /* Is X_Reply. */
-    BYTE   pad;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32; /* Is PACK_METHOD_LIMIT / 4 from NXpack.h. */
-    CARD8  entries;    /* Is PACK_METHOD_LIMIT. */
-    BYTE   pad1, pad2, pad3;
-    CARD32 pad4 B32;
-    CARD32 pad5 B32;
-    CARD32 pad6 B32;
-    CARD32 pad7 B32;
-    CARD32 pad8 B32;
-} xNXGetUnpackParametersReply;
-
-typedef struct _NXGetShmemParametersReply {
-    BYTE   type;             /* Is X_Reply. */
-    CARD8  stage;            /* As in the corresponding request. */
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;       /* Is 0. */
-    BOOL   clientEnabled;    /* SHM on path agent to proxy.      */
-    BOOL   serverEnabled;    /* SHM on path proxy to X server.   */
-    BYTE   pad1, pad2;       /* Previous values can be checked   */
-    CARD32 clientSize B32;   /* at end of stage 2.               */
-    CARD32 serverSize B32;
-    CARD32 pad3 B32;
-    CARD32 pad4 B32;
-    CARD32 pad5 B32;
-} xNXGetShmemParametersReply;
-
-typedef struct _NXGetFontParametersReply {
-    BYTE   type; /* Is X_Reply. */
-    BYTE   pad1;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32; /* Is length of path string + 1 / 4. */
-    CARD32 pad2 B32;
-    CARD32 pad3 B32;
-    CARD32 pad4 B32;
-    CARD32 pad5 B32;
-    CARD32 pad6 B32;
-    CARD32 pad7 B32;
-} xNXGetFontParametersReply;
-
-/*
- * NX Requests.
- */
-
-typedef struct _NXGetControlParametersReq {
-    CARD8  reqType;
-    BYTE   pad;
-    CARD16 length B16;
-} xNXGetControlParametersReq;
-
-typedef struct _NXGetCleanupParametersReq {
-    CARD8  reqType;
-    BYTE   pad;
-    CARD16 length B16;
-} xNXGetCleanupParametersReq;
-
-typedef struct _NXGetImageParametersReq {
-    CARD8  reqType;
-    BYTE   pad;
-    CARD16 length B16;
-} xNXGetImageParametersReq;
-
-typedef struct _NXGetUnpackParametersReq {
-    CARD8  reqType;
-    BYTE   pad;
-    CARD16 length B16;
-    CARD8  entries;
-    BYTE   pad1, pad2, pad3;
-} xNXGetUnpackParametersReq;
-
-typedef struct _NXGetShmemParametersReq {
-    CARD8    reqType;
-    CARD8    stage;         /* It is between 0 and 2.     */
-    CARD16   length B16;
-    BOOL     enableClient;  /* X client side support is   */
-    BOOL     enableServer;  /* not implemented yet.       */
-    BYTE     pad1, pad2;
-    CARD32   clientSegment; /* XID identifying the shared */
-    CARD32   serverSegment; /* memory segments.           */
-} xNXGetShmemParametersReq;
-
-typedef struct _NXGetFontParametersReq {
-    CARD8    reqType;
-    CARD8    pad;
-    CARD16   length B16;
-} xNXGetFontParametersReq;
-
-/*
- * The available split modes.
- */
-
-#define NXSplitModeDefault              0
-#define NXSplitModeAsync                1
-#define NXSplitModeSync                 2
-
-typedef struct _NXStartSplitReq {
-    CARD8  reqType;
-    CARD8  resource;
-    CARD16 length B16;
-    CARD8  mode;
-    BYTE   pad1, pad2, pad3;
-} xNXStartSplitReq;
-
-typedef struct _NXEndSplitReq {
-    CARD8  reqType;
-    CARD8  resource;
-    CARD16 length B16;
-} xNXEndSplitReq;
-
-typedef struct _NXCommitSplitReq {
-    CARD8  reqType;
-    CARD8  resource;
-    CARD16 length B16;
-    CARD8  propagate;
-    CARD8  request;
-    BYTE   pad1, pad2;
-    CARD32 position B32;
-} xNXCommitSplitReq;
-
-typedef struct _NXFinishSplitReq {
-    CARD8  reqType;
-    CARD8  resource;
-    CARD16 length B16;
-} xNXFinishSplitReq;
-
-typedef struct _NXAbortSplitReq {
-    CARD8  reqType;
-    CARD8  resource;
-    CARD16 length B16;
-} xNXAbortSplitReq;
-
-typedef struct _NXFreeSplitReq {
-    CARD8  reqType;
-    CARD8  resource;
-    CARD16 length B16;
-} xNXFreeSplitReq;
-
-typedef struct _NXSetExposeParametersReq {
-    CARD8  reqType;
-    BYTE   pad;
-    CARD16 length B16;
-    BOOL   expose;
-    BOOL   graphicsExpose;
-    BOOL   noExpose;
-    BYTE   pad1;
-} xNXSetExposeParametersReq;
-
-typedef struct _NXSetCacheParametersReq {
-    CARD8  reqType;
-    BYTE   pad;
-    CARD16 length B16;
-    BOOL   enableCache;
-    BOOL   enableSplit;
-    BOOL   enableSave;
-    BOOL   enableLoad;
-} xNXSetCacheParametersReq;
-
-typedef struct _NXSetUnpackGeometryReq {
-    CARD8  reqType;
-    CARD8  resource;
-    CARD16 length B16;
-    CARD8  depth1Bpp;
-    CARD8  depth4Bpp;
-    CARD8  depth8Bpp;
-    CARD8  depth16Bpp;
-    CARD8  depth24Bpp;
-    CARD8  depth32Bpp;
-    BYTE   pad1, pad2;
-    CARD32 redMask B32;
-    CARD32 greenMask B32;
-    CARD32 blueMask B32;
-} xNXSetUnpackGeometryReq;
-
-typedef struct _NXSetUnpackColormapReq {
-    CARD8  reqType;
-    CARD8  resource;
-    CARD16 length B16;
-    CARD8  method;
-    BYTE   pad1, pad2, pad3;
-    CARD32 srcLength B32;
-    CARD32 dstLength B32;
-} xNXSetUnpackColormapReq;
-
-typedef struct _NXSetUnpackAlphaReq {
-    CARD8  reqType;
-    CARD8  resource;
-    CARD16 length B16;
-    CARD8  method;
-    BYTE   pad1, pad2, pad3;
-    CARD32 srcLength B32;
-    CARD32 dstLength B32;
-} xNXSetUnpackAlphaReq;
-
-typedef struct _NXPutPackedImageReq {
-    CARD8    reqType;
-    CARD8    resource;
-    CARD16   length B16;
-    Drawable drawable B32;
-    GContext gc B32;
-    CARD8    method;
-    CARD8    format;
-    CARD8    srcDepth;
-    CARD8    dstDepth;
-    CARD32   srcLength B32;
-    CARD32   dstLength B32;
-    INT16    srcX B16, srcY B16;
-    CARD16   srcWidth B16, srcHeight B16;
-    INT16    dstX B16, dstY B16;
-    CARD16   dstWidth B16, dstHeight B16;
-} xNXPutPackedImageReq;
-
-typedef struct _NXFreeUnpackReq {
-    CARD8  reqType;
-    CARD8  resource;
-    CARD16 length B16;
-} xNXFreeUnpackReq;
-
-/*
- * The X_NXSplitData and X_NXSplitEvent opcodes
- * are used internally and are ignored if coming
- * from the agent.
- */
-
-#define X_NXInternalGenericData         0
-#define X_NXInternalGenericReply        1
-#define X_NXInternalGenericRequest      255
-
-#define X_NXInternalShapeExtension      128
-#define X_NXInternalRenderExtension     129
-
-#define X_NXFirstOpcode                 230
-#define X_NXLastOpcode                  252
-
-#define X_NXGetControlParameters        230
-#define X_NXGetCleanupParameters        231
-#define X_NXGetImageParameters          232
-#define X_NXGetUnpackParameters         233
-#define X_NXStartSplit                  234
-#define X_NXEndSplit                    235
-#define X_NXSplitData                   236
-#define X_NXCommitSplit                 237
-#define X_NXSetExposeParameters         240
-#define X_NXSetUnpackGeometry           241
-#define X_NXSetUnpackColormap           242
-#define X_NXPutPackedImage              243
-#define X_NXSplitEvent                  244
-#define X_NXGetShmemParameters          245
-#define X_NXSetUnpackAlpha              246
-#define X_NXFreeUnpack                  247
-#define X_NXFinishSplit                 248
-#define X_NXAbortSplit                  249
-#define X_NXFreeSplit                   250
-#define X_NXGetFontParameters           251
-#define X_NXSetCacheParameters          252
-
-/*
- * The following events are received by the agent
- * in the form of a ClientMessage with the value
- * 0 in fields atom and window. The format is
- * always 32. Event specific data starts at byte
- * offset 12.
- *
- * These events are sent by the NX transport to
- * notify the agent about the result of a split
- * operation.
- */
-
-#define NXNoSplitNotify                 1
-#define NXStartSplitNotify              2
-#define NXCommitSplitNotify             3
-#define NXEndSplitNotify                4
-#define NXEmptySplitNotify              5
-
-/*
- * Notifications of collect events. These events
- * don't come from the NX transport but are put
- * back in client's event queue by NXlib.
- */
-
-#define NXCollectImageNotify            8
-#define NXCollectPropertyNotify         9
-#define NXCollectGrabPointerNotify      10
-#define NXCollectInputFocusNotify       11
-
-#undef Drawable
-#undef GContext
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* NXproto_H */
diff --git a/nxcomp/NXrender.h b/nxcomp/NXrender.h
deleted file mode 100644
index 280715833..000000000
--- a/nxcomp/NXrender.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef NXrender_H
-#define NXrender_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Import this from <X11/extensions/render.h>
- * to compile under old XFree86 distributions
- * when render extension was not present yet.
- */
-
-#define X_RenderQueryVersion		    0
-#define X_RenderQueryPictFormats	    1
-#define X_RenderQueryPictIndexValues	    2
-#define X_RenderQueryDithers		    3
-#define X_RenderCreatePicture		    4
-#define X_RenderChangePicture		    5
-#define X_RenderSetPictureClipRectangles    6
-#define X_RenderFreePicture		    7
-#define X_RenderComposite		    8
-#define X_RenderScale			    9
-#define X_RenderTrapezoids		    10
-#define X_RenderTriangles		    11
-#define X_RenderTriStrip		    12
-#define X_RenderTriFan			    13
-#define X_RenderColorTrapezoids		    14
-#define X_RenderColorTriangles		    15
-#define X_RenderTransform		    16
-#define X_RenderCreateGlyphSet		    17
-#define X_RenderReferenceGlyphSet	    18
-#define X_RenderFreeGlyphSet		    19
-#define X_RenderAddGlyphs		    20
-#define X_RenderAddGlyphsFromPicture	    21
-#define X_RenderFreeGlyphs		    22
-#define X_RenderCompositeGlyphs8	    23
-#define X_RenderCompositeGlyphs16	    24
-#define X_RenderCompositeGlyphs32	    25
-#define X_RenderFillRectangles		    26
-/* 0.5 */
-#define X_RenderCreateCursor		    27
-/* 0.6 */
-#define X_RenderSetPictureTransform	    28
-#define X_RenderQueryFilters		    29
-#define X_RenderSetPictureFilter	    30
-#define X_RenderCreateAnimCursor	    31
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* NXrender_H */
diff --git a/nxcomp/NXvars.h b/nxcomp/NXvars.h
deleted file mode 100644
index f514000d7..000000000
--- a/nxcomp/NXvars.h
+++ /dev/null
@@ -1,201 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef NXvars_H
-#define NXvars_H
-
-/*
- * This can be included by the proxy or another
- * layer that doesn't use Xlib.
- */
-
-#if !defined(_XLIB_H_) && !defined(_XKBSRV_H_)
-
-#define NeedFunctionPrototypes  1
-
-#define Display  void
-
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Display flush policies.
- */
-
-#define NXPolicyImmediate    1
-#define NXPolicyDeferred     2
-
-/*
- * Type of flush.
- */
-
-#define NXFlushBuffer        0
-#define NXFlushLink          1
-
-/*
- * Type of statistics.
- */
-
-#define NXStatisticsPartial  0
-#define NXStatisticsTotal    1
-
-/*
- * Reason why the display is blocking.
- */
-
-#define NXBlockRead          1
-#define NXBlockWrite         2
-
-/*
- * Set if the client is interested in ignoring
- * the display error and continue with the exe-
- * cution of the program. By default the usual
- * Xlib behaviour is gotten, and the library
- * will call an exit().
- */
-
-extern int _NXHandleDisplayError;
-
-/*
- * The function below is called whenever Xlib is
- * going to perform an I/O operation. The funct-
- * ion can be redefined to include additional
- * checks aimed at detecting if the display needs
- * to be closed, for example because of an event
- * or a signal mandating the end of the session.
- * In this way the client program can regain the
- * control before Xlib blocks waiting for input
- * from the network.
- */
-
-typedef int (*NXDisplayErrorPredicate)(
-#if NeedFunctionPrototypes
-    Display*            /* display */,
-    int                 /* reason */
-#endif
-);
-
-extern NXDisplayErrorPredicate _NXDisplayErrorFunction;
-
-/*
- * This is called when Xlib is going to block
- * waiting for the display to become readable or
- * writable. The client can use the hook to run
- * any arbitrary operation that may require some
- * time to complete. The user should not try to
- * read or write to the display inside the call-
- * back routine.
- */
-
-typedef void (*NXDisplayBlockHandler)(
-#if NeedFunctionPrototypes
-    Display*            /* display */,
-    int                 /* reason */
-#endif
-);
-
-extern NXDisplayBlockHandler _NXDisplayBlockFunction;
-
-/*
- * Used to notify the program when more data
- * is written to the socket.
- */
-
-typedef void (*NXDisplayWriteHandler)(
-#if NeedFunctionPrototypes
-    Display*            /* display */,
-    int                 /* length */
-#endif
-);
-
-extern NXDisplayWriteHandler _NXDisplayWriteFunction;
-
-/*
- * This callback is used to notify the agent
- * that the proxy link has been flushed.
- */
-
-typedef void (*NXDisplayFlushHandler)(
-#if NeedFunctionPrototypes
-    Display*            /* display */,
-    int                 /* length */
-#endif
-);
-
-extern NXDisplayFlushHandler _NXDisplayFlushFunction;
-
-/*
- * Used by the NX transport to get an arbitrary
- * string to add to its protocol statistics.
- */
-
-typedef void (*NXDisplayStatisticsHandler)(
-#if NeedFunctionPrototypes
-    Display*            /* display */,
-    char*               /* buffer */,
-    int                 /* size */
-#endif
-);
-
-extern NXDisplayStatisticsHandler _NXDisplayStatisticsFunction;
-
-/*
- * Let users redefine the function printing an
- * error message in the case of a out-of-order
- * sequence number.
- */
-
-typedef void (*NXLostSequenceHandler)(
-#if NeedFunctionPrototypes
-    Display*            /* display */,
-    unsigned long       /* newseq */,
-    unsigned long       /* lastseq */,
-    unsigned int        /* type */
-#endif
-);
-
-extern NXLostSequenceHandler _NXLostSequenceFunction;
-
-/*
- * Let the X server run the children processes
- * (as for example the keyboard initialization
- * utilities) by using the native system libra-
- * ries, instead of the libraries shipped with
- * the NX environment. If set, the Popen() in
- * the X server will remove the LD_LIBRARY_PATH
- * setting from the environment before calling
- * the execl() function in the child process.
- */
-
-extern int _NXUnsetLibraryPath;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* NXvars_H */
diff --git a/nxcomp/OpcodeCache.h b/nxcomp/OpcodeCache.h
deleted file mode 100644
index e07a1b997..000000000
--- a/nxcomp/OpcodeCache.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef OpcodeCache_H
-#define OpcodeCache_H
-
-#include "CharCache.h"
-
-class OpcodeCache
-{
-  friend class EncodeBuffer;
-  friend class DecodeBuffer;
-  
-  public:
-
-  OpcodeCache()
-  {
-    slot_ = 0;
-  }
-
-  ~OpcodeCache()
-  {
-  }
-
-  private:
-
-  CharCache base_[256];
-  unsigned char slot_;
-};
-
-#endif /* OpcodeCache_H */
diff --git a/nxcomp/OpcodeStore.cpp b/nxcomp/OpcodeStore.cpp
deleted file mode 100644
index 66a425d53..000000000
--- a/nxcomp/OpcodeStore.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "OpcodeStore.h"
-
-OpcodeStore::OpcodeStore()
-{
-  //
-  // Assign values of the specific
-  // NX opcodes.
-  //
-
-  getControlParameters = X_NXGetControlParameters;
-  getCleanupParameters = X_NXGetCleanupParameters;
-  getImageParameters   = X_NXGetImageParameters;
-  getUnpackParameters  = X_NXGetUnpackParameters;
-  getShmemParameters   = X_NXGetShmemParameters;
-  getFontParameters    = X_NXGetFontParameters;
-
-  startSplit  = X_NXStartSplit;
-  endSplit    = X_NXEndSplit;
-  commitSplit = X_NXCommitSplit;
-  finishSplit = X_NXFinishSplit;
-  abortSplit  = X_NXAbortSplit;
-
-  splitData  = X_NXSplitData;
-  splitEvent = X_NXSplitEvent;
-
-  setCacheParameters  = X_NXSetCacheParameters;
-  setExposeParameters = X_NXSetExposeParameters;
-
-  setUnpackGeometry = X_NXSetUnpackGeometry;
-  setUnpackColormap = X_NXSetUnpackColormap;
-  setUnpackAlpha    = X_NXSetUnpackAlpha;
-
-  putPackedImage = X_NXPutPackedImage;
-
-  freeUnpack = X_NXFreeUnpack;
-  freeSplit  = X_NXFreeSplit;
-
-  //
-  // These values must be fetched
-  // from the X server.
-  //
-
-  shapeExtension  = 0;
-  renderExtension = 0;
-
-  //
-  // Events sent as ClientMessage.
-  //
-
-  noSplitNotify     = NXNoSplitNotify;
-  startSplitNotify  = NXStartSplitNotify;
-  commitSplitNotify = NXCommitSplitNotify;
-  endSplitNotify    = NXEndSplitNotify;
-  emptySplitNotify  = NXEmptySplitNotify;
-}
-
-OpcodeStore::~OpcodeStore()
-{
-}
diff --git a/nxcomp/OpcodeStore.h b/nxcomp/OpcodeStore.h
deleted file mode 100644
index d041ed4b8..000000000
--- a/nxcomp/OpcodeStore.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef OpcodeStore_H
-#define OpcodeStore_H
-
-#include "NXproto.h"
-
-class OpcodeStore
-{
-  public:
-
-  OpcodeStore();
-
-  ~OpcodeStore();
-
-  //
-  // Map NX protocol messages. At the moment mapping is hard-
-  // coded. Opcodes should be instead agreed with the proxied
-  // X server (by excluding all opcodes used for extensions)
-  // and exported by the proxy class to channels.
-  //
-  // Some toolkits query the server only once for extensions'
-  // opcodes and share the same settings across all channels.
-  // This could be a problem as channels needed to monitor the
-  // traffic to find out the extensions' opcodes themselves,
-  // so it is important that proxy passes an instance of this
-  // class to new channels.
-  //
-
-  unsigned char getControlParameters;
-  unsigned char getCleanupParameters;
-  unsigned char getImageParameters;
-  unsigned char getUnpackParameters;
-  unsigned char getShmemParameters;
-  unsigned char getFontParameters;
-
-  unsigned char startSplit;
-  unsigned char endSplit;
-  unsigned char commitSplit;
-  unsigned char finishSplit;
-  unsigned char abortSplit;
-
-  unsigned char splitData;
-  unsigned char splitEvent;
-
-  unsigned char setCacheParameters;
-  unsigned char setExposeParameters;
-
-  unsigned char setUnpackGeometry;
-  unsigned char setUnpackColormap;
-  unsigned char setUnpackAlpha;
-
-  unsigned char putPackedImage;
-
-  unsigned char freeUnpack;
-  unsigned char freeSplit;
-
-  unsigned char shapeExtension;
-  unsigned char renderExtension;
-
-  unsigned char noSplitNotify;
-  unsigned char startSplitNotify;
-  unsigned char commitSplitNotify;
-  unsigned char endSplitNotify;
-  unsigned char emptySplitNotify;
-};
-
-#endif /* OpcodeStore_H */
diff --git a/nxcomp/Pack.c b/nxcomp/Pack.c
deleted file mode 100644
index 97fb93b5f..000000000
--- a/nxcomp/Pack.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdio.h>
-
-#include "NXpack.h"
-
-const ColorMask Mask8TrueColor    = { 128, 63, 240, 7 };
-const ColorMask Mask64TrueColor   = { 192, 7,  240, 4 };
-const ColorMask Mask256TrueColor  = { 255, 0,  255, 0 };
-const ColorMask Mask512TrueColor  = { 224, 5,  240, 4 };
-const ColorMask Mask4KTrueColor   = { 240, 4,  240, 2 };
-const ColorMask Mask32KTrueColor  = { 248, 3,  248, 2 };
-const ColorMask Mask64KTrueColor  = { 255, 0,  255, 0 };
-const ColorMask Mask256KTrueColor = { 252, 1,  252, 1 };
-const ColorMask Mask2MTrueColor   = { 255, 0,  254, 1 };
-const ColorMask Mask16MTrueColor  = { 255, 0,  255, 0 };
-
-const ColorMask *MethodColorMask(unsigned int method)
-{
-  switch (method)
-  {
-    case MASK_8_COLORS:
-    {
-      return &Mask8TrueColor;
-    }
-    case MASK_64_COLORS:
-    {
-      return &Mask64TrueColor;
-    }
-    case MASK_256_COLORS:
-    {
-      return &Mask256TrueColor;
-    }
-    case MASK_512_COLORS:
-    {
-      return &Mask512TrueColor;
-    }
-    case MASK_4K_COLORS:
-    {
-      return &Mask4KTrueColor;
-    }
-    case MASK_32K_COLORS:
-    {
-      return &Mask32KTrueColor;
-    }
-    case MASK_64K_COLORS:
-    {
-      return &Mask64KTrueColor;
-    }
-    case MASK_256K_COLORS:
-    {
-      return &Mask256KTrueColor;
-    }
-    case MASK_2M_COLORS:
-    {
-      return &Mask2MTrueColor;
-    }
-    case MASK_16M_COLORS:
-    {
-      return &Mask16MTrueColor;
-    }
-    default:
-    {
-      return NULL;
-    }
-  }
-}
-
-int MethodBitsPerPixel(unsigned int method)
-{
-  switch (method)
-  {
-    case PACK_MASKED_8_COLORS:
-    case PACK_JPEG_8_COLORS:
-    case PACK_PNG_8_COLORS:
-    {
-      return 8;
-    }
-    case PACK_MASKED_64_COLORS:
-    case PACK_JPEG_64_COLORS:
-    case PACK_PNG_64_COLORS:
-    {
-      return 8;
-    }
-    case PACK_MASKED_256_COLORS:
-    case PACK_JPEG_256_COLORS:
-    case PACK_PNG_256_COLORS:
-    {
-      return 8;
-    }
-    case PACK_MASKED_512_COLORS:
-    case PACK_JPEG_512_COLORS:
-    case PACK_PNG_512_COLORS:
-    {
-      return 16;
-    }
-    case PACK_MASKED_4K_COLORS:
-    case PACK_JPEG_4K_COLORS:
-    case PACK_PNG_4K_COLORS:
-    {
-      return 16;
-    }
-    case PACK_MASKED_32K_COLORS:
-    case PACK_JPEG_32K_COLORS:
-    case PACK_PNG_32K_COLORS:
-    {
-      return 16;
-    }
-    case PACK_MASKED_64K_COLORS:
-    case PACK_JPEG_64K_COLORS:
-    case PACK_PNG_64K_COLORS:
-    {
-      return 16;
-    }
-    case PACK_MASKED_256K_COLORS:
-    case PACK_JPEG_256K_COLORS:
-    case PACK_PNG_256K_COLORS:
-    {
-      return 24;
-    }
-    case PACK_MASKED_2M_COLORS:
-    case PACK_JPEG_2M_COLORS:
-    case PACK_PNG_2M_COLORS:
-    {
-      return 24;
-    }
-    case PACK_MASKED_16M_COLORS:
-    case PACK_JPEG_16M_COLORS:
-    case PACK_PNG_16M_COLORS:
-    {
-      return 24;
-    }
-    case PACK_BITMAP_16M_COLORS:
-    case PACK_RGB_16M_COLORS:
-    case PACK_RLE_16M_COLORS:
-    {
-      return 24;
-    }
-    default:
-    {
-      return 0;
-    }
-  }
-}
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/nxcomp/Pgn.cpp b/nxcomp/Pgn.cpp
deleted file mode 100644
index 17e1702d4..000000000
--- a/nxcomp/Pgn.cpp
+++ /dev/null
@@ -1,805 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-//
-// This file obviously supports PNG
-// decompression. It was renamed to
-// avoid name clashes on Windows.
-//
-
-#include <X11/Xmd.h>
-
-#ifdef ANDROID
-#include <strings.h>
-#endif
-#include <unistd.h>
-#include <stdio.h>
-#include <png.h>
-
-#include "Unpack.h"
-#include "Pgn.h"
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-#define RGB24_TO_PIXEL(bpp,r,g,b)                         \
-   ((((CARD##bpp)(r) & 0xFF) * srcRedMax2 + 127) / 255    \
-    << srcRedShift2 |                                     \
-    (((CARD##bpp)(g) & 0xFF) * srcGreenMax2 + 127) / 255  \
-    << srcGreenShift2 |                                   \
-    (((CARD##bpp)(b) & 0xFF) * srcBlueMax2 + 127) / 255   \
-    << srcBlueShift2)
-
-#define RGB24_TO_PIXEL32(r,g,b)                           \
-  (((CARD32)(r) & 0xFF) << srcRedShift2 |                 \
-   ((CARD32)(g) & 0xFF) << srcGreenShift2 |               \
-   ((CARD32)(b) & 0xFF) << srcBlueShift2)
-
-//
-// Functions from Unpack.cpp
-//
-
-extern int Unpack32To32(const T_colormask *colormask, const unsigned int *data,
-                            unsigned int *out, unsigned int *end);
-
-extern int Unpack24To24(const T_colormask *colormask, const unsigned char *data,
-                            unsigned char *out, unsigned char *end);
-
-extern int Unpack16To16(const T_colormask *colormask, const unsigned char *data,
-                            unsigned char *out, unsigned char *end);
-
-//
-// Local functions used for the png decompression.
-//
-
-static int DecompressPng16(unsigned char *compressedData, int compressedLen,
-                                unsigned int w, unsigned int h, unsigned char *dstBuf,
-                                    int byteOrder);
-
-static int DecompressPng24(unsigned char *compressedData, int compressedLen,
-                                unsigned int w, unsigned int h, unsigned char *dstBuf,
-                                    int byteOrder);
-
-static int DecompressPng32(unsigned char *compressedData, int compressedLen,
-                                unsigned int w, unsigned int h, unsigned char *dstBuf,
-                                    int byteOrder);
-
-static void PngReadData(png_structp png_ptr, png_bytep data, png_size_t length);
-
-//
-// Colormap stuff.
-//
-
-CARD16 srcRedMax2, srcGreenMax2, srcBlueMax2;
-CARD8  srcRedShift2, srcGreenShift2, srcBlueShift2;
-
-//
-// Attributes used for the png decompression.
-//
-
-static char *tmpBuf;
-static int  tmpBufSize = 0;
-static int  streamPos;
-
-int UnpackPng(T_geometry *geometry, unsigned char method, unsigned char *srcData,
-                  int srcSize, int dstBpp, int dstWidth, int dstHeight,
-                      unsigned char *dstData, int dstSize)
-{
-  int byteOrder = geometry -> image_byte_order;
-
-  //
-  // Check if data is coming from a failed unsplit.
-  //
-
-  if (srcSize < 2 || (srcData[0] == SPLIT_PATTERN &&
-          srcData[1] == SPLIT_PATTERN))
-  {
-    #ifdef WARNING
-    *logofs << "UnpackPng: WARNING! Skipping unpack of dummy data.\n"
-            << logofs_flush;
-    #endif
-
-    return -1;
-  }
-
-  #ifdef DEBUG
-  *logofs << "UnpackPng: Decompressing image with "
-          << "srcSize " << srcSize << " and bpp "
-          << dstBpp  << ".\n" << logofs_flush;
-  #endif
-
-  srcRedShift2   = ffs(geometry -> red_mask) - 1;
-  srcGreenShift2 = ffs(geometry -> green_mask) - 1;
-  srcBlueShift2  = ffs(geometry -> blue_mask) - 1;
-  srcRedMax2     = geometry -> red_mask >> srcRedShift2;
-  srcGreenMax2   = geometry -> green_mask >> srcGreenShift2;
-  srcBlueMax2    = geometry -> blue_mask >> srcBlueShift2;
-
-  //
-  // Make enough space in the temporary
-  // buffer to have one complete row of
-  // the image with 3 bytes per pixel.
-  //
-
-  tmpBufSize = dstWidth * 3;
-  tmpBuf = new char [tmpBufSize];
-
-  if (tmpBuf == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "UnpackPng: PANIC! Cannot allocate "
-            << dstWidth * 3 << " bytes for PNG "
-            << "decompressed data.\n" << logofs_flush;
-    #endif
-
-    delete [] tmpBuf;
-
-    return -1;
-  }
-
-  int result = 1;
-
-  switch (dstBpp)
-  {
-    case 8:
-    {
-      //
-      // Simply move the data from srcData to dstData
-      // taking into consideration the correct padding.
-      //
-
-      int row;
-
-      unsigned char * dstBuff = dstData;
-      unsigned char * srcBuff = srcData;
-
-      for (row = 0; row < dstHeight; row++)
-      {
-        memcpy(dstBuff, srcBuff, dstWidth );
-
-        dstBuff += RoundUp4(dstWidth);
-        srcBuff += dstWidth;
-      }
-    }
-    case 16:
-    {
-      result = DecompressPng16(srcData, srcSize, dstWidth,
-                                    dstHeight, dstData, byteOrder);
-      break;
-    }
-    case 24:
-    {
-      result = DecompressPng24(srcData, srcSize, dstWidth,
-                                    dstHeight, dstData, byteOrder);
-      break;
-    }
-    case 32:
-    {
-      result = DecompressPng32(srcData, srcSize, dstWidth,
-                                    dstHeight, dstData, byteOrder);
-      break;
-    }
-    default:
-    {
-      #ifdef PANIC
-      *logofs << "UnpackPng: PANIC! Error in PNG compression. "
-              << " Unsupported Bpp value " << dstBpp
-              << " for the PNG compression"
-              << ".\n" << logofs_flush;
-      #endif
-
-      delete [] tmpBuf;
-
-      result = -1;
-    }
-  }
-
-  if (result == -1)
-  {
-    delete [] tmpBuf;
-
-    return result;
-  }
-
-  //
-  // Apply the correction for the brightness
-  //
-
-  int maskMethod;
-
-  switch (method)
-  {
-    case PACK_PNG_8_COLORS:
-    {
-      maskMethod = MASK_8_COLORS;
-
-      break;
-    }
-    case PACK_PNG_64_COLORS:
-    {
-      maskMethod = MASK_64_COLORS;
-
-      break;
-    }
-    case PACK_PNG_256_COLORS:
-    {
-      maskMethod = MASK_256_COLORS;
-
-      break;
-    }
-    case PACK_PNG_512_COLORS:
-    {
-      maskMethod = MASK_512_COLORS;
-
-      break;
-    }
-    case PACK_PNG_4K_COLORS:
-    {
-      maskMethod = MASK_4K_COLORS;
-
-      break;
-    }
-    case PACK_PNG_32K_COLORS:
-    {
-      maskMethod = MASK_32K_COLORS;
-
-      break;
-    }
-    case PACK_PNG_64K_COLORS:
-    {
-      maskMethod = MASK_64K_COLORS;
-
-      break;
-    }
-    case PACK_PNG_256K_COLORS:
-    {
-      maskMethod = MASK_256K_COLORS;
-
-      break;
-    }
-    case PACK_PNG_2M_COLORS:
-    {
-      maskMethod = MASK_2M_COLORS;
-
-      break;
-    }
-    case PACK_PNG_16M_COLORS:
-    {
-      maskMethod = MASK_16M_COLORS;
-
-      break;
-    }
-    default:
-    {
-      #ifdef PANIC
-      *logofs << "DecompressPng16: PANIC! "
-              << " No matching decompression method.\n"
-              << logofs_flush;
-      #endif
-
-      delete [] tmpBuf;
-
-      return -1;
-    }
-  }
-
-  const T_colormask *colorMask = MethodColorMask(maskMethod);
-
-  unsigned char *dstBuff = dstData;
-
-  switch (dstBpp)
-  {
-    case 16:
-    {
-      Unpack16To16(colorMask, dstBuff, dstBuff, dstBuff + dstSize);
-
-      break;
-    }
-    case 24:
-    {
-      break;
-    }
-    case 32:
-    {
-      Unpack32To32(colorMask, (unsigned int *)dstBuff, (unsigned int *)dstBuff,
-                       (unsigned int *)(dstBuff + dstSize));
-      break;
-    }
-    default:
-    {
-      #ifdef PANIC
-      *logofs << "DecompressPng16: PANIC! "
-              << " No matching destination bits per plane.\n"
-              << logofs_flush;
-      #endif
-
-      delete [] tmpBuf;
-
-      return -1;
-    }
-  }
-
-  delete [] tmpBuf;
-
-  return 1;
-}
-
-
-//
-// Functions that actually do
-// the PNG decompression.
-//
-
-int DecompressPng16(unsigned char *compressedData, int compressedLen,
-                         unsigned int w, unsigned int h, unsigned char *dstBuf, int byteOrder)
-{
-  unsigned char *data;
-  unsigned int dx, dy;
-
-  png_structp pngPtr;
-  png_infop   infoPtr;
-  png_bytep   rowPointers;
-
-
-  streamPos = 0;
-
-  pngPtr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-
-  if (!pngPtr)
-  {
-    #ifdef PANIC
-    *logofs << "DecompressPng16: PANIC! "
-            << " Failed png_create_read_struct operation"
-            << ".\n" << logofs_flush;
-    #endif
-
-    return -1;
-  }
-
-  infoPtr = png_create_info_struct(pngPtr);
-
-  if (!infoPtr)
-  {
-    #ifdef PANIC
-    *logofs << "DecompressPng16: PANIC! "
-            << "Failed png_create_info_struct operation"
-            << ".\n" << logofs_flush;
-    #endif
-
-    png_destroy_read_struct(&pngPtr, NULL, NULL);
-
-    return -1;
-  }
-
-  if (setjmp(png_jmpbuf(pngPtr)))
-  {
-    #ifdef PANIC
-    *logofs << "DecompressPng16: PANIC! "
-            << "Error during IO initialization"
-            << ".\n" << logofs_flush;
-    #endif
-
-    png_destroy_read_struct(&pngPtr, &infoPtr, NULL);
-
-    return -1;
-  }
-
-  png_set_read_fn(pngPtr, (void *)compressedData, PngReadData);
-
-  if (setjmp(png_jmpbuf(pngPtr)))
-  {
-    #ifdef PANIC
-    *logofs << "DecompressPng16: PANIC! "
-            << "Error during read of PNG header"
-            << ".\n" << logofs_flush;
-    #endif
-
-    png_destroy_read_struct(&pngPtr, &infoPtr, NULL);
-
-    return -1;
-  }
-
-  png_read_info(pngPtr, infoPtr);
-
-  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
-  {
-    png_set_expand(pngPtr);
-  }
-
-  //
-  // data points to dstBuf which is
-  // already padded correctly for the final
-  // image to put
-  //
-
-  data = dstBuf;
-  rowPointers = (png_byte *) tmpBuf;
-
-  //
-  // We use setjmp() to save our context.
-  // The PNG library will call longjmp()
-  // in case of error.
-  //
-
-  if (setjmp(png_jmpbuf(pngPtr)))
-  {
-    #ifdef PANIC
-    *logofs << "DecompressPng16: PANIC! "
-            << "Error during read of PNG rows"
-            << ".\n" << logofs_flush;
-    #endif
-
-    png_destroy_read_struct(&pngPtr, &infoPtr, NULL);
-
-    return -1;
-  }
-
-  unsigned long pixel;
-
-  for (dy = 0; dy < h; dy++)
-  {
-    png_read_row(pngPtr, rowPointers, NULL);
-
-    for (dx = 0; dx < w; dx++)
-    {
-      pixel = RGB24_TO_PIXEL(16, tmpBuf[dx*3], tmpBuf[dx*3+1], tmpBuf[dx*3+2]);
-
-      //
-      // Follow the server byte order when arranging data.
-      //
- 
-      if (byteOrder == LSBFirst)
-      {
-        data[0] = (unsigned char) (pixel & 0xff);
-        data[1] = (unsigned char) ((pixel >> 8) & 0xff);
-      }
-      else
-      {
-        data[1] = (unsigned char) (pixel & 0xff);
-        data[0] = (unsigned char) ((pixel >> 8) & 0xff);
-      }
- 
-      data += 2; 
-    }
-
-    //
-    // Move pixelPtr at the beginning of the
-    // next line.
-    //
-
-    data = data + (RoundUp4(w * 2) - w * 2);
-  }
-
-  png_destroy_read_struct(&pngPtr, &infoPtr,NULL);
-
-  #ifdef DEBUG
-  *logofs << "DecompressPng16: Decompression finished."
-          << dy << " lines handled.\n"
-          << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int DecompressPng24(unsigned char *compressedData, int compressedLen,
-                        unsigned int w, unsigned int h, unsigned char *dstBuf, int byteOrder)
-{
-  static CARD8 *pixelPtr = NULL;
-  unsigned int dx, dy;
-
-  png_structp pngPtr;
-  png_infop   infoPtr;
-  png_bytep   rowPointers;
-
-
-  streamPos = 0;
-
-  pngPtr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-
-  if (!pngPtr)
-  {
-    #ifdef PANIC
-    *logofs << "DecompressPng24: PANIC! "
-            << "Failed png_create_read_struct operation"
-            << ".\n" << logofs_flush;
-    #endif
-
-    return -1;
-  }
-
-  infoPtr = png_create_info_struct(pngPtr);
-
-  if (!infoPtr)
-  {
-    #ifdef PANIC
-    *logofs << "DecompressPng24: PANIC! "
-            << "Failed png_create_info_struct operation"
-            << ".\n" << logofs_flush;
-    #endif
-
-    png_destroy_read_struct(&pngPtr, NULL, NULL);
-
-    return -1;
-  }
-
-  if (setjmp(png_jmpbuf(pngPtr)))
-  {
-    #ifdef PANIC
-    *logofs << "DecompressPng24: PANIC! "
-            << "Error during IO initialization"
-            << ".\n" << logofs_flush;
-    #endif
-
-    png_destroy_read_struct(&pngPtr, &infoPtr, NULL);
-
-    return -1;
-  }
-
-  png_set_read_fn(pngPtr, (void *)compressedData, PngReadData);
-
-  if (setjmp(png_jmpbuf(pngPtr)))
-  {
-    #ifdef PANIC
-    *logofs << "DecompressPng24: PANIC! "
-            << "Error during read of PNG header"
-            << ".\n" << logofs_flush;
-    #endif
-
-    png_destroy_read_struct(&pngPtr, &infoPtr, NULL);
-
-    return -1;
-  }
-
-  png_read_info( pngPtr, infoPtr ) ;
-
-  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
-  {
-    png_set_expand(pngPtr);
-  }
-
-  //
-  // PixelPtr points to dstBuf which is
-  // already padded correctly for the final
-  // image to put
-  //
-
-  pixelPtr = (CARD8 *) dstBuf;
-
-  rowPointers = (png_byte *)tmpBuf;
-  
-  if (setjmp(png_jmpbuf(pngPtr)))
-  {
-    #ifdef PANIC
-    *logofs << "DecompressPng24: PANIC! "
-            << "Error during read of PNG rows"
-            << ".\n" << logofs_flush;
-    #endif
-
-    png_destroy_read_struct(&pngPtr, &infoPtr, NULL);
-
-    return -1;
-  }
-
-  for (dy = 0; dy < h; dy++)
-  {
-    png_read_row(pngPtr, rowPointers, NULL);
-
-    for (dx = 0; dx < w; dx++)
-    {
-      //
-      // Follow the server byte order when arranging data.
-      //
-
-      if (byteOrder == LSBFirst)
-      {
-        pixelPtr[0] = tmpBuf[dx * 3];
-        pixelPtr[1] = tmpBuf[dx * 3 + 1];
-        pixelPtr[2] = tmpBuf[dx * 3 + 2];
-      }
-      else
-      {
-        pixelPtr[2] = tmpBuf[dx * 3];
-        pixelPtr[1] = tmpBuf[dx * 3 + 1];
-        pixelPtr[0] = tmpBuf[dx * 3 + 2];
-      }
-
-      pixelPtr += 3;
-    }
-
-    //
-    // Go to the next line.
-    //
-
-    pixelPtr = (CARD8 *) (((char *) pixelPtr) + (RoundUp4(w * 3) - w * 3));
-  }
-
-  png_destroy_read_struct(&pngPtr, &infoPtr,NULL);
-
-  #ifdef DEBUG
-  *logofs << "DecompressPng24: Decompression finished."
-          << dy << " lines handled.\n"
-          << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int DecompressPng32(unsigned char *compressedData, int compressedLen,
-                         unsigned int w, unsigned int h, unsigned char *dstBuf, int byteOrder)
-{
-  unsigned char *data;
-
-  unsigned int dx, dy;
-
-  png_structp pngPtr;
-  png_infop   infoPtr;
-  png_bytep   rowPointers;
-
-  streamPos = 0;
-
-  pngPtr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-
-  if (!pngPtr)
-  { 
-    #ifdef PANIC
-    *logofs << "DecompressPng32: PANIC! "
-            << "Failed png_create_read_struct operation"
-            << ".\n" << logofs_flush;
-    #endif
-
-    return -1;
-  }
-
-  infoPtr = png_create_info_struct(pngPtr);
-
-  if (!infoPtr)
-  { 
-    #ifdef PANIC
-    *logofs << "DecompressPng32: PANIC! "
-            << "Failed png_create_info_struct operation."
-            << ".\n" << logofs_flush;
-    #endif
-    
-    png_destroy_read_struct(&pngPtr, NULL, NULL);
-
-    return -1;
-  }
-
-  if (setjmp(png_jmpbuf(pngPtr)))
-  {
-    #ifdef PANIC
-    *logofs << "DecompressPng32: PANIC! "
-            << "Error during IO initialization"
-            << ".\n" << logofs_flush;
-    #endif
-
-    png_destroy_read_struct(&pngPtr, &infoPtr, NULL);
-
-    return -1;
-  }
-
-  png_set_read_fn(pngPtr, (void *)compressedData, PngReadData);
- 
-  if (setjmp(png_jmpbuf(pngPtr)))
-  {
-    #ifdef PANIC
-    *logofs << "DecompressPng32: PANIC! "
-            << "Error during read of PNG header"
-            << ".\n" << logofs_flush;
-    #endif
-
-    png_destroy_read_struct(&pngPtr, &infoPtr, NULL);
-
-    return -1;
-  }
-
-  png_read_info(pngPtr, infoPtr) ;
-
-
-  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
-  {
-    png_set_expand(pngPtr);
-  }
-
-  //
-  // data points to dstBuf which is
-  // already padded correctly for the final
-  // image to put
-  //
-
-  data = dstBuf;
-
-  rowPointers = (png_byte *) tmpBuf;
-  
-  if (setjmp(png_jmpbuf(pngPtr)))
-  {
-    #ifdef PANIC
-    *logofs << "DecompressPng32: PANIC! "
-            << "Error during read of PNG rows"
-            << ".\n" << logofs_flush;
-    #endif
-
-    png_destroy_read_struct(&pngPtr, &infoPtr, NULL);
-
-    return -1;
-  }
-
-  unsigned long pixel;
-
-  int i;
-
-  for (dy = 0; dy < h; dy++)
-  {
-    png_read_row(pngPtr, rowPointers, NULL);
-
-    for (dx = 0; dx < w; dx++)
-    {
-      pixel = RGB24_TO_PIXEL(32, tmpBuf[dx * 3], tmpBuf[dx * 3 + 1],
-                                 tmpBuf[dx * 3 + 2]);
-
-      //
-      // Follow the server byte order when arranging data.
-      //
-
-      if (byteOrder == LSBFirst)
-      {
-        for (i = 0; i < 4; i++)
-        {
-          data[i] = (unsigned char)(pixel & 0xff);
-          pixel >>= 8;
-        }
-      }
-      else
-      {
-        for (i = 3; i >= 0; i--)
-        {
-          data[i] = (unsigned char) (pixel & 0xff);
-          pixel >>= 8;
-        }
-      }
-
-      data += 4;
-    }
-  }
-
-  png_destroy_read_struct(&pngPtr, &infoPtr,NULL);
-
-  #ifdef DEBUG
-  *logofs << "DecompressPng32: Decompression finished."
-          << dy << " lines handled.\n"
-          << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-static void PngReadData(png_structp png_ptr, png_bytep data, png_size_t length)
-{
-  memcpy((char *) data, (char *) png_get_io_ptr(png_ptr) + streamPos, length);
-
-  streamPos += length;
-}
diff --git a/nxcomp/Pgn.h b/nxcomp/Pgn.h
deleted file mode 100644
index e5ea36715..000000000
--- a/nxcomp/Pgn.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef Pgn_H
-#define Pgn_H
-
-//
-// This file obviously supports PNG
-// decompression. It was renamed to
-// avoid name clashes on Windows.
-//
-
-#include "Misc.h"
-#include "Unpack.h"
-
-int UnpackPng(T_geometry *geometry, unsigned char method, unsigned char *srcData,
-                  int srcSize, int dstBpp, int dstWidth, int dstHeight,
-                      unsigned char *dstData, int dstSize);
-
-#endif /* Pgn_H */
diff --git a/nxcomp/Pipe.cpp b/nxcomp/Pipe.cpp
deleted file mode 100644
index 88f10edb4..000000000
--- a/nxcomp/Pipe.cpp
+++ /dev/null
@@ -1,429 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <pwd.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <grp.h>
-
-#include "Pipe.h"
-#include "Misc.h"
-#include "Fork.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-extern void RegisterChild(int child);
-
-static int Psplit(const char *command, char *parameters[], int limit);
-
-//
-// These are slightly modified versions of popen(3) and pclose(3)
-// that don't rely on a shell to be available on the system, so
-// that they can also work on Windows. As an additional benefit,
-// these functions give up all privileges before running the com-
-// mand. Code is taken from the X distribution and, in turn, is
-// based on libc from FreeBSD 2.2.
-//
-
-static struct pid
-{
-  struct pid *next;
-  FILE *fp;
-  int self;
-
-} *pidlist;
-
-//
-// A very unsofisticated attempt to parse the command line and
-// split each parameter in distinct strings. This is not going
-// to work when dealing with parameters containing spaces, even
-// if they are enclosed in quotes.
-// 
-
-int Psplit(const char *command, char *parameters[], int limit)
-{
-  char *line;
-  char *value;
-
-  int number;
-
-  //
-  // Preapare the list of parameters.
-  //
-
-  for (number = 0; number < limit; number++)
-  {
-    parameters[number] = NULL;
-  }
-
-  //
-  // Copy the command to get rid of the
-  // const qualifier.
-  //
-
-  line = new char[strlen(command) + 1];
-
-  if (line == NULL)
-  {
-    goto PsplitError;
-  }
-
-  strcpy(line, command);
-
-  number = 0;
-
-  value = strtok(line, " ");
-
-  while (value != NULL && number < limit)
-  {
-    #ifdef DEBUG
-    *logofs << "Psplit: Got parameter '" << value
-            << "'.\n" << logofs_flush;
-    #endif
-
-    parameters[number] = new char[strlen(value) + 1];
-
-    if (parameters[number] == NULL)
-    {
-      goto PsplitError;
-    }
-
-    strcpy(parameters[number], value);
-
-    number++;
-
-    //
-    // If this is the first parameter, then
-    // copy it in the second position and
-    // use it as the name of the command.
-    //
-
-    if (number == 1)
-    {
-      parameters[number] = new char[strlen(value) + 1];
-
-      if (parameters[number] == NULL)
-      {
-        goto PsplitError;
-      }
-
-      strcpy(parameters[number], value);
-
-      number++;
-    }
-
-    value = strtok(NULL, " ");
-  }
-
-  //
-  // Needs at least to have the command itself and
-  // the first argument, being again the name of
-  // the command.
-  //
-
-  if (number < 2)
-  {
-    goto PsplitError;
-  }
-
-  return number;
-
-PsplitError:
-
-  #ifdef PANIC
-  *logofs << "Psplit: PANIC! Can't split command line '"
-          << command << "'.\n" << logofs_flush;
-  #endif
-
-  cerr << "Error" << ": Can't split command line '"
-       << command << "'.\n";
-
-  delete [] line;
-
-  return -1;
-}
-
-FILE *Popen(char * const parameters[], const char *type)
-{
-  FILE *iop;
-
-  struct pid *cur;
-  int pdes[2], pid;
-
-  if (parameters == NULL || type == NULL)
-  {
-    return NULL;
-  }
-
-  if ((*type != 'r' && *type != 'w') || type[1])
-  {
-    return NULL;
-  }
-
-  if ((cur = (struct pid *) malloc(sizeof(struct pid))) == NULL)
-  {
-    return NULL;
-  }
-
-  if (pipe(pdes) < 0)
-  {
-    free(cur);
-
-    return NULL;
-  }
-
-  //
-  // Block all signals until command is exited.
-  // We need to gather information about the
-  // child in Pclose().
-  //
-
-  DisableSignals();
-
-  switch (pid = Fork())
-  {
-    case -1:
-    {
-      //
-      // Error.
-      //
-
-      #ifdef PANIC
-      *logofs << "Popen: PANIC! Function fork failed. "
-              << "Error is " << EGET() << " '" << ESTR()
-              << "'.\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Function fork failed. "
-           << "Error is " << EGET() << " '" << ESTR()
-           << "'.\n";
-
-      close(pdes[0]);
-      close(pdes[1]);
-
-      free(cur);
-
-      return NULL;
-    }
-    case 0:
-    {
-      //
-      // Child.
-      //
-
-      struct passwd *pwent = getpwuid(getuid());
-      if (pwent) initgroups(pwent->pw_name,getgid());
-      if (setgid(getgid()) == -1)
-      {
-        _exit(127);
-      }
-      if (setuid(getuid()) == -1)
-      {
-        _exit(127);
-      }
-
-      if (*type == 'r')
-      {
-        if (pdes[1] != 1)
-        {
-          //
-          // Set up stdout.
-          //
-
-          dup2(pdes[1], 1);
-          close(pdes[1]);
-        }
-
-        close(pdes[0]);
-      }
-      else
-      {
-        if (pdes[0] != 0)
-        {
-          //
-          // Set up stdin.
-          //
-
-          dup2(pdes[0], 0);
-          close(pdes[0]);
-        }
-
-        close(pdes[1]);
-      }
-
-      execvp(parameters[0], parameters + 1);
-
-      exit(127);
-    }
-  }
-
-  //
-  // Parent. Save data about the child.
-  //
-
-  RegisterChild(pid);
-
-  if (*type == 'r')
-  {
-    iop = fdopen(pdes[0], type);
-
-    close(pdes[1]);
-  }
-  else
-  {
-    iop = fdopen(pdes[1], type);
-
-    close(pdes[0]);
-  }
-
-  cur -> fp = iop;
-  cur -> self = pid;
-  cur -> next = pidlist;
-
-  pidlist = cur;
-
-  #ifdef TEST
-  *logofs << "Popen: Executing ";
-
-  for (int i = 0; i < 256 && parameters[i] != NULL; i++)
-  {
-    *logofs << "[" << parameters[i] << "]";
-  }
-
-  *logofs << " with descriptor " << fileno(iop)
-          << ".\n" << logofs_flush;
-  #endif
-
-  return iop;
-}
-
-FILE *Popen(const char *command, const char *type)
-{
-  char *parameters[256];
-
-  if (Psplit(command, parameters, 256) > 0)
-  {
-    FILE *file = Popen(parameters, type);
-
-    for (int i = 0; i < 256; i++)
-    {
-      delete [] parameters[i];
-    }
-
-    return file;
-  }
-  else
-  {
-    #ifdef PANIC
-    *logofs << "Popen: PANIC! Failed to parse command '"
-            << command << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Failed to parse command '"
-         << command << "'.\n";
-
-    return NULL;
-  }
-}
-
-int Pclose(FILE *iop)
-{
-  struct pid *cur, *last;
-
-  int pstat;
-  int pid;
-
-  #ifdef TEST
-  *logofs << "Pclose: Closing command with output "
-          << "on descriptor " << fileno(iop) << ".\n"
-          << logofs_flush;
-  #endif
-
-  fclose((FILE *) iop);
-
-  for (last = NULL, cur = pidlist; cur; last = cur, cur = cur -> next)
-  {
-    if (cur -> fp == iop)
-    {
-      break;
-    }
-  }
-
-  if (cur == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "Pclose: PANIC! Failed to find the process "
-            << "for descriptor " << fileno(iop) << ".\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Failed to find the process "
-         << "for descriptor " << fileno(iop) << ".\n";
-
-    return -1;
-  }
-
-  do
-  {
-    #ifdef TEST
-    *logofs << "Pclose: Going to wait for process "
-            << "with pid '" << cur -> self << "'.\n"
-            << logofs_flush;
-    #endif
-
-    pid = waitpid(cur -> self, &pstat, 0);
-  }
-  while (pid == -1 && errno == EINTR);
-
-  if (last == NULL)
-  {
-    pidlist = cur -> next;
-  }
-  else
-  {
-    last -> next = cur -> next;
-  }
-
-  free(cur);
-
-  //
-  // Child has finished and we called the
-  // waitpid(). We can enable signals again.
-  //
-
-  EnableSignals();
-
-  return (pid == -1 ? -1 : pstat);
-}
diff --git a/nxcomp/Pipe.h b/nxcomp/Pipe.h
deleted file mode 100644
index fd1061d30..000000000
--- a/nxcomp/Pipe.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-//
-// These are slightly modified versions of popen(3) and pclose(3)
-// that don't rely on a shell to be available on the system, so
-// that they can also work on Windows.
-//
-
-extern FILE *Popen(char * const parameters[], const char *type);
-extern FILE *Popen(const char *command, const char *type);
-
-extern int Pclose(FILE *file);
diff --git a/nxcomp/PolyArc.cpp b/nxcomp/PolyArc.cpp
deleted file mode 100644
index 8996c6f15..000000000
--- a/nxcomp/PolyArc.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "PolyArc.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int PolyArcStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                    unsigned int size, int bigEndian) const
-{
-  PolyArcMessage *polyArc = (PolyArcMessage *) message;
-
-  //
-  // Here is the fingerprint.
-  //
-
-  polyArc -> drawable = GetULONG(buffer + 4, bigEndian);
-  polyArc -> gcontext = GetULONG(buffer + 8, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed Identity for message at " << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int PolyArcStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                      unsigned int size, int bigEndian) const
-{
-  PolyArcMessage *polyArc = (PolyArcMessage *) message;
-
-  //
-  // Fill all the message's fields.
-  //
-
-  PutULONG(polyArc -> drawable, buffer + 4, bigEndian);
-  PutULONG(polyArc -> gcontext, buffer + 8, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at " << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void PolyArcStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  PolyArcMessage *polyArc = (PolyArcMessage *) message;
-
-  *logofs << name() << ": Identity drawable " << polyArc -> drawable
-                    << ", gcontext " << polyArc -> gcontext
-                    << ", size " << polyArc -> size_ << ".\n" << logofs_flush;
-  #endif
-}
-
-void PolyArcStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                        unsigned int size, int bigEndian) const
-{
-}
-
-void PolyArcStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                      const Message *cachedMessage,
-                                          ChannelCache *channelCache) const
-{
-  PolyArcMessage *polyArc       = (PolyArcMessage *) message;
-  PolyArcMessage *cachedPolyArc = (PolyArcMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << polyArc -> drawable
-          << " as drawable field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeXidValue(polyArc -> drawable, clientCache -> drawableCache);
-
-  cachedPolyArc -> drawable = polyArc -> drawable;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << polyArc -> gcontext
-          << " as gcontext field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeXidValue(polyArc -> gcontext, clientCache -> gcCache);
-
-  cachedPolyArc -> gcontext = polyArc -> gcontext;
-}
-
-void PolyArcStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                      ChannelCache *channelCache) const
-{
-  PolyArcMessage *polyArc = (PolyArcMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
-
-  polyArc -> drawable = value;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << polyArc -> drawable
-          << " as drawable field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeXidValue(value, clientCache -> gcCache);
-
-  polyArc -> gcontext = value;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << polyArc -> gcontext
-          << " as gcontext field.\n" << logofs_flush;
-  #endif
-}
-
-
diff --git a/nxcomp/PolyArc.h b/nxcomp/PolyArc.h
deleted file mode 100644
index d744d6a10..000000000
--- a/nxcomp/PolyArc.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef PolyArc_H
-#define PolyArc_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define POLYARC_ENABLE_CACHE               1
-#define POLYARC_ENABLE_DATA                0
-#define POLYARC_ENABLE_SPLIT               0
-#define POLYARC_ENABLE_COMPRESS            0
-
-#define POLYARC_DATA_LIMIT                 1980
-#define POLYARC_DATA_OFFSET                12
-
-#define POLYARC_CACHE_SLOTS                2000
-#define POLYARC_CACHE_THRESHOLD            2
-#define POLYARC_CACHE_LOWER_THRESHOLD      1
-
-//
-// The message class.
-//
-
-class PolyArcMessage : public Message
-{
-  friend class PolyArcStore;
-
-  public:
-
-  PolyArcMessage()
-  {
-  }
-
-  ~PolyArcMessage()
-  {
-  }
-
-  //
-  // Put here the fields which constitute 
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned int drawable;
-  unsigned int gcontext;
-};
-
-class PolyArcStore : public MessageStore
-{
-  //
-  // Constructors and destructors.
-  //
-
-  public:
-
-  PolyArcStore() : MessageStore()
-  {
-    enableCache    = POLYARC_ENABLE_CACHE;
-    enableData     = POLYARC_ENABLE_DATA;
-    enableSplit    = POLYARC_ENABLE_SPLIT;
-    enableCompress = POLYARC_ENABLE_COMPRESS;
-
-    dataLimit  = POLYARC_DATA_LIMIT;
-    dataOffset = POLYARC_DATA_OFFSET;
-
-    cacheSlots          = POLYARC_CACHE_SLOTS;
-    cacheThreshold      = POLYARC_CACHE_THRESHOLD;
-    cacheLowerThreshold = POLYARC_CACHE_LOWER_THRESHOLD;
-
-    messages_ -> resize(cacheSlots);
-
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      *i = NULL;
-    }
-
-    temporary_ = NULL;
-  }
-
-  virtual ~PolyArcStore()
-  {
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      destroy(*i);
-    }
-
-    destroy(temporary_);
-  }
-
-  virtual const char *name() const
-  {
-    return "PolyArc";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_PolyArc;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(PolyArcMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  public:
-
-  virtual Message *create() const
-  {
-    return new PolyArcMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new PolyArcMessage((const PolyArcMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (PolyArcMessage *) message;
-  }
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* PolyArc_H */
diff --git a/nxcomp/PolyFillArc.cpp b/nxcomp/PolyFillArc.cpp
deleted file mode 100644
index f995a8815..000000000
--- a/nxcomp/PolyFillArc.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "PolyFillArc.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int PolyFillArcStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                        unsigned int size, int bigEndian) const
-{
-  PolyFillArcMessage *polyFillArc = (PolyFillArcMessage *) message;
-
-  //
-  // Here is the fingerprint.
-  //
-
-  polyFillArc -> drawable = GetULONG(buffer + 4, bigEndian);
-  polyFillArc -> gcontext = GetULONG(buffer + 8, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed Identity for message at " << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int PolyFillArcStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                          unsigned int size, int bigEndian) const
-{
-  PolyFillArcMessage *polyFillArc = (PolyFillArcMessage *) message;
-
-  //
-  // Fill all the message's fields.
-  //
-
-  PutULONG(polyFillArc -> drawable, buffer + 4, bigEndian);
-  PutULONG(polyFillArc -> gcontext, buffer + 8, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at " << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void PolyFillArcStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  PolyFillArcMessage *polyFillArc = (PolyFillArcMessage *) message;
-
-  *logofs << name() << ": Identity drawable " << polyFillArc -> drawable
-                    << ", gcontext " << polyFillArc -> gcontext
-                    << ", size " << polyFillArc -> size_ << ".\n" << logofs_flush;
-  #endif
-}
-
-void PolyFillArcStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                            unsigned int size, int bigEndian) const
-{
-}
-
-void PolyFillArcStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                          const Message *cachedMessage,
-                                              ChannelCache *channelCache) const
-{
-  PolyFillArcMessage *polyFillArc       = (PolyFillArcMessage *) message;
-  PolyFillArcMessage *cachedPolyFillArc = (PolyFillArcMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << polyFillArc -> drawable
-          << " as drawable field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeXidValue(polyFillArc -> drawable, clientCache -> drawableCache);
-
-  cachedPolyFillArc -> drawable = polyFillArc -> drawable;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << polyFillArc -> gcontext
-          << " as gcontext field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeXidValue(polyFillArc -> gcontext, clientCache -> gcCache);
-
-  cachedPolyFillArc -> gcontext = polyFillArc -> gcontext;
-}
-
-void PolyFillArcStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                          ChannelCache *channelCache) const
-{
-  PolyFillArcMessage *polyFillArc = (PolyFillArcMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
-
-  polyFillArc -> drawable = value;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << polyFillArc -> drawable
-          << " as drawable field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeXidValue(value, clientCache -> gcCache);
-
-  polyFillArc -> gcontext = value;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << polyFillArc -> gcontext
-          << " as gcontext field.\n" << logofs_flush;
-  #endif
-}
-
-
diff --git a/nxcomp/PolyFillArc.h b/nxcomp/PolyFillArc.h
deleted file mode 100644
index a4eff5b48..000000000
--- a/nxcomp/PolyFillArc.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef PolyFillArc_H
-#define PolyFillArc_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define POLYFILLARC_ENABLE_CACHE               1
-#define POLYFILLARC_ENABLE_DATA                0
-#define POLYFILLARC_ENABLE_SPLIT               0
-#define POLYFILLARC_ENABLE_COMPRESS            0
-
-#define POLYFILLARC_DATA_LIMIT                 6144
-#define POLYFILLARC_DATA_OFFSET                12
-
-#define POLYFILLARC_CACHE_SLOTS                2000
-#define POLYFILLARC_CACHE_THRESHOLD            2
-#define POLYFILLARC_CACHE_LOWER_THRESHOLD      1
-
-//
-// The message class.
-//
-
-class PolyFillArcMessage : public Message
-{
-  friend class PolyFillArcStore;
-
-  public:
-
-  PolyFillArcMessage()
-  {
-  }
-
-  ~PolyFillArcMessage()
-  {
-  }
-
-  //
-  // Put here the fields which constitute 
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned int drawable;
-  unsigned int gcontext;
-};
-
-class PolyFillArcStore : public MessageStore
-{
-  //
-  // Constructors and destructors.
-  //
-
-  public:
-
-  PolyFillArcStore() : MessageStore()
-  {
-    enableCache    = POLYFILLARC_ENABLE_CACHE;
-    enableData     = POLYFILLARC_ENABLE_DATA;
-    enableSplit    = POLYFILLARC_ENABLE_SPLIT;
-    enableCompress = POLYFILLARC_ENABLE_COMPRESS;
-
-    dataLimit  = POLYFILLARC_DATA_LIMIT;
-    dataOffset = POLYFILLARC_DATA_OFFSET;
-
-    cacheSlots          = POLYFILLARC_CACHE_SLOTS;
-    cacheThreshold      = POLYFILLARC_CACHE_THRESHOLD;
-    cacheLowerThreshold = POLYFILLARC_CACHE_LOWER_THRESHOLD;
-
-    messages_ -> resize(cacheSlots);
-
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      *i = NULL;
-    }
-
-    temporary_ = NULL;
-  }
-
-  virtual ~PolyFillArcStore()
-  {
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      destroy(*i);
-    }
-
-    destroy(temporary_);
-  }
-
-  virtual const char *name() const
-  {
-    return "PolyFillArc";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_PolyFillArc;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(PolyFillArcMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  public:
-
-  virtual Message *create() const
-  {
-    return new PolyFillArcMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new PolyFillArcMessage((const PolyFillArcMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (PolyFillArcMessage *) message;
-  }
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* PolyFillArc_H */
diff --git a/nxcomp/PolyFillRectangle.cpp b/nxcomp/PolyFillRectangle.cpp
deleted file mode 100644
index d0f1452b2..000000000
--- a/nxcomp/PolyFillRectangle.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "PolyFillRectangle.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int PolyFillRectangleStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                              unsigned int size, int bigEndian) const
-{
-  PolyFillRectangleMessage *polyFillRectangle = (PolyFillRectangleMessage *) message;
-
-  //
-  // Here is the fingerprint.
-  //
-
-  polyFillRectangle -> drawable = GetULONG(buffer + 4, bigEndian);
-  polyFillRectangle -> gcontext = GetULONG(buffer + 8, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed Identity for message at " << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int PolyFillRectangleStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                                unsigned int size, int bigEndian) const
-{
-  PolyFillRectangleMessage *polyFillRectangle = (PolyFillRectangleMessage *) message;
-
-  //
-  // Fill all the message's fields.
-  //
-
-  PutULONG(polyFillRectangle -> drawable, buffer + 4, bigEndian);
-  PutULONG(polyFillRectangle -> gcontext, buffer + 8, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at " << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void PolyFillRectangleStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  PolyFillRectangleMessage *polyFillRectangle = (PolyFillRectangleMessage *) message;
-
-  *logofs << name() << ": Identity drawable " << polyFillRectangle -> drawable
-                    << ", gcontext " << polyFillRectangle -> gcontext
-                    << ", size " << polyFillRectangle -> size_ << ".\n" << logofs_flush;
-  #endif
-}
-
-void PolyFillRectangleStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                                  unsigned int size, int bigEndian) const
-{
-}
-
-void PolyFillRectangleStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                                const Message *cachedMessage,
-                                                    ChannelCache *channelCache) const
-{
-  PolyFillRectangleMessage *polyFillRectangle       = (PolyFillRectangleMessage *) message;
-  PolyFillRectangleMessage *cachedPolyFillRectangle = (PolyFillRectangleMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Encoding value " << polyFillRectangle -> drawable
-          << " as drawable field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeXidValue(polyFillRectangle -> drawable, clientCache -> drawableCache);
-
-  cachedPolyFillRectangle -> drawable = polyFillRectangle -> drawable;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Encoding value " << polyFillRectangle -> gcontext
-          << " as gcontext field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeXidValue(polyFillRectangle -> gcontext, clientCache -> gcCache);
-
-  cachedPolyFillRectangle -> gcontext = polyFillRectangle -> gcontext;
-}
-
-void PolyFillRectangleStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                                ChannelCache *channelCache) const
-{
-  PolyFillRectangleMessage *polyFillRectangle = (PolyFillRectangleMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
-
-  polyFillRectangle -> drawable = value;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << polyFillRectangle -> drawable
-          << " as drawable field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeXidValue(value, clientCache -> gcCache);
-
-  polyFillRectangle -> gcontext = value;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << polyFillRectangle -> gcontext
-          << " as gcontext field.\n" << logofs_flush;
-  #endif
-}
diff --git a/nxcomp/PolyFillRectangle.h b/nxcomp/PolyFillRectangle.h
deleted file mode 100644
index 7ebb9270d..000000000
--- a/nxcomp/PolyFillRectangle.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef PolyFillRectangle_H
-#define PolyFillRectangle_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define POLYFILLRECTANGLE_ENABLE_CACHE                           1
-#define POLYFILLRECTANGLE_ENABLE_DATA                            0
-#define POLYFILLRECTANGLE_ENABLE_SPLIT                           0
-#define POLYFILLRECTANGLE_ENABLE_COMPRESS                        0
-
-#define POLYFILLRECTANGLE_DATA_LIMIT                             2048
-#define POLYFILLRECTANGLE_DATA_OFFSET                            12
-
-#define POLYFILLRECTANGLE_CACHE_SLOTS                            4000
-#define POLYFILLRECTANGLE_CACHE_THRESHOLD                        5
-#define POLYFILLRECTANGLE_CACHE_LOWER_THRESHOLD                  1
-
-//
-// The message class.
-//
-
-class PolyFillRectangleMessage : public Message
-{
-  friend class PolyFillRectangleStore;
-
-  public:
-
-  PolyFillRectangleMessage()
-  {
-  }
-
-  ~PolyFillRectangleMessage()
-  {
-  }
-
-  //
-  // Put here the fields which constitute 
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned int drawable;
-  unsigned int gcontext;
-};
-
-class PolyFillRectangleStore : public MessageStore
-{
-  //
-  // Constructors and destructors.
-  //
-
-  public:
-
-  PolyFillRectangleStore() : MessageStore()
-  {
-    enableCache    = POLYFILLRECTANGLE_ENABLE_CACHE;
-    enableData     = POLYFILLRECTANGLE_ENABLE_DATA;
-    enableSplit    = POLYFILLRECTANGLE_ENABLE_SPLIT;
-    enableCompress = POLYFILLRECTANGLE_ENABLE_COMPRESS;
-
-    dataLimit  = POLYFILLRECTANGLE_DATA_LIMIT;
-    dataOffset = POLYFILLRECTANGLE_DATA_OFFSET;
-
-    cacheSlots          = POLYFILLRECTANGLE_CACHE_SLOTS;
-    cacheThreshold      = POLYFILLRECTANGLE_CACHE_THRESHOLD;
-    cacheLowerThreshold = POLYFILLRECTANGLE_CACHE_LOWER_THRESHOLD;
-
-    messages_ -> resize(cacheSlots);
-
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      *i = NULL;
-    }
-
-    temporary_ = NULL;
-  }
-
-  virtual ~PolyFillRectangleStore()
-  {
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      destroy(*i);
-    }
-
-    destroy(temporary_);
-  }
-
-  virtual const char *name() const
-  {
-    return "PolyFillRectangle";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_PolyFillRectangle;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(PolyFillRectangleMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  public:
-
-  virtual Message *create() const
-  {
-    return new PolyFillRectangleMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new PolyFillRectangleMessage((const PolyFillRectangleMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (PolyFillRectangleMessage *) message;
-  }
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* PolyFillRectangle_H */
diff --git a/nxcomp/PolyLine.cpp b/nxcomp/PolyLine.cpp
deleted file mode 100644
index 845985728..000000000
--- a/nxcomp/PolyLine.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "PolyLine.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int PolyLineStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                     unsigned int size, int bigEndian) const
-{
-  PolyLineMessage *polyLine = (PolyLineMessage *) message;
-
-  //
-  // Here is the fingerprint.
-  //
-
-  polyLine -> mode = *(buffer + 1);
-
-  polyLine -> drawable = GetULONG(buffer + 4, bigEndian);
-  polyLine -> gcontext = GetULONG(buffer + 8, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed Identity for message at " << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int PolyLineStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                       unsigned int size, int bigEndian) const
-{
-  PolyLineMessage *polyLine = (PolyLineMessage *) message;
-
-  //
-  // Fill all the message's fields.
-  //
-
-  *(buffer + 1) = polyLine -> mode;
-
-  PutULONG(polyLine -> drawable, buffer + 4, bigEndian);
-  PutULONG(polyLine -> gcontext, buffer + 8, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at " << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void PolyLineStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  PolyLineMessage *polyLine = (PolyLineMessage *) message;
-
-  *logofs << name() << ": Identity drawable " << polyLine -> drawable
-                    << ", gcontext " << polyLine -> gcontext
-                    << ", size " << polyLine -> size_ << ".\n" << logofs_flush;
-  #endif
-}
-
-void PolyLineStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                         unsigned int size, int bigEndian) const
-{
-  // Since ProtoStep8 (#issue 108)
-  md5_append(md5_state_, buffer + 1, 1);
-}
-
-void PolyLineStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                       const Message *cachedMessage,
-                                           ChannelCache *channelCache) const
-{
-  PolyLineMessage *polyLine       = (PolyLineMessage *) message;
-  PolyLineMessage *cachedPolyLine = (PolyLineMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << polyLine -> drawable
-          << " as drawable field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeXidValue(polyLine -> drawable, clientCache -> drawableCache);
-
-  cachedPolyLine -> drawable = polyLine -> drawable;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << polyLine -> gcontext
-          << " as gcontext field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeXidValue(polyLine -> gcontext, clientCache -> gcCache);
-
-  cachedPolyLine -> gcontext = polyLine -> gcontext;
-}
-
-void PolyLineStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                       ChannelCache *channelCache) const
-{
-  PolyLineMessage *polyLine = (PolyLineMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
-
-  polyLine -> drawable = value;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << polyLine -> drawable
-          << " as drawable field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeXidValue(value, clientCache -> gcCache);
-
-  polyLine -> gcontext = value;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << polyLine -> gcontext
-          << " as gcontext field.\n" << logofs_flush;
-  #endif
-}
-
-
diff --git a/nxcomp/PolyLine.h b/nxcomp/PolyLine.h
deleted file mode 100644
index 66fa5df1a..000000000
--- a/nxcomp/PolyLine.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef PolyLine_H
-#define PolyLine_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define POLYLINE_ENABLE_CACHE               1
-#define POLYLINE_ENABLE_DATA                0
-#define POLYLINE_ENABLE_SPLIT               0
-#define POLYLINE_ENABLE_COMPRESS            0
-
-#define POLYLINE_DATA_LIMIT                 144
-#define POLYLINE_DATA_OFFSET                12
-
-#define POLYLINE_CACHE_SLOTS                3000
-#define POLYLINE_CACHE_THRESHOLD            3
-#define POLYLINE_CACHE_LOWER_THRESHOLD      1
-
-//
-// The message class.
-//
-
-class PolyLineMessage : public Message
-{
-  friend class PolyLineStore;
-
-  public:
-
-  PolyLineMessage()
-  {
-  }
-
-  ~PolyLineMessage()
-  {
-  }
-
-  //
-  // Put here the fields which constitute 
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned char mode;
-  unsigned int  drawable;
-  unsigned int  gcontext;
-};
-
-class PolyLineStore : public MessageStore
-{
-  //
-  // Constructors and destructors.
-  //
-
-  public:
-
-  PolyLineStore() : MessageStore()
-  {
-    enableCache    = POLYLINE_ENABLE_CACHE;
-    enableData     = POLYLINE_ENABLE_DATA;
-    enableSplit    = POLYLINE_ENABLE_SPLIT;
-    enableCompress = POLYLINE_ENABLE_COMPRESS;
-
-    dataLimit  = POLYLINE_DATA_LIMIT;
-    dataOffset = POLYLINE_DATA_OFFSET;
-
-    cacheSlots          = POLYLINE_CACHE_SLOTS;
-    cacheThreshold      = POLYLINE_CACHE_THRESHOLD;
-    cacheLowerThreshold = POLYLINE_CACHE_LOWER_THRESHOLD;
-
-    messages_ -> resize(cacheSlots);
-
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      *i = NULL;
-    }
-
-    temporary_ = NULL;
-  }
-
-  virtual ~PolyLineStore()
-  {
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      destroy(*i);
-    }
-
-    destroy(temporary_);
-  }
-
-  virtual const char *name() const
-  {
-    return "PolyLine";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_PolyLine;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(PolyLineMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  public:
-
-  virtual Message *create() const
-  {
-    return new PolyLineMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new PolyLineMessage((const PolyLineMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (PolyLineMessage *) message;
-  }
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* PolyLine_H */
diff --git a/nxcomp/PolyPoint.cpp b/nxcomp/PolyPoint.cpp
deleted file mode 100644
index dfd77f40b..000000000
--- a/nxcomp/PolyPoint.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "PolyPoint.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int PolyPointStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                      unsigned int size, int bigEndian) const
-{
-  PolyPointMessage *polyPoint = (PolyPointMessage *) message;
-
-  //
-  // Here is the fingerprint.
-  //
-
-  polyPoint -> mode = *(buffer + 1);
-
-  polyPoint -> drawable = GetULONG(buffer + 4, bigEndian);
-  polyPoint -> gcontext = GetULONG(buffer + 8, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed Identity for message at " << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int PolyPointStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                        unsigned int size, int bigEndian) const
-{
-  PolyPointMessage *polyPoint = (PolyPointMessage *) message;
-
-  //
-  // Fill all the message's fields.
-  //
-
-  *(buffer + 1) = polyPoint -> mode;
-
-  PutULONG(polyPoint -> drawable, buffer + 4, bigEndian);
-  PutULONG(polyPoint -> gcontext, buffer + 8, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at " << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void PolyPointStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  PolyPointMessage *polyPoint = (PolyPointMessage *) message;
-
-  *logofs << name() << ": Identity drawable " << polyPoint -> drawable
-                    << ", gcontext " << polyPoint -> gcontext
-                    << ", size " << polyPoint -> size_ << ".\n" << logofs_flush;
-  #endif
-}
-
-void PolyPointStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                          unsigned int size, int bigEndian) const
-{
-  // Since ProtoStep8 (#issue 108)
-  md5_append(md5_state_, buffer + 1, 1);
-}
-
-void PolyPointStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                        const Message *cachedMessage,
-                                            ChannelCache *channelCache) const
-{
-  PolyPointMessage *polyPoint       = (PolyPointMessage *) message;
-  PolyPointMessage *cachedPolyPoint = (PolyPointMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << polyPoint -> drawable
-          << " as drawable field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeXidValue(polyPoint -> drawable, clientCache -> drawableCache);
-
-  cachedPolyPoint -> drawable = polyPoint -> drawable;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << polyPoint -> gcontext
-          << " as gcontext field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeXidValue(polyPoint -> gcontext, clientCache -> gcCache);
-
-  cachedPolyPoint -> gcontext = polyPoint -> gcontext;
-}
-
-void PolyPointStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                        ChannelCache *channelCache) const
-{
-  PolyPointMessage *polyPoint = (PolyPointMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
-
-  polyPoint -> drawable = value;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << polyPoint -> drawable
-          << " as drawable field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeXidValue(value, clientCache -> gcCache);
-
-  polyPoint -> gcontext = value;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << polyPoint -> gcontext
-          << " as gcontext field.\n" << logofs_flush;
-  #endif
-}
-
-
diff --git a/nxcomp/PolyPoint.h b/nxcomp/PolyPoint.h
deleted file mode 100644
index b8ea183bf..000000000
--- a/nxcomp/PolyPoint.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef PolyPoint_H
-#define PolyPoint_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define POLYPOINT_ENABLE_CACHE               1
-#define POLYPOINT_ENABLE_DATA                0
-#define POLYPOINT_ENABLE_SPLIT               0
-#define POLYPOINT_ENABLE_COMPRESS            0
-
-#define POLYPOINT_DATA_LIMIT                 3200
-#define POLYPOINT_DATA_OFFSET                12
-
-#define POLYPOINT_CACHE_SLOTS                3000
-#define POLYPOINT_CACHE_THRESHOLD            3
-#define POLYPOINT_CACHE_LOWER_THRESHOLD      1
-
-//
-// The message class.
-//
-
-class PolyPointMessage : public Message
-{
-  friend class PolyPointStore;
-
-  public:
-
-  PolyPointMessage()
-  {
-  }
-
-  ~PolyPointMessage()
-  {
-  }
-
-  //
-  // Put here the fields which constitute 
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned char mode;
-  unsigned int  drawable;
-  unsigned int  gcontext;
-};
-
-class PolyPointStore : public MessageStore
-{
-  //
-  // Constructors and destructors.
-  //
-
-  public:
-
-  PolyPointStore() : MessageStore()
-  {
-    enableCache    = POLYPOINT_ENABLE_CACHE;
-    enableData     = POLYPOINT_ENABLE_DATA;
-    enableSplit    = POLYPOINT_ENABLE_SPLIT;
-    enableCompress = POLYPOINT_ENABLE_COMPRESS;
-
-    dataLimit  = POLYPOINT_DATA_LIMIT;
-    dataOffset = POLYPOINT_DATA_OFFSET;
-
-    cacheSlots          = POLYPOINT_CACHE_SLOTS;
-    cacheThreshold      = POLYPOINT_CACHE_THRESHOLD;
-    cacheLowerThreshold = POLYPOINT_CACHE_LOWER_THRESHOLD;
-
-    messages_ -> resize(cacheSlots);
-
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      *i = NULL;
-    }
-
-    temporary_ = NULL;
-  }
-
-  virtual ~PolyPointStore()
-  {
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      destroy(*i);
-    }
-
-    destroy(temporary_);
-  }
-
-  virtual const char *name() const
-  {
-    return "PolyPoint";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_PolyPoint;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(PolyPointMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  public:
-
-  virtual Message *create() const
-  {
-    return new PolyPointMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new PolyPointMessage((const PolyPointMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (PolyPointMessage *) message;
-  }
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* PolyPoint_H */
diff --git a/nxcomp/PolySegment.cpp b/nxcomp/PolySegment.cpp
deleted file mode 100644
index 34c2461f1..000000000
--- a/nxcomp/PolySegment.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "PolySegment.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int PolySegmentStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                        unsigned int size, int bigEndian) const
-{
-  PolySegmentMessage *polySegment = (PolySegmentMessage *) message;
-
-  //
-  // Here is the fingerprint.
-  //
-
-  polySegment -> drawable = GetULONG(buffer + 4, bigEndian);
-  polySegment -> gcontext = GetULONG(buffer + 8, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed Identity for message at " << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int PolySegmentStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                          unsigned int size, int bigEndian) const
-{
-  PolySegmentMessage *polySegment = (PolySegmentMessage *) message;
-
-  //
-  // Fill all the message's fields.
-  //
-
-  PutULONG(polySegment -> drawable, buffer + 4, bigEndian);
-  PutULONG(polySegment -> gcontext, buffer + 8, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at " << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void PolySegmentStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  PolySegmentMessage *polySegment = (PolySegmentMessage *) message;
-
-  *logofs << name() << ": Identity drawable " << polySegment -> drawable
-                    << ", gcontext " << polySegment -> gcontext
-                    << ", size " << polySegment -> size_ << ".\n" << logofs_flush;
-  #endif
-}
-
-void PolySegmentStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                            unsigned int size, int bigEndian) const
-{
-}
-
-void PolySegmentStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                          const Message *cachedMessage,
-                                              ChannelCache *channelCache) const
-{
-  PolySegmentMessage *polySegment       = (PolySegmentMessage *) message;
-  PolySegmentMessage *cachedPolySegment = (PolySegmentMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << polySegment -> drawable
-          << " as drawable field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeXidValue(polySegment -> drawable, clientCache -> drawableCache);
-
-  cachedPolySegment -> drawable = polySegment -> drawable;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << polySegment -> gcontext
-          << " as gcontext field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeXidValue(polySegment -> gcontext, clientCache -> gcCache);
-
-  cachedPolySegment -> gcontext = polySegment -> gcontext;
-}
-
-void PolySegmentStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                          ChannelCache *channelCache) const
-{
-  PolySegmentMessage *polySegment = (PolySegmentMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
-
-  polySegment -> drawable = value;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << polySegment -> drawable
-          << " as drawable field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeXidValue(value, clientCache -> gcCache);
-
-  polySegment -> gcontext = value;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << polySegment -> gcontext
-          << " as gcontext field.\n" << logofs_flush;
-  #endif
-}
-
-
diff --git a/nxcomp/PolySegment.h b/nxcomp/PolySegment.h
deleted file mode 100644
index 53fd42c60..000000000
--- a/nxcomp/PolySegment.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef PolySegment_H
-#define PolySegment_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define POLYSEGMENT_ENABLE_CACHE               1
-#define POLYSEGMENT_ENABLE_DATA                0
-#define POLYSEGMENT_ENABLE_SPLIT               0
-#define POLYSEGMENT_ENABLE_COMPRESS            0
-
-#define POLYSEGMENT_DATA_LIMIT                 8192
-#define POLYSEGMENT_DATA_OFFSET                12
-
-#define POLYSEGMENT_CACHE_SLOTS                3000
-#define POLYSEGMENT_CACHE_THRESHOLD            5
-#define POLYSEGMENT_CACHE_LOWER_THRESHOLD      1
-
-//
-// The message class.
-//
-
-class PolySegmentMessage : public Message
-{
-  friend class PolySegmentStore;
-
-  public:
-
-  PolySegmentMessage()
-  {
-  }
-
-  ~PolySegmentMessage()
-  {
-  }
-
-  //
-  // Put here the fields which constitute 
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned int drawable;
-  unsigned int gcontext;
-};
-
-class PolySegmentStore : public MessageStore
-{
-  //
-  // Constructors and destructors.
-  //
-
-  public:
-
-  PolySegmentStore() : MessageStore()
-  {
-    enableCache    = POLYSEGMENT_ENABLE_CACHE;
-    enableData     = POLYSEGMENT_ENABLE_DATA;
-    enableSplit    = POLYSEGMENT_ENABLE_SPLIT;
-    enableCompress = POLYSEGMENT_ENABLE_COMPRESS;
-
-    dataLimit           = POLYSEGMENT_DATA_LIMIT;
-    dataOffset          = POLYSEGMENT_DATA_OFFSET;
-
-    cacheSlots          = POLYSEGMENT_CACHE_SLOTS;
-    cacheThreshold      = POLYSEGMENT_CACHE_THRESHOLD;
-    cacheLowerThreshold = POLYSEGMENT_CACHE_LOWER_THRESHOLD;
-
-    messages_ -> resize(cacheSlots);
-
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      *i = NULL;
-    }
-
-    temporary_ = NULL;
-  }
-
-  virtual ~PolySegmentStore()
-  {
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      destroy(*i);
-    }
-
-    destroy(temporary_);
-  }
-
-  virtual const char *name() const
-  {
-    return "PolySegment";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_PolySegment;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(PolySegmentMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  public:
-
-  virtual Message *create() const
-  {
-    return new PolySegmentMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new PolySegmentMessage((const PolySegmentMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (PolySegmentMessage *) message;
-  }
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* PolySegment_H */
diff --git a/nxcomp/PolyText16.cpp b/nxcomp/PolyText16.cpp
deleted file mode 100644
index 80c77a70f..000000000
--- a/nxcomp/PolyText16.cpp
+++ /dev/null
@@ -1,308 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "PolyText16.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int PolyText16Store::parseIdentity(Message *message, const unsigned char *buffer,
-                                       unsigned int size, int bigEndian) const
-{
-  PolyText16Message *polyText16 = (PolyText16Message *) message;
-
-  //
-  // Here is the fingerprint.
-  //
-
-  polyText16 -> drawable = GetULONG(buffer + 4, bigEndian); 
-  polyText16 -> gcontext = GetULONG(buffer + 8, bigEndian);
-
-  polyText16 -> x = GetUINT(buffer + 12, bigEndian);
-  polyText16 -> y = GetUINT(buffer + 14, bigEndian);
-
-  //
-  // Clean up padding bytes.
-  //
-
-  #ifdef DUMP
-
-  DumpData(buffer, size);
-
-  *logofs << "\n" << logofs_flush;
-
-  #endif
-
-  if ((int) size > dataOffset)
-  {
-    int current;
-    int length;
-    int delta;
-    int item;
-    
-    unsigned int nitem;
-
-    unsigned char *pad = NULL; 
-    unsigned char *end = NULL;
-
-    delta = 1;
-    nitem = 0;
-
-    #ifdef DUMP
-    *logofs << name() << " Size " << size << ".\n" << logofs_flush;
-    #endif
-
-    //
-    // Data is a list of TextItem where element
-    // can be a string or a font shift.
-    //
-
-    current = POLYTEXT16_DATA_OFFSET;
-    length  = POLYTEXT16_DATA_OFFSET;
-
-    do
-    {
-      #ifdef DUMP
-      *logofs << name() << " Current " << current << ".\n" << logofs_flush;
-      #endif
-
-      item = GetUINT(buffer + length , bigEndian);
-
-      if (item < 255)
-      {
-        //
-        // Text element. Number represents
-        // the 'Length of CHAR2B string'
-        // field.
-        //
-
-        length += ((item * 2) + delta + 1);
-
-        nitem++;
-      }
-      else if (item == 255)
-      {
-        //
-        // Element is a font shift.
-        //
-
-        length += 5;
-
-        nitem++;
-      }
-
-      #ifdef DUMP
-      *logofs << name() << " Item " << item << ".\n" << logofs_flush;
-      #endif
-
-      current += length;
-    }
-    while(current < (int) size && item != 0);
-
-    #ifdef DUMP
-    *logofs << name() << " Final length " << length << ".\n" << logofs_flush;
-    #endif
-
-    end = ((unsigned char *) buffer) + size;
-
-    pad = ((unsigned char *) buffer) + length;
-
-    for (; pad < end && nitem >= 1; pad++)
-    {
-      #ifdef DUMP
-      *logofs << name() << " Padding " << " .\n" << logofs_flush;
-      #endif
-
-      *pad = 0;
-    }
-  }
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed Identity for message at " << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int PolyText16Store::unparseIdentity(const Message *message, unsigned char *buffer,
-                                         unsigned int size, int bigEndian) const
-{
-  PolyText16Message *polyText16 = (PolyText16Message *) message;
-
-  //
-  // Fill all the message's fields.
-  //
-
-  PutULONG(polyText16 -> drawable, buffer + 4, bigEndian);
-  PutULONG(polyText16 -> gcontext, buffer + 8, bigEndian);
-
-  PutUINT(polyText16 -> x, buffer + 12, bigEndian);
-  PutUINT(polyText16 -> y, buffer + 14, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at " << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void PolyText16Store::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  PolyText16Message *polyText16 = (PolyText16Message *) message;
-
-  *logofs << name() << ": Identity drawable " << polyText16 -> drawable 
-          << ", gcontext " << polyText16 -> gcontext << ", x " << polyText16 -> x 
-          << ", y " << polyText16 -> y << ", size " << polyText16 -> size_ 
-          << ".\n";
-
-  #endif
-}
-
-void PolyText16Store::identityChecksum(const Message *message, const unsigned char *buffer,
-                                           unsigned int size, int bigEndian) const
-{
-}
-
-void PolyText16Store::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                         const Message *cachedMessage,
-                                             ChannelCache *channelCache) const
-{
-  PolyText16Message *polyText16       = (PolyText16Message *) message;
-  PolyText16Message *cachedPolyText16 = (PolyText16Message *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << polyText16 -> drawable
-          << " as " << "drawable" << " field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeXidValue(polyText16 -> drawable, clientCache -> drawableCache);
-
-  cachedPolyText16 -> drawable = polyText16 -> drawable;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << polyText16 -> gcontext
-          << " as " << "gcontext" << " field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeXidValue(polyText16 -> gcontext, clientCache -> gcCache);
-
-  cachedPolyText16 -> gcontext = polyText16 -> gcontext;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << polyText16 -> x
-          << " as " << "x" << " field.\n" << logofs_flush;
-  #endif
-
-  unsigned short int diff_x = polyText16 -> x - cachedPolyText16 -> x;
-
-  encodeBuffer.encodeCachedValue(diff_x, 16,
-                     clientCache -> polyTextCacheX);
-
-  cachedPolyText16 -> x = polyText16 -> x;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << polyText16 -> y
-          << " as " << "y" << " field.\n" << logofs_flush;
-  #endif
-
-  unsigned short int diff_y = polyText16 -> y - cachedPolyText16 -> y;
-
-  encodeBuffer.encodeCachedValue(diff_y, 16,
-                     clientCache -> polyTextCacheY);
-
-  cachedPolyText16 -> y = polyText16 -> y;
-}
-
-void PolyText16Store::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                         ChannelCache *channelCache) const
-{
-  PolyText16Message *polyText16 = (PolyText16Message *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
-
-  polyText16 -> drawable = value;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << polyText16 -> drawable
-          << " as " << "drawable" << " field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeXidValue(value, clientCache -> gcCache);
-
-  polyText16 -> gcontext = value;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << polyText16 -> gcontext
-          << " as gcontext field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeCachedValue(value, 16,
-               clientCache -> polyTextCacheX);
-
-  polyText16 -> x += value;
-  polyText16 -> x &= 0xffff;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << polyText16 -> x
-          << " as x field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeCachedValue(value, 16,
-               clientCache -> polyTextCacheY);
-
-  polyText16 -> y += value;
-  polyText16 -> y &= 0xffff;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << polyText16 -> y
-          << " as y field.\n" << logofs_flush;
-  #endif
-}
-
-
diff --git a/nxcomp/PolyText16.h b/nxcomp/PolyText16.h
deleted file mode 100644
index 805e1fa04..000000000
--- a/nxcomp/PolyText16.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef PolyText16_H
-#define PolyText16_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define POLYTEXT16_ENABLE_CACHE               1
-#define POLYTEXT16_ENABLE_DATA                0
-#define POLYTEXT16_ENABLE_SPLIT               0
-#define POLYTEXT16_ENABLE_COMPRESS            0
-
-#define POLYTEXT16_DATA_LIMIT                 420
-#define POLYTEXT16_DATA_OFFSET                16
-
-#define POLYTEXT16_CACHE_SLOTS                3000
-#define POLYTEXT16_CACHE_THRESHOLD            4
-#define POLYTEXT16_CACHE_LOWER_THRESHOLD      1
-
-//
-// The message class.
-//
-
-class PolyText16Message : public Message
-{
-  friend class PolyText16Store;
-
-  public:
-
-  PolyText16Message()
-  {
-  }
-
-  ~PolyText16Message()
-  {
-  }
-
-  //
-  // Put here the fields which constitute 
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned int drawable;
-  unsigned int gcontext;
-
-  unsigned short x;
-  unsigned short y;
-};
-
-class PolyText16Store : public MessageStore
-{
-  //
-  // Constructors and destructors.
-  //
-
-  public:
-
-  PolyText16Store() : MessageStore()
-  {
-    enableCache    = POLYTEXT16_ENABLE_CACHE;
-    enableData     = POLYTEXT16_ENABLE_DATA;
-    enableSplit    = POLYTEXT16_ENABLE_SPLIT;
-    enableCompress = POLYTEXT16_ENABLE_COMPRESS;
-
-    dataLimit  = POLYTEXT16_DATA_LIMIT;
-    dataOffset = POLYTEXT16_DATA_OFFSET;
-
-    cacheSlots          = POLYTEXT16_CACHE_SLOTS;
-    cacheThreshold      = POLYTEXT16_CACHE_THRESHOLD;
-    cacheLowerThreshold = POLYTEXT16_CACHE_LOWER_THRESHOLD;
-
-    messages_ -> resize(cacheSlots);
-
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      *i = NULL;
-    }
-
-    temporary_ = NULL;
-  }
-
-  virtual ~PolyText16Store()
-  {
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      destroy(*i);
-    }
-
-    destroy(temporary_);
-  }
-
-  virtual const char *name() const
-  {
-    return "PolyText16";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_PolyText16;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(PolyText16Message);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  public:
-
-  virtual Message *create() const
-  {
-    return new PolyText16Message();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new PolyText16Message((const PolyText16Message &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (PolyText16Message *) message;
-  }
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-				unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* PolyText16_H */
diff --git a/nxcomp/PolyText8.cpp b/nxcomp/PolyText8.cpp
deleted file mode 100644
index 50c21f79e..000000000
--- a/nxcomp/PolyText8.cpp
+++ /dev/null
@@ -1,306 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "PolyText8.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int PolyText8Store::parseIdentity(Message *message, const unsigned char *buffer,
-                                      unsigned int size, int bigEndian) const
-{
-  PolyText8Message *polyText8 = (PolyText8Message *) message;
-
-  //
-  // Here is the fingerprint.
-  //
-
-  polyText8 -> drawable = GetULONG(buffer + 4, bigEndian); 
-  polyText8 -> gcontext = GetULONG(buffer + 8, bigEndian);
-
-  polyText8 -> x = GetUINT(buffer + 12, bigEndian);
-  polyText8 -> y = GetUINT(buffer + 14, bigEndian);
-
-  //
-  // Clean up padding bytes.
-  //
-
-  #ifdef DUMP
-
-  DumpData(buffer, size);
-
-  *logofs << "\n\n" << logofs_flush;
-
-  #endif
-
-  if ((int) size > dataOffset)
-  { 
-    int length;
-    int current;
-    int delta;
-    int item;
-
-    unsigned int nitem;
-
-    unsigned char *pad = NULL;
-    unsigned char *end = NULL;
-
-    delta = 1;
-    nitem = 0;
-
-    #ifdef DUMP 
-    *logofs << name() << " Size " << size << ".\n" << logofs_flush;
-    #endif
-
-    //
-    // Data is a list of TextItem where element
-    // can be a string or a font shift.
-    //
-
-    current = POLYTEXT8_DATA_OFFSET;
-    length  = POLYTEXT8_DATA_OFFSET;
-
-    do
-    {
-      #ifdef DUMP
-      *logofs << name() << " Current " << current << ".\n" << logofs_flush;
-      #endif
-
-      item = GetUINT(buffer + length , bigEndian);
-      
-      if (item < 255)
-      {
-        //
-        // Text element. Number represents
-        // the 'Length of string' field.
-        //
-        
-        length += (item + delta + 1);
-
-	nitem++;
-      }	
-      else if (item == 255)
-      {
-        //
-        // Element is a font shift.
-        //
-        
-        length += 5;
-
-        nitem++;
-      }
-
-      #ifdef DUMP 
-      *logofs << name() << " Item " << item << ".\n" << logofs_flush;
-      #endif
-
-      current += length;
-    }
-    while(current < (int) size && item != 0);
-     
-     
-    #ifdef DUMP
-    *logofs << name() << " Final length " << length << ".\n" << logofs_flush;
-    #endif
-
-    end = ((unsigned char *) buffer) + size;
-
-    pad = ((unsigned char *) buffer) + length;
-
-    for (; pad < end && nitem >= 1; pad++)
-    {
-      #ifdef DUMP
-      *logofs << name() << " Padding " << " .\n" << logofs_flush;
-      #endif
-
-      *pad = 0;
-    }
-  }
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed Identity for message at " << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int PolyText8Store::unparseIdentity(const Message *message, unsigned char *buffer,
-                                        unsigned int size, int bigEndian) const
-{
-  PolyText8Message *polyText8 = (PolyText8Message *) message;
-
-  //
-  // Fill all the message's fields.
-  //
-
-  PutULONG(polyText8 -> drawable, buffer + 4, bigEndian);
-  PutULONG(polyText8 -> gcontext, buffer + 8, bigEndian);
-
-  PutUINT(polyText8 -> x, buffer + 12, bigEndian);
-  PutUINT(polyText8 -> y, buffer + 14, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at " << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void PolyText8Store::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  PolyText8Message *polyText8 = (PolyText8Message *) message;
-
-  *logofs << name() << ": Identity drawable " << polyText8 -> drawable 
-          << ", gcontext " << polyText8 -> gcontext << ", x " << polyText8 -> x 
-          << ", y " << polyText8 -> y << ", size " << polyText8 -> size_ 
-          << ".\n";
-
-  #endif
-}
-
-void PolyText8Store::identityChecksum(const Message *message, const unsigned char *buffer,
-                                          unsigned int size, int bigEndian) const
-{
-}
-
-void PolyText8Store::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                        const Message *cachedMessage,
-                                            ChannelCache *channelCache) const
-{
-  PolyText8Message *polyText8       = (PolyText8Message *) message;
-  PolyText8Message *cachedPolyText8 = (PolyText8Message *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << polyText8 -> drawable
-          << " as " << "drawable" << " field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeXidValue(polyText8 -> drawable, clientCache -> drawableCache);
-
-  cachedPolyText8 -> drawable = polyText8 -> drawable;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << polyText8 -> gcontext
-          << " as " << "gcontext" << " field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeXidValue(polyText8 -> gcontext, clientCache -> gcCache);
-
-  cachedPolyText8 -> gcontext = polyText8 -> gcontext;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << polyText8 -> x
-          << " as " << "x" << " field.\n" << logofs_flush;
-  #endif
-
-  unsigned short int diff_x = polyText8 -> x - cachedPolyText8 -> x;
-
-  encodeBuffer.encodeCachedValue(diff_x, 16,
-                     clientCache -> polyTextCacheX);
-
-  cachedPolyText8 -> x = polyText8 -> x;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << polyText8 -> y
-          << " as " << "y" << " field.\n" << logofs_flush;
-  #endif
-
-  unsigned short int diff_y = polyText8 -> y - cachedPolyText8 -> y;
-
-  encodeBuffer.encodeCachedValue(diff_y, 16,
-                     clientCache -> polyTextCacheY);
-
-  cachedPolyText8 -> y = polyText8 -> y;
-}
-
-void PolyText8Store::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                        ChannelCache *channelCache) const
-{
-  PolyText8Message *polyText8 = (PolyText8Message *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
-
-  polyText8 -> drawable = value;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << polyText8 -> drawable
-          << " as " << "drawable" << " field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeXidValue(value, clientCache -> gcCache);
-
-  polyText8 -> gcontext = value;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << polyText8 -> gcontext
-          << " as gcontext field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeCachedValue(value, 16,
-               clientCache -> polyTextCacheX);
-
-  polyText8 -> x += value;
-  polyText8 -> x &= 0xffff;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << polyText8 -> x
-          << " as x field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeCachedValue(value, 16,
-               clientCache -> polyTextCacheY);
-
-  polyText8 -> y += value;
-  polyText8 -> y &= 0xffff;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << polyText8 -> y
-          << " as y field.\n" << logofs_flush;
-  #endif
-}
diff --git a/nxcomp/PolyText8.h b/nxcomp/PolyText8.h
deleted file mode 100644
index 3d5ff533a..000000000
--- a/nxcomp/PolyText8.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef PolyText8_H
-#define PolyText8_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define POLYTEXT8_ENABLE_CACHE               1
-#define POLYTEXT8_ENABLE_DATA                0
-#define POLYTEXT8_ENABLE_SPLIT               0
-#define POLYTEXT8_ENABLE_COMPRESS            0
-
-#define POLYTEXT8_DATA_LIMIT                 380
-#define POLYTEXT8_DATA_OFFSET                16
-
-#define POLYTEXT8_CACHE_SLOTS                3000
-#define POLYTEXT8_CACHE_THRESHOLD            5
-#define POLYTEXT8_CACHE_LOWER_THRESHOLD      1
-
-//
-// The message class.
-//
-
-class PolyText8Message : public Message
-{
-  friend class PolyText8Store;
-
-  public:
-
-  PolyText8Message()
-  {
-  }
-
-  ~PolyText8Message()
-  {
-  }
-
-  //
-  // Put here the fields which constitute 
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned int drawable;
-  unsigned int gcontext;
-
-  unsigned short x;
-  unsigned short y;
-};
-
-class PolyText8Store : public MessageStore
-{
-  //
-  // Constructors and destructors.
-  //
-
-  public:
-
-  PolyText8Store() : MessageStore()
-  {
-    enableCache    = POLYTEXT8_ENABLE_CACHE;
-    enableData     = POLYTEXT8_ENABLE_DATA;
-    enableSplit    = POLYTEXT8_ENABLE_SPLIT;
-    enableCompress = POLYTEXT8_ENABLE_COMPRESS;
-
-    dataLimit  = POLYTEXT8_DATA_LIMIT;
-    dataOffset = POLYTEXT8_DATA_OFFSET;
-
-    cacheSlots          = POLYTEXT8_CACHE_SLOTS;
-    cacheThreshold      = POLYTEXT8_CACHE_THRESHOLD;
-    cacheLowerThreshold = POLYTEXT8_CACHE_LOWER_THRESHOLD;
-
-    messages_ -> resize(cacheSlots);
-
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      *i = NULL;
-    }
-
-    temporary_ = NULL;
-  }
-
-  virtual ~PolyText8Store()
-  {
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      destroy(*i);
-    }
-
-    destroy(temporary_);
-  }
-
-  virtual const char *name() const
-  {
-    return "PolyText8";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_PolyText8;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(PolyText8Message);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  public:
-
-  virtual Message *create() const
-  {
-    return new PolyText8Message();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new PolyText8Message((const PolyText8Message &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (PolyText8Message *) message;
-  }
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-				unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* PolyText8_H */
diff --git a/nxcomp/Proxy.cpp b/nxcomp/Proxy.cpp
deleted file mode 100644
index 3a7a42362..000000000
--- a/nxcomp/Proxy.cpp
+++ /dev/null
@@ -1,6525 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include <cstdio>
-#include <unistd.h>
-#include <cstdlib>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <signal.h>
-
-#ifdef ANDROID
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/tcp.h>
-#endif
-
-#include "Misc.h"
-
-#if defined(__CYGWIN32__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__sun)
-#include <netinet/in_systm.h>
-#endif
-
-#ifndef ANDROID
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/tcp.h>
-#endif
-
-#include "NXalert.h"
-#include "NXvars.h"
-
-#include "Proxy.h"
-
-#include "Socket.h"
-#include "Channel.h"
-#include "Statistics.h"
-
-#include "ClientChannel.h"
-#include "ServerChannel.h"
-#include "GenericChannel.h"
-#include "ChannelEndPoint.h"
-
-//
-// We need to adjust some values related
-// to these messages at the time the mes-
-// sage stores are reconfigured.
-//
-
-#include "PutImage.h"
-#include "ChangeGC.h"
-#include "PolyFillRectangle.h"
-#include "PutPackedImage.h"
-
-//
-// This is from the main loop.
-//
-
-extern void CleanupListeners();
-
-extern int HandleChild(int);
-
-//
-// Default size of string buffers.
-//
-
-#define DEFAULT_STRING_LENGTH  512
-
-//
-// Set the verbosity level. You also need
-// to define DUMP in Misc.cpp if DUMP is
-// defined here.
-//
-
-#define WARNING
-#define PANIC
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Log the important tracepoints related
-// to writing packets to the peer proxy.
-//
-
-#undef  FLUSH
-
-//
-// Log the operations related to splits.
-//
-
-#undef  SPLIT
-
-//
-// Log the operations related to sending
-// and receiving the control tokens.
-//
-
-#undef  TOKEN
-
-//
-// Log the operations related to setting
-// the token limits.
-//
-
-#undef  LIMIT
-
-//
-// Log a warning if no data is written by
-// the proxy within a timeout.
-//
-
-#undef  TIME
-
-//
-// Log the operation related to generating
-// the ping message at idle time.
-//
-
-#undef  PING
-
-Proxy::Proxy(int fd)
-
-  : transport_(new ProxyTransport(fd)), fd_(fd), readBuffer_(transport_)
-{
-  for (int channelId = 0;
-           channelId < CONNECTIONS_LIMIT;
-               channelId++)
-  {
-    channels_[channelId]    = NULL;
-    transports_[channelId]  = NULL;
-    congestions_[channelId] = 0;
-
-    fdMap_[channelId]      = nothing;
-    channelMap_[channelId] = nothing;
-    slavePidMap_[channelId] = nothing;
-  }
-
-  inputChannel_  = nothing;
-  outputChannel_ = nothing;
-
-  controlLength_ = 0;
-
-  operation_ = operation_in_negotiation;
-
-  draining_   = 0;
-  priority_   = 0;
-  finish_     = 0;
-  shutdown_   = 0;
-  congestion_ = 0;
-
-  timer_ = 0;
-  alert_ = 0;
-
-  agent_ = nothing;
-
-  //
-  // Set null timeouts. This will require
-  // a new link configuration.
-  //
-
-  timeouts_.split  = 0;
-  timeouts_.motion = 0;
-
-  timeouts_.readTs  = getTimestamp();
-  timeouts_.writeTs = getTimestamp();
-
-  timeouts_.loopTs  = getTimestamp();
-  timeouts_.pingTs  = getTimestamp();
-  timeouts_.alertTs = nullTimestamp();
-  timeouts_.loadTs  = nullTimestamp();
-
-  timeouts_.splitTs  = nullTimestamp();
-  timeouts_.motionTs = nullTimestamp();
-
-  //
-  // Initialize the token counters. This
-  // will require a new link configuration.
-  //
-
-  for (int i = token_control; i <= token_data; i++)
-  {
-    tokens_[i].size      = 0;
-    tokens_[i].limit     = 0;
-
-    tokens_[i].bytes     = 0;
-    tokens_[i].remaining = 0;
-  }
-
-  tokens_[token_control].request = code_control_token_request;
-  tokens_[token_control].reply   = code_control_token_reply;
-  tokens_[token_control].type    = token_control;
-
-  tokens_[token_split].request = code_split_token_request;
-  tokens_[token_split].reply   = code_split_token_reply;
-  tokens_[token_split].type    = token_split;
-
-  tokens_[token_data].request = code_data_token_request;
-  tokens_[token_data].reply   = code_data_token_reply;
-  tokens_[token_data].type    = token_data;
-
-  currentStatistics_ = NULL;
-
-  //
-  // Create compressor and decompressor
-  // for image and data payload.
-  //
-
-  compressor_ = new StaticCompressor(control -> LocalDataCompressionLevel,
-                                         control -> LocalDataCompressionThreshold);
-
-  //
-  // Create object storing NX specific
-  // opcodes.
-  //
-
-  opcodeStore_ = new OpcodeStore();
-
-  //
-  // Create the message stores.
-  //
-
-  clientStore_ = new ClientStore(compressor_);
-  serverStore_ = new ServerStore(compressor_);
-
-  clientCache_ = new ClientCache();
-  serverCache_ = new ServerCache();
-
-  if (clientCache_ == NULL || serverCache_ == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "Proxy: PANIC! Failed to create the channel cache.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Failed to create the channel cache.\n";
-
-    HandleCleanup();
-  }
-
-  //
-  // Prepare for image decompression.
-  //
-
-  UnpackInit();
-
-  #ifdef DEBUG
-  *logofs << "Proxy: Created new object at " << this
-          << ".\n" << logofs_flush;
-  #endif
-}
-
-Proxy::~Proxy()
-{
-  for (int channelId = 0;
-           channelId < CONNECTIONS_LIMIT;
-               channelId++)
-  {
-    if (channels_[channelId] != NULL)
-    {
-      deallocateTransport(channelId);
-
-      delete channels_[channelId];
-      channels_[channelId] = NULL;
-    }
-  }
-
-  //
-  // Kill all active slave channel children, and
-  // give them 5 seconds to exit nicely.
-
-  #ifdef DEBUG
-  *logofs << "Proxy: Killing active slaves" << endl;
-  #endif
-
-  int slave_count = 999;
-  int loop_count = 0;
-
-  while(slave_count > 0 && loop_count < 50)
-  {
-    slave_count = 0;
-
-    for (int channelId = 0; channelId<CONNECTIONS_LIMIT; channelId++)
-    {
-      int pid = slavePidMap_[channelId];
-
-      if (pid > 1) {
-         slave_count++;
-
-         #ifdef DEBUG
-         *logofs << "Proxy: Active slave with pid " << pid << logofs_flush;
-         #endif
-
-         if ( loop_count == 0 )
-         {
-             #ifdef DEBUG
-             *logofs << "Proxy: Sending SIGTERM to " << pid << logofs_flush;
-             #endif
-             kill(pid, SIGTERM);
-         }
-         else if ( loop_count == 25 )
-         {
-             #ifdef DEBUG
-             *logofs << "Proxy: Sending SIGKILL to " << pid << logofs_flush;
-             #endif
-             kill(pid, SIGKILL);
-         }
-
-         if (HandleChild(pid))
-         {
-             #ifdef DEBUG
-             *logofs << "Proxy: Slave " << pid << " terminated" << logofs_flush;
-             #endif
-             slavePidMap_[channelId] = nothing;
-         }
-      }
-    }
-
-    if ( slave_count > 0 )
-    {
-      cerr << "Proxy: Error: Failed to kill all slave channel processes. " << slave_count << " processes still remaining." << endl;
-    }
-
-    usleep(200000);
-    loop_count++;
-  }
-
-  delete transport_;
-  delete compressor_;
-
-  //
-  // Delete storage shared among channels.
-  //
-
-  delete opcodeStore_;
-
-  delete clientStore_;
-  delete serverStore_;
-
-  delete clientCache_;
-  delete serverCache_;
-
-  //
-  // Get rid of the image decompression
-  // resources.
-  //
-
-  UnpackDestroy();
-
-  #ifdef DEBUG
-  *logofs << "Proxy: Deleted proxy object at " << this
-          << ".\n" << logofs_flush;
-  #endif
-}
-
-int Proxy::setOperational()
-{
-  #ifdef TEST
-  *logofs << "Proxy: Entering operational mode.\n"
-          << logofs_flush;
-  #endif
-
-  operation_ = operation_in_messages;
-
-  return 1;
-}
-
-int Proxy::setReadDescriptors(fd_set *fdSet, int &fdMax, T_timestamp &tsMax)
-{
-  //
-  // Set the initial timeout to the time of
-  // the next ping. If the congestion count
-  // is greater than zero, anyway, use a
-  // shorter timeout to force a congestion
-  // update.
-  //
-
-  if (agent_ != nothing && congestions_[agent_] == 0 &&
-          statistics -> getCongestionInFrame() >= 1 &&
-              tokens_[token_control].remaining >=
-                  (tokens_[token_control].limit - 1))
-  {
-    setMinTimestamp(tsMax, control -> IdleTimeout);
-
-    #ifdef TEST
-    *logofs << "Proxy: Initial timeout is " << tsMax.tv_sec
-            << " S and " << (double) tsMax.tv_usec /
-               1000 << " Ms with congestion "
-            << statistics -> getCongestionInFrame()
-            << ".\n" << logofs_flush;
-    #endif
-  }
-  else
-  {
-    setMinTimestamp(tsMax, control -> PingTimeout);
-
-    #ifdef TEST
-    *logofs << "Proxy: Initial timeout is " << tsMax.tv_sec
-            << " S and " << (double) tsMax.tv_usec /
-               1000 << " Ms.\n" << logofs_flush;
-    #endif
-  }
-
-  int fd = -1;
-
-  if (isTimeToRead() == 1)
-  {
-    //
-    // If we don't have split tokens available
-    // don't set the timeout.
-    //
-
-    if (tokens_[token_split].remaining > 0 &&
-            isTimestamp(timeouts_.splitTs) == 1)
-    {
-      int diffTs = getTimeToNextSplit();
-
-      #if defined(TEST) || defined(INFO) || \
-              defined(FLUSH) || defined(SPLIT)
-
-      if (diffTimestamp(timeouts_.splitTs,
-              getTimestamp()) > timeouts_.split)
-      {
-        *logofs << "Proxy: FLUSH! SPLIT! WARNING! Running with "
-                << diffTimestamp(timeouts_.splitTs, getTimestamp())
-                << " Ms elapsed since the last split.\n"
-                << logofs_flush;
-      }
-
-      *logofs << "Proxy: FLUSH! SPLIT! Requesting timeout of "
-              << diffTs << " Ms as there are splits to send.\n"
-              << logofs_flush;
-
-      #endif
-
-      setMinTimestamp(tsMax, diffTs);
-    }
-    #if defined(TEST) || defined(INFO)
-    else if (isTimestamp(timeouts_.splitTs) == 1)
-    {
-      *logofs << "Proxy: WARNING! Not requesting a split "
-              << "timeout with " << tokens_[token_split].remaining
-              << " split tokens remaining.\n" << logofs_flush;
-    }
-    #endif
-
-    //
-    // Loop through the valid channels and set
-    // the descriptors selected for read and
-    // the timeout.
-    //
-
-    T_list &channelList = activeChannels_.getList();
-
-    for (T_list::iterator j = channelList.begin();
-           j != channelList.end(); j++)
-    {
-      int channelId = *j;
-
-      if (channels_[channelId] == NULL)
-      {
-        continue;
-      }
-
-      fd = getFd(channelId);
-
-      if (channels_[channelId] -> getFinish() == 0 &&
-              (channels_[channelId] -> getType() == channel_x11 ||
-                  tokens_[token_data].remaining > 0) &&
-                      congestions_[channelId] == 0)
-      {
-        FD_SET(fd, fdSet);
-
-        if (fd >= fdMax)
-        {
-          fdMax = fd + 1;
-        }
-
-        #ifdef TEST
-        *logofs << "Proxy: Descriptor FD#" << fd
-                << " selected for read with buffer length "
-                << transports_[channelId] -> length()
-                << ".\n" << logofs_flush;
-        #endif
-
-        //
-        // Wakeup the proxy if there are motion
-        // events to flush.
-        //
-
-        if (isTimestamp(timeouts_.motionTs) == 1)
-        {
-          int diffTs = getTimeToNextMotion();
-
-          #if defined(TEST) || defined(INFO)
-
-          if (diffTimestamp(timeouts_.motionTs,
-                  getTimestamp()) > timeouts_.motion)
-          {
-            *logofs << "Proxy: FLUSH! WARNING! Running with "
-                    << diffTimestamp(timeouts_.motionTs, getTimestamp())
-                    << " Ms elapsed since the last motion.\n"
-                    << logofs_flush;
-          }
-
-          *logofs << "Proxy: FLUSH! Requesting timeout of "
-                  << diffTs << " Ms as FD#" << fd << " has motion "
-                  << "events to send.\n" << logofs_flush;
-
-          #endif
-
-          setMinTimestamp(tsMax, diffTs);
-        }
-      }
-      #if defined(TEST) || defined(INFO)
-      else
-      {
-        if (channels_[channelId] -> getType() != channel_x11 &&
-                tokens_[token_data].remaining <= 0)
-        {
-          *logofs << "Proxy: WARNING! Descriptor FD#" << fd
-                  << " not selected for read with "
-                  << tokens_[token_data].remaining << " data "
-                  << "tokens remaining.\n" << logofs_flush;
-        }
-      }
-      #endif
-    }
-  }
-  #if defined(TEST) || defined(INFO)
-  else
-  {
-    *logofs << "Proxy: WARNING! Disabled reading from channels.\n"
-            << logofs_flush;
-
-    *logofs << "Proxy: WARNING! Congestion is " << congestion_
-            << " pending " << transport_ -> pending() << " blocked "
-            << transport_ -> blocked() << " length " << transport_ ->
-               length() << ".\n" << logofs_flush;
-  }
-  #endif
-
-  //
-  // Include the proxy descriptor.
-  //
-
-  FD_SET(fd_, fdSet);
-
-  if (fd_ >= fdMax)
-  {
-    fdMax = fd_ + 1;
-  }
-
-  #ifdef TEST
-  *logofs << "Proxy: Proxy descriptor FD#" << fd_
-          << " selected for read with buffer length "
-          << transport_ -> length() << ".\n"
-          << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-//
-// Add to the mask the file descriptors of all
-// X connections to write to.
-//
-
-int Proxy::setWriteDescriptors(fd_set *fdSet, int &fdMax, T_timestamp &tsMax)
-{
-  int fd = -1;
-
-  T_list &channelList = activeChannels_.getList();
-
-  for (T_list::iterator j = channelList.begin();
-           j != channelList.end(); j++)
-  {
-    int channelId = *j;
-
-    if (channels_[channelId] != NULL)
-    {
-      fd = getFd(channelId);
-
-      if (transports_[channelId] -> length() > 0)
-      {
-        FD_SET(fd, fdSet);
-
-        #ifdef TEST
-        *logofs << "Proxy: Descriptor FD#" << fd << " selected "
-                << "for write with blocked " << transports_[channelId] ->
-                   blocked() << " and length " << transports_[channelId] ->
-                   length() << ".\n" << logofs_flush;
-        #endif
-
-        if (fd >= fdMax)
-        {
-          fdMax = fd + 1;
-        }
-      }
-      #ifdef TEST
-      else
-      {
-        *logofs << "Proxy: Descriptor FD#" << fd << " not selected "
-                << "for write with blocked " << transports_[channelId] ->
-                   blocked() << " and length " << transports_[channelId] ->
-                   length() << ".\n" << logofs_flush;
-      }
-      #endif
-
-      #if defined(TEST) || defined(INFO)
-
-      if (transports_[channelId] -> getType() !=
-              transport_agent && transports_[channelId] ->
-                   length() > 0 && transports_[channelId] ->
-                       blocked() != 1)
-      {
-        *logofs << "Proxy: PANIC! Descriptor FD#" << fd
-                << " has data to write but blocked flag is "
-                << transports_[channelId] -> blocked()
-                << ".\n" << logofs_flush;
-
-        cerr << "Error" << ": Descriptor FD#" << fd
-             << " has data to write but blocked flag is "
-             << transports_[channelId] -> blocked()
-             << ".\n";
-
-        HandleCleanup();
-      }
-
-      #endif
-    }
-  }
-
-  //
-  // Check if the proxy transport has data
-  // from a previous blocking write.
-  //
-
-  if (transport_ -> blocked() == 1)
-  {
-    FD_SET(fd_, fdSet);
-
-    #ifdef TEST
-    *logofs << "Proxy: Proxy descriptor FD#"
-            << fd_ << " selected for write. Blocked is "
-            << transport_ -> blocked() << " length is "
-            << transport_ -> length() << ".\n"
-            << logofs_flush;
-    #endif
-
-    if (fd_ >= fdMax)
-    {
-      fdMax = fd_ + 1;
-    }
-  }
-  #ifdef TEST
-  else
-  {
-    *logofs << "Proxy: Proxy descriptor FD#"
-            << fd_ << " not selected for write. Blocked is "
-            << transport_ -> blocked() << " length is "
-            << transport_ -> length() << ".\n"
-            << logofs_flush;
-  }
-  #endif
-
-  //
-  // We are entering the main select. Save
-  // the timestamp of the last loop so that
-  // we can detect the clock drifts.
-  //
-
-  timeouts_.loopTs = getTimestamp();
-
-  return 1;
-}
-
-int Proxy::getChannels(T_channel_type type)
-{
-  int channels = 0;
-
-  T_list &channelList = activeChannels_.getList();
-
-  for (T_list::iterator j = channelList.begin();
-           j != channelList.end(); j++)
-  {
-    int channelId = *j;
-
-    if (channels_[channelId] != NULL &&
-            (type == channel_none ||
-                 type == channels_[channelId] ->
-                     getType()))
-    {
-      channels++;
-    }
-  }
-
-  return channels;
-}
-
-T_channel_type Proxy::getType(int fd)
-{
-  int channelId = getChannel(fd);
-
-  if (channelId < 0 || channels_[channelId] == NULL)
-  {
-    return channel_none;
-  }
-
-  return channels_[channelId] -> getType();
-}
-
-const char *Proxy::getTypeName(T_channel_type type)
-{
-  switch (type)
-  {
-    case channel_x11:
-    {
-      return "X";
-    }
-    case channel_cups:
-    {
-      return "CUPS";
-    }
-    case channel_smb:
-    {
-      return "SMB";
-    }
-    case channel_media:
-    {
-      return "media";
-    }
-    case channel_http:
-    {
-      return "HTTP";
-    }
-    case channel_font:
-    {
-      return "font";
-    }
-    case channel_slave:
-    {
-      return "slave";
-    }
-    default:
-    {
-      return "unknown";
-    }
-  }
-}
-
-const char *Proxy::getComputerName()
-{
-  //
-  // Strangely enough, under some Windows OSes SMB
-  // service doesn't bind to localhost. Fall back
-  // to localhost if can't find computer name in
-  // the environment. In future we should try to
-  // bind to localhost and then try the other IPs.
-  //
-
-  const char *hostname = NULL;
-
-  #ifdef __CYGWIN32__
-
-  hostname = getenv("COMPUTERNAME");
-
-  #endif
-
-  if (hostname == NULL)
-  {
-    hostname = "localhost";
-  }
-
-  return hostname;
-}
-
-//
-// Handle data from channels selected for read.
-//
-
-int Proxy::handleRead(int &resultFds, fd_set &readSet)
-{
-  #ifdef DEBUG
-  *logofs << "Proxy: Checking descriptors selected for read.\n"
-          << logofs_flush;
-  #endif
-
-  T_list &channelList = activeChannels_.getList();
-
-  for (T_list::iterator j = channelList.begin();
-           j != channelList.end(); j++)
-  {
-    #ifdef DEBUG
-    *logofs << "Proxy: Looping with current channel "
-            << *j << ".\n" << logofs_flush;
-    #endif
-
-    int fd = getFd(*j);
-
-    if (fd >= 0 && resultFds > 0 && FD_ISSET(fd, &readSet))
-    {
-      #ifdef DEBUG
-      *logofs << "Proxy: Going to read messages from FD#"
-              << fd << ".\n" << logofs_flush;
-      #endif
-
-      int result = handleRead(fd);
-
-      if (result < 0)
-      {
-        #ifdef TEST
-        *logofs << "Proxy: Failure reading messages from FD#"
-                << fd << ".\n" << logofs_flush;
-        #endif
-
-        return -1;
-      }
-
-      #ifdef DEBUG
-      *logofs << "Proxy: Clearing the read descriptor "
-              << "for FD#" << fd << ".\n" << logofs_flush;
-      #endif
-
-      FD_CLR(fd, &readSet);
-
-      resultFds--;
-    }
-  }
-
-  if (resultFds > 0 && FD_ISSET(fd_, &readSet))
-  {
-    #ifdef DEBUG
-    *logofs << "Proxy: Going to read messages from "
-            << "proxy FD#" << fd_ << ".\n"
-            << logofs_flush;
-    #endif
-
-    if (handleRead() < 0)
-    {
-      #ifdef TEST
-      *logofs << "Proxy: Failure reading from proxy FD#"
-              << fd_ << ".\n" << logofs_flush;
-      #endif
-
-      return -1;
-    }
-
-    #ifdef DEBUG
-    *logofs << "Proxy: Clearing the read descriptor "
-            << "for proxy FD#" << fd_ << ".\n"
-            << logofs_flush;
-    #endif
-
-    FD_CLR(fd_, &readSet);
-
-    resultFds--;
-  }
-
-  return 1;
-}
-
-//
-// Perform flush on descriptors selected for write.
-//
-
-int Proxy::handleFlush(int &resultFds, fd_set &writeSet)
-{
-  #ifdef DEBUG
-  *logofs << "Proxy: Checking descriptors selected for write.\n"
-          << logofs_flush;
-  #endif
-
-  if (resultFds > 0 && FD_ISSET(fd_, &writeSet))
-  {
-    #ifdef TEST
-    *logofs << "Proxy: FLUSH! Proxy descriptor FD#" << fd_
-            << " reported to be writable.\n"
-            << logofs_flush;
-    #endif
-
-    if (handleFlush() < 0)
-    {
-      #ifdef TEST
-      *logofs << "Proxy: Failure flushing the writable "
-              << "proxy FD#" << fd_ << ".\n"
-              << logofs_flush;
-      #endif
-
-      return -1;
-    }
-
-    #ifdef DEBUG
-    *logofs << "Proxy: Clearing the write descriptor "
-            << "for proxy FD#" << fd_ << ".\n"
-            << logofs_flush;
-    #endif
-
-    FD_CLR(fd_, &writeSet);
-
-    resultFds--;
-  }
-
-  T_list &channelList = activeChannels_.getList();
-
-  for (T_list::iterator j = channelList.begin();
-           resultFds > 0 && j != channelList.end(); j++)
-  {
-    #ifdef DEBUG
-    *logofs << "Proxy: Looping with current channel "
-            << *j << ".\n" << logofs_flush;
-    #endif
-
-    int fd = getFd(*j);
-
-    if (fd >= 0 && FD_ISSET(fd, &writeSet))
-    {
-      #ifdef TEST
-      *logofs << "Proxy: X descriptor FD#" << fd
-              << " reported to be writable.\n"
-              << logofs_flush;
-      #endif
-
-      //
-      // It can happen that, in handling reads, we
-      // have destroyed the buffer associated to a
-      // closed socket, so don't complain about
-      // the errors.
-      //
-
-      handleFlush(fd);
-
-      //
-      // Clear the descriptor from the mask so
-      // we don't confuse the agent if it's
-      // not checking only its own descriptors.
-      //
-
-      #ifdef DEBUG
-      *logofs << "Proxy: Clearing the write descriptor "
-              << "for FD#" << fd << ".\n"
-              << logofs_flush;
-      #endif
-
-      FD_CLR(fd, &writeSet);
-
-      resultFds--;
-    }
-  }
-
-  return 1;
-}
-
-int Proxy::handleRead()
-{
-  #if defined(TEST) || defined(INFO)
-  *logofs << "Proxy: Decoding data from proxy FD#"
-          << fd_ << ".\n" << logofs_flush;
-  #endif
-
-  //
-  // Decode all the available messages from
-  // the remote proxy until is not possible
-  // to read more.
-  //
-
-  for (;;)
-  {
-    int result = readBuffer_.readMessage();
-
-    #if defined(TEST) || defined(DEBUG) || defined(INFO)
-    *logofs << "Proxy: Read result on proxy FD#" << fd_
-            << " is " << result << ".\n"
-            << logofs_flush;
-    #endif
-
-    if (result < 0)
-    {
-      if (shutdown_ == 0)
-      {
-        if (finish_ == 0)
-        {
-          #ifdef PANIC
-          *logofs << "Proxy: PANIC! Failure reading from the "
-                  << "peer proxy on FD#" << fd_ << ".\n"
-                  << logofs_flush;
-          #endif
-
-          cerr << "Error" << ": Failure reading from the "
-               << "peer proxy.\n";
-        }
-      }
-      #ifdef TEST
-      else
-      {
-        *logofs << "Proxy: Closure of the proxy link detected "
-                << "after clean shutdown.\n" << logofs_flush;
-      }
-      #endif
-
-      priority_   = 0;
-      finish_     = 1;
-      congestion_ = 0;
-
-      return -1;
-    }
-    else if (result == 0)
-    {
-      #if defined(TEST) || defined(DEBUG) || defined(INFO)
-      *logofs << "Proxy: No data read from proxy FD#"
-              << fd_ << "\n" << logofs_flush;
-      #endif
-
-      return 0;
-    }
-
-    //
-    // We read some data from the remote. If we set
-    // the congestion flag because we couldn't read
-    // before the timeout and have tokens available,
-    // then reset the congestion flag.
-    //
-
-    if (congestion_ == 1 &&
-            tokens_[token_control].remaining > 0)
-    {
-      #if defined(TEST) || defined(INFO)
-      *logofs << "Proxy: Exiting congestion due to "
-              << "proxy data with " << tokens_[token_control].remaining
-              << " tokens.\n" << logofs_flush;
-      #endif
-
-      congestion_ = 0;
-    }
-
-    //
-    // Set the timestamp of the last read
-    // operation from the remote proxy and
-    // enable again showing the 'no data
-    // received' dialog at the next timeout.
-    //
-
-    timeouts_.readTs  = getTimestamp();
-
-    if (alert_ != 0)
-    {
-      #if defined(TEST) || defined(INFO)
-      *logofs << "Proxy: Displacing the dialog "
-              << "for proxy FD#" << fd_ << ".\n"
-              << logofs_flush;
-      #endif
-
-      HandleAlert(DISPLACE_MESSAGE_ALERT, 1);
-    }
-
-    timeouts_.alertTs = nullTimestamp();
-
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Proxy: Getting messages from proxy FD#" << fd_
-            << " with " << readBuffer_.getLength() << " bytes "
-            << "in the read buffer.\n" << logofs_flush;
-    #endif
-
-    unsigned int controlLength;
-    unsigned int dataLength;
-
-    const unsigned char *message;
-
-    while ((message = readBuffer_.getMessage(controlLength, dataLength)) != NULL)
-    {
-      statistics -> addFrameIn();
-
-      if (controlLength == 3 && *message == 0 &&
-              *(message + 1) < code_last_tag)
-      {
-        if (handleControlFromProxy(message) < 0)
-        {
-          return -1;
-        }
-      }
-      else if (operation_ == operation_in_messages)
-      {
-        int channelId = inputChannel_;
-
-        #if defined(TEST) || defined(INFO)
-        *logofs << "Proxy: Identified message of " << dataLength
-                << " bytes for FD#" << getFd(channelId) << " channel ID#"
-                 << channelId << ".\n" << logofs_flush;
-        #endif
-
-        if (channelId >= 0 && channelId < CONNECTIONS_LIMIT &&
-                channels_[channelId] != NULL)
-        {
-          int finish = channels_[channelId] -> getFinish();
-
-          #ifdef WARNING
-
-          if (finish == 1)
-          {
-            *logofs << "Proxy: WARNING! Handling data for finishing "
-                    << "FD#" << getFd(channelId) << " channel ID#"
-                    << channelId << ".\n" << logofs_flush;
-          }
-
-          #endif
-
-          //
-          // We need to decode all the data to preserve
-          // the consistency of the cache, so can't re-
-          // turn as soon as the first error is encount-
-          // ered. Check if this is the first time that
-          // the failure is detected.
-          //
-
-          int result = channels_[channelId] -> handleWrite(message, dataLength);
-
-          if (result < 0 && finish == 0)
-          {
-            #ifdef TEST
-            *logofs << "Proxy: Failed to write proxy data to FD#"
-                    << getFd(channelId) << " channel ID#"
-                    << channelId << ".\n" << logofs_flush;
-            #endif
-
-            if (handleFinish(channelId) < 0)
-            {
-              return -1;
-            }
-          }
-
-          //
-          // Check if we have splits or motion
-          // events to send.
-          //
-
-          setSplitTimeout(channelId);
-          setMotionTimeout(channelId);
-        }
-        #ifdef WARNING
-        else
-        {
-          *logofs << "Proxy: WARNING! Received data for "
-                  << "invalid channel ID#" << channelId
-                  << ".\n" << logofs_flush;
-        }
-        #endif
-      }
-      else if (operation_ == operation_in_statistics)
-      {
-        #ifdef TEST
-        *logofs << "Proxy: Received statistics data from remote proxy.\n"
-                << logofs_flush;
-        #endif
-
-        if (handleStatisticsFromProxy(message, dataLength) < 0)
-        {
-          return -1;
-        }
-
-        operation_ = operation_in_messages;
-      }
-      else if (operation_ == operation_in_negotiation)
-      {
-        #ifdef TEST
-        *logofs << "Proxy: Received new negotiation data from remote proxy.\n"
-                << logofs_flush;
-        #endif
-
-        if (handleNegotiationFromProxy(message, dataLength) < 0)
-        {
-          return -1;
-        }
-      }
-
-      //
-      // if (controlLength == 3 && *message == 0 && ...) ...
-      // else if (operation_ == operation_in_statistics) ...
-      // else if (operation_ == operation_in_messages) ...
-      // else if (operation_ == operation_in_negotiation) ...
-      // else ...
-      //
-
-      else
-      {
-        #ifdef PANIC
-        *logofs << "Proxy: PANIC! Unrecognized message received on proxy FD#"
-                << fd_ << ".\n" << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Unrecognized message received on proxy FD#"
-             << fd_ << ".\n";
-
-        return -1;
-      }
-
-    } // while ((message = readBuffer_.getMessage(controlLength, dataLength)) != NULL) ...
-
-    //
-    // Reset the read buffer.
-    //
-
-    readBuffer_.fullReset();
-
-    //
-    // Give up if no data is readable.
-    //
-
-    if (transport_ -> readable() == 0)
-    {
-      break;
-    }
-
-  } // End of for (;;) ...
-
-  return 1;
-}
-
-int Proxy::handleControlFromProxy(const unsigned char *message)
-{
-  #if defined(TEST) || defined(INFO)
-  *logofs << "Proxy: Received message '" << DumpControl(*(message + 1))
-          << "' at " << strMsTimestamp() << " with data ID#"
-          << (int) *(message + 2) << ".\n" << logofs_flush;
-  #endif
-
-  T_channel_type channelType = channel_none;
-
-  switch (*(message + 1))
-  {
-    case code_switch_connection:
-    {
-      int channelId = *(message + 2);
-
-      //
-      // If channel is invalid further messages will
-      // be ignored. The acknowledged shutdown of
-      // channels should prevent this.
-      //
-
-      inputChannel_ = channelId;
-
-      break;
-    }
-    case code_begin_congestion:
-    {
-      //
-      // Set the congestion state for the
-      // channel reported by the remote.
-      //
-
-      int channelId = *(message + 2);
-
-      if (channels_[channelId] != NULL)
-      {
-        congestions_[channelId] = 1;
-
-        #if defined(TEST) || defined(INFO)
-        *logofs << "Proxy: Received a begin congestion "
-                << "for channel id ID#" << channelId
-                << ".\n" << logofs_flush;
-        #endif
-
-        if (channelId == agent_ && congestions_[agent_] != 0)
-        {
-          #if defined(TEST) || defined(INFO)
-          *logofs << "Proxy: Forcing an update of the congestion "
-                  << "counter with agent congested.\n"
-                  << logofs_flush;
-          #endif
-
-          statistics -> updateCongestion(-tokens_[token_control].remaining,
-                                             tokens_[token_control].limit);
-        }
-      }
-      #ifdef WARNING
-      else
-      {
-        *logofs << "Proxy: WARNING! Received a begin congestion "
-                << "for invalid channel id ID#" << channelId
-                << ".\n" << logofs_flush;
-      }
-      #endif
-
-      break;
-    }
-    case code_end_congestion:
-    {
-      //
-      // Attend again to the channel.
-      //
-
-      int channelId = *(message + 2);
-
-      if (channels_[channelId] != NULL)
-      {
-        congestions_[channelId] = 0;
-
-        #if defined(TEST) || defined(INFO)
-        *logofs << "Proxy: Received an end congestion "
-                << "for channel id ID#" << channelId
-                << ".\n" << logofs_flush;
-        #endif
-
-        if (channelId == agent_ && congestions_[agent_] != 0)
-        {
-          #if defined(TEST) || defined(INFO)
-          *logofs << "Proxy: Forcing an update of the congestion "
-                  << "counter with agent decongested.\n"
-                  << logofs_flush;
-          #endif
-
-          statistics -> updateCongestion(tokens_[token_control].remaining,
-                                             tokens_[token_control].limit);
-        }
-      }
-      #ifdef WARNING
-      else
-      {
-        *logofs << "Proxy: WARNING! Received an end congestion "
-                << "for invalid channel id ID#" << channelId
-                << ".\n" << logofs_flush;
-      }
-      #endif
-
-      break;
-    }
-    case code_control_token_request:
-    {
-      T_proxy_token &token = tokens_[token_control];
-
-      if (handleTokenFromProxy(token, *(message + 2)) < 0)
-      {
-        return -1;
-      }
-
-      break;
-    }
-    case code_split_token_request:
-    {
-      T_proxy_token &token = tokens_[token_split];
-
-      if (handleTokenFromProxy(token, *(message + 2)) < 0)
-      {
-        return -1;
-      }
-
-      break;
-    }
-    case code_data_token_request:
-    {
-      T_proxy_token &token = tokens_[token_data];
-
-      if (handleTokenFromProxy(token, *(message + 2)) < 0)
-      {
-        return -1;
-      }
-
-      break;
-    }
-    case code_control_token_reply:
-    {
-      T_proxy_token &token = tokens_[token_control];
-
-      if (handleTokenReplyFromProxy(token, *(message + 2)) < 0)
-      {
-        return -1;
-      }
-
-      break;
-    }
-    case code_split_token_reply:
-    {
-      T_proxy_token &token = tokens_[token_split];
-
-      if (handleTokenReplyFromProxy(token, *(message + 2)) < 0)
-      {
-        return -1;
-      }
-
-      break;
-    }
-    case code_data_token_reply:
-    {
-      T_proxy_token &token = tokens_[token_data];
-
-      if (handleTokenReplyFromProxy(token, *(message + 2)) < 0)
-      {
-        return -1;
-      }
-
-      break;
-    }
-    case code_new_x_connection:
-    {
-      //
-      // Opening the channel is handled later.
-      //
-
-      channelType = channel_x11;
-
-      break;
-    }
-    case code_new_cups_connection:
-    {
-      channelType = channel_cups;
-
-      break;
-    }
-    case code_new_aux_connection:
-    {
-      //
-      // Starting from version 1.5.0 we create real X
-      // connections for the keyboard channel. We need
-      // to refuse old auxiliary X connections because
-      // they would be unable to leverage the new fake
-      // authorization cookie.
-      //
-
-      #ifdef WARNING
-      *logofs << "Proxy: WARNING! Can't open outdated auxiliary X "
-              << "channel for code " << *(message + 1) << ".\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Warning" << ": Can't open outdated auxiliary X "
-           << "channel for code " << *(message + 1) << ".\n";
-
-      if (handleControl(code_drop_connection, *(message + 2)) < 0)
-      {
-        return -1;
-      }
-
-      break;
-    }
-    case code_new_smb_connection:
-    {
-      channelType = channel_smb;
-
-      break;
-    }
-    case code_new_media_connection:
-    {
-      channelType = channel_media;
-
-      break;
-    }
-    case code_new_http_connection:
-    {
-      channelType = channel_http;
-
-      break;
-    }
-    case code_new_font_connection:
-    {
-      channelType = channel_font;
-
-      break;
-    }
-    case code_new_slave_connection:
-    {
-      channelType = channel_slave;
-
-      break;
-    }
-    case code_drop_connection:
-    {
-      int channelId = *(message + 2);
-
-      if (channelId >= 0 && channelId < CONNECTIONS_LIMIT &&
-              channels_[channelId] != NULL)
-      {
-        handleDropFromProxy(channelId);
-      }
-      #ifdef WARNING
-      else
-      {
-        *logofs << "Proxy: WARNING! Received a drop message "
-                << "for invalid channel id ID#" << channelId
-                << ".\n" << logofs_flush;
-      }
-      #endif
-
-      break;
-    }
-    case code_finish_connection:
-    {
-      int channelId = *(message + 2);
-
-      if (channelId >= 0 && channelId < CONNECTIONS_LIMIT &&
-              channels_[channelId] != NULL)
-      {
-        //
-        // Force the finish state on the channel.
-        // We can receive this message while in
-        // the read loop, so we only mark the
-        // channel for deletion.
-        //
-
-        #ifdef TEST
-        *logofs << "Proxy: Received a finish message for FD#"
-                << getFd(channelId) << " channel ID#"
-                << channelId << ".\n" << logofs_flush;
-        #endif
-
-        handleFinishFromProxy(channelId);
-      }
-      #ifdef WARNING
-      else
-      {
-        *logofs << "Proxy: WARNING! Received a finish message "
-                << "for invalid channel id ID#" << channelId
-                << ".\n" << logofs_flush;
-      }
-      #endif
-
-      break;
-    }
-    case code_finish_listeners:
-    {
-      //
-      // This is from the main loop.
-      //
-
-      #ifdef TEST
-      *logofs << "Proxy: Closing down all local listeners.\n"
-              << logofs_flush;
-      #endif
-
-      CleanupListeners();
-
-      finish_ = 1;
-
-      break;
-    }
-    case code_reset_request:
-    {
-      #ifdef PANIC
-      *logofs << "Proxy: PANIC! Proxy reset not supported "
-              << "in this version.\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Proxy reset not supported "
-           << "in this version.\n";
-
-      HandleCleanup();
-    }
-    case code_shutdown_request:
-    {
-      //
-      // Time to rest in peace.
-      //
-
-      shutdown_ = 1;
-
-      break;
-    }
-    case code_load_request:
-    {
-      if (handleLoadFromProxy() < 0)
-      {
-        return -1;
-      }
-
-      break;
-    }
-    case code_save_request:
-    {
-      //
-      // Don't abort the connection
-      // if can't write to disk.
-      //
-
-      handleSaveFromProxy();
-
-      break;
-    }
-    case code_statistics_request:
-    {
-      int type = *(message + 2);
-
-      if (handleStatisticsFromProxy(type) < 0)
-      {
-        return -1;
-      }
-
-      break;
-    }
-    case code_statistics_reply:
-    {
-      operation_ = operation_in_statistics;
-
-      break;
-    }
-    case code_alert_request:
-    {
-      HandleAlert(*(message + 2), 1);
-
-      break;
-    }
-    case code_sync_request:
-    {
-      int channelId = *(message + 2);
-
-      if (handleSyncFromProxy(channelId) < 0)
-      {
-        return -1;
-      }
-
-      break;
-    }
-    case code_sync_reply:
-    {
-      //
-      // We are not the one that issued
-      // the request.
-      //
-
-      #if defined(TEST) || defined(INFO)
-      *logofs << "Proxy: PANIC! Received an unexpected "
-              << "synchronization reply.\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Received an unexpected "
-           << "synchronization reply.\n";
-
-      HandleCleanup();
-    }
-    default:
-    {
-      #ifdef PANIC
-      *logofs << "Proxy: PANIC! Received bad control message number "
-              << (unsigned int) *(message + 1) << " with attribute "
-              << (unsigned int) *(message + 2) << ".\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Received bad control message number "
-           << (unsigned int) *(message + 1) << " with attribute "
-           << (unsigned int) *(message + 2) << ".\n";
-
-      HandleCleanup();
-    }
-
-  } // End of switch (*(message + 1)) ...
-
-  if (channelType == channel_none)
-  {
-    return 1;
-  }
-
-  //
-  // Handle the channel allocation that we
-  // left from the main switch case.
-  //
-
-  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.
-  //
-
-  int result = checkChannelMap(channelId);
-
-  if (result >= 0)
-  {
-    result = handleNewConnectionFromProxy(channelType, channelId);
-  }
-
-  if (result < 0)
-  {
-    //
-    // Realization of new channel failed.
-    // Send channel shutdown message to
-    // the peer proxy.
-    //
-
-    if (handleControl(code_drop_connection, channelId) < 0)
-    {
-      return -1;
-    }
-  }
-  else
-  {
-    int fd =  getFd(channelId);
-
-    if (getReadable(fd) > 0)
-    {
-      #ifdef TEST
-      *logofs << "Proxy: Trying to read immediately "
-              << "from descriptor FD#" << fd << ".\n"
-              << logofs_flush;
-      #endif
-
-      if (handleRead(fd) < 0)
-      {
-        return -1;
-      }
-    }
-    #ifdef TEST
-    *logofs << "Proxy: Nothing to read immediately "
-            << "from descriptor FD#" << fd << ".\n"
-            << logofs_flush;
-    #endif
-  }
-
-  return 1;
-}
-
-int Proxy::handleRead(int fd, const char *data, int size)
-{
-  #if defined(TEST) || defined(INFO)
-  *logofs << "Proxy: Handling data for connection on FD#"
-          << fd << ".\n" << logofs_flush;
-  #endif
-
-  if (canRead(fd) == 0)
-  {
-    #if defined(TEST) || defined(INFO)
-
-    if (getChannel(fd) < 0)
-    {
-      *logofs << "Proxy: PANIC! Can't read from invalid FD#"
-              << fd << ".\n" << logofs_flush;
-
-      HandleCleanup();
-    }
-    else
-    {
-      *logofs << "Proxy: WARNING! Read method called for FD#"
-              << fd << " but operation is not possible.\n"
-              << logofs_flush;
-    }
-
-    #endif
-
-    return 0;
-  }
-
-  int channelId = getChannel(fd);
-
-  //
-  // Let the channel object read all the new data from
-  // its file descriptor, isolate messages, compress
-  // those messages, and append the compressed form to
-  // the encode buffer.
-  //
-
-  #if defined(TEST) || defined(INFO)
-  *logofs << "Proxy: Reading messages from FD#" << fd
-          << " channel ID#" << channelId << ".\n"
-          << logofs_flush;
-  #endif
-
-  int result = channels_[channelId] -> handleRead(encodeBuffer_, (const unsigned char *) data,
-                                                      (unsigned int) size);
-
-  //
-  // Even in the case of a failure, write the produced
-  // data to the proxy connection. To keep the stores
-  // synchronized, the remote side needs to decode any
-  // message encoded by this side, also if the X socket
-  // was closed in the meanwhile. If this is the case,
-  // the decompressed output will be silently discarded.
-  //
-
-  if (result < 0)
-  {
-    #ifdef TEST
-    *logofs << "Proxy: Failed to read data from connection FD#"
-            << fd << " channel ID#" << channelId << ".\n"
-            << logofs_flush;
-    #endif
-
-    if (handleFinish(channelId) < 0)
-    {
-      return -1;
-    }
-  }
-
-  //
-  // Check if there are new splits or
-  // motion events to send.
-  //
-
-  setSplitTimeout(channelId);
-  setMotionTimeout(channelId);
-
-  return 1;
-}
-
-int Proxy::handleEvents()
-{
-  #ifdef TEST
-  *logofs << "Proxy: Going to check the events on channels.\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // Check if we can safely write to the
-  // proxy link.
-  //
-
-  int read = isTimeToRead();
-
-  //
-  // Loop on channels and send the pending
-  // events. We must copy the list because
-  // channels can be removed in the middle
-  // of the loop.
-  //
-
-  T_list channelList = activeChannels_.copyList();
-
-  for (T_list::iterator j = channelList.begin();
-           j != channelList.end(); j++)
-  {
-    int channelId = *j;
-
-    if (channels_[channelId] == NULL)
-    {
-      continue;
-    }
-
-    //
-    // Check if we need to drop the channel.
-    //
-
-    if (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
-
-      if (handleDrop(channelId) < 0)
-      {
-        return -1;
-      }
-
-      continue;
-    }
-    else if (channels_[channelId] -> getFinish() == 1)
-    {
-      #ifdef TEST
-      *logofs << "Proxy: Skipping finishing "
-              << "descriptor FD#" << getFd(channelId)
-              << " channel ID#" << channelId << ".\n"
-              << logofs_flush;
-      #endif
-
-      continue;
-    }
-
-    //
-    // If the proxy link or the channel is
-    // in congestion state, don't handle
-    // the further events.
-    //
-
-    if (read == 0 || congestions_[channelId] == 1)
-    {
-      #ifdef TEST
-
-      if (read == 0)
-      {
-        *logofs << "Proxy: Can't handle events for FD#"
-                << getFd(channelId) << " channel ID#"
-                << channelId << " with proxy not available.\n"
-                << logofs_flush;
-      }
-      else
-      {
-        *logofs << "Proxy: Can't handle events for FD#"
-                << getFd(channelId) << " channel ID#"
-                << channelId << " with channel congested.\n"
-                << logofs_flush;
-      }
-
-      #endif
-
-      continue;
-    }
-
-    //
-    // Handle the timeouts on the channel
-    // operations.
-    //
-
-    int result = 0;
-
-    //
-    // Handle the motion events.
-    //
-
-    if (result >= 0 && channels_[channelId] -> needMotion() == 1)
-    {
-      if (isTimeToMotion() == 1)
-      {
-        #if defined(TEST) || defined(INFO) || defined(FLUSH)
-
-        *logofs << "Proxy: FLUSH! Motion timeout expired after "
-                << diffTimestamp(timeouts_.motionTs, getTimestamp())
-                << " Ms.\n" << logofs_flush;
-
-        #endif
-
-        result = channels_[channelId] -> handleMotion(encodeBuffer_);
-
-        #ifdef TEST
-
-        if (result < 0)
-        {
-          *logofs << "Proxy: Failed to handle motion events for FD#"
-                  << getFd(channelId) << " channel ID#" << channelId
-                  << ".\n" << logofs_flush;
-        }
-
-        #endif
-
-        timeouts_.motionTs = nullTimestamp();
-
-        setMotionTimeout(channelId);
-      }
-      #if defined(TEST) || defined(INFO)
-      else if (isTimestamp(timeouts_.motionTs) == 1)
-      {
-        *logofs << "Proxy: Running with "
-                << diffTimestamp(timeouts_.motionTs, getTimestamp())
-                << " Ms elapsed since the last motion.\n"
-                << logofs_flush;
-      }
-      #endif
-    }
-
-    if (result >= 0 && channels_[channelId] -> needSplit() == 1)
-    {
-      //
-      // Check if it is time to send more splits
-      // and how many bytes are going to be sent.
-      //
-
-      if (isTimeToSplit() == 1)
-      {
-        #if defined(TEST) || defined(INFO) || defined(SPLIT)
-        *logofs << "Proxy: SPLIT! Split timeout expired after "
-                << diffTimestamp(timeouts_.splitTs, getTimestamp())
-                << " Ms.\n" << logofs_flush;
-        #endif
-
-        #if defined(TEST) || defined(INFO) || defined(SPLIT)
-
-        *logofs << "Proxy: SPLIT! Encoding splits for FD#"
-                << getFd(channelId) << " at " << strMsTimestamp()
-                << " with " << clientStore_ -> getSplitTotalStorageSize()
-                << " total bytes and " << control -> SplitDataPacketLimit
-                << " bytes " << "to write.\n"
-                << logofs_flush;
-
-        #endif
-
-        result = channels_[channelId] -> handleSplit(encodeBuffer_);
-
-        #ifdef TEST
-
-        if (result < 0)
-        {
-          *logofs << "Proxy: Failed to handle splits for FD#"
-                  << getFd(channelId) << " channel ID#" << channelId
-                  << ".\n" << logofs_flush;
-        }
-
-        #endif
-
-        timeouts_.splitTs = nullTimestamp();
-
-        setSplitTimeout(channelId);
-      }
-      #if defined(TEST) || defined(INFO) || defined(SPLIT)
-      else if (channels_[channelId] -> needSplit() == 1 &&
-                   isTimestamp(timeouts_.splitTs) == 0)
-      {
-        *logofs << "Proxy: SPLIT! WARNING! Channel for FD#"
-                << getFd(channelId) << " has split to send but "
-                << "there is no timeout.\n" << logofs_flush;
-      }
-      else if (isTimestamp(timeouts_.splitTs) == 1)
-      {
-        *logofs << "Proxy: SPLIT! Running with "
-                << diffTimestamp(timeouts_.splitTs, getTimestamp())
-                << " Ms elapsed since the last split.\n"
-                << logofs_flush;
-      }
-      #endif
-    }
-
-    if (result < 0)
-    {
-      #ifdef TEST
-      *logofs << "Proxy: Error handling events for FD#"
-              << getFd(channelId) << " channel ID#"
-              << channelId << ".\n" << logofs_flush;
-      #endif
-
-      if (handleFinish(channelId) < 0)
-      {
-        return -1;
-      }
-    }
-  }
-
-  return 1;
-}
-
-int Proxy::handleFrame(T_frame_type type)
-{
-  //
-  // Write any outstanding control message, followed by the
-  // content of the encode buffer, to the proxy transport.
-  //
-  // This code assumes that the encode buffer data is at an
-  // offset several bytes from start of the buffer, so that
-  // the length header and any necessary control bytes can
-  // be inserted in front of the data already in the buffer.
-  // This is the easiest way to encapsulate header and data
-  // together in a single frame.
-  //
-  // The way framing is implemented is very efficient but
-  // inherently limited and does not allow for getting the
-  // best performance, especially when running over a fast
-  // link. Framing should be rewritten to include the length
-  // of the packets in a fixed size header and, possibly,
-  // to incapsulate the control messages and the channel's
-  // data in a pseudo X protocol message, so that the proxy
-  // itself would be treated like any other channel.
-  //
-
-  #if defined(TEST) || defined(INFO)
-
-  if (congestion_ == 1)
-  {
-    //
-    // This can happen because there may be control
-    // messages to send, like a proxy shutdown mes-
-    // sage or a statistics request. All the other
-    // cases should be considered an error.
-    //
-
-    #ifdef WARNING
-    *logofs << "Proxy: WARNING! Data is to be sent while "
-            << "congestion is " << congestion_ << ".\n"
-            << logofs_flush;
-    #endif
-  }
-
-  #endif
-
-  //
-  // Check if there is any data available on
-  // the socket. Recent Linux kernels are very
-  // picky. They require that we read often or
-  // they assume that the process is non-inter-
-  // active.
-  //
-
-  if (handleAsyncEvents() < 0)
-  {
-    return -1;
-  }
-
-  //
-  // Check if this is a ping, not a data frame.
-  //
-
-  if (type == frame_ping)
-  {
-    if (handleToken(frame_ping) < 0)
-    {
-      return -1;
-    }
-  }
-
-  unsigned int dataLength = encodeBuffer_.getLength();
-
-  #ifdef DEBUG
-  *logofs << "Proxy: Data length is " << dataLength
-          << " control length is " << controlLength_
-          << ".\n" << logofs_flush;
-  #endif
-
-  if (dataLength > 0)
-  {
-    //
-    // If this is a generic channel we need
-    // to add the completion bits. Data can
-    // also have been encoded because of a
-    // statistics request, even if no output
-    // channel was currently selected.
-    //
-
-    if (outputChannel_ != -1)
-    {
-      #if defined(TEST) || defined(INFO)
-
-      if (channels_[outputChannel_] == NULL)
-      {
-        *logofs << "Proxy: PANIC! A new frame was requested "
-                << "but the channel is invalid.\n"
-                << logofs_flush;
-
-        HandleCleanup();
-      }
-
-      #endif
-
-      channels_[outputChannel_] -> handleCompletion(encodeBuffer_);
-
-      dataLength = encodeBuffer_.getLength();
-    }
-  }
-  else if (controlLength_ == 0)
-  {
-    #if defined(TEST) || defined(INFO)
-
-    *logofs << "Proxy: PANIC! A new frame was requested "
-            << "but there is no data to write.\n"
-            << logofs_flush;
-
-    HandleCleanup();
-
-    #endif
-
-    return 0;
-  }
-
-  #ifdef DEBUG
-  *logofs << "Proxy: Data length is now " << dataLength
-          << " control length is " << controlLength_
-          << ".\n" << logofs_flush;
-  #endif
-
-  //
-  // Check if this frame needs to carry a new
-  // token request.
-  //
-
-  if (type == frame_data)
-  {
-    if (handleToken(frame_data) < 0)
-    {
-      return -1;
-    }
-  }
-
-  #ifdef DEBUG
-  *logofs << "Proxy: Adding a new frame for the remote proxy.\n"
-          << logofs_flush;
-  #endif
-
-  unsigned char temp[5];
-
-  unsigned int lengthLength = 0;
-  unsigned int shift = dataLength;
-
-  while (shift)
-  {
-    temp[lengthLength++] = (unsigned char) (shift & 0x7f);
-
-    shift >>= 7;
-  }
-
-  unsigned char *data = encodeBuffer_.getData();
-
-  unsigned char *outputMessage = data - (controlLength_ + lengthLength);
-
-  unsigned char *nextDest = outputMessage;
-
-  for (int i = 0; i < controlLength_; i++)
-  {
-    *nextDest++ = controlCodes_[i];
-  }
-
-  for (int j = lengthLength - 1; j > 0; j--)
-  {
-    *nextDest++ = (temp[j] | 0x80);
-  }
-
-  if (lengthLength)
-  {
-    *nextDest++ = temp[0];
-  }
-
-  unsigned int outputLength = dataLength + controlLength_ + lengthLength;
-
-  #if defined(TEST) || defined(INFO)
-  *logofs << "Proxy: Produced plain output for " << dataLength << "+"
-          << controlLength_ << "+" << lengthLength << " out of "
-          << outputLength << " bytes.\n" << logofs_flush;
-  #endif
-
-  #if defined(TEST) || defined(INFO) || defined(FLUSH) || defined(TIME)
-
-  T_timestamp nowTs = getTimestamp();
-
-  *logofs << "Proxy: FLUSH! Immediate with blocked " << transport_ ->
-             blocked() << " length " << transport_ -> length()
-          << " new " << outputLength << " flushable " << transport_ ->
-             flushable() << " tokens " << tokens_[token_control].remaining
-          << " after " << diffTimestamp(timeouts_.writeTs, nowTs)
-          << " Ms.\n" << logofs_flush;
-
-  *logofs << "Proxy: FLUSH! Immediate flush to proxy FD#" << fd_
-          << " of " << outputLength << " bytes at " << strMsTimestamp()
-          << " with priority " << priority_ << ".\n" << logofs_flush;
-
-  *logofs << "Proxy: FLUSH! Current bitrate is "
-          << statistics -> getBitrateInShortFrame() << " with "
-          << statistics -> getBitrateInLongFrame() << " in the "
-          << "long frame and top " << statistics ->
-             getTopBitrate() << ".\n" << logofs_flush;
-  #endif
-
-  statistics -> addWriteOut();
-
-  int result = transport_ -> write(write_immediate, outputMessage, outputLength);
-
-  #ifdef TIME
-
-  if (diffTimestamp(timeouts_.writeTs, nowTs) > 50)
-  {
-    *logofs << "Proxy: WARNING! TIME! Data written to proxy FD#"
-            << fd_ << " at " << strMsTimestamp() << " after "
-            << diffTimestamp(timeouts_.writeTs, nowTs)
-            << " Ms.\n" << logofs_flush;
-  }
-
-  #endif
-
-  #ifdef DUMP
-  *logofs << "Proxy: Sent " << outputLength << " bytes of data "
-          << "with checksum ";
-
-  DumpChecksum(outputMessage, outputLength);
-
-  *logofs << " on proxy FD#" << fd_ << ".\n" << logofs_flush;
-  #endif
-
-  #ifdef DUMP
-  *logofs << "Proxy: Partial checksums are:\n";
-
-  DumpBlockChecksums(outputMessage, outputLength, 256);
-
-  *logofs << logofs_flush;
-  #endif
-
-  //
-  // Clean up the encode buffer and
-  // bring it to the initial size.
-  //
-
-  encodeBuffer_.fullReset();
-
-  //
-  // Close the connection if we got
-  // an error.
-  //
-
-  if (result < 0)
-  {
-    #ifdef TEST
-    *logofs << "Proxy: Failed write to proxy FD#"
-            << fd_ << ".\n" << logofs_flush;
-    #endif
-
-    return -1;
-  }
-
-  //
-  // Account for the data frame and the
-  // framing overhead.
-  //
-
-  if (dataLength > 0)
-  {
-    statistics -> addFrameOut();
-  }
-
-  statistics -> addFramingBits((controlLength_ + lengthLength) << 3);
-
-  controlLength_ = 0;
-
-  //
-  // Reset all buffers, counters and the
-  // priority flag.
-  //
-
-  handleResetFlush();
-
-  //
-  // Check if more data became available
-  // after writing.
-  //
-
-  if (handleAsyncEvents() < 0)
-  {
-    return -1;
-  }
-
-  //
-  // Drain the proxy link if we are in
-  // congestion state.
-  //
-  // if (needDrain() == 1 && draining_ == 0)
-  // {
-  //   if (handleDrain() < 0)
-  //   {
-  //     return -1;
-  //   }
-  // }
-  //
-
-  return result;
-}
-
-int Proxy::handleFlush()
-{
-  //
-  // We can have data in the encode buffer or
-  // control bytes to send. In the case make
-  // up a new frame.
-  //
-
-  if (encodeBuffer_.getLength() + controlLength_ > 0)
-  {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Proxy: Flushing data in the encode buffer.\n"
-            << logofs_flush;
-    #endif
-
-    priority_ = 1;
-
-    if (handleFrame(frame_data) < 0)
-    {
-      return -1;
-    }
-  }
-
-  //
-  // Check if we have something to write.
-  //
-
-  if (transport_ -> length() + transport_ -> flushable() == 0)
-  {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Proxy: Nothing else to flush for proxy FD#"
-            << fd_ << ".\n" << logofs_flush;
-    #endif
-
-    return 0;
-  }
-
-  #if defined(TEST) || defined(INFO)
-
-  if (transport_ -> blocked() == 0)
-  {
-    #ifdef PANIC
-    *logofs << "Proxy: PANIC! Proxy descriptor FD#" << fd_
-            << " has data to flush but the transport "
-            << "is not blocked.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Proxy descriptor FD#" << fd_
-         << " has data to flush but the transport "
-         << "is not blocked.\n";
-
-    HandleCleanup();
-  }
-
-  #endif
-
-  #if defined(TEST) || defined(INFO) || defined(FLUSH)
-  *logofs << "Proxy: FLUSH! Deferred with blocked " << transport_ ->
-             blocked() << " length " << transport_ -> length()
-          << " flushable " << transport_ -> flushable() << " tokens "
-          << tokens_[token_control].remaining << ".\n"
-          << logofs_flush;
-
-  *logofs << "Proxy: FLUSH! Deferred flush to proxy FD#" << fd_
-          << " of " << transport_ -> length() + transport_ ->
-             flushable() << " bytes at " << strMsTimestamp()
-          << " with priority " << priority_ << ".\n"
-          << logofs_flush;
-
-  *logofs << "Proxy: FLUSH! Current bitrate is "
-          << statistics -> getBitrateInShortFrame() << " with "
-          << statistics -> getBitrateInLongFrame() << " in the "
-          << "long frame and top " << statistics ->
-             getTopBitrate() << ".\n" << logofs_flush;
-  #endif
-
-  statistics -> addWriteOut();
-
-  int result = transport_ -> flush();
-
-  if (result < 0)
-  {
-    return -1;
-  }
-
-  //
-  // Reset the counters and update the
-  // timestamp of the last write.
-  //
-
-  handleResetFlush();
-
-  return result;
-}
-
-int Proxy::handleDrain()
-{
-  //
-  // If the proxy is run in the same process
-  // as SSH, we can't block or the program
-  // would not have a chance to read or write
-  // its data.
-  //
-
-  if (control -> LinkEncrypted == 1)
-  {
-    return 0;
-  }
-
-  if (needDrain() == 0 || draining_ == 1)
-  {
-    #if defined(TEST) || defined(INFO)
-
-    if (draining_ == 1)
-    {
-      *logofs << "Proxy: WARNING! Already draining proxy FD#"
-              << fd_ << " at " << strMsTimestamp() << ".\n"
-              << logofs_flush;
-    }
-    else
-    {
-      *logofs << "Proxy: WARNING! No need to drain proxy FD#"
-              << fd_ << " with congestion " << congestion_
-              << " length " << transport_ -> length()
-              << " and blocked " << transport_ -> blocked()
-              << ".\n" << logofs_flush;
-    }
-
-    #endif
-
-    return 0;
-  }
-
-  draining_ = 1;
-
-  #if defined(TEST) || defined(INFO)
-  *logofs << "Proxy: Going to drain the proxy FD#" << fd_
-          << " at " << strMsTimestamp() << ".\n"
-          << logofs_flush;
-  #endif
-
-  int timeout = control -> PingTimeout / 2;
-
-  T_timestamp startTs = getNewTimestamp();
-
-  T_timestamp nowTs = startTs;
-
-  int remaining;
-  int result;
-
-  //
-  // Keep draining the proxy socket while
-  // reading the incoming messages until
-  // the timeout is expired.
-  // 
-
-  for (;;)
-  {
-    remaining = timeout - diffTimestamp(startTs, nowTs);
-
-    if (remaining <= 0)
-    {
-      #if defined(TEST) || defined(INFO)
-      *logofs << "Proxy: Timeout raised while draining "
-              << "FD#" << fd_ << " at " << strMsTimestamp()
-              << " after " << diffTimestamp(startTs, nowTs)
-              << " Ms.\n" << logofs_flush;
-      #endif
-
-      result = 0;
-
-      goto ProxyDrainEnd;
-    }
-
-    if (transport_ -> length() > 0)
-    {
-      #if defined(TEST) || defined(INFO)
-      *logofs << "Proxy: Trying to write to FD#" << fd_
-              << " at " << strMsTimestamp() << " with length "
-              << transport_ -> length() << " and "
-              << remaining << " Ms remaining.\n"
-              << logofs_flush;
-      #endif
-
-      result = transport_ -> drain(0, remaining);
-
-      if (result == -1)
-      {
-        result = -1;
-
-        goto ProxyDrainEnd;
-      }
-      else if (result == 0 && transport_ -> readable() > 0)
-      {
-        #if defined(TEST) || defined(INFO)
-        *logofs << "Proxy: Decoding more data from proxy FD#"
-                << fd_ << " at " << strMsTimestamp() << " with "
-                << transport_ -> length() << " bytes to write and "
-                << transport_ -> readable() << " readable.\n"
-                << logofs_flush;
-        #endif
-
-        if (handleRead() < 0)
-        {
-          result = -1;
-
-          goto ProxyDrainEnd;
-        }
-      }
-      #if defined(TEST) || defined(INFO)
-      else if (result == 1)
-      {
-        *logofs << "Proxy: Transport for proxy FD#" << fd_
-                << " drained down to " << transport_ -> length()
-                << " bytes.\n" << logofs_flush;
-      }
-      #endif
-    }
-    else
-    {
-      #if defined(TEST) || defined(INFO)
-      *logofs << "Proxy: Waiting for more data from proxy "
-              << "FD#" << fd_ << " at " << strMsTimestamp()
-              << " with " << remaining << " Ms remaining.\n"
-              << logofs_flush;
-      #endif
-
-
-      result = transport_ -> wait(remaining);
-
-      if (result == -1)
-      {
-        result = -1;
-
-        goto ProxyDrainEnd;
-      }
-      else if (result > 0)
-      {
-        #if defined(TEST) || defined(INFO)
-        *logofs << "Proxy: Decoding more data from proxy FD#"
-                << fd_ << " at " << strMsTimestamp() << " with "
-                << transport_ -> readable() << " bytes readable.\n"
-                << logofs_flush;
-        #endif
-
-        if (handleRead() < 0)
-        {
-          result = -1;
-
-          goto ProxyDrainEnd;
-        }
-      }
-    }
-
-    //
-    // Check if we finally got the tokens
-    // that would allow us to come out of
-    // the congestion state.
-    //
-
-    if (needDrain() == 0)
-    {
-      #if defined(TEST) || defined(INFO)
-      *logofs << "Proxy: Got decongestion for proxy FD#"
-              << fd_ << " at " << strMsTimestamp() << " after "
-              << diffTimestamp(startTs, getTimestamp())
-              << " Ms.\n" << logofs_flush;
-      #endif
-
-      result = 1;
-
-      goto ProxyDrainEnd;
-    }
-
-    nowTs = getNewTimestamp();
-  }
-
-ProxyDrainEnd:
-
-  draining_ = 0;
-
-  return result;
-}
-
-int Proxy::handleFlush(int fd)
-{
-  int channelId = getChannel(fd);
-
-  if (channelId < 0 || channels_[channelId] == NULL)
-  {
-    #ifdef TEST
-    *logofs << "Proxy: WARNING! Skipping flush on invalid "
-            << "descriptor FD#" << fd << " channel ID#"
-            << channelId << ".\n" << logofs_flush;
-    #endif
-
-    return 0;
-  }
-  else if (channels_[channelId] -> getFinish() == 1)
-  {
-    #ifdef TEST
-    *logofs << "Proxy: Skipping flush on finishing "
-            << "descriptor FD#" << fd << " channel ID#"
-            << channelId << ".\n" << logofs_flush;
-    #endif
-
-    return 0;
-  }
-
-  #ifdef TEST
-  *logofs << "Proxy: Going to flush FD#" << fd
-          << " with blocked " << transports_[channelId] -> blocked()
-          << " length " << transports_[channelId] -> length()
-          << ".\n" << logofs_flush;
-  #endif
-
-  if (channels_[channelId] -> handleFlush() < 0)
-  {
-    #ifdef TEST
-    *logofs << "Proxy: Failed to flush data to FD#"
-            << getFd(channelId) << " channel ID#"
-            << channelId << ".\n" << logofs_flush;
-    #endif
-
-    handleFinish(channelId);
-
-    return -1;
-  }
-
-  return 1;
-}
-
-int Proxy::handleStatistics(int type, ostream *stream)
-{
-  if (stream == NULL || control -> EnableStatistics == 0)
-  {
-    #ifdef WARNING
-    *logofs << "Proxy: WARNING! Cannot produce statistics "
-            << " for proxy FD#" << fd_ << ". Invalid settings "
-            << "for statistics or stream.\n" << logofs_flush;
-    #endif
-
-    return 0;
-  }
-  else if (currentStatistics_ != NULL)
-  {
-    //
-    // Need to update the stream pointer as the
-    // previous one could have been destroyed.
-    //
- 
-    #ifdef WARNING
-    *logofs << "Proxy: WARNING! Replacing stream while producing "
-            << "statistics in stream at " << currentStatistics_
-            << " for proxy FD#" << fd_ << ".\n"
-            << logofs_flush;
-    #endif
-  }
-
-  currentStatistics_ = stream;
-
-  //
-  // Get statistics of remote peer.
-  //
-
-  if (handleControl(code_statistics_request, type) < 0)
-  {
-    return -1;
-  }
-
-  return 1;
-}
-
-int Proxy::handleStatisticsFromProxy(int type)
-{
-  if (needFlush() == 1)
-  {
-    #if defined(TEST) || defined(INFO) || defined(FLUSH)
-    *logofs << "Proxy: WARNING! Data for the previous "
-            << "channel ID#" << outputChannel_
-            << " flushed in statistics.\n"
-            << logofs_flush;
-    #endif
-
-    if (handleFrame(frame_data) < 0)
-    {
-      return -1;
-    }
-  }
-
-  if (control -> EnableStatistics == 1)
-  {
-    //
-    // Allocate a buffer for the output.
-    //
-
-    char *buffer = new char[STATISTICS_LENGTH];
- 
-    *buffer = '\0';
-
-    if (control -> ProxyMode == proxy_client)
-    {
-      #ifdef TEST
-      *logofs << "Proxy: Producing "
-              << (type == TOTAL_STATS ? "total" : "partial")
-              << " client statistics for proxy FD#"
-              << fd_ << ".\n" << logofs_flush;
-      #endif
-
-      statistics -> getClientProtocolStats(type, buffer);
-
-      statistics -> getClientOverallStats(type, buffer);
-    }
-    else
-    {
-      #ifdef TEST
-      *logofs << "Proxy: Producing "
-              << (type == TOTAL_STATS ? "total" : "partial")
-              << " server statistics for proxy FD#"
-              << fd_ << ".\n" << logofs_flush;
-      #endif
-
-      statistics -> getServerProtocolStats(type, buffer);
-    }
-
-    if (type == PARTIAL_STATS)
-    {
-      statistics -> resetPartialStats();
-    }
-
-    unsigned int length = strlen((char *) buffer) + 1;
-
-    encodeBuffer_.encodeValue(type, 8);
-
-    encodeBuffer_.encodeValue(length, 32);
-
-    #ifdef TEST
-    *logofs << "Proxy: Encoding " << length
-            << " bytes of statistics data for proxy FD#"
-            << fd_ << ".\n" << logofs_flush;
-    #endif
-
-    encodeBuffer_.encodeMemory((unsigned char *) buffer, length);
-
-    //
-    // Account statistics data as framing bits.
-    //
-
-    statistics -> addFramingBits(length << 3);
-
-    delete [] buffer;
-  }
-  else
-  {
-    #ifdef WARNING
-    *logofs << "Proxy: WARNING! Got statistics request "
-            << "but local statistics are disabled.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Warning" << ": Got statistics request "
-         << "but local statistics are disabled.\n";
-
-    type = NO_STATS;
-
-    encodeBuffer_.encodeValue(type, 8);
-
-    #ifdef TEST
-    *logofs << "Proxy: Sending error code to remote proxy on FD#"
-            << fd_ << ".\n" << logofs_flush;
-    #endif
-  }
-
-  //
-  // The next write will flush the statistics
-  // data and the control message.
-  //
-
-  if (handleControl(code_statistics_reply, type) < 0)
-  {
-    return -1;
-  }
-
-  return 1;
-}
-
-int Proxy::handleStatisticsFromProxy(const unsigned char *message, unsigned int length)
-{
-  if (currentStatistics_ == NULL)
-  {
-    #ifdef WARNING
-    *logofs << "Proxy: WARNING! Unexpected statistics data received "
-            << "from remote proxy on FD#" << fd_ << ".\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Warning" << ": Unexpected statistics data received "
-         << "from remote proxy.\n";
-
-    return 0;
-  }
-
-  //
-  // Allocate the decode buffer and at least
-  // the 'type' field to see if there was an
-  // error.
-  //
-
-  DecodeBuffer decodeBuffer(message, length);
-
-  unsigned int type;
-
-  decodeBuffer.decodeValue(type, 8);
-
-  if (type == NO_STATS)
-  {
-    #ifdef PANIC
-    *logofs << "Proxy: PANIC! Couldn't get statistics from remote "
-            << "proxy on FD#" << fd_ << ".\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Couldn't get statistics from remote proxy.\n";
-  }
-  else if (type != TOTAL_STATS && type != PARTIAL_STATS)
-  {
-    #ifdef PANIC
-    *logofs << "Proxy: PANIC! Cannot produce statistics "
-            << "with qualifier '" << type << "'.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Cannot produce statistics "
-         << "with qualifier '" << type << "'.\n";
-
-    return -1;
-  }
-  else
-  {
-    unsigned int size;
-
-    decodeBuffer.decodeValue(size, 32);
-
-    char *buffer = new char[STATISTICS_LENGTH];
-
-    *buffer = '\0';
-
-    if (control -> EnableStatistics == 1)
-    {
-      if (control -> ProxyMode == proxy_client)
-      {
-        #ifdef TEST
-        *logofs << "Proxy: Finalizing "
-                << (type == TOTAL_STATS ? "total" : "partial")
-                << " client statistics for proxy FD#"
-                << fd_ << ".\n" << logofs_flush;
-        #endif
-
-        statistics -> getClientCacheStats(type, buffer);
-
-        #ifdef TEST
-        *logofs << "Proxy: Decoding " << size
-                << " bytes of statistics data for proxy FD#"
-                << fd_ << ".\n" << logofs_flush;
-        #endif
-
-        strncat(buffer, (char *) decodeBuffer.decodeMemory(size), size);
-
-        statistics -> getClientProtocolStats(type, buffer);
-
-        statistics -> getClientOverallStats(type, buffer);
-      }
-      else
-      {
-        #ifdef TEST
-        *logofs << "Proxy: Finalizing "
-                << (type == TOTAL_STATS ? "total" : "partial")
-                << " server statistics for proxy FD#"
-                << fd_ << ".\n" << logofs_flush;
-        #endif
-
-        statistics -> getServerCacheStats(type, buffer);
-
-        statistics -> getServerProtocolStats(type, buffer);
-
-        #ifdef TEST
-        *logofs << "Proxy: Decoding " << size
-                << " bytes of statistics data for proxy FD#"
-                << fd_ << ".\n" << logofs_flush;
-        #endif
-
-        strncat(buffer, (char *) decodeBuffer.decodeMemory(size), size);
-      }
-
-      if (type == PARTIAL_STATS)
-      {
-        statistics -> resetPartialStats();
-      }
-
-      *currentStatistics_ << buffer;
-
-      //
-      // Mark the end of text to help external parsing.
-      //
-
-      *currentStatistics_ << '\4';
-
-      *currentStatistics_ << flush;
-    }
-    else
-    {
-      //
-      // It can be that statistics were enabled at the time
-      // we issued the request (otherwise we could not have
-      // set the stream), but now they have been disabled
-      // by user. We must decode statistics data if we want
-      // to keep the connection.
-      //
-
-      #ifdef TEST
-      *logofs << "Proxy: Discarding " << size
-              << " bytes of statistics data for proxy FD#"
-              << fd_ << ".\n" << logofs_flush;
-      #endif
-
-      strncat(buffer, (char *) decodeBuffer.decodeMemory(size), size);
-    }
-
-    delete [] buffer;
-  }
-
-  currentStatistics_ = NULL;
-
-  return 1;
-}
-
-int Proxy::handleNegotiation(const unsigned char *message, unsigned int length)
-{
-  #ifdef PANIC
-  *logofs << "Proxy: PANIC! Writing data during proxy "
-          << "negotiation is not implemented.\n"
-          << logofs_flush;
-  #endif
-
-  cerr << "Error" << ": Writing data during proxy "
-       << "negotiation is not implemented.\n";
-
-  return -1;
-}
-
-int Proxy::handleNegotiationFromProxy(const unsigned char *message, unsigned int length)
-{
-  #ifdef PANIC
-  *logofs << "Proxy: PANIC! Reading data during proxy "
-          << "negotiation is not implemented.\n"
-          << logofs_flush;
-  #endif
-
-  cerr << "Error" << ": Reading data during proxy "
-       << "negotiation is not implemented.\n";
-
-  return -1;
-}
-
-int Proxy::handleAlert(int alert)
-{
-  if (handleControl(code_alert_request, alert) < 0)
-  {
-    return -1;
-  }
-
-  return 1;
-}
-
-int Proxy::handleCloseConnection(int clientFd)
-{
-  int channelId = getChannel(clientFd);
-
-  if (channels_[channelId] != NULL &&
-          channels_[channelId] -> getFinish() == 0)
-  {
-    #ifdef TEST
-    *logofs << "Proxy: Closing down the channel for FD#"
-            << clientFd << ".\n" << logofs_flush;
-    #endif
-
-    if (handleFinish(channelId) < 0)
-    {
-      return -1;
-    }
-
-    return 1;
-  }
-
-  return 0;
-}
-
-int Proxy::handleCloseAllXConnections()
-{
-  #ifdef TEST
-  *logofs << "Proxy: Closing down any remaining X channel.\n"
-          << logofs_flush;
-  #endif
-
-  T_list &channelList = activeChannels_.getList();
-
-  for (T_list::iterator j = channelList.begin();
-           j != channelList.end(); j++)
-  {
-    int channelId = *j;
-
-    if (channels_[channelId] != NULL &&
-            channels_[channelId] -> getType() == channel_x11 &&
-                channels_[channelId] -> getFinish() == 0)
-    {
-      #ifdef TEST
-      *logofs << "Proxy: Closing down the channel for FD#"
-              << getFd(channelId) << ".\n" << logofs_flush;
-      #endif
-
-      if (handleFinish(channelId) < 0)
-      {
-        return -1;
-      }
-    }
-  }
-
-  return 1;
-}
-
-int Proxy::handleCloseAllListeners()
-{
-  // Since ProtoStep7 (#issue 108)
-  if (finish_ == 0)
-  {
-    #ifdef TEST
-    *logofs << "Proxy: Closing down all remote listeners.\n"
-            << logofs_flush;
-    #endif
-
-    if (handleControl(code_finish_listeners) < 0)
-    {
-      return -1;
-    }
-
-    finish_ = 1;
-  }
-
-  return 1;
-}
-
-void Proxy::handleResetAlert()
-{
-  if (alert_ != 0)
-  {
-    #ifdef TEST
-    *logofs << "Proxy: The proxy alert '" << alert_
-            << "' was displaced.\n" << logofs_flush;
-    #endif
-
-    alert_ = 0;
-  }
-
-  T_list &channelList = activeChannels_.getList();
-
-  for (T_list::iterator j = channelList.begin();
-           j != channelList.end(); j++)
-  {
-    int channelId = *j;
-
-    if (channels_[channelId] != NULL)
-    {
-      channels_[channelId] -> handleResetAlert();
-    }
-  }
-}
-
-int Proxy::handleFinish(int channelId)
-{
-  //
-  // Send any outstanding encoded data and
-  // do any finalization needed on the
-  // channel.
-  //
-
-  if (needFlush(channelId) == 1)
-  {
-    if (channels_[channelId] -> getFinish() == 1)
-    {
-      #ifdef WARNING
-      *logofs << "Proxy: WARNING! The finishing channel ID#"
-              << channelId << " has data to flush.\n"
-              << logofs_flush;
-      #endif
-    }
-
-    #if defined(TEST) || defined(INFO) || defined(FLUSH)
-    *logofs << "Proxy: WARNING! Flushing data for the "
-            << "finishing channel ID#" << channelId
-            << ".\n" << logofs_flush;
-    #endif
-
-    if (handleFrame(frame_data) < 0)
-    {
-      return -1;
-    }
-  }
-
-  //
-  // Reset the congestion state and the
-  // timeouts, if needed.
-  //
-
-  congestions_[channelId] = 0;
-
-  setSplitTimeout(channelId);
-  setMotionTimeout(channelId);
-
-  if (channels_[channelId] -> getFinish() == 0)
-  {
-    channels_[channelId] -> handleFinish();
-
-    //
-    // Force a failure in the case somebody
-    // would try to read from the channel.
-    //
-
-    shutdown(getFd(channelId), SHUT_RD);
-
-    //
-    // If the failure was not originated by
-    // the remote, send a channel shutdown
-    // message.
-    //
-
-    if (channels_[channelId] -> getClosing() == 0)
-    {
-      #ifdef TEST
-      *logofs << "Proxy: Finishing channel for FD#"
-              << getFd(channelId) << " channel ID#"
-              << channelId << " because of failure.\n"
-              << logofs_flush;
-      #endif
-
-      if (handleControl(code_finish_connection, channelId) < 0)
-      {
-        return -1;
-      }
-    }
-  }
-
-  return 1;
-}
-
-int Proxy::handleFinishFromProxy(int channelId)
-{
-  //
-  // Check if this channel has pending
-  // data to send.
-  //
-
-  if (needFlush(channelId) == 1)
-  {
-    #if defined(TEST) || defined(INFO) || defined(FLUSH)
-    *logofs << "Proxy: WARNING! Flushing data for the "
-            << "finishing channel ID#" << channelId
-            << ".\n" << logofs_flush;
-    #endif
-
-    if (handleFrame(frame_data) < 0)
-    {
-      return -1;
-    }
-  }
-
-  //
-  // Mark the channel. We will free its
-  // resources at the next loop and will
-  // send the drop message to the remote.
-  //
-
-  if (channels_[channelId] -> getClosing() == 0)
-  {
-    #ifdef TEST
-    *logofs << "Proxy: Marking channel for FD#"
-            << getFd(channelId) << " channel ID#"
-            << channelId << " as closing.\n"
-            << logofs_flush;
-    #endif
-
-    channels_[channelId] -> handleClosing();
-  }
-
-  if (channels_[channelId] -> getFinish() == 0)
-  {
-    #ifdef TEST
-    *logofs << "Proxy: Finishing channel for FD#"
-            << getFd(channelId) << " channel ID#"
-            << channelId << " because of proxy.\n"
-            << logofs_flush;
-    #endif
-
-    channels_[channelId] -> handleFinish();
-  }
-
-  if (handleFinish(channelId) < 0)
-  {
-    return -1;
-  }
-
-  return 1;
-}
-
-int Proxy::handleDropFromProxy(int channelId)
-{
-  //
-  // Only mark the channel.
-  //
-
-  #ifdef TEST
-  *logofs << "Proxy: Marking channel for FD#"
-          << getFd(channelId) << " channel ID#"
-          << channelId << " as being dropped.\n"
-          << logofs_flush;
-  #endif
-
-  if (channels_[channelId] -> getDrop() == 0)
-  {
-    channels_[channelId] -> handleDrop();
-  }
-
-  return 1;
-}
-
-//
-// Close the channel and deallocate all its
-// resources.
-//
-
-int Proxy::handleDrop(int channelId)
-{
-  //
-  // Check if this channel has pending
-  // data to send.
-  //
-
-  if (needFlush(channelId) == 1)
-  {
-    if (channels_[channelId] -> getFinish() == 1)
-    {
-      #ifdef WARNING
-      *logofs << "Proxy: WARNING! The dropping channel ID#"
-              << channelId << " has data to flush.\n"
-              << logofs_flush;
-      #endif
-    }
-
-    #if defined(TEST) || defined(INFO) || defined(FLUSH)
-    *logofs << "Proxy: WARNING! Flushing data for the "
-            << "dropping channel ID#" << channelId
-            << ".\n" << logofs_flush;
-    #endif
-
-    if (handleFrame(frame_data) < 0)
-    {
-      return -1;
-    }
-  }
-
-  #ifdef TEST
-  *logofs << "Proxy: Dropping channel for FD#"
-          << getFd(channelId) << " channel ID#"
-          << channelId << ".\n" << logofs_flush;
-  #endif
-
-  if (channels_[channelId] -> getFinish() == 0)
-  {
-    #ifdef WARNING
-    *logofs << "Proxy: WARNING! The channel for FD#"
-            << getFd(channelId) << " channel ID#"
-            << channelId << " was not marked as "
-            << "finishing.\n" << logofs_flush;
-    #endif
-
-    cerr << "Warning" << ": The channel for FD#"
-         << getFd(channelId) << " channel ID#"
-         << channelId << " was not marked as "
-         << "finishing.\n";
-
-    channels_[channelId] -> handleFinish();
-  }
-
-  //
-  // Send the channel shutdown message
-  // to the peer proxy.
-  //
-
-  if (channels_[channelId] -> getClosing() == 1)
-  {
-    if (handleControl(code_drop_connection, channelId) < 0)
-    {
-      return -1;
-    }
-  }
-
-  //
-  // Get rid of the channel.
-  //
-
-  if (channels_[channelId] -> getType() != channel_x11)
-  {
-    #ifdef TEST
-    *logofs << "Proxy: Closed connection to "
-            << getTypeName(channels_[channelId] -> getType())
-            << " server.\n" << logofs_flush;
-    #endif
-
-    cerr << "Info" << ": Closed connection to "
-         << getTypeName(channels_[channelId] -> getType())
-         << " server.\n";
-  }
-
-  delete channels_[channelId];
-  channels_[channelId] = NULL;
-
-  cleanupChannelMap(channelId);
-
-  //
-  // Get rid of the transport.
-  //
-
-  deallocateTransport(channelId);
-
-  congestions_[channelId] = 0;
-
-  decreaseChannels(channelId);
-
-  //
-  // Check if the channel was the
-  // one currently selected for
-  // output.
-  //
-
-  if (outputChannel_ == channelId)
-  {
-    outputChannel_ = -1;
-  }
-  
-  return 1;
-}
-
-//
-// Send an empty message to the remote peer
-// to verify if the link is alive and let
-// the remote proxy detect a congestion.
-//
-
-int Proxy::handlePing()
-{
-  T_timestamp nowTs = getTimestamp();
-
-  #if defined(DEBUG) || defined(PING)
-
-  *logofs << "Proxy: Checking ping at "
-          << strMsTimestamp(nowTs) << logofs_flush;
-
-  *logofs << " with last loop at "
-          << strMsTimestamp(timeouts_.loopTs) << ".\n"
-          << logofs_flush;
-
-  *logofs << "Proxy: Last bytes in at "
-          << strMsTimestamp(timeouts_.readTs) << logofs_flush;
-
-  *logofs << " last bytes out at "
-          << strMsTimestamp(timeouts_.writeTs) << ".\n"
-          << logofs_flush;
-
-  *logofs << "Proxy: Last ping at "
-          << strMsTimestamp(timeouts_.pingTs) << ".\n"
-          << logofs_flush;
-
-  #endif
-
-  //
-  // Be sure we take into account any clock drift. This
-  // can be caused by the user changing the system timer
-  // or by small adjustments introduced by the operating
-  // system making the clock go backward.
-  //
-
-  if (checkDiffTimestamp(timeouts_.loopTs, nowTs) == 0)
-  {
-    #ifdef WARNING
-    *logofs << "Proxy: WARNING! Detected drift in system "
-            << "timer. Resetting to current time.\n"
-            << logofs_flush;
-    #endif
-
-    timeouts_.pingTs  = nowTs;
-    timeouts_.readTs  = nowTs;
-    timeouts_.writeTs = nowTs;
-  }
-
-  //
-  // Check timestamp of last read from remote proxy. It can
-  // happen that we stayed in the main loop long enough to
-  // have idle timeout expired, for example if the proxy was
-  // stopped and restarted or because of an extremely high
-  // load of the system. In this case we don't complain if
-  // there is something new to read from the remote.
-  //
-
-  int diffIn = diffTimestamp(timeouts_.readTs, nowTs);
-
-  if (diffIn >= (control -> PingTimeout * 2) -
-          control -> LatencyTimeout)
-  {
-    //
-    // Force a read to detect whether the remote proxy
-    // aborted the connection.
-    //
-
-    int result = handleRead();
-
-    if (result < 0)
-    {
-      #if defined(TEST) || defined(INFO) || defined(PING)
-      *logofs << "Proxy: WARNING! Detected shutdown waiting "
-              << "for the ping after " << diffIn / 1000
-              << " seconds.\n" << logofs_flush;
-      #endif
-
-      return -1;
-    }
-    else if (result > 0)
-    {
-      diffIn = diffTimestamp(timeouts_.readTs, nowTs);
-
-      if (handleFlush() < 0)
-      {
-        return -1;
-      }
-    }
-  }
-
-  if (diffIn >= (control -> PingTimeout * 2) -
-          control -> LatencyTimeout)
-  {
-    #if defined(TEST) || defined(INFO) || defined(PING)
-    *logofs << "Proxy: Detected congestion at "
-            << strMsTimestamp() << " with " << diffIn / 1000
-            << " seconds since the last read.\n"
-            << logofs_flush;
-    #endif
-
-    //
-    // There are two types of proxy congestion. The first,
-    // affecting the ability of the proxy to write the
-    // encoded data to the network, is controlled by the
-    // congestion_ flag. The flag is raised when no data
-    // is received from the remote proxy within a timeout.
-    // On the X client side, the flag is also raised when
-    // the proxy runs out of tokens.
-    //
-
-    if (control -> ProxyMode == proxy_server)
-    {
-      //
-      // At X server side we must return to read data
-      // from the channels after a while, because we
-      // need to give a chance to the channel to read
-      // the key sequence CTRL+ALT+SHIFT+ESC.
-      //
-
-      if (congestion_ == 0)
-      {
-        #if defined(TEST) || defined(INFO)
-        *logofs << "Proxy: Forcibly entering congestion due to "
-                << "timeout with " << tokens_[token_control].remaining
-                << " tokens.\n" << logofs_flush;
-        #endif
-
-        congestion_ = 1;
-      }
-      else
-      {
-        #if defined(TEST) || defined(INFO)
-        *logofs << "Proxy: Forcibly exiting congestion due to "
-                << "timeout with " << tokens_[token_control].remaining
-                << " tokens.\n" << logofs_flush;
-        #endif
-
-        congestion_ = 0;
-      }
-    }
-    else
-    {
-      #if defined(TEST) || defined(INFO)
-
-      if (congestion_ == 0)
-      {
-        *logofs << "Proxy: Entering congestion due to timeout "
-                << "with " << tokens_[token_control].remaining
-                << " tokens.\n" << logofs_flush;
-      }
-
-      #endif
-
-      congestion_ = 1;
-    }
-
-    if (control -> ProxyTimeout > 0 &&
-            diffIn >= (control -> ProxyTimeout -
-                control -> LatencyTimeout))
-    {
-      #ifdef PANIC
-      *logofs << "Proxy: PANIC! No data received from "
-              << "remote proxy on FD#" << fd_ << " within "
-              << (diffIn + control -> LatencyTimeout) / 1000
-              << " seconds.\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": No data received from remote "
-           << "proxy within " << (diffIn + control ->
-              LatencyTimeout) / 1000 << " seconds.\n";
-
-      HandleAbort();
-    }
-    else
-    {
-      #if defined(TEST) || defined(INFO)
-      *logofs << "Proxy: WARNING! No data received from "
-              << "remote proxy on FD#" << fd_ << " since "
-              << diffIn << " Ms.\n" << logofs_flush;
-      #endif
-
-      if (control -> ProxyTimeout > 0 &&
-              isTimestamp(timeouts_.alertTs) == 0 &&
-                  diffIn >= (control -> ProxyTimeout -
-                      control -> LatencyTimeout) / 4)
-      {
-        //
-        // If we are in the middle of a shutdown
-        // procedure but the remote is not resp-
-        // onding, force the closure of the link.
-        //
-
-        if (finish_ != 0)
-        {
-          #ifdef PANIC
-          *logofs << "Proxy: PANIC! No response received from "
-                  << "the remote proxy on FD#" << fd_ << " while "
-                  << "waiting for the shutdown.\n"
-                  << logofs_flush;
-          #endif
-
-          cerr << "Error" << ": No response received from remote "
-               << "proxy while waiting for the shutdown.\n";
-
-          HandleAbort();
-        }
-        else
-        {
-          cerr << "Warning" << ": No data received from remote "
-               << "proxy within " << (diffIn + control ->
-                  LatencyTimeout) / 1000 << " seconds.\n";
-
-          if (alert_ == 0)
-          {
-            if (control -> ProxyMode == proxy_client)
-            {
-              alert_ = CLOSE_DEAD_PROXY_CONNECTION_CLIENT_ALERT;
-            }
-            else
-            {
-              alert_ = CLOSE_DEAD_PROXY_CONNECTION_SERVER_ALERT;
-            }
-
-            HandleAlert(alert_, 1);
-          }
-
-          timeouts_.alertTs = nowTs;
-        }
-      }
-    }
-  }
-
-  //
-  // Check if we need to update the congestion
-  // counter.
-  //
-
-  int diffOut = diffTimestamp(timeouts_.writeTs, nowTs);
-
-  if (agent_ != nothing && congestions_[agent_] == 0 &&
-          statistics -> getCongestionInFrame() >= 1 &&
-              diffOut >= (control -> IdleTimeout -
-                  control -> LatencyTimeout * 5))
-  {
-    #if defined(TEST) || defined(INFO) || defined(PING)
-    *logofs << "Proxy: Forcing an update of the "
-            << "congestion counter after timeout.\n"
-            << logofs_flush;
-    #endif
-
-    statistics -> updateCongestion(tokens_[token_control].remaining,
-                                       tokens_[token_control].limit);
-  }
-
-  //
-  // Send a new token if we didn't send any data to
-  // the remote for longer than the ping timeout.
-  // The client side sends a token, the server side
-  // responds with a token reply.
-  //
-  // VMWare virtual machines can have the system
-  // timer deadly broken. Try to send a ping regard-
-  // less we are the client or the server proxy to
-  // force a write by the remote.
-  //
-
-  if (control -> ProxyMode == proxy_client ||
-          diffIn >= (control -> PingTimeout * 4) -
-              control -> LatencyTimeout)
-  {
-    //
-    // We need to send a new ping even if we didn't
-    // receive anything from the remote within the
-    // ping timeout. The server side will respond
-    // to our ping, so we use the ping to force the
-    // remote end to send some data.
-    //
-
-    if (diffIn >= (control -> PingTimeout -
-            control -> LatencyTimeout * 5) ||
-                diffOut >= (control -> PingTimeout -
-                    control -> LatencyTimeout * 5))
-    {
-      int diffPing = diffTimestamp(timeouts_.pingTs, nowTs);
-
-      if (diffPing < 0 || diffPing >= (control -> PingTimeout -
-              control -> LatencyTimeout * 5))
-      {
-        #if defined(TEST) || defined(INFO) || defined(PING)
-        *logofs << "Proxy: Sending a new ping at " << strMsTimestamp()
-                << " with " << tokens_[token_control].remaining
-                << " tokens and elapsed in " << diffIn << " out "
-                << diffOut << " ping " << diffPing
-                << ".\n" << logofs_flush;
-        #endif
-
-        if (handleFrame(frame_ping) < 0)
-        {
-          return -1;
-        }
-
-        timeouts_.pingTs = nowTs;
-      }
-      #if defined(TEST) || defined(INFO) || defined(PING)
-      else
-      {
-        *logofs << "Proxy: Not sending a new ping with "
-                << "elapsed in " << diffIn << " out "
-                << diffOut << " ping " << diffPing
-                << ".\n" << logofs_flush;
-      }
-      #endif
-    }
-  }
-
-  return 1;
-}
-
-int Proxy::handleSyncFromProxy(int channelId)
-{
-  #if defined(TEST) || defined(INFO)
-  *logofs << "Proxy: WARNING! Received a synchronization "
-          << "request from the remote proxy.\n"
-          << logofs_flush;
-  #endif
-
-  if (handleControl(code_sync_reply, channelId) < 0)
-  {
-    return -1;
-  }
-
-  return 1;
-}
-
-int Proxy::handleResetStores()
-{
-  //
-  // Recreate the message stores.
-  //
-
-  delete clientStore_;
-  delete serverStore_;
-
-  clientStore_ = new ClientStore(compressor_);
-  serverStore_ = new ServerStore(compressor_);
-
-  timeouts_.loadTs = nullTimestamp();
-
-  //
-  // Replace message stores in channels.
-  //
-
-  T_list &channelList = activeChannels_.getList();
-
-  for (T_list::iterator j = channelList.begin();
-           j != channelList.end(); j++)
-  {
-    int channelId = *j;
-
-    if (channels_[channelId] != NULL)
-    {
-      if (channels_[channelId] -> setStores(clientStore_, serverStore_) < 0)
-      {
-        #ifdef PANIC
-        *logofs << "Proxy: PANIC! Failed to replace message stores in "
-                << "channel for FD#" << getFd(channelId) << ".\n"
-                << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Failed to replace message stores in "
-             << "channel for FD#" << getFd(channelId) << ".\n";
-
-        return -1;
-      }
-      #ifdef TEST
-      else
-      {
-        *logofs << "Proxy: Replaced message stores in channel "
-                << "for FD#" << getFd(channelId) << ".\n"
-                << logofs_flush;
-      }
-      #endif
-    }
-  }
-
-  return 1;
-}
-
-int Proxy::handleResetPersistentCache()
-{
-  char *fullName = new char[strlen(control -> PersistentCachePath) +
-                                strlen(control -> PersistentCacheName) + 2];
-
-  strcpy(fullName, control -> PersistentCachePath);
-  strcat(fullName, "/");
-  strcat(fullName, control -> PersistentCacheName);
-
-  #ifdef TEST
-  *logofs << "Proxy: Going to remove persistent cache file '"
-          << fullName << "'\n" << logofs_flush;
-  #endif
-
-  unlink(fullName);
-
-  delete [] fullName;
-
-  delete [] control -> PersistentCacheName;
-
-  control -> PersistentCacheName = NULL;
-
-  return 1;
-}
-
-void Proxy::handleResetFlush()
-{
-  #ifdef TEST
-  *logofs << "Proxy: Going to reset flush counters "
-          << "for proxy FD#" << fd_ << ".\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // Reset the proxy priority flag.
-  //
-
-  priority_ = 0;
-
-  //
-  // Restore buffers to their initial
-  // size.
-  //
-
-  transport_ -> partialReset();
-
-  //
-  // Update the timestamp of the last
-  // write operation performed on the
-  // socket.
-  //
-
-  timeouts_.writeTs = getTimestamp();
-}
-
-int Proxy::handleFinish()
-{
-  //
-  // Reset the timestamps to give the proxy
-  // another chance to show the 'no response'
-  // dialog if the shutdown message doesn't
-  // come in time.
-  //
-
-  timeouts_.readTs = getTimestamp();
-
-  timeouts_.alertTs = nullTimestamp();
-
-  finish_ = 1;
-
-  return 1;
-}
-
-int Proxy::handleShutdown()
-{
-  //
-  // Send shutdown message to remote proxy.
-  //
-
-  shutdown_ = 1;
-
-  handleControl(code_shutdown_request);
-
-  #ifdef TEST
-  *logofs << "Proxy: Starting shutdown procedure "
-          << "for proxy FD#" << fd_ << ".\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // Ensure that all the data accumulated
-  // in the transport buffer is flushed
-  // to the network layer.
-  //
-
-  for (int i = 0; i < 100; i++)
-  {
-    if (canFlush() == 1)
-    {
-      handleFlush();
-    }
-    else
-    {
-      break;
-    }
-
-    usleep(100000);
-  }
-
-  //
-  // Now wait for the network layers to
-  // consume all the data.
-  //
-
-  for (int i = 0; i < 100; i++)
-  {
-    if (transport_ -> queued() <= 0)
-    {
-      break;
-    }
-
-    usleep(100000);
-  }
-
-  //
-  // Give time to the remote end to read
-  // the shutdown message and close the
-  // connection.
-  //
-
-  transport_ -> wait(10000);
-
-  #ifdef TEST
-  *logofs << "Proxy: Ending shutdown procedure "
-          << "for proxy FD#" << fd_ << ".\n"
-          << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int Proxy::handleChannelConfiguration()
-{
-  if (activeChannels_.getSize() == 0)
-  {
-    #ifdef TEST
-    *logofs << "Proxy: Going to initialize the static "
-            << "members in channels for proxy FD#"
-            << fd_ << ".\n" << logofs_flush;
-    #endif
-
-    Channel::setReferences();
-
-    ClientChannel::setReferences();
-    ServerChannel::setReferences();
-
-    GenericChannel::setReferences();
-  }
-
-  return 1;
-}
-
-int Proxy::handleSocketConfiguration()
-{
-  //
-  // Set linger mode on proxy to correctly
-  // get shutdown notification.
-  //
-
-  SetLingerTimeout(fd_, 30);
-
-  //
-  // Set keep-alive on socket so that if remote link
-  // terminates abnormally (as killed hard or because
-  // of a power-off) process will get a SIGPIPE. In
-  // practice this is useless as proxies already ping
-  // each other every few seconds.
-  //
-
-  if (control -> OptionProxyKeepAlive == 1)
-  {
-    SetKeepAlive(fd_);
-  }
-
-  //
-  // Set 'priority' flag at TCP layer for path
-  // proxy-to-proxy. Look at IPTOS_LOWDELAY in
-  // man 7 ip.
-  //
-
-  if (control -> OptionProxyLowDelay == 1)
-  {
-    SetLowDelay(fd_);
-  }
-
-  //
-  // Update size of TCP send and receive buffers.
-  //
-
-  if (control -> OptionProxySendBuffer != -1)
-  {
-    SetSendBuffer(fd_, control -> OptionProxySendBuffer);
-  }
-
-  if (control -> OptionProxyReceiveBuffer != -1)
-  {
-    SetReceiveBuffer(fd_, control -> OptionProxyReceiveBuffer);
-  }
-
-  //
-  // Update TCP_NODELAY settings. Note that on old Linux
-  // kernels turning off the Nagle algorithm didn't work
-  // when proxy was run through a PPP link. Trying to do
-  // so caused the kernel to stop delivering data to us
-  // if a serious network congestion was encountered.
-  //
-
-  if (control -> ProxyMode == proxy_client)
-  {
-    if (control -> OptionProxyClientNoDelay != -1)
-    {
-      SetNoDelay(fd_, control -> OptionProxyClientNoDelay);
-    }
-  }
-  else
-  {
-    if (control -> OptionProxyServerNoDelay != -1)
-    {
-      SetNoDelay(fd_, control -> OptionProxyServerNoDelay);
-    }
-  }
-
-  return 1;
-}
-
-int Proxy::handleLinkConfiguration()
-{
-  #ifdef TEST
-  *logofs << "Proxy: Propagating parameters to "
-          << "channels' read buffers.\n"
-          << logofs_flush;
-  #endif
-
-  T_list &channelList = activeChannels_.getList();
-
-  for (T_list::iterator j = channelList.begin();
-           j != channelList.end(); j++)
-  {
-    int channelId = *j;
-
-    if (channels_[channelId] != NULL)
-    {
-      channels_[channelId] -> handleConfiguration();
-    }
-  }
-
-  #ifdef TEST
-  *logofs << "Proxy: Propagating parameters to "
-          << "proxy buffers.\n"
-          << logofs_flush;
-  #endif
-
-  readBuffer_.setSize(control -> ProxyInitialReadSize,
-                          control -> ProxyMaximumBufferSize);
-
-  encodeBuffer_.setSize(control -> TransportProxyBufferSize,
-                            control -> TransportProxyBufferThreshold,
-                                control -> TransportMaximumBufferSize);
-
-  transport_ -> setSize(control -> TransportProxyBufferSize,
-                            control -> TransportProxyBufferThreshold,
-                                control -> TransportMaximumBufferSize);
-
-  #ifdef TEST
-  *logofs << "Proxy: Configuring the proxy timeouts.\n"
-          << logofs_flush;
-  #endif
-
-  timeouts_.split  = control -> SplitTimeout;
-  timeouts_.motion = control -> MotionTimeout;
-
-  #ifdef TEST
-  *logofs << "Proxy: Configuring the proxy tokens.\n"
-          << logofs_flush;
-  #endif
-
-  tokens_[token_control].size  = control -> TokenSize;
-  tokens_[token_control].limit = control -> TokenLimit;
-
-  if (tokens_[token_control].limit < 1)
-  {
-    tokens_[token_control].limit = 1;
-  }
-
-  #if defined(TEST) || defined(INFO) || defined(LIMIT)
-  *logofs << "Proxy: TOKEN! LIMIT! Setting token ["
-          << DumpToken(token_control) << "] size to "
-          << tokens_[token_control].size << " and limit to "
-          << tokens_[token_control].limit << ".\n"
-          << logofs_flush;
-  #endif
-
-  tokens_[token_split].size  = control -> TokenSize;
-  tokens_[token_split].limit = control -> TokenLimit / 2;
-
-  if (tokens_[token_split].limit < 1)
-  {
-    tokens_[token_split].limit = 1;
-  }
-
-  #if defined(TEST) || defined(INFO) || defined(LIMIT)
-  *logofs << "Proxy: TOKEN! LIMIT! Setting token ["
-          << DumpToken(token_split) << "] size to "
-          << tokens_[token_split].size << " and limit to "
-          << tokens_[token_split].limit << ".\n"
-          << logofs_flush;
-  #endif
-
-  tokens_[token_data].size  = control -> TokenSize;
-  tokens_[token_data].limit = control -> TokenLimit / 4;
-
-  if (tokens_[token_data].limit < 1)
-  {
-    tokens_[token_data].limit = 1;
-  }
-
-  #if defined(TEST) || defined(INFO) || defined(LIMIT)
-  *logofs << "Proxy: TOKEN! LIMIT! Setting token ["
-          << DumpToken(token_data) << "] size to "
-          << tokens_[token_data].size << " and limit to "
-          << tokens_[token_data].limit << ".\n"
-          << logofs_flush;
-  #endif
-
-  for (int i = token_control; i <= token_data; i++)
-  {
-    tokens_[i].remaining = tokens_[i].limit;
-  }
-
-  #if defined(TEST) || defined(INFO) || defined(LIMIT)
-  *logofs << "Proxy: LIMIT! Using client bitrate "
-          << "limit " << control -> ClientBitrateLimit
-          << " server bitrate limit " << control ->
-             ServerBitrateLimit << " with local limit "
-          << control -> LocalBitrateLimit << ".\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // Set the other parameters based on
-  // the token size.
-  //
-
-  int base = control -> TokenSize;
-
-  control -> SplitDataThreshold   = base * 4;
-  control -> SplitDataPacketLimit = base / 2;
-
-  #if defined(TEST) || defined(INFO)
-  *logofs << "Proxy: LIMIT! Setting split data threshold "
-          << "to " << control -> SplitDataThreshold
-          << " split packet limit to " << control ->
-             SplitDataPacketLimit << " with base "
-          << base << ".\n" << logofs_flush;
-  #endif
-
-  //
-  // Set the number of bytes read from the
-  // data channels at each loop. This will
-  // basically determine the maximum band-
-  // width available for the generic chan-
-  // nels.
-  //
-
-  control -> GenericInitialReadSize   = base / 2;
-  control -> GenericMaximumBufferSize = base / 2;
-
-  #if defined(TEST) || defined(INFO)
-  *logofs << "Proxy: LIMIT! Setting generic channel "
-          << "initial read size to " << control ->
-             GenericInitialReadSize << " maximum read "
-          << "size to " << control -> GenericMaximumBufferSize
-          << " with base " << base << ".\n"
-          << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int Proxy::handleCacheConfiguration()
-{
-  #ifdef TEST
-  *logofs << "Proxy: Configuring cache according to pack parameters.\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // Further adjust the cache parameters. If
-  // packing of the images is enabled, reduce
-  // the size available for plain images.
-  //
-
-  if (control -> SessionMode == session_agent)
-  {
-    if (control -> PackMethod != NO_PACK)
-    {
-      clientStore_ -> getRequestStore(X_PutImage) ->
-          cacheThreshold = PUTIMAGE_CACHE_THRESHOLD_IF_PACKED;
-
-      clientStore_ -> getRequestStore(X_PutImage) ->
-          cacheLowerThreshold = PUTIMAGE_CACHE_LOWER_THRESHOLD_IF_PACKED;
-    }
-  }
-
-  //
-  // If this is a shadow session increase the
-  // size of the image cache.
-  //
-
-  if (control -> SessionMode == session_shadow)
-  {
-    if (control -> PackMethod != NO_PACK)
-    {
-      clientStore_ -> getRequestStore(X_NXPutPackedImage) ->
-          cacheThreshold = PUTPACKEDIMAGE_CACHE_THRESHOLD_IF_PACKED_SHADOW;
-
-      clientStore_ -> getRequestStore(X_NXPutPackedImage) ->
-          cacheLowerThreshold = PUTPACKEDIMAGE_CACHE_LOWER_THRESHOLD_IF_PACKED_SHADOW;
-    }
-    else
-    {
-      clientStore_ -> getRequestStore(X_PutImage) ->
-          cacheThreshold = PUTIMAGE_CACHE_THRESHOLD_IF_SHADOW;
-
-      clientStore_ -> getRequestStore(X_PutImage) ->
-          cacheLowerThreshold = PUTIMAGE_CACHE_LOWER_THRESHOLD_IF_SHADOW;
-    }
-  }
-
-  return 1;
-}
-
-int Proxy::handleSaveStores()
-{
-  //
-  // Save content of stores on disk.
-  //
-
-  char *cacheToAdopt = NULL;
-
-  //
-  // Set to false the indicator for cumulative store
-  // size too small
-  //
-  bool isTooSmall = false;
-
-  if (control -> PersistentCacheEnableSave)
-  {
-    #ifdef TEST
-    *logofs << "Proxy: Going to save content of client store.\n"
-            << logofs_flush;
-    #endif
-
-    cacheToAdopt = handleSaveAllStores(control -> PersistentCachePath, isTooSmall);
-  }
-  #ifdef TEST
-  else
-  {
-    if (control -> ProxyMode == proxy_client)
-    {
-      *logofs << "Proxy: Saving persistent cache to disk disabled.\n"
-              << logofs_flush;
-    }
-    else
-    {
-      *logofs << "Proxy: PANIC! Protocol violation in command save.\n"
-              << logofs_flush;
-
-      cerr << "Error" << ": Protocol violation in command save.\n";
-
-      HandleCleanup();
-    }
-  }
-  #endif
-
-  if (cacheToAdopt != NULL)
-  {
-    //
-    // Do we have a cache already?
-    //
-
-    if (control -> PersistentCacheName != NULL)
-    {
-      //
-      // Check if old and new cache are the same.
-      // In this case don't remove the old cache.
-      //
-
-      if (strcasecmp(control -> PersistentCacheName, cacheToAdopt) != 0)
-      {
-        handleResetPersistentCache();
-      }
-
-      delete [] control -> PersistentCacheName;
-    }
-
-    #ifdef TEST
-    *logofs << "Proxy: Setting current persistent cache file to '"
-            << cacheToAdopt << "'\n" << logofs_flush;
-    #endif
-
-    control -> PersistentCacheName = cacheToAdopt;
-
-    return 1;
-  }
-  else
-  {
-    #ifdef TEST
-      *logofs << "Proxy: No cache file produced from message stores.\n"
-              << logofs_flush;
-    #endif
-
-    //
-    // It can be that we didn't generate a new cache
-    // because store was too small or persistent cache
-    // was disabled. This is not an error.
-    //
-
-    if (control -> PersistentCacheEnableSave && !isTooSmall)
-    {
-      return -1;
-    }
-    else
-    {
-      return 0;
-    }
-  }
-}
-
-int Proxy::handleLoadStores()
-{
-  //
-  // Restore the content of the client store
-  // from disk if a valid cache was negotiated
-  // at session startup.
-  //
-
-  if (control -> PersistentCacheEnableLoad == 1 &&
-          control -> PersistentCachePath != NULL &&
-              control -> PersistentCacheName != NULL)
-  {
-    #ifdef TEST
-    *logofs << "Proxy: Going to load content of client store.\n"
-            << logofs_flush;
-    #endif
-
-    //
-    // Returns the same string passed as name of
-    // the cache, or NULL if it was not possible
-    // to load the cache from disk.
-    //
-
-    if (handleLoadAllStores(control -> PersistentCachePath,
-                                control -> PersistentCacheName) == NULL)
-    {
-      //
-      // The corrupted cache should have been
-      // removed from disk. Get rid of the
-      // reference so we don't try to delete
-      // it once again.
-      //
-
-      if (control -> PersistentCacheName != NULL)
-      {
-        delete [] control -> PersistentCacheName;
-      }
-
-      control -> PersistentCacheName = NULL;
- 
-      return -1;
-    }
-
-    //
-    // Set timestamp of last time cache
-    // was loaded from data on disk.
-    //
-
-    timeouts_.loadTs = getTimestamp();
-
-    return 1;
-  }
-  #ifdef TEST
-  else
-  {
-    if (control -> ProxyMode == proxy_client)
-    {
-      *logofs << "Proxy: Loading of cache disabled or no cache file selected.\n"
-              << logofs_flush;
-    }
-    else
-    {
-      *logofs << "Proxy: PANIC! Protocol violation in command load.\n"
-              << logofs_flush;
-
-      cerr << "Error" << ": Protocol violation in command load.\n";
-
-      HandleCleanup();
-    }
-  }
-  #endif
-
-  return 0;
-}
-
-int Proxy::handleControl(T_proxy_code code, int data)
-{
-  //
-  // Send the given control messages
-  // to the remote proxy.
-  //
-
-  #if defined(TEST) || defined(INFO)
-
-  if (data != -1)
-  {
-    if (code == code_control_token_reply ||
-            code == code_split_token_reply ||
-                code == code_data_token_reply)
-    {
-      *logofs << "Proxy: TOKEN! Sending message '" << DumpControl(code)
-              << "' at " << strMsTimestamp() << " with count "
-              << data << ".\n" << logofs_flush;
-    }
-    else
-    {
-      *logofs << "Proxy: Sending message '" << DumpControl(code)
-              << "' at " << strMsTimestamp() << " with data ID#"
-              << data << ".\n" << logofs_flush;
-    }
-  }
-  else
-  {
-    *logofs << "Proxy: Sending message '" << DumpControl(code)
-            << "' at " << strMsTimestamp() << ".\n"
-            << logofs_flush;
-  }
-
-  #endif
-
-  //
-  // Add the control message and see if the
-  // data has to be flushed immediately.
-  //
-
-  if (addControlCodes(code, data) < 0)
-  {
-    return -1;
-  }
-
-  switch (code)
-  {
-    //
-    // Append the first data read from the opened
-    // channel to the control code.
-    // 
-
-    case code_new_x_connection:
-    case code_new_cups_connection:
-    case code_new_aux_connection:
-    case code_new_smb_connection:
-    case code_new_media_connection:
-    case code_new_http_connection:
-    case code_new_font_connection:
-    case code_new_slave_connection:
-
-    //
-    // Do we send the token reply immediately?
-    // The control messages are put at the begin-
-    // ning of the of the encode buffer, so we may
-    // reply to multiple tokens before having the
-    // chance of handling the actual frame data.
-    // On the other hand, the sooner we reply, the
-    // sooner the remote proxy is restarted.
-    //
-
-    case code_control_token_reply:
-    case code_split_token_reply:
-    case code_data_token_reply:
-    {
-      break;
-    }
-
-    //
-    // Also send the congestion control codes
-    // immediately.
-    //
-    // case code_begin_congestion:
-    // case code_end_congestion:
-    //
-
-    default:
-    {
-      priority_ = 1;
-
-      break;
-    }
-  }
-
-  if (priority_ == 1)
-  {
-    if (handleFrame(frame_data) < 0)
-    {
-      return -1;
-    }
-  }
-
-  return 1;
-}
-
-int Proxy::handleSwitch(int channelId)
-{
-  //
-  // If data is for a different channel than last
-  // selected for output, prepend to the data the
-  // new channel id.
-  //
-
-  #ifdef DEBUG
-  *logofs << "Proxy: Requested a switch with "
-          << "current channel ID#" << outputChannel_
-          << " new channel ID#" << channelId << ".\n"
-          << logofs_flush;
-  #endif
-
-  if (channelId != outputChannel_)
-  {
-    if (needFlush() == 1)
-    {
-      #if defined(TEST) || defined(INFO) || defined(FLUSH)
-      *logofs << "Proxy: WARNING! Flushing data for the "
-              << "previous channel ID#" << outputChannel_
-              << ".\n" << logofs_flush;
-      #endif
-
-      if (handleFrame(frame_data) < 0)
-      {
-        return -1;
-      }
-    }
-
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Proxy: Sending message '"
-            << DumpControl(code_switch_connection) << "' at "
-            << strMsTimestamp() << " with FD#" << getFd(channelId)
-            << " channel ID#" << channelId << ".\n"
-            << logofs_flush;
-    #endif
-
-    if (addControlCodes(code_switch_connection, channelId) < 0)
-    {
-      return -1;
-    }
-
-    outputChannel_ = channelId;
-  }
-
-  return 1;
-}
-
-int Proxy::addTokenCodes(T_proxy_token &token)
-{
-  #if defined(TEST) || defined(INFO) || defined(TOKEN)
-  *logofs << "Proxy: TOKEN! Sending token ["
-          << DumpToken(token.type) << "] with "
-          << token.bytes << " bytes accumulated size "
-          << token.size << " and " << token.remaining
-          << " available.\n" << logofs_flush;
-  #endif
-
-  //
-  // Give a 'weight' to the token. The tokens
-  // remaining can become negative if we sent
-  // a packet that was exceptionally big.
-  //
-
-  int count = 0;
-
-  // Since ProtoStep7 (#issue 108)
-  count = token.bytes / token.size;
-
-  //
-  // Force a count of 1, for example
-  // if this is a ping.
-  //
-
-  if (count < 1)
-  {
-    count = 1;
-
-    token.bytes = 0;
-  }
-  else
-  {
-    // Since ProtoStep7 (#issue 108)
-    if (count > 255)
-    {
-      count = 255;
-    }
-
-    //
-    // Let the next token account for the
-    // remaining bytes.
-    //
-
-    token.bytes %= token.size;
-  }
-
-  #if defined(TEST) || defined(INFO) || defined(TOKEN)
-  *logofs << "Proxy: Sending message '"
-          << DumpControl(token.request) << "' at "
-          << strMsTimestamp() << " with count " << count
-          << ".\n" << logofs_flush;
-  #endif
-
-  controlCodes_[controlLength_++] = 0;
-  controlCodes_[controlLength_++] = (unsigned char) token.request;
-  controlCodes_[controlLength_++] = (unsigned char) count;
-
-  statistics -> addFrameOut();
-
-  token.remaining -= count;
-
-  return 1;
-}
-
-int Proxy::handleToken(T_frame_type type)
-{
-  #if defined(TEST) || defined(INFO) || defined(TOKEN)
-  *logofs << "Proxy: TOKEN! Checking tokens with "
-          << "frame type [";
-
-  *logofs << (type == frame_ping ? "frame_ping" : "frame_data");
-
-  *logofs << "] with stream ratio " << statistics ->
-             getStreamRatio() << ".\n" << logofs_flush;
-  #endif
-
-  if (type == frame_data)
-  {
-    //
-    // Since ProtoStep7 (#issue 108)
-    //
-
-    // Send a distinct token for each data type.
-    // We don't want to slow down the sending of
-    // the X events, X replies and split confir-
-    // mation events on the X server side, so
-    // take care only of the generic data token.
-    //
-
-    if (control -> ProxyMode == proxy_client)
-    {
-      statistics -> updateControlToken(tokens_[token_control].bytes);
-
-      if (tokens_[token_control].bytes > tokens_[token_control].size)
-      {
-        if (addTokenCodes(tokens_[token_control]) < 0)
-        {
-          return -1;
-        }
-
-        #if defined(TEST) || defined(INFO) || defined(TOKEN)
-
-        T_proxy_token &token = tokens_[token_control];
-
-        *logofs << "Proxy: TOKEN! Token class ["
-                << DumpToken(token.type) << "] has now "
-                << token.bytes << " bytes accumulated and "
-                << token.remaining << " tokens remaining.\n"
-                << logofs_flush;
-        #endif
-      }
-
-      statistics -> updateSplitToken(tokens_[token_split].bytes);
-
-      if (tokens_[token_split].bytes > tokens_[token_split].size)
-      {
-        if (addTokenCodes(tokens_[token_split]) < 0)
-        {
-          return -1;
-        }
-
-        #if defined(TEST) || defined(INFO) || defined(TOKEN)
-
-        T_proxy_token &token = tokens_[token_split];
-
-        *logofs << "Proxy: TOKEN! Token class ["
-                << DumpToken(token.type) << "] has now "
-                << token.bytes << " bytes accumulated and "
-                << token.remaining << " tokens remaining.\n"
-                << logofs_flush;
-        #endif
-      }
-    }
-
-    statistics -> updateDataToken(tokens_[token_data].bytes);
-
-    if (tokens_[token_data].bytes > tokens_[token_data].size)
-    {
-      if (addTokenCodes(tokens_[token_data]) < 0)
-      {
-        return -1;
-      }
-
-      #if defined(TEST) || defined(INFO) || defined(TOKEN)
-
-      T_proxy_token &token = tokens_[token_data];
-
-      *logofs << "Proxy: TOKEN! Token class ["
-              << DumpToken(token.type) << "] has now "
-              << token.bytes << " bytes accumulated and "
-              << token.remaining << " tokens remaining.\n"
-              << logofs_flush;
-      #endif
-    }
-  }
-  else
-  {
-    if (addTokenCodes(tokens_[token_control]) < 0)
-    {
-      return -1;
-    }
-
-    //
-    // Reset all counters on a ping.
-    //
-
-    tokens_[token_control].bytes = 0;
-    tokens_[token_split].bytes   = 0;
-    tokens_[token_data].bytes    = 0;
-
-    #if defined(TEST) || defined(INFO) || defined(TOKEN)
-
-    T_proxy_token &token = tokens_[token_control];
-
-    *logofs << "Proxy: TOKEN! Token class ["
-            << DumpToken(token.type) << "] has now "
-            << token.bytes << " bytes accumulated and "
-            << token.remaining << " tokens remaining.\n"
-            << logofs_flush;
-    #endif
-  }
-
-  //
-  // Check if we have entered in
-  // congestion state.
-  //
-
-  if (congestion_ == 0 &&
-          tokens_[token_control].remaining <= 0)
-  {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Proxy: Entering congestion with "
-            << tokens_[token_control].remaining
-            << " tokens remaining.\n" << logofs_flush;
-    #endif
-
-    congestion_ = 1;
-  }
-
-  statistics -> updateCongestion(tokens_[token_control].remaining,
-                                     tokens_[token_control].limit);
-
-  return 1;
-}
-
-int Proxy::handleTokenFromProxy(T_proxy_token &token, int count)
-{
-  #if defined(TEST) || defined(INFO) || defined(TOKEN)
-  *logofs << "Proxy: TOKEN! Received token ["
-          << DumpToken(token.type) << "] request at "
-          << strMsTimestamp() << " with count "
-          << count << ".\n" << logofs_flush;
-  #endif
-
-  //
-  // Since ProtoStep7 (#issue 108) with no limitations
-  // concerning invalid token requests at this point
-  //
-
-  //
-  // Add our token reply.
-  //
-
-  if (handleControl(token.reply, count) < 0)
-  {
-    return -1;
-  }
-
-  return 1;
-}
-
-int Proxy::handleTokenReplyFromProxy(T_proxy_token &token, int count)
-{
-  #if defined(TEST) || defined(INFO) || defined(TOKEN)
-  *logofs << "Proxy: TOKEN! Received token ["
-          << DumpToken(token.type) << "] reply at "
-          << strMsTimestamp() << " with count " << count
-          << ".\n" << logofs_flush;
-  #endif
-
-  //
-  // Since ProtoStep7 (#issue 108) with no limitations
-  // concerning invalid token requests at this point
-  //
-
-  //
-  // Increment the available tokens.
-  //
-
-  token.remaining += count;
-
-  if (token.remaining > token.limit)
-  {
-    #ifdef PANIC
-    *logofs << "Proxy: PANIC! Token overflow handling messages.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Token overflow handling messages.\n";
-
-    HandleCleanup();
-  }
-
-  #if defined(TEST) || defined(INFO) || defined(TOKEN)
-  *logofs << "Proxy: TOKEN! Token class ["
-          << DumpToken(token.type) << "] has now " << token.bytes
-          << " bytes accumulated and " << token.remaining
-          << " tokens remaining.\n" << logofs_flush;
-  #endif
-
-  //
-  // Check if we can jump out of the
-  // congestion state.
-  //
-
-  if (congestion_ == 1 &&
-          tokens_[token_control].remaining > 0)
-  {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Proxy: Exiting congestion with "
-            << tokens_[token_control].remaining
-            << " tokens remaining.\n" << logofs_flush;
-    #endif
-
-    congestion_ = 0;
-  }
-
-  statistics -> updateCongestion(tokens_[token_control].remaining,
-                                     tokens_[token_control].limit);
-
-  return 1;
-}
-
-void Proxy::handleFailOnSave(const char *fullName, const char *failContext) const
-{
-  #ifdef WARNING
-  *logofs << "Proxy: WARNING! Error saving stores to cache file "
-          << "in context [" << failContext << "].\n" << logofs_flush;
-  #endif
-
-  cerr << "Warning" << ": Error saving stores to cache file "
-       << "in context [" << failContext << "].\n";
-
-  #ifdef WARNING
-  *logofs << "Proxy: WARNING! Removing invalid cache '"
-          << fullName << "'.\n" << logofs_flush;
-  #endif
-
-  cerr << "Warning" << ": Removing invalid cache '"
-       << fullName << "'.\n";
-
-  unlink(fullName);
-}
-
-void Proxy::handleFailOnLoad(const char *fullName, const char *failContext) const
-{
-  #ifdef WARNING
-  *logofs << "Proxy: WARNING! Error loading stores from cache file "
-          << "in context [" << failContext << "].\n" << logofs_flush;
-  #endif
-
-  cerr << "Warning" << ": Error loading stores from cache file "
-       << "in context [" << failContext << "].\n";
-
-  #ifdef WARNING
-  *logofs << "Proxy: WARNING! Removing invalid cache '"
-          << fullName << "'.\n" << logofs_flush;
-  #endif
-
-  cerr << "Warning" << ": Removing invalid cache '"
-       << fullName << "'.\n";
-
-  unlink(fullName);
-}
-
-int Proxy::handleSaveVersion(unsigned char *buffer, int &major,
-                                 int &minor, int &patch) const
-{
-  // Since ProtoStep8 (#issue 108)
-  major = 3;
-  minor = 0;
-  patch = 0;
-
-  *(buffer + 0) = major;
-  *(buffer + 1) = minor;
-
-  PutUINT(patch, buffer + 2, storeBigEndian());
-
-  return 1;
-}
-
-int Proxy::handleLoadVersion(const unsigned char *buffer, int &major,
-                                 int &minor, int &patch) const
-{
-  major = *(buffer + 0);
-  minor = *(buffer + 1);
-
-  patch = GetUINT(buffer + 2, storeBigEndian());
-
-  //
-  // Force the proxy to discard the
-  // incompatible caches.
-  // 
-
-  // Since ProtoStep8 (#issue 108)
-  if (major < 3)
-  {
-    return -1;
-  }
-
-  return 1;
-}
-
-char *Proxy::handleSaveAllStores(const char *savePath, bool & isTooSmall) const
-{
-  isTooSmall = false;
-
-  int cumulativeSize = MessageStore::getCumulativeTotalStorageSize();
-
-  if (cumulativeSize < control -> PersistentCacheThreshold)
-  {
-    #ifdef TEST
-    *logofs << "Proxy: Cache not saved as size is "
-            << cumulativeSize << " with threshold set to "
-            << control -> PersistentCacheThreshold
-            << ".\n" << logofs_flush;
-    #endif
-
-    //
-    // Cumulative store size is smaller than threshold
-    // so the indicator is set to true
-    //
-
-    isTooSmall = true;
-
-    return NULL;
-  }
-  else if (savePath == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "Proxy: PANIC! No name provided for save path.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": No name provided for save path.\n";
-
-    return NULL;
-  }
-
-  #ifdef TEST
-  *logofs << "Proxy: Going to save content of message stores.\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // Our parent process is likely going to terminate.
-  // Until we finish saving cache we must ignore its
-  // SIGIPE.
-  //
-
-  DisableSignals();
-
-  ofstream *cachefs = NULL;
-
-  md5_state_t *md5StateStream = NULL;
-  md5_byte_t  *md5DigestStream = NULL;
-
-  md5_state_t *md5StateClient = NULL;
-  md5_byte_t  *md5DigestClient = NULL;
-
-  char md5String[MD5_LENGTH * 2 + 2];
-
-  char fullName[strlen(savePath) + MD5_LENGTH * 2 + 4];
-
-  //
-  // Prepare the template for the temporary file
-  //
-
-  const char* const uniqueTemplate = "XXXXXX";
-  char tempName[strlen(savePath) + strlen("/") + 4 + strlen(uniqueTemplate) + 1];
-
-  snprintf(tempName, sizeof tempName, "%s/%s%s",
-               savePath,
-               control -> ProxyMode == proxy_client ?
-                   "Z-C-" :
-                   "Z-S-",
-               uniqueTemplate);
-
-  #ifdef TEST
-  *logofs << "Proxy: Generating temporary file with template '"
-          << tempName << "'.\n" << logofs_flush;
-  #endif
-
-  //
-  // Change the mask to make the file only
-  // readable by the user, then restore the
-  // old mask.
-  //
-
-  mode_t fileMode = umask(0077);
-
-  //
-  // Generate a unique temporary filename from tempName
-  // and then create and open the file
-  //
-
-  int fdTemp = mkstemp(tempName);
-  if (fdTemp == -1)
-  {
-    #ifdef PANIC
-    *logofs << "Proxy: PANIC! Can't create temporary file in '"
-            << savePath << "'. Cause = " << strerror(errno) << ".\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Can't create temporary file in '"
-         << savePath << "'. Cause = " << strerror(errno) << ".\n";
-
-    umask(fileMode);
-
-    EnableSignals();
-
-    return NULL;
-  }
-
-  #ifdef TEST
-  *logofs << "Proxy: Saving cache to file '"
-          << tempName << "'.\n" << logofs_flush;
-  #endif
-
-  //
-  // Create and open the output stream for the new temporary
-  // file
-  //
-
-  cachefs = new (std::nothrow) ofstream(tempName, ios::out | ios::binary);
-  if ((cachefs == NULL) || cachefs->fail())
-  {
-    #ifdef PANIC
-    *logofs << "Proxy: PANIC! Can't create stream for temporary file '"
-            << tempName << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Can't create stream for temporary file '"
-         << tempName << "'.\n";
-
-    close(fdTemp);
-    unlink(tempName);
-
-    umask(fileMode);
-
-    EnableSignals();
-
-    return NULL;
-  }
-
-  //
-  // Close the file descriptor returned by mkstemp
-  // and restore the old mask
-  //
-
-  close(fdTemp);
-  umask(fileMode);
-
-  md5StateStream  = new md5_state_t();
-  md5DigestStream = new md5_byte_t[MD5_LENGTH];
-
-  md5_init(md5StateStream);
-
-  //
-  // First write the proxy version.
-  //
-
-  unsigned char version[4];
-
-  int major;
-  int minor;
-  int patch;
-
-  handleSaveVersion(version, major, minor, patch);
-
-  #ifdef TEST
-  *logofs << "Proxy: Saving cache using version '"
-          << major << "." << minor << "." << patch
-          << "'.\n" << logofs_flush;
-  #endif
-
-  if (PutData(cachefs, version, 4) < 0)
-  {
-    handleFailOnSave(tempName, "A");
-
-    delete cachefs;
-
-    delete md5StateStream;
-    delete [] md5DigestStream;
-
-    EnableSignals();
-
-    return NULL;
-  }
-
-  //
-  // Make space for the calculated MD5 so we
-  // can later rewind the file and write it
-  // at this position.
-  //
-
-  if (PutData(cachefs, md5DigestStream, MD5_LENGTH) < 0)
-  {
-    handleFailOnSave(tempName, "B");
-
-    delete cachefs;
-
-    delete md5StateStream;
-    delete [] md5DigestStream;
-
-    EnableSignals();
-
-    return NULL;
-  }
-
-  md5StateClient  = new md5_state_t();
-  md5DigestClient = new md5_byte_t[MD5_LENGTH];
-
-  md5_init(md5StateClient);
-
-  #ifdef DUMP
-
-  ofstream *cacheDump = NULL;
-
-  ofstream *tempfs = (ofstream*) logofs;
-
-  char cacheDumpName[DEFAULT_STRING_LENGTH];
-
-  if (control -> ProxyMode == proxy_client)
-  {
-    snprintf(cacheDumpName, DEFAULT_STRING_LENGTH - 1,
-                 "%s/client-cache-dump", control -> TempPath);
-  }
-  else
-  {
-    snprintf(cacheDumpName, DEFAULT_STRING_LENGTH - 1,
-                 "%s/server-cache-dump", control -> TempPath);
-  }
-
-  *(cacheDumpName + DEFAULT_STRING_LENGTH - 1) = '\0';
-
-  fileMode = umask(0077);
-
-  cacheDump = new ofstream(cacheDumpName, ios::out);
-
-  umask(fileMode);
-
-  logofs = cacheDump;
-
-  #endif
-
-  //
-  // Use the virtual method of the concrete proxy class.
-  //
-
-  int allSaved = handleSaveAllStores(cachefs, md5StateStream, md5StateClient);
-
-  #ifdef DUMP
-
-  logofs = tempfs;
-
-  delete cacheDump;
-
-  #endif
-
-  if (allSaved == -1)
-  {
-    handleFailOnSave(tempName, "C");
-
-    delete cachefs;
-
-    delete md5StateStream;
-    delete [] md5DigestStream;
-
-    delete md5StateClient;
-    delete [] md5DigestClient;
-
-    EnableSignals();
-
-    return NULL;
-  }
-
-  md5_finish(md5StateClient, md5DigestClient);
-
-  for (unsigned int i = 0; i < MD5_LENGTH; i++)
-  {
-    sprintf(md5String + (i * 2), "%02X", md5DigestClient[i]);
-  }
-
-  strcpy(fullName, (control -> ProxyMode == proxy_client) ? "C-" : "S-");
-
-  strcat(fullName, md5String);
-
-  md5_append(md5StateStream, (const md5_byte_t *) fullName, strlen(fullName));
-  md5_finish(md5StateStream, md5DigestStream);
-
-  //
-  // Go to the beginning of file plus
-  // the integer where we wrote our
-  // proxy version.
-  //
-
-  cachefs -> seekp(4);
-
-  if (PutData(cachefs, md5DigestStream, MD5_LENGTH) < 0)
-  {
-    handleFailOnSave(tempName, "D");
-
-    delete cachefs;
-
-    delete md5StateStream;
-    delete [] md5DigestStream;
-
-    delete md5StateClient;
-    delete [] md5DigestClient;
-
-    EnableSignals();
-
-    return NULL;
-  }
-
-  delete cachefs;
-
-  //
-  // Copy the resulting cache name without
-  // the path so that we can return it to
-  // the caller.
-  //
-
-  char *cacheName = new char[MD5_LENGTH * 2 + 4];
-
-  strcpy(cacheName, fullName);
-
-  //
-  // Add the path to the full name and move
-  // the cache into the path.
-  //
-
-  strcpy(fullName, savePath);
-  strcat(fullName, (control -> ProxyMode == proxy_client) ? "/C-" : "/S-");
-  strcat(fullName, md5String);
-
-  #ifdef TEST
-  *logofs << "Proxy: Renaming cache file from '"
-          << tempName << "' to '" << fullName
-          << "'.\n" << logofs_flush;
-  #endif
-
-  rename(tempName, fullName);
-
-  delete md5StateStream;
-  delete [] md5DigestStream;
-
-  delete md5StateClient;
-  delete [] md5DigestClient;
-
-  //
-  // Restore the original handlers.
-  //
-
-  EnableSignals();
-
-  #ifdef TEST
-  *logofs << "Proxy: Successfully saved cache file '"
-          << cacheName << "'.\n" << logofs_flush;
-  #endif
-
-  //
-  // This must be enabled only for test
-  // because it requires that client and
-  // server reside on the same machine.
-  //
-
-  if (control -> PersistentCacheCheckOnShutdown == 1 &&
-          control -> ProxyMode == proxy_server)
-  {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Proxy: MATCH! Checking if the file '"
-            << fullName << "' matches a client cache.\n"
-            << logofs_flush;
-    #endif
-
-    strcpy(fullName, savePath);
-    strcat(fullName, "/C-");
-    strcat(fullName, md5String);
-
-    struct stat fileStat;
-
-    if (stat(fullName, &fileStat) != 0)
-    {
-      #ifdef PANIC
-      *logofs << "Proxy: PANIC! Can't find a client cache "
-              << "with name '" << fullName << "'.\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Can't find a client cache "
-           << "with name '" << fullName << "'.\n";
-
-      HandleShutdown();
-    }
-
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Proxy: MATCH! Client cache '" << fullName
-            << "' matches the local cache.\n"
-            << logofs_flush;
-    #endif
-  }
-
-  return cacheName;
-}
-
-const char *Proxy::handleLoadAllStores(const char *loadPath, const char *loadName) const
-{
-  #ifdef TEST
-  *logofs << "Proxy: Going to load content of message stores.\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // Until we finish loading cache we
-  // must at least ignore any SIGIPE.
-  //
-
-  DisableSignals();
-
-  if (loadPath == NULL || loadName == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "Proxy: PANIC! No path or no file name provided for cache to restore.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": No path or no file name provided for cache to restore.\n";
-
-    EnableSignals();
-
-    return NULL;
-  }
-  else if (strlen(loadName) != MD5_LENGTH * 2 + 2)
-  {
-    #ifdef PANIC
-    *logofs << "Proxy: PANIC! Bad file name provided for cache to restore.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Bad file name provided for cache to restore.\n";
-
-    EnableSignals();
-
-    return NULL;
-  }
-
-  istream *cachefs = NULL;
-  char md5String[(MD5_LENGTH * 2) + 2];
-  md5_byte_t md5FromFile[MD5_LENGTH];
-
-  char *cacheName = new char[strlen(loadPath) + strlen(loadName) + 3];
-
-  strcpy(cacheName, loadPath);
-  strcat(cacheName, "/");
-  strcat(cacheName, loadName);
-
-  #ifdef TEST
-  *logofs << "Proxy: Name of cache file is '"
-          << cacheName << "'.\n" << logofs_flush;
-  #endif
-
-  cachefs = new ifstream(cacheName, ios::in | ios::binary);
-
-  unsigned char version[4];
-
-  if (cachefs == NULL || GetData(cachefs, version, 4) < 0)
-  {
-    #ifdef PANIC
-    *logofs << "Proxy: PANIC! Can't read cache file '"
-            << cacheName << "'.\n" << logofs_flush;;
-    #endif
-
-    handleFailOnLoad(cacheName, "A");
-
-    delete cachefs;
-
-    delete [] cacheName;
-
-    EnableSignals();
-
-    return NULL;
-  }
-
-  int major;
-  int minor;
-  int patch;
-
-  if (handleLoadVersion(version, major, minor, patch) < 0)
-  {
-    #ifdef PANIC
-    *logofs << "Proxy: WARNING! Incompatible version '"
-            << major << "." << minor << "." << patch
-            << "' in cache file '" << cacheName
-            << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Warning" << ": Incompatible version '"
-         << major << "." << minor << "." << patch
-         << "' in cache file '" << cacheName
-         << "'.\n" << logofs_flush;
-
-    if (control -> ProxyMode == proxy_server)
-    {
-      handleFailOnLoad(cacheName, "B");
-    }
-    else
-    {
-      //
-      // Simply remove the cache file.
-      //
-
-      unlink(cacheName);
-    }
-
-    delete cachefs;
-
-    delete [] cacheName;
-
-    EnableSignals();
-
-    return NULL;
-  }
-
-  #ifdef TEST
-  *logofs << "Proxy: Reading from cache file version '"
-          << major << "." << minor << "." << patch
-          << "'.\n" << logofs_flush;
-  #endif
-
-  if (GetData(cachefs, md5FromFile, MD5_LENGTH) < 0)
-  {
-    #ifdef PANIC
-    *logofs << "Proxy: PANIC! No checksum in cache file '"
-            << loadName << "'.\n" << logofs_flush;
-    #endif
-
-    handleFailOnLoad(cacheName, "C");
-
-    delete cachefs;
-
-    delete [] cacheName;
-
-    EnableSignals();
-
-    return NULL;
-  }
-
-  md5_state_t *md5StateStream = NULL;
-  md5_byte_t  *md5DigestStream = NULL;
-
-  md5StateStream  = new md5_state_t();
-  md5DigestStream = new md5_byte_t[MD5_LENGTH];
-
-  md5_init(md5StateStream);
-
-  //
-  // Use the virtual method of the proxy class.
-  //
-
-  if (handleLoadAllStores(cachefs, md5StateStream) < 0)
-  {
-    handleFailOnLoad(cacheName, "D");
-
-    delete cachefs;
-
-    delete md5StateStream;
-    delete [] md5DigestStream;
-
-    delete [] cacheName;
-
-    EnableSignals();
-
-    return NULL;
-  }
-
-  md5_append(md5StateStream, (const md5_byte_t *) loadName, strlen(loadName));
-  md5_finish(md5StateStream, md5DigestStream);
-
-  for (int i = 0; i < MD5_LENGTH; i++)
-  {
-    if (md5DigestStream[i] != md5FromFile[i])
-    {
-      #ifdef PANIC
-
-      *logofs << "Proxy: PANIC! Bad checksum for cache file '"
-              << cacheName << "'.\n" << logofs_flush;
-
-      for (unsigned int i = 0; i < MD5_LENGTH; i++)
-      {
-        sprintf(md5String + (i * 2), "%02X", md5FromFile[i]);
-      }
-
-      *logofs << "Proxy: PANIC! Saved checksum is '"
-              << md5String << "'.\n" << logofs_flush;
-
-      for (unsigned int i = 0; i < MD5_LENGTH; i++)
-      {
-        sprintf(md5String + (i * 2),"%02X", md5DigestStream[i]);
-      }
-
-      *logofs << "Proxy: PANIC! Calculated checksum is '"
-              << md5String << "'.\n" << logofs_flush;
-
-      #endif
-
-      handleFailOnLoad(cacheName, "E");
-
-      delete cachefs;
-
-      delete md5StateStream;
-      delete [] md5DigestStream;
-
-      delete [] cacheName;
-
-      EnableSignals();
-
-      return NULL;
-    }
-  }
-
-  delete cachefs;
-
-  delete md5StateStream;
-  delete [] md5DigestStream;
-
-  delete [] cacheName;
-
-  //
-  // Restore the original handlers.
-  //
-
-  EnableSignals();
-
-  #ifdef TEST
-  *logofs << "Proxy: Successfully loaded cache file '"
-          << loadName << "'.\n" << logofs_flush;
-  #endif
-
-  //
-  // Return the string provided by caller.
-  //
-
-  return loadName;
-}
-
-int Proxy::allocateChannelMap(int fd)
-{
-  //
-  // We assume that the fd is lower than
-  // the maximum allowed number. This is
-  // checked at the time the connection
-  // is accepted.
-  //
-
-  if (fd < 0 || fd >= CONNECTIONS_LIMIT)
-  {
-    #ifdef PANIC
-    *logofs << "Proxy: PANIC! Internal error allocating "
-            << "new channel with FD#" << fd_ << ".\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Internal error allocating "
-         << "new channel with FD#" << fd_ << ".\n";
-
-    HandleCleanup();
-  }
-
-  for (int channelId = 0;
-           channelId < CONNECTIONS_LIMIT;
-               channelId++)
-  {
-    if (checkLocalChannelMap(channelId) == 1 &&
-            fdMap_[channelId] == -1)
-    {
-      fdMap_[channelId] = fd;
-      channelMap_[fd] = channelId;
-
-      #ifdef TEST
-      *logofs << "Proxy: Allocated new channel ID#"
-              << channelId << " with FD#" << fd << ".\n"
-              << logofs_flush;
-      #endif
-
-      return channelId;
-    }
-  }
-
-  //
-  // No available channel is remaining.
-  //
-
-  #ifdef TEST
-  *logofs << "Proxy: WARNING! Can't allocate a new channel "
-          << "for FD#" << fd_ << ".\n" << logofs_flush;
-  #endif
-
-  return -1;
-}
-
-int Proxy::checkChannelMap(int channelId)
-{
-  //
-  // To be acceptable, the channel id must
-  // be an id that is not possible to use
-  // to allocate channels at this side.
-  //
-
-  if (checkLocalChannelMap(channelId) == 1)
-  {
-    #ifdef PANIC
-    *logofs << "Proxy: PANIC! Can't open a new channel "
-            << "with invalid ID#" << channelId << ".\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Can't open a new channel "
-         << "with invalid ID#" << channelId << ".\n";
-
-    return -1;
-  }
-  else if (channels_[channelId] != NULL)
-  {
-    #ifdef PANIC
-    *logofs << "Proxy: PANIC! Can't open a new channel "
-            << "over an existing ID#" << channelId
-            << " with FD#" << getFd(channelId)
-            << ".\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Can't open a new channel "
-         << "over an existing ID#" << channelId
-         << " with FD#" << getFd(channelId)
-         << ".\n";
-
-    return -1;
-  }
-
-  return 1;
-}
-
-int Proxy::assignChannelMap(int channelId, int fd)
-{
-  //
-  // We assume that the fd is lower than
-  // the maximum allowed number. This is
-  // checked at the time the connection
-  // is accepted.
-  //
-
-  if (channelId < 0 || channelId >= CONNECTIONS_LIMIT ||
-          fd < 0 || fd >= CONNECTIONS_LIMIT)
-  {
-    #ifdef PANIC
-    *logofs << "Proxy: PANIC! Internal error assigning "
-            << "new channel with FD#" << fd_ << ".\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Internal error assigning "
-         << "new channel with FD#" << fd_ << ".\n";
-
-    HandleCleanup();
-  }
-
-  fdMap_[channelId] = fd;
-  channelMap_[fd] = channelId;
-
-  return 1;
-}
-
-void Proxy::cleanupChannelMap(int channelId)
-{
-  int fd = fdMap_[channelId];
-
-  if (fd != -1)
-  {
-    fdMap_[channelId] = -1;
-    channelMap_[fd] = -1;
-  }
-}
-
-int Proxy::addControlCodes(T_proxy_code code, int data)
-{
-  //
-  // Flush the encode buffer plus all the outstanding
-  // control codes if there is not enough space for
-  // the new control message. We need to ensure that
-  // there are further bytes available, in the case
-  // we will need to add more token control messages.
-  //
-
-  if (controlLength_ + 3 > CONTROL_CODES_THRESHOLD)
-  {
-    #ifdef WARNING
-    *logofs << "Proxy: WARNING! Flushing control messages "
-            << "while sending code '" << DumpControl(code)
-            << "'.\n" << logofs_flush;
-    #endif
-
-    if (handleFlush() < 0)
-    {
-      return -1;
-    }
-  }
-
-  controlCodes_[controlLength_++] = 0;
-  controlCodes_[controlLength_++] = (unsigned char) code;
-  controlCodes_[controlLength_++] = (unsigned char) (data == -1 ? 0 : data);
-
-  //
-  // Account for the control frame.
-  //
-
-  statistics -> addFrameOut();
-
-  return 1;
-}
-
-void Proxy::setSplitTimeout(int channelId)
-{
-  int needed = channels_[channelId] -> needSplit();
-
-  if (needed != isTimestamp(timeouts_.splitTs))
-  {
-    if (needed == 1)
-    {
-      #if defined(TEST) || defined(INFO) || defined(SPLIT)
-      *logofs << "Proxy: SPLIT! Allocating split timestamp at "
-              << strMsTimestamp() << ".\n" << logofs_flush;
-      #endif
-
-      timeouts_.splitTs = getTimestamp();
-    }
-    else
-    {
-      T_list &channelList = activeChannels_.getList();
-
-      for (T_list::iterator j = channelList.begin();
-               j != channelList.end(); j++)
-      {
-        int channelId = *j;
-
-        if (channels_[channelId] != NULL &&
-                channels_[channelId] -> needSplit() == 1)
-        {
-          #ifdef TEST
-          *logofs << "Proxy: SPLIT! Channel for FD#"
-                  << getFd(channelId) << " still needs splits.\n"
-                  << logofs_flush;
-          #endif
-
-          return;
-        }
-      }
-
-      #if defined(TEST) || defined(INFO) || defined(SPLIT)
-      *logofs << "Proxy: SPLIT! Resetting split timestamp at "
-              << strMsTimestamp() << ".\n" << logofs_flush;
-      #endif
-
-      timeouts_.splitTs = nullTimestamp();
-    }
-  }
-}
-
-void Proxy::setMotionTimeout(int channelId)
-{
-  int needed = channels_[channelId] -> needMotion();
-
-  if (needed != isTimestamp(timeouts_.motionTs))
-  {
-    if (channels_[channelId] -> needMotion() == 1)
-    {
-      #if defined(TEST) || defined(INFO) || defined(SPLIT)
-      *logofs << "Proxy: Allocating motion timestamp at "
-              << strMsTimestamp() << ".\n" << logofs_flush;
-      #endif
-
-      timeouts_.motionTs = getTimestamp();
-    }
-    else
-    {
-      T_list &channelList = activeChannels_.getList();
-
-      for (T_list::iterator j = channelList.begin();
-               j != channelList.end(); j++)
-      {
-        int channelId = *j;
-
-        if (channels_[channelId] != NULL &&
-                channels_[channelId] -> needMotion() == 1)
-        {
-          #ifdef TEST
-          *logofs << "Proxy: SPLIT! Channel for FD#"
-                  << getFd(channelId) << " still needs motions.\n"
-                  << logofs_flush;
-          #endif
-
-          return;
-        }
-      }
-
-      #if defined(TEST) || defined(INFO) || defined(SPLIT)
-      *logofs << "Proxy: Resetting motion timestamp at "
-              << strMsTimestamp() << ".\n" << logofs_flush;
-      #endif
-
-      timeouts_.motionTs = nullTimestamp();
-    }
-  }
-}
-
-void Proxy::increaseChannels(int channelId)
-{
-  #ifdef TEST
-  *logofs << "Proxy: Adding channel " << channelId
-          << " to the list of active channels.\n"
-          << logofs_flush;
-  #endif
-
-  activeChannels_.add(channelId);
-
-  #ifdef TEST
-  *logofs << "Proxy: There are " << activeChannels_.getSize()
-          << " allocated channels for proxy FD#" << fd_
-          << ".\n" << logofs_flush;
-  #endif
-}
-
-void Proxy::decreaseChannels(int channelId)
-{
-  #ifdef TEST
-  *logofs << "Proxy: Removing channel " << channelId
-          << " from the list of active channels.\n"
-          << logofs_flush;
-  #endif
-
-  activeChannels_.remove(channelId);
-
-  #ifdef TEST
-  *logofs << "Proxy: There are " << activeChannels_.getSize()
-          << " allocated channels for proxy FD#" << fd_
-          << ".\n" << logofs_flush;
-  #endif
-}
-
-int Proxy::allocateTransport(int channelFd, int channelId)
-{
-  if (transports_[channelId] == NULL)
-  {
-    transports_[channelId] = new Transport(channelFd);
-
-    if (transports_[channelId] == NULL)
-    {
-      #ifdef PANIC
-      *logofs << "Proxy: PANIC! Can't allocate transport for "
-              << "channel id " << channelId << ".\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Can't allocate transport for "
-           << "channel id " << channelId << ".\n";
-
-      return -1;
-    }
-  }
-  else if (transports_[channelId] ->
-               getType() != transport_agent)
-  {
-    #ifdef PANIC
-    *logofs << "Proxy: PANIC! Transport for channel id "
-            << channelId << " should be null.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Transport for channel id "
-         << channelId << " should be null.\n";
-
-    return -1;
-  }
-
-  return 1;
-}
-
-int Proxy::deallocateTransport(int channelId)
-{
-  //
-  // Transport for the agent connection
-  // is passed from the outside when
-  // creating the channel.
-  //
-
-  if (transports_[channelId] ->
-          getType() != transport_agent)
-  {
-    delete transports_[channelId];
-  }
-
-  transports_[channelId] = NULL;
-
-  return 1;
-}
-
-int Proxy::handleNewGenericConnection(int clientFd, T_channel_type type, const char *label)
-{
-  int channelId = allocateChannelMap(clientFd);
-
-  if (channelId == -1)
-  {
-    #ifdef PANIC
-    *logofs << "Proxy: PANIC! Maximum number of available "
-            << "channels exceeded.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Maximum number of available "
-         << "channels exceeded.\n";
-
-    return -1;
-  }
-
-  #ifdef TEST
-  *logofs << "Proxy: Channel for " << label << " descriptor "
-          << "FD#" << clientFd << " mapped to ID#"
-          << channelId << ".\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // Turn queuing off for path server-to-proxy.
-  //
-
-  SetNoDelay(clientFd, 1);
-
-  if (allocateTransport(clientFd, channelId) < 0)
-  {
-    return -1;
-  }
-
-  switch (type)
-  {
-    case channel_cups:
-    {
-      channels_[channelId] = new CupsChannel(transports_[channelId], compressor_);
-
-      break;
-    }
-    case channel_smb:
-    {
-      channels_[channelId] = new SmbChannel(transports_[channelId], compressor_);
-
-      break;
-    }
-    case channel_media:
-    {
-      channels_[channelId] = new MediaChannel(transports_[channelId], compressor_);
-
-      break;
-    }
-    case channel_http:
-    {
-      channels_[channelId] = new HttpChannel(transports_[channelId], compressor_);
-
-      break;
-    }
-    case channel_font:
-    {
-      channels_[channelId] = new FontChannel(transports_[channelId], compressor_);
-
-      break;
-    }
-    default:
-    {
-      channels_[channelId] = new SlaveChannel(transports_[channelId], compressor_);
-
-      break;
-    }
-  }
-
-  if (channels_[channelId] == NULL)
-  {
-    deallocateTransport(channelId);
-
-    return -1;
-  }
-
-  #ifdef TEST
-  *logofs << "Proxy: Accepted new connection to "
-          << label << " server.\n" << logofs_flush;
-  #endif
-
-  cerr << "Info" << ": Accepted new connection to "
-       << label << " server.\n";
-
-  increaseChannels(channelId);
-
-  switch (type)
-  {
-    case channel_cups:
-    {
-      if (handleControl(code_new_cups_connection, channelId) < 0)
-      {
-        return -1;
-      }
-
-      break;
-    }
-    case channel_smb:
-    {
-      if (handleControl(code_new_smb_connection, channelId) < 0)
-      {
-        return -1;
-      }
-
-      break;
-    }
-    case channel_media:
-    {
-      if (handleControl(code_new_media_connection, channelId) < 0)
-      {
-        return -1;
-      }
-
-      break;
-    }
-    case channel_http:
-    {
-      if (handleControl(code_new_http_connection, channelId) < 0)
-      {
-        return -1;
-      }
-
-      break;
-    }
-    case channel_font:
-    {
-      if (handleControl(code_new_font_connection, channelId) < 0)
-      {
-        return -1;
-      }
-
-      break;
-    }
-    default:
-    {
-      if (handleControl(code_new_slave_connection, channelId) < 0)
-      {
-        return -1;
-      }
-
-      break;
-    }
-  }
-
-  channels_[channelId] -> handleConfiguration();
-
-  return 1;
-}
-
-int Proxy::handleNewSlaveConnection(int clientFd)
-{
-  // Since ProtoStep7 (#issue 108)
-  return handleNewGenericConnection(clientFd, channel_slave, "slave");
-}
-
-
-
-int Proxy::handleNewGenericConnectionFromProxy(int channelId, T_channel_type type,
-                                               ChannelEndPoint &endPoint, const char *label)
-{
-  char *unixPath, *host;
-  long port;
-
-  if (endPoint.getUnixPath(&unixPath)) {
-    return handleNewGenericConnectionFromProxyUnix(channelId, type, unixPath, label);
-  }
-
-  if (endPoint.getTCPHostAndPort(&host, &port)) {
-    return handleNewGenericConnectionFromProxyTCP(channelId, type, host, port, label);
-  }
-
-  #ifdef WARNING
-  *logofs << "Proxy: WARNING! Refusing attempted connection "
-      << "to " << label << " server.\n" << logofs_flush;
-  #endif
-
-  cerr << "Warning" << ": Refusing attempted connection "
-      << "to " << label << " server.\n";
-
-  return -1;
-}
-
-int Proxy::handleNewGenericConnectionFromProxyTCP(int channelId, T_channel_type type,
-                                                  const char *hostname, long port, const char *label)
-
-{
-  if (port <= 0)
-  {
-    //
-    // This happens when user has disabled
-    // forwarding of the specific service.
-    //
-
-    #ifdef WARNING
-    *logofs << "Proxy: WARNING! Refusing attempted connection "
-            << "to " << label << " server.\n" << logofs_flush;
-    #endif
-
-    cerr << "Warning" << ": Refusing attempted connection "
-         << "to " << label << " server.\n";
-
-    return -1;
-  }
-
-  const char *serverHost = hostname;
-  int serverAddrFamily = AF_INET;
-  sockaddr *serverAddr = NULL;
-  unsigned int serverAddrLength = 0;
-
-  #ifdef TEST
-  *logofs << "Proxy: Connecting to " << label
-          << " server '" << serverHost << "' on TCP port '"
-          << port << "'.\n" << logofs_flush;
-  #endif
-
-  int serverIPAddr = GetHostAddress(serverHost);
-
-  if (serverIPAddr == 0)
-  {
-    #ifdef PANIC
-    *logofs << "Proxy: PANIC! Unknown " << label
-            << " server host '" << serverHost << "'.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Unknown " << label
-         << " server host '" << serverHost
-         << "'.\n";
-
-    return -1;
-  }
-
-  sockaddr_in *serverAddrTCP = new sockaddr_in;
-
-  serverAddrTCP -> sin_family = AF_INET;
-  serverAddrTCP -> sin_port = htons(port);
-  serverAddrTCP -> sin_addr.s_addr = serverIPAddr;
-
-  serverAddr = (sockaddr *) serverAddrTCP;
-  serverAddrLength = sizeof(sockaddr_in);
-
-  //
-  // Connect to the requested server.
-  //
-
-  int serverFd = socket(serverAddrFamily, SOCK_STREAM, PF_UNSPEC);
-
-  if (serverFd < 0)
-  {
-    #ifdef PANIC
-    *logofs << "Proxy: PANIC! Call to socket failed. "
-            << "Error is " << EGET() << " '" << ESTR()
-            << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Call to socket failed. "
-         << "Error is " << EGET() << " '" << ESTR()
-         << "'.\n";
-
-    delete serverAddrTCP;
-
-    return -1;
-  }
-  else if (connect(serverFd, serverAddr, serverAddrLength) < 0)
-  {
-    #ifdef WARNING
-    *logofs << "Proxy: WARNING! Connection to " << label
-            << " server '" << serverHost << ":" << port
-            << "' failed with error '" << ESTR() << "'.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Warning" << ": Connection to " << label
-         << " server '" << serverHost << ":" << port
-         << "' failed with error '" << ESTR() << "'.\n";
-
-    close(serverFd);
-
-    delete serverAddrTCP;
-
-    return -1;
-  }
-
-  delete serverAddrTCP;
-
-  if (handlePostConnectionFromProxy(channelId, serverFd, type, label) < 0)
-  {
-    return -1;
-  }
-
-  #ifdef TEST
-  *logofs << "Proxy: Forwarded new connection to "
-          << label << " server on port '" << port
-          << "'.\n" << logofs_flush;
-  #endif
-
-  cerr << "Info" << ": Forwarded new connection to "
-       << label << " server on port '" << port
-       << "'.\n";
-
-  return 1;
-}
-
-int Proxy::handleNewGenericConnectionFromProxyUnix(int channelId, T_channel_type type,
-                                                   const char *path, const char *label)
-{
-  if (path == NULL || *path == '\0' )
-  {
-    //
-    // This happens when user has disabled
-    // forwarding of the specific service.
-    //
-
-    #ifdef WARNING
-    *logofs << "Proxy: WARNING! Refusing attempted connection "
-            << "to " << label << " server.\n" << logofs_flush;
-    #endif
-
-    cerr << "Warning" << ": Refusing attempted connection "
-         << "to " << label << " server.\n";
-
-    return -1;
-  }
-
-  sockaddr_un serverAddrUnix;
-
-  unsigned int serverAddrLength = sizeof(sockaddr_un);
-
-  int serverAddrFamily = AF_UNIX;
-
-  serverAddrUnix.sun_family = AF_UNIX;
-
-  const int serverAddrNameLength = 108;
-
-  strncpy(serverAddrUnix.sun_path, path, serverAddrNameLength);
-
-  *(serverAddrUnix.sun_path + serverAddrNameLength - 1) = '\0';
-
-  #ifdef TEST
-  *logofs << "Proxy: Connecting to " << label << " server "
-          << "on Unix port '" << path << "'.\n" << logofs_flush;
-  #endif
-
-  //
-  // Connect to the requested server.
-  //
-
-  int serverFd = socket(serverAddrFamily, SOCK_STREAM, PF_UNSPEC);
-
-  if (serverFd < 0)
-  {
-    #ifdef PANIC
-    *logofs << "Proxy: PANIC! Call to socket failed. "
-            << "Error is " << EGET() << " '" << ESTR()
-            << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Call to socket failed. "
-         << "Error is " << EGET() << " '" << ESTR()
-         << "'.\n";
-
-    return -1;
-  }
-  else if (connect(serverFd, (sockaddr *) &serverAddrUnix, serverAddrLength) < 0)
-  {
-    #ifdef WARNING
-    *logofs << "Proxy: WARNING! Connection to " << label
-            << " server on Unix port '" << path << "' failed "
-            << "with error " << EGET() << ", '" << ESTR() << "'.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Warning" << ": Connection to " << label
-         << " server on Unix port '" << path << "' failed "
-        << "with error " << EGET() << ", '" << ESTR() << "'.\n";
-
-    close(serverFd);
-
-    return -1;
-  }
-
-  if (handlePostConnectionFromProxy(channelId, serverFd, type, label) < 0)
-  {
-    return -1;
-  }
-
-  #ifdef TEST
-  *logofs << "Proxy: Forwarded new connection to "
-          << label << " server on Unix port '" << path
-          << "'.\n" << logofs_flush;
-  #endif
-
-  cerr << "Info" << ": Forwarded new connection to "
-       << label << " server on Unix port '" << path
-       << "'.\n";
-
-  return 1;
-}
-
-int Proxy::handleNewSlaveConnectionFromProxy(int channelId)
-{
-
-  cerr << "Info" << ": New slave connection on "
-       << "channel ID#" << channelId << "\n";
-
-  char *nx_slave_cmd = getenv("NX_SLAVE_CMD");
-  if (nx_slave_cmd == NULL) {
-    return -1;
-  }
-
-  int spair[2];
-  if (socketpair(AF_UNIX, SOCK_STREAM, 0, spair) == -1) {
-    perror("socketpair");
-    return -1;
-  }
-
-  int serverFd = spair[0];
-  int clientFd = spair[1];
-
-  if (handlePostConnectionFromProxy(channelId, serverFd, channel_slave, "slave") < 0)
-  {
-    close(serverFd);
-    close(clientFd);
-    return -1;
-  }
-
-
-  int pid = fork();
-  if (pid == 0)
-  {
-
-    if (dup2(clientFd, 0) == -1)
-    {
-      perror("dup2");
-      exit(1);
-    }
-
-    if (dup2(clientFd, 1) == -1)
-    {
-      perror("dup2");
-      exit(1);
-    }
-
-    close(serverFd);
-    close(clientFd);
-
-    /* Close FDs used by NX, QVD #1208 */
-    for (int fd = 3; fd < 256; fd++) {
-        close(fd);
-    }
-
-    char *const argv[2] = {nx_slave_cmd, NULL};
-
-    if (execv(nx_slave_cmd, argv) == -1)
-    {
-      perror("execv");
-    }
-    exit(1);
-
-  }
-  else if (pid == -1)
-  {
-    // TODO Test this!
-    perror("fork");
-    close(serverFd);
-    close(clientFd);
-    return -1;
-  }
-
-  close(clientFd);
-  slavePidMap_[channelId] = pid;
-
-  cerr << "Info" << ": slave channel ID#" << channelId << " handler has PID " << pid << endl;
-
-  return 1;
-}
-
-void Proxy::checkSlaves()
-{
-  for (int channelId = 0; channelId<CONNECTIONS_LIMIT; channelId++)
-  {
-    int pid = slavePidMap_[channelId];
-
-    if (pid > 1 && HandleChild(pid))
-    {
-      slavePidMap_[channelId] = nothing;
-      cerr << "Info:" << " Handled death of slave with pid " << pid << endl;
-    }
-  }
-}
-
-int Proxy::handlePostConnectionFromProxy(int channelId, int serverFd,
-                                             T_channel_type type, const char *label)
-{
-  //
-  // Turn queuing off for path proxy-to-server.
-  //
-
-  SetNoDelay(serverFd, 1);
-
-  assignChannelMap(channelId, serverFd);
-
-  #ifdef TEST
-  *logofs << "Proxy: Descriptor FD#" << serverFd 
-          << " mapped to channel ID#" << channelId << ".\n"
-          << logofs_flush;
-  #endif
-
-  if (allocateTransport(serverFd, channelId) < 0)
-  {
-    return -1;
-  }
-
-  switch (type)
-  {
-    case channel_cups:
-    {
-      channels_[channelId] = new CupsChannel(transports_[channelId], compressor_);
-      break;
-    }
-    case channel_smb:
-    {
-      channels_[channelId] = new SmbChannel(transports_[channelId], compressor_);
-
-      break;
-    }
-    case channel_media:
-    {
-      channels_[channelId] = new MediaChannel(transports_[channelId], compressor_);
-
-      break;
-    }
-    case channel_http:
-    {
-      channels_[channelId] = new HttpChannel(transports_[channelId], compressor_);
-
-      break;
-    }
-    case channel_font:
-    {
-      channels_[channelId] = new FontChannel(transports_[channelId], compressor_);
-
-      break;
-    }
-    default:
-    {
-      channels_[channelId] = new SlaveChannel(transports_[channelId], compressor_);
-
-      break;
-    }
-  }
-
-  if (channels_[channelId] == NULL)
-  {
-    deallocateTransport(channelId);
-
-    return -1;
-  }
-
-  increaseChannels(channelId);
-
-  channels_[channelId] -> handleConfiguration();
-
-  return 1;
-}
diff --git a/nxcomp/Proxy.h b/nxcomp/Proxy.h
deleted file mode 100644
index ea60c827a..000000000
--- a/nxcomp/Proxy.h
+++ /dev/null
@@ -1,1276 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef Proxy_H
-#define Proxy_H
-
-#include <sys/types.h>
-
-#ifdef _AIX
-#include <sys/select.h>
-#endif
-
-#include "Misc.h"
-#include "Timestamp.h"
-
-#include "List.h"
-#include "Channel.h"
-#include "Transport.h"
-#include "EncodeBuffer.h"
-#include "ProxyReadBuffer.h"
-#include "ChannelEndPoint.h"
-
-//
-// Forward declaration as we
-// need a pointer.
-//
-
-class Agent;
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-//
-// Log the important tracepoints related
-// to writing packets to the peer proxy.
-//
-
-#undef  FLUSH
-
-//
-// Codes used for control messages in
-// proxy-to-proxy protocol.
-//
-// The following codes are currently
-// unused.
-//
-// code_alert_reply,
-// code_reset_request,
-// code_reset_reply,
-// code_load_reply,
-// code_save_reply,
-// code_shutdown_reply,
-// code_configuration_request,
-// code_configuration_reply.
-//
-// These are for compatibility with
-// old versions.
-//
-// code_sync_request,
-// code_sync_reply,
-//
-// The code_new_aux_connection should not
-// be used anymore. Auxiliary X connections
-// are treated as normal X channels since
-// version 1.5.0.
-//
-
-typedef enum
-{
-  code_new_x_connection,
-  code_new_cups_connection,
-  code_new_aux_connection,
-  code_new_smb_connection,
-  code_new_media_connection,
-  code_switch_connection,
-  code_drop_connection,
-  code_finish_connection,
-  code_begin_congestion,
-  code_end_congestion,
-  code_alert_request,
-  code_alert_reply,
-  code_reset_request,
-  code_reset_reply,
-  code_load_request,
-  code_load_reply,
-  code_save_request,
-  code_save_reply,
-  code_shutdown_request,
-  code_shutdown_reply,
-  code_control_token_request,
-  code_control_token_reply,
-  code_configuration_request,
-  code_configuration_reply,
-  code_statistics_request,
-  code_statistics_reply,
-  code_new_http_connection,
-  code_sync_request,
-  code_sync_reply,
-  code_new_font_connection,
-  code_new_slave_connection,
-  code_finish_listeners,
-  code_split_token_request,
-  code_split_token_reply,
-  code_data_token_request,
-  code_data_token_reply,
-  code_last_tag
-
-} T_proxy_code;
-
-typedef enum
-{
-  operation_in_negotiation,
-  operation_in_messages,
-  operation_in_configuration,
-  operation_in_statistics,
-  operation_last_tag
-
-} T_proxy_operation;
-
-typedef enum
-{
-  frame_ping,
-  frame_data,
-
-} T_frame_type;
-
-typedef enum
-{
-  token_control,
-  token_split,
-  token_data
-
-} T_token_type;
-
-typedef enum
-{
-  load_if_any,
-  load_if_first
-
-} T_load_type;
-
-class Proxy
-{
-  public:
-
-  //
-  // Maximum number of supported channels.
-  //
-
-  static const int CONNECTIONS_LIMIT  = 256;
-
-  //
-  // Numboer of token types.
-  //
-
-  static const int TOKEN_TYPES = 3;
-
-  //
-  // Lenght of buffer we use to add our
-  // control messages plus the length of
-  // the data frame.
-  //
-
-  static const int CONTROL_CODES_LENGTH = ENCODE_BUFFER_PREFIX_SIZE - 5;
-
-  static const int CONTROL_CODES_THRESHOLD = CONTROL_CODES_LENGTH - 9;
-
-  Proxy(int fd);
-
-  virtual ~Proxy();
-
-  //
-  // Inform the proxy that the negotiation phase is
-  // completed and that it can start handling binary
-  // messages.
-  //
-
-  int setOperational();
-
-  int getOperational()
-  {
-    return (operation_ != operation_in_negotiation);
-  }
-
-  int setReadDescriptors(fd_set *fdSet, int &fdMax, T_timestamp &tsMax);
-
-  int setWriteDescriptors(fd_set *fdSet, int &fdMax, T_timestamp &tsMax);
-
-  //
-  // Perform the operation on the proxy
-  // link or its own channels.
-  //
-
-  int handleRead(int &resultFds, fd_set &fdSet);
-
-  int handleFlush(int &resultFds, fd_set &fdSet);
-
-  int handleRead();
-
-  int handleRead(int fd, const char *data = NULL, int size = 0);
-
-  int handleEvents();
-
-  int handleFlush();
-
-  int handleFlush(int fd);
-
-  int handlePing();
-
-  int handleFinish();
-
-  int handleShutdown();
-
-  int handleStatistics(int type, ostream *statofs);
-
-  int handleAlert(int alert);
-
-  int handleRotate()
-  {
-    activeChannels_.rotate();
-
-    return 1;
-  }
-
-  int handleChannelConfiguration();
-
-  int handleSocketConfiguration();
-
-  int handleLinkConfiguration();
-
-  int handleCacheConfiguration();
-
-  //
-  // These must be called just after initialization to
-  // tell to the proxy where the network connections
-  // have to be forwarded.
-  //
-
-  virtual void handleDisplayConfiguration(const char *xServerDisplay, int xServerAddrFamily,
-                                              sockaddr * xServerAddr, unsigned int xServerAddrLength) = 0;
-
-  virtual void handlePortConfiguration(ChannelEndPoint &cupsServerPort,
-                                       ChannelEndPoint &smbServerPort,
-                                       ChannelEndPoint &mediaServerPort,
-                                       ChannelEndPoint &httpServerPort,
-                                       const char *fontServerPort) = 0;
-
-  //
-  // Create new tunneled channels.
-  //
-
-  virtual int handleNewConnection(T_channel_type type, int clientFd) = 0;
-
-  virtual int handleNewConnectionFromProxy(T_channel_type type, int channelId) = 0;
-
-  virtual int handleNewAgentConnection(Agent *agent) = 0;
-
-  virtual int handleNewXConnection(int clientFd) = 0;
-
-  virtual int handleNewXConnectionFromProxy(int channelId) = 0;
-
-  int handleNewGenericConnection(int clientFd, T_channel_type type, const char *label);
-
-  int handleNewGenericConnectionFromProxy(int channelId, T_channel_type type,
-                                          ChannelEndPoint &endpoint, const char *label);
-
-  int handleNewGenericConnectionFromProxyUnix(int channelId, T_channel_type type,
-                                              const char *path, const char *label);
-
-  int handleNewGenericConnectionFromProxyTCP(int channelId, T_channel_type type,
-                                             const char *hostname, long port, const char *label);
-
-  int handleNewSlaveConnection(int clientFd);
-
-  int handleNewSlaveConnectionFromProxy(int channelId);
-
-  void checkSlaves();
-
-  //
-  // Force closure of channels.
-  //
-
-  int handleCloseConnection(int clientFd);
-
-  int handleCloseAllXConnections();
-
-  int handleCloseAllListeners();
-
-  //
-  // Called when the loop has replaced
-  // or closed a previous alert.
-  //
-
-  void handleResetAlert();
-
-  //
-  // Handle the persistent cache.
-  //
-
-  virtual int handleLoad(T_load_type type) = 0;
-
-  virtual int handleSave() = 0;
-
-  protected:
-
-  //
-  // Timeout related data:
-  //
-  // flush
-  // split
-  // motion
-  //
-  // Timeouts in milliseconds after which the
-  // proxy will have to perform the operation.
-  //
-  // readTs, writeTs
-  //
-  // Timestamp of last packet received or sent
-  // to remote proxy. Used to detect lost con-
-  // nection.
-  //
-  // loopTs
-  //
-  // Timestamp of last loop completed by the
-  // proxy
-  //
-  // pingTs
-  //
-  // Timestamp of last ping request sent to the
-  // remote peer.
-  //
-  // alertTs
-  //
-  // Timestamp of last 'no data received' alert
-  // dialog shown to the user.
-  //
-  // loadTs
-  //
-  // Were message stores populated from data on
-  // disk.
-  //
-  // splitTs
-  // motionTs
-  //
-  // Timestamps of the last operation of this
-  // kind handled by the proxy.
-  //
-
-  typedef struct
-  {
-    int split;
-    int motion;
-
-    T_timestamp readTs;
-    T_timestamp writeTs;
-
-    T_timestamp loopTs;
-    T_timestamp pingTs;
-    T_timestamp alertTs;
-    T_timestamp loadTs;
-
-    T_timestamp splitTs;
-    T_timestamp motionTs;
-
-  } T_proxy_timeouts;
-
-  //
-  // Bytes accumulated so far while waiting
-  // to send the next token, number of tokens
-  // remaining for each token type and other
-  // token related information.
-  //
-
-  typedef struct
-  {
-    int size;
-    int limit;
-
-    int bytes;
-    int remaining;
-
-    T_proxy_code request;
-    T_proxy_code reply;
-
-    T_token_type type;
-
-  } T_proxy_token;
-
-  int handlePostConnectionFromProxy(int channelId, int serverFd,
-                                        T_channel_type type, const char *label);
-
-  int handleDrain();
-
-  int handleFrame(T_frame_type type);
-
-  int handleFinish(int channelId);
-
-  int handleDrop(int channelId);
-
-  int handleFinishFromProxy(int channelId);
-
-  int handleDropFromProxy(int channelId);
-
-  int handleStatisticsFromProxy(int type);
-
-  int handleStatisticsFromProxy(const unsigned char *message, unsigned int length);
-
-  int handleNegotiation(const unsigned char *message, unsigned int length);
-
-  int handleNegotiationFromProxy(const unsigned char *message, unsigned int length);
-
-  int handleToken(T_frame_type type);
-
-  int handleTokenFromProxy(T_proxy_token &token, int count);
-
-  int handleTokenReplyFromProxy(T_proxy_token &token, int count);
-
-  int handleSyncFromProxy(int channelId);
-
-  int handleSwitch(int channelId);
-
-  int handleControl(T_proxy_code code, int data = -1);
-
-  int handleControlFromProxy(const unsigned char *message);
-
-  //
-  // Interleave reads of the X server
-  // events while writing data to the
-  // remote proxy.
-  //
-
-  virtual int handleAsyncEvents() = 0;
-
-  //
-  // Timer related functions.
-  //
-
-  protected:
-
-  void setTimer(int value)
-  {
-    SetTimer(value);
-  }
-
-  void resetTimer()
-  {
-    ResetTimer();
-
-    timer_ = 0;
-  }
-
-  public:
-
-  void handleTimer()
-  {
-    timer_ = 1;
-  }
-
-  int getTimer()
-  {
-    return timer_;
-  }
-
-  //
-  // Can the channel consume data and the
-  // proxy produce more output?
-  //
-
-  int canRead(int fd) const
-  {
-    return (isTimeToRead() == 1 &&
-                isTimeToRead(getChannel(fd)) == 1);
-  }
-
-  //
-  // Can the proxy read more data from its
-  // peer?
-  //
-
-  int canRead() const
-  {
-    return (transport_ -> readable() != 0);
-  }
-
-  int canFlush() const
-  {
-    return (encodeBuffer_.getLength() +
-                controlLength_ + transport_ -> length() +
-                    transport_ -> flushable() > 0);
-  }
-
-  int needFlush(int channelId) const
-  {
-    return (outputChannel_ == channelId &&
-                encodeBuffer_.getLength() > 0);
-  }
-
-  int needFlush() const
-  {
-    return (encodeBuffer_.getLength() > 0);
-  }
-
-  int shouldFlush() const
-  {
-    if ((int) ((encodeBuffer_.getLength() +
-            controlLength_) / statistics ->
-                getStreamRatio()) >= control -> TokenSize)
-    {
-      #if defined(TEST) || defined(INFO) || defined(FLUSH)
-      *logofs << "Proxy: FLUSH! Requesting a flush with "
-              << (encodeBuffer_.getLength() + controlLength_)
-              << " bytes and stream ratio " << (double) statistics ->
-                 getStreamRatio() << ".\n" << logofs_flush;
-      #endif
-
-      return 1;
-    }
-
-    #if defined(TEST) || defined(INFO) || defined(FLUSH)
-    *logofs << "Proxy: Not requesting a flush with "
-            << (encodeBuffer_.getLength() + controlLength_)
-            << " bytes and stream ratio " << (double) statistics ->
-               getStreamRatio() << ".\n" << logofs_flush;
-    #endif
-
-    return 0;
-  }
-
-  int needDrain() const
-  {
-    return (congestion_ == 1 || transport_ -> length() >
-                control -> TransportProxyBufferThreshold);
-  }
-
-  int getFd() const
-  {
-    return fd_;
-  }
-
-  int getFlushable(int fd) const
-  {
-    if (fd == fd_)
-    {
-      return (encodeBuffer_.getLength() + controlLength_ +
-                  transport_ -> flushable());
-    }
-
-    return 0;
-  }
-
-  int getSplitSize()
-  {
-    return (clientStore_ != NULL ? clientStore_ ->
-                getSplitTotalSize() : 0);
-  }
-
-  int getSplitStorageSize()
-  {
-    return (clientStore_ != NULL ? clientStore_ ->
-                getSplitTotalStorageSize() : 0);
-  }
-
-  //
-  // Returns the number of active channels
-  // that currently managed by this proxy.
-  //
-
-  int getChannels(T_channel_type type = channel_none);
-
-  //
-  // If descriptor corresponds to a valid
-  // channel, returns the type of traffic
-  // carried by it.
-  //
-
-  T_channel_type getType(int fd);
-
-  //
-  // Given a channel type, returns the
-  // literal name.
-  //
-
-  const char *getTypeName(T_channel_type type);
-
-  //
-  // Get a convenient name for 'localhost'.
-  //
-
-  const char *getComputerName();
-
-  //
-  // Set if we have initiated the shutdown
-  // procedure and if the shutdown request
-  // has been received from the remote.
-  //
-
-  int getFinish() const
-  {
-    return finish_;
-  }
-
-  int getShutdown() const
-  {
-    return shutdown_;
-  }
-
-  //
-  // Interfaces to the transport buffers.
-  //
-
-  int getLength(int fd) const
-  {
-    if (fd == fd_)
-    {
-      return transport_ -> length();
-    }
-
-    int channelId = getChannel(fd);
-
-    if (channelId < 0 || channels_[channelId] == NULL)
-    {
-      return 0;
-    }
-
-    return transports_[channelId] -> length();
-  }
-
-  int getPending(int fd) const
-  {
-    if (fd == fd_)
-    {
-      return transport_ -> pending();
-    }
-
-    int channelId = getChannel(fd);
-
-    if (channelId < 0 || channels_[channelId] == NULL)
-    {
-      return 0;
-    }
-
-    return transports_[channelId] -> pending();
-  }
-
-  //
-  // Check if the proxy or the given channel
-  // has data in the buffer because of a
-  // blocking write.
-  //
-
-  int getBlocked(int fd) const
-  {
-    if (fd == fd_)
-    {
-      return transport_ -> blocked();
-    }
-
-    int channelId = getChannel(fd);
-
-    if (channelId < 0 || channels_[channelId] == NULL)
-    {
-      return 0;
-    }
-
-    return transports_[channelId] -> blocked();
-  }
-
-  //
-  // Check if the proxy or the given channel has
-  // data to read.
-  //
-
-  int getReadable(int fd) const
-  {
-    if (fd == fd_)
-    {
-      return transport_ -> readable();
-    }
-
-    int channelId = getChannel(fd);
-
-    if (channelId < 0 || channels_[channelId] == NULL)
-    {
-      return 0;
-    }
-
-    return transports_[channelId] -> readable();
-  }
-
-  //
-  // Return a vale between 0 and 9 in the case
-  // of the proxy descriptor.
-  //
-
-  int getCongestion(int fd) const
-  {
-    if (fd == fd_)
-    {
-      return (agent_ != nothing && congestions_[agent_] == 1 ? 9 :
-                  (int) statistics -> getCongestionInFrame());
-    }
-
-    int channelId = getChannel(fd);
-
-    if (channelId < 0 || channels_[channelId] == NULL)
-    {
-      return 0;
-    }
-
-    return channels_[channelId] -> getCongestion();
-  }
-
-  //
-  // Let the statistics class get info
-  // from the message stores.
-  //
-
-  const ClientStore * const getClientStore() const
-  {
-    return clientStore_;
-  }
-
-  const ServerStore * const getServerStore() const
-  {
-    return serverStore_;
-  }
-
-  //
-  // These can be called asynchronously by
-  // channels during their read or write
-  // loop.
-  //
-
-  int handleAsyncRead(int fd)
-  {
-    return handleRead(fd);
-  }
-
-  int handleAsyncCongestion(int fd)
-  {
-    int channelId = getChannel(fd);
-
-    return handleControl(code_begin_congestion, channelId);
-  }
-
-  int handleAsyncDecongestion(int fd)
-  {
-    int channelId = getChannel(fd);
-
-    return handleControl(code_end_congestion, channelId);
-  }
-
-  int handleAsyncSplit(int fd, Split *split)
-  {
-    return channels_[getChannel(fd)] ->
-               handleSplitEvent(encodeBuffer_, split);
-  }
-
-  int handleAsyncPriority()
-  {
-    if (control -> FlushPriority == 1)
-    {
-      return handleFlush();
-    }
-
-    return 0;
-  }
-
-  int canAsyncFlush() const
-  {
-    return shouldFlush();
-  }
-
-  int handleAsyncFlush()
-  {
-    return handleFlush();
-  }
-
-  int handleAsyncSwitch(int fd)
-  {
-    return handleSwitch(getChannel(fd));
-  }
-
-  int handleAsyncKeeperCallback()
-  {
-    KeeperCallback();
-
-    return 1;
-  }
-
-  //
-  // Internal interfaces used to verify the
-  // availability of channels and the proxy
-  // link.
-  //
-
-  protected:
-
-  int isTimeToRead() const
-  {
-    if (congestion_ == 0 && transport_ ->
-            blocked() == 0)
-    {
-      return 1;
-    }
-    else
-    {
-      #if defined(TEST) || defined(INFO)
-      *logofs << "Proxy: Can't read from channels "
-              << "with congestion " << congestion_
-              << " and blocked " << transport_ ->
-                 blocked() << ".\n" << logofs_flush;
-      #endif
-
-      return 0;
-    }
-  }
-
-  int isTimeToRead(int channelId) const
-  {
-    if (channelId >= 0 && channelId < CONNECTIONS_LIMIT &&
-            channels_[channelId] != NULL &&
-                congestions_[channelId] == 0)
-    {
-      if (channels_[channelId] -> getType() == channel_x11 ||
-              tokens_[token_data].remaining > 0 ||
-                  channels_[channelId] ->
-                      getFinish() == 1)
-      {
-        return 1;
-      }
-
-      #if defined(TEST) || defined(INFO)
-      *logofs << "Proxy: Can't read from generic "
-              << "descriptor FD#" << getFd(channelId)
-              << " channel ID#" << channelId << " with "
-              << tokens_[token_data].remaining
-              << " data tokens remaining.\n"
-              << logofs_flush;
-      #endif
-
-      return 0;
-    }
-
-    #if defined(TEST) || defined(INFO)
-
-    if (channelId < 0 || channelId >= CONNECTIONS_LIMIT ||
-            channels_[channelId] == NULL)
-    {
-      *logofs << "Proxy: WARNING! No valid channel for ID#"
-              << channelId << ".\n" << logofs_flush;
-    }
-    else if (channels_[channelId] -> getFinish())
-    {
-      *logofs << "Proxy: Can't read from finishing "
-              << "descriptor FD#" << getFd(channelId)
-              << " channel ID#" << channelId << ".\n"
-              << logofs_flush;
-    }
-    else if (congestions_[channelId] == 1)
-    {
-      *logofs << "Proxy: Can't read from congested "
-              << "descriptor FD#" << getFd(channelId)
-              << " channel ID#" << channelId << ".\n"
-              << logofs_flush;
-    }
-
-    #endif
-
-    return 0;
-  }
-
-  //
-  // Handle the flush and split timeouts.
-  // All these functions should round up
-  // to the value of the latency timeout
-  // to save a further loop.
-  //
-
-  protected:
-
-  int isTimeToSplit() const
-  {
-    if (isTimestamp(timeouts_.splitTs) &&
-            getTimeToNextSplit() <= control ->
-                LatencyTimeout)
-    {
-      if (tokens_[token_split].remaining > 0)
-      {
-        return 1;
-      }
-
-      #if defined(TEST) || defined(INFO)
-      *logofs << "Proxy: WARNING! Can't encode splits "
-              << "with " << tokens_[token_split].remaining
-              << " split tokens remaining.\n"
-              << logofs_flush;
-      #endif
-    }
-
-    return 0;
-  }
-
-  int isTimeToMotion() const
-  {
-    return (isTimestamp(timeouts_.motionTs) &&
-                getTimeToNextMotion() <= control ->
-                    LatencyTimeout);
-  }
-
-  int getTimeToNextSplit() const
-  {
-    #if defined(TEST) || defined(INFO) || defined(FLUSH)
-
-    if (isTimestamp(timeouts_.splitTs) == 0)
-    {
-      #ifdef PANIC
-      *logofs << "Proxy: PANIC! No split timeout was set "
-              << "for proxy FD#" << fd_ << ".\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": No split timeout was set "
-           << "for proxy FD#" << fd_ << ".\n";
-
-      HandleCleanup();
-    }
-
-    #endif
-
-    int diffTs = timeouts_.split -
-                     diffTimestamp(timeouts_.splitTs,
-                         getTimestamp());
-
-    return (diffTs > 0 ? diffTs : 0);
-  }
-
-  int getTimeToNextMotion() const
-  {
-    #if defined(TEST) || defined(INFO) || defined(FLUSH)
-
-    if (isTimestamp(timeouts_.motionTs) == 0)
-    {
-      #ifdef PANIC
-      *logofs << "Proxy: PANIC! No motion timeout was set "
-              << "for proxy FD#" << fd_ << ".\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": No motion timeout was set "
-           << "for proxy FD#" << fd_ << ".\n";
-
-      HandleCleanup();
-    }
-
-    #endif
-
-    int diffTs = timeouts_.motion -
-                     diffTimestamp(timeouts_.motionTs,
-                         getTimestamp());
-
-    return (diffTs > 0 ? diffTs : 0);
-  }
-
-  protected:
-
-  //
-  // Implement persistence of cache on disk.
-  //
-
-  virtual int handleLoadFromProxy() = 0;
-  virtual int handleSaveFromProxy() = 0;
-
-  int handleLoadStores();
-  int handleSaveStores();
-
-  char *handleSaveAllStores(const char *savePath, bool & isTooSmall) const;
-
-  virtual int handleSaveAllStores(ostream *cachefs, md5_state_t *md5StateStream,
-                                      md5_state_t *md5StateClient) const = 0;
-
-  int handleSaveVersion(unsigned char *buffer, int &major, int &minor, int &patch) const;
-
-  void handleFailOnSave(const char *fullName, const char *failContext) const;
-
-  const char *handleLoadAllStores(const char *loadPath, const char *loadName) const;
-
-  virtual int handleLoadAllStores(istream *cachefs, md5_state_t *md5StateStream) const = 0;
-
-  int handleLoadVersion(const unsigned char *buffer, int &major, int &minor, int &patch) const;
-
-  void handleFailOnLoad(const char *fullName, const char *failContext) const;
-
-  //
-  // Prepare for a new persistent cache.
-  //
-
-  int handleResetPersistentCache();
-
-  //
-  // Reset the stores in the case of a
-  // failure loading the cache.
-  //
-
-  int handleResetStores();
-
-  //
-  // Reset the transport buffer and the
-  // other counters.
-  //
-
-  void handleResetFlush();
-
-  //
-  // Utility functions used to map file
-  // descriptors to channel ids.
-  //
-
-  protected:
-
-  int allocateChannelMap(int fd);
-  int checkChannelMap(int channelId);
-  int assignChannelMap(int channelId, int fd);
-
-  void cleanupChannelMap(int channelId);
-
-  virtual int checkLocalChannelMap(int channelId) = 0;
-
-  int addControlCodes(T_proxy_code code, int data);
-  int addTokenCodes(T_proxy_token &token);
-
-  int getFd(int channelId) const
-  {
-    if (channelId >= 0 && channelId < CONNECTIONS_LIMIT)
-    {
-      return fdMap_[channelId];
-    }
-
-    return -1;
-  }
-
-  int getChannel(int fd) const
-  {
-    if (fd >= 0 && fd < CONNECTIONS_LIMIT)
-    {
-      return channelMap_[fd];
-    }
-
-    return -1;
-  }
-
-  protected:
-
-  void setSplitTimeout(int channelId);
-  void setMotionTimeout(int channelId);
-
-  void increaseChannels(int channelId);
-  void decreaseChannels(int channelId);
-
-  int allocateTransport(int channelFd, int channelId);
-  int deallocateTransport(int channelId);
-
-  //
-  // The proxy has its own transport.
-  //
-
-  ProxyTransport *transport_;
-
-  //
-  // The static compressor is shared among
-  // channels and all the message stores.
-  //
-
-  StaticCompressor *compressor_;
-
-  //
-  // Map NX specific opcodes.
-  //
-
-  OpcodeStore *opcodeStore_;
-
-  //
-  // Stores are shared between channels.
-  //
-
-  ClientStore *clientStore_;
-  ServerStore *serverStore_;
-
-  //
-  // Client and server caches are shared
-  // between channels.
-  //
-
-  ClientCache *clientCache_;
-  ServerCache *serverCache_;
-
-  //
-  // The proxy's file descriptor.
-  //
-
-  int fd_;
-
-  //
-  // Channels currently selected for I/O
-  // operations.
-  //
-
-  int inputChannel_;
-  int outputChannel_;
-
-  //
-  // List of active channels.
-  //
-
-  List activeChannels_;
-
-  //
-  // Used to read data sent from peer proxy.
-  //
-
-  ProxyReadBuffer readBuffer_;
-
-  //
-  // Used to send data to peer proxy.
-  //
-
-  EncodeBuffer encodeBuffer_;
-
-  //
-  // Control messages' array.
-  //
-
-  int controlLength_;
-
-  unsigned char controlCodes_[CONTROL_CODES_LENGTH];
-
-  //
-  // Table of channel classes taking
-  // care of open X connections.
-  //
-
-  Channel *channels_[CONNECTIONS_LIMIT];
-
-  //
-  // Table of open sockets.
-  //
-
-  Transport *transports_[CONNECTIONS_LIMIT];
-
-  //
-  // Timeout related data.
-  //
-
-  T_proxy_timeouts timeouts_;
-
-  //
-  // Proxy can be decoding messages,
-  // handling a link reconfiguration,
-  // or decoding statistics.
-  //
-
-  int operation_;
-
-  //
-  // True if we are currently draining
-  // the proxy link.
-  //
-
-  int draining_;
-
-  //
-  // Force flush because of prioritized
-  // control messages to send.
-  //
-
-  int priority_;
-
-  //
-  // Set if we have initiated the close
-  // down procedure.
-  //
-
-  int finish_;
-
-  //
-  // Remote peer requested the shutdown.
-  //
-
-  int shutdown_;
-
-  //
-  // We are in the middle of a network
-  // congestion in the path to remote
-  // proxy.
-  //
-
-  int congestion_;
-
-  //
-  // Channels at the remote end that
-  // are not consuming their data.
-  //
-
-  int congestions_[CONNECTIONS_LIMIT];
-
-  //
-  // Is the timer expired?
-  //
-
-  int timer_;
-
-  //
-  // Did the proxy request an alert?
-  //
-
-  int alert_;
-
-  //
-  // The channel id of the agent.
-  //
-
-  int agent_;
-
-  //
-  // Token related data.
-  //
-
-  T_proxy_token tokens_[TOKEN_TYPES];
-
-  //
-  // Pointer to stream descriptor where
-  // proxy is producing statistics.
-  //
-
-  ostream *currentStatistics_;
-
-  private:
-
-  //
-  // Map channel ids to file descriptors.
-  //
-
-  int channelMap_[CONNECTIONS_LIMIT];
-  int fdMap_[CONNECTIONS_LIMIT];
-  int slavePidMap_[CONNECTIONS_LIMIT];
-};
-
-#endif /* Proxy_H */
diff --git a/nxcomp/ProxyReadBuffer.cpp b/nxcomp/ProxyReadBuffer.cpp
deleted file mode 100644
index 0427bb76c..000000000
--- a/nxcomp/ProxyReadBuffer.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "ProxyReadBuffer.h"
-
-#include "Transport.h"
-
-//
-// Set the verbosity level. You also
-// need to define DUMP in Misc.cpp
-// if DUMP is defined here.
-//
-
-#define WARNING
-#define PANIC
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-unsigned int ProxyReadBuffer::suggestedLength(unsigned int pendingLength)
-{
-  //
-  // Always read all the data that
-  // is available.
-  //
-
-  int readable = transport_ -> readable();
-
-  unsigned int readLength = (readable == -1 ? 0 : (unsigned int) readable);
-
-  if (readLength < pendingLength)
-  {
-    readLength = pendingLength;
-  }
-
-  //
-  // Even if the readable data is not
-  // enough to make a complete message,
-  // resize the buffer to accommodate
-  // it all.
-  //
-
-  if (pendingLength < remaining_)
-  {
-    readLength = remaining_;
-  }
-
-  return readLength;
-}  
-
-int ProxyReadBuffer::locateMessage(const unsigned char *start,
-                                       const unsigned char *end,
-                                           unsigned int &controlLength,
-                                               unsigned int &dataLength,
-                                                   unsigned int &trailerLength)
-{
-  unsigned int lengthLength = 0;
-  const unsigned char *nextSrc = start;
-  unsigned char next;
-
-  dataLength = 0;
-
-  #ifdef TEST
-  *logofs << "ProxyReadBuffer: Locating message for FD#"
-          << transport_ -> fd() << " with " << end - start
-          << " bytes.\n" << logofs_flush;
-  #endif
-
-  //
-  // Use something like the following if
-  // you are looking for errors.
-  //
-
-  #ifdef DUMP
-  if (control -> ProxyMode == proxy_server && start < end &&
-          transport_ -> fd() == 6 || transport_ -> fd() == 11)
-  {
-    *logofs << "ProxyReadBuffer: Partial checksums are:\n";
-
-    DumpBlockChecksums(start, end - start, 256);
-
-    *logofs << logofs_flush;
-  }
-  #endif
-
-  do
-  {
-    if (nextSrc >= end)
-    {
-      remaining_ = 1;
-
-      #ifdef TEST
-      *logofs << "ProxyReadBuffer: No message was located "
-              << "with remaining " << remaining_ << ".\n"
-              << logofs_flush;
-      #endif
-
-      return 0;
-    }
-
-    next = *nextSrc++;
-
-    dataLength <<= 7;
-    dataLength |= (unsigned int) (next & 0x7f);
-
-    lengthLength++;
-  }
-  while (next & 0x80);
-
-  unsigned int totalLength;
-
-  if (dataLength == 0)
-  {
-    trailerLength = 0;
-    controlLength = 3;
-    totalLength   = controlLength;
-  }
-  else
-  {
-    trailerLength = lengthLength;
-    controlLength = 0;
-    totalLength   = dataLength + trailerLength;
-  }
-
-  if (start + totalLength > end)
-  {
-    //
-    // When having to decompress a ZLIB stream,
-    // a single byte can be enough to complete
-    // the frame.
-    //
-
-    if (control -> RemoteStreamCompression == 0)
-    {
-      remaining_ = totalLength - (end - start);
-    }
-    else
-    {
-      remaining_ = 1;
-    }
-
-    #ifdef TEST
-    *logofs << "ProxyReadBuffer: No message was located "
-            << "with remaining " << remaining_ << ".\n"
-            << logofs_flush;
-    #endif
-
-    return 0;
-  }
-  else
-  {
-    #ifdef DUMP
-    *logofs << "ProxyReadBuffer: Received " << totalLength << " bytes of data "
-            << "with checksum ";
-
-    DumpChecksum(start, totalLength);
-
-    *logofs << " on proxy FD#" << transport_ -> fd() << ".\n" << logofs_flush;
-    #endif
-
-    #if defined(TEST) || defined(INFO)
-    *logofs << "ProxyReadBuffer: Produced plain input for " << dataLength 
-            << "+" << trailerLength << "+" << controlLength << " bytes out of " 
-            << totalLength << " bytes.\n" << logofs_flush;
-    #endif
-
-    #ifdef DUMP
-    *logofs << "ProxyReadBuffer: Partial checksums are:\n";
-
-    DumpBlockChecksums(start, totalLength, 256);
-
-    *logofs << logofs_flush;
-    #endif
-
-    remaining_ = 0;
-
-    #ifdef TEST
-    *logofs << "ProxyReadBuffer: Located message with "
-            << "remaining " << remaining_ << ".\n"
-            << logofs_flush;
-    #endif
-
-    return 1;
-  }
-}
diff --git a/nxcomp/ProxyReadBuffer.h b/nxcomp/ProxyReadBuffer.h
deleted file mode 100644
index 68e9e95fa..000000000
--- a/nxcomp/ProxyReadBuffer.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef ProxyReadBuffer_H
-#define ProxyReadBuffer_H
-
-#include "ReadBuffer.h"
-#include "Control.h"
-
-class ProxyReadBuffer : public ReadBuffer
-{
-  public:
-
-  ProxyReadBuffer(Transport *transport)
-
-    : ReadBuffer(transport)
-  {
-  }
-
-  virtual ~ProxyReadBuffer()
-  {
-  }
-
-  protected:
-
-  virtual unsigned int suggestedLength(unsigned int pendingLength);
-
-  virtual int locateMessage(const unsigned char *start,
-                                const unsigned char *end,
-                                    unsigned int &controlLength,
-                                        unsigned int &dataLength,
-                                            unsigned int &trailerLength);
-};
-
-#endif /* ProxyReadBuffer_H */
diff --git a/nxcomp/PutImage.cpp b/nxcomp/PutImage.cpp
deleted file mode 100644
index 7b9a3ae5d..000000000
--- a/nxcomp/PutImage.cpp
+++ /dev/null
@@ -1,407 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "PutImage.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-#include "WriteBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Constructors and destructors.
-//
-
-PutImageStore::PutImageStore(StaticCompressor *compressor)
-
-  : MessageStore(compressor)
-{
-  enableCache    = PUTIMAGE_ENABLE_CACHE;
-  enableData     = PUTIMAGE_ENABLE_DATA;
-
-  // Since ProtoStep7 (#issue 108)
-  enableCompress = PUTIMAGE_ENABLE_COMPRESS_IF_PROTO_STEP_7;
-
-  dataLimit  = PUTIMAGE_DATA_LIMIT;
-  dataOffset = PUTIMAGE_DATA_OFFSET;
-
-  cacheSlots          = PUTIMAGE_CACHE_SLOTS;
-  cacheThreshold      = PUTIMAGE_CACHE_THRESHOLD;
-  cacheLowerThreshold = PUTIMAGE_CACHE_LOWER_THRESHOLD;
-
-  // Since ProtoStep8 (#issue 108)
-  enableSplit = PUTIMAGE_ENABLE_SPLIT_IF_PROTO_STEP_8;
-
-  messages_ -> resize(cacheSlots);
-
-  for (T_messages::iterator i = messages_ -> begin();
-           i < messages_ -> end(); i++)
-  {
-    *i = NULL;
-  }
-
-  temporary_ = NULL;
-}
-
-PutImageStore::~PutImageStore()
-{
-  for (T_messages::iterator i = messages_ -> begin();
-           i < messages_ -> end(); i++)
-  {
-    destroy(*i);
-  }
-
-  destroy(temporary_);
-}
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int PutImageStore::encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                      const unsigned int size, int bigEndian,
-                                          ChannelCache *channelCache) const
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Encoding full message identity.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeValue(GetUINT(buffer + 2, bigEndian), 16, 8);
-
-  encodeBuffer.encodeValue((unsigned int) buffer[1], 2);
-
-  encodeBuffer.encodeXidValue(GetULONG(buffer + 4, bigEndian),
-                     clientCache -> drawableCache);
-  encodeBuffer.encodeXidValue(GetULONG(buffer + 8, bigEndian),
-                     clientCache -> gcCache);
-
-  unsigned int width = GetUINT(buffer + 12, bigEndian);
-  encodeBuffer.encodeCachedValue(width, 16,
-                     clientCache -> putImageWidthCache, 8);
-
-  unsigned int height = GetUINT(buffer + 14, bigEndian);
-  encodeBuffer.encodeCachedValue(height, 16,
-                     clientCache -> putImageHeightCache, 8);
-
-  unsigned int x = GetUINT(buffer + 16, bigEndian);
-  int xDiff = x - clientCache -> putImageLastX;
-  clientCache -> putImageLastX = x;
-  encodeBuffer.encodeCachedValue(xDiff, 16,
-                     clientCache -> putImageXCache, 8);
-
-  unsigned int y = GetUINT(buffer + 18, bigEndian);
-  int yDiff = y - clientCache -> putImageLastY;
-  clientCache -> putImageLastY = y;
-  encodeBuffer.encodeCachedValue(yDiff, 16,
-                     clientCache -> putImageYCache, 8);
-
-  encodeBuffer.encodeCachedValue(buffer[20], 8,
-                     clientCache -> putImageLeftPadCache);
-
-  encodeBuffer.encodeCachedValue(buffer[21], 8,
-                     clientCache -> depthCache);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Encoded full message identity.\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int PutImageStore::decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                                      unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
-                                          ChannelCache *channelCache) const
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoding full message identity.\n" << logofs_flush;
-  #endif
-
-  unsigned int  value;
-  unsigned char cValue;
-
-  decodeBuffer.decodeValue(value, 16, 8);
-
-  size = (value << 2);
-
-  buffer = writeBuffer -> addMessage(size);
-
-  decodeBuffer.decodeValue(value, 2);
-  buffer[1] = (unsigned char) value;
-
-  decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
-  PutULONG(value, buffer + 4, bigEndian);
-
-  decodeBuffer.decodeXidValue(value, clientCache -> gcCache);
-  PutULONG(value, buffer + 8, bigEndian);
-
-  unsigned int width;
-  decodeBuffer.decodeCachedValue(width, 16,
-                     clientCache -> putImageWidthCache, 8);
-  PutUINT(width, buffer + 12, bigEndian);
-
-  unsigned int height;
-  decodeBuffer.decodeCachedValue(height, 16,
-                     clientCache -> putImageHeightCache, 8);
-  PutUINT(height, buffer + 14, bigEndian);
-
-  decodeBuffer.decodeCachedValue(value, 16,
-                     clientCache -> putImageXCache, 8);
-  clientCache -> putImageLastX += value;
-  clientCache -> putImageLastX &= 0xffff;
-  PutUINT(clientCache -> putImageLastX, buffer + 16, bigEndian);
-
-  decodeBuffer.decodeCachedValue(value, 16,
-                     clientCache -> putImageYCache, 8);
-  clientCache -> putImageLastY += value;
-  clientCache -> putImageLastY &= 0xffff;
-  PutUINT(clientCache -> putImageLastY, buffer + 18, bigEndian);
-
-  decodeBuffer.decodeCachedValue(cValue, 8,
-                     clientCache -> putImageLeftPadCache);
-  buffer[20] = cValue;
-
-  decodeBuffer.decodeCachedValue(cValue, 8,
-                     clientCache -> depthCache);
-  buffer[21] = cValue;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded full message identity.\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int PutImageStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                     unsigned int size, int bigEndian) const
-{
-  PutImageMessage *putImage = (PutImageMessage *) message;
-
-  //
-  // Here is the fingerprint.
-  //
-
-  putImage -> format   = *(buffer + 1);
-  putImage -> depth    = *(buffer + 21);
-  putImage -> left_pad = *(buffer + 20);
-
-  putImage -> width  = GetUINT(buffer + 12, bigEndian);
-  putImage -> height = GetUINT(buffer + 14, bigEndian);
-  putImage -> pos_x  = GetUINT(buffer + 16, bigEndian);
-  putImage -> pos_y  = GetUINT(buffer + 18, bigEndian);
-
-  putImage -> drawable = GetULONG(buffer + 4, bigEndian); 
-  putImage -> gcontext = GetULONG(buffer + 8, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed identity for message at " << message << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int PutImageStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                       unsigned int size, int bigEndian) const
-{
-  PutImageMessage *putImage = (PutImageMessage *) message;
-
-  //
-  // Fill all the message's fields.
-  //
-
-  *(buffer + 1) = putImage -> format;
-
-  PutULONG(putImage -> drawable, buffer + 4, bigEndian);
-  PutULONG(putImage -> gcontext, buffer + 8, bigEndian);
-
-  PutUINT(putImage -> width, buffer + 12, bigEndian);
-  PutUINT(putImage -> height, buffer + 14, bigEndian);
-  PutUINT(putImage -> pos_x, buffer + 16, bigEndian);
-  PutUINT(putImage -> pos_y, buffer + 18, bigEndian);
-
-  *(buffer + 20) = (unsigned char) putImage -> left_pad;
-  *(buffer + 21) = (unsigned char) putImage -> depth;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at "
-          << message << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void PutImageStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  PutImageMessage *putImage = (PutImageMessage *) message;
-
-  *logofs << name() << ": Identity format " << (unsigned) putImage -> format 
-          << ", depth " << (unsigned) putImage -> depth << ", left_pad " 
-          << (unsigned) putImage -> left_pad << ", width " << putImage -> width  
-          << ", height " << putImage -> height << ", pos_x " << putImage -> pos_x 
-          << ", pos_y " << putImage -> pos_y << ", drawable " << putImage -> drawable 
-          << ", gcontext " << putImage -> gcontext  << ", size " << putImage -> size_
-          << ".\n" << logofs_flush;
-
-  #endif
-}
-
-void PutImageStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                         unsigned int size, int bigEndian) const
-{
-  //
-  // Fields format, width, height, left_pad, depth.
-  //
-
-  md5_append(md5_state_, buffer + 1,  1);
-  md5_append(md5_state_, buffer + 12, 4);
-  md5_append(md5_state_, buffer + 20, 2);
-}
-
-void PutImageStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                       const Message *cachedMessage,
-                                           ChannelCache *channelCache) const
-{
-  //
-  // Encode the variant part.
-  //
-
-  PutImageMessage *putImage       = (PutImageMessage *) message;
-  PutImageMessage *cachedPutImage = (PutImageMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << putImage -> drawable
-          << " as drawable field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeXidValue(putImage -> drawable, clientCache -> drawableCache);
-
-  cachedPutImage -> drawable = putImage -> drawable;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << putImage -> gcontext
-          << " as gcontext field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeXidValue(putImage -> gcontext, clientCache -> gcCache);
-
-  cachedPutImage -> gcontext = putImage -> gcontext;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << putImage -> pos_x
-          << " as " << "pos_x" << " field.\n" << logofs_flush;
-  #endif
-
-  unsigned short int diff_x = putImage -> pos_x - cachedPutImage -> pos_x;
-
-  encodeBuffer.encodeCachedValue(diff_x, 16,
-                     clientCache -> putImageXCache, 8);
-
-  cachedPutImage -> pos_x = putImage -> pos_x;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << putImage -> pos_y
-          << " as " << "pos_y" << " field.\n" << logofs_flush;
-  #endif
-
-  unsigned short int diff_y = putImage -> pos_y - cachedPutImage -> pos_y;
-
-  encodeBuffer.encodeCachedValue(diff_y, 16,
-                     clientCache -> putImageYCache, 8);
-
-  cachedPutImage -> pos_y = putImage -> pos_y;
-}
-
-void PutImageStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                       ChannelCache *channelCache) const
-{
-  //
-  // Decode the variant part.
-  //
-
-  PutImageMessage *putImage = (PutImageMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
-
-  putImage -> drawable = value;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << putImage -> drawable
-          << " as drawable field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeXidValue(value, clientCache -> gcCache);
-
-  putImage -> gcontext = value;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << putImage -> gcontext
-          << " as gcontext field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeCachedValue(value, 16,
-               clientCache -> putImageXCache, 8);
-
-  putImage -> pos_x += value;
-  putImage -> pos_x &= 0xffff;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << putImage -> pos_x
-          << " as pos_x field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeCachedValue(value, 16,
-               clientCache -> putImageYCache, 8);
-
-  putImage -> pos_y += value;
-  putImage -> pos_y &= 0xffff;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << putImage -> pos_y
-          << " as pos_y field.\n" << logofs_flush;
-  #endif
-}
diff --git a/nxcomp/PutImage.h b/nxcomp/PutImage.h
deleted file mode 100644
index 93dde9dfb..000000000
--- a/nxcomp/PutImage.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef PutImage_H
-#define PutImage_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define PUTIMAGE_ENABLE_CACHE                            1
-#define PUTIMAGE_ENABLE_DATA                             1
-
-#define PUTIMAGE_DATA_LIMIT                              262144 - 24
-#define PUTIMAGE_DATA_OFFSET                             24
-
-#define PUTIMAGE_CACHE_SLOTS                             6000
-#define PUTIMAGE_CACHE_THRESHOLD                         70
-#define PUTIMAGE_CACHE_LOWER_THRESHOLD                   50
-
-#define PUTIMAGE_ENABLE_COMPRESS_IF_PROTO_STEP_7         0
-
-#define PUTIMAGE_CACHE_THRESHOLD_IF_PACKED               10
-#define PUTIMAGE_CACHE_LOWER_THRESHOLD_IF_PACKED         5
-
-#define PUTIMAGE_CACHE_THRESHOLD_IF_SHADOW               97
-#define PUTIMAGE_CACHE_LOWER_THRESHOLD_IF_SHADOW         90
-
-#define PUTIMAGE_ENABLE_SPLIT_IF_PROTO_STEP_8            0
-
-//
-// The message class.
-//
-
-class PutImageMessage : public Message
-{
-  friend class PutImageStore;
-
-  public:
-
-  PutImageMessage()
-  {
-  }
-
-  ~PutImageMessage()
-  {
-  }
-
-  //
-  // Put here the fields which constitute 
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned char  format;
-  unsigned char  depth;
-  unsigned char  left_pad;
-  unsigned short width;
-  unsigned short height;
-  unsigned int   drawable;
-  unsigned int   gcontext;
-  unsigned short pos_x;
-  unsigned short pos_y;
-};
-
-class PutImageStore : public MessageStore
-{
-  public:
-
-  PutImageStore(StaticCompressor *compressor);
-
-  virtual ~PutImageStore();
-
-  virtual const char *name() const
-  {
-    return "PutImage";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_PutImage;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(PutImageMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  protected:
-
-  virtual Message *create() const
-  {
-    return new PutImageMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new PutImageMessage((const PutImageMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (PutImageMessage *) message;
-  }
-
-  virtual int encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                 const unsigned int size, int bigEndian,
-                                     ChannelCache *channelCache) const;
-
-  virtual int decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                                 unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
-                                     ChannelCache *channelCache) const;
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer, 
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer, 
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer, 
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* PutImage_H */
diff --git a/nxcomp/PutPackedImage.cpp b/nxcomp/PutPackedImage.cpp
deleted file mode 100644
index 66506ebbe..000000000
--- a/nxcomp/PutPackedImage.cpp
+++ /dev/null
@@ -1,600 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "PutPackedImage.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-#include "WriteBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Constructors and destructors.
-//
-
-PutPackedImageStore::PutPackedImageStore(StaticCompressor *compressor)
-
-  : MessageStore(compressor)
-{
-  enableCache    = PUTPACKEDIMAGE_ENABLE_CACHE;
-  enableData     = PUTPACKEDIMAGE_ENABLE_DATA;
-  enableCompress = PUTPACKEDIMAGE_ENABLE_COMPRESS;
-
-  dataLimit  = PUTPACKEDIMAGE_DATA_LIMIT;
-  dataOffset = PUTPACKEDIMAGE_DATA_OFFSET;
-
-  cacheSlots          = PUTPACKEDIMAGE_CACHE_SLOTS;
-  cacheThreshold      = PUTPACKEDIMAGE_CACHE_THRESHOLD;
-  cacheLowerThreshold = PUTPACKEDIMAGE_CACHE_LOWER_THRESHOLD;
-
-  // Since ProtoStep8 (#issue 108)
-  enableSplit = PUTPACKEDIMAGE_ENABLE_SPLIT_IF_PROTO_STEP_8;
-
-  messages_ -> resize(cacheSlots);
-
-  for (T_messages::iterator i = messages_ -> begin();
-           i < messages_ -> end(); i++)
-  {
-    *i = NULL;
-  }
-
-  temporary_ = NULL;
-}
-
-PutPackedImageStore::~PutPackedImageStore()
-{
-  for (T_messages::iterator i = messages_ -> begin();
-           i < messages_ -> end(); i++)
-  {
-    destroy(*i);
-  }
-
-  destroy(temporary_);
-}
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int PutPackedImageStore::encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                            const unsigned int size, int bigEndian,
-                                                ChannelCache *channelCache) const
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Encoding full message identity.\n" << logofs_flush;
-  #endif
-
-  // Client.
-  encodeBuffer.encodeCachedValue(*(buffer + 1), 8,
-                     clientCache -> resourceCache);
-
-  // Size.
-  encodeBuffer.encodeValue(GetUINT(buffer + 2, bigEndian), 16, 10);
-
-  // Drawable.
-  encodeBuffer.encodeXidValue(GetULONG(buffer + 4, bigEndian),
-                     clientCache -> drawableCache);
-  // GC.
-  encodeBuffer.encodeXidValue(GetULONG(buffer + 8, bigEndian),
-                     clientCache -> gcCache);
-  // Method.
-  encodeBuffer.encodeCachedValue(*(buffer + 12), 8,
-                     clientCache -> methodCache);
-  // Format.
-  encodeBuffer.encodeValue(*(buffer + 13), 2);
-
-  // SrcDepth.
-  encodeBuffer.encodeCachedValue(*(buffer + 14), 8,
-                     clientCache -> depthCache);
-  // DstDepth.
-  encodeBuffer.encodeCachedValue(*(buffer + 15), 8,
-                     clientCache -> depthCache);
-  // SrcLength.
-  encodeBuffer.encodeCachedValue(GetULONG(buffer + 16, bigEndian), 24,
-                     clientCache -> putPackedImageSrcLengthCache);
-  // DstLength.
-  encodeBuffer.encodeCachedValue(GetULONG(buffer + 20, bigEndian), 24,
-                     clientCache -> putPackedImageDstLengthCache);
-  // SrcX.
-  unsigned int x = GetUINT(buffer + 24, bigEndian);
-  int xDiff = x - clientCache -> putImageLastX;
-  clientCache -> putImageLastX = x;
-  encodeBuffer.encodeCachedValue(xDiff, 16,
-                     clientCache -> putImageXCache, 8);
-  // SrcY.
-  unsigned int y = GetUINT(buffer + 26, bigEndian);
-  int yDiff = y - clientCache -> putImageLastY;
-  clientCache -> putImageLastY = y;
-  encodeBuffer.encodeCachedValue(yDiff, 16,
-                     clientCache -> putImageYCache, 8);
-  // SrcWidth.
-  encodeBuffer.encodeCachedValue(GetUINT(buffer + 28, bigEndian), 16,
-                     clientCache -> putImageWidthCache, 8);
-  // SrcHeight.
-  encodeBuffer.encodeCachedValue(GetUINT(buffer + 30, bigEndian), 16,
-                     clientCache -> putImageHeightCache, 8);
-  // DstX.
-  x = GetUINT(buffer + 32, bigEndian);
-  xDiff = x - clientCache -> putImageLastX;
-  clientCache -> putImageLastX = x;
-  encodeBuffer.encodeCachedValue(xDiff, 16,
-                     clientCache -> putImageXCache, 8);
-  // DstY.
-  y = GetUINT(buffer + 34, bigEndian);
-  yDiff = y - clientCache -> putImageLastY;
-  clientCache -> putImageLastY = y;
-  encodeBuffer.encodeCachedValue(yDiff, 16,
-                     clientCache -> putImageYCache, 8);
-  // DstWidth.
-  encodeBuffer.encodeCachedValue(GetUINT(buffer + 36, bigEndian), 16,
-                     clientCache -> putImageWidthCache, 8);
-  // DstHeight.
-  encodeBuffer.encodeCachedValue(GetUINT(buffer + 38, bigEndian), 16,
-                     clientCache -> putImageHeightCache, 8);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Encoded full message identity.\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int PutPackedImageStore::decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                                            unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
-                                                ChannelCache *channelCache) const
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoding full message identity.\n" << logofs_flush;
-  #endif
-
-  unsigned int value;
-  unsigned char cValue;
-
-  // Client.
-  decodeBuffer.decodeCachedValue(cValue, 8,
-                     clientCache -> resourceCache);
-
-  // Size.
-  decodeBuffer.decodeValue(size, 16, 10);
-
-  size <<= 2;
-
-  buffer = writeBuffer -> addMessage(size);
-
-  *(buffer + 1) = cValue;
-
-  // Drawable.
-  decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
-  PutULONG(value, buffer + 4, bigEndian);
-
-  // GC.
-  decodeBuffer.decodeXidValue(value, clientCache -> gcCache);
-  PutULONG(value, buffer + 8, bigEndian);
-
-  // Method.
-  decodeBuffer.decodeCachedValue(cValue, 8,
-                     clientCache -> methodCache);
-  *(buffer + 12) = cValue;
-
-  // Format.
-  decodeBuffer.decodeValue(value, 2);
-  *(buffer + 13) = value;
-
-  // SrcDepth.
-  decodeBuffer.decodeCachedValue(cValue, 8,
-                     clientCache -> depthCache);
-  *(buffer + 14) = cValue;
-
-  // DstDepth.
-  decodeBuffer.decodeCachedValue(cValue, 8,
-                     clientCache -> depthCache);
-  *(buffer + 15) = cValue;
-
-  // SrcLength.
-  decodeBuffer.decodeCachedValue(value, 24,
-                     clientCache -> putPackedImageSrcLengthCache);
-  PutULONG(value, buffer + 16, bigEndian);
-
-  // DstLength.
-  decodeBuffer.decodeCachedValue(value, 24,
-                     clientCache -> putPackedImageDstLengthCache);
-  PutULONG(value, buffer + 20, bigEndian);
-
-  // SrcX.
-  decodeBuffer.decodeCachedValue(value, 16,
-                     clientCache -> putImageXCache, 8);
-  clientCache -> putImageLastX += value;
-  clientCache -> putImageLastX &= 0xffff;
-  PutUINT(clientCache -> putImageLastX, buffer + 24, bigEndian);
-
-  // SrcY.
-  decodeBuffer.decodeCachedValue(value, 16,
-                     clientCache -> putImageYCache, 8);
-  clientCache -> putImageLastY += value;
-  clientCache -> putImageLastY &= 0xffff;
-  PutUINT(clientCache -> putImageLastY, buffer + 26, bigEndian);
-
-  // SrcWidth.
-  decodeBuffer.decodeCachedValue(value, 16,
-                     clientCache -> putImageWidthCache, 8);
-  PutUINT(value, buffer + 28, bigEndian);
-
-  // SrcHeight.
-  decodeBuffer.decodeCachedValue(value, 16,
-                     clientCache -> putImageHeightCache, 8);
-  PutUINT(value, buffer + 30, bigEndian);
-
-  // DstX.
-  decodeBuffer.decodeCachedValue(value, 16,
-                     clientCache -> putImageXCache, 8);
-  clientCache -> putImageLastX += value;
-  clientCache -> putImageLastX &= 0xffff;
-  PutUINT(clientCache -> putImageLastX, buffer + 32, bigEndian);
-
-  // DstY.
-  decodeBuffer.decodeCachedValue(value, 16,
-                     clientCache -> putImageYCache, 8);
-  clientCache -> putImageLastY += value;
-  clientCache -> putImageLastY &= 0xffff;
-  PutUINT(clientCache -> putImageLastY, buffer + 34, bigEndian);
-
-  // DstWidth.
-  decodeBuffer.decodeCachedValue(value, 16,
-                     clientCache -> putImageWidthCache, 8);
-  PutUINT(value, buffer + 36, bigEndian);
-
-  // DstHeight.
-  decodeBuffer.decodeCachedValue(value, 16,
-                     clientCache -> putImageHeightCache, 8);
-  PutUINT(value, buffer + 38, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded full message identity.\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int PutPackedImageStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                           unsigned int size, int bigEndian) const
-{
-  PutPackedImageMessage *putPackedImage = (PutPackedImageMessage *) message;
-
-  //
-  // Here is the fingerprint.
-  //
-
-  putPackedImage -> client = *(buffer + 1);
-
-  putPackedImage -> drawable = GetULONG(buffer + 4,  bigEndian); 
-  putPackedImage -> gcontext = GetULONG(buffer + 8,  bigEndian);
-
-  putPackedImage -> method = *(buffer + 12);
-
-  putPackedImage -> format    = *(buffer + 13);
-  putPackedImage -> src_depth = *(buffer + 14);
-  putPackedImage -> dst_depth = *(buffer + 15);
-
-  putPackedImage -> src_length = GetULONG(buffer + 16,  bigEndian);
-  putPackedImage -> dst_length = GetULONG(buffer + 20,  bigEndian);
-
-  putPackedImage -> src_x      = GetUINT(buffer + 24, bigEndian);
-  putPackedImage -> src_y      = GetUINT(buffer + 26, bigEndian);
-  putPackedImage -> src_width  = GetUINT(buffer + 28, bigEndian);
-  putPackedImage -> src_height = GetUINT(buffer + 30, bigEndian);
-
-  putPackedImage -> dst_x      = GetUINT(buffer + 32, bigEndian);
-  putPackedImage -> dst_y      = GetUINT(buffer + 34, bigEndian);
-  putPackedImage -> dst_width  = GetUINT(buffer + 36, bigEndian);
-  putPackedImage -> dst_height = GetUINT(buffer + 38, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed identity for message at "
-          << message << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int PutPackedImageStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                             unsigned int size, int bigEndian) const
-{
-  PutPackedImageMessage *putPackedImage = (PutPackedImageMessage *) message;
-
-  //
-  // Fill all the message's fields.
-  //
-
-  *(buffer + 1) = putPackedImage -> client;
-
-  PutULONG(putPackedImage -> drawable, buffer + 4, bigEndian);
-  PutULONG(putPackedImage -> gcontext, buffer + 8, bigEndian);
-
-  *(buffer + 12) = putPackedImage -> method;
-
-  *(buffer + 13) = putPackedImage -> format;
-  *(buffer + 14) = putPackedImage -> src_depth;
-  *(buffer + 15) = putPackedImage -> dst_depth;
-
-  PutULONG(putPackedImage -> src_length, buffer + 16, bigEndian);
-  PutULONG(putPackedImage -> dst_length, buffer + 20, bigEndian);
-
-  PutUINT(putPackedImage -> src_x,      buffer + 24, bigEndian);
-  PutUINT(putPackedImage -> src_y,      buffer + 26, bigEndian);
-  PutUINT(putPackedImage -> src_width,  buffer + 28, bigEndian);
-  PutUINT(putPackedImage -> src_height, buffer + 30, bigEndian);
-
-  PutUINT(putPackedImage -> dst_x,      buffer + 32, bigEndian);
-  PutUINT(putPackedImage -> dst_y,      buffer + 34, bigEndian);
-  PutUINT(putPackedImage -> dst_width,  buffer + 36, bigEndian);
-  PutUINT(putPackedImage -> dst_height, buffer + 38, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at "
-          << message << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void PutPackedImageStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  PutPackedImageMessage *putPackedImage = (PutPackedImageMessage *) message;
-
-  *logofs << name() << ": Identity format "
-
-          << "drawable " << putPackedImage -> drawable << ", "
-          << "gcontext " << putPackedImage -> gcontext << ", "
-
-          << "format "     << (unsigned int) putPackedImage -> format     << ", "
-          << "method "     << (unsigned int) putPackedImage -> method     << ", "
-
-          << "src_depth "  << (unsigned int) putPackedImage -> src_depth  << ", "
-          << "dst_depth "  << (unsigned int) putPackedImage -> dst_depth  << ", "
-
-          << "src_length " << putPackedImage -> src_length << ", "
-          << "dst_length " << putPackedImage -> dst_length << ", "
-
-          << "src_x "      << putPackedImage -> src_x      << ", "
-          << "src_y "      << putPackedImage -> src_y      << ", "
-          << "src_width "  << putPackedImage -> src_width  << ", "
-          << "src_height " << putPackedImage -> src_height << ", "
-
-          << "dst_x "      << putPackedImage -> dst_x      << ", "
-          << "dst_y "      << putPackedImage -> dst_y      << ", "
-          << "dst_width "  << putPackedImage -> dst_width  << ", "
-          << "dst_height " << putPackedImage -> dst_height << ", "
-
-          << "size "   << putPackedImage -> size_   << ".\n"
-          << logofs_flush;
-
-  #endif
-}
-
-void PutPackedImageStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                               unsigned int size, int bigEndian) const
-{
-  //
-  // Fields method, format, src_depth, dst_depth,
-  // src_length, dst_length, src_x, src_y, src_width,
-  // src_height.
-  //
-  //
-  // TODO: We should better investigate the effect of
-  // having fields src_x and src_y in identity instead
-  // of keeping them in differences.
-  //
-
-  md5_append(md5_state_, buffer + 12, 20);
-}
-
-void PutPackedImageStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                             const Message *cachedMessage,
-                                                 ChannelCache *channelCache) const
-{
-  //
-  // Encode the variant part.
-  //
-
-  PutPackedImageMessage *putPackedImage       = (PutPackedImageMessage *) message;
-  PutPackedImageMessage *cachedPutPackedImage = (PutPackedImageMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value "
-          << (unsigned int) putPackedImage -> client
-          << " as client field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeCachedValue(putPackedImage -> client, 8,
-                     clientCache -> resourceCache);
-
-  cachedPutPackedImage -> client = putPackedImage -> client;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << putPackedImage -> drawable
-          << " as drawable field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeXidValue(putPackedImage -> drawable, clientCache -> drawableCache);
-
-  cachedPutPackedImage -> drawable = putPackedImage -> drawable;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << putPackedImage -> gcontext
-          << " as gcontext field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeXidValue(putPackedImage -> gcontext, clientCache -> gcCache);
-
-  cachedPutPackedImage -> gcontext = putPackedImage -> gcontext;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << putPackedImage -> dst_x
-          << " as " << "dst_x" << " field.\n" << logofs_flush;
-  #endif
-
-  unsigned short int diff_x = putPackedImage -> dst_x - cachedPutPackedImage -> dst_x;
-
-  encodeBuffer.encodeCachedValue(diff_x, 16,
-                     clientCache -> putImageXCache, 8);
-
-  cachedPutPackedImage -> dst_x = putPackedImage -> dst_x;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << putPackedImage -> dst_y
-          << " as " << "dst_y" << " field.\n" << logofs_flush;
-  #endif
-
-  unsigned short int diff_y = putPackedImage -> dst_y - cachedPutPackedImage -> dst_y;
-
-  encodeBuffer.encodeCachedValue(diff_y, 16,
-                     clientCache -> putImageYCache, 8);
-
-  cachedPutPackedImage -> dst_y = putPackedImage -> dst_y;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << putPackedImage -> dst_width
-          << " as " << "dst_width" << " field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeCachedValue(putPackedImage -> dst_width, 16,
-                     clientCache -> putImageWidthCache, 8);
-
-  cachedPutPackedImage -> dst_width = putPackedImage -> dst_width;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << putPackedImage -> dst_height
-          << " as " << "dst_height" << " field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeCachedValue(putPackedImage -> dst_height, 16,
-                     clientCache -> putImageHeightCache, 8);
-
-  cachedPutPackedImage -> dst_height = putPackedImage -> dst_height;
-}
-
-void PutPackedImageStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                             ChannelCache *channelCache) const
-{
-  //
-  // Decode the variant part.
-  //
-
-  PutPackedImageMessage *putPackedImage = (PutPackedImageMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int  value;
-
-  decodeBuffer.decodeCachedValue(putPackedImage -> client, 8,
-                     clientCache -> resourceCache);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value "
-          << (unsigned int) putPackedImage -> client
-          << " as client field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
-
-  putPackedImage -> drawable = value;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << putPackedImage -> drawable
-          << " as drawable field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeXidValue(value, clientCache -> gcCache);
-
-  putPackedImage -> gcontext = value;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << putPackedImage -> gcontext
-          << " as gcontext field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeCachedValue(value, 16,
-               clientCache -> putImageXCache, 8);
-
-  putPackedImage -> dst_x += value;
-  putPackedImage -> dst_x &= 0xffff;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << putPackedImage -> dst_x
-          << " as dst_x field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeCachedValue(value, 16,
-               clientCache -> putImageYCache, 8);
-
-  putPackedImage -> dst_y += value;
-  putPackedImage -> dst_y &= 0xffff;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << putPackedImage -> dst_y
-          << " as dst_y field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeCachedValue(value, 16,
-               clientCache -> putImageWidthCache, 8);
-
-  putPackedImage -> dst_width = value;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << putPackedImage -> dst_width
-          << " as dst_width field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeCachedValue(value, 16,
-               clientCache -> putImageHeightCache, 8);
-
-  putPackedImage -> dst_height = value;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << putPackedImage -> dst_height
-          << " as dst_height field.\n" << logofs_flush;
-  #endif
-}
-
diff --git a/nxcomp/PutPackedImage.h b/nxcomp/PutPackedImage.h
deleted file mode 100644
index d28ad39eb..000000000
--- a/nxcomp/PutPackedImage.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef PutPackedImage_H
-#define PutPackedImage_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define PUTPACKEDIMAGE_ENABLE_CACHE                            1
-#define PUTPACKEDIMAGE_ENABLE_DATA                             1
-#define PUTPACKEDIMAGE_ENABLE_COMPRESS                         0
-
-//
-// We can't exceed lenght of 262144 bytes.
-//
-
-#define PUTPACKEDIMAGE_DATA_LIMIT                              262144 - 40
-#define PUTPACKEDIMAGE_DATA_OFFSET                             40
-
-#define PUTPACKEDIMAGE_CACHE_SLOTS                             6000
-#define PUTPACKEDIMAGE_CACHE_THRESHOLD                         70
-#define PUTPACKEDIMAGE_CACHE_LOWER_THRESHOLD                   50
-
-#define PUTPACKEDIMAGE_CACHE_THRESHOLD_IF_PACKED_SHADOW        97
-#define PUTPACKEDIMAGE_CACHE_LOWER_THRESHOLD_IF_PACKED_SHADOW  90
-
-#define PUTPACKEDIMAGE_ENABLE_SPLIT_IF_PROTO_STEP_8            0
-
-//
-// The message class.
-//
-
-class PutPackedImageMessage : public Message
-{
-  friend class PutPackedImageStore;
-
-  public:
-
-  PutPackedImageMessage()
-  {
-  }
-
-  ~PutPackedImageMessage()
-  {
-  }
-
-  //
-  // Here are the fields which constitute
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned char  client;
-
-  unsigned int   drawable;
-  unsigned int   gcontext;
-
-  unsigned char  format;
-  unsigned char  method;
-
-  unsigned char  src_depth;
-  unsigned char  dst_depth;
-
-  unsigned int   src_length;
-  unsigned int   dst_length;
-
-  short int      src_x;
-  short int      src_y;
-  unsigned short src_width;
-  unsigned short src_height;
-
-  short int      dst_x;
-  short int      dst_y;
-  unsigned short dst_width;
-  unsigned short dst_height;
-};
-
-class PutPackedImageStore : public MessageStore
-{
-  //
-  // Constructors and destructors.
-  //
-
-  public:
-
-  PutPackedImageStore(StaticCompressor *compressor);
-
-  virtual ~PutPackedImageStore();
-
-  virtual const char *name() const
-  {
-    return "PutPackedImage";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_NXPutPackedImage;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(PutPackedImageMessage);
-  }
-
-  //
-  // Very special of this class.
-  //
-
-  int getPackedSize(const int position) const
-  {
-    PutPackedImageMessage *message = (PutPackedImageMessage *) (*messages_)[position];
-
-    if (message == NULL)
-    {
-      return 0;
-    }
-
-    return dataOffset + message -> src_length;
-  }
-
-  int getUnpackedSize(const int position) const
-  {
-    PutPackedImageMessage *message = (PutPackedImageMessage *) (*messages_)[position];
-
-    if (message == NULL)
-    {
-      return 0;
-    }
-
-    return dataOffset + message -> dst_length;
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  protected:
-
-  virtual Message *create() const
-  {
-    return new PutPackedImageMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new PutPackedImageMessage((const PutPackedImageMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (PutPackedImageMessage *) message;
-  }
-
-  virtual int encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                 const unsigned int size, int bigEndian,
-                                     ChannelCache *channelCache) const;
-
-  virtual int decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                                 unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
-                                     ChannelCache *channelCache) const;
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer, 
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer, 
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer, 
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* PutPackedImage_H */
diff --git a/nxcomp/QueryFontReply.cpp b/nxcomp/QueryFontReply.cpp
deleted file mode 100644
index ffd5eaee9..000000000
--- a/nxcomp/QueryFontReply.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "QueryFontReply.h"
-
-#include "ServerCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-QueryFontReplyStore::QueryFontReplyStore(StaticCompressor *compressor)
-
-  : MessageStore(compressor)
-{
-  enableCache    = QUERYFONTREPLY_ENABLE_CACHE;
-  enableData     = QUERYFONTREPLY_ENABLE_DATA;
-  enableSplit    = QUERYFONTREPLY_ENABLE_SPLIT;
-
-  // Since ProtoStep7 (#issue 108)
-  enableCompress = QUERYFONTREPLY_ENABLE_COMPRESS_IF_PROTO_STEP_7;
-
-  dataLimit  = QUERYFONTREPLY_DATA_LIMIT;
-  dataOffset = QUERYFONTREPLY_DATA_OFFSET;
-
-  cacheSlots          = QUERYFONTREPLY_CACHE_SLOTS;
-  cacheThreshold      = QUERYFONTREPLY_CACHE_THRESHOLD;
-  cacheLowerThreshold = QUERYFONTREPLY_CACHE_LOWER_THRESHOLD;
-
-  messages_ -> resize(cacheSlots);
-
-  for (T_messages::iterator i = messages_ -> begin();
-           i < messages_ -> end(); i++)
-  {
-    *i = NULL;
-  }
-
-  temporary_ = NULL;
-}
-
-QueryFontReplyStore::~QueryFontReplyStore()
-{
-  for (T_messages::iterator i = messages_ -> begin();
-           i < messages_ -> end(); i++)
-  {
-    destroy(*i);
-  }
-
-  destroy(temporary_);
-}
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int QueryFontReplyStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                          unsigned int size, int bigEndian) const
-{
-  //
-  // Clear the padding bytes.
-  //
-
-  unsigned char *pad = (unsigned char *) buffer;
-
-  if (size >= 24)
-  {
-    PutULONG(0, pad + 20, bigEndian);
-  }
-
-  if (size >= 40)
-  {
-    PutULONG(0, pad + 36, bigEndian);
-  }
-
-  //
-  // TODO: This doesn't work. Probably these
-  // padding bytes are not padding anymore.
-  // This is to be investigated.
-  //
-  // pad += 60;
-  //
-  // while (pad + 16 <= (buffer + size))
-  // {
-  //   PutULONG(0, pad + 12, bigEndian);
-  //
-  //   pad += 16;
-  // }
-  //
-
-  #ifdef DEBUG
-  *logofs << name() << ": Cleaned padding bytes of "
-          << "message at " << message << ".\n"
-          << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int QueryFontReplyStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                            unsigned int size, int bigEndian) const
-{
-  return 1;
-}
-
-void QueryFontReplyStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  QueryFontReplyMessage *queryFontReply = (QueryFontReplyMessage *) message;
-
-  *logofs << name() << ": Identity size " << queryFontReply -> size_ << ".\n";
-
-  #endif
-}
-
-void QueryFontReplyStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                               unsigned int size, int bigEndian) const
-{
-}
diff --git a/nxcomp/QueryFontReply.h b/nxcomp/QueryFontReply.h
deleted file mode 100644
index e12fe4e4b..000000000
--- a/nxcomp/QueryFontReply.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef QueryFontReply_H
-#define QueryFontReply_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-#define QUERYFONTREPLY_ENABLE_CACHE                       1
-#define QUERYFONTREPLY_ENABLE_DATA                        1
-#define QUERYFONTREPLY_ENABLE_SPLIT                       0
-
-#define QUERYFONTREPLY_DATA_LIMIT                         1048576 - 32
-#define QUERYFONTREPLY_DATA_OFFSET                        8
-
-#define QUERYFONTREPLY_CACHE_SLOTS                        200
-#define QUERYFONTREPLY_CACHE_THRESHOLD                    20
-#define QUERYFONTREPLY_CACHE_LOWER_THRESHOLD              5
-
-#define QUERYFONTREPLY_ENABLE_COMPRESS_IF_PROTO_STEP_7    0
-
-//
-// The message class.
-//
-
-class QueryFontReplyMessage : public Message
-{
-  friend class QueryFontReplyStore;
-
-  public:
-
-  QueryFontReplyMessage()
-  {
-  }
-
-  ~QueryFontReplyMessage()
-  {
-  }
-};
-
-class QueryFontReplyStore : public MessageStore
-{
-  //
-  // Constructors and destructors.
-  //
-
-  public:
-
-  QueryFontReplyStore(StaticCompressor *compressor);
-
-  virtual ~QueryFontReplyStore();
-
-  virtual const char *name() const
-  {
-    return "QueryFontReply";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_QueryFont;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(QueryFontReplyMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  protected:
-
-  virtual Message *create() const
-  {
-    return new QueryFontReplyMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new QueryFontReplyMessage((const QueryFontReplyMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (QueryFontReplyMessage *) message;
-  }
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer, 
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer, 
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer, 
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* QueryFontReply_H */
diff --git a/nxcomp/ReadBuffer.cpp b/nxcomp/ReadBuffer.cpp
deleted file mode 100644
index 1e2326cee..000000000
--- a/nxcomp/ReadBuffer.cpp
+++ /dev/null
@@ -1,635 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "ReadBuffer.h"
-
-#include "Transport.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-ReadBuffer::ReadBuffer(Transport *transport)
-
-  : transport_(transport)
-{
-  //
-  // The read buffer will grow until
-  // reaching the maximum buffer size
-  // and then will remain stable at
-  // that size.
-  //
-
-  initialReadSize_   = READ_BUFFER_DEFAULT_SIZE;
-  maximumBufferSize_ = READ_BUFFER_DEFAULT_SIZE;
-
-  size_   = 0;
-  buffer_ = NULL;
-
-  owner_  = 1;
-  length_ = 0;
-  start_  = 0;
-
-  remaining_ = 0;
-}
-
-ReadBuffer::~ReadBuffer()
-{
-  if (owner_ == 1)
-  {
-    delete [] buffer_;
-  }
-}
-
-void ReadBuffer::readMessage(const unsigned char *message, unsigned int length)
-{
-  //
-  // To be here we must be the real owner
-  // of the buffer and there must not be
-  // pending bytes in the transport.
-  //
-
-  #ifdef TEST
-
-  if (owner_ == 0)
-  {
-    *logofs << "ReadBuffer: PANIC! Class for FD#"
-            << transport_ -> fd() << " doesn't "
-            << "appear to be the owner of the buffer "
-            << "while borrowing from the caller.\n"
-            << logofs_flush;
-
-    HandleCleanup();
-  }
-
-  #endif
-
-  //
-  // Be sure that any outstanding data from
-  // the transport is appended to our own
-  // byffer.
-  //
-
-  if (transport_ -> pending() != 0)
-  {
-    #ifdef WARNING
-    *logofs << "ReadBuffer: WARNING! Class for FD#"
-            << transport_ -> fd() << " has pending "
-            << "data in the transport while "
-            << "borrowing from the caller.\n"
-            << logofs_flush;
-    #endif
-
-    readMessage();
-
-    if (owner_ == 0)
-    {
-      convertBuffer();
-    }
-  }
-
-  //
-  // Can't borrow the buffer if there is data
-  // from a partial message. In this case add
-  // the new data to the end of our buffer.
-  //
-
-  if (length_ == 0)
-  {
-    #ifdef TEST
-    *logofs << "ReadBuffer: Borrowing " << length
-            << " bytes from the caller for FD#"
-            << transport_ -> fd() << " with "
-            << length_ << " bytes in the buffer.\n"
-            << logofs_flush;
-    #endif
-
-    delete [] buffer_;
-
-    buffer_ = (unsigned char *) message;
-    size_   = length;
-
-    length_ = length;
-
-    owner_ = 0;
-    start_ = 0;
-  }
-  else
-  {
-    #ifdef TEST
-    *logofs << "ReadBuffer: Appending " << length
-            << " bytes from the caller for FD#"
-            << transport_ -> fd() << " with "
-            << length_ << " bytes in the buffer.\n"
-            << logofs_flush;
-    #endif
-
-    appendBuffer(message, length);
-  }
-}
-
-int ReadBuffer::readMessage()
-{
-  int pendingLength = transport_ -> pending();
-
-  if (pendingLength > 0)
-  {
-    //
-    // Can't move the data in the borrowed buffer,
-    // so use the tansport buffer only if we don't
-    // have any partial message. This can happen
-    // with the proxy where we need to deflate the
-    // stream.
-    //
-
-    if (length_ == 0)
-    {
-      unsigned char *newBuffer;
-
-      length_ = transport_ -> getPending(newBuffer);
-
-      if (newBuffer == NULL)
-      {
-        #ifdef PANIC
-        *logofs << "ReadBuffer: PANIC! Failed to borrow "
-                << length_ << " bytes of memory for buffer "
-                << "in context [A].\n" << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Failed to borrow memory for "
-             << "read buffer in context [A].\n";
-
-        HandleCleanup();
-      }
-
-      delete [] buffer_;
-
-      buffer_ = newBuffer;
-      size_   = length_;
-
-      owner_ = 0;
-      start_ = 0;
-
-      #ifdef TEST
-      *logofs << "ReadBuffer: Borrowed " << length_
-              << " pending bytes for FD#" << transport_ ->
-                 fd() << ".\n" << logofs_flush;
-      #endif
-
-      return length_;
-    }
-    #ifdef TEST
-    else
-    {
-      *logofs << "ReadBuffer: WARNING! Cannot borrow "
-              << pendingLength << " bytes for FD#"
-              << transport_ -> fd() << " with "
-              << length_ << " bytes in the buffer.\n"
-              << logofs_flush;
-    }
-    #endif
-  }
-
-  unsigned int readLength = suggestedLength(pendingLength);
-
-  #ifdef DEBUG
-  *logofs << "ReadBuffer: Requested " << readLength
-          << " bytes for FD#" << transport_ -> fd()
-          << " with readable " << transport_ -> readable()
-          << " remaining " << remaining_ << " pending "
-          << transport_ -> pending() << ".\n"
-          << logofs_flush;
-  #endif
-
-  if (readLength < initialReadSize_)
-  {
-    readLength = initialReadSize_;
-  }
-
-  #ifdef DEBUG
-  *logofs << "ReadBuffer: Buffer size is " << size_
-          << " length " << length_ << " and start "
-          << start_  << ".\n" << logofs_flush;
-  #endif
-
-  //
-  // We can't use the transport buffer
-  // to read our own data in it.
-  //
-
-  #ifdef TEST
-
-  if (owner_ == 0)
-  {
-    *logofs << "ReadBuffer: PANIC! Class for FD#"
-            << transport_ -> fd() << " doesn't "
-            << "appear to be the owner of the buffer "
-            << "while reading.\n" << logofs_flush;
-
-    HandleCleanup();
-  }
-
-  #endif
-
-  //
-  // Be sure that we have enough space
-  // to store all the requested data.
-  //
-
-  if (buffer_ == NULL || length_ + readLength > size_)
-  {
-    unsigned int newSize = length_ + readLength;
-
-    #ifdef TEST
-    *logofs << "ReadBuffer: Resizing buffer for FD#"
-            << transport_ -> fd() << " in read from "
-            << size_ << " to " << newSize << " bytes.\n"
-            << logofs_flush;
-    #endif
-
-    unsigned char *newBuffer = allocateBuffer(newSize);
-
-    memcpy(newBuffer, buffer_ + start_, length_);
-
-    delete [] buffer_;
-
-    buffer_ = newBuffer;
-    size_   = newSize;
-
-    transport_ -> pendingReset();
-
-    owner_ = 1;
-  }
-  else if (start_ != 0 && length_ != 0)
-  {
-    //
-    // If any bytes are left due to a partial
-    // message, shift them to the beginning
-    // of the buffer.
-    //
-
-    #ifdef TEST
-    *logofs << "ReadBuffer: Moving " << length_
-            << " bytes of data " << "at beginning of "
-            << "the buffer for FD#" << transport_ -> fd() 
-            << ".\n" << logofs_flush;
-    #endif
-
-    memmove(buffer_, buffer_ + start_, length_);
-  }
-
-  start_ = 0;
-
-  #ifdef DEBUG
-  *logofs << "ReadBuffer: Buffer size is now " << size_ 
-          << " length is " << length_ << " and start is " 
-          << start_ << ".\n" << logofs_flush;
-  #endif
-
-  unsigned char *readData = buffer_ + length_;
-
-  #ifdef DEBUG
-  *logofs << "ReadBuffer: Going to read " << readLength 
-          << " bytes from FD#" << transport_ -> fd() << ".\n"
-          << logofs_flush;
-  #endif
-
-  int bytesRead = transport_ -> read(readData, readLength);
-
-  if (bytesRead > 0)
-  {
-    #ifdef TEST
-    *logofs << "ReadBuffer: Read " << bytesRead
-            << " bytes from FD#" << transport_ -> fd()
-            << ".\n" << logofs_flush;
-    #endif
-
-    length_ += bytesRead;
-  }
-  else if (bytesRead < 0)
-  {
-    //
-    // Check if there is more data pending than the
-    // size of the provided buffer. After reading
-    // the requested amount, in fact, the transport
-    // may have decompressed the data and produced
-    // more input. This trick allows us to always
-    // borrow the buffer from the transport, even
-    // when the partial read would have prevented
-    // that.
-    //
-
-    if (transport_ -> pending() > 0)
-    {
-      #ifdef TEST
-      *logofs << "ReadBuffer: WARNING! Trying to read some "
-              << "more with " << transport_ -> pending()
-              << " bytes pending for FD#" << transport_ ->
-                 fd() << ".\n" << logofs_flush;
-      #endif
-
-      return readMessage();
-    }
-
-    #ifdef TEST
-    *logofs << "ReadBuffer: Error detected reading "
-            << "from FD#" << transport_ -> fd()
-            << ".\n" << logofs_flush;
-    #endif
-
-    return -1;
-  }
-  #ifdef TEST
-  else
-  {
-    *logofs << "ReadBuffer: No data read from FD#"
-            << transport_ -> fd() << " with remaining "
-            << remaining_ << ".\n" << logofs_flush;
-  }
-  #endif
-
-  return bytesRead;
-}
-
-const unsigned char *ReadBuffer::getMessage(unsigned int &controlLength,
-                                                unsigned int &dataLength)
-{
-  #ifdef TEST
-
-  if (transport_ -> pending() > 0)
-  {
-    *logofs << "ReadBuffer: PANIC! The transport "
-            << "appears to have data pending.\n"
-            << logofs_flush;
-
-    HandleCleanup();
-  }
-
-  #endif
-
-  if (length_ == 0)
-  {
-    #ifdef DEBUG
-    *logofs << "ReadBuffer: No message can be located "
-            << "for FD#" << transport_ -> fd() << ".\n"
-            << logofs_flush;
-    #endif
-
-    if (owner_ == 0)
-    {
-      buffer_ = NULL;
-      size_   = 0;
-
-      transport_ -> pendingReset();
-
-      owner_ = 1;
-      start_ = 0;
-    }
-
-    return NULL;
-  }
-
-  unsigned int trailerLength;
-
-  #ifdef DEBUG
-  *logofs << "ReadBuffer: Going to locate message with "
-          << "start at " << start_ << " and length "
-          << length_ << " for FD#" << transport_ -> fd()
-          << ".\n" << logofs_flush;
-  #endif
-
-  int located = locateMessage(buffer_ + start_, buffer_ + start_ + length_,
-                                  controlLength, dataLength, trailerLength);
-
-  if (located == 0)
-  {
-    //
-    // No more complete messages are in
-    // the buffer.
-    //
-
-    #ifdef DEBUG
-    *logofs << "ReadBuffer: No message was located "
-            << "for FD#" << transport_ -> fd()
-            << ".\n" << logofs_flush;
-    #endif
-
-    if (owner_ == 0)
-    {
-      //
-      // Must move the remaining bytes in
-      // our own buffer.
-      //
-
-      convertBuffer();
-    }
-  
-    return NULL;
-  }
-  else
-  {
-    const unsigned char *result = buffer_ + start_;
-
-    if (dataLength > 0)
-    {
-      //
-      // Message contains data, so go to the
-      // first byte of payload.
-      //
-
-      result += trailerLength;
-
-      start_  += (dataLength + trailerLength);
-      length_ -= (dataLength + trailerLength);
-    }
-    else
-    {
-      //
-      // It is a control message.
-      //
-
-      start_  += (controlLength + trailerLength);
-      length_ -= (controlLength + trailerLength);
-    }
-
-    #ifdef DEBUG
-    *logofs << "ReadBuffer: Located message for FD#"
-            << transport_ -> fd() << " with control length "
-            << controlLength << " and data length "
-            << dataLength << ".\n" << logofs_flush;
-    #endif
-
-    remaining_ = 0;
-
-    return result;
-  }
-}
-
-int ReadBuffer::setSize(int initialReadSize, int maximumBufferSize)
-{
-  initialReadSize_   = initialReadSize;
-  maximumBufferSize_ = maximumBufferSize;
-
-  #ifdef TEST
-  *logofs << "ReadBuffer: WARNING! Set buffer parameters to "
-          << initialReadSize_ << "/" << maximumBufferSize_
-          << " for object at "<< this << ".\n"
-          << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void ReadBuffer::fullReset()
-{
-  #ifdef TEST
-
-  if (owner_ == 0)
-  {
-    *logofs << "ReadBuffer: PANIC! Class for FD#"
-            << transport_ -> fd() << " doesn't "
-            << "appear to be the owner of the buffer "
-            << "in reset.\n" << logofs_flush;
-
-    HandleCleanup();
-  }
-
-  #endif
-
-  if (length_ == 0 && size_ > maximumBufferSize_)
-  {
-    #ifdef TEST
-    *logofs << "ReadBuffer: Resizing buffer for FD#"
-            << transport_ -> fd() << " in reset from "
-            << size_ << " to " << maximumBufferSize_
-            << " bytes.\n" << logofs_flush;
-    #endif
-
-    delete [] buffer_;
-
-    int newSize = maximumBufferSize_;
-
-    unsigned char *newBuffer = allocateBuffer(newSize);
-
-    buffer_ = newBuffer;
-    size_   = newSize;
-
-    transport_ -> pendingReset();
-
-    owner_ = 1;
-    start_ = 0;
-  }
-}
-
-unsigned char *ReadBuffer::allocateBuffer(unsigned int newSize)
-{
-  unsigned char *newBuffer = new unsigned char[newSize];
-
-  if (newBuffer == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "ReadBuffer: PANIC! Can't allocate "
-            << newSize << " bytes of memory for buffer "
-            << "in context [B].\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Can't allocate memory for "
-         << "read buffer in context [B].\n";
-
-    HandleCleanup();
-  }
-
-  #ifdef VALGRIND
-
-  memset(newBuffer, '\0', newSize);
-
-  #endif
-
-  return newBuffer;
-}
-
-void ReadBuffer::appendBuffer(const unsigned char *message, unsigned int length)
-{
-  if (start_ + length_ + length > size_)
-  {
-    unsigned int newSize = length_ + length + initialReadSize_;
-
-    #ifdef TEST
-    *logofs << "ReadBuffer: WARNING! Resizing buffer "
-            << "for FD#" << transport_ -> fd()
-            << " from " << size_ << " to " << newSize
-            << " bytes.\n" << logofs_flush;
-    #endif
-
-    unsigned char *newBuffer = allocateBuffer(newSize);
-
-    memcpy(newBuffer, buffer_ + start_, length_);
-
-    delete [] buffer_;
-
-    buffer_ = newBuffer;
-    size_   = newSize;
-
-    start_ = 0;
-  }
-
-  memcpy(buffer_ + start_ + length_, message, length);
-
-  length_ += length;
-
-  transport_ -> pendingReset();
-
-  owner_ = 1;
-}
-
-void ReadBuffer::convertBuffer()
-{
-  unsigned int newSize = length_ + initialReadSize_;
-
-  #ifdef TEST
-  *logofs << "ReadBuffer: WARNING! Converting "
-          << length_ << " bytes to own buffer "
-          << "for FD#" << transport_ -> fd()
-          << " with new size " << newSize
-          << " bytes.\n" << logofs_flush;
-  #endif
-
-  unsigned char *newBuffer = allocateBuffer(newSize);
-
-  memcpy(newBuffer, buffer_ + start_, length_);
-
-  buffer_ = newBuffer;
-  size_   = newSize;
-
-  transport_ -> pendingReset();
-
-  owner_ = 1;
-  start_ = 0;
-}
diff --git a/nxcomp/ReadBuffer.h b/nxcomp/ReadBuffer.h
deleted file mode 100644
index a12bcc9b3..000000000
--- a/nxcomp/ReadBuffer.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef ReadBuffer_H
-#define ReadBuffer_H
-
-#include "Misc.h"
-#include "Timestamp.h"
-#include "Transport.h"
-
-#define READ_BUFFER_DEFAULT_SIZE  8192
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-class ReadBuffer
-{
-  public:
-
-  ReadBuffer(Transport *transport);
-
-  virtual ~ReadBuffer();
-
-  int readMessage();
-
-  void readMessage(const unsigned char *message, unsigned int length);
-
-  const unsigned char *getMessage(unsigned int &dataLength)
-  {
-    unsigned int controlLength;
-
-    return getMessage(controlLength, dataLength);
-  }
-
-  const unsigned char *getMessage(unsigned int &controlLength, unsigned int &dataLength);
-
-  unsigned int getLength() const
-  {
-    return length_;
-  }
-
-  unsigned int getRemaining() const
-  {
-    return remaining_;
-  }
-
-  int setSize(int initialReadSize, int initialbufferSize);
-
-  void fullReset();
-
-  //
-  // Check if there is a complete
-  // message in the buffer.
-  //
-
-  int checkMessage()
-  {
-    if (length_ == 0)
-    {
-      return 0;
-    }
-    else
-    {
-      unsigned int controlLength;
-      unsigned int dataLength;
-      unsigned int trailerLength;
-
-      return (locateMessage(buffer_ + start_, buffer_ + start_ + length_,
-                  controlLength, dataLength, trailerLength));
-    }
-  }
-
-  protected:
-
-  virtual unsigned int suggestedLength(unsigned int pendingLength) = 0;
-
-  virtual int locateMessage(const unsigned char *start,
-                                const unsigned char *end,
-                                    unsigned int &controlLength,
-                                        unsigned int &dataLength,
-                                            unsigned int &trailerLength) = 0;
-
-  unsigned char *allocateBuffer(unsigned int newSize);
-
-  void appendBuffer(const unsigned char *message, unsigned int length);
-
-  void convertBuffer();
-
-  Transport *transport_;
-
-  unsigned char *buffer_;
-
-  unsigned int length_;
-  unsigned int size_;
-  unsigned int start_;
-  unsigned int remaining_;
-
-  int owner_;
-
-  unsigned int initialReadSize_;
-  unsigned int maximumBufferSize_;
-};
-
-#endif /* ReadBuffer_H */
diff --git a/nxcomp/RenderAddGlyphs.cpp b/nxcomp/RenderAddGlyphs.cpp
deleted file mode 100644
index ed0864b93..000000000
--- a/nxcomp/RenderAddGlyphs.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-//
-// Include the template for
-// this message class.
-//
-
-#include "RenderAddGlyphs.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-#include MESSAGE_TAGS
-
-//
-// Message handling methods.
-//
-
-MESSAGE_BEGIN_ENCODE_SIZE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeCachedValue((size - MESSAGE_OFFSET) >> 2, 16,
-                     clientCache -> renderLengthCache, 5);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded size with value "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_SIZE
-
-MESSAGE_BEGIN_DECODE_SIZE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeCachedValue(size, 16,
-                     clientCache -> renderLengthCache, 5);
-
-  size = MESSAGE_OFFSET + (size << 2);
-
-  buffer = writeBuffer -> addMessage(size);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded size with value "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_SIZE
-
-MESSAGE_BEGIN_ENCODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeCachedValue(GetULONG(buffer + 4, bigEndian), 29,
-                     clientCache -> renderGlyphSetCache);
-
-  encodeBuffer.encodeCachedValue(GetULONG(buffer + 8, bigEndian), 32,
-                     clientCache -> renderNumGlyphsCache, 8);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded message. Type is "
-          << (unsigned int) *(buffer + 1) << " size is "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_MESSAGE
-
-MESSAGE_BEGIN_DECODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  *(buffer + 1) = type;
-
-  decodeBuffer.decodeCachedValue(value, 29,
-                     clientCache -> renderGlyphSetCache);
-
-  PutULONG(value, buffer + 4, bigEndian);
-
-  decodeBuffer.decodeCachedValue(value, 32,
-                     clientCache -> renderNumGlyphsCache, 8);
-
-  PutULONG(value, buffer + 8, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded message. Type is "
-          << (unsigned int) type << " size is " << size
-          << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_MESSAGE
-
-MESSAGE_BEGIN_ENCODE_DATA
-{
-  encodeCharData(encodeBuffer, buffer, MESSAGE_OFFSET,
-                     size, bigEndian, channelCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded " << size - MESSAGE_OFFSET
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_DATA
-
-MESSAGE_BEGIN_DECODE_DATA
-{
-  decodeCharData(decodeBuffer, buffer, MESSAGE_OFFSET,
-                     size, bigEndian, channelCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded " << size - MESSAGE_OFFSET
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_DATA
-
-MESSAGE_BEGIN_PARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  renderExtension -> data.add_glyphs.type = *(buffer + 1);
-
-  renderExtension -> data.add_glyphs.set_id  = GetULONG(buffer + 4, bigEndian);
-  renderExtension -> data.add_glyphs.num_elm = GetULONG(buffer + 8,  bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Parsed identity. Type is "
-          << (unsigned int) renderExtension -> data.add_glyphs.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_PARSE_IDENTITY
-
-MESSAGE_BEGIN_UNPARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  *(buffer + 1) = renderExtension -> data.add_glyphs.type;
-
-  PutULONG(renderExtension -> data.add_glyphs.set_id,  buffer + 4,  bigEndian);
-  PutULONG(renderExtension -> data.add_glyphs.num_elm, buffer + 8,  bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Unparsed identity. Type is "
-          << (unsigned int) renderExtension -> data.add_glyphs.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_UNPARSE_IDENTITY
-
-MESSAGE_BEGIN_IDENTITY_CHECKSUM
-{
-  md5_append(md5_state, buffer + 1, 3);
-  md5_append(md5_state, buffer + 8, 4);
-}
-MESSAGE_END_IDENTITY_CHECKSUM
-
-MESSAGE_BEGIN_ENCODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
-  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeCachedValue(renderExtension -> data.add_glyphs.set_id, 29,
-                     clientCache -> renderGlyphSetCache);
-
-  cachedRenderExtension -> data.add_glyphs.set_id =
-              renderExtension -> data.add_glyphs.set_id;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded update. Type is "
-          << (unsigned int) renderExtension -> data.add_glyphs.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_UPDATE
-
-MESSAGE_BEGIN_DECODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeCachedValue(renderExtension -> data.add_glyphs.set_id, 29,
-                     clientCache -> renderGlyphSetCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded update. Type is "
-          << (unsigned int) renderExtension -> data.add_glyphs.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_UPDATE
diff --git a/nxcomp/RenderAddGlyphs.h b/nxcomp/RenderAddGlyphs.h
deleted file mode 100644
index d3c8cd158..000000000
--- a/nxcomp/RenderAddGlyphs.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef RenderAddGlyphs_H
-#define RenderAddGlyphs_H
-
-//
-// Define the characteristics
-// of this message class here.
-//
-
-#undef  MESSAGE_NAME
-#define MESSAGE_NAME          "RenderAddGlyphs"
-
-#undef  MESSAGE_STORE
-#define MESSAGE_STORE         RenderAddGlyphsStore
-
-#undef  MESSAGE_CLASS
-#define MESSAGE_CLASS         RenderMinorExtensionStore
-
-#undef  MESSAGE_METHODS
-#define MESSAGE_METHODS       "RenderMinorExtensionMethods.h"
-
-#undef  MESSAGE_HEADERS
-#define MESSAGE_HEADERS       "RenderMinorExtensionHeaders.h"
-
-#undef  MESSAGE_TAGS
-#define MESSAGE_TAGS          "RenderMinorExtensionTags.h"
-
-#undef  MESSAGE_OFFSET
-#define MESSAGE_OFFSET        12
-
-#undef  MESSAGE_HAS_SIZE
-#define MESSAGE_HAS_SIZE      1
-
-#undef  MESSAGE_HAS_DATA
-#define MESSAGE_HAS_DATA      1
-
-#undef  MESSAGE_HAS_FILTER
-#define MESSAGE_HAS_FILTER    0
-
-//
-// Declare the message class.
-//
-
-#include MESSAGE_HEADERS
-
-class MESSAGE_STORE : public MESSAGE_CLASS
-{
-  public:
-
-  virtual const char *name() const
-  {
-    return MESSAGE_NAME;
-  }
-
-  virtual int identitySize(const unsigned char *buffer,
-                               unsigned int size)
-  {
-    return MESSAGE_OFFSET;
-  }
-
-  #include MESSAGE_METHODS
-};
-
-#endif /* RenderAddGlyphs_H */
diff --git a/nxcomp/RenderChangePicture.cpp b/nxcomp/RenderChangePicture.cpp
deleted file mode 100644
index 2abb97493..000000000
--- a/nxcomp/RenderChangePicture.cpp
+++ /dev/null
@@ -1,234 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-//
-// Include the template for
-// this message class.
-//
-
-#include "RenderChangePicture.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-#include MESSAGE_TAGS
-
-//
-// Message handling methods.
-//
-
-MESSAGE_BEGIN_ENCODE_SIZE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeCachedValue((size - MESSAGE_OFFSET) >> 2, 16,
-                     clientCache -> renderLengthCache, 5);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded size with value "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_SIZE
-
-MESSAGE_BEGIN_DECODE_SIZE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeCachedValue(size, 16,
-                     clientCache -> renderLengthCache, 5);
-
-  size = MESSAGE_OFFSET + (size << 2);
-
-  buffer = writeBuffer -> addMessage(size);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded size with value "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_SIZE
-
-MESSAGE_BEGIN_ENCODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeXidValue(GetULONG(buffer + 4, bigEndian),
-                                  clientCache -> renderSrcPictureCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded message. Type is "
-          << (unsigned int) *(buffer + 1) << " size is "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_MESSAGE
-
-MESSAGE_BEGIN_DECODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  *(buffer + 1) = type;
-
-  decodeBuffer.decodeXidValue(value, clientCache -> renderSrcPictureCache);
-
-  PutULONG(value, buffer + 4, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded message. Type is "
-          << (unsigned int) type << " size is " << size
-          << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_MESSAGE
-
-MESSAGE_BEGIN_ENCODE_DATA
-{
-  #ifdef DEBUG
-
-  if (size == MESSAGE_OFFSET + 4)
-  {
-    *logofs << name() << ": Mask is " << GetULONG(buffer + 8, bigEndian)
-            << " value is " << GetULONG(buffer + 12, bigEndian)
-            << ".\n" << logofs_flush;
-  }
-  else
-  {
-    *logofs << name() << ": WARNING! Unexpected size. Mask is "
-            << GetULONG(buffer + 8, bigEndian) << ".\n"
-            << logofs_flush;
-  }
-
-  #endif
-
-  encodeLongData(encodeBuffer, buffer, MESSAGE_OFFSET,
-                     size, bigEndian, channelCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded " << size - MESSAGE_OFFSET
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_DATA
-
-MESSAGE_BEGIN_DECODE_DATA
-{
-  decodeLongData(decodeBuffer, buffer, MESSAGE_OFFSET,
-                     size, bigEndian, channelCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded " << size - MESSAGE_OFFSET
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_DATA
-
-MESSAGE_BEGIN_PARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  renderExtension -> data.change_picture.type = *(buffer + 1);
-
-  renderExtension -> data.change_picture.src_id = GetULONG(buffer + 4,  bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Parsed identity. Type is "
-          << (unsigned int) renderExtension -> data.change_picture.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_PARSE_IDENTITY
-
-MESSAGE_BEGIN_UNPARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  *(buffer + 1) = renderExtension -> data.change_picture.type;
-
-  PutULONG(renderExtension -> data.change_picture.src_id, buffer + 4,  bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Unparsed identity. Type is "
-          << (unsigned int) renderExtension -> data.change_picture.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_UNPARSE_IDENTITY
-
-MESSAGE_BEGIN_IDENTITY_CHECKSUM
-{
-  md5_append(md5_state, buffer + 1, 3);
-}
-MESSAGE_END_IDENTITY_CHECKSUM
-
-MESSAGE_BEGIN_ENCODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
-  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeXidValue(renderExtension -> data.change_picture.src_id,
-                     clientCache -> renderSrcPictureCache);
-
-  cachedRenderExtension -> data.change_picture.src_id =
-              renderExtension -> data.change_picture.src_id;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded update. Type is "
-          << (unsigned int) renderExtension -> data.change_picture.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_UPDATE
-
-MESSAGE_BEGIN_DECODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeXidValue(renderExtension -> data.change_picture.src_id,
-                     clientCache -> renderSrcPictureCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded update. Type is "
-          << (unsigned int) renderExtension -> data.change_picture.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_UPDATE
diff --git a/nxcomp/RenderChangePicture.h b/nxcomp/RenderChangePicture.h
deleted file mode 100644
index 4bab1ef98..000000000
--- a/nxcomp/RenderChangePicture.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef RenderChangePicture_H
-#define RenderChangePicture_H
-
-//
-// Define the characteristics
-// of this message class here.
-//
-
-#undef  MESSAGE_NAME
-#define MESSAGE_NAME          "RenderChangePicture"
-
-#undef  MESSAGE_STORE
-#define MESSAGE_STORE         RenderChangePictureStore
-
-#undef  MESSAGE_CLASS
-#define MESSAGE_CLASS         RenderMinorExtensionStore
-
-#undef  MESSAGE_METHODS
-#define MESSAGE_METHODS       "RenderMinorExtensionMethods.h"
-
-#undef  MESSAGE_HEADERS
-#define MESSAGE_HEADERS       "RenderMinorExtensionHeaders.h"
-
-#undef  MESSAGE_TAGS
-#define MESSAGE_TAGS          "RenderMinorExtensionTags.h"
-
-#undef  MESSAGE_OFFSET
-#define MESSAGE_OFFSET        8
-
-#undef  MESSAGE_HAS_SIZE
-#define MESSAGE_HAS_SIZE      1
-
-#undef  MESSAGE_HAS_DATA
-#define MESSAGE_HAS_DATA      1
-
-#undef  MESSAGE_HAS_FILTER
-#define MESSAGE_HAS_FILTER    0
-
-//
-// Declare the message class.
-//
-
-#include MESSAGE_HEADERS
-
-class MESSAGE_STORE : public MESSAGE_CLASS
-{
-  public:
-
-  virtual const char *name() const
-  {
-    return MESSAGE_NAME;
-  }
-
-  virtual int identitySize(const unsigned char *buffer,
-                               unsigned int size)
-  {
-    return MESSAGE_OFFSET;
-  }
-
-  #include MESSAGE_METHODS
-};
-
-#endif /* RenderChangePicture_H */
diff --git a/nxcomp/RenderComposite.cpp b/nxcomp/RenderComposite.cpp
deleted file mode 100644
index e8603a7da..000000000
--- a/nxcomp/RenderComposite.cpp
+++ /dev/null
@@ -1,396 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-//
-// Include the template for
-// this message class.
-//
-
-#include "RenderComposite.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-#include MESSAGE_TAGS
-
-//
-// Message handling methods.
-//
-
-MESSAGE_BEGIN_ENCODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeCachedValue(*(buffer + 4), 8,
-                     clientCache -> renderOpCache);
-
-  encodeBuffer.encodeXidValue(GetULONG(buffer + 8, bigEndian),
-                     clientCache -> renderSrcPictureCache);
-
-  encodeBuffer.encodeXidValue(GetULONG(buffer + 12, bigEndian),
-                     clientCache -> renderMaskPictureCache);
-
-  encodeBuffer.encodeXidValue(GetULONG(buffer + 16, bigEndian),
-                     clientCache -> renderDstPictureCache);
-
-  //
-  // Src X and Y.
-  //
-
-  encodeBuffer.encodeDiffCachedValue(GetUINT(buffer + 20, bigEndian),
-                     clientCache -> renderLastX, 16,
-                         clientCache -> renderXCache, 11);
-
-  encodeBuffer.encodeDiffCachedValue(GetUINT(buffer + 22, bigEndian),
-                     clientCache -> renderLastY, 16,
-                         clientCache -> renderYCache, 11);
-  //
-  // Mask X and Y.
-  //
-
-  encodeBuffer.encodeDiffCachedValue(GetUINT(buffer + 24, bigEndian),
-                     clientCache -> renderLastX, 16,
-                         clientCache -> renderXCache, 11);
-
-  encodeBuffer.encodeDiffCachedValue(GetUINT(buffer + 26, bigEndian),
-                     clientCache -> renderLastY, 16,
-                         clientCache -> renderYCache, 11);
-
-  //
-  // Dst X and Y.
-  //
-
-  encodeBuffer.encodeDiffCachedValue(GetUINT(buffer + 28, bigEndian),
-                     clientCache -> renderLastX, 16,
-                         clientCache -> renderXCache, 11);
-
-  encodeBuffer.encodeDiffCachedValue(GetUINT(buffer + 30, bigEndian),
-                     clientCache -> renderLastY, 16,
-                         clientCache -> renderYCache, 11);
-
-  //
-  // Width and height.
-  //
-
-  encodeBuffer.encodeCachedValue(GetUINT(buffer + 32, bigEndian), 16,
-                     clientCache -> renderWidthCache, 11);
-
-  encodeBuffer.encodeCachedValue(GetUINT(buffer + 34, bigEndian), 16,
-                     clientCache -> renderHeightCache, 11);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded message. Type is "
-          << (unsigned int) *(buffer + 1) << " size is "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_MESSAGE
-
-MESSAGE_BEGIN_DECODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  *(buffer + 1) = type;
-
-  decodeBuffer.decodeCachedValue(*(buffer + 4), 8,
-                     clientCache -> renderOpCache);
-
-  decodeBuffer.decodeXidValue(value, clientCache -> renderSrcPictureCache);
-
-  PutULONG(value, buffer + 8, bigEndian);
-
-  decodeBuffer.decodeXidValue(value, clientCache -> renderMaskPictureCache);
-
-  PutULONG(value, buffer + 12, bigEndian);
-
-  decodeBuffer.decodeXidValue(value, clientCache -> renderDstPictureCache);
-
-  PutULONG(value, buffer + 16, bigEndian);
-
-  //
-  // Src X and Y.
-  //
-
-  decodeBuffer.decodeDiffCachedValue(value,
-                     clientCache -> renderLastX, 16,
-                         clientCache -> renderXCache, 11);
-
-  PutUINT(clientCache -> renderLastX, buffer + 20, bigEndian);
-
-  decodeBuffer.decodeDiffCachedValue(value,
-                     clientCache -> renderLastY, 16,
-                         clientCache -> renderYCache, 11);
-
-  PutUINT(clientCache -> renderLastY, buffer + 22, bigEndian);
-
-  //
-  // Mask X and Y.
-  //
-
-  decodeBuffer.decodeDiffCachedValue(value,
-                     clientCache -> renderLastX, 16,
-                         clientCache -> renderXCache, 11);
-
-  PutUINT(clientCache -> renderLastX, buffer + 24, bigEndian);
-
-  decodeBuffer.decodeDiffCachedValue(value,
-                     clientCache -> renderLastY, 16,
-                         clientCache -> renderYCache, 11);
-
-  PutUINT(clientCache -> renderLastY, buffer + 26, bigEndian);
-
-  //
-  // Dst X and Y.
-  //
-
-  decodeBuffer.decodeDiffCachedValue(value,
-                     clientCache -> renderLastX, 16,
-                         clientCache -> renderXCache, 11);
-
-  PutUINT(clientCache -> renderLastX, buffer + 28, bigEndian);
-
-  decodeBuffer.decodeDiffCachedValue(value,
-                     clientCache -> renderLastY, 16,
-                         clientCache -> renderYCache, 11);
-
-  PutUINT(clientCache -> renderLastY, buffer + 30, bigEndian);
-
-  //
-  // Width and height.
-  //
-
-  decodeBuffer.decodeCachedValue(value, 16,
-                     clientCache -> renderWidthCache, 11);
-
-  PutUINT(value, buffer + 32, bigEndian);
-
-  decodeBuffer.decodeCachedValue(value, 16,
-                     clientCache -> renderHeightCache, 11);
-
-  PutUINT(value, buffer + 34, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded message. Type is "
-          << (unsigned int) type << " size is " << size
-          << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_MESSAGE
-
-MESSAGE_BEGIN_PARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  renderExtension -> data.composite.type = *(buffer + 1);
-  renderExtension -> data.composite.op   = *(buffer + 4);
-
-  renderExtension -> data.composite.src_id = GetULONG(buffer + 8,  bigEndian);
-  renderExtension -> data.composite.msk_id = GetULONG(buffer + 12, bigEndian);
-  renderExtension -> data.composite.dst_id = GetULONG(buffer + 16, bigEndian);
-
-  renderExtension -> data.composite.src_x = GetUINT(buffer + 20, bigEndian);
-  renderExtension -> data.composite.src_y = GetUINT(buffer + 22, bigEndian);
-
-  renderExtension -> data.composite.msk_x = GetUINT(buffer + 24, bigEndian);
-  renderExtension -> data.composite.msk_y = GetUINT(buffer + 26, bigEndian);
-
-  renderExtension -> data.composite.dst_x = GetUINT(buffer + 28, bigEndian);
-  renderExtension -> data.composite.dst_y = GetUINT(buffer + 30, bigEndian);
-
-  renderExtension -> data.composite.width  = GetUINT(buffer + 32, bigEndian);
-  renderExtension -> data.composite.height = GetUINT(buffer + 34, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Parsed identity. Type is "
-          << (unsigned int) renderExtension -> data.composite.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_PARSE_IDENTITY
-
-MESSAGE_BEGIN_UNPARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  *(buffer + 1) = renderExtension -> data.composite.type;
-  *(buffer + 4) = renderExtension -> data.composite.op;
-
-  PutULONG(renderExtension -> data.composite.src_id, buffer + 8,  bigEndian);
-  PutULONG(renderExtension -> data.composite.msk_id, buffer + 12, bigEndian);
-  PutULONG(renderExtension -> data.composite.dst_id, buffer + 16, bigEndian);
-
-  PutUINT(renderExtension -> data.composite.src_x, buffer + 20, bigEndian);
-  PutUINT(renderExtension -> data.composite.src_y, buffer + 22, bigEndian);
-
-  PutUINT(renderExtension -> data.composite.msk_x, buffer + 24, bigEndian);
-  PutUINT(renderExtension -> data.composite.msk_y, buffer + 26, bigEndian);
-
-  PutUINT(renderExtension -> data.composite.dst_x, buffer + 28, bigEndian);
-  PutUINT(renderExtension -> data.composite.dst_y, buffer + 30, bigEndian);
-
-  PutUINT(renderExtension -> data.composite.width,  buffer + 32, bigEndian);
-  PutUINT(renderExtension -> data.composite.height, buffer + 34, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Unparsed identity. Type is "
-          << (unsigned int) renderExtension -> data.composite.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_UNPARSE_IDENTITY
-
-MESSAGE_BEGIN_IDENTITY_CHECKSUM
-{
-  //
-  // Include the minor opcode and size in the
-  // identity, plus the operator, the x and y
-  // of the source and mask and the width and
-  // height of the destination.
-  //
-
-  md5_append(md5_state, buffer + 1,  4);
-  md5_append(md5_state, buffer + 20, 8);
-  md5_append(md5_state, buffer + 32, 4);
-}
-MESSAGE_END_IDENTITY_CHECKSUM
-
-MESSAGE_BEGIN_ENCODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
-  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Source " << renderExtension -> data.composite.src_id
-          << " mask " << renderExtension -> data.composite.msk_id
-          << " destination " << renderExtension -> data.composite.msk_id
-          << ".\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeXidValue(renderExtension -> data.composite.src_id,
-                     clientCache -> renderSrcPictureCache);
-
-  cachedRenderExtension -> data.composite.src_id =
-              renderExtension -> data.composite.src_id;
-
-  encodeBuffer.encodeXidValue(renderExtension -> data.composite.msk_id,
-                     clientCache -> renderMaskPictureCache);
-
-  cachedRenderExtension -> data.composite.msk_id =
-              renderExtension -> data.composite.msk_id;
-
-  encodeBuffer.encodeXidValue(renderExtension -> data.composite.dst_id,
-                     clientCache -> renderDstPictureCache);
-
-  cachedRenderExtension -> data.composite.dst_id =
-              renderExtension -> data.composite.dst_id;
-
-  //
-  // Dst X and Y.
-  //
-
-  unsigned int value;
-  unsigned int previous;
-
-  value    = renderExtension -> data.composite.dst_x;
-  previous = cachedRenderExtension -> data.composite.dst_x;
-
-  encodeBuffer.encodeDiffCachedValue(value, previous, 16,
-                     clientCache -> renderXCache, 11);
-
-  cachedRenderExtension -> data.composite.dst_x = value;
-
-  value    = renderExtension -> data.composite.dst_y;
-  previous = cachedRenderExtension -> data.composite.dst_y;
-
-  encodeBuffer.encodeDiffCachedValue(value, previous, 16,
-                     clientCache -> renderYCache, 11);
-
-  cachedRenderExtension -> data.composite.dst_y = value;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded update. Type is "
-          << (unsigned int) renderExtension -> data.composite.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_UPDATE
-
-MESSAGE_BEGIN_DECODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeXidValue(renderExtension -> data.composite.src_id,
-                     clientCache -> renderSrcPictureCache);
-
-  decodeBuffer.decodeXidValue(renderExtension -> data.composite.msk_id,
-                     clientCache -> renderMaskPictureCache);
-
-  decodeBuffer.decodeXidValue(renderExtension -> data.composite.dst_id,
-                     clientCache -> renderDstPictureCache);
-
-  //
-  // Dst X and Y.
-  //
-
-  unsigned int value;
-  unsigned int previous;
-
-  previous = renderExtension -> data.composite.dst_x;
-
-  decodeBuffer.decodeDiffCachedValue(value, previous, 16,
-                     clientCache -> renderXCache, 11);
-
-  renderExtension -> data.composite.dst_x = value;
-
-  previous = renderExtension -> data.composite.dst_y;
-
-  decodeBuffer.decodeDiffCachedValue(value, previous, 16,
-                     clientCache -> renderYCache, 11);
-
-  renderExtension -> data.composite.dst_y = value;
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded update. Type is "
-          << (unsigned int) renderExtension -> data.composite.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_UPDATE
diff --git a/nxcomp/RenderComposite.h b/nxcomp/RenderComposite.h
deleted file mode 100644
index aafa1e776..000000000
--- a/nxcomp/RenderComposite.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef RenderComposite_H
-#define RenderComposite_H
-
-//
-// Define the characteristics
-// of this message class here.
-//
-
-#undef  MESSAGE_NAME
-#define MESSAGE_NAME          "RenderComposite"
-
-#undef  MESSAGE_STORE
-#define MESSAGE_STORE         RenderCompositeStore
-
-#undef  MESSAGE_CLASS
-#define MESSAGE_CLASS         RenderMinorExtensionStore
-
-#undef  MESSAGE_METHODS
-#define MESSAGE_METHODS       "RenderMinorExtensionMethods.h"
-
-#undef  MESSAGE_HEADERS
-#define MESSAGE_HEADERS       "RenderMinorExtensionHeaders.h"
-
-#undef  MESSAGE_TAGS
-#define MESSAGE_TAGS          "RenderMinorExtensionTags.h"
-
-#undef  MESSAGE_OFFSET
-#define MESSAGE_OFFSET        36
-
-#undef  MESSAGE_HAS_SIZE
-#define MESSAGE_HAS_SIZE      0
-
-#undef  MESSAGE_HAS_DATA
-#define MESSAGE_HAS_DATA      0
-
-#undef  MESSAGE_HAS_FILTER
-#define MESSAGE_HAS_FILTER    0
-
-//
-// Declare the message class.
-//
-
-#include MESSAGE_HEADERS
-
-class MESSAGE_STORE : public MESSAGE_CLASS
-{
-  public:
-
-  virtual const char *name() const
-  {
-    return MESSAGE_NAME;
-  }
-
-  virtual int identitySize(const unsigned char *buffer,
-                               unsigned int size)
-  {
-    return MESSAGE_OFFSET;
-  }
-
-  #include MESSAGE_METHODS
-};
-
-#endif /* RenderComposite_H */
diff --git a/nxcomp/RenderCompositeGlyphs.cpp b/nxcomp/RenderCompositeGlyphs.cpp
deleted file mode 100644
index 74b3ec779..000000000
--- a/nxcomp/RenderCompositeGlyphs.cpp
+++ /dev/null
@@ -1,625 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-//
-// Include the template for
-// this message class.
-//
-
-#include "RenderCompositeGlyphs.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-#include MESSAGE_TAGS
-
-//
-// Message handling methods.
-//
-
-MESSAGE_BEGIN_ENCODE_SIZE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Encoding value "
-          << ((size - MESSAGE_OFFSET) >> 2) << ".\n"
-          << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeCachedValue((size - MESSAGE_OFFSET) >> 2, 16,
-                     clientCache -> renderLengthCache, 5);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded size with value "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_SIZE
-
-MESSAGE_BEGIN_DECODE_SIZE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeCachedValue(size, 16,
-                     clientCache -> renderLengthCache, 5);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << size
-          << ".\n" << logofs_flush;
-  #endif
-
-  size = MESSAGE_OFFSET + (size << 2);
-
-  buffer = writeBuffer -> addMessage(size);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded size with value "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_SIZE
-
-MESSAGE_BEGIN_ENCODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeCachedValue(*(buffer + 4), 8,
-                     clientCache -> renderOpCache);
-
-  encodeBuffer.encodeXidValue(GetULONG(buffer + 8, bigEndian),
-                     clientCache -> renderSrcPictureCache);
-
-  encodeBuffer.encodeXidValue(GetULONG(buffer + 12, bigEndian),
-                     clientCache -> renderDstPictureCache);
-
-  encodeBuffer.encodeCachedValue(GetULONG(buffer + 16, bigEndian), 32,
-                     clientCache -> renderFormatCache);
-
-  encodeBuffer.encodeCachedValue(GetULONG(buffer + 20, bigEndian), 29,
-                     clientCache -> renderGlyphSetCache);
-
-  unsigned int src_x = GetUINT(buffer + 24, bigEndian);
-  unsigned int src_y = GetUINT(buffer + 26, bigEndian);
-
-  // Since ProtoStep8 (#issue 108)
-  encodeBuffer.encodeDiffCachedValue(src_x,
-                     clientCache -> renderGlyphX, 16,
-                         clientCache -> renderGlyphXCache, 11);
-
-  encodeBuffer.encodeDiffCachedValue(src_y,
-                     clientCache -> renderGlyphY, 16,
-                         clientCache -> renderGlyphYCache, 11);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded source X "
-          << GetUINT(buffer + 24, bigEndian) << " source Y "
-          << GetUINT(buffer + 26, bigEndian) << ".\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // Bytes from 28 to 36 contain in the order:
-  //
-  // 1 byte for the length of the first string.
-  // 3 bytes of padding.
-  // 2 bytes for the X offset.
-  // 2 bytes for the Y offset.
-  //
-  // Encode these bytes differentially to match
-  // all the strings that have equal glyphs.
-  //
-  // Only manage the first string of glyphs. The
-  // others strings should match, if they contain
-  // the same glyphs, since the offset are rela-
-  // tive to the first offset coordinates.
-  //
-
-  // Since ProtoStep8 (#issue 108)
-  if (size >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
-  {
-    unsigned int numGlyphs = *(buffer + 28);
-
-    encodeBuffer.encodeCachedValue(numGlyphs, 8,
-                       clientCache -> renderNumGlyphsCache);
-
-    unsigned int offset_x = GetUINT(buffer + 32, bigEndian);
-    unsigned int offset_y = GetUINT(buffer + 34, bigEndian);
-
-    if (offset_x == src_x && offset_y == src_y)
-    {
-      encodeBuffer.encodeBoolValue(0);
-
-      #ifdef TEST
-      *logofs << name() << ": Matched offset X "
-              << GetUINT(buffer + 32, bigEndian) << " offset Y "
-              << GetUINT(buffer + 34, bigEndian) << ".\n"
-              << logofs_flush;
-      #endif
-    }
-    else
-    {
-      encodeBuffer.encodeBoolValue(1);
-
-      encodeBuffer.encodeDiffCachedValue(offset_x,
-                         clientCache -> renderGlyphX, 16,
-                             clientCache -> renderGlyphXCache, 11);
-
-      encodeBuffer.encodeDiffCachedValue(offset_y,
-                         clientCache -> renderGlyphY, 16,
-                             clientCache -> renderGlyphYCache, 11);
-
-      #ifdef TEST
-      *logofs << name() << ": Missed offset X "
-              << GetUINT(buffer + 32, bigEndian) << " offset Y "
-              << GetUINT(buffer + 34, bigEndian) << ".\n"
-              << logofs_flush;
-      #endif
-    }
-  }
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded message. Type is "
-          << (unsigned int) *(buffer + 1) << " size is "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_MESSAGE
-
-MESSAGE_BEGIN_DECODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  *(buffer + 1) = type;
-
-  decodeBuffer.decodeCachedValue(*(buffer + 4), 8,
-                     clientCache -> renderOpCache);
-
-  decodeBuffer.decodeXidValue(value,
-                     clientCache -> renderSrcPictureCache);
-
-  PutULONG(value, buffer + 8, bigEndian);
-
-  decodeBuffer.decodeXidValue(value,
-                     clientCache -> renderDstPictureCache);
-
-  PutULONG(value, buffer + 12, bigEndian);
-
-  decodeBuffer.decodeCachedValue(value, 32,
-                     clientCache -> renderFormatCache);
-
-  PutULONG(value, buffer + 16, bigEndian);
-
-  decodeBuffer.decodeCachedValue(value, 29,
-                     clientCache -> renderGlyphSetCache);
-
-  PutULONG(value, buffer + 20, bigEndian);
-
-  unsigned int src_x;
-  unsigned int src_y;
-
-  // Since ProtoStep8 (#issue 108)
-  decodeBuffer.decodeDiffCachedValue(src_x,
-                     clientCache -> renderGlyphX, 16,
-                         clientCache -> renderGlyphXCache, 11);
-
-  decodeBuffer.decodeDiffCachedValue(src_y,
-                     clientCache -> renderGlyphY, 16,
-                         clientCache -> renderGlyphYCache, 11);
-
-  PutUINT(src_x, buffer + 24, bigEndian);
-  PutUINT(src_y, buffer + 26, bigEndian);
-
-  // Since ProtoStep8 (#issue 108)
-  if (size >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
-  {
-    decodeBuffer.decodeCachedValue(value, 8,
-                       clientCache -> renderNumGlyphsCache);
-
-    *(buffer + 28) = value;
-
-    decodeBuffer.decodeBoolValue(value);
-
-    if (value == 0)
-    {
-      PutUINT(src_x, buffer + 32, bigEndian);
-      PutUINT(src_y, buffer + 34, bigEndian);
-    }
-    else
-    {
-      decodeBuffer.decodeDiffCachedValue(src_x,
-                         clientCache -> renderGlyphX, 16,
-                             clientCache -> renderGlyphXCache, 11);
-
-      PutUINT(src_x, buffer + 32, bigEndian);
-
-      decodeBuffer.decodeDiffCachedValue(src_y,
-                         clientCache -> renderGlyphY, 16,
-                             clientCache -> renderGlyphYCache, 11);
-
-      PutUINT(src_y, buffer + 34, bigEndian);
-    }
-  }
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded message. Type is "
-          << (unsigned int) type << " size is " << size
-          << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_MESSAGE
-
-MESSAGE_BEGIN_ENCODE_DATA
-{
-  // Since ProtoStep8 (#issue 108)
-  if (size >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
-  {
-    encodeCharData(encodeBuffer, buffer, MESSAGE_OFFSET_IF_PROTO_STEP_8,
-                       size, bigEndian, channelCache);
-  }
-  else if (size > MESSAGE_OFFSET)
-  {
-    encodeCharData(encodeBuffer, buffer, MESSAGE_OFFSET,
-                       size, bigEndian, channelCache);
-  }
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded " << size - MESSAGE_OFFSET
-          << " bytes of text data.\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_DATA
-
-MESSAGE_BEGIN_DECODE_DATA
-{
-  // Since ProtoStep8 (#issue 108)
-  if (size >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
-  {
-    decodeCharData(decodeBuffer, buffer, MESSAGE_OFFSET_IF_PROTO_STEP_8,
-                       size, bigEndian, channelCache);
-  }
-  else if (size > MESSAGE_OFFSET)
-  {
-    decodeCharData(decodeBuffer, buffer, MESSAGE_OFFSET,
-                       size, bigEndian, channelCache);
-  }
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded " << size - MESSAGE_OFFSET
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_DATA
-
-MESSAGE_BEGIN_PARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  renderExtension -> data.composite_glyphs.type = *(buffer + 1);
-  renderExtension -> data.composite_glyphs.op   = *(buffer + 4);
-
-  renderExtension -> data.composite_glyphs.src_id = GetULONG(buffer + 8,  bigEndian);
-  renderExtension -> data.composite_glyphs.dst_id = GetULONG(buffer + 12, bigEndian);
-
-  renderExtension -> data.composite_glyphs.format = GetULONG(buffer + 16, bigEndian);
-  renderExtension -> data.composite_glyphs.set_id = GetULONG(buffer + 20, bigEndian);
-
-  renderExtension -> data.composite_glyphs.src_x = GetUINT(buffer + 24, bigEndian);
-  renderExtension -> data.composite_glyphs.src_y = GetUINT(buffer + 26, bigEndian);
-
-  // Since ProtoStep8 (#issue 108)
-  if (size >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
-  {
-    renderExtension -> data.composite_glyphs.num_elm = *(buffer + 28);
-
-    renderExtension -> data.composite_glyphs.offset_x = GetUINT(buffer + 32, bigEndian);
-    renderExtension -> data.composite_glyphs.offset_y = GetUINT(buffer + 34, bigEndian);
-  }
-
-  #ifdef TEST
-  *logofs << name() << ": Parsed identity. Type is "
-          << (unsigned int) renderExtension -> data.composite_glyphs.type
-          << " size is " << renderExtension -> size_ << " identity size "
-          << renderExtension -> i_size_ << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_PARSE_IDENTITY
-
-MESSAGE_BEGIN_UNPARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  *(buffer + 1) = renderExtension -> data.composite_glyphs.type;
-  *(buffer + 4) = renderExtension -> data.composite_glyphs.op;
-
-  PutULONG(renderExtension -> data.composite_glyphs.src_id, buffer + 8,  bigEndian);
-  PutULONG(renderExtension -> data.composite_glyphs.dst_id, buffer + 12, bigEndian);
-
-  PutULONG(renderExtension -> data.composite_glyphs.format, buffer + 16, bigEndian);
-  PutULONG(renderExtension -> data.composite_glyphs.set_id, buffer + 20, bigEndian);
-
-  PutUINT(renderExtension -> data.composite_glyphs.src_x, buffer + 24, bigEndian);
-  PutUINT(renderExtension -> data.composite_glyphs.src_y, buffer + 26, bigEndian);
-
-  // Since ProtoStep8 (#issue 108)
-  if (size >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
-  {
-    *(buffer + 28) = renderExtension -> data.composite_glyphs.num_elm;
-
-    PutUINT(renderExtension -> data.composite_glyphs.offset_x, buffer + 32, bigEndian);
-    PutUINT(renderExtension -> data.composite_glyphs.offset_y, buffer + 34, bigEndian);
-  }
-
-  #ifdef TEST
-  *logofs << name() << ": Unparsed identity. Type is "
-          << (unsigned int) renderExtension -> data.composite_glyphs.type
-          << " size is " << renderExtension -> size_  << " identity size "
-          << renderExtension -> i_size_ <<  ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_UNPARSE_IDENTITY
-
-MESSAGE_BEGIN_IDENTITY_CHECKSUM
-{
-  //
-  // Include minor opcode, size and
-  // the composite operator in the
-  // identity.
-  //
-
-  md5_append(md5_state, buffer + 1, 4);
-
-  //
-  // Include the format.
-  //
-
-  md5_append(md5_state, buffer + 16, 4);
-
-  //
-  // Also include the length of the
-  // first string.
-  //
-
-  // Since ProtoStep8 (#issue 108)
-  if (size >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
-  {
-    md5_append(md5_state, buffer + 28, 1);
-  }
-}
-MESSAGE_END_IDENTITY_CHECKSUM
-
-MESSAGE_BEGIN_ENCODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
-  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeXidValue(renderExtension -> data.composite_glyphs.src_id,
-                     clientCache -> renderSrcPictureCache);
-
-  cachedRenderExtension -> data.composite_glyphs.src_id =
-              renderExtension -> data.composite_glyphs.src_id;
-
-  encodeBuffer.encodeXidValue(renderExtension -> data.composite_glyphs.dst_id,
-                     clientCache -> renderDstPictureCache);
-
-  cachedRenderExtension -> data.composite_glyphs.dst_id =
-              renderExtension -> data.composite_glyphs.dst_id;
-
-  encodeBuffer.encodeCachedValue(renderExtension -> data.composite_glyphs.set_id, 29,
-                     clientCache -> renderGlyphSetCache);
-
-  cachedRenderExtension -> data.composite_glyphs.set_id =
-              renderExtension -> data.composite_glyphs.set_id;
-
-  //
-  // Src X and Y.
-  //
-  // The source X and Y coordinates are
-  // encoded as differerences in respect
-  // to the cached message.
-  //
-
-  unsigned int value;
-  unsigned int previous;
-
-  // Since ProtoStep8 (#issue 108)
-  value    = renderExtension -> data.composite_glyphs.src_x;
-  previous = cachedRenderExtension -> data.composite_glyphs.src_x;
-
-  encodeBuffer.encodeDiffCachedValue(value, previous, 16,
-                     clientCache -> renderGlyphXCache, 11);
-
-  cachedRenderExtension -> data.composite_glyphs.src_x = value;
-
-  value    = renderExtension -> data.composite_glyphs.src_y;
-  previous = cachedRenderExtension -> data.composite_glyphs.src_y;
-
-  encodeBuffer.encodeDiffCachedValue(value, previous, 16,
-                     clientCache -> renderGlyphYCache, 11);
-
-  cachedRenderExtension -> data.composite_glyphs.src_y = value;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded source X "
-          << renderExtension -> data.composite_glyphs.src_x << " source Y "
-          << renderExtension -> data.composite_glyphs.src_y << ".\n"
-          << logofs_flush;
-  #endif
-
-  // Since ProtoStep8 (#issue 108)
-  if (renderExtension -> size_ >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
-  {
-    //
-    // Offset X and Y.
-    //
-
-    if (renderExtension -> data.composite_glyphs.offset_x ==
-            renderExtension -> data.composite_glyphs.src_x &&
-                renderExtension -> data.composite_glyphs.offset_y ==
-                    renderExtension -> data.composite_glyphs.src_y)
-    {
-      encodeBuffer.encodeBoolValue(0);
-
-      cachedRenderExtension -> data.composite_glyphs.offset_x =
-            renderExtension -> data.composite_glyphs.offset_x;
-
-      cachedRenderExtension -> data.composite_glyphs.offset_y =
-            renderExtension -> data.composite_glyphs.offset_y;
-
-      #ifdef TEST
-      *logofs << name() << ": Matched offset X "
-              << renderExtension -> data.composite_glyphs.offset_x << " offset Y "
-              << renderExtension -> data.composite_glyphs.offset_y << ".\n"
-              << logofs_flush;
-      #endif
-    }
-    else
-    {
-      encodeBuffer.encodeBoolValue(1);
-
-      value    = renderExtension -> data.composite_glyphs.offset_x;
-      previous = cachedRenderExtension -> data.composite_glyphs.offset_x;
-
-      encodeBuffer.encodeDiffCachedValue(value, previous, 16,
-                         clientCache -> renderGlyphXCache, 11);
-
-      cachedRenderExtension -> data.composite_glyphs.offset_x = value;
-
-      value    = renderExtension -> data.composite_glyphs.offset_y;
-      previous = cachedRenderExtension -> data.composite_glyphs.offset_y;
-
-      encodeBuffer.encodeDiffCachedValue(value, previous, 16,
-                         clientCache -> renderGlyphYCache, 11);
-
-      cachedRenderExtension -> data.composite_glyphs.offset_y = value;
-
-      #ifdef TEST
-      *logofs << name() << ": Missed offset X "
-              << renderExtension -> data.composite_glyphs.offset_x << " offset Y "
-              << renderExtension -> data.composite_glyphs.offset_y << ".\n"
-              << logofs_flush;
-      #endif
-    }
-  }
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded update. Type is "
-          << (unsigned int) renderExtension -> data.composite_glyphs.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_UPDATE
-
-MESSAGE_BEGIN_DECODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeXidValue(renderExtension -> data.composite_glyphs.src_id,
-                     clientCache -> renderSrcPictureCache);
-
-  decodeBuffer.decodeXidValue(renderExtension -> data.composite_glyphs.dst_id,
-                     clientCache -> renderDstPictureCache);
-
-  decodeBuffer.decodeCachedValue(renderExtension -> data.composite_glyphs.set_id, 29,
-                     clientCache -> renderGlyphSetCache);
-
-  //
-  // Src X and Y.
-  //
-
-  unsigned int value;
-  unsigned int previous;
-
-  // Since ProtoStep8 (#issue 108)
-  previous = renderExtension -> data.composite_glyphs.src_x;
-
-  decodeBuffer.decodeDiffCachedValue(value, previous, 16,
-                     clientCache -> renderGlyphXCache, 11);
-
-  renderExtension -> data.composite_glyphs.src_x = value;
-
-  previous = renderExtension -> data.composite_glyphs.src_y;
-
-  decodeBuffer.decodeDiffCachedValue(value, previous, 16,
-                     clientCache -> renderGlyphYCache, 11);
-
-  renderExtension -> data.composite_glyphs.src_y = value;
-
-  // Since ProtoStep8 (#issue 108)
-  if (renderExtension -> size_ >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
-  {
-    //
-    // Offset X and Y.
-    //
-
-    decodeBuffer.decodeBoolValue(value);
-
-    if (value == 0)
-    {
-      renderExtension -> data.composite_glyphs.offset_x =
-            renderExtension -> data.composite_glyphs.src_x;
-
-      renderExtension -> data.composite_glyphs.offset_y =
-            renderExtension -> data.composite_glyphs.src_y;
-    }
-    else
-    {
-      previous = renderExtension -> data.composite_glyphs.offset_x;
-
-      decodeBuffer.decodeDiffCachedValue(value, previous, 16,
-                         clientCache -> renderGlyphXCache, 11);
-
-      renderExtension -> data.composite_glyphs.offset_x = value;
-
-      previous = renderExtension -> data.composite_glyphs.offset_y;
-
-      decodeBuffer.decodeDiffCachedValue(value, previous, 16,
-                         clientCache -> renderGlyphYCache, 11);
-
-      renderExtension -> data.composite_glyphs.offset_y = value;
-    }
-  }
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded update. Type is "
-          << (unsigned int) renderExtension -> data.composite_glyphs.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_UPDATE
diff --git a/nxcomp/RenderCompositeGlyphs.h b/nxcomp/RenderCompositeGlyphs.h
deleted file mode 100644
index 1062ee781..000000000
--- a/nxcomp/RenderCompositeGlyphs.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef RenderCompositeGlyphs_H
-#define RenderCompositeGlyphs_H
-
-//
-// Define the characteristics
-// of this message class here.
-//
-
-#undef  MESSAGE_NAME
-#define MESSAGE_NAME          "RenderCompositeGlyphs"
-
-#undef  MESSAGE_STORE
-#define MESSAGE_STORE         RenderCompositeGlyphsStore
-
-#undef  MESSAGE_CLASS
-#define MESSAGE_CLASS         RenderMinorExtensionStore
-
-#undef  MESSAGE_METHODS
-#define MESSAGE_METHODS       "RenderMinorExtensionMethods.h"
-
-#undef  MESSAGE_HEADERS
-#define MESSAGE_HEADERS       "RenderMinorExtensionHeaders.h"
-
-#undef  MESSAGE_TAGS
-#define MESSAGE_TAGS          "RenderMinorExtensionTags.h"
-
-#undef  MESSAGE_OFFSET
-#define MESSAGE_OFFSET        28
-
-#undef  MESSAGE_HAS_SIZE
-#define MESSAGE_HAS_SIZE      1
-
-#undef  MESSAGE_HAS_DATA
-#define MESSAGE_HAS_DATA      1
-
-#undef  MESSAGE_HAS_FILTER
-#define MESSAGE_HAS_FILTER    0
-
-//
-// Encode the first 8 bytes of the
-// data differentially in newer
-// protocol versions.
-//
-
-#undef  MESSAGE_OFFSET_IF_PROTO_STEP_8
-#define MESSAGE_OFFSET_IF_PROTO_STEP_8  36
-
-//
-// Declare the message class.
-//
-
-#include MESSAGE_HEADERS
-
-class MESSAGE_STORE : public MESSAGE_CLASS
-{
-  public:
-
-  virtual const char *name() const
-  {
-    return MESSAGE_NAME;
-  }
-
-  virtual int identitySize(const unsigned char *buffer,
-                               unsigned int size)
-  {
-    // Since ProtoStep8 (#issue 108)
-    unsigned int offset = MESSAGE_OFFSET_IF_PROTO_STEP_8;
-
-    return (size >= offset ? offset : size);
-  }
-
-  #include MESSAGE_METHODS
-};
-
-#endif /* RenderCompositeGlyphs_H */
diff --git a/nxcomp/RenderCreateGlyphSet.cpp b/nxcomp/RenderCreateGlyphSet.cpp
deleted file mode 100644
index 3e7a71721..000000000
--- a/nxcomp/RenderCreateGlyphSet.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-//
-// Include the template for
-// this message class.
-//
-
-#include "RenderCreateGlyphSet.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-#include MESSAGE_TAGS
-
-//
-// Message handling methods.
-//
-
-MESSAGE_BEGIN_ENCODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeNewXidValue(GetULONG(buffer + 4, bigEndian),
-                     clientCache -> lastId, clientCache -> lastIdCache,
-                         clientCache -> renderGlyphSetCache,
-                             clientCache -> renderFreeGlyphSetCache);
-
-  encodeBuffer.encodeCachedValue(GetULONG(buffer + 8, bigEndian), 32,
-                     clientCache -> renderFormatCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded message. Type is "
-          << (unsigned int) *(buffer + 1) << " size is "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_MESSAGE
-
-MESSAGE_BEGIN_DECODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  *(buffer + 1) = type;
-
-  decodeBuffer.decodeNewXidValue(value,
-                     clientCache -> lastId, clientCache -> lastIdCache,
-                         clientCache -> renderGlyphSetCache,
-                             clientCache -> renderFreeGlyphSetCache);
-
-  PutULONG(value, buffer + 4, bigEndian);
-
-  decodeBuffer.decodeCachedValue(value, 32,
-                     clientCache -> renderFormatCache);
-
-  PutULONG(value, buffer + 8, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded message. Type is "
-          << (unsigned int) type << " size is " << size
-          << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_MESSAGE
-
-MESSAGE_BEGIN_PARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  renderExtension -> data.create_set.type = *(buffer + 1);
-
-  renderExtension -> data.create_set.set_id = GetULONG(buffer + 4, bigEndian);
-  renderExtension -> data.create_set.format = GetULONG(buffer + 8, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Parsed identity. Type is "
-          << (unsigned int) renderExtension -> data.create_set.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_PARSE_IDENTITY
-
-MESSAGE_BEGIN_UNPARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  *(buffer + 1) = renderExtension -> data.create_set.type;
-
-  PutULONG(renderExtension -> data.create_set.set_id, buffer + 4,  bigEndian);
-  PutULONG(renderExtension -> data.create_set.format,   buffer + 8,  bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Unparsed identity. Type is "
-          << (unsigned int) renderExtension -> data.create_set.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_UNPARSE_IDENTITY
-
-MESSAGE_BEGIN_IDENTITY_CHECKSUM
-{
-  md5_append(md5_state, buffer + 1, 3);
-  md5_append(md5_state, buffer + 8, 4);
-}
-MESSAGE_END_IDENTITY_CHECKSUM
-
-MESSAGE_BEGIN_ENCODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
-  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeNewXidValue(renderExtension -> data.create_set.set_id,
-                     clientCache -> lastId, clientCache -> lastIdCache,
-                         clientCache -> renderGlyphSetCache,
-                             clientCache -> renderFreeGlyphSetCache);
-
-  cachedRenderExtension -> data.create_set.set_id =
-              renderExtension -> data.create_set.set_id;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded update. Type is "
-          << (unsigned int) renderExtension -> data.create_set.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_UPDATE
-
-MESSAGE_BEGIN_DECODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeNewXidValue(renderExtension -> data.create_set.set_id,
-                     clientCache -> lastId, clientCache -> lastIdCache,
-                         clientCache -> renderGlyphSetCache,
-                             clientCache -> renderFreeGlyphSetCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded update. Type is "
-          << (unsigned int) renderExtension -> data.create_set.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_UPDATE
diff --git a/nxcomp/RenderCreateGlyphSet.h b/nxcomp/RenderCreateGlyphSet.h
deleted file mode 100644
index 10f5d6699..000000000
--- a/nxcomp/RenderCreateGlyphSet.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef RenderCreateGlyphSet_H
-#define RenderCreateGlyphSet_H
-
-//
-// Define the characteristics
-// of this message class here.
-//
-
-#undef  MESSAGE_NAME
-#define MESSAGE_NAME          "RenderCreateGlyphSet"
-
-#undef  MESSAGE_STORE
-#define MESSAGE_STORE         RenderCreateGlyphSetStore
-
-#undef  MESSAGE_CLASS
-#define MESSAGE_CLASS         RenderMinorExtensionStore
-
-#undef  MESSAGE_METHODS
-#define MESSAGE_METHODS       "RenderMinorExtensionMethods.h"
-
-#undef  MESSAGE_HEADERS
-#define MESSAGE_HEADERS       "RenderMinorExtensionHeaders.h"
-
-#undef  MESSAGE_TAGS
-#define MESSAGE_TAGS          "RenderMinorExtensionTags.h"
-
-#undef  MESSAGE_OFFSET
-#define MESSAGE_OFFSET        12
-
-#undef  MESSAGE_HAS_SIZE
-#define MESSAGE_HAS_SIZE      0
-
-#undef  MESSAGE_HAS_DATA
-#define MESSAGE_HAS_DATA      0
-
-#undef  MESSAGE_HAS_FILTER
-#define MESSAGE_HAS_FILTER    0
-
-//
-// Declare the message class.
-//
-
-#include MESSAGE_HEADERS
-
-class MESSAGE_STORE : public MESSAGE_CLASS
-{
-  public:
-
-  virtual const char *name() const
-  {
-    return MESSAGE_NAME;
-  }
-
-  virtual int identitySize(const unsigned char *buffer,
-                               unsigned int size)
-  {
-    return MESSAGE_OFFSET;
-  }
-
-  #include MESSAGE_METHODS
-};
-
-#endif /* RenderCreateGlyphSet_H */
diff --git a/nxcomp/RenderCreatePicture.cpp b/nxcomp/RenderCreatePicture.cpp
deleted file mode 100644
index 2fd736cbb..000000000
--- a/nxcomp/RenderCreatePicture.cpp
+++ /dev/null
@@ -1,274 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-//
-// Include the template for
-// this message class.
-//
-
-#include "RenderCreatePicture.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-#include MESSAGE_TAGS
-
-//
-// Message handling methods.
-//
-
-MESSAGE_BEGIN_ENCODE_SIZE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeCachedValue((size - MESSAGE_OFFSET) >> 2, 16,
-                     clientCache -> renderLengthCache, 5);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded size with value "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_SIZE
-
-MESSAGE_BEGIN_DECODE_SIZE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeCachedValue(size, 16,
-                     clientCache -> renderLengthCache, 5);
-
-  size = MESSAGE_OFFSET + (size << 2);
-
-  buffer = writeBuffer -> addMessage(size);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded size with value "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_SIZE
-
-MESSAGE_BEGIN_ENCODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeNewXidValue(GetULONG(buffer + 4, bigEndian),
-                     clientCache -> lastId, clientCache -> lastIdCache,
-                         clientCache -> renderSrcPictureCache,
-                             clientCache -> renderFreePictureCache);
-
-  encodeBuffer.encodeXidValue(GetULONG(buffer + 8, bigEndian),
-                     clientCache -> drawableCache);
-
-  encodeBuffer.encodeCachedValue(GetULONG(buffer + 12, bigEndian), 32,
-                     clientCache -> renderFormatCache);
-
-  encodeBuffer.encodeCachedValue(GetULONG(buffer + 16, bigEndian), 32,
-                     clientCache -> renderValueMaskCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded message. Type is "
-          << (unsigned int) *(buffer + 1) << " size is "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_MESSAGE
-
-MESSAGE_BEGIN_DECODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  *(buffer + 1) = type;
-
-  decodeBuffer.decodeNewXidValue(value,
-                     clientCache -> lastId, clientCache -> lastIdCache,
-                         clientCache -> renderSrcPictureCache,
-                             clientCache -> renderFreePictureCache);
-
-  PutULONG(value, buffer + 4, bigEndian);
-
-  decodeBuffer.decodeXidValue(value,
-                     clientCache -> drawableCache);
-
-  PutULONG(value, buffer + 8, bigEndian);
-
-  decodeBuffer.decodeCachedValue(value, 32,
-                     clientCache -> renderFormatCache);
-
-  PutULONG(value, buffer + 12, bigEndian);
-
-  decodeBuffer.decodeCachedValue(value, 32,
-                     clientCache -> renderValueMaskCache);
-
-  PutULONG(value, buffer + 16, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded message. Type is "
-          << (unsigned int) type << " size is " << size
-          << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_MESSAGE
-
-MESSAGE_BEGIN_ENCODE_DATA
-{
-  encodeLongData(encodeBuffer, buffer, MESSAGE_OFFSET,
-                     size, bigEndian, channelCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded " << size - MESSAGE_OFFSET
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_DATA
-
-MESSAGE_BEGIN_DECODE_DATA
-{
-  decodeLongData(decodeBuffer, buffer, MESSAGE_OFFSET,
-                     size, bigEndian, channelCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded " << size - MESSAGE_OFFSET
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_DATA
-
-MESSAGE_BEGIN_PARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  renderExtension -> data.create_picture.type = *(buffer + 1);
-
-  renderExtension -> data.create_picture.src_id = GetULONG(buffer + 4,  bigEndian);
-  renderExtension -> data.create_picture.dst_id = GetULONG(buffer + 8,  bigEndian);
-
-  renderExtension -> data.create_picture.format = GetULONG(buffer + 12,  bigEndian);
-  renderExtension -> data.create_picture.mask   = GetULONG(buffer + 16,  bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Parsed identity. Type is "
-          << (unsigned int) renderExtension -> data.create_picture.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_PARSE_IDENTITY
-
-MESSAGE_BEGIN_UNPARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  *(buffer + 1) = renderExtension -> data.create_picture.type;
-
-  PutULONG(renderExtension -> data.create_picture.src_id, buffer + 4,  bigEndian);
-  PutULONG(renderExtension -> data.create_picture.dst_id, buffer + 8, bigEndian);
-
-  PutULONG(renderExtension -> data.create_picture.format, buffer + 12, bigEndian);
-  PutULONG(renderExtension -> data.create_picture.mask,   buffer + 16, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Unparsed identity. Type is "
-          << (unsigned int) renderExtension -> data.create_picture.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_UNPARSE_IDENTITY
-
-MESSAGE_BEGIN_IDENTITY_CHECKSUM
-{
-  md5_append(md5_state, buffer + 1,  3);
-  md5_append(md5_state, buffer + 12, 8);
-}
-MESSAGE_END_IDENTITY_CHECKSUM
-
-MESSAGE_BEGIN_ENCODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
-  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Encoding new id value "
-          << renderExtension -> data.create_picture.src_id
-          << ".\n";
-  #endif
-
-  encodeBuffer.encodeNewXidValue(renderExtension -> data.create_picture.src_id,
-                     clientCache -> lastId, clientCache -> lastIdCache,
-                         clientCache -> renderSrcPictureCache,
-                             clientCache -> renderFreePictureCache);
-
-  cachedRenderExtension -> data.create_picture.src_id =
-              renderExtension -> data.create_picture.src_id;
-
-  encodeBuffer.encodeXidValue(renderExtension -> data.create_picture.dst_id,
-                     clientCache -> drawableCache);
-
-  cachedRenderExtension -> data.create_picture.dst_id =
-              renderExtension -> data.create_picture.dst_id;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded update. Type is "
-          << (unsigned int) renderExtension -> data.create_picture.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_UPDATE
-
-MESSAGE_BEGIN_DECODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeNewXidValue(renderExtension -> data.create_picture.src_id,
-                     clientCache -> lastId, clientCache -> lastIdCache,
-                         clientCache -> renderSrcPictureCache,
-                             clientCache -> renderFreePictureCache);
-
-  decodeBuffer.decodeXidValue(renderExtension -> data.create_picture.dst_id,
-                     clientCache -> drawableCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded update. Type is "
-          << (unsigned int) renderExtension -> data.create_picture.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_UPDATE
diff --git a/nxcomp/RenderCreatePicture.h b/nxcomp/RenderCreatePicture.h
deleted file mode 100644
index ae2f583a0..000000000
--- a/nxcomp/RenderCreatePicture.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef RenderCreatePicture_H
-#define RenderCreatePicture_H
-
-//
-// Define the characteristics
-// of this message class here.
-//
-
-#undef  MESSAGE_NAME
-#define MESSAGE_NAME          "RenderCreatePicture"
-
-#undef  MESSAGE_STORE
-#define MESSAGE_STORE         RenderCreatePictureStore
-
-#undef  MESSAGE_CLASS
-#define MESSAGE_CLASS         RenderMinorExtensionStore
-
-#undef  MESSAGE_METHODS
-#define MESSAGE_METHODS       "RenderMinorExtensionMethods.h"
-
-#undef  MESSAGE_HEADERS
-#define MESSAGE_HEADERS       "RenderMinorExtensionHeaders.h"
-
-#undef  MESSAGE_TAGS
-#define MESSAGE_TAGS          "RenderMinorExtensionTags.h"
-
-#undef  MESSAGE_OFFSET
-#define MESSAGE_OFFSET        20
-
-#undef  MESSAGE_HAS_SIZE
-#define MESSAGE_HAS_SIZE      1
-
-#undef  MESSAGE_HAS_DATA
-#define MESSAGE_HAS_DATA      1
-
-#undef  MESSAGE_HAS_FILTER
-#define MESSAGE_HAS_FILTER    0
-
-//
-// Declare the message class.
-//
-
-#include MESSAGE_HEADERS
-
-class MESSAGE_STORE : public MESSAGE_CLASS
-{
-  public:
-
-  virtual const char *name() const
-  {
-    return MESSAGE_NAME;
-  }
-
-  virtual int identitySize(const unsigned char *buffer,
-                               unsigned int size)
-  {
-    return MESSAGE_OFFSET;
-  }
-
-  #include MESSAGE_METHODS
-};
-
-#endif /* RenderCreatePicture_H */
diff --git a/nxcomp/RenderExtension.cpp b/nxcomp/RenderExtension.cpp
deleted file mode 100644
index bd2285e82..000000000
--- a/nxcomp/RenderExtension.cpp
+++ /dev/null
@@ -1,423 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "NXrender.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-#include "WriteBuffer.h"
-
-#include "RenderExtension.h"
-
-#include "RenderGenericRequest.h"
-#include "RenderCreatePicture.h"
-#include "RenderChangePicture.h"
-#include "RenderFreePicture.h"
-#include "RenderPictureClip.h"
-#include "RenderPictureTransform.h"
-#include "RenderPictureFilter.h"
-#include "RenderCreateGlyphSet.h"
-#include "RenderFreeGlyphSet.h"
-#include "RenderAddGlyphs.h"
-#include "RenderComposite.h"
-#include "RenderCompositeGlyphs.h"
-#include "RenderFillRectangles.h"
-#include "RenderTrapezoids.h"
-#include "RenderTriangles.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-//
-// Constructor and destructor.
-//
-
-RenderExtensionStore::RenderExtensionStore(StaticCompressor *compressor)
-
-  : MessageStore(compressor)
-{
-  enableCache    = RENDEREXTENSION_ENABLE_CACHE;
-  enableData     = RENDEREXTENSION_ENABLE_DATA;
-  enableSplit    = RENDEREXTENSION_ENABLE_SPLIT;
-  enableCompress = RENDEREXTENSION_ENABLE_COMPRESS;
-
-  generic_ = new RenderGenericRequestStore();
-
-  for (int i = 0; i < RENDEREXTENSION_MINOR_OPCODE_LIMIT; i++)
-  {
-    minors_[i] = generic_;
-  }
-
-  minors_[X_RenderChangePicture]  = new RenderChangePictureStore();
-  minors_[X_RenderFillRectangles] = new RenderFillRectanglesStore();
-  minors_[X_RenderAddGlyphs]      = new RenderAddGlyphsStore();
-
-  // Since ProtoStep7 (#issue 108)
-  minors_[X_RenderCreatePicture]            = new RenderCreatePictureStore();
-  minors_[X_RenderFreePicture]              = new RenderFreePictureStore();
-  minors_[X_RenderSetPictureClipRectangles] = new RenderPictureClipStore();
-  minors_[X_RenderCreateGlyphSet]           = new RenderCreateGlyphSetStore();
-  minors_[X_RenderComposite]                = new RenderCompositeStore();
-  minors_[X_RenderCompositeGlyphs8]         = new RenderCompositeGlyphsStore();
-  minors_[X_RenderCompositeGlyphs16]        = new RenderCompositeGlyphsStore();
-  minors_[X_RenderCompositeGlyphs32]        = new RenderCompositeGlyphsStore();
-
-  minors_[X_RenderSetPictureTransform] = new RenderPictureTransformStore();
-  minors_[X_RenderSetPictureFilter]    = new RenderPictureFilterStore();
-  minors_[X_RenderFreeGlyphSet]        = new RenderFreeGlyphSetStore();
-  minors_[X_RenderTrapezoids]          = new RenderTrapezoidsStore();
-  minors_[X_RenderTriangles]           = new RenderTrianglesStore();
-
-  dataLimit  = RENDEREXTENSION_DATA_LIMIT;
-  dataOffset = RENDEREXTENSION_DATA_OFFSET;
-
-  // Since ProtoStep7 (#issue 108)
-  cacheSlots = RENDEREXTENSION_CACHE_SLOTS_IF_PROTO_STEP_7;
-
-  cacheThreshold      = RENDEREXTENSION_CACHE_THRESHOLD;
-  cacheLowerThreshold = RENDEREXTENSION_CACHE_LOWER_THRESHOLD;
-
-  opcode_ = X_NXInternalRenderExtension;
-
-  messages_ -> resize(cacheSlots);
-
-  for (T_messages::iterator i = messages_ -> begin();
-           i < messages_ -> end(); i++)
-  {
-    *i = NULL;
-  }
-
-  temporary_ = NULL;
-}
-
-RenderExtensionStore::~RenderExtensionStore()
-{
-  for (int i = 0; i < RENDEREXTENSION_MINOR_OPCODE_LIMIT; i++)
-  {
-    if (minors_[i] != generic_)
-    {
-      delete minors_[i];
-    }
-  }
-
-  delete generic_;
-
-  for (T_messages::iterator i = messages_ -> begin();
-           i < messages_ -> end(); i++)
-  {
-    destroy(*i);
-  }
-
-  destroy(temporary_);
-}
-
-int RenderExtensionStore::validateMessage(const unsigned char *buffer, int size)
-{
-  #ifdef TEST
-  *logofs << name() << ": Encoding message OPCODE#"
-          << (unsigned) *buffer << " MINOR#" << (unsigned)
-             *(buffer + 1) << " with size " << size
-          << ".\n" << logofs_flush;
-  #endif
-
-  return (size >= control -> MinimumMessageSize &&
-              size <= control -> MaximumMessageSize);
-}
-
-//
-// Here are the methods to handle the messages' content.
-//
-
-int RenderExtensionStore::identitySize(const unsigned char *buffer, unsigned int size)
-{
-  return minors_[*(buffer + 1)] -> identitySize(buffer, size);
-}
-
-int RenderExtensionStore::encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                             const unsigned int size, int bigEndian,
-                                                 ChannelCache *channelCache) const
-{
-  encodeBuffer.encodeOpcodeValue(*(buffer + 1),
-                     ((ClientCache *) channelCache) -> renderOpcodeCache);
-
-  minors_[*(buffer + 1)] -> encodeMessage(encodeBuffer, buffer, size,
-                                              bigEndian, channelCache);
-
-  return 1;
-}
-
-int RenderExtensionStore::decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                                             unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
-                                                 ChannelCache *channelCache) const
-{
-  unsigned char type;
-
-  decodeBuffer.decodeOpcodeValue(type,
-                     ((ClientCache *) channelCache) -> renderOpcodeCache);
-
-  minors_[type] -> decodeMessage(decodeBuffer, buffer, size, type,
-                                     bigEndian, writeBuffer, channelCache);
-
-  return 1;
-}
-
-int RenderExtensionStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                            unsigned int size, int bigEndian) const
-{
-  return minors_[*(buffer + 1)] -> parseIdentity(message, buffer, size, bigEndian);
-}
-
-int RenderExtensionStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                              unsigned int size, int bigEndian) const
-{
-  return minors_[((RenderExtensionMessage *) message) -> data.any.type] ->
-                     unparseIdentity(message, buffer, size, bigEndian);
-}
-
-void RenderExtensionStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                               unsigned int size, int bigEndian) const
-{
-  minors_[*(buffer + 1)] -> identityChecksum(message, buffer, size, md5_state_, bigEndian);
-}
-
-void RenderExtensionStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                              const Message *cachedMessage,
-                                                   ChannelCache *channelCache) const
-{
-  minors_[((RenderExtensionMessage *) message) -> data.any.type] ->
-              updateIdentity(encodeBuffer, message, cachedMessage, channelCache);
-}
-
-void RenderExtensionStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                              ChannelCache *channelCache) const
-{
-  minors_[((RenderExtensionMessage *) message) -> data.any.type] ->
-              updateIdentity(decodeBuffer, message, channelCache);
-}
-
-void RenderExtensionStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  #ifdef WARNING
-  *logofs << name() << ": WARNING! Dump of identity not implemented.\n"
-          << logofs_flush;
-  #endif
-
-  #endif
-}
-
-//
-// TODO: The following encoding and decoding functions
-// could be generalized further, for example by passing
-// the pointer to the data cache, the number of caches
-// made available by the caller and the first cache to
-// iterate through.
-//
-
-void RenderMinorExtensionStore::encodeLongData(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                                   unsigned int offset, unsigned int size, int bigEndian,
-                                                       ChannelCache *channelCache) const
-{
-  // Since ProtoStep7 (#issue 108)
-  encodeBuffer.encodeLongData(buffer + offset, size - offset);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded " << size - offset
-          << " bytes of long data.\n" << logofs_flush;
-  #endif
-}
-
-void RenderMinorExtensionStore::encodeIntData(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                                  unsigned int offset, unsigned int size, int bigEndian,
-                                                      ChannelCache *channelCache) const
-{
-  // Since ProtoStep7 (#issue 108)
-  encodeBuffer.encodeIntData(buffer + offset, size - offset);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded " << size - offset
-          << " bytes of int data.\n" << logofs_flush;
-  #endif
-}
-
-void RenderMinorExtensionStore::encodeCharData(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                                   unsigned int offset, unsigned int size, int bigEndian,
-                                                       ChannelCache *channelCache) const
-{
-  // Since ProtoStep7 (#issue 108)
-  encodeBuffer.encodeTextData(buffer + offset, size - offset);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded " << size - offset
-          << " bytes of text data.\n" << logofs_flush;
-  #endif
-}
-
-void RenderMinorExtensionStore::decodeLongData(DecodeBuffer &decodeBuffer, unsigned char *buffer,
-                                                   unsigned int offset, unsigned int size, int bigEndian,
-                                                       ChannelCache *channelCache) const
-{
-  // Since ProtoStep7 (#issue 108)
-  decodeBuffer.decodeLongData(buffer + offset, size - offset);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded " << size - offset
-          << " bytes of long data.\n" << logofs_flush;
-  #endif
-}
-
-void RenderMinorExtensionStore::decodeIntData(DecodeBuffer &decodeBuffer, unsigned char *buffer,
-                                                  unsigned int offset, unsigned int size, int bigEndian,
-                                                      ChannelCache *channelCache) const
-{
-  // Since ProtoStep7 (#issue 108)
-  decodeBuffer.decodeIntData(buffer + offset, size - offset);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded " << size - offset
-          << " bytes of int data.\n" << logofs_flush;
-  #endif
-}
-
-void RenderMinorExtensionStore::decodeCharData(DecodeBuffer &decodeBuffer, unsigned char *buffer,
-                                                   unsigned int offset, unsigned int size, int bigEndian,
-                                                       ChannelCache *channelCache) const
-{
-  // Since ProtoStep7 (#issue 108)
-  decodeBuffer.decodeTextData(buffer + offset, size - offset);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded " << size - offset
-          << " bytes of text data.\n" << logofs_flush;
-  #endif
-}
-
-void RenderMinorExtensionStore::parseIntData(const Message *message, const unsigned char *buffer,
-                                                 unsigned int offset, unsigned int size,
-                                                     int bigEndian) const
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  unsigned int last = ((unsigned) message -> i_size_ > size ? size : message -> i_size_);
-
-  for (unsigned int i = offset, c = (offset - 4) % 16; i < last; i += 2)
-  {
-    #ifdef DEBUG
-    *logofs << name() << ": Parsing int with i = " << i << " c = "
-            << c << ".\n" << logofs_flush;
-    #endif
-
-    renderExtension -> data.any.short_data[c] = GetUINT(buffer + i, bigEndian);
-
-    if (++c == 16) c = 0;
-  }
-}
-
-void RenderMinorExtensionStore::unparseIntData(const Message *message, unsigned char *buffer,
-                                                   unsigned int offset, unsigned int size,
-                                                       int bigEndian) const
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  unsigned int last = ((unsigned) message -> i_size_ > size ? size : message -> i_size_);
-
-  for (unsigned int i = offset, c = (offset - 4) % 16; i < last; i += 2)
-  {
-    #ifdef DEBUG
-    *logofs << name() << ": Unparsing int with i = " << i << " c = "
-            << c << ".\n" << logofs_flush;
-    #endif
-
-    PutUINT(renderExtension -> data.any.short_data[c], buffer + i, bigEndian);
-
-    if (++c == 16) c = 0;
-  }
-}
-
-void RenderMinorExtensionStore::updateIntData(EncodeBuffer &encodeBuffer, const Message *message,
-                                                  const Message *cachedMessage, unsigned int offset,
-                                                      unsigned int size, ChannelCache *channelCache) const
-{
-  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
-  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int last = ((unsigned) message -> i_size_ > size ? size : message -> i_size_);
-
-  for (unsigned int i = offset, c = (offset - 4) % 16; i < last; i += 2)
-  {
-    #ifdef DEBUG
-    *logofs << name() << ": Encoding int update with i = " << i
-            << " c = " << c << ".\n" << logofs_flush;
-    #endif
-
-    encodeBuffer.encodeCachedValue(renderExtension -> data.any.short_data[c], 16,
-                       *clientCache -> renderDataCache[c]);
-
-    cachedRenderExtension -> data.any.short_data[c] =
-                renderExtension -> data.any.short_data[c];
-
-    if (++c == 16) c = 0;
-  }
-}
-
-void RenderMinorExtensionStore::updateIntData(DecodeBuffer &decodeBuffer, const Message *message,
-                                                  unsigned int offset, unsigned int size,
-                                                      ChannelCache *channelCache) const
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int last = ((unsigned) message -> i_size_ > size ? size : message -> i_size_);
-
-  unsigned int value;
-
-  for (unsigned int i = offset, c = (offset - 4) % 16; i < last; i += 2)
-  {
-    #ifdef DEBUG
-    *logofs << name() << ": Decoding int update with i = " << i
-            << " c = " << c << ".\n" << logofs_flush;
-    #endif
-
-    decodeBuffer.decodeCachedValue(value, 16,
-                       *clientCache -> renderDataCache[c]);
-
-    renderExtension -> data.any.short_data[c] = value;
-
-    if (++c == 16) c = 0;
-  }
-}
diff --git a/nxcomp/RenderExtension.h b/nxcomp/RenderExtension.h
deleted file mode 100644
index aa9db1b55..000000000
--- a/nxcomp/RenderExtension.h
+++ /dev/null
@@ -1,504 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef RenderExtension_H
-#define RenderExtension_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Compression of data part is not enabled as
-// most messages of this type are smaller than
-// the current data size compression threshold.
-//
-
-#define RENDEREXTENSION_ENABLE_CACHE               1
-#define RENDEREXTENSION_ENABLE_DATA                0
-#define RENDEREXTENSION_ENABLE_SPLIT               0
-#define RENDEREXTENSION_ENABLE_COMPRESS            0
-
-#define RENDEREXTENSION_DATA_LIMIT                 6144
-#define RENDEREXTENSION_DATA_OFFSET                36
-
-#define RENDEREXTENSION_CACHE_THRESHOLD            20
-#define RENDEREXTENSION_CACHE_LOWER_THRESHOLD      10
-
-#define RENDEREXTENSION_CACHE_SLOTS_IF_PROTO_STEP_7    8000
-
-//
-// Used to build the table of minor opcodes.
-//
-
-#define RENDEREXTENSION_MINOR_OPCODE_LIMIT         256
-
-//
-// The message class.
-//
-
-class RenderMinorExtensionStore;
-
-class RenderExtensionMessage : public Message
-{
-  friend class RenderExtensionStore;
-  friend class RenderMinorExtensionStore;
-
-  friend class RenderGenericRequestStore;
-  friend class RenderCreatePictureStore;
-  friend class RenderChangePictureStore;
-  friend class RenderFreePictureStore;
-  friend class RenderPictureClipStore;
-  friend class RenderPictureTransformStore;
-  friend class RenderPictureFilterStore;
-  friend class RenderCreateGlyphSetStore;
-  friend class RenderFreeGlyphSetStore;
-  friend class RenderAddGlyphsStore;
-  friend class RenderCompositeStore;
-  friend class RenderCompositeGlyphsStore;
-  friend class RenderFillRectanglesStore;
-  friend class RenderTrapezoidsStore;
-  friend class RenderTrianglesStore;
-
-  public:
-
-  RenderExtensionMessage()
-  {
-  }
-
-  ~RenderExtensionMessage()
-  {
-  }
-
-  //
-  // We consider for this message a data offset of 36,
-  // that is size of the biggest among all requests of
-  // this extension. The most common requests have a
-  // specific differential encoding, others are simply
-  // encoded through an array of int or char caches.
-  //
-
-  private:
-
-  union
-  {
-    struct
-    {
-      unsigned char type;
-
-      unsigned char  char_data[32];
-      unsigned short short_data[16];
-      unsigned short long_data[8];
-    }
-    any;
-
-    struct
-    {
-      unsigned char type;
-
-      unsigned int src_id;
-      unsigned int dst_id;
-
-      unsigned int format;
-      unsigned int mask;
-    }
-    create_picture;
-
-    struct
-    {
-      unsigned char type;
-
-      unsigned int src_id;
-    }
-    change_picture;
-
-    struct
-    {
-      unsigned char type;
-
-      unsigned int src_id;
-    }
-    free_picture;
-
-    struct
-    {
-      unsigned char type;
-
-      unsigned int src_id;
-
-      unsigned short src_x;
-      unsigned short src_y;
-    }
-    picture_clip;
-
-    struct
-    {
-      unsigned char type;
-
-      unsigned int src_id;
-    }
-    picture_transform;
-
-    struct
-    {
-      unsigned char type;
-
-      unsigned int src_id;
-      unsigned int num_elm;
-    }
-    picture_filter;
-
-    struct
-    {
-      unsigned char type;
-
-      unsigned int set_id;
-      unsigned int format;
-    }
-    create_set;
-
-    struct
-    {
-      unsigned char type;
-
-      unsigned int set_id;
-    }
-    free_set;
-
-    struct
-    {
-      unsigned char type;
-
-      unsigned int set_id;
-      unsigned int num_elm;
-    }
-    add_glyphs;
-
-    struct
-    {
-      unsigned char type;
-
-      unsigned char op;
-
-      unsigned int src_id;
-      unsigned int msk_id;
-      unsigned int dst_id;
-
-      unsigned short src_x;
-      unsigned short src_y;
-
-      unsigned short msk_x;
-      unsigned short msk_y;
-
-      unsigned short dst_x;
-      unsigned short dst_y;
-
-      unsigned short width;
-      unsigned short height;
-    }
-    composite;
-
-    struct
-    {
-      unsigned char type;
-
-      unsigned char op;
-
-      unsigned char num_elm;
-
-      unsigned int src_id;
-      unsigned int dst_id;
-
-      unsigned int format;
-      unsigned int set_id;
-
-      unsigned short src_x;
-      unsigned short src_y;
-
-      unsigned short offset_x;
-      unsigned short offset_y;
-    }
-    composite_glyphs;
-
-    struct
-    {
-      unsigned char type;
-
-      unsigned char op;
-
-      unsigned int dst_id;
-    }
-    fill_rectangles;
-
-    struct
-    {
-      unsigned char type;
-
-      unsigned char op;
-
-      unsigned int src_id;
-      unsigned int dst_id;
-
-      unsigned int format;
-
-      unsigned short src_x;
-      unsigned short src_y;
-    }
-    trapezoids;
-
-    struct
-    {
-      unsigned char type;
-
-      unsigned char op;
-
-      unsigned int src_id;
-      unsigned int dst_id;
-
-      unsigned int format;
-
-      unsigned short src_x;
-      unsigned short src_y;
-    }
-    triangles;
-
-    struct
-    {
-      unsigned char type;
-
-      unsigned char op;
-
-      unsigned char num_elm;
-
-      unsigned int src_id;
-      unsigned int dst_id;
-
-      unsigned int format;
-      unsigned int set_id;
-
-      unsigned short src_x;
-      unsigned short src_y;
-
-      unsigned short delta_x;
-      unsigned short delta_y;
-    }
-    composite_glyphs_compat;
-
-  }
-  data;
-};
-
-class RenderExtensionStore : public MessageStore
-{
-  public:
-
-  RenderExtensionStore(StaticCompressor *compressor);
-
-  virtual ~RenderExtensionStore();
-
-  virtual const char *name() const
-  {
-    return "RenderExtension";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return opcode_;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(RenderExtensionMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  public:
-
-  virtual Message *create() const
-  {
-    return new RenderExtensionMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new RenderExtensionMessage((const RenderExtensionMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (RenderExtensionMessage *) message;
-  }
-
-  //
-  // Determine if the message must be stored
-  // in the cache.
-  //
-
-  virtual int validateMessage(const unsigned char *buffer, int size);
-
-  //
-  // Since protocol step 5 these methods are
-  // specialized in their minor opcode stores.
-  //
-
-  virtual int identitySize(const unsigned char *buffer, unsigned int size);
-
-  virtual int encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                 const unsigned int size, int bigEndian,
-                                     ChannelCache *channelCache) const;
-
-  virtual int decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                                 unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
-                                     ChannelCache *channelCache) const;
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-
-  private:
-
-  unsigned char opcode_;
-
-  //
-  // Keep pointers to specialized classes.
-  //
-
-  RenderMinorExtensionStore *minors_[RENDEREXTENSION_MINOR_OPCODE_LIMIT];
-
-  RenderMinorExtensionStore *generic_;
-};
-
-class RenderMinorExtensionStore : public MinorMessageStore
-{
-  public:
-
-  virtual const char *name() const = 0;
-
-  virtual int identitySize(const unsigned char *buffer, unsigned int size) = 0;
-
-  virtual int encodeMessage(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                const unsigned int size, int bigEndian,
-                                    ChannelCache *channelCache) const = 0;
-
-  virtual int decodeMessage(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                                unsigned int &size, unsigned char type, int bigEndian,
-                                    WriteBuffer *writeBuffer, ChannelCache *channelCache) const = 0;
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const = 0;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const = 0;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const = 0;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const = 0;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-                                    unsigned int size, md5_state_t *md5_state,
-                                        int bigEndian) const = 0;
-
-  //
-  // Internal encode and decode utilities.
-  //
-
-  protected:
-
-  void encodeLongData(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                          unsigned int offset, unsigned int size, int bigEndian,
-                              ChannelCache *channelCache) const;
- 
-  void encodeIntData(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                         unsigned int offset, unsigned int size, int bigEndian,
-                             ChannelCache *channelCache) const;
- 
-  void encodeCharData(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                          unsigned int offset, unsigned int size, int bigEndian,
-                              ChannelCache *channelCache) const;
-
-  void decodeLongData(DecodeBuffer &decodeBuffer, unsigned char *buffer,
-                          unsigned int offset, unsigned int size, int bigEndian,
-                              ChannelCache *channelCache) const;
-
-  void decodeIntData(DecodeBuffer &decodeBuffer, unsigned char *buffer,
-                         unsigned int offset, unsigned int size, int bigEndian,
-                             ChannelCache *channelCache) const;
-
-  void decodeCharData(DecodeBuffer &decodeBuffer, unsigned char *buffer,
-                          unsigned int offset, unsigned int size, int bigEndian,
-                              ChannelCache *channelCache) const;
-
-  /*
-   * The following methods are only used in the
-   * encoding of the generic render request. To
-   * be removed in future.
-   */
-
-  void parseIntData(const Message *message, const unsigned char *buffer,
-                        unsigned int offset, unsigned int size,
-                            int bigEndian) const;
-
-  void unparseIntData(const Message *message, unsigned char *buffer,
-                          unsigned int offset, unsigned int size,
-                              int bigEndian) const;
-
-  void updateIntData(EncodeBuffer &encodeBuffer, const Message *message,
-                         const Message *cachedMessage, unsigned int offset,
-                             unsigned int size, ChannelCache *channelCache) const;
-
-  void updateIntData(DecodeBuffer &decodeBuffer, const Message *message,
-                         unsigned int offset, unsigned int size,
-                             ChannelCache *channelCache) const;
-};
-
-#endif /* RenderExtension_H */
diff --git a/nxcomp/RenderFillRectangles.cpp b/nxcomp/RenderFillRectangles.cpp
deleted file mode 100644
index a6f2c0e0d..000000000
--- a/nxcomp/RenderFillRectangles.cpp
+++ /dev/null
@@ -1,233 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-//
-// Include the template for
-// this message class.
-//
-
-#include "RenderFillRectangles.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-#include MESSAGE_TAGS
-
-//
-// Message handling methods.
-//
-
-MESSAGE_BEGIN_ENCODE_SIZE
-{
-  //
-  // The color structure (4 components, 2 bytes
-  // each) is included in the data part, so that
-  // it gets into the checksum. The rectangles
-  // are in the format x, y, width, height with
-  // 2 bytes per each field, so each request is
-  // at least 12 + 8 + 8 = 28 bytes long.
-  //
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeCachedValue((size - MESSAGE_OFFSET) >> 2, 16,
-                     clientCache -> renderLengthCache, 5);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded size with value "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_SIZE
-
-MESSAGE_BEGIN_DECODE_SIZE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeCachedValue(size, 16,
-                     clientCache -> renderLengthCache, 5);
-
-  size = MESSAGE_OFFSET + (size << 2);
-
-  buffer = writeBuffer -> addMessage(size);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded size with value "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_SIZE
-
-MESSAGE_BEGIN_ENCODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeCachedValue(*(buffer + 4), 8,
-                     clientCache -> renderOpCache);
-
-  encodeBuffer.encodeXidValue(GetULONG(buffer + 8, bigEndian),
-                     clientCache -> renderSrcPictureCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded message. Type is "
-          << (unsigned int) *(buffer + 1) << " size is "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_MESSAGE
-
-MESSAGE_BEGIN_DECODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  *(buffer + 1) = type;
-
-  decodeBuffer.decodeCachedValue(*(buffer + 4), 8,
-                     clientCache -> renderOpCache);
-
-  decodeBuffer.decodeXidValue(value, clientCache -> renderSrcPictureCache);
-
-  PutULONG(value, buffer + 8, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded message. Type is "
-          << (unsigned int) type << " size is " << size
-          << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_MESSAGE
-
-MESSAGE_BEGIN_ENCODE_DATA
-{
-  encodeIntData(encodeBuffer, buffer, MESSAGE_OFFSET,
-                    size, bigEndian, channelCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded " << size - MESSAGE_OFFSET
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_DATA
-
-MESSAGE_BEGIN_DECODE_DATA
-{
-  decodeIntData(decodeBuffer, buffer, MESSAGE_OFFSET,
-                    size, bigEndian, channelCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded " << size - MESSAGE_OFFSET
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_DATA
-
-MESSAGE_BEGIN_PARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  renderExtension -> data.fill_rectangles.type = *(buffer + 1);
-  renderExtension -> data.fill_rectangles.op   = *(buffer + 4);
-
-  renderExtension -> data.fill_rectangles.dst_id = GetULONG(buffer + 8, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Parsed identity. Type is "
-          << (unsigned int) renderExtension -> data.fill_rectangles.type << " size is "
-          << renderExtension -> size_ << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_PARSE_IDENTITY
-
-MESSAGE_BEGIN_UNPARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  *(buffer + 1) = renderExtension -> data.fill_rectangles.type;
-  *(buffer + 4) = renderExtension -> data.fill_rectangles.op;
-
-  PutULONG(renderExtension -> data.fill_rectangles.dst_id, buffer + 8,  bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Unparsed identity. Type is "
-          << (unsigned int) renderExtension -> data.fill_rectangles.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_UNPARSE_IDENTITY
-
-MESSAGE_BEGIN_IDENTITY_CHECKSUM
-{
-  md5_append(md5_state, buffer + 1, 4);
-}
-MESSAGE_END_IDENTITY_CHECKSUM
-
-MESSAGE_BEGIN_ENCODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
-  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeXidValue(renderExtension -> data.fill_rectangles.dst_id,
-                     clientCache -> renderSrcPictureCache);
-
-  cachedRenderExtension -> data.fill_rectangles.dst_id =
-              renderExtension -> data.fill_rectangles.dst_id;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded update. Type is "
-          << (unsigned int) renderExtension -> data.fill_rectangles.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_UPDATE
-
-MESSAGE_BEGIN_DECODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeXidValue(renderExtension -> data.fill_rectangles.dst_id,
-                     clientCache -> renderSrcPictureCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded update. Type is "
-          << (unsigned int) renderExtension -> data.fill_rectangles.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_UPDATE
diff --git a/nxcomp/RenderFillRectangles.h b/nxcomp/RenderFillRectangles.h
deleted file mode 100644
index 9efaeffa8..000000000
--- a/nxcomp/RenderFillRectangles.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef RenderFillRectangles_H
-#define RenderFillRectangles_H
-
-//
-// Define the characteristics
-// of this message class here.
-//
-
-#undef  MESSAGE_NAME
-#define MESSAGE_NAME          "RenderFillRectangles"
-
-#undef  MESSAGE_STORE
-#define MESSAGE_STORE         RenderFillRectanglesStore
-
-#undef  MESSAGE_CLASS
-#define MESSAGE_CLASS         RenderMinorExtensionStore
-
-#undef  MESSAGE_METHODS
-#define MESSAGE_METHODS       "RenderMinorExtensionMethods.h"
-
-#undef  MESSAGE_HEADERS
-#define MESSAGE_HEADERS       "RenderMinorExtensionHeaders.h"
-
-#undef  MESSAGE_TAGS
-#define MESSAGE_TAGS          "RenderMinorExtensionTags.h"
-
-#undef  MESSAGE_OFFSET
-#define MESSAGE_OFFSET        12
-
-#undef  MESSAGE_HAS_SIZE
-#define MESSAGE_HAS_SIZE      1
-
-#undef  MESSAGE_HAS_DATA
-#define MESSAGE_HAS_DATA      1
-
-#undef  MESSAGE_HAS_FILTER
-#define MESSAGE_HAS_FILTER    0
-
-//
-// Declare the message class.
-//
-
-#include MESSAGE_HEADERS
-
-class MESSAGE_STORE : public MESSAGE_CLASS
-{
-  public:
-
-  virtual const char *name() const
-  {
-    return MESSAGE_NAME;
-  }
-
-  virtual int identitySize(const unsigned char *buffer,
-                               unsigned int size)
-  {
-    return MESSAGE_OFFSET;
-  }
-
-  #include MESSAGE_METHODS
-};
-
-#endif /* RenderFillRectangles_H */
diff --git a/nxcomp/RenderFreeGlyphSet.cpp b/nxcomp/RenderFreeGlyphSet.cpp
deleted file mode 100644
index cf1261ac0..000000000
--- a/nxcomp/RenderFreeGlyphSet.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-//
-// Include the template for
-// this message class.
-//
-
-#include "RenderFreeGlyphSet.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-#include MESSAGE_TAGS
-
-//
-// Message handling methods.
-//
-
-MESSAGE_BEGIN_ENCODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeFreeXidValue(GetULONG(buffer + 4, bigEndian),
-                     clientCache -> renderFreeGlyphSetCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded message. Type is "
-          << (unsigned int) *(buffer + 1) << " size is "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_MESSAGE
-
-MESSAGE_BEGIN_DECODE_MESSAGE
-{
-  unsigned int value;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  *(buffer + 1) = type;
-
-  decodeBuffer.decodeFreeXidValue(value,
-                     clientCache -> renderFreeGlyphSetCache);
-
-  PutULONG(value, buffer + 4, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded message. Type is "
-          << (unsigned int) type << " size is " << size
-          << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_MESSAGE
-
-MESSAGE_BEGIN_PARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  renderExtension -> data.free_set.type = *(buffer + 1);
-
-  renderExtension -> data.free_set.set_id = GetULONG(buffer + 4, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Parsed identity. Type is "
-          << (unsigned int) renderExtension -> data.free_set.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_PARSE_IDENTITY
-
-MESSAGE_BEGIN_UNPARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  *(buffer + 1) = renderExtension -> data.free_set.type;
-
-  PutULONG(renderExtension -> data.free_set.set_id, buffer + 4, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Unparsed identity. Type is "
-          << (unsigned int) renderExtension -> data.free_set.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_UNPARSE_IDENTITY
-
-MESSAGE_BEGIN_IDENTITY_CHECKSUM
-{
-  md5_append(md5_state, buffer + 1, 3);
-}
-MESSAGE_END_IDENTITY_CHECKSUM
-
-MESSAGE_BEGIN_ENCODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
-  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeFreeXidValue(renderExtension -> data.free_set.set_id,
-                     clientCache -> renderFreeGlyphSetCache);
-
-  cachedRenderExtension -> data.free_set.set_id =
-              renderExtension -> data.free_set.set_id;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded update. Type is "
-          << (unsigned int) renderExtension -> data.free_set.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_UPDATE
-
-MESSAGE_BEGIN_DECODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeFreeXidValue(renderExtension -> data.free_set.set_id,
-                     clientCache -> renderFreeGlyphSetCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded update. Type is "
-          << (unsigned int) renderExtension -> data.free_set.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_UPDATE
diff --git a/nxcomp/RenderFreeGlyphSet.h b/nxcomp/RenderFreeGlyphSet.h
deleted file mode 100644
index 8817e8d99..000000000
--- a/nxcomp/RenderFreeGlyphSet.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef RenderFreeGlyphSet_H
-#define RenderFreeGlyphSet_H
-
-//
-// Define the characteristics
-// of this message class here.
-//
-
-#undef  MESSAGE_NAME
-#define MESSAGE_NAME          "RenderFreeGlyphSet"
-
-#undef  MESSAGE_STORE
-#define MESSAGE_STORE         RenderFreeGlyphSetStore
-
-#undef  MESSAGE_CLASS
-#define MESSAGE_CLASS         RenderMinorExtensionStore
-
-#undef  MESSAGE_METHODS
-#define MESSAGE_METHODS       "RenderMinorExtensionMethods.h"
-
-#undef  MESSAGE_HEADERS
-#define MESSAGE_HEADERS       "RenderMinorExtensionHeaders.h"
-
-#undef  MESSAGE_TAGS
-#define MESSAGE_TAGS          "RenderMinorExtensionTags.h"
-
-#undef  MESSAGE_OFFSET
-#define MESSAGE_OFFSET        8
-
-#undef  MESSAGE_HAS_SIZE
-#define MESSAGE_HAS_SIZE      0
-
-#undef  MESSAGE_HAS_DATA
-#define MESSAGE_HAS_DATA      0
-
-#undef  MESSAGE_HAS_FILTER
-#define MESSAGE_HAS_FILTER    0
-
-//
-// Declare the message class.
-//
-
-#include MESSAGE_HEADERS
-
-class MESSAGE_STORE : public MESSAGE_CLASS
-{
-  public:
-
-  virtual const char *name() const
-  {
-    return MESSAGE_NAME;
-  }
-
-  virtual int identitySize(const unsigned char *buffer,
-                               unsigned int size)
-  {
-    return MESSAGE_OFFSET;
-  }
-
-  #include MESSAGE_METHODS
-};
-
-#endif /* RenderFreeGlyphSet_H */
diff --git a/nxcomp/RenderFreePicture.cpp b/nxcomp/RenderFreePicture.cpp
deleted file mode 100644
index 3d468624a..000000000
--- a/nxcomp/RenderFreePicture.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-//
-// Include the template for
-// this message class.
-//
-
-#include "RenderFreePicture.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-#include MESSAGE_TAGS
-
-//
-// Message handling methods.
-//
-
-MESSAGE_BEGIN_ENCODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeFreeXidValue(GetULONG(buffer + 4, bigEndian),
-                     clientCache -> renderFreePictureCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded message. Type is "
-          << (unsigned int) *(buffer + 1) << " size is "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_MESSAGE
-
-MESSAGE_BEGIN_DECODE_MESSAGE
-{
-  unsigned int value;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  *(buffer + 1) = type;
-
-  decodeBuffer.decodeFreeXidValue(value,
-                     clientCache -> renderFreePictureCache);
-
-  PutULONG(value, buffer + 4, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded message. Type is "
-          << (unsigned int) type << " size is " << size
-          << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_MESSAGE
-
-MESSAGE_BEGIN_PARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  renderExtension -> data.free_picture.type = *(buffer + 1);
-
-  renderExtension -> data.free_picture.src_id = GetULONG(buffer + 4, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Parsed identity. Type is "
-          << (unsigned int) renderExtension -> data.free_picture.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_PARSE_IDENTITY
-
-MESSAGE_BEGIN_UNPARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  *(buffer + 1) = renderExtension -> data.free_picture.type;
-
-  PutULONG(renderExtension -> data.free_picture.src_id, buffer + 4, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Unparsed identity. Type is "
-          << (unsigned int) renderExtension -> data.free_picture.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_UNPARSE_IDENTITY
-
-MESSAGE_BEGIN_IDENTITY_CHECKSUM
-{
-  md5_append(md5_state, buffer + 1, 3);
-}
-MESSAGE_END_IDENTITY_CHECKSUM
-
-MESSAGE_BEGIN_ENCODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
-  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeFreeXidValue(renderExtension -> data.free_picture.src_id,
-                     clientCache -> renderFreePictureCache);
-
-  cachedRenderExtension -> data.free_picture.src_id =
-              renderExtension -> data.free_picture.src_id;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded update. Type is "
-          << (unsigned int) renderExtension -> data.free_picture.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_UPDATE
-
-MESSAGE_BEGIN_DECODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeFreeXidValue(renderExtension -> data.free_picture.src_id,
-                     clientCache -> renderFreePictureCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded update. Type is "
-          << (unsigned int) renderExtension -> data.free_picture.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_UPDATE
diff --git a/nxcomp/RenderFreePicture.h b/nxcomp/RenderFreePicture.h
deleted file mode 100644
index b50191a72..000000000
--- a/nxcomp/RenderFreePicture.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef RenderFreePicture_H
-#define RenderFreePicture_H
-
-//
-// Define the characteristics
-// of this message class here.
-//
-
-#undef  MESSAGE_NAME
-#define MESSAGE_NAME          "RenderFreePicture"
-
-#undef  MESSAGE_STORE
-#define MESSAGE_STORE         RenderFreePictureStore
-
-#undef  MESSAGE_CLASS
-#define MESSAGE_CLASS         RenderMinorExtensionStore
-
-#undef  MESSAGE_METHODS
-#define MESSAGE_METHODS       "RenderMinorExtensionMethods.h"
-
-#undef  MESSAGE_HEADERS
-#define MESSAGE_HEADERS       "RenderMinorExtensionHeaders.h"
-
-#undef  MESSAGE_TAGS
-#define MESSAGE_TAGS          "RenderMinorExtensionTags.h"
-
-#undef  MESSAGE_OFFSET
-#define MESSAGE_OFFSET        8
-
-#undef  MESSAGE_HAS_SIZE
-#define MESSAGE_HAS_SIZE      0
-
-#undef  MESSAGE_HAS_DATA
-#define MESSAGE_HAS_DATA      0
-
-#undef  MESSAGE_HAS_FILTER
-#define MESSAGE_HAS_FILTER    0
-
-//
-// Declare the message class.
-//
-
-#include MESSAGE_HEADERS
-
-class MESSAGE_STORE : public MESSAGE_CLASS
-{
-  public:
-
-  virtual const char *name() const
-  {
-    return MESSAGE_NAME;
-  }
-
-  virtual int identitySize(const unsigned char *buffer,
-                               unsigned int size)
-  {
-    return MESSAGE_OFFSET;
-  }
-
-  #include MESSAGE_METHODS
-};
-
-#endif /* RenderFreePicture_H */
diff --git a/nxcomp/RenderGenericRequest.cpp b/nxcomp/RenderGenericRequest.cpp
deleted file mode 100644
index fc3210ba2..000000000
--- a/nxcomp/RenderGenericRequest.cpp
+++ /dev/null
@@ -1,266 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "NXrender.h"
-
-#include "RenderExtension.h"
-#include "RenderGenericRequest.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-#include "WriteBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-//
-// Here are the methods to handle the messages' content.
-//
-
-int RenderGenericRequestStore::encodeMessage(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                                 const unsigned int size, int bigEndian,
-                                                     ChannelCache *channelCache) const
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Encoding full message.\n"
-          << logofs_flush;
-
-  unsigned char type = *(buffer + 1);
-
-  #endif
-
-  encodeBuffer.encodeCachedValue(size >> 2, 16,
-                     clientCache -> renderLengthCache, 5);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Encoding full unhandled message. "
-          << "Type is " << (unsigned int) type << " size is "
-          << size << ".\n" << logofs_flush;
-  #endif
-
-  encodeIntData(encodeBuffer, buffer, 4, size,
-                    bigEndian, clientCache);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Encoded full message.\n"
-          << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int RenderGenericRequestStore::decodeMessage(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                                                 unsigned int &size, unsigned char type, int bigEndian,
-                                                     WriteBuffer *writeBuffer, ChannelCache *channelCache) const
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoding full message.\n"
-          << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeCachedValue(size, 16,
-                     clientCache -> renderLengthCache, 5);
-
-  size <<= 2;
-
-  buffer = writeBuffer -> addMessage(size);
-
-  *(buffer + 1) = type;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoding full unhandled message. "
-          << "Type is " << (unsigned int) type << " size is "
-          << size << ".\n" << logofs_flush;
-  #endif
-
-  decodeIntData(decodeBuffer, buffer, 4, size,
-                    bigEndian, clientCache);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded full message.\n"
-          << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void RenderGenericRequestStore::encodeData(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                               unsigned int size, int bigEndian,
-                                                   ChannelCache *channelCache) const
-{
-}
-
-void RenderGenericRequestStore::decodeData(DecodeBuffer &decodeBuffer, unsigned char *buffer,
-                                               unsigned int size, int bigEndian,
-                                                   ChannelCache *channelCache) const
-{
-}
-
-int RenderGenericRequestStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                                 unsigned int size, int bigEndian) const
-{
-  #ifdef DEBUG
-  *logofs << name() << ": Parsing identity for message at "
-          << this << ".\n" << logofs_flush;
-  #endif
-
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  unsigned char type = *(buffer + 1);
-
-  renderExtension -> data.any.type = type;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsing unhandled identity. "
-          << "Type is " << (unsigned int) renderExtension -> data.any.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-
-  parseIntData(message, buffer, 4, size, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed identity for message at "
-          << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int RenderGenericRequestStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                                   unsigned int size, int bigEndian) const
-{
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsing identity for message at "
-          << this << ".\n" << logofs_flush;
-  #endif
-
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  unsigned char type = renderExtension -> data.any.type;
-
-  *(buffer + 1) = type;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsing unhandled identity. "
-          << "Type is " << (unsigned int) renderExtension -> data.any.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-
-  unparseIntData(message, buffer, 4, size, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at "
-          << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void RenderGenericRequestStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                                     unsigned int size, md5_state_t *md5_state,
-                                                         int bigEndian) const
-{
-  //
-  // Include the minor opcode in the checksum.
-  // Because the data offset can be beyond the
-  // real end of the message, we need to include
-  // the size or we will match any message whose
-  // size is less or equal to the data offset.
-  //
-
-  md5_append(md5_state, buffer + 1, 3);
-}
-
-void RenderGenericRequestStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                                   const Message *cachedMessage,
-                                                       ChannelCache *channelCache) const
-{
-  //
-  // Encode the variant part.
-  //
-
-  #ifdef DEBUG
-  *logofs << name() << ": Updating identity for message at "
-          << this << ".\n" << logofs_flush;
-  #endif
-
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Encoding unhandled update. "
-          << "Type is " << (unsigned int) renderExtension -> data.any.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-
-  updateIntData(encodeBuffer, message, cachedMessage, 4,
-                    renderExtension -> size_, channelCache);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Updated identity for message at "
-          << this << ".\n" << logofs_flush;
-  #endif
-}
-
-void RenderGenericRequestStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                                   ChannelCache *channelCache) const
-{
-  #ifdef DEBUG
-  *logofs << name() << ": Updating identity for message at "
-          << this << ".\n" << logofs_flush;
-  #endif
-
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoding unhandled update. "
-          << "Type is " << (unsigned int) renderExtension -> data.any.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-
-  updateIntData(decodeBuffer, message, 4,
-                    renderExtension -> size_, channelCache);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Updated identity for message at "
-          << this << ".\n" << logofs_flush;
-  #endif
-}
diff --git a/nxcomp/RenderGenericRequest.h b/nxcomp/RenderGenericRequest.h
deleted file mode 100644
index fdf5ca876..000000000
--- a/nxcomp/RenderGenericRequest.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef RenderGenericRequest_H
-#define RenderGenericRequest_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-class RenderGenericRequestStore : public RenderMinorExtensionStore
-{
-  public:
-
-  virtual const char *name() const
-  {
-    return "RenderGenericRequest";
-  }
-
-  virtual int identitySize(const unsigned char *buffer, unsigned int size)
-  {
-    return RENDEREXTENSION_DATA_OFFSET;
-  }
-
-  virtual int encodeMessage(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                const unsigned int size, int bigEndian,
-                                    ChannelCache *channelCache) const;
-
-  virtual int decodeMessage(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                                unsigned int &size, unsigned char type, int bigEndian,
-                                    WriteBuffer *writeBuffer, ChannelCache *channelCache) const;
-
-  virtual void encodeData(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                              unsigned int size, int bigEndian,
-                                  ChannelCache *channelCache) const;
-
-  virtual void decodeData(DecodeBuffer &decodeBuffer, unsigned char *buffer,
-                              unsigned int size, int bigEndian,
-                                  ChannelCache *channelCache) const;
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-                                    unsigned int size, md5_state_t *md5_state,
-                                        int bigEndian) const;
-};
-
-#endif /* RenderGenericRequest_H */
diff --git a/nxcomp/RenderMinorExtensionHeaders.h b/nxcomp/RenderMinorExtensionHeaders.h
deleted file mode 100644
index b7f6efc5a..000000000
--- a/nxcomp/RenderMinorExtensionHeaders.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef RenderMinorExtensionHeaders_H
-#define RenderMinorExtensionHeaders_H
-
-#include "NXrender.h"
-
-#include "Message.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-#include "WriteBuffer.h"
-
-#include "RenderExtension.h"
-
-#endif /* RenderMinorExtensionHeaders_H */
diff --git a/nxcomp/RenderMinorExtensionMethods.h b/nxcomp/RenderMinorExtensionMethods.h
deleted file mode 100644
index d272337e0..000000000
--- a/nxcomp/RenderMinorExtensionMethods.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-//
-// This file is included multiple times,
-// one for each message inheriting the
-// parent class.
-//
-
-public:
-
-#if MESSAGE_HAS_SIZE
-
-virtual void encodeSize(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                            const unsigned int size, int bigEndian,
-                                ChannelCache *channelCache) const;
-
-virtual void decodeSize(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                            unsigned int &size, unsigned char type, int bigEndian,
-                                WriteBuffer *writeBuffer, ChannelCache *channelCache) const;
-
-#endif
-
-#if MESSAGE_HAS_DATA
-
-virtual void encodeData(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                            unsigned int size, int bigEndian,
-                                ChannelCache *channelCache) const;
-
-virtual void decodeData(DecodeBuffer &decodeBuffer, unsigned char *buffer,
-                            unsigned int size, int bigEndian,
-                                ChannelCache *channelCache) const;
-
-#endif
-
-virtual int encodeMessage(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                              const unsigned int size, int bigEndian,
-                                  ChannelCache *channelCache) const;
-
-virtual int decodeMessage(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                              unsigned int &size, unsigned char type, int bigEndian,
-                                  WriteBuffer *writeBuffer, ChannelCache *channelCache) const;
-
-virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                              unsigned int size, int bigEndian) const;
-
-virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                unsigned int size, int bigEndian) const;
-
-virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                const Message *cachedMessage,
-                                    ChannelCache *channelCache) const;
-
-virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                ChannelCache *channelCache) const;
-
-virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-                                  unsigned int size, md5_state_t *md5_state,
-                                      int bigEndian) const;
diff --git a/nxcomp/RenderMinorExtensionTags.h b/nxcomp/RenderMinorExtensionTags.h
deleted file mode 100644
index c24a99638..000000000
--- a/nxcomp/RenderMinorExtensionTags.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef RenderMinorExtensionTags_H
-#define RenderMinorExtensionTags_H
-
-//
-// Set in the message header file.
-//
-
-#if MESSAGE_HAS_SIZE
-
-#define MESSAGE_ENCODE_SIZE  encodeSize(encodeBuffer, buffer, size, bigEndian, channelCache)
-#define MESSAGE_DECODE_SIZE  decodeSize(decodeBuffer, buffer, size, type, bigEndian, writeBuffer, channelCache)
-
-#else
-
-#define MESSAGE_ENCODE_SIZE
-#define MESSAGE_DECODE_SIZE  size = MESSAGE_OFFSET; buffer = writeBuffer -> addMessage(size);
-
-#endif
-
-#if MESSAGE_HAS_DATA
-
-#define MESSAGE_ENCODE_DATA  encodeData(encodeBuffer, buffer, size, bigEndian, channelCache)
-#define MESSAGE_DECODE_DATA  decodeData(decodeBuffer, buffer, size, bigEndian, channelCache)
-
-#else
-
-#define MESSAGE_ENCODE_DATA
-#define MESSAGE_DECODE_DATA
-
-#endif
-
-//
-// Prologue an epilogue of the message
-// handling functions.
-//
-
-#define MESSAGE_BEGIN_ENCODE_SIZE \
-\
-void MESSAGE_STORE::encodeSize(EncodeBuffer &encodeBuffer, const unsigned char *buffer, \
-                                   const unsigned int size, int bigEndian, \
-                                       ChannelCache *channelCache) const \
-{
-
-#define MESSAGE_END_ENCODE_SIZE \
-\
-}
-
-#define MESSAGE_BEGIN_DECODE_SIZE \
-\
-void MESSAGE_STORE::decodeSize(DecodeBuffer &decodeBuffer, unsigned char *&buffer, \
-                                   unsigned int &size, unsigned char type, int bigEndian, \
-                                       WriteBuffer *writeBuffer, ChannelCache *channelCache) const \
-{
-
-#define MESSAGE_END_DECODE_SIZE \
-\
-}
-
-#define MESSAGE_BEGIN_ENCODE_MESSAGE \
-\
-int MESSAGE_STORE::encodeMessage(EncodeBuffer &encodeBuffer, const unsigned char *buffer, \
-                                     const unsigned int size, int bigEndian, \
-                                         ChannelCache *channelCache) const \
-{ \
-  MESSAGE_ENCODE_SIZE;
-
-
-#define MESSAGE_END_ENCODE_MESSAGE \
-\
-  MESSAGE_ENCODE_DATA; \
-\
-  return 1; \
-}
-
-#define MESSAGE_BEGIN_DECODE_MESSAGE \
-\
-int MESSAGE_STORE::decodeMessage(DecodeBuffer &decodeBuffer, unsigned char *&buffer, \
-                                     unsigned int &size, unsigned char type, int bigEndian, \
-                                         WriteBuffer *writeBuffer, ChannelCache *channelCache) const \
-{ \
-  MESSAGE_DECODE_SIZE;
-
-
-#define MESSAGE_END_DECODE_MESSAGE \
-\
-  MESSAGE_DECODE_DATA; \
-\
-  return 1; \
-}
-
-#define MESSAGE_BEGIN_ENCODE_DATA \
-\
-void MESSAGE_STORE::encodeData(EncodeBuffer &encodeBuffer, const unsigned char *buffer, \
-                                   unsigned int size, int bigEndian, \
-                                       ChannelCache *channelCache) const \
-{
-
-#define MESSAGE_END_ENCODE_DATA \
-\
-}
-
-#define MESSAGE_BEGIN_DECODE_DATA \
-\
-void MESSAGE_STORE::decodeData(DecodeBuffer &decodeBuffer, unsigned char *buffer, \
-                                   unsigned int size, int bigEndian, \
-                                       ChannelCache *channelCache) const \
-{
-
-#define MESSAGE_END_DECODE_DATA \
-\
-}
-
-#define MESSAGE_BEGIN_PARSE_IDENTITY \
-\
-int MESSAGE_STORE::parseIdentity(Message *message, const unsigned char *buffer, \
-                                     unsigned int size, int bigEndian) const \
-{
-
-#define MESSAGE_END_PARSE_IDENTITY \
-\
-  return 1; \
-\
-}
-
-#define MESSAGE_BEGIN_UNPARSE_IDENTITY \
-\
-int MESSAGE_STORE::unparseIdentity(const Message *message, unsigned char *buffer, \
-                                       unsigned int size, int bigEndian) const \
-{
-
-#define MESSAGE_END_UNPARSE_IDENTITY \
-\
-  return 1; \
-\
-}
-
-#define MESSAGE_BEGIN_IDENTITY_CHECKSUM \
-\
-void MESSAGE_STORE::identityChecksum(const Message *message, const unsigned char *buffer, \
-                                         unsigned int size, md5_state_t *md5_state, \
-                                             int bigEndian) const \
-{
-
-#define MESSAGE_END_IDENTITY_CHECKSUM \
-\
-}
-
-#define MESSAGE_BEGIN_ENCODE_UPDATE \
-\
-void MESSAGE_STORE::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message, \
-                                       const Message *cachedMessage, \
-                                           ChannelCache *channelCache) const \
-{
-
-#define MESSAGE_END_ENCODE_UPDATE \
-\
-}
-
-#define MESSAGE_BEGIN_DECODE_UPDATE \
-\
-void MESSAGE_STORE::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message, \
-                                       ChannelCache *channelCache) const \
-{
-
-#define MESSAGE_END_DECODE_UPDATE \
-\
-}
-
-#endif /* RenderMinorExtensionTags_H */
diff --git a/nxcomp/RenderPictureClip.cpp b/nxcomp/RenderPictureClip.cpp
deleted file mode 100644
index 32d526c81..000000000
--- a/nxcomp/RenderPictureClip.cpp
+++ /dev/null
@@ -1,299 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-//
-// Include the template for
-// this message class.
-//
-
-#include "RenderPictureClip.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-#include MESSAGE_TAGS
-
-//
-// Message handling methods.
-//
-
-MESSAGE_BEGIN_ENCODE_SIZE
-{
-  //
-  // The data is constituted by a number of
-  // rectangles. Each rectangle is in the
-  // format x, y, width, height with 2 bytes
-  // per each field, so each request is at
-  // least 12 + 8 = 20 bytes long.
-  //
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeCachedValue((size - MESSAGE_OFFSET) >> 2, 16,
-                     clientCache -> renderLengthCache, 5);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded size with value "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_SIZE
-
-MESSAGE_BEGIN_DECODE_SIZE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeCachedValue(size, 16,
-                     clientCache -> renderLengthCache, 5);
-
-  size = MESSAGE_OFFSET + (size << 2);
-
-  buffer = writeBuffer -> addMessage(size);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded size with value "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_SIZE
-
-MESSAGE_BEGIN_ENCODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeXidValue(GetULONG(buffer + 4, bigEndian),
-                     clientCache -> renderSrcPictureCache);
-
-  encodeBuffer.encodeDiffCachedValue(GetUINT(buffer + 8, bigEndian),
-                     clientCache -> renderLastX, 16,
-                         clientCache -> renderXCache, 11);
-
-  encodeBuffer.encodeDiffCachedValue(GetUINT(buffer + 10, bigEndian),
-                     clientCache -> renderLastY, 16,
-                         clientCache -> renderYCache, 11);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded message. Type is "
-          << (unsigned int) *(buffer + 1) << " size is "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_MESSAGE
-
-MESSAGE_BEGIN_DECODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  *(buffer + 1) = type;
-
-  decodeBuffer.decodeXidValue(value,
-                     clientCache -> renderSrcPictureCache);
-
-  PutULONG(value, buffer + 4, bigEndian);
-
-  decodeBuffer.decodeDiffCachedValue(value,
-                     clientCache -> renderLastX, 16,
-                         clientCache -> renderXCache, 11);
-
-  PutUINT(clientCache -> renderLastX, buffer + 8, bigEndian);
-
-  decodeBuffer.decodeDiffCachedValue(value,
-                     clientCache -> renderLastY, 16,
-                         clientCache -> renderYCache, 11);
-
-  PutUINT(clientCache -> renderLastY, buffer + 10, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded message. Type is "
-          << (unsigned int) type << " size is " << size
-          << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_MESSAGE
-
-MESSAGE_BEGIN_ENCODE_DATA
-{
-  encodeIntData(encodeBuffer, buffer, MESSAGE_OFFSET,
-                    size, bigEndian, channelCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded " << size - MESSAGE_OFFSET
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_DATA
-
-MESSAGE_BEGIN_DECODE_DATA
-{
-  decodeIntData(decodeBuffer, buffer, MESSAGE_OFFSET,
-                    size, bigEndian, channelCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded " << size - MESSAGE_OFFSET
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_DATA
-
-MESSAGE_BEGIN_PARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  renderExtension -> data.picture_clip.type = *(buffer + 1);
-
-  renderExtension -> data.picture_clip.src_id = GetULONG(buffer + 4,  bigEndian);
-
-  renderExtension -> data.picture_clip.src_x = GetUINT(buffer + 8,  bigEndian);
-  renderExtension -> data.picture_clip.src_y = GetUINT(buffer + 10, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Parsed identity. Type is "
-          << (unsigned int) renderExtension -> data.picture_clip.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_PARSE_IDENTITY
-
-MESSAGE_BEGIN_UNPARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  *(buffer + 1) = renderExtension -> data.picture_clip.type;
-
-  PutULONG(renderExtension -> data.picture_clip.src_id, buffer + 4,  bigEndian);
-
-  PutUINT(renderExtension -> data.picture_clip.src_x, buffer + 8,  bigEndian);
-  PutUINT(renderExtension -> data.picture_clip.src_y, buffer + 10, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Unparsed identity. Type is "
-          << (unsigned int) renderExtension -> data.picture_clip.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_UNPARSE_IDENTITY
-
-MESSAGE_BEGIN_IDENTITY_CHECKSUM
-{
-  //
-  // Encode the picture id and the
-  // source x and y differentially.
-  //
-
-  md5_append(md5_state, buffer + 1, 3);
-}
-MESSAGE_END_IDENTITY_CHECKSUM
-
-MESSAGE_BEGIN_ENCODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
-  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeXidValue(renderExtension -> data.picture_clip.src_id,
-                     clientCache -> renderSrcPictureCache);
-
-  cachedRenderExtension -> data.picture_clip.src_id =
-              renderExtension -> data.picture_clip.src_id;
-
-  //
-  // The source x and y coordinates are
-  // encoded as differerences in respect
-  // to the previous cached value.
-  //
-
-  unsigned int value;
-  unsigned int previous;
-
-  value    = renderExtension -> data.picture_clip.src_x;
-  previous = cachedRenderExtension -> data.picture_clip.src_x;
-
-  encodeBuffer.encodeDiffCachedValue(value, previous, 16,
-                     clientCache -> renderXCache, 11);
-
-  cachedRenderExtension -> data.picture_clip.src_x = value;
-
-  value    = renderExtension -> data.picture_clip.src_y;
-  previous = cachedRenderExtension -> data.picture_clip.src_y;
-
-  encodeBuffer.encodeDiffCachedValue(value, previous, 16,
-                     clientCache -> renderYCache, 11);
-
-  cachedRenderExtension -> data.picture_clip.src_y = value;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded update. Type is "
-          << (unsigned int) renderExtension -> data.picture_clip.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_UPDATE
-
-MESSAGE_BEGIN_DECODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeXidValue(renderExtension -> data.picture_clip.src_id,
-                     clientCache -> renderSrcPictureCache);
-
-  unsigned int value;
-  unsigned int previous;
-
-  previous = renderExtension -> data.picture_clip.src_x;
-
-  decodeBuffer.decodeDiffCachedValue(value, previous, 16,
-                     clientCache -> renderXCache, 11);
-
-  renderExtension -> data.picture_clip.src_x = value;
-
-  previous = renderExtension -> data.picture_clip.src_y;
-
-  decodeBuffer.decodeDiffCachedValue(value, previous, 16,
-                     clientCache -> renderYCache, 11);
-
-  renderExtension -> data.picture_clip.src_y = value;
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded update. Type is "
-          << (unsigned int) renderExtension -> data.picture_clip.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_UPDATE
diff --git a/nxcomp/RenderPictureClip.h b/nxcomp/RenderPictureClip.h
deleted file mode 100644
index bd811dfcd..000000000
--- a/nxcomp/RenderPictureClip.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef RenderPictureClip_H
-#define RenderPictureClip_H
-
-//
-// Define the characteristics
-// of this message class here.
-//
-
-#undef  MESSAGE_NAME
-#define MESSAGE_NAME          "RenderPictureClip"
-
-#undef  MESSAGE_STORE
-#define MESSAGE_STORE         RenderPictureClipStore
-
-#undef  MESSAGE_CLASS
-#define MESSAGE_CLASS         RenderMinorExtensionStore
-
-#undef  MESSAGE_METHODS
-#define MESSAGE_METHODS       "RenderMinorExtensionMethods.h"
-
-#undef  MESSAGE_HEADERS
-#define MESSAGE_HEADERS       "RenderMinorExtensionHeaders.h"
-
-#undef  MESSAGE_TAGS
-#define MESSAGE_TAGS          "RenderMinorExtensionTags.h"
-
-#undef  MESSAGE_OFFSET
-#define MESSAGE_OFFSET        12
-
-#undef  MESSAGE_HAS_SIZE
-#define MESSAGE_HAS_SIZE      1
-
-#undef  MESSAGE_HAS_DATA
-#define MESSAGE_HAS_DATA      1
-
-#undef  MESSAGE_HAS_FILTER
-#define MESSAGE_HAS_FILTER    0
-
-//
-// Declare the message class.
-//
-
-#include MESSAGE_HEADERS
-
-class MESSAGE_STORE : public MESSAGE_CLASS
-{
-  public:
-
-  virtual const char *name() const
-  {
-    return MESSAGE_NAME;
-  }
-
-  virtual int identitySize(const unsigned char *buffer,
-                               unsigned int size)
-  {
-    return MESSAGE_OFFSET;
-  }
-
-  #include MESSAGE_METHODS
-};
-
-#endif /* RenderPictureClip_H */
diff --git a/nxcomp/RenderPictureFilter.cpp b/nxcomp/RenderPictureFilter.cpp
deleted file mode 100644
index 9598601c2..000000000
--- a/nxcomp/RenderPictureFilter.cpp
+++ /dev/null
@@ -1,274 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-//
-// Include the template for
-// this message class.
-//
-
-#include "RenderPictureFilter.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-#include MESSAGE_TAGS
-
-//
-// Message handling methods.
-//
-
-MESSAGE_BEGIN_ENCODE_SIZE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Encoding value "
-          << ((size - MESSAGE_OFFSET) >> 2) << ".\n"
-          << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeCachedValue((size - MESSAGE_OFFSET) >> 2, 16,
-                     clientCache -> renderLengthCache, 5);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded size with value "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_SIZE
-
-MESSAGE_BEGIN_DECODE_SIZE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeCachedValue(size, 16,
-                     clientCache -> renderLengthCache, 5);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << size
-          << ".\n" << logofs_flush;
-  #endif
-
-  size = MESSAGE_OFFSET + (size << 2);
-
-  buffer = writeBuffer -> addMessage(size);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded size with value "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_SIZE
-
-MESSAGE_BEGIN_ENCODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeXidValue(GetULONG(buffer + 4, bigEndian),
-                     clientCache -> renderSrcPictureCache);
-
-  encodeBuffer.encodeCachedValue(GetUINT(buffer + 8, bigEndian), 16,
-                     clientCache -> renderLengthCache, 5);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded message. Type is "
-          << (unsigned int) *(buffer + 1) << " size is "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_MESSAGE
-
-MESSAGE_BEGIN_DECODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  *(buffer + 1) = type;
-
-  decodeBuffer.decodeXidValue(value,
-                     clientCache -> renderSrcPictureCache);
-
-  PutULONG(value, buffer + 4, bigEndian);
-
-  decodeBuffer.decodeCachedValue(value, 16,
-                     clientCache -> renderLengthCache, 5);
-
-  PutUINT(value, buffer + 8, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded message. Type is "
-          << (unsigned int) type << " size is " << size
-          << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_MESSAGE
-
-MESSAGE_BEGIN_ENCODE_DATA
-{
-  encodeCharData(encodeBuffer, buffer, MESSAGE_OFFSET,
-                     size, bigEndian, channelCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded " << size - MESSAGE_OFFSET
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_DATA
-
-MESSAGE_BEGIN_DECODE_DATA
-{
-  decodeCharData(decodeBuffer, buffer, MESSAGE_OFFSET,
-                     size, bigEndian, channelCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded " << size - MESSAGE_OFFSET
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_DATA
-
-MESSAGE_BEGIN_PARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  renderExtension -> data.picture_filter.type = *(buffer + 1);
-
-  renderExtension -> data.picture_filter.src_id = GetULONG(buffer + 4, bigEndian);
-  renderExtension -> data.picture_filter.num_elm = GetUINT(buffer + 8, bigEndian);
-
-  //
-  // Clean the padding bytes. This
-  // should be the purpose of the
-  // filter.
-  //
-
-  #ifdef TEST
-  *logofs << name() << ": Cleaning "
-          << RoundUp4(renderExtension -> data.picture_filter.num_elm) -
-             renderExtension -> data.picture_filter.num_elm << " bytes "
-          << "at offset " << MESSAGE_OFFSET + renderExtension ->
-             data.picture_filter.num_elm << " with " << renderExtension ->
-             data.picture_filter.num_elm << " elements and size "
-          << renderExtension -> size_ << ".\n" << logofs_flush;
-  #endif
-
-  if (size >= MESSAGE_OFFSET + renderExtension ->
-          data.picture_filter.num_elm)
-  {
-    unsigned char *next = (unsigned char *) buffer +
-                              MESSAGE_OFFSET + renderExtension ->
-                                  data.picture_filter.num_elm;
-
-    while (next < buffer + size)
-    {
-      *next++ = '\0';
-    }
-  }
-
-  #ifdef TEST
-  *logofs << name() << ": Parsed identity. Type is "
-          << (unsigned int) renderExtension -> data.picture_filter.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_PARSE_IDENTITY
-
-MESSAGE_BEGIN_UNPARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  *(buffer + 1) = renderExtension -> data.picture_filter.type;
-
-  PutULONG(renderExtension -> data.picture_filter.src_id, buffer + 4, bigEndian);
-  PutUINT(renderExtension -> data.picture_filter.num_elm, buffer + 8, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Unparsed identity. Type is "
-          << (unsigned int) renderExtension -> data.picture_filter.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_UNPARSE_IDENTITY
-
-MESSAGE_BEGIN_IDENTITY_CHECKSUM
-{
-  //
-  // Include the length of the filter name
-  // in the checksum.
-  //
-
-  md5_append(md5_state, buffer + 1, 3);
-  md5_append(md5_state, buffer + 8, 2);
-}
-MESSAGE_END_IDENTITY_CHECKSUM
-
-MESSAGE_BEGIN_ENCODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
-  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeXidValue(renderExtension -> data.picture_filter.src_id,
-                     clientCache -> renderSrcPictureCache);
-
-  cachedRenderExtension -> data.picture_filter.src_id =
-              renderExtension -> data.picture_filter.src_id;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded update. Type is "
-          << (unsigned int) renderExtension -> data.picture_filter.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_UPDATE
-
-MESSAGE_BEGIN_DECODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeXidValue(renderExtension -> data.picture_filter.src_id,
-                     clientCache -> renderSrcPictureCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded update. Type is "
-          << (unsigned int) renderExtension -> data.picture_filter.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_UPDATE
diff --git a/nxcomp/RenderPictureFilter.h b/nxcomp/RenderPictureFilter.h
deleted file mode 100644
index a3e37538b..000000000
--- a/nxcomp/RenderPictureFilter.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef RenderPictureFilter_H
-#define RenderPictureFilter_H
-
-//
-// Define the characteristics
-// of this message class here.
-//
-
-#undef  MESSAGE_NAME
-#define MESSAGE_NAME          "RenderPictureFilter"
-
-#undef  MESSAGE_STORE
-#define MESSAGE_STORE         RenderPictureFilterStore
-
-#undef  MESSAGE_CLASS
-#define MESSAGE_CLASS         RenderMinorExtensionStore
-
-#undef  MESSAGE_METHODS
-#define MESSAGE_METHODS       "RenderMinorExtensionMethods.h"
-
-#undef  MESSAGE_HEADERS
-#define MESSAGE_HEADERS       "RenderMinorExtensionHeaders.h"
-
-#undef  MESSAGE_TAGS
-#define MESSAGE_TAGS          "RenderMinorExtensionTags.h"
-
-#undef  MESSAGE_OFFSET
-#define MESSAGE_OFFSET        12
-
-#undef  MESSAGE_HAS_SIZE
-#define MESSAGE_HAS_SIZE      1
-
-#undef  MESSAGE_HAS_DATA
-#define MESSAGE_HAS_DATA      1
-
-#undef  MESSAGE_HAS_FILTER
-#define MESSAGE_HAS_FILTER    0
-
-//
-// Declare the message class.
-//
-
-#include MESSAGE_HEADERS
-
-class MESSAGE_STORE : public MESSAGE_CLASS
-{
-  public:
-
-  virtual const char *name() const
-  {
-    return MESSAGE_NAME;
-  }
-
-  virtual int identitySize(const unsigned char *buffer,
-                               unsigned int size)
-  {
-    return MESSAGE_OFFSET;
-  }
-
-  #include MESSAGE_METHODS
-};
-
-#endif /* RenderPictureFilter_H */
diff --git a/nxcomp/RenderPictureTransform.cpp b/nxcomp/RenderPictureTransform.cpp
deleted file mode 100644
index 053748bd3..000000000
--- a/nxcomp/RenderPictureTransform.cpp
+++ /dev/null
@@ -1,210 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-//
-// Include the template for
-// this message class.
-//
-
-#include "RenderPictureTransform.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-#include MESSAGE_TAGS
-
-//
-// Message handling methods.
-//
-
-MESSAGE_BEGIN_ENCODE_SIZE
-{
-  //
-  // Size is always 44. The identity size
-  // is set to 8, so we encode the 36 bytes
-  // of the transformation matrix as our
-  // data.
-  //
-}
-MESSAGE_END_ENCODE_SIZE
-
-MESSAGE_BEGIN_DECODE_SIZE
-{
-  size = MESSAGE_OFFSET + 36;
-
-  buffer = writeBuffer -> addMessage(size);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded size with value "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_SIZE
-
-MESSAGE_BEGIN_ENCODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeXidValue(GetULONG(buffer + 4, bigEndian),
-                     clientCache -> renderSrcPictureCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded message. Type is "
-          << (unsigned int) *(buffer + 1) << " size is "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_MESSAGE
-
-MESSAGE_BEGIN_DECODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  *(buffer + 1) = type;
-
-  decodeBuffer.decodeXidValue(value,
-                     clientCache -> renderSrcPictureCache);
-
-  PutULONG(value, buffer + 4, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded message. Type is "
-          << (unsigned int) type << " size is " << size
-          << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_MESSAGE
-
-MESSAGE_BEGIN_ENCODE_DATA
-{
-  encodeLongData(encodeBuffer, buffer, MESSAGE_OFFSET,
-                     size, bigEndian, channelCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded " << size - MESSAGE_OFFSET
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_DATA
-
-MESSAGE_BEGIN_DECODE_DATA
-{
-  decodeLongData(decodeBuffer, buffer, MESSAGE_OFFSET,
-                     size, bigEndian, channelCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded " << size - MESSAGE_OFFSET
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_DATA
-
-MESSAGE_BEGIN_PARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  renderExtension -> data.picture_transform.type = *(buffer + 1);
-
-  renderExtension -> data.picture_transform.src_id = GetULONG(buffer + 4,  bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Parsed identity. Type is "
-          << (unsigned int) renderExtension -> data.picture_transform.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_PARSE_IDENTITY
-
-MESSAGE_BEGIN_UNPARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  *(buffer + 1) = renderExtension -> data.picture_transform.type;
-
-  PutULONG(renderExtension -> data.picture_transform.src_id, buffer + 4,  bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Unparsed identity. Type is "
-          << (unsigned int) renderExtension -> data.picture_transform.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_UNPARSE_IDENTITY
-
-MESSAGE_BEGIN_IDENTITY_CHECKSUM
-{
-  md5_append(md5_state, buffer + 1, 3);
-}
-MESSAGE_END_IDENTITY_CHECKSUM
-
-MESSAGE_BEGIN_ENCODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
-  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeXidValue(renderExtension -> data.picture_transform.src_id,
-                     clientCache -> renderSrcPictureCache);
-
-  cachedRenderExtension -> data.picture_transform.src_id =
-              renderExtension -> data.picture_transform.src_id;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded update. Type is "
-          << (unsigned int) renderExtension -> data.picture_transform.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_UPDATE
-
-MESSAGE_BEGIN_DECODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeXidValue(renderExtension -> data.picture_transform.src_id,
-                     clientCache -> renderSrcPictureCache);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded update. Type is "
-          << (unsigned int) renderExtension -> data.picture_transform.type
-          << " size is " << renderExtension -> size_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_UPDATE
diff --git a/nxcomp/RenderPictureTransform.h b/nxcomp/RenderPictureTransform.h
deleted file mode 100644
index 649cd05d3..000000000
--- a/nxcomp/RenderPictureTransform.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef RenderPictureTransform_H
-#define RenderPictureTransform_H
-
-//
-// Define the characteristics
-// of this message class here.
-//
-
-#undef  MESSAGE_NAME
-#define MESSAGE_NAME          "RenderPictureTransform"
-
-#undef  MESSAGE_STORE
-#define MESSAGE_STORE         RenderPictureTransformStore
-
-#undef  MESSAGE_CLASS
-#define MESSAGE_CLASS         RenderMinorExtensionStore
-
-#undef  MESSAGE_METHODS
-#define MESSAGE_METHODS       "RenderMinorExtensionMethods.h"
-
-#undef  MESSAGE_HEADERS
-#define MESSAGE_HEADERS       "RenderMinorExtensionHeaders.h"
-
-#undef  MESSAGE_TAGS
-#define MESSAGE_TAGS          "RenderMinorExtensionTags.h"
-
-#undef  MESSAGE_OFFSET
-#define MESSAGE_OFFSET        8
-
-#undef  MESSAGE_HAS_SIZE
-#define MESSAGE_HAS_SIZE      1
-
-#undef  MESSAGE_HAS_DATA
-#define MESSAGE_HAS_DATA      1
-
-#undef  MESSAGE_HAS_FILTER
-#define MESSAGE_HAS_FILTER    0
-
-//
-// Declare the message class.
-//
-
-#include MESSAGE_HEADERS
-
-class MESSAGE_STORE : public MESSAGE_CLASS
-{
-  public:
-
-  virtual const char *name() const
-  {
-    return MESSAGE_NAME;
-  }
-
-  virtual int identitySize(const unsigned char *buffer,
-                               unsigned int size)
-  {
-    return MESSAGE_OFFSET;
-  }
-
-  #include MESSAGE_METHODS
-};
-
-#endif /* RenderPictureTransform_H */
diff --git a/nxcomp/RenderTrapezoids.cpp b/nxcomp/RenderTrapezoids.cpp
deleted file mode 100644
index 85f4cad05..000000000
--- a/nxcomp/RenderTrapezoids.cpp
+++ /dev/null
@@ -1,368 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-//
-// Include the template for
-// this message class.
-//
-
-#include "RenderTrapezoids.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-#include MESSAGE_TAGS
-
-//
-// Message handling methods.
-//
-
-MESSAGE_BEGIN_ENCODE_SIZE
-{
-  //
-  // The trapezoid data is made up of a structure
-  // containing a top and bottom coordinate in 4
-  // bytes format, plus two lines, each represent-
-  // ed as four points in 4 bytes format. Thus
-  // each trapezoid is 4 * 2 + (4 * 4) * 2 = 40
-  // bytes. Bytes are all padded to an long int,
-  // so we don't need to clean the message.
-  //
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Encoding value "
-          << ((size - MESSAGE_OFFSET) >> 2) << ".\n"
-          << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeCachedValue((size - MESSAGE_OFFSET) >> 2, 16,
-                     clientCache -> renderLengthCache, 5);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded size with value "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_SIZE
-
-MESSAGE_BEGIN_DECODE_SIZE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeCachedValue(size, 16,
-                     clientCache -> renderLengthCache, 5);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << size
-          << ".\n" << logofs_flush;
-  #endif
-
-  size = MESSAGE_OFFSET + (size << 2);
-
-  buffer = writeBuffer -> addMessage(size);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded size with value "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_SIZE
-
-MESSAGE_BEGIN_ENCODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeCachedValue(*(buffer + 4), 8,
-                     clientCache -> renderOpCache);
-
-  encodeBuffer.encodeXidValue(GetULONG(buffer + 8, bigEndian),
-                     clientCache -> renderSrcPictureCache);
-
-  encodeBuffer.encodeXidValue(GetULONG(buffer + 12, bigEndian),
-                     clientCache -> renderDstPictureCache);
-
-  encodeBuffer.encodeCachedValue(GetULONG(buffer + 16, bigEndian), 32,
-                     clientCache -> renderFormatCache);
-
-  encodeBuffer.encodeDiffCachedValue(GetUINT(buffer + 20, bigEndian),
-                     clientCache -> renderLastX, 16,
-                         clientCache -> renderXCache, 11);
-
-  encodeBuffer.encodeDiffCachedValue(GetUINT(buffer + 22, bigEndian),
-                     clientCache -> renderLastY, 16,
-                         clientCache -> renderYCache, 11);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded message. Type is "
-          << (unsigned int) *(buffer + 1) << " size is "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_MESSAGE
-
-MESSAGE_BEGIN_DECODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  *(buffer + 1) = type;
-
-  decodeBuffer.decodeCachedValue(*(buffer + 4), 8,
-                     clientCache -> renderOpCache);
-
-  decodeBuffer.decodeXidValue(value,
-                     clientCache -> renderSrcPictureCache);
-
-  PutULONG(value, buffer + 8, bigEndian);
-
-  decodeBuffer.decodeXidValue(value,
-                     clientCache -> renderDstPictureCache);
-
-  PutULONG(value, buffer + 12, bigEndian);
-
-  decodeBuffer.decodeCachedValue(value, 32,
-                     clientCache -> renderFormatCache);
-
-  PutULONG(value, buffer + 16, bigEndian);
-
-  decodeBuffer.decodeDiffCachedValue(value,
-                     clientCache -> renderLastX, 16,
-                         clientCache -> renderXCache, 11);
-
-  PutUINT(clientCache -> renderLastX, buffer + 20, bigEndian);
-
-  decodeBuffer.decodeDiffCachedValue(value,
-                     clientCache -> renderLastY, 16,
-                         clientCache -> renderYCache, 11);
-
-  PutUINT(clientCache -> renderLastY, buffer + 22, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded message. Type is "
-          << (unsigned int) type << " size is " << size
-          << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_MESSAGE
-
-MESSAGE_BEGIN_ENCODE_DATA
-{
-  if (size > MESSAGE_OFFSET)
-  {
-    encodeLongData(encodeBuffer, buffer, MESSAGE_OFFSET,
-                       size, bigEndian, channelCache);
-  }
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded " << size - MESSAGE_OFFSET
-          << " bytes of text data.\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_DATA
-
-MESSAGE_BEGIN_DECODE_DATA
-{
-  if (size > MESSAGE_OFFSET)
-  {
-    decodeLongData(decodeBuffer, buffer, MESSAGE_OFFSET,
-                       size, bigEndian, channelCache);
-  }
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded " << size - MESSAGE_OFFSET
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_DATA
-
-MESSAGE_BEGIN_PARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  renderExtension -> data.trapezoids.type = *(buffer + 1);
-  renderExtension -> data.trapezoids.op   = *(buffer + 4);
-
-  renderExtension -> data.trapezoids.src_id = GetULONG(buffer + 8,  bigEndian);
-  renderExtension -> data.trapezoids.dst_id = GetULONG(buffer + 12, bigEndian);
-
-  renderExtension -> data.trapezoids.format = GetULONG(buffer + 16, bigEndian);
-
-  renderExtension -> data.trapezoids.src_x = GetUINT(buffer + 20, bigEndian);
-  renderExtension -> data.trapezoids.src_y = GetUINT(buffer + 22, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Parsed identity. Type is "
-          << (unsigned int) renderExtension -> data.trapezoids.type
-          << " size is " << renderExtension -> size_ << " identity size "
-          << renderExtension -> i_size_ << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_PARSE_IDENTITY
-
-MESSAGE_BEGIN_UNPARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  *(buffer + 1) = renderExtension -> data.trapezoids.type;
-  *(buffer + 4) = renderExtension -> data.trapezoids.op;
-
-  PutULONG(renderExtension -> data.trapezoids.src_id, buffer + 8,  bigEndian);
-  PutULONG(renderExtension -> data.trapezoids.dst_id, buffer + 12, bigEndian);
-
-  PutULONG(renderExtension -> data.trapezoids.format, buffer + 16, bigEndian);
-
-  PutUINT(renderExtension -> data.trapezoids.src_x, buffer + 20, bigEndian);
-  PutUINT(renderExtension -> data.trapezoids.src_y, buffer + 22, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Unparsed identity. Type is "
-          << (unsigned int) renderExtension -> data.trapezoids.type
-          << " size is " << renderExtension -> size_  << " identity size "
-          << renderExtension -> i_size_ <<  ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_UNPARSE_IDENTITY
-
-MESSAGE_BEGIN_IDENTITY_CHECKSUM
-{
-  //
-  // Include minor opcode, size and the
-  // operator in the identity.
-  //
-
-  md5_append(md5_state, buffer + 1, 4);
-
-  //
-  // Also include the format but not the
-  // x and y source.
-  //
-
-  md5_append(md5_state, buffer + 16, 4);
-}
-MESSAGE_END_IDENTITY_CHECKSUM
-
-MESSAGE_BEGIN_ENCODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
-  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeXidValue(renderExtension -> data.trapezoids.src_id,
-                     clientCache -> renderSrcPictureCache);
-
-  cachedRenderExtension -> data.trapezoids.src_id =
-              renderExtension -> data.trapezoids.src_id;
-
-  encodeBuffer.encodeXidValue(renderExtension -> data.trapezoids.dst_id,
-                     clientCache -> renderDstPictureCache);
-
-  cachedRenderExtension -> data.trapezoids.dst_id =
-              renderExtension -> data.trapezoids.dst_id;
-
-  //
-  // The source x and y coordinates are
-  // encoded as differerences in respect
-  // to the previous cached value.
-  //
-
-  unsigned int value;
-  unsigned int previous;
-
-  value    = renderExtension -> data.trapezoids.src_x;
-  previous = cachedRenderExtension -> data.trapezoids.src_x;
-
-  encodeBuffer.encodeDiffCachedValue(value, previous, 16,
-                     clientCache -> renderXCache, 11);
-
-  cachedRenderExtension -> data.trapezoids.src_x = value;
-
-  value    = renderExtension -> data.trapezoids.src_y;
-  previous = cachedRenderExtension -> data.trapezoids.src_y;
-
-  encodeBuffer.encodeDiffCachedValue(value, previous, 16,
-                     clientCache -> renderYCache, 11);
-
-  cachedRenderExtension -> data.trapezoids.src_y = value;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded update. Type is "
-          << (unsigned int) renderExtension -> data.trapezoids.type
-          << " size is " << renderExtension -> size_ << " source x "
-          << renderExtension -> data.trapezoids.src_x << " y "
-          << renderExtension -> data.trapezoids.src_y << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_UPDATE
-
-MESSAGE_BEGIN_DECODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeXidValue(renderExtension -> data.trapezoids.src_id,
-                     clientCache -> renderSrcPictureCache);
-
-  decodeBuffer.decodeXidValue(renderExtension -> data.trapezoids.dst_id,
-                     clientCache -> renderDstPictureCache);
-
-  unsigned int value;
-  unsigned int previous;
-
-  previous = renderExtension -> data.trapezoids.src_x;
-
-  decodeBuffer.decodeDiffCachedValue(value, previous, 16,
-                     clientCache -> renderXCache, 11);
-
-  renderExtension -> data.trapezoids.src_x = value;
-
-  previous = renderExtension -> data.trapezoids.src_y;
-
-  decodeBuffer.decodeDiffCachedValue(value, previous, 16,
-                     clientCache -> renderYCache, 11);
-
-  renderExtension -> data.trapezoids.src_y = value;
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded update. Type is "
-          << (unsigned int) renderExtension -> data.trapezoids.type
-          << " size is " << renderExtension -> size_ << " source x "
-          << renderExtension -> data.trapezoids.src_x << " y "
-          << renderExtension -> data.trapezoids.src_y << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_UPDATE
diff --git a/nxcomp/RenderTrapezoids.h b/nxcomp/RenderTrapezoids.h
deleted file mode 100644
index faf524c76..000000000
--- a/nxcomp/RenderTrapezoids.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef RenderTrapezoids_H
-#define RenderTrapezoids_H
-
-//
-// Define the characteristics
-// of this message class here.
-//
-
-#undef  MESSAGE_NAME
-#define MESSAGE_NAME          "RenderTrapezoids"
-
-#undef  MESSAGE_STORE
-#define MESSAGE_STORE         RenderTrapezoidsStore
-
-#undef  MESSAGE_CLASS
-#define MESSAGE_CLASS         RenderMinorExtensionStore
-
-#undef  MESSAGE_METHODS
-#define MESSAGE_METHODS       "RenderMinorExtensionMethods.h"
-
-#undef  MESSAGE_HEADERS
-#define MESSAGE_HEADERS       "RenderMinorExtensionHeaders.h"
-
-#undef  MESSAGE_TAGS
-#define MESSAGE_TAGS          "RenderMinorExtensionTags.h"
-
-#undef  MESSAGE_OFFSET
-#define MESSAGE_OFFSET        24
-
-#undef  MESSAGE_HAS_SIZE
-#define MESSAGE_HAS_SIZE      1
-
-#undef  MESSAGE_HAS_DATA
-#define MESSAGE_HAS_DATA      1
-
-#undef  MESSAGE_HAS_FILTER
-#define MESSAGE_HAS_FILTER    0
-
-//
-// Declare the message class.
-//
-
-#include MESSAGE_HEADERS
-
-class MESSAGE_STORE : public MESSAGE_CLASS
-{
-  public:
-
-  virtual const char *name() const
-  {
-    return MESSAGE_NAME;
-  }
-
-  virtual int identitySize(const unsigned char *buffer,
-                               unsigned int size)
-  {
-    return (size >= MESSAGE_OFFSET ? MESSAGE_OFFSET : size);
-  }
-
-  #include MESSAGE_METHODS
-};
-
-#endif /* RenderTrapezoids_H */
diff --git a/nxcomp/RenderTriangles.cpp b/nxcomp/RenderTriangles.cpp
deleted file mode 100644
index 746a8e278..000000000
--- a/nxcomp/RenderTriangles.cpp
+++ /dev/null
@@ -1,358 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-//
-// Include the template for
-// this message class.
-//
-
-#include "RenderTriangles.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-#include MESSAGE_TAGS
-
-//
-// Message handling methods.
-//
-
-MESSAGE_BEGIN_ENCODE_SIZE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Encoding value "
-          << ((size - MESSAGE_OFFSET) >> 2) << ".\n"
-          << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeCachedValue((size - MESSAGE_OFFSET) >> 2, 16,
-                     clientCache -> renderLengthCache, 5);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded size with value "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_SIZE
-
-MESSAGE_BEGIN_DECODE_SIZE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeCachedValue(size, 16,
-                     clientCache -> renderLengthCache, 5);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << size
-          << ".\n" << logofs_flush;
-  #endif
-
-  size = MESSAGE_OFFSET + (size << 2);
-
-  buffer = writeBuffer -> addMessage(size);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded size with value "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_SIZE
-
-MESSAGE_BEGIN_ENCODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeCachedValue(*(buffer + 4), 8,
-                     clientCache -> renderOpCache);
-
-  encodeBuffer.encodeXidValue(GetULONG(buffer + 8, bigEndian),
-                     clientCache -> renderSrcPictureCache);
-
-  encodeBuffer.encodeXidValue(GetULONG(buffer + 12, bigEndian),
-                     clientCache -> renderDstPictureCache);
-
-  encodeBuffer.encodeCachedValue(GetULONG(buffer + 16, bigEndian), 32,
-                     clientCache -> renderFormatCache);
-
-  encodeBuffer.encodeDiffCachedValue(GetUINT(buffer + 20, bigEndian),
-                     clientCache -> renderLastX, 16,
-                         clientCache -> renderXCache, 11);
-
-  encodeBuffer.encodeDiffCachedValue(GetUINT(buffer + 22, bigEndian),
-                     clientCache -> renderLastY, 16,
-                         clientCache -> renderYCache, 11);
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded message. Type is "
-          << (unsigned int) *(buffer + 1) << " size is "
-          << size << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_MESSAGE
-
-MESSAGE_BEGIN_DECODE_MESSAGE
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  *(buffer + 1) = type;
-
-  decodeBuffer.decodeCachedValue(*(buffer + 4), 8,
-                     clientCache -> renderOpCache);
-
-  decodeBuffer.decodeXidValue(value,
-                     clientCache -> renderSrcPictureCache);
-
-  PutULONG(value, buffer + 8, bigEndian);
-
-  decodeBuffer.decodeXidValue(value,
-                     clientCache -> renderDstPictureCache);
-
-  PutULONG(value, buffer + 12, bigEndian);
-
-  decodeBuffer.decodeCachedValue(value, 32,
-                     clientCache -> renderFormatCache);
-
-  PutULONG(value, buffer + 16, bigEndian);
-
-  decodeBuffer.decodeDiffCachedValue(value,
-                     clientCache -> renderLastX, 16,
-                         clientCache -> renderXCache, 11);
-
-  PutUINT(clientCache -> renderLastX, buffer + 20, bigEndian);
-
-  decodeBuffer.decodeDiffCachedValue(value,
-                     clientCache -> renderLastY, 16,
-                         clientCache -> renderYCache, 11);
-
-  PutUINT(clientCache -> renderLastY, buffer + 22, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded message. Type is "
-          << (unsigned int) type << " size is " << size
-          << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_MESSAGE
-
-MESSAGE_BEGIN_ENCODE_DATA
-{
-  if (size > MESSAGE_OFFSET)
-  {
-    encodeLongData(encodeBuffer, buffer, MESSAGE_OFFSET,
-                       size, bigEndian, channelCache);
-  }
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded " << size - MESSAGE_OFFSET
-          << " bytes of text data.\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_DATA
-
-MESSAGE_BEGIN_DECODE_DATA
-{
-  if (size > MESSAGE_OFFSET)
-  {
-    decodeLongData(decodeBuffer, buffer, MESSAGE_OFFSET,
-                       size, bigEndian, channelCache);
-  }
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded " << size - MESSAGE_OFFSET
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_DATA
-
-MESSAGE_BEGIN_PARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  renderExtension -> data.triangles.type = *(buffer + 1);
-  renderExtension -> data.triangles.op   = *(buffer + 4);
-
-  renderExtension -> data.triangles.src_id = GetULONG(buffer + 8,  bigEndian);
-  renderExtension -> data.triangles.dst_id = GetULONG(buffer + 12, bigEndian);
-
-  renderExtension -> data.triangles.format = GetULONG(buffer + 16, bigEndian);
-
-  renderExtension -> data.triangles.src_x = GetUINT(buffer + 20, bigEndian);
-  renderExtension -> data.triangles.src_y = GetUINT(buffer + 22, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Parsed identity. Type is "
-          << (unsigned int) renderExtension -> data.triangles.type
-          << " size is " << renderExtension -> size_ << " identity size "
-          << renderExtension -> i_size_ << ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_PARSE_IDENTITY
-
-MESSAGE_BEGIN_UNPARSE_IDENTITY
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  *(buffer + 1) = renderExtension -> data.triangles.type;
-  *(buffer + 4) = renderExtension -> data.triangles.op;
-
-  PutULONG(renderExtension -> data.triangles.src_id, buffer + 8,  bigEndian);
-  PutULONG(renderExtension -> data.triangles.dst_id, buffer + 12, bigEndian);
-
-  PutULONG(renderExtension -> data.triangles.format, buffer + 16, bigEndian);
-
-  PutUINT(renderExtension -> data.triangles.src_x, buffer + 20, bigEndian);
-  PutUINT(renderExtension -> data.triangles.src_y, buffer + 22, bigEndian);
-
-  #ifdef TEST
-  *logofs << name() << ": Unparsed identity. Type is "
-          << (unsigned int) renderExtension -> data.triangles.type
-          << " size is " << renderExtension -> size_  << " identity size "
-          << renderExtension -> i_size_ <<  ".\n" << logofs_flush;
-  #endif
-}
-MESSAGE_END_UNPARSE_IDENTITY
-
-MESSAGE_BEGIN_IDENTITY_CHECKSUM
-{
-  //
-  // Include minor opcode, size and the
-  // operator in the identity.
-  //
-
-  md5_append(md5_state, buffer + 1, 4);
-
-  //
-  // Also include the format but not the
-  // x and y source.
-  //
-
-  md5_append(md5_state, buffer + 16, 4);
-}
-MESSAGE_END_IDENTITY_CHECKSUM
-
-MESSAGE_BEGIN_ENCODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
-  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeXidValue(renderExtension -> data.triangles.src_id,
-                     clientCache -> renderSrcPictureCache);
-
-  cachedRenderExtension -> data.triangles.src_id =
-              renderExtension -> data.triangles.src_id;
-
-  encodeBuffer.encodeXidValue(renderExtension -> data.triangles.dst_id,
-                     clientCache -> renderDstPictureCache);
-
-  cachedRenderExtension -> data.triangles.dst_id =
-              renderExtension -> data.triangles.dst_id;
-
-  //
-  // The source x and y coordinates are
-  // encoded as differerences in respect
-  // to the previous cached value.
-  //
-
-  unsigned int value;
-  unsigned int previous;
-
-  value    = renderExtension -> data.triangles.src_x;
-  previous = cachedRenderExtension -> data.triangles.src_x;
-
-  encodeBuffer.encodeDiffCachedValue(value, previous, 16,
-                     clientCache -> renderXCache, 11);
-
-  cachedRenderExtension -> data.triangles.src_x = value;
-
-  value    = renderExtension -> data.triangles.src_y;
-  previous = cachedRenderExtension -> data.triangles.src_y;
-
-  encodeBuffer.encodeDiffCachedValue(value, previous, 16,
-                     clientCache -> renderYCache, 11);
-
-  cachedRenderExtension -> data.triangles.src_y = value;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoded update. Type is "
-          << (unsigned int) renderExtension -> data.triangles.type
-          << " size is " << renderExtension -> size_ << " source x "
-          << renderExtension -> data.triangles.src_x << " y "
-          << renderExtension -> data.triangles.src_y << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_ENCODE_UPDATE
-
-MESSAGE_BEGIN_DECODE_UPDATE
-{
-  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeXidValue(renderExtension -> data.triangles.src_id,
-                     clientCache -> renderSrcPictureCache);
-
-  decodeBuffer.decodeXidValue(renderExtension -> data.triangles.dst_id,
-                     clientCache -> renderDstPictureCache);
-
-  unsigned int value;
-  unsigned int previous;
-
-  previous = renderExtension -> data.triangles.src_x;
-
-  decodeBuffer.decodeDiffCachedValue(value, previous, 16,
-                     clientCache -> renderXCache, 11);
-
-  renderExtension -> data.triangles.src_x = value;
-
-  previous = renderExtension -> data.triangles.src_y;
-
-  decodeBuffer.decodeDiffCachedValue(value, previous, 16,
-                     clientCache -> renderYCache, 11);
-
-  renderExtension -> data.triangles.src_y = value;
-
-  #ifdef TEST
-  *logofs << name() << ": Decoded update. Type is "
-          << (unsigned int) renderExtension -> data.triangles.type
-          << " size is " << renderExtension -> size_ << " source x "
-          << renderExtension -> data.triangles.src_x << " y "
-          << renderExtension -> data.triangles.src_y << ".\n"
-          << logofs_flush;
-  #endif
-}
-MESSAGE_END_DECODE_UPDATE
diff --git a/nxcomp/RenderTriangles.h b/nxcomp/RenderTriangles.h
deleted file mode 100644
index d73efb7b8..000000000
--- a/nxcomp/RenderTriangles.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef RenderTriangles_H
-#define RenderTriangles_H
-
-//
-// Define the characteristics
-// of this message class here.
-//
-
-#undef  MESSAGE_NAME
-#define MESSAGE_NAME          "RenderTriangles"
-
-#undef  MESSAGE_STORE
-#define MESSAGE_STORE         RenderTrianglesStore
-
-#undef  MESSAGE_CLASS
-#define MESSAGE_CLASS         RenderMinorExtensionStore
-
-#undef  MESSAGE_METHODS
-#define MESSAGE_METHODS       "RenderMinorExtensionMethods.h"
-
-#undef  MESSAGE_HEADERS
-#define MESSAGE_HEADERS       "RenderMinorExtensionHeaders.h"
-
-#undef  MESSAGE_TAGS
-#define MESSAGE_TAGS          "RenderMinorExtensionTags.h"
-
-#undef  MESSAGE_OFFSET
-#define MESSAGE_OFFSET        24
-
-#undef  MESSAGE_HAS_SIZE
-#define MESSAGE_HAS_SIZE      1
-
-#undef  MESSAGE_HAS_DATA
-#define MESSAGE_HAS_DATA      1
-
-#undef  MESSAGE_HAS_FILTER
-#define MESSAGE_HAS_FILTER    0
-
-//
-// Declare the message class.
-//
-
-#include MESSAGE_HEADERS
-
-class MESSAGE_STORE : public MESSAGE_CLASS
-{
-  public:
-
-  virtual const char *name() const
-  {
-    return MESSAGE_NAME;
-  }
-
-  virtual int identitySize(const unsigned char *buffer,
-                               unsigned int size)
-  {
-    return (size >= MESSAGE_OFFSET ? MESSAGE_OFFSET : size);
-  }
-
-  #include MESSAGE_METHODS
-};
-
-#endif /* RenderTriangles_H */
diff --git a/nxcomp/Rgb.cpp b/nxcomp/Rgb.cpp
deleted file mode 100644
index 8946a9fc8..000000000
--- a/nxcomp/Rgb.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "Misc.h"
-#include "Rgb.h"
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-int UnpackRgb(T_geometry *geometry, unsigned char method, unsigned char *src_data,
-                  int src_size, int dst_bpp, int dst_width, int dst_height,
-                      unsigned char *dst_data, int dst_size)
-{
-  if (*src_data == 0)
-  {
-    if (dst_size != src_size - 1)
-    {
-      #ifdef TEST
-      *logofs << "UnpackRgb: PANIC! Invalid destination size "
-              << dst_size << " with source " << src_size
-              << ".\n" << logofs_flush;
-      #endif
-
-      return -1;
-    }
-
-    #ifdef TEST
-    *logofs << "UnpackRgb: Expanding " << src_size - 1
-            << " bytes of plain RGB data.\n" << logofs_flush;
-    #endif
-
-    memcpy(dst_data, src_data + 1, src_size - 1);
-
-    return 1;
-  }
-
-  unsigned int check_size = dst_size;
-
-  int result = ZDecompress(&unpackStream, dst_data, &check_size,
-                               src_data + 1, src_size - 1);
-
-  if (result != Z_OK)
-  {
-    #ifdef PANIC
-    *logofs << "UnpackRgb: PANIC! Failure decompressing RGB data. "
-            << "Error is '" << zError(result) << "'.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Failure decompressing RGB data. "
-         << "Error is '" << zError(result) << "'.\n";
-
-    return -1;
-  }
-  else if (check_size != (unsigned int) dst_size)
-  {
-    #ifdef PANIC
-    *logofs << "UnpackRgb: PANIC! Size mismatch in RGB data. "
-            << "Resulting size is " << check_size << " with "
-            << "expected size " << dst_size << ".\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Size mismatch in RGB data. "
-         << "Resulting size is " << check_size << " with "
-         << "expected size " << dst_size << ".\n";
-
-    return -1;
-  }
-
-  #ifdef TEST
-  *logofs << "UnpackRgb: Decompressed " << src_size - 1
-          << " bytes to " << dst_size << " bytes of RGB data.\n"
-          << logofs_flush;
-  #endif
-
-  return 1;
-}
diff --git a/nxcomp/Rgb.h b/nxcomp/Rgb.h
deleted file mode 100644
index ec088dd1b..000000000
--- a/nxcomp/Rgb.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef Rgb_H
-#define Rgb_H
-
-#include "Unpack.h"
-
-int UnpackRgb(T_geometry *geometry, unsigned char method,
-                  unsigned char *src_data, int src_size, int dst_bpp,
-                      int dst_width, int dst_height, unsigned char *dst_data,
-                          int dst_size);
-
-#endif /* Rgb_H */
diff --git a/nxcomp/Rle.cpp b/nxcomp/Rle.cpp
deleted file mode 100644
index 92fc7785a..000000000
--- a/nxcomp/Rle.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "Misc.h"
-#include "Rle.h"
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-int UnpackRle(T_geometry *geometry, unsigned char method, unsigned char *src_data,
-                  int src_size, int dst_bpp, int dst_width, int dst_height,
-                      unsigned char *dst_data, int dst_size)
-{
-  if (*src_data == 0)
-  {
-    if (dst_size != src_size - 1)
-    {
-      #ifdef TEST
-      *logofs << "UnpackRle: PANIC! Invalid destination size "
-              << dst_size << " with source " << src_size
-              << ".\n" << logofs_flush;
-      #endif
-
-      return -1;
-    }
-
-    #ifdef TEST
-    *logofs << "UnpackRle: Expanding " << src_size - 1
-            << " bytes of plain RLE data.\n" << logofs_flush;
-    #endif
-
-    memcpy(dst_data, src_data + 1, src_size - 1);
-
-    return 1;
-  }
-
-  unsigned int check_size = dst_size;
-
-  int result = ZDecompress(&unpackStream, dst_data, &check_size,
-                               src_data + 1, src_size - 1);
-
-  if (result != Z_OK)
-  {
-    #ifdef PANIC
-    *logofs << "UnpackRle: PANIC! Failure decompressing RLE data. "
-            << "Error is '" << zError(result) << "'.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Failure decompressing RLE data. "
-         << "Error is '" << zError(result) << "'.\n";
-
-    return -1;
-  }
-  else if (check_size != (unsigned int) dst_size)
-  {
-    #ifdef PANIC
-    *logofs << "UnpackRle: PANIC! Size mismatch in RLE data. "
-            << "Resulting size is " << check_size << " with "
-            << "expected size " << dst_size << ".\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Size mismatch in RLE data. "
-         << "Resulting size is " << check_size << " with "
-         << "expected size " << dst_size << ".\n";
-
-    return -1;
-  }
-
-  #ifdef TEST
-  *logofs << "UnpackRle: Decompressed " << src_size - 1
-          << " bytes to " << dst_size << " bytes of RLE data.\n"
-          << logofs_flush;
-  #endif
-
-  return 1;
-}
diff --git a/nxcomp/Rle.h b/nxcomp/Rle.h
deleted file mode 100644
index cc5dab0e8..000000000
--- a/nxcomp/Rle.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef Rle_H
-#define Rle_H
-
-#include "Unpack.h"
-
-int UnpackRle(T_geometry *geometry, unsigned char method,
-                  unsigned char *src_data, int src_size, int dst_bpp,
-                      int dst_width, int dst_height, unsigned char *dst_data,
-                          int dst_size);
-
-#endif /* Rle_H */
diff --git a/nxcomp/SendEvent.cpp b/nxcomp/SendEvent.cpp
deleted file mode 100644
index 8658c1835..000000000
--- a/nxcomp/SendEvent.cpp
+++ /dev/null
@@ -1,300 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "SendEvent.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-#include "IntCache.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int SendEventStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                      unsigned int size, int bigEndian) const
-{
-  SendEventMessage *sendEvent = (SendEventMessage *) message;
-
-  //
-  // Here is the fingerprint.
-  //
-
-  sendEvent -> propagate = *(buffer + 1);
-
-  sendEvent -> window = GetULONG(buffer + 4, bigEndian);
-  sendEvent -> mask   = GetULONG(buffer + 8, bigEndian);
-
-  sendEvent -> code      = *(buffer + 12);
-  sendEvent -> byte_data = *(buffer + 13);
-
-  sendEvent -> sequence = GetUINT(buffer + 14, bigEndian);
-
-  sendEvent -> int_data = GetULONG(buffer + 16, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed Identity for message at "
-           << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int SendEventStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                        unsigned int size, int bigEndian) const
-{
-  SendEventMessage *sendEvent = (SendEventMessage *) message;
-
-  //
-  // Fill all the message's fields.
-  //
-
-  *(buffer + 1) = sendEvent -> propagate;
-
-  PutULONG(sendEvent -> window, buffer + 4,  bigEndian);
-  PutULONG(sendEvent -> mask,   buffer + 8,  bigEndian);
-
-  *(buffer + 12) = sendEvent -> code;
-  *(buffer + 13) = sendEvent -> byte_data;
-
-  PutUINT(sendEvent -> sequence, buffer + 14, bigEndian);
-
-  PutULONG(sendEvent -> int_data, buffer + 16, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at "
-          << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void SendEventStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  SendEventMessage *sendEvent = (SendEventMessage *) message;
-
-  *logofs << name() << ": Identity propagate " << (unsigned int) sendEvent -> propagate 
-          << ", window " << sendEvent -> window << ", mask " << sendEvent -> mask
-          << ", code " << (unsigned int) sendEvent -> code << ", byte_data "
-          << (unsigned int) sendEvent -> byte_data << ", sequence "
-          << sendEvent -> sequence << ", int_data " << sendEvent -> int_data 
-          << ", size " << sendEvent -> size_ << ".\n" << logofs_flush;
-
-  #endif
-}
-
-void SendEventStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                          unsigned int size, int bigEndian) const
-{
-}
-
-void SendEventStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                        const Message *cachedMessage,
-                                            ChannelCache *channelCache) const
-{
-  SendEventMessage *sendEvent       = (SendEventMessage *) message;
-  SendEventMessage *cachedSendEvent = (SendEventMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << (unsigned int) sendEvent -> propagate
-          << " as propagate field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeBoolValue(sendEvent -> propagate);
-
-  cachedSendEvent -> propagate = sendEvent -> propagate;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << sendEvent -> window
-          << " as window field.\n" << logofs_flush;
-  #endif
-
-  if (sendEvent -> window == 0 || sendEvent -> window == 1)
-  {
-    encodeBuffer.encodeBoolValue(1);
-
-    encodeBuffer.encodeBoolValue(sendEvent -> window);
-  }
-  else
-  {
-    encodeBuffer.encodeBoolValue(0);
-
-    encodeBuffer.encodeXidValue(sendEvent -> window, clientCache -> windowCache);
-  }
-
-  cachedSendEvent -> window = sendEvent -> window;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << sendEvent -> mask
-          << " as mask field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeCachedValue(sendEvent -> mask, 32,
-                     clientCache -> sendEventMaskCache);
-
-  cachedSendEvent -> mask = sendEvent -> mask;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << sendEvent -> code
-          << " as code field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeCachedValue(sendEvent -> code, 8, 
-                     clientCache -> sendEventCodeCache);
-
-  cachedSendEvent -> code = sendEvent -> code;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << sendEvent -> byte_data
-          << " as byte_data field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeCachedValue(sendEvent -> byte_data, 8, 
-                     clientCache -> sendEventByteDataCache);
-
-  cachedSendEvent -> byte_data = sendEvent -> byte_data;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << sendEvent -> sequence
-          << " as sequence field.\n" << logofs_flush;
-  #endif
-
-  unsigned int diffSeq = sendEvent -> sequence -
-                             clientCache -> sendEventLastSequence;
-
-  clientCache -> sendEventLastSequence = sendEvent -> sequence;
-
-  encodeBuffer.encodeValue(diffSeq, 16, 4);
-
-  cachedSendEvent -> sequence = sendEvent -> sequence;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << sendEvent -> int_data
-          << " as int_data field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeCachedValue(sendEvent -> int_data, 32,
-                     clientCache -> sendEventIntDataCache);
-
-  cachedSendEvent -> int_data = sendEvent -> int_data;
-}
-
-void SendEventStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                        ChannelCache *channelCache) const
-{
-  SendEventMessage *sendEvent = (SendEventMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int  value;
-
-  decodeBuffer.decodeBoolValue(value);
-
-  sendEvent -> propagate = value;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << (unsigned int) sendEvent -> propagate
-          << " as propagate field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeBoolValue(value);
-
-  if (value)
-  {
-    decodeBuffer.decodeBoolValue(value);
-  }
-  else
-  {
-    decodeBuffer.decodeXidValue(value, clientCache -> windowCache);
-  }
-
-  sendEvent -> window = value;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << sendEvent -> window
-          << " as window field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeCachedValue(sendEvent -> mask, 32,
-                     clientCache -> sendEventMaskCache);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << sendEvent -> mask
-          << " as mask field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeCachedValue(sendEvent -> code, 8,
-                     clientCache -> sendEventCodeCache);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << sendEvent -> code
-          << " as code field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeCachedValue(sendEvent -> byte_data, 8,
-                     clientCache -> sendEventByteDataCache);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << sendEvent -> byte_data
-          << " as byte_data field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeValue(value, 16, 4);
-
-  clientCache -> sendEventLastSequence += value;
-  clientCache -> sendEventLastSequence &= 0xffff;
-
-  sendEvent -> sequence = clientCache -> sendEventLastSequence;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << sendEvent -> sequence
-          << " as sequence field.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeCachedValue(sendEvent -> int_data, 32,
-                     clientCache -> sendEventIntDataCache);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << sendEvent -> int_data
-          << " as int_data field.\n" << logofs_flush;
-  #endif
-}
diff --git a/nxcomp/SendEvent.h b/nxcomp/SendEvent.h
deleted file mode 100644
index a8841a706..000000000
--- a/nxcomp/SendEvent.h
+++ /dev/null
@@ -1,195 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef SendEvent_H
-#define SendEvent_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define SENDEVENT_ENABLE_CACHE               1
-#define SENDEVENT_ENABLE_DATA                0
-#define SENDEVENT_ENABLE_SPLIT               0
-#define SENDEVENT_ENABLE_COMPRESS            0
-
-#define SENDEVENT_DATA_LIMIT                 24
-#define SENDEVENT_DATA_OFFSET                20
-
-#define SENDEVENT_CACHE_SLOTS                2000
-#define SENDEVENT_CACHE_THRESHOLD            2
-#define SENDEVENT_CACHE_LOWER_THRESHOLD      1
-
-//
-// The message class.
-//
-
-class SendEventMessage : public Message
-{
-  friend class SendEventStore;
-
-  public:
-
-  SendEventMessage()
-  {
-  }
-
-  ~SendEventMessage()
-  {
-  }
-
-  //
-  // Put here the fields which constitute 
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned char  propagate;
-  unsigned int   window;
-  unsigned int   mask;
-
-  //
-  // These are part of the event data.
-  //
-
-  unsigned char  code;
-  unsigned char  byte_data;
-  unsigned short sequence;
-  unsigned int   int_data;
-};
-
-class SendEventStore : public MessageStore
-{
-  //
-  // Constructors and destructors.
-  //
-
-  public:
-
-  SendEventStore() : MessageStore()
-  {
-    enableCache    = SENDEVENT_ENABLE_CACHE;
-    enableData     = SENDEVENT_ENABLE_DATA;
-    enableSplit    = SENDEVENT_ENABLE_SPLIT;
-    enableCompress = SENDEVENT_ENABLE_COMPRESS;
-
-    dataLimit  = SENDEVENT_DATA_LIMIT;
-    dataOffset = SENDEVENT_DATA_OFFSET;
-
-    cacheSlots           = SENDEVENT_CACHE_SLOTS;
-    cacheThreshold       = SENDEVENT_CACHE_THRESHOLD;
-    cacheLowerThreshold  = SENDEVENT_CACHE_LOWER_THRESHOLD;
-
-    messages_ -> resize(cacheSlots);
-
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      *i = NULL;
-    }
-
-    temporary_ = NULL;
-  }
-
-  virtual ~SendEventStore()
-  {
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      destroy(*i);
-    }
-
-    destroy(temporary_);
-  }
-
-  virtual const char *name() const
-  {
-    return "SendEvent";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_SendEvent;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(SendEventMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  public:
-
-  virtual Message *create() const
-  {
-    return new SendEventMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new SendEventMessage((const SendEventMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (SendEventMessage *) message;
-  }
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* SendEvent_H */
diff --git a/nxcomp/SequenceQueue.cpp b/nxcomp/SequenceQueue.cpp
deleted file mode 100644
index 3114bfcd0..000000000
--- a/nxcomp/SequenceQueue.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "SequenceQueue.h"
-
-static const unsigned int INITIAL_SIZE_    = 16;
-static const unsigned int GROWTH_INCREMENT = 16;
-
-SequenceQueue::SequenceQueue()
-
-  : queue_(new RequestSequence[INITIAL_SIZE_]), size_(INITIAL_SIZE_),
-        length_(0), start_(0), end_(0)
-{
-}
-
-SequenceQueue::~SequenceQueue()
-{
-  delete [] queue_;
-}
-
-void SequenceQueue::push(unsigned short int sequence, unsigned char opcode,
-                             unsigned int data1, unsigned int data2,
-                                 unsigned int data3)
-{
-  if (length_ == 0)
-  {
-    start_ = end_ = 0;
-
-    queue_[0].opcode   = opcode;
-    queue_[0].sequence = sequence;
-
-    queue_[0].data1 = data1;
-    queue_[0].data2 = data2;
-    queue_[0].data3 = data3;
-
-    length_ = 1;
-
-    return;
-  }
-
-  if (length_ == size_)
-  {
-    size_ += GROWTH_INCREMENT;
-
-    RequestSequence *newQueue = new RequestSequence[size_];
-
-    for (int i = start_; (unsigned int) i < length_; i++)
-    {
-      newQueue[i - start_] = queue_[i];
-    }
-
-    for (int i1 = 0; (unsigned int) i1 < start_; i1++)
-    {
-      newQueue[i1 + length_ - start_] = queue_[i1];
-    }
-
-    delete [] queue_;
-
-    queue_ = newQueue;
-
-    start_ = 0;
-
-    end_ = length_ - 1;
-  }
-
-  end_++;
-
-  if (end_ == size_)
-  {
-    end_ = 0;
-  }
-
-  queue_[end_].opcode   = opcode;
-  queue_[end_].sequence = sequence;
-
-  queue_[end_].data1 = data1;
-  queue_[end_].data2 = data2;
-  queue_[end_].data3 = data3;
-
-  length_++;
-}
-
-int SequenceQueue::peek(unsigned short int &sequence,
-                            unsigned char &opcode)
-{
-  if (length_ == 0)
-  {
-    return 0;
-  }
-  else
-  {
-    opcode   = queue_[start_].opcode;
-    sequence = queue_[start_].sequence;
-
-    return 1;
-  }
-}
-
-int SequenceQueue::peek(unsigned short int &sequence, unsigned char &opcode,
-                            unsigned int &data1, unsigned int &data2,
-                                unsigned int &data3)
-{
-  if (length_ == 0)
-  {
-    return 0;
-  }
-  else
-  {
-    opcode   = queue_[start_].opcode;
-    sequence = queue_[start_].sequence;
-
-    data1 = queue_[start_].data1;
-    data2 = queue_[start_].data2;
-    data3 = queue_[start_].data3;
-
-    return 1;
-  }
-}
-
-int SequenceQueue::pop(unsigned short int &sequence, unsigned char &opcode, 
-                           unsigned int &data1, unsigned int &data2,
-                               unsigned int &data3)
-{
-  if (length_ == 0)
-  {
-    return 0;
-  }
-  else
-  {
-    opcode   = queue_[start_].opcode;
-    sequence = queue_[start_].sequence;
-
-    data1 = queue_[start_].data1;
-    data2 = queue_[start_].data2;
-    data3 = queue_[start_].data3;
-
-    start_++;
-
-    if (start_ == size_)
-    {
-      start_ = 0;
-    }
-
-    length_--;
-
-    return 1;
-  }
-}
diff --git a/nxcomp/SequenceQueue.h b/nxcomp/SequenceQueue.h
deleted file mode 100644
index 2a72bc3fe..000000000
--- a/nxcomp/SequenceQueue.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef SequenceQueue_H
-#define SequenceQueue_H
-
-//
-// List of outstanding request messages which
-// are waiting for a reply. This class is used
-// in X client and server channels to correlate
-// the replies sequence numbers to the original
-// request type.
-//
-
-class SequenceQueue
-{
-  public:
-
-  SequenceQueue();
-
-  virtual ~SequenceQueue();
-
-  void push(unsigned short int sequence, unsigned char opcode,
-                unsigned int data1 = 0, unsigned int data2 = 0,
-                    unsigned int data3 = 0);
-
-  int peek(unsigned short int &sequence, unsigned char &opcode);
-
-  int peek(unsigned short int &sequence, unsigned char &opcode,
-               unsigned int &data1, unsigned int &data2,
-                   unsigned int &data3);
-
-  int pop(unsigned short int &sequence, unsigned char &opcode, 
-              unsigned int &data1, unsigned int &data2,
-                  unsigned int &data3);
-
-  int pop(unsigned short int &sequence, unsigned char &opcode)
-  {
-    unsigned int data1, data2, data3;
-
-    return pop(sequence, opcode, data1, data2, data3);
-  }
-
-  int length()
-  {
-    return length_;
-  }
-
-  private:
-
-  struct RequestSequence
-  {
-    unsigned short int sequence;
-    unsigned char      opcode;
-    unsigned int       data1;
-    unsigned int       data2;
-    unsigned int       data3;
-  };
-
-  RequestSequence *queue_;
-
-  unsigned int size_;
-  unsigned int length_;
-
-  unsigned int start_;
-  unsigned int end_;
-};
-
-#endif /* SequenceQueue_H */
diff --git a/nxcomp/ServerCache.cpp b/nxcomp/ServerCache.cpp
deleted file mode 100644
index 00693d2af..000000000
--- a/nxcomp/ServerCache.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "ServerCache.h"
-
-//
-// Some global caches used to store information
-// common to all X connections.
-//
-
-BlockCache ServerCache::lastInitReply;
-BlockCache ServerCache::lastKeymap;
-unsigned char ServerCache::getKeyboardMappingLastKeysymsPerKeycode = 0;
-BlockCache ServerCache::getKeyboardMappingLastMap;
-BlockCache ServerCache::getModifierMappingLastMap;
-BlockCache ServerCache::xResources;
-BlockCacheSet ServerCache::queryFontFontCache(16);
-
-ServerCache::ServerCache() :
-
-  replySequenceCache(6), eventSequenceCache(6),
-  lastTimestamp(0), visualCache(8), colormapCache(8),
-
-  errorMinorCache(8),
-
-  colormapNotifyWindowCache(8), colormapNotifyColormapCache(8),
-
-  createNotifyWindowCache(8), createNotifyLastWindow(0),
-
-  exposeWindowCache(12),
-
-  focusInWindowCache(8),
-
-  keyPressLastKey(0),
-
-  mapNotifyEventCache(8), mapNotifyWindowCache(8),
-
-  motionNotifyTimestampCache(8), motionNotifyLastRootX(0),
-  motionNotifyLastRootY(0), motionNotifyRootXCache(8),
-  motionNotifyRootYCache(8), motionNotifyEventXCache(8),
-  motionNotifyEventYCache(8), motionNotifyStateCache(8),
-
-  noExposeDrawableCache(8), noExposeMinorCache(8),
-
-  propertyNotifyWindowCache(8), propertyNotifyAtomCache(8),
-
-  reparentNotifyWindowCache(8),
-
-  selectionClearWindowCache(8), selectionClearAtomCache(8),
-
-  visibilityNotifyWindowCache(8),
-
-  getGeometryRootCache(8),
-
-  getInputFocusWindowCache(8),
-
-  getKeyboardMappingKeysymCache(8),
-
-  getPropertyTypeCache(8),
-
-  getSelectionOwnerCache(8),
-
-  getWindowAttributesClassCache(8), getWindowAttributesPlanesCache(8),
-  getWindowAttributesPixelCache(8), getWindowAttributesAllEventsCache(8),
-  getWindowAttributesYourEventsCache(8),
-  getWindowAttributesDontPropagateCache(8),
-
-  queryPointerRootCache(8), queryPointerChildCache(8),
-
-  translateCoordsChildCache(8), translateCoordsXCache(8),
-  translateCoordsYCache(8),
-
-  queryTreeWindowCache(8)
-
-{
-  unsigned int i;
-
-  for (i = 0; i < 3; i++)
-  {
-    configureNotifyWindowCache[i] = new IntCache(8);
-  }
-
-  for (i = 0; i < 5; i++)
-  {
-    configureNotifyGeomCache[i] = new IntCache(8);
-  }
-
-  for (i = 0; i < 5; i++)
-  {
-    exposeGeomCache[i] = new IntCache(8);
-  }
-
-  for (i = 0; i < 3; i++)
-  {
-    motionNotifyWindowCache[i] = new IntCache(8);
-  }
-
-  for (i = 0; i < 5; i++)
-  {
-    getGeometryGeomCache[i] = new IntCache(8);
-  }
-
-  for (i = 0; i < 23; i++)
-  {
-    keyPressCache[i] = 0;
-  }
-
-  for (i = 0; i < 6; i++)
-  {
-    queryFontCharInfoCache[i] = new IntCache(8);
-    queryFontLastCharInfo[i] = 0;
-  }
-
-  for (i = 0; i < 12; i++)
-  {
-    genericReplyIntCache[i] = new IntCache(8);
-  }
-
-  for (i = 0; i < 14; i++)
-  {
-    genericEventIntCache[i] = new IntCache(8);
-  }
-}
-
-
-ServerCache::~ServerCache()
-{
-  unsigned int i;
-
-  for (i = 0; i < 3; i++)
-  {
-    delete configureNotifyWindowCache[i];
-  }
-
-  for (i = 0; i < 5; i++)
-  {
-    delete configureNotifyGeomCache[i];
-  }
-
-  for (i = 0; i < 5; i++)
-  {
-    delete exposeGeomCache[i];
-  }
-
-  for (i = 0; i < 3; i++)
-  {
-    delete motionNotifyWindowCache[i];
-  }
-
-  for (i = 0; i < 5; i++)
-  {
-    delete getGeometryGeomCache[i];
-  }
-
-  for (i = 0; i < 6; i++)
-  {
-    delete queryFontCharInfoCache[i];
-  }
-
-  for (i = 0; i < 12; i++)
-  {
-    delete genericReplyIntCache[i];
-  }
-
-  for (i = 0; i < 14; i++)
-  {
-    delete genericEventIntCache[i];
-  }
-}
diff --git a/nxcomp/ServerCache.h b/nxcomp/ServerCache.h
deleted file mode 100644
index c6e2b81b6..000000000
--- a/nxcomp/ServerCache.h
+++ /dev/null
@@ -1,303 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef ServerCache_H
-#define ServerCache_H
-
-#include "Misc.h"
-
-#include "IntCache.h"
-#include "CharCache.h"
-#include "OpcodeCache.h"
-#include "BlockCache.h"
-#include "BlockCacheSet.h"
-
-#include "ChannelCache.h"
-
-class ServerCache : public ChannelCache
-{
-  public:
-
-  ServerCache();
-
-  ~ServerCache();
-
-  //
-  // Opcode prediction caches.
-  //
-
-  OpcodeCache opcodeCache;
-
-  //
-  // General-purpose caches.
-  //
-
-  IntCache replySequenceCache;
-  IntCache eventSequenceCache;
-  unsigned int lastTimestamp;
-  CharCache depthCache;
-  IntCache visualCache;
-  IntCache colormapCache;
-  CharCache resourceCache;
-
-  //
-  // X connection startup.
-  //
-
-  static BlockCache lastInitReply;
-
-  //
-  // X errors.
-  //
-
-  CharCache errorCodeCache;
-  IntCache errorMinorCache;
-  CharCache errorMajorCache;
-
-  //
-  // ButtonPress and ButtonRelease events.
-  //
-
-  CharCache buttonCache;
-
-  //
-  // ColormapNotify event.
-  //
-
-  IntCache colormapNotifyWindowCache;
-  IntCache colormapNotifyColormapCache;
-
-  //
-  // ConfigureNotify event.
-  //
-
-  IntCache *configureNotifyWindowCache[3];
-  IntCache *configureNotifyGeomCache[5];
-
-  //
-  // CreateNotify event.
-  //
-
-  IntCache createNotifyWindowCache;
-  unsigned int createNotifyLastWindow;
-
-  //
-  // Expose event.
-  //
-
-  IntCache exposeWindowCache;
-  IntCache *exposeGeomCache[5];
-
-  //
-  // FocusIn event (also used for FocusOut).
-  //
-
-  IntCache focusInWindowCache;
-
-  //
-  // KeymapNotify event.
-  //
-
-  static BlockCache lastKeymap;
-
-  //
-  // KeyPress event.
-  //
-
-  unsigned char keyPressLastKey;
-  unsigned char keyPressCache[23];
-
-  //
-  // MapNotify event (also used for UnmapNotify).
-  //
-
-  IntCache mapNotifyEventCache;
-  IntCache mapNotifyWindowCache;
-
-  //
-  // MotionNotify event (also used for KeyPress, 
-  // KeyRelease, ButtonPress, ButtonRelease,
-  // EnterNotify, and LeaveNotify events and
-  // QueryPointer reply).
-  //
-
-  IntCache motionNotifyTimestampCache;
-  unsigned int motionNotifyLastRootX;
-  unsigned int motionNotifyLastRootY;
-  IntCache motionNotifyRootXCache;
-  IntCache motionNotifyRootYCache;
-  IntCache motionNotifyEventXCache;
-  IntCache motionNotifyEventYCache;
-  IntCache motionNotifyStateCache;
-  IntCache *motionNotifyWindowCache[3];
-
-  //
-  // NoExpose event.
-  //
-
-  IntCache noExposeDrawableCache;
-  IntCache noExposeMinorCache;
-  CharCache noExposeMajorCache;
-
-  //
-  // PropertyNotify event.
-  //
-
-  IntCache propertyNotifyWindowCache;
-  IntCache propertyNotifyAtomCache;
-
-  //
-  // ReparentNotify event.
-  //
-
-  IntCache reparentNotifyWindowCache;
-
-  //
-  // SelectionClear event.
-  //
-
-  IntCache selectionClearWindowCache;
-  IntCache selectionClearAtomCache;
-
-  //
-  // VisibilityNotify event.
-  //
-
-  IntCache visibilityNotifyWindowCache;
-
-  //
-  // GetGeometry reply.
-  //
-
-  IntCache getGeometryRootCache;
-  IntCache *getGeometryGeomCache[5];
-
-  //
-  // GetInputFocus reply.
-  //
-
-  IntCache getInputFocusWindowCache;
-
-  //
-  // GetKeyboardMapping reply.
-  //
-
-  static unsigned char getKeyboardMappingLastKeysymsPerKeycode;
-  static BlockCache getKeyboardMappingLastMap;
-  IntCache getKeyboardMappingKeysymCache;
-  CharCache getKeyboardMappingLastByteCache;
-
-  //
-  // GetModifierMapping reply.
-  //
-
-  static BlockCache getModifierMappingLastMap;
-
-  //
-  // GetProperty reply.
-  //
-
-  CharCache getPropertyFormatCache;
-  IntCache getPropertyTypeCache;
-  static BlockCache xResources;
-
-  //
-  // GetSelection reply.
-  //
-
-  IntCache getSelectionOwnerCache;
-
-  //
-  // GetWindowAttributes reply.
-  //
-
-  IntCache getWindowAttributesClassCache;
-  CharCache getWindowAttributesBitGravityCache;
-  CharCache getWindowAttributesWinGravityCache;
-  IntCache getWindowAttributesPlanesCache;
-  IntCache getWindowAttributesPixelCache;
-  IntCache getWindowAttributesAllEventsCache;
-  IntCache getWindowAttributesYourEventsCache;
-  IntCache getWindowAttributesDontPropagateCache;
-
-  //
-  // QueryColors reply.
-  //
-
-  BlockCache queryColorsLastReply;
-
-  //
-  // QueryFont reply.
-  //
-
-  static BlockCacheSet queryFontFontCache;
-  IntCache *queryFontCharInfoCache[6];
-  unsigned int queryFontLastCharInfo[6];
-
-  //
-  // QueryPointer reply.
-  //
-
-  IntCache queryPointerRootCache;
-  IntCache queryPointerChildCache;
-
-  //
-  // TranslateCoords reply.
-  //
-
-  IntCache translateCoordsChildCache;
-  IntCache translateCoordsXCache;
-  IntCache translateCoordsYCache;
-
-  //
-  // QueryTree reply.
-  //
-
-  IntCache queryTreeWindowCache;
-
-  //
-  // Generic reply. Use short data
-  // in protocol versions >= 3.
-  //
-
-  CharCache genericReplyCharCache;
-  IntCache  *genericReplyIntCache[12];
-
-  //
-  // Generic event. Only in protocol
-  // versions >= 3.
-  //
-
-  CharCache genericEventCharCache;
-  IntCache  *genericEventIntCache[14];
-
-  //
-  // Used in the abort split events.
-  //
-
-  OpcodeCache abortOpcodeCache;
-};
-
-#endif /* ServerCache_H */
diff --git a/nxcomp/ServerChannel.cpp b/nxcomp/ServerChannel.cpp
deleted file mode 100644
index eff24e90e..000000000
--- a/nxcomp/ServerChannel.cpp
+++ /dev/null
@@ -1,7942 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include <string.h>
-#include <sys/types.h>
-#include <sys/ipc.h>
-#ifndef ANDROID
-#include <sys/shm.h>
-#endif
-
-#include <X11/X.h>
-#include <X11/Xatom.h>
-
-#include "NXproto.h"
-#include "NXalert.h"
-#include "NXpack.h"
-#include "NXmitshm.h"
-
-#include "ServerChannel.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-#include "StaticCompressor.h"
-
-#include "Statistics.h"
-#include "Proxy.h"
-
-#include "Auth.h"
-#include "Unpack.h"
-
-//
-// Available unpack methods.
-//
-
-#include "Alpha.h"
-#include "Colormap.h"
-#include "Bitmap.h"
-#include "Jpeg.h"
-#include "Pgn.h"
-#include "Rgb.h"
-#include "Rle.h"
-
-extern Proxy *proxy;
-
-//
-// Set the verbosity level. You also
-// need to define OPCODES in Misc.cpp
-// if you want literals instead of
-// opcodes' numbers.
-//
-
-#define PANIC
-#define WARNING
-#undef  OPCODES
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Log the important tracepoints related
-// to writing packets to the peer proxy.
-//
-
-#undef  FLUSH
-
-//
-// Log the operations related to splits.
-//
-
-#undef  SPLIT
-
-//
-// Define this to log when a channel
-// is created or destroyed.
-//
-
-#undef  REFERENCES
-
-//
-// Define this to exit and suspend the
-// session after a given number of X
-// messages decoded by the proxy.
-//
-
-#undef  SUSPEND
-
-//
-// Define these to hide the server extensions.
-//
-
-#define HIDE_MIT_SHM_EXTENSION
-#define HIDE_BIG_REQUESTS_EXTENSION
-#define HIDE_XFree86_Bigfont_EXTENSION
-#undef  HIDE_SHAPE_EXTENSION
-#undef  HIDE_XKEYBOARD_EXTENSION
-
-//
-// Known reasons of connection failures.
-//
-
-#define INVALID_COOKIE_DATA  "Invalid MIT-MAGIC-COOKIE-1 key"
-#define INVALID_COOKIE_SIZE  ((int) sizeof(INVALID_COOKIE_DATA) - 1)
-
-#define NO_AUTH_PROTO_DATA   "No protocol specified"
-#define NO_AUTH_PROTO_SIZE   ((int) sizeof(NO_AUTH_PROTO_DATA) - 1)
-
-//
-// Here are the static members.
-//
-
-#ifdef REFERENCES
-
-int ServerChannel::references_ = 0;
-
-#endif
-
-ServerChannel::ServerChannel(Transport *transport, StaticCompressor *compressor)
-
-  : Channel(transport, compressor), readBuffer_(transport_, this)
-{
-  //
-  // Sequence number of the next message
-  // being encoded or decoded.
-  //
-
-  clientSequence_ = 0;
-  serverSequence_ = 0;
-
-  //
-  // Save the last motion event and flush
-  // it only when the timeout expires.
-  //
-
-  lastMotion_[0] = '\0';
-
-  //
-  // Clear the queue of sequence numbers
-  // of split commits. Used to mask the
-  // errors.
-  //
-
-  initCommitQueue();
-
-  //
-  // Do we enable or not sending of expose
-  // events to the X client.
-  //
-
-  enableExpose_         = 1;
-  enableGraphicsExpose_ = 1;
-  enableNoExpose_       = 1;
-
-  //
-  // Track data of image currently being
-  // decompressed.
-  //
-
-  imageState_ = NULL;
-
-  //
-  // Track MIT-SHM resources.
-  //
-
-  shmemState_ = NULL;
-
-  //
-  // Store the unpack state for each agent
-  // resource.
-  //
-
-  for (int i = 0; i < CONNECTIONS_LIMIT; i++)
-  {
-    unpackState_[i] = NULL;
-  }
-
-  //
-  // Data about the split parameters requested
-  // by the encoding side.
-  //
-
-  splitState_.resource = nothing;
-  splitState_.current  = 0;
-  splitState_.save     = 1;
-  splitState_.load     = 1;
-  splitState_.commit   = 0;
-
-  //
-  // It will be eventually set by
-  // the server proxy.
-  //
-
-  fontPort_ = -1;
-
-  #ifdef REFERENCES
-  *logofs << "ServerChannel: Created new object at " 
-          << this << " for FD#" << fd_ << " out of "
-          << ++references_ << " allocated channels.\n"
-          << logofs_flush;
-  #endif
-}
-
-ServerChannel::~ServerChannel()
-{
-  #ifdef TEST
-  *logofs << "ServerChannel: Freeing image state information.\n"
-          << logofs_flush;
-  #endif
-
-  handleImageStateRemove();
-
-  #ifdef TEST
-  *logofs << "ServerChannel: Freeing shared memory information.\n"
-          << logofs_flush;
-  #endif
-
-  handleShmemStateRemove();
-
-  #ifdef TEST
-  *logofs << "ServerChannel: Freeing unpack state information.\n"
-          << logofs_flush;
-  #endif
-
-  for (int i = 0; i < CONNECTIONS_LIMIT; i++)
-  {
-    handleUnpackStateRemove(i);
-  }
-
-  #ifdef TEST
-  *logofs << "ServerChannel: Freeing channel caches.\n"
-          << logofs_flush;
-  #endif
-
-  #ifdef REFERENCES
-  *logofs << "ServerChannel: Deleted object at " 
-          << this << " for FD#" << fd_ << " out of "
-          << --references_ << " allocated channels.\n"
-          << logofs_flush;
-  #endif
-}
-
-//
-// Beginning of handleRead().
-//
-
-int ServerChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *message,
-                                  unsigned int length)
-{
-  #ifdef DEBUG
-  *logofs << "handleRead: Called for FD#" << fd_
-          << ".\n" << logofs_flush;
-  #endif
-
-  //
-  // Pointer to located message and
-  // its size in bytes.
-  //
-
-  const unsigned char *inputMessage;
-  unsigned int inputLength;
-
-  //
-  // Set when message is found in
-  // cache.
-  //
-
-  int hit;
-
-  #if defined(TEST) || defined(INFO)
-  *logofs << "handleRead: Trying to read from FD#"
-          << fd_ << " at " << strMsTimestamp() << ".\n"
-          << logofs_flush;
-  #endif
-
-  int result = readBuffer_.readMessage();
-
-  #if defined(DEBUG) || defined(INFO)
-  *logofs << "handleRead: Read result on FD#" << fd_
-          << " is " << result << ".\n"
-          << logofs_flush;
-  #endif
-
-  if (result < 0)
-  {
-    //
-    // Let the proxy close the channel.
-    //
-
-    return -1;
-  }
-  else if (result == 0)
-  {
-    #if defined(TEST) || defined(INFO)
-
-    //
-    // This can happen because we have the descriptor
-    // selected in the read set but we already read
-    // the data asynchronously, while decoding data
-    // read from the proxy.
-    //
-
-    *logofs << "handleRead: WARNING! No data read from FD#"
-            << fd_ << " while encoding messages.\n"
-            << logofs_flush;
-
-    #endif
-
-    return 0;
-  }
-
-  #if defined(TEST) || defined(INFO) || defined(FLUSH)
-  *logofs << "handleRead: Encoding messages for FD#" << fd_
-          << " with " << readBuffer_.getLength() << " bytes "
-          << "in the buffer.\n" << logofs_flush;
-  #endif
-
-  //
-  // Extract any complete message which 
-  // is available in the buffer.
-  //
-
-  if (proxy -> handleAsyncSwitch(fd_) < 0)
-  {
-    return -1;
-  }
-
-  while ((inputMessage = readBuffer_.getMessage(inputLength)) != NULL)
-  {
-    hit = 0;
-
-    if (firstReply_)
-    {
-      //
-      // Handle the X server's authorization reply.
-      //
-
-      if (handleAuthorization(inputMessage, inputLength) < 0)
-      {
-        return -1;
-      }
-
-      imageByteOrder_ = inputMessage[30];
-      bitmapBitOrder_ = inputMessage[31];
-      scanlineUnit_   = inputMessage[32];
-      scanlinePad_    = inputMessage[33];
-
-      encodeBuffer.encodeValue((unsigned int) inputMessage[0], 8);
-      encodeBuffer.encodeValue((unsigned int) inputMessage[1], 8);
-      encodeBuffer.encodeValue(GetUINT(inputMessage + 2, bigEndian_), 16);
-      encodeBuffer.encodeValue(GetUINT(inputMessage + 4, bigEndian_), 16);
-      encodeBuffer.encodeValue(GetUINT(inputMessage + 6, bigEndian_), 16);
-
-      if (ServerCache::lastInitReply.compare(inputLength - 8, inputMessage + 8))
-      {
-        encodeBuffer.encodeBoolValue(1);
-      }
-      else
-      {
-        encodeBuffer.encodeBoolValue(0);
-
-        for (unsigned int i = 8; i < inputLength; i++)
-        {
-          encodeBuffer.encodeValue((unsigned int) inputMessage[i], 8);
-        }
-      }
-
-      firstReply_ = 0;
-
-      #if defined(TEST) || defined(OPCODES)
-
-      int bits = encodeBuffer.diffBits();
-
-      *logofs << "handleRead: Handled first reply. " << inputLength
-              << " bytes in, " << bits << " bits (" << ((float) bits) / 8
-              << " bytes) out.\n" << logofs_flush;
-
-      #endif
-
-      priority_++;
-
-    }
-    else
-    {
-      //
-      // NX client needs this line to consider
-      // the initialization phase successfully
-      // completed.
-      //
-
-      if (firstClient_ == -1)
-      {
-        cerr << "Info" << ": Established X server connection.\n" ;
-
-        firstClient_ = fd_;
-      }
-
-      //
-      // Check if this is a reply.
-      //
-
-      if (*inputMessage == X_Reply)
-      {
-        int bits = 0;
-
-        unsigned char inputOpcode = *inputMessage;
-
-        unsigned short int requestSequenceNum;
-        unsigned char      requestOpcode;
-        unsigned int       requestData[3];
-
-        unsigned int sequenceNum = GetUINT(inputMessage + 2, bigEndian_);
-
-        #ifdef SUSPEND
-
-        if (sequenceNum >= 1000)
-        {
-          cerr << "Warning" << ": Exiting to test the resilience of the agent.\n";
-
-          sleep(2);
-
-          HandleAbort();
-        }
-
-        #endif
-
-        //
-        // We managed all the events and errors caused
-        // by the previous requests. We can now reset
-        // the queue of split commits.
-        //
-
-        clearCommitQueue();
-
-        //
-        // Encode opcode and difference between
-        // current sequence and the last one.
-        //
-
-        encodeBuffer.encodeOpcodeValue(inputOpcode, serverCache_ -> opcodeCache);
-
-        unsigned int sequenceDiff = sequenceNum - serverSequence_;
-
-        serverSequence_ = sequenceNum;
-
-        #ifdef DEBUG
-        *logofs << "handleRead: Last server sequence number for FD#" 
-                << fd_ << " is " << serverSequence_ << " with "
-                << "difference " << sequenceDiff << ".\n"
-                << logofs_flush;
-        #endif
-
-        encodeBuffer.encodeCachedValue(sequenceDiff, 16,
-                           serverCache_ -> replySequenceCache, 7);
-
-        //
-        // Now handle the data part.
-        //
-
-        if (sequenceQueue_.peek(requestSequenceNum, requestOpcode) &&
-                                    requestSequenceNum == sequenceNum)
-        {
-          //
-          // We've found the request that generated this reply.
-          // It is possible to compress the reply based on the
-          // specific request type.
-          //
-
-          sequenceQueue_.pop(requestSequenceNum, requestOpcode,
-                                 requestData[0], requestData[1], requestData[2]);
-
-          //
-          // If differential compression is disabled
-          // then use the most simple encoding.
-          //
-
-          if (control -> LocalDeltaCompression == 0)
-          {
-            int result = handleFastReadReply(encodeBuffer, requestOpcode,
-                                                 inputMessage, inputLength);
-            if (result < 0)
-            {
-              return -1;
-            }
-            else if (result > 0)
-            {
-              continue;
-            }
-          }
-
-          switch (requestOpcode)
-          {
-          case X_AllocColor:
-            {
-              const unsigned char *nextSrc = inputMessage + 8;
-              for (unsigned int i = 0; i < 3; i++)
-              {
-                unsigned int colorValue = GetUINT(nextSrc, bigEndian_);
-                nextSrc += 2;
-                if (colorValue == requestData[i])
-                  encodeBuffer.encodeBoolValue(1);
-                else
-                {
-                  encodeBuffer.encodeBoolValue(0);
-                  encodeBuffer.encodeValue(colorValue - colorValue, 16, 6);
-                }
-              }
-              unsigned int pixel = GetULONG(inputMessage + 16, bigEndian_);
-              encodeBuffer.encodeValue(pixel, 32, 9);
-
-              priority_++;
-            }
-            break;
-          case X_GetAtomName:
-            {
-              unsigned int nameLength = GetUINT(inputMessage + 8, bigEndian_);
-              encodeBuffer.encodeValue(nameLength, 16, 6);
-              const unsigned char *nextSrc = inputMessage + 32;
-
-              // Since ProtoStep7 (#issue 108)
-              encodeBuffer.encodeTextData(nextSrc, nameLength);
-
-              priority_++;
-            }
-            break;
-          case X_GetGeometry:
-            {
-              //
-              // TODO: This obtains a satisfactory 10:1, but
-              // could be cached to leverage the big amount
-              // of such requests issued by QT clients.
-              //
-
-              encodeBuffer.encodeCachedValue(inputMessage[1], 8,
-                                             serverCache_ -> depthCache);
-              encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_),
-                                  29, serverCache_ -> getGeometryRootCache, 9);
-              const unsigned char *nextSrc = inputMessage + 12;
-              for (unsigned int i = 0; i < 5; i++)
-              {
-                encodeBuffer.encodeCachedValue(GetUINT(nextSrc, bigEndian_), 16,
-                                   *serverCache_ -> getGeometryGeomCache[i], 8);
-                nextSrc += 2;
-              }
-
-              priority_++;
-            }
-            break;
-          case X_GetInputFocus:
-            {
-              //
-              // Is it a real X_GetInputFocus or a
-              // masqueraded reply?
-              //
-
-              if (requestData[0] == X_GetInputFocus)
-              {
-                encodeBuffer.encodeValue((unsigned int) inputMessage[1], 2);
-                encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_),
-                                29, serverCache_ -> getInputFocusWindowCache);
-
-                priority_++;
-              }
-              else
-              {
-                //
-                // TODO: We are not setting priority in case
-                // of replies other than real X_GetInputFocus
-                // or X_NXGetUnpackParameters. We should check
-                // once again that this is OK.
-                //
-
-                #ifdef TEST
-                *logofs << "handleRead: Received tainted X_GetInputFocus reply "
-                        << "for request OPCODE#" << requestData[0] << " with "
-                        << "sequence " << sequenceNum << ".\n"
-                        << logofs_flush;
-                #endif
-
-                //
-                // Don't encode any data in case of sync
-                // messages or any other reply for which
-                // opcode is enough.
-                //
-
-                if (requestData[0] == opcodeStore_ -> getUnpackParameters)
-                {
-                  for (int i = 0; i < PACK_METHOD_LIMIT; i++)
-                  {
-                    encodeBuffer.encodeBoolValue(control -> LocalUnpackMethods[i]);
-                  }
-
-                  priority_++;
-                }
-                else if (requestData[0] == opcodeStore_ -> getShmemParameters)
-                {
-                  if (handleShmemReply(encodeBuffer, requestOpcode, requestData[1],
-                                           inputMessage, inputLength) < 0)
-                  {
-                    return -1;
-                  }
-
-                  priority_++;
-                }
-                else if (requestData[0] == opcodeStore_ -> getFontParameters)
-                {
-                  if (handleFontReply(encodeBuffer, requestOpcode,
-                                          inputMessage, inputLength) < 0)
-                  {
-                    return -1;
-                  }
-                }
-
-                //
-                // Account this data to the original opcode.
-                //
-
-                requestOpcode = requestData[0];
-              }
-            }
-            break;
-          case X_GetKeyboardMapping:
-            {
-              unsigned int keysymsPerKeycode = (unsigned int) inputMessage[1];
-              if (ServerCache::getKeyboardMappingLastMap.compare(inputLength - 32,
-                        inputMessage + 32) && (keysymsPerKeycode ==
-                            ServerCache::getKeyboardMappingLastKeysymsPerKeycode))
-              {
-                encodeBuffer.encodeBoolValue(1);
-
-                priority_++;
-
-                break;
-              }
-              ServerCache::getKeyboardMappingLastKeysymsPerKeycode = keysymsPerKeycode;
-              encodeBuffer.encodeBoolValue(0);
-              unsigned int numKeycodes =
-              (((inputLength - 32) / keysymsPerKeycode) >> 2);
-              encodeBuffer.encodeValue(numKeycodes, 8);
-              encodeBuffer.encodeValue(keysymsPerKeycode, 8, 4);
-              const unsigned char *nextSrc = inputMessage + 32;
-              unsigned char previous = 0;
-              for (unsigned int count = numKeycodes * keysymsPerKeycode;
-                   count; --count)
-              {
-                unsigned int keysym = GetULONG(nextSrc, bigEndian_);
-                nextSrc += 4;
-                if (keysym == NoSymbol)
-                  encodeBuffer.encodeBoolValue(1);
-                else
-                {
-                  encodeBuffer.encodeBoolValue(0);
-                  unsigned int first3Bytes = (keysym >> 8);
-                  encodeBuffer.encodeCachedValue(first3Bytes, 24,
-                             serverCache_ -> getKeyboardMappingKeysymCache, 9);
-                  unsigned char lastByte = (unsigned char) (keysym & 0xff);
-                  encodeBuffer.encodeCachedValue(lastByte - previous, 8,
-                           serverCache_ -> getKeyboardMappingLastByteCache, 5);
-                  previous = lastByte;
-                }
-              }
-
-              priority_++;
-            }
-            break;
-          case X_GetModifierMapping:
-            {
-              encodeBuffer.encodeValue((unsigned int) inputMessage[1], 8);
-              const unsigned char *nextDest = inputMessage + 32;
-              if (ServerCache::getModifierMappingLastMap.compare(inputLength - 32,
-                                                nextDest))
-              {
-                encodeBuffer.encodeBoolValue(1);
-
-                priority_++;
-
-                break;
-              }
-              encodeBuffer.encodeBoolValue(0);
-              for (unsigned int count = inputLength - 32; count; count--)
-              {
-                unsigned char next = *nextDest++;
-                if (next == 0)
-                  encodeBuffer.encodeBoolValue(1);
-                else
-                {
-                  encodeBuffer.encodeBoolValue(0);
-                  encodeBuffer.encodeValue(next, 8);
-                }
-              }
-
-              priority_++;
-            }
-            break;
-          case X_GetProperty:
-            {
-              MessageStore *messageStore = serverStore_ ->
-                                   getReplyStore(X_GetProperty);
-
-              hit = handleEncode(encodeBuffer, serverCache_, messageStore,
-                                     requestOpcode, inputMessage, inputLength);
-
-              priority_++;
-            }
-            break;
-          case X_GetSelectionOwner:
-            {
-              encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_),
-                                29, serverCache_ -> getSelectionOwnerCache, 9);
-              priority_++;
-            }
-            break;
-          case X_GetWindowAttributes:
-            {
-              encodeBuffer.encodeValue((unsigned int) inputMessage[1], 2);
-              encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_),
-                                           29, serverCache_ -> visualCache);
-              encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 12, bigEndian_),
-                         16, serverCache_ -> getWindowAttributesClassCache, 3);
-              encodeBuffer.encodeCachedValue(inputMessage[14], 8,
-                           serverCache_ -> getWindowAttributesBitGravityCache);
-              encodeBuffer.encodeCachedValue(inputMessage[15], 8,
-                           serverCache_ -> getWindowAttributesWinGravityCache);
-              encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 16, bigEndian_),
-                        32, serverCache_ -> getWindowAttributesPlanesCache, 9);
-              encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 20, bigEndian_),
-                         32, serverCache_ -> getWindowAttributesPixelCache, 9);
-              encodeBuffer.encodeBoolValue((unsigned int) inputMessage[24]);
-              encodeBuffer.encodeBoolValue((unsigned int) inputMessage[25]);
-              encodeBuffer.encodeValue((unsigned int) inputMessage[26], 2);
-              encodeBuffer.encodeBoolValue((unsigned int) inputMessage[27]);
-              encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 28, bigEndian_),
-                                         29, serverCache_ -> colormapCache, 9);
-              encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 32, bigEndian_),
-                        32, serverCache_ -> getWindowAttributesAllEventsCache);
-              encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 36, bigEndian_),
-                       32, serverCache_ -> getWindowAttributesYourEventsCache);
-              encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 40, bigEndian_),
-                    16, serverCache_ -> getWindowAttributesDontPropagateCache);
-
-              priority_++;
-            }
-            break;
-          case X_GrabKeyboard:
-          case X_GrabPointer:
-            {
-              encodeBuffer.encodeValue((unsigned int) inputMessage[1], 3);
-
-              priority_++;
-            }
-            break;
-          case X_InternAtom:
-            {
-              encodeBuffer.encodeValue(GetULONG(inputMessage + 8, bigEndian_), 29, 9);
-
-              priority_++;
-            }
-            break;
-          case X_ListExtensions:
-            {
-              encodeBuffer.encodeValue(GetULONG(inputMessage + 4, bigEndian_), 32, 8);
-              unsigned int numExtensions = (unsigned int) inputMessage[1];
-              encodeBuffer.encodeValue(numExtensions, 8);
-              const unsigned char *nextSrc = inputMessage + 32;
-
-              for (; numExtensions; numExtensions--)
-              {
-                unsigned int length = (unsigned int) (*nextSrc++);
-
-                encodeBuffer.encodeValue(length, 8);
-
-                #ifdef HIDE_MIT_SHM_EXTENSION
-
-                if (!strncmp((char *) nextSrc, "MIT-SHM", 7))
-                {
-                  #ifdef TEST
-                  *logofs << "handleRead: Hiding MIT-SHM extension in reply.\n"
-                          << logofs_flush;
-                  #endif
-
-                  memcpy((unsigned char *) nextSrc, "NO-MIT-", 7);
-                }
-
-                #endif
-
-                #ifdef HIDE_BIG_REQUESTS_EXTENSION
-
-                if (!strncmp((char *) nextSrc, "BIG-REQUESTS", 12))
-                {
-                  #ifdef TEST
-                  *logofs << "handleRead: Hiding BIG-REQUESTS extension in reply.\n"
-                          << logofs_flush;
-                  #endif
-
-                  memcpy((unsigned char *) nextSrc, "NO-BIG-REQUE", 12);
-                }
-
-                #endif
-
-                #ifdef HIDE_XKEYBOARD_EXTENSION
-
-                if (!strncmp((char *) nextSrc, "XKEYBOARD", 9))
-                {
-                  #ifdef TEST
-                  *logofs << "handleRead: Hiding XKEYBOARD extension in reply.\n"
-                          << logofs_flush;
-                  #endif
-
-                  memcpy((unsigned char *) nextSrc, "NO-XKEYBO", 9);
-                }
-
-                #endif
-
-                #ifdef HIDE_XFree86_Bigfont_EXTENSION
-
-                if (!strncmp((char *) nextSrc, "XFree86-Bigfont", 15))
-                {
-                  #ifdef TEST
-                  *logofs << "handleRead: Hiding XFree86-Bigfont extension in reply.\n"
-                          << logofs_flush;
-                  #endif
-
-                  memcpy((unsigned char *) nextSrc, "NO-XFree86-Bigf", 15);
-                }
-
-                #endif
-
-                #ifdef HIDE_SHAPE_EXTENSION
-
-                if (!strncmp((char *) nextSrc, "SHAPE", 5))
-                {
-                  #ifdef TEST
-                  *logofs << "handleRead: Hiding SHAPE extension in reply.\n"
-                          << logofs_flush;
-                  #endif
-
-                  memcpy((unsigned char *) nextSrc, "NO-SH", 5);
-                }
-
-                #endif
-
-                //
-                // Check if user disabled RENDER extension.
-                //
-
-                if (control -> HideRender == 1 &&
-                        !strncmp((char *) nextSrc, "RENDER", 6))
-                {
-                  #ifdef TEST
-                  *logofs << "handleRead: Hiding RENDER extension in reply.\n"
-                          << logofs_flush;
-                  #endif
-
-                  memcpy((unsigned char *) nextSrc, "NO-REN", 6);
-                }
-
-                for (; length; length--)
-                {
-                  encodeBuffer.encodeValue((unsigned int) (*nextSrc++), 8);
-                }
-              }
-
-              priority_++;
-            }
-            break;
-          case X_ListFonts:
-            {
-              MessageStore *messageStore = serverStore_ ->
-                                   getReplyStore(X_ListFonts);
-
-              if (handleEncodeCached(encodeBuffer, serverCache_, messageStore,
-                                         inputMessage, inputLength))
-              {
-                priority_++;
-
-                hit = 1;
-
-                break;
-              }
-
-              encodeBuffer.encodeValue(GetULONG(inputMessage + 4, bigEndian_), 32, 8);
-              unsigned int numFonts = GetUINT(inputMessage + 8, bigEndian_);
-              encodeBuffer.encodeValue(numFonts, 16, 6);
-
-              // Differential encoding.
-              encodeBuffer.encodeBoolValue(1);
-
-              const unsigned char* nextSrc = inputMessage + 32;
-              for (; numFonts; numFonts--)
-              {
-                unsigned int length = (unsigned int) (*nextSrc++);
-                encodeBuffer.encodeValue(length, 8);
-
-                // Since ProtoStep7 (#issue 108)
-                encodeBuffer.encodeTextData(nextSrc, length);
-
-                nextSrc += length;
-              }
-
-              priority_++;
-            }
-            break;
-          case X_LookupColor:
-          case X_AllocNamedColor:
-            {
-              const unsigned char *nextSrc = inputMessage + 8;
-              if (requestOpcode == X_AllocNamedColor)
-              {
-                encodeBuffer.encodeValue(GetULONG(nextSrc, bigEndian_), 32, 9);
-                nextSrc += 4;
-              }
-              unsigned int count = 3;
-              do
-              {
-                unsigned int exactColor = GetUINT(nextSrc, bigEndian_);
-                encodeBuffer.encodeValue(exactColor, 16, 9);
-                unsigned int visualColor = GetUINT(nextSrc + 6, bigEndian_) -
-                exactColor;
-                encodeBuffer.encodeValue(visualColor, 16, 5);
-                nextSrc += 2;
-              }
-              while (--count);
-
-              priority_++;
-            }
-            break;
-          case X_QueryBestSize:
-            {
-              encodeBuffer.encodeValue(GetUINT(inputMessage + 8, bigEndian_), 16, 8);
-              encodeBuffer.encodeValue(GetUINT(inputMessage + 10, bigEndian_), 16, 8);
-
-              priority_++;
-            }
-            break;
-          case X_QueryColors:
-            {
-              // Differential encoding.
-              encodeBuffer.encodeBoolValue(1);
-
-              unsigned int numColors = ((inputLength - 32) >> 3);
-              const unsigned char *nextSrc = inputMessage + 40;
-              unsigned char *nextDest = (unsigned char *) inputMessage + 38;
-              for (unsigned int c = 1; c < numColors; c++)
-              {
-                for (unsigned int i = 0; i < 6; i++)
-                  *nextDest++ = *nextSrc++;
-                nextSrc += 2;
-              }
-              unsigned int colorsLength = numColors * 6;
-              if (serverCache_ -> queryColorsLastReply.compare(colorsLength,
-                                                                   inputMessage + 32))
-                encodeBuffer.encodeBoolValue(1);
-              else
-              {
-                const unsigned char *nextSrc = inputMessage + 32;
-                encodeBuffer.encodeBoolValue(0);
-                encodeBuffer.encodeValue(numColors, 16, 5);
-                for (numColors *= 3; numColors; numColors--)
-                {
-                  encodeBuffer.encodeValue(GetUINT(nextSrc, bigEndian_), 16);
-                  nextSrc += 2;
-                }
-              }
-
-              priority_++;
-            }
-            break;
-          case X_QueryExtension:
-            {
-              if (requestData[0] == X_QueryExtension)
-              {
-                //
-                // Value in requestData[0] will be nonzero
-                // if the request is for an extension that
-                // we should hide to the X client.
-                //
-
-                if (requestData[1])
-                {
-                  encodeBuffer.encodeBoolValue(0);
-                  encodeBuffer.encodeValue(0, 8);
-                }
-                else
-                {
-                  encodeBuffer.encodeBoolValue((unsigned int) inputMessage[8]);
-                  encodeBuffer.encodeValue((unsigned int) inputMessage[9], 8);
-                }
-
-                encodeBuffer.encodeValue((unsigned int) inputMessage[10], 8);
-                encodeBuffer.encodeValue((unsigned int) inputMessage[11], 8);
-
-                if (requestData[2] == X_NXInternalShapeExtension)
-                {
-                  opcodeStore_ -> shapeExtension = inputMessage[9];
-
-                  #ifdef TEST
-                  *logofs << "handleRead: Shape extension opcode for FD#" << fd_
-                          << " is " << (unsigned int) opcodeStore_ -> shapeExtension
-                          << ".\n" << logofs_flush;
-                  #endif
-                }
-                else if (requestData[2] == X_NXInternalRenderExtension)
-                {
-                  opcodeStore_ -> renderExtension = inputMessage[9];
-
-                  #ifdef TEST
-                  *logofs << "handleRead: Render extension opcode for FD#" << fd_
-                          << " is " << (unsigned int) opcodeStore_ -> renderExtension
-                          << ".\n" << logofs_flush;
-                  #endif
-                }
-
-                priority_++;
-              }
-              else
-              {
-                #ifdef TEST
-                *logofs << "handleRead: Received tainted X_QueryExtension reply "
-                        << "for request OPCODE#" << requestData[0] << " with "
-                        << "sequence " << sequenceNum << ".\n"
-                        << logofs_flush;
-                #endif
-
-                if (requestData[0] == opcodeStore_ -> getShmemParameters)
-                {
-                  if (handleShmemReply(encodeBuffer, requestOpcode, requestData[1],
-                                           inputMessage, inputLength) < 0)
-                  {
-                    return -1;
-                  }
-
-                  priority_++;
-                }
-                //
-                // Account this data to the original opcode.
-                //
-
-                requestOpcode = requestData[0];
-              }
-            }
-            break;
-          case X_QueryFont:
-            {
-              MessageStore *messageStore = serverStore_ ->
-                                   getReplyStore(X_QueryFont);
-
-              if (handleEncodeCached(encodeBuffer, serverCache_, messageStore,
-                                         inputMessage, inputLength))
-              {
-                priority_++;
-
-                hit = 1;
-
-                break;
-              }
-
-              // Differential encoding.
-              encodeBuffer.encodeBoolValue(1);
-
-              unsigned int numProperties = GetUINT(inputMessage + 46, bigEndian_);
-              unsigned int numCharInfos = GetULONG(inputMessage + 56, bigEndian_);
-              encodeBuffer.encodeValue(numProperties, 16, 8);
-              encodeBuffer.encodeValue(numCharInfos, 32, 10);
-              handleEncodeCharInfo(inputMessage + 8, encodeBuffer);
-              handleEncodeCharInfo(inputMessage + 24, encodeBuffer);
-              encodeBuffer.encodeValue(GetUINT(inputMessage + 40, bigEndian_), 16, 9);
-              encodeBuffer.encodeValue(GetUINT(inputMessage + 42, bigEndian_), 16, 9);
-              encodeBuffer.encodeValue(GetUINT(inputMessage + 44, bigEndian_), 16, 9);
-              encodeBuffer.encodeBoolValue((unsigned int) inputMessage[48]);
-              encodeBuffer.encodeValue((unsigned int) inputMessage[49], 8);
-              encodeBuffer.encodeValue((unsigned int) inputMessage[50], 8);
-              encodeBuffer.encodeBoolValue((unsigned int) inputMessage[51]);
-              encodeBuffer.encodeValue(GetUINT(inputMessage + 52, bigEndian_), 16, 9);
-              encodeBuffer.encodeValue(GetUINT(inputMessage + 54, bigEndian_), 16, 9);
-              const unsigned char *nextSrc = inputMessage + 60;
-              unsigned int index;
-
-              int end = 0;
-
-              if (ServerCache::queryFontFontCache.lookup(numProperties * 8 +
-                                        numCharInfos * 12, nextSrc, index))
-              {
-                encodeBuffer.encodeBoolValue(1);
-                encodeBuffer.encodeValue(index, 4);
-
-                end = 1;
-              }
-
-              if (end == 0)
-              {
-                encodeBuffer.encodeBoolValue(0);
-                for (; numProperties; numProperties--)
-                {
-                  encodeBuffer.encodeValue(GetULONG(nextSrc, bigEndian_), 32, 9);
-                  encodeBuffer.encodeValue(GetULONG(nextSrc + 4, bigEndian_), 32, 9);
-                  nextSrc += 8;
-                }
-                for (; numCharInfos; numCharInfos--)
-                {
-                  handleEncodeCharInfo(nextSrc, encodeBuffer);
-
-                  nextSrc += 12;
-                }
-              }
-
-              priority_++;
-            }
-            break;
-          case X_QueryPointer:
-            {
-              encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]);
-              encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_),
-                                 29, serverCache_ -> queryPointerRootCache, 9);
-              encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 12, bigEndian_),
-                                29, serverCache_ -> queryPointerChildCache, 9);
-              unsigned int rootX = GetUINT(inputMessage + 16, bigEndian_);
-              unsigned int rootY = GetUINT(inputMessage + 18, bigEndian_);
-              unsigned int eventX = GetUINT(inputMessage + 20, bigEndian_);
-              unsigned int eventY = GetUINT(inputMessage + 22, bigEndian_);
-              eventX -= rootX;
-              eventY -= rootY;
-              encodeBuffer.encodeCachedValue(
-                             rootX - serverCache_ -> motionNotifyLastRootX, 16,
-                                    serverCache_ -> motionNotifyRootXCache, 8);
-              serverCache_ -> motionNotifyLastRootX = rootX;
-              encodeBuffer.encodeCachedValue(
-                             rootY - serverCache_ -> motionNotifyLastRootY, 16,
-                                    serverCache_ -> motionNotifyRootYCache, 8);
-              serverCache_ -> motionNotifyLastRootY = rootY;
-              encodeBuffer.encodeCachedValue(eventX, 16,
-                                   serverCache_ -> motionNotifyEventXCache, 8);
-              encodeBuffer.encodeCachedValue(eventY, 16,
-                                   serverCache_ -> motionNotifyEventYCache, 8);
-              encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 24, bigEndian_),
-                                   16, serverCache_ -> motionNotifyStateCache);
-              priority_++;
-            }
-            break;
-          case X_QueryTree:
-            {
-              //
-              // This was very inefficient. In practice
-              // it just copied data on the output. Now
-              // it obtains an average 7:1 compression
-              // and could optionally be cached.
-              //
-
-              unsigned int children = GetUINT(inputMessage + 16, bigEndian_);
-
-              encodeBuffer.encodeValue(children, 16, 8);
-
-              encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_), 29,
-                                 serverCache_ -> queryTreeWindowCache);
-
-              encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 12, bigEndian_), 29,
-                                 serverCache_ -> queryTreeWindowCache);
-
-              const unsigned char *next = inputMessage + 32;
-
-              for (unsigned int i = 0; i < children; i++)
-              {
-                encodeBuffer.encodeCachedValue(GetULONG(next + (i * 4), bigEndian_), 29,
-                                   serverCache_ -> queryTreeWindowCache);
-              }
-
-              priority_++;
-            }
-            break;
-          case X_TranslateCoords:
-            {
-              encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]);
-              encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_),
-                             29, serverCache_ -> translateCoordsChildCache, 9);
-              encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 12, bigEndian_),
-                                 16, serverCache_ -> translateCoordsXCache, 8);
-              encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 14, bigEndian_),
-                                 16, serverCache_ -> translateCoordsYCache, 8);
-              priority_++;
-            }
-            break;
-          case X_GetImage:
-            {
-              MessageStore *messageStore = serverStore_ ->
-                                   getReplyStore(X_GetImage);
-
-              if (handleEncodeCached(encodeBuffer, serverCache_, messageStore,
-                                         inputMessage, inputLength))
-              {
-                priority_++;
-
-                hit = 1;
-
-                break;
-              }
-
-              // Depth.
-              encodeBuffer.encodeCachedValue(inputMessage[1], 8,
-                                 serverCache_ -> depthCache);
-              // Reply length.
-              encodeBuffer.encodeValue(GetULONG(inputMessage + 4, bigEndian_), 32, 9);
-
-              // Visual.
-              encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_), 29,
-                                 serverCache_ -> visualCache);
-
-              // Since ProtoStep8 (#issue 108)
-              handleCopy(encodeBuffer, requestOpcode, messageStore ->
-                            dataOffset, inputMessage, inputLength);
-
-              priority_++;
-            }
-            break;
-            case X_GetPointerMapping:
-            {
-              encodeBuffer.encodeValue(inputMessage[1], 8, 4);
-              encodeBuffer.encodeValue(GetULONG(inputMessage + 4, bigEndian_), 32, 4);
-              for (unsigned int i = 32; i < inputLength; i++)
-                encodeBuffer.encodeValue((unsigned int) inputMessage[i], 8, 4);
-
-              priority_++;
-            }
-            break;
-            case X_GetKeyboardControl:
-            {
-              encodeBuffer.encodeValue(inputMessage[1], 8, 2);
-              encodeBuffer.encodeValue(GetULONG(inputMessage + 4, bigEndian_), 32, 8);
-              for (unsigned int i = 8; i < inputLength; i++)
-                encodeBuffer.encodeValue((unsigned int) inputMessage[i], 8, 4);
-
-              priority_++;
-            }
-            break;
-          default:
-            {
-              #ifdef PANIC
-              *logofs << "ServerChannel: PANIC! No matching request with "
-                      << "OPCODE#" << (unsigned int) requestOpcode
-                      << " for reply with sequence number "
-                      << requestSequenceNum << ".\n"
-                      << logofs_flush;
-              #endif
-
-              cerr << "Error" << ": No matching request with OPCODE#"
-                   << (unsigned int) requestOpcode << " for reply with "
-                   << "sequence number " << requestSequenceNum << ".\n";
-
-              return -1;
-            }
-          }
-
-          bits = encodeBuffer.diffBits();
-
-          #if defined(TEST) || defined(OPCODES)
-
-          const char *cacheString = (hit ? "cached " : "");
-
-          *logofs << "handleRead: Handled " << cacheString << "reply to OPCODE#"
-                  << (unsigned int) requestOpcode << " (" << DumpOpcode(requestOpcode)
-                  << ") for FD#" << fd_ << " sequence " << serverSequence_
-                  << ". " << inputLength << " bytes in, " << bits << " bits ("
-                  << ((float) bits) / 8 << " bytes) out.\n" << logofs_flush;
-
-          #endif
-
-        } // End of if (sequenceQueue_.peek(requestSequenceNum, requestOpcode) && ...
-        else
-        {
-          //
-          // We didn't push the request opcode.
-          // Check if fast encoding is required.
-          //
-
-          requestOpcode = X_Reply;
-
-          if (control -> LocalDeltaCompression == 0)
-          {
-            int result = handleFastReadReply(encodeBuffer, requestOpcode,
-                                                 inputMessage, inputLength);
-            if (result < 0)
-            {
-              return -1;
-            }
-            else if (result > 0)
-            {
-              continue;
-            }
-          }
-
-          //
-          // Group all replies whose opcode was not
-          // pushed in sequence number queue under
-          // the category 'generic reply'.
-          //
-
-          #ifdef DEBUG
-          *logofs << "handleRead: Identified generic reply.\n"
-                  << logofs_flush;
-          #endif
-
-          MessageStore *messageStore = serverStore_ ->
-                               getReplyStore(X_NXInternalGenericReply);
-
-          hit = handleEncode(encodeBuffer, serverCache_, messageStore,
-                                 requestOpcode, inputMessage, inputLength);
-
-          priority_++;
-
-          bits = encodeBuffer.diffBits();
-
-          #if defined(TEST) || defined(OPCODES)
-
-          const char *cacheString = (hit ? "cached " : "");
-
-          *logofs << "handleRead: Handled " << cacheString << "generic reply "
-                  << "OPCODE#" << X_NXInternalGenericReply << " for FD#" << fd_
-                  << " sequence " << serverSequence_ << ". " << inputLength
-                  << " bytes in, " << bits << " bits (" << ((float) bits) / 8
-                  << " bytes) out.\n" << logofs_flush;
-
-          #endif
-        }
-
-        if (hit)
-        {
-          statistics -> addCachedReply(requestOpcode);
-        }
-
-        statistics -> addReplyBits(requestOpcode, inputLength << 3, bits);
-
-      } // End of if (inputMessage[0] == 1) ...
-      else
-      {
-        //
-        // Event or error.
-        //
-
-        unsigned char inputOpcode = *inputMessage;
-
-        unsigned int inputSequence = GetUINT(inputMessage + 2, bigEndian_);
-
-        //
-        // Check if this is an event which we can discard.
-        //
-
-        if ((inputOpcode == Expose && enableExpose_ == 0) ||
-                (inputOpcode == GraphicsExpose && enableGraphicsExpose_ == 0) ||
-                    (inputOpcode == NoExpose && enableNoExpose_ == 0))
-        {
-          continue;
-        }
-        else if (shmemState_ != NULL && shmemState_ -> enabled == 1 &&
-                     inputOpcode == shmemState_ -> event &&
-                         checkShmemEvent(inputOpcode, inputSequence,
-                             inputMessage) > 0)
-        {
-          continue;
-        }
-        else if (inputOpcode == MotionNotify)
-        {
-          //
-          // Save the motion event and send when another
-          // event or error is received or the motion ti-
-          // meout is elapsed. If a previous motion event
-          // was already saved, we replace it with the
-          // new one and don't reset the timeout, so we
-          // still have a motion event every given ms.
-          //
-
-          memcpy(lastMotion_, inputMessage, 32);
-
-          #ifdef TEST
-          *logofs << "handleRead: Saved suppressed motion event for FD#"
-                  << fd_ << ".\n" << logofs_flush;
-          #endif
-
-          continue;
-        }
-        else if (inputOpcode == X_Error)
-        {
-          //
-          // Check if this is an error that matches a
-          // sequence number for which we are expecting
-          // a reply.
-          //
-
-          unsigned short int errorSequenceNum;
-          unsigned char errorOpcode;
-
-          if (sequenceQueue_.peek(errorSequenceNum, errorOpcode) &&
-                  ((unsigned int) errorSequenceNum == inputSequence))
-          {
-            sequenceQueue_.pop(errorSequenceNum, errorOpcode);
-          }
-
-          //
-          // Check if error is due to an image commit
-          // generated at the end of a split.
-          //
-
-          if (checkCommitError(*(inputMessage + 1), inputSequence, inputMessage) > 0)
-          {
-            #ifdef TEST
-            *logofs << "handleRead: Skipping error on image commit for FD#"
-                    << fd_ << ".\n" << logofs_flush;
-            #endif
-
-            continue;
-          }
-
-          //
-          // Check if it's an error generated by a request
-          // concerning shared memory support.
-          //
-
-          else if (shmemState_ != NULL && (shmemState_ -> sequence ==
-                        inputSequence || (shmemState_ -> enabled == 1 &&
-                            (shmemState_ -> opcode == *(inputMessage + 10) ||
-                                shmemState_ -> error == *(inputMessage + 1)))) &&
-                                    checkShmemError(*(inputMessage + 1), inputSequence,
-                                        inputMessage) > 0)
-          {
-            #ifdef TEST
-            *logofs << "handleRead: Skipping error on shmem operation for FD#"
-                    << fd_ << ".\n" << logofs_flush;
-            #endif
-
-            continue;
-          }
-        }
-        //
-        // Check if user pressed the CTRL+ALT+SHIFT+ESC key
-        // sequence because was unable to kill the session
-        // through the normal procedure.
-        //
-
-        if (inputOpcode == KeyPress)
-        {
-          if (checkKeyboardEvent(inputOpcode, inputSequence, inputMessage) == 1)
-          {
-            #ifdef TEST
-            *logofs << "handleRead: Removing the key sequence from the "
-                    << "event stream for FD#" << fd_ << ".\n"
-                    << logofs_flush;
-            #endif
-
-            continue;
-          }
-        }
-
-        //
-        // We are going to handle an event or error
-        // that's not a mouse motion. Prepend any
-        // saved motion to it.
-        //
-
-        if (lastMotion_[0] != '\0')
-        {
-          if (handleMotion(encodeBuffer) < 0)
-          {
-            #ifdef PANIC
-            *logofs << "handleRead: PANIC! Can't encode motion event for FD#"
-                    << fd_ << ".\n" << logofs_flush;
-            #endif
-
-            cerr << "Error" << ": Can't encode motion event for FD#"
-                 << fd_ << ".\n";
-
-            return -1;
-          }
-        }
-
-        //
-        // Encode opcode and difference between
-        // current sequence and the last one.
-        //
-
-        encodeBuffer.encodeOpcodeValue(inputOpcode, serverCache_ -> opcodeCache);
-
-        unsigned int sequenceDiff = inputSequence - serverSequence_;
-
-        serverSequence_ = inputSequence;
-
-        #ifdef DEBUG
-        *logofs << "handleRead: Last server sequence number for FD#" 
-                << fd_ << " is " << serverSequence_ << " with "
-                << "difference " << sequenceDiff << ".\n"
-                << logofs_flush;
-        #endif
-
-        encodeBuffer.encodeCachedValue(sequenceDiff, 16,
-                           serverCache_ -> eventSequenceCache, 7);
-
-        //
-        // If differential compression is disabled
-        // then use the most simple encoding.
-        //
-
-        if (control -> LocalDeltaCompression == 0)
-        {
-          int result = handleFastReadEvent(encodeBuffer, inputOpcode,
-                                               inputMessage, inputLength);
-          if (result < 0)
-          {
-            return -1;
-          }
-          else if (result > 0)
-          {
-            continue;
-          }
-        }
-
-        switch (inputOpcode)
-        {
-        case X_Error:
-          {
-            //
-            // Set the priority flag in the case of
-            // a X protocol error. This may restart
-            // the client if it was waiting for the
-            // reply.
-            //
-
-            priority_++;
-
-            unsigned char errorCode = *(inputMessage + 1);
-
-            encodeBuffer.encodeCachedValue(errorCode, 8,
-                               serverCache_ -> errorCodeCache);
-
-            if (errorCode != 11 && errorCode != 8 &&
-                    errorCode != 15 && errorCode != 1)
-            {
-              encodeBuffer.encodeValue(GetULONG(inputMessage + 4, bigEndian_), 32, 16);
-            }
-
-            if (errorCode >= 18)
-            {
-              encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 8, bigEndian_), 16,
-                                 serverCache_ -> errorMinorCache);
-            }
-
-            encodeBuffer.encodeCachedValue(inputMessage[10], 8,
-                               serverCache_ -> errorMajorCache);
-
-            if (errorCode >= 18)
-            {
-              const unsigned char *nextSrc = inputMessage + 11;
-              for (unsigned int i = 11; i < 32; i++)
-                encodeBuffer.encodeValue(*nextSrc++, 8);
-            }
-          }
-          break;
-        case ButtonPress:
-        case ButtonRelease:
-        case KeyPress:
-        case KeyRelease:
-        case MotionNotify:
-        case EnterNotify:
-        case LeaveNotify:
-          {
-            //
-            // Set the priority in the case this is
-            // an event that the remote side may
-            // care to receive as soon as possible.
-            //
-
-            switch (inputOpcode)
-            {
-              case ButtonPress:
-              case ButtonRelease:
-              case KeyPress:
-              case KeyRelease:
-              {
-                priority_++;
-              }
-            }
-
-            unsigned char detail = inputMessage[1];
-            if (*inputMessage == MotionNotify)
-              encodeBuffer.encodeBoolValue((unsigned int) detail);
-            else if ((*inputMessage == EnterNotify) || (*inputMessage == LeaveNotify))
-              encodeBuffer.encodeValue((unsigned int) detail, 3);
-            else if (*inputMessage == KeyRelease)
-            {
-              if (detail == serverCache_ -> keyPressLastKey)
-                encodeBuffer.encodeBoolValue(1);
-              else
-              {
-                encodeBuffer.encodeBoolValue(0);
-                encodeBuffer.encodeValue((unsigned int) detail, 8);
-              }
-            }
-            else if ((*inputMessage == ButtonPress) || (*inputMessage == ButtonRelease))
-              encodeBuffer.encodeCachedValue(detail, 8,
-                                             serverCache_ -> buttonCache);
-            else
-              encodeBuffer.encodeValue((unsigned int) detail, 8);
-            unsigned int timestamp = GetULONG(inputMessage + 4, bigEndian_);
-            unsigned int timestampDiff =
-            timestamp - serverCache_ -> lastTimestamp;
-            serverCache_ -> lastTimestamp = timestamp;
-            encodeBuffer.encodeCachedValue(timestampDiff, 32,
-                                serverCache_ -> motionNotifyTimestampCache, 9);
-            int skipRest = 0;
-            if (*inputMessage == KeyRelease)
-            {
-              skipRest = 1;
-              for (unsigned int i = 8; i < 31; i++)
-              {
-                if (inputMessage[i] != serverCache_ -> keyPressCache[i - 8])
-                {
-                  skipRest = 0;
-                  break;
-                }
-              }
-              encodeBuffer.encodeBoolValue(skipRest);
-            }
-
-            if (!skipRest)
-            {
-              const unsigned char *nextSrc = inputMessage + 8;
-              for (unsigned int i = 0; i < 3; i++)
-              {
-                encodeBuffer.encodeCachedValue(GetULONG(nextSrc, bigEndian_), 29,
-                                   *serverCache_ -> motionNotifyWindowCache[i], 6);
-                nextSrc += 4;
-              }
-              unsigned int rootX  = GetUINT(inputMessage + 20, bigEndian_);
-              unsigned int rootY  = GetUINT(inputMessage + 22, bigEndian_);
-              unsigned int eventX = GetUINT(inputMessage + 24, bigEndian_);
-              unsigned int eventY = GetUINT(inputMessage + 26, bigEndian_);
-              eventX -= rootX;
-              eventY -= rootY;
-              encodeBuffer.encodeCachedValue(rootX -
-                    serverCache_ -> motionNotifyLastRootX, 16,
-                    serverCache_ -> motionNotifyRootXCache, 6);
-              serverCache_ -> motionNotifyLastRootX = rootX;
-              encodeBuffer.encodeCachedValue(rootY -
-                    serverCache_ -> motionNotifyLastRootY, 16,
-                    serverCache_ -> motionNotifyRootYCache, 6);
-              serverCache_ -> motionNotifyLastRootY = rootY;
-              encodeBuffer.encodeCachedValue(eventX, 16,
-                                   serverCache_ -> motionNotifyEventXCache, 6);
-              encodeBuffer.encodeCachedValue(eventY, 16,
-                                   serverCache_ -> motionNotifyEventYCache, 6);
-              encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 28, bigEndian_),
-                                   16, serverCache_ -> motionNotifyStateCache);
-              if ((*inputMessage == EnterNotify) || (*inputMessage == LeaveNotify))
-                encodeBuffer.encodeValue((unsigned int) inputMessage[30], 2);
-              else
-                encodeBuffer.encodeBoolValue((unsigned int) inputMessage[30]);
-              if ((*inputMessage == EnterNotify) || (*inputMessage == LeaveNotify))
-                encodeBuffer.encodeValue((unsigned int) inputMessage[31], 2);
-              else if (*inputMessage == KeyPress)
-              {
-                serverCache_ -> keyPressLastKey = detail;
-                for (unsigned int i = 8; i < 31; i++)
-                {
-                  serverCache_ -> keyPressCache[i - 8] = inputMessage[i];
-                }
-              }
-            }
-          }
-          break;
-        case ColormapNotify:
-          {
-            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_),
-                             29, serverCache_ -> colormapNotifyWindowCache, 8);
-            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_),
-                           29, serverCache_ -> colormapNotifyColormapCache, 8);
-            encodeBuffer.encodeBoolValue((unsigned int) inputMessage[12]);
-            encodeBuffer.encodeBoolValue((unsigned int) inputMessage[13]);
-          }
-          break;
-        case ConfigureNotify:
-          {
-            const unsigned char *nextSrc = inputMessage + 4;
-            for (unsigned int i = 0; i < 3; i++)
-            {
-              encodeBuffer.encodeCachedValue(GetULONG(nextSrc, bigEndian_), 29,
-                                 *serverCache_ -> configureNotifyWindowCache[i], 9);
-              nextSrc += 4;
-            }
-            for (unsigned int j = 0; j < 5; j++)
-            {
-              encodeBuffer.encodeCachedValue(GetUINT(nextSrc, bigEndian_), 16,
-                                 *serverCache_ -> configureNotifyGeomCache[j], 8);
-              nextSrc += 2;
-            }
-            encodeBuffer.encodeBoolValue(*nextSrc);
-          }
-          break;
-        case CreateNotify:
-          {
-            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_),
-                        29, serverCache_ -> createNotifyWindowCache, 9);
-            unsigned int window = GetULONG(inputMessage + 8, bigEndian_);
-            encodeBuffer.encodeValue(window -
-                             serverCache_ -> createNotifyLastWindow, 29, 5);
-            serverCache_ -> createNotifyLastWindow = window;
-            const unsigned char* nextSrc = inputMessage + 12;
-            for (unsigned int i = 0; i < 5; i++)
-            {
-              encodeBuffer.encodeValue(GetUINT(nextSrc, bigEndian_), 16, 9);
-              nextSrc += 2;
-            }
-            encodeBuffer.encodeBoolValue(*nextSrc);
-          }
-          break;
-        case Expose:
-          {
-            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), 29,
-                               serverCache_ -> exposeWindowCache, 9);
-            const unsigned char *nextSrc = inputMessage + 8;
-            for (unsigned int i = 0; i < 5; i++)
-            {
-              encodeBuffer.encodeCachedValue(GetUINT(nextSrc, bigEndian_), 16,
-                                 *serverCache_ -> exposeGeomCache[i], 6);
-              nextSrc += 2;
-            }
-          }
-          break;
-        case FocusIn:
-        case FocusOut:
-          {
-            encodeBuffer.encodeValue((unsigned int) inputMessage[1], 3);
-            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_),
-                                    29, serverCache_ -> focusInWindowCache, 9);
-            encodeBuffer.encodeValue((unsigned int) inputMessage[8], 2);
-          }
-          break;
-        case KeymapNotify:
-          {
-          if (ServerCache::lastKeymap.compare(31, inputMessage + 1))
-              encodeBuffer.encodeBoolValue(1);
-            else
-            {
-              encodeBuffer.encodeBoolValue(0);
-              const unsigned char *nextSrc = inputMessage + 1;
-              for (unsigned int i = 1; i < 32; i++)
-                encodeBuffer.encodeValue((unsigned int) *nextSrc++, 8);
-            }
-          }
-          break;
-        case MapNotify:
-        case UnmapNotify:
-        case DestroyNotify:
-          {
-            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_),
-                                   29, serverCache_ -> mapNotifyEventCache, 9);
-            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_),
-                                  29, serverCache_ -> mapNotifyWindowCache, 9);
-            if ((*inputMessage == MapNotify) || (*inputMessage == UnmapNotify))
-              encodeBuffer.encodeBoolValue((unsigned int) inputMessage[12]);
-          }
-          break;
-        case NoExpose:
-          {
-            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_),
-                                 29, serverCache_ -> noExposeDrawableCache, 9);
-            encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 8, bigEndian_), 16,
-                                           serverCache_ -> noExposeMinorCache);
-            encodeBuffer.encodeCachedValue(inputMessage[10], 8,
-                                           serverCache_ -> noExposeMajorCache);
-          }
-          break;
-        case PropertyNotify:
-          {
-            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_),
-                             29, serverCache_ -> propertyNotifyWindowCache, 9);
-            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_),
-                               29, serverCache_ -> propertyNotifyAtomCache, 9);
-            unsigned int timestamp = GetULONG(inputMessage + 12, bigEndian_);
-            unsigned int timestampDiff =
-            timestamp - serverCache_ -> lastTimestamp;
-            serverCache_ -> lastTimestamp = timestamp;
-            encodeBuffer.encodeValue(timestampDiff, 32, 9);
-            encodeBuffer.encodeBoolValue((unsigned int) inputMessage[16]);
-          }
-          break;
-        case ReparentNotify:
-          {
-            const unsigned char* nextSrc = inputMessage + 4;
-            for (unsigned int i = 0; i < 3; i++)
-            {
-              encodeBuffer.encodeCachedValue(GetULONG(nextSrc, bigEndian_),
-                     29, serverCache_ -> reparentNotifyWindowCache, 9);
-              nextSrc += 4;
-            }
-            encodeBuffer.encodeValue(GetUINT(nextSrc, bigEndian_), 16, 6);
-            encodeBuffer.encodeValue(GetUINT(nextSrc + 2, bigEndian_), 16, 6);
-            encodeBuffer.encodeBoolValue((unsigned int)inputMessage[20]);
-          }
-          break;
-        case SelectionClear:
-          {
-            unsigned int timestamp = GetULONG(inputMessage + 4, bigEndian_);
-            unsigned int timestampDiff = timestamp - serverCache_ -> lastTimestamp;
-            serverCache_ -> lastTimestamp = timestamp;
-            encodeBuffer.encodeValue(timestampDiff, 32, 9);
-            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_),
-                           29, serverCache_ -> selectionClearWindowCache, 9);
-            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 12, bigEndian_),
-                           29, serverCache_ -> selectionClearAtomCache, 9);
-          }
-          break;
-        case SelectionRequest:
-          {
-            unsigned int timestamp = GetULONG(inputMessage + 4, bigEndian_);
-            unsigned int timestampDiff = timestamp - serverCache_ -> lastTimestamp;
-            serverCache_ -> lastTimestamp = timestamp;
-            encodeBuffer.encodeValue(timestampDiff, 32, 9);
-            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_),
-                           29, serverCache_ -> selectionClearWindowCache, 9);
-            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 12, bigEndian_),
-                           29, serverCache_ -> selectionClearWindowCache, 9);
-            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 16, bigEndian_),
-                           29, serverCache_ -> selectionClearAtomCache, 9);
-            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 20, bigEndian_),
-                           29, serverCache_ -> selectionClearAtomCache, 9);
-            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 24, bigEndian_),
-                           29, serverCache_ -> selectionClearAtomCache, 9);
-          }
-          break;
-        case VisibilityNotify:
-          {
-            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_),
-                           29, serverCache_ -> visibilityNotifyWindowCache, 9);
-            encodeBuffer.encodeValue((unsigned int) inputMessage[8], 2);
-          }
-          break;
-        default:
-          {
-            #ifdef TEST
-            *logofs << "handleRead: Using generic event compression "
-                    << "for OPCODE#" << (unsigned int) inputOpcode
-                    << ".\n" << logofs_flush;
-            #endif
-
-            encodeBuffer.encodeCachedValue(*(inputMessage + 1), 8,
-                         serverCache_ -> genericEventCharCache);
-
-            for (unsigned int i = 0; i < 14; i++)
-            {
-              encodeBuffer.encodeCachedValue(GetUINT(inputMessage + i * 2 + 4, bigEndian_),
-                                 16, *serverCache_ -> genericEventIntCache[i]);
-            }
-          }
-
-        } // switch (inputOpcode)...
-
-        int bits = encodeBuffer.diffBits();
-
-        #if defined(TEST) || defined(OPCODES)
-
-        if (*inputMessage == X_Error)
-        {
-          unsigned char code = *(inputMessage + 1);
-
-          *logofs << "handleRead: Handled error ERR_CODE#"
-                  << (unsigned int) code << " for FD#" << fd_;
-
-          *logofs << " RES_ID#" << GetULONG(inputMessage + 4, bigEndian_);
-
-          *logofs << " MIN_OP#" << GetUINT(inputMessage + 8, bigEndian_);
-
-          *logofs << " MAJ_OP#" << (unsigned int) *(inputMessage + 10);
-
-          *logofs << " sequence " << inputSequence << ". " << inputLength
-                  << " bytes in, " << bits << " bits (" << ((float) bits) / 8
-                  << " bytes) out.\n" << logofs_flush;
-        }
-        else
-        {
-          *logofs << "handleRead: Handled event OPCODE#"
-                  << (unsigned int) *inputMessage << " for FD#" << fd_
-                  << " sequence " << inputSequence << ". " << inputLength
-                  << " bytes in, " << bits << " bits (" << ((float) bits) / 8
-                  << " bytes) out.\n" << logofs_flush;
-        }
-
-        #endif
-
-        statistics -> addEventBits(*inputMessage, inputLength << 3, bits);
-
-      } // End of if (inputMessage[0] == X_Reply) ... else ...
-
-    } // End of if (firstReply_) ... else ...
-
-  } // End of while ((inputMessage = readBuffer_.getMessage(inputLength)) != 0) ...
-
-  //
-  // Check if we need to flush because of
-  // prioritized data.
-  //
-
-  if (priority_ > 0)
-  {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "handleRead: WARNING! Requesting flush "
-            << "because of " << priority_ << " prioritized "
-            << "messages for FD#" << fd_ << ".\n"
-            << logofs_flush;
-    #endif
-
-    if (proxy -> handleAsyncPriority() < 0)
-    {
-      return -1;
-    }
-
-    //
-    // Reset the priority flag.
-    //
-
-    priority_ = 0;
-  }
-
-  //
-  // Flush if we produced enough data.
-  //
-
-  if (proxy -> canAsyncFlush() == 1)
-  {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "handleRead: WARNING! Requesting flush "
-            << "because of token length exceeded.\n"
-            << logofs_flush;
-    #endif
-
-    if (proxy -> handleAsyncFlush() < 0)
-    {
-      return -1;
-    }
-  }
-
-  #if defined(TEST) || defined(INFO)
-
-  if (transport_ -> pending() != 0 ||
-          readBuffer_.checkMessage() != 0)
-  {
-    *logofs << "handleRead: PANIC! Buffer for X descriptor FD#"
-            << fd_ << " has " << transport_ -> pending()
-            << " bytes to read.\n" << logofs_flush;
-
-    HandleCleanup();
-  }
-
-  #endif
-
-  //
-  // Reset the read buffer.
-  //
-
-  readBuffer_.fullReset();
-
-  return 1;
-}
-
-//
-// End of handleRead().
-//
-
-//
-// Beginning of handleWrite().
-//
-
-int ServerChannel::handleWrite(const unsigned char *message, unsigned int length)
-{
-  #ifdef TEST
-  *logofs << "handleWrite: Called for FD#" << fd_
-          << ".\n" << logofs_flush;
-  #endif
-
-  //
-  // Create the buffer from which to 
-  // decode messages.
-  //
-
-  DecodeBuffer decodeBuffer(message, length);
-
-  #if defined(TEST) || defined(INFO) || defined(FLUSH)
-  *logofs << "handleWrite: Decoding messages for FD#" << fd_
-          << " with " << length << " bytes in the buffer.\n"
-          << logofs_flush;
-  #endif
-
-  if (firstRequest_)
-  {
-    //
-    // Need to add the length of the first request
-    // because it was not present in the previous
-    // versions. Length of the first request was
-    // assumed to be the same as the encode buffer
-    // but this may be not the case if a different
-    // encoding is used.
-    //
-
-    // Since ProtoStep7 (#issue 108)
-    decodeBuffer.decodeValue(length, 8);
-
-    unsigned int nextByte;
-    unsigned char *outputMessage = writeBuffer_.addMessage(length);
-    unsigned char *nextDest = outputMessage;
-
-    for (unsigned int i = 0; i < length; i++)
-    {
-      decodeBuffer.decodeValue(nextByte, 8);
-
-      *nextDest++ = (unsigned char) nextByte;
-    }
-
-    if (*outputMessage == 0x42)
-    {
-      setBigEndian(1);
-    }
-    else
-    {
-      setBigEndian(0);
-    }
-
-    #ifdef TEST
-    *logofs << "handleWrite: First request detected.\n" << logofs_flush;
-    #endif
-
-    //
-    // Handle the fake authorization cookie.
-    //
-
-    if (handleAuthorization(outputMessage) < 0)
-    {
-      return -1;
-    }
-
-    firstRequest_ = 0;
-
-  } // End of if (firstRequest_)
-
-  //
-  // This was previously in a 'else' block.
-  // Due to the way the first request was
-  // handled, we could not decode multiple
-  // messages in the first frame.
-  //
-
-  { // Start of the decoding block.
-
-    unsigned char outputOpcode;
-
-    unsigned char *outputMessage;
-    unsigned int outputLength;
-
-    //
-    // Set when message is found in cache.
-    //
-
-    int hit;
-
-    while (decodeBuffer.decodeOpcodeValue(outputOpcode, clientCache_ -> opcodeCache, 1))
-    {
-      hit = 0;
-
-      //
-      // Splits are sent by client proxy outside the
-      // normal read loop. As we 'insert' splits in
-      // the real client-server X protocol, we must
-      // avoid to increment the sequence number or
-      // our clients would get confused.
-      //
-
-      if (outputOpcode != opcodeStore_ -> splitData)
-      {
-        clientSequence_++;
-        clientSequence_ &= 0xffff;
-
-        #ifdef DEBUG
-        *logofs << "handleWrite: Last client sequence number for FD#" 
-                << fd_ << " is " << clientSequence_ << ".\n"
-                << logofs_flush;
-        #endif
-      }
-      else
-      {
-        //
-        // It's a split, not a normal
-        // burst of proxy data.
-        //
-
-        handleSplit(decodeBuffer);
-
-        continue;
-      }
-
-      #ifdef SUSPEND
-
-      if (clientSequence_ == 1000)
-      {
-        cerr << "Warning" << ": Exiting to test the resilience of the agent.\n";
-
-        sleep(2);
-
-        HandleAbort();
-      }
-
-      #endif
-
-      //
-      // Is differential encoding disabled?
-      //
-
-      if (control -> RemoteDeltaCompression == 0)
-      {
-        int result = handleFastWriteRequest(decodeBuffer, outputOpcode,
-                                                outputMessage, outputLength);
-        if (result < 0)
-        {
-          return -1;
-        }
-        else if (result > 0)
-        {
-          continue;
-        }
-      }
-
-      //
-      // General-purpose temp variables for
-      // decoding ints and chars.
-      //
-
-      unsigned int value;
-      unsigned char cValue;
-
-      #ifdef DEBUG
-      *logofs << "handleWrite: Going to handle request OPCODE#"
-              << (unsigned int) outputOpcode << " (" << DumpOpcode(outputOpcode)
-              << ") for FD#" << fd_ << " sequence " << clientSequence_
-              << ".\n" << logofs_flush;
-      #endif
-
-      switch (outputOpcode)
-      {
-      case X_AllocColor:
-        {
-          outputLength = 16;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          decodeBuffer.decodeCachedValue(value, 29,
-                             clientCache_ -> colormapCache);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          unsigned char *nextDest = outputMessage + 8;
-          unsigned int colorData[3];
-
-          for (unsigned int i = 0; i < 3; i++)
-          {
-            decodeBuffer.decodeCachedValue(value, 16,
-                               *(clientCache_ -> allocColorRGBCache[i]), 4);
-            PutUINT(value, nextDest, bigEndian_);
-            colorData[i] = value;
-            nextDest += 2;
-          }
-
-          sequenceQueue_.push(clientSequence_, outputOpcode,
-                                  colorData[0], colorData[1], colorData[2]);
-        }
-        break;
-      case X_ReparentWindow:
-        {
-          outputLength = 16;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> windowCache);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> windowCache);
-          PutULONG(value, outputMessage + 8, bigEndian_);
-          decodeBuffer.decodeValue(value, 16, 11);
-          PutUINT(value, outputMessage + 12, bigEndian_);
-          decodeBuffer.decodeValue(value, 16, 11);
-          PutUINT(value, outputMessage + 14, bigEndian_);
-        }
-        break;
-      case X_ChangeProperty:
-        {
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_ChangeProperty);
-
-          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
-                                     outputMessage, outputLength))
-          {
-            break;
-          }
-
-          unsigned char format;
-          decodeBuffer.decodeCachedValue(format, 8,
-                             clientCache_ -> changePropertyFormatCache);
-          unsigned int dataLength;
-          decodeBuffer.decodeValue(dataLength, 32, 6);
-          outputLength = 24 + RoundUp4(dataLength * (format >> 3));
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          decodeBuffer.decodeValue(value, 2);
-          outputMessage[1] = (unsigned char) value;
-          decodeBuffer.decodeXidValue(value, clientCache_ -> windowCache);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          decodeBuffer.decodeCachedValue(value, 29,
-                             clientCache_ -> changePropertyPropertyCache, 9);
-          PutULONG(value, outputMessage + 8, bigEndian_);
-          decodeBuffer.decodeCachedValue(value, 29,
-                             clientCache_ -> changePropertyTypeCache, 9);
-          PutULONG(value, outputMessage + 12, bigEndian_);
-          outputMessage[16] = format;
-          PutULONG(dataLength, outputMessage + 20, bigEndian_);
-          unsigned char *nextDest = outputMessage + 24;
-
-          if (format == 8)
-          {
-            // Since ProtoStep7 (#issue 108)
-            decodeBuffer.decodeTextData(nextDest, dataLength);
-          }
-          else if (format == 32)
-          {
-            for (unsigned int i = 0; i < dataLength; i++)
-            {
-              decodeBuffer.decodeCachedValue(value, 32,
-                                 clientCache_ -> changePropertyData32Cache);
-
-              PutULONG(value, nextDest, bigEndian_);
-
-              nextDest += 4;
-            }
-          }
-          else
-          {
-            for (unsigned int i = 0; i < dataLength; i++)
-            {
-              decodeBuffer.decodeValue(value, 16);
-
-              PutUINT(value, nextDest, bigEndian_);
-
-              nextDest += 2;
-            }
-          }
-
-          handleSave(messageStore, outputMessage, outputLength);
-        }
-        break;
-      case X_SendEvent:
-        {
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_SendEvent);
-
-          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
-                                     outputMessage, outputLength))
-          {
-            break;
-          }
-
-          outputLength = 44;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          decodeBuffer.decodeBoolValue(value);
-          *(outputMessage + 1) = value;
-          decodeBuffer.decodeBoolValue(value);
-          if (value)
-          {
-            decodeBuffer.decodeBoolValue(value);
-          }
-          else
-          {
-            decodeBuffer.decodeXidValue(value, clientCache_ -> windowCache);
-          }
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          decodeBuffer.decodeCachedValue(value, 32,
-                       clientCache_ -> sendEventMaskCache, 9);
-          PutULONG(value, outputMessage + 8, bigEndian_);
-          decodeBuffer.decodeCachedValue(*(outputMessage + 12), 8,
-                       clientCache_ -> sendEventCodeCache);
-          decodeBuffer.decodeCachedValue(*(outputMessage + 13), 8,
-                       clientCache_ -> sendEventByteDataCache);
-          decodeBuffer.decodeValue(value, 16, 4);
-          clientCache_ -> sendEventLastSequence += value;
-          clientCache_ -> sendEventLastSequence &= 0xffff;
-          PutUINT(clientCache_ -> sendEventLastSequence, outputMessage + 14, bigEndian_);
-          decodeBuffer.decodeCachedValue(value, 32,
-                       clientCache_ -> sendEventIntDataCache);
-          PutULONG(value, outputMessage + 16, bigEndian_);
-
-          for (unsigned int i = 20; i < 44; i++)
-          {
-            decodeBuffer.decodeCachedValue(cValue, 8,
-                               clientCache_ -> sendEventEventCache);
-            *(outputMessage + i) = cValue;
-          }
-
-          handleSave(messageStore, outputMessage, outputLength);
-        }
-        break;
-      case X_ChangeWindowAttributes:
-        {
-          unsigned int numAttrs;
-          decodeBuffer.decodeValue(numAttrs, 4);
-          outputLength = 12 + (numAttrs << 2);
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> windowCache);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          unsigned int bitmask;
-          decodeBuffer.decodeCachedValue(bitmask, 15,
-                                     clientCache_ -> createWindowBitmaskCache);
-          PutULONG(bitmask, outputMessage + 8, bigEndian_);
-          unsigned char *nextDest = outputMessage + 12;
-          unsigned int mask = 0x1;
-          for (unsigned int i = 0; i < 15; i++)
-          {
-            if (bitmask & mask)
-            {
-              decodeBuffer.decodeCachedValue(value, 32,
-                                 *clientCache_ -> createWindowAttrCache[i]);
-              PutULONG(value, nextDest, bigEndian_);
-              nextDest += 4;
-            }
-            mask <<= 1;
-          }
-        }
-        break;
-      case X_ClearArea:
-        {
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_ClearArea);
-
-          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
-                                     outputMessage, outputLength))
-          {
-            break;
-          }
-
-          outputLength = 16;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          decodeBuffer.decodeBoolValue(value);
-          outputMessage[1] = (unsigned char) value;
-          decodeBuffer.decodeXidValue(value, clientCache_ -> windowCache);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          unsigned char *nextDest = outputMessage + 8;
-          for (unsigned int i = 0; i < 4; i++)
-          {
-            decodeBuffer.decodeCachedValue(value, 16,
-                               *clientCache_ -> clearAreaGeomCache[i], 8);
-            PutUINT(value, nextDest, bigEndian_);
-            nextDest += 2;
-          }
-
-          handleSave(messageStore, outputMessage, outputLength);
-        }
-        break;
-      case X_CloseFont:
-        {
-          outputLength = 8;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          decodeBuffer.decodeValue(value, 29, 5);
-          clientCache_ -> lastFont += value;
-          clientCache_ -> lastFont &= 0x1fffffff;
-          PutULONG(clientCache_ -> lastFont, outputMessage + 4, bigEndian_);
-        }
-        break;
-      case X_ConfigureWindow:
-        {
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_ConfigureWindow);
-
-          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
-                                     outputMessage, outputLength))
-          {
-            break;
-          }
-
-          outputLength = 12;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          writeBuffer_.registerPointer(&outputMessage);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> windowCache);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          unsigned int bitmask;
-          decodeBuffer.decodeCachedValue(bitmask, 7,
-                                  clientCache_ -> configureWindowBitmaskCache);
-          PutUINT(bitmask, outputMessage + 8, bigEndian_);
-          unsigned int mask = 0x1;
-          for (unsigned int i = 0; i < 7; i++)
-          {
-            if (bitmask & mask)
-            {
-              unsigned char* nextDest = writeBuffer_.addMessage(4);
-              outputLength += 4;
-              decodeBuffer.decodeCachedValue(value, CONFIGUREWINDOW_FIELD_WIDTH[i],
-                                 *clientCache_ -> configureWindowAttrCache[i], 8);
-              PutULONG(value, nextDest, bigEndian_);
-              nextDest += 4;
-            }
-            mask <<= 1;
-          }
-          writeBuffer_.unregisterPointer();
-
-          handleSave(messageStore, outputMessage, outputLength);
-        }
-        break;
-      case X_ConvertSelection:
-        {
-          outputLength = 24;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          decodeBuffer.decodeCachedValue(value, 29,
-                             clientCache_ -> convertSelectionRequestorCache, 9);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          unsigned char* nextDest = outputMessage + 8;
-          for (unsigned int i = 0; i < 3; i++)
-          {
-            decodeBuffer.decodeCachedValue(value, 29,
-                               *(clientCache_ -> convertSelectionAtomCache[i]), 9);
-            PutULONG(value, nextDest, bigEndian_);
-            nextDest += 4;
-          }
-          decodeBuffer.decodeValue(value, 32, 4);
-          clientCache_ -> convertSelectionLastTimestamp += value;
-          PutULONG(clientCache_ -> convertSelectionLastTimestamp,
-                   nextDest, bigEndian_);
-        }
-        break;
-      case X_CopyArea:
-        {
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_CopyArea);
-
-          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
-                                     outputMessage, outputLength))
-          {
-            break;
-          }
-
-          outputLength = 28;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
-          PutULONG(value, outputMessage + 8, bigEndian_);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
-          PutULONG(value, outputMessage + 12, bigEndian_);
-          unsigned char *nextDest = outputMessage + 16;
-          for (unsigned int i = 0; i < 6; i++)
-          {
-            decodeBuffer.decodeCachedValue(value, 16,
-                               *clientCache_ -> copyAreaGeomCache[i], 8);
-            PutUINT(value, nextDest, bigEndian_);
-            nextDest += 2;
-          }
-
-          handleSave(messageStore, outputMessage, outputLength);
-        }
-        break;
-      case X_CopyGC:
-        {
-          outputLength = 16;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
-          PutULONG(value, outputMessage + 8, bigEndian_);
-          decodeBuffer.decodeCachedValue(value, 23,
-                             clientCache_ -> createGCBitmaskCache);
-          PutULONG(value, outputMessage + 12, bigEndian_);
-        }
-        break;
-      case X_CopyPlane:
-        {
-          outputLength = 32;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
-          PutULONG(value, outputMessage + 8, bigEndian_);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
-          PutULONG(value, outputMessage + 12, bigEndian_);
-          unsigned char *nextDest = outputMessage + 16;
-          for (unsigned int i = 0; i < 6; i++)
-          {
-            decodeBuffer.decodeCachedValue(value, 16,
-                               *clientCache_ -> copyPlaneGeomCache[i], 8);
-            PutUINT(value, nextDest, bigEndian_);
-            nextDest += 2;
-          }
-          decodeBuffer.decodeCachedValue(value, 32,
-                             clientCache_ -> copyPlaneBitPlaneCache, 10);
-          PutULONG(value, outputMessage + 28, bigEndian_);
-        }
-        break;
-      case X_CreateGC:
-        {
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_CreateGC);
-
-          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
-                                     outputMessage, outputLength))
-          {
-            break;
-          }
-
-          outputLength = 16;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          writeBuffer_.registerPointer(&outputMessage);
-
-          // Since ProtoStep7 (#issue 108)
-          decodeBuffer.decodeNewXidValue(value, clientCache_ -> lastId,
-                             clientCache_ -> lastIdCache, clientCache_ -> gcCache,
-                                 clientCache_ -> freeGCCache);
-
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          unsigned int offset = 8;
-          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
-          PutULONG(value, outputMessage + offset, bigEndian_);
-          offset += 4;
-          unsigned int bitmask;
-          decodeBuffer.decodeCachedValue(bitmask, 23,
-                                         clientCache_ -> createGCBitmaskCache);
-          PutULONG(bitmask, outputMessage + offset, bigEndian_);
-          unsigned int mask = 0x1;
-          for (unsigned int i = 0; i < 23; i++)
-          {
-            if (bitmask & mask)
-            {
-              unsigned char* nextDest = writeBuffer_.addMessage(4);
-              outputLength += 4;
-              unsigned int fieldWidth = CREATEGC_FIELD_WIDTH[i];
-              if (fieldWidth <= 4)
-                decodeBuffer.decodeValue(value, fieldWidth);
-              else
-                decodeBuffer.decodeCachedValue(value, fieldWidth,
-                                   *clientCache_ -> createGCAttrCache[i]);
-              PutULONG(value, nextDest, bigEndian_);
-            }
-            mask <<= 1;
-          }
-          writeBuffer_.unregisterPointer();
-
-          handleSave(messageStore, outputMessage, outputLength);
-        }
-        break;
-      case X_ChangeGC:
-        {
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_ChangeGC);
-
-          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
-                                     outputMessage, outputLength))
-          {
-            break;
-          }
-
-          outputLength = 12;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          writeBuffer_.registerPointer(&outputMessage);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          unsigned int offset = 8;
-          unsigned int bitmask;
-          decodeBuffer.decodeCachedValue(bitmask, 23,
-                                         clientCache_ -> createGCBitmaskCache);
-          PutULONG(bitmask, outputMessage + offset, bigEndian_);
-          unsigned int mask = 0x1;
-          for (unsigned int i = 0; i < 23; i++)
-          {
-            if (bitmask & mask)
-            {
-              unsigned char* nextDest = writeBuffer_.addMessage(4);
-              outputLength += 4;
-              unsigned int fieldWidth = CREATEGC_FIELD_WIDTH[i];
-              if (fieldWidth <= 4)
-                decodeBuffer.decodeValue(value, fieldWidth);
-              else
-                decodeBuffer.decodeCachedValue(value, fieldWidth,
-                                   *clientCache_ -> createGCAttrCache[i]);
-              PutULONG(value, nextDest, bigEndian_);
-            }
-            mask <<= 1;
-          }
-          writeBuffer_.unregisterPointer();
-
-          handleSave(messageStore, outputMessage, outputLength);
-        }
-        break;
-      case X_CreatePixmap:
-        {
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_CreatePixmap);
-
-          hit = handleDecode(decodeBuffer, clientCache_, messageStore,
-                                 outputOpcode, outputMessage, outputLength);
-        }
-        break;
-      case X_CreateWindow:
-        {
-          outputLength = 32;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          writeBuffer_.registerPointer(&outputMessage);
-          decodeBuffer.decodeCachedValue(cValue, 8, clientCache_ -> depthCache);
-          outputMessage[1] = cValue;
-          decodeBuffer.decodeXidValue(value, clientCache_ -> windowCache);
-          PutULONG(value, outputMessage + 8, bigEndian_);
-
-          // Since ProtoStep7 (#issue 108)
-          decodeBuffer.decodeNewXidValue(value, clientCache_ -> lastId,
-                             clientCache_ -> lastIdCache, clientCache_ -> windowCache,
-                                 clientCache_ -> freeWindowCache);
-
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          unsigned char *nextDest = outputMessage + 12;
-          unsigned int i;
-          for (i = 0; i < 6; i++)
-          {
-            decodeBuffer.decodeCachedValue(value, 16,
-                               *clientCache_ -> createWindowGeomCache[i], 8);
-            PutUINT(value, nextDest, bigEndian_);
-            nextDest += 2;
-          }
-          decodeBuffer.decodeCachedValue(value, 29, clientCache_ -> visualCache);
-          PutULONG(value, outputMessage + 24, bigEndian_);
-          unsigned int bitmask;
-          decodeBuffer.decodeCachedValue(bitmask, 15,
-                                     clientCache_ -> createWindowBitmaskCache);
-          PutULONG(bitmask, outputMessage + 28, bigEndian_);
-          unsigned int mask = 0x1;
-          for (i = 0; i < 15; i++)
-          {
-            if (bitmask & mask)
-            {
-              nextDest = writeBuffer_.addMessage(4);
-              outputLength += 4;
-              decodeBuffer.decodeCachedValue(value, 32,
-                                 *clientCache_ -> createWindowAttrCache[i]);
-              PutULONG(value, nextDest, bigEndian_);
-            }
-            mask <<= 1;
-          }
-          writeBuffer_.unregisterPointer();
-        }
-        break;
-      case X_DeleteProperty:
-        {
-          outputLength = 12;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> windowCache);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          decodeBuffer.decodeValue(value, 29, 9);
-          PutULONG(value, outputMessage + 8, bigEndian_);
-        }
-        break;
-      case X_FillPoly:
-        {
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_FillPoly);
-
-          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
-                                     outputMessage, outputLength))
-          {
-            break;
-          }
-
-          unsigned int numPoints;
-
-          // Since ProtoStep10 (#issue 108)
-          decodeBuffer.decodeCachedValue(numPoints, 16,
-                             clientCache_ -> fillPolyNumPointsCache, 4);
-
-          outputLength = 16 + (numPoints << 2);
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
-          PutULONG(value, outputMessage + 8, bigEndian_);
-          decodeBuffer.decodeValue(value, 2);
-          outputMessage[12] = (unsigned char) value;
-          unsigned int relativeCoordMode;
-          decodeBuffer.decodeBoolValue(relativeCoordMode);
-          outputMessage[13] = (unsigned char) relativeCoordMode;
-          unsigned char *nextDest = outputMessage + 16;
-          unsigned int pointIndex = 0;
-          for (unsigned int i = 0; i < numPoints; i++)
-          {
-            if (relativeCoordMode)
-            {
-              decodeBuffer.decodeCachedValue(value, 16,
-                                 *clientCache_ -> fillPolyXRelCache[pointIndex], 8);
-              PutUINT(value, nextDest, bigEndian_);
-              nextDest += 2;
-              decodeBuffer.decodeCachedValue(value, 16,
-                                 *clientCache_ -> fillPolyYRelCache[pointIndex], 8);
-              PutUINT(value, nextDest, bigEndian_);
-              nextDest += 2;
-            }
-            else
-            {
-              unsigned int x, y;
-              decodeBuffer.decodeBoolValue(value);
-              if (value)
-              {
-                decodeBuffer.decodeValue(value, 3);
-                x = clientCache_ -> fillPolyRecentX[value];
-                y = clientCache_ -> fillPolyRecentY[value];
-              }
-              else
-              {
-                decodeBuffer.decodeCachedValue(x, 16,
-                                   *clientCache_ -> fillPolyXAbsCache[pointIndex], 8);
-                decodeBuffer.decodeCachedValue(y, 16,
-                                   *clientCache_ -> fillPolyYAbsCache[pointIndex], 8);
-                clientCache_ -> fillPolyRecentX[clientCache_ -> fillPolyIndex] = x;
-                clientCache_ -> fillPolyRecentY[clientCache_ -> fillPolyIndex] = y;
-                clientCache_ -> fillPolyIndex++;
-                if (clientCache_ -> fillPolyIndex == 8)
-                  clientCache_ -> fillPolyIndex = 0;
-              }
-              PutUINT(x, nextDest, bigEndian_);
-              nextDest += 2;
-              PutUINT(y, nextDest, bigEndian_);
-              nextDest += 2;
-            }
-
-            if (++pointIndex == 10) pointIndex = 0;
-          }
-
-          handleSave(messageStore, outputMessage, outputLength);
-        }
-        break;
-      case X_FreeColors:
-        {
-          unsigned int numPixels;
-          decodeBuffer.decodeValue(numPixels, 16, 4);
-          outputLength = 12 + (numPixels << 2);
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          decodeBuffer.decodeCachedValue(value, 29,
-                             clientCache_ -> colormapCache);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          decodeBuffer.decodeValue(value, 32, 4);
-          PutULONG(value, outputMessage + 8, bigEndian_);
-          unsigned char* nextDest = outputMessage + 12;
-          while (numPixels)
-          {
-            decodeBuffer.decodeValue(value, 32, 8);
-            PutULONG(value, nextDest, bigEndian_);
-            nextDest += 4;
-            numPixels--;
-          }
-        }
-        break;
-      case X_FreeCursor:
-        {
-          outputLength = 8;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          decodeBuffer.decodeCachedValue(value, 29, clientCache_ -> cursorCache, 9);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-        }
-        break;
-      case X_FreeGC:
-        {
-          outputLength = 8;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-
-          // Since ProtoStep7 (#issue 108)
-          decodeBuffer.decodeFreeXidValue(value, clientCache_ -> freeGCCache);
-
-          PutULONG(value, outputMessage + 4, bigEndian_);
-        }
-        break;
-      case X_FreePixmap:
-        {
-          outputLength = 8;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-
-          // Since ProtoStep7 (#issue 108)
-          decodeBuffer.decodeFreeXidValue(value, clientCache_ -> freeDrawableCache);
-
-          PutULONG(value, outputMessage + 4, bigEndian_);
-        }
-        break;
-      case X_GetAtomName:
-        {
-          outputLength = 8;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          decodeBuffer.decodeValue(value, 29, 9);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-
-          sequenceQueue_.push(clientSequence_, outputOpcode);
-        }
-        break;
-      case X_GetGeometry:
-        {
-          outputLength = 8;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-
-          sequenceQueue_.push(clientSequence_, outputOpcode);
-        }
-        break;
-      case X_GetInputFocus:
-        {
-          outputLength = 4;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-
-          sequenceQueue_.push(clientSequence_, outputOpcode, outputOpcode);
-        }
-        break;
-      case X_GetModifierMapping:
-        {
-          outputLength = 4;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-
-          sequenceQueue_.push(clientSequence_, outputOpcode);
-        }
-        break;
-      case X_GetKeyboardMapping:
-        {
-          outputLength = 8;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          decodeBuffer.decodeValue(value, 8);
-          outputMessage[4] = value;
-          decodeBuffer.decodeValue(value, 8);
-          outputMessage[5] = value;
-
-          sequenceQueue_.push(clientSequence_, outputOpcode);
-        }
-        break;
-      case X_GetProperty:
-        {
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_GetProperty);
-
-          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
-                                     outputMessage, outputLength))
-          {
-            //
-            // Save a reference to identify the reply.
-            //
-
-            unsigned int property = GetULONG(outputMessage + 8, bigEndian_);
-
-            sequenceQueue_.push(clientSequence_, outputOpcode, property);
-
-            break;
-          }
-
-          outputLength = 24;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          decodeBuffer.decodeBoolValue(value);
-          outputMessage[1] = (unsigned char) value;
-          decodeBuffer.decodeXidValue(value, clientCache_ -> windowCache);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          unsigned int property;
-          decodeBuffer.decodeValue(property, 29, 9);
-          PutULONG(property, outputMessage + 8, bigEndian_);
-          decodeBuffer.decodeValue(value, 29, 9);
-          PutULONG(value, outputMessage + 12, bigEndian_);
-          decodeBuffer.decodeValue(value, 32, 2);
-          PutULONG(value, outputMessage + 16, bigEndian_);
-          decodeBuffer.decodeValue(value, 32, 8);
-          PutULONG(value, outputMessage + 20, bigEndian_);
-
-          sequenceQueue_.push(clientSequence_, outputOpcode, property);
-
-          handleSave(messageStore, outputMessage, outputLength);
-        }
-        break;
-      case X_GetSelectionOwner:
-        {
-          outputLength = 8;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          decodeBuffer.decodeCachedValue(value, 29,
-                           clientCache_ -> getSelectionOwnerSelectionCache, 9);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-
-          sequenceQueue_.push(clientSequence_, outputOpcode);
-        }
-        break;
-      case X_GrabButton:
-      case X_GrabPointer:
-        {
-          outputLength = 24;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          decodeBuffer.decodeBoolValue(value);
-          outputMessage[1] = (unsigned char) value;
-          decodeBuffer.decodeXidValue(value, clientCache_ -> windowCache);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          decodeBuffer.decodeCachedValue(value, 16,
-                             clientCache_ -> grabButtonEventMaskCache);
-          PutUINT(value, outputMessage + 8, bigEndian_);
-          decodeBuffer.decodeBoolValue(value);
-          outputMessage[10] = (unsigned char) value;
-          decodeBuffer.decodeBoolValue(value);
-          outputMessage[11] = (unsigned char) value;
-          decodeBuffer.decodeCachedValue(value, 29,
-                             clientCache_ -> grabButtonConfineCache, 9);
-          PutULONG(value, outputMessage + 12, bigEndian_);
-          decodeBuffer.decodeCachedValue(value, 29,
-                             clientCache_ -> cursorCache, 9);
-          PutULONG(value, outputMessage + 16, bigEndian_);
-          if (outputOpcode == X_GrabButton)
-          {
-            decodeBuffer.decodeCachedValue(cValue, 8,
-                               clientCache_ -> grabButtonButtonCache);
-            outputMessage[20] = cValue;
-            decodeBuffer.decodeCachedValue(value, 16,
-                               clientCache_ -> grabButtonModifierCache);
-            PutUINT(value, outputMessage + 22, bigEndian_);
-          }
-          else
-          {
-            decodeBuffer.decodeValue(value, 32, 4);
-            clientCache_ -> grabKeyboardLastTimestamp += value;
-            PutULONG(clientCache_ -> grabKeyboardLastTimestamp,
-                     outputMessage + 20, bigEndian_);
-
-            sequenceQueue_.push(clientSequence_, outputOpcode);
-          }
-        }
-        break;
-      case X_GrabKeyboard:
-        {
-          outputLength = 16;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          decodeBuffer.decodeBoolValue(value);
-          outputMessage[1] = (unsigned char) value;
-          decodeBuffer.decodeXidValue(value, clientCache_ -> windowCache);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          decodeBuffer.decodeValue(value, 32, 4);
-          clientCache_ -> grabKeyboardLastTimestamp += value;
-          PutULONG(clientCache_ -> grabKeyboardLastTimestamp, outputMessage + 8,
-                   bigEndian_);
-          decodeBuffer.decodeBoolValue(value);
-          outputMessage[12] = (unsigned char) value;
-          decodeBuffer.decodeBoolValue(value);
-          outputMessage[13] = (unsigned char) value;
-
-          sequenceQueue_.push(clientSequence_, outputOpcode);
-        }
-        break;
-      case X_GrabServer:
-      case X_UngrabServer:
-      case X_NoOperation:
-        {
-          #ifdef DEBUG
-          *logofs << "handleWrite: Managing (probably tainted) X_NoOperation request for FD#" 
-                  << fd_ << ".\n" << logofs_flush;
-          #endif
-
-          outputLength = 4;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-        }
-        break;
-      case X_PolyText8:
-        {
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_PolyText8);
-
-          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
-                                     outputMessage, outputLength))
-          {
-            break;
-          }
-
-          outputLength = 16;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
-          PutULONG(value, outputMessage + 8, bigEndian_);
-          decodeBuffer.decodeCachedValue(value, 16,
-                             clientCache_ -> polyTextCacheX);
-          clientCache_ -> polyTextLastX += value;
-          clientCache_ -> polyTextLastX &= 0xffff;
-          PutUINT(clientCache_ -> polyTextLastX, outputMessage + 12, bigEndian_);
-          decodeBuffer.decodeCachedValue(value, 16,
-                             clientCache_ -> polyTextCacheY);
-          clientCache_ -> polyTextLastY += value;
-          clientCache_ -> polyTextLastY &= 0xffff;
-          PutUINT(clientCache_ -> polyTextLastY, outputMessage + 14, bigEndian_);
-          unsigned int addedLength = 0;
-          writeBuffer_.registerPointer(&outputMessage);
-          for (;;)
-          {
-            decodeBuffer.decodeBoolValue(value);
-            if (!value)
-              break;
-            unsigned int textLength;
-            decodeBuffer.decodeValue(textLength, 8);
-            if (textLength == 255)
-            {
-              addedLength += 5;
-              unsigned char *nextSegment = writeBuffer_.addMessage(5);
-              *nextSegment = (unsigned char) textLength;
-              decodeBuffer.decodeCachedValue(value, 29,
-                                 clientCache_ -> polyTextFontCache);
-              PutULONG(value, nextSegment + 1, 1);
-            }
-            else
-            {
-              addedLength += (textLength + 2);
-              unsigned char *nextSegment =
-              writeBuffer_.addMessage(textLength + 2);
-              *nextSegment = (unsigned char) textLength;
-              unsigned char *nextDest = nextSegment + 1;
-              decodeBuffer.decodeCachedValue(cValue, 8,
-                                 clientCache_ -> polyTextDeltaCache);
-              *nextDest++ = cValue;
-
-              // Since ProtoStep7 (#issue 108)
-              decodeBuffer.decodeTextData(nextDest, textLength);
-
-              nextDest += textLength;
-            }
-          }
-          outputLength += addedLength;
-          unsigned int mod4 = (addedLength & 0x3);
-          if (mod4)
-          {
-            unsigned int extra = 4 - mod4;
-            unsigned char *nextDest = writeBuffer_.addMessage(extra);
-            for (unsigned int i = 0; i < extra; i++)
-              *nextDest++ = 0;
-            outputLength += extra;
-          }
-          writeBuffer_.unregisterPointer();
-
-          handleSave(messageStore, outputMessage, outputLength);
-        }
-        break;
-      case X_PolyText16:
-        {
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_PolyText16);
-
-          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
-                                     outputMessage, outputLength))
-          {
-            break;
-          }
-
-          outputLength = 16;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
-          PutULONG(value, outputMessage + 8, bigEndian_);
-          decodeBuffer.decodeCachedValue(value, 16,
-                             clientCache_ -> polyTextCacheX);
-          clientCache_ -> polyTextLastX += value;
-          clientCache_ -> polyTextLastX &= 0xffff;
-          PutUINT(clientCache_ -> polyTextLastX, outputMessage + 12, bigEndian_);
-          decodeBuffer.decodeCachedValue(value, 16,
-                             clientCache_ -> polyTextCacheY);
-          clientCache_ -> polyTextLastY += value;
-          clientCache_ -> polyTextLastY &= 0xffff;
-          PutUINT(clientCache_ -> polyTextLastY, outputMessage + 14, bigEndian_);
-          unsigned int addedLength = 0;
-          writeBuffer_.registerPointer(&outputMessage);
-          for (;;)
-          {
-            decodeBuffer.decodeBoolValue(value);
-            if (!value)
-              break;
-            unsigned int textLength;
-            decodeBuffer.decodeValue(textLength, 8);
-            if (textLength == 255)
-            {
-              addedLength += 5;
-              unsigned char *nextSegment = writeBuffer_.addMessage(5);
-              *nextSegment = (unsigned char) textLength;
-              decodeBuffer.decodeCachedValue(value, 29, clientCache_ -> polyTextFontCache);
-              PutULONG(value, nextSegment + 1, 1);
-            }
-            else
-            {
-              addedLength += (textLength * 2 + 2);
-              unsigned char *nextSegment =
-              writeBuffer_.addMessage(textLength * 2 + 2);
-              *nextSegment = (unsigned char) textLength;
-              unsigned char *nextDest = nextSegment + 1;
-              decodeBuffer.decodeCachedValue(cValue, 8, clientCache_ -> polyTextDeltaCache);
-              *nextDest++ = cValue;
-
-              // Since ProtoStep7 (#issue 108)
-              decodeBuffer.decodeTextData(nextDest, textLength * 2);
-
-              nextDest += textLength * 2;
-            }
-          }
-          outputLength += addedLength;
-
-          unsigned int mod4 = (addedLength & 0x3);
-          if (mod4)
-          {
-            unsigned int extra = 4 - mod4;
-            unsigned char *nextDest = writeBuffer_.addMessage(extra);
-            for (unsigned int i = 0; i < extra; i++)
-              *nextDest++ = 0;
-            outputLength += extra;
-          }
-          writeBuffer_.unregisterPointer();
-
-          handleSave(messageStore, outputMessage, outputLength);
-        }
-        break;
-      case X_ImageText8:
-        {
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_ImageText8);
-
-          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
-                                     outputMessage, outputLength))
-          {
-            break;
-          }
-
-          unsigned int textLength;
-          decodeBuffer.decodeCachedValue(textLength, 8,
-                       clientCache_ -> imageTextLengthCache, 4);
-          outputLength = 16 + RoundUp4(textLength);
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          outputMessage[1] = (unsigned char) textLength;
-          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
-          PutULONG(value, outputMessage + 8, bigEndian_);
-          decodeBuffer.decodeCachedValue(value, 16,
-                       clientCache_ -> imageTextCacheX);
-          clientCache_ -> imageTextLastX += value;
-          clientCache_ -> imageTextLastX &= 0xffff;
-          PutUINT(clientCache_ -> imageTextLastX, outputMessage + 12, bigEndian_);
-          decodeBuffer.decodeCachedValue(value, 16,
-                       clientCache_ -> imageTextCacheY);
-          clientCache_ -> imageTextLastY += value;
-          clientCache_ -> imageTextLastY &= 0xffff;
-          PutUINT(clientCache_ -> imageTextLastY, outputMessage + 14, bigEndian_);
-          unsigned char *nextDest = outputMessage + 16;
-
-          // Since ProtoStep7 (#issue 108)
-          decodeBuffer.decodeTextData(nextDest, textLength);
-
-          handleSave(messageStore, outputMessage, outputLength);
-        }
-        break;
-      case X_ImageText16:
-        {
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_ImageText16);
-
-          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
-                                     outputMessage, outputLength))
-          {
-            break;
-          }
-
-          unsigned int textLength;
-          decodeBuffer.decodeCachedValue(textLength, 8,
-                       clientCache_ -> imageTextLengthCache, 4);
-          outputLength = 16 + RoundUp4(textLength * 2);
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          outputMessage[1] = (unsigned char) textLength;
-          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
-          PutULONG(value, outputMessage + 8, bigEndian_);
-          decodeBuffer.decodeCachedValue(value, 16,
-                       clientCache_ -> imageTextCacheX);
-          clientCache_ -> imageTextLastX += value;
-          clientCache_ -> imageTextLastX &= 0xffff;
-          PutUINT(clientCache_ -> imageTextLastX, outputMessage + 12, bigEndian_);
-          decodeBuffer.decodeCachedValue(value, 16,
-                       clientCache_ -> imageTextCacheY);
-          clientCache_ -> imageTextLastY += value;
-          clientCache_ -> imageTextLastY &= 0xffff;
-          PutUINT(clientCache_ -> imageTextLastY, outputMessage + 14, bigEndian_);
-          unsigned char *nextDest = outputMessage + 16;
-
-          // Since ProtoStep7 (#issue 108)
-          decodeBuffer.decodeTextData(nextDest, textLength * 2);
-
-          handleSave(messageStore, outputMessage, outputLength);
-        }
-        break;
-      case X_InternAtom:
-        {
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_InternAtom);
-
-          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
-                                     outputMessage, outputLength))
-          {
-            sequenceQueue_.push(clientSequence_, outputOpcode);
-
-            break;
-          }
-
-          unsigned int nameLength;
-          decodeBuffer.decodeValue(nameLength, 16, 6);
-          outputLength = RoundUp4(nameLength) + 8;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          PutUINT(nameLength, outputMessage + 4, bigEndian_);
-          decodeBuffer.decodeBoolValue(value);
-          outputMessage[1] = (unsigned char) value;
-          unsigned char *nextDest = outputMessage + 8;
-
-          // Since ProtoStep7 (#issue 108)
-          decodeBuffer.decodeTextData(nextDest, nameLength);
-
-          sequenceQueue_.push(clientSequence_, outputOpcode);
-
-          handleSave(messageStore, outputMessage, outputLength);
-        }
-        break;
-      case X_ListExtensions:
-        {
-          outputLength = 4;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-
-          sequenceQueue_.push(clientSequence_, outputOpcode);
-        }
-        break;
-      case X_ListFonts:
-        {
-          unsigned int textLength;
-          decodeBuffer.decodeValue(textLength, 16, 6);
-          outputLength = 8 + RoundUp4(textLength);
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          PutUINT(textLength, outputMessage + 6, bigEndian_);
-          decodeBuffer.decodeValue(value, 16, 6);
-          PutUINT(value, outputMessage + 4, bigEndian_);
-          unsigned char* nextDest = outputMessage + 8;
-
-          // Since ProtoStep7 (#issue 108)
-          decodeBuffer.decodeTextData(nextDest, textLength);
-
-          sequenceQueue_.push(clientSequence_, outputOpcode);
-        }
-        break;
-      case X_LookupColor:
-      case X_AllocNamedColor:
-        {
-          unsigned int textLength;
-          decodeBuffer.decodeValue(textLength, 16, 6);
-          outputLength = 12 + RoundUp4(textLength);
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          decodeBuffer.decodeCachedValue(value, 29,
-                             clientCache_ -> colormapCache);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          PutUINT(textLength, outputMessage + 8, bigEndian_);
-          unsigned char *nextDest = outputMessage + 12;
-
-          // Since ProtoStep7 (#issue 108)
-          decodeBuffer.decodeTextData(nextDest, textLength);
-
-          sequenceQueue_.push(clientSequence_, outputOpcode);
-        }
-        break;
-      case X_MapWindow:
-      case X_UnmapWindow:
-      case X_MapSubwindows:
-      case X_GetWindowAttributes:
-      case X_DestroyWindow:
-      case X_DestroySubwindows:
-      case X_QueryPointer:
-      case X_QueryTree:
-        {
-          outputLength = 8;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-
-          if (outputOpcode == X_DestroyWindow) // Since ProtoStep7 (#issue 108)
-          {
-            decodeBuffer.decodeFreeXidValue(value, clientCache_ -> freeWindowCache);
-          }
-          else
-          {
-            decodeBuffer.decodeXidValue(value, clientCache_ -> windowCache);
-          }
-
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          if (outputOpcode == X_QueryPointer ||
-                  outputOpcode == X_GetWindowAttributes ||
-                      outputOpcode == X_QueryTree)
-          {
-            sequenceQueue_.push(clientSequence_, outputOpcode);
-          }
-        }
-        break;
-      case X_OpenFont:
-        {
-          unsigned int nameLength;
-          decodeBuffer.decodeValue(nameLength, 16, 7);
-          outputLength = RoundUp4(12 + nameLength);
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          PutUINT(nameLength, outputMessage + 8, bigEndian_);
-          decodeBuffer.decodeValue(value, 29, 5);
-          clientCache_ -> lastFont += value;
-          clientCache_ -> lastFont &= 0x1fffffff;
-          PutULONG(clientCache_ -> lastFont, outputMessage + 4, bigEndian_);
-          unsigned char *nextDest = outputMessage + 12;
-
-          // Since ProtoStep7 (#issue 108)
-          decodeBuffer.decodeTextData(nextDest, nameLength);
-        }
-        break;
-      case X_PolyFillRectangle:
-        {
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_PolyFillRectangle);
-
-          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
-                                     outputMessage, outputLength))
-          {
-            break;
-          }
-
-          outputLength = 12;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          writeBuffer_.registerPointer(&outputMessage);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
-          PutULONG(value, outputMessage + 8, bigEndian_);
-
-          unsigned int index = 0;
-          unsigned int lastX = 0, lastY = 0, lastWidth = 0, lastHeight = 0;
-          unsigned int numRectangles = 0;
-
-          for (;;)
-          {
-            outputLength += 8;
-            writeBuffer_.addMessage(8);
-            unsigned char *nextDest = outputMessage + 12 +
-            (numRectangles << 3);
-            numRectangles++;
-            decodeBuffer.decodeCachedValue(value, 16,
-                         *clientCache_ -> polyFillRectangleCacheX[index], 8);
-            value += lastX;
-            PutUINT(value, nextDest, bigEndian_);
-            lastX = value;
-            nextDest += 2;
-            decodeBuffer.decodeCachedValue(value, 16,
-                         *clientCache_ -> polyFillRectangleCacheY[index], 8);
-            value += lastY;
-            PutUINT(value, nextDest, bigEndian_);
-            lastY = value;
-            nextDest += 2;
-            decodeBuffer.decodeCachedValue(value, 16,
-                         *clientCache_ -> polyFillRectangleCacheWidth[index], 8);
-            value += lastWidth;
-            PutUINT(value, nextDest, bigEndian_);
-            lastWidth = value;
-            nextDest += 2;
-            decodeBuffer.decodeCachedValue(value, 16,
-                         *clientCache_ -> polyFillRectangleCacheHeight[index], 8);
-            value += lastHeight;
-            PutUINT(value, nextDest, bigEndian_);
-            lastHeight = value;
-            nextDest += 2;
-
-            if (++index == 4) index = 0;
-
-            decodeBuffer.decodeBoolValue(value);
-
-            if (!value) break;
-          }
-          writeBuffer_.unregisterPointer();
-
-          handleSave(messageStore, outputMessage, outputLength);
-        }
-        break;
-      case X_PolyFillArc:
-        {
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_PolyFillArc);
-
-          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
-                                     outputMessage, outputLength))
-          {
-            break;
-          }
-
-          outputLength = 12;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          writeBuffer_.registerPointer(&outputMessage);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
-          PutULONG(value, outputMessage + 8, bigEndian_);
-
-          unsigned int index = 0;
-          unsigned int lastX = 0, lastY = 0,
-                       lastWidth = 0, lastHeight = 0,
-                       lastAngle1 = 0, lastAngle2 = 0;
-
-          unsigned int numArcs = 0;
-
-          for (;;)
-          {
-            outputLength += 12;
-            writeBuffer_.addMessage(12);
-
-            unsigned char *nextDest = outputMessage + 12 +
-            (numArcs * 12);
-            numArcs++;
-
-            decodeBuffer.decodeCachedValue(value, 16,
-                         *clientCache_ -> polyFillArcCacheX[index], 8);
-            value += lastX;
-            PutUINT(value, nextDest, bigEndian_);
-            lastX = value;
-            nextDest += 2;
-
-            decodeBuffer.decodeCachedValue(value, 16,
-                         *clientCache_ -> polyFillArcCacheY[index], 8);
-            value += lastY;
-            PutUINT(value, nextDest, bigEndian_);
-            lastY = value;
-            nextDest += 2;
-
-            decodeBuffer.decodeCachedValue(value, 16,
-                         *clientCache_ -> polyFillArcCacheWidth[index], 8);
-            value += lastWidth;
-            PutUINT(value, nextDest, bigEndian_);
-            lastWidth = value;
-            nextDest += 2;
-
-            decodeBuffer.decodeCachedValue(value, 16,
-                         *clientCache_ -> polyFillArcCacheHeight[index], 8);
-            value += lastHeight;
-            PutUINT(value, nextDest, bigEndian_);
-            lastHeight = value;
-            nextDest += 2;
-
-            decodeBuffer.decodeCachedValue(value, 16,
-                         *clientCache_ -> polyFillArcCacheAngle1[index], 8);
-            value += lastAngle1;
-            PutUINT(value, nextDest, bigEndian_);
-            lastAngle1 = value;
-            nextDest += 2;
-
-            decodeBuffer.decodeCachedValue(value, 16,
-                         *clientCache_ -> polyFillArcCacheAngle2[index], 8);
-            value += lastAngle2;
-            PutUINT(value, nextDest, bigEndian_);
-            lastAngle2 = value;
-            nextDest += 2;
-
-            if (++index == 2) index = 0;
-
-            decodeBuffer.decodeBoolValue(value);
-
-            if (!value) break;
-          }
-          writeBuffer_.unregisterPointer();
-
-          handleSave(messageStore, outputMessage, outputLength);
-        }
-        break;
-      case X_PolyArc:
-        {
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_PolyArc);
-
-          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
-                                     outputMessage, outputLength))
-          {
-            break;
-          }
-
-          outputLength = 12;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          writeBuffer_.registerPointer(&outputMessage);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
-          PutULONG(value, outputMessage + 8, bigEndian_);
-
-          unsigned int index = 0;
-          unsigned int lastX = 0, lastY = 0,
-                       lastWidth = 0, lastHeight = 0,
-                       lastAngle1 = 0, lastAngle2 = 0;
-
-          unsigned int numArcs = 0;
-
-          for (;;)
-          {
-            outputLength += 12;
-            writeBuffer_.addMessage(12);
-
-            unsigned char *nextDest = outputMessage + 12 +
-            (numArcs * 12);
-            numArcs++;
-
-            decodeBuffer.decodeCachedValue(value, 16,
-                           *clientCache_ -> polyArcCacheX[index], 8);
-            value += lastX;
-            PutUINT(value, nextDest, bigEndian_);
-            lastX = value;
-            nextDest += 2;
-
-            decodeBuffer.decodeCachedValue(value, 16,
-                         *clientCache_ -> polyArcCacheY[index], 8);
-            value += lastY;
-            PutUINT(value, nextDest, bigEndian_);
-            lastY = value;
-            nextDest += 2;
-
-            decodeBuffer.decodeCachedValue(value, 16,
-                         *clientCache_ -> polyArcCacheWidth[index], 8);
-            value += lastWidth;
-            PutUINT(value, nextDest, bigEndian_);
-            lastWidth = value;
-            nextDest += 2;
-
-            decodeBuffer.decodeCachedValue(value, 16,
-                         *clientCache_ -> polyArcCacheHeight[index], 8);
-            value += lastHeight;
-            PutUINT(value, nextDest, bigEndian_);
-            lastHeight = value;
-            nextDest += 2;
-
-            decodeBuffer.decodeCachedValue(value, 16,
-                         *clientCache_ -> polyArcCacheAngle1[index], 8);
-            value += lastAngle1;
-            PutUINT(value, nextDest, bigEndian_);
-            lastAngle1 = value;
-            nextDest += 2;
-
-            decodeBuffer.decodeCachedValue(value, 16,
-                         *clientCache_ -> polyArcCacheAngle2[index], 8);
-            value += lastAngle2;
-            PutUINT(value, nextDest, bigEndian_);
-            lastAngle2 = value;
-            nextDest += 2;
-
-            if (++index == 2) index = 0;
-
-            decodeBuffer.decodeBoolValue(value);
-
-            if (!value) break;
-          }
-          writeBuffer_.unregisterPointer();
-
-          handleSave(messageStore, outputMessage, outputLength);
-        }
-        break;
-      case X_PolyPoint:
-        {
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_PolyPoint);
-
-          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
-                                     outputMessage, outputLength))
-          {
-            break;
-          }
-
-          unsigned int numPoints;
-          decodeBuffer.decodeValue(numPoints, 16, 4);
-          outputLength = (numPoints << 2) + 12;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          unsigned int relativeCoordMode;
-          decodeBuffer.decodeBoolValue(relativeCoordMode);
-          outputMessage[1] = (unsigned char) relativeCoordMode;
-          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
-          PutULONG(value, outputMessage + 8, bigEndian_);
-          unsigned char *nextDest = outputMessage + 12;
-
-          unsigned int index = 0;
-          unsigned int lastX = 0, lastY = 0;
-
-          for (unsigned int i = 0; i < numPoints; i++)
-          {
-            decodeBuffer.decodeCachedValue(value, 16,
-                               *clientCache_ -> polyPointCacheX[index], 8);
-            lastX += value;
-            PutUINT(lastX, nextDest, bigEndian_);
-            nextDest += 2;
-            decodeBuffer.decodeCachedValue(value, 16,
-                               *clientCache_ -> polyPointCacheY[index], 8);
-            lastY += value;
-            PutUINT(lastY, nextDest, bigEndian_);
-            nextDest += 2;
-
-            if (++index == 2) index = 0;
-          }
-
-          handleSave(messageStore, outputMessage, outputLength);
-        }
-        break;
-      case X_PolyLine:
-        {
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_PolyLine);
-
-          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
-                                     outputMessage, outputLength))
-          {
-            break;
-          }
-
-          unsigned int numPoints;
-          decodeBuffer.decodeValue(numPoints, 16, 4);
-          outputLength = (numPoints << 2) + 12;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          unsigned int relativeCoordMode;
-          decodeBuffer.decodeBoolValue(relativeCoordMode);
-          outputMessage[1] = (unsigned char) relativeCoordMode;
-          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
-          PutULONG(value, outputMessage + 8, bigEndian_);
-          unsigned char *nextDest = outputMessage + 12;
-
-          unsigned int index = 0;
-          unsigned int lastX = 0, lastY = 0;
-
-          for (unsigned int i = 0; i < numPoints; i++)
-          {
-            decodeBuffer.decodeCachedValue(value, 16,
-                               *clientCache_ -> polyLineCacheX[index], 8);
-            lastX += value;
-            PutUINT(lastX, nextDest, bigEndian_);
-            nextDest += 2;
-            decodeBuffer.decodeCachedValue(value, 16,
-                               *clientCache_ -> polyLineCacheY[index], 8);
-            lastY += value;
-            PutUINT(lastY, nextDest, bigEndian_);
-            nextDest += 2;
-
-            if (++index == 2) index = 0;
-          }
-
-          handleSave(messageStore, outputMessage, outputLength);
-        }
-        break;
-      case X_PolyRectangle:
-        {
-          unsigned int numRectangles;
-          decodeBuffer.decodeValue(numRectangles, 16, 3);
-          outputLength = (numRectangles << 3) + 12;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
-          PutULONG(value, outputMessage + 8, bigEndian_);
-          unsigned char *nextDest = outputMessage + 12;
-          for (unsigned int i = 0; i < numRectangles; i++)
-            for (unsigned int k = 0; k < 4; k++)
-            {
-              decodeBuffer.decodeCachedValue(value, 16,
-                                *clientCache_ -> polyRectangleGeomCache[k], 8);
-              PutUINT(value, nextDest, bigEndian_);
-              nextDest += 2;
-            }
-        }
-        break;
-      case X_PolySegment:
-        {
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_PolySegment);
-
-          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
-                                     outputMessage, outputLength))
-          {
-            break;
-          }
-
-          unsigned int numSegments;
-          decodeBuffer.decodeValue(numSegments, 16, 4);
-          outputLength = (numSegments << 3) + 12;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
-          PutULONG(value, outputMessage + 8, bigEndian_);
-          unsigned char *nextDest = outputMessage + 12;
-
-          for (numSegments *= 2; numSegments; numSegments--)
-          {
-            unsigned int index;
-            decodeBuffer.decodeBoolValue(index);
-            unsigned int x;
-            decodeBuffer.decodeCachedValue(x, 16,
-                               clientCache_ -> polySegmentCacheX, 6);
-            x += clientCache_ -> polySegmentLastX[index];
-            PutUINT(x, nextDest, bigEndian_);
-            nextDest += 2;
-
-            unsigned int y;
-            decodeBuffer.decodeCachedValue(y, 16,
-                               clientCache_ -> polySegmentCacheY, 6);
-            y += clientCache_ -> polySegmentLastY[index];
-            PutUINT(y, nextDest, bigEndian_);
-            nextDest += 2;
-
-            clientCache_ -> polySegmentLastX[clientCache_ -> polySegmentCacheIndex] = x;
-            clientCache_ -> polySegmentLastY[clientCache_ -> polySegmentCacheIndex] = y;
-
-            if (clientCache_ -> polySegmentCacheIndex == 1)
-              clientCache_ -> polySegmentCacheIndex = 0;
-            else
-              clientCache_ -> polySegmentCacheIndex = 1;
-          }
-
-          handleSave(messageStore, outputMessage, outputLength);
-        }
-        break;
-      case X_PutImage:
-        {
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_PutImage);
-
-          hit = handleDecode(decodeBuffer, clientCache_, messageStore,
-                                 outputOpcode, outputMessage, outputLength);
-
-          if (outputOpcode == X_PutImage)
-          {
-            handleImage(outputOpcode, outputMessage, outputLength);
-          }
-        }
-        break;
-      case X_QueryBestSize:
-        {
-          outputLength = 12;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          decodeBuffer.decodeValue(value, 2);
-          outputMessage[1] = (unsigned char)value;
-          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          decodeBuffer.decodeValue(value, 16, 8);
-          PutUINT(value, outputMessage + 8, bigEndian_);
-          decodeBuffer.decodeValue(value, 16, 8);
-          PutUINT(value, outputMessage + 10, bigEndian_);
-
-          sequenceQueue_.push(clientSequence_, outputOpcode);
-        }
-        break;
-      case X_QueryColors:
-        {
-          // Differential or plain data compression?
-          decodeBuffer.decodeBoolValue(value);
-
-          if (value)
-          {
-            unsigned int numColors;
-            decodeBuffer.decodeValue(numColors, 16, 5);
-            outputLength = (numColors << 2) + 8;
-            outputMessage = writeBuffer_.addMessage(outputLength);
-            decodeBuffer.decodeCachedValue(value, 29,
-                               clientCache_ -> colormapCache);
-            PutULONG(value, outputMessage + 4, bigEndian_);
-            unsigned char *nextDest = outputMessage + 8;
-            unsigned int predictedPixel = clientCache_ -> queryColorsLastPixel;
-            for (unsigned int i = 0; i < numColors; i++)
-            {
-              unsigned int pixel;
-              decodeBuffer.decodeBoolValue(value);
-              if (value)
-                pixel = predictedPixel;
-              else
-                decodeBuffer.decodeValue(pixel, 32, 9);
-              PutULONG(pixel, nextDest, bigEndian_);
-              if (i == 0)
-                clientCache_ -> queryColorsLastPixel = pixel;
-              predictedPixel = pixel + 1;
-              nextDest += 4;
-            }
-          }
-          else
-          {
-            // Request length.
-            unsigned int requestLength;
-            decodeBuffer.decodeValue(requestLength, 16, 10);
-            outputLength = (requestLength << 2);
-            outputMessage = writeBuffer_.addMessage(outputLength);
-
-            const unsigned char *compressedData = NULL;
-            unsigned int compressedDataSize = 0;
-
-            int decompressed = handleDecompress(decodeBuffer, outputOpcode, 4,
-                                                    outputMessage, outputLength, compressedData,
-                                                        compressedDataSize);
-            if (decompressed < 0)
-            {
-              return -1;
-            }
-          }
-
-          sequenceQueue_.push(clientSequence_, outputOpcode);
-        }
-        break;
-      case X_QueryExtension:
-        {
-          unsigned int nameLength;
-          decodeBuffer.decodeValue(nameLength, 16, 6);
-          outputLength = 8 + RoundUp4(nameLength);
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          PutUINT(nameLength, outputMessage + 4, bigEndian_);
-          unsigned char *nextDest = outputMessage + 8;
-          for (unsigned int i = 0; i < nameLength; i++)
-          {
-            decodeBuffer.decodeValue(value, 8);
-            *nextDest++ = (unsigned char) value;
-          }
-
-          unsigned int hide = 0;
-
-          #ifdef HIDE_MIT_SHM_EXTENSION
-
-          if (!strncmp((char *) outputMessage + 8, "MIT-SHM", 7))
-          {
-            #ifdef TEST
-            *logofs << "handleWrite: Going to hide MIT-SHM extension in reply.\n"
-                    << logofs_flush;
-            #endif
-
-            hide = 1;
-          }
-
-          #endif
-
-          #ifdef HIDE_BIG_REQUESTS_EXTENSION
-
-          if (!strncmp((char *) outputMessage + 8, "BIG-REQUESTS", 12))
-          {
-            #ifdef TEST
-            *logofs << "handleWrite: Going to hide BIG-REQUESTS extension in reply.\n"
-                    << logofs_flush;
-            #endif
-
-            hide = 1;
-          }
-
-          #endif
-
-          #ifdef HIDE_XKEYBOARD_EXTENSION
-
-          else if (!strncmp((char *) outputMessage + 8, "XKEYBOARD", 9))
-          {
-            #ifdef TEST
-            *logofs << "handleWrite: Going to hide XKEYBOARD extension in reply.\n"
-                    << logofs_flush;
-            #endif
-
-            hide = 1;
-          }
-
-          #endif
-
-          #ifdef HIDE_XFree86_Bigfont_EXTENSION
-
-          else if (!strncmp((char *) outputMessage + 8, "XFree86-Bigfont", 15))
-          {
-            #ifdef TEST
-            *logofs << "handleWrite: Going to hide XFree86-Bigfont extension in reply.\n"
-                    << logofs_flush;
-            #endif
-
-            hide = 1;
-          }
-
-          #endif
-
-          //
-          // This is if you want to experiment disabling SHAPE extensions.
-          //
-
-          #ifdef HIDE_SHAPE_EXTENSION
-
-          if (!strncmp((char *) outputMessage + 8, "SHAPE", 5))
-          {
-            #ifdef DEBUG
-            *logofs << "handleWrite: Going to hide SHAPE extension in reply.\n"
-                    << logofs_flush;
-            #endif
-
-            hide = 1;
-          }
-
-          #endif
-
-          //
-          // Check if user disabled RENDER extension.
-          //
-
-          if (control -> HideRender == 1 &&
-                  strncmp((char *) outputMessage + 8, "RENDER", 6) == 0)
-          {
-            #ifdef TEST
-            *logofs << "handleWrite: Going to hide RENDER extension in reply.\n"
-                    << logofs_flush;
-            #endif
-
-            hide = 1;
-          }
-
-          unsigned int extension = 0;
-
-          if (strncmp((char *) outputMessage + 8, "SHAPE", 5) == 0)
-          {
-            extension = X_NXInternalShapeExtension;
-          }
-          else if (strncmp((char *) outputMessage + 8, "RENDER", 6) == 0)
-          {
-            extension = X_NXInternalRenderExtension;
-          }
-
-          sequenceQueue_.push(clientSequence_, outputOpcode,
-                                  outputOpcode, hide, extension);
-        }
-        break;
-      case X_QueryFont:
-        {
-          outputLength = 8;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          decodeBuffer.decodeValue(value, 29, 5);
-          clientCache_ -> lastFont += value;
-          clientCache_ -> lastFont &= 0x1fffffff;
-          PutULONG(clientCache_ -> lastFont, outputMessage + 4, bigEndian_);
-
-          sequenceQueue_.push(clientSequence_, outputOpcode);
-        }
-        break;
-      case X_SetClipRectangles:
-        {
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_SetClipRectangles);
-
-          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
-                                       outputMessage, outputLength))
-          {
-            break;
-          }
-
-          unsigned int numRectangles;
-
-          // Since ProtoStep9 (#issue 108)
-          decodeBuffer.decodeValue(numRectangles, 15, 4);
-
-          outputLength = (numRectangles << 3) + 12;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          decodeBuffer.decodeValue(value, 2);
-          outputMessage[1] = (unsigned char) value;
-          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          decodeBuffer.decodeCachedValue(value, 16,
-                                   clientCache_ -> setClipRectanglesXCache, 8);
-          PutUINT(value, outputMessage + 8, bigEndian_);
-          decodeBuffer.decodeCachedValue(value, 16,
-                                   clientCache_ -> setClipRectanglesYCache, 8);
-          PutUINT(value, outputMessage + 10, bigEndian_);
-          unsigned char *nextDest = outputMessage + 12;
-          for (unsigned int i = 0; i < numRectangles; i++)
-          {
-            for (unsigned int k = 0; k < 4; k++)
-            {
-              decodeBuffer.decodeCachedValue(value, 16,
-                                 *clientCache_ -> setClipRectanglesGeomCache[k], 8);
-              PutUINT(value, nextDest, bigEndian_);
-              nextDest += 2;
-            }
-          }
-
-          handleSave(messageStore, outputMessage, outputLength);
-        }
-        break;
-      case X_SetDashes:
-        {
-          unsigned int numDashes;
-          decodeBuffer.decodeCachedValue(numDashes, 16,
-                                      clientCache_ -> setDashesLengthCache, 5);
-          outputLength = 12 + RoundUp4(numDashes);
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          PutUINT(numDashes, outputMessage + 10, bigEndian_);
-          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          decodeBuffer.decodeCachedValue(value, 16,
-                                      clientCache_ -> setDashesOffsetCache, 5);
-          PutUINT(value, outputMessage + 8, bigEndian_);
-          unsigned char *nextDest = outputMessage + 12;
-          for (unsigned int i = 0; i < numDashes; i++)
-          {
-            decodeBuffer.decodeCachedValue(cValue, 8,
-                                clientCache_ -> setDashesDashCache_[i & 1], 5);
-            *nextDest++ = cValue;
-          }
-        }
-        break;
-      case X_SetSelectionOwner:
-        {
-          outputLength = 16;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          decodeBuffer.decodeCachedValue(value, 29,
-                                    clientCache_ -> setSelectionOwnerCache, 9);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          decodeBuffer.decodeCachedValue(value, 29,
-                           clientCache_ -> getSelectionOwnerSelectionCache, 9);
-          PutULONG(value, outputMessage + 8, bigEndian_);
-          decodeBuffer.decodeCachedValue(value, 32,
-                           clientCache_ -> setSelectionOwnerTimestampCache, 9);
-          PutULONG(value, outputMessage + 12, bigEndian_);
-        }
-        break;
-      case X_TranslateCoords:
-        {
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_TranslateCoords);
-
-          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
-                                     outputMessage, outputLength))
-          {
-            sequenceQueue_.push(clientSequence_, outputOpcode);
-
-            break;
-          }
-
-          outputLength = 16;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          decodeBuffer.decodeCachedValue(value, 29,
-                                   clientCache_ -> translateCoordsSrcCache, 9);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          decodeBuffer.decodeCachedValue(value, 29,
-                                  clientCache_ -> translateCoordsDstCache, 9);
-          PutULONG(value, outputMessage + 8, bigEndian_);
-          decodeBuffer.decodeCachedValue(value, 16,
-                                     clientCache_ -> translateCoordsXCache, 8);
-          PutUINT(value, outputMessage + 12, bigEndian_);
-          decodeBuffer.decodeCachedValue(value, 16,
-                                     clientCache_ -> translateCoordsYCache, 8);
-          PutUINT(value, outputMessage + 14, bigEndian_);
-
-          sequenceQueue_.push(clientSequence_, outputOpcode);
-
-          handleSave(messageStore, outputMessage, outputLength);
-        }
-        break;
-      case X_GetImage:
-        {
-          MessageStore *messageStore = clientStore_ ->
-                               getRequestStore(X_GetImage);
-
-          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
-                                     outputMessage, outputLength))
-          {
-            sequenceQueue_.push(clientSequence_, outputOpcode);
-
-            break;
-          }
-
-          outputLength = 20;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-          // Format.
-          unsigned int format;
-          decodeBuffer.decodeValue(format, 2);
-          outputMessage[1] = (unsigned char) format;
-          // Drawable.
-          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
-          PutULONG(value, outputMessage + 4, bigEndian_);
-          // X.
-          decodeBuffer.decodeCachedValue(value, 16,
-                             clientCache_ -> putImageXCache, 8);
-          clientCache_ -> putImageLastX += value;
-          clientCache_ -> putImageLastX &= 0xffff;
-          PutUINT(clientCache_ -> putImageLastX, outputMessage + 8, bigEndian_);
-          // Y.
-          decodeBuffer.decodeCachedValue(value, 16,
-                             clientCache_ -> putImageYCache, 8);
-          clientCache_ -> putImageLastY += value;
-          clientCache_ -> putImageLastY &= 0xffff;
-          PutUINT(clientCache_ -> putImageLastY, outputMessage + 10, bigEndian_);
-          // Width.
-          unsigned int width;
-          decodeBuffer.decodeCachedValue(width, 16,
-                             clientCache_ -> putImageWidthCache, 8);
-          PutUINT(width, outputMessage + 12, bigEndian_);
-          // Height.
-          unsigned int height;
-          decodeBuffer.decodeCachedValue(height, 16,
-                             clientCache_ -> putImageHeightCache, 8);
-          PutUINT(height, outputMessage + 14, bigEndian_);
-          // Plane mask.
-          decodeBuffer.decodeCachedValue(value, 32,
-                             clientCache_ -> getImagePlaneMaskCache, 5);
-          PutULONG(value, outputMessage + 16, bigEndian_);
-
-          sequenceQueue_.push(clientSequence_, outputOpcode);
-
-          handleSave(messageStore, outputMessage, outputLength);
-        }
-        break;
-      case X_GetPointerMapping:
-        {
-          outputLength = 4;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-
-          sequenceQueue_.push(clientSequence_, outputOpcode);
-        }
-        break;
-      case X_GetKeyboardControl:
-        {
-          outputLength = 4;
-          outputMessage = writeBuffer_.addMessage(outputLength);
-
-          sequenceQueue_.push(clientSequence_, outputOpcode);
-        }
-        break;
-      default:
-        {
-          if (outputOpcode == opcodeStore_ -> renderExtension)
-          {
-            MessageStore *messageStore = clientStore_ ->
-                                 getRequestStore(X_NXInternalRenderExtension);
-
-            hit = handleDecode(decodeBuffer, clientCache_, messageStore,
-                                   outputOpcode, outputMessage, outputLength);
-          }
-          else if (outputOpcode == opcodeStore_ -> shapeExtension)
-          {
-            MessageStore *messageStore = clientStore_ ->
-                                 getRequestStore(X_NXInternalShapeExtension);
-
-            hit = handleDecode(decodeBuffer, clientCache_, messageStore,
-                                   outputOpcode, outputMessage, outputLength);
-          }
-          else if (outputOpcode == opcodeStore_ -> putPackedImage)
-          {
-            #ifdef DEBUG
-            *logofs << "handleWrite: Decoding packed image request for FD#"
-                    << fd_ << ".\n" << logofs_flush;
-            #endif
-
-            MessageStore *messageStore = clientStore_ ->
-                                 getRequestStore(X_NXPutPackedImage);
-
-            hit = handleDecode(decodeBuffer, clientCache_, messageStore,
-                                   outputOpcode, outputMessage, outputLength);
-
-            if (outputOpcode == opcodeStore_ -> putPackedImage)
-            {
-              handleImage(outputOpcode, outputMessage, outputLength);
-            }
-          }
-          else if (outputOpcode == opcodeStore_ -> setUnpackColormap)
-          {
-            #ifdef DEBUG
-            *logofs << "handleWrite: Decoding set unpack colormap request "
-                    << "for FD#" << fd_ << ".\n" << logofs_flush;
-            #endif
-
-            MessageStore *messageStore = clientStore_ ->
-                                 getRequestStore(X_NXSetUnpackColormap);
-
-            hit = handleDecode(decodeBuffer, clientCache_, messageStore,
-                                   outputOpcode, outputMessage, outputLength);
-            //
-            // Message could have been split.
-            //
-
-            if (outputOpcode == opcodeStore_ -> setUnpackColormap)
-            {
-              handleColormap(outputOpcode, outputMessage, outputLength);
-            }
-          }
-          else if (outputOpcode == opcodeStore_ -> setUnpackAlpha)
-          {
-            #ifdef DEBUG
-            *logofs << "handleWrite: Decoding unpack alpha request for FD#"
-                    << fd_ << ".\n" << logofs_flush;
-            #endif
-
-            MessageStore *messageStore = clientStore_ ->
-                                 getRequestStore(X_NXSetUnpackAlpha);
-
-            hit = handleDecode(decodeBuffer, clientCache_, messageStore,
-                                   outputOpcode, outputMessage, outputLength);
-            //
-            // Message could have been split.
-            //
-
-            if (outputOpcode == opcodeStore_ -> setUnpackAlpha)
-            {
-              handleAlpha(outputOpcode, outputMessage, outputLength);
-            }
-          }
-          else if (outputOpcode == opcodeStore_ -> setUnpackGeometry)
-          {
-            #ifdef DEBUG
-            *logofs << "handleWrite: Decoding set unpack geometry request "
-                    << "for FD#" << fd_ << ".\n" << logofs_flush;
-            #endif
-
-            MessageStore *messageStore = clientStore_ ->
-                                 getRequestStore(X_NXSetUnpackGeometry);
-
-            hit = handleDecode(decodeBuffer, clientCache_, messageStore,
-                                   outputOpcode, outputMessage, outputLength);
-
-            handleGeometry(outputOpcode, outputMessage, outputLength);
-          }
-          else if (outputOpcode == opcodeStore_ -> startSplit)
-          {
-            handleStartSplitRequest(decodeBuffer, outputOpcode,
-                                        outputMessage, outputLength);
-          }
-          else if (outputOpcode == opcodeStore_ -> endSplit)
-          {
-            handleEndSplitRequest(decodeBuffer, outputOpcode,
-                                      outputMessage, outputLength);
-          }
-          else if (outputOpcode == opcodeStore_ -> commitSplit)
-          {
-            int result = handleCommitSplitRequest(decodeBuffer, outputOpcode,
-                                                      outputMessage, outputLength);
-
-            //
-            // Check if message has been successfully
-            // extracted from the split store. In this
-            // case post-process it in the usual way.
-            //
-
-            if (result > 0)
-            {
-              if (outputOpcode == opcodeStore_ -> putPackedImage ||
-                      outputOpcode == X_PutImage)
-              {
-                handleImage(outputOpcode, outputMessage, outputLength);
-              }
-              else if (outputOpcode == opcodeStore_ -> setUnpackColormap)
-              {
-                handleColormap(outputOpcode, outputMessage, outputLength);
-              }
-              else if (outputOpcode == opcodeStore_ -> setUnpackAlpha)
-              {
-                handleAlpha(outputOpcode, outputMessage, outputLength);
-              }
-            }
-            else if (result < 0)
-            {
-              return -1;
-            }
-          }
-          else if (outputOpcode == opcodeStore_ -> abortSplit)
-          {
-            handleAbortSplitRequest(decodeBuffer, outputOpcode,
-                                        outputMessage, outputLength);
-          }
-          else if (outputOpcode == opcodeStore_ -> finishSplit)
-          {
-            #ifdef DEBUG
-            *logofs << "handleWrite: Decoding finish split request "
-                    << "for FD#" << fd_ << ".\n" << logofs_flush;
-            #endif
-
-            decodeBuffer.decodeCachedValue(cValue, 8,
-                         clientCache_ -> resourceCache);
-
-            handleNullRequest(outputOpcode, outputMessage, outputLength);
-          }
-          else if (outputOpcode == opcodeStore_ -> freeSplit)
-          {
-            #ifdef DEBUG
-            *logofs << "handleWrite: Decoding free split request "
-                    << "for FD#" << fd_ << ".\n" << logofs_flush;
-            #endif
-
-            decodeBuffer.decodeCachedValue(cValue, 8,
-                         clientCache_ -> resourceCache);
-
-            handleNullRequest(outputOpcode, outputMessage, outputLength);
-          }
-          else if (outputOpcode == opcodeStore_ -> freeUnpack)
-          {
-            #ifdef DEBUG
-            *logofs << "handleWrite: Decoding free unpack request "
-                    << "for FD#" << fd_ << ".\n" << logofs_flush;
-            #endif
-
-            decodeBuffer.decodeCachedValue(cValue, 8,
-                         clientCache_ -> resourceCache);
-
-            #ifdef DEBUG
-            *logofs << "handleWrite: Freeing unpack state for resource "
-                    << (unsigned int) cValue << ".\n" << logofs_flush;
-            #endif
-
-            handleUnpackStateRemove(cValue);
-
-            handleNullRequest(outputOpcode, outputMessage, outputLength);
-          }
-          else if (outputOpcode == opcodeStore_ -> setExposeParameters)
-          {
-            //
-            // Send expose events according to agent's wish.
-            //
-
-            decodeBuffer.decodeBoolValue(enableExpose_);
-            decodeBuffer.decodeBoolValue(enableGraphicsExpose_);
-            decodeBuffer.decodeBoolValue(enableNoExpose_);
-
-            handleNullRequest(outputOpcode, outputMessage, outputLength);
-          }
-          else if (outputOpcode == opcodeStore_ -> getUnpackParameters)
-          {
-            //
-            // Client proxy needs the list of supported
-            // unpack methods. We would need an encode
-            // buffer, but this is in proxy, not here in
-            // channel.
-            //
-
-            #ifdef TEST
-            *logofs << "handleWrite: Sending X_GetInputFocus request for FD#" 
-                    << fd_ << " due to OPCODE#" << (unsigned int) outputOpcode
-                    << ".\n" << logofs_flush;
-            #endif
-
-            outputOpcode = X_GetInputFocus;
-
-            outputLength  = 4;
-            outputMessage = writeBuffer_.addMessage(outputLength);
-
-            sequenceQueue_.push(clientSequence_, outputOpcode,
-                                    opcodeStore_ -> getUnpackParameters);
-          }
-          else if (outputOpcode == opcodeStore_ -> getControlParameters ||
-                       outputOpcode == opcodeStore_ -> getCleanupParameters ||
-                           outputOpcode == opcodeStore_ -> getImageParameters)
-          {
-            handleNullRequest(outputOpcode, outputMessage, outputLength);
-          }
-          else if (outputOpcode == opcodeStore_ -> getShmemParameters)
-          {
-            if (handleShmemRequest(decodeBuffer, outputOpcode,
-                                       outputMessage, outputLength) < 0)
-            {
-              return -1;
-            }
-          }
-          else if (outputOpcode == opcodeStore_ -> setCacheParameters)
-          {
-            if (handleCacheRequest(decodeBuffer, outputOpcode,
-                                       outputMessage, outputLength) < 0)
-            {
-              return -1;
-            }
-          }
-          else if (outputOpcode == opcodeStore_ -> getFontParameters)
-          {
-            if (handleFontRequest(decodeBuffer, outputOpcode,
-                                      outputMessage, outputLength) < 0)
-            {
-              return -1;
-            }
-          }
-          else
-          {
-            MessageStore *messageStore = clientStore_ ->
-                                 getRequestStore(X_NXInternalGenericRequest);
-
-            hit = handleDecode(decodeBuffer, clientCache_, messageStore,
-                                   outputOpcode, outputMessage, outputLength);
-          }
-        }
-      } // End of switch on opcode.
-
-      //
-      // TODO: at the moment the variable hit was being set
-      // but not used, so to avoid the corresponding warning
-      // this logging block has been added.
-      // This code will probably be optimized away when none
-      // of the defines is set, but if there is no additional
-      // use for the hit variable in the future, then maybe
-      // it could be removed completely.
-      //
-
-      if (hit)
-      {
-        #if defined(TEST) || defined(OPCODES)
-        *logofs << "handleWrite: Cached flag enabled in handled request.\n"
-                << logofs_flush;
-        #endif
-      }
-
-      //
-      // A packed image request can generate more than just
-      // a single X_PutImage. Write buffer is handled inside
-      // handleUnpack(). Cannot simply assume that the final
-      // opcode and size must be put at the buffer offset as
-      // as buffer could have been grown or could have been
-      // replaced by a scratch buffer. The same is true in
-      // the case of a shared memory image.
-      //
-
-      if (outputOpcode != 0)
-      {
-        //
-        // Commit opcode and size to the buffer.
-        //
-
-        *outputMessage = (unsigned char) outputOpcode;
-
-        PutUINT(outputLength >> 2, outputMessage + 2, bigEndian_);
-
-        #if defined(TEST) || defined(OPCODES)
-        *logofs << "handleWrite: Handled request OPCODE#"
-                << (unsigned int) outputOpcode << " ("
-                << DumpOpcode(outputOpcode) << ") for FD#"
-                << fd_ << " sequence " << clientSequence_
-                << ". "  << outputLength << " bytes out.\n"
-                << logofs_flush;
-        #endif
-      }
-      #if defined(TEST) || defined(OPCODES)
-      else
-      {
-        //
-        // In case of shared memory images the log doesn't
-        // reflect the actual opcode of the request that is
-        // going to be written. It would be possible to find
-        // the opcode of the original request received from
-        // the remote proxy in member imageState_ -> opcode,
-        // but we have probably already deleted the struct.
-        //
-
-        *logofs << "handleWrite: Handled image request for FD#"
-                  << fd_ << " new sequence " << clientSequence_
-                  << ". " << outputLength << " bytes out.\n"
-                  << logofs_flush;
-      }
-      #endif
-
-      //
-      // Check if we produced enough data. We need to
-      // decode all the proxy messages or the decode
-      // buffer will be left in an inconsistent state,
-      // so we just update the finish flag in case of
-      // failure.
-      //
-
-      handleFlush(flush_if_needed);
-
-    } // End of while (decodeBuffer.decodeOpcodeValue(outputOpcode, 8, ...
-
-  } // End of the decoding block.
-
-  //
-  // Write any remaining data to the X connection.
-  //
-
-  if (handleFlush(flush_if_any) < 0)
-  {
-    return -1;
-  }
-
-  //
-  // Reset offset at which we read the
-  // last event looking for the shared
-  // memory completion.
-  //
-
-  if (shmemState_ != NULL)
-  {
-    shmemState_ -> checked = 0;
-  }
-
-  return 1;
-}
-
-//
-// End of handleWrite().
-//
-
-//
-// Other members.
-//
-
-int ServerChannel::handleSplit(DecodeBuffer &decodeBuffer, MessageStore *store,
-                                   T_store_action action, int position, unsigned char &opcode,
-                                       unsigned char *&buffer, unsigned int &size)
-{
-  // Since ProtoStep7 (#issue 108)
-  splitState_.current = splitState_.resource;
-
-  handleSplitStoreAlloc(&splitResources_, splitState_.current);
-
-  #if defined(TEST) || defined(SPLIT)
-  *logofs << "handleSplit: SPLIT! Message OPCODE#"
-          << (unsigned int) store -> opcode() << " of size " << size
-          << " [split] with resource " << splitState_.current
-          << " position " << position << " and action ["
-          << DumpAction(action) << "] at " << strMsTimestamp()
-          << ".\n" << logofs_flush;
-  #endif
-
-  //
-  // Get the MD5 of the message being
-  // split.
-  //
-
-  T_checksum checksum = NULL;
-
-  if (action != IS_HIT)
-  {
-    handleSplitChecksum(decodeBuffer, checksum);
-  }
-
-  //
-  // The method must abort the connection
-  // if it can't allocate the split.
-  //
-
-  Split *splitMessage = clientStore_ -> getSplitStore(splitState_.current) ->
-                              add(store, splitState_.current, position,
-                                      action, checksum, buffer, size);
-
-  //
-  // If the encoding side didn't provide
-  // a checksum, then don't send the split
-  // report.
-  //
-
-  if (checksum == NULL)
-  {
-    if (action == IS_HIT)
-    {
-      splitMessage -> setState(split_loaded);
-    }
-    else
-    {
-      splitMessage -> setState(split_missed);
-    }
-
-    #if defined(TEST) || defined(SPLIT)
-
-    *logofs << "handleSplit: SPLIT! There are " << clientStore_ ->
-               getSplitTotalSize() << " messages and " << clientStore_ ->
-               getSplitTotalStorageSize() << " bytes to send in "
-            << "the split stores.\n" << logofs_flush;
-
-    clientStore_ -> dumpSplitStore(splitState_.current);
-
-    #endif
-
-    return 1;
-  }
-
-  delete [] checksum;
-
-  //
-  // Tell the split store if it must use
-  // the disk cache to retrieve and save
-  // the message.
-  //
-
-  splitMessage -> setPolicy(splitState_.load, splitState_.save);
-
-  //
-  // Try to locate the message on disk.
-  //
-
-  if (clientStore_ -> getSplitStore(splitState_.current) ->
-          load(splitMessage) == 1)
-  {
-    #if defined(TEST) || defined(SPLIT)
-    *logofs << "handleSplit: SPLIT! Loaded the message "
-            << "from the image cache.\n" << logofs_flush;
-    #endif
-
-    splitMessage -> setState(split_loaded);
-  }
-  else
-  {
-    #if defined(TEST) || defined(SPLIT)
-    *logofs << "handleSplit: WARNING! SPLIT! Can't find the message "
-            << "in the image cache.\n" << logofs_flush;
-    #endif
-
-    splitMessage -> setState(split_missed);
-  }
-
-  #if defined(TEST) || defined(SPLIT)
-
-  T_timestamp startTs = getTimestamp();
-
-  *logofs << "handleSplit: SPLIT! Encoding abort "
-          << "split events for FD#" << fd_ << " at "
-          << strMsTimestamp() << ".\n" << logofs_flush;
-  #endif
-
-  if (proxy -> handleAsyncSplit(fd_, splitMessage) < 0)
-  {
-    return -1;
-  }
-
-  //
-  // Send the encoded data immediately. We
-  // want the abort split message to reach
-  // the remote proxy as soon as possible.
-  //
-
-  if (proxy -> handleAsyncFlush() < 0)
-  {
-    return -1;
-  }
-
-  #if defined(TEST) || defined(SPLIT)
-
-  *logofs << "handleSplit: SPLIT! Spent "
-          << diffTimestamp(startTs, getTimestamp()) << " Ms "
-          << "handling abort split events for FD#" << fd_
-          << ".\n" << logofs_flush;
-
-  *logofs << "handleSplit: SPLIT! There are " << clientStore_ ->
-             getSplitTotalSize() << " messages and " << clientStore_ ->
-             getSplitTotalStorageSize() << " bytes to send in "
-          << "the split stores.\n" << logofs_flush;
-
-  clientStore_ -> dumpSplitStore(splitState_.current);
-
-  #endif
-
-  return 1;
-}
-
-int ServerChannel::handleSplit(DecodeBuffer &decodeBuffer)
-{
-  #if defined(TEST) || defined(SPLIT)
-  *logofs << "handleSplit: SPLIT! Going to handle splits "
-          << "for FD#" << fd_ << " at " << strMsTimestamp()
-          << ".\n" << logofs_flush;
-  #endif
-
-  unsigned char resource;
-
-  // Since ProtoStep7 (#issue 108)
-  decodeBuffer.decodeCachedValue(resource, 8,
-                     clientCache_ -> resourceCache);
-
-  splitState_.current = resource;
-
-  handleSplitStoreAlloc(&splitResources_, splitState_.current);
-
-  SplitStore *splitStore = clientStore_ -> getSplitStore(splitState_.current);
-
-  #if defined(TEST) || defined(SPLIT)
-  *logofs << "handleSplit: SPLIT! Handling splits for "
-          << "resource [" << splitState_.current << "] with "
-          << splitStore -> getSize() << " elements "
-          << "in the split store.\n" << logofs_flush;
-  #endif
-
-  int result = splitStore -> receive(decodeBuffer);
-
-  if (result < 0)
-  {
-    #ifdef PANIC
-    *logofs << "handleSplit: PANIC! Receive of split for FD#" << fd_
-            << " failed.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Receive of split for FD#" << fd_
-         << " failed.\n";
-
-    return -1;
-  }
-  else if (result == 0)
-  {
-    //
-    // The split is still incomplete. It's time
-    // to check if we need to start the house-
-    // keeping process to take care of the image
-    // cache.
-    //
-
-    if (proxy -> handleAsyncKeeperCallback() < 0)
-    {
-      return -1;
-    }
-  }
-  else
-  {
-    //
-    // Note that we don't need the resource id at the
-    // X server side and, thus, we don't provide it
-    // at the time we add split to the split store.
-    //
-
-    #if defined(TEST) || defined(SPLIT)
-    *logofs << "handleSplit: SPLIT! Remote agent should "
-            << "now commit a new split for resource ["
-            << splitState_.current << "].\n"
-            << logofs_flush;
-
-    clientStore_ -> dumpCommitStore();
-
-    #endif
-
-    if (splitStore -> getSize() == 0)
-    {
-      #if defined(TEST) || defined(SPLIT)
-      *logofs << "handleSplit: SPLIT! Removing split store "
-              << "for resource [" << splitState_.current
-              << "] at " << strMsTimestamp() << ".\n"
-              << logofs_flush;
-      #endif
-
-      handleSplitStoreRemove(&splitResources_, splitState_.current);
-
-      #if defined(TEST) || defined(SPLIT)
-      *logofs << "handleSplit: SPLIT! There are [" << clientStore_ ->
-                 getSplitTotalSize() << "] messages and " << clientStore_ ->
-                 getSplitTotalStorageSize() << " bytes to send in "
-              << "the split stores.\n" << logofs_flush;
-      #endif
-    }
-    else
-    {
-      //
-      // If the next split is discarded, it can be
-      // that, since the beginning of the split, we
-      // have saved the message on the disk, due to
-      // a more recent split operation. This is also
-      // the case when we had to discard the message
-      // because it was locked but, since then, we
-      // completed the transferral of the split.
-      //
-
-      Split *splitMessage = splitStore -> getFirstSplit();
-
-      if (splitMessage -> getAction() == is_discarded &&
-            splitMessage -> getState() == split_missed &&
-                splitStore -> load(splitMessage) == 1)
-      {
-        #if defined(TEST) || defined(SPLIT)
-        *logofs << "handleSplit: WARNING! SPLIT! Asynchronously "
-                << "loaded the message from the image cache.\n"
-                << logofs_flush;
-        #endif
-
-        splitMessage -> setState(split_loaded);
-
-        #if defined(TEST) || defined(SPLIT)
-
-        T_timestamp startTs = getTimestamp();
-
-        *logofs << "handleSplit: WARNING! SPLIT! Asynchronously "
-                << "encoding abort split events for FD#" << fd_
-                << " at " << strMsTimestamp() << ".\n"
-                << logofs_flush;
-        #endif
-
-        if (proxy -> handleAsyncSplit(fd_, splitMessage) < 0)
-        {
-          return -1;
-        }
-
-        //
-        // Send the encoded data immediately. We
-        // want the abort split message to reach
-        // the remote proxy as soon as possible.
-        //
-
-        if (proxy -> handleAsyncFlush() < 0)
-        {
-          return -1;
-        }
-
-        #if defined(TEST) || defined(SPLIT)
-
-        *logofs << "handleSplit: WARNING! SPLIT! Spent "
-                << diffTimestamp(startTs, getTimestamp()) << " Ms "
-                << "handling asynchronous abort split events for "
-                << "FD#" << fd_ << ".\n" << logofs_flush;
-
-        *logofs << "handleSplit: SPLIT! There are " << clientStore_ ->
-                   getSplitTotalSize() << " messages and " << clientStore_ ->
-                   getSplitTotalStorageSize() << " bytes to send in "
-                << "the split stores.\n" << logofs_flush;
-
-        clientStore_ -> dumpSplitStore(splitState_.current);
-
-        #endif
-      }
-    }
-  }
-
-  return 1;
-}
-
-int ServerChannel::handleSplitEvent(EncodeBuffer &encodeBuffer, Split *splitMessage)
-{
-  int resource = splitMessage -> getResource();
-
-  #if defined(TEST) || defined(SPLIT)
-  *logofs << "handleSplitEvent: SPLIT! Going to send a "
-          << "split report for resource " << resource
-          << ".\n" << logofs_flush;
-  #endif
-
-  //
-  // This function is called only after the message
-  // has been searched in the disk cache. We need to
-  // inform the other side if the data transfer can
-  // start or it must be aborted to let the local
-  // side use the copy that was found on the disk.
-  //
-
-  #if defined(TEST) || defined(INFO)
-
-  if (splitMessage -> getState() != split_loaded &&
-          splitMessage -> getState() != split_missed)
-  {
-    *logofs << "handleSplitEvent: PANIC! Can't find the split to be aborted.\n"
-            << logofs_flush;
-
-    HandleCleanup();
-  }
-
-  #endif
-
-  //
-  // We need to send a boolean telling if the split
-  // was found or not, followed by the checksum of
-  // message we are referencing.
-  //
-
-  T_checksum checksum = splitMessage -> getChecksum();
-
-  #if defined(TEST) || defined(SPLIT)
-  *logofs << "handleSplitEvent: SPLIT! Sending split report for "
-          << "checksum [" << DumpChecksum(checksum) << "].\n"
-          << logofs_flush;
-  #endif
-
-  if (proxy -> handleAsyncSwitch(fd_) < 0)
-  {
-    return -1;
-  }
-
-  encodeBuffer.encodeOpcodeValue(opcodeStore_ -> splitEvent,
-                                     serverCache_ -> opcodeCache);
-
-  //
-  // The encoding in older protocol versions
-  // is different but we will never try to
-  // send a split report if the remote does
-  // not support our version.
-  //
-
-  encodeBuffer.encodeCachedValue(resource, 8,
-                     serverCache_ -> resourceCache);
-
-  if (splitMessage -> getState() == split_loaded)
-  {
-    encodeBuffer.encodeBoolValue(1);
-
-    encodeBuffer.encodeOpcodeValue(splitMessage -> getStore() -> opcode(),
-                                       serverCache_ -> abortOpcodeCache);
-
-    encodeBuffer.encodeValue(splitMessage -> compressedSize(), 32, 14);
-  }
-  else
-  {
-    encodeBuffer.encodeBoolValue(0);
-  }
-
-  for (unsigned int i = 0; i < MD5_LENGTH; i++)
-  {
-    encodeBuffer.encodeValue((unsigned int) checksum[i], 8);
-  }
-
-  //
-  // Update statistics for this special opcode.
-  //
-
-  int bits = encodeBuffer.diffBits();
-
-  #if defined(TEST) || defined(OPCODES) || defined(INFO) || defined(SPLIT)
-  *logofs << "handleSplitEvent: SPLIT! Handled event OPCODE#"
-          << (unsigned int) opcodeStore_ -> splitEvent << " ("
-          << DumpOpcode(opcodeStore_ -> splitEvent) << ")" << " for FD#"
-          << fd_ << " sequence none. 0 bytes in, " << bits << " bits ("
-          << ((float) bits) / 8 << " bytes) out.\n" << logofs_flush;
-  #endif
-
-  statistics -> addEventBits(opcodeStore_ -> splitEvent, 0, bits);
-
-  return 1;
-}
-
-int ServerChannel::handleAbortSplitRequest(DecodeBuffer &decodeBuffer, unsigned char &opcode,
-                                               unsigned char *&buffer, unsigned int &size)
-{
-  unsigned char resource;
-
-  decodeBuffer.decodeCachedValue(resource, 8,
-                     clientCache_ -> resourceCache);
-
-  #if defined(TEST) || defined(SPLIT)
-  *logofs << "handleAbortSplitRequest: SPLIT! Handling abort split "
-          << "request for FD#" << fd_ << " and resource "
-          << (unsigned) resource << ".\n"
-          << logofs_flush;
-  #endif
-
-  int splits = 0;
-
-  SplitStore *splitStore = clientStore_ -> getSplitStore(resource);
-
-  if (splitStore != NULL)
-  {
-    //
-    // Discard from the memory cache the messages
-    // that are still incomplete and then get rid
-    // of the splits in the store.
-    //
-
-    #if defined(TEST) || defined(SPLIT)
-
-    clientStore_ -> dumpSplitStore(resource);
-
-    #endif
-
-    Split *splitMessage;
-
-    for (;;)
-    {
-      splitMessage = splitStore -> getFirstSplit();
-
-      if (splitMessage == NULL)
-      {
-        //
-        // Check if we had created the store
-        // but no message was added yet.
-        //
-
-        #ifdef WARNING
-
-        if (splits == 0)
-        {
-          *logofs << "handleAbortSplitRequest: WARNING! SPLIT! The "
-                  << "split store for resource [" << (unsigned int)
-                     resource << "] is unexpectedly empty.\n"
-                  << logofs_flush;
-        }
-
-        #endif
-
-        break;
-      }
-
-      //
-      // Splits already aborted can't be in the
-      // split store.
-      //
-
-      #if defined(TEST) || defined(SPLIT)
-
-      if (splitMessage -> getState() == split_aborted)
-      {
-        *logofs << "handleAbortSplitRequest: PANIC! SPLIT! Found an "
-                << "aborted split in store [" << (unsigned int) resource
-                << "].\n" << logofs_flush;
-
-        HandleCleanup();
-      }
-
-      #endif
-
-      if (splitMessage -> getAction() == IS_HIT)
-      {
-        #if defined(TEST) || defined(SPLIT)
-        *logofs << "handleAbortSplitRequest: SPLIT! Removing the "
-                << "split from the memory cache.\n"
-                << logofs_flush;
-        #endif
-
-        splitMessage -> getStore() -> remove(splitMessage -> getPosition(),
-                                                 discard_checksum, use_data);
-      }
-
-      #if defined(TEST) || defined(SPLIT)
-      *logofs << "handleAbortSplitRequest: SPLIT! Removing the "
-              << "split from the split store.\n"
-              << logofs_flush;
-      #endif
-
-      splitMessage = splitStore -> pop();
-
-      #if defined(TEST) || defined(SPLIT)
-      *logofs << "handleAbortSplitRequest: SPLIT! Freeing up the "
-              << "aborted split.\n" << logofs_flush;
-      #endif
-
-      delete splitMessage;
-
-      splits++;
-    }
-  }
-  #ifdef WARNING
-  else
-  {
-    *logofs << "handleAbortSplitRequest: WARNING! SPLIT! The "
-            << "split store for resource [" << (unsigned int)
-               resource << "] is already empty.\n"
-            << logofs_flush;
-  }
-  #endif
-
-  handleNullRequest(opcode, buffer, size);
-
-  return (splits > 0);
-}
-
-int ServerChannel::handleCommitSplitRequest(DecodeBuffer &decodeBuffer, unsigned char &opcode,
-                                                unsigned char *&buffer, unsigned int &size)
-{
-  //
-  // Get request type and position of the image
-  // to commit.
-  //
-
-  unsigned char request;
-
-  decodeBuffer.decodeOpcodeValue(request, clientCache_ -> opcodeCache);
-
-  unsigned int diffCommit;
-
-  decodeBuffer.decodeValue(diffCommit, 32, 5);
-
-  splitState_.commit += diffCommit;
-
-  unsigned char resource = 0;
-  unsigned int commit = 1;
-
-  //
-  // Send the resource id and the commit flag.
-  // The resource id is ignored at the moment.
-  // The message will be handled based on the
-  // resource id that was sent together with
-  // the original message.
-  //
-
-  decodeBuffer.decodeCachedValue(resource, 8,
-                     clientCache_ -> resourceCache);
-
-  decodeBuffer.decodeBoolValue(commit);
-
-  Split *split = handleSplitCommitRemove(request, resource, splitState_.commit);
-
-  if (split == NULL)
-  {
-    return -1;
-  }
-
-  clientStore_ -> getCommitStore() -> update(split);
-
-  if (commit == 1)
-  {
-    #if defined(TEST) || defined(SPLIT)
-    *logofs << "handleCommitSplitRequest: SPLIT! Handling split commit "
-            << "for FD#" << fd_ << " with commit " << commit
-            << " request " << (unsigned) request << " resource "
-            << (unsigned) resource << " and position "
-            << splitState_.commit << ".\n"
-            << logofs_flush;
-    #endif
-
-    //
-    // Allocate as many bytes in the write
-    // buffer as the final length of the
-    // message in uncompressed form.
-    //
-
-    size = split -> plainSize();
-
-    buffer = writeBuffer_.addMessage(size);
-
-    #if defined(TEST) || defined(SPLIT)
-    *logofs << "handleCommitSplitRequest: SPLIT! Prepared an "
-            << "outgoing buffer of " << size << " bytes.\n"
-            << logofs_flush;
-    #endif
-
-    if (clientStore_ -> getCommitStore() -> expand(split, buffer, size) < 0)
-    {
-      writeBuffer_.removeMessage(size);
-
-      commit = 0;
-    }
-  }
-
-  //
-  // Free the split.
-  //
-
-  #if defined(TEST) || defined(SPLIT)
-  *logofs << "handleCommitSplitRequest: SPLIT! Freeing up the "
-          << "committed split.\n" << logofs_flush;
-  #endif
-
-  delete split;
-
-  //
-  // Discard the operation and send a null
-  // message.
-  //
-
-  if (commit == 0)
-  {
-    handleNullRequest(opcode, buffer, size);
-  }
-  else
-  {
-    //
-    // Save the sequence number to be able
-    // to mask any error generated by the
-    // request.
-    //
-
-    updateCommitQueue(clientSequence_);
-
-    //
-    // Now in the write buffer there is
-    // a copy of this request.
-    //
-
-    opcode = request;
-  }
-
-  return commit;
-}
-
-int ServerChannel::handleGeometry(unsigned char &opcode, unsigned char *&buffer,
-                                      unsigned int &size)
-{
-  //
-  // Replace the old geometry and taint
-  // the message into a X_NoOperation.
-  //
-
-  int resource = *(buffer + 1);
-
-  #ifdef TEST
-  *logofs << "handleGeometry: Setting new unpack geometry "
-          << "for resource " << resource << ".\n"
-          << logofs_flush;
-  #endif
-
-  handleUnpackStateInit(resource);
-
-  handleUnpackAllocGeometry(resource);
-
-  unpackState_[resource] -> geometry -> depth1_bpp  = *(buffer + 4);
-  unpackState_[resource] -> geometry -> depth4_bpp  = *(buffer + 5);
-  unpackState_[resource] -> geometry -> depth8_bpp  = *(buffer + 6);
-  unpackState_[resource] -> geometry -> depth16_bpp = *(buffer + 7);
-  unpackState_[resource] -> geometry -> depth24_bpp = *(buffer + 8);
-  unpackState_[resource] -> geometry -> depth32_bpp = *(buffer + 9);
-
-  unpackState_[resource] -> geometry -> red_mask   = GetULONG(buffer + 12, bigEndian_);
-  unpackState_[resource] -> geometry -> green_mask = GetULONG(buffer + 16, bigEndian_);
-  unpackState_[resource] -> geometry -> blue_mask  = GetULONG(buffer + 20, bigEndian_);
-
-  handleCleanAndNullRequest(opcode, buffer, size);
-
-  return 1;
-}
-
-int ServerChannel::handleColormap(unsigned char &opcode, unsigned char *&buffer,
-                                      unsigned int &size)
-{
-  //
-  // Replace the old colormap and taint
-  // the message into a X_NoOperation.
-  //
-
-  int resource = *(buffer + 1);
-
-  #ifdef TEST
-  *logofs << "handleColormap: Setting new unpack colormap "
-          << "for resource " << resource << ".\n"
-          << logofs_flush;
-  #endif
-
-  handleUnpackStateInit(resource);
-
-  handleUnpackAllocColormap(resource);
-
-  //
-  // New protocol versions send the alpha
-  // data in compressed form.
-  //
-
-  //
-  // Since ProtoStep7 (#issue 108)
-  //
-
-  { // An anonymous block is used here to limit the scope of local variables
-    unsigned int packed   = GetULONG(buffer + 8, bigEndian_);
-    unsigned int unpacked = GetULONG(buffer + 12, bigEndian_);
-
-    validateSize("colormap", packed, unpacked, 16, size);
-
-    if (unpackState_[resource] -> colormap -> entries != unpacked >> 2 &&
-            unpackState_[resource] -> colormap -> data != NULL)
-    {
-      #ifdef TEST
-      *logofs << "handleColormap: Freeing previously allocated "
-              << "unpack colormap data.\n" << logofs_flush;
-      #endif
-
-      delete [] unpackState_[resource] -> colormap -> data;
-
-      unpackState_[resource] -> colormap -> data    = NULL;
-      unpackState_[resource] -> colormap -> entries = 0;
-    }
-
-    #ifdef TEST
-    *logofs << "handleColormap: Setting " << unpacked
-            << " bytes of unpack colormap data for resource "
-            << resource << ".\n" << logofs_flush;
-    #endif
-
-    if (unpackState_[resource] -> colormap -> data == NULL)
-    {
-      unpackState_[resource] -> colormap -> data =
-            (unsigned int *) new unsigned char[unpacked];
-
-      if (unpackState_[resource] -> colormap -> data == NULL)
-      {
-        #ifdef PANIC
-        *logofs << "handleColormap: PANIC! Can't allocate "
-                << unpacked << " entries for unpack colormap data "
-                << "for FD#" << fd_ << ".\n" << logofs_flush;
-        #endif
-
-        goto handleColormapEnd;
-      }
-
-      #ifdef DEBUG
-      *logofs << "handleColormap: Size of new colormap data is "
-              << unpacked << ".\n" << logofs_flush;
-      #endif
-    }
-
-    unsigned int method = *(buffer + 4);
-
-    if (method == PACK_COLORMAP)
-    {
-      if (UnpackColormap(method, buffer + 16, packed,
-                             (unsigned char *) unpackState_[resource] ->
-                                 colormap -> data, unpacked) < 0)
-      {
-        #ifdef PANIC
-        *logofs << "handleColormap: PANIC! Can't unpack " << packed
-                << " bytes to " << unpacked << " entries for FD#"
-                << fd_ << ".\n" << logofs_flush;
-        #endif
-
-        delete [] unpackState_[resource] -> colormap -> data;
-
-        unpackState_[resource] -> colormap -> data    = NULL;
-        unpackState_[resource] -> colormap -> entries = 0;
-
-        goto handleColormapEnd;
-      }
-    }
-    else
-    {
-      memcpy((unsigned char *) unpackState_[resource] ->
-                 colormap -> data, buffer + 16, unpacked);
-    }
-
-    unpackState_[resource] -> colormap -> entries = unpacked >> 2;
-
-    #if defined(DEBUG) && defined(DUMP)
-
-    *logofs << "handleColormap: Dumping colormap entries:\n"
-            << logofs_flush;
-
-    const unsigned char *p = (const unsigned char *) unpackState_[resource] -> colormap -> data;
-
-    for (unsigned int i = 0; i < unpackState_[resource] ->
-             colormap -> entries; i++)
-    {
-      *logofs << "handleColormap: [" << i << "] ["
-              << (void *) ((int) p[i]) << "].\n"
-              << logofs_flush;
-    }
-
-    #endif
-  } // end anonymous block
-
-handleColormapEnd:
-
-  handleCleanAndNullRequest(opcode, buffer, size);
-
-  return 1;
-}
-
-int ServerChannel::handleAlpha(unsigned char &opcode, unsigned char *&buffer,
-                                      unsigned int &size)
-{
-  int resource = *(buffer + 1);
-
-  #ifdef TEST
-  *logofs << "handleAlpha: Setting new unpack alpha "
-          << "for resource " << resource << ".\n"
-          << logofs_flush;
-  #endif
-
-  handleUnpackStateInit(resource);
-
-  handleUnpackAllocAlpha(resource);
-
-  //
-  // New protocol versions send the alpha
-  // data in compressed form.
-  //
-
-  //
-  // Since ProtoStep7 (#issue 108)
-  //
-
-  {  // An anonymous block is used here to limit the scope of local variables
-    unsigned int packed   = GetULONG(buffer + 8, bigEndian_);
-    unsigned int unpacked = GetULONG(buffer + 12, bigEndian_);
-
-    validateSize("alpha", packed, unpacked, 16, size);
-
-    if (unpackState_[resource] -> alpha -> entries != unpacked &&
-            unpackState_[resource] -> alpha -> data != NULL)
-    {
-      #ifdef TEST
-      *logofs << "handleAlpha: Freeing previously allocated "
-              << "unpack alpha data.\n" << logofs_flush;
-      #endif
-
-      delete [] unpackState_[resource] -> alpha -> data;
-
-      unpackState_[resource] -> alpha -> data    = NULL;
-      unpackState_[resource] -> alpha -> entries = 0;
-    }
-
-    #ifdef TEST
-    *logofs << "handleAlpha: Setting " << unpacked
-            << " bytes of unpack alpha data for resource "
-            << resource << ".\n" << logofs_flush;
-    #endif
-
-    if (unpackState_[resource] -> alpha -> data == NULL)
-    {
-      unpackState_[resource] -> alpha -> data = new unsigned char[unpacked];
-
-      if (unpackState_[resource] -> alpha -> data == NULL)
-      {
-        #ifdef PANIC
-        *logofs << "handleAlpha: PANIC! Can't allocate "
-                << unpacked << " entries for unpack alpha data "
-                << "for FD#" << fd_ << ".\n" << logofs_flush;
-        #endif
-
-        goto handleAlphaEnd;
-      }
-
-      #ifdef DEBUG
-      *logofs << "handleAlpha: Size of new alpha data is "
-              << unpacked << ".\n" << logofs_flush;
-      #endif
-    }
-
-    unsigned int method = *(buffer + 4);
-
-    if (method == PACK_ALPHA)
-    {
-      if (UnpackAlpha(method, buffer + 16, packed,
-                          unpackState_[resource] -> alpha ->
-                              data, unpacked) < 0)
-      {
-        #ifdef PANIC
-        *logofs << "handleAlpha: PANIC! Can't unpack " << packed
-                << " bytes to " << unpacked << " entries for FD#"
-                << fd_ << ".\n" << logofs_flush;
-        #endif
-
-        delete [] unpackState_[resource] -> alpha -> data;
-
-        unpackState_[resource] -> alpha -> data    = NULL;
-        unpackState_[resource] -> alpha -> entries = 0;
-
-        goto handleAlphaEnd;
-      }
-    }
-    else
-    {
-      memcpy((unsigned char *) unpackState_[resource] ->
-                 alpha -> data, buffer + 16, unpacked);
-    }
-
-    unpackState_[resource] -> alpha -> entries = unpacked;
-
-    #if defined(DEBUG) && defined(DUMP)
-
-    *logofs << "handleAlpha: Dumping alpha entries:\n"
-            << logofs_flush;
-
-    const unsigned char *p = unpackState_[resource] -> alpha -> data;
-
-    for (unsigned int i = 0; i < unpackState_[resource] ->
-             alpha -> entries; i++)
-    {
-      *logofs << "handleAlpha: [" << i << "] ["
-              << (void *) ((int) p[i]) << "].\n"
-              << logofs_flush;
-    }
-
-    #endif
-  } //end anonymous block
-
-handleAlphaEnd:
-
-  handleCleanAndNullRequest(opcode, buffer, size);
-
-  return 1;
-}
-
-int ServerChannel::handleImage(unsigned char &opcode, unsigned char *&buffer,
-                                   unsigned int &size)
-{
-  int result = 1;
-
-  //
-  // Save the original opcode together with
-  // the image state so we can later find if
-  // this is a plain or a packed image when
-  // moving data to the shared memory area.
-  //
-
-  handleImageStateAlloc(opcode);
-
-  if (opcode == opcodeStore_ -> putPackedImage)
-  {
-    //
-    // Unpack the image and put a X_PutImage in a
-    // new buffer. Save the expected output size,
-    // so, in the case of a decoding error we can
-    // still update the statistics.
-    //
-
-    int length = GetULONG(buffer + 20, bigEndian_);
-
-    #ifdef TEST
-    *logofs << "handleImage: Sending image for FD#" << fd_
-            << " due to OPCODE#" << (unsigned int) opcode << " with "
-            << GetULONG(buffer + 16, bigEndian_) << " bytes packed "
-            << "and " << GetULONG(buffer + 20, bigEndian_)
-            << " bytes unpacked.\n" << logofs_flush;
-    #endif
-
-    statistics -> addPackedBytesIn(size);
-
-    result = handleUnpack(opcode, buffer, size);
-
-    if (result < 0)
-    {
-      //
-      // Recover from the error. Send a X_NoOperation
-      // to keep the sequence counter in sync with
-      // the remote peer.
-      //
-
-      size   = 4;
-      buffer = writeBuffer_.addMessage(size);
-
-      *buffer = X_NoOperation;
-
-      PutUINT(size >> 2, buffer + 2, bigEndian_);
-
-      #ifdef PANIC
-      *logofs << "handleImage: PANIC! Sending X_NoOperation for FD#"
-              << fd_ << " to recover from failed unpack.\n"
-              << logofs_flush;
-      #endif
-
-      //
-      // Set the output length to reflect the amount of
-      // data that would have been produced by unpacking
-      // the image. This is advisable to keep the count-
-      // ers in sync with those at remote proxy. Setting
-      // the size here doesn't have any effect on the
-      // size of data sent to the X server as the actual
-      // size will be taken from the content of the write
-      // buffer.
-      //
-
-      size = length;
-    }
-
-    statistics -> addPackedBytesOut(size);
-
-    //
-    // Refrain the write loop from putting
-    // opcode and size in the output buffer.
-    //
-
-    opcode = 0;
-  }
-
-  //
-  // Now image is unpacked as a X_PutImage
-  // in write buffer. Check if we can send
-  // the image using the MIT-SHM extension.
-  //
-
-  if (result > 0)
-  {
-    result = handleShmem(opcode, buffer, size);
-
-    //
-    // We already put opcode and size in
-    // the resulting buffer.
-    //
-
-    if (result > 0)
-    {
-      opcode = 0;
-    }
-  }
-
-  return 1;
-}
-
-int ServerChannel::handleMotion(EncodeBuffer &encodeBuffer)
-{
-  #if defined(TEST) || defined(INFO)
-
-  if (lastMotion_[0] == '\0')
-  {
-    *logofs << "handleMotion: PANIC! No motion events to send "
-            << "for FD#" << fd_ << ".\n" << logofs_flush;
-
-    HandleCleanup();
-  }
-
-  #endif
-
-  #if defined(TEST) || defined(INFO)
-  *logofs << "handleMotion: Sending motion events for FD#"
-          << fd_ << " at " << strMsTimestamp() << ".\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // Replicate code from read loop. When have
-  // time and wish, try to split everything
-  // in functions.
-  //
-
-  if (proxy -> handleAsyncSwitch(fd_) < 0)
-  {
-    return -1;
-  }
-
-  const unsigned char *buffer = lastMotion_;
-  unsigned char opcode = *lastMotion_;
-  unsigned int size = 32;
-
-  if (GetUINT(buffer + 2, bigEndian_) < serverSequence_)
-  {
-    PutUINT(serverSequence_, (unsigned char *) buffer + 2, bigEndian_);
-  }
-
-  encodeBuffer.encodeOpcodeValue(opcode, serverCache_ -> opcodeCache);
-
-  unsigned int sequenceNum = GetUINT(buffer + 2, bigEndian_);
-
-  unsigned int sequenceDiff = sequenceNum - serverSequence_;
-
-  serverSequence_ = sequenceNum;
-
-  #ifdef DEBUG
-  *logofs << "handleMotion: Last server sequence number for FD#" 
-          << fd_ << " is " << serverSequence_ << " with "
-          << "difference " << sequenceDiff << ".\n"
-          << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeCachedValue(sequenceDiff, 16,
-                     serverCache_ -> eventSequenceCache, 7);
-
-  //
-  // If we fast encoded the message
-  // then skip the rest.
-  //
-
-  if (control -> LocalDeltaCompression == 0)
-  {
-    int result = handleFastReadEvent(encodeBuffer, opcode,
-                                         buffer, size);
-
-    #ifdef DEBUG
-    *logofs << "handleMotion: Sent saved motion event for FD#"
-            << fd_ << ".\n" << logofs_flush;
-    #endif
-
-    lastMotion_[0] = '\0';
-
-    #ifdef DEBUG
-    *logofs << "handleMotion: Reset last motion event for FD#"
-            << fd_ << ".\n" << logofs_flush;
-    #endif
-
-    if (result < 0)
-    {
-      return -1;
-    }
-    else if (result > 0)
-    {
-      return 1;
-    }
-  }
-
-  //
-  // This should be just the part specific
-  // for motion events but is currently a
-  // copy-paste of code from the read loop.
-  //
-
-  unsigned char detail = buffer[1];
-  if (*buffer == MotionNotify)
-    encodeBuffer.encodeBoolValue((unsigned int) detail);
-  else if ((*buffer == EnterNotify) || (*buffer == LeaveNotify))
-    encodeBuffer.encodeValue((unsigned int) detail, 3);
-  else if (*buffer == KeyRelease)
-  {
-    if (detail == serverCache_ -> keyPressLastKey)
-      encodeBuffer.encodeBoolValue(1);
-    else
-    {
-      encodeBuffer.encodeBoolValue(0);
-      encodeBuffer.encodeValue((unsigned int) detail, 8);
-    }
-  }
-  else if ((*buffer == ButtonPress) || (*buffer == ButtonRelease))
-    encodeBuffer.encodeCachedValue(detail, 8,
-                                   serverCache_ -> buttonCache);
-  else
-    encodeBuffer.encodeValue((unsigned int) detail, 8);
-  unsigned int timestamp = GetULONG(buffer + 4, bigEndian_);
-  unsigned int timestampDiff = timestamp - serverCache_ -> lastTimestamp;
-  serverCache_ -> lastTimestamp = timestamp;
-  encodeBuffer.encodeCachedValue(timestampDiff, 32,
-                      serverCache_ -> motionNotifyTimestampCache, 9);
-  int skipRest = 0;
-  if (*buffer == KeyRelease)
-  {
-    skipRest = 1;
-    for (unsigned int i = 8; i < 31; i++)
-    {
-      if (buffer[i] != serverCache_ -> keyPressCache[i - 8])
-      {
-        skipRest = 0;
-        break;
-      }
-    }
-    encodeBuffer.encodeBoolValue(skipRest);
-  }
-  if (!skipRest)
-  {
-    const unsigned char *nextSrc = buffer + 8;
-    for (unsigned int i = 0; i < 3; i++)
-    {
-      encodeBuffer.encodeCachedValue(GetULONG(nextSrc, bigEndian_), 29,
-                         *serverCache_ -> motionNotifyWindowCache[i], 6);
-      nextSrc += 4;
-    }
-    unsigned int rootX = GetUINT(buffer + 20, bigEndian_);
-    unsigned int rootY = GetUINT(buffer + 22, bigEndian_);
-    unsigned int eventX = GetUINT(buffer + 24, bigEndian_);
-    unsigned int eventY = GetUINT(buffer + 26, bigEndian_);
-    eventX -= rootX;
-    eventY -= rootY;
-    encodeBuffer.encodeCachedValue(rootX -
-          serverCache_ -> motionNotifyLastRootX, 16,
-          serverCache_ -> motionNotifyRootXCache, 6);
-    serverCache_ -> motionNotifyLastRootX = rootX;
-    encodeBuffer.encodeCachedValue(rootY -
-          serverCache_ -> motionNotifyLastRootY, 16,
-          serverCache_ -> motionNotifyRootYCache, 6);
-    serverCache_ -> motionNotifyLastRootY = rootY;
-    encodeBuffer.encodeCachedValue(eventX, 16,
-                         serverCache_ -> motionNotifyEventXCache, 6);
-    encodeBuffer.encodeCachedValue(eventY, 16,
-                         serverCache_ -> motionNotifyEventYCache, 6);
-    encodeBuffer.encodeCachedValue(GetUINT(buffer + 28, bigEndian_),
-                         16, serverCache_ -> motionNotifyStateCache);
-    if ((*buffer == EnterNotify) || (*buffer == LeaveNotify))
-      encodeBuffer.encodeValue((unsigned int) buffer[30], 2);
-    else
-      encodeBuffer.encodeBoolValue((unsigned int) buffer[30]);
-    if ((*buffer == EnterNotify) || (*buffer == LeaveNotify))
-      encodeBuffer.encodeValue((unsigned int) buffer[31], 2);
-    else if (*buffer == KeyPress)
-    {
-      serverCache_ -> keyPressLastKey = detail;
-      for (unsigned int i = 8; i < 31; i++)
-      {
-        serverCache_ -> keyPressCache[i - 8] = buffer[i];
-      }
-    }
-  }
-
-  //
-  // Print info about achieved compression
-  // and update the statistics.
-  //
-
-  int bits = encodeBuffer.diffBits();
-
-  #if defined(TEST) || defined(OPCODES)
-  *logofs << "handleMotion: Handled event OPCODE#" << (unsigned int) buffer[0]
-          << " for FD#" << fd_ << " sequence " << sequenceNum << ". "
-          << size << " bytes in, " << bits << " bits (" << ((float) bits) / 8
-          << " bytes) out.\n" << logofs_flush;
-  #endif
-
-  statistics -> addEventBits(*buffer, size << 3, bits);
-
-  #ifdef DEBUG
-  *logofs << "handleMotion: Sent saved motion event for FD#"
-          << fd_ << ".\n" << logofs_flush;
-  #endif
-
-  lastMotion_[0] = '\0';
-
-  #ifdef DEBUG
-  *logofs << "handleMotion: Reset last motion event for FD#"
-          << fd_ << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int ServerChannel::handleConfiguration()
-{
-  #ifdef TEST
-  *logofs << "ServerChannel: Setting new buffer parameters "
-          << "for FD#" << fd_ << ".\n" << logofs_flush;
-  #endif
-
-  readBuffer_.setSize(control -> ServerInitialReadSize,
-                          control -> ServerMaximumBufferSize);
-
-  writeBuffer_.setSize(control -> TransportXBufferSize,
-                           control -> TransportXBufferThreshold,
-                               control -> TransportMaximumBufferSize);
-
-  transport_ -> setSize(control -> TransportXBufferSize,
-                            control -> TransportXBufferThreshold,
-                                control -> TransportMaximumBufferSize);
-  return 1;
-}
-
-int ServerChannel::handleFinish()
-{
-  #ifdef TEST
-  *logofs << "ServerChannel: Finishing connection for FD#"
-          << fd_ << ".\n" << logofs_flush;
-  #endif
-
-  congestion_ = 0;
-  priority_   = 0;
-
-  finish_ = 1;
-
-  //
-  // Reset the motion event.
-  //
-
-  lastMotion_[0] = '\0';
-
-  transport_ -> fullReset();
-
-  return 1;
-}
-
-int ServerChannel::handleAsyncEvents()
-{
-  //
-  // Encode more events while decoding the
-  // proxy messages.
-  //
-
-  if (transport_ -> readable() > 0)
-  {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "handleAsyncEvents: WARNING! Encoding events "
-            << "for FD#" << fd_ << " at " << strMsTimestamp()
-            << ".\n" << logofs_flush;
-    #endif
-
-    #if defined(TEST) || defined(INFO)
-
-    T_timestamp startTs = getTimestamp();
-
-    #endif
-
-    if (proxy -> handleAsyncRead(fd_) < 0)
-    {
-      return -1;
-    }
-
-    #if defined(TEST) || defined(INFO)
-    *logofs << "handleAsyncEvents: Spent " << diffTimestamp(startTs,
-               getTimestamp()) << " Ms handling events for FD#"
-            << fd_ << ".\n" << logofs_flush;
-    #endif
-
-    return 1;
-  }
-
-  return 0;
-}
-
-int ServerChannel::handleUnpack(unsigned char &opcode, unsigned char *&buffer,
-                                    unsigned int &size)
-{
-  int resource = *(buffer + 1);
-
-  #ifdef DEBUG
-  *logofs << "handleUnpack: Unpacking image for resource " << resource
-          << " with method " << (unsigned int) *(buffer + 12)
-          << ".\n" << logofs_flush;
-  #endif
-
-  handleUnpackStateInit(resource);
-
-  T_geometry *geometryState = unpackState_[resource] -> geometry;
-  T_colormap *colormapState = unpackState_[resource] -> colormap;
-  T_alpha    *alphaState    = unpackState_[resource] -> alpha;
-
-  if (geometryState == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "handleUnpack: PANIC! Missing geometry unpacking "
-            << "image for resource " << resource << ".\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Missing geometry unpacking "
-         << "image for resource " << resource << ".\n";
-
-    return -1;
-  }
-
-  //
-  // Get the image data from the buffer.
-  //
-
-  imageState_ -> drawable  = GetULONG(buffer + 4,  bigEndian_);
-  imageState_ -> gcontext  = GetULONG(buffer + 8,  bigEndian_);
-
-  imageState_ -> method    = *(buffer + 12);
-
-  imageState_ -> format    = *(buffer + 13);
-  imageState_ -> srcDepth  = *(buffer + 14);
-  imageState_ -> dstDepth  = *(buffer + 15);
-
-  imageState_ -> srcLength = GetULONG(buffer + 16,  bigEndian_);
-  imageState_ -> dstLength = GetULONG(buffer + 20,  bigEndian_);
-
-  imageState_ -> srcX      = GetUINT(buffer + 24, bigEndian_);
-  imageState_ -> srcY      = GetUINT(buffer + 26, bigEndian_);
-  imageState_ -> srcWidth  = GetUINT(buffer + 28, bigEndian_);
-  imageState_ -> srcHeight = GetUINT(buffer + 30, bigEndian_);
-
-  imageState_ -> dstX      = GetUINT(buffer + 32, bigEndian_);
-  imageState_ -> dstY      = GetUINT(buffer + 34, bigEndian_);
-  imageState_ -> dstWidth  = GetUINT(buffer + 36, bigEndian_);
-  imageState_ -> dstHeight = GetUINT(buffer + 38, bigEndian_);
-
-  #ifdef TEST
-  *logofs << "handleUnpack: Source X is " << imageState_ -> srcX
-          << " Y is " << imageState_ -> srcY << " width is "
-          << imageState_ -> srcWidth << " height is "
-          << imageState_ -> srcHeight << ".\n"
-          << logofs_flush;
-  #endif
-
-  #ifdef TEST
-  *logofs << "handleUnpack: Destination X is " << imageState_ -> dstX
-          << " Y is " << imageState_ -> dstY << " width is "
-          << imageState_ -> dstWidth << " height is "
-          << imageState_ -> dstHeight << ".\n"
-          << logofs_flush;
-  #endif
-
-  if (imageState_ -> srcX != 0 || imageState_ -> srcY != 0)
-  {
-    #ifdef PANIC
-    *logofs << "handleUnpack: PANIC! Unsupported source coordinates "
-            << "in unpack request.\n" << logofs_flush;
-    #endif
-
-    return -1;
-  }
-  else if (imageState_ -> method == PACK_COLORMAP_256_COLORS &&
-               (colormapState == NULL || colormapState -> data == NULL))
-  {
-    #ifdef PANIC
-    *logofs << "handleUnpack: PANIC! Cannot find any unpack colormap.\n"
-            << logofs_flush;
-    #endif
-
-    return -1;
-  }
-
-  //
-  // Field srcLength carries size of image data in
-  // packed format. Field dstLength is size of the
-  // image in the original X bitmap format.
-  //
-
-  unsigned int srcDataOffset = 40;
-
-  unsigned int srcSize = imageState_ -> srcLength;
-
-  unsigned int removeSize = size;
-
-  unsigned char *srcData = buffer + srcDataOffset;
-
-  //
-  // Get source and destination bits per pixel.
-  //
-
-  int srcBitsPerPixel = MethodBitsPerPixel(imageState_ -> method);
-
-  if (srcBitsPerPixel <= 0)
-  {
-    #ifdef PANIC
-    *logofs << "handleUnpack: PANIC! Can't identify source "
-            << "bits per pixel for method " << (unsigned int)
-               imageState_ -> method << ".\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Can't identify source bits "
-         << "per pixel for method " << (unsigned int)
-            imageState_ -> method << ".\n";
-
-    writeBuffer_.removeMessage(removeSize);
-
-    return -1;
-  }
-
-  #ifdef TEST
-  *logofs << "handleUnpack: Source bits per pixel are "
-          << srcBitsPerPixel << " source data size is "
-          << srcSize << ".\n" << logofs_flush;
-  #endif
-
-  int dstBitsPerPixel = UnpackBitsPerPixel(geometryState, imageState_ -> dstDepth);
-
-  if (dstBitsPerPixel <= 0)
-  {
-    #ifdef PANIC
-    *logofs << "handleUnpack: PANIC! Can't identify "
-            << "destination bits per pixel for depth "
-            << (unsigned int) imageState_ -> dstDepth
-            << ".\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Can't identify "
-         << "destination bits per pixel for depth "
-         << (unsigned int) imageState_ -> dstDepth
-         << ".\n";
-
-    writeBuffer_.removeMessage(removeSize);
-
-    return -1;
-  }
-
-  //
-  // Destination is a PutImage request.
-  //
-
-  unsigned int dstDataOffset = 24;
-
-  //
-  // Output buffer size must match the number of input
-  // pixels multiplied by the number of bytes per pixel
-  // of current geometry.
-  //
-
-  size = (RoundUp4(imageState_ -> dstWidth * dstBitsPerPixel / 8) *
-                       imageState_ -> dstHeight) + dstDataOffset;
-
-  #ifdef TEST
-  *logofs << "handleUnpack: Destination bits per pixel are "
-          << dstBitsPerPixel << " destination data size is "
-          << size - dstDataOffset << ".\n" << logofs_flush;
-  #endif
-
-  unsigned int dstSize = size - dstDataOffset;
-
-  imageState_ -> dstLines = imageState_ -> dstHeight;
-
-  unsigned char *dstData;
-
-  //
-  // Size of the final output buffer had to be stored
-  // in the offset field of XImage/NXPackedImage.
-  //
-
-  #ifdef WARNING
-
-  if (dstSize != imageState_ -> dstLength)
-  {
-    *logofs << "handleUnpack: WARNING! Destination size mismatch "
-            << "with reported " << imageState_ -> dstLength
-            << " and actual " << dstSize << ".\n"
-            << logofs_flush;
-  }
-
-  #endif
-
-  //
-  // The decoding algorithm has put the packed image
-  // in the plain write buffer. Let's use the scratch
-  // buffer to uncompress the image.
-  //
-
-  buffer = writeBuffer_.addScratchMessage(size);
-
-  dstData = buffer + dstDataOffset;
-
-  //
-  // Unpack image into the buffer.
-  //
-
-  *buffer = (unsigned char) X_PutImage;
-
-  *(buffer + 1) = imageState_ -> format;
-
-  PutUINT(size >> 2, buffer + 2, bigEndian_);
-
-  PutULONG(imageState_ -> drawable, buffer + 4,  bigEndian_);
-  PutULONG(imageState_ -> gcontext, buffer + 8,  bigEndian_);
-
-  PutUINT(imageState_ -> dstWidth, buffer + 12, bigEndian_);
-  PutUINT(imageState_ -> dstLines, buffer + 14, bigEndian_);
-
-  PutUINT(imageState_ -> dstX, buffer + 16, bigEndian_);
-  PutUINT(imageState_ -> dstY, buffer + 18, bigEndian_);
-
-  *(buffer + 20) = 0;
-  *(buffer + 21) = imageState_ -> dstDepth;
-
-  #ifdef TEST
-  *logofs << "handleUnpack: Write buffer size is "
-          << writeBuffer_.getLength() << " scratch size is "
-          << writeBuffer_.getScratchLength() << ".\n"
-          << logofs_flush;
-  #endif
-
-  int result = 0;
-
-  switch (imageState_ -> method)
-  {
-    case PACK_JPEG_8_COLORS:
-    case PACK_JPEG_64_COLORS:
-    case PACK_JPEG_256_COLORS:
-    case PACK_JPEG_512_COLORS:
-    case PACK_JPEG_4K_COLORS:
-    case PACK_JPEG_32K_COLORS:
-    case PACK_JPEG_64K_COLORS:
-    case PACK_JPEG_256K_COLORS:
-    case PACK_JPEG_2M_COLORS:
-    case PACK_JPEG_16M_COLORS:
-    {
-      result = UnpackJpeg(geometryState, imageState_ -> method, srcData,
-                              srcSize, dstBitsPerPixel, imageState_ -> dstWidth,
-                                  imageState_ -> dstHeight, dstData, dstSize);
-      break;
-    }
-    case PACK_PNG_8_COLORS:
-    case PACK_PNG_64_COLORS:
-    case PACK_PNG_256_COLORS:
-    case PACK_PNG_512_COLORS:
-    case PACK_PNG_4K_COLORS:
-    case PACK_PNG_32K_COLORS:
-    case PACK_PNG_64K_COLORS:
-    case PACK_PNG_256K_COLORS:
-    case PACK_PNG_2M_COLORS:
-    case PACK_PNG_16M_COLORS:
-    {
-      result = UnpackPng(geometryState, imageState_ -> method, srcData,
-                             srcSize, dstBitsPerPixel, imageState_ -> dstWidth,
-                                 imageState_ -> dstHeight, dstData, dstSize);
-      break;
-    }
-    case PACK_RGB_16M_COLORS:
-    {
-      result = UnpackRgb(geometryState, imageState_ -> method, srcData,
-                             srcSize, dstBitsPerPixel, imageState_ -> dstWidth,
-                                 imageState_ -> dstHeight, dstData, dstSize);
-      break;
-    }
-    case PACK_RLE_16M_COLORS:
-    {
-      result = UnpackRle(geometryState, imageState_ -> method, srcData,
-                             srcSize, dstBitsPerPixel, imageState_ -> dstWidth,
-                                 imageState_ -> dstHeight, dstData, dstSize);
-      break;
-    }
-    case PACK_BITMAP_16M_COLORS:
-    {
-      result = UnpackBitmap(geometryState, imageState_ -> method, srcData,
-                                srcSize, dstBitsPerPixel, imageState_ -> dstWidth,
-                                    imageState_ -> dstHeight, dstData, dstSize);
-      break;
-    }
-    case PACK_COLORMAP_256_COLORS:
-    {
-      result = Unpack8(geometryState, colormapState, srcBitsPerPixel,
-                           imageState_ -> srcWidth, imageState_ -> srcHeight, srcData,
-                               srcSize, dstBitsPerPixel, imageState_ -> dstWidth,
-                                   imageState_ -> dstHeight, dstData, dstSize);
-
-      break;
-    }
-    default:
-    {
-      const T_colormask *colorMask = MethodColorMask(imageState_ -> method);
-
-      switch (imageState_ -> method)
-      {
-        case PACK_MASKED_8_COLORS:
-        case PACK_MASKED_64_COLORS:
-        case PACK_MASKED_256_COLORS:
-        {
-          result = Unpack8(geometryState, colorMask, imageState_ -> srcDepth,
-                               imageState_ -> srcWidth, imageState_ -> srcHeight,
-                                   srcData, srcSize, imageState_ -> dstDepth,
-                                       imageState_ -> dstWidth, imageState_ -> dstHeight,
-                                           dstData, dstSize);
-          break;
-        }
-        case PACK_MASKED_512_COLORS:
-        case PACK_MASKED_4K_COLORS:
-        case PACK_MASKED_32K_COLORS:
-        case PACK_MASKED_64K_COLORS:
-        {
-          result = Unpack16(geometryState, colorMask, imageState_ -> srcDepth,
-                                imageState_ -> srcWidth, imageState_ -> srcHeight,
-                                    srcData, srcSize, imageState_ -> dstDepth,
-                                        imageState_ -> dstWidth, imageState_ -> dstHeight,
-                                            dstData, dstSize);
-          break;
-        }
-        case PACK_MASKED_256K_COLORS:
-        case PACK_MASKED_2M_COLORS:
-        case PACK_MASKED_16M_COLORS:
-        {
-          result = Unpack24(geometryState, colorMask, imageState_ -> srcDepth,
-                                imageState_ -> srcWidth, imageState_ -> srcHeight,
-                                    srcData, srcSize, imageState_ -> dstDepth,
-                                        imageState_ -> dstWidth, imageState_ -> dstHeight,
-                                            dstData, dstSize);
-          break;
-        }
-        default:
-        {
-          break;
-        }
-      }
-    }
-  }
-
-  writeBuffer_.removeMessage(removeSize);
-
-  if (result <= 0)
-  {
-    #ifdef PANIC
-    *logofs << "handleUnpack: PANIC! Failed to unpack image "
-            << "with method '" << (unsigned int) imageState_ -> method
-            << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Warning" << ": Failed to unpack image "
-         << "with method '" << (unsigned int) imageState_ -> method
-         << "'.\n";
-
-    //
-    // TODO: We should mark the image somehow,
-    // and force the remote to remove it from
-    // the cache.
-    //
-
-    writeBuffer_.removeScratchMessage();
-
-    return -1;
-  }
-
-  //
-  // Alpha channel is used only on some 32 bits pixmaps
-  // and only if render extension is in use. Presently
-  // we don't have an efficient way to know in advance
-  // if mask must be applied or not to the image. If an
-  // alpha channel is set, the function will check if
-  // the size of the alpha data matches the size of the
-  // image. In the worst case we'll create an useless
-  // alpha plane for a pixmap that doesn't need it.
-  //
-
-  if (alphaState != NULL && alphaState -> data != NULL &&
-          imageState_ -> dstDepth == 32)
-  {
-    UnpackAlpha(alphaState, dstData, dstSize, imageByteOrder_);
-  }
-
-  return 1;
-}
-
-int ServerChannel::handleAuthorization(unsigned char *buffer)
-{
-  //
-  // At the present moment we don't support more than
-  // a single display for each proxy, so authorization
-  // data is shared among all the channels.
-  //
-  // Use the following code to simulate authentication
-  // failures on a LSB machine:
-  // 
-  // memcpy(buffer + 12 + (((buffer[6] + 256 *
-  //            buffer[7]) + 3) & ~3), "1234567890123456", 16);
-  //
-
-  if (auth == NULL)
-  {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "handleAuthorization: Forwarding the real cookie "
-            << "for FD#" << fd_ << ".\n" << logofs_flush;
-    #endif
-
-    return 0;
-  }
-  else if (auth -> checkCookie(buffer) == 1)
-  {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "handleAuthorization: Matched the fake cookie "
-            << "for FD#" << fd_ << ".\n" << logofs_flush;
-    #endif
-
-    return 1;
-  }
-  else
-  {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "handleAuthorization: WARNING! Failed to match "
-            << "the fake cookie for FD#" << fd_ << ".\n"
-            << logofs_flush;
-    #endif
-
-    return -1;
-  }
-}
-
-int ServerChannel::handleAuthorization(const unsigned char *buffer, int size)
-{
-  //
-  // Check the X server's response and, in the case of
-  // an error, print the textual information reported
-  // by the server.
-  //
-
-  if (*buffer != 1)
-  {
-    const char *reason = NULL;
-
-    //
-    // At the moment we don't take into account the end-
-    // ianess of the reply. This should work in any case
-    // because we simply try to match a few well-known
-    // error strings.
-    //
-
-    if (size >= INVALID_COOKIE_SIZE + 8 &&
-            memcmp(buffer + 8, INVALID_COOKIE_DATA,
-                       INVALID_COOKIE_SIZE) == 0)
-    {
-      reason = INVALID_COOKIE_DATA;
-    }
-    else if (size >= NO_AUTH_PROTO_SIZE + 8 &&
-                 memcmp(buffer + 8, NO_AUTH_PROTO_DATA,
-                            NO_AUTH_PROTO_SIZE) == 0)
-    {
-      reason = NO_AUTH_PROTO_DATA;
-    }
-    else
-    {
-      reason = "Unknown";
-    }
-
-    #ifdef WARNING
-    *logofs << "handleAuthorization: WARNING! X connection failed "
-            << "with error '" << reason << "' on FD#" << fd_
-            << ".\n" << logofs_flush;
-    #endif
-
-    cerr << "Warning" << ": X connection failed "
-         << "with error '" << reason << "'.\n";
-  }
-  #if defined(TEST) || defined(INFO)
-  else
-  {
-    *logofs << "handleAuthorization: X connection successful "
-            << "on FD#" << fd_ << ".\n" << logofs_flush;
-  }
-  #endif
-
-  return 1;
-}
-
-//
-// Use a simple encoding. Need to handle the image
-// requests in the usual way and the X_ListExtensions
-// and X_QueryExtension to hide MIT-SHM and RENDER
-// in the reply.
-//
-
-int ServerChannel::handleFastWriteRequest(DecodeBuffer &decodeBuffer, unsigned char &opcode,
-                                              unsigned char *&buffer, unsigned int &size)
-{
-  //
-  // All the NX requests are handled in the
-  // main message loop.
-  //
-
-  //
-  // Since ProtoStep7 (#issue 108)
-  //
-  // The X_PutImage can be handled here only
-  // if a split was not requested.
-  //
-
-  if ((opcode >= X_NXFirstOpcode && opcode <= X_NXLastOpcode) ||
-          (opcode == X_PutImage && splitState_.resource != nothing) ||
-              opcode == X_ListExtensions ||
-                  opcode == X_QueryExtension)
-  {
-    return 0;
-  }
-
-  #ifdef DEBUG
-  *logofs << "handleFastWriteRequest: Decoding raw request OPCODE#"
-          << (unsigned int) opcode << " for FD#" << fd_
-          << ".\n" << logofs_flush;
-  #endif
-
-  buffer = writeBuffer_.addMessage(4);
-
-  #ifndef __sun
-
-  unsigned int *next = (unsigned int *) decodeBuffer.decodeMemory(4);
-
-  *((unsigned int *) buffer) = *next;
-
-  #else /* #ifndef __sun */
-
-  memcpy(buffer, decodeBuffer.decodeMemory(4), 4);
-
-  #endif /* #ifndef __sun */
-
-  size = GetUINT(buffer + 2, bigEndian_) << 2;
-
-  if (size < 4)
-  {
-    #ifdef WARNING
-    *logofs << "handleFastWriteRequest: WARNING! Assuming size 4 "
-            << "for suspicious message of size " << size
-            << ".\n" << logofs_flush;
-    #endif
-
-    size = 4;
-  }
-
-  writeBuffer_.registerPointer(&buffer);
-
-  if (writeBuffer_.getAvailable() < size - 4 ||
-          (int) size >= control -> TransportFlushBufferSize)
-  {
-    #ifdef DEBUG
-    *logofs << "handleFastWriteRequest: Using scratch buffer for OPCODE#"
-            << (unsigned int) opcode << " with size " << size << " and "
-            << writeBuffer_.getLength() << " bytes in buffer.\n"
-            << logofs_flush;
-    #endif
-
-    //
-    // The procedure moving data to shared memory
-    // assumes that the full message is stored in
-    // the scratch buffer. We can safely let the
-    // scratch buffer inherit the decode buffer
-    // at the next offset.
-    //
-
-    writeBuffer_.removeMessage(4);
-
-    buffer = writeBuffer_.addScratchMessage(((unsigned char *)
-                             decodeBuffer.decodeMemory(size - 4)) - 4, size);
-  }
-  else
-  {
-    writeBuffer_.addMessage(size - 4);
-
-    #ifndef __sun
-
-    if (size <= 32)
-    {
-      next = (unsigned int *) decodeBuffer.decodeMemory(size - 4);
-
-      for (unsigned int i = 4; i < size; i += sizeof(unsigned int))
-      {
-        *((unsigned int *) (buffer + i)) = *next++;
-      }
-    }
-    else
-    {
-      memcpy(buffer + 4, decodeBuffer.decodeMemory(size - 4), size - 4);
-    }
-
-    #else /* #ifndef __sun */
-
-    memcpy(buffer + 4, decodeBuffer.decodeMemory(size - 4), size - 4);
-
-    #endif /* #ifndef __sun */
-  }
-
-  //
-  // Opcode could have been tainted by the client
-  // proxy. Replace the original opcode with the
-  // one sent in the decode buffer.
-  //
-
-  *buffer = opcode;
-
-  writeBuffer_.unregisterPointer();
-
-  if (opcode == X_PutImage)
-  {
-    handleImage(opcode, buffer, size);
-  }
-
-  #if defined(TEST) || defined(OPCODES)
-
-  if (opcode != 0)
-  {
-    *logofs << "handleFastWriteRequest: Handled request "
-            << "OPCODE#" << (unsigned int) opcode << " ("
-            << DumpOpcode(opcode) << ") for FD#" << fd_
-            << " sequence " << clientSequence_ << ". "
-            << size << " bytes out.\n" << logofs_flush;
-  }
-  else
-  {
-    *logofs << "handleFastWriteRequest: Handled image or "
-            << "other request for FD#" << fd_
-            << " sequence " << clientSequence_ << ". "
-            << size << " bytes out.\n" << logofs_flush;
-  }
-
-  #endif
-
-  handleFlush(flush_if_needed);
-
-  return 1;
-}
-
-//
-// Use the simplest encoding except for replies that
-// need to be managed some way.
-//
-
-int ServerChannel::handleFastReadReply(EncodeBuffer &encodeBuffer, const unsigned char &opcode,
-                                           const unsigned char *&buffer, const unsigned int &size)
-{
-  //
-  // If we pushed a X_GetInputFocus in the sequence
-  // queue this means that the original message was
-  // a NX request for which we have to provide a NX
-  // reply.
-  //
-
-  if ((opcode >= X_NXFirstOpcode &&
-           opcode <= X_NXLastOpcode) ||
-               opcode == X_QueryExtension ||
-                   opcode == X_ListExtensions ||
-                       opcode == X_GetInputFocus)
-  {
-    return 0;
-  }
-
-  #ifdef DEBUG
-  *logofs << "handleFastReadReply: Encoding raw reply OPCODE#"
-          << (unsigned int) opcode << " for FD#" << fd_
-          << " with size " << size << ".\n"
-          << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeMemory(buffer, size);
-
-  //
-  // Send back the reply as soon
-  // as possible.
-  //
-
-  priority_++;
-
-  int bits = encodeBuffer.diffBits();
-
-  #if defined(TEST) || defined(OPCODES)
-  *logofs << "handleFastReadReply: Handled raw reply OPCODE#"
-          << (unsigned int) opcode << " for FD#" << fd_ << " sequence "
-          << serverSequence_ << ". " << size << " bytes in, "
-          << bits << " bits (" << ((float) bits) / 8
-          << " bytes) out.\n" << logofs_flush;
-  #endif
-
-  statistics -> addReplyBits(opcode, size << 3, bits);
-
-  return 1;
-}
-
-int ServerChannel::handleFastReadEvent(EncodeBuffer &encodeBuffer, const unsigned char &opcode,
-                                           const unsigned char *&buffer, const unsigned int &size)
-{
-  #ifdef DEBUG
-  *logofs << "handleFastReadEvent: Encoding raw "
-          << (opcode == X_Error ? "error" : "event") << " OPCODE#"
-          << (unsigned int) opcode << " for FD#" << fd_
-          << " with size " << size << ".\n"
-          << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeMemory(buffer, size);
-
-  switch (opcode)
-  {
-    case X_Error:
-    case ButtonPress:
-    case ButtonRelease:
-    case KeyPress:
-    case KeyRelease:
-    {
-      priority_++;
-    }
-  }
-
-  int bits = encodeBuffer.diffBits();
-
-  #if defined(TEST) || defined(OPCODES)
-
-  if (opcode == X_Error)
-  {
-    unsigned char code = *(buffer + 1);
-
-    *logofs << "handleFastReadEvent: Handled error ERR_CODE#"
-            << (unsigned int) code << " for FD#" << fd_;
-
-    *logofs << " RES_ID#" << GetULONG(buffer + 4, bigEndian_);
-
-    *logofs << " MIN_OP#" << GetUINT(buffer + 8, bigEndian_);
-
-    *logofs << " MAJ_OP#" << (unsigned int) *(buffer + 10);
-
-    *logofs << " sequence " << serverSequence_ << ". " << size
-            << " bytes in, " << bits << " bits (" << ((float) bits) / 8
-            << " bytes) out.\n" << logofs_flush;
-  }
-  else
-  {
-    *logofs << "handleFastReadEvent: Handled event OPCODE#"
-            << (unsigned int) *buffer << " for FD#" << fd_
-            << " sequence " << serverSequence_ << ". " << size
-            << " bytes in, " << bits << " bits (" << ((float) bits) / 8
-            << " bytes) out.\n" << logofs_flush;
-  }
-
-  #endif
-
-  statistics -> addEventBits(opcode, size << 3, bits);
-
-  return 1;
-}
-
-void ServerChannel::initCommitQueue()
-{
-  #ifdef TEST
-  *logofs << "initCommitQueue: Resetting the queue of split commits "
-          << "for FD#" << fd_ << ".\n" << logofs_flush;
-  #endif
-
-  for (int i = 0; i < MAX_COMMIT_SEQUENCE_QUEUE; i++)
-  {
-    commitSequenceQueue_[i] = 0;
-  }
-}
-
-void ServerChannel::updateCommitQueue(unsigned short sequence)
-{
-  for (int i = 0; i < MAX_COMMIT_SEQUENCE_QUEUE - 1; i++)
-  {
-    commitSequenceQueue_[i + 1] = commitSequenceQueue_[i];
-  }
-
-  #ifdef TEST
-  *logofs << "updateCommitQueue: Saved " << sequence
-          << " as last sequence number of image to commit.\n"
-          << logofs_flush;
-  #endif
-
-  commitSequenceQueue_[0] = sequence;
-}
-
-int ServerChannel::checkCommitError(unsigned char error, unsigned short sequence,
-                                        const unsigned char *buffer)
-{
-  //
-  // Check if error is due to an image commit
-  // generated at the end of a split.
-  //
-  // TODO: It should zero the head of the list
-  // when an event comes with a sequence number
-  // greater than the value of the last element
-  // added.
-  //
-
-  for (int i = 0; i < MAX_COMMIT_SEQUENCE_QUEUE &&
-           commitSequenceQueue_[i] != 0; i++)
-  {
-    #ifdef TEST
-    *logofs << "checkCommitError: Checking committed image's "
-            << "sequence number " << commitSequenceQueue_[i]
-            << " with input sequence " << sequence << ".\n"
-            << logofs_flush;
-    #endif
-
-    if (commitSequenceQueue_[i] == sequence)
-    {
-      #ifdef WARNING
-
-      *logofs << "checkCommitError: WARNING! Failed operation for "
-              << "FD#" << fd_ << " with ERR_CODE#"
-              << (unsigned int) *(buffer + 1);
-
-      *logofs << " RES_ID#" << GetULONG(buffer + 4, bigEndian_);
-
-      *logofs << " MIN_OP#" << GetUINT(buffer + 8, bigEndian_);
-
-      *logofs << " MAJ_OP#" << (unsigned int) *(buffer + 10);
-
-      *logofs << " sequence " << sequence << ".\n";
-
-      *logofs << logofs_flush;
-
-      #endif
-
-      cerr << "Warning" << ": Failed commit operation "
-           << "with ERR_CODE#" << (unsigned int) error;
-
-      cerr << " RES_ID#" << GetULONG(buffer + 4, bigEndian_);
-
-      cerr << " MIN_OP#" << GetUINT(buffer + 8, bigEndian_);
-
-      cerr << " MAJ_OP#" << (unsigned int) *(buffer + 10);
-
-      cerr << ".\n";
-
-      #ifdef WARNING
-      *logofs << "checkCommitError: WARNING! Suppressing error on "
-              << "OPCODE#" << (unsigned int) opcodeStore_ -> commitSplit
-              << " for FD#" << fd_ << " with sequence " << sequence
-              << " at position " << i << ".\n" << logofs_flush;
-      #endif
-
-      return 0;
-    }
-  }
-
-  return 0;
-}
-
-//
-// Check if the user pressed the CTRL+ALT+SHIFT+ESC
-// keystroke. At the present moment it uses different
-// keycodes based on the client OS. This  should be
-// implemented in a way that is platform independent
-// (that's not an easy task, considered that we don't
-// have access to the higher level X libraries).
-//
-
-int ServerChannel::checkKeyboardEvent(unsigned char event, unsigned short sequence,
-                                          const unsigned char *buffer)
-{
-  #ifdef TEST
-  *logofs << "checkKeyboardEvent: Checking escape sequence with byte [1] "
-          << (void *) ((unsigned) *(buffer + 1)) << " and bytes [28-29] "
-          << (void *) ((unsigned) GetUINT(buffer + 28, bigEndian_))
-          << " for FD#" << fd_ << ".\n" << logofs_flush;
-  #endif
-
-  #ifdef __APPLE__
-
-  int alert = (*(buffer + 1) == 0x3d &&
-                   GetUINT(buffer + 28, bigEndian_) == 0x2005);
-
-  #else
-
-  int alert = (*(buffer + 1) == 0x09 &&
-                   ((GetUINT(buffer + 28, bigEndian_) &
-                        0x0d) == 0x0d));
-
-  #endif
-
-  if (alert == 1)
-  {
-    #ifdef PANIC
-    *logofs << "checkKeyboardEvent: PANIC! Received sequence "
-            << "CTRL+ALT+SHIFT+ESC " << "for FD#"<< fd_
-            << ". Showing the abort dialog.\n" << logofs_flush;
-    #endif
-
-    cerr << "Warning" << ": Received sequence CTRL+ALT+SHIFT+ESC. "
-         << "Showing the abort dialog.\n";
-
-    HandleAlert(CLOSE_UNRESPONSIVE_X_SERVER_ALERT, 1);
-  }
-
-  return alert;
-}
-
-//
-// Handle the MIT-SHM initialization
-// messages exchanged with the remote
-// proxy. 
-//
-
-int ServerChannel::handleShmemReply(EncodeBuffer &encodeBuffer, const unsigned char opcode,
-                                        const unsigned int stage, const unsigned char *buffer,
-                                            const unsigned int size)
-{
-  #ifdef TEST
-  *logofs << "handleShmemReply: Returning shmem reply for "
-          << "stage " << stage << ".\n" << logofs_flush;
-  #endif
-
-  if (opcode == X_QueryExtension)
-  {
-    encodeBuffer.encodeValue(stage, 2);
-
-#ifndef ANDROID
-    shmemState_ -> present = *(buffer + 8);
-#else
-    shmemState_ -> present = 0;
-    cerr << "Info: handleShmemReply: In android no shared memory. Setting present to 0 hardcoded\n";
-#endif
-    shmemState_ -> opcode  = *(buffer + 9);
-    shmemState_ -> event   = *(buffer + 10);
-    shmemState_ -> error   = *(buffer + 11);
-
-    #ifdef TEST
-    *logofs << "handleShmemReply: Extension present is "
-            << shmemState_ -> present << " with base OPCODE#"
-            << (unsigned int) shmemState_ -> opcode << " base event "
-            << (unsigned int) shmemState_ -> event << " base error "
-            << (unsigned int) shmemState_ -> error << ".\n"
-            << logofs_flush;
-    #endif
-  }
-  else if (opcode == X_GetInputFocus)
-  {
-    encodeBuffer.encodeValue(stage, 2);
-
-    encodeBuffer.encodeBoolValue(0);
-
-    if (shmemState_ -> present == 1 &&
-            shmemState_ -> address != NULL &&
-                shmemState_ -> segment > 0 &&
-                    shmemState_ -> id > 0)
-    {
-      cerr << "Info" << ": Using shared memory parameters 1/"
-           << (shmemState_ -> size / 1024) << "K.\n";
-
-#ifndef ANDROID
-      shmemState_ -> enabled = 1;
-#else
-      cerr << "Info: handleShmemReply: In android no shared memory. Setting enabled to -1. This should not be displayed\n";
-      shmemState_ -> enabled = -1;
-#endif
-
-      encodeBuffer.encodeBoolValue(1);
-    }
-    else
-    {
-      #ifdef TEST
-      *logofs << "handleShmemReply: WARNING! Not using shared memory "
-              << "support in X server for FD#" << fd_ << ".\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Info" << ": Using shared memory parameters 0/0K.\n";
-
-      handleShmemStateRemove();
-
-      encodeBuffer.encodeBoolValue(0);
-    }
-  }
-  else
-  {
-    #ifdef PANIC
-    *logofs << "handleShmemReply: PANIC! Conversation error "
-            << "handling shared memory support for FD#"
-            << fd_ << ".\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Conversation error handling "
-         << "shared memory support.\n";
-
-    return -1;
-  }
-
-  return 1;
-}
-
-int ServerChannel::handleShmemRequest(DecodeBuffer &decodeBuffer, unsigned char &opcode,
-                                          unsigned char *&buffer, unsigned int &size)
-{
-  //
-  // We need to query and initialize MIT-SHM on
-  // the real X server. To do this we'll need 3
-  // requests. At the end we'll have to encode
-  // the final reply for the X client side.
-  //
-
-  handleShmemStateAlloc();
-
-  unsigned int stage;
-
-  decodeBuffer.decodeValue(stage, 2);
-
-  unsigned int expected = shmemState_ -> stage + 1;
-
-  if (stage != expected || stage > 2)
-  {
-    #ifdef PANIC
-    *logofs << "handleShmemRequest: PANIC! Unexpected stage "
-            << stage << " in handling shared memory "
-            << "support for FD#" << fd_ << ".\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Unexpected stage "
-         << stage << " in handling shared memory "
-         << "support for FD#" << fd_ << ".\n";
-
-    return -1;
-  }
-
-  switch (stage)
-  {
-    case 0:
-    {
-      unsigned int enableClient;
-      unsigned int enableServer;
-
-      decodeBuffer.decodeBoolValue(enableClient);
-      decodeBuffer.decodeBoolValue(enableServer);
-
-      unsigned int clientSegment;
-      unsigned int serverSegment;
-
-      decodeBuffer.decodeValue(clientSegment, 29, 9);
-      decodeBuffer.decodeValue(serverSegment, 29, 9);
-
-      shmemState_ -> segment = serverSegment;
-
-      #ifdef TEST
-      *logofs << "handleShmemRequest: Size of the shared memory "
-              << "segment will be " << control -> ShmemServerSize
-              << ".\n" << logofs_flush;
-      #endif
-
-      #ifdef TEST
-      *logofs << "handleShmemRequest: Sending X_QueryExtension request "
-              << "for FD#" << fd_ << " due to OPCODE#" << (unsigned int)
-                 opcodeStore_ -> getShmemParameters << " in stage "
-              << stage << ".\n" << logofs_flush;
-      #endif
-
-      opcode = X_QueryExtension;
-
-      size   = 16;
-      buffer = writeBuffer_.addMessage(size);
-
-      PutUINT(7, buffer + 4, bigEndian_);
-
-      //
-      // Simply make the query fail if shared
-      // memory support is disabled by the
-      // user.
-      //
-#ifndef ANDROID
-      if (control -> ShmemServer == 1 &&
-              control -> ShmemServerSize > 0 &&
-                  enableServer == 1)
-      {
-        memcpy(buffer + 8, "MIT-SHM", 7);
-      }
-      else
-      {
-        memcpy(buffer + 8, "NO-MIT-", 7);
-      }
-#else
-      cerr << "Info: handleShmemRequest: In android no shared memory. Returning NO-MIT- answer\n";
-
-        memcpy(buffer + 8, "NO-MIT-", 7);
-#endif
-     sequenceQueue_.push(clientSequence_, opcode,
-                              opcodeStore_ -> getShmemParameters, stage);
-
-      //
-      // Save the sequence number so we can
-      // later identify any matching X error
-      // received from server.
-      //
-
-      shmemState_ -> sequence = clientSequence_;
-
-      break;
-    }
-    case 1:
-    {
-      if (shmemState_ -> present == 1)
-      {
-        //
-        // Make the segment read-write for everybody on
-        // Cygwin (to avoid any lack of support or any
-        // performance issue) and on MacOS/X (where the
-        // 0600 mask doesn't seem to work).
-        //
-
-        #if defined(__CYGWIN32__) || defined(__APPLE__)
-
-        int permissions = 0777;
-
-        #else
-
-        int permissions = 0600;
-
-        #endif
-
-        shmemState_ -> size = control -> ShmemServerSize;
-
-#ifndef ANDROID
-        shmemState_ -> id = shmget(IPC_PRIVATE, shmemState_ -> size,
-                                       IPC_CREAT | permissions);
-#else
-	cerr << "Info: handleShmemReqyest: In android no shared memory (shmget). This message should not be displayed present should never be 1 in android\n";
-	shmemState_ -> id = -1;
-#endif
-        if (shmemState_ -> id >= 0)
-        {
-          #if defined(TEST) || defined(INFO)
-          *logofs << "handleShmemRequest: Allocated shared memory "
-                  << "segment of " << shmemState_ -> size
-                  << " bytes with id " << shmemState_ -> id
-                  << ".\n" << logofs_flush;
-          #endif
-
-
-#ifndef ANDROID
-          shmemState_ -> address = shmat(shmemState_ -> id, 0, 0);
-#else
-	  cerr << "Info: handleShmemReqyest: In android no shared memory (shmat). This message should not be displayed. present should never be 1 in android\n";
-	  shmemState_ -> address = NULL;
-#endif
-          if (shmemState_ -> address != NULL)
-          {
-            #ifdef TEST
-            *logofs << "handleShmemRequest: Sending X_ShmAttach request "
-                    << "for FD#" << fd_ << " due to OPCODE#" << (unsigned int)
-                       opcodeStore_ -> getShmemParameters << " in stage "
-                    << stage << ".\n" << logofs_flush;
-            #endif
-
-            opcode = shmemState_ -> opcode;
-
-            size   = 16;
-            buffer = writeBuffer_.addMessage(size);
-
-            *(buffer + 1) = X_ShmAttach;
-
-            PutULONG(shmemState_ -> segment, buffer + 4, bigEndian_);
-            PutULONG(shmemState_ -> id, buffer + 8, bigEndian_);
-
-            *(buffer + 12) = 1;
-
-            shmemState_ -> sequence = clientSequence_;
-
-            break;
-          }
-          else
-          {
-            #ifdef WARNING
-            *logofs << "handleShmemRequest: WARNING! Can't attach the shared "
-                    << "memory segment. Error is " << EGET() << " '"
-                    << ESTR() << "'.\n" << logofs_flush;
-            #endif
-
-            cerr << "Warning" << ": Can't attach the shared memory "
-                 << "segment. Error is " << EGET() << " '"
-                 << ESTR() << "'.\n";
-          }
-        }
-        else
-        {
-          #ifndef __CYGWIN32__
-
-          #ifdef WARNING
-          *logofs << "handleShmemRequest: WARNING! Can't create the shared "
-                  << "memory segment. Error is " << EGET() << " '"
-                  << ESTR() << "'.\n" << logofs_flush;
-          #endif
-
-          cerr << "Warning" << ": Can't create the shared memory "
-               << "segment. Error is " << EGET() << " '"
-               << ESTR() << "'.\n";
-
-          #else
-
-          #ifdef TEST
-          *logofs << "handleShmemRequest: WARNING! Can't create the shared "
-                  << "memory segment. Error is " << EGET() << " '"
-                  << ESTR() << "'.\n" << logofs_flush;
-          #endif
-
-          #endif
-        }
-      }
-
-      if (shmemState_ -> present != 0)
-      {
-        #ifdef TEST
-        *logofs << "handleShmemRequest: Resetting shared memory "
-                << "presence flag for FD#" << fd_ << ".\n"
-                << logofs_flush;
-        #endif
-
-        shmemState_ -> present = 0;
-      }
-
-      handleNullRequest(opcode, buffer, size);
-
-      break;
-    }
-    default:
-    {
-      #ifdef TEST
-      *logofs << "handleShmemRequest: Sending X_GetInputFocus request "
-              << "for FD#" << fd_ << " due to OPCODE#" << (unsigned int)
-                 opcodeStore_ -> getShmemParameters << " in stage "
-              << stage << ".\n" << logofs_flush;
-      #endif
-
-      opcode = X_GetInputFocus;
-
-      size   = 4;
-      buffer = writeBuffer_.addMessage(size);
-
-      sequenceQueue_.push(clientSequence_, opcode,
-                              opcodeStore_ -> getShmemParameters, stage);
-      break;
-    }
-  }
-
-  shmemState_ -> stage += 1;
-
-  return 1;
-}
-
-//
-// Handling of MIT-SHM extension has been plugged late in
-// the design, so we have to make some assumptions. Image
-// is a X_PutImage request contained either in the scratch
-// buffer or in the normal write buffer. We need to move
-// the image data to the shared memory segment and replace
-// the X_PutImage request with a X_ShmPutImage.
-//
-
-int ServerChannel::handleShmem(unsigned char &opcode, unsigned char *&buffer,
-                                   unsigned int &size)
-{
-  if (shmemState_ == NULL || shmemState_ -> enabled != 1)
-  {
-    #ifdef TEST
-
-    if (shmemState_ != NULL)
-    {
-      *logofs << "handleShmem: PANIC! Shared memory "
-              << "state found but support is not enabled "
-              << "for FD#" << fd_ << " in stage "
-              << shmemState_ -> stage << ".\n"
-              << logofs_flush;
-    }
-
-    #endif
-
-    return 0;
-  }
-#ifdef ANDROID
-  cerr << "Info: handleShmem: In android no shared memory.  enabled should never be 1. This should not be displayed\n";
-  return 0;
-#endif
-
-  //
-  // Ignore null requests and requests that will not result
-  // in a single X_PutImage. To conform with the other func-
-  // tions, we get the opcode passed as a parameter. It can
-  // be zero if we don't want the write loop to put opcode
-  // and length in the resulting buffer. Anyway we are only
-  // interested in the original opcode of the request, that
-  // is stored in the image state.
-  //
-
-  unsigned char *dstData    = buffer + 24;
-  unsigned int  dstDataSize = size   - 24;
-
-  if (dstDataSize == 0 || dstDataSize >
-          (unsigned int) control -> MaximumRequestSize)
-  {
-    #ifdef TEST
-    *logofs << "handleShmem: Ignoring image with opcode "
-            << (unsigned int) imageState_ -> opcode
-            << " and size " << size << " for FD#" << fd_
-            << ".\n" << logofs_flush;
-    #endif
-
-    return 0;
-  }
-
-  #ifdef TEST
-  *logofs << "handleShmem: Handling image with opcode "
-          << (unsigned int) imageState_ -> opcode
-          << " and size " << size << " for FD#" << fd_
-          << ".\n" << logofs_flush;
-  #endif
-
-  //
-  // Get image data from buffer.
-  //
-
-  if (imageState_ -> opcode == X_PutImage)
-  {
-    //
-    // We still need to get the image's data.
-    //
-
-    imageState_ -> format    = *(buffer + 1);
-
-    imageState_ -> drawable  = GetULONG(buffer + 4,  bigEndian_);
-    imageState_ -> gcontext  = GetULONG(buffer + 8,  bigEndian_);
-
-    imageState_ -> dstWidth  = GetUINT(buffer + 12, bigEndian_);
-    imageState_ -> dstHeight = GetUINT(buffer + 14, bigEndian_);
-
-    imageState_ -> srcX      = 0;
-    imageState_ -> srcY      = 0;
-
-    imageState_ -> srcWidth  = imageState_ -> dstWidth;
-    imageState_ -> srcHeight = imageState_ -> dstHeight;
-
-    imageState_ -> dstX      = GetUINT(buffer + 16, bigEndian_);
-    imageState_ -> dstY      = GetUINT(buffer + 18, bigEndian_);
-
-    imageState_ -> leftPad   = *(buffer + 20);
-    imageState_ -> dstDepth  = *(buffer + 21);
-
-    imageState_ -> dstLines  = imageState_ -> dstHeight;
-
-    imageState_ -> dstLength = size - 24;
-  }
-
-  //
-  // Skip the MIT-SHM operation if the image
-  // is 1 bits-per-plane.
-  //
-
-  if (imageState_ -> dstDepth == 1)
-  {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "handleShmem: Ignoring image with opcode "
-            << (unsigned int) imageState_ -> opcode << " depth "
-            << (unsigned int) imageState_ -> dstDepth << " and "
-            << "size " << size << " for FD#" << fd_
-            << ".\n" << logofs_flush;
-    #endif
-
-    return 0;
-  }
-
-  //
-  // If the image can't fit in the available
-  // space, check if the completion event is
-  // arrived.
-  //
-
-  #if defined(TEST) || defined(INFO)
-
-  if (isTimestamp(shmemState_ -> last) == 0 &&
-          shmemState_ -> offset != 0)
-  {
-    *logofs << "handleShmem: PANIC! No timestamp for sequence "
-            << shmemState_ -> sequence << " with offset "
-            << shmemState_ -> offset << ".\n"
-            << logofs_flush;
-  }
-
-  #endif
-
-  if (shmemState_ -> offset + imageState_ -> dstLength >
-          shmemState_ -> size)
-  {
-    if (imageState_ -> dstLength > shmemState_ -> size)
-    {
-      #if defined(TEST) || defined(INFO)
-      *logofs << "handleShmem: WARNING! Can't fit the image "
-              << "in the available memory segment for FD#"
-              << fd_ << ".\n" << logofs_flush;
-      #endif
-
-      return 0;
-    }
-    else if (handleShmemEvent() <= 0)
-    {
-      #if defined(TEST) || defined(INFO)
-      *logofs << "handleShmem: WARNING! Missing completion "
-              << "after " << diffTimestamp(shmemState_ -> last,
-                 getTimestamp()) << " Ms for shared memory "
-              << "for FD#" << fd_ << ".\n" << logofs_flush;
-      #endif
-
-      return 0;
-    }
-  }
-
-  //
-  // Let image start at current offset
-  // in the shared segment.
-  //
-
-  #ifdef TEST
-  *logofs << "handleShmem: Copying " << dstDataSize
-          << " bytes to shared memory at offset "
-          << shmemState_ -> offset << " for FD#"
-          << fd_ << ".\n" << logofs_flush;
-  #endif
-
-  memcpy((unsigned char *) shmemState_ -> address +
-             shmemState_ -> offset, dstData, dstDataSize);
-
-  //
-  // Get rid of the original X_PutImage
-  // request.
-  //
-
-  if (writeBuffer_.getScratchData() != NULL)
-  {
-    writeBuffer_.removeScratchMessage();
-  }
-  else
-  {
-    writeBuffer_.removeMessage(size);
-  }
-
-  //
-  // Add a X_ShmPutImage request to the
-  // write buffer.
-  //
-
-  buffer = writeBuffer_.addMessage(40);
-
-  *buffer = shmemState_ -> opcode;
-
-  *(buffer + 1) = X_ShmPutImage;
-
-  PutUINT(40 >> 2, buffer + 2, bigEndian_);
-
-  PutULONG(imageState_ -> drawable, buffer + 4,  bigEndian_);
-  PutULONG(imageState_ -> gcontext, buffer + 8,  bigEndian_);
-
-  PutUINT(imageState_ -> dstWidth, buffer + 12, bigEndian_);
-  PutUINT(imageState_ -> dstLines, buffer + 14, bigEndian_);
-
-  PutUINT(imageState_ -> srcX, buffer + 16, bigEndian_);
-  PutUINT(imageState_ -> srcY, buffer + 18, bigEndian_);
-
-  PutUINT(imageState_ -> dstWidth,  buffer + 20, bigEndian_);
-  PutUINT(imageState_ -> dstLines,  buffer + 22, bigEndian_);
-
-  PutUINT(imageState_ -> dstX, buffer + 24, bigEndian_);
-  PutUINT(imageState_ -> dstY, buffer + 26, bigEndian_);
-
-  *(buffer + 28) = imageState_ -> dstDepth;
-  *(buffer + 29) = imageState_ -> format;
-  *(buffer + 30) = 1;
-
-  PutULONG(shmemState_ -> segment, buffer + 32, bigEndian_);
-  PutULONG(shmemState_ -> offset,  buffer + 36, bigEndian_);
-
-  shmemState_ -> offset += dstDataSize;
-
-  shmemState_ -> sequence = clientSequence_;
-  shmemState_ -> last     = getTimestamp();
-
-  #ifdef TEST
-  *logofs << "handleShmem: Saved shared memory sequence "
-          << shmemState_ -> sequence << " for FD#" << fd_
-          << " with offset " << shmemState_ -> offset
-          << " at " << strMsTimestamp() << ".\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // Make the X server read immediately
-  // from the shared memory buffer and
-  // produce the completion event.
-  //
-
-  handleFlush(flush_if_any);
-
-  return 1;
-}
-
-//
-// Try to read more events from the socket in the
-// attempt to get the completion event required
-// to reset the MIT-SHM segment.
-//
-
-int ServerChannel::handleShmemEvent()
-{
-  #if defined(TEST) || defined(INFO)
-  *logofs << "handleShmemEvent: Waiting for shared memory "
-          << "sequence " << shmemState_ -> sequence
-          << " for X server FD#" << fd_ << ".\n"
-          << logofs_flush;
-
-  T_timestamp startTs = getTimestamp();
-
-  #endif
-
-  while (isTimestamp(shmemState_ -> last) != 0)
-  {
-    if (handleWait(control -> ShmemTimeout) <= 0)
-    {
-      break;
-    }
-    #if defined(TEST) || defined(INFO)
-    else
-    {
-      *logofs << "handleShmemEvent: WARNING! Encoded events "
-              << "for FD#" << fd_ << " at " << strMsTimestamp()
-              << ".\n" << logofs_flush;
-    }
-    #endif
-  }
-
-  if (isTimestamp(shmemState_ -> last) == 0)
-  {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "handleShmemEvent: Spent "
-            << diffTimestamp(startTs, getTimestamp()) << " Ms "
-            << "waiting for shared memory sequence for FD#"
-            << fd_ << ".\n" << logofs_flush;
-    #endif
-
-    return 1;
-  }
-
-  #if defined(TEST) || defined(INFO)
-  *logofs << "handleShmemEvent: WARNING! Can't reset shared "
-          << "memory sequence for FD#" << fd_ << " after "
-          << diffTimestamp(shmemState_ -> last, getTimestamp())
-          << " Ms.\n" << logofs_flush;
-  #endif
-
-  return 0;
-}
-
-int ServerChannel::checkShmemEvent(unsigned char event, unsigned short sequence,
-                                       const unsigned char *buffer)
-{
-  if (isTimestamp(shmemState_ -> last) == 1 &&
-          sequence == shmemState_ -> sequence)
-  {
-    #ifdef TEST
-    *logofs << "checkShmemEvent: Reset shared memory sequence "
-            << shmemState_ -> sequence << " for FD#" << fd_
-            << " after " << diffTimestamp(shmemState_ -> last,
-               getTimestamp()) << " Ms.\n" << logofs_flush;
-    #endif
-
-    shmemState_ -> sequence = 0;
-    shmemState_ -> offset   = 0;
-    shmemState_ -> last     = nullTimestamp();
-  }
-  #ifdef TEST
-  else
-  {
-    *logofs << "checkShmemEvent: Skipping past shared memory "
-            << "image sequence " << sequence << " for FD#"
-            << fd_ << ".\n" << logofs_flush;
-  }
-  #endif
-
-  return 1;
-}
-
-int ServerChannel::checkShmemError(unsigned char error, unsigned short sequence,
-                                       const unsigned char *buffer)
-{
-  #ifdef TEST
-
-  *logofs << "checkShmemError: WARNING! Failed operation for "
-          << "FD#" << fd_ << " in stage " << shmemState_ -> stage
-          << " with ERR_CODE#" << (unsigned int) *(buffer + 1);
-
-  *logofs << " RES_ID#" << GetULONG(buffer + 4, bigEndian_);
-
-  *logofs << " MIN_OP#" << GetUINT(buffer + 8, bigEndian_);
-
-  *logofs << " MAJ_OP#" << (unsigned int) *(buffer + 10);
-
-  *logofs << " sequence " << sequence << ".\n";
-
-  *logofs << logofs_flush;
-
-  #endif
-
-  //
-  // If enabled flag is <= 0 we are still
-  // in the inizialization phase. In this
-  // case force presence to false.
-  //
-
-  if (shmemState_ -> enabled != 1)
-  {
-    if (shmemState_ -> present != 0)
-    {
-      #ifdef TEST
-      *logofs << "checkShmemError: Resetting shared memory "
-              << "presence flag for FD#" << fd_ << ".\n"
-              << logofs_flush;
-      #endif
-
-      shmemState_ -> present = 0;
-    }
-
-    return 0;
-  }
-
-  if (shmemState_ -> sequence == sequence)
-  {
-    //
-    // Reset the sequence and timestamp.
-    //
-
-    shmemState_ -> sequence = 0;
-    shmemState_ -> offset   = 0;
-    shmemState_ -> last     = nullTimestamp();
-  }
-
-  return 1;
-}
-
-int ServerChannel::handleFontRequest(DecodeBuffer &decodeBuffer, unsigned char &opcode,
-                                         unsigned char *&buffer, unsigned int &size)
-{
-  //
-  // Send a synchronization request and use
-  // the reply to return the requested font
-  // path.
-  //
-
-  #ifdef TEST
-  *logofs << "handleFontRequest: Sending X_GetInputFocus request "
-          << "for FD#" << fd_ << " due to OPCODE#" << (unsigned int)
-             opcodeStore_ -> getFontParameters << ".\n"
-          << logofs_flush;
-  #endif
-
-  opcode = X_GetInputFocus;
-
-  size   = 4;
-  buffer = writeBuffer_.addMessage(size);
-
-  sequenceQueue_.push(clientSequence_, X_GetInputFocus,
-                          opcodeStore_ -> getFontParameters);
-
-  return 1;
-}
-
-int ServerChannel::handleFontReply(EncodeBuffer &encodeBuffer, const unsigned char opcode,
-                                       const unsigned char *buffer, const unsigned int size)
-{
-  #ifdef TEST
-  *logofs << "handleFontReply: Encoding font operation "
-          << "reply with size " << size << ".\n"
-          << logofs_flush;
-  #endif
-
-  char data[256];
-
-  if (fontPort_ != -1)
-  {
-    sprintf(data + 1, "tcp/localhost:%d", fontPort_);
-  }
-  else
-  {
-    *(data + 1) = '\0';
-  }
-
-  *data = strlen(data + 1);
-
-  unsigned char *next = (unsigned char *) data;
-
-  unsigned int length = (unsigned int) (*next++);
-
-  encodeBuffer.encodeValue(length, 8);
-
-  encodeBuffer.encodeTextData(next, length);
-
-  return 1;
-}
-
-int ServerChannel::handleCacheRequest(DecodeBuffer &decodeBuffer, unsigned char &opcode,
-                                          unsigned char *&buffer, unsigned int &size)
-{
-  unsigned int mask;
-
-  decodeBuffer.decodeCachedValue(mask, 32, clientCache_ ->
-                     setCacheParametersCache);
-
-  splitState_.save = (mask >> 8) & 0xff;
-  splitState_.load = mask & 0xff;
-
-  #ifdef TEST
-  *logofs << "handleCacheRequest: Set cache parameters to "
-          << "save " << splitState_.save << " load "
-          << splitState_.load << ".\n" << logofs_flush;
-  #endif
-
-  handleNullRequest(opcode, buffer, size);
-
-  return 1;
-}
-
-int ServerChannel::handleStartSplitRequest(DecodeBuffer &decodeBuffer, unsigned char &opcode,
-                                               unsigned char *&buffer, unsigned int &size)
-{
-  //
-  // Prepare for the split for the selected
-  // resource. Old proxy versions only used
-  // the split store at position 0.
-  //
-
-  // Since ProtoStep7 (#issue 108)
-  unsigned char resource;
-
-  decodeBuffer.decodeCachedValue(resource, 8,
-                     clientCache_ -> resourceCache);
-
-  splitState_.resource = resource;
-
-  splitState_.current = splitState_.resource;
-
-  #if defined(TEST) || defined(SPLIT)
-  *logofs << "handleStartSplitRequest: SPLIT! Registered id "
-          << splitState_.resource << " as resource "
-          << "waiting for a split.\n" << logofs_flush;
-  #endif
-
-  handleNullRequest(opcode, buffer, size);
-
-  return 1;
-}
-
-int ServerChannel::handleEndSplitRequest(DecodeBuffer &decodeBuffer, unsigned char &opcode,
-                                             unsigned char *&buffer, unsigned int &size)
-{
-  //
-  // Verify that the agent resource matches.
-  //
-
-  // Since ProtoStep7 (#issue 108)
-  unsigned char resource;
-
-  decodeBuffer.decodeCachedValue(resource, 8,
-                     clientCache_ -> resourceCache);
-
-  #ifdef TEST
-
-  if (splitState_.resource == nothing)
-  {
-    #ifdef PANIC
-    *logofs << "handleEndSplitRequest: PANIC! SPLIT! Received an end of "
-            << "split for resource id " << (unsigned int) *(buffer + 1)
-            << " without a previous start.\n"
-            << logofs_flush;
-    #endif
-
-    HandleCleanup();
-  }
-  else if (resource != splitState_.resource)
-  {
-    #ifdef PANIC
-    *logofs << "handleEndSplitRequest: PANIC! SPLIT! Invalid resource id "
-            << resource << " received while waiting for resource id "
-            << splitState_.resource << ".\n" << logofs_flush;
-    #endif
-
-    HandleCleanup();
-  }
-
-  #endif
-
-  #if defined(TEST) || defined(SPLIT)
-  *logofs << "handleEndSplitRequest: SPLIT! Reset id "
-          << splitState_.resource << " as resource "
-          << "selected for splits.\n" << logofs_flush;
-  #endif
-
-  splitState_.resource = nothing;
-
-  handleNullRequest(opcode, buffer, size);
-
-  return 1;
-}
-
-int ServerChannel::handleSplitChecksum(DecodeBuffer &decodeBuffer, T_checksum &checksum)
-{
-  unsigned int receive;
-
-  // Since ProtoStep7 (#issue 108)
-  decodeBuffer.decodeBoolValue(receive);
-
-  if (receive == 1)
-  {
-    checksum = new md5_byte_t[MD5_LENGTH];
-
-    for (unsigned int i = 0; i < MD5_LENGTH; i++)
-    {
-      decodeBuffer.decodeValue(receive, 8);
-
-      if (checksum != NULL)
-      {
-        checksum[i] = (unsigned char) receive;
-      }
-    }
-
-    #if defined(TEST) || defined(SPLIT)
-    *logofs << "handleSplitChecksum: SPLIT! Received checksum "
-            <<  "[" << DumpChecksum(checksum) << "].\n"
-            << logofs_flush;
-    #endif
-
-    return 1;
-  }
-
-  return 0;
-}
-
-void ServerChannel::handleShmemStateAlloc()
-{
-  if (shmemState_ == NULL)
-  {
-    shmemState_ = new T_shmem_state();
-
-    shmemState_ -> stage   = -1;
-    shmemState_ -> present = -1;
-    shmemState_ -> enabled = -1;
-
-    shmemState_ -> segment = -1;
-    shmemState_ -> id      = -1;
-    shmemState_ -> address = NULL;
-    shmemState_ -> size    = 0;
-
-    shmemState_ -> opcode = 0xff;
-    shmemState_ -> event  = 0xff;
-    shmemState_ -> error  = 0xff;
-
-    shmemState_ -> sequence = 0;
-    shmemState_ -> offset   = 0;
-    shmemState_ -> last     = nullTimestamp();
-
-    shmemState_ -> checked  = 0;
-  }
-}
-
-void ServerChannel::handleShmemStateRemove()
-{
-  if (shmemState_ != NULL)
-  {
-   if (shmemState_ -> address != NULL)
-    {
-#ifndef ANDROID
-       shmdt((char *) shmemState_ -> address);
-#else
-    cerr << "Info: handleShmemStateRemove: In android no shared memory. This should not be displayed. address should always be NULL\n";
-#endif
-    }
-
-    if (shmemState_ -> id > 0)
-    {
-#ifndef ANDROID
-      shmctl(shmemState_ -> id, IPC_RMID, 0);
-#else
-      cerr << "Info: handleShmemStateRemove: In android no shared memory. This should not be displayed. id should always be 0\n";
-#endif
-    }
-
-    delete shmemState_;
-
-    shmemState_ = NULL;
-  }
-}
-
-void ServerChannel::handleUnpackStateInit(int resource)
-{
-  if (unpackState_[resource] == NULL)
-  {
-    unpackState_[resource] = new T_unpack_state();
-
-    if (unpackState_[resource] == NULL)
-    {
-      #ifdef PANIC
-      *logofs << "handleUnpackStateInit: PANIC! Can't allocate "
-              << "memory for unpack state in context [A].\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Can't allocate memory for "
-           << "unpack state in context [A].\n";
-
-      HandleAbort();
-    }
-
-    unpackState_[resource] -> geometry = NULL;
-    unpackState_[resource] -> colormap = NULL;
-    unpackState_[resource] -> alpha    = NULL;
-  }
-}
-
-void ServerChannel::handleUnpackAllocGeometry(int resource)
-{
-  if (unpackState_[resource] -> geometry == NULL)
-  {
-    unpackState_[resource] -> geometry = new T_geometry();
-
-    if (unpackState_[resource] -> geometry == NULL)
-    {
-      #ifdef PANIC
-      *logofs << "handleUnpackAllocGeometry: PANIC! Can't allocate "
-              << "memory for unpack state in context [B].\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Can't allocate memory for "
-           << "unpack state in context [B].\n";
-
-      HandleAbort();
-    }
-
-    unpackState_[resource] -> geometry -> depth1_bpp  = 4;
-    unpackState_[resource] -> geometry -> depth4_bpp  = 4;
-    unpackState_[resource] -> geometry -> depth8_bpp  = 8;
-    unpackState_[resource] -> geometry -> depth16_bpp = 16;
-    unpackState_[resource] -> geometry -> depth24_bpp = 32;
-    unpackState_[resource] -> geometry -> depth32_bpp = 32;
-
-    unpackState_[resource] -> geometry -> red_mask   = 0xff0000;
-    unpackState_[resource] -> geometry -> green_mask = 0x00ff00;
-    unpackState_[resource] -> geometry -> blue_mask  = 0x0000ff;
-
-    unpackState_[resource] -> geometry -> image_byte_order = imageByteOrder_;
-    unpackState_[resource] -> geometry -> bitmap_bit_order = bitmapBitOrder_;
-    unpackState_[resource] -> geometry -> scanline_unit    = scanlineUnit_;
-    unpackState_[resource] -> geometry -> scanline_pad     = scanlinePad_;
-  }
-}
-
-void ServerChannel::handleUnpackAllocColormap(int resource)
-{
-  if (unpackState_[resource] -> colormap == NULL)
-  {
-    unpackState_[resource] -> colormap = new T_colormap();
-
-    if (unpackState_[resource] -> colormap == NULL)
-    {
-      #ifdef PANIC
-      *logofs << "handleUnpackAllocColormap: PANIC! Can't allocate "
-              << "memory for unpack state in context [C].\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Can't allocate memory for "
-           << "unpack state in context [C].\n";
-
-      HandleAbort();
-    }
-
-    unpackState_[resource] -> colormap -> entries = 0;
-    unpackState_[resource] -> colormap -> data    = NULL;
-  }
-}
-
-void ServerChannel::handleUnpackAllocAlpha(int resource)
-{
-  if (unpackState_[resource] -> alpha == NULL)
-  {
-    unpackState_[resource] -> alpha = new T_alpha();
-
-    if (unpackState_[resource] -> alpha == NULL)
-    {
-      #ifdef PANIC
-      *logofs << "handleUnpackAllocAlpha: PANIC! Can't allocate "
-              << "memory for unpack state in context [D].\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Can't allocate memory for "
-           << "unpack state in context [D].\n";
-
-      HandleAbort();
-    }
-
-    unpackState_[resource] -> alpha -> entries = 0;
-    unpackState_[resource] -> alpha -> data    = NULL;
-  }
-}
-
-void ServerChannel::handleUnpackStateRemove(int resource)
-{
-  if (unpackState_[resource] != NULL)
-  {
-    delete unpackState_[resource] -> geometry;
-
-    if (unpackState_[resource] -> colormap != NULL)
-    {
-      delete [] unpackState_[resource] -> colormap -> data;
-    }
-
-    delete unpackState_[resource] -> colormap;
-
-    if (unpackState_[resource] -> alpha != NULL)
-    {
-      delete [] unpackState_[resource] -> alpha -> data;
-    }
-
-    delete unpackState_[resource] -> alpha;
-
-    delete unpackState_[resource];
-
-    unpackState_[resource] = NULL;
-  }
-}
-
-void ServerChannel::handleEncodeCharInfo(const unsigned char *nextSrc, EncodeBuffer &encodeBuffer)
-{
-  unsigned int value = GetUINT(nextSrc, bigEndian_) |
-                           (GetUINT(nextSrc + 10, bigEndian_) << 16);
-
-  encodeBuffer.encodeCachedValue(value, 32,
-                     *serverCache_ -> queryFontCharInfoCache[0], 6);
-
-  nextSrc += 2;
-
-  for (unsigned int i = 1; i < 5; i++)
-  {
-    unsigned int value = GetUINT(nextSrc, bigEndian_);
-
-    nextSrc += 2;
-
-    encodeBuffer.encodeCachedValue(value, 16,
-                       *serverCache_ -> queryFontCharInfoCache[i], 6);
-  }
-}
-
-int ServerChannel::setBigEndian(int flag)
-{
-  bigEndian_ = flag;
-
-  readBuffer_.setBigEndian(flag);
-
-  return 1;
-}
-
-int ServerChannel::setReferences()
-{
-  #ifdef TEST
-  *logofs << "ServerChannel: Initializing the static "
-          << "members for the server channels.\n"
-          << logofs_flush;
-  #endif
-
-  #ifdef REFERENCES
-
-  references_ = 0;
-
-  #endif
-
-  return 1;
-}
diff --git a/nxcomp/ServerChannel.h b/nxcomp/ServerChannel.h
deleted file mode 100644
index 374e52896..000000000
--- a/nxcomp/ServerChannel.h
+++ /dev/null
@@ -1,529 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef ServerChannel_H
-#define ServerChannel_H
-
-#include "List.h"
-#include "Channel.h"
-
-#include "SequenceQueue.h"
-
-#include "ServerReadBuffer.h"
-
-#include "Unpack.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-//
-// How many sequence numbers of split commit
-// requests we are going to save in order to
-// mask errors.
-//
-
-#define MAX_COMMIT_SEQUENCE_QUEUE         16
-
-//
-// Define this to know when a channel
-// is created or destroyed.
-//
-
-#undef  REFERENCES
-
-//
-// This class implements the X server
-// side compression of X protocol.
-//
-
-class ServerChannel : public Channel
-{
-  public:
-
-  ServerChannel(Transport *transport, StaticCompressor *compressor);
-
-  virtual ~ServerChannel();
-
-  virtual int handleRead(EncodeBuffer &encodeBuffer, const unsigned char *message,
-                             unsigned int length);
-
-  virtual int handleWrite(const unsigned char *message, unsigned int length);
-
-  virtual int handleSplit(EncodeBuffer &encodeBuffer, MessageStore *store,
-                              T_store_action action, int position, const unsigned char opcode,
-                                  const unsigned char *buffer, const unsigned int size)
-  {
-    return 0;
-  }
-
-  virtual int handleSplit(DecodeBuffer &decodeBuffer, MessageStore *store,
-                                T_store_action action, int position, unsigned char &opcode,
-                                    unsigned char *&buffer, unsigned int &size);
-
-  virtual int handleSplit(EncodeBuffer &encodeBuffer)
-  {
-    return 0;
-  }
-
-  virtual int handleSplit(DecodeBuffer &decodeBuffer);
-
-  virtual int handleSplitEvent(EncodeBuffer &encodeBuffer, Split *split);
-
-  virtual int handleSplitEvent(DecodeBuffer &decodeBuffer)
-  {
-    return 0;
-  }
-
-  //
-  // Send the last motion notify event
-  // received from the X server to the
-  // remote proxy.
-  //
-
-  virtual int handleMotion(EncodeBuffer &encodeBuffer);
-
-  virtual int handleCompletion(EncodeBuffer &encodeBuffer)
-  {
-    return 0;
-  }
-
-  virtual int handleConfiguration();
-
-  virtual int handleFinish();
-
-  virtual int handleAsyncEvents();
-
-  virtual int needSplit() const
-  {
-    return 0;
-  }
-
-  virtual int needMotion() const
-  {
-    return (lastMotion_[0] != '\0');
-  }
-
-  virtual T_channel_type getType() const
-  {
-    return channel_x11;
-  }
-
-  int setBigEndian(int flag);
-
-  //
-  // Initialize the static members.
-  //
-
-  static int setReferences();
-
-  private:
-
-  int handleFastReadReply(EncodeBuffer &encodeBuffer, const unsigned char &opcode,
-                              const unsigned char *&buffer, const unsigned int &size);
-
-  int handleFastReadEvent(EncodeBuffer &encodeBuffer, const unsigned char &opcode,
-                              const unsigned char *&buffer, const unsigned int &size);
-
-  int handleFastWriteRequest(DecodeBuffer &decodeBuffer, unsigned char &opcode,
-                                 unsigned char *&buffer, unsigned int &size);
-
-  //
-  // Handle the fake authorization cookie
-  // and the X server's reply.
-  //
-
-  int handleAuthorization(unsigned char *buffer);
-  int handleAuthorization(const unsigned char *buffer, int size);
-
-  //
-  // Set the unpack colormap and the alpha
-  // blending data to be used to unpack
-  // images.
-  //
-
-  int handleGeometry(unsigned char &opcode, unsigned char *&buffer,
-                         unsigned int &size);
-
-  int handleColormap(unsigned char &opcode, unsigned char *&buffer,
-                         unsigned int &size);
-
-  int handleAlpha(unsigned char &opcode, unsigned char *&buffer,
-                      unsigned int &size);
-
-  //
-  // Manage the decoded buffer to unpack
-  // the image and move the data to the
-  // shared memory segment.
-  //
-
-  int handleImage(unsigned char &opcode, unsigned char *&buffer,
-                      unsigned int &size);
-
-  //
-  // Uncompress a packed image in one
-  // or more graphic X requests.
-  //
-
-  int handleUnpack(unsigned char &opcode, unsigned char *&buffer,
-                       unsigned int &size);
-
-  //
-  // Move the image to the shared
-  // memory buffer.
-  //
-
-  int handleShmem(unsigned char &opcode, unsigned char *&buffer,
-                      unsigned int &size);
-
-  //
-  // Handle suppression of error on
-  // commit of image splits.
-  //
-
-  void initCommitQueue();
-
-  void updateCommitQueue(unsigned short sequence);
-
-  int checkCommitError(unsigned char error, unsigned short sequence,
-                           const unsigned char *buffer);
-
-  void clearCommitQueue()
-  {
-    if (commitSequenceQueue_[0] != 0)
-    {
-      initCommitQueue();
-    }
-  }
-
-  //
-  // Check if the user pressed the
-  // CTRL+ALT+SHIFT+ESC keystroke.
-  //
-
-  int checkKeyboardEvent(unsigned char event, unsigned short sequence,
-                             const unsigned char *buffer);
-
-  //
-  // Other utilities.
-  //
-
-  void handleEncodeCharInfo(const unsigned char *nextSrc, EncodeBuffer &encodeBuffer);
-
-  //
-  // Handle the MIT-SHM initialization
-  // messages exchanged with the remote
-  // proxy.
-  //
-
-  int handleShmemRequest(DecodeBuffer &decodeBuffer, unsigned char &opcode,
-                             unsigned char *&buffer, unsigned int &size);
-
-
-  int handleShmemReply(EncodeBuffer &encodeBuffer, const unsigned char opcode,
-                           const unsigned int stage, const unsigned char *buffer,
-                               const unsigned int size);
-
-  //
-  // Try to read more events in the attempt to
-  // get the MIT-SHM image completion event
-  // from the X server.
-  //
-
-  int handleShmemEvent();
-
-  //
-  // Handle the MIT-SHM events as they are read
-  // from the socket.
-  //
-
-  int checkShmemEvent(unsigned char event, unsigned short sequence,
-                          const unsigned char *buffer);
-
-  int checkShmemError(unsigned char error, unsigned short sequence,
-                          const unsigned char *buffer);
-
-  //
-  // Query the port used to tunnel
-  // the font server connections.
-  //
-
-  int handleFontRequest(DecodeBuffer &decodeBuffer, unsigned char &opcode,
-                            unsigned char *&buffer, unsigned int &size);
-
-  int handleFontReply(EncodeBuffer &encodeBuffer, const unsigned char opcode,
-                          const unsigned char *buffer, const unsigned int size);
-
-  //
-  // Set the cache policy for image
-  // requests.
-  //
-
-  int handleCacheRequest(DecodeBuffer &decodeBuffer, unsigned char &opcode,
-                             unsigned char *&buffer, unsigned int &size);
-
-  //
-  // Decode the start and end split
-  // requests.
-  //
-
-  int handleStartSplitRequest(DecodeBuffer &decodeBuffer, unsigned char &opcode,
-                                  unsigned char *&buffer, unsigned int &size);
-
-  int handleEndSplitRequest(DecodeBuffer &decodeBuffer, unsigned char &opcode,
-                                unsigned char *&buffer, unsigned int &size);
-
-  //
-  // Remove the split store and the
-  // incomplete messages from the
-  // memory cache.
-  //
-
-  int handleAbortSplitRequest(DecodeBuffer &decodeBuffer, unsigned char &opcode,
-                                  unsigned char *&buffer, unsigned int &size);
-
-  //
-  // Send the split requests to the
-  // X server once they have been
-  // recomposed.
-  //
-
-  int handleCommitSplitRequest(DecodeBuffer &decodeBuffer, unsigned char &opcode,
-                                   unsigned char *&buffer, unsigned int &size);
-
-  int handleSplitChecksum(DecodeBuffer &decodeBuffer, T_checksum &checksum);
-
-  //
-  // Allocate and free the shared memory
-  // support resources.
-  //
-
-  void handleShmemStateAlloc();
-  void handleShmemStateRemove();
-
-  //
-  // Temporary storage for the image info.
-  //
-
-  void handleImageStateAlloc(unsigned char opcode)
-  {
-    if (imageState_ == NULL)
-    {
-      imageState_ = new T_image_state();
-    }
-
-    imageState_ -> opcode = opcode;
-  }
-
-  void handleImageStateRemove()
-  {
-    if (imageState_ != NULL)
-    {
-      delete imageState_;
-
-      imageState_ = NULL;
-    }
-  }
-
-  //
-  // Store the information needed to unpack
-  // images per each known agent's client.
-  //
-
-  void handleUnpackStateInit(int resource);
-
-  void handleUnpackAllocGeometry(int resource);
-  void handleUnpackAllocColormap(int resource);
-  void handleUnpackAllocAlpha(int resource);
-
-  void handleUnpackStateRemove(int resource);
-
-  typedef struct
-  {
-    T_geometry *geometry;
-    T_colormap *colormap;
-    T_alpha    *alpha;
-
-  } T_unpack_state;
-
-  T_unpack_state *unpackState_[256];
-
-  //
-  // Own read buffer. It is able to identify
-  // full messages read from X descriptor.
-  //
-
-  ServerReadBuffer readBuffer_;
-
-  //
-  // Sequence number of last request coming
-  // from X client or X server.
-  //
-
-  unsigned int clientSequence_;
-  unsigned int serverSequence_;
-
-  //
-  // Used to identify replies based on sequence
-  // number of original request.
-  //
-
-  SequenceQueue sequenceQueue_;
-
-  //
-  // Last motion notify read from the X server.
-  //
-
-  unsigned char lastMotion_[32];
-
-  //
-  // Sequence numbers of last auto-generated
-  // put image requests. Needed to intercept
-  // and suppress errors generated by such
-  // requests.
-  //
-
-  unsigned int commitSequenceQueue_[MAX_COMMIT_SEQUENCE_QUEUE];
-
-  //
-  // Let agent select which expose
-  // events is going to receive.
-  //
-
-  unsigned int enableExpose_;
-  unsigned int enableGraphicsExpose_;
-  unsigned int enableNoExpose_;
-
-  //
-  // Used in initialization and handling
-  // of MIT-SHM shared memory put images.
-  //
-
-  typedef struct
-  {
-    int           stage;
-    int           present;
-    int           enabled;
-    int           segment;
-    int           id;
-    void          *address;
-    unsigned int  size;
-
-    unsigned char opcode;
-    unsigned char event;
-    unsigned char error;
-
-    unsigned int  sequence;
-    unsigned int  offset;
-    T_timestamp   last;
-
-    unsigned int  checked;
-
-  } T_shmem_state;
-
-  T_shmem_state *shmemState_;
-
-  //
-  // Used to pass current image data between
-  // the different decompression stages.
-  //
-
-  typedef struct
-  {
-    unsigned char  opcode;
-
-    unsigned int   drawable;
-    unsigned int   gcontext;
-
-    unsigned char  method;
-
-    unsigned char  format;
-    unsigned char  srcDepth;
-    unsigned char  dstDepth;
-
-    unsigned int   srcLength;
-    unsigned int   dstLength;
-    unsigned int   dstLines;
-
-    short int      srcX;
-    short int      srcY;
-    unsigned short srcWidth;
-    unsigned short srcHeight;
-
-    short int      dstX;
-    short int      dstY;
-    unsigned short dstWidth;
-    unsigned short dstHeight;
-
-    unsigned char  leftPad;
-
-  } T_image_state;
-
-  T_image_state *imageState_;
-
-  //
-  // The flags is set according to the
-  // split load and save policy set by
-  // the encoding side.
-  //
-
-  typedef struct
-  {
-    int resource;
-    int current;
-    int load;
-    int save;
-    int commit;
-
-  } T_split_state;
-
-  T_split_state splitState_;
-
-  //
-  // List of agent resources.
-  //
-
-  List splitResources_;
-
-  //
-  // Keep track of object creation and
-  // deletion.
-  //
-
-  private:
-
-  #ifdef REFERENCES
-
-  static int references_;
-
-  #endif
-};
-
-#endif /* ServerChannel_H */
diff --git a/nxcomp/ServerProxy.cpp b/nxcomp/ServerProxy.cpp
deleted file mode 100644
index 5d1765183..000000000
--- a/nxcomp/ServerProxy.cpp
+++ /dev/null
@@ -1,617 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include <unistd.h>
-
-#include "NXalert.h"
-
-#include "Socket.h"
-
-#include "ServerProxy.h"
-
-#include "ServerChannel.h"
-#include "GenericChannel.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-//
-// Log the operations related to sending
-// and receiving the control tokens.
-//
-
-#undef  TOKEN
-
-ServerProxy::ServerProxy(int proxyFd) : Proxy(proxyFd)
-
-{
-  xServerAddrFamily_ = -1;
-  xServerAddrLength_ = 0;
-
-  xServerAddr_    = NULL;
-  xServerDisplay_ = NULL;
-
-  cupsServerPort_  = NULL;
-  smbServerPort_   = NULL;
-  mediaServerPort_ = NULL;
-  httpServerPort_  = NULL;
-
-  fontServerPort_ = NULL;
-
-  #ifdef DEBUG
-  *logofs << "ServerProxy: Created new object at " << this
-          << ".\n" << logofs_flush;
-  #endif
-}
-
-ServerProxy::~ServerProxy()
-{
-  delete xServerAddr_;
-
-  delete [] xServerDisplay_;
-
-  delete [] fontServerPort_;
-
-  #ifdef DEBUG
-  *logofs << "ServerProxy: Deleted object at " << this
-          << ".\n" << logofs_flush;
-  #endif
-}
-
-void ServerProxy::handleDisplayConfiguration(const char *xServerDisplay, int xServerAddrFamily,
-                                                 sockaddr *xServerAddr, unsigned int xServerAddrLength)
-{
-  delete xServerAddr_;
-
-  xServerAddr_ = xServerAddr;
-
-  xServerAddrFamily_ = xServerAddrFamily;
-  xServerAddrLength_ = xServerAddrLength;
-
-  delete [] xServerDisplay_;
-
-  xServerDisplay_ = new char[strlen(xServerDisplay) + 1];
-
-  strcpy(xServerDisplay_, xServerDisplay);
-
-  #ifdef DEBUG
-  *logofs << "ServerProxy: Set display configuration to display '"
-          << xServerDisplay_ << "'.\n"
-          << logofs_flush;
-  #endif
-}
-
-void ServerProxy::handlePortConfiguration(ChannelEndPoint &cupsServerPort,
-                                          ChannelEndPoint &smbServerPort,
-                                          ChannelEndPoint &mediaServerPort,
-                                          ChannelEndPoint &httpServerPort,
-                                          const char *fontServerPort)
-{
-  cupsServerPort_  = cupsServerPort;
-  smbServerPort_   = smbServerPort;
-  mediaServerPort_ = mediaServerPort;
-  httpServerPort_  = httpServerPort;
-
-  delete [] fontServerPort_;
-
-  fontServerPort_ = new char[strlen(fontServerPort) + 1];
-
-  strcpy(fontServerPort_, fontServerPort);
-
-  #ifdef DEBUG
-  *logofs << "ServerProxy: Set port configuration to CUPS "
-          << cupsServerPort_ << ", SMB " << smbServerPort_
-          << ", media " << mediaServerPort_ << ", HTTP "
-          << httpServerPort_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-
-int ServerProxy::handleNewConnection(T_channel_type type, int clientFd)
-{
-  switch (type)
-  {
-    case channel_font:
-    {
-      return handleNewGenericConnection(clientFd, channel_font, "font");
-    }
-    case channel_slave:
-    {
-      return handleNewSlaveConnection(clientFd);
-    }
-    default:
-    {
-      #ifdef PANIC
-      *logofs << "ServerProxy: PANIC! Unsupported channel with type '"
-              << getTypeName(type) << "'.\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Unsupported channel with type '"
-           << getTypeName(type) << "'.\n";
-
-      return -1;
-    }
-  }
-}
-
-int ServerProxy::handleNewConnectionFromProxy(T_channel_type type, int channelId)
-{
-  switch (type)
-  {
-    case channel_x11:
-    {
-      return handleNewXConnectionFromProxy(channelId);
-    }
-    case channel_cups:
-    {
-      return handleNewGenericConnectionFromProxy(channelId, channel_cups,
-                                                     cupsServerPort_, "CUPS");
-    }
-    case channel_smb:
-    {
-      smbServerPort_.setDefaultTCPInterface(1);
-      return handleNewGenericConnectionFromProxy(channelId, channel_smb,
-                                                     smbServerPort_, "SMB");
-    }
-    case channel_media:
-    {
-      return handleNewGenericConnectionFromProxy(channelId, channel_media,
-                                                     mediaServerPort_, "media");
-    }
-    case channel_http:
-    {
-      return handleNewGenericConnectionFromProxy(channelId, channel_http,
-                                                     httpServerPort_, "HTTP");
-    }
-    case channel_slave:
-    {
-      return handleNewSlaveConnectionFromProxy(channelId);
-    }
-    default:
-    {
-      #ifdef PANIC
-      *logofs << "ServerProxy: PANIC! Unsupported channel with type '"
-              << getTypeName(type) << "'.\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Unsupported channel with type '"
-           << getTypeName(type) << "'.\n";
-
-      return -1;
-    }
-  }
-}
-
-int ServerProxy::handleNewAgentConnection(Agent *agent)
-{
-  #ifdef PANIC
-  *logofs << "ServerProxy: PANIC! Can't create an agent "
-          << "connection at this side.\n"
-          << logofs_flush;
-  #endif
-
-  cerr << "Error" << ": Can't create an agent "
-       << "connection at this side.\n";
-
-  return -1;
-}
-
-int ServerProxy::handleNewXConnection(int clientFd)
-{
-  #ifdef PANIC
-  *logofs << "ServerProxy: PANIC! Can't create a new X channel "
-          << "with FD#" << clientFd << " at this side.\n"
-          << logofs_flush;
-  #endif
-
-  cerr << "Error" << ": Can't create a new X channel "
-       << "with FD#" << clientFd << " at this side.\n";
-
-  return -1;
-}
-
-int ServerProxy::handleNewXConnectionFromProxy(int channelId)
-{
-  //
-  // Connect to the real X server.
-  //
-
-  int retryConnect = control -> OptionServerRetryConnect;
-
-  int xServerFd;
-
-  for (;;)
-  {
-    xServerFd = socket(xServerAddrFamily_, SOCK_STREAM, PF_UNSPEC);
-
-    if (xServerFd < 0)
-    {
-      #ifdef PANIC
-      *logofs << "ServerProxy: PANIC! Call to socket failed. "
-              << "Error is " << EGET() << " '" << ESTR()
-              << "'.\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Call to socket failed. "
-           << "Error is " << EGET() << " '" << ESTR()
-           << "'.\n";
-
-      return -1;
-    }
-
-    #ifdef TEST
-    *logofs << "ServerProxy: Trying to connect to X server '"
-            << xServerDisplay_ << "'.\n" << logofs_flush;
-    #endif
-
-    int result = connect(xServerFd, xServerAddr_, xServerAddrLength_);
-
-    getNewTimestamp();
-
-    if (result < 0)
-    {
-      #ifdef WARNING
-      *logofs << "ServerProxy: WARNING! Connection to '"
-              << xServerDisplay_ << "' failed with error '"
-              << ESTR() << "'. Retrying.\n" << logofs_flush;
-      #endif
-
-      close(xServerFd);
-
-      if (--retryConnect == 0)
-      {
-        #ifdef PANIC
-        *logofs << "ServerProxy: PANIC! Connection to '"
-                << xServerDisplay_ << "' for channel ID#"
-                << channelId << " failed. Error is "
-                << EGET() << " '" << ESTR() << "'.\n"
-                << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Connection to '"
-             << xServerDisplay_ << "' failed. Error is "
-             << EGET() << " '" << ESTR() << "'.\n";
-
-        close(xServerFd);
-
-        return -1;
-      }
-
-      if (activeChannels_.getSize() == 0)
-      {
-        sleep(2);
-      }
-      else
-      {
-        sleep(1);
-      }
-    }
-    else
-    {
-      break;
-    }
-  }
-
-  assignChannelMap(channelId, xServerFd);
-
-  #ifdef TEST
-  *logofs << "ServerProxy: X server descriptor FD#" << xServerFd 
-          << " mapped to channel ID#" << channelId << ".\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // Turn queuing off for path proxy-to-X-server.
-  //
-
-  if (control -> OptionServerNoDelay == 1)
-  {
-    SetNoDelay(xServerFd, control -> OptionServerNoDelay);
-  }
-
-  //
-  // If requested, set the size of the TCP send
-  // and receive buffers.
-  //
-
-  if (control -> OptionServerSendBuffer != -1)
-  {
-    SetSendBuffer(xServerFd, control -> OptionServerSendBuffer);
-  }
-
-  if (control -> OptionServerReceiveBuffer != -1)
-  {
-    SetReceiveBuffer(xServerFd, control -> OptionServerReceiveBuffer);
-  }
-
-  if (allocateTransport(xServerFd, channelId) < 0)
-  {
-    return -1;
-  }
-
-  //
-  // Starting from protocol level 3 client and server
-  // caches are created in proxy and shared between all
-  // channels. If remote proxy has older protocol level
-  // pointers are NULL and channels must create their
-  // own instances.
-  //
-
-  channels_[channelId] = new ServerChannel(transports_[channelId], compressor_);
-
-  if (channels_[channelId] == NULL)
-  {
-    deallocateTransport(channelId);
-
-    return -1;
-  }
-
-  increaseChannels(channelId);
-
-  //
-  // Propagate channel stores and caches to the new
-  // channel.
-  //
-
-  channels_[channelId] -> setOpcodes(opcodeStore_);
-
-  channels_[channelId] -> setStores(clientStore_, serverStore_);
-
-  channels_[channelId] -> setCaches(clientCache_, serverCache_);
-
-  int port = atoi(fontServerPort_);
-
-  if (port > 0)
-  {
-    channels_[channelId] -> setPorts(port);
-  }
-
-  //
-  // Let channel configure itself according
-  // to control parameters.
-  //
-
-  channels_[channelId] -> handleConfiguration();
-
-  //
-  // Check if we have successfully loaded the
-  // selected cache and, if not, remove it
-  // from disk.
-  //
-
-  handleCheckLoad();
-
-  return 1;
-}
-
-//
-// Check if we still need to drop a channel. We need
-// to check this explicitly at the time we receive a
-// request to load or save the cache because we could
-// receive the control message before having entered
-// the function handling the channel events.
-//
-
-int ServerProxy::handleCheckDrop()
-{
-  T_list channelList = activeChannels_.copyList();
-
-  for (T_list::iterator j = channelList.begin();
-           j != channelList.end(); j++)
-  {
-    int channelId = *j;
-
-    if (channels_[channelId] != NULL &&
-            (channels_[channelId] -> getDrop() == 1 ||
-                channels_[channelId] -> getClosing() == 1))
-    {
-      #ifdef TEST
-      *logofs << "ServerProxy: Dropping the descriptor FD#"
-              << getFd(channelId) << " channel ID#"
-              << channelId << ".\n" << logofs_flush;
-      #endif
-
-      handleDrop(channelId);
-    }
-  }
-
-  return 1;
-}
-
-int ServerProxy::handleCheckLoad()
-{
-  //
-  // Check if we just created the first X channel
-  // but the client side didn't tell us to load
-  // the cache selected at the session negotiation.
-  // This is very likely because the load operation
-  // failed at the remote side, for example because
-  // the cache was invalid or corrupted.
-  //
-
-  int channelCount = getChannels(channel_x11);
-
-  if (channelCount != 1)
-  {
-    return 0;
-  }
-
-  if (control -> PersistentCacheEnableLoad == 1 &&
-          control -> PersistentCachePath != NULL &&
-              control -> PersistentCacheName != NULL &&
-                  isTimestamp(timeouts_.loadTs) == 0)
-  {
-    #ifdef WARNING
-    *logofs << "ServerProxy: WARNING! Cache file '" << control -> PersistentCachePath
-            << "/" << control -> PersistentCacheName << "' not loaded.\n"
-            << logofs_flush;
-    #endif
-
-    //
-    // Remove the cache file.
-    //
-
-    #ifdef WARNING
-    *logofs << "ServerProxy: WARNING! Removing supposedly "
-            << "incompatible cache '" << control -> PersistentCachePath
-            << "/" << control -> PersistentCacheName
-            << "'.\n" << logofs_flush;
-    #endif
-
-    handleResetPersistentCache();
-  }
-
-  return 1;
-}
-
-int ServerProxy::handleLoadFromProxy()
-{
-  //
-  // Be sure we drop any confirmed channel.
-  //
-
-  handleCheckDrop();
-
-  //
-  // Check that either no X channel is
-  // remaining or we are inside a reset.
-  //
-
-  int channelCount = getChannels(channel_x11);
-
-  if (channelCount > 0)
-  {
-    #ifdef PANIC
-    *logofs << "ServerProxy: PANIC! Protocol violation "
-            << "in command load with " << channelCount
-            << " channels.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Protocol violation "
-         << "in command load from proxy.\n";
-
-    return -1;
-  } 
-  else if (handleLoadStores() < 0)
-  {
-    #ifdef WARNING
-    *logofs << "ServerProxy: WARNING! Failed to load content "
-            << "of persistent cache.\n" << logofs_flush;
-    #endif
-
-    return -1;
-  }
-
-  return 1;
-}
-
-int ServerProxy::handleSaveFromProxy()
-{
-  //
-  // Be sure we drop any confirmed channel.
-  //
-
-  handleCheckDrop();
-
-  //
-  // Now verify that all channels are gone.
-  //
-
-  int channelCount = getChannels(channel_x11);
-
-  if (channelCount > 0)
-  {
-    #ifdef PANIC
-    *logofs << "ServerProxy: PANIC! Protocol violation "
-            << "in command save with " << channelCount
-            << " channels.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Protocol violation "
-         << "in command save from proxy.\n";
-
-    return -1;
-  }
-  else if (handleSaveStores() < 0)
-  {
-    #ifdef PANIC
-    *logofs << "ServerProxy: PANIC! Failed to save stores "
-            << "to persistent cache.\n" << logofs_flush;
-    #endif
-
-    return -1;
-  }
-
-  return 1;
-}
-
-int ServerProxy::handleSaveAllStores(ostream *cachefs, md5_state_t *md5StateStream,
-                                         md5_state_t *md5StateClient) const
-{
-  if (clientStore_ -> saveRequestStores(cachefs, md5StateStream, md5StateClient,
-                                            discard_checksum, use_data) < 0)
-  {
-    return -1;
-  }
-  else if (serverStore_ -> saveReplyStores(cachefs, md5StateStream, md5StateClient,
-                                               use_checksum, discard_data) < 0)
-  {
-    return -1;
-  }
-  else if (serverStore_ -> saveEventStores(cachefs, md5StateStream, md5StateClient,
-                                               use_checksum, discard_data) < 0)
-  {
-    return -1;
-  }
-
-  return 1;
-}
-
-int ServerProxy::handleLoadAllStores(istream *cachefs, md5_state_t *md5StateStream) const
-{
-  if (clientStore_ -> loadRequestStores(cachefs, md5StateStream,
-                                            discard_checksum, use_data) < 0)
-  {
-    return -1;
-  }
-  else if (serverStore_ -> loadReplyStores(cachefs, md5StateStream,
-                                               use_checksum, discard_data) < 0)
-  {
-    return -1;
-  }
-  else if (serverStore_ -> loadEventStores(cachefs, md5StateStream,
-                                               use_checksum, discard_data) < 0)
-  {
-    return -1;
-  }
-
-  return 1;
-}
diff --git a/nxcomp/ServerProxy.h b/nxcomp/ServerProxy.h
deleted file mode 100644
index e169c4aec..000000000
--- a/nxcomp/ServerProxy.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef ServerProxy_H
-#define ServerProxy_H
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include "Proxy.h"
-
-#include "Misc.h"
-#include "ChannelEndPoint.h"
-
-//
-// Set the verbosity level.
-//
-
-#undef  TEST
-#undef  DEBUG
-
-class ServerProxy : public Proxy
-{
-  public:
-
-  ServerProxy(int proxyFd);
-
-  virtual ~ServerProxy();
-
-  virtual void handleDisplayConfiguration(const char *xServerDisplay, int xServerAddrFamily,
-                                              sockaddr *xServerAddr, unsigned int xServerAddrLength);
-
-  virtual void handlePortConfiguration(ChannelEndPoint &cupsServerPort,
-                                       ChannelEndPoint &smbServerPort,
-                                       ChannelEndPoint &mediaServerPort,
-                                       ChannelEndPoint &httpServerPort,
-                                       const char *fontServerPort);
-
-  protected:
-
-  //
-  // Create a new channel.
-  //
-
-  virtual int handleNewConnection(T_channel_type type, int clientFd);
-
-  virtual int handleNewConnectionFromProxy(T_channel_type type, int channelId);
-
-  virtual int handleNewAgentConnection(Agent *agent);
-
-  virtual int handleNewXConnection(int clientFd);
-
-  virtual int handleNewXConnectionFromProxy(int channelId);
-
-  //
-  // Implement persistence according
-  // to our proxy mode.
-  //
-
-  virtual int handleLoad(T_load_type type)
-  {
-    return 0;
-  }
-
-  virtual int handleSave()
-  {
-    return 0;
-  }
-
-  virtual int handleAsyncEvents()
-  {
-    return 0;
-  }
-
-  virtual int handleLoadFromProxy();
-  virtual int handleSaveFromProxy();
-
-  virtual int handleSaveAllStores(ostream *cachefs, md5_state_t *md5StateStream,
-                                      md5_state_t *md5StateClient) const;
-
-  virtual int handleLoadAllStores(istream *cachefs, md5_state_t *md5StateStream) const;
-
-  int handleCheckDrop();
-  int handleCheckLoad();
-
-  //
-  // Utility function used to realize
-  // a new connection.
-  //
-
-  protected:
-
-  virtual int checkLocalChannelMap(int channelId)
-  {
-    // Since ProtoStep7 (#issue 108)
-    return ((channelId & control -> ChannelMask) == 0);
-  }
-
-  private:
-
-  // FIXME: Use a ChannelEndPoint object also for the X server!
-  int xServerAddrFamily_;
-  sockaddr *xServerAddr_;
-  unsigned int xServerAddrLength_;
-
-  //
-  // This is the name of the X display where
-  // we are going to forward connections.
-  //
-
-  char *xServerDisplay_;
-
-  //
-  // Ports where to forward extended services'
-  // TCP connections.
-  //
-
-  ChannelEndPoint cupsServerPort_;
-  ChannelEndPoint smbServerPort_;
-  ChannelEndPoint mediaServerPort_;
-  ChannelEndPoint httpServerPort_;
-
-  //
-  // It will have to be passed to the channel
-  // so that it can set the port where the
-  // font server connections are tunneled.
-  //
-
-  char *fontServerPort_;
-};
-
-#endif /* ServerProxy_H */
diff --git a/nxcomp/ServerReadBuffer.cpp b/nxcomp/ServerReadBuffer.cpp
deleted file mode 100644
index 5bd9bb60f..000000000
--- a/nxcomp/ServerReadBuffer.cpp
+++ /dev/null
@@ -1,243 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "ServerReadBuffer.h"
-#include "ServerChannel.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-unsigned int ServerReadBuffer::suggestedLength(unsigned int pendingLength)
-{
-  //
-  // Always read all the data that
-  // is available.
-  //
-
-  int readable = transport_ -> readable();
-
-  unsigned int readLength = (readable == -1 ? 0 : (unsigned int) readable);
-
-  if (readLength < pendingLength)
-  {
-    readLength = pendingLength;
-  }
-
-  //
-  // Even if the readable data is not
-  // enough to make a complete message,
-  // resize the buffer to accommodate
-  // it all.
-  //
-
-  if (pendingLength < remaining_)
-  {
-    readLength = remaining_;
-  }
-
-  return readLength;
-}  
-
-int ServerReadBuffer::locateMessage(const unsigned char *start,
-                                        const unsigned char *end,
-                                            unsigned int &controlLength,
-                                                unsigned int &dataLength,
-                                                    unsigned int &trailerLength)
-{
-  unsigned int size = end - start;
-
-  #ifdef TEST
-  *logofs << "ServerReadBuffer: Locating message for FD#"
-          << transport_ -> fd() << " with " << size
-          << " bytes.\n" << logofs_flush;
-  #endif
-
-  if (firstMessage_)
-  {
-    if (size < 8)
-    {
-      remaining_ = 8 - size;
-
-      #ifdef TEST
-      *logofs << "ServerReadBuffer: No message was located "
-              << "with remaining " << remaining_ << ".\n"
-              << logofs_flush;
-      #endif
-
-      return 0;
-    }
-
-    dataLength = 8 + (GetUINT(start + 6, bigEndian_) << 2);
-  }
-  else
-  {
-    if (size < 32)
-    {
-      remaining_ = 32 - size;
-
-      #ifdef TEST
-      *logofs << "ServerReadBuffer: No message was located "
-              << "with remaining " << remaining_ << ".\n"
-              << logofs_flush;
-      #endif
-
-      return 0;
-    }
-
-    if (*start == 1)
-    {
-      dataLength = 32 + (GetULONG(start + 4, bigEndian_) << 2);
-    }
-    else
-    {
-      dataLength = 32;
-    }
-
-    if (dataLength < 32)
-    {
-      #ifdef TEST
-      *logofs << "ServerReadBuffer: WARNING! Assuming length 32 "
-              << "for suspicious message of length " << dataLength
-              << ".\n" << logofs_flush;
-      #endif
-
-      dataLength = 32;
-    }
-  }
-
-  #ifdef TEST
-  *logofs << "ServerReadBuffer: Length of the next message is "
-          << dataLength << ".\n" << logofs_flush;
-  #endif
-
-  if (size < dataLength)
-  {
-    remaining_ = dataLength - size;
-
-    #ifdef TEST
-    *logofs << "ServerReadBuffer: No message was located "
-            << "with remaining " << remaining_ << ".\n"
-            << logofs_flush;
-    #endif
-
-    return 0;
-  }
-
-  firstMessage_ = 0;
-
-  controlLength = 0;
-  trailerLength = 0;
-
-  remaining_ = 0;
-
-  #ifdef TEST
-  *logofs << "ServerReadBuffer: Located message with "
-          << "remaining " << remaining_ << ".\n"
-          << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-//
-// Check if the data already read contains a
-// message matching the opcode and sequence,
-// starting at the given offset.
-//
-
-unsigned char *ServerReadBuffer::peekMessage(unsigned int &offset, unsigned char opcode,
-                                                 unsigned short sequence)
-{
-  #ifdef TEST
-  *logofs << "ServerReadBuffer: Peeking message "
-          << "for FD#" << transport_ -> fd() << " with size "
-          << length_ << " offset " << offset << " opcode "
-          << (unsigned int) opcode << " and sequence "
-          << sequence << ".\n" << logofs_flush;
-  #endif
-
-  if (firstMessage_)
-  {
-    return NULL;
-  }
-
-  unsigned char *next = buffer_ + start_ + offset;
-  unsigned char *end  = buffer_ + start_ + length_;
-
-  int found = 0;
-
-  while (end - next >= 32)
-  {
-    #ifdef DEBUG
-    *logofs << "ServerReadBuffer: Checking opcode "
-            << (unsigned int) *next << " sequence "
-            << GetUINT(next + 2, bigEndian_)
-            << " at " << next - buffer_ + start_
-            << ".\n" << logofs_flush;
-    #endif
-
-    if (*next == opcode && GetUINT(next + 2, bigEndian_) == sequence)
-    {
-      found = 1;
-
-      break;
-    }
-    else if (*next == 1)
-    {
-      next += (32 + (GetULONG(next + 4, bigEndian_) << 2));
-    }
-    else
-    {
-      next += 32;
-    }
-  }
-
-  offset = next - buffer_ + start_;
-
-  if (found == 1)
-  {
-    #ifdef TEST
-    *logofs << "ServerReadBuffer: Found message at "
-            << "offset " << next - buffer_ + start_
-            << ".\n" << logofs_flush;
-    #endif
-
-    return next;
-  }
-
-  #ifdef TEST
-  *logofs << "ServerReadBuffer: Quitting loop at "
-          << "offset " << next - buffer_ + start_
-          << ".\n" << logofs_flush;
-  #endif
-
-  return NULL;
-}
diff --git a/nxcomp/ServerReadBuffer.h b/nxcomp/ServerReadBuffer.h
deleted file mode 100644
index d6c207ead..000000000
--- a/nxcomp/ServerReadBuffer.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef ServerReadBuffer_H
-#define ServerReadBuffer_H
-
-#include "ReadBuffer.h"
-#include "Control.h"
-
-class ServerChannel;
-
-class ServerReadBuffer : public ReadBuffer
-{
-  public:
-
-  ServerReadBuffer(Transport *transport, ServerChannel *channel)
-
-    : ReadBuffer(transport), firstMessage_(1), channel_(channel)
-  {
-  }
-
-  virtual ~ServerReadBuffer()
-  {
-  }
-
-  void setBigEndian(int flag)
-  {
-    bigEndian_ = flag;
-  }
-
-  unsigned char *peekMessage(unsigned int &offset, unsigned char opcode,
-                                 unsigned short sequence);
-
-  protected:
-
-  virtual unsigned int suggestedLength(unsigned int pendingLength);
-
-  virtual int locateMessage(const unsigned char *start,
-                                const unsigned char *end,
-                                    unsigned int &controlLength,
-                                        unsigned int &dataLength,
-                                            unsigned int &trailerLength);
-
-  int bigEndian_;
-
-  int firstMessage_;
-
-  ServerChannel *channel_;
-};
-
-#endif /* ServerReadBuffer_H */
diff --git a/nxcomp/ServerStore.cpp b/nxcomp/ServerStore.cpp
deleted file mode 100644
index 0fb17d974..000000000
--- a/nxcomp/ServerStore.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "ServerStore.h"
-
-//
-// Cached reply classes.
-//
-
-#include "GetImageReply.h"
-#include "ListFontsReply.h"
-#include "QueryFontReply.h"
-#include "GetPropertyReply.h"
-#include "GenericReply.h"
-
-//
-// Set the verbosity level.
-//
-
-#define WARNING
-#define PANIC
-#undef  TEST
-
-ServerStore::ServerStore(StaticCompressor *compressor)
-{
-  if (logofs == NULL)
-  {
-    logofs = &cout;
-  }
-
-  for (int i = 0; i < CHANNEL_STORE_OPCODE_LIMIT; i++)
-  {
-    replies_[i] = NULL;
-    events_[i]  = NULL;
-  }
-
-  replies_[X_ListFonts]   = new ListFontsReplyStore(compressor);
-  replies_[X_QueryFont]   = new QueryFontReplyStore(compressor);
-  replies_[X_GetImage]    = new GetImageReplyStore(compressor);
-  replies_[X_GetProperty] = new GetPropertyReplyStore(compressor);
-
-  replies_[X_NXInternalGenericReply] = new GenericReplyStore(compressor);
-}
-
-ServerStore::~ServerStore()
-{
-  if (logofs == NULL)
-  {
-    logofs = &cout;
-  }
-
-  for (int i = 0; i < CHANNEL_STORE_OPCODE_LIMIT; i++)
-  {
-    delete replies_[i];
-    delete events_[i];
-  }
-}
-
-int ServerStore::saveReplyStores(ostream *cachefs, md5_state_t *md5StateStream,
-                                     md5_state_t *md5StateClient, T_checksum_action checksumAction,
-                                         T_data_action dataAction) const
-{
-  for (int i = 0; i < CHANNEL_STORE_OPCODE_LIMIT; i++)
-  {
-    if (replies_[i] != NULL &&
-            replies_[i] -> saveStore(cachefs, md5StateStream, md5StateClient,
-                                         checksumAction, dataAction,
-                                             storeBigEndian()) < 0)
-    {
-      #ifdef PANIC
-      *logofs << "ServerStore: PANIC! Error saving reply store "
-              << "for OPCODE#" << (unsigned int) i << ".\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Error saving reply store "
-           << "for opcode '" << (unsigned int) i << "'.\n";
-
-      return -1;
-    }
-  }
-
-  return 1;
-}
-
-int ServerStore::saveEventStores(ostream *cachefs, md5_state_t *md5StateStream,
-                                     md5_state_t *md5StateClient, T_checksum_action checksumAction,
-                                         T_data_action dataAction) const
-{
-  for (int i = 0; i < CHANNEL_STORE_OPCODE_LIMIT; i++)
-  {
-    if (events_[i] != NULL &&
-            events_[i] -> saveStore(cachefs, md5StateStream, md5StateClient,
-                                        checksumAction, dataAction,
-                                            storeBigEndian()) < 0)
-    {
-      #ifdef PANIC
-      *logofs << "ServerStore: PANIC! Error saving event store "
-              << "for OPCODE#" << (unsigned int) i << ".\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Error saving event store "
-           << "for opcode '" << (unsigned int) i << "'.\n";
-
-      return -1;
-    }
-  }
-
-  return 1;
-}
-
-int ServerStore::loadReplyStores(istream *cachefs, md5_state_t *md5StateStream,
-                                     T_checksum_action checksumAction, T_data_action dataAction) const
-{
-  for (int i = 0; i < CHANNEL_STORE_OPCODE_LIMIT; i++)
-  {
-    if (replies_[i] != NULL &&
-            replies_[i] -> loadStore(cachefs, md5StateStream,
-                                         checksumAction, dataAction,
-                                             storeBigEndian()) < 0)
-    {
-      #ifdef PANIC
-      *logofs << "ServerStore: PANIC! Error loading reply store "
-              << "for OPCODE#" << (unsigned int) i << ".\n"
-              << logofs_flush;
-      #endif
-
-      return -1;
-    }
-  }
-
-  return 1;
-}
-
-int ServerStore::loadEventStores(istream *cachefs, md5_state_t *md5StateStream,
-                                     T_checksum_action checksumAction, T_data_action dataAction) const
-{
-  for (int i = 0; i < CHANNEL_STORE_OPCODE_LIMIT; i++)
-  {
-    if (events_[i] != NULL &&
-            events_[i] -> loadStore(cachefs, md5StateStream,
-                                        checksumAction, dataAction,
-                                            storeBigEndian()) < 0)
-    {
-      #ifdef PANIC
-      *logofs << "ServerStore: PANIC! Error loading event store "
-              << "for OPCODE#" << (unsigned int) i << ".\n"
-              << logofs_flush;
-      #endif
-
-      return -1;
-    }
-  }
-
-  return 1;
-}
diff --git a/nxcomp/ServerStore.h b/nxcomp/ServerStore.h
deleted file mode 100644
index dbbb968e5..000000000
--- a/nxcomp/ServerStore.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef ServerStore_H
-#define ServerStore_H
-
-#include "Message.h"
-
-#include "ChannelStore.h"
-
-class StaticCompressor;
-
-class ServerStore : public ChannelStore
-{
-  public:
-
-  ServerStore(StaticCompressor *compressor);
-
-  virtual ~ServerStore();
-
-  MessageStore *getReplyStore(unsigned char opcode) const
-  {
-    return replies_[opcode];
-  }
-
-  MessageStore *getEventStore(unsigned char opcode) const
-  {
-    return events_[opcode];
-  }
-
-  //
-  // Actually save the message store
-  // to disk according to proxy mode.
-  //
-
-  int saveReplyStores(ostream *cachefs, md5_state_t *md5StateStream,
-                          md5_state_t *md5StateClient, T_checksum_action checksumAction,
-                              T_data_action dataAction) const;
-
-  int saveEventStores(ostream *cachefs, md5_state_t *md5StateStream,
-                          md5_state_t *md5StateClient, T_checksum_action checksumAction,
-                              T_data_action dataAction) const;
-
-
-  int loadReplyStores(istream *cachefs, md5_state_t *md5StateStream,
-                          T_checksum_action checksumAction, T_data_action dataAction) const;
-
-  int loadEventStores(istream *cachefs, md5_state_t *md5StateStream,
-                          T_checksum_action checksumAction, T_data_action dataAction) const;
-
-  private:
-
-  //
-  // A server store contains replies and events.
-  //
-
-  MessageStore *replies_[CHANNEL_STORE_OPCODE_LIMIT];
-  MessageStore *events_[CHANNEL_STORE_OPCODE_LIMIT];
-};
-
-#endif /* ServerStore_H */
diff --git a/nxcomp/SetClipRectangles.cpp b/nxcomp/SetClipRectangles.cpp
deleted file mode 100644
index 164ead006..000000000
--- a/nxcomp/SetClipRectangles.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "SetClipRectangles.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int SetClipRectanglesStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                              unsigned int size, int bigEndian) const
-{
-  SetClipRectanglesMessage *setClipRectangles = (SetClipRectanglesMessage *) message;
-
-  //
-  // Here is the fingerprint.
-  //
-
-  setClipRectangles -> ordering = *(buffer + 1);
-
-  setClipRectangles -> gcontext = GetULONG(buffer + 4, bigEndian);
-
-  setClipRectangles -> x_origin = GetUINT(buffer + 8, bigEndian);
-  setClipRectangles -> y_origin = GetUINT(buffer + 10, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed Identity for message at " << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int SetClipRectanglesStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                                unsigned int size, int bigEndian) const
-{
-  SetClipRectanglesMessage *setClipRectangles = (SetClipRectanglesMessage *) message;
-
-  //
-  // Fill all the message's fields.
-  //
-
-  *(buffer + 1) = setClipRectangles -> ordering;
-
-  PutULONG(setClipRectangles -> gcontext, buffer + 4, bigEndian);
-
-  PutUINT(setClipRectangles -> x_origin, buffer + 8, bigEndian);
-  PutUINT(setClipRectangles -> y_origin, buffer + 10, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at " << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void SetClipRectanglesStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  SetClipRectanglesMessage *setClipRectangles = (SetClipRectanglesMessage *) message;
-
-  *logofs << name() << ": Identity ordering " << (unsigned int) setClipRectangles -> ordering
-                    << ", gcontext " << setClipRectangles -> gcontext << ", x_origin " 
-                    << setClipRectangles -> x_origin << ", y_origin " 
-                    << setClipRectangles -> y_origin << ", size " 
-                    << setClipRectangles -> size_ << ".\n" << logofs_flush;
-  #endif
-}
-
-void SetClipRectanglesStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                                  unsigned int size, int bigEndian) const
-{
-  md5_append(md5_state_, buffer + 1, 1);
-  md5_append(md5_state_, buffer + 8, 4);
-}
-
-void SetClipRectanglesStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                                const Message *cachedMessage,
-                                                    ChannelCache *channelCache) const
-{
-  SetClipRectanglesMessage *setClipRectangles       = (SetClipRectanglesMessage *) message;
-  SetClipRectanglesMessage *cachedSetClipRectangles = (SetClipRectanglesMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value " << setClipRectangles -> gcontext
-          << " as gcontext field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeXidValue(setClipRectangles -> gcontext, clientCache -> gcCache);
-
-  cachedSetClipRectangles -> gcontext = setClipRectangles -> gcontext;
-}
-
-void SetClipRectanglesStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                                ChannelCache *channelCache) const
-{
-  SetClipRectanglesMessage *setClipRectangles = (SetClipRectanglesMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  decodeBuffer.decodeXidValue(value, clientCache -> gcCache);
-
-  setClipRectangles -> gcontext = value;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value " << setClipRectangles -> gcontext
-          << " as gcontext field.\n" << logofs_flush;
-  #endif
-}
diff --git a/nxcomp/SetClipRectangles.h b/nxcomp/SetClipRectangles.h
deleted file mode 100644
index a2245360c..000000000
--- a/nxcomp/SetClipRectangles.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef SetClipRectangles_H
-#define SetClipRectangles_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define SETCLIPRECTANGLES_ENABLE_CACHE               1
-#define SETCLIPRECTANGLES_ENABLE_DATA                0
-#define SETCLIPRECTANGLES_ENABLE_SPLIT               0
-#define SETCLIPRECTANGLES_ENABLE_COMPRESS            0
-
-#define SETCLIPRECTANGLES_DATA_LIMIT                 2048
-#define SETCLIPRECTANGLES_DATA_OFFSET                12
-
-#define SETCLIPRECTANGLES_CACHE_SLOTS                3000
-#define SETCLIPRECTANGLES_CACHE_THRESHOLD            3
-#define SETCLIPRECTANGLES_CACHE_LOWER_THRESHOLD      1
-
-//
-// The message class.
-//
-
-class SetClipRectanglesMessage : public Message
-{
-  friend class SetClipRectanglesStore;
-
-  public:
-
-  SetClipRectanglesMessage()
-  {
-  }
-
-  ~SetClipRectanglesMessage()
-  {
-  }
-
-  //
-  // Put here the fields which constitute 
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned char  ordering;
-  unsigned int   gcontext;
-  unsigned short x_origin;
-  unsigned short y_origin;
-};
-
-class SetClipRectanglesStore : public MessageStore
-{
-  //
-  // Constructors and destructors.
-  //
-
-  public:
-
-  SetClipRectanglesStore() : MessageStore()
-  {
-    enableCache    = SETCLIPRECTANGLES_ENABLE_CACHE;
-    enableData     = SETCLIPRECTANGLES_ENABLE_DATA;
-    enableSplit    = SETCLIPRECTANGLES_ENABLE_SPLIT;
-    enableCompress = SETCLIPRECTANGLES_ENABLE_COMPRESS;
-
-    dataLimit  = SETCLIPRECTANGLES_DATA_LIMIT;
-    dataOffset = SETCLIPRECTANGLES_DATA_OFFSET;
-
-    cacheSlots          = SETCLIPRECTANGLES_CACHE_SLOTS;
-    cacheThreshold      = SETCLIPRECTANGLES_CACHE_THRESHOLD;
-    cacheLowerThreshold = SETCLIPRECTANGLES_CACHE_LOWER_THRESHOLD;
-
-    messages_ -> resize(cacheSlots);
-
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      *i = NULL;
-    }
-
-    temporary_ = NULL;
-  }
-
-  virtual ~SetClipRectanglesStore()
-  {
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      destroy(*i);
-    }
-
-    destroy(temporary_);
-  }
-
-  virtual const char *name() const
-  {
-    return "SetClipRectangles";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_SetClipRectangles;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(SetClipRectanglesMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  public:
-
-  virtual Message *create() const
-  {
-    return new SetClipRectanglesMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new SetClipRectanglesMessage((const SetClipRectanglesMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (SetClipRectanglesMessage *) message;
-  }
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* SetClipRectangles_H */
diff --git a/nxcomp/SetUnpackAlpha.cpp b/nxcomp/SetUnpackAlpha.cpp
deleted file mode 100644
index cf09074e3..000000000
--- a/nxcomp/SetUnpackAlpha.cpp
+++ /dev/null
@@ -1,262 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "SetUnpackAlpha.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-#include "WriteBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Constructors and destructors.
-//
-
-SetUnpackAlphaStore::SetUnpackAlphaStore(StaticCompressor *compressor)
-
-  : MessageStore(compressor)
-{
-  enableCache    = SETUNPACKALPHA_ENABLE_CACHE;
-  enableData     = SETUNPACKALPHA_ENABLE_DATA;
-  enableCompress = SETUNPACKALPHA_ENABLE_COMPRESS_IF_PROTO_STEP_7;
-
-  dataLimit  = SETUNPACKALPHA_DATA_LIMIT;
-  dataOffset = SETUNPACKALPHA_DATA_OFFSET_IF_PROTO_STEP_7;
-
-  cacheSlots          = SETUNPACKALPHA_CACHE_SLOTS;
-  cacheThreshold      = SETUNPACKALPHA_CACHE_THRESHOLD;
-  cacheLowerThreshold = SETUNPACKALPHA_CACHE_LOWER_THRESHOLD;
-
-  // Since ProtoStep8 (#issue 108)
-  enableSplit    = SETUNPACKALPHA_ENABLE_SPLIT_IF_PROTO_STEP_8;
-
-  messages_ -> resize(cacheSlots);
-
-  for (T_messages::iterator i = messages_ -> begin();
-           i < messages_ -> end(); i++)
-  {
-    *i = NULL;
-  }
-
-  temporary_ = NULL;
-}
-
-SetUnpackAlphaStore::~SetUnpackAlphaStore()
-{
-  for (T_messages::iterator i = messages_ -> begin();
-           i < messages_ -> end(); i++)
-  {
-    destroy(*i);
-  }
-
-  destroy(temporary_);
-}
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int SetUnpackAlphaStore::encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                            const unsigned int size, int bigEndian,
-                                                ChannelCache *channelCache) const
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Encoding full message identity.\n" << logofs_flush;
-  #endif
-
-  //
-  // Encode the source length first because
-  // we need it to determine the size of
-  // the output buffer.
-  //
-
-  // SrcLength.
-  encodeBuffer.encodeValue(GetULONG(buffer + 8, bigEndian), 32, 9);
-
-  // Client.
-  encodeBuffer.encodeCachedValue(*(buffer + 1), 8,
-                     clientCache -> resourceCache);
-  // Method.
-  encodeBuffer.encodeCachedValue(*(buffer + 4), 8,
-                     clientCache -> methodCache);
-  // DstLength.
-  encodeBuffer.encodeValue(GetULONG(buffer + 12, bigEndian), 32, 9);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Encoded full message identity.\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int SetUnpackAlphaStore::decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                                            unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
-                                                ChannelCache *channelCache) const
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoding full message identity.\n" << logofs_flush;
-  #endif
-
-  unsigned int  value;
-  unsigned char cValue;
-
-  // SrcLength.
-  decodeBuffer.decodeValue(value, 32, 9);
-
-  size = RoundUp4(value) + 16;
-
-  buffer = writeBuffer -> addMessage(size);
-
-  PutULONG(value, buffer + 8, bigEndian);
-
-  // Client.
-  decodeBuffer.decodeCachedValue(cValue, 8,
-                     clientCache -> resourceCache);
-
-  *(buffer + 1) = cValue;
-
-  // Method.
-  decodeBuffer.decodeCachedValue(cValue, 8,
-                     clientCache -> methodCache);
-
-  *(buffer + 4) = cValue;
-
-  // DstLength.
-  decodeBuffer.decodeValue(value, 32, 9);
-
-  PutULONG(value, buffer + 12, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded full message identity.\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int SetUnpackAlphaStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                           unsigned int size, int bigEndian) const
-{
-  SetUnpackAlphaMessage *setUnpackAlpha = (SetUnpackAlphaMessage *) message;
-
-  setUnpackAlpha -> client = *(buffer + 1);
-  setUnpackAlpha -> method = *(buffer + 4);
-
-  setUnpackAlpha -> src_length = GetULONG(buffer + 8, bigEndian);
-  setUnpackAlpha -> dst_length = GetULONG(buffer + 12, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed identity for message at " << message << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int SetUnpackAlphaStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                             unsigned int size, int bigEndian) const
-{
-  SetUnpackAlphaMessage *setUnpackAlpha = (SetUnpackAlphaMessage *) message;
-
-  *(buffer + 1) = setUnpackAlpha -> client;
-  *(buffer + 4) = setUnpackAlpha -> method;
-
-  PutULONG(setUnpackAlpha -> src_length, buffer + 8,  bigEndian);
-  PutULONG(setUnpackAlpha -> dst_length, buffer + 12, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at " << message << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void SetUnpackAlphaStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  SetUnpackAlphaMessage *setUnpackAlpha = (SetUnpackAlphaMessage *) message;
-
-  *logofs << name() << ": Identity client "
-          << (unsigned int) setUnpackAlpha -> client << " method "
-          << (unsigned int) setUnpackAlpha -> method << " source length "
-          << setUnpackAlpha -> src_length << " destination length "
-          << setUnpackAlpha -> dst_length << " size "
-          << setUnpackAlpha -> size_ << ".\n";
-
-  #endif
-}
-
-void SetUnpackAlphaStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                               unsigned int size, int bigEndian) const
-{
-  //
-  // Include the pack method and the source
-  // and destination length.
-  //
-
-  md5_append(md5_state_, buffer + 4, 1);
-  md5_append(md5_state_, buffer + 8, 8);
-}
-
-void SetUnpackAlphaStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                             const Message *cachedMessage,
-                                                 ChannelCache *channelCache) const
-{
-  SetUnpackAlphaMessage *setUnpackAlpha       = (SetUnpackAlphaMessage *) message;
-  SetUnpackAlphaMessage *cachedSetUnpackAlpha = (SetUnpackAlphaMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeCachedValue(setUnpackAlpha -> client, 8,
-                     clientCache -> resourceCache);
-
-  cachedSetUnpackAlpha -> client = setUnpackAlpha -> client;
-}
-
-void SetUnpackAlphaStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                             ChannelCache *channelCache) const
-{
-  SetUnpackAlphaMessage *setUnpackAlpha = (SetUnpackAlphaMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeCachedValue(setUnpackAlpha -> client, 8,
-                     clientCache -> resourceCache);
-}
diff --git a/nxcomp/SetUnpackAlpha.h b/nxcomp/SetUnpackAlpha.h
deleted file mode 100644
index 54714efaa..000000000
--- a/nxcomp/SetUnpackAlpha.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef SetUnpackAlpha_H
-#define SetUnpackAlpha_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define SETUNPACKALPHA_ENABLE_CACHE                       1
-#define SETUNPACKALPHA_ENABLE_DATA                        1
-
-#define SETUNPACKALPHA_DATA_LIMIT                         16384
-
-#define SETUNPACKALPHA_CACHE_SLOTS                        2000
-#define SETUNPACKALPHA_CACHE_THRESHOLD                    10
-#define SETUNPACKALPHA_CACHE_LOWER_THRESHOLD              5
-
-#define SETUNPACKALPHA_DATA_OFFSET_IF_PROTO_STEP_7        16
-#define SETUNPACKALPHA_ENABLE_COMPRESS_IF_PROTO_STEP_7    0
-
-#define SETUNPACKALPHA_ENABLE_SPLIT_IF_PROTO_STEP_8       0
-
-//
-// The message class.
-//
-
-class SetUnpackAlphaMessage : public Message
-{
-  friend class SetUnpackAlphaStore;
-
-  public:
-
-  SetUnpackAlphaMessage()
-  {
-  }
-
-  ~SetUnpackAlphaMessage()
-  {
-  }
-
-  //
-  // Put here the fields which constitute 
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned char client;
-  unsigned char method;
-
-  unsigned int src_length;
-  unsigned int dst_length;
-};
-
-class SetUnpackAlphaStore : public MessageStore
-{
-  public:
-
-  SetUnpackAlphaStore(StaticCompressor *compressor);
-
-  virtual ~SetUnpackAlphaStore();
-
-  virtual const char *name() const
-  {
-    return "SetUnpackAlpha";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_NXSetUnpackAlpha;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(SetUnpackAlphaMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  protected:
-
-  virtual Message *create() const
-  {
-    return new SetUnpackAlphaMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new SetUnpackAlphaMessage((const SetUnpackAlphaMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (SetUnpackAlphaMessage *) message;
-  }
-
-  virtual int encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                 const unsigned int size, int bigEndian,
-                                     ChannelCache *channelCache) const;
-
-  virtual int decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                                 unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
-                                     ChannelCache *channelCache) const;
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* SetUnpackAlpha_H */
diff --git a/nxcomp/SetUnpackColormap.cpp b/nxcomp/SetUnpackColormap.cpp
deleted file mode 100644
index b44a7cf13..000000000
--- a/nxcomp/SetUnpackColormap.cpp
+++ /dev/null
@@ -1,262 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "SetUnpackColormap.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-#include "WriteBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Constructors and destructors.
-//
-
-SetUnpackColormapStore::SetUnpackColormapStore(StaticCompressor *compressor)
-
-  : MessageStore(compressor)
-{
-  enableCache    = SETUNPACKCOLORMAP_ENABLE_CACHE;
-  enableData     = SETUNPACKCOLORMAP_ENABLE_DATA;
-  enableCompress = SETUNPACKCOLORMAP_ENABLE_COMPRESS_IF_PROTO_STEP_7;
-
-  dataLimit  = SETUNPACKCOLORMAP_DATA_LIMIT;
-  dataOffset = SETUNPACKCOLORMAP_DATA_OFFSET_IF_PROTO_STEP_7;
-
-  cacheSlots          = SETUNPACKCOLORMAP_CACHE_SLOTS;
-  cacheThreshold      = SETUNPACKCOLORMAP_CACHE_THRESHOLD;
-  cacheLowerThreshold = SETUNPACKCOLORMAP_CACHE_LOWER_THRESHOLD;
-
-  // Since ProtoStep8 (#issue 108)
-  enableSplit = SETUNPACKCOLORMAP_ENABLE_SPLIT_IF_PROTO_STEP_8;
-
-  messages_ -> resize(cacheSlots);
-
-  for (T_messages::iterator i = messages_ -> begin();
-           i < messages_ -> end(); i++)
-  {
-    *i = NULL;
-  }
-
-  temporary_ = NULL;
-}
-
-SetUnpackColormapStore::~SetUnpackColormapStore()
-{
-  for (T_messages::iterator i = messages_ -> begin();
-           i < messages_ -> end(); i++)
-  {
-    destroy(*i);
-  }
-
-  destroy(temporary_);
-}
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int SetUnpackColormapStore::encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                               const unsigned int size, int bigEndian,
-                                                   ChannelCache *channelCache) const
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Encoding full message identity.\n" << logofs_flush;
-  #endif
-
-  //
-  // Encode the source length first because
-  // we need it to determine the size of
-  // the output buffer.
-  //
-
-  // SrcLength.
-  encodeBuffer.encodeValue(GetULONG(buffer + 8, bigEndian), 32, 9);
-
-  // Client.
-  encodeBuffer.encodeCachedValue(*(buffer + 1), 8,
-                     clientCache -> resourceCache);
-  // Method.
-  encodeBuffer.encodeCachedValue(*(buffer + 4), 8,
-                     clientCache -> methodCache);
-  // DstLength.
-  encodeBuffer.encodeValue(GetULONG(buffer + 12, bigEndian), 32, 9);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Encoded full message identity.\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int SetUnpackColormapStore::decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                                               unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
-                                                   ChannelCache *channelCache) const
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoding full message identity.\n" << logofs_flush;
-  #endif
-
-  unsigned int  value;
-  unsigned char cValue;
-
-  // SrcLength.
-  decodeBuffer.decodeValue(value, 32, 9);
-
-  size = RoundUp4(value) + 16;
-
-  buffer = writeBuffer -> addMessage(size);
-
-  PutULONG(value, buffer + 8, bigEndian);
-
-  // Client.
-  decodeBuffer.decodeCachedValue(cValue, 8,
-                     clientCache -> resourceCache);
-
-  *(buffer + 1) = cValue;
-
-  // Method.
-  decodeBuffer.decodeCachedValue(cValue, 8,
-                     clientCache -> methodCache);
-
-  *(buffer + 4) = cValue;
-
-  // DstLength.
-  decodeBuffer.decodeValue(value, 32, 9);
-
-  PutULONG(value, buffer + 12, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded full message identity.\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int SetUnpackColormapStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                              unsigned int size, int bigEndian) const
-{
-  SetUnpackColormapMessage *setUnpackColormap = (SetUnpackColormapMessage *) message;
-
-  setUnpackColormap -> client = *(buffer + 1);
-  setUnpackColormap -> method = *(buffer + 4);
-
-  setUnpackColormap -> src_length = GetULONG(buffer + 8, bigEndian);
-  setUnpackColormap -> dst_length = GetULONG(buffer + 12, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed identity for message at " << message << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int SetUnpackColormapStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                                unsigned int size, int bigEndian) const
-{
-  SetUnpackColormapMessage *setUnpackColormap = (SetUnpackColormapMessage *) message;
-
-  *(buffer + 1) = setUnpackColormap -> client;
-  *(buffer + 4) = setUnpackColormap -> method;
-
-  PutULONG(setUnpackColormap -> src_length, buffer + 8,  bigEndian);
-  PutULONG(setUnpackColormap -> dst_length, buffer + 12, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at " << message << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void SetUnpackColormapStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  SetUnpackColormapMessage *setUnpackColormap = (SetUnpackColormapMessage *) message;
-
-  *logofs << name() << ": Identity client "
-          << (unsigned int) setUnpackColormap -> client << " method "
-          << (unsigned int) setUnpackColormap -> method << " source length "
-          << setUnpackColormap -> src_length << " destination length "
-          << setUnpackColormap -> dst_length << " size "
-          << setUnpackColormap -> size_ << ".\n";
-
-  #endif
-}
-
-void SetUnpackColormapStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                                  unsigned int size, int bigEndian) const
-{
-  //
-  // Include the pack method and the source
-  // and destination length.
-  //
-
-  md5_append(md5_state_, buffer + 4, 1);
-  md5_append(md5_state_, buffer + 8, 8);
-}
-
-void SetUnpackColormapStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                                const Message *cachedMessage,
-                                                    ChannelCache *channelCache) const
-{
-  SetUnpackColormapMessage *setUnpackColormap       = (SetUnpackColormapMessage *) message;
-  SetUnpackColormapMessage *cachedSetUnpackColormap = (SetUnpackColormapMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  encodeBuffer.encodeCachedValue(setUnpackColormap -> client, 8,
-                     clientCache -> resourceCache);
-
-  cachedSetUnpackColormap -> client = setUnpackColormap -> client;
-}
-
-void SetUnpackColormapStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                                ChannelCache *channelCache) const
-{
-  SetUnpackColormapMessage *setUnpackColormap = (SetUnpackColormapMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeCachedValue(setUnpackColormap -> client, 8,
-                     clientCache -> resourceCache);
-}
diff --git a/nxcomp/SetUnpackColormap.h b/nxcomp/SetUnpackColormap.h
deleted file mode 100644
index 779366531..000000000
--- a/nxcomp/SetUnpackColormap.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef SetUnpackColormap_H
-#define SetUnpackColormap_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define SETUNPACKCOLORMAP_ENABLE_CACHE                       1
-#define SETUNPACKCOLORMAP_ENABLE_DATA                        1
-
-#define SETUNPACKCOLORMAP_DATA_LIMIT                         4096
-
-#define SETUNPACKCOLORMAP_CACHE_SLOTS                        2000
-#define SETUNPACKCOLORMAP_CACHE_THRESHOLD                    5
-#define SETUNPACKCOLORMAP_CACHE_LOWER_THRESHOLD              0
-
-#define SETUNPACKCOLORMAP_DATA_OFFSET_IF_PROTO_STEP_7        16
-#define SETUNPACKCOLORMAP_ENABLE_COMPRESS_IF_PROTO_STEP_7    0
-
-#define SETUNPACKCOLORMAP_ENABLE_SPLIT_IF_PROTO_STEP_8       0
-
-//
-// The message class.
-//
-
-class SetUnpackColormapMessage : public Message
-{
-  friend class SetUnpackColormapStore;
-
-  public:
-
-  SetUnpackColormapMessage()
-  {
-  }
-
-  ~SetUnpackColormapMessage()
-  {
-  }
-
-  //
-  // Put here the fields which constitute 
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned char client;
-  unsigned char method;
-
-  unsigned int src_length;
-  unsigned int dst_length;
-};
-
-class SetUnpackColormapStore : public MessageStore
-{
-  public:
-
-  SetUnpackColormapStore(StaticCompressor *compressor);
-
-  virtual ~SetUnpackColormapStore();
-
-  virtual const char *name() const
-  {
-    return "SetUnpackColormap";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_NXSetUnpackColormap;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(SetUnpackColormapMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  protected:
-
-  virtual Message *create() const
-  {
-    return new SetUnpackColormapMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new SetUnpackColormapMessage((const SetUnpackColormapMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (SetUnpackColormapMessage *) message;
-  }
-
-  virtual int encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                 const unsigned int size, int bigEndian,
-                                     ChannelCache *channelCache) const;
-
-  virtual int decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                                 unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
-                                     ChannelCache *channelCache) const;
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* SetUnpackColormap_H */
diff --git a/nxcomp/SetUnpackGeometry.cpp b/nxcomp/SetUnpackGeometry.cpp
deleted file mode 100644
index 49fa4344e..000000000
--- a/nxcomp/SetUnpackGeometry.cpp
+++ /dev/null
@@ -1,301 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "SetUnpackGeometry.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-#include "WriteBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Constructors and destructors.
-//
-
-SetUnpackGeometryStore::SetUnpackGeometryStore(StaticCompressor *compressor)
-
-  : MessageStore(compressor)
-{
-  enableCache    = SETUNPACKGEOMETRY_ENABLE_CACHE;
-  enableData     = SETUNPACKGEOMETRY_ENABLE_DATA;
-  enableSplit    = SETUNPACKGEOMETRY_ENABLE_SPLIT;
-  enableCompress = SETUNPACKGEOMETRY_ENABLE_COMPRESS;
-
-  dataLimit  = SETUNPACKGEOMETRY_DATA_LIMIT;
-  dataOffset = SETUNPACKGEOMETRY_DATA_OFFSET;
-
-  cacheSlots          = SETUNPACKGEOMETRY_CACHE_SLOTS;
-  cacheThreshold      = SETUNPACKGEOMETRY_CACHE_THRESHOLD;
-  cacheLowerThreshold = SETUNPACKGEOMETRY_CACHE_LOWER_THRESHOLD;
-
-  messages_ -> resize(cacheSlots);
-
-  for (T_messages::iterator i = messages_ -> begin();
-           i < messages_ -> end(); i++)
-  {
-    *i = NULL;
-  }
-
-  temporary_ = NULL;
-}
-
-SetUnpackGeometryStore::~SetUnpackGeometryStore()
-{
-  for (T_messages::iterator i = messages_ -> begin();
-           i < messages_ -> end(); i++)
-  {
-    destroy(*i);
-  }
-
-  destroy(temporary_);
-}
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int SetUnpackGeometryStore::encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                            const unsigned int size, int bigEndian,
-                                                ChannelCache *channelCache) const
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Encoding full message identity.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeCachedValue(*(buffer + 1), 8,
-                     clientCache -> resourceCache);
-
-  const unsigned char *nextChar = buffer + 4;
-
-  for (int i = 0; i < 6; i++)
-  {
-    encodeBuffer.encodeCachedValue(*nextChar++, 8,
-                       clientCache -> depthCache);
-  }
-
-  encodeBuffer.encodeValue(GetULONG(buffer + 12, bigEndian), 32);
-  encodeBuffer.encodeValue(GetULONG(buffer + 16, bigEndian), 32);
-  encodeBuffer.encodeValue(GetULONG(buffer + 20, bigEndian), 32);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Encoded full message identity.\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int SetUnpackGeometryStore::decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                                            unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
-                                                ChannelCache *channelCache) const
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoding full message identity.\n" << logofs_flush;
-  #endif
-
-  size   = 24;
-  buffer = writeBuffer -> addMessage(size);
-
-  unsigned char cValue;
-
-  decodeBuffer.decodeCachedValue(cValue, 8,
-                     clientCache -> resourceCache);
-  *(buffer + 1) = cValue;
-
-  decodeBuffer.decodeCachedValue(cValue, 8,
-                     clientCache -> depthCache);
-  *(buffer + 4) = cValue;
-
-  decodeBuffer.decodeCachedValue(cValue, 8,
-                     clientCache -> depthCache);
-  *(buffer + 5) = cValue;
-
-  decodeBuffer.decodeCachedValue(cValue, 8,
-                     clientCache -> depthCache);
-  *(buffer + 6) = cValue;
-
-  decodeBuffer.decodeCachedValue(cValue, 8,
-                     clientCache -> depthCache);
-  *(buffer + 7) = cValue;
-
-  decodeBuffer.decodeCachedValue(cValue, 8,
-                     clientCache -> depthCache);
-  *(buffer + 8) = cValue;
-
-  decodeBuffer.decodeCachedValue(cValue, 8,
-                     clientCache -> depthCache);
-  *(buffer + 9) = cValue;
-
-  unsigned int value;
-
-  decodeBuffer.decodeValue(value, 32);
-  PutULONG(value, buffer + 12, bigEndian);
-
-  decodeBuffer.decodeValue(value, 32);
-  PutULONG(value, buffer + 16, bigEndian);
-
-  decodeBuffer.decodeValue(value, 32);
-  PutULONG(value, buffer + 20, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded full message identity.\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int SetUnpackGeometryStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                           unsigned int size, int bigEndian) const
-{
-  SetUnpackGeometryMessage *setUnpackGeometry = (SetUnpackGeometryMessage *) message;
-
-  setUnpackGeometry -> client = *(buffer + 1);
-
-  setUnpackGeometry -> depth_1_bpp  = *(buffer + 4);
-  setUnpackGeometry -> depth_4_bpp  = *(buffer + 5);
-  setUnpackGeometry -> depth_8_bpp  = *(buffer + 6);
-  setUnpackGeometry -> depth_16_bpp = *(buffer + 7);
-  setUnpackGeometry -> depth_24_bpp = *(buffer + 8);
-  setUnpackGeometry -> depth_32_bpp = *(buffer + 9);
-
-  setUnpackGeometry -> red_mask   = GetULONG(buffer + 12, bigEndian);
-  setUnpackGeometry -> green_mask = GetULONG(buffer + 16, bigEndian);
-  setUnpackGeometry -> blue_mask  = GetULONG(buffer + 20, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed identity for message at " << message << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int SetUnpackGeometryStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                             unsigned int size, int bigEndian) const
-{
-  SetUnpackGeometryMessage *setUnpackGeometry = (SetUnpackGeometryMessage *) message;
-
-  *(buffer + 1) = setUnpackGeometry -> client;
-
-  *(buffer + 4) = setUnpackGeometry -> depth_1_bpp;
-  *(buffer + 5) = setUnpackGeometry -> depth_4_bpp;
-  *(buffer + 6) = setUnpackGeometry -> depth_8_bpp;
-  *(buffer + 7) = setUnpackGeometry -> depth_16_bpp;
-  *(buffer + 8) = setUnpackGeometry -> depth_24_bpp;
-  *(buffer + 9) = setUnpackGeometry -> depth_32_bpp;
-
-  PutULONG(setUnpackGeometry -> red_mask,   buffer + 12, bigEndian);
-  PutULONG(setUnpackGeometry -> green_mask, buffer + 16, bigEndian);
-  PutULONG(setUnpackGeometry -> blue_mask,  buffer + 20, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at " << message << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void SetUnpackGeometryStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  SetUnpackGeometryMessage *setUnpackGeometry = (SetUnpackGeometryMessage *) message;
-
-  *logofs << name() << ": Identity client "
-          << (unsigned) setUnpackGeometry -> client << " depth_1_bpp "
-          << (unsigned) setUnpackGeometry -> depth_1_bpp << " depth_4_bpp "
-          << (unsigned int) setUnpackGeometry -> depth_4_bpp << " depth_8_bpp "
-          << (unsigned int) setUnpackGeometry -> depth_8_bpp << " depth_16_bpp "
-          << (unsigned int) setUnpackGeometry -> depth_16_bpp << " depth_24_bpp "
-          << (unsigned int) setUnpackGeometry -> depth_24_bpp << " depth_32_bpp "
-          << (unsigned int) setUnpackGeometry -> depth_32_bpp
-
-          << " red_mask " << setUnpackGeometry -> red_mask
-          << " green_mask " << setUnpackGeometry -> green_mask
-          << " blue_mask " << setUnpackGeometry -> blue_mask
-
-          << " size " << setUnpackGeometry -> size_ << ".\n";
-
-  #endif
-}
-
-void SetUnpackGeometryStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                               unsigned int size, int bigEndian) const
-{
-  md5_append(md5_state_, buffer + 4,  6);
-  md5_append(md5_state_, buffer + 12, 12);
-}
-
-void SetUnpackGeometryStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                             const Message *cachedMessage,
-                                                 ChannelCache *channelCache) const
-{
-  SetUnpackGeometryMessage *setUnpackGeometry       = (SetUnpackGeometryMessage *) message;
-  SetUnpackGeometryMessage *cachedSetUnpackGeometry = (SetUnpackGeometryMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef TEST
-  *logofs << name() << ": Encoding value "
-          << (unsigned int) setUnpackGeometry -> client
-          << " as client field.\n" << logofs_flush;
-  #endif
-
-  encodeBuffer.encodeCachedValue(setUnpackGeometry -> client, 8,
-                     clientCache -> resourceCache);
-
-  cachedSetUnpackGeometry -> client = setUnpackGeometry -> client;
-}
-
-void SetUnpackGeometryStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                             ChannelCache *channelCache) const
-{
-  SetUnpackGeometryMessage *setUnpackGeometry = (SetUnpackGeometryMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  decodeBuffer.decodeCachedValue(setUnpackGeometry -> client, 8,
-                     clientCache -> resourceCache);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded value "
-          << (unsigned int) setUnpackGeometry -> client
-          << " as client field.\n" << logofs_flush;
-  #endif
-}
diff --git a/nxcomp/SetUnpackGeometry.h b/nxcomp/SetUnpackGeometry.h
deleted file mode 100644
index 96104f57f..000000000
--- a/nxcomp/SetUnpackGeometry.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef SetUnpackGeometry_H
-#define SetUnpackGeometry_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define SETUNPACKGEOMETRY_ENABLE_CACHE               1
-#define SETUNPACKGEOMETRY_ENABLE_DATA                0
-#define SETUNPACKGEOMETRY_ENABLE_SPLIT               0
-#define SETUNPACKGEOMETRY_ENABLE_COMPRESS            0
-
-#define SETUNPACKGEOMETRY_DATA_LIMIT                 24
-#define SETUNPACKGEOMETRY_DATA_OFFSET                24
-
-#define SETUNPACKGEOMETRY_CACHE_SLOTS                20
-#define SETUNPACKGEOMETRY_CACHE_THRESHOLD            1
-#define SETUNPACKGEOMETRY_CACHE_LOWER_THRESHOLD      0
-
-//
-// The message class.
-//
-
-class SetUnpackGeometryMessage : public Message
-{
-  friend class SetUnpackGeometryStore;
-
-  public:
-
-  SetUnpackGeometryMessage()
-  {
-  }
-
-  ~SetUnpackGeometryMessage()
-  {
-  }
-
-  //
-  // Put here the fields which constitute 
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned char client;
-
-  unsigned char depth_1_bpp;
-  unsigned char depth_4_bpp;
-  unsigned char depth_8_bpp;
-  unsigned char depth_16_bpp;
-  unsigned char depth_24_bpp;
-  unsigned char depth_32_bpp;
-
-  unsigned int red_mask;
-  unsigned int green_mask;
-  unsigned int blue_mask;
-};
-
-class SetUnpackGeometryStore : public MessageStore
-{
-  public:
-
-  SetUnpackGeometryStore(StaticCompressor *compressor);
-
-  virtual ~SetUnpackGeometryStore();
-
-  virtual const char *name() const
-  {
-    return "SetUnpackGeometry";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_NXSetUnpackGeometry;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(SetUnpackGeometryMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  protected:
-
-  virtual Message *create() const
-  {
-    return new SetUnpackGeometryMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new SetUnpackGeometryMessage((const SetUnpackGeometryMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (SetUnpackGeometryMessage *) message;
-  }
-
-  virtual int encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                 const unsigned int size, int bigEndian,
-                                     ChannelCache *channelCache) const;
-
-  virtual int decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                                 unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
-                                     ChannelCache *channelCache) const;
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* SetUnpackGeometry_H */
diff --git a/nxcomp/ShapeExtension.cpp b/nxcomp/ShapeExtension.cpp
deleted file mode 100644
index be3b9a903..000000000
--- a/nxcomp/ShapeExtension.cpp
+++ /dev/null
@@ -1,301 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "ShapeExtension.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-#include "WriteBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Constructors and destructors.
-//
-
-ShapeExtensionStore::ShapeExtensionStore(StaticCompressor *compressor)
-
-  : MessageStore(compressor)
-{
-  enableCache    = SHAPEEXTENSION_ENABLE_CACHE;
-  enableData     = SHAPEEXTENSION_ENABLE_DATA;
-  enableSplit    = SHAPEEXTENSION_ENABLE_SPLIT;
-
-  // Since ProtoStep7 (#issue 108)
-  enableCompress = SHAPEEXTENSION_ENABLE_COMPRESS_IF_PROTO_STEP_7;
-
-  dataLimit  = SHAPEEXTENSION_DATA_LIMIT;
-  dataOffset = SHAPEEXTENSION_DATA_OFFSET;
-
-  cacheSlots          = SHAPEEXTENSION_CACHE_SLOTS;
-  cacheThreshold      = SHAPEEXTENSION_CACHE_THRESHOLD;
-  cacheLowerThreshold = SHAPEEXTENSION_CACHE_LOWER_THRESHOLD;
-
-  opcode_ = X_NXInternalShapeExtension;
-
-  messages_ -> resize(cacheSlots);
-
-  for (T_messages::iterator i = messages_ -> begin();
-           i < messages_ -> end(); i++)
-  {
-    *i = NULL;
-  }
-
-  temporary_ = NULL;
-}
-
-ShapeExtensionStore::~ShapeExtensionStore()
-{
-  for (T_messages::iterator i = messages_ -> begin();
-           i < messages_ -> end(); i++)
-  {
-    destroy(*i);
-  }
-
-  destroy(temporary_);
-}
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int ShapeExtensionStore::encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                            const unsigned int size, int bigEndian,
-                                                ChannelCache *channelCache) const
-{
-  //
-  // Handle this extension in a way similar to shape.
-  //
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Encoding full message identity.\n" << logofs_flush;
-  #endif
-
-  //
-  // We handle all possible requests of this extension
-  // using the same opcode. We give to message a data
-  // offset of 4 (or 16 if proto is >= 3) and handle
-  // the first 16 bytes through an array of caches.
-  //
-
-  encodeBuffer.encodeValue(size >> 2, 16, 10);
-
-  encodeBuffer.encodeCachedValue(*(buffer + 1), 8,
-                     clientCache -> shapeOpcodeCache);
-
-  for (unsigned int i = 0; i < 8 && (i * 2 + 4) < size; i++)
-  {
-    encodeBuffer.encodeCachedValue(GetUINT(buffer + (i * 2) + 4, bigEndian), 16,
-                       *clientCache -> shapeDataCache[i]);
-  }
-
-  #ifdef DEBUG
-  *logofs << name() << ": Encoded full message identity.\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int ShapeExtensionStore::decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                                            unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
-                                                ChannelCache *channelCache) const
-{
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoding full message identity.\n" << logofs_flush;
-  #endif
-
-  decodeBuffer.decodeValue(size, 16, 10);
-
-  size <<= 2;
-
-  buffer = writeBuffer -> addMessage(size);
-
-  decodeBuffer.decodeCachedValue(*(buffer + 1), 8,
-                     clientCache -> shapeOpcodeCache);
-
-  unsigned int value;
-
-  for (unsigned int i = 0; i < 8 && (i * 2 + 4) < size; i++)
-  {
-    decodeBuffer.decodeCachedValue(value, 16,
-                       *clientCache -> shapeDataCache[i]);
-
-    PutUINT(value, buffer + 4 + (i * 2), bigEndian);
-  }
-
-  #ifdef DEBUG
-  *logofs << name() << ": Decoded full message identity.\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int ShapeExtensionStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                           unsigned int size, int bigEndian) const
-{
-  ShapeExtensionMessage *shapeExtension = (ShapeExtensionMessage *) message;
-
-  shapeExtension -> opcode = *(buffer + 1);
-
-  for (unsigned int i = 0; i < 8; i++)
-  {
-    if ((i * 2 + 4) < size)
-    {
-      shapeExtension -> data[i] = GetUINT(buffer + i * 2 + 4, bigEndian); 
-
-      #ifdef DEBUG
-      *logofs << name() << ": Parsed data[" << i << "].\n"
-              << logofs_flush;
-      #endif
-    }
-    else
-    {
-      shapeExtension -> data[i] = 0;
-    }
-  }
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed identity for message at "
-          << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int ShapeExtensionStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                             unsigned int size, int bigEndian) const
-{
-  ShapeExtensionMessage *shapeExtension = (ShapeExtensionMessage *) message;
-
-  *(buffer + 1) = shapeExtension -> opcode;
-
-  for (unsigned int i = 0; i < 8 && (i * 2 + 4) < size; i++)
-  {
-    PutUINT(shapeExtension -> data[i], buffer + i * 2 + 4, bigEndian);
-  }
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at "
-          << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void ShapeExtensionStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  ShapeExtensionMessage *shapeExtension = (ShapeExtensionMessage *) message;
-
-  *logofs << name() << ": Identity opcode " << (unsigned) shapeExtension -> opcode;
-
-  for (int i = 0; i < 8; i++)
-  {
-    *logofs << ", data[" << i << "] " << shapeExtension -> data[i];
-  }
-
-  *logofs << ", size " << shapeExtension -> size_ << ".\n" << logofs_flush;
-
-  #endif
-}
-
-void ShapeExtensionStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                               unsigned int size, int bigEndian) const
-{
-  //
-  // Include minor opcode in the checksum. As data
-  // offset can be beyond the real end of message,
-  // we need to include size or we will match any
-  // message of size less or equal to data offset.
-  //
-
-  md5_append(md5_state_, buffer + 1,  3);
-}
-
-void ShapeExtensionStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                             const Message *cachedMessage,
-                                                 ChannelCache *channelCache) const
-{
-  //
-  // Encode the variant part.
-  //
-
-  ShapeExtensionMessage *shapeExtension       = (ShapeExtensionMessage *) message;
-  ShapeExtensionMessage *cachedShapeExtension = (ShapeExtensionMessage *) cachedMessage;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  for (int i = 0; i < 8 && (i * 2 + 4) < shapeExtension -> size_; i++)
-  {
-    #ifdef TEST
-    *logofs << name() << ": Encoding value " << shapeExtension -> data[i]
-            << " as data[" << i << "] field.\n" << logofs_flush;
-    #endif
-
-    encodeBuffer.encodeCachedValue((unsigned int) shapeExtension -> data[i], 16,
-                 *clientCache -> shapeDataCache[i]);
-
-    cachedShapeExtension -> data[i] = shapeExtension -> data[i];
-  }
-}
-
-void ShapeExtensionStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                             ChannelCache *channelCache) const
-{
-  ShapeExtensionMessage *shapeExtension = (ShapeExtensionMessage *) message;
-
-  ClientCache *clientCache = (ClientCache *) channelCache;
-
-  unsigned int value;
-
-  for (int i = 0; i < 8 && (i * 2 + 4) < shapeExtension -> size_; i++)
-  {
-    decodeBuffer.decodeCachedValue(value, 16,
-                 *clientCache -> shapeDataCache[i]);
-
-    shapeExtension -> data[i] = (unsigned short) value;
-
-    #ifdef TEST
-    *logofs << name() << ": Decoded value " << shapeExtension -> data[i]
-            << " as data[" << i << "] field.\n" << logofs_flush;
-    #endif
-  }
-}
diff --git a/nxcomp/ShapeExtension.h b/nxcomp/ShapeExtension.h
deleted file mode 100644
index 4dd636847..000000000
--- a/nxcomp/ShapeExtension.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef ShapeExtension_H
-#define ShapeExtension_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define SHAPEEXTENSION_ENABLE_CACHE                       1
-#define SHAPEEXTENSION_ENABLE_DATA                        1
-#define SHAPEEXTENSION_ENABLE_SPLIT                       0
-
-#define SHAPEEXTENSION_DATA_LIMIT                         3200
-#define SHAPEEXTENSION_DATA_OFFSET                        20
-
-#define SHAPEEXTENSION_CACHE_SLOTS                        3000
-#define SHAPEEXTENSION_CACHE_THRESHOLD                    10
-#define SHAPEEXTENSION_CACHE_LOWER_THRESHOLD              5
-
-#define SHAPEEXTENSION_ENABLE_COMPRESS_IF_PROTO_STEP_7    0
-
-//
-// The message class.
-//
-
-class ShapeExtensionMessage : public Message
-{
-  friend class ShapeExtensionStore;
-
-  public:
-
-  ShapeExtensionMessage()
-  {
-  }
-
-  ~ShapeExtensionMessage()
-  {
-  }
-
-  //
-  // Note for encoding in protocol level 1: we consider
-  // for this message a data offset of 4. Bytes from 5
-  // to 20, if present, are taken as part of identity
-  // and encoded through an array of int caches.
-  //
-
-  private:
-
-  unsigned char  opcode;
-  unsigned short data[8];
-};
-
-class ShapeExtensionStore : public MessageStore
-{
-  public:
-
-  ShapeExtensionStore(StaticCompressor *compressor);
-
-  virtual ~ShapeExtensionStore();
-
-  virtual const char *name() const
-  {
-    return "ShapeExtension";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return opcode_;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(ShapeExtensionMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  public:
-
-  virtual Message *create() const
-  {
-    return new ShapeExtensionMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new ShapeExtensionMessage((const ShapeExtensionMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (ShapeExtensionMessage *) message;
-  }
-
-  virtual int encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                 const unsigned int size, int bigEndian,
-                                     ChannelCache *channelCache) const;
-
-  virtual int decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                                 unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
-                                     ChannelCache *channelCache) const;
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-
-  private:
-
-  unsigned char opcode_;
-};
-
-#endif /* ShapeExtension_H */
diff --git a/nxcomp/Socket.cpp b/nxcomp/Socket.cpp
deleted file mode 100644
index 28cb5646d..000000000
--- a/nxcomp/Socket.cpp
+++ /dev/null
@@ -1,753 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include <sys/types.h>
-#include <sys/utsname.h>
-
-#if defined(__CYGWIN32__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__sun)
-#include <netinet/in_systm.h>
-#endif
-
-#ifdef __sun
-#include <unistd.h>
-#include <sys/termios.h>
-#endif
-
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-
-#include <netdb.h>
-#include <fcntl.h>
-
-//
-// System specific defines.
-//
-
-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__sun)
-#define SOL_IP  IPPROTO_IP
-#endif
-
-#ifdef __sun
-#define INADDR_NONE  ((unsigned int) -1)
-#endif
-
-//
-// The TIOCOUTQ ioctl is not implemented on Cygwin.
-// Note also that TIOCOUTQ and IPTOS_LOWDELAY are
-// disabled when running on MacOS/X.
-//
-
-#ifdef __CYGWIN32__
-#define TIOCOUTQ  ((unsigned int) -1)
-#endif
-
-//
-// NX includes.
-//
-
-#include "Misc.h"
-#include "Socket.h"
-
-//
-// Set verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-//
-// Set this only once by querying OS details.
-//
-
-static int _kernelStep = -1;
-
-int GetKernelStep()
-{
-  if (_kernelStep < 0)
-  {
-    //
-    // At the moment only NX clients run on Win32
-    // and MacOS/X so we are not really interested
-    // in the relevant OS dependent functions.
-    //
-
-    #if defined(__CYGWIN32__) || defined(__APPLE__)
-
-    _kernelStep = 0;
-
-    #else
-
-    struct utsname buffer;
-
-    if (uname(&buffer) < 0)
-    {
-      #ifdef WARNING
-      *logofs << "Socket: WARNING! Failed to get system info. Error is "
-              << EGET() << " '" << ESTR() << "'.\n" << logofs_flush;
-
-      *logofs << "Socket: WARNING! Assuming lowest system support.\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Warning" << ": Failed to get system info. Error is "
-           << EGET() << " '" << ESTR() << "'.\n";
-
-      cerr << "Warning" << ": Assuming lowest system support.\n";
-
-      _kernelStep = 0;
-    }
-    else
-    {
-      #ifdef TEST
-      *logofs << "Socket: System is '" << buffer.sysname
-              << "' nodename '" << buffer.nodename << "' release '"
-              << buffer.release << "'.\n" << logofs_flush;
-
-      *logofs << "Socket: Version is '" << buffer.version << "' machine '"
-              << buffer.machine << "'.\n" << logofs_flush;
-      #endif
-
-      //
-      // Should test support on other operating systems.
-      //
-
-      if (strcmp(buffer.sysname, "Linux") == 0)
-      {
-        if (strncmp(buffer.release, "2.0.", 4) == 0 ||
-                strncmp(buffer.release, "2.2.", 4) == 0)
-        {
-          #ifdef TEST
-          *logofs << "Socket: Assuming level 2 system support.\n"
-                  << logofs_flush;
-          #endif
-
-          _kernelStep = 2;
-        }
-        else
-        {
-          #ifdef TEST
-          *logofs << "Socket: Assuming level 3 system support.\n"
-                  << logofs_flush;
-          #endif
-
-          _kernelStep = 3;
-        }
-      }
-      else if (strcmp(buffer.sysname, "SunOS") == 0)
-      {
-        #ifdef TEST
-        *logofs << "Socket: Assuming level 1 system support.\n"
-                << logofs_flush;
-        #endif
-
-        _kernelStep = 1;
-      }
-      else
-      {
-        #ifdef TEST
-        *logofs << "Socket: Assuming level 0 system support.\n"
-                << logofs_flush;
-        #endif
-
-        _kernelStep = 0;
-      }
-    }
-
-    #endif /* #if defined(__CYGWIN32__) || defined(__APPLE__) */
-  }
-
-  return _kernelStep;
-}
-  
-int SetReuseAddress(int fd)
-{
-  int flag = 1;
-
-  if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR,
-                     (char *) &flag, sizeof(flag)) < 0)
-  {
-    #ifdef PANIC
-    *logofs << "Socket: PANIC! Failed to set SO_REUSEADDR flag on FD#"
-            << fd << ". Error is " << EGET() << " '" << ESTR() << "'.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Failed to set SO_REUSEADDR flag on FD#"
-            << fd << ". Error is " << EGET() << " '" << ESTR()
-            << "'.\n";
-
-    return -1;
-  }
-  #ifdef TEST
-  else
-  {
-    *logofs << "Socket: Set SO_REUSEADDR flag on FD#"
-            << fd << ".\n" << logofs_flush;
-  }
-  #endif
-
-  return 1;
-}
-
-int SetNonBlocking(int fd, int value)
-{
-  int flags = fcntl(fd, F_GETFL);
-
-  if (flags >= 0)
-  {
-    if (value == 0)
-    {
-      flags &= ~O_NONBLOCK;
-    }
-    else
-    {
-      flags |= O_NONBLOCK;
-    }
-  }
-
-  if (flags < 0 || fcntl(fd, F_SETFL, flags) < 0)
-  {
-    #ifdef PANIC
-    *logofs << "Socket: PANIC! Failed to set O_NONBLOCK flag on FD#"
-            << fd << " to " << value << ". Error is " << EGET()
-            << " '" << ESTR() << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Failed to set O_NONBLOCK flag on FD#"
-         << fd << " to " << value << ". Error is " << EGET()
-         << " '" << ESTR() << "'.\n";
-
-    return -1;
-  }
-  #ifdef TEST
-  else
-  {
-    *logofs << "Socket: Set O_NONBLOCK flag on FD#"
-            << fd << " to " << value << ".\n"
-            << logofs_flush;
-  }
-  #endif
-
-  return 1;
-}
-
-int SetLingerTimeout(int fd, int timeout)
-{
-  struct linger linger_value;
-
-  if (timeout > 0)
-  {
-    linger_value.l_onoff  = 1;
-    linger_value.l_linger = timeout;
-  }
-  else
-  {
-    linger_value.l_onoff  = 0;
-    linger_value.l_linger = 0;
-  }
-
-  if (setsockopt(fd, SOL_SOCKET, SO_LINGER, &linger_value, sizeof(linger_value)) < 0)
-  {
-    #ifdef PANIC
-    *logofs << "Socket: PANIC! Failed to set SO_LINGER values to "
-            << linger_value.l_onoff << " and " << linger_value.l_linger
-            << " on FD#" << fd << ". Error is " << EGET() << " '"
-            << ESTR() << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Failed to set SO_LINGER values to "
-         << linger_value.l_onoff << " and " << linger_value.l_linger
-         << " on FD#" << fd << ". Error is " << EGET() << " '"
-         << ESTR() << "'.\n";
-
-    return -1;
-  }
-  #ifdef TEST
-  else
-  {
-    *logofs << "Socket: Set SO_LINGER values to "
-            << linger_value.l_onoff << " and " << linger_value.l_linger
-            << " on FD#" << fd << ".\n" << logofs_flush;
-  }
-  #endif
-
-  return 1;
-}
-
-int SetSendBuffer(int fd, int size)
-{
-  if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &size, sizeof(size)) < 0)
-  {
-    #ifdef PANIC
-    *logofs << "Socket: PANIC! Failed to set SO_SNDBUF size to "
-            << size << " on FD#" << fd << ". Error is "
-            << EGET() << " '" << ESTR() << "'.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Failed to set SO_SNDBUF size to "
-         << size << " on FD#" << fd << ". Error is "
-         << EGET() << " '" << ESTR() << "'.\n";
-
-    return -1;
-  }
-  #ifdef TEST
-  else
-  {
-    *logofs << "Socket: Set SO_SNDBUF on FD#" << fd
-            << " to " << size << " bytes.\n"
-            << logofs_flush;
-  }
-  #endif
-
-  return 1;
-}
-
-int SetReceiveBuffer(int fd, int size)
-{
-  if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &size, sizeof(size)) < 0)
-  {
-    #ifdef PANIC
-    *logofs << "Socket: PANIC! Failed to set SO_RCVBUF size to "
-            << size << " on FD#" << fd << ". Error is "
-            << EGET() << " '" << ESTR() << "'.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Failed to set SO_RCVBUF size to "
-         << size << " on FD#" << fd << ". Error is "
-         << EGET() << " '" << ESTR() << "'.\n";
-
-    return -1;
-  }
-  #ifdef TEST
-  else
-  {
-    *logofs << "Socket: Set SO_RCVBUF on FD#" << fd
-            << " to " << size << " bytes.\n"
-            << logofs_flush;
-  }
-  #endif
-
-  return 1;
-}
-
-int SetNoDelay(int fd, int value)
-{
-  int result = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &value, sizeof(value));
-
-  if (result == 0)
-  {
-    result = 1;
-  }
-  else if (result < 0)
-  {
-    //
-    // Is it become a different error on
-    // Mac OSX 10.4?
-    //
-
-    #if defined(__APPLE__)
-
-    result = 0;
-
-    #endif
-
-    #if defined(__sun)
-
-    if (EGET() == ENOPROTOOPT)
-    {
-      result = 0;
-    }
-
-    #endif
-
-    #if !defined(__APPLE__) && !defined(__sun)
-
-    if (EGET() == EOPNOTSUPP)
-    {
-      result = 0;
-    }
-
-    #endif
-  }
-
-  if (result < 0)
-  {
-    #ifdef PANIC
-    *logofs << "Socket: PANIC! Failed to set TCP_NODELAY flag on "
-            << "FD#" << fd << " to " << value << ". Error is "
-            << EGET() << " '" << ESTR() << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Failed to set TCP_NODELAY flag on "
-         << "FD#" << fd << " to " << value << ". Error is "
-         << EGET() << " '" << ESTR() << "'.\n";
-  }
-  #ifdef TEST
-  else if (result == 0)
-  {
-    #ifdef TEST
-    *logofs << "Socket: Option TCP_NODELAY not supported "
-            << "on FD#" << fd << ".\n" << logofs_flush;
-    #endif
-  }
-  else
-  {
-    *logofs << "Socket: Set TCP_NODELAY flag on FD#"
-            << fd << " to " << value << ".\n"
-            << logofs_flush;
-  }
-  #endif
-
-  return result;
-}
-
-int SetKeepAlive(int fd)
-{
-  int flag = 1;
-
-  if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &flag, sizeof(flag)) < 0)
-  {
-    #ifdef PANIC
-    *logofs << "Socket: PANIC! Failed to set SO_KEEPALIVE flag on "
-            << "FD#" << fd << ". Error is " << EGET() << " '"
-            << ESTR() << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Failed to set SO_KEEPALIVE flag on "
-         << "FD#" << fd << ". Error is " << EGET() << " '"
-         << ESTR() << "'.\n";
-
-    return -1;
-  }
-  #ifdef TEST
-  else
-  {
-    *logofs << "Socket: Set SO_KEEPALIVE flag on FD#"
-            << fd << ".\n" << logofs_flush;
-  }
-  #endif
-
-  return 1;
-}
-
-int SetLowDelay(int fd)
-{
-  if (_kernelStep < 0)
-  {
-    GetKernelStep();
-  }
-
-  switch (_kernelStep)
-  {
-    case 3:
-    case 2:
-    case 1:
-    {
-      int flag = IPTOS_LOWDELAY;
-
-      if (setsockopt(fd, SOL_IP, IP_TOS, &flag, sizeof(flag)) < 0)
-      {
-        if (EGET() == EOPNOTSUPP)
-        {
-          #ifdef TEST
-          *logofs << "Socket: Option IPTOS_LOWDELAY not supported "
-                  << "on FD#" << fd << ".\n" << logofs_flush;
-          #endif
-
-          return 0;
-        }
-        else
-        {
-          #ifdef WARNING
-          *logofs << "Socket: WARNING! Failed to set IPTOS_LOWDELAY flag on "
-                  << "FD#" << fd << ". Error is " << EGET() << " '" << ESTR()
-                  << "'.\n" << logofs_flush;
-          #endif
-
-          cerr << "Warning" << ": Failed to set IPTOS_LOWDELAY flag on "
-               << "FD#" << fd << ". Error is " << EGET() << " '" << ESTR()
-               << "'.\n";
-
-          return -1;
-        }
-      }
-      #ifdef TEST
-      else
-      {
-        *logofs << "Socket: Set IPTOS_LOWDELAY flag on FD#"
-                << fd << ".\n" << logofs_flush;
-      }
-      #endif
-
-      return 1;
-    }
-    default:
-    {
-      #ifdef TEST
-      *logofs << "Socket: Option IPTOS_LOWDELAY not "
-              << "supported on FD#" << fd << ".\n"
-              << logofs_flush;
-      #endif
-
-      return 0;
-    }
-  }
-}
-
-int SetCloseOnExec(int fd)
-{
-  if (fcntl(fd, F_SETFD, 1) != 0)
-  {
-    #ifdef TEST
-    *logofs << "NXClient: PANIC! Cannot set close-on-exec "
-            << "on FD#" << fd << ". Error is " << EGET()
-            << " '" << ESTR() << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Cannot set close-on-exec on FD#"
-         << fd << ". Error is " << EGET() << " '" << ESTR()
-         << "'.\n";
-
-    return -1;
-  }
-
-  return 1;
-}
-
-int GetBytesReadable(int fd)
-{
-  long readable = 0;
-
-  //
-  // It may fail, for example at session
-  // shutdown.
-  //
-
-  if (ioctl(fd, FIONREAD, &readable) < 0)
-  {
-    #ifdef TEST
-    *logofs << "Socket: PANIC! Failed to get bytes readable "
-            << "from FD#" << fd << ". Error is " << EGET()
-            << " '" << ESTR() << "'.\n" << logofs_flush;
-    #endif
-
-    return -1;
-  }
-
-  #ifdef TEST
-  *logofs << "Socket: Returning " << (int) readable
-          << " bytes readable on FD#" << fd << ".\n"
-           << logofs_flush;
-  #endif
-
-  return (int) readable;
-}
-
-int GetBytesWritable(int fd)
-{
-  if (_kernelStep < 0)
-  {
-    GetKernelStep();
-  }
-
-  long writable;
-
-  switch (_kernelStep)
-  {
-    case 3:
-    {
-      //
-      // TODO: Should query the real size
-      // of the TCP write buffer.
-      //
-
-      writable = 16384 - GetBytesQueued(fd);
-
-      if (writable < 0)
-      {
-        writable = 0;
-      }
-
-      break;
-    }
-    case 2:
-    {
-      if (ioctl(fd, TIOCOUTQ, (void *) &writable) < 0)
-      {
-        #ifdef PANIC
-        *logofs << "Socket: PANIC! Failed to get bytes writable "
-                << "on FD#" << fd << ". Error is " << EGET()
-                << " '" << ESTR() << "'.\n" << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Failed to get bytes writable "
-             << "on FD#" << fd << ". Error is " << EGET()
-             << " '" << ESTR() << "'.\n";
-
-        return -1;
-      }
-
-      break;
-    }
-    default:
-    {
-      #ifdef TEST
-      *logofs << "Socket: Option TIOCOUTQ not supported "
-              << "on FD#" << fd << ",\n" << logofs_flush;
-      #endif
-
-      //
-      // TODO: Should query the real size
-      // of the TCP write buffer.
-      //
-
-      writable = 16384;
-
-      break;
-    }
-  }
-
-  #ifdef TEST
-  *logofs << "Socket: Returning " << writable
-          << " bytes writable on FD#" << fd
-          << ".\n" << logofs_flush;
-  #endif
-
-  return (int) writable;
-}
-
-int GetBytesQueued(int fd)
-{
-  //
-  // The TIOCOUTQ ioctl is not implemented on Cygwin
-  // and returns the space available on Linux Kernels
-  // 2.0 and 2.2 (like current MIPS for PS/2).
-  //
-
-  if (_kernelStep < 0)
-  {
-    GetKernelStep();
-  }
-
-  long queued;
-
-  switch (_kernelStep)
-  {
-    case 3:
-    {
-      if (ioctl(fd, TIOCOUTQ, (void *) &queued) < 0)
-      {
-        #ifdef PANIC
-        *logofs << "Socket: PANIC! Failed to get bytes queued "
-                << "on FD#" << fd << ". Error is " << EGET()
-                << " '" << ESTR() << "'.\n" << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Failed to get bytes queued "
-             << "on FD#" << fd << ". Error is " << EGET()
-             << " '" << ESTR() << "'.\n";
-
-        return -1;
-      }
-
-      break;
-    }
-    case 2:
-    {
-      //
-      // TODO: Should query the real size
-      // of the TCP write buffer.
-      //
-
-      queued = 16384 - GetBytesWritable(fd);
-
-      if (queued < 0)
-      {
-        queued = 0;
-      }
-
-      break;
-    }
-    default:
-    {
-      #ifdef TEST
-      *logofs << "Socket: Option TIOCOUTQ not supported "
-              << "on FD#" << fd << ",\n" << logofs_flush;
-      #endif
-
-      queued = 0;
-
-      break;
-    }
-  }
-
-  #ifdef TEST
-  *logofs << "Socket: Returning " << queued
-          << " bytes queued on FD#" << fd
-          << ".\n" << logofs_flush;
-  #endif
-
-  return (int) queued;
-}
-
-int GetHostAddress(const char *name)
-{
-  hostent *host = gethostbyname(name);
-
-  if (host == NULL)
-  {
-    //
-    // On some Unices gethostbyname() doesn't
-    // accept IP addresses, so try inet_addr.
-    //
-
-    IN_ADDR_T address = inet_addr(name);
-
-    if (address == INADDR_NONE)
-    {
-      #ifdef PANIC
-      *logofs << "Socket: PANIC! Failed to resolve address of '"
-              << name << "'.\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Failed to resolve address of '"
-           << name << "'.\n";
-
-      return 0;
-    }
-
-    return (int) address;
-  }
-  else
-  {
-    return (*((int *) host -> h_addr_list[0]));
-  }
-}
diff --git a/nxcomp/Socket.h b/nxcomp/Socket.h
deleted file mode 100644
index 5e7e47705..000000000
--- a/nxcomp/Socket.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef Socket_H
-#define Socket_H
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-
-#ifdef __sun
-#include <stropts.h>
-#include <sys/filio.h>
-#endif
-
-//
-// Set socket options.
-//
-
-int SetReuseAddress(int fd);
-int SetNonBlocking(int fd, int value);
-int SetLingerTimeout(int fd, int timeout);
-int SetSendBuffer(int fd, int size);
-int SetReceiveBuffer(int fd, int size);
-int SetNoDelay(int fd, int value);
-int SetKeepAlive(int fd);
-int SetLowDelay(int fd);
-int SetCloseOnExec(int fd);
-
-//
-// Get kernel support level.
-//
-
-int GetKernelStep();
-
-//
-// Get socket info.
-//
-
-int GetBytesReadable(int fd);
-int GetBytesWritable(int fd);
-int GetBytesQueued(int fd);
-
-//
-// Inline version, providing direct access
-// to the interface.
-//
-
-#include "Misc.h"
-
-inline int GetBytesReadable(int fd, int *readable)
-{
-  long t;
-
-  int result = ioctl(fd, FIONREAD, &t);
-
-  #ifdef DEBUG
-  *logofs << "Socket: Bytes readable from FD#"
-          << fd << " are " << t << " with result "
-          << result << ".\n" << logofs_flush;
-  #endif
-
-  *readable = (int) t;
-
-  return result;
-}
-
-//
-// Query Internet address.
-//
-
-int GetHostAddress(const char *name);
-
-#endif /* Socket_H */
diff --git a/nxcomp/Split.cpp b/nxcomp/Split.cpp
deleted file mode 100644
index b6828c7cb..000000000
--- a/nxcomp/Split.cpp
+++ /dev/null
@@ -1,1835 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include <unistd.h>
-#include <cstring>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <utime.h>
-
-#include "Misc.h"
-
-#include "Split.h"
-
-#include "Control.h"
-#include "Statistics.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-#include "StaticCompressor.h"
-
-#include "Unpack.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Define this to trace elements
-// allocated and deallocated.
-//
-
-#undef  REFERENCES
-
-//
-// Counters used for store control.
-//
-
-int SplitStore::totalSplitSize_;
-int SplitStore::totalSplitStorageSize_;
-
-//
-// This is used for reference count.
-//
-
-#ifdef REFERENCES
-
-int Split::references_ = 0;
-
-#endif
-
-Split::Split()
-{
-  resource_ = nothing;
-  position_ = nothing;
-
-  store_ = NULL;
-
-  d_size_ = 0;
-  i_size_ = 0;
-  c_size_ = 0;
-  r_size_ = 0;
-
-  next_ = 0;
-  load_ = 0;
-  save_ = 0;
-
-  checksum_ = NULL;
-  state_    = split_undefined;
-  mode_     = split_none;
-  action_   = is_discarded;
-
-  #ifdef REFERENCES
-
-  references_++;
-
-  *logofs << "Split: Created new Split at " 
-          << this << " out of " << references_ 
-          << " allocated references.\n" << logofs_flush;
-  #endif
-}
-
-Split::~Split()
-{
-  delete [] checksum_;
-
-  #ifdef REFERENCES
-
-  references_--;
-
-  *logofs << "Split: Deleted Split at " 
-          << this << " out of " << references_ 
-          << " allocated references.\n" << logofs_flush;
-  #endif
-}
-
-SplitStore::SplitStore(StaticCompressor *compressor, CommitStore *commits, int resource)
-
-  : compressor_(compressor), commits_(commits), resource_(resource)
-{
-  splits_ = new T_splits();
-
-  current_ = splits_ -> end();
-
-  splitStorageSize_ = 0;
-
-  #ifdef TEST
-  *logofs << "SplitStore: Created new store [";
-
-  if (resource_ != nothing)
-  {
-    *logofs << resource_;
-  }
-  else
-  {
-    *logofs << "commit";
-  }
-  
-  *logofs << "].\n" << logofs_flush;
-
-  *logofs << "SplitStore: Total messages in stores are "
-          << totalSplitSize_ << " with total storage size "
-          << totalSplitStorageSize_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-
-SplitStore::~SplitStore()
-{
-  totalSplitSize_ -= splits_ -> size();
-
-  totalSplitStorageSize_ -= splitStorageSize_;
-
-  for (T_splits::iterator i = splits_ -> begin();
-           i != splits_ -> end(); i++)
-  {
-    delete *i;
-  }
-
-  delete splits_;
-
-  #ifdef TEST
-  *logofs << "SplitStore: Deleted store [";
-
-  if (resource_ != nothing)
-  {
-    *logofs << resource_;
-  }
-  else
-  {
-    *logofs << "commit";
-  }
-  
-  *logofs << "] with storage size " << splitStorageSize_
-          << ".\n" << logofs_flush;
-
-  *logofs << "SplitStore: Total messages in stores are "
-          << totalSplitSize_ << " with total storage size "
-          << totalSplitStorageSize_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-
-//
-// This is called at the encoding side.
-//
-
-Split *SplitStore::add(MessageStore *store, int resource, T_split_mode mode,
-                           int position, T_store_action action, T_checksum checksum,
-                               const unsigned char *buffer, const int size)
-{
-  #ifdef TEST
-  *logofs << "SplitStore: Adding message [" << (unsigned int) store ->
-             opcode() << "] resource " << resource << " mode " << mode
-          << " position " << position << " action [" << DumpAction(action)
-          << "] and checksum [" << DumpChecksum(checksum) << "]"
-          << ".\n" << logofs_flush;
-  #endif
-
-  Split *split = new Split();
-
-  if (split == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "SplitStore: PANIC! Can't allocate "
-            << "memory for the split.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Can't allocate memory "
-         << "for the split.\n";
-
-    HandleAbort();
-  }
-
-  split -> store_    = store;
-  split -> resource_ = resource;
-  split -> mode_     = mode;
-  split -> position_ = position;
-  split -> action_   = action;
-
-  split -> store_ -> validateSize(size);
-
-  //
-  // The checksum is not provided if the
-  // message is cached.
-  //
-
-  if (checksum != NULL)
-  {
-    split -> checksum_ = new md5_byte_t[MD5_LENGTH];
-
-    memcpy(split -> checksum_, checksum, MD5_LENGTH);
-  }
-
-  //
-  // We don't need the identity data at the
-  // encoding side. This qualifies the split
-  // as a split generated at the encoding
-  // side.
-  //
-
-  split -> i_size_ = store -> identitySize(buffer, size);
-
-  split -> d_size_ = size - split -> i_size_;
-
-  if (action == IS_ADDED || action == is_discarded)
-  {
-    //
-    // If the message was added to message
-    // store or discarded we need to save
-    // the real data so we can transfer it
-    // at later time.
-    //
-
-    split -> data_.resize(split -> d_size_);
-
-    memcpy(split -> data_.begin(), buffer + split -> i_size_, split -> d_size_);
-
-    //
-    // If the message was added, lock it so
-    // it will not be used by the encoding
-    // side until it is recomposed.
-    //
-
-    if (action == IS_ADDED)
-    {
-      split -> store_ -> lock(split -> position_);
-
-      #ifdef TEST
-
-      commits_ -> validate(split);
-
-      #endif
-    }
-  }
-  #ifdef WARNING
-  else
-  {
-    *logofs << "SplitStore: WARNING! Not copying data for the cached message.\n"
-            << logofs_flush;
-  }
-  #endif
-
-  push(split);
-
-  return split;
-}
-
-//
-// This is called at decoding side. If checksum
-// is provided, the message can be searched on
-// disk, then, if message is found, an event is
-// sent to abort the data transfer.
-//
-
-Split *SplitStore::add(MessageStore *store, int resource, int position,
-                           T_store_action action, T_checksum checksum,
-                               unsigned char *buffer, const int size)
-{
-  #ifdef TEST
-  *logofs << "SplitStore: Adding message ["
-          << (unsigned int) store -> opcode() << "] resource "
-          << resource << " position " << position << " action ["
-          << DumpAction(action) << "] and checksum ["
-          << DumpChecksum(checksum) << "].\n" << logofs_flush;
-  #endif
-
-  Split *split = new Split();
-
-  if (split == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "SplitStore: PANIC! Can't allocate "
-            << "memory for the split.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Can't allocate memory "
-         << "for the split.\n";
-
-    HandleAbort();
-  }
-
-  split -> store_    = store;
-  split -> resource_ = resource;
-  split -> position_ = position;
-  split -> action_   = action;
-
-  split -> store_ -> validateSize(size);
-
-  //
-  // Check if the checksum was provided
-  // by the remote.
-  //
-
-  if (checksum != NULL)
-  {
-    split -> checksum_ = new md5_byte_t[MD5_LENGTH];
-
-    memcpy(split -> checksum_, checksum, MD5_LENGTH);
-  }
-
-  split -> i_size_ = store -> identitySize(buffer, size);
-
-  //
-  // Copy the identity so we can expand the
-  // message when it is committed.
-  //
-
-  split -> identity_.resize(split -> i_size_);
-
-  memcpy(split -> identity_.begin(), buffer, split -> i_size_);
-
-  split -> d_size_ = size - split -> i_size_;
-
-  if (action == IS_ADDED || action == is_discarded)
-  {
-    //
-    // The unpack procedure will check if the
-    // first 2 bytes of the buffer contain the
-    // pattern and will not try to expand the
-    // image.
-    //
-
-    split -> data_.resize(2);
-
-    unsigned char *data = split -> data_.begin();
-
-    data[0] = SPLIT_PATTERN;
-    data[1] = SPLIT_PATTERN;
-
-    //
-    // If the message was added to the store,
-    // we don't have the data part, yet, so
-    // we need to lock the message until it
-    // is recomposed.
-    //
-
-    if (action == IS_ADDED)
-    {
-      split -> store_ -> lock(split -> position_);
-
-      #ifdef TEST
-
-      commits_ -> validate(split);
-
-      #endif
-    }
-  }
-  else
-  {
-    #ifdef WARNING
-    *logofs << "SplitStore: WARNING! Copying data for the cached message.\n"
-            << logofs_flush;
-    #endif
-
-    //
-    // We may optionally take the data from the
-    // message store in compressed form, but,
-    // as the data has been decompressed in the
-    // buffer, we save a further decompression.
-    //
-
-    split -> data_.resize(split -> d_size_);
-
-    memcpy(split -> data_.begin(), buffer + split -> i_size_, split -> d_size_);
-  }
-
-  push(split);
-
-  return split;
-}
-
-void SplitStore::push(Split *split)
-{
-  splits_ -> push_back(split);
-
-  splitStorageSize_ += getNodeSize(split);
-
-  totalSplitSize_++;
-
-  totalSplitStorageSize_ += getNodeSize(split);
-
-  statistics -> addSplit();
-
-  #ifdef TEST
-  *logofs << "SplitStore: There are " << splits_ -> size()
-          << " messages in store [" << resource_ << "] with "
-          << "storage size " << splitStorageSize_ << ".\n"
-          << logofs_flush;
-
-  *logofs << "SplitStore: Total messages in stores are "
-          << totalSplitSize_ << " with total storage size "
-          << totalSplitStorageSize_ << ".\n"
-          << logofs_flush;
-  #endif
-
-  split -> state_ = split_added;
-}
-
-void SplitStore::dump()
-{
-  #ifdef DUMP
-
-  int n;
-
-  Split *split;
-
-  *logofs << "SplitStore: DUMP! Dumping content of ";
-
-  if (commits_ == NULL)
-  {
-    *logofs << "[commits]";
-  }
-  else
-  {
-    *logofs << "[splits] for store [" << resource_ << "]";
-  }
-
-  *logofs << " with [" << getSize() << "] elements "
-          << "in the store.\n" << logofs_flush;
-
-  n = 0;
-
-  for (T_splits::iterator i = splits_ -> begin(); i != splits_ -> end(); i++, n++)
-  {
-    split = *i;
-
-    *logofs << "SplitStore: DUMP! Split [" << n << "] has action ["
-            << DumpAction(split -> action_) << "] state ["
-            << DumpState(split -> state_) << "] ";
-
-    if (split -> resource_ >= 0)
-    {
-      *logofs << "resource " << split -> resource_;
-    }
-
-    *logofs << " request " << (unsigned) split -> store_ -> opcode()
-            << " position " << split -> position_ << " size is "
-            << split -> data_.size() << " (" << split -> d_size_
-            << "/" << split -> c_size_ << "/" << split -> r_size_
-            << ") with " << split -> data_.size() - split -> next_
-            << "] bytes to go.\n" << logofs_flush;
-  }
-
-  #endif
-}
-
-int SplitStore::send(EncodeBuffer &encodeBuffer, int packetSize)
-{
-  if (splits_ -> size() == 0)
-  {
-    #ifdef PANIC
-    *logofs << "SplitStore: PANIC! Function send called with no splits available.\n" 
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Function send called with no splits available.\n";
-
-    HandleAbort();
-  }
-
-  //
-  // A start operation must always be executed on
-  // the split, even in the case the split will be
-  // later aborted.
-  // 
-
-  if (current_ == splits_ -> end())
-  {
-    start(encodeBuffer);
-  }
-
-  //
-  // If we have matched the checksum received from
-  // the remote side then we must abort the current
-  // split, else we can send another block of data
-  // to the remote peer.
-  //
-
-  Split *split = *current_;
-
-  unsigned int abort = 0;
-
-  if (split -> state_ == split_loaded)
-  {
-    abort = 1;
-  }
-
-  encodeBuffer.encodeBoolValue(abort);
-
-  if (abort == 1)
-  {
-    #ifdef TEST
-    *logofs << "SplitStore: Aborting split for checksum ["
-            << DumpChecksum(split -> checksum_) << "] position "
-            << split -> position_ << " with " << (split ->
-               data_.size() - split -> next_) << " bytes to go "
-            << "out of " << split -> data_.size()
-            << ".\n" << logofs_flush;
-    #endif
-
-    statistics -> addSplitAborted();
-
-    statistics -> addSplitAbortedBytesOut(split -> data_.size() - split -> next_);
-
-    split -> next_ = split -> data_.size();
-
-    split -> state_ = split_aborted;
-  }
-  else
-  {
-    int count = (packetSize <= 0 || split -> next_ +
-                     packetSize > (int) split -> data_.size() ?
-                         split -> data_.size() - split -> next_ : packetSize);
-
-    #ifdef TEST
-    *logofs << "SplitStore: Sending split for checksum ["
-            << DumpChecksum(split -> checksum_) << "] count "
-            << count << " position " << split -> position_
-            << ". Data size is " << split -> data_.size() << " ("
-            << split -> d_size_ << "/" << split -> c_size_ << "), "
-            << split -> data_.size() - (split -> next_ + count)
-            << " to go.\n" << logofs_flush;
-    #endif
-
-    encodeBuffer.encodeValue(count, 32, 10);
-
-    encodeBuffer.encodeMemory(split -> data_.begin() + split -> next_, count);
-
-    split -> next_ += count;
-  }
-
-  //
-  // Was data completely transferred? We are the
-  // sending side. We must update the message in
-  // store, even if split was aborted.
-  //
-
-  if (split -> next_ != ((int) split -> data_.size()))
-  {
-    return 0;
-  }
-
-  //
-  // Move the split at the head of the
-  // list to the commits.
-  //
-
-  remove(split);
-
-  //
-  // Reset current position to the
-  // end of repository.
-  //
-
-  current_ = splits_ -> end();
-
-  #ifdef TEST
-  *logofs << "SplitStore: Removed split at head of the list. "
-          << "Resource is " << split -> resource_ << " request "
-          << (unsigned) split -> store_ -> opcode() << " position "
-          << split -> position_ << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int SplitStore::start(EncodeBuffer &encodeBuffer)
-{
-  //
-  // Get the element at the top of the
-  // list.
-  //
-
-  current_ = splits_ -> begin();
-
-  Split *split = *current_;
-
-  #ifdef TEST
-  *logofs << "SplitStore: Starting split for checksum ["
-          << DumpChecksum(split -> checksum_) << "] position "
-          << split -> position_ << " with " << (split ->
-             data_.size() - split -> next_) << " bytes to go "
-          << "out of " << split -> data_.size()
-          << ".\n" << logofs_flush;
-  #endif
-
-  //
-  // See if compression of the data part is
-  // enabled.
-  //
-
-  if (split -> store_ -> enableCompress)
-  {
-    //
-    // If the split is going to be aborted don't
-    // compress the data and go straight to the
-    // send. The new data size will be assumed
-    // from the disk cache.
-    //
-
-    if (split -> state_ != split_loaded)
-    {
-      unsigned int compressedSize = 0;
-      unsigned char *compressedData = NULL;
-
-      if (control -> LocalDataCompression &&
-              (compressor_ -> compressBuffer(split -> data_.begin(), split -> d_size_,
-                                                 compressedData, compressedSize)))
-      {
-        //
-        // Replace the data with the one in
-        // compressed form.
-        //
-
-        #ifdef TEST
-        *logofs << "SplitStore: Split data of size " << split -> d_size_
-                << " has been compressed to " << compressedSize 
-                << " bytes.\n" << logofs_flush;
-        #endif
-
-        split -> data_.clear();
-
-        split -> data_.resize(compressedSize);
-
-        memcpy(split -> data_.begin(), compressedData, compressedSize);
-
-        split -> c_size_ = compressedSize;
-
-        //
-        // Inform our peer that the data is
-        // compressed and send the new size.
-        //
-
-        encodeBuffer.encodeBoolValue(1);
-
-        encodeBuffer.encodeValue(compressedSize, 32, 14);
-
-        #ifdef TEST
-        *logofs << "SplitStore: Signaled " << split -> c_size_
-                << " bytes of compressed data for this message.\n"
-                << logofs_flush;
-        #endif
-
-        return 1;
-      }
-    }
-    #ifdef TEST
-    else
-    {
-      *logofs << "SplitStore: Not trying to compress the "
-              << "loaded message.\n" << logofs_flush;
-    }
-    #endif
-
-    //
-    // Tell to the remote that data will
-    // follow uncompressed.
-    //
-
-    encodeBuffer.encodeBoolValue(0);
-  }
-
-  return 1;
-}
-
-int SplitStore::start(DecodeBuffer &decodeBuffer)
-{
-  #ifdef TEST
-  *logofs << "SplitStore: Going to receive a new split from the remote side.\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // Get the element at the head
-  // of the list.
-  //
-
-  current_ = splits_ -> begin();
-
-  Split *split = *current_;
-
-  unsigned int compressedSize = 0;
-
-  //
-  // Save the data size known by the remote.
-  // This information will be needed if the
-  // remote will not have a chance to abort
-  // the split.
-  //
-
-  split -> r_size_ = split -> d_size_;
-
-  //
-  // Find out if data was compressed by the
-  // remote.
-  //
-
-  if (split -> store_ -> enableCompress)
-  {
-    decodeBuffer.decodeBoolValue(compressedSize);
-
-    if (compressedSize == 1)
-    {
-      //
-      // Get the compressed size.
-      //
-
-      // Since ProtoStep7 (#issue 108)
-      decodeBuffer.decodeValue(compressedSize, 32, 14);
-
-      split -> store_ -> validateSize(split -> d_size_, compressedSize);
-
-      split -> r_size_ = compressedSize;
-    }
-  }
-
-  //
-  // Update the size if the split
-  // was not already loaded.
-  //
-
-  if (split -> state_ != split_loaded)
-  {
-    split -> data_.clear();
-
-    if (compressedSize > 0)
-    {
-      split -> c_size_ = compressedSize;
-
-      #ifdef TEST
-      *logofs << "SplitStore: Split data of size "
-              << split -> d_size_ << " was compressed to "
-              << split -> c_size_ << " bytes.\n"
-              << logofs_flush;
-      #endif
-
-      split -> data_.resize(split -> c_size_);
-    }
-    else
-    {
-      split -> data_.resize(split -> d_size_);
-    }
-
-    unsigned char *data = split -> data_.begin();
-
-    data[0] = SPLIT_PATTERN;
-    data[1] = SPLIT_PATTERN;
-  }
-  #ifdef TEST
-  else
-  {
-    //
-    // The message had been already
-    // loaded from disk.
-    //
-
-    if (compressedSize > 0)
-    {
-      if ((int) compressedSize != split -> c_size_)
-      {
-        *logofs << "SplitStore: WARNING! Compressed data size is "
-                << "different than the loaded compressed size.\n"
-                << logofs_flush;
-      }
-
-      *logofs << "SplitStore: Ignoring the new size with "
-              << "loaded compressed size " << split -> c_size_
-              << ".\n" << logofs_flush;
-    }
-  }
-  #endif
-
-  return 1;
-}
-
-int SplitStore::receive(DecodeBuffer &decodeBuffer)
-{
-  if (splits_ -> size() == 0)
-  {
-    #ifdef PANIC
-    *logofs << "SplitStore: PANIC! Function receive called with no splits available.\n" 
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Function receive called with no splits available.\n";
-
-    HandleAbort();
-  }
-
-  if (current_ == splits_ -> end())
-  {
-    start(decodeBuffer);
-  }
-
-  //
-  // Check first if split was aborted, else add
-  // any new data to message being recomposed.
-  //
-
-  Split *split = *current_;
-
-  unsigned int abort = 0;
-
-  decodeBuffer.decodeBoolValue(abort);
-
-  if (abort == 1)
-  {
-    #ifdef TEST
-    *logofs << "SplitStore: Aborting split for checksum ["
-            << DumpChecksum(split -> checksum_) << "] position "
-            << split -> position_ << " with " << (split ->
-               data_.size() - split -> next_) << " bytes to go "
-            << "out of " << split -> data_.size()
-            << ".\n" << logofs_flush;
-    #endif
-
-    statistics -> addSplitAborted();
-
-    statistics -> addSplitAbortedBytesOut(split -> r_size_ - split -> next_);
-
-    split -> next_ = split -> r_size_;
-
-    split -> state_ = split_aborted;
-  }
-  else
-  {
-    //
-    // Get the size of the packet.
-    //
-
-    unsigned int count;
-
-    decodeBuffer.decodeValue(count, 32, 10);
-
-    //
-    // If the split was not already loaded from
-    // disk, decode the packet and update our
-    // copy of the data. The encoding side may
-    // have not received the abort event, yet,
-    // and may be unaware that the message is
-    // stored in compressed form at our side.
-    //
-
-    #ifdef TEST
-    *logofs << "SplitStore: Receiving split for checksum ["
-            << DumpChecksum(split -> checksum_) << "] count "
-            << count << " position " << split -> position_
-            << ". Data size is " << split -> data_.size() << " ("
-            << split -> d_size_ << "/" << split -> c_size_ << "/"
-            << split -> r_size_ << "), " << split -> r_size_ -
-               (split -> next_ + count) << " to go.\n"
-            << logofs_flush;
-    #endif
-
-    if (split -> next_ + count > (unsigned) split -> r_size_)
-    {
-      #ifdef PANIC
-      *logofs << "SplitStore: PANIC! Invalid data count "
-              << count << "provided in the split.\n"
-              << logofs_flush;
-
-      *logofs << "SplitStore: PANIC! While receiving split for "
-              << "checksum [" << DumpChecksum(split -> checksum_)
-              << "] with count " << count << " action ["
-              << DumpAction(split -> action_) << "] state ["
-              << DumpState(split -> state_) << "]. Data size is "
-              << split -> data_.size() << " (" << split -> d_size_
-              << "/" << split -> c_size_ << "), " << split ->
-                 data_.size() - (split -> next_ + count)
-              << " to go.\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Invalid data count "
-           << count << "provided in the split.\n";
-
-      HandleAbort();
-    }
-
-    if (split -> state_ != split_loaded)
-    {
-      #ifdef TEST
-
-      if (split -> next_ + count > split -> data_.size())
-      {
-        #ifdef PANIC
-        *logofs << "SplitStore: PANIC! Inconsistent split data size "
-                << split -> data_.size() << " with expected size "
-                << split -> r_size_ << ".\n"
-               << logofs_flush;
-        #endif
-
-        HandleAbort();
-      }
-
-      #endif
-
-      memcpy(split -> data_.begin() + split -> next_, 
-                 decodeBuffer.decodeMemory(count), count);
-    }
-    else
-    {
-      #ifdef TEST
-      *logofs << "SplitStore: WARNING! Data discarded with split "
-              << "loaded from disk.\n" << logofs_flush;
-      #endif
-
-      decodeBuffer.decodeMemory(count);
-    }
-
-    split -> next_ += count;
-  }
-
-  //
-  // Is unsplit complete?
-  //
-
-  if (split -> next_ != split -> r_size_)
-  {
-    return 0;
-  }
-
-  //
-  // If the persistent cache is enabled,
-  // we have a valid checksum and the
-  // split was not originally retrieved
-  // from disk, save the message on disk.
-  //
-
-  if (split -> state_ != split_loaded &&
-          split -> state_ != split_aborted)
-  {
-    save(split);
-  }
-
-  //
-  // Move the split at the head of the
-  // list to the commits.
-  //
-
-  remove(split);
-
-  //
-  // Reset the current position to the
-  // end of the repository.
-  //
-
-  current_ = splits_ -> end();
-
-  #ifdef TEST
-  *logofs << "SplitStore: Removed split at head of the list. "
-          << "Resource is " << split -> resource_ << " request "
-          << (unsigned) split -> store_ -> opcode() << " position "
-          << split -> position_ << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-Split *SplitStore::pop()
-{
-  if (splits_ -> size() == 0)
-  {
-    #ifdef TEST
-    *logofs << "SplitStore: The split store is empty.\n"
-            << logofs_flush;
-    #endif
-
-    return NULL;
-  }
-
-  //
-  // Move the pointer at the end of the list.
-  // The next send operation will eventually
-  // start a new split.
-  // 
-
-  current_ = splits_ -> end();
-
-  Split *split = *(splits_ -> begin());
-
-  splits_ -> pop_front();
-
-  #ifdef TEST
-  *logofs << "SplitStore: Removed split at the head of the "
-          << "list with resource " << split -> resource_
-          << " request " << (unsigned) split -> store_ ->
-             opcode() << " position " << split -> position_
-          << ".\n" << logofs_flush;
-  #endif
-
-  splitStorageSize_ -= getNodeSize(split);
-
-  totalSplitSize_--;
-
-  totalSplitStorageSize_ -= getNodeSize(split);
-
-  #ifdef TEST
-  *logofs << "SplitStore: There are " << splits_ -> size()
-          << " messages in store [" << resource_ << "] with "
-          << "storage size " << splitStorageSize_ << ".\n"
-          << logofs_flush;
-
-  *logofs << "SplitStore: Total messages in stores are "
-          << totalSplitSize_ << " with total storage size "
-          << totalSplitStorageSize_ << ".\n"
-          << logofs_flush;
-  #endif
-
-  return split;
-}
-
-void SplitStore::remove(Split *split)
-{
-  #ifdef TEST
-  *logofs << "SplitStore: Going to remove the split from the list.\n"
-          << logofs_flush;
-  #endif
-
-  #ifdef TEST
-
-  if (split != getFirstSplit())
-  {
-    #ifdef PANIC
-    *logofs << "SplitStore: PANIC! Trying to remove a split "
-            << "not at the head of the list.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Trying to remove a split "
-         << "not at the head of the list.\n";
-
-    HandleAbort();
-  }
-
-  #endif
-
-  //
-  // Move the split to the commit store.
-  //
-
-  splits_ -> pop_front();
-
-  commits_ -> splits_ -> push_back(split);
-
-  splitStorageSize_ -= getNodeSize(split);
-
-  totalSplitSize_--;
-
-  totalSplitStorageSize_ -= getNodeSize(split);
-
-  #ifdef TEST
-  *logofs << "SplitStore: There are " << splits_ -> size()
-          << " messages in store [" << resource_ << "] with "
-          << "storage size " << splitStorageSize_ << ".\n"
-          << logofs_flush;
-
-  *logofs << "SplitStore: Total messages in stores are "
-          << totalSplitSize_ << " with total storage size "
-          << totalSplitStorageSize_ << ".\n"
-          << logofs_flush;
-  #endif
-
-  #ifdef TEST
-
-  if (splits_ -> size() == 0)
-  {
-    if (splitStorageSize_ != 0)
-    {
-      #ifdef PANIC
-      *logofs << "SplitStore: PANIC! Internal error calculating "
-              << "split data size. It is " << splitStorageSize_ 
-              << " while should be 0.\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Internal error calculating "
-           << "split data size. It is " << splitStorageSize_
-           << " while should be 0.\n";
-
-      HandleAbort();
-    }
-  }
-
-  #endif
-}
-
-const char *SplitStore::name(const T_checksum checksum)
-{
-  if (checksum == NULL)
-  {
-    return NULL;
-  }
-
-  char *pathName = control -> ImageCachePath;
-
-  if (pathName == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "SplitStore: PANIC! Cannot determine directory of "
-            << "NX image files.\n" << logofs_flush;
-    #endif
-
-    return NULL;
-  }
-
-  int pathSize = strlen(pathName);
-
-  //
-  // File name is "[path][/I-c/I-][checksum][\0]",
-  // where c is the first hex digit of checksum.
-  //
-
-  int nameSize = pathSize + 7 + MD5_LENGTH * 2 + 1;
-
-  char *fileName = new char[nameSize];
-
-  if (fileName == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "SplitStore: PANIC! Cannot allocate space for "
-            << "NX image file name.\n" << logofs_flush;
-    #endif
-
-    return NULL;
-  }
-
-  strcpy(fileName, pathName);
-
-  sprintf(fileName + pathSize, "/I-%1X/I-",
-              *((unsigned char *) checksum) >> 4);
-
-  for (unsigned int i = 0; i < MD5_LENGTH; i++)
-  {
-    sprintf(fileName + pathSize + 7 + (i * 2), "%02X",
-                ((unsigned char *) checksum)[i]);
-  }
-
-  return fileName;
-}
-
-int SplitStore::save(Split *split)
-{
-  //
-  // Check if saving the message on the
-  // persistent cache is enabled.
-  //
-
-  if (split -> save_ == 0)
-  {
-    return 0;
-  }
-
-  T_checksum checksum = split -> checksum_;
-
-  const char *fileName = name(checksum);
-
-  if (fileName == NULL)
-  {
-    return 0;
-  }
-
-  unsigned int splitSize;
-
-  ostream *fileStream = NULL;
-
-  unsigned char *fileHeader = NULL;
-
-  //
-  // Get the other data from the split.
-  //
-
-  unsigned char opcode = split -> store_ -> opcode();
-
-  unsigned char *data = split -> data_.begin();
-
-  int dataSize = split -> d_size_;
-  int compressedSize = split -> c_size_;
-
-  #ifdef DEBUG
-  *logofs << "SplitStore: Going to save split OPCODE#"
-          << (unsigned int) opcode << " to file '" << fileName
-          << "' with size " << dataSize << " and compressed size "
-          << compressedSize << ".\n" << logofs_flush;
-  #endif
-
-  DisableSignals();
-
-  //
-  // Change the mask to make the file only
-  // readable by the user, then restore the
-  // old mask.
-  //
-
-  mode_t fileMode;
-
-  //
-  // Check if the file already exists. We try to
-  // load the message when the split is started
-  // and save it only if it is not found. Still
-  // the remote side may send the same image mul-
-  // tiple time and we may not have the time to
-  // notify the abort.
-  //
-
-  struct stat fileStat;
-
-  if (stat(fileName, &fileStat) == 0)
-  {
-    #ifdef TEST
-    *logofs << "SplitStore: Image file '" << fileName
-            << "' already present on disk.\n"
-            << logofs_flush;
-    #endif
-
-    goto SplitStoreSaveError;
-  }
-
-  fileMode = umask(0077);
-
-  fileStream = new ofstream(fileName, ios::out | ios::binary);
-
-  umask(fileMode);
-
-  if (CheckData(fileStream) < 0)
-  {
-    #ifdef PANIC
-    *logofs << "SplitStore: PANIC! Cannot open file '" << fileName
-            << "' for output.\n" << logofs_flush;
-    #endif
-
-    goto SplitStoreSaveError;
-  }
-
-  fileHeader = new unsigned char[SPLIT_HEADER_SIZE];
-
-  if (fileHeader == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "SplitStore: PANIC! Cannot allocate space for "
-            << "NX image header.\n" << logofs_flush;
-    #endif
-
-    goto SplitStoreSaveError;
-  }
-
-  //
-  // Leave 3 bytes for future use. Please note
-  // that, on some CPUs, we can't use PutULONG()
-  // to write integers that are not aligned to
-  // the word boundary.
-  //
-
-  *fileHeader = opcode;
-
-  *(fileHeader + 1) = 0;
-  *(fileHeader + 2) = 0;
-  *(fileHeader + 3) = 0;
-
-  PutULONG(dataSize, fileHeader + 4, false);
-  PutULONG(compressedSize, fileHeader + 8, false);
-
-  splitSize = (compressedSize > 0 ? compressedSize : dataSize);
-
-  if (PutData(fileStream, fileHeader, SPLIT_HEADER_SIZE) < 0 ||
-          PutData(fileStream, data, splitSize) < 0)
-  {
-    #ifdef PANIC
-    *logofs << "SplitStore: PANIC! Cannot write to NX "
-            << "image file '" << fileName << "'.\n"
-            << logofs_flush;
-    #endif
-
-    goto SplitStoreSaveError;
-  }
-
-  //
-  // Check if all the data was written on the
-  // disk and, if not, remove the faulty copy.
-  //
-
-  FlushData(fileStream);
-
-  if (CheckData(fileStream) < 0)
-  {
-    #ifdef PANIC
-    *logofs << "SplitStore: PANIC! Failed to write NX "
-            << "image file '" << fileName << "'.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Warning" << ": Failed to write NX "
-         << "image file '" << fileName << "'.\n";
-
-    goto SplitStoreSaveError;
-  }
-
-  #ifdef TEST
-  *logofs << "SplitStore: Saved split to file '" << fileName
-          << "' with data size " << dataSize << " and "
-          << "compressed data size " << compressedSize
-          << ".\n" << logofs_flush;
-  #endif
-
-  delete fileStream;
-
-  delete [] fileName;
-  delete [] fileHeader;
-
-  EnableSignals();
-
-  //
-  // Update the timestamp as the operation
-  // may have taken some time.
-  //
-
-  getNewTimestamp();
-
-  return 1;
-
-SplitStoreSaveError:
-
-  delete fileStream;
-
-  if (fileName != NULL)
-  {
-    unlink(fileName);
-  }
-
-  delete [] fileName;
-  delete [] fileHeader;
-
-  EnableSignals();
-
-  return -1;
-}
-
-int SplitStore::find(Split *split)
-{
-  const char *fileName = name(split -> checksum_);
-
-  if (fileName == NULL)
-  {
-    return 0;
-  }
-
-  #ifdef DEBUG
-  *logofs << "SplitStore: Going to find split OPCODE#"
-          << (unsigned) split -> store_ -> opcode()
-          << " in file '" << fileName << "'.\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // Check if the file exists and, at the
-  // same time, update the modification
-  // time to prevent its deletion.
-  //
-
-  if (utime(fileName, NULL) == 0)
-  {
-    #ifdef TEST
-    *logofs << "SplitStore: Found split OPCODE#"
-            << (unsigned) split -> store_ -> opcode()
-            << " in file '" << fileName << "'.\n"
-            << logofs_flush;
-    #endif
-
-    delete [] fileName;
-
-    return 1;
-  }
-
-  #ifdef TEST
-  *logofs << "SplitStore: WARNING! Can't find split "
-          << "OPCODE#" << (unsigned) split -> store_ ->
-             opcode() << " in file '" << fileName
-          << "'.\n" << logofs_flush;
-  #endif
-
-  delete [] fileName;
-
-  return 0;
-}
-
-int SplitStore::load(Split *split)
-{
-  //
-  // Check if loading the image is enabled.
-  //
-
-  if (split -> load_ == 0)
-  {
-    return 0;
-  }
-
-  const char *fileName = name(split -> checksum_);
-
-  if (fileName == NULL)
-  {
-    return 0;
-  }
-
-  unsigned char fileOpcode;
-
-  int fileSize;
-  int fileCSize;
-
-  istream *fileStream = NULL;
-
-  unsigned char *fileHeader = NULL;
-
-  DisableSignals();
-
-  #ifdef DEBUG
-  *logofs << "SplitStore: Going to load split OPCODE#"
-          << (unsigned int) split -> store_ -> opcode()
-          << " from file '" << fileName << "'.\n"
-          << logofs_flush;
-  #endif
-
-  fileStream = new ifstream(fileName, ios::in | ios::binary);
-
-  if (CheckData(fileStream) < 0)
-  {
-    #ifdef TEST
-    *logofs << "SplitStore: WARNING! Can't open image file '"
-            << fileName  << "' on disk.\n" << logofs_flush;
-    #endif
-
-    goto SplitStoreLoadError;
-  }
-
-  fileHeader = new unsigned char[SPLIT_HEADER_SIZE];
-
-  if (fileHeader == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "SplitStore: PANIC! Cannot allocate space for "
-            << "NX image header.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Cannot allocate space for "
-         << "NX image header.\n";
-
-    goto SplitStoreLoadError;
-  }
-
-  if (GetData(fileStream, fileHeader, SPLIT_HEADER_SIZE) < 0)
-  {
-    #ifdef PANIC
-    *logofs << "SplitStore: PANIC! Cannot read header from "
-            << "NX image file '" << fileName << "'.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Warning" << ": Cannot read header from "
-         << "NX image file '" << fileName << "'.\n";
-
-    goto SplitStoreLoadError;
-  }
-
-  fileOpcode = *fileHeader;
-
-  fileSize  = GetULONG(fileHeader + 4, false);
-  fileCSize = GetULONG(fileHeader + 8, false);
-
-  //
-  // Don't complain if we find that data was saved
-  // in compressed form even if we were not aware
-  // of the compressed data size. The remote side
-  // compresses the data only at the time it starts
-  // the transferral of the split. We replace our
-  // copy of the data with whatever we find on the
-  // disk.
-  //
-
-  if (fileOpcode != split -> store_ -> opcode() ||
-          fileSize != split -> d_size_ ||
-              fileSize > control -> MaximumRequestSize ||
-                  fileCSize > control -> MaximumRequestSize)
-
-  {
-    #ifdef TEST
-    *logofs << "SplitStore: PANIC! Corrupted image file '" << fileName
-            << "'. Expected " << (unsigned int) split -> store_ -> opcode()
-            << "/" << split -> d_size_ << "/" << split -> c_size_ << " found "
-            << (unsigned int) fileOpcode << "/" << fileSize << "/"
-            << fileCSize << ".\n" << logofs_flush;
-    #endif
-
-    cerr << "Warning" << ": Corrupted image file '" << fileName
-         << "'. Expected " << (unsigned int) split -> store_ -> opcode()
-         << "/" << split -> d_size_ << "/" << split -> c_size_ << " found "
-         << (unsigned int) fileOpcode << "/" << fileSize << "/"
-         << fileCSize << ".\n";
-
-    goto SplitStoreLoadError;
-  }
-
-  //
-  // Update the data size with the size
-  // we got from the disk record.
-  //
-
-  split -> d_size_ = fileSize;
-  split -> c_size_ = fileCSize;
-
-  unsigned int splitSize;
-
-  if (fileCSize > 0)
-  {
-    splitSize = fileCSize;
-  }
-  else
-  {
-    splitSize = fileSize;
-  }
-
-  //
-  // Allocate a new buffer if we didn't
-  // do that already or if the size is
-  // different.
-  //
-
-  if (split -> data_.size() != splitSize)
-  {
-    split -> data_.clear();
-
-    split -> data_.resize(splitSize);
-  }
-
-  if (GetData(fileStream, split -> data_.begin(), splitSize) < 0)
-  {
-    #ifdef PANIC
-    *logofs << "SplitStore: PANIC! Cannot read data from "
-            << "NX image file '" << fileName << "'.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Warning" << ": Cannot read data from "
-         << "NX image file '" << fileName << "'.\n";
-
-    goto SplitStoreLoadError;
-  }
-
-  delete fileStream;
-
-  delete [] fileHeader;
-  delete [] fileName;
-
-  EnableSignals();
-
-  //
-  // Update the timestamp as the operation
-  // may have taken some time.
-  //
-
-  getNewTimestamp();
-
-  return 1;
-
-SplitStoreLoadError:
-
-  delete fileStream;
-
-  unlink(fileName);
-
-  delete [] fileName;
-  delete [] fileHeader;
-
-  EnableSignals();
-
-  return -1;
-}
-
-Split *CommitStore::pop()
-{
-  if (splits_ -> size() == 0)
-  {
-    #ifdef TEST
-    *logofs << "CommitStore: The commit store is empty.\n"
-            << logofs_flush;
-    #endif
-
-    return NULL;
-  }
-
-  Split *split = *(splits_ -> begin());
-
-  splits_ -> pop_front();
-
-  #ifdef TEST
-  *logofs << "CommitStore: Removed commit split at the head "
-          << "of the list with resource " << split -> resource_
-          << " request " << (unsigned) split -> store_ ->
-             opcode() << " position " << split -> position_
-          << ".\n" << logofs_flush;
-  #endif
-
-  return split;
-}
-
-int CommitStore::expand(Split *split, unsigned char *buffer, const int size)
-{
-  #ifdef TEST
-  *logofs << "CommitStore: Expanding split data with "
-          << size << " bytes to write.\n"
-          << logofs_flush;
-  #endif
-
-  #ifdef TEST
-
-  if (size < split -> i_size_ + split -> d_size_)
-  {
-    #ifdef PANIC
-    *logofs << "CommitStore: PANIC! Wrong size of the provided "
-            << "buffer. It should be " << split -> i_size_ +
-               split -> d_size_ << " instead of " << size
-            << ".\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Wrong size of the provided "
-         << "buffer. It should be " << split -> i_size_ +
-            split -> d_size_ << " instead of " << size
-         << ".\n";
-
-    HandleAbort();
-  }
-
-  #endif
-
-  #ifdef DEBUG
-  *logofs << "CommitStore: Copying " << split -> i_size_
-          << " bytes of identity.\n" << logofs_flush;
-  #endif
-
-  memcpy(buffer, split -> identity_.begin(), split -> i_size_);
-
-  //
-  // Copy data, if any, to the buffer.
-  //
-
-  if (size > split -> i_size_)
-  {
-    //
-    // Check if message has been stored
-    // in compressed format.
-    //
-
-    if (split -> c_size_ == 0)
-    {
-      #ifdef DEBUG
-      *logofs << "CommitStore: Copying " << split -> d_size_
-              << " bytes of plain data.\n" << logofs_flush;
-      #endif
-
-      memcpy(buffer + split -> i_size_, split -> data_.begin(), split -> d_size_);
-    }
-    else
-    {
-      #ifdef DEBUG
-      *logofs << "CommitStore: Decompressing " << split -> c_size_
-              << " bytes and copying " << split -> d_size_
-              << " bytes of data.\n" << logofs_flush;
-      #endif
-
-      if (compressor_ ->
-              decompressBuffer(buffer + split -> i_size_,
-                                   split -> d_size_, split -> data_.begin(),
-                                       split -> c_size_) < 0)
-      {
-        #ifdef PANIC
-        *logofs << "CommitStore: PANIC! Split data decompression failed.\n"
-                << logofs_flush;
-        #endif
-
-        cerr << "Error" << ": Split data decompression failed.\n";
-
-        return -1;
-      }
-    }
-  }
-
-  return 1;
-}
-
-int CommitStore::update(Split *split)
-{
-  if (split -> action_ != IS_ADDED)
-  {
-    return 0;
-  }
-
-  //
-  // We don't need the identity data at
-  // the encoding side.
-  //
-
-  if (split -> identity_.size() == 0)
-  {
-    #ifdef TEST
-    *logofs << "SplitStore: Going to update the size "
-            << "for object at position " << split -> position_
-            << " with data size " << split -> d_size_
-            << " and compressed data size " << split ->
-               c_size_ << ".\n" << logofs_flush;
-    #endif
-
-    split -> store_ -> updateData(split -> position_, split -> d_size_,
-                                      split -> c_size_);
-  }
-  else
-  {
-    #ifdef TEST
-    *logofs << "SplitStore: Going to update data and size "
-            << "for object at position " << split -> position_
-            << " with data size " << split -> d_size_
-            << " and compressed data size " << split ->
-               c_size_ << ".\n" << logofs_flush;
-    #endif
-
-    split -> store_ -> updateData(split -> position_, split -> data_.begin(), 
-                                      split -> d_size_, split -> c_size_);
-  }
-
-  //
-  // Unlock message so that we can remove
-  // or save it on disk at shutdown.
-  //
-
-  if (split -> action_ == IS_ADDED)
-  {
-    split -> store_ -> unlock(split -> position_);
-
-    #ifdef TEST
-
-    validate(split);
-
-    #endif
-  }
-
-  return 1;
-}
-
-int CommitStore::validate(Split *split)
-{
-  MessageStore *store = split -> store_;
-
-  int p, n, s;
-
-  s = store -> cacheSlots;
-
-  for (p = 0, n = 0; p < s; p++)
-  {
-    if (store -> getLocks(p) == 1)
-    {
-      n++;
-    }
-    else if (store -> getLocks(p) != 0)
-    {
-      #ifdef PANIC
-      *logofs << "CommitStore: PANIC! Repository for OPCODE#"
-              << (unsigned int) store -> opcode() << " has "
-              << store -> getLocks(p) << " locks for message "
-              << "at position " << p << ".\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Repository for OPCODE#"
-           << (unsigned int) store -> opcode() << " has "
-           << store -> getLocks(p) << " locks for message "
-           << "at position " << p << ".\n";
-
-      HandleAbort();
-    }
-  }
-
-  #ifdef TEST
-  *logofs << "CommitStore: Repository for OPCODE#"
-          << (unsigned int) store -> opcode()
-          << " has " << n << " locked messages.\n"
-          << logofs_flush;
-  #endif
-
-  return 1;
-}
diff --git a/nxcomp/Split.h b/nxcomp/Split.h
deleted file mode 100644
index ee5eae7fe..000000000
--- a/nxcomp/Split.h
+++ /dev/null
@@ -1,543 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef Split_H
-#define Split_H
-
-#include "Types.h"
-#include "Timestamp.h"
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-//
-// Define this to know how many splits
-// are allocated and deallocated.
-//
-
-#undef  REFERENCES
-
-//
-// Size of header of messages saved on
-// disk.
-//
-
-#define SPLIT_HEADER_SIZE            12
-
-//
-// This class is used to divide big messages
-// in smaller chunks and send them at idle
-// time.
-//
-
-class EncodeBuffer;
-class DecodeBuffer;
-
-class SplitStore;
-class CommitStore;
-
-//
-// Preferred message streaming policy.
-//
-
-typedef enum
-{
-  split_none = -1,
-  split_async = 1,
-  split_sync
-
-} T_split_mode;
-
-//
-// Current state of the split. Used to
-// implement the state machine.
-//
-
-typedef enum
-{
-  split_undefined = -1,
-  split_added,
-  split_missed,
-  split_loaded,
-  split_aborted,
-  split_notified
-
-} T_split_state;
-
-class Split
-{
-  friend class SplitStore;
-  friend class CommitStore;
-
-  public:
-
-  Split();
-
-  ~Split();
-
-  //
-  // Note that, differently from the message
-  // store, the split store doesn't account
-  // for the data offset when dealing with
-  // the data. This means that both the size_
-  // and c_size members represent the actual
-  // size of the data part.
-  //
-
-  void compressedSize(int size)
-  {
-    c_size_ = size;
-
-    store_ -> validateSize(d_size_, c_size_);
-  }
-
-  int compressedSize()
-  {
-    return c_size_;
-  }
-
-  int plainSize()
-  {
-    return i_size_ + d_size_;
-  }
-
-  T_checksum getChecksum()
-  {
-    return checksum_;
-  }
-
-  MessageStore *getStore()
-  {
-    return store_;
-  }
-  
-  T_split_state getState()
-  {
-    return state_;
-  }
-
-  T_store_action getAction()
-  {
-    return action_;
-  }
-
-  //
-  // We may need to find the resource
-  // associated to the split message
-  // because old protocol version use
-  // a single store for all splits.
-  //
-
-  int getResource()
-  {
-    return resource_;
-  }
-
-  int getRequest()
-  {
-    return store_ -> opcode();
-  }
-
-  int getPosition()
-  {
-    return position_;
-  }
-
-  T_split_mode getMode()
-  {
-    return mode_;
-  }
-
-  void setPolicy(int load, int save)
-  {
-    load_ = load;
-    save_ = save;
-  }
-
-  void setState(T_split_state state)
-  {
-    state_ = state;
-  }
-
-  private:
-
-  //
-  // The agent's resource which is splitting
-  // the message.
-  //
-
-  int resource_;
-
-  //
-  // Where to find the message in the message
-  // store or the X sequence number of the
-  // original request, in recent versions.
-  //
-
-  int position_;
-
-  //
-  // Which store is involved.
-  //
-
-  MessageStore *store_;
-
-  //
-  // Identity size of the message.
-  //
-
-  int i_size_;
-
-  //
-  // This is the uncompressed data size of the
-  // original message.
-  //
-
-  int d_size_;
-
-  //
-  // This is the size of the compressed data,
-  // if the data is stored in this form.
-  //
-
-  int c_size_;
-
-  //
-  // Size of the data buffer, as known by the
-  // encoding side. This field is only used at
-  // the decoding side. The remote size can be
-  // different from the actual data size, if
-  // the encoding side did not confirm that it
-  // received the abort split event.
-  //
-
-  int r_size_;
-  
-  //
-  // Position in the data buffer that will be
-  // the target of the next send or receive
-  // operation while streaming the message.
-  //
-
-  int next_;
-
-  //
-  // Load or save the split to disk.
-  //
-
-  int load_;
-  int save_;
-
-  //
-  // Checksum of the original message.
-  //
-
-  T_checksum checksum_;
-
-  //
-  // Was this split confirmed or aborted?
-  //
-
-  T_split_state state_;
-
-  //
-  // What's the policy for sending this split?
-  //
-
-  T_split_mode mode_;
-
-  //
-  // Operation that had been performed on the
-  // store at the time the split was added.
-  //
-
-  T_store_action action_;
-
-  //
-  // Container for the identity and data part
-  // of the X message.
-  //
-
-  T_data identity_;
-  T_data data_;
-
-  #ifdef REFERENCES
-
-  static int references_;
-
-  #endif
-};
-
-class SplitStore
-{
-  public:
-
-  SplitStore(StaticCompressor *compressor, CommitStore *commits, int resource);
-
-  ~SplitStore();
-
-  Split *getFirstSplit() const
-  {
-    if (splits_ -> size() > 0)
-    {
-      return (*(splits_ -> begin()));
-    }
-
-    return NULL;
-  }
-
-  Split *getLastSplit() const
-  {
-    if (splits_ -> size() > 0)
-    {
-      return (*(--(splits_ -> end())));
-    }
-
-    return NULL;
-  }
-
-  int getNodeSize(const Split *split) const
-  {
-    //
-    // Take in account 64 bytes of overhead
-    // for each node.
-    //
-
-    return (sizeof(class Split) + 64 +
-                split -> i_size_ + split -> d_size_);
-  }
-
-  int getStorageSize()
-  {
-    return splitStorageSize_;
-  }
-
-  static int getTotalSize()
-  {
-    return totalSplitSize_;
-  }
-
-  static int getTotalStorageSize()
-  {
-    return totalSplitStorageSize_;
-  }
-
-  int getResource()
-  {
-    return resource_;
-  }
-
-  int getSize()
-  {
-    return splits_ -> size();
-  }
-
-  T_splits *getSplits()
-  {
-    return splits_;
-  }
-
-  //
-  // Used, respectively, at the encoding
-  // and decoding side.
-  //
-
-  Split *add(MessageStore *store, int resource, T_split_mode mode,
-                 int position, T_store_action action, T_checksum checksum,
-                     const unsigned char *buffer, const int size);
-
-  Split *add(MessageStore *store, int resource, int position,
-                T_store_action action, T_checksum checksum,
-                     unsigned char *buffer, const int size);
-
-  //
-  // Handle the streaming of the message data.
-  //
-
-  int send(EncodeBuffer &encodeBuffer, int packetSize);
-
-  int receive(DecodeBuffer &decodeBuffer);
-
-  //
-  // Remove the top element of the split store
-  // and update the storage size.
-  //
-
-  void remove(Split *split);
-
-  //
-  // Load the message from disk and replace the
-  // message in the store with the new copy.
-  //
-
-  int load(Split *split);
-
-  //
-  // Save the data to disk after the message has
-  // been recomposed at the local side.
-  //
-
-  int save(Split *split);
-
-  //
-  // Find the message on disk and update the last
-  // modification time. This is currently unused.
-  //
-
-  int find(Split *split);
-
-  //
-  // Remove the element on top of the queue and
-  // discard any split data that still needs to
-  // be transferred.
-  //
-
-  Split *pop();
-
-  //
-  // Dump the content of the store.
-  //
-
-  void dump();
-
-  protected:
-
-  //
-  // Repository where to add the splits.
-  //
-
-  T_splits *splits_;
-
-  //
-  // Compress and decompress the data payload.
-  //
-
-  StaticCompressor *compressor_;
-
-  private:
-
-  int start(EncodeBuffer &encodeBuffer);
-
-  int start(DecodeBuffer &decodeBuffer);
-
-  void push(Split *split);
-
-  //
-  // Determine the name of the file object based
-  // on the checksum.
-  //
-
-  const char *name(const T_checksum checksum);
-
-  //
-  // The number of elements and data bytes
-  // in the repository.
-  //
-
-  int splitStorageSize_;
-
-  static int totalSplitSize_;
-  static int totalSplitStorageSize_;
-
-  //
-  // Current element being transferred.
-  //
-
-  T_splits::iterator current_;
-
-  //
-  // Repository where to move the splits
-  // after they are completely recomposed.
-  //
-
-  CommitStore *commits_;
-
-  //
-  // Index in the client store or none,
-  // if this is a commit store.
-  //
-
-  int resource_;
-
-  #ifdef REFERENCES
-
-  static int references_;
-
-  #endif
-};
-
-class CommitStore : public SplitStore
-{
-  //
-  // This is just a split store.
-  //
-
-  public:
-
-  CommitStore(StaticCompressor *compressor)
-
-    : SplitStore(compressor, NULL, nothing)
-  {
-  }
-
-  //
-  // Move identity and data of the split to the
-  // provided buffer, uncompressing the message,
-  // if needed.
-  //
-
-  int expand(Split *split, unsigned char *buffer, const int size);
-
-  //
-  // We recomposed the data part. If the message
-  // was originally added to the message store,
-  // replace the data and/or update the size.
-  //
-
-  int update(Split *split);
-
-  //
-  // Remove the split from the commit queue.
-  //
-
-  Split *pop();
-
-  //
-  // This is just used for debug. It checks
-  // if any message in the message store has
-  // an invalid number of locks.
-  //
-
-  int validate(Split *split);
-};
-
-#endif /* Split_H */
diff --git a/nxcomp/StaticCompressor.cpp b/nxcomp/StaticCompressor.cpp
deleted file mode 100644
index 93103af41..000000000
--- a/nxcomp/StaticCompressor.cpp
+++ /dev/null
@@ -1,428 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "Z.h"
-#include "Misc.h"
-#include "Control.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-#include "StaticCompressor.h"
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-StaticCompressor::StaticCompressor(int compressionLevel,
-                                       int compressionThreshold)
-{
-  buffer_     = NULL;
-  bufferSize_ = 0;
-
-  compressionStream_.zalloc = (alloc_func) 0;
-  compressionStream_.zfree  = (free_func) 0;
-  compressionStream_.opaque = (voidpf) 0;
-
-  decompressionStream_.zalloc = (alloc_func) 0;
-  decompressionStream_.zfree  = (free_func) 0;
-  decompressionStream_.opaque = (void *) 0;
-
-  decompressionStream_.next_in = (Bytef *) 0;
-  decompressionStream_.avail_in = 0;
-
-  #ifdef TEST
-  *logofs << "StaticCompressor: Compression level is "
-          << compressionLevel << ".\n" << logofs_flush;
-  #endif
-
-  int result = deflateInit2(&compressionStream_, compressionLevel, Z_DEFLATED,
-                                15, 9, Z_DEFAULT_STRATEGY);
-
-  if (result != Z_OK)
-  {
-    #ifdef PANIC
-    *logofs << "StaticCompressor: PANIC! Cannot initialize the "
-            << "compression stream. Error is '" << zError(result)
-            << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Cannot initialize the compression "
-         << "stream. Error is '" << zError(result) << "'.\n";
-
-    HandleAbort();
-  }
-
-  result = inflateInit2(&decompressionStream_, 15);
-
-  if (result != Z_OK)
-  {
-    #ifdef PANIC
-    *logofs << "StaticCompressor: PANIC! Cannot initialize the "
-            << "decompression stream. Error is '" << zError(result)
-            << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Cannot initialize the decompression "
-         << "stream. Error is '" << zError(result) << "'.\n";
-
-    HandleAbort();
-  }
-
-  #ifdef TEST
-  *logofs << "StaticCompressor: Compression threshold is "
-          << compressionThreshold << ".\n" << logofs_flush;
-  #endif
-
-  threshold_ = compressionThreshold;
-}
-
-StaticCompressor::~StaticCompressor()
-{
-  int result = deflateEnd(&compressionStream_);
-
-  if (result != Z_OK)
-  {
-    #ifdef PANIC
-    *logofs << "StaticCompressor: PANIC! Cannot deinitialize the "
-            << "compression stream. Error is '" << zError(result)
-            << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Cannot deinitialize the compression "
-         << "stream. Error is '" << zError(result) << "'.\n";
-  }
-
-  result = inflateEnd(&decompressionStream_);
-
-  if (result != Z_OK)
-  {
-    #ifdef PANIC
-    *logofs << "StaticCompressor: PANIC! Cannot deinitialize the "
-            << "decompression stream. Error is '" << zError(result)
-            << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Cannot deinitialize the decompression "
-         << "stream. Error is '" << zError(result) << "'.\n";
-  }
-
-  delete [] buffer_;
-}
-
-//
-// This function compresses and encodes the compressed
-// buffer. It returns a pointer to the internal buffer
-// where data was compressed.
-//
-
-int StaticCompressor::compressBuffer(const unsigned char *plainBuffer,
-                                         const unsigned int plainSize,
-                                             unsigned char *&compressedBuffer,
-                                                 unsigned int &compressedSize,
-                                                     EncodeBuffer &encodeBuffer)
-{
-  if (control -> LocalDataCompression == 0 ||
-          compressBuffer(plainBuffer, plainSize, 
-                             compressedBuffer, compressedSize) <= 0)
-  {
-    encodeBuffer.encodeBoolValue(0);
-
-    encodeBuffer.encodeMemory(plainBuffer, plainSize);
-
-    return 0;
-  }
-  else
-  {
-    encodeBuffer.encodeBoolValue(1);
-
-    encodeBuffer.encodeValue(compressedSize, 32, 14);
-    encodeBuffer.encodeValue(plainSize, 32, 14);
-
-    encodeBuffer.encodeMemory(compressedBuffer, compressedSize);
-
-    return 1;
-  }
-}
-
-//
-// This function compresses data into a dynamically
-// allocated buffer and returns a pointer to it, so
-// application must copy data before the next call.
-//
-
-int StaticCompressor::compressBuffer(const unsigned char *plainBuffer,
-                                         const unsigned int plainSize,
-                                             unsigned char *&compressedBuffer,
-                                                 unsigned int &compressedSize)
-{
-  #ifdef DEBUG
-  *logofs << "StaticCompressor: Called for buffer at "
-          << (void *) plainBuffer << ".\n"
-          << logofs_flush;
-  #endif
-
-  compressedSize = plainSize;
-
-  if (plainSize < (unsigned int) threshold_)
-  {
-    #ifdef TEST
-    *logofs << "StaticCompressor: Leaving buffer unchanged. "
-            << "Plain size is " << plainSize << " with threshold "
-            << (unsigned int) threshold_ << ".\n" << logofs_flush;
-    #endif
-
-    return 0;
-  }
-
-  //
-  // Determine the size of the temporary
-  // buffer. 
-  //
-
-  unsigned int newSize = plainSize + (plainSize / 1000) + 12;
-
-  //
-  // Allocate a new buffer if it grows
-  // beyond 64K.
-  //
-
-  if (buffer_ == NULL || (bufferSize_ > 65536 &&
-          newSize < bufferSize_ / 2) || newSize > bufferSize_)
-  {
-    delete [] buffer_;
-
-    buffer_ = new unsigned char[newSize];
-
-    if (buffer_ == NULL)
-    {
-      #ifdef PANIC
-      *logofs << "StaticCompressor: PANIC! Can't allocate compression "
-              << "buffer of " << newSize << " bytes. Error is " << EGET()
-              << " ' " << ESTR() << "'.\n" << logofs_flush;
-      #endif
-
-      cerr << "Warning" << ": Can't allocate compression buffer of "
-           << newSize << " bytes. Error is " << EGET()
-           << " '" << ESTR() << "'.\n";
-
-      bufferSize_ = 0;
-
-      return 0;
-    }
-
-    bufferSize_ = newSize;
-  }
-
-  unsigned int resultingSize = newSize; 
-
-  int result = ZCompress(&compressionStream_, buffer_, &resultingSize,
-                             plainBuffer, plainSize);
-
-  if (result == Z_OK)
-  {
-    if (resultingSize > newSize)
-    {
-      #ifdef PANIC
-      *logofs << "StaticCompressor: PANIC! Overflow in compression "
-              << "buffer size. " << "Expected size was " << newSize
-              << " while it is " << resultingSize << ".\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Overflow in compress buffer size. "
-           << "Expected size was " << newSize << " while it is "
-           << resultingSize << ".\n";
-
-      return -1;
-    }
-    else if (resultingSize >= plainSize)
-    {
-      #ifdef TEST
-      *logofs << "StaticCompressor: Leaving buffer unchanged. "
-              << "Plain size is " << plainSize << " compressed "
-              << "size is " << resultingSize << ".\n"
-              << logofs_flush;
-      #endif
-
-      return 0;
-    }
-
-    compressedBuffer = buffer_;
-    compressedSize   = resultingSize;
-
-    #ifdef TEST
-    *logofs << "StaticCompressor: Compressed buffer from "
-            << plainSize << " to " << resultingSize
-            << " bytes.\n" << logofs_flush;
-    #endif
-
-    return 1;
-  }
-
-  #ifdef PANIC
-  *logofs << "StaticCompressor: PANIC! Failed compression of buffer. "
-          << "Error is '" << zError(result) << "'.\n"
-          << logofs_flush;
-  #endif
-
-  cerr << "Error" << ": Failed compression of buffer. "
-       << "Error is '" << zError(result) << "'.\n";
-
-  return -1;
-}
-
-int StaticCompressor::decompressBuffer(unsigned char *plainBuffer,
-                                           unsigned int plainSize,
-                                               const unsigned char *&compressedBuffer,
-                                                   unsigned int &compressedSize,
-                                                       DecodeBuffer &decodeBuffer)
-{
-  #ifdef DEBUG
-  *logofs << "StaticCompressor: Called for buffer at "
-          << (void *) plainBuffer << ".\n"
-          << logofs_flush;
-  #endif
-
-  unsigned int value;
-
-  decodeBuffer.decodeBoolValue(value);
-
-  if (value == 0)
-  {
-    memcpy(plainBuffer,
-               decodeBuffer.decodeMemory(plainSize),
-                   plainSize);
-
-    return 0;
-  }
-
-  unsigned int checkSize = plainSize;
-
-  decodeBuffer.decodeValue(value, 32, 14);
-  compressedSize = value;
-
-  decodeBuffer.decodeValue(value, 32, 14);
-  checkSize = value;
-
-  //
-  // If caller needs the original compressed
-  // data it must copy this to its own buffer
-  // before using any further decode function.
-  //
-
-  compressedBuffer = decodeBuffer.decodeMemory(compressedSize);
-
-  int result = ZDecompress(&decompressionStream_, plainBuffer, &checkSize,
-                               compressedBuffer, compressedSize);
-
-  if (result != Z_OK)
-  {
-    #ifdef PANIC
-    *logofs << "StaticCompressor: PANIC! Failure decompressing buffer. "
-            << "Error is '" << zError(result) << "'.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Failure decompressing buffer. "
-         << "Error is '" << zError(result) << "'.\n";
-
-    return -1;
-  }
-  else if (plainSize != checkSize)
-  {
-    #ifdef PANIC
-    *logofs << "StaticCompressor: PANIC! Expected decompressed size was "
-            << plainSize << " while it is " << checkSize 
-            << ".\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Expected decompressed size was "
-         << plainSize << " while it is " << checkSize
-         << ".\n";
-
-    return -1;
-  }
-
-  return 1;
-}
-
-//
-// This is used to uncompress on-the-fly
-// messages whose data has been stored
-// in compressed format.
-//
-
-int StaticCompressor::decompressBuffer(unsigned char *plainBuffer,
-                                           const unsigned int plainSize,
-                                               const unsigned char *compressedBuffer,
-                                                   const unsigned int compressedSize)
-{
-  #ifdef TEST
-  *logofs << "StaticCompressor: Called for buffer at "
-          << (void *) plainBuffer << ".\n"
-          << logofs_flush;
-  #endif
-
-  unsigned int checkSize = plainSize;
-
-  int result = ZDecompress(&decompressionStream_, plainBuffer, &checkSize,
-                               compressedBuffer, compressedSize);
-
-  if (result != Z_OK)
-  {
-    #ifdef PANIC
-    *logofs << "StaticCompressor: PANIC! Failure decompressing buffer. "
-            << "Error is '" << zError(result) << "'.\n"
-            << logofs_flush;
-    #endif
-
-    return -1;
-  }
-
-  if (plainSize != checkSize)
-  {
-    #ifdef PANIC
-    *logofs << "StaticCompressor: PANIC! Expected decompressed size was "
-            << plainSize << " while it is " << checkSize 
-            << ".\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Expected decompressed size was "
-         << plainSize << " while it is " << checkSize
-         << ".\n";
-
-    return -1;
-  }
-
-  #ifdef TEST
-  *logofs << "StaticCompressor: Decompressed buffer from "
-          << compressedSize << " to " << plainSize
-          << " bytes.\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
diff --git a/nxcomp/StaticCompressor.h b/nxcomp/StaticCompressor.h
deleted file mode 100644
index e0b81a527..000000000
--- a/nxcomp/StaticCompressor.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef StaticCompressor_H
-#define StaticCompressor_H
-
-#include "Z.h"
-
-class EncodeBuffer;
-class DecodeBuffer;
-
-class StaticCompressor
-{
-  public:
-
-  StaticCompressor(int compressionLevel, int compressionThreshold);
-
-  ~StaticCompressor();
-
-  int compressBuffer(const unsigned char *plainBuffer, const unsigned int plainSize,
-                         unsigned char *&compressedBuffer, unsigned int &compressedSize,
-                             EncodeBuffer &encodeBuffer);
-
-  int compressBuffer(const unsigned char *plainBuffer, const unsigned int plainSize,
-                         unsigned char *&compressedBuffer, unsigned int &compressedSize);
-
-  int decompressBuffer(unsigned char *plainBuffer, unsigned int plainSize,
-                           const unsigned char *&compressedBuffer, unsigned int &compressedSize,
-                               DecodeBuffer &decodeBuffer);
-
-  int decompressBuffer(unsigned char *plainBuffer, const unsigned int plainSize,
-                           const unsigned char *compressedBuffer, const unsigned compressedSize);
-
-  static int isCompressionLevel(int compressionLevel)
-  {
-    return (compressionLevel == Z_DEFAULT_COMPRESSION ||
-                (compressionLevel >= Z_NO_COMPRESSION &&
-                     compressionLevel <= Z_BEST_COMPRESSION));
-  }
-
-  int fullReset()
-  {
-    return (deflateReset(&compressionStream_) == Z_OK &&
-                inflateReset(&decompressionStream_) == Z_OK);
-  }
-
-  private:
-
-  z_stream compressionStream_;
-  z_stream decompressionStream_;
-
-  unsigned char *buffer_;
-  unsigned int  bufferSize_;
-
-  int threshold_;
-};
-
-#endif
diff --git a/nxcomp/Statistics.cpp b/nxcomp/Statistics.cpp
deleted file mode 100644
index baad7ef60..000000000
--- a/nxcomp/Statistics.cpp
+++ /dev/null
@@ -1,2003 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include <stdio.h>
-
-#include "Statistics.h"
-
-#include "Control.h"
-
-#include "Proxy.h"
-
-#include "ClientStore.h"
-#include "ServerStore.h"
-
-//
-// Length of temporary buffer
-// used to format output.
-//
-
-#define FORMAT_LENGTH          1024
-
-//
-// Log level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-//
-// Note that when presenting statistics we invert the
-// correct semantics of X client and server entities.
-// This is questionable, but matches the user's pers-
-// pective of running remote X applications on its
-// local client.
-//
-
-Statistics::Statistics(Proxy *proxy) : proxy_(proxy)
-{
-  transportPartial_.idleTime_             = 0;
-  transportPartial_.readTime_             = 0;
-  transportPartial_.writeTime_            = 0;
-  transportPartial_.proxyBytesIn_         = 0;
-  transportPartial_.proxyBytesOut_        = 0;
-  transportPartial_.proxyFramesIn_        = 0;
-  transportPartial_.proxyFramesOut_       = 0;
-  transportPartial_.proxyWritesOut_       = 0;
-  transportPartial_.compressedBytesIn_    = 0;
-  transportPartial_.compressedBytesOut_   = 0;
-  transportPartial_.decompressedBytesIn_  = 0;
-  transportPartial_.decompressedBytesOut_ = 0;
-  transportPartial_.framingBitsOut_       = 0;
-
-  transportTotal_.idleTime_             = 0;
-  transportTotal_.readTime_             = 0;
-  transportTotal_.writeTime_            = 0;
-  transportTotal_.proxyBytesIn_         = 0;
-  transportTotal_.proxyBytesOut_        = 0;
-  transportTotal_.proxyFramesIn_        = 0;
-  transportTotal_.proxyFramesOut_       = 0;
-  transportTotal_.proxyWritesOut_       = 0;
-  transportTotal_.compressedBytesIn_    = 0;
-  transportTotal_.compressedBytesOut_   = 0;
-  transportTotal_.decompressedBytesIn_  = 0;
-  transportTotal_.decompressedBytesOut_ = 0;
-  transportTotal_.framingBitsOut_       = 0;
-
-  for (int i = 0; i < STATISTICS_OPCODE_MAX; i++)
-  {
-    protocolPartial_.requestCached_[i]  = 0;
-    protocolPartial_.requestReplied_[i] = 0;
-    protocolPartial_.requestCount_[i]   = 0;
-    protocolPartial_.requestBitsIn_[i]  = 0;
-    protocolPartial_.requestBitsOut_[i] = 0;
-
-    protocolPartial_.renderRequestCached_[i]  = 0;
-    protocolPartial_.renderRequestCount_[i]   = 0;
-    protocolPartial_.renderRequestBitsIn_[i]  = 0;
-    protocolPartial_.renderRequestBitsOut_[i] = 0;
-
-    protocolPartial_.replyCached_[i]  = 0;
-    protocolPartial_.replyCount_[i]   = 0;
-    protocolPartial_.replyBitsIn_[i]  = 0;
-    protocolPartial_.replyBitsOut_[i] = 0;
-
-    protocolPartial_.eventCached_[i]  = 0;
-    protocolPartial_.eventCount_[i]   = 0;
-    protocolPartial_.eventBitsIn_[i]  = 0;
-    protocolPartial_.eventBitsOut_[i] = 0;
-
-    protocolTotal_.requestCached_[i]  = 0;
-    protocolTotal_.requestReplied_[i] = 0;
-    protocolTotal_.requestCount_[i]   = 0;
-    protocolTotal_.requestBitsIn_[i]  = 0;
-    protocolTotal_.requestBitsOut_[i] = 0;
-
-    protocolTotal_.renderRequestCached_[i]  = 0;
-    protocolTotal_.renderRequestCount_[i]   = 0;
-    protocolTotal_.renderRequestBitsIn_[i]  = 0;
-    protocolTotal_.renderRequestBitsOut_[i] = 0;
-
-    protocolTotal_.replyCached_[i]  = 0;
-    protocolTotal_.replyCount_[i]   = 0;
-    protocolTotal_.replyBitsIn_[i]  = 0;
-    protocolTotal_.replyBitsOut_[i] = 0;
-
-    protocolTotal_.eventCached_[i]  = 0;
-    protocolTotal_.eventCount_[i]   = 0;
-    protocolTotal_.eventBitsIn_[i]  = 0;
-    protocolTotal_.eventBitsOut_[i] = 0;
-  }
-
-  protocolPartial_.cupsCount_    = 0;
-  protocolPartial_.cupsBitsIn_   = 0;
-  protocolPartial_.cupsBitsOut_  = 0;
-
-  protocolPartial_.smbCount_     = 0;
-  protocolPartial_.smbBitsIn_    = 0;
-  protocolPartial_.smbBitsOut_   = 0;
-
-  protocolPartial_.mediaCount_   = 0;
-  protocolPartial_.mediaBitsIn_  = 0;
-  protocolPartial_.mediaBitsOut_ = 0;
-
-  protocolPartial_.httpCount_    = 0;
-  protocolPartial_.httpBitsIn_   = 0;
-  protocolPartial_.httpBitsOut_  = 0;
-
-  protocolPartial_.fontCount_    = 0;
-  protocolPartial_.fontBitsIn_   = 0;
-  protocolPartial_.fontBitsOut_  = 0;
-
-  protocolPartial_.slaveCount_   = 0;
-  protocolPartial_.slaveBitsIn_  = 0;
-  protocolPartial_.slaveBitsOut_ = 0;
-
-  protocolTotal_.cupsCount_    = 0;
-  protocolTotal_.cupsBitsIn_   = 0;
-  protocolTotal_.cupsBitsOut_  = 0;
-
-  protocolTotal_.smbCount_     = 0;
-  protocolTotal_.smbBitsIn_    = 0;
-  protocolTotal_.smbBitsOut_   = 0;
-
-  protocolTotal_.mediaCount_   = 0;
-  protocolTotal_.mediaBitsIn_  = 0;
-  protocolTotal_.mediaBitsOut_ = 0;
-
-  protocolTotal_.httpCount_    = 0;
-  protocolTotal_.httpBitsIn_   = 0;
-  protocolTotal_.httpBitsOut_  = 0;
-
-  protocolTotal_.fontCount_    = 0;
-  protocolTotal_.fontBitsIn_   = 0;
-  protocolTotal_.fontBitsOut_  = 0;
-
-  protocolTotal_.slaveCount_   = 0;
-  protocolTotal_.slaveBitsIn_  = 0;
-  protocolTotal_.slaveBitsOut_ = 0;
-
-  packedPartial_.packedBytesIn_  = 0;
-  packedPartial_.packedBytesOut_ = 0;
-
-  packedTotal_.packedBytesIn_    = 0;
-  packedTotal_.packedBytesOut_   = 0;
-
-  splitPartial_.splitCount_           = 0;
-  splitPartial_.splitAborted_         = 0;
-  splitPartial_.splitAbortedBytesOut_ = 0;
-
-  splitTotal_.splitCount_             = 0;
-  splitTotal_.splitAborted_           = 0;
-  splitTotal_.splitAbortedBytesOut_   = 0;
-
-  overallPartial_.overallBytesIn_  = 0;
-  overallPartial_.overallBytesOut_ = 0;
-
-  overallTotal_.overallBytesIn_    = 0;
-  overallTotal_.overallBytesOut_   = 0;
-
-  proxyData_.protocolCount_ = 0;
-  proxyData_.controlCount_  = 0;
-  proxyData_.splitCount_    = 0;
-  proxyData_.dataCount_     = 0;
-
-  proxyData_.streamRatio_ = 1;
-
-  startShortFrameTs_ = getTimestamp();
-  startLongFrameTs_  = getTimestamp();
-  startFrameTs_      = getTimestamp();
-
-  bytesInShortFrame_ = 0;
-  bytesInLongFrame_  = 0;
-
-  bitrateInShortFrame_ = 0;
-  bitrateInLongFrame_  = 0;
-
-  topBitrate_ = 0;
-
-  congestionInFrame_ = 0;
-}
-
-Statistics::~Statistics()
-{
-}
-
-int Statistics::resetPartialStats()
-{
-  transportPartial_.idleTime_             = 0;
-  transportPartial_.readTime_             = 0;
-  transportPartial_.writeTime_            = 0;
-  transportPartial_.proxyBytesIn_         = 0;
-  transportPartial_.proxyBytesOut_        = 0;
-  transportPartial_.proxyFramesIn_        = 0;
-  transportPartial_.proxyFramesOut_       = 0;
-  transportPartial_.proxyWritesOut_       = 0;
-  transportPartial_.compressedBytesIn_    = 0;
-  transportPartial_.compressedBytesOut_   = 0;
-  transportPartial_.decompressedBytesIn_  = 0;
-  transportPartial_.decompressedBytesOut_ = 0;
-  transportPartial_.framingBitsOut_       = 0;
-
-  for (int i = 0; i < STATISTICS_OPCODE_MAX; i++)
-  {
-    protocolPartial_.requestCached_[i]  = 0;
-    protocolPartial_.requestReplied_[i] = 0;
-    protocolPartial_.requestCount_[i]   = 0;
-    protocolPartial_.requestBitsIn_[i]  = 0;
-    protocolPartial_.requestBitsOut_[i] = 0;
-
-    protocolPartial_.renderRequestCached_[i]  = 0;
-    protocolPartial_.renderRequestCount_[i]   = 0;
-    protocolPartial_.renderRequestBitsIn_[i]  = 0;
-    protocolPartial_.renderRequestBitsOut_[i] = 0;
-
-    protocolPartial_.replyCached_[i]  = 0;
-    protocolPartial_.replyCount_[i]   = 0;
-    protocolPartial_.replyBitsIn_[i]  = 0;
-    protocolPartial_.replyBitsOut_[i] = 0;
-
-    protocolPartial_.eventCached_[i]  = 0;
-    protocolPartial_.eventCount_[i]   = 0;
-    protocolPartial_.eventBitsIn_[i]  = 0;
-    protocolPartial_.eventBitsOut_[i] = 0;
-  }
-
-  protocolPartial_.cupsCount_    = 0;
-  protocolPartial_.cupsBitsIn_   = 0;
-  protocolPartial_.cupsBitsOut_  = 0;
-
-  protocolPartial_.smbCount_     = 0;
-  protocolPartial_.smbBitsIn_    = 0;
-  protocolPartial_.smbBitsOut_   = 0;
-
-  protocolPartial_.mediaCount_   = 0;
-  protocolPartial_.mediaBitsIn_  = 0;
-  protocolPartial_.mediaBitsOut_ = 0;
-
-  protocolPartial_.httpCount_    = 0;
-  protocolPartial_.httpBitsIn_   = 0;
-  protocolPartial_.httpBitsOut_  = 0;
-
-  protocolPartial_.fontCount_    = 0;
-  protocolPartial_.fontBitsIn_   = 0;
-  protocolPartial_.fontBitsOut_  = 0;
-
-  protocolPartial_.slaveCount_   = 0;
-  protocolPartial_.slaveBitsIn_  = 0;
-  protocolPartial_.slaveBitsOut_ = 0;
-
-  packedPartial_.packedBytesIn_  = 0;
-  packedPartial_.packedBytesOut_ = 0;
-
-  splitPartial_.splitCount_           = 0;
-  splitPartial_.splitAborted_         = 0;
-  splitPartial_.splitAbortedBytesOut_ = 0;
-
-  overallPartial_.overallBytesIn_  = 0;
-  overallPartial_.overallBytesOut_ = 0;
-
-  return 1;
-}
-
-void Statistics::addCompressedBytes(unsigned int bytesIn, unsigned int bytesOut)
-{
-  transportPartial_.compressedBytesIn_ += bytesIn;
-  transportTotal_.compressedBytesIn_ += bytesIn;
-
-  transportPartial_.compressedBytesOut_ += bytesOut;
-  transportTotal_.compressedBytesOut_ += bytesOut;
-
-  double ratio = bytesIn / bytesOut;
-
-  if (ratio < 1)
-  {
-    ratio = 1;
-  }
-
-  #if defined(TEST) || defined(TOKEN)
-  *logofs << "Statistics: TOKEN! Old ratio was "
-          << proxyData_.streamRatio_ << " current is "
-          << (double) ratio << " new ratio is " << (double)
-             ((proxyData_.streamRatio_ * 2) + ratio) / 3 << ".\n"
-          << logofs_flush;
-  #endif
-
-  proxyData_.streamRatio_ = ((proxyData_.streamRatio_ * 2) + ratio) / 3;
-
-  #if defined(TEST) || defined(TOKEN)
-  *logofs << "Statistics: TOKEN! Updated compressed bytes "
-          << "with " << bytesIn << " in " << bytesOut << " out "
-          << "and ratio " << (double) proxyData_.streamRatio_
-          << ".\n" << logofs_flush;
-  #endif
-}
-
-//
-// Recalculate the current bitrate. The bytes written
-// are accounted at the time the transport actually
-// writes the data to the network, not at the time it
-// receives the data from the upper layers. The reason
-// is that data can be compressed by the stream com-
-// pressor, so we can become aware of the new bitrate
-// only afer having flushed the ZLIB stream. This also
-// means that, to have a reliable estimate, we need to
-// flush the link often.
-//
-
-void Statistics::updateBitrate(int bytes)
-{
-  T_timestamp thisFrameTs = getNewTimestamp();
-
-  int diffFramesInMs = diffTimestamp(startFrameTs_, thisFrameTs);
-
-  #ifdef DEBUG
-  *logofs << "Statistics: Difference since previous timestamp is "
-          << diffFramesInMs << " Ms.\n" << logofs_flush;
-  #endif
-
-  if (diffFramesInMs > 0)
-  {
-    #ifdef DEBUG
-    *logofs << "Statistics: Removing " << diffFramesInMs
-            << " Ms in short and long time frame.\n"
-            << logofs_flush;
-    #endif
-
-    int shortBytesToRemove = (int) (((double) bytesInShortFrame_ * (double) diffFramesInMs) /
-                                       (double) control -> ShortBitrateTimeFrame);
-
-    int longBytesToRemove = (int) (((double) bytesInLongFrame_ * (double) diffFramesInMs) /
-                                      (double) control -> LongBitrateTimeFrame);
-
-    #ifdef DEBUG
-    *logofs << "Statistics: Removing " << shortBytesToRemove
-            << " bytes from " << bytesInShortFrame_
-            << " in the short frame.\n" << logofs_flush;
-    #endif
-
-    bytesInShortFrame_ -= shortBytesToRemove;
-
-    if (bytesInShortFrame_ < 0)
-    {
-      #ifdef TEST
-      *logofs << "Statistics: Bytes in short frame are "
-              << bytesInShortFrame_ << ". Set to 0.\n"
-              << logofs_flush;
-      #endif
-
-      bytesInShortFrame_ = 0;
-    }
-
-    #ifdef DEBUG
-    *logofs << "Statistics: Removing " << longBytesToRemove
-            << " bytes from " << bytesInLongFrame_
-            << " in the long frame.\n" << logofs_flush;
-    #endif
-
-    bytesInLongFrame_ -= longBytesToRemove;
-
-    if (bytesInLongFrame_ < 0)
-    {
-      #ifdef TEST
-      *logofs << "Statistics: Bytes in long frame are "
-              << bytesInLongFrame_ << ". Set to 0.\n"
-              << logofs_flush;
-      #endif
-
-      bytesInLongFrame_ = 0;
-    }
-
-    int diffStartInMs;
-
-    diffStartInMs = diffTimestamp(thisFrameTs, startShortFrameTs_);
-
-    if (diffStartInMs > control -> ShortBitrateTimeFrame)
-    {
-      addMsTimestamp(startShortFrameTs_, diffStartInMs);
-    }
-
-    diffStartInMs = diffTimestamp(thisFrameTs, startLongFrameTs_);
-
-    if (diffStartInMs > control -> LongBitrateTimeFrame)
-    {
-      addMsTimestamp(startLongFrameTs_, diffStartInMs);
-    }
-
-    startFrameTs_ = thisFrameTs;
-  }
-
-  #ifdef DEBUG
-  *logofs << "Statistics: Adding " << bytes << " bytes to "
-          << bytesInShortFrame_ << " in the short frame.\n"
-          << logofs_flush;
-  #endif
-
-  bytesInShortFrame_ = bytesInShortFrame_ + bytes;
-
-  #ifdef DEBUG
-  *logofs << "Statistics: Adding " << bytes << " bytes to "
-          << bytesInLongFrame_ << " in the long frame.\n"
-          << logofs_flush;
-  #endif
-
-  bytesInLongFrame_ = bytesInLongFrame_ + bytes;
-
-  bitrateInShortFrame_ = (int) ((double) bytesInShortFrame_ /
-                                   ((double) control -> ShortBitrateTimeFrame / 1000));
-
-  bitrateInLongFrame_ = (int) ((double) bytesInLongFrame_ /
-                                   ((double) control -> LongBitrateTimeFrame / 1000));
-
-  if (bitrateInShortFrame_ > topBitrate_)
-  {
-    topBitrate_ = bitrateInShortFrame_;
-  }
-
-  #ifdef TEST
-  *logofs << "Statistics: Current bitrate is short " << bitrateInShortFrame_
-          << " long " << bitrateInLongFrame_ << " top " << topBitrate_
-          << ".\n" << logofs_flush;
-  #endif
-}
-
-void Statistics::updateCongestion(int remaining, int limit)
-{
-  #ifdef TEST
-  *logofs << "Statistics: Updating the congestion "
-          << "counters at " << strMsTimestamp()
-          << ".\n" << logofs_flush;
-  #endif
-
-  double current = remaining;
-
-  if (current < 0)
-  {
-    current = 0;
-  }
-
-  current = 9 * (limit - current) / limit;
-
-  #ifdef TEST
-  *logofs << "Statistics: Current congestion is "
-          << current << " with " << limit << " tokens "
-          << "and " << remaining << " remaining.\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // If the current congestion counter is greater
-  // than the previous, take the current value,
-  // otherwise ramp down the value by calculating
-  // the average of the last 8 updates.
-  //
-
-  #ifdef TEST
-  *logofs << "Statistics: Old congestion was "
-          << congestionInFrame_;
-  #endif
-
-  if (current >= congestionInFrame_)
-  {
-    congestionInFrame_ = current;
-  }
-  else
-  {
-    congestionInFrame_ = ((congestionInFrame_ * 7) + current) / 8;
-  }
-
-  #ifdef TEST
-  *logofs << " new congestion is "
-          << ((congestionInFrame_ * 7) + current) / 8
-          << ".\n" << logofs_flush;
-  #endif
-
-  //
-  // Call the function with 0 bytes flushed
-  // so the agent can update its congestion
-  // counter.
-  //
-
-  FlushCallback(0);
-}
-
-int Statistics::getClientCacheStats(int type, char *&buffer)
-{
-  if (type != PARTIAL_STATS && type != TOTAL_STATS)
-  {
-    #ifdef PANIC
-    *logofs << "Statistics: PANIC! Cannot produce statistics "
-            << "with qualifier '" << type << "'.\n"
-            << logofs_flush;
-    #endif
-
-    return -1;
-  }
-
-  //
-  // Print message cache data according
-  // to local and remote view.
-  //
-
-  MessageStore *currentStore = NULL;
-  MessageStore *anyStore     = NULL;
-
-  char format[FORMAT_LENGTH];
-
-  strcat(buffer, "\nNX Cache Statistics\n");
-  strcat(buffer, "-------------------\n\n");
-
-  for (int m = proxy_client; m <= proxy_server; m++)
-  {
-    if (m == proxy_client)
-    {
-      strcat(buffer, "Request\tCached\tSize at Server\t\tSize at Client\t\tCache limit\n");
-      strcat(buffer, "-------\t------\t--------------\t\t--------------\t\t-----------\n");
-    }
-    else
-    {
-      strcat(buffer, "\nReply\tCached\tSize at Server\t\tSize at Client\t\tCache limit\n");
-      strcat(buffer, "-----\t------\t--------------\t\t--------------\t\t-----------\n");
-    }
-
-    for (int i = 0; i < CHANNEL_STORE_OPCODE_LIMIT; i++)
-    {
-      if (m == proxy_client)
-      {
-        currentStore = proxy_ -> getClientStore() -> getRequestStore(i);
-      }
-      else
-      {
-        currentStore = proxy_ -> getServerStore() -> getReplyStore(i);
-      }
-
-      if (currentStore != NULL &&
-              (currentStore -> getLocalStorageSize() ||
-                   currentStore -> getRemoteStorageSize()))
-      {
-        anyStore = currentStore;
-
-        sprintf(format, "#%d\t%d\t", i, currentStore -> getSize());
-
-        strcat(buffer, format);
-
-        sprintf(format, "%d (%.0f KB)\t\t", currentStore -> getLocalStorageSize(),
-                    ((double) currentStore -> getLocalStorageSize()) / 1024);
-
-        strcat(buffer, format);
-
-        sprintf(format, "%d (%.0f KB)\t\t", currentStore -> getRemoteStorageSize(),
-                    ((double) currentStore -> getRemoteStorageSize()) / 1024);
-
-        strcat(buffer, format);
-
-        sprintf(format, "%d/%.0f KB\n", currentStore -> cacheSlots,
-                    ((double) control -> getUpperStorageSize() / 100 *
-                          currentStore -> cacheThreshold) / 1024);
-
-        strcat(buffer, format);
-      }
-    }
-
-    if (anyStore == NULL)
-    {
-      strcat(buffer, "N/A\n");
-    }
-  }
-
-  if (anyStore != NULL)
-  {
-    sprintf(format, "\ncache: %d bytes (%d KB) available at server.\n",
-                control -> ClientTotalStorageSize,
-                    control -> ClientTotalStorageSize / 1024);
-
-    strcat(buffer, format);
-
-    sprintf(format, "       %d bytes (%d KB) available at client.\n\n",
-                control -> ServerTotalStorageSize,
-                    control -> ServerTotalStorageSize / 1024);
-
-    strcat(buffer, format);
-
-    sprintf(format, "       %d bytes (%d KB) allocated at server.\n",
-                anyStore -> getLocalTotalStorageSize(),
-                    anyStore -> getLocalTotalStorageSize() / 1024);
-
-    strcat(buffer, format);
-
-    sprintf(format, "       %d bytes (%d KB) allocated at client.\n\n\n",
-                anyStore -> getRemoteTotalStorageSize(),
-                    anyStore -> getRemoteTotalStorageSize() / 1024);
-
-    strcat(buffer, format);
-  }
-  else
-  {
-    strcat(buffer, "\ncache: N/A\n\n");
-  }
-
-  return 1;
-}
-
-int Statistics::getClientProtocolStats(int type, char *&buffer)
-{
-  if (type != PARTIAL_STATS && type != TOTAL_STATS)
-  {
-    #ifdef PANIC
-    *logofs << "Statistics: PANIC! Cannot produce statistics "
-            << "with qualifier '" << type << "'.\n"
-            << logofs_flush;
-    #endif
-
-    return -1;
-  }
-
-  struct T_transportData *transportData;
-  struct T_protocolData  *protocolData;
-  struct T_overallData   *overallData;
-
-  if (type == PARTIAL_STATS)
-  {
-    transportData = &transportPartial_;
-    protocolData = &protocolPartial_;
-    overallData = &overallPartial_;
-  }
-  else
-  {
-    transportData = &transportTotal_;
-    protocolData = &protocolTotal_;
-    overallData = &overallTotal_;
-  }
-
-  char format[FORMAT_LENGTH];
-
-  double countRequestIn        = 0;
-  double countCachedRequestIn  = 0;
-  double countRepliedRequestIn = 0;
-
-  double countRequestBitsIn  = 0;
-  double countRequestBitsOut = 0;
-
-  double countAnyIn   = 0;
-  double countBitsIn  = 0;
-  double countBitsOut = 0;
-
-  //
-  // Print request data.
-  //
-
-  strcat(buffer, "NX Server Side Protocol Statistics\n");
-  strcat(buffer, "----------------------------------\n\n");
-
-  //
-  // Print render data.
-  //
-
-  strcat(buffer, "Render  Total\tCached\tBits In\t\tBits Out\tBits/Request\t\tRatio\n");
-  strcat(buffer, "------- -----\t------\t-------\t\t--------\t------------\t\t-----\n");
-
-  for (int i = 0; i < STATISTICS_OPCODE_MAX; i++)
-  {
-    if (protocolData -> renderRequestCount_[i])
-    {
-      sprintf(format, "#%d ", i);
-
-      while (strlen(format) < 8)
-      {
-        strcat(format, " ");
-      }
-
-      strcat(buffer, format);
-
-      if (protocolData -> renderRequestCached_[i] > 0)
-      {
-        sprintf(format, "%.0f\t%.0f", protocolData -> renderRequestCount_[i],
-                    protocolData -> renderRequestCached_[i]);
-      }
-      else
-      {
-        sprintf(format, "%.0f\t", protocolData -> renderRequestCount_[i]);
-      }
-
-      strcat(buffer, format);
-
-      sprintf(format, "\t%.0f (%.0f KB)\t%.0f (%.0f KB)\t%.0f/1 -> %.0f/1     \t",
-                  protocolData -> renderRequestBitsIn_[i], protocolData -> renderRequestBitsIn_[i] / 8192,
-                      protocolData -> renderRequestBitsOut_[i], protocolData -> renderRequestBitsOut_[i] / 8192,
-                          protocolData -> renderRequestBitsIn_[i] / protocolData -> renderRequestCount_[i],
-                              protocolData -> renderRequestBitsOut_[i] / protocolData -> renderRequestCount_[i]);
-
-      strcat(buffer, format);
-
-      if (protocolData -> renderRequestBitsOut_[i] > 0)
-      {
-        sprintf(format, "%5.3f:1\n", protocolData -> renderRequestBitsIn_[i] /
-                                         protocolData -> renderRequestBitsOut_[i]);
-
-        strcat(buffer, format);
-      }
-      else
-      {
-        strcat(buffer, "1:1\n");
-      }
-    }
-
-    countRequestIn        += protocolData -> renderRequestCount_[i];
-    countCachedRequestIn  += protocolData -> renderRequestCached_[i];
-
-    countRequestBitsIn  += protocolData -> renderRequestBitsIn_[i];
-    countRequestBitsOut += protocolData -> renderRequestBitsOut_[i];
-
-    countAnyIn   += protocolData -> renderRequestCount_[i];
-    countBitsIn  += protocolData -> renderRequestBitsIn_[i];
-    countBitsOut += protocolData -> renderRequestBitsOut_[i];
-  }
-
-  if (countRequestIn > 0)
-  {
-    if (countCachedRequestIn > 0)
-    {
-      sprintf(format, "\ntotal:  %.0f\t%.0f", countRequestIn, countCachedRequestIn);
-    }
-    else
-    {
-      sprintf(format, "\ntotal:  %.0f\t", countRequestIn);
-    }
-
-    strcat(buffer, format);
-
-    sprintf(format, "\t%.0f (%.0f KB)\t%.0f (%.0f KB)\t%.0f/1 -> %.0f/1     \t",
-                countRequestBitsIn, countRequestBitsIn / 8192, countRequestBitsOut,
-                    countRequestBitsOut / 8192, countRequestBitsIn / countRequestIn,
-                        countRequestBitsOut / countRequestIn);
-
-    strcat(buffer, format);
-
-    if (countRequestBitsOut > 0)
-    {
-      sprintf(format, "%5.3f:1\n", countRequestBitsIn / countRequestBitsOut);
-    }
-    else
-    {
-      sprintf(format, "1:1\n");
-    }
-
-    strcat(buffer, format);
-  }
-  else
-  {
-    strcat(buffer, "N/A\n\n");
-  }
-
-  countRequestIn        = 0;
-  countCachedRequestIn  = 0;
-
-  countRequestBitsIn  = 0;
-  countRequestBitsOut = 0;
-
-  countAnyIn   = 0;
-  countBitsIn  = 0;
-  countBitsOut = 0;
-
-  //
-  // Print other requests' data.
-  //
-
-  strcat(buffer, "\nRequest Total\tCached\tBits In\t\tBits Out\tBits/Request\t\tRatio\n");
-  strcat(buffer, "------- -----\t------\t-------\t\t--------\t------------\t\t-----\n");
-
-  for (int i = 0; i < STATISTICS_OPCODE_MAX; i++)
-  {
-    if (protocolData -> requestCount_[i])
-    {
-      sprintf(format, "#%d ", i);
-
-      while (strlen(format) < 5)
-      {
-        strcat(format, " ");
-      }
-
-      //
-      // Mark NX agent-related requests, those
-      // having a reply and finally those that
-      // have been probably tainted by client
-      // side.
-      //
-
-      if (i >= X_NXFirstOpcode && i <= X_NXLastOpcode)
-      {
-        strcat(format, "A");
-      }
-
-      if (i != X_NXInternalGenericReply && protocolData -> requestReplied_[i] > 0)
-      {
-        strcat(format, "R");
-      }
-
-      if (i == X_NoOperation && control -> TaintReplies)
-      {
-        strcat(format, "T");
-      }
-
-      while (strlen(format) < 8)
-      {
-        strcat(format, " ");
-      }
-
-      strcat(buffer, format);
-
-      if (protocolData -> requestCached_[i] > 0)
-      {
-        sprintf(format, "%.0f\t%.0f", protocolData -> requestCount_[i],
-                    protocolData -> requestCached_[i]);
-      }
-      else
-      {
-        sprintf(format, "%.0f\t", protocolData -> requestCount_[i]);
-      }
-
-      strcat(buffer, format);
-
-      sprintf(format, "\t%.0f (%.0f KB)\t%.0f (%.0f KB)\t%.0f/1 -> %.0f/1     \t",
-                  protocolData -> requestBitsIn_[i], protocolData -> requestBitsIn_[i] / 8192,
-                      protocolData -> requestBitsOut_[i], protocolData -> requestBitsOut_[i] / 8192,
-                          protocolData -> requestBitsIn_[i] / protocolData -> requestCount_[i],
-                              protocolData -> requestBitsOut_[i] / protocolData -> requestCount_[i]);
-
-      strcat(buffer, format);
-
-      if (protocolData -> requestBitsOut_[i] > 0)
-      {
-        sprintf(format, "%5.3f:1\n", protocolData -> requestBitsIn_[i] /
-                                         protocolData -> requestBitsOut_[i]);
-
-        strcat(buffer, format);
-      }
-      else
-      {
-        strcat(buffer, "1:1\n");
-      }
-    }
-
-    countRequestIn        += protocolData -> requestCount_[i];
-    countCachedRequestIn  += protocolData -> requestCached_[i];
-    countRepliedRequestIn += protocolData -> requestReplied_[i];
-
-    countRequestBitsIn  += protocolData -> requestBitsIn_[i];
-    countRequestBitsOut += protocolData -> requestBitsOut_[i];
-
-    countAnyIn   += protocolData -> requestCount_[i];
-    countBitsIn  += protocolData -> requestBitsIn_[i];
-    countBitsOut += protocolData -> requestBitsOut_[i];
-  }
-
-  if (countRequestIn > 0)
-  {
-    if (countCachedRequestIn > 0)
-    {
-      sprintf(format, "\ntotal:  %.0f\t%.0f", countRequestIn, countCachedRequestIn);
-    }
-    else
-    {
-      sprintf(format, "\ntotal:  %.0f\t", countRequestIn);
-    }
-
-    strcat(buffer, format);
-
-    sprintf(format, "\t%.0f (%.0f KB)\t%.0f (%.0f KB)\t%.0f/1 -> %.0f/1     \t",
-                countRequestBitsIn, countRequestBitsIn / 8192, countRequestBitsOut,
-                    countRequestBitsOut / 8192, countRequestBitsIn / countRequestIn,
-                        countRequestBitsOut / countRequestIn);
-
-    strcat(buffer, format);
-
-    if (countRequestBitsOut > 0)
-    {
-      sprintf(format, "%5.3f:1\n", countRequestBitsIn / countRequestBitsOut);
-    }
-    else
-    {
-      sprintf(format, "1:1\n");
-    }
-
-    strcat(buffer, format);
-  }
-  else
-  {
-    strcat(buffer, "N/A\n\n");
-  }
-
-  //
-  // Print transport data.
-  //
-
-  getTimeStats(type, buffer);
-
-  countAnyIn   += protocolData -> cupsCount_;
-  countBitsIn  += protocolData -> cupsBitsIn_;
-  countBitsOut += protocolData -> cupsBitsOut_;
-
-  countAnyIn   += protocolData -> smbCount_;
-  countBitsIn  += protocolData -> smbBitsIn_;
-  countBitsOut += protocolData -> smbBitsOut_;
-
-  countAnyIn   += protocolData -> mediaCount_;
-  countBitsIn  += protocolData -> mediaBitsIn_;
-  countBitsOut += protocolData -> mediaBitsOut_;
-
-  countAnyIn   += protocolData -> httpCount_;
-  countBitsIn  += protocolData -> httpBitsIn_;
-  countBitsOut += protocolData -> httpBitsOut_;
-
-  countAnyIn   += protocolData -> fontCount_;
-  countBitsIn  += protocolData -> fontBitsIn_;
-  countBitsOut += protocolData -> fontBitsOut_;
-
-  countAnyIn   += protocolData -> slaveCount_;
-  countBitsIn  += protocolData -> slaveBitsIn_;
-  countBitsOut += protocolData -> slaveBitsOut_;
-
-  //
-  // Save the overall amount of bytes
-  // coming from X clients.
-  //
-
-  overallData -> overallBytesIn_ = countBitsIn / 8;
-
-  //
-  // Print performance data.
-  //
-
-  if (transportData -> readTime_ > 0)
-  {
-    sprintf(format, "      %.0f messages (%.0f KB) encoded per second.\n\n",
-                countAnyIn / (transportData -> readTime_ / 1000),
-                    (countBitsIn + transportData -> framingBitsOut_) / 8192 /
-                         (transportData -> readTime_ / 1000));
-  }
-  else
-  {
-    sprintf(format, "      %.0f messages (%.0f KB) encoded per second.\n\n",
-                countAnyIn, (countBitsIn + transportData ->
-                    framingBitsOut_) / 8192);
-  }
-
-  strcat(buffer, format);
-
-  strcat(buffer, "link: ");
-
-  //
-  // ZLIB compression stats.
-  //
-
-  getStreamStats(type, buffer);
-
-  //
-  // Save the overall amount of bytes
-  // sent on NX proxy link.
-  //
-
-  if (transportData -> compressedBytesOut_ > 0)
-  {
-    overallData -> overallBytesOut_ = transportData -> compressedBytesOut_;
-  }
-  else
-  {
-    overallData -> overallBytesOut_ = countBitsOut / 8;
-  }
-
-  //
-  // Print info on multiplexing overhead.
-  //
-
-  getFramingStats(type, buffer);
-
-  //
-  // Print stats about additional channels.
-  //
-
-  getServicesStats(type, buffer);
-
-  //
-  // Compression summary.
-  //
-
-  double ratio = 1;
-
-  if (transportData -> compressedBytesOut_ / 1024 > 0)
-  {
-    ratio = ((countBitsIn + transportData -> framingBitsOut_) / 8192) /
-                  (transportData -> compressedBytesOut_ / 1024);
-
-  }
-  else if (countBitsOut > 0)
-  {
-    ratio = (countBitsIn + transportData -> framingBitsOut_) /
-                 countBitsOut;
-  }
-
-  sprintf(format, "      Protocol compression ratio is %5.3f:1.\n\n",
-              ratio);
-
-  strcat(buffer, format);
-
-  getBitrateStats(type, buffer);
-
-  getSplitStats(type, buffer);
-
-  sprintf(format, "      %.0f total handled replies (%.0f unmatched).\n\n\n",
-              countRepliedRequestIn, protocolData -> requestReplied_[X_NXInternalGenericReply]);
-
-  strcat(buffer, format);
-
-  return 1;
-}
-
-int Statistics::getClientOverallStats(int type, char *&buffer)
-{
-  if (type != PARTIAL_STATS && type != TOTAL_STATS)
-  {
-    #ifdef PANIC
-    *logofs << "Statistics: PANIC! Cannot produce statistics "
-            << "with qualifier '" << type << "'.\n"
-            << logofs_flush;
-    #endif
-
-    return -1;
-  }
-
-  struct T_overallData *overallData;
-  struct T_packedData  *packedData;
-
-  if (type == PARTIAL_STATS)
-  {
-    overallData = &overallPartial_;
-    packedData  = &packedPartial_;
-  }
-  else
-  {
-    overallData = &overallTotal_;
-    packedData = &packedTotal_;
-  }
-
-  char format[FORMAT_LENGTH];
-
-  //
-  // Print header including link type,
-  // followed by info on packed images.
-  //
-
-  strcat(buffer, "NX Compression Summary\n");
-  strcat(buffer, "----------------------\n\n");
-
-  char label[FORMAT_LENGTH];
-
-  switch (control -> LinkMode)
-  {
-    case LINK_TYPE_NONE:
-    {
-      strcpy(label, "NONE");
-
-      break;
-    }
-    case LINK_TYPE_MODEM:
-    {
-      strcpy(label, "MODEM");
-
-      break;
-    }
-    case LINK_TYPE_ISDN:
-    {
-      strcpy(label, "ISDN");
-
-      break;
-    }
-    case LINK_TYPE_ADSL:
-    {
-      strcpy(label, "ADSL");
-
-      break;
-    }
-    case LINK_TYPE_WAN:
-    {
-      strcpy(label, "WAN");
-
-      break;
-    }
-    case LINK_TYPE_LAN:
-    {
-      strcpy(label, "LAN");
-
-      break;
-    }
-    default:
-    {
-      strcpy(label, "Unknown");
-
-      break;
-    }
-  }
-
-  sprintf(format, "link:    %s", label);
-
-  if (control -> LocalDeltaCompression == 1)
-  {
-    strcat(format, " with protocol compression enabled.");
-  }
-  else
-  {
-    strcat(format, " with protocol compression disabled.");
-  }
-
-  strcat(format, "\n\n");
-
-  strcat(buffer, format);
-
-  if (packedData -> packedBytesIn_ > 0)
-  {
-    sprintf(format, "images:  %.0f bytes (%.0f KB) packed to %.0f (%.0f KB).\n\n",
-                packedData -> packedBytesOut_, packedData -> packedBytesOut_ / 1024,
-                    packedData -> packedBytesIn_, packedData -> packedBytesIn_ / 1024);
-
-    strcat(buffer, format);
-
-    sprintf(format, "         Images compression ratio is %5.3f:1.\n\n",
-                packedData -> packedBytesOut_ / packedData -> packedBytesIn_);
-
-    strcat(buffer, format);
-  }
-
-  double overallIn = overallData -> overallBytesIn_ - packedData -> packedBytesIn_ +
-                         packedData -> packedBytesOut_;
-
-  double overallOut = overallData -> overallBytesOut_;
-
-  sprintf(format, "overall: %.0f bytes (%.0f KB) in, %.0f bytes (%.0f KB) out.\n\n",
-              overallIn, overallIn / 1024, overallOut, overallOut / 1024);
-
-  strcat(buffer, format);
-
-  if (overallData -> overallBytesOut_ > 0)
-  {
-    sprintf(format, "         Overall NX server compression ratio is %5.3f:1.\n\n\n",
-                overallIn / overallOut);
-  }
-  else
-  {
-    sprintf(format, "         Overall NX server compression ratio is 1:1.\n\n\n");
-  }
-
-  strcat(buffer, format);
-
-  return 1;
-}
-
-int Statistics::getServerCacheStats(int type, char *&buffer)
-{
-  if (type != PARTIAL_STATS && type != TOTAL_STATS)
-  {
-    #ifdef PANIC
-    *logofs << "Statistics: PANIC! Cannot produce statistics "
-            << "with qualifier '" << type << "'.\n"
-            << logofs_flush;
-    #endif
-
-    return -1;
-  }
-
-  //
-  // Print message cache data according
-  // to local and remote view.
-  //
-
-  MessageStore *currentStore = NULL;
-  MessageStore *anyStore     = NULL;
-
-  char format[FORMAT_LENGTH];
-
-  strcat(buffer, "\nNX Cache Statistics\n");
-  strcat(buffer, "-------------------\n\n");
-
-  for (int m = proxy_client; m <= proxy_server; m++)
-  {
-    if (m == proxy_client)
-    {
-      strcat(buffer, "Request\tCached\tSize at Server\t\tSize at Client\t\tCache limit\n");
-      strcat(buffer, "-------\t------\t--------------\t\t--------------\t\t-----------\n");
-    }
-    else
-    {
-      strcat(buffer, "\nReply\tCached\tSize at Server\t\tSize at Client\t\tCache limit\n");
-      strcat(buffer, "-----\t------\t--------------\t\t--------------\t\t-----------\n");
-    }
-
-    for (int i = 0; i < CHANNEL_STORE_OPCODE_LIMIT; i++)
-    {
-      if (m == proxy_client)
-      {
-        currentStore = proxy_ -> getClientStore() -> getRequestStore(i);
-      }
-      else
-      {
-        currentStore = proxy_ -> getServerStore() -> getReplyStore(i);
-      }
-
-      if (currentStore != NULL &&
-              (currentStore -> getLocalStorageSize() ||
-                   currentStore -> getRemoteStorageSize()))
-      {
-        anyStore = currentStore;
-
-        sprintf(format, "#%d\t%d\t", i, currentStore -> getSize());
-
-        strcat(buffer, format);
-
-        sprintf(format, "%d (%.0f KB)\t\t", currentStore -> getRemoteStorageSize(),
-                    ((double) currentStore -> getRemoteStorageSize()) / 1024);
-
-        strcat(buffer, format);
-
-        sprintf(format, "%d (%.0f KB)\t\t", currentStore -> getLocalStorageSize(),
-                    ((double) currentStore -> getLocalStorageSize()) / 1024);
-
-        strcat(buffer, format);
-
-        sprintf(format, "%d/%.0f KB\n", currentStore -> cacheSlots,
-                    ((double) control -> getUpperStorageSize() / 100 *
-                          currentStore -> cacheThreshold) / 1024);
-
-        strcat(buffer, format);
-      }
-    }
-
-    if (anyStore == NULL)
-    {
-      strcat(buffer, "N/A\n");
-    }
-  }
-
-  if (anyStore != NULL)
-  {
-    sprintf(format, "\ncache: %d bytes (%d KB) available at server.\n",
-                control -> ClientTotalStorageSize,
-                    control -> ClientTotalStorageSize / 1024);
-
-    strcat(buffer, format);
-
-    sprintf(format, "       %d bytes (%d KB) available at client.\n\n",
-                control -> ServerTotalStorageSize,
-                    control -> ServerTotalStorageSize / 1024);
-
-    strcat(buffer, format);
-
-    sprintf(format, "       %d bytes (%d KB) allocated at server.\n",
-                anyStore -> getRemoteTotalStorageSize(),
-                    anyStore -> getRemoteTotalStorageSize() / 1024);
-
-    strcat(buffer, format);
-
-    sprintf(format, "       %d bytes (%d KB) allocated at client.\n\n\n",
-                anyStore -> getLocalTotalStorageSize(),
-                    anyStore -> getLocalTotalStorageSize() / 1024);
-
-    strcat(buffer, format);
-  }
-  else
-  {
-    strcat(buffer, "\ncache: N/A\n\n");
-  }
-
-  return 1;
-}
-
-int Statistics::getServerProtocolStats(int type, char *&buffer)
-{
-  if (type != PARTIAL_STATS && type != TOTAL_STATS)
-  {
-    #ifdef PANIC
-    *logofs << "Statistics: PANIC! Cannot produce statistics "
-            << "with qualifier '" << type << "'.\n"
-            << logofs_flush;
-    #endif
-
-    return -1;
-  }
-
-  struct T_transportData *transportData;
-  struct T_protocolData  *protocolData;
-  struct T_overallData   *overallData;
-
-  if (type == PARTIAL_STATS)
-  {
-    transportData = &transportPartial_;
-    protocolData = &protocolPartial_;
-    overallData = &overallPartial_;
-  }
-  else
-  {
-    transportData = &transportTotal_;
-    protocolData = &protocolTotal_;
-    overallData = &overallTotal_;
-  }
-
-  char format[FORMAT_LENGTH];
-
-  double countReplyBitsIn  = 0;
-  double countReplyBitsOut = 0;
-
-  double countReplyIn        = 0;
-  double countCachedReplyIn  = 0;
-
-  double countEventBitsIn  = 0;
-  double countEventBitsOut = 0;
-
-  double countEventIn        = 0;
-  double countCachedEventIn  = 0;
-
-  double countAnyIn   = 0;
-  double countBitsIn  = 0;
-  double countBitsOut = 0;
-
-  //
-  // Print reply data.
-  //
-
-  strcat(buffer, "NX Client Side Protocol Statistics\n");
-  strcat(buffer, "----------------------------------\n\n");
-
-  strcat(buffer, "Reply   Total\tCached\tBits In\t\tBits Out\tBits/Reply\t\tRatio\n");
-  strcat(buffer, "------- -----\t------\t-------\t\t--------\t----------\t\t-----\n");
-
-  for (int i = 0; i < STATISTICS_OPCODE_MAX; i++)
-  {
-    if (protocolData -> replyCount_[i])
-    {
-      sprintf(format, "#%d ", i);
-
-      while (strlen(format) < 5)
-      {
-        strcat(format, " ");
-      }
-
-      //
-      // Mark replies originated
-      // by NX agent requests.
-      //
-
-      if (i >= X_NXFirstOpcode && i <= X_NXLastOpcode)
-      {
-        strcat(format, "A");
-      }
-
-      //
-      // Mark replies that we didn't
-      // match against a request.
-      //
-
-      if (i == 1)
-      {
-        strcat(format, "U");
-      }
-
-      while (strlen(format) < 8)
-      {
-        strcat(format, " ");
-      }
-
-      strcat(buffer, format);
-
-      if (protocolData -> replyCached_[i] > 0)
-      {
-        sprintf(format, "%.0f\t%.0f", protocolData -> replyCount_[i],
-                    protocolData -> replyCached_[i]);
-      }
-      else
-      {
-        sprintf(format, "%.0f\t", protocolData -> replyCount_[i]);
-      }
-
-      strcat(buffer, format);
-
-      sprintf(format, "\t%.0f (%.0f KB)\t%.0f (%.0f KB)\t%.0f/1 -> %.0f/1     \t",
-                  protocolData -> replyBitsIn_[i], protocolData -> replyBitsIn_[i] / 8192,
-                      protocolData -> replyBitsOut_[i], protocolData -> replyBitsOut_[i] / 8192,
-                          protocolData -> replyBitsIn_[i] / protocolData -> replyCount_[i],
-                              protocolData -> replyBitsOut_[i] / protocolData -> replyCount_[i]);
-
-      strcat(buffer, format);
-
-      if (protocolData -> replyBitsOut_[i] > 0)
-      {
-        sprintf(format, "%5.3f:1\n", protocolData -> replyBitsIn_[i] /
-                                         protocolData -> replyBitsOut_[i]);
-      }
-      else
-      {
-        sprintf(format, "1:1\n");
-      }
-
-      strcat(buffer, format);
-    }
-
-    countReplyIn       += protocolData -> replyCount_[i];
-    countCachedReplyIn += protocolData -> replyCached_[i];
-
-    countReplyBitsIn  += protocolData -> replyBitsIn_[i];
-    countReplyBitsOut += protocolData -> replyBitsOut_[i];
-
-    countAnyIn   += protocolData -> replyCount_[i];
-    countBitsIn  += protocolData -> replyBitsIn_[i];
-    countBitsOut += protocolData -> replyBitsOut_[i];
-  }
-
-  if (countReplyIn > 0)
-  {
-    if (countCachedReplyIn > 0)
-    {
-      sprintf(format, "\ntotal:  %.0f\t%.0f", countReplyIn, countCachedReplyIn);
-    }
-    else
-    {
-      sprintf(format, "\ntotal:  %.0f\t", countReplyIn);
-    }
-
-    strcat(buffer, format);
-
-    sprintf(format, "\t%.0f (%.0f KB)\t%.0f (%.0f KB)\t%.0f/1 -> %.0f/1     \t",
-                countReplyBitsIn, countReplyBitsIn / 8192, countReplyBitsOut,
-                    countReplyBitsOut / 8192, countReplyBitsIn / countReplyIn,
-                        countReplyBitsOut / countReplyIn);
-
-    strcat(buffer, format);
-
-    if (countReplyBitsOut > 0)
-    {
-      sprintf(format, "%5.3f:1\n", countReplyBitsIn / countReplyBitsOut);
-    }
-    else
-    {
-      sprintf(format, "1:1\n");
-    }
-
-    strcat(buffer, format);
-  }
-  else
-  {
-    strcat(buffer, "N/A\n");
-  }
-
-  strcat(buffer, "\n");
-
-  //
-  // Print event and error data.
-  //
-
-  strcat(buffer, "Event   Total\tCached\tBits In\t\tBits Out\tBits/Event\t\tRatio\n");
-  strcat(buffer, "------- -----\t------\t-------\t\t--------\t----------\t\t-----\n");
-
-  for (int i = 0; i < STATISTICS_OPCODE_MAX; i++)
-  {
-    if (protocolData -> eventCount_[i])
-    {
-      sprintf(format, "#%d ", i);
-
-      while (strlen(format) < 8)
-      {
-        strcat(format, " ");
-      }
-
-      strcat(buffer, format);
-
-      if (protocolData -> eventCached_[i] > 0)
-      {
-        sprintf(format, "%.0f\t%.0f", protocolData -> eventCount_[i],
-                    protocolData -> eventCached_[i]);
-      }
-      else
-      {
-        sprintf(format, "%.0f\t", protocolData -> eventCount_[i]);
-      }
-
-      strcat(buffer, format);
-
-      sprintf(format, "\t%.0f (%.0f KB)\t%.0f (%.0f KB)\t%.0f/1 -> %.0f/1     \t",
-                  protocolData -> eventBitsIn_[i], protocolData -> eventBitsIn_[i] / 8192,
-                      protocolData -> eventBitsOut_[i], protocolData -> eventBitsOut_[i] / 8192,
-                          protocolData -> eventBitsIn_[i] / protocolData -> eventCount_[i],
-                              protocolData -> eventBitsOut_[i] / protocolData -> eventCount_[i]);
-
-      strcat(buffer, format);
-
-      if (protocolData -> eventBitsOut_[i] > 0)
-      {
-        sprintf(format, "%5.3f:1\n", protocolData -> eventBitsIn_[i] /
-                                         protocolData -> eventBitsOut_[i]);
-      }
-      else
-      {
-        sprintf(format, "1:1\n");
-      }
-
-      strcat(buffer, format);
-    }
-
-    countEventIn       += protocolData -> eventCount_[i];
-    countCachedEventIn += protocolData -> eventCached_[i];
-
-    countEventBitsIn  += protocolData -> eventBitsIn_[i];
-    countEventBitsOut += protocolData -> eventBitsOut_[i];
-
-    countAnyIn   += protocolData -> eventCount_[i];
-    countBitsIn  += protocolData -> eventBitsIn_[i];
-    countBitsOut += protocolData -> eventBitsOut_[i];
-  }
-
-  if (countEventIn > 0)
-  {
-    if (countCachedEventIn > 0)
-    {
-      sprintf(format, "\ntotal:  %.0f\t%.0f", countEventIn, countCachedEventIn);
-    }
-    else
-    {
-      sprintf(format, "\ntotal:  %.0f\t", countEventIn);
-    }
-
-    strcat(buffer, format);
-
-    sprintf(format, "\t%.0f (%.0f KB)\t%.0f (%.0f KB)\t%.0f/1 -> %.0f/1     \t",
-                countEventBitsIn, countEventBitsIn / 8192, countEventBitsOut,
-                    countEventBitsOut / 8192, countEventBitsIn / countEventIn,
-                        countEventBitsOut / countEventIn);
-
-    strcat(buffer, format);
-
-    if (countEventBitsOut > 0)
-    {
-      sprintf(format, "%5.3f:1\n", countEventBitsIn / countEventBitsOut);
-    }
-    else
-    {
-      sprintf(format, "1:1\n");
-    }
-
-    strcat(buffer, format);
-  }
-  else
-  {
-    strcat(buffer, "N/A\n\n");
-  }
-
-  //
-  // Print transport data.
-  //
-
-  getTimeStats(type, buffer);
-
-  countAnyIn   += protocolData -> cupsCount_;
-  countBitsIn  += protocolData -> cupsBitsIn_;
-  countBitsOut += protocolData -> cupsBitsOut_;
-
-  countAnyIn   += protocolData -> smbCount_;
-  countBitsIn  += protocolData -> smbBitsIn_;
-  countBitsOut += protocolData -> smbBitsOut_;
-
-  countAnyIn   += protocolData -> mediaCount_;
-  countBitsIn  += protocolData -> mediaBitsIn_;
-  countBitsOut += protocolData -> mediaBitsOut_;
-
-  countAnyIn   += protocolData -> httpCount_;
-  countBitsIn  += protocolData -> httpBitsIn_;
-  countBitsOut += protocolData -> httpBitsOut_;
-
-  countAnyIn   += protocolData -> fontCount_;
-  countBitsIn  += protocolData -> fontBitsIn_;
-  countBitsOut += protocolData -> fontBitsOut_;
-
-  countAnyIn   += protocolData -> slaveCount_;
-  countBitsIn  += protocolData -> slaveBitsIn_;
-  countBitsOut += protocolData -> slaveBitsOut_;
-
-  //
-  // Save the overall amount of bytes
-  // coming from X clients.
-  //
-
-  overallData -> overallBytesIn_ = countBitsIn / 8;
-
-  //
-  // Print performance data.
-  //
-
-  if (transportData -> readTime_ > 0)
-  {
-    sprintf(format, "      %.0f messages (%.0f KB) encoded per second.\n\n",
-                countAnyIn / (transportData -> readTime_ / 1000),
-                    (countBitsIn + transportData -> framingBitsOut_) / 8192 /
-                         (transportData -> readTime_ / 1000));
-  }
-  else
-  {
-    sprintf(format, "      %.0f messages (%.0f KB) encoded per second.\n\n",
-                countAnyIn, (countBitsIn + transportData ->
-                    framingBitsOut_) / 8192);
-  }
-
-  strcat(buffer, format);
-
-  strcat(buffer, "link: ");
-
-  //
-  // ZLIB compression stats.
-  //
-
-  getStreamStats(type, buffer);
-
-  //
-  // Save the overall amount of bytes
-  // sent on NX proxy link.
-  //
-
-  if (transportData -> compressedBytesOut_ > 0)
-  {
-    overallData -> overallBytesOut_ = transportData -> compressedBytesOut_;
-  }
-  else
-  {
-    overallData -> overallBytesOut_ = countBitsOut / 8;
-  }
-
-  //
-  // Print info on multiplexing overhead.
-  //
-
-  getFramingStats(type, buffer);
-
-  //
-  // Print stats about additional channels.
-  //
-
-  getServicesStats(type, buffer);
-
-  //
-  // Compression summary.
-  //
-
-  double ratio = 1;
-
-  if (transportData -> compressedBytesOut_ / 1024 > 0)
-  {
-    ratio = ((countBitsIn + transportData -> framingBitsOut_) / 8192) /
-                  (transportData -> compressedBytesOut_ / 1024);
-
-  }
-  else if (countBitsOut > 0)
-  {
-    ratio = (countBitsIn + transportData -> framingBitsOut_) /
-                 countBitsOut;
-  }
-
-  sprintf(format, "      Protocol compression ratio is %5.3f:1.\n\n",
-              ratio);
-
-  strcat(buffer, format);
-
-  getBitrateStats(type, buffer);
-
-  //
-  // These are not included in output.
-  //
-  // getSplitStats(type, buffer);
-  //
-
-  strcat(buffer, "\n");
-
-  //
-  // These statistics are not included in output.
-  // You can check it anyway to get the effective
-  // amount of bytes produced by unpack procedure.
-  //
-  // getClientOverallStats(type, buffer);
-  //
-
-  return 1;
-}
-
-int Statistics::getServerOverallStats(int type, char *&buffer)
-{
-  return 1;
-}
-
-int Statistics::getTimeStats(int type, char *&buffer)
-{
-  struct T_transportData *transportData;
-
-  if (type == PARTIAL_STATS)
-  {
-    transportData = &transportPartial_;
-  }
-  else
-  {
-    transportData = &transportTotal_;
-  }
-
-  char format[FORMAT_LENGTH];
-
-  sprintf(format, "\ntime: %.0f Ms idle, %.0f Ms (%.0f Ms in read, %.0f Ms in write) running.\n\n",
-              transportData -> idleTime_, transportData -> readTime_,
-                  transportData -> readTime_ - transportData -> writeTime_,
-                      transportData -> writeTime_);
-
-  strcat(buffer, format);
-
-  return 1;
-}
-
-int Statistics::getStreamStats(int type, char *&buffer)
-{
-  struct T_transportData *transportData;
-
-  if (type == PARTIAL_STATS)
-  {
-    transportData = &transportPartial_;
-  }
-  else
-  {
-    transportData = &transportTotal_;
-  }
-
-  char format[FORMAT_LENGTH];
-
-  if (transportData -> compressedBytesOut_ > 0)
-  {
-    sprintf(format, "%.0f bytes (%.0f KB) compressed to %.0f (%.0f KB).\n",
-                transportData -> compressedBytesIn_, transportData -> compressedBytesIn_ / 1024,
-                    transportData -> compressedBytesOut_, transportData -> compressedBytesOut_ / 1024);
-
-    strcat(buffer, format);
-
-    sprintf(format, "      %5.3f:1 stream compression ratio.\n\n",
-                transportData -> compressedBytesIn_ / transportData -> compressedBytesOut_);
-
-    strcat(buffer, format);
-  }
-
-  if (transportData -> decompressedBytesOut_ > 0)
-  {
-    if (transportData -> compressedBytesOut_ > 0)
-    {
-      strcat(buffer, "      ");
-    }
-
-    sprintf(format, "%.0f bytes (%.0f KB) decompressed to %.0f (%.0f KB).\n",
-                transportData -> decompressedBytesIn_, transportData -> decompressedBytesIn_ / 1024,
-                    transportData -> decompressedBytesOut_, transportData -> decompressedBytesOut_ / 1024);
-
-    strcat(buffer, format);
-
-    sprintf(format, "      %5.3f:1 stream compression ratio.\n\n",
-                transportData -> decompressedBytesOut_ / transportData -> decompressedBytesIn_);
-
-    strcat(buffer, format);
-  }
-
-  if (transportData -> compressedBytesOut_ > 0 ||
-          transportData -> decompressedBytesOut_ > 0)
-  {
-    strcat(buffer, "      ");
-  }
-
-  return 1;
-}
-
-int Statistics::getServicesStats(int type, char *&buffer)
-{
-  struct T_protocolData *protocolData;
-
-  if (type == PARTIAL_STATS)
-  {
-    protocolData = &protocolPartial_;
-  }
-  else
-  {
-    protocolData = &protocolTotal_;
-  }
-
-  char format[FORMAT_LENGTH];
-
-  if (protocolData -> cupsBitsOut_ > 0)
-  {
-    sprintf(format, "      %.0f CUPS messages, %.0f bytes (%.0f KB) in, %.0f bytes (%.0f KB) out.\n\n",
-                protocolData -> cupsCount_ , protocolData -> cupsBitsIn_ / 8,
-                    protocolData -> cupsBitsIn_ / 8192, protocolData -> cupsBitsOut_ / 8,
-                        protocolData -> cupsBitsOut_ / 8192);
-
-    strcat(buffer, format);
-  }
-
-  if (protocolData -> smbBitsOut_ > 0)
-  {
-    sprintf(format, "      %.0f SMB messages, %.0f bytes (%.0f KB) in, %.0f bytes (%.0f KB) out.\n\n",
-                protocolData -> smbCount_ , protocolData -> smbBitsIn_ / 8,
-                    protocolData -> smbBitsIn_ / 8192, protocolData -> smbBitsOut_ / 8,
-                        protocolData -> smbBitsOut_ / 8192);
-
-    strcat(buffer, format);
-  }
-
-  if (protocolData -> mediaBitsOut_ > 0)
-  {
-    sprintf(format, "      %.0f multimedia messages, %.0f bytes (%.0f KB) in, %.0f bytes (%.0f KB) out.\n\n",
-                protocolData -> mediaCount_ , protocolData -> mediaBitsIn_ / 8,
-                    protocolData -> mediaBitsIn_ / 8192, protocolData -> mediaBitsOut_ / 8,
-                        protocolData -> mediaBitsOut_ / 8192);
-
-    strcat(buffer, format);
-  }
-
-  if (protocolData -> httpBitsOut_ > 0)
-  {
-    sprintf(format, "      %.0f HTTP messages, %.0f bytes (%.0f KB) in, %.0f bytes (%.0f KB) out.\n\n",
-                protocolData -> httpCount_ , protocolData -> httpBitsIn_ / 8,
-                    protocolData -> httpBitsIn_ / 8192, protocolData -> httpBitsOut_ / 8,
-                        protocolData -> httpBitsOut_ / 8192);
-
-    strcat(buffer, format);
-  }
-
-  if (protocolData -> fontBitsOut_ > 0)
-  {
-    sprintf(format, "      %.0f font server messages, %.0f bytes (%.0f KB) in, %.0f bytes (%.0f KB) out.\n\n",
-                protocolData -> fontCount_ , protocolData -> fontBitsIn_ / 8,
-                    protocolData -> fontBitsIn_ / 8192, protocolData -> fontBitsOut_ / 8,
-                        protocolData -> fontBitsOut_ / 8192);
-
-    strcat(buffer, format);
-  }
-
-  if (protocolData -> slaveBitsOut_ > 0)
-  {
-    sprintf(format, "      %.0f slave messages, %.0f bytes (%.0f KB) in, %.0f bytes (%.0f KB) out.\n\n",
-                protocolData -> slaveCount_ , protocolData -> slaveBitsIn_ / 8,
-                    protocolData -> slaveBitsIn_ / 8192, protocolData -> slaveBitsOut_ / 8,
-                        protocolData -> slaveBitsOut_ / 8192);
-
-    strcat(buffer, format);
-  }
-
-  return 1;
-}
-
-int Statistics::getFramingStats(int type, char *&buffer)
-{
-  struct T_transportData *transportData;
-
-  if (type == PARTIAL_STATS)
-  {
-    transportData = &transportPartial_;
-  }
-  else
-  {
-    transportData = &transportTotal_;
-  }
-
-  char format[FORMAT_LENGTH];
-
-  //
-  // Print info on multiplexing overhead.
-  //
-
-  sprintf(format, "%.0f frames in, %.0f frames out, %.0f writes out.\n\n",
-              transportData -> proxyFramesIn_, transportData -> proxyFramesOut_,
-                  transportData -> proxyWritesOut_);
-
-  strcat(buffer, format);
-
-  sprintf(format, "      %.0f bytes (%.0f KB) used for framing and multiplexing.\n\n",
-              transportData -> framingBitsOut_ / 8, transportData -> framingBitsOut_ / 8192);
-
-  strcat(buffer, format);
-
-  return 1;
-}
-
-int Statistics::getBitrateStats(int type, char *&buffer)
-{
-  struct T_transportData *transportData;
-  struct T_overallData   *overallData;
-
-  if (type == PARTIAL_STATS)
-  {
-    transportData = &transportPartial_;
-    overallData = &overallPartial_;
-  }
-  else
-  {
-    transportData = &transportTotal_;
-    overallData = &overallTotal_;
-  }
-
-  double total = 0;
-
-  if (transportData -> idleTime_ + transportData -> readTime_ > 0)
-  {
-    total = overallData -> overallBytesOut_ /
-                ((transportData -> idleTime_ + transportData -> readTime_) / 1000);
-  }
-
-  char format[FORMAT_LENGTH];
-
-  sprintf(format, "      %.0f B/s average, %d B/s %ds, %d B/s %ds, %d B/s maximum.\n\n",
-              total, getBitrateInShortFrame(), control -> ShortBitrateTimeFrame / 1000,
-                  getBitrateInLongFrame(), control -> LongBitrateTimeFrame / 1000,
-                      getTopBitrate());
-
-  strcat(buffer, format);
-
-  resetTopBitrate();
-
-  return 1;
-}
-
-int Statistics::getSplitStats(int type, char *&buffer)
-{
-  //
-  // Don't print these statistics if persistent
-  // cache of images is disabled.
-  //
-
-  if (control -> ImageCacheEnableLoad == 0 &&
-          control -> ImageCacheEnableSave == 0)
-  {
-    return 0;
-  }
-
-  struct T_splitData *splitData;
-
-  if (type == PARTIAL_STATS)
-  {
-    splitData = &splitPartial_;
-  }
-  else
-  {
-    splitData = &splitTotal_;
-  }
-
-  char format[FORMAT_LENGTH];
-
-  //
-  // Print info on split messages restored from disk.
-  //
-
-  sprintf(format, "      %.0f images streamed, %.0f restored, %.0f bytes (%.0f KB) cached.\n\n",
-              splitData -> splitCount_, splitData -> splitAborted_, splitData -> splitAbortedBytesOut_,
-                  splitData -> splitAbortedBytesOut_ / 1024);
-
-  strcat(buffer, format);
-
-  return 1;
-}
diff --git a/nxcomp/Statistics.h b/nxcomp/Statistics.h
deleted file mode 100644
index 1ffb6b5d6..000000000
--- a/nxcomp/Statistics.h
+++ /dev/null
@@ -1,745 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef Statistics_H
-#define Statistics_H
-
-#include "NXproto.h"
-
-#include "Misc.h"
-#include "Timestamp.h"
-
-class Proxy;
-
-//
-// Opcode 255 is for generic requests, 1 is for
-// generic replies (those which haven't a speci-
-// fic differential encoding), opcode 0 is for
-// generic messages from the auxiliary channels.
-//
-
-#define STATISTICS_OPCODE_MAX       256
-
-//
-// Maximum length of the buffer allocated for
-// the statistics output.
-//
-
-#define STATISTICS_LENGTH           16384
-
-//
-// Query type.
-//
-
-#define TOTAL_STATS                 1
-#define PARTIAL_STATS               2
-#define NO_STATS                    3
-
-//
-// Log level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-//
-// Log the operations related to updating
-// the control tokens.
-//
-
-#undef  TOKEN
-
-class Statistics
-{
-  public:
-
-  //
-  // Use the proxy class to get access
-  // to the message stores.
-  //
-
-  Statistics(Proxy *proxy);
-
-  ~Statistics();
-
-  void addIdleTime(unsigned int numMs)
-  {
-    transportPartial_.idleTime_ += numMs;
-    transportTotal_.idleTime_ += numMs;
-  }
-
-  void subIdleTime(unsigned int numMs)
-  {
-    transportPartial_.idleTime_ -= numMs;
-    transportTotal_.idleTime_ -= numMs;
-  }
-
-  void addReadTime(unsigned int numMs)
-  {
-    transportPartial_.readTime_ += numMs;
-    transportTotal_.readTime_ += numMs;
-  }
-
-  void subReadTime(unsigned int numMs)
-  {
-    transportPartial_.readTime_ -= numMs;
-    transportTotal_.readTime_ -= numMs;
-  }
-
-  void addWriteTime(unsigned int numMs)
-  {
-    transportPartial_.writeTime_ += numMs;
-    transportTotal_.writeTime_ += numMs;
-  }
-
-  void subWriteTime(unsigned int numMs)
-  {
-    transportPartial_.writeTime_ -= numMs;
-    transportTotal_.writeTime_ -= numMs;
-  }
-
-  void addBytesIn(unsigned int numBytes)
-  {
-    transportPartial_.proxyBytesIn_ += numBytes;
-    transportTotal_.proxyBytesIn_ += numBytes;
-  }
-
-  double getBytesIn()
-  {
-    return transportTotal_.proxyBytesIn_;
-  }
-
-  void addBytesOut(unsigned int numBytes)
-  {
-    transportPartial_.proxyBytesOut_ += numBytes;
-    transportTotal_.proxyBytesOut_ += numBytes;
-  }
-
-  double getBytesOut()
-  {
-    return transportTotal_.proxyBytesOut_;
-  }
-
-  void addFrameIn()
-  {
-    transportPartial_.proxyFramesIn_++;
-    transportTotal_.proxyFramesIn_++;
-
-    #ifdef TEST
-    *logofs << "Statistics: Updated total proxy frames in to "
-            << transportTotal_.proxyFramesIn_ << " at "
-            << strMsTimestamp() << ".\n" << logofs_flush;
-    #endif
-  }
-
-  void addFrameOut()
-  {
-    transportPartial_.proxyFramesOut_++;
-    transportTotal_.proxyFramesOut_++;
-
-    #ifdef TEST
-    *logofs << "Statistics: Updated total proxy frames out to "
-            << transportTotal_.proxyFramesOut_ << " at "
-            << strMsTimestamp() << ".\n"
-            << logofs_flush;
-    #endif
-  }
-
-  void addWriteOut()
-  {
-    transportPartial_.proxyWritesOut_++;
-    transportTotal_.proxyWritesOut_++;
-
-    #ifdef TEST
-    *logofs << "Statistics: Updated total proxy writes out to "
-            << transportTotal_.proxyWritesOut_ << " at "
-            << strMsTimestamp() << ".\n" << logofs_flush;
-    #endif
-  }
-
-  void addCompressedBytes(unsigned int bytesIn, unsigned int bytesOut);
-
-  void addDecompressedBytes(unsigned int bytesIn, unsigned int bytesOut)
-  {
-    transportPartial_.decompressedBytesIn_ += bytesIn;
-    transportTotal_.decompressedBytesIn_ += bytesIn;
-
-    transportPartial_.decompressedBytesOut_ += bytesOut;
-    transportTotal_.decompressedBytesOut_ += bytesOut;
-  }
-
-  void addFramingBits(unsigned int bitsOut)
-  {
-    transportPartial_.framingBitsOut_ += bitsOut;
-    transportTotal_.framingBitsOut_ += bitsOut;
-
-    proxyData_.protocolCount_ += bitsOut;
-  }
-
-  void addCachedRequest(unsigned int opcode)
-  {
-    protocolPartial_.requestCached_[opcode]++;
-    protocolTotal_.requestCached_[opcode]++;
-  }
-
-  void addRenderCachedRequest(unsigned int opcode)
-  {
-    protocolPartial_.renderRequestCached_[opcode]++;
-    protocolTotal_.renderRequestCached_[opcode]++;
-  }
-
-  void addRepliedRequest(unsigned int opcode)
-  {
-    protocolPartial_.requestReplied_[opcode]++;
-    protocolTotal_.requestReplied_[opcode]++;
-  }
-
-  void addCachedReply(unsigned int opcode)
-  {
-    protocolPartial_.replyCached_[opcode]++;
-    protocolTotal_.replyCached_[opcode]++;
-  }
-
-  void addRequestBits(unsigned int opcode, unsigned int bitsIn, unsigned int bitsOut)
-  {
-    #ifdef DEBUG
-    *logofs << "Statistcs: Added " << bitsIn << " bits in and "
-            << bitsOut << " bits out to opcode " << opcode
-            << ".\n" << logofs_flush;
-    #endif
-
-    protocolPartial_.requestCount_[opcode]++;
-    protocolTotal_.requestCount_[opcode]++;
-
-    protocolPartial_.requestBitsIn_[opcode] += bitsIn;
-    protocolTotal_.requestBitsIn_[opcode] += bitsIn;
-
-    protocolPartial_.requestBitsOut_[opcode] += bitsOut;
-    protocolTotal_.requestBitsOut_[opcode] += bitsOut;
-
-    //
-    // Don't account the split bits
-    // to the control token.
-    //
-
-    if (opcode != X_NXSplitData && opcode != X_NXSplitEvent)
-    {
-      proxyData_.protocolCount_ += bitsOut;
-    }
-  }
-
-  void addRenderRequestBits(unsigned int opcode, unsigned int bitsIn, unsigned int bitsOut)
-  {
-    #ifdef DEBUG
-    *logofs << "Statistcs: Added " << bitsIn << " bits in and "
-            << bitsOut << " bits out to render opcode " << opcode
-            << ".\n" << logofs_flush;
-    #endif
-
-    protocolPartial_.renderRequestCount_[opcode]++;
-    protocolTotal_.renderRequestCount_[opcode]++;
-
-    protocolPartial_.renderRequestBitsIn_[opcode] += bitsIn;
-    protocolTotal_.renderRequestBitsIn_[opcode] += bitsIn;
-
-    protocolPartial_.renderRequestBitsOut_[opcode] += bitsOut;
-    protocolTotal_.renderRequestBitsOut_[opcode] += bitsOut;
-  }
-
-  void addReplyBits(unsigned int opcode, unsigned int bitsIn, unsigned int bitsOut)
-  {
-    protocolPartial_.replyCount_[opcode]++;
-    protocolTotal_.replyCount_[opcode]++;
-
-    protocolPartial_.replyBitsIn_[opcode] += bitsIn;
-    protocolTotal_.replyBitsIn_[opcode] += bitsIn;
-
-    protocolPartial_.replyBitsOut_[opcode] += bitsOut;
-    protocolTotal_.replyBitsOut_[opcode] += bitsOut;
-
-    proxyData_.protocolCount_ += bitsOut;
-  }
-
-  void addEventBits(unsigned int opcode, unsigned int bitsIn, unsigned int bitsOut)
-  {
-    protocolPartial_.eventCount_[opcode]++;
-    protocolTotal_.eventCount_[opcode]++;
-
-    protocolPartial_.eventBitsIn_[opcode] += bitsIn;
-    protocolTotal_.eventBitsIn_[opcode] += bitsIn;
-
-    protocolPartial_.eventBitsOut_[opcode] += bitsOut;
-    protocolTotal_.eventBitsOut_[opcode] += bitsOut;
-
-    proxyData_.protocolCount_ += bitsOut;
-  }
-
-  void addCupsBits(unsigned int bitsIn, unsigned int bitsOut)
-  {
-    protocolPartial_.cupsCount_++;
-    protocolTotal_.cupsCount_++;
-
-    protocolPartial_.cupsBitsIn_ += bitsIn;
-    protocolTotal_.cupsBitsIn_ += bitsIn;
-
-    protocolPartial_.cupsBitsOut_ += bitsOut;
-    protocolTotal_.cupsBitsOut_ += bitsOut;
-  }
-
-  void addSmbBits(unsigned int bitsIn, unsigned int bitsOut)
-  {
-    protocolPartial_.smbCount_++;
-    protocolTotal_.smbCount_++;
-
-    protocolPartial_.smbBitsIn_ += bitsIn;
-    protocolTotal_.smbBitsIn_ += bitsIn;
-
-    protocolPartial_.smbBitsOut_ += bitsOut;
-    protocolTotal_.smbBitsOut_ += bitsOut;
-  }
-
-  void addMediaBits(unsigned int bitsIn, unsigned int bitsOut)
-  {
-    protocolPartial_.mediaCount_++;
-    protocolTotal_.mediaCount_++;
-
-    protocolPartial_.mediaBitsIn_ += bitsIn;
-    protocolTotal_.mediaBitsIn_ += bitsIn;
-
-    protocolPartial_.mediaBitsOut_ += bitsOut;
-    protocolTotal_.mediaBitsOut_ += bitsOut;
-  }
-
-  void addHttpBits(unsigned int bitsIn, unsigned int bitsOut)
-  {
-    protocolPartial_.httpCount_++;
-    protocolTotal_.httpCount_++;
-
-    protocolPartial_.httpBitsIn_ += bitsIn;
-    protocolTotal_.httpBitsIn_ += bitsIn;
-
-    protocolPartial_.httpBitsOut_ += bitsOut;
-    protocolTotal_.httpBitsOut_ += bitsOut;
-  }
-
-  void addFontBits(unsigned int bitsIn, unsigned int bitsOut)
-  {
-    protocolPartial_.fontCount_++;
-    protocolTotal_.fontCount_++;
-
-    protocolPartial_.fontBitsIn_ += bitsIn;
-    protocolTotal_.fontBitsIn_ += bitsIn;
-
-    protocolPartial_.fontBitsOut_ += bitsOut;
-    protocolTotal_.fontBitsOut_ += bitsOut;
-  }
-
-  void addSlaveBits(unsigned int bitsIn, unsigned int bitsOut)
-  {
-    protocolPartial_.slaveCount_++;
-    protocolTotal_.slaveCount_++;
-
-    protocolPartial_.slaveBitsIn_ += bitsIn;
-    protocolTotal_.slaveBitsIn_ += bitsIn;
-
-    protocolPartial_.slaveBitsOut_ += bitsOut;
-    protocolTotal_.slaveBitsOut_ += bitsOut;
-  }
-
-  void addPackedBytesIn(unsigned int numBytes)
-  {
-    packedPartial_.packedBytesIn_ += numBytes;
-    packedTotal_.packedBytesIn_ += numBytes;
-  }
-
-  void addPackedBytesOut(unsigned int numBytes)
-  {
-    packedPartial_.packedBytesOut_ += numBytes;
-    packedTotal_.packedBytesOut_ += numBytes;
-  }
-
-  void addSplit()
-  {
-    splitPartial_.splitCount_++;
-    splitTotal_.splitCount_++;
-  }
-
-  void addSplitAborted()
-  {
-    splitPartial_.splitAborted_++;
-    splitTotal_.splitAborted_++;
-  }
-
-  void addSplitAbortedBytesOut(unsigned int numBytes)
-  {
-    splitPartial_.splitAbortedBytesOut_ += numBytes;
-    splitTotal_.splitAbortedBytesOut_ += numBytes;
-  }
-
-  //
-  // Add the recorded protocol data to the proxy
-  // token counters. We want to send bpth the token
-  // request message and the data payload using a
-  // single system write, so we must guess how many
-  // output bytes we will generate.
-  //
-
-  void updateControlToken(int &count)
-  {
-    //
-    // Total is the total number of protocol bytes
-    // generated so far. We have saved the number
-    // of bytes generated the last time the function
-    // was called so we can calculate the difference.
-    //
-    // The number of protocol bits is updated as soon
-    // as new bits are accumulated, to avoid summing
-    // up all the opcodes in this routine. We add a
-    // byte to the control bytes difference to account
-    // for the framing bits that are very likely to
-    // be added to the payload.
-    //
-
-    double total = proxyData_.protocolCount_ / 8;
-
-    double diff = total - proxyData_.controlCount_ + 1;
-
-    #if defined(TEST) || defined(TOKEN)
-    *logofs << "Statistics: TOKEN! Protocol bytes are "
-            << total  << " control bytes are "
-            << proxyData_.controlCount_ << " difference is "
-            << diff << ".\n" << logofs_flush;
-    #endif
-
-    count += (int) (diff / proxyData_.streamRatio_);
-
-    #if defined(TEST) || defined(TOKEN)
-    *logofs << "Statistics: TOKEN! Adding "
-            << (int) (diff / proxyData_.streamRatio_)
-            << " bytes to the control token with ratio "
-            << proxyData_.streamRatio_ << ".\n"
-            << logofs_flush;
-    #endif
-
-    proxyData_.controlCount_ = total;
-
-    #if defined(TEST) || defined(TOKEN)
-    *logofs << "Statistics: TOKEN! New control token has "
-            << count << " bytes with total control bytes "
-            << proxyData_.controlCount_ << ".\n"
-            << logofs_flush;
-    #endif
-  }
-
-  void updateSplitToken(int &count)
-  {
-    double total = (protocolTotal_.requestBitsOut_[X_NXSplitData] +
-                        protocolTotal_.eventBitsOut_[X_NXSplitEvent]) / 8;
-
-    double diff = total - proxyData_.splitCount_;
-
-    #if defined(TEST) || defined(TOKEN)
-    *logofs << "Statistics: TOKEN! Protocol bytes are "
-            << total  << " split bytes are "
-            << proxyData_.splitCount_ << " difference is "
-            << diff << ".\n" << logofs_flush;
-    #endif
-
-    count += (int) (diff / proxyData_.streamRatio_);
-
-    #if defined(TEST) || defined(TOKEN)
-    *logofs << "Statistics: TOKEN! Adding "
-            << (int) (diff / proxyData_.streamRatio_)
-            << " bytes to the split token with ratio "
-            << proxyData_.streamRatio_ << ".\n"
-            << logofs_flush;
-    #endif
-
-    proxyData_.splitCount_ = total;
-
-    #if defined(TEST) || defined(TOKEN)
-    *logofs << "Statistics: TOKEN! New split token has "
-            << count << " bytes with total split bytes "
-            << proxyData_.splitCount_ << ".\n"
-            << logofs_flush;
-    #endif
-  }
-
-  void updateDataToken(int &count)
-  {
-    double total = (protocolTotal_.cupsBitsOut_ +
-                        protocolTotal_.smbBitsOut_ +
-                            protocolTotal_.mediaBitsOut_ +
-                                protocolTotal_.httpBitsOut_ +
-                                    protocolTotal_.fontBitsOut_ +
-                                        protocolTotal_.slaveBitsOut_) / 8;
-
-    double diff = total - proxyData_.dataCount_;
-
-    #if defined(TEST) || defined(TOKEN)
-    *logofs << "Statistics: TOKEN! Protocol bytes are "
-            << total  << " data bytes are "
-            << proxyData_.dataCount_ << " difference is "
-            << diff << ".\n" << logofs_flush;
-    #endif
-
-    count += (int) (diff / proxyData_.streamRatio_);
-
-    #if defined(TEST) || defined(TOKEN)
-    *logofs << "Statistics: TOKEN! Adding "
-            << (int) (diff / proxyData_.streamRatio_)
-            << " bytes to the data token with ratio "
-            << proxyData_.streamRatio_ << ".\n"
-            << logofs_flush;
-    #endif
-
-    proxyData_.dataCount_ = total;
-
-    #if defined(TEST) || defined(TOKEN)
-    *logofs << "Statistics: TOKEN! New data token has "
-            << count << " bytes with total data bytes "
-            << proxyData_.dataCount_ << ".\n"
-            << logofs_flush;
-    #endif
-  }
-
-  //
-  // Update the current bitrate.
-  //
-
-  void updateBitrate(int bytes);
-
-  //
-  // Return the current bitrate.
-  //
-
-  int getBitrateInShortFrame()
-  {
-    return bitrateInShortFrame_;
-  }
-
-  int getBitrateInLongFrame()
-  {
-    return bitrateInLongFrame_;
-  }
-
-  int getTopBitrate()
-  {
-    return topBitrate_;
-  }
-
-  void resetTopBitrate()
-  {
-    topBitrate_ = 0;
-  }
-
-  double getStreamRatio()
-  {
-    return proxyData_.streamRatio_;
-  }
-
-  //
-  // Manage the congestion level.
-  //
-
-  void updateCongestion(int remaining, int limit);
-
-  double getCongestionInFrame()
-  {
-    return congestionInFrame_;
-  }
-
-  //
-  // Produce a dump of the statistics on
-  // the provided buffer.
-  //
-
-  int getClientCacheStats(int type, char *&buffer);
-  int getClientProtocolStats(int type, char *&buffer);
-  int getClientOverallStats(int type, char *&buffer);
-
-  int getServerCacheStats(int type, char *&buffer);
-  int getServerProtocolStats(int type, char *&buffer);
-  int getServerOverallStats(int type, char *&buffer);
-
-  int resetPartialStats();
-
-  private:
-
-  int getTimeStats(int type, char *&buffer);
-  int getServicesStats(int type, char *&buffer);
-  int getFramingStats(int type, char *&buffer);
-  int getBitrateStats(int type, char *&buffer);
-  int getStreamStats(int type, char *&buffer);
-  int getSplitStats(int type, char *&buffer);
-
-  struct T_protocolData
-  {
-    double requestCached_[STATISTICS_OPCODE_MAX];
-    double requestReplied_[STATISTICS_OPCODE_MAX];
-    double requestCount_[STATISTICS_OPCODE_MAX];
-    double requestBitsIn_[STATISTICS_OPCODE_MAX];
-    double requestBitsOut_[STATISTICS_OPCODE_MAX];
-
-    double renderRequestCached_[STATISTICS_OPCODE_MAX];
-    double renderRequestCount_[STATISTICS_OPCODE_MAX];
-    double renderRequestBitsIn_[STATISTICS_OPCODE_MAX];
-    double renderRequestBitsOut_[STATISTICS_OPCODE_MAX];
-
-    double replyCached_[STATISTICS_OPCODE_MAX];
-    double replyCount_[STATISTICS_OPCODE_MAX];
-    double replyBitsIn_[STATISTICS_OPCODE_MAX];
-    double replyBitsOut_[STATISTICS_OPCODE_MAX];
-
-    double eventCached_[STATISTICS_OPCODE_MAX];
-    double eventCount_[STATISTICS_OPCODE_MAX];
-    double eventBitsIn_[STATISTICS_OPCODE_MAX];
-    double eventBitsOut_[STATISTICS_OPCODE_MAX];
-
-    double cupsCount_;
-    double cupsBitsIn_;
-    double cupsBitsOut_;
-
-    double smbCount_;
-    double smbBitsIn_;
-    double smbBitsOut_;
-
-    double mediaCount_;
-    double mediaBitsIn_;
-    double mediaBitsOut_;
-
-    double httpCount_;
-    double httpBitsIn_;
-    double httpBitsOut_;
-
-    double fontCount_;
-    double fontBitsIn_;
-    double fontBitsOut_;
-
-    double slaveCount_;
-    double slaveBitsIn_;
-    double slaveBitsOut_;
-  };
-
-  struct T_transportData
-  {
-    double idleTime_;
-    double readTime_;
-    double writeTime_;
-
-    double proxyBytesIn_;
-    double proxyBytesOut_;
-
-    double proxyFramesIn_;
-    double proxyFramesOut_;
-    double proxyWritesOut_;
-
-    double compressedBytesIn_;
-    double compressedBytesOut_;
-
-    double decompressedBytesIn_;
-    double decompressedBytesOut_;
-
-    double framingBitsOut_;
-  };
-
-  struct T_packedData
-  {
-    double packedBytesIn_;
-    double packedBytesOut_;
-  };
-
-  struct T_splitData
-  {
-    double splitCount_;
-    double splitAborted_;
-    double splitAbortedBytesOut_;
-  };
-
-  struct T_overallData
-  {
-    double overallBytesIn_;
-    double overallBytesOut_;
-  };
-
-  struct T_proxyData
-  {
-    double protocolCount_;
-    double controlCount_;
-    double splitCount_;
-    double dataCount_;
-
-    double streamRatio_;
-  };
-
-  T_protocolData protocolPartial_;
-  T_protocolData protocolTotal_;
-
-  T_transportData transportPartial_;
-  T_transportData transportTotal_;
-
-  T_packedData packedPartial_;
-  T_packedData packedTotal_;
-
-  T_splitData splitPartial_;
-  T_splitData splitTotal_;
-
-  T_overallData overallPartial_;
-  T_overallData overallTotal_;
-
-  T_proxyData proxyData_;
-
-  //
-  // Used to calculate the bandwidth usage
-  // of the proxy link.
-  //
-
-  T_timestamp startShortFrameTs_;
-  T_timestamp startLongFrameTs_;
-  T_timestamp startFrameTs_;
-
-  int bytesInShortFrame_;
-  int bytesInLongFrame_;
-
-  int bitrateInShortFrame_;
-  int bitrateInLongFrame_;
-
-  int topBitrate_;
-
-  double congestionInFrame_;
-
-  //
-  // Need the proxy pointer to print the
-  // statistics related to the client and
-  // server stores and to add the protocol
-  // data to the proxy token accumulators.
-  //
-
-  Proxy *proxy_;
-};
-
-#endif /* Statistics_H */
diff --git a/nxcomp/Timestamp.cpp b/nxcomp/Timestamp.cpp
deleted file mode 100644
index d5b3d613b..000000000
--- a/nxcomp/Timestamp.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "Timestamp.h"
-
-//
-// Log level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-//
-// Last timestamp taken from the system.
-//
-
-T_timestamp timestamp;
-
-//
-// The following functions all use the ctime
-// static buffer from the C library.
-//
-
-char *strTimestamp(const T_timestamp &ts)
-{
-  char *ctime_now = ctime((time_t *) &ts.tv_sec);
-
-  ctime_now[24] = '\0';
-
-  return ctime_now;
-}
-
-//
-// This is especially dirty. 
-//
-
-char *strMsTimestamp(const T_timestamp &ts)
-{
-  char *ctime_now = ctime((time_t *) &ts.tv_sec);
-
-  char ctime_new[25];
-
-  sprintf(ctime_new, "%.8s:%3.3f", ctime_now + 11,
-              (float) ts.tv_usec / 1000);
-
-  strncpy(ctime_now, ctime_new, 24);
-
-  return ctime_now;
-}
diff --git a/nxcomp/Timestamp.h b/nxcomp/Timestamp.h
deleted file mode 100644
index 604f5a3bc..000000000
--- a/nxcomp/Timestamp.h
+++ /dev/null
@@ -1,307 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef Timestamp_H
-#define Timestamp_H
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <time.h>
-#include <sys/time.h>
-
-#include "Misc.h"
-
-//
-// Log level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-//
-// If not defined, always query the system time.
-//
-
-#undef  CACHE_TIMESTAMP
-
-//
-// Log a warning if the time difference since
-// the last update exceeds the given number
-// of milliseconds.
-//
-
-#define DRIFT_TIMESTAMP  1
-
-//
-// Type used for timeout manipulation.
-//
-
-typedef struct timeval T_timestamp;
-
-//
-// Last timestamp taken from the system. If the
-// timestamp is cached, we need to explicitly
-// get a new timestamp after any operation that
-// may have required a relevant amount of time.
-//
-
-extern T_timestamp timestamp;
-
-//
-// Get a timestamp instance with values set
-// at the given amount of milliseconds.
-//
-
-inline T_timestamp getTimestamp(long ms)
-{
-  struct timeval ts;
-
-  ts.tv_sec  = ms / 1000;
-  ts.tv_usec = (ms % 1000) * 1000;
-
-  return ts;
-}
-
-//
-// Return the difference in milliseconds
-// between the two timestamps.
-//
-
-inline long diffTimestamp(const T_timestamp &ts1, const T_timestamp &ts2)
-{
-  //
-  // Add 500 microseconds to round up
-  // to the nearest millisecond.
-  //
-
-  return ((ts2.tv_sec * 1000 + (ts2.tv_usec + 500) / 1000) -
-             (ts1.tv_sec * 1000 + (ts1.tv_usec + 500) / 1000));
-}
-
-//
-// The same in microseconds. It doesn't
-// round the value.
-//
-
-inline long diffUsTimestamp(const T_timestamp &ts1, const T_timestamp &ts2)
-{
-  return ((ts2.tv_sec * 1000000 + ts2.tv_usec) -
-             (ts1.tv_sec * 1000000 + ts1.tv_usec));
-}
-
-//
-// Return the last timestamp taken from the
-// system. It doesn't update the timestamp.
-//
-
-inline T_timestamp getTimestamp()
-{
-  #ifdef CACHE_TIMESTAMP
-
-  #ifdef TEST
-
-  T_timestamp ts;
-
-  gettimeofday(&ts, NULL);
-
-  long diffTs = diffTimestamp(timestamp, ts);
-
-  if (diffTs > DRIFT_TIMESTAMP)
-  {
-    *logofs << "Timestamp: WARNING! Time difference since the "
-            << "current timestamp is " << diffTs << " Ms.\n"
-            << logofs_flush;
-  }
-
-  #endif
-
-  return timestamp;
-
-  #else
-
-  gettimeofday(&timestamp, NULL);
-
-  return timestamp;
-
-  #endif
-}
-
-inline T_timestamp &setTimestamp(T_timestamp &ts, long ms)
-{
-  ts.tv_sec  = ms / 1000;
-  ts.tv_usec = (ms % 1000) * 1000;
-
-  return ts;
-}
-
-//
-// Return the smaller between two timestamps.
-//
-
-inline T_timestamp &setMinTimestamp(T_timestamp &ts, long ms)
-{
-  if ((ts.tv_sec * 1000 + ts.tv_usec / 1000) > ms)
-  {
-    ts.tv_sec  = ms / 1000;
-    ts.tv_usec = (ms % 1000) * 1000;
-  }
-
-  return ts;
-}
-
-inline T_timestamp &setMinTimestamp(T_timestamp &ts1, T_timestamp &ts2)
-{
-  if ((ts1.tv_sec * 1000000 + ts1.tv_usec) >
-           (ts2.tv_sec * 1000000 + ts2.tv_usec))
-  {
-    ts1.tv_sec  = ts2.tv_sec;
-    ts1.tv_usec = ts2.tv_usec;
-  }
-
-  return ts1;
-}
-
-//
-// Convert a timestamp in the total number
-// of milliseconds.
-//
-
-inline long getMsTimestamp(const T_timestamp &ts)
-{
-  return ts.tv_sec * 1000 + ts.tv_usec / 1000;
-}
-
-//
-// A 0 value on both seconds and microseconds
-// fields means that timestamp is invalid or
-// not set.
-//
-
-inline T_timestamp nullTimestamp()
-{
-  struct timeval ts;
-
-  ts.tv_sec  = 0;
-  ts.tv_usec = 0;
-
-  return ts;
-}
-
-inline bool isTimestamp(const T_timestamp &ts)
-{
-  if (ts.tv_sec == 0 && ts.tv_usec == 0)
-  {
-     return 0;
-  }
-
-  return 1;
-}
-
-inline void subMsTimestamp(T_timestamp &ts, long ms)
-{
-  ts.tv_sec  -= ms / 1000;
-  ts.tv_usec -= (ms % 1000) * 1000;
-}
-
-inline void addMsTimestamp(T_timestamp &ts, long ms)
-{
-  ts.tv_sec  += ms / 1000;
-  ts.tv_usec += (ms % 1000) * 1000;
-}
-
-//
-// Check the difference between timestamps.
-// Return 0 if the system time went backward
-// compared to the second timestamp, or the
-// difference between the timestamps exceeds
-// the given number of milliseconds.
-//
-
-inline int checkDiffTimestamp(const T_timestamp &ts1, const T_timestamp &ts2,
-                                  long ms = 30000)
-{
-  long diffTs = diffTimestamp(ts1, ts2);
-
-  if (diffTs < 0 || diffTs > ms)
-  {
-    return 0;
-  }
-
-  return 1;
-}
-
-//
-// Return a string representing the timestamp.
-//
-
-char *strTimestamp(const T_timestamp &ts);
-char *strMsTimestamp(const T_timestamp &ts);
-
-inline char *strTimestamp()
-{
-  return strTimestamp(getTimestamp());
-}
-
-inline char *strMsTimestamp()
-{
-  return strMsTimestamp(getTimestamp());
-}
-
-//
-// Update the current timestamp.
-//
-
-inline T_timestamp getNewTimestamp()
-{
-  #ifdef TEST
-
-  T_timestamp ts;
-
-  gettimeofday(&ts, NULL);
-
-  *logofs << "Timestamp: Updating the current timestamp at "
-          << strMsTimestamp(ts) << ".\n" << logofs_flush;
-
-  long diffTs = diffTimestamp(timestamp, ts);
-
-  if (diffTs > DRIFT_TIMESTAMP)
-  {
-    *logofs << "Timestamp: WARNING! Time difference since the "
-            << "old timestamp is " << diffTs << " Ms.\n"
-            << logofs_flush;
-  }
-
-  #endif
-
-  gettimeofday(&timestamp, NULL);
-
-  return timestamp;
-}
-
-#endif /* Timestamp_H */
diff --git a/nxcomp/TranslateCoords.cpp b/nxcomp/TranslateCoords.cpp
deleted file mode 100644
index 97bd285e1..000000000
--- a/nxcomp/TranslateCoords.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "TranslateCoords.h"
-
-#include "ClientCache.h"
-
-#include "EncodeBuffer.h"
-#include "DecodeBuffer.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Here are the methods to handle messages' content.
-//
-
-int TranslateCoordsStore::parseIdentity(Message *message, const unsigned char *buffer,
-                                            unsigned int size, int bigEndian) const
-{
-  TranslateCoordsMessage *translateCoords = (TranslateCoordsMessage *) message;
-
-  //
-  // Here is the fingerprint.
-  //
-
-  translateCoords -> src_window = GetULONG(buffer + 4, bigEndian);
-  translateCoords -> dst_window = GetULONG(buffer + 8, bigEndian);
-
-  translateCoords -> src_x = GetUINT(buffer + 12, bigEndian);
-  translateCoords -> src_y = GetUINT(buffer + 14, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Parsed Identity for message at " << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-int TranslateCoordsStore::unparseIdentity(const Message *message, unsigned char *buffer,
-                                              unsigned int size, int bigEndian) const
-{
-  TranslateCoordsMessage *translateCoords = (TranslateCoordsMessage *) message;
-
-  //
-  // Fill all the message's fields.
-  //
-
-  PutULONG(translateCoords -> src_window, buffer + 4,  bigEndian);
-  PutULONG(translateCoords -> dst_window, buffer + 8,  bigEndian);
-
-  PutUINT(translateCoords -> src_x, buffer + 12, bigEndian);
-  PutUINT(translateCoords -> src_y, buffer + 14, bigEndian);
-
-  #ifdef DEBUG
-  *logofs << name() << ": Unparsed identity for message at " << this << ".\n" << logofs_flush;
-  #endif
-
-  return 1;
-}
-
-void TranslateCoordsStore::dumpIdentity(const Message *message) const
-{
-  #ifdef DUMP
-
-  TranslateCoordsMessage *translateCoords = (TranslateCoordsMessage *) message;
-
-  *logofs << name() << ": Identity src_window " << translateCoords -> src_window << ", dst_window " 
-          << translateCoords -> dst_window << ", src_x " << translateCoords -> src_x << ", src_y " 
-          << translateCoords -> src_y << ", size " << translateCoords -> size_ << ".\n" << logofs_flush;
-
-  #endif
-}
-
-void TranslateCoordsStore::identityChecksum(const Message *message, const unsigned char *buffer,
-                                                unsigned int size, int bigEndian) const
-{
-  md5_append(md5_state_, buffer + 4,  4);
-  md5_append(md5_state_, buffer + 8,  4);
-  md5_append(md5_state_, buffer + 12, 2);
-  md5_append(md5_state_, buffer + 14, 2);
-}
diff --git a/nxcomp/TranslateCoords.h b/nxcomp/TranslateCoords.h
deleted file mode 100644
index 997d079e1..000000000
--- a/nxcomp/TranslateCoords.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef TranslateCoords_H
-#define TranslateCoords_H
-
-#include "Message.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
-
-//
-// Set default values.
-//
-
-#define TRANSLATECOORDS_ENABLE_CACHE               1
-#define TRANSLATECOORDS_ENABLE_DATA                0
-#define TRANSLATECOORDS_ENABLE_SPLIT               0
-#define TRANSLATECOORDS_ENABLE_COMPRESS            0
-
-#define TRANSLATECOORDS_DATA_LIMIT                 0
-#define TRANSLATECOORDS_DATA_OFFSET                16
-
-#define TRANSLATECOORDS_CACHE_SLOTS                3000
-#define TRANSLATECOORDS_CACHE_THRESHOLD            3
-#define TRANSLATECOORDS_CACHE_LOWER_THRESHOLD      1
-
-//
-// The message class.
-//
-
-class TranslateCoordsMessage : public Message
-{
-  friend class TranslateCoordsStore;
-
-  public:
-
-  TranslateCoordsMessage()
-  {
-  }
-
-  ~TranslateCoordsMessage()
-  {
-  }
-
-  //
-  // Put here the fields which constitute 
-  // the 'identity' part of the message.
-  //
-
-  private:
-
-  unsigned int  src_window;
-  unsigned int  dst_window;
-  unsigned int  src_x;
-  unsigned int  src_y;
-
-  unsigned char r_same_screen;
-  unsigned int  r_child_window;
-  unsigned int  r_dst_x;
-  unsigned int  r_dst_y;
-};
-
-class TranslateCoordsStore : public MessageStore
-{
-  //
-  // Constructors and destructors.
-  //
-
-  public:
-
-  TranslateCoordsStore() : MessageStore()
-  {
-    enableCache    = TRANSLATECOORDS_ENABLE_CACHE;
-    enableData     = TRANSLATECOORDS_ENABLE_DATA;
-    enableSplit    = TRANSLATECOORDS_ENABLE_SPLIT;
-    enableCompress = TRANSLATECOORDS_ENABLE_COMPRESS;
-
-    dataLimit  = TRANSLATECOORDS_DATA_LIMIT;
-    dataOffset = TRANSLATECOORDS_DATA_OFFSET;
-
-    cacheSlots          = TRANSLATECOORDS_CACHE_SLOTS;
-    cacheThreshold      = TRANSLATECOORDS_CACHE_THRESHOLD;
-    cacheLowerThreshold = TRANSLATECOORDS_CACHE_LOWER_THRESHOLD;
-
-    messages_ -> resize(cacheSlots);
-
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      *i = NULL;
-    }
-
-    temporary_ = NULL;
-  }
-
-  virtual ~TranslateCoordsStore()
-  {
-    for (T_messages::iterator i = messages_ -> begin();
-             i < messages_ -> end(); i++)
-    {
-      destroy(*i);
-    }
-
-    destroy(temporary_);
-  }
-
-  virtual const char *name() const
-  {
-    return "TranslateCoords";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return X_TranslateCoords;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(TranslateCoordsMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  public:
-
-  virtual Message *create() const
-  {
-    return new TranslateCoordsMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new TranslateCoordsMessage((const TranslateCoordsMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (TranslateCoordsMessage *) message;
-  }
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-};
-
-#endif /* TranslateCoords_H */
diff --git a/nxcomp/Transport.cpp b/nxcomp/Transport.cpp
deleted file mode 100644
index eaf9775af..000000000
--- a/nxcomp/Transport.cpp
+++ /dev/null
@@ -1,3064 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/socket.h>
-
-#include "Transport.h"
-
-#include "Statistics.h"
-
-//
-// Set the verbosity level. You also
-// need to define DUMP in Misc.cpp
-// if DUMP is defined here.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  INSPECT
-#undef  DUMP
-
-//
-// Used to lock and unlock the transport
-// buffers before they are accessed by
-// different threads.
-//
-
-#undef  THREADS
-
-//
-// Define this to get logging all the
-// operations performed by the parent
-// thread, the one that enqueues and
-// dequeues data.
-//
-
-#define PARENT
-
-//
-// Define this to know when a channel
-// is created or destroyed.
-//
-
-#undef  REFERENCES
-
-//
-// Reference count for allocated buffers.
-//
-
-#ifdef REFERENCES
-
-int Transport::references_;
-int ProxyTransport::references_;
-int InternalTransport::references_;
-
-#endif
-
-//
-// This is the base class providing methods for read
-// and write buffering.
-//
-
-Transport::Transport(int fd) : fd_(fd)
-{
-  #ifdef TEST
-  *logofs << "Transport: Going to create base transport "
-          << "for FD#" << fd_ << ".\n" << logofs_flush;
-  #endif
-
-  type_ = transport_base;
-
-  //
-  // Set up the write buffer.
-  //
-
-  w_buffer_.length_ = 0;
-  w_buffer_.start_  = 0;
-
-  initialSize_   = TRANSPORT_BUFFER_DEFAULT_SIZE;
-  thresholdSize_ = TRANSPORT_BUFFER_DEFAULT_SIZE << 1;
-  maximumSize_   = TRANSPORT_BUFFER_DEFAULT_SIZE << 4;
-
-  w_buffer_.data_.resize(initialSize_);
-
-  //
-  // Set non-blocking IO on socket.
-  //
-
-  SetNonBlocking(fd_, 1);
-
-  blocked_ = 0;
-  finish_  = 0;
-
-  #ifdef REFERENCES
-  *logofs << "Transport: Created new object at " 
-          << this << " out of " << ++references_ 
-          << " allocated references.\n" << logofs_flush;
-  #endif
-}
-
-Transport::~Transport()
-{
-  #ifdef TEST
-  *logofs << "Transport: Going to destroy base class "
-          << "for FD#" << fd_ << ".\n" << logofs_flush;
-  #endif
-
-  ::close(fd_);
-
-  #ifdef REFERENCES
-  *logofs << "Transport: Deleted object at " 
-          << this << " out of " << --references_ 
-          << " allocated references.\n" << logofs_flush;
-  #endif
-}
-
-//
-// Read data from its file descriptor.
-//
-
-int Transport::read(unsigned char *data, unsigned int size)
-{
-  #ifdef DEBUG
-  *logofs << "Transport: Going to read " << size << " bytes from " 
-          << "FD#" << fd_ << ".\n" << logofs_flush;
-  #endif
-
-  //
-  // Read the available data from the socket.
-  //
-
-  int result = ::read(fd_, data, size);
-
-  //
-  // Update the current timestamp as the read
-  // can have scheduled some other process.
-  //
-
-  getNewTimestamp();
-
-  if (result < 0)
-  {
-    if (EGET() == EAGAIN)
-    {
-      #ifdef TEST
-      *logofs << "Transport: WARNING! Read of " << size << " bytes from "
-              << "FD#" << fd_ << " would block.\n" << logofs_flush;
-      #endif
-
-      return 0;
-    }
-    else if (EGET() == EINTR)
-    {
-      #ifdef TEST
-      *logofs << "Transport: Read of " << size << " bytes from "
-              << "FD#" << fd_ << " was interrupted.\n"
-              << logofs_flush;
-      #endif
-
-      return 0;
-    }
-    else
-    {
-      #ifdef TEST
-      *logofs << "Transport: Error reading from " 
-              << "FD#" << fd_ << ".\n" << logofs_flush;
-      #endif
-
-      finish();
-
-      return -1;
-    }
-  }
-  else if (result == 0)
-  {
-    #ifdef TEST
-    *logofs << "Transport: No data read from " 
-            << "FD#" << fd_ << ".\n" << logofs_flush;
-    #endif
-
-    finish();
-
-    return -1;
-  }
-
-  #ifdef TEST
-  *logofs << "Transport: Read " << result << " bytes out of "
-          << size << " from FD#" << fd_ << ".\n" << logofs_flush;
-  #endif
-
-  #ifdef DUMP
-
-  *logofs << "Transport: Dumping content of read data.\n"
-          << logofs_flush;
-
-  DumpData(data, result);
-
-  #endif
-
-  return result;
-}
-
-//
-// Write as many bytes as possible to socket. 
-// Append the remaining data bytes to the end 
-// of the buffer and update length to reflect
-// changes.
-//
-
-int Transport::write(T_write type, const unsigned char *data, const unsigned int size)
-{
-  //
-  // If an immediate write was requested then
-  // flush the enqueued data first.
-  //
-  // Alternatively may try to write only if
-  // the socket is not blocked.
-  //
-  // if (w_buffer_.length_ > 0 && blocked_ == 0 &&
-  //         type == write_immediate)
-  // {
-  //   ...
-  // }
-  //
-
-  if (w_buffer_.length_ > 0 && type == write_immediate)
-
-  {
-    #ifdef TEST
-    *logofs << "Transport: Writing " << w_buffer_.length_
-            << " bytes of previous data to FD#" << fd_ << ".\n"
-            << logofs_flush;
-    #endif
-
-    int result = Transport::flush();
-
-    if (result < 0)
-    {
-      return -1;
-    }
-  }
-
-  //
-  // If nothing is remained, write immediately
-  // to the socket.
-  //
-
-  unsigned int written = 0;
-
-  if (w_buffer_.length_ == 0 && blocked_ == 0 &&
-          type == write_immediate)
-  {
-    //
-    // Limit the amount of data sent.
-    //
-
-    unsigned int toWrite = size;
-
-    #ifdef DUMP
-
-    *logofs << "Transport: Going to write " << toWrite
-            << " bytes to FD#" << fd_ << " with checksum ";
-
-    DumpChecksum(data, size);
-
-    *logofs << ".\n" << logofs_flush;
-
-    #endif
-
-    T_timestamp writeTs;
-
-    int diffTs;
-
-    while (written < toWrite)
-    {
-      //
-      // Trace system time spent writing data.
-      //
-
-      writeTs = getTimestamp();
-
-      int result = ::write(fd_, data + written, toWrite - written);
-
-      diffTs = diffTimestamp(writeTs, getNewTimestamp());
-
-      statistics -> addWriteTime(diffTs);
-
-      if (result <= 0)
-      {
-        if (EGET() == EAGAIN)
-        {
-          #ifdef TEST
-          *logofs << "Transport: Write of " << toWrite - written
-                  << " bytes on FD#" << fd_ << " would block.\n"
-                  << logofs_flush;
-          #endif
-
-          blocked_ = 1;
-
-          break;
-        }
-        else if (EGET() == EINTR)
-        {
-          #ifdef TEST
-          *logofs << "Transport: Write of " << toWrite - written
-                  << " bytes on FD#" << fd_ << " was interrupted.\n"
-                  << logofs_flush;
-          #endif
-
-          continue;
-        }
-        else
-        {
-          #ifdef TEST
-          *logofs << "Transport: Write to " << "FD#" 
-                  << fd_ << " failed.\n" << logofs_flush;
-          #endif
-
-          finish();
-
-          return -1;
-        }
-      }
-      else
-      {
-        #ifdef TEST
-        *logofs << "Transport: Immediately written " << result
-                << " bytes on " << "FD#" << fd_ << ".\n"
-                << logofs_flush;
-        #endif
-
-        written += result;
-      }
-    }
-
-    #ifdef DUMP
-
-    if (written > 0)
-    {
-      *logofs << "Transport: Dumping content of immediately written data.\n"
-              << logofs_flush;
-
-      DumpData(data, written);
-    }
-
-    #endif
-  }
-
-  if (written == size)
-  {
-    //
-    // We will not affect the write buffer.
-    //
-
-    return written;
-  }
-
-  #ifdef DEBUG
-  *logofs << "Transport: Going to append " << size - written
-          << " bytes to write buffer for " << "FD#" << fd_
-          << ".\n" << logofs_flush;
-  #endif
-
-  if (resize(w_buffer_, size - written) < 0)
-  {
-    return -1;
-  }
-
-  memmove(w_buffer_.data_.begin() + w_buffer_.start_ + w_buffer_.length_,
-              data + written, size - written);
-
-  w_buffer_.length_ += size - written;
-
-  #ifdef TEST
-  *logofs << "Transport: Write buffer for FD#" << fd_
-          << " has data for " << w_buffer_.length_ << " bytes.\n"
-          << logofs_flush;
-
-  *logofs << "Transport: Start is " << w_buffer_.start_ 
-          << " length is " << w_buffer_.length_ << " size is "
-          << w_buffer_.data_.size() << " capacity is "
-          << w_buffer_.data_.capacity() << ".\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // Note that this function always returns the whole
-  // size of buffer that was provided, either if not
-  // all the data could be actually written.
-  //
-
-  return size;
-}
-
-//
-// Write pending data to its file descriptor.
-//
-
-int Transport::flush()
-{
-  if (w_buffer_.length_ == 0)
-  {
-    #ifdef TEST
-    *logofs << "Transport: No data to flush on "
-            << "FD#" << fd_ << ".\n" << logofs_flush;
-    #endif
-
-    #ifdef WARNING
-    if (blocked_ != 0)
-    {
-      *logofs << "Transport: Blocked flag is " << blocked_
-              << " with no data to flush on FD#" << fd_
-              << ".\n" << logofs_flush;
-    }
-    #endif
-
-    return 0;
-  }
-
-  //
-  // It's time to move data from the 
-  // write buffer to the real link. 
-  //
-
-  int written = 0;
-
-  int toWrite = w_buffer_.length_;
-
-  //
-  // We will do our best to write any available
-  // data to the socket, so let's say we start
-  // from a clean state.
-  //
-
-  blocked_ = 0;
-
-  #ifdef TEST
-  *logofs << "Transport: Going to flush " << toWrite
-          << " bytes on FD#" << fd_ << ".\n"
-          << logofs_flush;
-  #endif
-
-  T_timestamp writeTs;
-
-  int diffTs;
-
-  while (written < toWrite)
-  {
-    writeTs = getTimestamp();
-
-    int result = ::write(fd_, w_buffer_.data_.begin() + w_buffer_.start_ +
-                             written, toWrite - written);
-
-    diffTs = diffTimestamp(writeTs, getNewTimestamp());
-
-    statistics -> addWriteTime(diffTs);
-
-    if (result <= 0)
-    {
-      if (EGET() == EAGAIN)
-      {
-        #ifdef TEST
-        *logofs << "Transport: Write of " << toWrite - written
-                << " bytes on FD#" << fd_ << " would block.\n"
-                << logofs_flush;
-        #endif
-
-        blocked_ = 1;
-
-        break;
-      }
-      else if (EGET() == EINTR)
-      {
-        #ifdef TEST
-        *logofs << "Transport: Write of " << toWrite - written
-                << " bytes on FD#" << fd_ << " was interrupted.\n"
-                << logofs_flush;
-        #endif
-
-        continue;
-      }
-      else
-      {
-        #ifdef TEST
-        *logofs << "Transport: Write to " << "FD#" 
-                << fd_ << " failed.\n" << logofs_flush;
-        #endif
-
-        finish();
-
-        return -1;
-      }
-    }
-    else
-    {
-      #ifdef TEST
-      *logofs << "Transport: Flushed " << result << " bytes on " 
-              << "FD#" << fd_ << ".\n" << logofs_flush;
-      #endif
-
-      written += result;
-    }
-  }
-
-  if (written > 0)
-  {
-    #ifdef DUMP
-
-    *logofs << "Transport: Dumping content of flushed data.\n"
-            << logofs_flush;
-
-    DumpData(w_buffer_.data_.begin() + w_buffer_.start_, written);
-
-    #endif
-
-    //
-    // Update the buffer status.
-    //
-
-    w_buffer_.length_ -= written;
-
-    if (w_buffer_.length_ == 0)
-    {
-      w_buffer_.start_ = 0;
-    }
-    else
-    {
-      w_buffer_.start_ += written;
-    }
-  }
-
-  //
-  // It can be that we wrote less bytes than
-  // available because of the write limit.
-  //
-
-  if (w_buffer_.length_ > 0)
-  {
-    #ifdef TEST
-    *logofs << "Transport: There are still " << w_buffer_.length_ 
-            << " bytes in write buffer for " << "FD#" 
-            << fd_ << ".\n" << logofs_flush;
-    #endif
-
-    blocked_ = 1;
-  }
-
-  #ifdef TEST
-  *logofs << "Transport: Write buffer for FD#" << fd_
-          << " has data for " << w_buffer_.length_ << " bytes.\n"
-          << logofs_flush;
-
-  *logofs << "Transport: Start is " << w_buffer_.start_ 
-          << " length is " << w_buffer_.length_ << " size is "
-          << w_buffer_.data_.size() << " capacity is "
-          << w_buffer_.data_.capacity() << ".\n"
-          << logofs_flush;
-  #endif
-
-  //
-  // No new data was produced for the link except
-  // any outstanding data from previous writes.
-  //
-
-  return 0;
-}
-
-int Transport::drain(int limit, int timeout)
-{
-  if (w_buffer_.length_ <= limit)
-  {
-    return 1;
-  }
-
-  //
-  // Write the data accumulated in the write
-  // buffer until it is below the limit or
-  // the timeout is elapsed.
-  //
-
-  int toWrite = w_buffer_.length_;
-
-  int written = 0;
-
-  #ifdef TEST
-  *logofs << "Transport: Draining " << toWrite - limit
-          << " bytes on FD#" << fd_ << " with limit set to "
-          << limit << ".\n" << logofs_flush;
-  #endif
-
-  T_timestamp startTs = getNewTimestamp();
-
-  T_timestamp selectTs;
-  T_timestamp writeTs;
-  T_timestamp idleTs;
-
-  T_timestamp nowTs = startTs;
-
-  int diffTs;
-
-  fd_set writeSet;
-  fd_set readSet;
-
-  FD_ZERO(&writeSet);
-  FD_ZERO(&readSet);
-
-  int result;
-  int ready;
-
-  while (w_buffer_.length_ - written > limit)
-  {
-    nowTs = getNewTimestamp();
-
-    //
-    // Wait for descriptor to become
-    // readable or writable.
-    //
-
-    FD_SET(fd_, &writeSet);
-    FD_SET(fd_, &readSet);
-
-    setTimestamp(selectTs, timeout / 2);
-
-    idleTs = nowTs;
-
-    result = select(fd_ + 1, &readSet, &writeSet, NULL, &selectTs);
-
-    nowTs = getNewTimestamp();
-
-    diffTs = diffTimestamp(idleTs, nowTs);
-
-    statistics -> addIdleTime(diffTs);
-
-    statistics -> subReadTime(diffTs);
-
-    if (result < 0)
-    {
-      if (EGET() == EINTR)
-      {
-        #ifdef TEST
-        *logofs << "Transport: Select on FD#" << fd_
-                << " was interrupted.\n" << logofs_flush;
-        #endif
-
-        continue;
-      }
-      else
-      {
-        #ifdef TEST
-        *logofs << "Transport: Select on FD#" << fd_
-                << " failed.\n" << logofs_flush;
-        #endif
-
-        finish();
-
-        return -1;
-      }
-    }
-    else if (result > 0)
-    {
-      ready = result;
-
-      if (FD_ISSET(fd_, &writeSet))
-      {
-        writeTs = getNewTimestamp();
-
-        result = ::write(fd_, w_buffer_.data_.begin() + w_buffer_.start_ +
-                             written, toWrite - written);
-
-        nowTs = getNewTimestamp();
-
-        diffTs = diffTimestamp(writeTs, nowTs);
-
-        statistics -> addWriteTime(diffTs);
-
-        if (result > 0)
-        {
-          #ifdef TEST
-          *logofs << "Transport: Forced flush of " << result
-                  << " bytes on " << "FD#" << fd_ << ".\n"
-                  << logofs_flush;
-          #endif
-
-          written += result;
-        }
-        else if (result < 0 && EGET() == EINTR)
-        {
-          #ifdef TEST
-          *logofs << "Transport: Write to FD#" << fd_
-                  << " was interrupted.\n" << logofs_flush;
-          #endif
-
-          continue;
-        }
-        else
-        {
-          #ifdef TEST
-          *logofs << "Transport: Write to FD#" << fd_
-                  << " failed.\n" << logofs_flush;
-          #endif
-
-          finish();
-
-          return -1;
-        }
-
-        ready--;
-      }
-
-      if (ready > 0)
-      {
-        if (FD_ISSET(fd_, &readSet))
-        {
-          #ifdef TEST
-          *logofs << "Transport: Not draining further "
-                  << "due to data readable on FD#" << fd_
-                  << ".\n" << logofs_flush;
-          #endif
-
-          break;
-        }
-      }
-    }
-    #ifdef TEST
-    else
-    {
-      *logofs << "Transport: Timeout encountered "
-              << "waiting for FD#" << fd_ << ".\n"
-              << logofs_flush;
-    }
-    #endif
-
-    nowTs = getNewTimestamp();
-
-    diffTs = diffTimestamp(startTs, nowTs);
-
-    if (diffTs >= timeout)
-    {
-      #ifdef TEST
-      *logofs << "Transport: Not draining further "
-              << "due to the timeout on FD#" << fd_
-              << ".\n" << logofs_flush;
-      #endif
-
-      break;
-    }
-  }
-
-  if (written > 0)
-  {
-    #ifdef DUMP
-
-    *logofs << "Transport: Dumping content of flushed data.\n"
-            << logofs_flush;
-
-    DumpData(w_buffer_.data_.begin() + w_buffer_.start_, written);
-
-    #endif
-
-    //
-    // Update the buffer status.
-    //
-
-    w_buffer_.length_ -= written;
-
-    if (w_buffer_.length_ == 0)
-    {
-      w_buffer_.start_ = 0;
-
-      blocked_ = 0;
-    }
-    else
-    {
-      w_buffer_.start_ += written;
-
-      #ifdef TEST
-      *logofs << "Transport: There are still " << w_buffer_.length_ 
-              << " bytes in write buffer for " << "FD#" 
-              << fd_ << ".\n" << logofs_flush;
-      #endif
-
-      blocked_ = 1;
-    }
-  }
-  #ifdef TEST
-  else
-  {
-    *logofs << "Transport: WARNING! No data written to FD#" << fd_
-            << " with " << toWrite  << " bytes to drain and limit "
-            << "set to " << limit << ".\n" << logofs_flush;
-  }
-  #endif
-
-  #ifdef TEST
-  *logofs << "Transport: Write buffer for FD#" << fd_
-          << " has data for " << w_buffer_.length_ << " bytes.\n"
-          << logofs_flush;
-
-  *logofs << "Transport: Start is " << w_buffer_.start_ 
-          << " length is " << w_buffer_.length_ << " size is "
-          << w_buffer_.data_.size() << " capacity is "
-          << w_buffer_.data_.capacity() << ".\n"
-          << logofs_flush;
-  #endif
-
-  return (w_buffer_.length_ <= limit);
-}
-
-int Transport::wait(int timeout) const
-{
-  T_timestamp startTs = getNewTimestamp();
-
-  T_timestamp idleTs;
-  T_timestamp selectTs;
-
-  T_timestamp nowTs = startTs;
-
-  long available = 0;
-  int  result    = 0;
-
-  int diffTs;
-
-  fd_set readSet;
-
-  FD_ZERO(&readSet);
-  FD_SET(fd_, &readSet);
-
-  for (;;)
-  {
-    available = readable();
-
-    diffTs = diffTimestamp(startTs, nowTs);
-
-    if (available != 0 || timeout == 0 ||
-            (diffTs + (timeout / 10)) >= timeout)
-    {
-      #ifdef TEST
-      *logofs << "Transport: There are " << available
-              << " bytes on FD#" << fd_ << " after "
-              << diffTs << " Ms.\n" << logofs_flush;
-      #endif
-
-      return available;
-    }
-    else if (available == 0 && result > 0)
-    {
-      #ifdef TEST
-      *logofs << "Transport: Read on " << "FD#" 
-              << fd_ << " failed.\n" << logofs_flush;
-      #endif
-
-      return -1;
-    }
-
-    //
-    // TODO: Should subtract the time
-    // already spent in select.
-    //
-
-    selectTs.tv_sec  = 0;
-    selectTs.tv_usec = timeout * 1000;
-
-    idleTs = nowTs;
-
-    //
-    // Wait for descriptor to become readable.
-    //
-
-    result = select(fd_ + 1, &readSet, NULL, NULL, &selectTs);
-
-    nowTs = getNewTimestamp();
-
-    diffTs = diffTimestamp(idleTs, nowTs);
-
-    statistics -> addIdleTime(diffTs);
-
-    statistics -> subReadTime(diffTs);
-
-    if (result < 0)
-    {
-      if (EGET() == EINTR)
-      {
-        #ifdef TEST
-        *logofs << "Transport: Select on FD#" << fd_
-                << " was interrupted.\n" << logofs_flush;
-        #endif
-
-        continue;
-      }
-      else
-      {
-        #ifdef TEST
-        *logofs << "Transport: Select on " << "FD#" 
-                << fd_ << " failed.\n" << logofs_flush;
-        #endif
-
-        return -1;
-      }
-    }
-    #ifdef TEST
-    else if (result == 0)
-    {
-      *logofs << "Transport: No data available on FD#" << fd_
-              << " after " << diffTimestamp(startTs, nowTs)
-              << " Ms.\n" << logofs_flush;
-    }
-    else
-    {
-      *logofs << "Transport: Data became available on FD#" << fd_
-              << " after " << diffTimestamp(startTs, nowTs)
-              << " Ms.\n" << logofs_flush;
-    }
-    #endif
-  }
-}
-
-void Transport::setSize(unsigned int initialSize, unsigned int thresholdSize,
-                            unsigned int maximumSize)
-{
-  initialSize_   = initialSize;
-  thresholdSize_ = thresholdSize;
-  maximumSize_   = maximumSize;
-
-  #ifdef TEST
-  *logofs << "Transport: Set buffer sizes for FD#" << fd_
-          << " to " << initialSize_ << "/" << thresholdSize_
-          << "/" << maximumSize_ << ".\n" << logofs_flush;
-  #endif
-}
-
-void Transport::fullReset()
-{
-  blocked_ = 0;
-  finish_  = 0;
-
-  fullReset(w_buffer_);
-}
-
-int Transport::resize(T_buffer &buffer, const int &size)
-{
-  if ((int) buffer.data_.size() >= (buffer.length_ + size) &&
-          (buffer.start_ + buffer.length_ + size) >
-               (int) buffer.data_.size())
-  {
-    if (buffer.length_ > 0)
-    {
-      //
-      // There is enough space in buffer but we need
-      // to move existing data at the beginning.
-      //
-
-      #ifdef TEST
-      *logofs << "Transport: Moving " << buffer.length_
-              << " bytes of data for " << "FD#" << fd_
-              << " to make room in the buffer.\n"
-              << logofs_flush;
-      #endif
-
-      memmove(buffer.data_.begin(), buffer.data_.begin() +
-                  buffer.start_, buffer.length_);
-    }
-
-    buffer.start_ = 0;
-
-    #ifdef DEBUG
-    *logofs << "Transport: Made room for " 
-            << buffer.data_.size() - buffer.start_
-            << " bytes in buffer for " << "FD#" 
-            << fd_ << ".\n" << logofs_flush;
-    #endif
-  }
-  else if ((buffer.length_ + size) > (int) buffer.data_.size())
-  {
-    //
-    // Not enough space, so increase
-    // the size of the buffer.
-    //
-
-    if (buffer.start_ != 0 && buffer.length_ > 0)
-    {
-      #ifdef TEST
-      *logofs << "Transport: Moving " << buffer.length_
-              << " bytes of data for " << "FD#" << fd_
-              << " to resize the buffer.\n"
-              << logofs_flush;
-      #endif
-
-      memmove(buffer.data_.begin(), buffer.data_.begin() +
-                  buffer.start_, buffer.length_);
-    }
-
-    buffer.start_ = 0;
-
-    unsigned int newSize = thresholdSize_;
-
-    while (newSize < (unsigned int) buffer.length_ + size)
-    {
-      newSize <<= 1;
-
-      if (newSize >= maximumSize_)
-      {
-        newSize = buffer.length_ + size + initialSize_;
-      }
-    }
-
-    #ifdef DEBUG
-    *logofs << "Transport: Buffer for " << "FD#" << fd_
-            << " will be enlarged from " << buffer.data_.size()
-            << " to at least " << buffer.length_ + size
-            << " bytes.\n" << logofs_flush;
-    #endif
-
-    buffer.data_.resize(newSize);
-
-    #ifdef TEST
-    if (newSize >= maximumSize_)
-    {
-      *logofs << "Transport: WARNING! Buffer for FD#" << fd_
-              << " grown to reach size of " << newSize
-              << " bytes.\n" << logofs_flush;
-    }
-    #endif
-
-    #ifdef TEST
-    *logofs << "Transport: Data buffer for " << "FD#" 
-            << fd_ << " has now size " << buffer.data_.size() 
-            << " and capacity " << buffer.data_.capacity()
-            << ".\n" << logofs_flush;
-    #endif
-  }
-
-  return (buffer.length_ + size);
-}
-
-void Transport::fullReset(T_buffer &buffer)
-{
-  //
-  // Force deallocation and allocation
-  // of the initial size.
-  //
-
-  #ifdef TEST
-  *logofs << "Transport: Resetting buffer for " << "FD#"
-          << fd_ << " with size " << buffer.data_.size()
-          << " and capacity " << buffer.data_.capacity()
-          << ".\n" << logofs_flush;
-  #endif
-
-  buffer.start_  = 0;
-  buffer.length_ = 0;
-
-  if (buffer.data_.size() > (unsigned int) initialSize_ &&
-          buffer.data_.capacity() > (unsigned int) initialSize_)
-  {
-    buffer.data_.clear();
-
-    buffer.data_.resize(initialSize_);
-
-    #ifdef TEST
-    *logofs << "Transport: Data buffer for " << "FD#"
-            << fd_ << " shrunk to size " << buffer.data_.size()
-            << " and capacity " << buffer.data_.capacity()
-            << ".\n" << logofs_flush;
-    #endif
-  }
-}
-
-ProxyTransport::ProxyTransport(int fd) : Transport(fd)
-{
-  #ifdef TEST
-  *logofs << "ProxyTransport: Going to create proxy transport "
-          << "for FD#" << fd_ << ".\n" << logofs_flush;
-  #endif
-
-  type_ = transport_proxy;
-
-  //
-  // Set up the read buffer.
-  //
-
-  r_buffer_.length_ = 0;
-  r_buffer_.start_  = 0;
-
-  r_buffer_.data_.resize(initialSize_);
-
-  //
-  // For now we own the buffer.
-  //
-
-  owner_ = 1;
-
-  //
-  // Set up ZLIB compression.
-  //
-
-  int result;
-
-  r_stream_.zalloc = NULL;
-  r_stream_.zfree  = NULL;
-  r_stream_.opaque = NULL;
-
-  r_stream_.next_in  = NULL;
-  r_stream_.avail_in = 0;
-
-  if ((result = inflateInit2(&r_stream_, 15)) != Z_OK)
-  {
-    #ifdef PANIC
-    *logofs << "ProxyTransport: PANIC! Failed initialization of ZLIB read stream. "
-            << "Error is '" << zError(result) << "'.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Failed initialization of ZLIB read stream. "
-         << "Error is '" << zError(result) << "'.\n";
-
-    HandleCleanup();
-  }
-
-  if (control -> LocalStreamCompression)
-  {
-    w_stream_.zalloc = NULL;
-    w_stream_.zfree  = NULL;
-    w_stream_.opaque = NULL;
-
-    if ((result = deflateInit2(&w_stream_, control -> LocalStreamCompressionLevel, Z_DEFLATED,
-                                   15, 9, Z_DEFAULT_STRATEGY)) != Z_OK)
-    {
-      #ifdef PANIC
-      *logofs << "ProxyTransport: PANIC! Failed initialization of ZLIB write stream. "
-              << "Error is '" << zError(result) << "'.\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Failed initialization of ZLIB write stream. "
-           << "Error is '" << zError(result) << "'.\n";
-
-      HandleCleanup();
-    }
-  }
-
-  //
-  // No ZLIB stream to flush yet.
-  //
-
-  flush_ = 0;
-
-  #ifdef REFERENCES
-  *logofs << "ProxyTransport: Created new object at " 
-          << this << " out of " << ++references_ 
-          << " allocated references.\n" << logofs_flush;
-  #endif
-}
-
-ProxyTransport::~ProxyTransport()
-{
-  #ifdef TEST
-  *logofs << "ProxyTransport: Going to destroy derived class "
-          << "for FD#" << fd_ << ".\n" << logofs_flush;
-  #endif
-
-  //
-  // Deallocate the ZLIB stream state.
-  //
-
-  inflateEnd(&r_stream_);
-
-  if (control -> LocalStreamCompression)
-  {
-    deflateEnd(&w_stream_);
-  }
-
-  #ifdef REFERENCES
-  *logofs << "ProxyTransport: Deleted object at " 
-          << this << " out of " << --references_ 
-          << " allocated references.\n" << logofs_flush;
-  #endif
-}
-
-//
-// Read data from its file descriptor.
-//
-
-int ProxyTransport::read(unsigned char *data, unsigned int size)
-{
-  //
-  // If the remote peer is not compressing
-  // the stream then just return any byte
-  // read from the socket.
-  //
-
-  if (control -> RemoteStreamCompression == 0)
-  {
-    int result = Transport::read(data, size);
-
-    if (result <= 0)
-    {
-      return result;
-    }
-
-    statistics -> addBytesIn(result);
-
-    return result;
-  }
-
-  //
-  // Return any pending data first.
-  //
-
-  if (r_buffer_.length_ > 0)
-  {
-    //
-    // If the size of the buffer doesn't
-    // match the amount of data pending,
-    // force the caller to retry.
-    //
-
-    if ((int) size < r_buffer_.length_)
-    {
-      #ifdef TEST
-      *logofs << "ProxyTransport: WARNING! Forcing a retry with "
-              << r_buffer_.length_ << " bytes pending and "
-              << size << " in the buffer.\n"
-              << logofs_flush;
-      #endif
-
-      ESET(EAGAIN);
-
-      return -1;
-    }
-
-    int copied = (r_buffer_.length_ > ((int) size) ?
-                      ((int) size) : r_buffer_.length_);
-
-    memcpy(data, r_buffer_.data_.begin() + r_buffer_.start_, copied);
-
-    //
-    // Update the buffer status.
-    //
-
-    #ifdef DEBUG
-    *logofs << "ProxyTransport: Going to immediately return " << copied
-            << " bytes from proxy FD#" << fd_ << ".\n"
-            << logofs_flush;
-    #endif
-
-    r_buffer_.length_ -= copied;
-
-    if (r_buffer_.length_ == 0)
-    {
-      r_buffer_.start_ = 0;
-    }
-    else
-    {
-      r_buffer_.start_ += copied;
-
-      #ifdef TEST
-      *logofs << "ProxyTransport: There are still " << r_buffer_.length_ 
-              << " bytes in read buffer for proxy " << "FD#" 
-              << fd_ << ".\n" << logofs_flush;
-        #endif
-    }
-
-    return copied;
-  }
-
-  //
-  // Read data in the user buffer.
-  //
-
-  int result = Transport::read(data, size);
-
-  if (result <= 0)
-  {
-    return result;
-  }
-
-  statistics -> addBytesIn(result);
-
-  //
-  // Decompress the data into the read
-  // buffer.
-  //
-
-  #ifdef DEBUG
-  *logofs << "ProxyTransport: Going to decompress data for " 
-          << "proxy FD#" << fd_ << ".\n" << logofs_flush;
-  #endif
-
-  int saveTotalIn  = r_stream_.total_in;
-  int saveTotalOut = r_stream_.total_out;
-
-  int oldTotalIn  = saveTotalIn;
-  int oldTotalOut = saveTotalOut;
-
-  int diffTotalIn;
-  int diffTotalOut;
-
-  #ifdef INSPECT
-  *logofs << "ProxyTransport: oldTotalIn = " << oldTotalIn
-          << ".\n" << logofs_flush;
-  #endif
-
-  #ifdef INSPECT
-  *logofs << "ProxyTransport: oldTotalOut = " << oldTotalOut
-          << ".\n" << logofs_flush;
-  #endif
-
-  r_stream_.next_in  = (Bytef *) data;
-  r_stream_.avail_in = result;
-
-  //
-  // Let ZLIB use all the space already
-  // available in the buffer.
-  //
-
-  unsigned int newAvailOut = r_buffer_.data_.size() - r_buffer_.start_ -
-                                 r_buffer_.length_;
-
-  #ifdef TEST
-  *logofs << "ProxyTransport: Initial decompress buffer is "
-          << newAvailOut << " bytes.\n" << logofs_flush;
-  #endif
-
-  for (;;)
-  {
-    #ifdef INSPECT
-    *logofs << "\nProxyTransport: Running the decompress loop.\n"
-            << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: r_buffer_.length_ = " << r_buffer_.length_
-            << ".\n" << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: r_buffer_.data_.size() = " << r_buffer_.data_.size()
-            << ".\n" << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: newAvailOut = " << newAvailOut
-            << ".\n" << logofs_flush;
-    #endif
-
-    if (resize(r_buffer_, newAvailOut) < 0)
-    {
-      return -1;
-    }
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: r_buffer_.data_.size() = "
-            << r_buffer_.data_.size() << ".\n"
-            << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: r_stream_.next_in = "
-            << (void *) r_stream_.next_in << ".\n"
-            << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: r_stream_.avail_in = "
-            << r_stream_.avail_in << ".\n"
-            << logofs_flush;
-    #endif
-
-    r_stream_.next_out  = r_buffer_.data_.begin() + r_buffer_.start_ +
-                              r_buffer_.length_;
-
-    r_stream_.avail_out = newAvailOut;
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: r_stream_.next_out = "
-            << (void *) r_stream_.next_out << ".\n"
-            << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: r_stream_.avail_out = "
-            << r_stream_.avail_out << ".\n"
-            << logofs_flush;
-    #endif
-
-    int result = inflate(&r_stream_, Z_SYNC_FLUSH);
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: Called inflate() result is "
-            << result << ".\n" << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: r_stream_.avail_in = "
-            << r_stream_.avail_in << ".\n"
-            << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: r_stream_.avail_out = "
-            << r_stream_.avail_out << ".\n"
-            << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: r_stream_.total_in = "
-            << r_stream_.total_in << ".\n"
-            << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: r_stream_.total_out = "
-            << r_stream_.total_out << ".\n"
-            << logofs_flush;
-    #endif
-
-    diffTotalIn  = r_stream_.total_in  - oldTotalIn;
-    diffTotalOut = r_stream_.total_out - oldTotalOut;
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: diffTotalIn = "
-            << diffTotalIn << ".\n"
-            << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: diffTotalOut = "
-            << diffTotalOut << ".\n"
-            << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: r_buffer_.length_ = "
-            << r_buffer_.length_ << ".\n"
-            << logofs_flush;
-    #endif
-
-    r_buffer_.length_ += diffTotalOut;
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: r_buffer_.length_ = "
-            << r_buffer_.length_ << ".\n"
-            << logofs_flush;
-    #endif
-
-    oldTotalIn  = r_stream_.total_in;
-    oldTotalOut = r_stream_.total_out;
-
-    if (result == Z_OK)
-    {
-      if (r_stream_.avail_in == 0 && r_stream_.avail_out > 0)
-      {
-        break;
-      }
-    }
-    else if (result == Z_BUF_ERROR && r_stream_.avail_out > 0 &&
-                 r_stream_.avail_in == 0)
-    {
-      #ifdef TEST
-      *logofs << "ProxyTransport: WARNING! Raised Z_BUF_ERROR decompressing data.\n"
-              << logofs_flush;
-      #endif
-
-      break;
-    }
-    else
-    {
-      #ifdef PANIC
-      *logofs << "ProxyTransport: PANIC! Decompression of data failed. "
-              << "Error is '" << zError(result) << "'.\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Decompression of data failed. Error is '"
-           << zError(result) << "'.\n";
-
-      finish();
-
-      return -1;
-    }
-
-    //
-    // Add more bytes to the buffer.
-    //
-
-    if (newAvailOut < thresholdSize_)
-    {
-      newAvailOut = thresholdSize_;
-    }
-
-    #ifdef TEST
-    *logofs << "ProxyTransport: Need to add " << newAvailOut
-            << " bytes to the decompress buffer in read.\n"
-            << logofs_flush;
-    #endif
-  }
-
-  diffTotalIn  = r_stream_.total_in  - saveTotalIn;
-  diffTotalOut = r_stream_.total_out - saveTotalOut;
-
-  #ifdef DEBUG
-  *logofs << "ProxyTransport: Decompressed data from "
-          << diffTotalIn << " to " << diffTotalOut
-          << " bytes.\n" << logofs_flush;
-  #endif
-
-  statistics -> addDecompressedBytes(diffTotalIn, diffTotalOut);
-
-  //
-  // Check if the size of the buffer
-  // matches the produced data.
-  //
-
-  if ((int) size < r_buffer_.length_)
-  {
-    #ifdef TEST
-    *logofs << "ProxyTransport: WARNING! Forcing a retry with "
-            << r_buffer_.length_ << " bytes pending and "
-            << size << " in the buffer.\n"
-            << logofs_flush;
-    #endif
-
-    ESET(EAGAIN);
-
-    return -1;
-  }
-
-  //
-  // Copy the decompressed data to the
-  // provided buffer.
-  //
-
-  int copied = (r_buffer_.length_ > ((int) size) ?
-                    ((int) size) : r_buffer_.length_);
-
-  #ifdef DEBUG
-  *logofs << "ProxyTransport: Going to return " << copied
-          << " bytes from proxy FD#" << fd_ << ".\n"
-          << logofs_flush;
-  #endif
-
-  memcpy(data, r_buffer_.data_.begin() + r_buffer_.start_, copied);
-
-  //
-  // Update the buffer status.
-  //
-
-  r_buffer_.length_ -= copied;
-
-  if (r_buffer_.length_ == 0)
-  {
-    r_buffer_.start_ = 0;
-  }
-  else
-  {
-    r_buffer_.start_ += copied;
-
-    #ifdef TEST
-    *logofs << "ProxyTransport: There are still " << r_buffer_.length_ 
-            << " bytes in read buffer for proxy FD#" << fd_
-            << ".\n" << logofs_flush;
-    #endif
-  }
-
-  return copied;
-}
-
-//
-// If required compress data, else write it to socket.
-//
-
-int ProxyTransport::write(T_write type, const unsigned char *data, const unsigned int size)
-{
-  #ifdef TEST
-  if (size == 0)
-  {
-    *logofs << "ProxyTransport: WARNING! Write called for FD#" 
-            << fd_ << " without any data to write.\n"
-            << logofs_flush;
-
-    return 0;
-  }
-  #endif
-
-  //
-  // If there is no compression revert to
-  // plain socket management.
-  //
-
-  if (control -> LocalStreamCompression == 0)
-  {
-    int result = Transport::write(type, data, size);
-
-    if (result <= 0)
-    {
-      return result;
-    }
-
-    statistics -> addBytesOut(result);
-
-    statistics -> updateBitrate(result);
-
-    FlushCallback(result);
-
-    return result;
-  }
-
-  #ifdef DEBUG
-  *logofs << "ProxyTransport: Going to compress " << size 
-          << " bytes to write buffer for proxy FD#" << fd_
-          << ".\n" << logofs_flush;
-  #endif
-
-  //
-  // Compress data into the write buffer.
-  //
-
-  int saveTotalIn  = w_stream_.total_in;
-  int saveTotalOut = w_stream_.total_out;
-
-  int oldTotalIn  = saveTotalIn;
-  int oldTotalOut = saveTotalOut;
-
-  int diffTotalIn;
-  int diffTotalOut;
-
-  #ifdef INSPECT
-  *logofs << "ProxyTransport: oldTotalIn = " << oldTotalIn
-          << ".\n" << logofs_flush;
-  #endif
-
-  #ifdef INSPECT
-  *logofs << "ProxyTransport: oldTotalOut = " << oldTotalOut
-          << ".\n" << logofs_flush;
-  #endif
-
-  w_stream_.next_in  = (Bytef *) data;
-  w_stream_.avail_in = size;
-
-  //
-  // Let ZLIB use all the space already
-  // available in the buffer.
-  //
-
-  unsigned int newAvailOut = w_buffer_.data_.size() - w_buffer_.start_ -
-                                 w_buffer_.length_;
-
-  #ifdef TEST
-  *logofs << "ProxyTransport: Initial compress buffer is "
-          << newAvailOut << " bytes.\n" << logofs_flush;
-  #endif
-
-  for (;;)
-  {
-    #ifdef INSPECT
-    *logofs << "\nProxyTransport: Running the compress loop.\n"
-            << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: w_buffer_.length_ = "
-            << w_buffer_.length_ << ".\n"
-            << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: w_buffer_.data_.size() = "
-            << w_buffer_.data_.size() << ".\n"
-            << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: newAvailOut = "
-            << newAvailOut << ".\n"
-            << logofs_flush;
-    #endif
-
-    if (resize(w_buffer_, newAvailOut) < 0)
-    {
-      return -1;
-    }
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: w_buffer_.data_.size() = "
-            << w_buffer_.data_.size() << ".\n"
-            << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: w_stream_.next_in = "
-            << (void *) w_stream_.next_in << ".\n"
-            << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: w_stream_.avail_in = "
-            << w_stream_.avail_in << ".\n"
-            << logofs_flush;
-    #endif
-
-    w_stream_.next_out  = w_buffer_.data_.begin() + w_buffer_.start_ +
-                              w_buffer_.length_;
-
-    w_stream_.avail_out = newAvailOut;
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: w_stream_.next_out = "
-            << (void *) w_stream_.next_out << ".\n"
-            << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: w_stream_.avail_out = "
-            << w_stream_.avail_out << ".\n"
-            << logofs_flush;
-    #endif
-
-    int result = deflate(&w_stream_, (type == write_delayed ?
-                             Z_NO_FLUSH : Z_SYNC_FLUSH));
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: Called deflate() result is "
-            << result << ".\n" << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: w_stream_.avail_in = "
-            << w_stream_.avail_in << ".\n"
-            << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: w_stream_.avail_out = "
-            << w_stream_.avail_out << ".\n"
-            << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: w_stream_.total_in = "
-            << w_stream_.total_in << ".\n"
-            << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: w_stream_.total_out = "
-            << w_stream_.total_out << ".\n"
-            << logofs_flush;
-    #endif
-
-    diffTotalOut = w_stream_.total_out - oldTotalOut;
-    diffTotalIn  = w_stream_.total_in  - oldTotalIn;
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: diffTotalIn = "
-            << diffTotalIn << ".\n"
-            << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: diffTotalOut = "
-            << diffTotalOut << ".\n"
-            << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: w_buffer_.length_ = "
-            << w_buffer_.length_ << ".\n"
-            << logofs_flush;
-    #endif
-
-    w_buffer_.length_ += diffTotalOut;
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: w_buffer_.length_ = "
-            << w_buffer_.length_ << ".\n"
-            << logofs_flush;
-    #endif
-
-    oldTotalOut = w_stream_.total_out;
-    oldTotalIn  = w_stream_.total_in;
-
-    if (result == Z_OK)
-    {
-      if (w_stream_.avail_in == 0 && w_stream_.avail_out > 0)
-      {
-        break;
-      }
-    }
-    else if (result == Z_BUF_ERROR && w_stream_.avail_out > 0 &&
-                 w_stream_.avail_in == 0)
-    {
-      #ifdef TEST
-      *logofs << "ProxyTransport: WARNING! Raised Z_BUF_ERROR compressing data.\n"
-              << logofs_flush;
-      #endif
-
-      break;
-    }
-    else
-    {
-      #ifdef PANIC
-      *logofs << "ProxyTransport: PANIC! Compression of data failed. "
-              << "Error is '" << zError(result) << "'.\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Compression of data failed. Error is '"
-           << zError(result) << "'.\n";
-
-      finish();
-
-      return -1;
-    }
-
-    //
-    // Add more bytes to the buffer.
-    //
-
-    if (newAvailOut < thresholdSize_)
-    {
-      newAvailOut = thresholdSize_;
-    }
-
-    #ifdef TEST
-    *logofs << "ProxyTransport: Need to add " << newAvailOut
-            << " bytes to the compress buffer in write.\n"
-            << logofs_flush;
-    #endif
-  }
-
-  diffTotalIn  = w_stream_.total_in  - saveTotalIn;
-  diffTotalOut = w_stream_.total_out - saveTotalOut;
-
-  #ifdef TEST
-
-  *logofs << "ProxyTransport: Compressed data from "
-          << diffTotalIn << " to " << diffTotalOut
-          << " bytes.\n" << logofs_flush;
-
-  if (diffTotalIn != (int) size)
-  {
-    #ifdef PANIC
-    *logofs << "ProxyTransport: PANIC! Bytes provided to ZLIB stream "
-            << "should be " << size << " but they look to be "
-            << diffTotalIn << ".\n" << logofs_flush;
-    #endif
-  }
-
-  #endif
-
-  //
-  // Find out what we have to do with the
-  // produced data.
-  //
-
-  if (type == write_immediate)
-  {
-    //
-    // If user requested an immediate write we
-    // flushed the ZLIB buffer. We can now reset
-    // the counter and write data to socket.
-    //
-
-    flush_ = 0;
-
-    #ifdef TEST
-    *logofs << "ProxyTransport: Write buffer for proxy FD#" << fd_
-            << " has data for " << w_buffer_.length_ << " bytes.\n"
-            << logofs_flush;
-
-    *logofs << "ProxyTransport: Start is " << w_buffer_.start_ 
-            << " length is " << w_buffer_.length_ << " flush is "
-            << flush_ << " size is " << w_buffer_.data_.size()
-            << " capacity is " << w_buffer_.data_.capacity()
-            << ".\n" << logofs_flush;
-    #endif
-
-    //
-    // Alternatively may try to write only if
-    // the socket is not blocked.
-    //
-    // if (w_buffer_.length_ > 0 && blocked_ == 0)
-    // {
-    //   ...
-    // }
-    //
-
-    if (w_buffer_.length_ > 0)
-
-    {
-      #ifdef TEST
-      *logofs << "ProxyTransport: Writing " << w_buffer_.length_
-              << " bytes of produced data to FD#" << fd_ << ".\n"
-              << logofs_flush;
-      #endif
-
-      int result = Transport::flush();
-
-      if (result < 0)
-      {
-        return -1;
-      }
-    }
-  }
-  else
-  {
-    //
-    // We haven't flushed the ZLIB compression
-    // buffer, so user will have to call proxy
-    // transport's flush explicitly.
-    //
-
-    flush_ += diffTotalIn;
-  }
-
-  //
-  // We either wrote the data or added it to the
-  // write buffer. It's convenient to update the
-  // counters at this stage to get the current
-  // bitrate earlier.
-  //
-
-  statistics -> addCompressedBytes(diffTotalIn, diffTotalOut);
-
-  statistics -> addBytesOut(diffTotalOut);
-
-  statistics -> updateBitrate(diffTotalOut);
-
-  FlushCallback(diffTotalOut);
-
-  #ifdef TEST
-  *logofs << "ProxyTransport: Write buffer for proxy FD#" << fd_
-          << " has data for " << w_buffer_.length_ << " bytes.\n"
-          << logofs_flush;
-
-  *logofs << "ProxyTransport: Start is " << w_buffer_.start_ 
-          << " length is " << w_buffer_.length_ << " flush is "
-          << flush_ << " size is " << w_buffer_.data_.size()
-          << " capacity is " << w_buffer_.data_.capacity()
-          << ".\n" << logofs_flush;
-  #endif
-
-  return size;
-}
-
-//
-// Write data to its file descriptor.
-//
-
-int ProxyTransport::flush()
-{
-  //
-  // If there is no compression or we already compressed
-  // outgoing data and just need to write it to socket
-  // because of previous incomplete writes then revert
-  // to plain socket management.
-  //
-
-  if (flush_ == 0 || control -> LocalStreamCompression == 0)
-  {
-    int result = Transport::flush();
-
-    if (result < 0)
-    {
-      return -1;
-    }
-
-    return result;
-  }
-
-  #ifdef DEBUG
-  *logofs << "ProxyTransport: Going to flush compression on "
-          << "proxy FD#" << fd_ << ".\n" << logofs_flush;
-  #endif
-
-  #ifdef TEST
-  *logofs << "ProxyTransport: Flush counter for proxy FD#" << fd_
-          << " is " << flush_ << " bytes.\n" << logofs_flush;
-  #endif
-
-  //
-  // Flush ZLIB stream into the write buffer.
-  //
-
-  int saveTotalIn  = w_stream_.total_in;
-  int saveTotalOut = w_stream_.total_out;
-
-  int oldTotalIn  = saveTotalIn;
-  int oldTotalOut = saveTotalOut;
-
-  int diffTotalOut;
-  int diffTotalIn;
-
-  #ifdef INSPECT
-  *logofs << "ProxyTransport: oldTotalIn = " << oldTotalIn
-          << ".\n" << logofs_flush;
-  #endif
-
-  #ifdef INSPECT
-  *logofs << "ProxyTransport: oldTotalOut = " << oldTotalOut
-          << ".\n" << logofs_flush;
-  #endif
-
-  w_stream_.next_in  = w_buffer_.data_.begin() + w_buffer_.start_ + w_buffer_.length_;
-  w_stream_.avail_in = 0;
-
-  //
-  // Let ZLIB use all the space already
-  // available in the buffer.
-  //
-
-  unsigned int newAvailOut = w_buffer_.data_.size() - w_buffer_.start_ -
-                                 w_buffer_.length_;
-
-  #ifdef DEBUG
-  *logofs << "ProxyTransport: Initial flush buffer is "
-          << newAvailOut << " bytes.\n" << logofs_flush;
-  #endif
-
-  for (;;)
-  {
-    #ifdef INSPECT
-    *logofs << "\nProxyTransport: Running the flush loop.\n"
-            << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: w_buffer_.length_ = "
-            << w_buffer_.length_ << ".\n"
-            << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: w_buffer_.data_.size() = "
-            << w_buffer_.data_.size() << ".\n"
-            << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: newAvailOut = "
-            << newAvailOut << ".\n"
-            << logofs_flush;
-    #endif
-
-    if (resize(w_buffer_, newAvailOut) < 0)
-    {
-      return -1;
-    }
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: w_buffer_.data_.size() = "
-            << w_buffer_.data_.size() << ".\n"
-            << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: w_stream_.next_in = "
-            << (void *) w_stream_.next_in << ".\n"
-            << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: w_stream_.avail_in = "
-            << w_stream_.avail_in << ".\n"
-            << logofs_flush;
-    #endif
-
-    w_stream_.next_out  = w_buffer_.data_.begin() + w_buffer_.start_ +
-                              w_buffer_.length_;
-
-    w_stream_.avail_out = newAvailOut;
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: w_stream_.next_out = "
-            << (void *) w_stream_.next_out << ".\n"
-            << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: w_stream_.avail_out = "
-            << w_stream_.avail_out << ".\n"
-            << logofs_flush;
-    #endif
-
-    int result = deflate(&w_stream_, Z_SYNC_FLUSH);
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: Called deflate() result is "
-            << result << ".\n" << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: w_stream_.avail_in = "
-            << w_stream_.avail_in << ".\n"
-            << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: w_stream_.avail_out = "
-            << w_stream_.avail_out << ".\n"
-            << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: w_stream_.total_in = "
-            << w_stream_.total_in << ".\n"
-            << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: w_stream_.total_out = "
-            << w_stream_.total_out << ".\n"
-            << logofs_flush;
-    #endif
-
-    diffTotalOut = w_stream_.total_out - oldTotalOut;
-    diffTotalIn  = w_stream_.total_in  - oldTotalIn;
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: diffTotalIn = "
-            << diffTotalIn << ".\n"
-            << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: diffTotalOut = "
-            << diffTotalOut << ".\n"
-            << logofs_flush;
-    #endif
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: w_buffer_.length_ = "
-            << w_buffer_.length_ << ".\n"
-            << logofs_flush;
-    #endif
-
-    w_buffer_.length_ += diffTotalOut;
-
-    #ifdef INSPECT
-    *logofs << "ProxyTransport: w_buffer_.length_ = "
-            << w_buffer_.length_ << ".\n"
-            << logofs_flush;
-    #endif
-
-    oldTotalOut = w_stream_.total_out;
-    oldTotalIn  = w_stream_.total_in;
-
-    if (result == Z_OK)
-    {
-      if (w_stream_.avail_in == 0 && w_stream_.avail_out > 0)
-      {
-        break;
-      }
-    }
-    else if (result == Z_BUF_ERROR && w_stream_.avail_out > 0 &&
-                 w_stream_.avail_in == 0)
-    {
-      #ifdef TEST
-      *logofs << "ProxyTransport: WARNING! Raised Z_BUF_ERROR flushing data.\n"
-              << logofs_flush;
-      #endif
-
-      break;
-    }
-    else
-    {
-      #ifdef PANIC
-      *logofs << "ProxyTransport: PANIC! Flush of compressed data failed. "
-              << "Error is '" << zError(result) << "'.\n"
-              << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Flush of compressed data failed. Error is '"
-           << zError(result) << "'.\n";
-
-      finish();
-
-      return -1;
-    }
-
-    //
-    // Add more bytes to the buffer.
-    //
-
-    if (newAvailOut < thresholdSize_)
-    {
-      newAvailOut = thresholdSize_;
-    }
-
-    #ifdef TEST
-    *logofs << "ProxyTransport: Need to add " << newAvailOut
-            << " bytes to the compress buffer in flush.\n"
-            << logofs_flush;
-    #endif
-  }
-
-  diffTotalIn  = w_stream_.total_in  - saveTotalIn;
-  diffTotalOut = w_stream_.total_out - saveTotalOut;
-
-  #ifdef TEST
-  *logofs << "ProxyTransport: Compressed flush data from "
-          << diffTotalIn << " to " << diffTotalOut
-          << " bytes.\n" << logofs_flush;
-  #endif
-
-  //
-  // Time to move data from the write
-  // buffer to the real link. 
-  //
-
-  #ifdef DEBUG
-  *logofs << "ProxyTransport: Reset flush counter for proxy FD#"
-          << fd_ << ".\n" << logofs_flush;
-  #endif
-
-  flush_ = 0;
-
-  #ifdef TEST
-  *logofs << "ProxyTransport: Write buffer for proxy FD#" << fd_
-          << " has data for " << w_buffer_.length_ << " bytes.\n"
-          << logofs_flush;
-
-  *logofs << "ProxyTransport: Start is " << w_buffer_.start_ 
-          << " length is " << w_buffer_.length_ << " flush is "
-          << flush_ << " size is " << w_buffer_.data_.size()
-          << " capacity is " << w_buffer_.data_.capacity()
-          << ".\n" << logofs_flush;
-  #endif
-
-  int result = Transport::flush();
-
-  if (result < 0)
-  {
-    return -1;
-  }
-
-  //
-  // Update all the counters.
-  //
-
-  statistics -> addCompressedBytes(diffTotalIn, diffTotalOut);
-
-  statistics -> addBytesOut(diffTotalOut);
-
-  statistics -> updateBitrate(diffTotalOut);
-
-  FlushCallback(diffTotalOut);
-
-  return result;
-}
-
-unsigned int ProxyTransport::getPending(unsigned char *&data)
-{
-  //
-  // Return a pointer to the data in the
-  // read buffer. It is up to the caller
-  // to ensure that the data is consumed
-  // before the read buffer is reused.
-  //
-
-  if (r_buffer_.length_ > 0)
-  {
-    unsigned int size = r_buffer_.length_;
-
-    data = r_buffer_.data_.begin() + r_buffer_.start_;
-
-    #ifdef DEBUG
-    *logofs << "ProxyTransport: Returning " << size
-            << " pending bytes from proxy FD#" << fd_
-            << ".\n" << logofs_flush;
-    #endif
-
-    r_buffer_.length_ = 0;
-    r_buffer_.start_  = 0;
-
-    //
-    // Prevent the deletion of the buffer.
-    //
-
-    owner_ = 0;
-
-    return size;
-  }
-
-  #ifdef TEST
-  *logofs << "ProxyTransport: WARNING! No pending data "
-          << "for proxy FD#" << fd_ << ".\n"
-          << logofs_flush;
-  #endif
-
-  data = NULL;
-
-  return 0;
-}
-
-void ProxyTransport::fullReset()
-{
-  blocked_ = 0;
-  finish_  = 0;
-  flush_   = 0;
-
-  if (control -> RemoteStreamCompression)
-  {
-    inflateReset(&r_stream_);
-  }
-
-  if (control -> LocalStreamCompression)
-  {
-    deflateReset(&w_stream_);
-  }
-
-  if (owner_ == 1)
-  {
-    Transport::fullReset(r_buffer_);
-  }
-
-  Transport::fullReset(w_buffer_);
-}
-
-AgentTransport::AgentTransport(int fd) : Transport(fd)
-{
-  #ifdef TEST
-  *logofs << "AgentTransport: Going to create agent transport "
-          << "for FD#" << fd_ << ".\n" << logofs_flush;
-  #endif
-
-  type_ = transport_agent;
-
-  //
-  // Set up the read buffer.
-  //
-
-  r_buffer_.length_ = 0;
-  r_buffer_.start_  = 0;
-
-  r_buffer_.data_.resize(initialSize_);
-
-  //
-  // For now we own the buffer.
-  //
-
-  owner_ = 1;
-
-  //
-  // Set up the mutexes.
-  //
-
-  #ifdef THREADS
-
-  pthread_mutexattr_t m_attributes;
-
-  pthread_mutexattr_init(&m_attributes);
-
-  //
-  // Interfaces in pthread to handle mutex
-  // type do not work in current version. 
-  //
-
-  m_attributes.__mutexkind = PTHREAD_MUTEX_ERRORCHECK_NP;
-
-  if (pthread_mutex_init(&m_read_, &m_attributes) != 0)
-  {
-    #ifdef TEST
-    *logofs << "AgentTransport: Child: Creation of read mutex failed. "
-            << "Error is " << EGET() << " '" << ESTR()
-            << "'.\n" << logofs_flush;
-    #endif
-  }
-
-  if (pthread_mutex_init(&m_write_, &m_attributes) != 0)
-  {
-    #ifdef TEST
-    *logofs << "AgentTransport: Child: Creation of write mutex failed. "
-            << "Error is " << EGET() << " '" << ESTR()
-            << "'.\n" << logofs_flush;
-    #endif
-  }
-
-  #endif
-
-  #ifdef REFERENCES
-  *logofs << "AgentTransport: Child: Created new object at " 
-          << this << " out of " << ++references_ 
-          << " allocated references.\n" << logofs_flush;
-  #endif
-}
-
-AgentTransport::~AgentTransport()
-{
-  #ifdef TEST
-  *logofs << "AgentTransport: Going to destroy derived class "
-          << "for FD#" << fd_ << ".\n" << logofs_flush;
-  #endif
-
-  //
-  // Unlock and free all mutexes.
-  //
-
-  #ifdef THREADS
-
-  pthread_mutex_unlock(&m_read_);
-  pthread_mutex_unlock(&m_write_);
-
-  pthread_mutex_destroy(&m_read_);
-  pthread_mutex_destroy(&m_write_);
-
-  #endif
-
-  #ifdef REFERENCES
-  *logofs << "AgentTransport: Child: Deleted object at " 
-          << this << " out of " << --references_ 
-          << " allocated references.\n" << logofs_flush;
-  #endif
-}
-
-//
-// Read data enqueued by the other thread.
-//
-
-int AgentTransport::read(unsigned char *data, unsigned int size)
-{
-  #ifdef THREADS
-
-  lockRead();
-
-  #endif
-
-  #ifdef DEBUG
-  *logofs << "AgentTransport: Child: Going to read " << size
-          << " bytes from " << "FD#" << fd_ << ".\n"
-          << logofs_flush;
-  #endif
-
-  int copied = -1;
-
-  if (r_buffer_.length_ > 0)
-  {
-    if ((int) size < r_buffer_.length_)
-    {
-      #ifdef TEST
-      *logofs << "AgentTransport: WARNING! Forcing a retry with "
-              << r_buffer_.length_ << " bytes pending and "
-              << size << " in the buffer.\n"
-              << logofs_flush;
-      #endif
-
-      ESET(EAGAIN);
-    }
-    else
-    {
-      copied = (r_buffer_.length_ > ((int) size) ?
-                    ((int) size) : r_buffer_.length_);
-
-      memcpy(data, r_buffer_.data_.begin() + r_buffer_.start_, copied);
-
-      //
-      // Update the buffer status.
-      //
-
-      #ifdef TEST
-      *logofs << "AgentTransport: Child: Going to immediately return "
-              << copied << " bytes from FD#" << fd_ << ".\n"
-              << logofs_flush;
-      #endif
-
-      #ifdef DUMP
-
-      *logofs << "AgentTransport: Child: Dumping content of read data.\n"
-              << logofs_flush;
-
-      DumpData(data, copied);
-
-      #endif
-
-      r_buffer_.length_ -= copied;
-
-      if (r_buffer_.length_ == 0)
-      {
-        r_buffer_.start_ = 0;
-      }
-      else
-      {
-        r_buffer_.start_ += copied;
-
-        #ifdef TEST
-        *logofs << "AgentTransport: Child: There are still "
-                << r_buffer_.length_  << " bytes in read buffer for "
-                << "FD#" << fd_ << ".\n" << logofs_flush;
-        #endif
-      }
-    }
-  }
-  else
-  {
-    #ifdef DEBUG
-    *logofs << "AgentTransport: Child: No data can be got "
-            << "from read buffer for FD#" << fd_ << ".\n"
-            << logofs_flush;
-    #endif
-
-    ESET(EAGAIN);
-  }
-
-  #ifdef THREADS
-
-  unlockRead();
-
-  #endif
-
-  return copied;
-}
-
-//
-// Write data to buffer so that the other
-// thread can get it.
-//
-
-int AgentTransport::write(T_write type, const unsigned char *data, const unsigned int size)
-{
-  #ifdef THREADS
-
-  lockWrite();
-
-  #endif
-
-  //
-  // Just append data to socket's write buffer.
-  // Note that we don't care if buffer exceeds
-  // the size limits set for this type of
-  // transport.
-  //
-
-  #ifdef TEST
-  *logofs << "AgentTransport: Child: Going to append " << size
-          << " bytes to write buffer for " << "FD#" << fd_
-          << ".\n" << logofs_flush;
-  #endif
-
-  int copied = -1;
-
-  if (resize(w_buffer_, size) < 0)
-  {
-    finish();
-
-    ESET(EPIPE);
-  }
-  else
-  {
-    memmove(w_buffer_.data_.begin() + w_buffer_.start_ + w_buffer_.length_, data, size);
-
-    w_buffer_.length_ += size;
-
-    #ifdef DUMP
-
-    *logofs << "AgentTransport: Child: Dumping content of written data.\n"
-            << logofs_flush;
-
-    DumpData(data, size);
-
-    #endif
-
-    #ifdef TEST
-    *logofs << "AgentTransport: Child: Write buffer for FD#" << fd_
-            << " has data for " << w_buffer_.length_ << " bytes.\n"
-            << logofs_flush;
-
-    *logofs << "AgentTransport: Child: Start is " << w_buffer_.start_ 
-            << " length is " << w_buffer_.length_ << " size is "
-            << w_buffer_.data_.size() << " capacity is "
-            << w_buffer_.data_.capacity() << ".\n"
-            << logofs_flush;
-    #endif
-
-    copied = size;
-  }
-
-  //
-  // Let child access again the read buffer.
-  //
-
-  #ifdef THREADS
-
-  unlockWrite();
-
-  #endif
-
-  return copied;
-}
-
-int AgentTransport::flush()
-{
-  //
-  // In case of memory-to-memory transport
-  // this function should never be called.
-  //
-
-  #ifdef PANIC
-  *logofs << "AgentTransport: Child: PANIC! Called flush() for "
-          << "memory to memory transport on " << "FD#"
-          << fd_ << ".\n" << logofs_flush;
-  #endif
-
-  cerr << "Error" << ": Called flush() for "
-       << "memory to memory transport on " << "FD#"
-       << fd_ << ".\n";
-
-  HandleAbort();
-}
-
-int AgentTransport::drain(int limit, int timeout)
-{
-  //
-  // We can't drain the channel in the case
-  // of the memory-to-memory transport. Data
-  // is enqueued for the agent to read but
-  // the agent could require multiple loops
-  // to read it all.
-  //
-
-  //
-  // In case of memory-to-memory transport
-  // this function should never be called.
-  //
-
-  #ifdef PANIC
-  *logofs << "AgentTransport: Child: PANIC! Called drain() for "
-          << "memory to memory transport on " << "FD#"
-          << fd_ << ".\n" << logofs_flush;
-  #endif
-
-  cerr << "Error" << ": Called drain() for "
-       << "memory to memory transport on " << "FD#"
-       << fd_ << ".\n";
-
-  HandleAbort();
-}
-
-unsigned int AgentTransport::getPending(unsigned char *&data)
-{
-  #ifdef THREADS
-
-  lockRead();
-
-  #endif
-
-  if (r_buffer_.length_ > 0)
-  {
-    unsigned int size = r_buffer_.length_;
-
-    data = r_buffer_.data_.begin() + r_buffer_.start_;
-
-    #ifdef DEBUG
-    *logofs << "AgentTransport: Child: Returning " << size
-            << " pending bytes from FD#" << fd_
-            << ".\n" << logofs_flush;
-    #endif
-
-    r_buffer_.length_ = 0;
-    r_buffer_.start_  = 0;
-
-    #ifdef THREADS
-
-    unlockRead();
-
-    #endif
-
-    //
-    // Prevent the deletion of the buffer.
-    //
-
-    owner_ = 0;
-
-    return size;
-  }
-
-  #ifdef TEST
-  *logofs << "AgentTransport: WARNING! No pending data "
-          << "for FD#" << fd_ << ".\n" << logofs_flush;
-  #endif
-
-  #ifdef THREADS
-
-  unlockRead();
-
-  #endif
-
-  data = NULL;
-
-  return 0;
-}
-
-void AgentTransport::fullReset()
-{
-  #ifdef THREADS
-
-  lockRead();
-  lockWrite();
-
-  #endif
-
-  #ifdef TEST
-  *logofs << "AgentTransport: Child: Resetting transport "
-          << "for FD#" << fd_ << ".\n" << logofs_flush;
-  #endif
-
-  blocked_ = 0;
-  finish_  = 0;
-
-  if (owner_ == 1)
-  {
-    Transport::fullReset(r_buffer_);
-  }
-
-  Transport::fullReset(w_buffer_);
-}
-
-int AgentTransport::enqueue(const char *data, const int size)
-{
-  #ifdef THREADS
-
-  lockRead();
-
-  #endif
-
-  if (finish_ == 1)
-  {
-    #if defined(PARENT) && defined(TEST)
-    *logofs << "AgentTransport: Parent: Returning EPIPE in "
-            << "write for finishing FD#" << fd_ << ".\n"
-           << logofs_flush;
-    #endif
-
-    ESET(EPIPE);
-
-    return -1;
-  }
-
-  //
-  // Always allow the agent to write
-  // all its data.
-  //
-
-  int toPut = size;
-
-  #if defined(PARENT) && defined(TEST)
-  *logofs << "AgentTransport: Parent: Going to put " << toPut
-          << " bytes into read buffer for FD#" << fd_
-          << ". Buffer length is " << r_buffer_.length_
-          << ".\n" << logofs_flush;
-  #endif
-
-  if (resize(r_buffer_, toPut) < 0)
-  {
-    finish();
-
-    #ifdef THREADS
-
-    unlockRead();
-
-    #endif
-
-    return -1;
-  }
-
-  memcpy(r_buffer_.data_.begin() + r_buffer_.start_ + r_buffer_.length_, data, toPut);
-
-  r_buffer_.length_ += toPut;
-
-  #if defined(DUMP) && defined(PARENT)
-
-  *logofs << "AgentTransport: Parent: Dumping content of enqueued data.\n"
-          << logofs_flush;
-
-  DumpData((const unsigned char *) data, toPut);
-
-  #endif
-
-  #if defined(PARENT) && defined(TEST)
-  *logofs << "AgentTransport: Parent: Read buffer for FD#" << fd_
-          << " has now data for " << r_buffer_.length_
-          << " bytes.\n" << logofs_flush;
-
-  *logofs << "AgentTransport: Parent: Start is " << r_buffer_.start_ 
-          << " length is " << r_buffer_.length_ << " size is "
-          << r_buffer_.data_.size() << " capacity is "
-          << r_buffer_.data_.capacity() << ".\n"
-          << logofs_flush;
-  #endif
-
-  #ifdef THREADS
-
-  unlockRead();
-
-  #endif
-
-  return toPut;
-}
-
-int AgentTransport::dequeue(char *data, int size)
-{
-  #ifdef THREADS
-
-  lockWrite();
-
-  #endif
-
-  if (w_buffer_.length_ == 0)
-  {
-    if (finish_ == 1)
-    {
-      #if defined(PARENT) && defined(TEST)
-      *logofs << "AgentTransport: Parent: Returning 0 in read "
-              << "for finishing FD#" << fd_ << ".\n"
-              << logofs_flush;
-      #endif
-
-      return 0;
-    }
-
-    #if defined(PARENT) && defined(TEST)
-    *logofs << "AgentTransport: Parent: No data can be read "
-            << "from write buffer for FD#" << fd_ << ".\n"
-            << logofs_flush;
-    #endif
-
-    ESET(EAGAIN);
-
-    #ifdef THREADS
-
-    unlockWrite();
-
-    #endif
-
-    return -1;
-  }
-
-  //
-  // Return as many bytes as possible.
-  //
-
-  int toGet = ((int) size > w_buffer_.length_ ? w_buffer_.length_ : size);
-
-  #if defined(PARENT) && defined(TEST)
-  *logofs << "AgentTransport: Parent: Going to get " << toGet
-          << " bytes from write buffer for FD#" << fd_ << ".\n"
-          << logofs_flush;
-  #endif
-
-  memcpy(data, w_buffer_.data_.begin() + w_buffer_.start_, toGet);
-
-  w_buffer_.start_  += toGet;
-  w_buffer_.length_ -= toGet;
-
-  #if defined(DUMP) && defined(PARENT)
-
-  *logofs << "AgentTransport: Parent: Dumping content of dequeued data.\n"
-          << logofs_flush;
-
-  DumpData((const unsigned char *) data, toGet);
-
-  #endif
-
-  #if defined(PARENT) && defined(TEST)
-  *logofs << "AgentTransport: Parent: Write buffer for FD#" << fd_
-          << " has now data for " << length() << " bytes.\n"
-          << logofs_flush;
-
-  *logofs << "AgentTransport: Parent: Start is " << w_buffer_.start_ 
-          << " length is " << w_buffer_.length_ << " size is "
-          << w_buffer_.data_.size() << " capacity is "
-          << w_buffer_.data_.capacity() << ".\n"
-          << logofs_flush;
-  #endif
-
-  #ifdef THREADS
-
-  unlockWrite();
-
-  #endif
-
-  return toGet;
-}
-
-int AgentTransport::dequeuable()
-{
-  if (finish_ == 1)
-  {
-    #if defined(PARENT) && defined(TEST)
-    *logofs << "AgentTransport: Parent: Returning EPIPE in "
-            << "readable for finishing FD#" << fd_
-            << ".\n" << logofs_flush;
-    #endif
-
-    ESET(EPIPE);
-
-    return -1;
-  }
-
-  #if defined(PARENT) && defined(TEST)
-  *logofs << "AgentTransport: Parent: Returning "
-          << w_buffer_.length_ << " as data readable "
-          << "from read buffer for FD#" << fd_ << ".\n"
-          << logofs_flush;
-  #endif
-
-  return w_buffer_.length_;
-}
-
-#ifdef THREADS
-
-int AgentTransport::lockRead()
-{
-  for (;;)
-  {
-    int result = pthread_mutex_lock(&m_read_);
-
-    if (result == 0)
-    {
-      #ifdef DEBUG
-      *logofs << "AgentTransport: Read mutex locked by thread id "
-              << pthread_self() << ".\n" << logofs_flush;
-      #endif
-
-      return 0;
-    }
-    else if (EGET() == EINTR)
-    {
-      continue;
-    }
-    else
-    {
-      #ifdef WARNING
-      *logofs << "AgentTransport: WARNING! Locking of read mutex by thread id "
-              << pthread_self() << " returned " << result << ". Error is '"
-              << ESTR() << "'.\n" << logofs_flush;
-      #endif
-
-      return result;
-    }
-  }
-}
-
-int AgentTransport::lockWrite()
-{
-  for (;;)
-  {
-    int result = pthread_mutex_lock(&m_write_);
-
-    if (result == 0)
-    {
-      #ifdef DEBUG
-      *logofs << "AgentTransport: Write mutex locked by thread id "
-              << pthread_self() << ".\n" << logofs_flush;
-      #endif
-
-      return 0;
-    }
-    else if (EGET() == EINTR)
-    {
-      continue;
-    }
-    else
-    {
-      #ifdef WARNING
-      *logofs << "AgentTransport: WARNING! Locking of write mutex by thread id "
-              << pthread_self() << " returned " << result << ". Error is '"
-              << ESTR() << "'.\n" << logofs_flush;
-      #endif
-
-      return result;
-    }
-  }
-}
-
-int AgentTransport::unlockRead()
-{
-  for (;;)
-  {
-    int result = pthread_mutex_unlock(&m_read_);
-
-    if (result == 0)
-    {
-      #ifdef DEBUG
-      *logofs << "AgentTransport: Read mutex unlocked by thread id "
-              << pthread_self() << ".\n" << logofs_flush;
-      #endif
-
-      return 0;
-    }
-    else if (EGET() == EINTR)
-    {
-      continue;
-    }
-    else
-    {
-      #ifdef WARNING
-      *logofs << "AgentTransport: WARNING! Unlocking of read mutex by thread id "
-              << pthread_self() << " returned " << result << ". Error is '"
-              << ESTR() << "'.\n" << logofs_flush;
-      #endif
-
-      return result;
-    }
-  }
-}
-
-int AgentTransport::unlockWrite()
-{
-  for (;;)
-  {
-    int result = pthread_mutex_unlock(&m_write_);
-
-    if (result == 0)
-    {
-      #ifdef DEBUG
-      *logofs << "AgentTransport: Write mutex unlocked by thread id "
-              << pthread_self() << ".\n" << logofs_flush;
-      #endif
-
-      return 0;
-    }
-    else if (EGET() == EINTR)
-    {
-      continue;
-    }
-    else
-    {
-      #ifdef WARNING
-      *logofs << "AgentTransport: WARNING! Unlocking of write mutex by thread id "
-              << pthread_self() << " returned " << result << ". Error is '"
-              << ESTR() << "'.\n" << logofs_flush;
-      #endif
-
-      return result;
-    }
-  }
-}
-
-#endif
diff --git a/nxcomp/Transport.h b/nxcomp/Transport.h
deleted file mode 100644
index 047396af6..000000000
--- a/nxcomp/Transport.h
+++ /dev/null
@@ -1,577 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef Transport_H
-#define Transport_H
-
-#include <zlib.h>
-#include <errno.h>
-
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include "Misc.h"
-#include "Control.h"
-
-#include "Types.h"
-#include "Timestamp.h"
-#include "Socket.h"
-
-//
-// Set the verbosity level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-//
-// Define this to lock and unlock the
-// memory-to-memory transport buffers
-// before they are accessed. The code
-// is outdated and doesn't work with
-// the current pthread library.
-//
-
-#undef  THREADS
-
-//
-// Define this to know when a socket
-// is created or destroyed.
-//
-
-#undef  REFERENCES
-
-//
-// Size of buffer if not set by user.
-//
-
-#define TRANSPORT_BUFFER_DEFAULT_SIZE         16384
-
-//
-// Type of transport.
-//
-
-typedef enum
-{
-  transport_base,
-  transport_proxy,
-  transport_agent,
-  transport_last_tag
-
-} T_transport_type;
-
-//
-// This class handles the buffered I/O on
-// the network sockets.
-//
-
-//
-// TODO: This class is useful but adds a lot of
-// overhead. There are many improvements we can
-// make here:
-//
-// - There should be a generic Buffer class, ac-
-//   comodating a list of memory buffers. This
-//   would enable the use of the readv() and
-//   writev() functions to perform the I/O on
-//   the socket.
-//
-// - The buffering should be moved to the Write-
-//   Buffer and ReadBuffer classes. By performing
-//   the buffering here and there, we are dupli-
-//   cating a lot of code and are adding a lot
-//   of useless memory copies.
-//
-// - Stream compression should be removed. The
-//   proxy should compress the frames based on
-//   the type and should include the length of
-//   the decompressed data in the header of the
-//   packet. Besides avoiding the compression
-//   of packets that cannot be reduced in size,
-//   we would also save the additional memory
-//   allocations due to the fact that we don't
-//   know the size of the decode buffer at the
-//   time we read the packet from the network.
-//
-// - The other utilities implemented here, like
-//   the functions forcing a write on the socket
-//   or waiting for more data to become available
-//   should be moved to the Proxy or the Channel
-//   classes.
-//
-
-class Transport
-{
-  public:
-
-  //
-  // Member functions.
-  //
-
-  Transport(int fd);
-
-  virtual ~Transport();
-
-  int fd() const
-  {
-    return fd_;
-  }
-
-  T_transport_type getType()
-  {
-    return type_;
-  }
-
-  //
-  // Virtual members redefined by proxy
-  // and 'memory-to-memory' I/O layers.
-  //
-
-  virtual int read(unsigned char *data, unsigned int size);
-
-  virtual int write(T_write type, const unsigned char *data, const unsigned int size);
-
-  virtual int flush();
-
-  virtual int drain(int limit, int timeout);
-
-  virtual void finish()
-  {
-    fullReset();
-
-    finish_ = 1;
-  }
-
-  virtual int length() const
-  {
-    return w_buffer_.length_;
-  }
-
-  virtual int pending() const
-  {
-    return 0;
-  }
-
-  virtual int readable() const
-  {
-    return GetBytesReadable(fd_);
-  }
-
-  virtual int writable() const
-  {
-    return GetBytesWritable(fd_);
-  }
-
-  virtual int queued() const
-  {
-    return GetBytesQueued(fd_);
-  }
-
-  virtual int flushable() const
-  {
-    return 0;
-  }
-
-  virtual int wait(int timeout) const;
-
-  void setSize(unsigned int initialSize,
-                   unsigned int thresholdSize,
-                       unsigned int maximumSize);
-
-  //
-  // Return a pointer to the data
-  // in the read buffer.
-  //
-
-  virtual unsigned int getPending(unsigned char *&data)
-  {
-    data = NULL;
-
-    return 0;
-  }
-
-  virtual void pendingReset()
-  {
-  }
-
-  virtual void partialReset()
-  {
-    partialReset(w_buffer_);
-  }
-
-  virtual void fullReset();
-
-  int blocked() const
-  {
-    return blocked_;
-  }
-
-  protected:
-
-  //
-  // Make room in the buffer to accommodate
-  // at least size bytes.
-  //
-
-  int resize(T_buffer &buffer, const int &size);
-
-  void partialReset(T_buffer &buffer)
-  {
-    if (buffer.length_ == 0 &&
-            (buffer.data_.size() > initialSize_ ||
-                 buffer.data_.capacity() > initialSize_))
-    {
-      fullReset(buffer);
-    }
-  }
-
-  void fullReset(T_buffer &buffer);
-
-  //
-  // Data members.
-  //
-
-  int fd_;
-
-  int blocked_;
-  int finish_;
-
-  T_buffer w_buffer_;
-
-  unsigned int initialSize_;
-  unsigned int thresholdSize_;
-  unsigned int maximumSize_;
-
-  T_transport_type type_;
-
-  private:
-
-  #ifdef REFERENCES
-
-  static int references_;
-
-  #endif
-};
-
-//
-// This class handles buffered I/O and 
-// compression of the proxy stream.
-//
-
-class ProxyTransport : public Transport
-{
-  public:
-
-  ProxyTransport(int fd);
-
-  virtual ~ProxyTransport();
-
-  virtual int read(unsigned char *data, unsigned int size);
-
-  virtual int write(T_write type, const unsigned char *data, const unsigned int size);
-
-  virtual int flush();
-
-  //
-  // Same as in the base class.
-  //
-  // virtual int drain(int limit, int timeout);
-  //
-  // virtual void finish();
-  //
-
-  //
-  // Same as in the base class.
-  //
-  // virtual int length() const
-  //
-
-  virtual int pending() const
-  {
-    return r_buffer_.length_;
-  }
-
-  //
-  // Same as in the base class.
-  //
-  // virtual int readable() const;
-  //
-  // virtual int writable() const;
-  //
-  // virtual int queued() const;
-  //
-
-  virtual int flushable() const
-  {
-    return flush_;
-  }
-
-  //
-  // Same as in the base class, but
-  // should not be called.
-  //
-  // int drained() const;
-  //
-  // Same as in the base class.
-  //
-  // virtual int wait(int timeout) const;
-  //
-  // Same as in the base class.
-  //
-  // void setSize(unsigned int initialSize,
-  //                  unsigned int thresholdSize,
-  //                      unsigned int maximumSize);
-  //
-
-  virtual unsigned int getPending(unsigned char *&data);
-
-  virtual void pendingReset()
-  {
-    owner_ = 1;
-  }
-
-  virtual void partialReset()
-  {
-    if (owner_ == 1)
-    {
-      Transport::partialReset(r_buffer_);
-    }
-
-    Transport::partialReset(w_buffer_);
-  }
-
-  virtual void fullReset();
-
-  //
-  // Same as in the base class.
-  //
-  // int blocked() const;
-  //
-
-  protected:
-
-  int flush_;
-  int owner_;
-
-  T_buffer r_buffer_;
-
-  z_stream r_stream_;
-  z_stream w_stream_;
-
-  private:
-
-  #ifdef REFERENCES
-
-  static int references_;
-
-  #endif
-};
-
-//
-// Handle memory-to-memory data transfers between
-// an agent and the proxy.
-//
-
-class AgentTransport : public Transport
-{
-  public:
-
-  AgentTransport(int fd);
-
-  virtual ~AgentTransport();
-
-  virtual int read(unsigned char *data, unsigned int size);
-
-  virtual int write(T_write type, const unsigned char *data, const unsigned int size);
-
-  //
-  // These two should never be called.
-  //
-
-  virtual int flush();
-
-  virtual int drain(int limit, int timeout);
-
-  //
-  // Same as in the base class.
-  //
-  // virtual void finish();
-  //
-
-  //
-  // Same as in the base class.
-  //
-  // virtual int length() const
-  //
-
-  virtual int pending() const
-  {
-    return r_buffer_.length_;
-  }
-
-  //
-  // These are intended to operate only
-  // on the internal buffers.
-  //
-
-  virtual int readable() const
-  {
-    return r_buffer_.length_;
-  }
-
-  virtual int writable() const
-  {
-    return control -> TransportMaximumBufferSize;
-  }
-
-  virtual int queued() const
-  {
-    return 0;
-  }
-
-  //
-  // Same as in the base class.
-  //
-  // virtual int flushable() const;
-  //
-  // Same as in the base class, but
-  // should not be called.
-  //
-  // int drained() const;
-  //
-
-  //
-  // Return immediately or will
-  // block until the timeout.
-  //
-
-  virtual int wait(int timeout) const
-  {
-    return 0;
-  }
-
-  //
-  // Same as in the base class.
-  //
-  // void setSize(unsigned int initialSize,
-  //                  unsigned int thresholdSize,
-  //                      unsigned int maximumSize);
-  //
-
-  virtual unsigned int getPending(unsigned char *&data);
-
-  virtual void pendingReset()
-  {
-    owner_ = 1;
-  }
-
-  virtual void partialReset()
-  {
-    if (owner_ == 1)
-    {
-      Transport::partialReset(r_buffer_);
-    }
-
-    Transport::partialReset(w_buffer_);
-  }
-
-  virtual void fullReset();
-
-  //
-  // Same as in the base class.
-  //
-  // int blocked() const;
-  //
-
-  //
-  // The following are specific of the
-  // memory-to-memory transport.
-  //
-
-  int enqueue(const char *data, const int size);
-
-  int dequeue(char *data, int size);
-
-  int queuable()
-  {
-    //
-    // Always allow the agent to enqueue
-    // more data.
-    //
-
-    return control -> TransportMaximumBufferSize;
-  }
-
-  int dequeuable();
-
-  protected:
-
-  //
-  // Lock the buffer to handle reads and
-  // writes safely.
-  //
-
-  #ifdef THREADS
-
-  int lockRead();
-  int lockWrite();
-
-  int unlockRead();
-  int unlockWrite();
-
-  #endif
-
-  //
-  // Data members.
-  //
-
-  int owner_;
-
-  T_buffer r_buffer_;
-
-  //
-  // Mutexes for safe read and write.
-  //
-
-  #ifdef THREADS
-
-  pthread_mutex_t m_read_;
-  pthread_mutex_t m_write_;
-
-  #endif
-
-  private:
-
-  #ifdef REFERENCES
-
-  static int references_;
-
-  #endif
-};
-
-#endif /* Transport_H */
diff --git a/nxcomp/Types.h b/nxcomp/Types.h
deleted file mode 100644
index e82664c81..000000000
--- a/nxcomp/Types.h
+++ /dev/null
@@ -1,271 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef Types_H
-#define Types_H
-
-using namespace std;
-
-#include <vector>
-#include <list>
-#include <map>
-#include <set>
-
-#include "MD5.h"
-
-//
-// This is MD5 length.
-//
-
-#define MD5_LENGTH          16
-
-//
-// Types of repositories. Replace the original 
-// clear() methods from STL in order to actually 
-// free the unused memory.
-//
-
-class Message;
-
-class T_data : public vector < unsigned char >
-{
-  public:
-
-  unsigned char *begin()
-  {
-    return &*(vector < unsigned char >::begin());
-  }
-
-  const unsigned char *begin() const
-  {
-    return &*(vector < unsigned char >::begin());
-  }
-
-  // Avoid overriding clear() when using libc++. Fiddling with STL internals
-  // doesn't really seem like a good idea to me anyway.
-  #ifndef _LIBCPP_VECTOR
-  void clear()
-  {
-    #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H)
-
-    #if defined(__GLIBCPP_INTERNAL_VECTOR_H)
-
-    _Destroy(_M_start, _M_finish);
-
-    #else /* #if defined(__GLIBCPP_INTERNAL_VECTOR_H) */
-
-    destroy(_M_start, _M_finish);
-
-    #endif /* #if defined(__GLIBCPP_INTERNAL_VECTOR_H) */
-
-    _M_deallocate(_M_start, _M_end_of_storage - _M_start);
-
-    _M_start = _M_finish = _M_end_of_storage = 0;
-
-    #else /* #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) */
-
-    #if defined(_GLIBCXX_VECTOR)
-
-    _Destroy(this->_M_impl._M_start, this->_M_impl._M_finish);
-
-    _M_deallocate(this->_M_impl._M_start, this->_M_impl._M_end_of_storage - this->_M_impl._M_start);
-
-    this->_M_impl._M_start = this->_M_impl._M_finish = this->_M_impl._M_end_of_storage = 0;
-
-    #else /* #if defined(_GLIBCXX_VECTOR) */
-
-    destroy(start, finish);
-
-    deallocate();
-
-    start = finish = end_of_storage = 0;
-
-    #endif /* #if defined(_GLIBCXX_VECTOR) */
-
-    #endif  /* #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) */
-  }
-  #endif /* #ifdef _LIBCPP_VECTOR */
-};
-
-class T_messages : public vector < Message * >
-{
-  public:
-
-  // Avoid overriding clear() when using libc++. Fiddling with STL internals
-  // doesn't really seem like a good idea to me anyway.
-  #ifndef _LIBCPP_VECTOR
-  void clear()
-  {
-    #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H)
-
-    #if defined(__GLIBCPP_INTERNAL_VECTOR_H)
-
-    _Destroy(_M_start, _M_finish);
-
-    #else /* #if defined(__GLIBCPP_INTERNAL_VECTOR_H) */
-
-    destroy(_M_start, _M_finish);
-
-    #endif /* #if defined(__GLIBCPP_INTERNAL_VECTOR_H) */
-
-    _M_deallocate(_M_start, _M_end_of_storage - _M_start);
-
-    _M_start = _M_finish = _M_end_of_storage = 0;
-
-    #else /* #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) */
-
-    #if defined(_GLIBCXX_VECTOR)
-
-    _Destroy(this->_M_impl._M_start, this->_M_impl._M_finish);
-
-    _M_deallocate(this->_M_impl._M_start, this->_M_impl._M_end_of_storage - this->_M_impl._M_start);
-
-    this->_M_impl._M_start = this->_M_impl._M_finish = this->_M_impl._M_end_of_storage = 0;
-
-    #else /* #if defined(_GLIBCXX_VECTOR) */
-
-    destroy(start, finish);
-
-    deallocate();
-
-    start = finish = end_of_storage = 0;
-
-    #endif /* #if defined(_GLIBCXX_VECTOR) */
-
-    #endif /* #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) */
-  }
-  #endif /* #ifndef _LIBCPP_VECTOR */
-};
-
-typedef md5_byte_t * T_checksum;
-
-struct T_less
-{
-  bool operator()(T_checksum a, T_checksum b) const
-  {
-    return (memcmp(a, b, MD5_LENGTH) < 0);
-  }
-};
-
-typedef map < T_checksum, int, T_less > T_checksums;
-
-class Split;
-
-typedef list < Split * > T_splits;
-
-class File;
-
-struct T_older
-{
-  bool operator()(File *a, File *b) const;
-};
-
-typedef set < File *, T_older > T_files;
-
-typedef list < int > T_list;
-
-//
-// Used to accommodate data to be read and
-// written to a socket.
-//
-
-typedef struct
-{
-  T_data data_;
-  int    length_;
-  int    start_;
-}
-T_buffer;
-
-//
-// The message store operation that was
-// executed for the message. The channels
-// use these values to determine how to
-// handle the message after it has been
-// received at the decoding side.
-//
-
-// Since ProtoStep8 (#issue 108)
-enum T_store_action
-{
-  is_hit,
-  is_added,
-  is_discarded,
-  is_removed
-};
-
-// Since ProtoStep8 (#issue 108)
-#define IS_HIT is_hit
-#define IS_ADDED is_added
-
-enum T_checksum_action
-{
-  use_checksum,
-  discard_checksum
-};
-
-enum T_data_action
-{
-  use_data,
-  discard_data
-};
-
-//
-// Message is going to be weighted for
-// deletion at insert or cleanup time?
-//
-
-enum T_rating
-{
-  rating_for_insert,
-  rating_for_clean
-};
-
-//
-// How to handle the writes to the X
-// and proxy connections.
-//
-
-enum T_write
-{
-  write_immediate,
-  write_delayed
-};
-
-enum T_flush
-{
-  flush_if_needed,
-  flush_if_any
-};
-
-//
-// This is the value to indicate an
-// invalid position in the message
-// store.
-//
-
-static const int nothing = -1;
-
-#endif /* Types_H */
diff --git a/nxcomp/Unpack.cpp b/nxcomp/Unpack.cpp
deleted file mode 100644
index 50ae890b6..000000000
--- a/nxcomp/Unpack.cpp
+++ /dev/null
@@ -1,1510 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "Misc.h"
-#include "Unpack.h"
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-//
-// Used for the ZLIB decompression
-// of RGB, alpha and colormap data.
-//
-
-z_stream unpackStream;
-
-static int unpackInitialized;
-
-int Unpack8To8(const T_colormask *colormask, const unsigned char *data,
-                   unsigned char *out, unsigned char *end);
-
-int Unpack8To8(T_colormap *colormap, const unsigned char *data,
-                   unsigned char *out, unsigned char *end);
-
-int Unpack8To16(const T_colormask *colormask, const unsigned char *data,
-                    unsigned char *out, unsigned char *end);
-
-int Unpack8To16(T_colormap *colormap, const unsigned char *data,
-                    unsigned char *out, unsigned char *end);
-
-int Unpack8To24(const T_colormask *colormask, const unsigned char *data,
-                    unsigned char *out, unsigned char *end);
-
-int Unpack8To24(T_colormap *colormap, const unsigned char *data,
-                    unsigned char *out, unsigned char *end);
-
-int Unpack8To32(const T_colormask *colormask, const unsigned char *data,
-                    unsigned char *out, unsigned char *end);
-
-int Unpack8To32(T_colormap *colormap, const unsigned char *data,
-                    unsigned char *out, unsigned char *end);
-
-int Unpack15To16(const unsigned char *data, unsigned char *out,
-                     unsigned char *end);
-
-int Unpack15To24(const unsigned char *data, unsigned char *out,
-                     unsigned char *end);
-
-int Unpack15To32(const unsigned char *data, unsigned char *out,
-                     unsigned char *end);
-
-int Unpack16To16(const T_colormask *colormask, const unsigned char *data,
-                     unsigned char *out, unsigned char *end);
-
-int Unpack16To16(const unsigned char *data, unsigned char *out,
-                     unsigned char *end, int imageByteOrder);
-
-int Unpack16To24(const T_colormask *colormask, const unsigned char *data,
-                     unsigned char *out, unsigned char *end);
-
-int Unpack16To24(const unsigned char *data, unsigned char *out,
-                     unsigned char *end, int imageByteOrder);
-
-int Unpack16To32(const T_colormask *colormask, const unsigned char *data,
-                     unsigned char *out, unsigned char *end);
-
-int Unpack16To32(const unsigned char *data, unsigned char *out,
-                     unsigned char *end, int imageByteOrder);
-
-int Unpack24To24(const T_colormask *colormask, const unsigned char *data,
-                     unsigned char *out, unsigned char *end);
-
-int Unpack24To24(const unsigned char *data, unsigned char *out,
-                     unsigned char *end);
-
-int Unpack24To32(const T_colormask *colormask, const unsigned char *data,
-                     unsigned char *out, unsigned char *end);
-
-int Unpack24To32(const unsigned char *data, unsigned char *out, unsigned char *end);
-
-int Unpack32To32(const T_colormask *colormask, const unsigned int *data,
-                            unsigned int *out, unsigned int *end);
-
-
-void UnpackInit()
-{
-  if (unpackInitialized == 0)
-  {
-    unpackStream.zalloc = (alloc_func) 0;
-    unpackStream.zfree  = (free_func) 0;
-    unpackStream.opaque = (voidpf) 0;
-
-    unpackStream.next_in = (Bytef *) 0;
-    unpackStream.avail_in = 0;
-
-    int result = inflateInit2(&unpackStream, 15);
-
-    if (result != Z_OK)
-    {
-      #ifdef PANIC
-      *logofs << "UnpackInit: PANIC! Cannot initialize the Z stream "
-              << "for decompression. Error is '" << zError(result)
-              << "'.\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Cannot initialize the Z stream for "
-           << "decompression. Error is '" << zError(result)
-           << "'.\n";
-    }
-    else
-    {
-      unpackInitialized = 1;
-    }
-  }
-}
-
-void UnpackDestroy()
-{
-  if (unpackInitialized == 1)
-  {
-    inflateEnd(&unpackStream);
-
-    unpackInitialized = 0;
-  }
-}
-
-//
-// Get bits per pixel set by client
-// according to display geometry.
-//
-
-int UnpackBitsPerPixel(T_geometry *geometry, unsigned int depth)
-{
-  switch (depth)
-  {
-    case 1:
-    {
-      return geometry -> depth1_bpp;
-    }
-    case 4:
-    {
-      return geometry -> depth4_bpp;
-    }
-    case 8:
-    {
-      return geometry -> depth8_bpp;
-    }
-    case 15:
-    case 16:
-    {
-      return geometry -> depth16_bpp;
-    }
-    case 24:
-    {
-      return geometry -> depth24_bpp;
-    }
-    case 32:
-    {
-      return geometry -> depth32_bpp;
-    }
-    default:
-    {
-      return 0;
-    }
-  }
-}
-
-int Unpack8To8(const T_colormask *colormask, const unsigned char *data,
-                    unsigned char *out, unsigned char *end)
-{
-  #ifdef TEST
-  *logofs << "Unpack8To8: Unpacking " << end - out
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-
-  memcpy(out, data, end - out);
-
-  return 1;
-}
-
-int Unpack8To16(const T_colormask *colormask, const unsigned char *data,
-                    unsigned char *out, unsigned char *end)
-{
-  #ifdef TEST
-  *logofs << "Unpack8To16: Unpacking " << end - out
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-
-  unsigned short *out16 = (unsigned short *) out;
-  unsigned short *end16 = (unsigned short *) end;
-  
-  while (out16 < end16)
-  {
-    if (*data == 0)
-    {
-      *out16 = 0x0;
-    }
-    else if (*data == 0xff)
-    {
-      *out16 = 0xffff;
-    }
-    else
-    {
-      //
-      // Pixel layout:
-      //
-      // 8bits 00RRGGBB -> 16bits RR000GG0 000BB000.
-      //
-
-      *out16 = (((((*data & 0x30) << 2) | colormask -> correction_mask) << 8) & 0xf800) |
-                   (((((*data & 0xc) << 4) | colormask -> correction_mask) << 3) & 0x7e0) |
-                       (((((*data & 0x3) << 6) | colormask -> correction_mask) >> 3) & 0x1f);
-    }
-
-    out16++;
-    data++;
-  }
-
-  return 1;
-}
-
-int Unpack8To24(const T_colormask *colormask, const unsigned char *data,
-                    unsigned char *out, unsigned char *end)
-{
-  #ifdef TEST
-  *logofs << "Unpack8To24: Unpacking " << end - out
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-
-  while (out < (end - 2))
-  {
-    if (*data == 0x00)
-    {
-      out[0] = out[1] = out[2] = 0x00;
-    }
-    else if (*data == 0xff)
-    {
-      out[0] = out[1] = out[2] = 0xff;
-    }
-    else
-    {
-      //
-      // Pixel layout:
-      //
-      // 8bits 00RRGGBB -> 24bits RR000000 GG00000 BB000000.
-      //
-
-      out[0] = (((*data & 0x30) << 2) | colormask -> correction_mask);
-      out[1] = (((*data & 0x0c) << 4) | colormask -> correction_mask);
-      out[2] = (((*data & 0x03) << 6) | colormask -> correction_mask);
-    }
-
-    out  += 3;
-    data += 1;
-  }
-
-  return 1;
-}
-
-int Unpack8To32(const T_colormask *colormask, const unsigned char *data,
-                    unsigned char *out, unsigned char *end)
-{
-  #ifdef TEST
-  *logofs << "Unpack8To32: Unpacking " << end - out
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-
-  unsigned int *out32 = (unsigned int *) out;
-  unsigned int *end32 = (unsigned int *) end;
-
-  while (out32 < end32)
-  {
-    if (*data == 0)
-    {
-      *out32 = 0x0;
-    }
-    else if (*data == 0xff)
-    {
-      *out32 = 0xffffff;
-    }
-    else
-    {
-      *out32 = ((((*data & 0x30) << 2) | colormask -> correction_mask) << 16) |
-                   ((((*data & 0xc) << 4) | colormask -> correction_mask) << 8) |
-                       (((*data & 0x3) << 6) | colormask -> correction_mask);
-    }
-
-    out32++;
-    data++;
-  }
-
-  return 1;
-}
-
-int Unpack8(T_geometry *geometry, const T_colormask *colormask, int src_depth, int src_width,
-                int src_height, unsigned char *src_data, int src_size, int dst_depth,
-                    int dst_width, int dst_height, unsigned char *dst_data, int dst_size)
-{
-  int dst_bpp = UnpackBitsPerPixel(geometry, dst_depth);
-
-  int (*unpack)(const T_colormask *colormask, const unsigned char *data,
-                    unsigned char *out, unsigned char *end);
-
-  switch (dst_bpp)
-  {
-    case 8:
-    {
-      unpack = Unpack8To8;
-
-      break;
-    }
-    case 16:
-    {
-      unpack = Unpack8To16;
-
-      break;
-    }
-    case 24:
-    {
-      unpack = Unpack8To24;
-
-      break;
-    }
-    case 32:
-    {
-      unpack = Unpack8To32;
-
-      break;
-    }
-    default:
-    {
-      #ifdef PANIC
-      *logofs << "Unpack8: PANIC! Bad destination bits per pixel "
-              << dst_bpp << ". Only 16/24/32 are supported.\n"
-              << logofs_flush;
-      #endif
-
-      return -1;
-    }
-  }
-
-  if (dst_bpp == 24)
-  {
-    unsigned char *dst_end = dst_data;
-
-    #ifdef TEST
-    *logofs  << "Unpack8: Handling 24 bits with dst_size "
-             << dst_size << ".\n" << logofs_flush;
-    #endif
-
-    for (int y = 0; y < dst_height; y++)
-    {
-      dst_data = dst_end;
-
-      dst_end += RoundUp4(dst_width * 3);
-
-      (*unpack)(colormask, src_data, dst_data, dst_end);
-
-      src_data += src_width;
-    }
-  }
-  else
-  {
-    unsigned char *dst_end = dst_data + dst_size;
-
-    (*unpack)(colormask, src_data, dst_data, dst_end);
-  }
-
-  return 1;
-}
-
-int Unpack16To16(const T_colormask *colormask, const unsigned char *data,
-                     unsigned char *out, unsigned char *end)
-{
-  #ifdef TEST
-  *logofs << "Unpack16To16: Unpacking " << end - out
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-
-  if (colormask -> correction_mask)
-  {
-    unsigned short *data16 = (unsigned short *) data;
-
-    unsigned short *out16 = (unsigned short *) out;
-    unsigned short *end16 = (unsigned short *) end;
-
-    while (out16 < end16)
-    {
-      if (*data16 == 0x0000)
-      {
-        *out16 = 0x0000;
-      }
-      else if (*data16 == 0xffff)
-      {
-        *out16 = 0xffff;
-      }
-      else
-      {
-        //
-        // Pixel layout:
-        //
-        // 16bit RRRRRGGG GG0BBBBB  -> RRRRRGGG GGGBBBBB.
-        //
-
-        *out16 = (((((*data16 & 0xf100) >> 8) | colormask -> correction_mask) << 8) & 0xf800) |
-                     (((((*data16 & 0x7c0) >> 3) | colormask -> correction_mask) << 3) & 0x7e0) |
-                         (((((*data16 & 0x1f) << 3) | colormask -> correction_mask) >> 3) & 0x1f);
-      }
-
-      out16++;
-      data16++;
-    }
-  }
-  else
-  {
-    #ifdef TEST
-    *logofs << "Unpack16To16: Using bitwise copy due to null correction mask.\n"
-            << logofs_flush;
-    #endif
-
-    memcpy((unsigned char *) out, (unsigned char *) data, end - out);
-  }
-
-  return 1;
-}
-
-int Unpack16To24(const T_colormask *colormask, const unsigned char *data,
-                     unsigned char *out, unsigned char *end)
-{
-  #ifdef TEST
-  *logofs << "Unpack16To24: Unpacking " << end - out
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-
-  unsigned short *data16 = (unsigned short *) data;
-
-
-  while (out < end - 2)
-  {
-    if (*data16 == 0x0)
-    {
-      out[0] = 0x00;
-      out[1] = 0x00;
-      out[2] = 0x00;
-    }
-    else if (*data16 == 0xffff)
-    {
-      out[0] = 0xff;
-      out[1] = 0xff;
-      out[2] = 0xff;
-    }
-    else
-    {
-      #ifdef TEST
-      *logofs << "Unpack16To24: Pixel [" << *data16 << "]\n"
-              << logofs_flush;
-      #endif
-
-      //
-      // Pixel layout:
-      //
-      //  16bit 0RRRRRGG GGGBBBBB  -> 24 bit RRRRR000 GGGGG000 BBBBB000
-      //
-
-      out[0] = (((*data16 & 0x7c00) >> 7) | colormask -> correction_mask);
-      out[1] = (((*data16 & 0x03e0) >> 2) | colormask -> correction_mask);
-      out[2] = (((*data16 & 0x001f) << 3) | colormask -> correction_mask);
-    }
-
-    out    += 3;
-    data16 += 1;
-  }
-
-  return 1;
-}
-
-int Unpack16To32(const T_colormask *colormask, const unsigned char *data,
-                     unsigned char *out, unsigned char *end)
-{
-  #ifdef TEST
-  *logofs << "Unpack16To32: Unpacking " << end - out
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-
-  unsigned short *data16 = (unsigned short *) data;
-
-  unsigned int *out32 = (unsigned int *) out;
-  unsigned int *end32 = (unsigned int *) end;
-
-  while (out32 < end32)
-  {
-    if (*data16 == 0x0)
-    {
-      *out32 = 0x0;
-    }
-    else if (*data16 == 0xffff)
-    {
-      *out32 = 0xffffff;
-    }
-    else
-    {
-      *out32 = ((((*data16 & 0x7c00) >> 7) | colormask -> correction_mask) << 16) |
-                   ((((*data16 & 0x3e0) >> 2) | colormask -> correction_mask) << 8) |
-                       (((*data16 & 0x1f) << 3) | colormask -> correction_mask);
-    }
-
-    out32++;
-    data16++;
-  }
-
-  return 1;
-}
-
-int Unpack16(T_geometry *geometry, const T_colormask *colormask, int src_depth, int src_width,
-                 int src_height, unsigned char *src_data, int src_size, int dst_depth,
-                     int dst_width, int dst_height, unsigned char *dst_data, int dst_size)
-{
-  int dst_bpp = UnpackBitsPerPixel(geometry, dst_depth);
-
-  int (*unpack)(const T_colormask *colormask, const unsigned char *data,
-                    unsigned char *out, unsigned char *end);
-
-  switch (dst_bpp)
-  {
-    case 16:
-    {
-      unpack = Unpack16To16;
-
-      break;
-    }
-    case 24:
-    {
-      unpack = Unpack16To24;
-
-      break;
-    }
-    case 32:
-    {
-      unpack = Unpack16To32;
-
-      break;
-    }
-    default:
-    {
-      #ifdef PANIC
-      *logofs << "Unpack16: PANIC! Bad destination bits per pixel "
-              << dst_bpp << ". Only 24/32 are supported.\n"
-              << logofs_flush;
-      #endif
-
-      return -1;
-    }
-  }
-
-  if (dst_bpp == 24)
-  {
-    unsigned char *dst_end = dst_data;
-
-    for (int y = 0; y < dst_height; y++)
-    {
-      dst_data = dst_end;
-
-      dst_end += RoundUp4(dst_width * 3);
-
-      (*unpack)(colormask, src_data, dst_data, dst_end);
-
-      src_data += (src_width * 2);
-    }
-
-  }
-  else
-  {
-    unsigned char *dst_end = dst_data + dst_size;
-
-    (*unpack)(colormask, src_data, dst_data, dst_end);
-  }
-  
-  return 1;
-}
-
-int Unpack24To24(const T_colormask *colormask, const unsigned char *data,
-                     unsigned char *out, unsigned char *end)
-{
-  #ifdef TEST
-  *logofs << "Unpack24To24: Unpacking " << end - out
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-
-  if (colormask -> correction_mask)
-  {
-    while (out < end)
-    {
-      if (data[0] == 0x00 &&
-              data[1] == 0x00 &&
-                  data[2] == 0x00)
-      {
-        out[0] = out[1] = out[2] = 0x00;
-      }
-      else if (data[0] == 0xff &&
-                   data[1] == 0xff &&
-                       data[2] == 0xff)
-      {
-        out[0] = out[1] = out[2] = 0xff;
-      }
-      else
-      {
-        out[0] = (data[0] | colormask -> correction_mask);
-        out[1] = (data[1] | colormask -> correction_mask);
-        out[2] = (data[2] | colormask -> correction_mask);
-      }
-
-      out  += 3;
-      data += 3;
-    }
-  }
-  else
-  {
-    #ifdef TEST
-    *logofs << "Unpack24To24: Using bitwise copy due to null correction mask.\n"
-            << logofs_flush;
-    #endif
-
-    memcpy((unsigned char *) out, (unsigned char *) data, end - out);
-  }
-
-  return 1;
-}
-
-int Unpack24To32(const T_colormask *colormask, const unsigned char *data,
-                     unsigned char *out, unsigned char *end)
-{
-  #ifdef TEST
-  *logofs << "Unpack24To32: Unpacking " << end - out
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-
-  unsigned int *out32 = (unsigned int *) out;
-  unsigned int *end32 = (unsigned int *) end;
-
-  while (out32 < end32)
-  {
-    if (colormask -> color_mask == 0xff)
-    {
-      *out32 = (data[0] << 16) | (data[1] << 8) | data[2];
-    }
-    else
-    {
-      if (data[0] == 0x0 && data[1] == 0x0 && data[2] == 0x0)
-      {
-        *out32 = 0x0;
-      }
-      else if (data[0] == 0xff && data[1] == 0xff && data[2] == 0xff)
-      {
-        *out32 = 0xffffff;
-      }
-      else
-      {
-        *out32 = (((unsigned int) data[0] | colormask -> correction_mask) << 16) |
-                   (((unsigned int) data[1] | colormask -> correction_mask) << 8) |
-                       ((unsigned int) data[2] | colormask -> correction_mask);
-      }
-    }
-
-    out32 += 1;
-    data  += 3;
-  }
-
-  return 1;
-}
-
-int Unpack24(T_geometry *geometry, const T_colormask *colormask, int src_depth, int src_width,
-                 int src_height, unsigned char *src_data, int src_size, int dst_depth,
-                     int dst_width, int dst_height, unsigned char *dst_data, int dst_size)
-{
-  int dst_bpp = UnpackBitsPerPixel(geometry, dst_depth);
-
-  int (*unpack)(const T_colormask *colormask, const unsigned char *data,
-                    unsigned char *out, unsigned char *end);
-
-  switch (dst_bpp)
-  {
-    case 24:
-    {
-      unpack = Unpack24To24;
-
-      break;
-    }
-    case 32:
-    {
-      unpack = Unpack24To32;
-
-      break;
-    }
-    default:
-    {
-      #ifdef PANIC
-      *logofs << "Unpack24: PANIC! Bad destination bits per pixel "
-              << dst_bpp << ". Only 32 is supported.\n"
-              << logofs_flush;
-      #endif
-
-      return -1;
-    }
-  }
-
-  if (dst_bpp == 24)
-  {
-    unsigned char *dst_end;
-    unsigned long scanline_size = RoundUp4(dst_width * dst_bpp / 8);
-
-    dst_end = dst_data;
-
-    #ifdef TEST
-    *logofs  << "Unpack24: Handling 24 bits with dst_height "
-             << dst_height << " scanline_size " << scanline_size
-             << " dst_size " << dst_size << ".\n" << logofs_flush;
-    #endif
-
-    for (int y = 0; y < dst_height; y++)
-    {
-      dst_data = dst_end;
-
-      dst_end += scanline_size;
-
-      (*unpack)(colormask, src_data, dst_data, dst_end);
-
-      src_data += scanline_size;
-    }
-  }
-  else
-  {
-    unsigned char *dst_end = dst_data + dst_size;
-
-    (*unpack)(colormask, src_data, dst_data, dst_end);
-  }
-
-  return 1;
-}
-
-int Unpack8To8(T_colormap *colormap, const unsigned char *data,
-                   unsigned char *out, unsigned char *end)
-{
-  #ifdef TEST
-  *logofs << "Unpack8To8: Unpacking " << end - out
-          << " bytes of colormapped data.\n"
-          << logofs_flush;
-  #endif
-
-  while (out < end)
-  {
-    *(out++) = (unsigned char) colormap -> data[*(data++)];
-  }
-
-  return 1;
-}
-
-int Unpack8To16(T_colormap *colormap, const unsigned char *data,
-                    unsigned char *out, unsigned char *end)
-{
-  #ifdef TEST
-  *logofs << "Unpack8To16: Unpacking " << end - out
-          << " bytes of colormapped data.\n"
-          << logofs_flush;
-  #endif
-
-  unsigned short *out16 = (unsigned short *) out;
-  unsigned short *end16 = (unsigned short *) end;
-
-  while (out16 < end16)
-  {
-    *(out16++) = (unsigned short) colormap -> data[*(data++)];
-  }
-
-  return 1;
-}
-
-int Unpack8To24(T_colormap *colormap, const unsigned char *data,
-                    unsigned char *out, unsigned char *end)
-{
-  #ifdef TEST
-  *logofs << "Unpack8To24: Unpacking " << end - out
-          << " bytes of colormapped data.\n"
-          << logofs_flush;
-  #endif
-
-  unsigned int value;
-
-  while (out < end)
-  {
-    value = colormap -> data[*(data++)];
-
-    *(out++) = value;
-    *(out++) = value >> 8;
-    *(out++) = value >> 16;
-  }
-
-  return 1;
-}
-
-int Unpack8To32(T_colormap *colormap, const unsigned char *data,
-                    unsigned char *out, unsigned char *end)
-{
-  #ifdef TEST
-  *logofs << "Unpack8To32: Unpacking " << end - out
-          << " bytes of colormapped data.\n"
-          << logofs_flush;
-  #endif
-
-  unsigned int *out32 = (unsigned int *) out;
-  unsigned int *end32 = (unsigned int *) end;
-
-  while (out32 < end32)
-  {
-    *(out32++) = colormap -> data[*(data++)];
-  }
-
-  return 1;
-}
-
-int Unpack8(T_geometry *geometry, T_colormap *colormap, int src_depth, int src_width, int src_height,
-                 unsigned char *src_data, int src_size, int dst_depth, int dst_width,
-                     int dst_height, unsigned char *dst_data, int dst_size)
-{
-  if (src_depth != 8)
-  {
-    #ifdef PANIC
-    *logofs << "Unpack8: PANIC! Cannot unpack colormapped image of source depth "
-            << src_depth << ".\n" << logofs_flush;
-    #endif
-
-    return -1;
-  }
-
-  int (*unpack)(T_colormap *colormap, const unsigned char *data,
-                    unsigned char *out, unsigned char *end);
-
-  int dst_bpp = UnpackBitsPerPixel(geometry, dst_depth);
-
-  switch (dst_bpp)
-  {
-    case 8:
-    {
-      unpack = Unpack8To8;
-
-      break;
-    }
-    case 16:
-    {
-      unpack = Unpack8To16;
-
-      break;
-    }
-    case 24:
-    {
-      unpack = Unpack8To24;
-
-      break;
-    }
-    case 32:
-    {
-      unpack = Unpack8To32;
-
-      break;
-    }
-    default:
-    {
-      #ifdef PANIC
-      *logofs << "Unpack8: PANIC! Bad destination bits per pixel "
-              << dst_bpp << ". Only 8/16/24/32 are supported.\n"
-              << logofs_flush;
-      #endif
-
-      return -1;
-    }
-  }
-
-  if (src_width == dst_width &&
-          src_height == dst_height)
-  {
-    unsigned char *dst_end = dst_data + dst_size;
-
-    (*unpack)(colormap, src_data, dst_data, dst_end);
-  }
-  else if (src_width >= dst_width &&
-             src_height >= dst_height)
-  {
-    unsigned char *dst_end = dst_data;
-
-    for (int y = 0; y < dst_height; y++)
-    {
-      dst_data = dst_end;
-
-      dst_end += RoundUp4(dst_width * dst_bpp / 8);
-
-      (*unpack)(colormap, src_data, dst_data, dst_end);
-
-      src_data += src_width;
-    }
-  }
-  else
-  {
-    #ifdef PANIC
-    *logofs << "Unpack8: PANIC! Cannot unpack image. "
-            << "Destination area " << dst_width << "x"
-            << dst_height << " is not fully contained in "
-            << src_width << "x" << src_height << " source.\n"
-            << logofs_flush;
-    #endif
-
-    return -1;
-  }
-
-  return 1;
-}
-
-int Unpack15To16(const unsigned char *data, unsigned char *out, unsigned char *end)
-{
-  #ifdef TEST
-  *logofs << "Unpack15To16: Unpacking " << end - out
-          << " bytes of colormapped data.\n"
-          << logofs_flush;
-  #endif
-  
-  unsigned short *data16 = (unsigned short *) data;
-  unsigned short *out16 = (unsigned short *) out;
-  unsigned short *end16 = (unsigned short *) end;
-
-  while (out16 < end16)
-  {
-    if (*data16 == 0x0)
-    {
-      *out16 = 0x0;
-    }
-    else if (*data16 == 0x7fff)
-    {
-      *out16 = 0xffff;
-    }
-    else
-    {
-      #ifdef TEST
-      *logofs << "Unpack15To16: Pixel [" << *data16 << "]\n"
-              << logofs_flush;
-      #endif
-      
-     *out16 = ((*data16 & 0x7ff0) << 1) |
-               (*data16 & 0x001f);
-    }
-
-    out16  += 1;
-    data16 += 1;
-  }
-  
-  return 1;
-}
-
-int Unpack15To24(const unsigned char *data, unsigned char *out, unsigned char *end)
-
-{
-  #ifdef TEST
-  *logofs << "Unpack15To24: Unpacking " << end - out
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-
-  unsigned short *data16 = (unsigned short *) data;
-
-  while (out < end - 2)
-  {
-    if (*data16 == 0x0)
-    {
-      out[0] = 0x00;
-      out[1] = 0x00;
-      out[2] = 0x00;
-    }
-    else if (*data16 == 0x7fff)
-    {
-      out[0] = 0xff;
-      out[1] = 0xff;
-      out[2] = 0xff;
-    }
-    else
-    {
-      #ifdef TEST
-      *logofs << "Unpack15To24: Pixel [" << *data16 << "]\n"
-              << logofs_flush;
-      #endif
-
-      out[0] = ((*data16 >> 7) & 0xf8) | ((*data16 >> 12) & 0x07);
-      out[1] = ((*data16 >> 2) & 0xf8) | ((*data16 >> 8) & 0x07);
-      out[2] = ((*data16 << 3) & 0xf8) | ((*data16 >> 2) & 0x07);
-    }
-
-    out    += 3;
-    data16 += 1;
-  }
-
-  return 1;
-}
-
-int Unpack15To32(const unsigned char *data, unsigned char *out, unsigned char *end)
-{
-  #ifdef TEST
-  *logofs << "Unpack15To32: Unpacking " << end - out
-          << " bytes of data.\n"
-          << logofs_flush;
-  #endif
-
-  unsigned short *data16 = (unsigned short *) data;
-  unsigned int *out32 = (unsigned int *) out;
-  unsigned int *end32 = (unsigned int *) end;
-
-  while (out32 < end32)
-  {
-    if (*data16 == 0x0)
-    {
-      *out32 = 0x0;
-    }
-    else if (*data16 == 0xffff)
-    {
-      *out32 = 0xffffff;
-    }
-    else
-    {
-        *out32 = ((((*data16 >> 7) & 0xf8) | ((*data16 >> 12) & 0x07)) << 16) | 
-                 ((((*data16 >> 2) & 0xf8) | ((*data16 >> 8) & 0x07)) << 8) | 
-                  (((*data16 << 3) & 0xf8) | ((*data16 >> 2) & 0x07));
-    }
-
-    out32++;
-    data16++;
-  }
-
-  return 1;
-}
-
-int Unpack15(T_geometry *geometry, int src_depth, int src_width, int src_height,
-                 unsigned char *src_data, int src_size, int dst_depth, int dst_width,
-                     int dst_height, unsigned char *dst_data, int dst_size)
-{
-  if (src_depth != 16)
-  {
-    #ifdef PANIC
-    *logofs << "Unpack15: PANIC! Cannot unpack colormapped image of source depth "
-            << src_depth << ".\n" << logofs_flush;
-    #endif
-
-    return -1;
-  }
-
-  int (*unpack)(const unsigned char *data, unsigned char *out, unsigned char *end);
-
-  int dst_bpp = UnpackBitsPerPixel(geometry, dst_depth);
-
-  switch (dst_bpp)
-  {
-    case 16:
-    {
-      unpack = Unpack15To16;
-
-      break;
-    }
-    case 24:
-    {
-      unpack = Unpack15To24;
-
-      break;
-    }
-    case 32:
-    {
-      unpack = Unpack15To32;
-
-      break;
-    }
-    default:
-    {
-      #ifdef PANIC
-      *logofs << "Unpack15: PANIC! Bad destination bits per pixel "
-              << dst_bpp << ". Only 16/24/32 are supported.\n"
-              << logofs_flush;
-      #endif
-
-      return -1;
-    }
-  }
-
-  if (src_width == dst_width && src_height == dst_height)
-  {
-    unsigned char *dst_end = dst_data + dst_size;
-
-    (*unpack)(src_data, dst_data, dst_end);
-  }
-  else if (src_width >= dst_width && src_height >= dst_height)
-  {
-    unsigned char *dst_end = dst_data;
-
-    for (int y = 0; y < dst_height; y++)
-    {
-      dst_data = dst_end;
-      dst_end += RoundUp4(dst_width * dst_bpp / 8);
-
-      (*unpack)(src_data, dst_data, dst_end);
-
-      src_data += src_width * 2;
-    }
-  }
-  else
-  {
-    #ifdef PANIC
-    *logofs << "Unpack15: PANIC! Cannot unpack image. "
-            << "Destination area " << dst_width << "x"
-            << dst_height << " is not fully contained in "
-            << src_width << "x" << src_height << " source.\n"
-            << logofs_flush;
-    #endif
-
-    return -1;
-  }
-
-  return 1;
-}
-
-int Unpack16To16(const unsigned char *data, unsigned char *out,
-                    unsigned char *end, int imageByteOrder)
-{
-  #ifdef TEST
-  *logofs << "Unpack16To16: Unpacking " << end - out
-          << " bytes of colormapped data.\n"
-          << logofs_flush;
-  #endif
-  
-  memcpy((unsigned char *) out, (unsigned char *) data, end - out);
-
-  return 1;
-}
-
-int Unpack16To24(const unsigned char *data, unsigned char *out, 
-                    unsigned char *end, int imageByteOrder)
-
-{
-  #ifdef TEST
-  *logofs << "Unpack16To24: Unpacking " << end - out
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-
-  unsigned short *data16 = (unsigned short *) data;
-
-  while (out < end - 2)
-  {
-    if (*data16 == 0x0)
-    {
-      out[0] = 0x00;
-      out[1] = 0x00;
-      out[2] = 0x00;
-    }
-    else if (*data16 == 0xffff)
-    {
-      out[0] = 0xff;
-      out[1] = 0xff;
-      out[2] = 0xff;
-    }
-    else
-    {
-      #ifdef TEST
-      *logofs << "Unpack16To24: Pixel [" << *data16 << "]\n"
-              << logofs_flush;
-      #endif
-
-      out[0] = ((*data16 >> 8) & 0xf8) | ((*data16 >> 13) & 0x07);
-      out[1] = ((*data16 >> 3) & 0xfc) | ((*data16 >> 9) & 0x03);
-      out[2] = ((*data16 << 3) & 0xf8) | ((*data16 >> 2) & 0x07);
-    }
-
-    out    += 3;
-    data16 += 1;
-  }
-
-  return 1;
-}
-
-
-int Unpack16To32(const unsigned char *data, unsigned char *out, 
-                    unsigned char *end, int imageByteOrder)
-{
-  #ifdef TEST
-  *logofs << "Unpack16To32: Unpacking " << end - out
-          << " bytes of data.\n"
-          << logofs_flush;
-  #endif
-
-  unsigned short *data16 = (unsigned short *) data;
-  unsigned int *out32 = (unsigned int *) out;
-  unsigned int *end32 = (unsigned int *) end;
-
-  unsigned short pixel16;
-  unsigned int pixel32;
-
-  while (out32 < end32)
-  {
-
-    pixel16 = GetUINT((unsigned char *)data16, 0);
-
-    if (pixel16 == 0x0)
-    {
-      PutULONG(0x0, (unsigned char *) out32, imageByteOrder); 
-    }
-    else if (pixel16 == 0xffff)
-    {
-      PutULONG(0xffffff, (unsigned char *) out32, imageByteOrder);
-    }
-    else
-    {
-      pixel32 = ((((pixel16 >> 8) & 0xf8) | ((pixel16 >> 13) & 0x07)) << 16) | 
-               ((((pixel16 >> 3) & 0xfc) | ((pixel16 >> 9) & 0x03)) << 8) | 
-               (((pixel16 << 3) & 0xf8) | ((pixel16 >> 2) & 0x07));
- 
-      PutULONG(pixel32, (unsigned char *) out32, imageByteOrder); 
-    }
-
-    out32++;
-    data16++;
-  }
-  return 1;
-}
-
-int Unpack16(T_geometry *geometry, int src_depth, int src_width, int src_height,
-                 unsigned char *src_data, int src_size, int dst_depth, int dst_width,
-                     int dst_height, unsigned char *dst_data, int dst_size)
-{
-  int imageByteOrder = geometry -> image_byte_order;
-
-  if (src_depth != 16)
-  {
-    #ifdef PANIC
-    *logofs << "Unpack16: PANIC! Cannot unpack colormapped image of source depth "
-            << src_depth << ".\n" << logofs_flush;
-    #endif
-
-    return -1;
-  }
-
-  int (*unpack)(const unsigned char *data, unsigned char *out, 
-                    unsigned char *end, int imageByteOrder);
-
-  int dst_bpp = UnpackBitsPerPixel(geometry, dst_depth);
-  
-  switch (dst_bpp)
-  {
-    case 16:
-    {
-      unpack = Unpack16To16;
-
-      break;
-    }
-    case 24:
-    {
-      unpack = Unpack16To24;
-
-      break;
-    }
-    case 32:
-    {
-      unpack = Unpack16To32;
-
-      break;
-    }
-    default:
-    {
-      #ifdef PANIC
-      *logofs << "Unpack16: PANIC! Bad destination bits per pixel "
-              << dst_bpp << ". Only 16/24/32 are supported.\n"
-              << logofs_flush;
-      #endif
-
-      return -1;
-    }
-  }
-
-  if (src_width == dst_width && src_height == dst_height)
-  {
-    unsigned char *dst_end = dst_data + dst_size;
-
-    (*unpack)(src_data, dst_data, dst_end, imageByteOrder);
-  }
-  else if (src_width >= dst_width && src_height >= dst_height)
-  {
-    unsigned char *dst_end = dst_data;
-
-    for (int y = 0; y < dst_height; y++)
-    {
-      dst_data = dst_end;
-      dst_end += RoundUp4(dst_width * dst_bpp / 8);
-
-      (*unpack)(src_data, dst_data, dst_end, imageByteOrder);
-
-      src_data += src_width * 2;
-    }
-  }
-  else
-  {
-    #ifdef PANIC
-    *logofs << "Unpack16: PANIC! Cannot unpack image. "
-            << "Destination area " << dst_width << "x"
-            << dst_height << " is not fully contained in "
-            << src_width << "x" << src_height << " source.\n"
-            << logofs_flush;
-    #endif
-
-    return -1;
-  }
-
-  return 1;
-}
-
-int Unpack24To24(const unsigned char *data,
-                    unsigned char *out, unsigned char *end)
-{
-  #ifdef TEST
-  *logofs << "Unpack124To24: Unpacking " << end - out
-          << " bytes of colormapped data.\n"
-          << logofs_flush;
-  #endif
-
-  while (out < end)
-  {
-    *(out++) = *(data++);
-  }
-
-  return 1;
-}
-
-int Unpack24To32(const unsigned char *data, unsigned char *out, unsigned char *end)
-{
-  #ifdef TEST
-  *logofs << "Unpack24To32: Unpacking " << end - out
-          << " bytes of colormapped data.\n"
-          << logofs_flush;
-  #endif
-
-  unsigned int *out32 = (unsigned int *) out;
-  unsigned int *end32 = (unsigned int *) end;
-
-  while (out32 < end32)
-  {
-    if (data[0] == 0x0 && data[1] == 0x0 && data[2] == 0x0)
-    {
-      *out32 = 0x0;
-    }
-    else if (data[0] == 0xff && data[1] == 0xff && data[2] == 0xff)
-    {
-      *out32 = 0xffffff;
-    }
-    else
-    {
-      *out32 = (data[2] << 16) | (data[1] << 8) | data[0];  
-    }
-
-    out32 += 1;
-    data  += 3;
-  }
-
-  return 1;
-}
-
-int Unpack24(T_geometry *geometry, int src_depth, int src_width, int src_height,
-                 unsigned char *src_data, int src_size, int dst_depth, int dst_width,
-                     int dst_height, unsigned char *dst_data, int dst_size)
-                     
-{
-  if (src_depth != 24)
-  {
-    #ifdef PANIC
-    *logofs << "Unpack24: PANIC! Cannot unpack colormapped image of source depth "
-            << src_depth << ".\n" << logofs_flush;
-    #endif
-
-    return -1;
-  }
-
-  int (*unpack)(const unsigned char *data, unsigned char *out, unsigned char *end);
-
-  int dst_bpp = UnpackBitsPerPixel(geometry, dst_depth);
-
-  switch (dst_bpp)
-  {
-    case 24:
-    {
-      unpack = Unpack24To24;
-
-      break;
-    }
-    case 32:
-    {
-      unpack = Unpack24To32;
-
-      break;
-    }
-    default:
-    {
-      #ifdef PANIC
-      *logofs << "Unpack24: PANIC! Bad destination bits per pixel "
-              << dst_bpp << ". Only 24/32 are supported.\n"
-              << logofs_flush;
-      #endif
-
-      return -1;
-    }
-  }
-
-  if (src_width == dst_width && src_height == dst_height)
-  {
-    unsigned char *dst_end = dst_data + dst_size;
-
-    (*unpack)(src_data, dst_data, dst_end);
-  }
-  else if (src_width >= dst_width && src_height >= dst_height)
-  {
-    unsigned char *dst_end = dst_data;
-
-    for (int y = 0; y < dst_height; y++)
-    {
-      dst_data = dst_end;
-      dst_end += RoundUp4(dst_width * dst_bpp / 8);
-
-      (*unpack)(src_data, dst_data, dst_end);
-
-      src_data += src_width * 3;
-    }
-  }
-  else
-  {
-    #ifdef PANIC
-    *logofs << "Unpack24: PANIC! Cannot unpack image. "
-            << "Destination area " << dst_width << "x"
-            << dst_height << " is not fully contained in "
-            << src_width << "x" << src_height << " source.\n"
-            << logofs_flush;
-    #endif
-
-    return -1;
-  }
-
-  return 1;
-}
-
-int Unpack32To32(const T_colormask *colormask, const unsigned int *data,
-                     unsigned int *out, unsigned int *end)
-{
-  #ifdef TEST
-  *logofs << "Unpack32To32: Unpacking " << end - out
-          << " bytes of data.\n" << logofs_flush;
-  #endif
-
-  if (colormask -> correction_mask)
-  {
-    while (out < end)
-    {
-      if (*data == 0x00000000)
-      {
-        *out = 0x00000000;
-      }
-      else if (*data == 0xFFFFFFFF)
-      {
-        *out = 0xFFFFFFFF;
-      }
-      else
-      {
-        *out = *data | ((colormask -> correction_mask << 16) |
-                            (colormask -> correction_mask << 8) |
-                                colormask -> correction_mask);
-      }
-
-      out  += 1;
-      data += 1;
-    }
-  }
-  else
-  {
-    #ifdef TEST
-    *logofs << "Unpack32To32: Using bitwise copy due to null correction mask.\n"
-            << logofs_flush;
-    #endif
-
-    memcpy((unsigned char *) out, (unsigned char *) data, end - out);
-  }
-
-  return 1;
-}
diff --git a/nxcomp/Unpack.h b/nxcomp/Unpack.h
deleted file mode 100644
index faaa41d82..000000000
--- a/nxcomp/Unpack.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef Unpack_H
-#define Unpack_H
-
-#include "NXpack.h"
-
-#include "Z.h"
-
-#define LSBFirst  0
-#define MSBFirst  1
-
-#define SPLIT_PATTERN  0x88
-
-typedef ColorMask T_colormask;
-
-//
-// Pixel geometry of channel's display.
-//
-
-typedef struct
-{
-  unsigned int depth1_bpp;
-  unsigned int depth4_bpp;
-  unsigned int depth8_bpp;
-  unsigned int depth16_bpp;
-  unsigned int depth24_bpp;
-  unsigned int depth32_bpp;
-
-  unsigned int red_mask;
-  unsigned int green_mask;
-  unsigned int blue_mask;
-
-  unsigned int image_byte_order;
-  unsigned int bitmap_bit_order;
-  unsigned int scanline_unit;
-  unsigned int scanline_pad;
-
-} T_geometry;
-
-//
-// Colormap is used to remap colors
-// from source to destination depth.
-//
- 
-typedef struct
-{
-  unsigned int entries;
-  unsigned int *data;
-
-} T_colormap;
-
-//
-// Alpha channel data is added to 32
-// bits images at the time they are
-// unpacked.
-//
- 
-typedef struct
-{
-  unsigned int entries;
-  unsigned char *data;
-
-} T_alpha;
-
-//
-// The ZLIB stream structure used for
-// the decompression.
-//
-
-extern z_stream unpackStream;
-
-//
-// Initialize the ZLIB stream used for
-// decompression.
-//
-
-void UnpackInit();
-
-//
-// Free the ZLIB stream.
-//
-
-void UnpackDestroy();
-
-//
-// Get the destination bits per pixel
-// based on the drawable depth.
-//
-
-int UnpackBitsPerPixel(T_geometry *geometry, unsigned int depth);
-
-//
-// Unpack the source data into the X
-// bitmap.
-//
-
-int Unpack8(T_geometry *geometry, const T_colormask *colormask, int src_depth, int src_width,
-                int src_height, unsigned char *src_data, int src_size, int dst_depth,
-                    int dst_width, int dst_height, unsigned char *dst_data, int dst_size);
-
-int Unpack16(T_geometry *geometry, const T_colormask *colormask, int src_depth, int src_width,
-                 int src_height, unsigned char *src_data, int src_size, int dst_depth,
-                     int dst_width, int dst_height, unsigned char *dst_data, int dst_size);
-
-int Unpack24(T_geometry *geometry, const T_colormask *colormask, int src_depth, int src_width,
-                 int src_height, unsigned char *src_data, int src_size, int dst_depth,
-                     int dst_width, int dst_height, unsigned char *dst_data, int dst_size);
-
-int Unpack8(T_geometry *geometry, T_colormap *colormap, int src_depth, int src_width,
-                int src_height, unsigned char *src_data, int src_size, int dst_depth,
-                    int dst_width, int dst_height, unsigned char *dst_data, int dst_size);
-
-int Unpack15(T_geometry *geometry, int src_depth, int src_width,
-                int src_height, unsigned char *src_data, int src_size, int dst_depth,
-                    int dst_width, int dst_height, unsigned char *dst_data, int dst_size);
-
-int Unpack16(T_geometry *geometry, int src_depth, int src_width,
-                int src_height, unsigned char *src_data, int src_size, int dst_depth,
-                    int dst_width, int dst_height, unsigned char *dst_data, int dst_size);
-
-int Unpack24(T_geometry *geometry, int src_depth, int src_width,
-                int src_height, unsigned char *src_data, int src_size, int dst_depth,
-                    int dst_width, int dst_height, unsigned char *dst_data, int dst_size);
-
-#endif /* Unpack_H */
diff --git a/nxcomp/Vars.c b/nxcomp/Vars.c
deleted file mode 100644
index 685969677..000000000
--- a/nxcomp/Vars.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdlib.h>
-
-#include "NXvars.h"
-
-/*
- * Allocate here instances of variables and
- * pointers declared in NXvars.h.
- */
- 
-int _NXHandleDisplayError = 0;
-
-NXDisplayErrorPredicate _NXDisplayErrorFunction = NULL;
-
-int _NXUnsetLibraryPath = 0;
-
-NXLostSequenceHandler _NXLostSequenceFunction = NULL;
-
-NXDisplayBlockHandler _NXDisplayBlockFunction = NULL;
-NXDisplayWriteHandler _NXDisplayWriteFunction = NULL;
-NXDisplayFlushHandler _NXDisplayFlushFunction = NULL;
-NXDisplayStatisticsHandler _NXDisplayStatisticsFunction = NULL;
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/nxcomp/Version.c b/nxcomp/Version.c
deleted file mode 100644
index ff1793434..000000000
--- a/nxcomp/Version.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2015 Qindel Formacion y Servicios SL.                    */
-/*                                                                        */
-/* This program is free software; you can redistribute it and/or modify   */
-/* it under the terms of the GNU General Public License Version 2, as     */
-/* published by the Free Software Foundation.                             */
-/*                                                                        */
-/* This program is distributed in the hope that it will be useful, but    */
-/* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTA-  */
-/* BILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General       */
-/* Public License for more details.                                       */
-/*                                                                        */
-/* You should have received a copy of the GNU General Public License      */
-/* along with this program; if not, you can request a copy from Qindel    */
-/* or write to the Free Software Foundation, Inc., 51 Franklin Street,    */
-/* Fifth Floor, Boston, MA 02110-1301 USA.                                */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/**************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "NX.h"
-
-
-static int _NXVersionMajor = -1;
-static int _NXVersionMinor = -1;
-static int _NXVersionPatch = -1;
-static int _NXVersionMaintenancePatch = -1;
-
-
-const char* NXVersion() {
-  const char *version = VERSION;
-  return version;
-}
-
-void _parseNXVersion() {
-  char version[32];
-  int i;
-  strcpy(version, VERSION);
-
-  char *value;
-  /* Reset values to 0 if undefined */
-  _NXVersionMajor = _NXVersionMinor = _NXVersionPatch = _NXVersionMaintenancePatch = 0;
-
-
-#define NXVERSIONSEPARATOR "."
-  value = strtok(version, NXVERSIONSEPARATOR);
-
-  for (i = 0; value != NULL && i < 4; i++)
-  {
-    switch (i)
-    {
-      case 0:
-        _NXVersionMajor = atoi(value);
-        break;
-
-      case 1:
-        _NXVersionMinor = atoi(value);
-        break;
-
-      case 2:
-        _NXVersionPatch = atoi(value);
-        break;
-
-      case 3:
-        _NXVersionMaintenancePatch = atoi(value);
-        break;
-    }
-
-    value = strtok(NULL, NXVERSIONSEPARATOR);
-  }
-}
-
-int NXMajorVersion() {
-  if (_NXVersionMajor == -1)
-    _parseNXVersion();
-  return _NXVersionMajor;
-}
-int NXMinorVersion() {
-  if (_NXVersionMinor == -1)
-    _parseNXVersion();
-  return _NXVersionMinor;
-}
-int NXPatchVersion() {
-  if (_NXVersionPatch == -1)
-    _parseNXVersion();
-  return _NXVersionPatch;
-}
-int NXMaintenancePatchVersion() {
-  if (_NXVersionMaintenancePatch == -1)
-    _parseNXVersion();
-  return _NXVersionMaintenancePatch;
-}
diff --git a/nxcomp/WriteBuffer.cpp b/nxcomp/WriteBuffer.cpp
deleted file mode 100644
index 07d14fc30..000000000
--- a/nxcomp/WriteBuffer.cpp
+++ /dev/null
@@ -1,496 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include <stddef.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include "Misc.h"
-#include "Control.h"
-
-#include "WriteBuffer.h"
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-WriteBuffer::WriteBuffer()
-{
-  size_   = WRITE_BUFFER_DEFAULT_SIZE;
-  buffer_ = new unsigned char[size_];
-  length_ = 0;
-  index_  = NULL;
-
-  scratchLength_ = 0;
-  scratchBuffer_ = NULL;
-  scratchOwner_  = 1;
-
-  initialSize_   = WRITE_BUFFER_DEFAULT_SIZE;
-  thresholdSize_ = WRITE_BUFFER_DEFAULT_SIZE << 1;
-  maximumSize_   = WRITE_BUFFER_DEFAULT_SIZE << 4;
-
-  #ifdef VALGRIND
-
-  memset(buffer_, '\0', size_);
-
-  #endif
-}
-
-WriteBuffer::~WriteBuffer()
-{
-  if (scratchOwner_ == 1 &&
-          scratchBuffer_ != NULL)
-  {
-    delete [] scratchBuffer_;
-  }
-
-  delete [] buffer_;
-}
-
-void WriteBuffer::setSize(unsigned int initialSize, unsigned int thresholdSize,
-                              unsigned int maximumSize)
-{
-  initialSize_   = initialSize;
-  thresholdSize_ = thresholdSize;
-  maximumSize_   = maximumSize;
-
-  #ifdef TEST
-  *logofs << "WriteBuffer: Set buffer sizes to "
-          << initialSize_ << "/" << thresholdSize_
-          << "/" << maximumSize_ << ".\n"
-          << logofs_flush;
-  #endif
-}
-
-void WriteBuffer::partialReset()
-{
-  if (scratchBuffer_ != NULL)
-  {
-    if (scratchOwner_)
-    {
-      #ifdef DEBUG
-      *logofs << "WriteBuffer: Going to delete "
-              << scratchLength_ << " bytes from the "
-              << "scratch buffer.\n" << logofs_flush;
-      #endif
-
-      delete [] scratchBuffer_;
-    }
-
-    scratchLength_ = 0;
-    scratchBuffer_ = NULL;
-    scratchOwner_  = 1;
-  }
-
-  length_ = 0;
-  index_  = NULL;
-
-  #ifdef DEBUG
-  *logofs << "WriteBuffer: Performed partial reset with "
-          << size_ << " bytes in buffer.\n"
-          << logofs_flush;
-  #endif
-}
-
-void WriteBuffer::fullReset()
-{
-  if (scratchBuffer_ != NULL)
-  {
-    if (scratchOwner_ == 1)
-    {
-      #ifdef DEBUG
-      *logofs << "WriteBuffer: Going to delete "
-              << scratchLength_ << " bytes from the "
-              << "scratch buffer.\n" << logofs_flush;
-      #endif
-
-      delete [] scratchBuffer_;
-    }
-
-    scratchLength_ = 0;
-    scratchBuffer_ = NULL;
-    scratchOwner_  = 1;
-  }
-
-  length_ = 0;
-  index_  = NULL;
-
-  if (size_ > initialSize_)
-  {
-    #ifdef TEST
-    *logofs << "WriteBuffer: Reallocating a new buffer of "
-            << initialSize_ << " bytes.\n" << logofs_flush;
-    #endif
-
-    delete [] buffer_;
-
-    size_ = initialSize_;
-
-    buffer_ = new unsigned char[size_];
-
-    if (buffer_ == NULL)
-    {
-      #ifdef PANIC
-      *logofs << "WriteBuffer: PANIC! Can't allocate memory for "
-              << "X messages in context [A].\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Can't allocate memory for "
-           << "X messages in context [A].\n";
-
-      HandleAbort();
-    }
-
-    #ifdef VALGRIND
-
-    memset(buffer_, '\0', size_);
-
-    #endif
-  }
-
-  #ifdef DEBUG
-  *logofs << "WriteBuffer: Performed full reset with "
-          << size_ << " bytes in buffer.\n"
-          << logofs_flush;
-  #endif
-}
-
-unsigned char *WriteBuffer::addMessage(unsigned int numBytes)
-{
-  #ifdef DEBUG
-  *logofs << "WriteBuffer: Adding " << numBytes << " bytes to "
-          << length_ << " bytes already in buffer.\n"
-          << logofs_flush;
-  #endif
-
-  if (numBytes > WRITE_BUFFER_OVERFLOW_SIZE)
-  {
-    #ifdef PANIC
-    *logofs << "WriteBuffer: PANIC! Can't add a message of "
-            << numBytes << " bytes.\n" << logofs_flush;
-
-    *logofs << "WriteBuffer: PANIC! Assuming error handling "
-            << "data in context [B].\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Can't add a message of "
-         << numBytes << " bytes to write buffer.\n";
-
-    cerr << "Error" << ": Assuming error handling "
-         << "data in context [B].\n";
-
-    HandleAbort();
-  }
-  else if (length_ + numBytes > size_)
-  {
-    unsigned int newSize = thresholdSize_;
-
-    while (newSize < length_ + numBytes)
-    {
-      newSize <<= 1;
-
-      if (newSize > maximumSize_)
-      {
-        newSize = length_ + numBytes + initialSize_;
-      }
-    }
-
-    #ifdef TEST
-    *logofs << "WriteBuffer: Growing buffer from "
-            << size_ << " to " << newSize << " bytes.\n"
-            << logofs_flush;
-    #endif
-
-    unsigned int indexOffset = 0;
-
-    if (index_ && *index_)
-    {
-      indexOffset = *index_ - buffer_;
-    }
-
-    size_ = newSize;
-
-    unsigned char *newBuffer = new unsigned char[size_];
-
-    if (newBuffer == NULL)
-    {
-      #ifdef PANIC
-      *logofs << "WriteBuffer: PANIC! Can't allocate memory for "
-              << "X messages in context [C].\n" << logofs_flush;
-      #endif
-
-      cerr << "Error" << ": Can't allocate memory for "
-           << "X messages in context [C].\n";
-
-      HandleAbort();
-    }
-
-    #ifdef TEST
-    if (newSize >= maximumSize_)
-    {
-      *logofs << "WriteBuffer: WARNING! Buffer grown to reach "
-              << "size of " << newSize << " bytes.\n"
-              << logofs_flush;
-    }
-    #endif
-
-    #ifdef VALGRIND
-
-    memset(newBuffer, '\0', size_);
-
-    #endif
-
-    memcpy(newBuffer, buffer_, length_);
-
-    #ifdef DEBUG
-    *logofs << "WriteBuffer: Going to delete the "
-            << "old buffer with new size " << size_
-            << ".\n" << logofs_flush;
-    #endif
-
-    delete [] buffer_;
-
-    buffer_ = newBuffer;
-
-    if (index_ && *index_)
-    {
-      *index_ = buffer_ + indexOffset;
-    }
-  }
-
-  unsigned char *result = buffer_ + length_;
-
-  length_ += numBytes;
-
-  #ifdef DEBUG
-  *logofs << "WriteBuffer: Bytes in buffer are "
-          << length_ << " while size is " << size_
-          << ".\n" << logofs_flush;
-  #endif
-
-  return result;
-}
-
-unsigned char *WriteBuffer::removeMessage(unsigned int numBytes)
-{
-  #ifdef TEST
-  *logofs << "WriteBuffer: Removing " << numBytes
-          << " bytes from buffer.\n" << logofs_flush;
-  #endif
-
-  if (numBytes > length_)
-  {
-    #ifdef PANIC
-    *logofs << "WriteBuffer: PANIC! Can't remove "
-            << numBytes << " bytes with only " << length_
-            << " bytes in buffer.\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Buffer underflow handling "
-         << "write buffer in context [D].\n";
-
-    HandleAbort();
-  }
-
-  length_ -= numBytes;
-
-  #ifdef TEST
-  *logofs << "WriteBuffer: Bytes in buffer are now "
-          << length_ << " while size is "
-          << size_ << ".\n" << logofs_flush;
-  #endif
-
-  return (buffer_ + length_);
-}
-
-unsigned char *WriteBuffer::addScratchMessage(unsigned int numBytes)
-{
-  if (numBytes > WRITE_BUFFER_OVERFLOW_SIZE)
-  {
-    #ifdef PANIC
-    *logofs << "WriteBuffer: PANIC! Can't add a message of "
-            << numBytes << " bytes.\n" << logofs_flush;
-
-    *logofs << "WriteBuffer: PANIC! Assuming error handling "
-            << "data in context [E].\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Can't add a message of "
-         << numBytes << " bytes to write buffer.\n";
-
-    cerr << "Error" << ": Assuming error handling "
-         << "data in context [E].\n";
-
-    HandleAbort();
-  }
-  else if (scratchBuffer_ != NULL)
-  {
-    #ifdef PANIC
-    *logofs << "WriteBuffer: PANIC! Can't add a message of "
-            << numBytes << " bytes with " << scratchLength_
-            << " bytes already in scratch buffer.\n"
-            << logofs_flush;
-
-    *logofs << "WriteBuffer: PANIC! Assuming error handling "
-            << "data in context [F].\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Can't add a message of "
-         << numBytes << " bytes with " << scratchLength_
-         << " bytes already in scratch buffer.\n";
-
-    cerr << "Error" << ": Assuming error handling "
-         << "data in context [F].\n";
-
-    HandleAbort();
-  }
-
-  #ifdef DEBUG
-  *logofs << "WriteBuffer: Adding " << numBytes << " bytes "
-          << "to scratch buffer.\n" << logofs_flush;
-  #endif
-
-  unsigned char *newBuffer = new unsigned char[numBytes];
-
-  if (newBuffer == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "WriteBuffer: PANIC! Can't allocate memory for "
-            << "X messages in context [G].\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Can't allocate memory for "
-         << "X messages in context [G].\n";
-
-    HandleAbort();
-  }
-
-  #ifdef VALGRIND
-
-  memset(newBuffer, '\0', numBytes);
-
-  #endif
-
-  scratchBuffer_ = newBuffer;
-  scratchOwner_  = 1;
-  scratchLength_ = numBytes;
-
-  return newBuffer;
-}
-
-unsigned char *WriteBuffer::addScratchMessage(unsigned char *newBuffer, unsigned int numBytes)
-{
-  if (numBytes > WRITE_BUFFER_OVERFLOW_SIZE)
-  {
-    #ifdef PANIC
-    *logofs << "WriteBuffer: PANIC! Can't add a message of "
-            << numBytes << " bytes.\n" << logofs_flush;
-
-    *logofs << "WriteBuffer: PANIC! Assuming error handling "
-            << "data in context [H].\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Can't add a message of "
-         << numBytes << " bytes to write buffer.\n";
-
-    cerr << "Error" << ": Assuming error handling "
-         << "data in context [H].\n";
-
-    HandleAbort();
-  }
-  else if (scratchBuffer_ != NULL)
-  {
-    #ifdef PANIC
-    *logofs << "WriteBuffer: PANIC! Can't add a foreign "
-            << "message of " << numBytes << " bytes with "
-            << scratchLength_ << " bytes already in "
-            << "scratch buffer.\n" << logofs_flush;
-
-    *logofs << "WriteBuffer: PANIC! Assuming error handling "
-            << "data in context [I].\n" << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Can't add a foreign message of "
-         << numBytes << " bytes with " << scratchLength_
-         << " bytes already in scratch buffer.\n";
-
-    cerr << "Error" << ": Assuming error handling "
-         << "data in context [I].\n";
-
-    HandleAbort();
-  }
-
-  #ifdef DEBUG
-  *logofs << "WriteBuffer: Adding " << numBytes << " bytes "
-          << "from a foreign message to scratch buffer.\n"
-          << logofs_flush;
-  #endif
-
-  scratchBuffer_ = newBuffer;
-  scratchLength_ = numBytes;
-  scratchOwner_  = 0;
-
-  return newBuffer;
-}
-
-void WriteBuffer::removeScratchMessage()
-{
-  #ifdef TEST
-
-  if (scratchLength_ == 0 || scratchBuffer_ == NULL)
-  {
-    #ifdef PANIC
-    *logofs << "WriteBuffer: PANIC! Can't remove non existent scratch message.\n"
-            << logofs_flush;
-    #endif
-
-    cerr << "Error" << ": Can't remove non existent scratch message.\n";
-
-    HandleAbort();
-  }
-
-  *logofs << "WriteBuffer: Removing " << scratchLength_
-          << " bytes from scratch buffer.\n"
-          << logofs_flush;
-
-  #endif
-
-  if (scratchOwner_ == 1)
-  {
-    #ifdef DEBUG
-    *logofs << "WriteBuffer: Going to delete "
-           << scratchLength_ << " bytes from the "
-            << "scratch buffer.\n" << logofs_flush;
-    #endif
-
-    delete [] scratchBuffer_;
-  }
-
-  scratchLength_ = 0;
-  scratchBuffer_ = NULL;
-  scratchOwner_  = 1;
-}
diff --git a/nxcomp/WriteBuffer.h b/nxcomp/WriteBuffer.h
deleted file mode 100644
index ce408e210..000000000
--- a/nxcomp/WriteBuffer.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef WriteBuffer_H
-#define WriteBuffer_H
-
-#include "Misc.h"
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-#define WRITE_BUFFER_DEFAULT_SIZE         16384
-
-//
-// Adjust for the biggest reply that we could receive.
-// This is likely to be a reply to a X_ListFonts where
-// user has a large amount of installed fonts.
-//
-
-#define WRITE_BUFFER_OVERFLOW_SIZE        4194304
-
-class WriteBuffer
-{
-  public:
-
-  WriteBuffer();
-
-  ~WriteBuffer();
-
-  void setSize(unsigned int initialSize, unsigned int thresholdSize,
-                   unsigned int maximumSize);
-
-  unsigned char *addMessage(unsigned int numBytes);
-
-  unsigned char *removeMessage(unsigned int numBytes);
-
-  unsigned char *addScratchMessage(unsigned int numBytes);
-
-  //
-  // This form allows user to provide its own
-  // buffer as write buffer's scratch area.
-  //
-
-  unsigned char *addScratchMessage(unsigned char *newBuffer, unsigned int numBytes);
-
-  void removeScratchMessage();
-
-  void partialReset();
-
-  void fullReset();
-
-  unsigned char *getData() const
-  {
-    return buffer_;
-  }
-
-  unsigned int getLength() const
-  {
-    return length_;
-  }
-
-  unsigned int getAvailable() const
-  {
-    return (size_ - length_);
-  }
-
-  unsigned char *getScratchData() const
-  {
-    return scratchBuffer_;
-  }
-
-  unsigned int getScratchLength() const
-  {
-    return scratchLength_;
-  }
-
-  unsigned int getTotalLength() const
-  {
-    return (length_ + scratchLength_);
-  }
-
-  void registerPointer(unsigned char **pointer)
-  {
-    index_ = pointer;
-  }
-
-  void unregisterPointer()
-  {
-    index_ = 0;
-  }
-
-  private:
-
-  unsigned int size_;
-  unsigned int length_;
-
-  unsigned char *buffer_;
-  unsigned char **index_;
-
-  unsigned int  scratchLength_;
-  unsigned char *scratchBuffer_;
-
-  int scratchOwner_;
-
-  unsigned int initialSize_;
-  unsigned int thresholdSize_;
-  unsigned int maximumSize_;
-};
-
-#endif /* WriteBuffer_H */
diff --git a/nxcomp/XidCache.cpp b/nxcomp/XidCache.cpp
deleted file mode 100644
index 0f83d388f..000000000
--- a/nxcomp/XidCache.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "Control.h"
-
-#include "XidCache.h"
-
-XidCache::XidCache()
-{
-  for (int i = 0; i < 256; i++)
-  {
-    base_[i] = new IntCache(8);
-  }
-
-  slot_ = 0;
-  last_ = 0;
-}
-
-XidCache::~XidCache()
-{
-  for (int i = 0; i < 256; i++)
-  {
-    delete base_[i];
-  }
-}
diff --git a/nxcomp/XidCache.h b/nxcomp/XidCache.h
deleted file mode 100644
index 8a09ef9b1..000000000
--- a/nxcomp/XidCache.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef XidCache_H
-#define XidCache_H
-
-#include "IntCache.h"
-
-class XidCache
-{
-  friend class EncodeBuffer;
-  friend class DecodeBuffer;
-  
-  public:
-
-  XidCache();
-  ~XidCache();
-
-  private:
-
-  IntCache *base_[256];
-
-  unsigned int slot_;
-  unsigned int last_;
-};
-
-#endif /* XidCache_H */
diff --git a/nxcomp/Z.cpp b/nxcomp/Z.cpp
deleted file mode 100644
index 35850b9d0..000000000
--- a/nxcomp/Z.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "Z.h"
-#include "Misc.h"
-
-int ZCompress(z_stream *stream, unsigned char *dest, unsigned int *destLen,
-                  const unsigned char *source, unsigned int sourceLen)
-{
-  //
-  // Deal with the possible overflow.
-  //
-
-  if (stream -> total_out & 0x80000000)
-  {
-    #ifdef TEST
-    *logofs << "ZCompress: Reset stream counters with "
-            << "total in " << stream -> total_in
-            << " and total out " << stream -> total_out
-            << ".\n" << logofs_flush;
-    #endif
-
-    stream -> total_in  = 0;
-    stream -> total_out = 0;
-  }
-
-  unsigned int saveOut = stream -> total_out;
-
-  stream -> next_in  = (Bytef *) source;
-  stream -> avail_in = sourceLen;
-
-  //
-  // Check if the source is bigger than
-  // 64K on 16-bit machine.
-  //
-
-  #ifdef MAXSEG_64K
-
-  if ((uLong) stream -> avail_in != sourceLen) return Z_BUF_ERROR;
-
-  #endif
-
-  stream -> next_out  = dest;
-  stream -> avail_out = *destLen;
-
-  #ifdef MAXSEG_64K
-
-  if ((uLong) stream -> avail_out != *destLen) return Z_BUF_ERROR;
-
-  #endif
-
-  int result = deflate(stream, Z_FINISH);
-
-  if (result != Z_STREAM_END)
-  {
-    deflateReset(stream);
-
-    return (result == Z_OK ? Z_BUF_ERROR : result);
-  }
-
-  *destLen = stream -> total_out - saveOut;
-
-  result = deflateReset(stream);
-
-  return result;
-}
-
-int ZDecompress(z_stream *stream, unsigned char *dest, unsigned int *destLen,
-                    const unsigned char *source, unsigned int sourceLen)
-{
-  stream -> next_in  = (Bytef *) source;
-  stream -> avail_in = sourceLen;
-
-  //
-  // Deal with the possible overflow.
-  //
-
-  if (stream -> total_out & 0x80000000)
-  {
-    #ifdef TEST
-    *logofs << "ZDecompress: Reset stream counters with "
-            << "total in " << stream -> total_in
-            << " and total out " << stream -> total_out
-            << ".\n" << logofs_flush;
-    #endif
-
-    stream -> total_in  = 0;
-    stream -> total_out = 0;
-  }
-
-  unsigned int saveOut = stream -> total_out;
-
-  if (stream -> avail_in != sourceLen)
-  {
-    return Z_BUF_ERROR;
-  }
-
-  stream -> next_out  = dest;
-  stream -> avail_out = *destLen;
-
-  if (stream -> avail_out != *destLen)
-  {
-    return Z_BUF_ERROR;
-  }
-
-  int result = inflate(stream, Z_FINISH);
-
-  if (result != Z_STREAM_END)
-  {
-    inflateReset(stream);
-
-    return (result == Z_OK ? Z_BUF_ERROR : result);
-  }
-
-  *destLen = stream -> total_out - saveOut;
-
-  result = inflateReset(stream);
-
-  return result;
-}
diff --git a/nxcomp/Z.h b/nxcomp/Z.h
deleted file mode 100644
index 3a6d684c2..000000000
--- a/nxcomp/Z.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef Z_H
-#define Z_H
-
-#include <zlib.h>
-
-int ZCompress(z_stream *stream, unsigned char *dest, unsigned int *destLen,
-                  const unsigned char *source, unsigned int sourceLen);
-
-int ZDecompress(z_stream *stream, unsigned char *dest, unsigned int *destLen,
-                    const unsigned char *source, unsigned int sourceLen);
-
-#endif /* Z_H */
diff --git a/nxcomp/configure.ac b/nxcomp/configure.ac
new file mode 100644
index 000000000..87087f32d
--- /dev/null
+++ b/nxcomp/configure.ac
@@ -0,0 +1,83 @@
+# ***************************************************************************
+# *** configure.ac for nxcomp                                         ***
+# ***************************************************************************
+
+m4_define([nxcomp_version], m4_esyscmd([tr -d '\n' < VERSION]))
+
+# Initialize Autoconf
+AC_PREREQ(2.60)
+
+AC_INIT([libXcomp], [nxcomp_version], [https://github.com/ArcticaProject/nx-libs/issues])
+AC_CONFIG_AUX_DIR([build-aux])
+AC_PROG_CXX
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
+
+AM_INIT_AUTOMAKE([foreign no-dist-gzip dist-xz])
+
+# Initialize libtool
+AC_PROG_LIBTOOL
+
+COMP_VERSION=nxcomp_version
+AC_SUBST([COMP_VERSION])
+
+LT_COMP_VERSION=[`echo $COMP_VERSION | sed -r -e 's/^([0-9]+\.[0-9]+\.[0-9]+).*$/\1/' -e 's/\./:/g'`] 
+AC_SUBST([LT_COMP_VERSION])
+
+PKG_CHECK_MODULES(JPEG, libjpeg)
+PKG_CHECK_MODULES(PNG, libpng)
+PKG_CHECK_MODULES(Z, zlib)
+
+# Upstream's pkg.m4 (since 0.27) offers this now, but define our own
+# compatible version in case the local version of pkgconfig isn't new enough.
+# https://bugs.freedesktop.org/show_bug.cgi?id=48743
+m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR],
+         [AC_ARG_WITH([pkgconfigdir],
+                      [AS_HELP_STRING([--with-pkgconfigdir],
+                      [install directory for nxcompshad.pc pkg-config file])],
+                       [],[with_pkgconfigdir='$(libdir)/pkgconfig'])
+          AC_SUBST([pkgconfigdir], [${with_pkgconfigdir}])])
+
+AC_LANG([C++])
+NX_COMPILER_BRAND
+NX_COMPILER_FLAGS
+
+NX_BUILD_ON_CYGWIN32
+NX_BUILD_ON_AMD64
+NX_BUILD_ON_DARWIN
+NX_BUILD_ON_SUN
+NX_BUILD_ON_FreeBSD
+
+# Build PIC libraries.
+
+if test "$CYGWIN32" != yes -a "$DARWIN" != yes; then
+  CXXFLAGS="$CXXFLAGS -fPIC"
+  CFLAGS="$CFLAGS -fPIC"
+fi
+
+# On FreeBSD search libraries and includes under /usr/local.
+
+if test "$FreeBSD" = yes; then
+  LIBS="$LIBS -L/usr/local/lib"
+  CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+fi
+
+NX_HAS_INADDRT
+
+# If in_addr_t is not defined use unsigned int.
+
+if test "$INADDRT" != yes ; then
+  echo -e "using unsigned int for type in_addr_t"
+  CPPFLAGS="$CPPFLAGS -DIN_ADDR_T=unsigned"
+else
+  CPPFLAGS="$CPPFLAGS -DIN_ADDR_T=in_addr_t"
+fi
+
+AC_CONFIG_FILES([
+Makefile
+src/Makefile
+nxcomp.pc
+])
+
+AC_OUTPUT
diff --git a/nxcomp/configure.in b/nxcomp/configure.in
deleted file mode 100644
index 8be604836..000000000
--- a/nxcomp/configure.in
+++ /dev/null
@@ -1,413 +0,0 @@
-dnl /**************************************************************************/
-dnl /*                                                                        */
-dnl /* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-dnl /* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-dnl /* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-dnl /* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-dnl /* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-dnl /* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-dnl /*                                                                        */
-dnl /* NXCOMP, NX protocol compression and NX extensions to this software     */
-dnl /* are copyright of the aforementioned persons and companies.             */
-dnl /*                                                                        */
-dnl /* Redistribution and use of the present software is allowed according    */
-dnl /* to terms specified in the file LICENSE.nxcomp which comes in the       */
-dnl /* source distribution.                                                   */
-dnl /*                                                                        */
-dnl /* All rights reserved.                                                   */
-dnl /*                                                                        */
-dnl /* NOTE: This software has received contributions from various other      */
-dnl /* contributors, only the core maintainers and supporters are listed as   */
-dnl /* copyright holders. Please contact us, if you feel you should be listed */
-dnl /* as copyright holder, as well.                                          */
-dnl /*                                                                        */
-dnl /**************************************************************************/
-
-
-dnl Process this file with autoconf to produce a configure script.
-
-dnl Prolog
-
-AC_INIT(NX.h)
-AC_PREREQ(2.13)
-
-pkgconfigdir=${libdir}/pkgconfig
-AC_SUBST(pkgconfigdir)
-
-dnl Set our default compilation flags.
-
-if test "x$CXXFLAGS" = "x"; then
-  CXXFLAGS="-O3 -fno-rtti -fno-exceptions"
-fi
-if test "x$CFLAGS" = "x"; then
-  CFLAGS="$CFLAGS -O3"
-fi
-
-dnl Reset default linking directives.
-
-LIBSTATIC=""
-LIBSHARED=""
-
-dnl Prefer headers and libraries from nx-X11, if present.
-
-if test -d "../nx-X11/include" ; then
-    CXXFLAGS="$CXXFLAGS -I../nx-X11/exports/include"
-    CFLAGS="$CFLAGS -I../nx-X11/exports/include"
-    LIBS="$LIBS -L../nx-X11/exports/lib"
-fi
-
-dnl Check whether --with-ipaq was given.
-
-if test "${with_ipaq}" = yes; then
-  echo -e "enabling IPAQ configuration"
-  CXX="arm-linux-c++"
-  CC="arm-linux-gcc"
-  unset ac_cv_prog_armcxx
-  unset ac_cv_prog_armcc
-  unset ac_cv_prog_CXXCPP
-  AC_CHECK_PROG([armcxx],["$CXX"],[yes],[no],[$PATH])
-  AC_CHECK_PROG([armcc],["$CC"],[yes],[no],[$PATH])
-  if test $armcxx = "yes" && test $armcc = "yes" ; then
-    ac_cv_prog_CXX="$CXX"
-    ac_cv_prog_CC="$CC"
-  else
-    AC_MSG_ERROR(Installation or configuration problem. Cannot find compiler for arm-linux.)
-  fi
-else
-  unset ac_cv_prog_CXX
-  unset ac_cv_prog_CC
-  unset ac_cv_prog_CXXCPP
-fi  
-
-dnl Check for programs.
-
-AC_PROG_CXX
-AC_PROG_CC
-AC_LANG_CPLUSPLUS
-
-dnl Check whether option -Wno-deprecated
-dnl is needed by GCC compiler.
-
-AC_MSG_CHECKING([whether compiler needs -Wno-deprecated])
-gcc_version=`${CC} --version | grep 'gcc (GCC) [[3-4]].' | head -n 1`
-case "${gcc_version}" in
-     gcc*)
-        AC_MSG_RESULT([yes])
-        CXXFLAGS="$CXXFLAGS -Wno-deprecated"
-        ;;
-
-     *)
-        AC_MSG_RESULT([no])
-        ;;
-esac
-
-AC_MSG_CHECKING([whether compiler accepts -Wmissing-declarations])
-gcc_version=`${CC} --version | grep 'gcc (GCC) [[3-4]].' | head -n 1`
-case "${gcc_version}" in
-     gcc*)
-        AC_MSG_RESULT([no])
-        ;;
-
-     *)
-        AC_MSG_RESULT([yes])
-        CXXFLAGS="$CXXFLAGS -Wmissing-declarations"
-        ;;
-esac
-
-dnl Check for BSD compatible install.
-
-AC_PROG_INSTALL
-
-dnl Check for extra header files.
-
-AC_PATH_XTRA
-
-dnl Custom addition.
-
-ac_help="$ac_help
-  --with-symbols          add the -g flag to produce the debug symbols
-  --with-use-malloc       add the __USE_MALLOC flag to avoid the STL allocators
-  --with-info             define INFO at compile time to get basic log output
-  --with-valgrind         clean up allocated buffers to avoid valgrind warnings
-  --with-version          use this version for produced libraries
-
-  --with-static-png       enable static linking of PNG library
-  --with-static-jpeg      enable static linking of JPEG library
-  --with-static-z         enable static linking of Z library"
-
-dnl Check to see if we're running under Cygwin32.
-
-AC_DEFUN(nxconf_CYGWIN32,
-[AC_CACHE_CHECK(for Cygwin32 environment, nxconf_cv_cygwin32,
-[AC_TRY_COMPILE(,[return __CYGWIN32__;],
-nxconf_cv_cygwin32=yes, nxconf_cv_cygwin32=no)
-rm -f conftest*])
-CYGWIN32=
-test "$nxconf_cv_cygwin32" = yes && CYGWIN32=yes])
-nxconf_CYGWIN32
-
-dnl Check whether we're building on a AMD64.
-
-AC_DEFUN(nxconf_AMD64,
-[AC_CACHE_CHECK(for Amd64 environment, nxconf_cv_amd64,
-[AC_TRY_COMPILE(,[return (__amd64__ || __x86_64__);],
-nxconf_cv_amd64=yes, nxconf_cv_amd64=no)
-rm -f conftest*])
-AMD64=
-test "$nxconf_cv_amd64" = yes && AMD64=yes])
-nxconf_AMD64
-
-dnl Check for Darwin environment.
-
-AC_DEFUN(nxconf_DARWIN,
-[AC_CACHE_CHECK(for Darwin environment, nxconf_cv_darwin,
-[AC_TRY_COMPILE(,[return __APPLE__;],
-nxconf_cv_darwin=yes, nxconf_cv_darwin=no)
-rm -f conftest*])
-DARWIN=
-test "$nxconf_cv_darwin" = yes && DARWIN=yes])
-nxconf_DARWIN
-
-dnl Check to see if we're running under Solaris.
-
-AC_DEFUN(nxconf_SUN,
-[AC_CACHE_CHECK(for Solaris environment, nxconf_cv_sun,
-[AC_TRY_COMPILE(,[return __sun;],
-nxconf_cv_sun=yes, nxconf_cv_sun=no)
-rm -f conftest*])
-SUN=
-test "$nxconf_cv_sun" = yes && SUN=yes])
-nxconf_SUN
-
-dnl Check to see if we're running under FreeBSD.
-
-AC_DEFUN(nxconf_FreeBSD,
-[AC_CACHE_CHECK(for FreeBSD environment, nxconf_cv_freebsd,
-[AC_TRY_COMPILE(,[return __FreeBSD__;],
-nxconf_cv_freebsd=yes, nxconf_cv_freebsd=no)
-rm -f conftest*])
-FreeBSD=
-test "$nxconf_cv_freebsd" = yes && FreeBSD=yes])
-nxconf_FreeBSD
-
-dnl Build PIC libraries.
-
-if test "$CYGWIN32" != yes -a "$DARWIN" != yes; then
-  CXXFLAGS="$CXXFLAGS -fPIC"
-  CFLAGS="$CFLAGS -fPIC"
-fi
-
-dnl Solaris requires the socket and gcc_s libs explicitly linked.
-dnl Note also that headers from default /usr/openwin/include/X11
-dnl cause a warning due to pragma in Xmd.h.
-
-if test "$SUN" = yes; then
-  LIBS="$LIBS -L/usr/sfw/lib -lsocket "
-  CXXFLAGS="$CXXFLAGS -I/usr/sfw/include"
-  CFLAGS="$CFLAGS -I/usr/sfw/include"
-fi
-
-dnl On FreeBSD search libraries and includes under /usr/local.
-
-if test "$FreeBSD" = yes; then
-  LIBS="$LIBS -L/usr/local/lib"
-  CXXFLAGS="$CXXFLAGS -I/usr/local/include"
-  CFLAGS="$CFLAGS -I/usr/local/include"
-fi
-
-dnl Under Darwin we don't have support for -soname option and
-dnl we need the -dynamiclib flag. Under Solaris, instead, we need
-dnl the options -G -h.
-
-if test "$DARWIN" = yes; then
-  LDFLAGS="$LDFLAGS -dynamiclib"
-elif test "$SUN" = yes; then
-  LDFLAGS="$LDFLAGS -G -h \$(LIBLOAD)"
-else
-  LDFLAGS="$LDFLAGS -Wl,-soname,\$(LIBLOAD)"
-fi
-
-dnl Check to see if in_addr_t is defined.
-dnl Could use a specific configure test.
-
-AC_DEFUN(nxconf_INADDRT,
-[AC_CACHE_CHECK(for in_addr_t, nxconf_cv_inaddrt,
-[AC_TRY_COMPILE([#include <netinet/in.h>],[in_addr_t t; t = 1; return t;],
-nxconf_cv_inaddrt=yes, nxconf_cv_inaddrt=no)
-rm -f conftest*])
-INADDRT=
-test "$nxconf_cv_inaddrt" = yes && INADDRT=yes])
-nxconf_INADDRT
-
-dnl If in_addr_t is not defined use unsigned int.
-
-if test "$INADDRT" != yes ; then
-  echo -e "using unsigned int for type in_addr_t"
-  CXXFLAGS="$CXXFLAGS -DIN_ADDR_T=unsigned"
-  CFLAGS="$CFLAGS -DIN_ADDR_T=unsigned"
-else
-  CXXFLAGS="$CXXFLAGS -DIN_ADDR_T=in_addr_t"
-  CFLAGS="$CFLAGS -DIN_ADDR_T=in_addr_t"
-fi
-
-dnl Check whether --with-version was given.
-
-AC_SUBST(LIBVERSION)
-AC_SUBST(VERSION)
-if test "${with_version}" = yes; then
-  VERSION=${ac_option}
-else
-  VERSION=`cat VERSION`
-fi
-echo -e "compiling version ${VERSION}"
-
-LIBVERSION=`echo ${VERSION} | cut -d '.' -f 1`
-
-CXXFLAGS="$CXXFLAGS -DVERSION=\\\"${VERSION}\\\""
-CFLAGS="$CFLAGS -DVERSION=\\\"${VERSION}\\\""
-
-dnl Check whether --with-static-png was given and
-dnl add -lpng or libpng.a to linking.
-
-if test "${with_static_png}" = yes; then
-  echo -e "enabling static linking of PNG library"
-  if test "$SUN" = yes && test -f "/usr/sfw/lib/libpng.a"; then
-    LIBSTATIC="$LIBSTATIC /usr/sfw/lib/libpng.a"
-  else
-    if test -f "/usr/lib/libpng.a" ; then
-      LIBSTATIC="$LIBSTATIC /usr/lib/libpng.a"
-    else
-      if test -f "/usr/local/lib/libpng.a" ; then
-        echo -e "assuming libpng.a in /usr/local/lib"
-        LIBSTATIC="$LIBSTATIC /usr/local/lib/libpng.a"
-      else
-        echo -e "Warning: assuming libpng.a in the local path"
-        LIBSTATIC="$LIBSTATIC libpng.a"
-      fi
-    fi
-  fi
-else
-  echo -e "enabling dynamic linking of PNG library"
-  LIBSHARED="$LIBSHARED -lpng"
-fi
-
-dnl Check whether --with-static-jpeg was given and
-dnl add -ljpeg or libjpeg.a to linking.
-
-if test "${with_static_jpeg}" = yes; then
-  echo -e "enabling static linking of JPEG library"
-  if test "$SUN" = yes && test -f "/usr/sfw/lib/libjpeg.a"; then
-    LIBSTATIC="$LIBSTATIC /usr/sfw/lib/libjpeg.a"
-  else
-    if test -f "/usr/lib/libjpeg.a" ; then
-      LIBSTATIC="$LIBSTATIC /usr/lib/libjpeg.a"
-    else
-      if test -f "/usr/local/lib/libjpeg.a" ; then
-        echo -e "assuming libjpeg.a in /usr/local/lib"
-        LIBSTATIC="$LIBSTATIC /usr/local/lib/libjpeg.a"
-      else
-        echo -e "Warning: assuming libjpeg.a in the local path"
-        LIBSTATIC="$LIBSTATIC libjpeg.a"
-      fi
-    fi
-  fi
-else
-  echo -e "enabling dynamic linking of JPEG library"
-  LIBSHARED="$LIBSHARED -ljpeg"
-fi
-
-dnl Check whether --with-static-z was given and
-dnl add -lz or libz.a to linking.
-
-if test "${with_static_z}" = yes; then
-  echo -e "enabling static linking of Z library"
-  if test "$SUN" = yes && test -f "/usr/sfw/lib/libz.a"; then
-    LIBSTATIC="$LIBSTATIC /usr/sfw/lib/libz.a"
-  else
-    if test -f "/usr/lib/libz.a" ; then
-      LIBSTATIC="$LIBSTATIC /usr/lib/libz.a"
-    else
-      if test -f "/usr/local/lib/libz.a" ; then
-        echo -e "assuming libz.a in /usr/local/lib"
-        LIBSTATIC="$LIBSTATIC /usr/local/lib/libz.a"
-      else
-        echo -e "Warning: assuming libz.a in the local path"
-        LIBSTATIC="$LIBSTATIC libz.a"
-      fi
-    fi
-  fi
-else
-  echo -e "enabling dynamic linking of Z library"
-  LIBSHARED="$LIBSHARED -lz"
-fi
-
-dnl Finally compose the LIB variable.
-
-if test "$DARWIN" = yes ; then
-  LIBS="$LIBS $LIBSTATIC $LIBSHARED"
-elif test "$SUN" = yes ; then
-  LIBS="$LIBS $LIBSTATIC $LIBSHARED"
-else
-  LIBS="$LIBS $LIBSTATIC -shared $LIBSHARED"
-fi
-
-dnl Check whether --with-symbols or --without-symbols was
-dnl given and set the required optimization level.
-
-if test "${with_symbols}" = yes; then
-  echo -e "enabling production of debug symbols"
-  CXXFLAGS="-g $CXXFLAGS"
-  CFLAGS="-g $CFLAGS"
-else
-  echo -e "disabling production of debug symbols"
-fi
-
-dnl Check whether --with-use-malloc or --without-use-malloc
-dnl was given.
-
-if test "${with_use_malloc}" = yes; then
-  echo -e "disabling use of the STL allocators"
-  CXXFLAGS="$CXXFLAGS -D__USE_MALLOC"
-else
-  echo -e "enabling use of the STL allocators"
-fi
-
-dnl Check whether --with-info or --without-info was given.
-
-if test "${with_info}" = yes; then
-  echo -e "enabling info output in the log file"
-  CXXFLAGS="$CXXFLAGS -DINFO"
-  CFLAGS="$CFLAGS -DINFO"
-else
-  echo -e "disabling info output in the log file"
-fi
-
-dnl Check whether --with-valgrind or --without-valgrind was given.
-
-if test "${with_valgrind}" = yes; then
-  echo -e "enabling valgrind memory checker workarounds"
-  CXXFLAGS="$CXXFLAGS -DVALGRIND"
-  CFLAGS="$CFLAGS -DVALGRIND"
-else
-  echo -e "disabling valgrind memory checker workarounds"
-fi
-
-dnl Find makedepend somewhere.
-
-AC_SUBST(MAKEDEPEND)
-MAKEDEPEND="$(which makedepend)"
-
-dnl Determine what to build based on the platform.
-dnl Override the LIBS settings on Cygwin32 so that
-dnl we always link with the exact set of libraries.
-
-AC_SUBST(ALL)
-
-if test "$CYGWIN32" = yes; then
-    ALL="\$(LIBCYGARCHIVE) \$(LIBCYGSHARED) \$(LIBARCHIVE)"
-    LIBS="-lstdc++ -lpng -ljpeg -lz"
-else
-    ALL="\$(LIBFULL) \$(LIBLOAD) \$(LIBSHARED) \$(LIBARCHIVE)"
-fi
-
-AC_OUTPUT(Makefile nxcomp.pc)
diff --git a/nxcomp/include/MD5.h b/nxcomp/include/MD5.h
new file mode 100644
index 000000000..698c995d8
--- /dev/null
+++ b/nxcomp/include/MD5.h
@@ -0,0 +1,91 @@
+/*
+  Copyright (C) 1999, 2002 Aladdin Enterprises.  All rights reserved.
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  L. Peter Deutsch
+  ghost@aladdin.com
+
+ */
+/* $Id: md5.h,v 1.4 2002/04/13 19:20:28 lpd Exp $ */
+/*
+  Independent implementation of MD5 (RFC 1321).
+
+  This code implements the MD5 Algorithm defined in RFC 1321, whose
+  text is available at
+	http://www.ietf.org/rfc/rfc1321.txt
+  The code is derived from the text of the RFC, including the test suite
+  (section A.5) but excluding the rest of Appendix A.  It does not include
+  any code or documentation that is identified in the RFC as being
+  copyrighted.
+
+  The original and principal author of md5.h is L. Peter Deutsch
+  <ghost@aladdin.com>.  Other authors are noted in the change history
+  that follows (in reverse chronological order):
+
+  2002-04-13 lpd Removed support for non-ANSI compilers; removed
+	references to Ghostscript; clarified derivation from RFC 1321;
+	now handles byte order either statically or dynamically.
+  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
+  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5);
+	added conditionalization for C++ compilation from Martin
+	Purschke <purschke@bnl.gov>.
+  1999-05-03 lpd Original version.
+ */
+
+#ifndef md5_INCLUDED
+#  define md5_INCLUDED
+
+/*
+ * This package supports both compile-time and run-time determination of CPU
+ * byte order.  If ARCH_IS_BIG_ENDIAN is defined as 0, the code will be
+ * compiled to run only on little-endian CPUs; if ARCH_IS_BIG_ENDIAN is
+ * defined as non-zero, the code will be compiled to run only on big-endian
+ * CPUs; if ARCH_IS_BIG_ENDIAN is not defined, the code will be compiled to
+ * run on either big- or little-endian CPUs, but will run slightly less
+ * efficiently on either one than if ARCH_IS_BIG_ENDIAN is defined.
+ */
+
+typedef unsigned char md5_byte_t; /* 8-bit byte */
+typedef unsigned int md5_word_t; /* 32-bit word */
+
+/* Define the state of the MD5 Algorithm. */
+typedef struct md5_state_s {
+    md5_word_t count[2];	/* message length in bits, lsw first */
+    md5_word_t abcd[4];		/* digest buffer */
+    md5_byte_t buf[64];		/* accumulate block */
+} md5_state_t;
+
+#ifdef __cplusplus
+extern "C" 
+{
+#endif
+
+/* Initialize the algorithm. */
+void md5_init(md5_state_t *pms);
+
+/* Append a string to the message. */
+void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes);
+
+/* Finish the message and return the digest. */
+void md5_finish(md5_state_t *pms, md5_byte_t digest[16]);
+
+#ifdef __cplusplus
+}  /* end extern "C" */
+#endif
+
+#endif /* md5_INCLUDED */
diff --git a/nxcomp/include/NX.h b/nxcomp/include/NX.h
new file mode 100644
index 000000000..7ec79b4b1
--- /dev/null
+++ b/nxcomp/include/NX.h
@@ -0,0 +1,471 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef NX_H
+#define NX_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <unistd.h>
+
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/select.h>
+#include <sys/uio.h>
+
+#define NX_FD_ANY                      -1
+
+#define NX_MODE_ANY                    -1
+#define NX_MODE_CLIENT                  1
+#define NX_MODE_SERVER                  2
+
+#define NX_DISPLAY_ANY                  NULL
+
+#define NX_SIGNAL_ANY                  -1
+#define NX_SIGNAL_ENABLE                1
+#define NX_SIGNAL_DISABLE               2
+#define NX_SIGNAL_RAISE                 3
+#define NX_SIGNAL_FORWARD               4
+
+#define NX_POLICY_IMMEDIATE             1
+#define NX_POLICY_DEFERRED              2
+
+#define NX_ALERT_REMOTE                 0
+#define NX_ALERT_LOCAL                  1
+
+#define NX_HANDLER_FLUSH                0
+#define NX_HANDLER_STATISTICS           1
+
+#define NX_STATISTICS_PARTIAL           0
+#define NX_STATISTICS_TOTAL             1
+
+#define NX_CHANNEL_X11                  0
+#define NX_CHANNEL_CUPS                 1
+#define NX_CHANNEL_SMB                  2
+#define NX_CHANNEL_MEDIA                3
+#define NX_CHANNEL_HTTP                 4
+#define NX_CHANNEL_FONT                 5
+#define NX_CHANNEL_SLAVE                6
+
+#define NX_FILE_SESSION                 0
+#define NX_FILE_ERRORS                  1
+#define NX_FILE_OPTIONS                 2
+#define NX_FILE_STATS                   3
+
+/*
+ * The following are the new interfaces to the NX transport. The
+ * NX proxy software is now intended to be run as a library of a
+ * higher level communication manager (nxssh, nxhttp, nxrtp, etc,
+ * not only nxproxy). This is a work-in-progress, so expect these
+ * interfaces to change in future. At the present moment, as an
+ * example, there is no provision for creating and managing mul-
+ * tiple proxy connections.
+ */
+
+/*
+ * Attach a NX transport to the provided descriptor. This should be
+ * done after having created a pair of connected sockets.
+ */
+
+extern int NXTransCreate(int fd, int mode, const char *options);
+
+/*
+ * Tell the proxy to use the second descriptor as its own end of
+ * the internal connection to the NX agent. The NX agent will use
+ * the first descriptor. Setting an agent connection will have the
+ * effect of disabling further X client connections and, if it is
+ * possible, will trigger the use of the memory-to-memory transport.
+ */
+
+extern int NXTransAgent(int fd[2]);
+
+/*
+ * Prepare the file sets and the timeout for a later execution of
+ * the select(). The masks and the timeout must persist across all
+ * the calls, so if you don't need any of the values, it is requi-
+ * red that you create empty masks and a default timeout. To save
+ * a check at each run, all the functions below assume that valid
+ * pointers are passed.
+ */
+
+extern int NXTransPrepare(int *maxfds, fd_set *readfds,
+                              fd_set *writefds, struct timeval *timeout);
+
+/*
+ * Call select() to find out the descriptors in the sets having
+ * pending data.
+ */
+
+extern int NXTransSelect(int *result, int *error, int *maxfds, fd_set *readfds,
+                             fd_set *writefds, struct timeval *timeout);
+
+/*
+ * Perform the required I/O on all the NX descriptors having pen-
+ * ding data. This can include reading and writing to the NX chan-
+ * nels, encoding and decoding the proxy data or managing any of
+ * the other NX resources.
+ */
+
+extern int NXTransExecute(int *result, int *error, int *maxfds, fd_set *readfds,
+                              fd_set *writefds, struct timeval *timeout);
+
+/*
+ * Run an empty loop, giving to the NX transport a chance to check
+ * its descriptors.
+ */
+
+extern int NXTransContinue(struct timeval *timeout);
+
+/*
+ * Perform I/O on the given descriptors. If memory-to-memory trans-
+ * port has been activated and the descriptor is recognized as a
+ * valid agent connection, then the functions will read and write
+ * the data directly to the proxy buffer, otherwise the correspond-
+ * ing network operation will be performed.
+ */
+
+extern int NXTransRead(int fd, char *data, int size);
+extern int NXTransWrite(int fd, char *data, int size);
+extern int NXTransReadable(int fd, int *readable);
+
+extern int NXTransReadVector(int fd, struct iovec *iovdata, int iovsize);
+extern int NXTransWriteVector(int fd, struct iovec *iovdata, int iovsize);
+
+extern int NXTransClose(int fd);
+
+/*
+ * Return true if the NX transport is running. The fd parameter can
+ * be either the local descriptor attached to the NX transport or
+ * NX_FD_ANY.
+ */
+
+extern int NXTransRunning(int fd);
+
+/*
+ * Close down the NX transport and free all the allocated resources.
+ * The fd parameter can be either the local descriptor or NX_FD_ANY.
+ * This must be explicitly called by the agent before the proxy can
+ * start the tear down procedure.
+ */
+
+extern int NXTransDestroy(int fd);
+
+/*
+ * Tell to the proxy how to handle the standard POSIX signals. For
+ * example, given the SIGINT signal, the caller can specify any of
+ * the following actions:
+ *
+ * NX_SIGNAL_ENABLE:  A signal handler will have to be installed by
+ *                    the library, so that it can be intercepted by
+ *                    the proxy.
+ *
+ * NX_SIGNAL_DISABLE: The signal will be handled by the caller and,
+ *                    eventually, forwarded to the proxy by calling
+ *                    NXTransSignal() explicitly.
+ *
+ * NX_SIGNAL_RAISE:   The signal must be handled now, as if it had
+ *                    been delivered by the operating system. This
+ *                    function can be called by the agent with the
+ *                    purpose of propagating a signal to the proxy.
+ *
+ * NX_SIGNAL_FORWARD: A signal handler will have to be installed by
+ *                    the library but the library will have to call
+ *                    the original signal handler when the signal
+ *                    is received.
+ *
+ * As a rule of thumb, agents should let the proxy handle SIGUSR1
+ * and SIGUSR2, used for producing the NX protocol statistics, and
+ * SIGHUP, used for disconnecting the NX transport.
+ *
+ * The following signals are blocked by default upon creation of the
+ * NX transport:
+ *
+ * SIGCHLD    These signals should be always put under the control
+ * SIGUSR1    of the proxy. If agents are intercepting them, agents
+ * SIGUSR2    should later call NXTransSignal(..., NX_SIGNAL_RAISE)
+ * SIGHUP     to forward the signal to the proxy. As an alternative
+ *            they can specify a NX_SIGNAL_FORWARD action, so they,
+ *            in turn, can be notified about the signal. This can
+ *            be especially useful for SIGCHLD.
+ *
+ * SIGINT     These signals should be intercepted by agents. Agents
+ * SIGTERM    should ensure that NXTransDestroy() is called before
+ *            exiting, to give the proxy a chance to shut down the
+ *            NX transport.
+ *
+ * SIGPIPE    This signal is blocked by the proxy, but not used to
+ *            implement any functionality. It can be handled by the
+ *            NX agent without affecting the proxy.
+ *
+ * SIGALRM    This is now used by the proxy and agents should not
+ *            redefine it. Agents can use the signal to implement
+ *            their own timers but should not interleave calls to
+ *            the NX transport and should restore the old handler
+ *            when the timeout is raised.
+ *
+ * SIGVTALRM  These signals are not used but may be used in future
+ * SIGWINCH   versions of the library.
+ * SIGIO
+ * SIGTSTP
+ * SIGTTIN
+ * SIGTTOU
+ *
+ * By calling NXTransSignal(..., NX_SIGNAL_DISABLE) nxcomp will res-
+ * tore the signal handler that was saved at the time the proxy hand-
+ * ler was installed. This means that you should call the function
+ * just after the XOpenDisplay() or any other function used to init-
+ * ialize the NX transport.
+ */
+ 
+extern int NXTransSignal(int signal, int action);
+
+/*
+ * Return a value between 0 and 9 indicating the congestion level
+ * based on the tokens still available. A value of 9 means that
+ * the link is congested and no further data can be sent.
+ */
+
+extern int NXTransCongestion(int fd);
+
+/*
+ * Let the application to be notified by the proxy when an event oc-
+ * curs. The parameter, as set at the time the handler is installed,
+ * is passed each time to the callback function. The parameter is
+ * presumably the display pointer, given that at the present moment
+ * the NX transport doesn't have access to the display structure and
+ * so wouldn't be able to determine the display to pass to the call-
+ * back function.
+ *
+ * NX_HANDLER_FLUSH:      The handler function is called when some
+ *                        more data has been written to the proxy
+ *                        link.
+ *
+ * The data is the number of bytes written.
+ *
+ * NX_HANDLER_STATISTICS: This handler is called to let the agent
+ *                        include arbitrary data in the transport
+ *                        statistics. The parameter, in this case,
+ *                        is a pointer to a pointer to a null term-
+ *                        inated string. The pointer is set at the
+ *                        time the handler is registered. The point-
+ *                        ed string will have to be filled by the
+ *                        agent with its statistics data.
+ *
+ * The data can be NX_STATISTICS_PARTIAL or NX_STATISTICS_TOTAL. The
+ * agent can refer to the value by using the  NXStatisticsPartial and
+ * NXStatisticsTotal constants defined in NXvars.h.
+ *
+ * Note that these interfaces are used by Xlib and nxcompext. Agents
+ * should never call these interfaces directly, but use the nxcompext
+ * wrapper.
+ */
+
+extern int NXTransHandler(int fd, int type, void (*handler)(void *parameter,
+                              int reason), void *parameter);
+
+/*
+ * Set the policy to be used by the NX transport to write data to the
+ * proxy link:
+ *
+ * NX_POLICY_IMMEDIATE: When set to immediate, the proxy will try to
+ *                      write the data just after having encoded it.
+ *
+ * NX_POLICY_DEFERRED:  When policy is set to deferred, data will be
+ *                      accumulated in a buffer and written to the
+ *                      remote proxy when NXTransFlush() is called by
+ *                      the agent.
+ */
+
+extern int NXTransPolicy(int fd, int type);
+
+/*
+ * Query the number of bytes that have been accumulated for a deferred
+ * flush.
+ */
+
+extern int NXTransFlushable(int fd);
+
+/*
+ * Tell to the NX transport to write all the accumulated data to the
+ * remote proxy.
+ */
+
+extern int NXTransFlush(int fd);
+
+/*
+ * Create a new channel of the given type. It returns 1 on success,
+ * 0 if the NX transport is not running, or -1 in the case of error.
+ * On success, the descriptor provided by the caller can be later
+ * used for the subsequent I/O. The type parameter not only tells to
+ * the proxy the remote port where the channel has to be connected,
+ * but also gives a hint about the type of data that will be carried
+ * by the channel, so that the proxy can try to optimize the traffic
+ * on the proxy link.
+ *
+ * NX_CHANNEL_X:     The channel will carry X traffic and it
+ *                   will be connected to the remote X display.
+ *
+ * NX_CHANNEL_CUPS:  The channel will carry CUPS/IPP protocol.
+ *
+ * NX_CHANNEL_SMB:   The channel will carry SMB/CIFS protocol.
+ *
+ * NX_CHANNEL_MEDIA: The channel will transport audio or other
+ *                   multimedia data.
+ *
+ * NX_CHANNEL_HTTP:  The channel will carry HTTP protocol.
+ *
+ * NX_CHANNEL_FONT:  The channel will forward a X font server
+ *                   connection.
+ *
+ * Only a proxy running at the NX server/X client side will be able
+ * to create a X, CUPS, SMB, MEDIA and HTTP channel. A proxy running
+ * at the NX client/X server side can create font server connections.
+ * The channel creation will also fail if the remote end has not been
+ * set up to forward the connection.
+ *
+ * To create a new channel the agent will have to set up a socketpair
+ * and pass to the proxy one of the socket descriptors.
+ *
+ * Example:
+ *
+ * #include <sys/types.h>
+ * #include <sys/socket.h>
+ *
+ * int fds[2];
+ *
+ * if (socketpair(PF_LOCAL, SOCK_STREAM, 0, fds) < 0)
+ * {
+ *   ...
+ * }
+ * else
+ * {
+ *   //
+ *   // Use fds[0] locally and let the
+ *   // proxy use fds[1].
+ *   //
+ *
+ *   if (NXTransChannel(NX_FD_ANY, fds[1], NX_CHANNEL_X) <= 0)
+ *   {
+ *     ...
+ *   }
+ *
+ *   //
+ *   // The agent can now use fds[0] in
+ *   // read(), write() and select()
+ *   // system calls.
+ *   //
+ *
+ *   ...
+ * }
+ *
+ * Note that all the I/O on the descriptor should be non-blocking, to
+ * give a chance to the NX transport to run in the background and handle
+ * the data that will be fed to the agent's side of the socketpair. This
+ * will happen automatically, as long as the agent uses the XSelect()
+ * version of the select() function (as it is normal whenever performing
+ * Xlib I/O). In all the other cases, like presumably in the agent's main
+ * loop, the agent will have to loop through NXTransPrepare(), NXTrans-
+ * Select() and NXTransExecute() functions explicitly, adding to the sets
+ * the descriptors that are awaited by the agent. Please check the imple-
+ * mentation of _XSelect() in nx-X11/lib/X11/XlibInt.c for an example.
+ */
+
+extern int NXTransChannel(int fd, int channelfd, int type);
+
+/*
+ * Return the name of the files used by the proxy for the current session.
+ *
+ * The type parameter can be:
+ *
+ * NX_FILE_SESSION:  Usually the file 'session' in the user's session
+ *                   directory.
+ *
+ * NX_FILE_ERRORS:   The file used for the diagnostic output. Usually
+ *                   the file 'errors' in the session directory.
+ *
+ * NX_FILE_OPTIONS:  The file containing the NX options, if any.
+ *
+ * NX_FILE_STATS:    The file used for the statistics output.
+ *
+ * The returned string is allocated in static memory. The caller should
+ * copy the string upon returning from the function, without freeing the
+ * pointer.
+ */
+
+extern const char *NXTransFile(int type);
+
+/*
+ * Return the time in milliseconds elapsed since the last call to this
+ * same function.
+ */
+
+extern long NXTransTime(void);
+
+/*
+ * Other interfaces to the internal transport functions.
+ */
+
+extern int NXTransProxy(int fd, int mode, const char *display);
+
+extern int NXTransClient(const char *display);
+
+extern int NXTransDialog(const char *caption, const char *message,
+                           const char *window, const char *type, int local,
+                               const char *display);
+
+extern int NXTransAlert(int code, int local);
+
+extern int NXTransWatchdog(int timeout);
+
+extern int NXTransKeeper(int caches, int images, const char *root);
+
+extern void NXTransExit(int code) __attribute__((noreturn));
+
+extern int NXTransParseCommandLine(int argc, const char **argv);
+extern int NXTransParseEnvironment(const char *env, int force);
+
+extern void NXTransCleanup(void) __attribute__((noreturn));
+
+/*
+ * Cleans up the global and local state
+ * (the same way as NXTransCleanup does)
+ * but does not exit the process
+ * Needed for IOS platform
+ */
+extern void NXTransCleanupForReconnect(void);
+
+extern const char* NXVersion(void);
+extern int NXMajorVersion(void);
+extern int NXMinorVersion(void);
+extern int NXPatchVersion(void);
+extern int NXMaintenancePatchVersion(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* NX_H */
diff --git a/nxcomp/include/NXalert.h b/nxcomp/include/NXalert.h
new file mode 100644
index 000000000..dca2f44ca
--- /dev/null
+++ b/nxcomp/include/NXalert.h
@@ -0,0 +1,276 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef NXalert_H
+#define NXalert_H
+
+#define ALERT_CAPTION_PREFIX                                 "NX - "
+
+#define INTERNAL_ERROR_ALERT                                 1
+#define INTERNAL_ERROR_ALERT_TYPE                            "error"
+#define INTERNAL_ERROR_ALERT_STRING                          \
+"\
+An unrecoverable internal error was detected.\n\
+Press OK to terminate the current session.\n\
+"
+
+#define CLOSE_DEAD_X_CONNECTION_CLIENT_ALERT                 2
+#define CLOSE_DEAD_X_CONNECTION_CLIENT_ALERT_TYPE            "yesno"
+#define CLOSE_DEAD_X_CONNECTION_CLIENT_ALERT_STRING          \
+"\
+One of the applications currently in use is not responding.\n\
+Do you want to terminate the current session?\n\
+"
+
+#define CLOSE_DEAD_X_CONNECTION_SERVER_ALERT                 3
+#define CLOSE_DEAD_X_CONNECTION_SERVER_ALERT_TYPE            "yesno"
+#define CLOSE_DEAD_X_CONNECTION_SERVER_ALERT_STRING          \
+"\
+One of the applications did not behave correctly and caused\n\
+the X server to stop responding in a timely fashion. Do you\n\
+want to terminate the current session?\n\
+"
+
+#define CLOSE_DEAD_PROXY_CONNECTION_CLIENT_ALERT             4
+#define CLOSE_DEAD_PROXY_CONNECTION_CLIENT_ALERT_TYPE        NULL
+#define CLOSE_DEAD_PROXY_CONNECTION_CLIENT_ALERT_STRING      NULL
+
+#define CLOSE_DEAD_PROXY_CONNECTION_SERVER_ALERT             5
+#define CLOSE_DEAD_PROXY_CONNECTION_SERVER_ALERT_TYPE        "yesno"
+#define CLOSE_DEAD_PROXY_CONNECTION_SERVER_ALERT_STRING      \
+"\
+No response received from the remote server.\n\
+Do you want to terminate the current session?\n\
+"
+
+#define RESTART_DEAD_PROXY_CONNECTION_CLIENT_ALERT           6
+#define RESTART_DEAD_PROXY_CONNECTION_CLIENT_ALERT_TYPE      NULL
+#define RESTART_DEAD_PROXY_CONNECTION_CLIENT_ALERT_STRING    NULL
+
+#define RESTART_DEAD_PROXY_CONNECTION_SERVER_ALERT           7
+#define RESTART_DEAD_PROXY_CONNECTION_SERVER_ALERT_TYPE      "yesno"
+#define RESTART_DEAD_PROXY_CONNECTION_SERVER_ALERT_STRING    \
+"\
+Connection with remote server was shut down. NX will try\n\
+to establish a new server connection. Session could have\n\
+been left in a unusable state. Do you want to terminate\n\
+the session?\n\
+"
+
+#define CLOSE_UNRESPONSIVE_X_SERVER_ALERT                    8
+#define CLOSE_UNRESPONSIVE_X_SERVER_ALERT_TYPE               "panic"
+#define CLOSE_UNRESPONSIVE_X_SERVER_ALERT_STRING             \
+"\
+You pressed the key sequence CTRL+ALT+SHIFT+ESC.\n\
+This is probably because your X server has become\n\
+unresponsive. Session will be terminated in 30\n\
+seconds unless you abort the procedure by pressing\n\
+the Cancel button.\n\
+"
+
+#define WRONG_PROXY_VERSION_ALERT                            9
+#define WRONG_PROXY_VERSION_ALERT_TYPE                       "ok"
+#define WRONG_PROXY_VERSION_ALERT_STRING                     \
+"\
+Local NX libraries version " VERSION " do not match the NX\n\
+version of the remote server. Please check the error\n\
+log on the server to find out which client version you\n\
+need to install to be able to access this server.\n\
+"
+
+#define FAILED_PROXY_CONNECTION_CLIENT_ALERT                 10
+#define FAILED_PROXY_CONNECTION_CLIENT_ALERT_TYPE            NULL
+#define FAILED_PROXY_CONNECTION_CLIENT_ALERT_STRING          NULL
+
+#define FAILED_PROXY_CONNECTION_SERVER_ALERT                 11
+#define FAILED_PROXY_CONNECTION_SERVER_ALERT_TYPE            "yesno"
+#define FAILED_PROXY_CONNECTION_SERVER_ALERT_STRING          \
+"\
+Could not yet establish the connection to the remote\n\
+proxy. Do you want to terminate the current session?\n\
+"
+
+#define MISSING_PROXY_CACHE_ALERT                            12
+#define MISSING_PROXY_CACHE_ALERT_TYPE                       "ok"
+#define MISSING_PROXY_CACHE_ALERT_STRING                     \
+"\
+NX was unable to negotiate a cache for this session.\n\
+This may happen if this is the first time you run a\n\
+session on this server or if cache was corrupted or\n\
+produced by an incompatible NX version.\n\
+"
+
+#define ABORT_PROXY_CONNECTION_ALERT                         13
+#define ABORT_PROXY_CONNECTION_ALERT_TYPE                    "ok"
+#define ABORT_PROXY_CONNECTION_ALERT_STRING                  \
+"\
+The connection with the remote server was shut down.\n\
+Please check the state of your network connection.\n\
+"
+
+/*
+ * The one below is a special alert, used to close
+ * a previous alert that is running on the given
+ * side. This can be used to get rid of a message
+ * that has ceased to hold true.
+ */
+
+#define DISPLACE_MESSAGE_ALERT                               14
+#define DISPLACE_MESSAGE_ALERT_TYPE                          NULL
+#define DISPLACE_MESSAGE_ALERT_STRING                        NULL
+
+/*
+ * These are the other alert messages that were
+ * added in the 1.5.0 release. The first is never
+ * shown and is intended just for testing.
+ */
+
+#define GREETING_MESSAGE_ALERT                               15
+#define GREETING_MESSAGE_ALERT_TYPE                          "ok"
+#define GREETING_MESSAGE_ALERT_STRING                        \
+"\
+Welcome to NX from the NoMachine team. We really\n\
+hope you will enjoy this wonderful software as much\n\
+as we had fun making it ;-).\n\
+"
+
+/*
+ * These alerts are intended to notify the user
+ * of the reason why the agent failed to resume
+ * the session.
+ */
+
+#define START_RESUME_SESSION_ALERT                           16
+#define START_RESUME_SESSION_ALERT_TYPE                      "ok"
+#define START_RESUME_SESSION_ALERT_STRING                    \
+"\
+You appear to run your NX session across a slow network\n\
+connection. Resuming the session may require some time.\n\
+Please wait.\
+"
+
+#define FAILED_RESUME_DISPLAY_ALERT                          17
+#define FAILED_RESUME_DISPLAY_ALERT_TYPE                     "error"
+#define FAILED_RESUME_DISPLAY_ALERT_STRING                   \
+"\
+Failed to open the display. Can't resume the NX\n\
+session on this display.\n\
+"
+
+#define FAILED_RESUME_DISPLAY_BROKEN_ALERT                   18
+#define FAILED_RESUME_DISPLAY_BROKEN_TYPE                    "error"
+#define FAILED_RESUME_DISPLAY_BROKEN_STRING                  \
+"\
+The display connection was broken while trying to\n\
+resume the session. Please, check your network\n\
+connection and try again.\n\
+"
+
+#define FAILED_RESUME_VISUALS_ALERT                          19
+#define FAILED_RESUME_VISUALS_ALERT_TYPE                     "error"
+#define FAILED_RESUME_VISUALS_ALERT_STRING                   \
+"\
+Failed to restore all the required visuals.\n\
+Can't resume the NX session on this display.\n\
+"
+
+#define FAILED_RESUME_COLORMAPS_ALERT                        20
+#define FAILED_RESUME_COLORMAPS_ALERT_TYPE                   "error"
+#define FAILED_RESUME_COLORMAPS_ALERT_STRING                 \
+"\
+The number of available colormaps is different\n\
+on the new display. Can't resume the NX session\n\
+on this display.\n\
+"
+
+#define FAILED_RESUME_PIXMAPS_ALERT                          21
+#define FAILED_RESUME_PIXMAPS_ALERT_TYPE                     "error"
+#define FAILED_RESUME_PIXMAPS_ALERT_STRING                   \
+"\
+Failed to restore all the required pixmap formats.\n\
+Can't resume the NX session on this display.\n\
+"
+
+#define FAILED_RESUME_DEPTHS_ALERT                           22
+#define FAILED_RESUME_DEPTHS_ALERT_TYPE                      "error"
+#define FAILED_RESUME_DEPTHS_ALERT_STRING                    \
+"\
+Failed to restore all the required screen depths.\n\
+Can't resume the NX session on this display.\n\
+"
+
+#define FAILED_RESUME_RENDER_ALERT                           23
+#define FAILED_RESUME_RENDER_ALERT_TYPE                      "error"
+#define FAILED_RESUME_RENDER_ALERT_STRING                    \
+"\
+The render extension is missing or an incompatible\n\
+version was detected on your X server. Can't resume\n\
+the NX session on this display.\n\
+"
+
+#define FAILED_RESUME_FONTS_ALERT                            24
+#define FAILED_RESUME_FONTS_ALERT_TYPE                       "error"
+#define FAILED_RESUME_FONTS_ALERT_STRING                     \
+"\
+One or more of the fonts that are in use by the\n\
+session are missing. Can't resume the NX session\n\
+on this display.\n\
+"
+
+#define ABORT_PROXY_NEGOTIATION_ALERT                        62
+#define ABORT_PROXY_NEGOTIATION_ALERT_TYPE                   "ok"
+#define ABORT_PROXY_NEGOTIATION_ALERT_STRING                 \
+"\
+The remote proxy closed the connection while negotiating\n\
+the session. This may be due to the wrong authentication\n\
+credentials passed to the server.\n\
+"
+
+#define ABORT_PROXY_SHUTDOWN_ALERT                           64
+#define ABORT_PROXY_SHUTDOWN_ALERT_TYPE                      "ok"
+#define ABORT_PROXY_SHUTDOWN_ALERT_STRING                    \
+"\
+No response received from the remote proxy while\n\
+waiting for the session shutdown.\n\
+"
+
+#define FAILED_XDMCP_CONNECTION_ALERT                        65
+#define FAILED_XDMCP_CONNECTION_ALERT_TYPE                   "ok"
+#define FAILED_XDMCP_CONNECTION_ALERT_STRING                 \
+"\
+The XDM host that was contacted by the NX server doesn't\n\
+seem to be able to start the session. Please check your\n\
+server configuration.\n\
+"
+
+/*
+ * Used to handle the backward compatibility.
+ * Update the numbers if you add a new alert. 
+ */
+
+#define LAST_PROTO_STEP_6_ALERT  63
+#define LAST_PROTO_STEP_7_ALERT  65
+
+#endif /* NXalert_H */
diff --git a/nxcomp/include/NXpack.h b/nxcomp/include/NXpack.h
new file mode 100644
index 000000000..3eade6855
--- /dev/null
+++ b/nxcomp/include/NXpack.h
@@ -0,0 +1,141 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef NXpack_H
+#define NXpack_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define MASK_METHOD_LIMIT                       10
+
+#define NO_MASK                                 0
+
+#define MASK_8_COLORS                           1
+#define MASK_64_COLORS                          2
+#define MASK_256_COLORS                         3
+#define MASK_512_COLORS                         4
+#define MASK_4K_COLORS                          5
+#define MASK_32K_COLORS                         6
+#define MASK_64K_COLORS                         7
+#define MASK_256K_COLORS                        8
+#define MASK_2M_COLORS                          9
+#define MASK_16M_COLORS                         10
+
+#define PACK_METHOD_LIMIT                       128
+
+#define NO_PACK                                 0
+
+#define PACK_MASKED_8_COLORS                    1
+#define PACK_MASKED_64_COLORS                   2
+#define PACK_MASKED_256_COLORS                  3
+#define PACK_MASKED_512_COLORS                  4
+#define PACK_MASKED_4K_COLORS                   5
+#define PACK_MASKED_32K_COLORS                  6
+#define PACK_MASKED_64K_COLORS                  7
+#define PACK_MASKED_256K_COLORS                 8
+#define PACK_MASKED_2M_COLORS                   9
+#define PACK_MASKED_16M_COLORS                  10
+
+#define PACK_RAW_8_BITS                         3
+#define PACK_RAW_16_BITS                        7
+#define PACK_RAW_24_BITS                        10
+
+#define PACK_COLORMAP_256_COLORS                11
+
+#define PACK_JPEG_8_COLORS                      26
+#define PACK_JPEG_64_COLORS                     27
+#define PACK_JPEG_256_COLORS                    28
+#define PACK_JPEG_512_COLORS                    29
+#define PACK_JPEG_4K_COLORS                     30
+#define PACK_JPEG_32K_COLORS                    31
+#define PACK_JPEG_64K_COLORS                    32
+#define PACK_JPEG_256K_COLORS                   33
+#define PACK_JPEG_2M_COLORS                     34
+#define PACK_JPEG_16M_COLORS                    35
+
+#define PACK_PNG_8_COLORS                       37
+#define PACK_PNG_64_COLORS                      38
+#define PACK_PNG_256_COLORS                     39
+#define PACK_PNG_512_COLORS                     40
+#define PACK_PNG_4K_COLORS                      41
+#define PACK_PNG_32K_COLORS                     42
+#define PACK_PNG_64K_COLORS                     43
+#define PACK_PNG_256K_COLORS                    44
+#define PACK_PNG_2M_COLORS                      45
+#define PACK_PNG_16M_COLORS                     46
+
+#define PACK_RGB_16M_COLORS                     63
+#define PACK_RLE_16M_COLORS                     64
+
+#define PACK_ALPHA                              65
+#define PACK_COLORMAP                           66
+
+#define PACK_BITMAP_16M_COLORS                  67
+
+/*
+ * Not really pack methods. These values
+ * allow dynamic selection of the pack
+ * method by the agent.
+ */
+
+#define PACK_NONE                               0
+#define PACK_LOSSY                              253
+#define PACK_LOSSLESS                           254
+#define PACK_ADAPTIVE                           255
+
+/*
+ * Reduce the number of colors in the
+ * image by applying a mask.
+ */
+
+typedef struct
+{
+  unsigned int color_mask;
+  unsigned int correction_mask;
+  unsigned int white_threshold;
+  unsigned int black_threshold;
+
+} ColorMask;
+
+extern const ColorMask Mask8TrueColor;
+extern const ColorMask Mask64TrueColor;
+extern const ColorMask Mask512TrueColor;
+extern const ColorMask Mask4KTrueColor;
+extern const ColorMask Mask32KTrueColor;
+extern const ColorMask Mask256KTrueColor;
+extern const ColorMask Mask2MTrueColor;
+extern const ColorMask Mask16MTrueColor;
+
+const ColorMask *MethodColorMask(unsigned int method);
+
+int MethodBitsPerPixel(unsigned int method);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* NXpack_H */
diff --git a/nxcomp/include/NXproto.h b/nxcomp/include/NXproto.h
new file mode 100644
index 000000000..7b988bdbf
--- /dev/null
+++ b/nxcomp/include/NXproto.h
@@ -0,0 +1,447 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef NXproto_H
+#define NXproto_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <X11/X.h>
+#include <X11/Xmd.h>
+#include <X11/Xproto.h>
+
+/*
+ * Force the size to match the wire protocol.
+ */
+ 
+#define Drawable CARD32
+#define GContext CARD32
+
+#define sz_xNXGetControlParametersReq           4
+#define sz_xNXGetCleanupParametersReq           4
+#define sz_xNXGetImageParametersReq             4
+#define sz_xNXGetUnpackParametersReq            8
+#define sz_xNXGetShmemParametersReq             16
+#define sz_xNXGetFontParametersReq              4
+#define sz_xNXSetExposeParametersReq            8
+#define sz_xNXSetCacheParametersReq             8
+#define sz_xNXStartSplitReq                     8
+#define sz_xNXEndSplitReq                       4
+#define sz_xNXCommitSplitReq                    12
+#define sz_xNXSetUnpackGeometryReq              24
+#define sz_xNXSetUnpackColormapReq              16
+#define sz_xNXSetUnpackAlphaReq                 16
+#define sz_xNXPutPackedImageReq                 40
+#define sz_xNXFreeUnpackReq                     4
+#define sz_xNXFinishSplitReq                    4
+#define sz_xNXAbortSplitReq                     4
+#define sz_xNXFreeSplitReq                      4
+
+#define sz_xGetControlParametersReply           32
+#define sz_xGetCleanupParametersReply           32
+#define sz_xGetImageParametersReply             32
+#define sz_xGetUnpackParametersReply            32
+#define sz_xGetShmemParametersReply             32
+
+#define LINK_TYPE_LIMIT                         5
+
+#define LINK_TYPE_NONE                          0
+#define LINK_TYPE_MODEM                         1
+#define LINK_TYPE_ISDN                          2
+#define LINK_TYPE_ADSL                          3
+#define LINK_TYPE_WAN                           4
+#define LINK_TYPE_LAN                           5
+
+/*
+ * NX Replies.
+ */
+
+/*
+ * The following reply has 4 new boolean
+ * fields in the last protocol version.
+ */
+
+typedef struct _NXGetControlParametersReply {
+    BYTE   type; /* Is X_Reply. */
+    CARD8  linkType;
+    CARD16 sequenceNumber B16;
+    CARD32 length B32; /* Is 0. */
+    CARD8  localMajor;
+    CARD8  localMinor;
+    CARD8  localPatch;
+    CARD8  remoteMajor;
+    CARD8  remoteMinor;
+    CARD8  remotePatch;
+    CARD16 splitTimeout B16;
+    CARD16 motionTimeout B16;
+    CARD8  splitMode;
+    CARD8  pad1;
+    CARD32 splitSize B32;
+    CARD8  packMethod;
+    CARD8  packQuality;
+    CARD8  dataLevel;
+    CARD8  streamLevel;
+    CARD8  deltaLevel;
+    CARD8  loadCache;
+    CARD8  saveCache;
+    CARD8  startupCache;
+} xNXGetControlParametersReply;
+
+typedef struct _NXGetCleanupParametersReply {
+    BYTE   type; /* Is X_Reply. */
+    BYTE   pad;
+    CARD16 sequenceNumber B16;
+    CARD32 length B32; /* Is 0. */
+    BOOL   cleanGet;
+    BOOL   cleanAlloc;
+    BOOL   cleanFlush;
+    BOOL   cleanSend;
+    BOOL   cleanImages;
+    BYTE   pad1, pad2, pad3;
+    CARD32 pad4 B32;
+    CARD32 pad5 B32;
+    CARD32 pad6 B32;
+    CARD32 pad7 B32;
+} xNXGetCleanupParametersReply;
+
+typedef struct _NXGetImageParametersReply {
+    BYTE   type; /* Is X_Reply. */
+    BYTE   pad;
+    CARD16 sequenceNumber B16;
+    CARD32 length B32; /* Is 0. */
+    BOOL   imageSplit;
+    BOOL   imageMask;
+    BOOL   imageFrame;
+    CARD8  imageMaskMethod;
+    CARD8  imageSplitMethod;
+    BYTE   pad1, pad2, pad3;
+    CARD32 pad4 B32;
+    CARD32 pad5 B32;
+    CARD32 pad6 B32;
+    CARD32 pad7 B32;
+} xNXGetImageParametersReply;
+
+/*
+ * Data is made of PACK_METHOD_LIMIT values of
+ * type BOOL telling which unpack capabilities
+ * are implemented in proxy.
+ */
+
+typedef struct _NXGetUnpackParametersReply {
+    BYTE   type; /* Is X_Reply. */
+    BYTE   pad;
+    CARD16 sequenceNumber B16;
+    CARD32 length B32; /* Is PACK_METHOD_LIMIT / 4 from NXpack.h. */
+    CARD8  entries;    /* Is PACK_METHOD_LIMIT. */
+    BYTE   pad1, pad2, pad3;
+    CARD32 pad4 B32;
+    CARD32 pad5 B32;
+    CARD32 pad6 B32;
+    CARD32 pad7 B32;
+    CARD32 pad8 B32;
+} xNXGetUnpackParametersReply;
+
+typedef struct _NXGetShmemParametersReply {
+    BYTE   type;             /* Is X_Reply. */
+    CARD8  stage;            /* As in the corresponding request. */
+    CARD16 sequenceNumber B16;
+    CARD32 length B32;       /* Is 0. */
+    BOOL   clientEnabled;    /* SHM on path agent to proxy.      */
+    BOOL   serverEnabled;    /* SHM on path proxy to X server.   */
+    BYTE   pad1, pad2;       /* Previous values can be checked   */
+    CARD32 clientSize B32;   /* at end of stage 2.               */
+    CARD32 serverSize B32;
+    CARD32 pad3 B32;
+    CARD32 pad4 B32;
+    CARD32 pad5 B32;
+} xNXGetShmemParametersReply;
+
+typedef struct _NXGetFontParametersReply {
+    BYTE   type; /* Is X_Reply. */
+    BYTE   pad1;
+    CARD16 sequenceNumber B16;
+    CARD32 length B32; /* Is length of path string + 1 / 4. */
+    CARD32 pad2 B32;
+    CARD32 pad3 B32;
+    CARD32 pad4 B32;
+    CARD32 pad5 B32;
+    CARD32 pad6 B32;
+    CARD32 pad7 B32;
+} xNXGetFontParametersReply;
+
+/*
+ * NX Requests.
+ */
+
+typedef struct _NXGetControlParametersReq {
+    CARD8  reqType;
+    BYTE   pad;
+    CARD16 length B16;
+} xNXGetControlParametersReq;
+
+typedef struct _NXGetCleanupParametersReq {
+    CARD8  reqType;
+    BYTE   pad;
+    CARD16 length B16;
+} xNXGetCleanupParametersReq;
+
+typedef struct _NXGetImageParametersReq {
+    CARD8  reqType;
+    BYTE   pad;
+    CARD16 length B16;
+} xNXGetImageParametersReq;
+
+typedef struct _NXGetUnpackParametersReq {
+    CARD8  reqType;
+    BYTE   pad;
+    CARD16 length B16;
+    CARD8  entries;
+    BYTE   pad1, pad2, pad3;
+} xNXGetUnpackParametersReq;
+
+typedef struct _NXGetShmemParametersReq {
+    CARD8    reqType;
+    CARD8    stage;         /* It is between 0 and 2.     */
+    CARD16   length B16;
+    BOOL     enableClient;  /* X client side support is   */
+    BOOL     enableServer;  /* not implemented yet.       */
+    BYTE     pad1, pad2;
+    CARD32   clientSegment; /* XID identifying the shared */
+    CARD32   serverSegment; /* memory segments.           */
+} xNXGetShmemParametersReq;
+
+typedef struct _NXGetFontParametersReq {
+    CARD8    reqType;
+    CARD8    pad;
+    CARD16   length B16;
+} xNXGetFontParametersReq;
+
+/*
+ * The available split modes.
+ */
+
+#define NXSplitModeDefault              0
+#define NXSplitModeAsync                1
+#define NXSplitModeSync                 2
+
+typedef struct _NXStartSplitReq {
+    CARD8  reqType;
+    CARD8  resource;
+    CARD16 length B16;
+    CARD8  mode;
+    BYTE   pad1, pad2, pad3;
+} xNXStartSplitReq;
+
+typedef struct _NXEndSplitReq {
+    CARD8  reqType;
+    CARD8  resource;
+    CARD16 length B16;
+} xNXEndSplitReq;
+
+typedef struct _NXCommitSplitReq {
+    CARD8  reqType;
+    CARD8  resource;
+    CARD16 length B16;
+    CARD8  propagate;
+    CARD8  request;
+    BYTE   pad1, pad2;
+    CARD32 position B32;
+} xNXCommitSplitReq;
+
+typedef struct _NXFinishSplitReq {
+    CARD8  reqType;
+    CARD8  resource;
+    CARD16 length B16;
+} xNXFinishSplitReq;
+
+typedef struct _NXAbortSplitReq {
+    CARD8  reqType;
+    CARD8  resource;
+    CARD16 length B16;
+} xNXAbortSplitReq;
+
+typedef struct _NXFreeSplitReq {
+    CARD8  reqType;
+    CARD8  resource;
+    CARD16 length B16;
+} xNXFreeSplitReq;
+
+typedef struct _NXSetExposeParametersReq {
+    CARD8  reqType;
+    BYTE   pad;
+    CARD16 length B16;
+    BOOL   expose;
+    BOOL   graphicsExpose;
+    BOOL   noExpose;
+    BYTE   pad1;
+} xNXSetExposeParametersReq;
+
+typedef struct _NXSetCacheParametersReq {
+    CARD8  reqType;
+    BYTE   pad;
+    CARD16 length B16;
+    BOOL   enableCache;
+    BOOL   enableSplit;
+    BOOL   enableSave;
+    BOOL   enableLoad;
+} xNXSetCacheParametersReq;
+
+typedef struct _NXSetUnpackGeometryReq {
+    CARD8  reqType;
+    CARD8  resource;
+    CARD16 length B16;
+    CARD8  depth1Bpp;
+    CARD8  depth4Bpp;
+    CARD8  depth8Bpp;
+    CARD8  depth16Bpp;
+    CARD8  depth24Bpp;
+    CARD8  depth32Bpp;
+    BYTE   pad1, pad2;
+    CARD32 redMask B32;
+    CARD32 greenMask B32;
+    CARD32 blueMask B32;
+} xNXSetUnpackGeometryReq;
+
+typedef struct _NXSetUnpackColormapReq {
+    CARD8  reqType;
+    CARD8  resource;
+    CARD16 length B16;
+    CARD8  method;
+    BYTE   pad1, pad2, pad3;
+    CARD32 srcLength B32;
+    CARD32 dstLength B32;
+} xNXSetUnpackColormapReq;
+
+typedef struct _NXSetUnpackAlphaReq {
+    CARD8  reqType;
+    CARD8  resource;
+    CARD16 length B16;
+    CARD8  method;
+    BYTE   pad1, pad2, pad3;
+    CARD32 srcLength B32;
+    CARD32 dstLength B32;
+} xNXSetUnpackAlphaReq;
+
+typedef struct _NXPutPackedImageReq {
+    CARD8    reqType;
+    CARD8    resource;
+    CARD16   length B16;
+    Drawable drawable B32;
+    GContext gc B32;
+    CARD8    method;
+    CARD8    format;
+    CARD8    srcDepth;
+    CARD8    dstDepth;
+    CARD32   srcLength B32;
+    CARD32   dstLength B32;
+    INT16    srcX B16, srcY B16;
+    CARD16   srcWidth B16, srcHeight B16;
+    INT16    dstX B16, dstY B16;
+    CARD16   dstWidth B16, dstHeight B16;
+} xNXPutPackedImageReq;
+
+typedef struct _NXFreeUnpackReq {
+    CARD8  reqType;
+    CARD8  resource;
+    CARD16 length B16;
+} xNXFreeUnpackReq;
+
+/*
+ * The X_NXSplitData and X_NXSplitEvent opcodes
+ * are used internally and are ignored if coming
+ * from the agent.
+ */
+
+#define X_NXInternalGenericData         0
+#define X_NXInternalGenericReply        1
+#define X_NXInternalGenericRequest      255
+
+#define X_NXInternalShapeExtension      128
+#define X_NXInternalRenderExtension     129
+
+#define X_NXFirstOpcode                 230
+#define X_NXLastOpcode                  252
+
+#define X_NXGetControlParameters        230
+#define X_NXGetCleanupParameters        231
+#define X_NXGetImageParameters          232
+#define X_NXGetUnpackParameters         233
+#define X_NXStartSplit                  234
+#define X_NXEndSplit                    235
+#define X_NXSplitData                   236
+#define X_NXCommitSplit                 237
+#define X_NXSetExposeParameters         240
+#define X_NXSetUnpackGeometry           241
+#define X_NXSetUnpackColormap           242
+#define X_NXPutPackedImage              243
+#define X_NXSplitEvent                  244
+#define X_NXGetShmemParameters          245
+#define X_NXSetUnpackAlpha              246
+#define X_NXFreeUnpack                  247
+#define X_NXFinishSplit                 248
+#define X_NXAbortSplit                  249
+#define X_NXFreeSplit                   250
+#define X_NXGetFontParameters           251
+#define X_NXSetCacheParameters          252
+
+/*
+ * The following events are received by the agent
+ * in the form of a ClientMessage with the value
+ * 0 in fields atom and window. The format is
+ * always 32. Event specific data starts at byte
+ * offset 12.
+ *
+ * These events are sent by the NX transport to
+ * notify the agent about the result of a split
+ * operation.
+ */
+
+#define NXNoSplitNotify                 1
+#define NXStartSplitNotify              2
+#define NXCommitSplitNotify             3
+#define NXEndSplitNotify                4
+#define NXEmptySplitNotify              5
+
+/*
+ * Notifications of collect events. These events
+ * don't come from the NX transport but are put
+ * back in client's event queue by NXlib.
+ */
+
+#define NXCollectImageNotify            8
+#define NXCollectPropertyNotify         9
+#define NXCollectGrabPointerNotify      10
+#define NXCollectInputFocusNotify       11
+
+#undef Drawable
+#undef GContext
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* NXproto_H */
diff --git a/nxcomp/include/NXvars.h b/nxcomp/include/NXvars.h
new file mode 100644
index 000000000..f514000d7
--- /dev/null
+++ b/nxcomp/include/NXvars.h
@@ -0,0 +1,201 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef NXvars_H
+#define NXvars_H
+
+/*
+ * This can be included by the proxy or another
+ * layer that doesn't use Xlib.
+ */
+
+#if !defined(_XLIB_H_) && !defined(_XKBSRV_H_)
+
+#define NeedFunctionPrototypes  1
+
+#define Display  void
+
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Display flush policies.
+ */
+
+#define NXPolicyImmediate    1
+#define NXPolicyDeferred     2
+
+/*
+ * Type of flush.
+ */
+
+#define NXFlushBuffer        0
+#define NXFlushLink          1
+
+/*
+ * Type of statistics.
+ */
+
+#define NXStatisticsPartial  0
+#define NXStatisticsTotal    1
+
+/*
+ * Reason why the display is blocking.
+ */
+
+#define NXBlockRead          1
+#define NXBlockWrite         2
+
+/*
+ * Set if the client is interested in ignoring
+ * the display error and continue with the exe-
+ * cution of the program. By default the usual
+ * Xlib behaviour is gotten, and the library
+ * will call an exit().
+ */
+
+extern int _NXHandleDisplayError;
+
+/*
+ * The function below is called whenever Xlib is
+ * going to perform an I/O operation. The funct-
+ * ion can be redefined to include additional
+ * checks aimed at detecting if the display needs
+ * to be closed, for example because of an event
+ * or a signal mandating the end of the session.
+ * In this way the client program can regain the
+ * control before Xlib blocks waiting for input
+ * from the network.
+ */
+
+typedef int (*NXDisplayErrorPredicate)(
+#if NeedFunctionPrototypes
+    Display*            /* display */,
+    int                 /* reason */
+#endif
+);
+
+extern NXDisplayErrorPredicate _NXDisplayErrorFunction;
+
+/*
+ * This is called when Xlib is going to block
+ * waiting for the display to become readable or
+ * writable. The client can use the hook to run
+ * any arbitrary operation that may require some
+ * time to complete. The user should not try to
+ * read or write to the display inside the call-
+ * back routine.
+ */
+
+typedef void (*NXDisplayBlockHandler)(
+#if NeedFunctionPrototypes
+    Display*            /* display */,
+    int                 /* reason */
+#endif
+);
+
+extern NXDisplayBlockHandler _NXDisplayBlockFunction;
+
+/*
+ * Used to notify the program when more data
+ * is written to the socket.
+ */
+
+typedef void (*NXDisplayWriteHandler)(
+#if NeedFunctionPrototypes
+    Display*            /* display */,
+    int                 /* length */
+#endif
+);
+
+extern NXDisplayWriteHandler _NXDisplayWriteFunction;
+
+/*
+ * This callback is used to notify the agent
+ * that the proxy link has been flushed.
+ */
+
+typedef void (*NXDisplayFlushHandler)(
+#if NeedFunctionPrototypes
+    Display*            /* display */,
+    int                 /* length */
+#endif
+);
+
+extern NXDisplayFlushHandler _NXDisplayFlushFunction;
+
+/*
+ * Used by the NX transport to get an arbitrary
+ * string to add to its protocol statistics.
+ */
+
+typedef void (*NXDisplayStatisticsHandler)(
+#if NeedFunctionPrototypes
+    Display*            /* display */,
+    char*               /* buffer */,
+    int                 /* size */
+#endif
+);
+
+extern NXDisplayStatisticsHandler _NXDisplayStatisticsFunction;
+
+/*
+ * Let users redefine the function printing an
+ * error message in the case of a out-of-order
+ * sequence number.
+ */
+
+typedef void (*NXLostSequenceHandler)(
+#if NeedFunctionPrototypes
+    Display*            /* display */,
+    unsigned long       /* newseq */,
+    unsigned long       /* lastseq */,
+    unsigned int        /* type */
+#endif
+);
+
+extern NXLostSequenceHandler _NXLostSequenceFunction;
+
+/*
+ * Let the X server run the children processes
+ * (as for example the keyboard initialization
+ * utilities) by using the native system libra-
+ * ries, instead of the libraries shipped with
+ * the NX environment. If set, the Popen() in
+ * the X server will remove the LD_LIBRARY_PATH
+ * setting from the environment before calling
+ * the execl() function in the child process.
+ */
+
+extern int _NXUnsetLibraryPath;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* NXvars_H */
diff --git a/nxcomp/install-sh b/nxcomp/install-sh
deleted file mode 100755
index 58719246f..000000000
--- a/nxcomp/install-sh
+++ /dev/null
@@ -1,238 +0,0 @@
-#! /bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-#
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:	no input file specified"
-	exit 1
-else
-	true
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-	
-	if [ -d $dst ]; then
-		instcmd=:
-	else
-		instcmd=mkdir
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f $src -o -d $src ]
-	then
-		true
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if [ x"$dst" = x ]
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		true
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d $dst ]
-	then
-		dst="$dst"/`basename $src`
-	else
-		true
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='	
-'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
-	shift
-
-	if [ ! -d "${pathcomp}" ] ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		true
-	fi
-
-	pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd $dst &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		true
-	fi
-
-# Make a temp file name in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd $src $dsttmp &&
-
-	trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
-
-exit 0
diff --git a/nxcomp/m4/nx-macros.m4 b/nxcomp/m4/nx-macros.m4
new file mode 120000
index 000000000..813e9b041
--- /dev/null
+++ b/nxcomp/m4/nx-macros.m4
@@ -0,0 +1 @@
+../../m4/nx-macros.m4
\ No newline at end of file
diff --git a/nxcomp/mkinstalldirs b/nxcomp/mkinstalldirs
deleted file mode 100755
index 936cf3407..000000000
--- a/nxcomp/mkinstalldirs
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Last modified: 1995-03-05
-# Public domain
-
-errstatus=0
-
-for file in ${1+"$@"} ; do
-   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-   shift
-
-   pathcomp=
-   for d in ${1+"$@"} ; do
-     pathcomp="$pathcomp$d"
-     case "$pathcomp" in
-       -* ) pathcomp=./$pathcomp ;;
-     esac
-
-     if test ! -d "$pathcomp"; then
-        echo "mkdir $pathcomp" 1>&2
-        mkdir "$pathcomp" > /dev/null 2>&1 || lasterr=$?
-     fi
-
-     if test ! -d "$pathcomp"; then
-	errstatus=$lasterr
-     fi
-
-     pathcomp="$pathcomp/"
-   done
-done
-
-exit $errstatus
diff --git a/nxcomp/nxcomp.pc.in b/nxcomp/nxcomp.pc.in
index f0963aa17..26206d857 100644
--- a/nxcomp/nxcomp.pc.in
+++ b/nxcomp/nxcomp.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: nxcomp
 Description: NX Compression Library
-Version: @VERSION@
+Version: @COMP_VERSION@
 #libjepg does not provide a pkgconfig-file, zlib does not provide it for older versions
 #Requires: libjpeg zlib
 Requires: libpng
diff --git a/nxcomp/src/ActionCache.cpp b/nxcomp/src/ActionCache.cpp
new file mode 100644
index 000000000..783b1724e
--- /dev/null
+++ b/nxcomp/src/ActionCache.cpp
@@ -0,0 +1,51 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "Control.h"
+
+#include "ActionCache.h"
+
+ActionCache::ActionCache()
+{
+  for (int i = 0; i < 256; i++)
+  {
+    base_[i] = new IntCache(8);
+  }
+
+  slot_ = 0;
+  last_ = 0;
+}
+
+ActionCache::~ActionCache()
+{
+  for (int i = 0; i < 256; i++)
+  {
+    delete base_[i];
+  }
+}
diff --git a/nxcomp/src/ActionCache.h b/nxcomp/src/ActionCache.h
new file mode 100644
index 000000000..2aedd4a07
--- /dev/null
+++ b/nxcomp/src/ActionCache.h
@@ -0,0 +1,49 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef ActionCache_H
+#define ActionCache_H
+
+#include "IntCache.h"
+
+class ActionCache
+{
+  friend class EncodeBuffer;
+  friend class DecodeBuffer;
+  
+  public:
+
+  ActionCache();
+  ~ActionCache();
+
+  private:
+
+  IntCache *base_[256];
+
+  unsigned int slot_;
+  unsigned short last_;
+};
+
+#endif /* ActionCache_H */
diff --git a/nxcomp/src/Agent.cpp b/nxcomp/src/Agent.cpp
new file mode 100644
index 000000000..e55620601
--- /dev/null
+++ b/nxcomp/src/Agent.cpp
@@ -0,0 +1,84 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "Misc.h"
+#include "Agent.h"
+#include "Proxy.h"
+
+extern Proxy *proxy;
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+Agent::Agent(int fd[2])
+{
+  remoteFd_ = fd[0];
+  localFd_  = fd[1];
+
+  transport_ = new AgentTransport(localFd_);
+
+  if (transport_ == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "Agent: PANIC! Can't create the memory-to-memory transport "
+            << "for FD#" << localFd_ << ".\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Can't create the memory-to-memory transport "
+         << "for FD#" << localFd_ << ".\n";
+
+    HandleCleanup();
+  }
+
+  FD_ZERO(&saveRead_);
+  FD_ZERO(&saveWrite_);
+
+  canRead_ = 0;
+
+  #ifdef DEBUG
+  *logofs << "Agent: Created agent object at " << this
+          << ".\n" << logofs_flush;
+  #endif
+}
+
+Agent::~Agent()
+{
+  delete transport_;
+
+  #ifdef DEBUG
+  *logofs << "Agent: Deleted agent object at " << this
+          << ".\n" << logofs_flush;
+  #endif
+}
diff --git a/nxcomp/src/Agent.h b/nxcomp/src/Agent.h
new file mode 100644
index 000000000..3e1a50ae5
--- /dev/null
+++ b/nxcomp/src/Agent.h
@@ -0,0 +1,263 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef Agent_H
+#define Agent_H
+
+#include <unistd.h>
+
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/select.h>
+
+#include "Misc.h"
+#include "Transport.h"
+#include "Proxy.h"
+
+extern Proxy *proxy;
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+class Agent
+{
+  public:
+
+  //
+  // Must be created by passing the fake descriptor that
+  // will be used for simulating socket communication
+  // betwen the agent and the proxy. I/O will take place
+  // by copying data to the agent's read and write buf-
+  // fers.
+  //
+
+  Agent(int fd[2]);
+
+  ~Agent();
+
+  AgentTransport *getTransport() const
+  {
+    return transport_;
+  }
+
+  void saveReadMask(fd_set *readSet)
+  {
+    saveRead_ = *readSet;
+  }
+
+  void saveWriteMask(fd_set *writeSet)
+  {
+    saveWrite_ = *writeSet;
+  }
+
+  void clearReadMask(fd_set *readSet)
+  {
+    FD_CLR(remoteFd_, readSet);
+    FD_CLR(localFd_,  readSet);
+  }
+
+  void clearWriteMask(fd_set *writeSet)
+  {
+    FD_CLR(remoteFd_, writeSet);
+    FD_CLR(localFd_,  writeSet);
+  }
+
+  void setLocalRead(fd_set *readSet, int *result)
+  {
+    (*result)++;
+
+    FD_SET(localFd_, readSet);
+  }
+
+  void setRemoteRead(fd_set *readSet, int *result)
+  {
+    (*result)++;
+
+    FD_SET(remoteFd_, readSet);
+  }
+
+  void setRemoteWrite(fd_set *writeSet, int *result)
+  {
+    (*result)++;
+
+    FD_SET(remoteFd_, writeSet);
+  }
+
+  fd_set *getSavedReadMask()
+  {
+    return &saveRead_;
+  }
+
+  fd_set *getSavedWriteMask()
+  {
+    return &saveWrite_;
+  }
+
+  int getRemoteFd() const
+  {
+    return remoteFd_;
+  }
+
+  int getLocalFd() const
+  {
+    return localFd_;
+  }
+
+  int getProxyFd() const
+  {
+    return proxy -> getFd();
+  }
+
+  int isValid() const
+  {
+    return (transport_ != NULL);
+  }
+
+  int localReadable()
+  {
+    return (transport_ -> readable() != 0);
+  }
+
+  //
+  // Check if we can process more data from
+  // the agent descriptor and cache the result
+  // to avoid multiple calls. This must be
+  // always called before querying the other
+  // functions.
+  //
+
+  void saveChannelState()
+  {
+    canRead_ = (proxy != NULL ? proxy -> canRead(localFd_) : 0);
+  }
+
+  int remoteCanRead(const fd_set * const readSet)
+  {
+    // OS X 10.5 requires the second argument to be non-const, so copy readSet.
+    // It's safe though, as FD_ISSET does not operate on it.
+    fd_set readWorkSet = *readSet;
+
+    #if defined(TEST) || defined(INFO)
+    *logofs << "Agent: remoteCanRead() is " <<
+               (FD_ISSET(remoteFd_, &readWorkSet) && transport_ -> dequeuable() != 0)
+            << " with FD_ISSET() " << (int) FD_ISSET(remoteFd_, &readWorkSet)
+            << " and dequeuable " << transport_ -> dequeuable()
+            << ".\n" << logofs_flush;
+    #endif
+
+    return (FD_ISSET(remoteFd_, &readWorkSet) &&
+                transport_ -> dequeuable() != 0);
+  }
+
+  int remoteCanWrite(const fd_set * const writeSet)
+  {
+    // OS X 10.5 requires the second argument to be non-const, so copy writeSet.
+    // It's safe though, as FD_ISSET does not operate on it.
+    fd_set writeWorkSet = *writeSet;
+
+    #if defined(TEST) || defined(INFO)
+    *logofs << "Agent: remoteCanWrite() is " <<
+               (FD_ISSET(remoteFd_, &writeWorkSet) && transport_ ->
+               queuable() != 0 && canRead_ == 1) << " with FD_ISSET() "
+            << (int) FD_ISSET(remoteFd_, &writeWorkSet) << " queueable "
+            << transport_ -> queuable() << " channel can read "
+            << canRead_ << ".\n" << logofs_flush;
+    #endif
+
+    return (FD_ISSET(remoteFd_, &writeWorkSet) &&
+                transport_ -> queuable() != 0 &&
+                    canRead_ == 1);
+  }
+
+  int localCanRead()
+  {
+    #if defined(TEST) || defined(INFO)
+    *logofs << "Agent: localCanRead() is " <<
+               (transport_ -> readable() != 0 && canRead_ == 1)
+            << " with readable " << transport_ -> readable()
+            << " channel can read " << canRead_ << ".\n"
+            << logofs_flush;
+    #endif
+
+    return (transport_ -> readable() != 0 &&
+                canRead_ == 1);
+  }
+
+  int proxyCanRead()
+  {
+    #if defined(TEST) || defined(INFO)
+    *logofs << "Agent: proxyCanRead() is " << proxy -> canRead()
+            << ".\n" << logofs_flush;
+    #endif
+
+    return (proxy -> canRead());
+  }
+
+  int proxyCanRead(const fd_set * const readSet)
+  {
+    // OS X 10.5 requires the second argument to be non-const, so copy readSet.
+    // It's safe though, as FD_ISSET does not operate on it.
+    fd_set readWorkSet = *readSet;
+
+    #if defined(TEST) || defined(INFO)
+    *logofs << "Agent: proxyCanRead() is "
+            << ((int) FD_ISSET(proxy -> getFd(), &readWorkSet))
+            << ".\n" << logofs_flush;
+    #endif
+
+    return (FD_ISSET(proxy -> getFd(), &readWorkSet));
+  }
+
+  int enqueueData(const char *data, const int size) const
+  {
+    return transport_ -> enqueue(data, size);
+  }
+
+  int dequeueData(char *data, int size) const
+  {
+    return transport_ -> dequeue(data, size);
+  }
+
+  int dequeuableData() const
+  {
+    return transport_ -> dequeuable();
+  }
+
+  private:
+
+  int remoteFd_;
+  int localFd_;
+
+  fd_set saveRead_;
+  fd_set saveWrite_;
+
+  int canRead_;
+
+  AgentTransport *transport_;
+};
+
+#endif /* Agent_H */
diff --git a/nxcomp/src/Alpha.cpp b/nxcomp/src/Alpha.cpp
new file mode 100644
index 000000000..6157e21e5
--- /dev/null
+++ b/nxcomp/src/Alpha.cpp
@@ -0,0 +1,138 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "Misc.h"
+#include "Unpack.h"
+#include "Alpha.h"
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+int UnpackAlpha(unsigned char method, unsigned char *src_data, int src_size,
+                    unsigned char *dst_data, int dst_size)
+{
+  if (*src_data == 0)
+  {
+    if (dst_size != src_size - 1)
+    {
+      #ifdef TEST
+      *logofs << "UnpackAlpha: PANIC! Invalid destination size "
+              << dst_size << " with source " << src_size
+              << ".\n" << logofs_flush;
+      #endif
+
+      return -1;
+    }
+
+    #ifdef TEST
+    *logofs << "UnpackAlpha: Expanding " << src_size - 1
+            << " bytes of plain alpha data.\n" << logofs_flush;
+    #endif
+
+    memcpy(dst_data, src_data + 1, src_size - 1);
+
+    return 1;
+  }
+
+  unsigned int check_size = dst_size;
+
+  int result = ZDecompress(&unpackStream, dst_data, &check_size,
+                               src_data + 1, src_size - 1);
+
+  if (result != Z_OK)
+  {
+    #ifdef PANIC
+    *logofs << "UnpackAlpha: PANIC! Failure decompressing alpha data. "
+            << "Error is '" << zError(result) << "'.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Failure decompressing alpha data. "
+         << "Error is '" << zError(result) << "'.\n";
+
+    return -1;
+  }
+  else if (check_size != (unsigned int) dst_size)
+  {
+    #ifdef PANIC
+    *logofs << "UnpackAlpha: PANIC! Size mismatch in alpha data. "
+            << "Resulting size is " << check_size << " with "
+            << "expected size " << dst_size << ".\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Size mismatch in alpha data. "
+         << "Resulting size is " << check_size << " with "
+         << "expected size " << dst_size << ".\n";
+
+    return -1;
+  }
+
+  #ifdef TEST
+  *logofs << "UnpackAlpha: Decompressed " << src_size - 1
+          << " bytes to " << dst_size << " bytes of alpha data.\n"
+          << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int UnpackAlpha(T_alpha *alpha, unsigned char *dst_data,
+                    int dst_size, int big_endian)
+{
+  unsigned int count = dst_size >> 2;
+
+  unsigned int i;
+
+  int shift;
+
+  if (count != alpha -> entries)
+  {
+    #ifdef WARNING
+    *logofs << "UnpackAlpha: WARNING! Not applying the alpha with "
+            << count << " elements needed and " << alpha -> entries
+            << " available.\n" << logofs_flush;
+    #endif
+
+    return 0;
+  }
+
+  shift = (big_endian == 1 ? 0 : 3);
+  
+  for (i = 0; i < count; i++)
+  {
+    *(dst_data + shift) = *(alpha -> data + i);
+
+    dst_data += 4;
+  }
+
+  return 1;
+}
diff --git a/nxcomp/src/Alpha.h b/nxcomp/src/Alpha.h
new file mode 100644
index 000000000..ea5068812
--- /dev/null
+++ b/nxcomp/src/Alpha.h
@@ -0,0 +1,35 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef Alpha_H
+#define Alpha_H
+
+int UnpackAlpha(unsigned char method, unsigned char *src_data, int src_size,
+                    unsigned char *dst_data, int dst_size);
+
+int UnpackAlpha(T_alpha *alpha, unsigned char *dst_data,
+                    int dst_size, int big_endian);
+
+#endif /* Aplha_H */
diff --git a/nxcomp/src/Auth.cpp b/nxcomp/src/Auth.cpp
new file mode 100644
index 000000000..d42c0556d
--- /dev/null
+++ b/nxcomp/src/Auth.cpp
@@ -0,0 +1,671 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "Auth.h"
+
+#include "Misc.h"
+#include "Control.h"
+#include "Timestamp.h"
+#include "Pipe.h"
+
+#define DEFAULT_STRING_LIMIT  512
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+//
+// Store the provided cookie as our 'fake' cookie, then
+// read the 'real' cookie from the current X authority
+// file. 
+//
+
+Auth::Auth(char *display, char *cookie)
+{
+  display_ = NULL;
+
+  file_ = NULL;
+
+  last_ = nullTimestamp();
+
+  fakeCookie_ = NULL;
+  realCookie_ = NULL;
+
+  fakeData_ = NULL;
+  realData_ = NULL;
+
+  dataSize_ = 0;
+
+  generatedCookie_ = 0;
+
+  if (display == NULL || *display == '\0' || cookie == NULL ||
+          *cookie == '\0' || strlen(cookie) != 32)
+  {
+    #ifdef PANIC
+    *logofs << "Auth: PANIC! Can't create the X authorization data "
+            << "with cookie '" << cookie << "' and display '"
+            << display << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Can't create the X authorization data "
+         << "with cookie '" << cookie << "' and display '"
+         << display << "'.\n";
+
+    return;
+  }
+
+  #ifdef TEST
+  *logofs << "Auth: Creating X authorization data with cookie '"
+          << cookie << "' and display '" << display << "'.\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // Get a local copy of all parameters.
+  //
+
+  display_ = new char[strlen(display) + 1];
+  file_    = new char[DEFAULT_STRING_LIMIT];
+
+  fakeCookie_ = new char[strlen(cookie) + 1];
+  realCookie_ = new char[DEFAULT_STRING_LIMIT];
+
+  if (display_ == NULL || file_ == NULL ||
+          fakeCookie_ == NULL || realCookie_ == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "Auth: PANIC! Cannot allocate memory for the X "
+            << "authorization data.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Cannot allocate memory for the X "
+         << "authorization data.\n";
+
+    return;
+  }
+
+  strcpy(display_, display);
+
+  *file_ = '\0';
+
+  strcpy(fakeCookie_, cookie);
+
+  *realCookie_ = '\0';
+
+  //
+  // Get the real cookie from the authorization file.
+  //
+
+  updateCookie();
+}
+
+Auth::~Auth()
+{
+  delete [] display_;
+  delete [] file_;
+
+  delete [] fakeCookie_;
+  delete [] realCookie_;
+
+  delete [] fakeData_;
+  delete [] realData_;
+}
+
+//
+// At the present moment the cookie is read only once,
+// at the time the instance is initialized. If the auth
+// file changes along the life of the session, the old
+// cookie will be used. This works with X servers beca-
+// use of an undocumented "feature". See nx-X11.
+//
+
+int Auth::updateCookie()
+{
+  if (isTimestamp(last_) == 0)
+  {
+    #ifdef TEST
+    *logofs << "Auth: Reading the X authorization file "
+            << "with last update at " << strMsTimestamp(last_)
+            << ".\n" << logofs_flush;
+    #endif
+
+    if (getCookie() == 1 && validateCookie() == 1)
+    {
+      //
+      // It should rather be the modification time
+      // the auth file, so we can read it again if
+      // the file is changed.
+      //
+
+      #ifdef TEST
+      *logofs << "Auth: Setting last X authorization file "
+              << "update at " << strMsTimestamp() << ".\n"
+              << logofs_flush;
+      #endif
+
+      last_ = getTimestamp();
+
+      return 1;
+    }
+
+    #ifdef PANIC
+    *logofs << "Auth: PANIC! Cannot read the cookie from the X "
+            << "authorization file.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Cannot read the cookie from the X "
+         << "authorization file.\n";
+
+    return -1;
+  }
+
+  #ifdef TEST
+  *logofs << "Auth: WARNING! Skipping check on the X "
+          << "authorization file.\n" << logofs_flush;
+  #endif
+
+  return 0;
+}
+
+int Auth::getCookie()
+{
+  //
+  // Check the name of the auth file that we are going to use.
+  // It can be either the value of the XAUTHORITY environment
+  // or the default .Xauthority file in the user's home.
+  //
+
+  char *environment;
+
+  environment = getenv("XAUTHORITY");
+
+  if (environment != NULL && *environment != '\0')
+  {
+    strncpy(file_, environment, DEFAULT_STRING_LIMIT - 1);
+  }
+  else
+  {
+    snprintf(file_, DEFAULT_STRING_LIMIT - 1, "%s/.Xauthority",
+                 control -> HomePath);
+  }
+
+  *(file_ + DEFAULT_STRING_LIMIT - 1) = '\0';
+
+  #ifdef TEST
+  *logofs << "Auth: Using X authorization file '" << file_
+          << "'.\n" << logofs_flush;
+  #endif
+
+  //
+  // Use the nxauth command on Windows and the Mac, xauth
+  // on all the other platforms. On Windows we assume that
+  // the nxauth command is located under bin in the client
+  // installation directory. On Mac OS X we assume that the
+  // command is located directly in the client installation
+  // directory, to make bundle shipping easier. On all the
+  // other platforms we use the default xauth command that
+  // is in our path.
+  //
+
+  char command[DEFAULT_STRING_LIMIT];
+
+  #if defined(__CYGWIN32__)
+
+  snprintf(command, DEFAULT_STRING_LIMIT - 1,
+               "%s/bin/nxauth", control -> SystemPath);
+
+  *(command + DEFAULT_STRING_LIMIT - 1) = '\0';
+
+  #elif defined(__APPLE__)
+
+  snprintf(command, DEFAULT_STRING_LIMIT - 1,
+               "%s/nxauth", control -> SystemPath);
+
+  *(command + DEFAULT_STRING_LIMIT - 1) = '\0';
+
+  #else
+
+  strcpy(command, "xauth");
+
+  #endif
+
+  #ifdef TEST
+  *logofs << "Auth: Using X auth command '" << command
+          << "'.\n" << logofs_flush;
+  #endif
+
+  //
+  // The SSH code forces using the unix:n port when passing localhost:n.
+  // This is probably because localhost:n can fail to return a valid
+  // entry on machines where the hostname for localhost doesn't match
+  // exactly the 'localhost' string. For example, on a freshly installed
+  // Fedora Core 3 I get a 'localhost.localdomain/unix:0' entry. Query-
+  // ing 'xauth list localhost:0' results in an empty result, while the
+  // query 'xauth list unix:0' works as expected. Note anyway that if
+  // the cookie for the TCP connection on 'localhost' is set to a dif-
+  // ferent cookie than the one for the Unix connections, both SSH and
+  // NX will match the wrong cookie and session will fail.
+  //
+  
+  char line[DEFAULT_STRING_LIMIT];
+
+  if (strncmp(display_, "localhost:", 10) == 0)
+  {
+    snprintf(line, DEFAULT_STRING_LIMIT, "unix:%s", display_ + 10);
+  }
+  else
+  {
+    snprintf(line, DEFAULT_STRING_LIMIT, "%.200s", display_);
+  }
+
+  const char *parameters[256];
+
+  parameters[0] = command;
+  parameters[1] = command;
+  parameters[2] = "-f";
+  parameters[3] = file_;
+  parameters[4] = "list";
+  parameters[5] = line;
+  parameters[6] = NULL;
+
+  #ifdef TEST
+  *logofs << "Auth: Executing command ";
+
+  for (int i = 0; i < 256 && parameters[i] != NULL; i++)
+  {
+    *logofs << "[" << parameters[i] << "]";
+  }
+
+  *logofs << ".\n" << logofs_flush;
+  #endif
+
+  //
+  // Use the popen() function to read the result
+  // of the command. We would better use our own
+  // implementation.
+  //
+
+  FILE *data = Popen((char *const *) parameters, "r");
+
+  int result = -1;
+
+  if (data == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "Auth: PANIC! Failed to execute the X auth command.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Failed to execute the X auth command.\n";
+
+    goto AuthGetCookieResult;
+  }
+
+  if (fgets(line, DEFAULT_STRING_LIMIT, data) == NULL)
+  {
+    #ifdef WARNING
+    *logofs << "Auth: WARNING! Failed to read data from the X "
+            << "auth command.\n" << logofs_flush;
+    #endif
+
+    #ifdef TEST
+    cerr << "Warning" << ": Failed to read data from the X "
+         << "auth command.\n";
+    #endif
+
+    #ifdef PANIC
+    *logofs << "Auth: WARNING! Generating a fake cookie for "
+            << "X authentication.\n" << logofs_flush;
+    #endif
+
+    #ifdef TEST
+    cerr << "Warning" << ": Generating a fake cookie for "
+         << "X authentication.\n";
+    #endif
+
+    generateCookie(realCookie_);
+  }
+  else
+  {
+    #ifdef TEST
+    *logofs << "Auth: Checking cookie in string '" << line
+            << "'.\n" << logofs_flush;
+    #endif
+
+    // 
+    // Skip the hostname in the authority entry
+    // just in case it includes some white spaces.
+    //
+
+    char *cookie = NULL;
+
+    cookie = index(line, ':');
+
+    if (cookie == NULL)
+    {
+      cookie = line;
+    }
+
+    if (sscanf(cookie, "%*s %*s %511s", realCookie_) != 1)
+    {
+      #ifdef PANIC
+      *logofs << "Auth: PANIC! Failed to identify the cookie "
+              << "in string '" << line << "'.\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Failed to identify the cookie "
+           << "in string '" << line << "'.\n";
+
+      goto AuthGetCookieResult;
+    }
+
+    #ifdef TEST
+    *logofs << "Auth: Got cookie '" << realCookie_
+            << "' from file '" << file_ << "'.\n"
+            << logofs_flush;
+    #endif
+  }
+
+  result = 1;
+
+AuthGetCookieResult:
+
+  if (data != NULL)
+  {
+    Pclose(data);
+  }
+
+  return result;
+}
+
+int Auth::validateCookie()
+{
+  unsigned int length = strlen(realCookie_);
+
+  if (length > DEFAULT_STRING_LIMIT / 2 - 1 ||
+          strlen(fakeCookie_) != length)
+  {
+    #ifdef PANIC
+    *logofs << "Auth: PANIC! Size mismatch between cookies '"
+            << realCookie_ << "' and '" << fakeCookie_ << "'.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Size mismatch between cookies '"
+         << realCookie_ << "' and '" << fakeCookie_ << "'.\n";
+
+    goto AuthValidateCookieError;
+  }
+
+  //
+  // The length of the resulting data will be
+  // half the size of the Hex cookie.
+  //
+
+  length = length / 2;
+
+  fakeData_ = new char[length];
+  realData_ = new char[length];
+
+  if (fakeData_ == NULL || realData_ == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "Auth: PANIC! Cannot allocate memory for the binary X "
+            << "authorization data.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Cannot allocate memory for the binary X "
+         << "authorization data.\n";
+
+    goto AuthValidateCookieError;
+  }
+
+  //
+  // Translate the real cookie from Hex data
+  // to its binary representation.
+  //
+
+  unsigned int value;
+
+  for (unsigned int i = 0; i < length; i++)
+  {
+    if (sscanf(realCookie_ + 2 * i, "%2x", &value) != 1)
+    {
+      #ifdef PANIC
+      *logofs << "Auth: PANIC! Bad X authorization data in real "
+              << "cookie '" << realCookie_ << "'.\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Bad X authorization data in real cookie '"
+           << realCookie_ << "'.\n";
+
+      goto AuthValidateCookieError;
+    }
+
+    realData_[i] = value;
+
+    if (sscanf(fakeCookie_ + 2 * i, "%2x", &value) != 1)
+    {
+      #ifdef PANIC
+      *logofs << "Auth: PANIC! Bad X authorization data in fake "
+              << "cookie '" << fakeCookie_ << "'.\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Bad X authorization data in fake cookie '"
+           << fakeCookie_ << "'.\n";
+
+      goto AuthValidateCookieError;
+    }
+
+    fakeData_[i] = value;
+  }
+
+  dataSize_ = length;
+
+  #ifdef TEST
+  *logofs << "Auth: Validated real cookie '"
+          << realCookie_ << "' and fake cookie '" << fakeCookie_
+          << "' with data with size " << dataSize_ << ".\n"
+          << logofs_flush;
+
+  *logofs << "Auth: Ready to accept incoming connections.\n"
+          << logofs_flush;
+  #endif
+
+  return 1;
+
+AuthValidateCookieError:
+
+  delete [] fakeData_;
+  delete [] realData_;
+
+  fakeData_ = NULL;
+  realData_ = NULL;
+
+  dataSize_ = 0;
+
+  return -1;
+}
+
+int Auth::checkCookie(unsigned char *buffer)
+{
+  if (isValid() != 1)
+  {
+    #ifdef PANIC
+    *logofs << "Auth: PANIC! Attempt to check the X cookie with "
+            << "invalid authorization data.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Attempt to check the X cookie with "
+         << "invalid authorization data.\n";
+
+    return -1;
+  }
+
+  const char *protoName = "MIT-MAGIC-COOKIE-1";
+  int protoSize = strlen(protoName);
+
+  int matchedProtoSize;
+  int matchedDataSize;
+
+  if (buffer[0] == 0x42)
+  {
+    //
+    // Byte order is MSB first.
+    //
+
+    matchedProtoSize = 256 * buffer[6] + buffer[7];
+    matchedDataSize  = 256 * buffer[8] + buffer[9];
+  }
+  else if (buffer[0] == 0x6c)
+  {
+    //
+    // Byte order is LSB first.
+    //
+
+    matchedProtoSize = buffer[6] + 256 * buffer[7];
+    matchedDataSize  = buffer[8] + 256 * buffer[9];
+  }
+  else
+  {
+    #ifdef WARNING
+    *logofs << "Auth: WARNING! Bad X connection data in the buffer.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Warning" << ": Bad X connection data in the buffer.\n";
+
+    return -1;
+  }
+
+  //
+  // Check if both the authentication protocol
+  // and the fake cookie match our data.
+  //
+
+  int protoOffset = 12;
+
+  #ifdef TEST
+  *logofs << "Auth: Received a protocol size of "
+          << matchedProtoSize << " bytes.\n"
+          << logofs_flush;
+  #endif
+
+  if (matchedProtoSize != protoSize ||
+          memcmp(buffer + protoOffset, protoName, protoSize) != 0)
+  {
+    #ifdef WARNING
+    *logofs << "Auth: WARNING! Protocol mismatch or no X "
+            << "authentication data.\n" << logofs_flush;
+    #endif
+
+    cerr << "Warning" << ": Protocol mismatch or no X "
+         << "authentication data.\n";
+
+    return -1;
+  }
+
+  int dataOffset = protoOffset + ((matchedProtoSize + 3) & ~3);
+
+  #ifdef TEST
+  *logofs << "Auth: Received a data size of "
+          << matchedDataSize << " bytes.\n"
+          << logofs_flush;
+  #endif
+
+  if (matchedDataSize != dataSize_ ||
+           memcmp(buffer + dataOffset, fakeData_, dataSize_) != 0)
+  {
+    #ifdef WARNING
+    *logofs << "Auth: WARNING! Cookie mismatch in the X "
+            << "authentication data.\n" << logofs_flush;
+    #endif
+
+    cerr << "Warning" << ": Cookie mismatch in the X "
+         << "authentication data.\n";
+
+    return -1;
+  }
+
+  //
+  // Everything is OK. Replace the fake data.
+  //
+
+  #ifdef TEST
+  *logofs << "Auth: Replacing fake X authentication data "
+          << "with the real data.\n" << logofs_flush;
+  #endif
+
+  memcpy(buffer + dataOffset, realData_, dataSize_);
+
+  return 1;
+}
+
+void Auth::generateCookie(char *cookie)
+{
+  //
+  // Code is from the SSH implementation, except that
+  // we use a much weaker random number generator.
+  // This is not critical, anyway, as this is just a
+  // fake cookie. The X server doesn't have a cookie
+  // for the display, so it will ignore the value we
+  // feed to it.
+  //
+
+  T_timestamp timer = getTimestamp();
+
+  srand((unsigned int) timer.tv_usec);
+
+  unsigned int data = rand();
+
+  for (int i = 0; i < 16; i++)
+  {
+    if (i % 4 == 0)
+    {
+      data = rand();
+    }
+
+    snprintf(cookie + 2 * i, 3, "%02x", data & 0xff);
+
+    data >>= 8;
+  }
+
+  generatedCookie_ = 1;
+
+  #ifdef TEST
+  *logofs << "Auth: Generated X cookie string '"
+          << cookie << "'.\n" << logofs_flush;
+  #endif
+}
diff --git a/nxcomp/src/Auth.h b/nxcomp/src/Auth.h
new file mode 100644
index 000000000..d51d9a26f
--- /dev/null
+++ b/nxcomp/src/Auth.h
@@ -0,0 +1,127 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef Auth_H
+#define Auth_H
+
+#include "Timestamp.h"
+
+//
+// Handle the forwarding of authorization credentials
+// to the X server by replacing the fake cookie with
+// the real cookie as it is read from the auth file.
+// At the moment only the MIT-MAGIC-COOKIE-1 cookies
+// are recognized. The implementation is based on the
+// corresponding code found in the SSH client.
+//
+
+class Auth
+{
+  public:
+
+  //
+  // Must be created by passing the fake cookie that
+  // will be forwarded by the remote end and with the
+  // real X display that is going to be used for the
+  // session.
+  //
+
+  Auth(char *display, char *cookie);
+
+  ~Auth();
+
+  int isValid()
+  {
+    return (isTimestamp(last_) == 1 && fakeCookie_ != NULL &&
+                *fakeCookie_ != '\0' && realCookie_ != NULL &&
+                    *realCookie_ != '\0' && fakeData_ != NULL &&
+                        realData_ != NULL && dataSize_ != 0);
+  }
+
+  int isFake() const
+  {
+    return generatedCookie_;
+  }
+
+  //
+  // Method called in the channel class to find if the
+  // provided cookie matches the fake one. If the data
+  // matches, the fake cookie is replaced with the real
+  // one.
+  //
+
+  int checkCookie(unsigned char *buffer);
+
+  protected:
+
+  //
+  // Update the real cookie for the display. If called
+  // a further time, check if the auth file is changed
+  // and get the new cookie.
+  //
+
+  int updateCookie();
+
+  //
+  // Find out which authorization file is to be used
+  // and query the cookie for the current display.
+  //
+
+  int getCookie();
+
+  //
+  // Extract the binary data from the cookies so that
+  // data can be directly compared at the time it is
+  // taken from the X request.
+  //
+
+  int validateCookie();
+
+  //
+  // Generate a fake random cookie and copy it to the
+  // provided string.
+  //
+
+  void generateCookie(char *cookie);
+
+  private:
+
+  char *display_;
+  char *file_;
+
+  T_timestamp last_;
+
+  char *fakeCookie_;
+  char *realCookie_;
+
+  char *fakeData_;
+  char *realData_;
+
+  int dataSize_;
+
+  int generatedCookie_;
+};
+
+#endif /* Auth_H */
diff --git a/nxcomp/src/Bitmap.cpp b/nxcomp/src/Bitmap.cpp
new file mode 100644
index 000000000..c89df53e3
--- /dev/null
+++ b/nxcomp/src/Bitmap.cpp
@@ -0,0 +1,118 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "Misc.h"
+#include "Bitmap.h"
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+int UnpackBitmap(T_geometry *geometry, unsigned char method, unsigned char *src_data,
+                  int src_size, int dst_bpp, int dst_width, int dst_height,
+                      unsigned char *dst_data, int dst_size)
+{
+  if (dst_bpp != 32)
+  {
+    #ifdef TEST
+    *logofs << "UnpackBitmap: Nothing to do with "
+            << "image of " << dst_bpp << " bits per plane "
+            << "and size " << src_size << ".\n"
+            << logofs_flush;
+    #endif
+
+    if (src_size != dst_size)
+    {
+      #ifdef PANIC
+      *logofs << "UnpackBitmap: PANIC! Size mismatch with "
+              << src_size << " bytes in the source and "
+              << dst_size << " in the destination.\n"
+              << logofs_flush;
+      #endif
+
+      return -1;
+    }
+
+    memcpy(dst_data, src_data, src_size);
+
+    return 1;
+  }
+  else if (src_size != dst_width * dst_height * 3 ||
+               dst_size != dst_width * dst_height * 4)
+  {
+    #ifdef PANIC
+    *logofs << "UnpackBitmap: PANIC! Size mismatch with "
+            << src_size << " bytes in the source and "
+            << dst_size << " in the destination.\n"
+            << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  /*
+   * Insert the 4th byte in the bitmap.
+   */
+
+  unsigned char *next_src = src_data;
+  unsigned char *next_dst = dst_data;
+
+  if (geometry -> image_byte_order == LSBFirst)
+  {
+    while (next_src < src_data + src_size)
+    {
+      *next_dst++ = *next_src++;
+      *next_dst++ = *next_src++;
+      *next_dst++ = *next_src++;
+
+      next_dst++;
+    }
+  }
+  else
+  {
+    while (next_src < src_data + src_size)
+    {
+      next_dst++;
+
+      *next_dst++ = *next_src++;
+      *next_dst++ = *next_src++;
+      *next_dst++ = *next_src++;
+    }
+  }
+
+  #ifdef TEST
+  *logofs << "UnpackBitmap: Unpacked " << src_size
+          << " bytes to a buffer of " << dst_size
+          << " with " << dst_bpp << " bits per plane.\n"
+          << logofs_flush;
+  #endif
+
+  return 1;
+}
diff --git a/nxcomp/src/Bitmap.h b/nxcomp/src/Bitmap.h
new file mode 100644
index 000000000..8143e3125
--- /dev/null
+++ b/nxcomp/src/Bitmap.h
@@ -0,0 +1,36 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef Bitmap_H
+#define Bitmap_H
+
+#include "Unpack.h"
+
+int UnpackBitmap(T_geometry *geometry, unsigned char method,
+                     unsigned char *src_data, int src_size, int dst_bpp,
+                         int dst_width, int dst_height, unsigned char *dst_data,
+                             int dst_size);
+
+#endif /* Bitmap_H */
diff --git a/nxcomp/src/BlockCache.cpp b/nxcomp/src/BlockCache.cpp
new file mode 100644
index 000000000..161145e3d
--- /dev/null
+++ b/nxcomp/src/BlockCache.cpp
@@ -0,0 +1,81 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <string.h>
+#include "BlockCache.h"
+
+
+int BlockCache::compare(unsigned int size, const unsigned char *data,
+                            int overwrite)
+{
+  int match = 0;
+  if (size == size_)
+  {
+    match = 1;
+    for (unsigned int i = 0; i < size_; i++)
+      if (data[i] != buffer_[i])
+      {
+        match = 0;
+        break;
+      }
+  }
+  if (!match && overwrite)
+    set(size, data);
+  return match;
+}
+
+
+void BlockCache::set(unsigned int size, const unsigned char *data)
+{
+  if (size_ < size)
+  {
+    delete[]buffer_;
+    buffer_ = new unsigned char[size];
+  }
+  size_ = size;
+  memcpy(buffer_, data, size);
+  checksum_ = checksum(size, data);
+}
+
+
+unsigned int BlockCache::checksum(unsigned int size, const unsigned char *data)
+{
+  unsigned int sum = 0;
+  unsigned int shift = 0;
+  const unsigned char *next = data;
+  for (unsigned int i = 0; i < size; i++)
+  {
+    unsigned int value = (unsigned int) *next++;
+    sum += (value << shift);
+    shift++;
+    if (shift == 8)
+      shift = 0;
+  }
+  return sum;
+}
diff --git a/nxcomp/src/BlockCache.h b/nxcomp/src/BlockCache.h
new file mode 100644
index 000000000..48e586966
--- /dev/null
+++ b/nxcomp/src/BlockCache.h
@@ -0,0 +1,67 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef BlockCache_H
+#define BlockCache_H
+
+
+// Cache to hold an arbitrary-length block of bytes
+
+class BlockCache
+{
+  public:
+  BlockCache():buffer_(0), size_(0), checksum_(0)
+  {
+  }
+   ~BlockCache()
+  {
+    delete[]buffer_;
+  }
+  int compare(unsigned int size, const unsigned char *data,
+	      int overwrite = 1);
+  void set(unsigned int size, const unsigned char *data);
+
+  unsigned int getLength() const
+  {
+    return size_;
+  }
+  unsigned int getChecksum() const
+  {
+    return checksum_;
+  }
+  const unsigned char *getData() const
+  {
+    return buffer_;
+  }
+
+  static unsigned int checksum(unsigned int size, const unsigned char *data);
+
+private:
+  unsigned char *buffer_;
+  unsigned int size_;
+  unsigned int checksum_;
+};
+
+#endif /* BlockCache_H */
diff --git a/nxcomp/src/BlockCacheSet.cpp b/nxcomp/src/BlockCacheSet.cpp
new file mode 100644
index 000000000..1dd6361dc
--- /dev/null
+++ b/nxcomp/src/BlockCacheSet.cpp
@@ -0,0 +1,147 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "Misc.h"
+#include "BlockCacheSet.h"
+
+
+BlockCacheSet::BlockCacheSet(unsigned int numCaches):
+  caches_(new BlockCache *[numCaches]), size_(numCaches), 
+  length_(0)
+{
+  for (unsigned int i = 0; i < numCaches; i++)
+    caches_[i] = new BlockCache();
+}
+
+
+BlockCacheSet::~BlockCacheSet()
+{
+  //
+  // TODO: There is still a strange segfault occurring
+  // at random time under Cygwin, when proxy is being
+  // shutdown. Problem appeared just after upgrading
+  // to the latest version of the Cygwin DLL. A stack
+  // trace, obtained at the last minute, reveals that
+  // failure happens in this destructor.
+  //
+
+  #ifndef __CYGWIN32__
+
+  for (unsigned int i = 0; i < size_; i++)
+    delete caches_[i];
+  delete[]caches_;
+
+  #endif /* ifdef __CYGWIN32__ */
+}
+
+
+int
+BlockCacheSet::lookup(unsigned int dataLength, const unsigned char *data,
+		      unsigned int &index)
+{
+  unsigned int checksum = BlockCache::checksum(dataLength, data);
+  for (unsigned int i = 0; i < length_; i++)
+    if ((caches_[i]->getChecksum() == checksum) &&
+	(caches_[i]->compare(dataLength, data, 0)))
+    {
+      // match
+      index = i;
+      if (i)
+      {
+	BlockCache *save = caches_[i];
+	unsigned int target = (i >> 1);
+	do
+	{
+	  caches_[i] = caches_[i - 1];
+	  i--;
+	}
+	while (i > target);
+	caches_[target] = save;
+      }
+      return 1;
+    }
+  // no match
+  unsigned int insertionPoint = (length_ >> 1);
+  unsigned int start;
+  if (length_ >= size_)
+    start = size_ - 1;
+  else
+  {
+    start = length_;
+    length_++;
+  }
+  BlockCache *save = caches_[start];
+  for (unsigned int k = start; k > insertionPoint; k--)
+    caches_[k] = caches_[k - 1];
+  caches_[insertionPoint] = save;
+  save->set(dataLength, data);
+  return 0;
+}
+
+
+void
+BlockCacheSet::get(unsigned index, unsigned int &size,
+		   const unsigned char *&data)
+{
+  size = caches_[index]->getLength();
+  data = caches_[index]->getData();
+  if (index)
+  {
+    BlockCache *save = caches_[index];
+    unsigned int target = (index >> 1);
+    do
+    {
+      caches_[index] = caches_[index - 1];
+      index--;
+    }
+    while (index > target);
+    caches_[target] = save;
+  }
+}
+
+
+
+void
+BlockCacheSet::set(unsigned int dataLength, const unsigned char *data)
+{
+  unsigned int insertionPoint = (length_ >> 1);
+  unsigned int start;
+  if (length_ >= size_)
+    start = size_ - 1;
+  else
+  {
+    start = length_;
+    length_++;
+  }
+  BlockCache *save = caches_[start];
+  for (unsigned int k = start; k > insertionPoint; k--)
+    caches_[k] = caches_[k - 1];
+  caches_[insertionPoint] = save;
+  save->set(dataLength, data);
+}
diff --git a/nxcomp/src/BlockCacheSet.h b/nxcomp/src/BlockCacheSet.h
new file mode 100644
index 000000000..97273b0e0
--- /dev/null
+++ b/nxcomp/src/BlockCacheSet.h
@@ -0,0 +1,49 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef BlockCacheSet_H
+#define BlockCacheSet_H
+
+#include "BlockCache.h"
+
+
+class BlockCacheSet
+{
+  public:
+  BlockCacheSet(unsigned int numCaches);
+   ~BlockCacheSet();
+
+  int lookup(unsigned int size, const unsigned char *data,
+	     unsigned int &index);
+  void get(unsigned int index, unsigned int &size, const unsigned char *&data);
+  void set(unsigned int size, const unsigned char *data);
+
+    private:
+    BlockCache ** caches_;
+  unsigned int size_;
+  unsigned int length_;
+};
+
+#endif /* BlockCacheSet_H */
diff --git a/nxcomp/src/ChangeGC.cpp b/nxcomp/src/ChangeGC.cpp
new file mode 100644
index 000000000..e92178f27
--- /dev/null
+++ b/nxcomp/src/ChangeGC.cpp
@@ -0,0 +1,184 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "ChangeGC.h"
+
+#include "ClientCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Here are the methods to handle messages' content.
+//
+
+int ChangeGCStore::parseIdentity(Message *message, const unsigned char *buffer,
+                                     unsigned int size, int bigEndian) const
+{
+  ChangeGCMessage *changeGC = (ChangeGCMessage *) message;
+
+  //
+  // Here is the fingerprint.
+  //
+
+  changeGC -> gcontext   = GetULONG(buffer + 4, bigEndian);
+  changeGC -> value_mask = GetULONG(buffer + 8, bigEndian);
+
+  //
+  // Clear the unused bytes carried in the
+  // payload to increase the effectiveness
+  // of the caching algorithm.
+  //
+
+  if ((int) size > dataOffset)
+  {
+    #ifdef DEBUG
+    *logofs << name() << ": Removing unused bytes from the "
+            << "data payload.\n" << logofs_flush;
+    #endif
+
+    changeGC -> value_mask &= (1 << 23) - 1;
+
+    unsigned int mask = 0x1;
+    unsigned char *source = (unsigned char *) buffer + CHANGEGC_DATA_OFFSET;
+    unsigned long value = 0;
+
+    for (unsigned int i = 0; i < 23; i++)
+    {
+      if (changeGC -> value_mask & mask)
+      {
+        value = GetULONG(source, bigEndian);
+
+        value &= (0xffffffff >> (32 - CREATEGC_FIELD_WIDTH[i]));
+
+        PutULONG(value, source, bigEndian);
+
+        source += 4;
+      }
+
+      mask <<= 1;
+    }
+  }
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsed Identity for message at "
+          << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int ChangeGCStore::unparseIdentity(const Message *message, unsigned char *buffer,
+                                       unsigned int size, int bigEndian) const
+{
+  ChangeGCMessage *changeGC = (ChangeGCMessage *) message;
+
+  //
+  // Fill all the message's fields.
+  //
+
+  PutULONG(changeGC -> gcontext,   buffer + 4, bigEndian);
+  PutULONG(changeGC -> value_mask, buffer + 8, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsed identity for message at "
+          << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void ChangeGCStore::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  ChangeGCMessage *changeGC = (ChangeGCMessage *) message;
+
+  *logofs << name() << ": Identity gcontext " << changeGC -> gcontext 
+                    << ", mask " << changeGC -> value_mask << ", size "
+                    << changeGC -> size_ << ".\n" << logofs_flush;
+  #endif
+}
+
+void ChangeGCStore::identityChecksum(const Message *message, const unsigned char *buffer,
+                                         unsigned int size, int bigEndian) const
+{
+/*
+  md5_append(md5_state_, buffer + 4, 8);
+*/
+  md5_append(md5_state_, buffer + 8, 4);
+}
+
+void ChangeGCStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                       const Message *cachedMessage,
+                                           ChannelCache *channelCache) const
+{
+  ChangeGCMessage *changeGC       = (ChangeGCMessage *) message;
+  ChangeGCMessage *cachedChangeGC = (ChangeGCMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << changeGC -> gcontext
+          << " as gcontext field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeXidValue(changeGC -> gcontext, clientCache -> gcCache);
+
+  cachedChangeGC -> gcontext = changeGC -> gcontext;
+}
+
+void ChangeGCStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                       ChannelCache *channelCache) const
+{
+  ChangeGCMessage *changeGC = (ChangeGCMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  unsigned int value;
+
+  decodeBuffer.decodeXidValue(value, clientCache -> gcCache);
+
+  changeGC -> gcontext = value;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << changeGC -> gcontext
+          << " as gcontext field.\n" << logofs_flush;
+  #endif
+}
diff --git a/nxcomp/src/ChangeGC.h b/nxcomp/src/ChangeGC.h
new file mode 100644
index 000000000..9cac90e66
--- /dev/null
+++ b/nxcomp/src/ChangeGC.h
@@ -0,0 +1,185 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef ChangeGC_H
+#define ChangeGC_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+
+#define CHANGEGC_ENABLE_CACHE                           1
+#define CHANGEGC_ENABLE_DATA                            0
+#define CHANGEGC_ENABLE_SPLIT                           0
+#define CHANGEGC_ENABLE_COMPRESS                        0
+
+#define CHANGEGC_DATA_LIMIT                             144
+#define CHANGEGC_DATA_OFFSET                            12
+
+#define CHANGEGC_CACHE_SLOTS                            3000
+#define CHANGEGC_CACHE_THRESHOLD                        3
+#define CHANGEGC_CACHE_LOWER_THRESHOLD                  1
+
+//
+// The message class.
+//
+
+class ChangeGCMessage : public Message
+{
+  friend class ChangeGCStore;
+
+  public:
+
+  ChangeGCMessage()
+  {
+  }
+
+  ~ChangeGCMessage()
+  {
+  }
+
+  //
+  // Put here the fields which constitute 
+  // the 'identity' part of the message.
+  //
+
+  private:
+
+  unsigned int gcontext;
+  unsigned int value_mask;
+};
+
+class ChangeGCStore : public MessageStore
+{
+  //
+  // Constructors and destructors.
+  //
+
+  public:
+
+  ChangeGCStore() : MessageStore()
+  {
+    enableCache    = CHANGEGC_ENABLE_CACHE;
+    enableData     = CHANGEGC_ENABLE_DATA;
+    enableSplit    = CHANGEGC_ENABLE_SPLIT;
+    enableCompress = CHANGEGC_ENABLE_COMPRESS;
+
+    dataLimit  = CHANGEGC_DATA_LIMIT;
+    dataOffset = CHANGEGC_DATA_OFFSET;
+
+    cacheSlots          = CHANGEGC_CACHE_SLOTS;
+    cacheThreshold      = CHANGEGC_CACHE_THRESHOLD;
+    cacheLowerThreshold = CHANGEGC_CACHE_LOWER_THRESHOLD;
+
+    messages_ -> resize(cacheSlots);
+
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      *i = NULL;
+    }
+
+    temporary_ = NULL;
+  }
+
+  virtual ~ChangeGCStore()
+  {
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      destroy(*i);
+    }
+
+    destroy(temporary_);
+  }
+
+  virtual const char *name() const
+  {
+    return "ChangeGC";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return X_ChangeGC;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(ChangeGCMessage);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  public:
+
+  virtual Message *create() const
+  {
+    return new ChangeGCMessage();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new ChangeGCMessage((const ChangeGCMessage &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (ChangeGCMessage *) message;
+  }
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer,
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+                                    unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+
+  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                  const Message *cachedMessage,
+                                      ChannelCache *channelCache) const;
+
+  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                  ChannelCache *channelCache) const;
+};
+
+#endif /* ChangeGC_H */
diff --git a/nxcomp/src/ChangeProperty.cpp b/nxcomp/src/ChangeProperty.cpp
new file mode 100644
index 000000000..74814c2ea
--- /dev/null
+++ b/nxcomp/src/ChangeProperty.cpp
@@ -0,0 +1,191 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "ChangeProperty.h"
+
+#include "ClientCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Here are the methods to handle messages' content.
+//
+
+int ChangePropertyStore::parseIdentity(Message *message, const unsigned char *buffer,
+                                           unsigned int size, int bigEndian) const
+{
+  ChangePropertyMessage *changeProperty = (ChangePropertyMessage *) message;
+
+  changeProperty -> mode     = *(buffer + 1);
+  changeProperty -> format   = *(buffer + 16);
+
+  changeProperty -> window   = GetULONG(buffer + 4, bigEndian);
+  changeProperty -> property = GetULONG(buffer + 8, bigEndian);
+  changeProperty -> type     = GetULONG(buffer + 12, bigEndian);
+  changeProperty -> length   = GetULONG(buffer + 20, bigEndian);
+
+  //
+  // Cleanup the padding bytes.
+  //
+
+  unsigned int uiFormat;
+  unsigned int uiLengthInBytes;
+
+  if ((int) size > CHANGEPROPERTY_DATA_OFFSET)
+  {
+    uiFormat = *(buffer + 16);
+
+    uiLengthInBytes = changeProperty -> length;
+
+    #ifdef DEBUG
+    *logofs << name() << ": length  " << uiLengthInBytes
+            << ", format " << uiFormat << ", size "
+            << size << ".\n" << logofs_flush;
+    #endif
+
+    if (uiFormat == 16)
+    {
+      uiLengthInBytes <<= 1; 
+    }
+    else if (uiFormat == 32)
+    {
+      uiLengthInBytes <<= 2;
+    }
+
+    unsigned char *end = ((unsigned char *) buffer) + size;
+    unsigned char *pad = ((unsigned char *) buffer) + CHANGEPROPERTY_DATA_OFFSET + uiLengthInBytes;
+
+    CleanData((unsigned char *) pad, end - pad);
+  }
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsed identity for message at "
+          << message << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int ChangePropertyStore::unparseIdentity(const Message *message, unsigned char *buffer,
+                                             unsigned int size, int bigEndian) const
+{
+  ChangePropertyMessage *changeProperty = (ChangePropertyMessage *) message;
+
+  *(buffer + 1)  = changeProperty -> mode;
+  *(buffer + 16) = changeProperty -> format;
+
+  PutULONG(changeProperty -> window,   buffer + 4,  bigEndian);
+  PutULONG(changeProperty -> property, buffer + 8,  bigEndian);
+  PutULONG(changeProperty -> type,     buffer + 12, bigEndian);
+  PutULONG(changeProperty -> length,   buffer + 20, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsed identity for message at "
+          << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void ChangePropertyStore::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  ChangePropertyMessage *changeProperty = (ChangePropertyMessage *) message;
+
+  *logofs << name() << ": Identity mode " << (unsigned int) changeProperty -> mode << ", format " 
+          << (unsigned int) changeProperty -> format << ", window " << changeProperty -> window
+          << ", property " << changeProperty -> property << ", type " << changeProperty -> type
+          << ", length " << changeProperty -> length << ", size " << changeProperty -> size_
+          << ".\n" << logofs_flush;
+
+  #endif
+}
+
+void ChangePropertyStore::identityChecksum(const Message *message, const unsigned char *buffer,
+                                               unsigned int size, int bigEndian) const
+{
+  md5_append(md5_state_, buffer + 1,  1);
+  md5_append(md5_state_, buffer + 16, 1);
+
+  md5_append(md5_state_, buffer + 8,  4);
+  md5_append(md5_state_, buffer + 12, 4);
+  md5_append(md5_state_, buffer + 20, 4);
+}
+
+void ChangePropertyStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                             const Message *cachedMessage,
+                                                 ChannelCache *channelCache) const
+{
+  ChangePropertyMessage *changeProperty       = (ChangePropertyMessage *) message;
+  ChangePropertyMessage *cachedChangeProperty = (ChangePropertyMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << changeProperty -> window
+          << " as window field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeXidValue(changeProperty -> window, clientCache -> windowCache);
+
+  cachedChangeProperty -> window = changeProperty -> window;
+}
+
+void ChangePropertyStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                             ChannelCache *channelCache) const
+{
+  ChangePropertyMessage *changeProperty = (ChangePropertyMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  unsigned int value;
+
+  decodeBuffer.decodeXidValue(value, clientCache -> windowCache);
+
+  changeProperty -> window = value;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << changeProperty -> window
+          << " as window field.\n" << logofs_flush;
+  #endif
+}
+
+
diff --git a/nxcomp/src/ChangeProperty.h b/nxcomp/src/ChangeProperty.h
new file mode 100644
index 000000000..c06ce10fc
--- /dev/null
+++ b/nxcomp/src/ChangeProperty.h
@@ -0,0 +1,189 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef ChangeProperty_H
+#define ChangeProperty_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+
+#define CHANGEPROPERTY_ENABLE_CACHE               1
+#define CHANGEPROPERTY_ENABLE_DATA                0
+#define CHANGEPROPERTY_ENABLE_SPLIT               0
+#define CHANGEPROPERTY_ENABLE_COMPRESS            0
+
+#define CHANGEPROPERTY_DATA_LIMIT                 28688
+#define CHANGEPROPERTY_DATA_OFFSET                24
+
+#define CHANGEPROPERTY_CACHE_SLOTS                2000
+#define CHANGEPROPERTY_CACHE_THRESHOLD            2
+#define CHANGEPROPERTY_CACHE_LOWER_THRESHOLD      1
+
+//
+// The message class.
+//
+
+class ChangePropertyMessage : public Message
+{
+  friend class ChangePropertyStore;
+
+  public:
+
+  ChangePropertyMessage()
+  {
+  }
+
+  ~ChangePropertyMessage()
+  {
+  }
+
+  //
+  // Put here the fields which constitute 
+  // the 'identity' part of the message.
+  //
+
+  private:
+
+  unsigned char mode;
+  unsigned char format;
+  unsigned int  window;
+  unsigned int  property;
+  unsigned int  type;
+  unsigned int  length;
+};
+
+class ChangePropertyStore : public MessageStore
+{
+  //
+  // Constructors and destructors.
+  //
+
+  public:
+
+  ChangePropertyStore() : MessageStore()
+  {
+    enableCache    = CHANGEPROPERTY_ENABLE_CACHE;
+    enableData     = CHANGEPROPERTY_ENABLE_DATA;
+    enableSplit    = CHANGEPROPERTY_ENABLE_SPLIT;
+    enableCompress = CHANGEPROPERTY_ENABLE_COMPRESS;
+
+    dataLimit  = CHANGEPROPERTY_DATA_LIMIT;
+    dataOffset = CHANGEPROPERTY_DATA_OFFSET;
+
+    cacheSlots          = CHANGEPROPERTY_CACHE_SLOTS;
+    cacheThreshold      = CHANGEPROPERTY_CACHE_THRESHOLD;
+    cacheLowerThreshold = CHANGEPROPERTY_CACHE_LOWER_THRESHOLD;
+
+    messages_ -> resize(cacheSlots);
+
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      *i = NULL;
+    }
+
+    temporary_ = NULL;
+  }
+
+  virtual ~ChangePropertyStore()
+  {
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      destroy(*i);
+    }
+
+    destroy(temporary_);
+  }
+
+  virtual const char *name() const
+  {
+    return "ChangeProperty";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return X_ChangeProperty;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(ChangePropertyMessage);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  public:
+
+  virtual Message *create() const
+  {
+    return new ChangePropertyMessage();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new ChangePropertyMessage((const ChangePropertyMessage &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (ChangePropertyMessage *) message;
+  }
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer,
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                  const Message *cachedMessage,
+                                      ChannelCache *channelCache) const;
+
+  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                  ChannelCache *channelCache) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+                                    unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+};
+
+#endif /* ChangeProperty_H */
diff --git a/nxcomp/src/Channel.cpp b/nxcomp/src/Channel.cpp
new file mode 100644
index 000000000..24a422e37
--- /dev/null
+++ b/nxcomp/src/Channel.cpp
@@ -0,0 +1,2039 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "Channel.h"
+
+#include "List.h"
+#include "Proxy.h"
+#include "Statistics.h"
+
+#include "StaticCompressor.h"
+
+#include "NXalert.h"
+
+extern Proxy *proxy;
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Log the operations related to splits.
+//
+
+#undef  SPLIT
+
+#undef  COUNT
+
+#define COUNT_MAJOR_OPCODE     154
+
+#undef  MONITOR
+
+#define MONITOR_MAJOR_OPCODE   154
+#define MONITOR_MINOR_OPCODE   23
+
+#undef  CLEAR
+
+#define CLEAR_MAJOR_OPCODE     154
+#define CLEAR_MINOR_OPCODE     23
+
+//
+// Define this to know how many messages
+// are allocated and deallocated.
+//
+
+#undef  REFERENCES
+
+//
+// Set to the descriptor of the first X
+// channel successfully connected.
+//
+
+int Channel::firstClient_ = -1;
+
+//
+// Port used for font server connections.
+//
+
+int Channel::fontPort_ = -1;
+
+//
+// This is used for reference count.
+//
+
+#ifdef REFERENCES
+
+int Channel::references_ = 0;
+
+#endif
+
+Channel::Channel(Transport *transport, StaticCompressor *compressor)
+
+    : transport_(transport), compressor_(compressor)
+{
+  fd_ = transport_ -> fd();
+
+  finish_     = 0;
+  closing_    = 0;
+  drop_       = 0;
+  congestion_ = 0;
+  priority_   = 0;
+
+  alert_ = 0;
+
+  firstRequest_ = 1;
+  firstReply_   = 1;
+
+  enableCache_ = 1;
+  enableSplit_ = 1;
+  enableSave_  = 1;
+  enableLoad_  = 1;
+
+  //
+  // Must be set by proxy.
+  //
+
+  opcodeStore_ = NULL;
+ 
+  clientStore_ = NULL;
+  serverStore_ = NULL;
+
+  clientCache_ = NULL;
+  serverCache_ = NULL;
+
+  #ifdef REFERENCES
+  *logofs << "Channel: Created new Channel at " 
+          << this << " out of " << ++references_ 
+          << " allocated references.\n" << logofs_flush;
+  #endif
+}
+
+Channel::~Channel()
+{
+  if (firstClient_ == fd_)
+  {
+    firstClient_ = -1;
+  }
+
+  #ifdef REFERENCES
+  *logofs << "Channel: Deleted Channel at " 
+          << this << " out of " << --references_ 
+          << " allocated references.\n" << logofs_flush;
+  #endif
+}
+
+int Channel::handleEncode(EncodeBuffer &encodeBuffer, ChannelCache *channelCache,
+                              MessageStore *store, const unsigned char opcode,
+                                  const unsigned char *buffer, const unsigned int size)
+{
+  #ifdef MONITOR
+
+  static float totalMessages = 0;
+  static float totalBits     = 0;
+
+  int bits;
+  int diff;
+
+  bits = encodeBuffer.getBits();
+
+  #endif
+
+  //
+  // Check if message can be differentially
+  // encoded using a similar message in the
+  // message store.
+  // 
+
+  #ifdef COUNT
+
+  if (*(buffer) == COUNT_MAJOR_OPCODE)
+  {
+    if (*(buffer) < 128)
+    {
+      *logofs << "handleEncode: Handling OPCODE#" << (unsigned int) *(buffer)
+              << ".\n" << logofs_flush;
+    }
+    else
+    {
+      *logofs << "handleEncode: Handling OPCODE#" << (unsigned int) *(buffer)
+              << " MINOR#" << (unsigned int) *(buffer + 1) << ".\n"
+              << logofs_flush;
+    }
+  }
+
+  #endif
+
+  #ifdef CLEAR
+
+  if (*(buffer) == CLEAR_MAJOR_OPCODE &&
+          (CLEAR_MINOR_OPCODE == -1 || *(buffer + 1) == CLEAR_MINOR_OPCODE))
+  {
+    *((unsigned char *) buffer) = X_NoOperation;
+
+    *((unsigned char *) buffer + 1) = '\0';
+
+    CleanData((unsigned char *) buffer + 4, size - 4);
+  }
+
+  #endif
+
+  if (handleEncodeCached(encodeBuffer, channelCache,
+                             store, buffer, size) == 1)
+  {
+    #ifdef MONITOR
+
+    diff = encodeBuffer.getBits() - bits;
+
+    if (*(buffer) == MONITOR_MAJOR_OPCODE &&
+            (MONITOR_MINOR_OPCODE == -1 || *(buffer + 1) == MONITOR_MINOR_OPCODE))
+    {
+      totalMessages++;
+
+      totalBits += diff;
+
+      *logofs << "handleEncode: Handled cached OPCODE#" << (unsigned int) *(buffer)
+              << " MINOR#" << (unsigned int) *(buffer + 1) << ". " << size
+              << " bytes in, " << diff << " bits (" << ((float) diff) / 8
+              << " bytes) out. Average " << totalBits / totalMessages
+              << "/1.\n" << logofs_flush;
+    }
+
+    #endif
+
+    //
+    // Let the channel update the split store
+    // and notify the agent in the case of a
+    // cache hit.
+    //
+
+    if (store -> enableSplit)
+    {
+      handleSplit(encodeBuffer, store, store -> lastAction,
+                      store -> lastHit, opcode, buffer, size);
+    }
+
+    return 1;
+  }
+
+  //
+  // A similar message could not be found in
+  // cache or message must be discarded. Must
+  // transmit the message using the field by
+  // field differential encoding.
+  //
+
+  handleEncodeIdentity(encodeBuffer, channelCache,
+                           store, buffer, size, bigEndian_);
+
+  //
+  // Check if message has a distinct data part.
+  //
+
+  if (store -> enableData)
+  {
+    //
+    // If message split was requested by agent then send data
+    // out-of-band, dividing it in small chunks. Until message
+    // is completely transferred, keep in the split store a
+    // dummy version of the message, with data replaced with a
+    // pattern.
+    //
+    // While data is being transferred, agent should have put
+    // the resource (for example its client) asleep. It can
+    // happen, though, that a different client would reference
+    // the same message. We cannot issue a cache hit for images
+    // being split (such images are put in store in 'incomplete'
+    // state), so we need to handle this case.
+    //
+
+    if (store -> enableSplit == 1)
+    {
+      //
+      // Let the channel decide what to do with the
+      // message. If the split can't take place be-
+      // cause the split store is full, the channel
+      // will tell the remote side that the data is
+      // going to follow.
+      //
+
+      if (handleSplit(encodeBuffer, store, store -> lastAction,
+                          (store -> lastAction == IS_ADDED ? store -> lastAdded : 0),
+                              opcode, buffer, size) == 1)
+      {
+        #ifdef MONITOR
+
+        diff = encodeBuffer.getBits() - bits;
+
+        if (*(buffer) == MONITOR_MAJOR_OPCODE &&
+                (MONITOR_MINOR_OPCODE == -1 || *(buffer + 1) == MONITOR_MINOR_OPCODE))
+        {
+          totalMessages++;
+
+          totalBits += diff;
+
+          *logofs << "handleEncode: Handled split OPCODE#" << (unsigned int) *(buffer)
+                  << " MINOR#" << (unsigned int) *(buffer + 1) << ". " << size
+                  << " bytes in, " << diff << " bits (" << ((float) diff) / 8
+                  << " bytes) out. Average " << totalBits / totalMessages
+                  << "/1.\n" << logofs_flush;
+        }
+
+        #endif
+
+        return 0;
+      }
+    }
+
+    //
+    // The split did not take place and we are going
+    // to transfer the data part. Check if the static
+    // compression of the data section is enabled.
+    // This is the case of all messages not having a
+    // special differential encoding or messages that
+    // we want to store in cache in compressed form.
+    //
+
+    unsigned int offset = store -> identitySize(buffer, size);
+
+    if (store -> enableCompress)
+    {
+      unsigned char *data   = NULL;
+      unsigned int dataSize = 0;
+
+      int compressed = handleCompress(encodeBuffer, opcode, offset,
+                                          buffer, size, data, dataSize);
+      if (compressed < 0)
+      {
+        return -1;
+      }
+      else if (compressed > 0)
+      {
+        //
+        // Update the size of the message according
+        // to the result of the data compression.
+        //
+
+        handleUpdate(store, size - offset, dataSize);
+      }
+    }
+    else
+    {
+      handleCopy(encodeBuffer, opcode, offset, buffer, size);
+    }
+  }
+
+  #ifdef MONITOR
+
+  diff = encodeBuffer.getBits() - bits;
+
+  if (*(buffer) == MONITOR_MAJOR_OPCODE &&
+          (MONITOR_MINOR_OPCODE == -1 || *(buffer + 1) == MONITOR_MINOR_OPCODE))
+  {
+    totalMessages++;
+
+    totalBits += diff;
+
+    *logofs << "handleEncode: Handled OPCODE#" << (unsigned int) *(buffer)
+            << " MINOR#" << (unsigned int) *(buffer + 1) << ". " << size
+            << " bytes in, " << diff << " bits (" << ((float) diff) / 8
+            << " bytes) out. Average " << totalBits / totalMessages
+            << "/1.\n" << logofs_flush;
+  }
+
+  #endif
+
+  return 0;
+}
+
+int Channel::handleDecode(DecodeBuffer &decodeBuffer, ChannelCache *channelCache,
+                              MessageStore *store, unsigned char &opcode,
+                                  unsigned char *&buffer, unsigned int &size)
+{
+  //
+  // Check first if the message is in the
+  // message store.
+  //
+
+  unsigned int split = 0;
+
+  if (handleDecodeCached(decodeBuffer, channelCache,
+                             store, buffer, size) == 1)
+  {
+    //
+    // Let the channel update the split store
+    // in the case of a message being cached.
+    //
+
+    if (store -> enableSplit == 1)
+    {
+      // Since ProtoStep7 (#issue 108)
+      #ifdef DEBUG
+      *logofs << "handleDecode: " << store -> name()
+              << ": Checking if the message was split.\n"
+              << logofs_flush;
+      #endif
+
+      decodeBuffer.decodeBoolValue(split);
+
+      if (split == 1)
+      {
+        handleSplit(decodeBuffer, store, store -> lastAction,
+                        store -> lastHit, opcode, buffer, size);
+
+        handleCleanAndNullRequest(opcode, buffer, size);
+      }
+    }
+
+    return 1;
+  }
+
+  //
+  // Decode the full identity.
+  //
+
+  handleDecodeIdentity(decodeBuffer, channelCache, store, buffer,
+                           size, bigEndian_, &writeBuffer_);
+
+  //
+  // Check if the message has a distinct
+  // data part.
+  //
+
+  if (store -> enableData)
+  {
+    //
+    // Check if message has been split.
+    //
+
+    if (store -> enableSplit)
+    {
+      #ifdef DEBUG
+      *logofs << "handleDecode: " << store -> name() 
+              << ": Checking if the message was split.\n" 
+              << logofs_flush;
+      #endif
+      
+      decodeBuffer.decodeBoolValue(split);
+
+      if (split == 1)
+      {
+        //
+        // If the message was added to the store,
+        // create the entry without the data part.
+        //
+
+        handleSaveSplit(store, buffer, size);
+
+        handleSplit(decodeBuffer, store, store -> lastAction,
+                        (store -> lastAction == IS_ADDED ? store -> lastAdded : 0),
+                            opcode, buffer, size);
+
+        handleCleanAndNullRequest(opcode, buffer, size);
+
+        return 0;
+      }
+    }
+
+    //
+    // Decode the data part.
+    //
+
+    unsigned int offset = store -> identitySize(buffer, size);
+
+    if (store -> enableCompress)
+    {
+      const unsigned char *data = NULL;
+      unsigned int dataSize = 0;
+
+      int decompressed = handleDecompress(decodeBuffer, opcode, offset,
+                                              buffer, size, data, dataSize);
+      if (decompressed < 0)
+      {
+        return -1;
+      }
+      else if (decompressed > 0)
+      {
+        //
+        // The message has been transferred
+        // in compressed format.
+        //
+
+        handleSave(store, buffer, size, data, dataSize);
+
+        if (store -> enableSplit)
+        {
+          if (split == 1)
+          {
+            handleSplit(decodeBuffer, store, store -> lastAction,
+                            (store -> lastAction == IS_ADDED ? store -> lastAdded : 0),
+                                opcode, buffer, size);
+
+            handleCleanAndNullRequest(opcode, buffer, size);
+          }
+        }
+
+        return 0;
+      }
+    }
+    else
+    {
+      //
+      // Static compression of the data part
+      // was not enabled for this message.
+      //
+
+      handleCopy(decodeBuffer, opcode, offset, buffer, size);
+    }
+  }
+
+  //
+  // The message doesn't have a data part
+  // or the data was not compressed.
+  //
+
+  handleSave(store, buffer, size);
+
+  if (store -> enableSplit)
+  {
+    if (split == 1)
+    {
+      handleSplit(decodeBuffer, store, store -> lastAction,
+                      (store -> lastAction == IS_ADDED ? store -> lastAdded : 0),
+                          opcode, buffer, size);
+
+      handleCleanAndNullRequest(opcode, buffer, size);
+    }
+  }
+
+  return 0;
+}
+
+int Channel::handleEncodeCached(EncodeBuffer &encodeBuffer, ChannelCache *channelCache,
+                                    MessageStore *store,  const unsigned char *buffer,
+                                        const unsigned int size)
+{
+  if (control -> LocalDeltaCompression == 0 ||
+          enableCache_ ==  0 || store -> enableCache == 0)
+  {
+    // Since ProtoStep7 (#issue 108)
+    encodeBuffer.encodeActionValue(is_discarded,
+                       store -> lastActionCache);
+
+    store -> lastAction = is_discarded;
+
+    return 0;
+  }
+
+  #ifdef DEBUG
+  *logofs << "handleEncodeCached: " << store -> name() 
+          << ": Going to handle a new message of this class.\n" 
+          << logofs_flush;
+  #endif
+
+  //
+  // Check if the estimated size of cache is greater
+  // than the requested limit. If it is the case make
+  // some room by deleting one or more messages.
+  //
+
+  int position;
+
+  while (mustCleanStore(store) == 1 && canCleanStore(store) == 1)
+  {
+    #ifdef DEBUG
+    *logofs << "handleEncodeCached: " << store -> name() 
+            << ": Trying to reduce size of message store.\n"
+            << logofs_flush;
+    #endif
+
+    position = store -> clean(use_checksum);
+
+    if (position == nothing)
+    {
+      #ifdef TEST
+      *logofs << "handleEncodeCached: " << store -> name() 
+              << ": WARNING! No message found to be "
+              << "actually removed.\n" << logofs_flush;
+      #endif
+
+      break;
+    }
+
+    #ifdef DEBUG
+    *logofs << "handleEncodeCached: " << store -> name() 
+            << ": Message at position " << position
+            << " will be removed.\n" << logofs_flush;
+    #endif
+
+    //
+    // Encode the position of message to
+    // be discarded.
+    //
+
+    store -> lastRemoved = position;
+
+    // Since ProtoStep7 (#issue 108)
+    encodeBuffer.encodeActionValue(is_removed, store -> lastRemoved,
+                       store -> lastActionCache);
+
+    #ifdef DEBUG
+    *logofs << "handleEncodeCached: " << store -> name() << ": Going to "
+            << "clean up message at position " << position << ".\n" 
+            << logofs_flush;
+    #endif
+
+    store -> remove(position, use_checksum, discard_data);
+
+    #ifdef DEBUG
+    *logofs << "handleEncodeCached: " << store -> name() << ": There are " 
+            << store -> getSize() << " messages in the store out of " 
+            << store -> cacheSlots << " slots.\n" << logofs_flush;
+
+    *logofs << "handleEncodeCached: " << store -> name() 
+            << ": Size of store is " << store -> getLocalStorageSize() 
+            << " bytes locally and " << store -> getRemoteStorageSize() 
+            << " bytes remotely.\n" << logofs_flush;
+
+    *logofs << "handleEncodeCached: " << store -> name() 
+            << ": Size of total cache is " << store -> getLocalTotalStorageSize()
+            << " bytes locally and " << store -> getRemoteTotalStorageSize()
+            << " bytes remotely.\n" << logofs_flush;
+    #endif
+  }
+
+  #ifdef DEBUG
+
+  if (mustCleanStore(store) == 1 && canCleanStore(store) == 0)
+  {
+    *logofs << "handleEncodeCached: " << store -> name() 
+            << ": Store would need a clean but operation will be delayed.\n" 
+            << logofs_flush;
+
+    *logofs << "handleEncodeCached: " << store -> name() << ": There are " 
+            << store -> getSize() << " messages in the store out of " 
+            << store -> cacheSlots << " slots.\n"  << logofs_flush;
+
+    *logofs << "handleEncodeCached: " << store -> name() 
+            << ": Size of store is " << store -> getLocalStorageSize() 
+            << " bytes locally and " << store -> getRemoteStorageSize() 
+            << " bytes remotely.\n" << logofs_flush;
+
+    *logofs << "handleEncodeCached: " << store -> name() 
+            << ": Size of total cache is " << store -> getLocalTotalStorageSize()
+            << " bytes locally and " << store -> getRemoteTotalStorageSize()
+            << " bytes remotely.\n" << logofs_flush;
+  }
+
+  #endif
+
+  //
+  // If 'on the wire' size of message exceeds the
+  // allowed limit then avoid to store it in the
+  // cache.
+  //
+
+  if (store -> validateMessage(buffer, size) == 0)
+  {
+    #ifdef TEST
+    *logofs << "handleEncodeCached: " << store -> name() 
+            << ": Message with size " << size << " ignored.\n" 
+            << logofs_flush;
+    #endif
+
+    // Since ProtoStep7 (#issue 108)
+    encodeBuffer.encodeActionValue(is_discarded,
+                       store -> lastActionCache);
+
+    store -> lastAction = is_discarded;
+
+    return 0;
+  }
+
+  //
+  // Fill the message object with the
+  // received data.
+  //
+
+  Message *message = store -> getTemporary();
+
+  if (message == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "handleEncodeCached: " << store -> name()
+            << ": PANIC! Can't allocate memory for "
+            << "a new message.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Can't allocate memory for "
+         << "a new message in context [D].\n";
+
+    HandleCleanup();
+  }
+
+  //
+  // As we are at encoding side, it is enough to store the
+  // checksum for the object while data can be erased. Both
+  // the identity and the data will never be sent through
+  // the wire again as long as they are stored in the cache
+  // at the decoding side. The split parameter is always
+  // set to 0 as the data will not be stored in any case.
+  //
+
+  store -> parse(message, 0, buffer, size, use_checksum,
+                     discard_data, bigEndian_);
+
+  #ifdef DUMP
+
+  store -> dump(message);
+
+  #endif
+
+  //
+  // Search the object in the message
+  // store. If found get the position.
+  //
+
+  #ifdef DEBUG
+  *logofs << "handleEncodeCached: " << store -> name() 
+          << ": Searching object of size " << size
+          << " in the cache.\n" << logofs_flush;
+  #endif
+
+  int added;
+  int locked;
+
+  position = store -> findOrAdd(message, use_checksum,
+                                    discard_data, added, locked);
+
+  if (position == nothing)
+  {
+    #ifdef WARNING
+    *logofs << "handleEncodeCached: " << store -> name() 
+            << ": WARNING! Can't store object in the cache.\n"
+            << logofs_flush;
+    #endif
+
+    // Since ProtoStep7 (#issue 108)
+    encodeBuffer.encodeActionValue(is_discarded,
+                       store -> lastActionCache);
+
+    store -> lastAction = is_discarded;
+
+    return 0;
+  }
+  else if (locked == 1)
+  {
+    //
+    // We can't issue a cache hit. Encoding identity
+    // differences while message it's being split
+    // would later result in agent to commit a wrong
+    // version of message.
+    //
+
+    #ifdef WARNING
+    *logofs << "handleEncodeCached: " << store -> name() 
+            << ": WARNING! Message of size " << store -> plainSize(position)
+            << " at position " << position << " is locked.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Warning" << ": Message of size " << store -> plainSize(position)
+         << " at position " << position << " is locked.\n";
+
+    // Since ProtoStep7 (#issue 108)
+    encodeBuffer.encodeActionValue(is_discarded,
+                       store -> lastActionCache);
+
+    store -> lastAction = is_discarded;
+
+    return 0;
+  }
+  else if (added == 1)
+  {
+    store -> resetTemporary();
+
+    #ifdef DEBUG
+    *logofs << "handleEncodeCached: " << store -> name() << ": Message of size "
+            << store -> plainSize(position) << " has been stored at position "
+            << position << ".\n" << logofs_flush;
+
+    *logofs << "handleEncodeCached: " << store -> name() << ": There are " 
+            << store -> getSize() << " messages in the store out of " 
+            << store -> cacheSlots << " slots.\n" << logofs_flush;
+
+    *logofs << "handleEncodeCached: " << store -> name() 
+            << ": Size of store is " << store -> getLocalStorageSize() 
+            << " bytes locally and " << store -> getRemoteStorageSize() 
+            << " bytes remotely.\n" << logofs_flush;
+
+    *logofs << "handleEncodeCached: " << store -> name() 
+            << ": Size of total cache is " << store -> getLocalTotalStorageSize()
+            << " bytes locally and " << store -> getRemoteTotalStorageSize()
+            << " bytes remotely.\n" << logofs_flush;
+    #endif
+
+    //
+    // Inform the decoding side that message 
+    // must be inserted in cache and encode
+    // the position where the insertion took
+    // place.
+    //
+
+    store -> lastAction = IS_ADDED;
+
+    store -> lastAdded = position;
+
+    // Since ProtoStep7 (#issue 108)
+    encodeBuffer.encodeActionValue(IS_ADDED, store -> lastAdded,
+                       store -> lastActionCache);
+
+    return 0;
+  }
+  else
+  {
+    #ifdef DEBUG
+    *logofs << "handleEncodeCached: " << store -> name()
+            << ": Cache hit. Found object at position " 
+            << position << ".\n" << logofs_flush;
+    #endif
+
+    //
+    // Must abort the connection if the
+    // the position is invalid.
+    //
+
+    Message *cachedMessage = store -> get(position);
+
+    //
+    // Increase the rating of the cached
+    // message.
+    //
+
+    store -> touch(cachedMessage);
+
+    #ifdef DEBUG
+    *logofs << "handleEncodeCached: " << store -> name() << ": Hits for "
+            << "object at position " << position << " are now " 
+            << store -> getTouches(position) << ".\n"
+            << logofs_flush;
+    #endif
+
+    //
+    // Send to the decoding side position
+    // where object can be found in cache.
+    //
+
+    store -> lastAction = IS_HIT;
+
+    store -> lastHit = position;
+
+    // Since ProtoStep7 (#issue 108)
+    encodeBuffer.encodeActionValue(IS_HIT, store -> lastHit,
+                       store -> lastActionCache);
+
+    //
+    // Send the field by field differences in
+    // respect to the original message stored
+    // in cache.
+    //
+
+    store -> updateIdentity(encodeBuffer, message, cachedMessage, channelCache);
+
+    return 1;
+  }
+}
+
+void Channel::handleUpdateAdded(MessageStore *store, unsigned int dataSize,
+                                    unsigned int compressedDataSize)
+{
+  #ifdef TEST
+
+  if (store -> lastAction != IS_ADDED)
+  {
+    #ifdef PANIC
+    *logofs << "handleUpdateAdded: " << store -> name()
+            << ": PANIC! Function called for action '"
+            << store -> lastAction << "'.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Update function called for "
+         << "store '" << store -> name() << "' with "
+         << "action '" << store -> lastAction
+         << "'.\n";
+
+    HandleCleanup();
+  }
+
+  #endif
+
+  #ifdef DEBUG
+  *logofs << "handleUpdateAdded: " << store -> name() << ": Updating "
+          << "object at position " << store -> lastAdded << " of size "
+          << store -> plainSize(store -> lastAdded) << " (" << dataSize
+          << "/" << compressedDataSize << ").\n" << logofs_flush;
+  #endif
+
+  store -> updateData(store -> lastAdded, dataSize, compressedDataSize);
+
+  #ifdef DEBUG
+  *logofs << "handleUpdateAdded: " << store -> name() << ": There are " 
+          << store -> getSize() << " messages in the store out of " 
+          << store -> cacheSlots << " slots.\n" << logofs_flush;
+
+  *logofs << "handleUpdateAdded: " << store -> name() 
+          << ": Size of store is " << store -> getLocalStorageSize() 
+          << " bytes locally and " << store -> getRemoteStorageSize() 
+          << " bytes remotely.\n" << logofs_flush;
+
+  *logofs << "handleUpdateAdded: " << store -> name() 
+          << ": Size of total cache is " << store -> getLocalTotalStorageSize()
+          << " bytes locally and " << store -> getRemoteTotalStorageSize()
+          << " bytes remotely.\n" << logofs_flush;
+  #endif
+}
+
+int Channel::handleDecodeCached(DecodeBuffer &decodeBuffer, ChannelCache *channelCache,
+                                    MessageStore *store, unsigned char *&buffer,
+                                        unsigned int &size)
+{
+  //
+  // Create a new message object and 
+  // fill it with received data.
+  //
+
+  #ifdef DEBUG
+  *logofs << "handleDecodeCached: " << store -> name() 
+          << ": Going to handle a new message of this class.\n" 
+          << logofs_flush;
+  #endif
+
+  //
+  // Decode bits telling how to handle
+  // this message.
+  //
+
+  unsigned char action;
+  unsigned short int position;
+
+  // Since ProtoStep7 (#issue 108)
+  decodeBuffer.decodeActionValue(action, position,
+                     store -> lastActionCache);
+
+  //
+  // Clean operations must always come 
+  // before any operation on message.
+  //
+
+  while (action == is_removed)
+  {
+    // Since ProtoStep7 (#issue 108)
+    store -> lastRemoved = position;
+
+    #ifdef DEBUG
+
+    if (store -> get(store -> lastRemoved))
+    {
+      *logofs << "handleDecodeCached: " << store -> name() << ": Cleaning up "
+              << "object at position " << store -> lastRemoved
+              << " of size " << store -> plainSize(store -> lastRemoved)
+              << " (" << store -> plainSize(store -> lastRemoved) << "/"
+              << store -> compressedSize(store -> lastRemoved) << ").\n"
+              << logofs_flush;
+    }
+
+    #endif
+
+    //
+    // If the message can't be found we
+    // will abort the connection.
+    //
+
+    store -> remove(store -> lastRemoved, discard_checksum, use_data);
+
+    // Since ProtoStep7 (#issue 108)
+    decodeBuffer.decodeActionValue(action, position,
+                       store -> lastActionCache);
+  }
+
+  //
+  // If it's a cache hit, the position
+  // where object can be found follows.
+  //
+
+  if ((T_store_action) action == IS_HIT)
+  {
+    // Since ProtoStep7 (#issue 108)
+    store -> lastHit = position;
+
+    //
+    // Get data from the cache at given position.
+    //
+
+    #ifdef DEBUG
+
+    if (store -> get(store -> lastHit))
+    {
+      *logofs << "handleDecodeCached: " << store -> name() << ": Retrieving "
+              << "object at position " << store -> lastHit
+              << " of size " << store -> plainSize(store -> lastHit)
+              << " (" << store -> plainSize(store -> lastHit)  << "/"
+              << store -> compressedSize(store -> lastHit) << ").\n"
+              << logofs_flush;
+    }
+
+    #endif
+
+    //
+    // Must abort the connection if the
+    // the position is invalid.
+    //
+
+    Message *message = store -> get(store -> lastHit);
+
+    //
+    // Make room for the outgoing message.
+    //
+
+    size = store -> plainSize(store -> lastHit);
+
+    buffer = writeBuffer_.addMessage(size);
+
+    #ifdef DEBUG
+    *logofs << "handleDecodeCached: " << store -> name() 
+            << ": Prepared an outgoing buffer of " 
+            << size << " bytes.\n" << logofs_flush;
+    #endif
+
+    //
+    // Decode the variant part. Pass client
+    // or server cache to the message store.
+    //
+
+    store -> updateIdentity(decodeBuffer, message, channelCache);
+
+    //
+    // Write each field in the outgoing buffer.
+    //
+
+    store -> unparse(message, buffer, size, bigEndian_);
+
+    #ifdef DUMP
+
+    store -> dump(message);
+
+    #endif
+
+    store -> lastAction = IS_HIT;
+
+    return 1;
+  }
+  else if ((T_store_action) action == IS_ADDED)
+  {
+    // Since ProtoStep7 (#issue 108)
+    store -> lastAdded = position;
+
+    #ifdef DEBUG
+    *logofs << "handleDecodeCached: " << store -> name() 
+            << ": Message will be later stored at position "
+             << store -> lastAdded << ".\n" << logofs_flush;
+    #endif
+
+    store -> lastAction = IS_ADDED;
+
+    return 0;
+  }
+  else
+  {
+    #ifdef DEBUG
+    *logofs << "handleDecodeCached: " << store -> name() 
+            << ": Message will be later discarded.\n"
+            << logofs_flush;
+    #endif
+
+    store -> lastAction = is_discarded;
+
+    return 0;
+  }
+}
+
+void Channel::handleSaveAdded(MessageStore *store, int split, unsigned char *buffer,
+                                  unsigned int size, const unsigned char *compressedData,
+                                      const unsigned int compressedDataSize)
+{
+  #ifdef TEST
+
+  if (store -> lastAction != IS_ADDED)
+  {
+    #ifdef PANIC
+    *logofs << "handleSaveAdded: " << store -> name()
+            << ": PANIC! Function called for action '"
+            << store -> lastAction << "'.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Save function called for "
+         << "store '" << store -> name() << "' with "
+         << "action '" << store -> lastAction
+         << "'.\n";
+
+    HandleCleanup();
+  }
+
+  #endif
+
+  Message *message = store -> getTemporary();
+
+  if (message == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "handleSaveAdded: " << store -> name()
+            << ": PANIC! Can't access temporary storage "
+            << "for message at position " << store -> lastAdded
+            << ".\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Can't access temporary storage "
+         << "for message  at position " << store -> lastAdded
+         << ".\n";
+
+    HandleCleanup();
+  }
+
+  if (compressedData == NULL)
+  {
+    //
+    // If the data part has been split
+    // avoid to copy it into the message.
+    //
+
+    store -> parse(message, split, buffer, size, discard_checksum,
+                       use_data, bigEndian_);
+  }
+  else
+  {
+    store -> parse(message, buffer, size, compressedData, 
+                       compressedDataSize, discard_checksum,
+                           use_data, bigEndian_);
+  }
+
+  if (store -> add(message, store -> lastAdded,
+          discard_checksum, use_data) == nothing)
+  {
+    #ifdef PANIC
+    *logofs << "handleSaveAdded: " << store -> name()
+            << ": PANIC! Can't store message in the cache "
+            << "at position " << store -> lastAdded << ".\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Can't store message of type "
+         << store -> name() << "in the cache at position "
+         << store -> lastAdded << ".\n";
+
+    HandleCleanup();
+  }
+  else
+  {
+    store -> resetTemporary();
+
+    #ifdef DEBUG
+    *logofs << "handleSaveAdded: " << store -> name() << ": Stored "
+            << (compressedData == NULL ? "plain" : "compressed")
+            << " object at position " << store -> lastAdded
+            << " of size " << store -> plainSize(store -> lastAdded)
+            << " (" << store -> plainSize(store -> lastAdded) << "/"
+            << store -> compressedSize(store -> lastAdded) << ").\n"
+            << logofs_flush;
+    #endif
+  }
+
+  #ifdef DEBUG
+  *logofs << "handleSaveAdded: " << store -> name()
+          << ": Size of store is " << store -> getLocalStorageSize()
+          << " bytes locally and " << store -> getRemoteStorageSize()
+          << " bytes remotely.\n" << logofs_flush;
+
+  *logofs << "handleSaveAdded: " << store -> name()
+          << ": Size of total cache is " << store -> getLocalTotalStorageSize()
+          << " bytes locally and " << store -> getRemoteTotalStorageSize()
+          << " bytes remotely.\n" << logofs_flush;
+  #endif
+}
+
+int Channel::handleWait(int timeout)
+{
+  #ifdef TEST
+  *logofs << "handleWait: Going to wait for more data "
+          << "on FD#" << fd_ << " at " << strMsTimestamp()
+          << ".\n" << logofs_flush;
+  #endif
+
+  T_timestamp startTs = getNewTimestamp();
+
+  T_timestamp nowTs = startTs;
+
+  int readable;
+  int remaining;
+
+  for (;;)
+  {
+    remaining = timeout - diffTimestamp(startTs, nowTs);
+
+    if (transport_ -> blocked() == 1)
+    {
+      #ifdef WARNING
+      *logofs << "handleWait: WARNING! Having to drain with "
+              << "channel " << "for FD#" << fd_ << " blocked.\n"
+              << logofs_flush;
+      #endif
+
+      handleDrain(0, remaining);
+
+      continue;
+    }
+
+    if (remaining <= 0)
+    {
+      #ifdef TEST
+      *logofs << "handleWait: Timeout raised while waiting "
+              << "for more data for FD#" << fd_ << " at "
+              << strMsTimestamp() << ".\n"
+              << logofs_flush;
+      #endif
+
+      return 0;
+    }
+
+    #ifdef TEST
+    *logofs << "handleWait: Waiting " << remaining << " Ms "
+            << "for a new message on  FD#" << fd_
+            << ".\n" << logofs_flush;
+    #endif
+
+    readable = transport_ -> wait(remaining);
+
+    if (readable > 0)
+    {
+      #ifdef TEST
+      *logofs << "handleWait: WARNING! Encoding more data "
+              << "for FD#" << fd_ << " at " << strMsTimestamp()
+              << ".\n" << logofs_flush;
+      #endif
+
+      if (proxy -> handleAsyncRead(fd_) < 0)
+      {
+        return -1;
+      }
+
+      return 1;
+    }
+    else if (readable == -1)
+    {
+      return -1;
+    }
+
+    nowTs = getNewTimestamp();
+  }
+}
+
+int Channel::handleDrain(int limit, int timeout)
+{
+  #ifdef TEST
+  *logofs << "handleDrain: Going to drain FD#" << fd_
+          << " with a limit of " << limit << " bytes "
+          << "at " << strMsTimestamp() << ".\n"
+          << logofs_flush;
+  #endif
+
+  T_timestamp startTs = getNewTimestamp();
+
+  T_timestamp nowTs = startTs;
+
+  int drained;
+  int remaining;
+
+  int result;
+
+  for (;;)
+  {
+    remaining = timeout - diffTimestamp(startTs, nowTs);
+
+    if (remaining <= 0)
+    {
+      #ifdef TEST
+      *logofs << "handleDrain: Timeout raised while draining "
+              << "FD#" << fd_ << " at " << strMsTimestamp()
+              << ".\n" << logofs_flush;
+      #endif
+
+      result = 0;
+
+      goto ChannelDrainEnd;
+    }
+
+    #ifdef TEST
+    *logofs << "handleDrain: Trying to write to FD#"
+            << fd_ << " with " << remaining << " Ms "
+            << "remaining.\n" << logofs_flush;
+    #endif
+
+    drained = transport_ -> drain(limit, remaining);
+
+    if (drained == 1)
+    {
+      #ifdef TEST
+      *logofs << "handleDrain: Transport for FD#" << fd_
+              << " drained to " << transport_ -> length()
+              << " bytes at " << strMsTimestamp() << ".\n"
+              << logofs_flush;
+      #endif
+
+      result = 1;
+
+      goto ChannelDrainEnd;
+    }
+    else if (drained == 0 && transport_ -> readable() > 0)
+    {
+      #ifdef TEST
+      *logofs << "handleDrain: WARNING! Encoding more data "
+              << "for FD#" << fd_ << " at " << strMsTimestamp()
+              << ".\n" << logofs_flush;
+      #endif
+
+      if (proxy -> handleAsyncRead(fd_) < 0)
+      {
+        goto ChannelDrainError;
+      }
+    }
+    else if (drained == -1)
+    {
+      goto ChannelDrainError;
+    }
+
+    nowTs = getNewTimestamp();
+
+    if (diffTimestamp(startTs, nowTs) >= control -> ChannelTimeout)
+    {
+      int seconds = (remaining + control -> LatencyTimeout * 10) / 1000;
+
+      #ifdef WARNING
+      *logofs << "handleDrain: WARNING! Could not drain FD#"
+              << fd_ << " within " << seconds << " seconds.\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Warning" << ": Can't write to connection on FD#"
+           << fd_ << " since " << seconds << " seconds.\n";
+
+      if (alert_ == 0)
+      {
+        if (control -> ProxyMode == proxy_client)
+        {
+          alert_ = CLOSE_DEAD_X_CONNECTION_CLIENT_ALERT;
+        }
+        else
+        {
+          alert_ = CLOSE_DEAD_X_CONNECTION_SERVER_ALERT;
+        }
+
+        HandleAlert(alert_, 1);
+      }
+    }
+  }
+
+ChannelDrainEnd:
+
+  //
+  // Maybe we drained the channel and are
+  // now out of the congestion state.
+  //
+
+  handleCongestion();
+
+  return result;
+
+ChannelDrainError:
+
+  finish_ = 1;
+
+  return -1;
+}
+
+int Channel::handleCongestion()
+{
+  //
+  // Send a begin congestion control code
+  // if the local end of the channel does
+  // not consume its data.
+  //
+
+  if (isCongested() == 1)
+  {
+    if (congestion_ == 0)
+    {
+      #if defined(TEST) || defined(INFO)
+      *logofs << "handleCongestion: Sending congestion for FD#"
+              << fd_ << " with length " << transport_ -> length()
+              << " at " << strMsTimestamp() << ".\n"
+              << logofs_flush;
+      #endif
+
+      congestion_ = 1;
+
+      //
+      // Use the callback to send the control
+      // code immediately.
+      //
+
+      if (proxy -> handleAsyncCongestion(fd_) < 0)
+      {
+        finish_ = 1;
+
+        return -1;
+      }
+    }
+  }
+  else
+  {
+    //
+    // If the channel was in congestion state
+    // send an end congestion control code.
+    //
+
+    if (congestion_ == 1)
+    {
+      #if defined(TEST) || defined(INFO)
+      *logofs << "handleCongestion: Sending decongestion for FD#"
+              << fd_ << " with length " << transport_ -> length()
+              << " at " << strMsTimestamp() << ".\n"
+              << logofs_flush;
+      #endif
+
+      congestion_ = 0;
+
+      if (proxy -> handleAsyncDecongestion(fd_) < 0)
+      {
+        finish_ = 1;
+
+        return -1;
+      }
+    }
+
+    //
+    // Remove the "channel unresponsive"
+    // dialog.
+    //
+
+    if (alert_ != 0)
+    {
+      #if defined(TEST) || defined(INFO)
+      *logofs << "handleCongestion: Displacing the dialog "
+              << "for FD#" << fd_ << ".\n" << logofs_flush;
+      #endif
+
+      HandleAlert(DISPLACE_MESSAGE_ALERT, 1);
+    }
+  }
+
+  return 1;
+}
+
+int Channel::handleFlush(T_flush type, int bufferLength, int scratchLength)
+{
+  if (finish_ == 1)
+  {
+    #ifdef TEST
+    *logofs << "handleFlush: Not flushing data for "
+            << "finishing channel for FD#" << fd_
+            << ".\n" << logofs_flush;
+    #endif
+
+    writeBuffer_.fullReset();
+
+    return -1;
+  }
+
+  #ifdef TEST
+  *logofs << "handleFlush: Flushing " << bufferLength
+          << " + " << scratchLength << " bytes "
+          << "to FD#" << fd_ << ".\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // Check if the channel has data available.
+  // Recent Linux kernels are very picky.
+  // They require that we read often or they
+  // assume that the process is non-interact-
+  // ive.
+  //
+
+  int result = 0;
+
+  if (handleAsyncEvents() < 0)
+  {
+    goto ChannelFlushError;
+  }
+
+  //
+  // Write the data in the main buffer first,
+  // followed by the data in the scratch buffer.
+  //
+
+  if (bufferLength > 0)
+  {
+    result = transport_ -> write(write_immediate,
+                                     writeBuffer_.getData(), bufferLength);
+  }
+
+  if (result >= 0 && scratchLength > 0)
+  {
+    result = transport_ -> write(write_immediate,
+                                     writeBuffer_.getScratchData(), scratchLength);
+  }
+
+  if (type == flush_if_any)
+  {
+    writeBuffer_.fullReset();
+  }
+  else
+  {
+    writeBuffer_.partialReset();
+  }
+
+  //
+  // If we failed to write to the X connection then
+  // set the finish flag. The caller should continue
+  // to handle all the remaining messages or it will
+  // corrupt the decode buffer. At the real end, an
+  // error will be propagated to the upper layers
+  // which will perform any needed cleanup.
+  //
+
+  if (result < 0)
+  {
+    goto ChannelFlushError;
+  }
+
+  //
+  // Reset transport buffers.
+  //
+
+  transport_ -> partialReset();
+
+  //
+  // Check if the X server has generated
+  // any event in response to our data.
+  //
+
+  if (handleAsyncEvents() < 0)
+  {
+    goto ChannelFlushError;
+  }
+
+  //
+  // Check if the channel has entered in
+  // congestion state and, in this case,
+  // send an immediate congestion control
+  // code to the remote.
+  //
+
+  handleCongestion();
+
+  //
+  // We could optionally drain the output
+  // buffer if this is X11 channel.
+  //
+  // if (isCongested() == 1 && isReliable() == 1)
+  // {
+  //   if (handleDrain(0, control -> ChannelTimeout) < 0)
+  //   {
+  //     goto ChannelFlushError;
+  //   }
+  // }
+  //
+
+  return 1;
+
+ChannelFlushError:
+
+  finish_ = 1;
+
+  return -1;
+}
+
+int Channel::handleFlush()
+{
+  #ifdef TEST
+  *logofs << "handleFlush: Flushing "
+          << transport_ -> length() << " bytes to FD#"
+          << fd_ << " with descriptor writable.\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // Check if there is anything to read
+  // before anf after having written to
+  // the socket.
+  //
+
+  if (handleAsyncEvents() < 0)
+  {
+    goto ChannelFlushError;
+  }
+
+  if (transport_ -> flush() < 0)
+  {
+    #ifdef TEST
+    *logofs << "handleFlush: Failure detected "
+            << "flushing data to FD#" << fd_
+            << ".\n" << logofs_flush;
+    #endif
+
+    goto ChannelFlushError;
+  }
+
+  if (handleAsyncEvents() < 0)
+  {
+    goto ChannelFlushError;
+  }
+
+  //
+  // Reset channel's transport buffers.
+  //
+
+  transport_ -> partialReset();
+
+  //
+  // Check if the channel went out of the
+  // congestion state.
+  //
+
+  handleCongestion();
+
+  return 1;
+
+ChannelFlushError:
+
+  finish_ = 1;
+
+  return -1;
+}
+
+void Channel::handleResetAlert()
+{
+  if (alert_ != 0)
+  {
+    #ifdef TEST
+    *logofs << "handleResetAlert: The channel alert '"
+            << alert_ << "' was displaced.\n"
+            << logofs_flush;
+    #endif
+
+    alert_ = 0;
+  }
+}
+
+int Channel::handleCompress(EncodeBuffer &encodeBuffer, const unsigned char opcode,
+                                const unsigned int offset, const unsigned char *buffer,
+                                    const unsigned int size, unsigned char *&compressedData,
+                                        unsigned int &compressedDataSize)
+{
+  if (size <= offset)
+  {
+    #ifdef DEBUG
+    *logofs << "handleCompress: Not compressing data for FD#" << fd_
+            << " as offset is " << offset << " with data size "
+            << size << ".\n" << logofs_flush;
+    #endif
+
+    return 0;
+  }
+
+  #ifdef DEBUG
+  *logofs << "handleCompress: Compressing data for FD#" << fd_
+          << " with data size " << size << " and offset "
+          << offset << ".\n" << logofs_flush;
+  #endif
+
+  //
+  // It is responsibility of the compressor to
+  // mark the buffer as such if the compression
+  // couldn't take place.
+  //
+
+  if (compressor_ -> compressBuffer(buffer + offset, size - offset, compressedData,
+                                        compressedDataSize, encodeBuffer) <= 0)
+  {
+    #ifdef DEBUG
+    *logofs << "handleCompress: Sent " << size - offset
+            << " bytes of plain data for FD#" << fd_
+            << ".\n" << logofs_flush;
+    #endif
+
+    return 0;
+  }
+  else
+  {
+    #ifdef DEBUG
+    *logofs << "handleCompress: Sent " << compressedDataSize
+            << " bytes of compressed data for FD#"
+            << fd_ << ".\n" << logofs_flush;
+    #endif
+
+    return 1;
+  }
+}
+
+int Channel::handleDecompress(DecodeBuffer &decodeBuffer, const unsigned char opcode,
+                                  const unsigned int offset, unsigned char *buffer,
+                                      const unsigned int size, const unsigned char *&compressedData,
+                                          unsigned int &compressedDataSize)
+{
+  if (size <= offset)
+  {
+    return 0;
+  }
+
+  int result = compressor_ -> decompressBuffer(buffer + offset, size - offset,
+                                                   compressedData, compressedDataSize,
+                                                       decodeBuffer);
+  if (result < 0)
+  {
+    #ifdef PANIC
+    *logofs << "handleDecompress: PANIC! Failed to decompress "
+            << size - offset << " bytes of data for FD#" << fd_
+            << " with OPCODE#" << (unsigned int) opcode << ".\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Data decompression failed for OPCODE#"
+         << (unsigned int) opcode << ".\n";
+
+    return -1;
+  }
+  else if (result == 0)
+  {
+    #ifdef DEBUG
+    *logofs << "handleDecompress: Received " << size - offset
+            << " bytes of plain data for FD#" << fd_
+            << ".\n" << logofs_flush;
+    #endif
+
+    return 0;
+  }
+  else
+  {
+    #ifdef DEBUG
+    *logofs << "handleDecompress: Received " << compressedDataSize
+            << " bytes of compressed data for FD#" << fd_
+            << ".\n" << logofs_flush;
+    #endif
+
+    return 1;
+  }
+}
+
+int Channel::handleCleanAndNullRequest(unsigned char &opcode, unsigned char *&buffer,
+                                           unsigned int &size)
+{
+  #ifdef TEST
+  *logofs << "handleCleanAndNullRequest: Removing the previous data "
+          << "and sending an X_NoOperation " << "for FD#" << fd_
+          << " due to OPCODE#" << (unsigned int) opcode << " ("
+          << DumpOpcode(opcode) << ").\n" << logofs_flush;
+  #endif
+
+  writeBuffer_.removeMessage(size - 4);
+
+  size   = 4;
+  opcode = X_NoOperation;
+
+  return 1;
+}
+
+int Channel::handleNullRequest(unsigned char &opcode, unsigned char *&buffer,
+                                   unsigned int &size)
+{
+  #ifdef TEST
+  *logofs << "handleNullRequest: Sending an X_NoOperation for FD#"
+          << fd_ << " due to OPCODE#" << (unsigned int) opcode
+          << " (" << DumpOpcode(opcode) << ").\n"
+          << logofs_flush;
+  #endif
+
+  size   = 4;
+  buffer = writeBuffer_.addMessage(size);
+  opcode = X_NoOperation;
+
+  return 1;
+}
+
+void Channel::handleSplitStoreError(int resource)
+{
+  if (resource < 0 || resource >= CONNECTIONS_LIMIT)
+  {
+    #ifdef PANIC
+    *logofs << "handleSplitStoreError: PANIC! Resource "
+            << resource << " is out of range with limit "
+            << "set to " << CONNECTIONS_LIMIT << ".\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Resource " << resource
+         << " is out of range with limit set to "
+         << CONNECTIONS_LIMIT << ".\n";
+
+    HandleCleanup();
+  }
+  else
+  {
+    #ifdef PANIC
+    *logofs << "handleSplitStoreError: PANIC! Cannot "
+            << "allocate the split store for resource "
+            << resource << ".\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Cannot allocate the "
+         << "split store for resource " << resource
+         << ".\n";
+
+    HandleCleanup();
+  }
+}
+
+void Channel::handleSplitStoreAlloc(List *list, int resource)
+{
+  if (resource < 0 || resource >= CONNECTIONS_LIMIT)
+  {
+    handleSplitStoreError(resource);
+  }
+
+  if (clientStore_ -> getSplitStore(resource) == NULL)
+  {
+    #if defined(TEST) || defined(SPLIT)
+    *logofs << "handleSplitStoreAlloc: Allocating a new "
+            << "split store for resource " << resource
+            << ".\n" << logofs_flush;
+    #endif
+
+    SplitStore *splitStore = clientStore_ -> createSplitStore(resource);
+
+    if (splitStore == NULL)
+    {
+      handleSplitStoreError(resource);
+    }
+
+    list -> add(resource);
+  }
+  #if defined(TEST) || defined(SPLIT)
+  else
+  {
+    //
+    // Old proxy versions only use a single
+    // split store.
+    //
+
+    if (resource != 0)
+    {
+      *logofs << "handleSplitStoreAlloc: WARNING! A split "
+              << "store for resource " << resource
+              << " already exists.\n" << logofs_flush;
+    }
+  }
+  #endif
+}
+
+void Channel::handleSplitStoreRemove(List *list, int resource)
+{
+  if (resource < 0 || resource >= CONNECTIONS_LIMIT)
+  {
+    handleSplitStoreError(resource);
+  }
+
+  SplitStore *splitStore = clientStore_ -> getSplitStore(resource);
+
+  if (splitStore != NULL)
+  {
+    #if defined(TEST) || defined(SPLIT)
+    *logofs << "handleSplitStoreRemove: Deleting the "
+            << "split store for resource " << resource
+            << ".\n" << logofs_flush;
+    #endif
+
+    clientStore_ -> destroySplitStore(resource);
+
+    #if defined(TEST) || defined(SPLIT)
+    *logofs << "handleSplitStoreRemove: Deleting resource "
+            << resource << " from the list " << ".\n"
+            << logofs_flush;
+    #endif
+
+    list -> remove(resource);
+  }
+  #if defined(TEST) || defined(SPLIT)
+  else
+  {
+    *logofs << "handleSplitStoreRemove: WARNING! A split "
+            << "store for resource " << resource
+            << " does not exist.\n" << logofs_flush;
+  }
+  #endif
+}
+
+Split *Channel::handleSplitCommitRemove(int request, int resource, int position)
+{
+  #if defined(TEST) || defined(SPLIT)
+  *logofs << "handleSplitCommitRemove: SPLIT! Checking split "
+          << "commit with resource " << resource << " request "
+          << request << " and position " << position
+          << ".\n" << logofs_flush;
+  #endif
+
+  //
+  // Remove the split from the split queue.
+  //
+
+  CommitStore *commitStore = clientStore_ -> getCommitStore();
+
+  Split *split = commitStore -> pop();
+
+  if (split == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "handleSplitCommitRemove: PANIC! Can't "
+            << "find the split in the commit queue.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Can't find the "
+         << "split in the commit queue.\n";
+
+    HandleCleanup();
+  }
+
+  #if defined(TEST) || defined(SPLIT)
+  *logofs << "handleSplitCommitRemove: SPLIT! Element from "
+          << "the queue has resource " << split -> getResource()
+          << " request " << split -> getRequest() << " and "
+          << "position " << split -> getPosition()
+          << ".\n" << logofs_flush;
+  #endif
+
+  // Since ProtoStep7 (#issue 108)
+  if (resource != split -> getResource() ||
+           request != split -> getRequest() ||
+               position != split -> getPosition())
+  {
+    #ifdef PANIC
+    *logofs << "handleSplitCommitRemove: PANIC! The data in "
+            << "the split doesn't match the commit request.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": The data in the split doesn't "
+         << "match the commit request.\n";
+
+    return NULL;
+  }
+
+  #if defined(TEST) || defined(SPLIT)
+
+  commitStore -> dump();
+
+  #endif
+
+  return split;
+}
+
+int Channel::setReferences()
+{
+  #ifdef TEST
+  *logofs << "Channel: Initializing the static "
+          << "members for the base class.\n"
+          << logofs_flush;
+  #endif
+
+  firstClient_ = -1;
+
+  fontPort_ = -1;
+
+  #ifdef REFERENCES
+
+  references_ = 0;
+
+  #endif
+
+  return 1;
+}
+
+int Channel::setOpcodes(OpcodeStore *opcodeStore)
+{
+  opcodeStore_ = opcodeStore;
+
+  #ifdef TEST
+  *logofs << "setOpcodes: Propagated opcodes store to channel "
+          << "for FD#" << fd_ << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int Channel::setStores(ClientStore *clientStore, ServerStore *serverStore)
+{
+  clientStore_ = clientStore;
+  serverStore_ = serverStore;
+
+  #ifdef TEST
+  *logofs << "setStores: Propagated message stores to channel "
+          << "for FD#" << fd_ << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int Channel::setCaches(ClientCache *clientCache, ServerCache *serverCache)
+{
+  clientCache_ = clientCache;
+  serverCache_ = serverCache;
+
+  #ifdef TEST
+  *logofs << "setCaches: Propagated encode caches to channel "
+          << "for FD#" << fd_ << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
diff --git a/nxcomp/src/Channel.h b/nxcomp/src/Channel.h
new file mode 100644
index 000000000..93b022630
--- /dev/null
+++ b/nxcomp/src/Channel.h
@@ -0,0 +1,664 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef Channel_H
+#define Channel_H
+
+#include "Transport.h"
+
+#include "WriteBuffer.h"
+
+#include "OpcodeStore.h"
+
+#include "ClientStore.h"
+#include "ServerStore.h"
+
+#include "ClientCache.h"
+#include "ServerCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+//
+// Forward declaration of referenced classes.
+//
+
+class List;
+
+class StaticCompressor;
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+//
+// Define this to log a line when a channel
+// is created or destroyed.
+//
+
+#undef  REFERENCES
+
+//
+// Type of traffic carried by channel.
+//
+
+typedef enum
+{
+  channel_none = -1,
+  channel_x11,
+  channel_cups,
+  channel_smb,
+  channel_media,
+  channel_http,
+  channel_font,
+  channel_slave,
+  channel_last_tag
+
+} T_channel_type;
+
+//
+// Type of notification event to be sent
+// by proxy to the X channel.
+//
+
+typedef enum
+{
+  notify_no_split,
+  notify_start_split,
+  notify_commit_split,
+  notify_end_split,
+  notify_empty_split,
+
+} T_notification_type;
+
+class Channel
+{
+  public:
+
+  //
+  // Maximum number of X connections supported.
+  //
+
+  static const int CONNECTIONS_LIMIT = 256;
+
+  Channel(Transport *transport, StaticCompressor *compressor);
+
+  virtual ~Channel();
+
+  //
+  // Read any X message available on the X
+  // connection and encode it to the encode
+  // buffer.
+  //
+
+  virtual int handleRead(EncodeBuffer &encodeBuffer, const unsigned char *message,
+                             unsigned int length) = 0;
+
+  //
+  // Decode any X message encoded in the
+  // proxy message and write it to the X
+  // connection.
+  //
+
+  virtual int handleWrite(const unsigned char *message, unsigned int length) = 0;
+
+  //
+  // Other methods to be implemented in
+  // client, server and generic channel
+  // classes.
+  //
+
+  virtual int handleSplit(EncodeBuffer &encodeBuffer, MessageStore *store,
+                              T_store_action action, int position, const unsigned char opcode,
+                                  const unsigned char *buffer, const unsigned int size) = 0;
+
+  virtual int handleSplit(DecodeBuffer &decodeBuffer, MessageStore *store,
+                              T_store_action action, int position, unsigned char &opcode,
+                                  unsigned char *&buffer, unsigned int &size) = 0;
+
+  virtual int handleSplit(EncodeBuffer &encodeBuffer) = 0;
+
+  virtual int handleSplit(DecodeBuffer &decodeBuffer) = 0;
+
+  virtual int handleSplitEvent(EncodeBuffer &encodeBuffer, Split *split) = 0;
+
+  virtual int handleSplitEvent(DecodeBuffer &decodeBuffer) = 0;
+
+  virtual int handleMotion(EncodeBuffer &encodeBuffer) = 0;
+
+  virtual int handleCompletion(EncodeBuffer &encodeBuffer) = 0;
+
+  virtual int handleConfiguration() = 0;
+
+  virtual int handleFinish() = 0;
+
+  //
+  // Interleave reads of the available
+  // events while writing data to the
+  // channel socket.
+  //
+
+  virtual int handleAsyncEvents() = 0;
+
+  //
+  // Handle the channel tear down.
+  //
+
+  int handleClosing()
+  {
+    closing_ = 1;
+
+    return 1;
+  }
+
+  int handleDrop()
+  {
+    drop_ = 1;
+
+    return 1;
+  }
+
+  //
+  // Try to read more data from the socket. In
+  // the meanwhile flush any enqueued data if
+  // the channel is blocked. Return as soon as
+  // more data has been read or the timeout has
+  // been exceeded.
+  //
+
+  int handleWait(int timeout);
+
+  //
+  // Drain the output buffer while handling the
+  // data that may become readable.
+  //
+
+  int handleDrain(int timeout, int limit);
+
+  //
+  // Flush any remaining data in the transport
+  // buffer.
+  //
+
+  int handleFlush();
+
+  //
+  // Called when the loop has replaced or
+  // closed a previous alert.
+  //
+
+  void handleResetAlert();
+
+  //
+  // Initialize all the static members.
+  //
+
+  static int setReferences();
+
+  //
+  // Set pointer to object mapping opcodes
+  // of NX specific messages.
+  //
+
+  int setOpcodes(OpcodeStore *opcodeStore);
+
+  //
+  // Update pointers to message stores in
+  // channels.
+  //
+
+  int setStores(ClientStore *clientStore, ServerStore *serverStore);
+
+  //
+  // The same for channels caches.
+  //
+
+  int setCaches(ClientCache *clientCache, ServerCache *serverCache);
+
+  //
+  // Set the port used for tunneling of the
+  // font server connections.
+  //
+
+  void setPorts(int fontPort)
+  {
+    fontPort_ = fontPort;
+  }
+
+  //
+  // Check if there are pending split 
+  // to send to the remote side.
+  //
+
+  virtual int needSplit() const = 0;
+
+  //
+  // Check if there are motion events
+  // to flush.
+  //
+
+  virtual int needMotion() const = 0;
+
+  //
+  // Return the type of traffic carried
+  // by this channel.
+  //
+
+  virtual T_channel_type getType() const = 0;
+
+  //
+  // Check if the channel has been marked
+  // as closing down.
+  //
+
+  int getFinish() const
+  {
+    return finish_;
+  }
+
+  int getClosing()
+  {
+    return closing_;
+  }
+
+  int getDrop()
+  {
+    return drop_;
+  }
+
+  int getCongestion()
+  {
+    return congestion_;
+  }
+
+  protected:
+
+  int handleFlush(T_flush type)
+  {
+    //
+    // We could write the data immediately if there
+    // is already something queued to the low level
+    // TCP buffers.
+    //
+    // if (... || transport_ -> queued() > 0)
+    // {
+    //   ...
+    // }
+    //
+
+    if (writeBuffer_.getScratchLength() > 0 ||
+          (type == flush_if_any && writeBuffer_.getLength() > 0) ||
+              writeBuffer_.getLength() >= (unsigned int)
+                  control -> TransportFlushBufferSize)
+    {
+      return handleFlush(type, writeBuffer_.getLength(),
+                             writeBuffer_.getScratchLength());
+    }
+
+    return 0;
+  }
+
+  //
+  // Actually flush the data to the
+  // channel descriptor.
+  //
+
+  int handleFlush(T_flush type, int bufferLength, int scratchLength);
+
+  //
+  // Handle the congestion changes.
+  //
+
+  int handleCongestion();
+
+  //
+  // Encode and decode X messages.
+  //
+
+  int handleEncode(EncodeBuffer &encodeBuffer, ChannelCache *channelCache,
+                       MessageStore *store, const unsigned char opcode,
+                           const unsigned char *buffer, const unsigned int size);
+
+  int handleDecode(DecodeBuffer &decodeBuffer, ChannelCache *channelCache,
+                       MessageStore *store, unsigned char &opcode,
+                           unsigned char *&buffer, unsigned int &size);
+
+  //
+  // Encode the message based on its
+  // message store.
+  //
+
+  int handleEncodeCached(EncodeBuffer &encodeBuffer, ChannelCache *channelCache,
+                             MessageStore *store,  const unsigned char *buffer,
+                                 const unsigned int size);
+
+  int handleDecodeCached(DecodeBuffer &decodeBuffer, ChannelCache *channelCache,
+                             MessageStore *store, unsigned char *&buffer,
+                                 unsigned int &size);
+
+  int handleEncodeIdentity(EncodeBuffer &encodeBuffer, ChannelCache *channelCache,
+                               MessageStore *store, const unsigned char *buffer,
+                                   const unsigned int size, int bigEndian)
+  {
+    return (store -> encodeIdentity(encodeBuffer, buffer, size,
+                                        bigEndian, channelCache));
+  }
+
+  int handleDecodeIdentity(DecodeBuffer &decodeBuffer, ChannelCache *channelCache,
+                               MessageStore *store, unsigned char *&buffer,
+                                   unsigned int &size, int bigEndian,
+                                       WriteBuffer *writeBuffer)
+  {
+    return (store -> decodeIdentity(decodeBuffer, buffer, size, bigEndian,
+                                        writeBuffer, channelCache));
+  }
+
+  //
+  // Other utility functions used by
+  // the encoding and decoding methods.
+  //
+
+  void handleCopy(EncodeBuffer &encodeBuffer, const unsigned char opcode,
+                      const unsigned int offset, const unsigned char *buffer,
+                          const unsigned int size)
+  {
+    if (size > offset)
+    {
+      encodeBuffer.encodeMemory(buffer + offset, size - offset);
+    }
+  }
+
+  void handleCopy(DecodeBuffer &decodeBuffer, const unsigned char opcode,
+                      const unsigned int offset, unsigned char *buffer,
+                          const unsigned int size)
+  {
+    if (size > offset)
+    {
+      memcpy(buffer + offset, decodeBuffer.decodeMemory(size - offset), size - offset);
+    }
+  }
+
+  void handleUpdate(MessageStore *store, const unsigned int dataSize,
+                        const unsigned int compressedDataSize)
+  {
+    if (store -> lastAction == IS_ADDED)
+    {
+      handleUpdateAdded(store, dataSize, compressedDataSize);
+    }
+  }
+
+  void handleSave(MessageStore *store, unsigned char *buffer, unsigned int size,
+                      const unsigned char *compressedData = NULL,
+                          const unsigned int compressedDataSize = 0)
+  {
+    if (store -> lastAction == IS_ADDED)
+    {
+      handleSaveAdded(store, 0, buffer, size, compressedData, compressedDataSize);
+    }
+  }
+
+  void handleSaveSplit(MessageStore *store, unsigned char *buffer,
+                          unsigned int size)
+  {
+    if (store -> lastAction == IS_ADDED)
+    {
+      return handleSaveAdded(store, 1, buffer, size, 0, 0);
+    }
+  }
+
+  void handleUpdateAdded(MessageStore *store, const unsigned int dataSize,
+                             const unsigned int compressedDataSize);
+
+  void handleSaveAdded(MessageStore *store, int split, unsigned char *buffer,
+                           unsigned int size, const unsigned char *compressedData,
+                               const unsigned int compressedDataSize);
+
+  //
+  // Compress the data part of a message
+  // using ZLIB or another compressor
+  // and send it over the network.
+  //
+
+  int handleCompress(EncodeBuffer &encodeBuffer, const unsigned char opcode,
+                         const unsigned int offset, const unsigned char *buffer,
+                             const unsigned int size, unsigned char *&compressedData,
+                                 unsigned int &compressedDataSize);
+
+  int handleDecompress(DecodeBuffer &decodeBuffer, const unsigned char opcode,
+                           const unsigned int offset, unsigned char *buffer,
+                               const unsigned int size, const unsigned char *&compressedData,
+                                   unsigned int &compressedDataSize);
+
+  //
+  // Send an X_NoOperation to the X server.
+  // The second version also removes any
+  // previous data in the write buffer.
+  //
+
+  int handleNullRequest(unsigned char &opcode, unsigned char *&buffer,
+                            unsigned int &size);
+
+  int handleCleanAndNullRequest(unsigned char &opcode, unsigned char *&buffer,
+                                    unsigned int &size);
+
+  //
+  // X11 channels are considered to be in
+  // congestion state when there was a
+  // blocking write and, since then, the
+  // local end didn't consume all the data.
+  //
+
+  virtual int isCongested()
+  {
+    return (transport_ -> getType() !=
+                transport_agent && transport_ -> length() >
+                    control -> TransportFlushBufferSize);
+  }
+
+  virtual int isReliable()
+  {
+    return 1;
+  }
+
+  //
+  // Determine how to handle allocation
+  // of new messages in the message
+  // stores.
+  //
+
+  int mustCleanStore(MessageStore *store)
+  {
+    return (store -> getRemoteTotalStorageSize() > control ->
+                RemoteTotalStorageSize || store -> getLocalTotalStorageSize() >
+                    control -> LocalTotalStorageSize || (store -> getRemoteStorageSize() >
+                        (control -> RemoteTotalStorageSize / 100 * store ->
+                            cacheThreshold)) || (store -> getLocalStorageSize() >
+                                (control -> LocalTotalStorageSize / 100 * store ->
+                                    cacheThreshold)));
+  }
+
+  int canCleanStore(MessageStore *store)
+  {
+    return ((store -> getSize() > 0 && (store -> getRemoteStorageSize() >
+                (control -> RemoteTotalStorageSize / 100 * store ->
+                    cacheLowerThreshold))) || (store -> getLocalStorageSize() >
+                        (control -> LocalTotalStorageSize / 100 *  store ->
+                            cacheLowerThreshold)));
+  }
+
+  protected:
+
+  //
+  // Set up the split stores.
+  //
+
+  void handleSplitStoreError(int resource);
+
+  void handleSplitStoreAlloc(List *list, int resource);
+  void handleSplitStoreRemove(List *list, int resource);
+
+  Split *handleSplitCommitRemove(int request, int resource, int position);
+
+  void validateSize(const char *name, int input, int output,
+                        int offset, int size)
+  {
+    if (size < offset || size > control -> MaximumMessageSize ||
+           size != (int) RoundUp4(input) + offset ||
+               output > control -> MaximumMessageSize)
+    {
+      *logofs << "Channel: PANIC! Invalid size " << size
+              << " for " << name << " output with data "
+              << input << "/" << output << "/" << offset
+              << "/" << size << ".\n" << logofs_flush;
+
+      cerr << "Error" << ": Invalid size " << size
+           << " for " << name << " output.\n";
+
+      HandleAbort();
+    }
+  }
+
+  //
+  // Is the X client big endian?
+  //
+
+  int bigEndian() const
+  {
+    return bigEndian_;
+  }
+
+  int bigEndian_;
+
+  //
+  // Other X server's features
+  // saved at session startup.
+  //
+
+  unsigned int imageByteOrder_;
+  unsigned int bitmapBitOrder_;
+  unsigned int scanlineUnit_;
+  unsigned int scanlinePad_;
+
+  int firstRequest_;
+  int firstReply_;
+
+  //
+  // Use this class for IO operations.
+  //
+
+  Transport *transport_;
+
+  //
+  // The static compressor is created by the
+  // proxy and shared among channels.
+  //
+
+  StaticCompressor *compressor_;
+
+  //
+  // Map NX operations to opcodes. Propagated
+  // by proxy to all channels on the same X
+  // server.
+  //
+
+  OpcodeStore *opcodeStore_;
+ 
+  //
+  // Also stores are shared between channels.
+  //
+
+  ClientStore *clientStore_;
+  ServerStore *serverStore_;
+
+  //
+  // Caches are specific for each channel.
+  //
+
+  ClientCache *clientCache_;
+  ServerCache *serverCache_;
+
+  //
+  // Data going to X connection.
+  //
+
+  WriteBuffer writeBuffer_;
+
+  //
+  // Other data members.
+  //
+
+  int fd_;
+
+  int finish_;
+  int closing_;
+  int drop_;
+  int congestion_;
+  int priority_;
+
+  int alert_;
+
+  //
+  // It will be set to the descriptor of the
+  // first X channel that is successfully con-
+  // nected and will print an info message on
+  // standard error.
+  //
+
+  static int firstClient_;
+
+  //
+  // Port used for font server connections.
+  //
+
+  static int fontPort_;
+
+  //
+  // Track which cache operations have been
+  // enabled by the agent.
+  //
+
+  int enableCache_;
+  int enableSplit_;
+  int enableSave_;
+  int enableLoad_;
+
+  //
+  // Keep track of object creation and
+  // deletion.
+  //
+
+  #ifdef REFERENCES
+
+  static int references_;
+
+  #endif
+};
+
+#endif /* Channel_H */
diff --git a/nxcomp/src/ChannelCache.cpp b/nxcomp/src/ChannelCache.cpp
new file mode 100644
index 000000000..f30f18bc1
--- /dev/null
+++ b/nxcomp/src/ChannelCache.cpp
@@ -0,0 +1,68 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "ChannelCache.h"
+
+const unsigned int CONFIGUREWINDOW_FIELD_WIDTH[7] =
+{
+  16,     // x
+  16,     // y
+  16,     // width
+  16,     // height
+  16,     // border width
+  29,     // sibling window
+  3       // stack mode
+};
+
+const unsigned int CREATEGC_FIELD_WIDTH[23] =
+{
+  4,      // function
+  32,     // plane mask
+  32,     // foreground
+  32,     // background
+  16,     // line width
+  2,      // line style
+  2,      // cap style
+  2,      // join style
+  2,      // fill style
+  1,      // fill rule
+  29,     // tile
+  29,     // stipple
+  16,     // tile/stipple x origin
+  16,     // tile/stipple y origin
+  29,     // font
+  1,      // subwindow mode
+  1,      // graphics exposures
+  16,     // clip x origin
+  16,     // clip y origin
+  29,     // clip mask
+  16,     // card offset
+  8,      // dashes
+  1       // arc mode
+};
diff --git a/nxcomp/src/ChannelCache.h b/nxcomp/src/ChannelCache.h
new file mode 100644
index 000000000..6a29c3847
--- /dev/null
+++ b/nxcomp/src/ChannelCache.h
@@ -0,0 +1,61 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef ChannelCache_H
+#define ChannelCache_H
+
+//
+// Sizes of optional fields for ConfigureWindow
+// request.
+//
+
+extern const unsigned int CONFIGUREWINDOW_FIELD_WIDTH[7];
+
+//
+// Sizes of optional fields for CreateGC request.
+//
+
+extern const unsigned int CREATEGC_FIELD_WIDTH[23];
+
+//
+// This is just needed to provide a pointer
+// to the base cache class in encoding and
+// decoding procedures of message stores.
+//
+
+class ChannelCache
+{
+  public:
+
+  ChannelCache()
+  {
+  }
+
+  ~ChannelCache()
+  {
+  }
+};
+
+#endif /* ChannelCache_H */
diff --git a/nxcomp/src/ChannelEndPoint.cpp b/nxcomp/src/ChannelEndPoint.cpp
new file mode 100644
index 000000000..921615bae
--- /dev/null
+++ b/nxcomp/src/ChannelEndPoint.cpp
@@ -0,0 +1,349 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/stat.h>
+
+#include "ChannelEndPoint.h"
+
+#include "NXalert.h"
+
+ChannelEndPoint::ChannelEndPoint(const char *spec)
+  : defaultTCPPort_(0), defaultTCPInterface_(0),
+    defaultUnixPath_(NULL), spec_(NULL) {
+  setSpec(spec);
+}
+
+ChannelEndPoint::~ChannelEndPoint()
+{
+  char *unixPath = NULL;
+
+  if (getUnixPath(&unixPath))
+  {
+    struct stat st;
+    lstat(unixPath, &st);
+    if(S_ISSOCK(st.st_mode))
+      unlink(unixPath);
+  }
+}
+
+void
+ChannelEndPoint::setSpec(const char *spec) {
+  if (spec_) free(spec_);
+
+  if (spec && strlen(spec))
+  {
+    spec_ = strdup(spec);
+    isUnix_ = getUnixPath();
+    isTCP_ = getTCPHostAndPort();
+  }
+  else
+  {
+    spec_ = NULL;
+    isUnix_ = false;
+    isTCP_ = false;
+  }
+}
+
+void
+ChannelEndPoint::setSpec(long port) {
+  if (port >= 0) {
+    char tmp[20];
+    sprintf(tmp, "%ld", port);
+    setSpec(tmp);
+  }
+  else {
+    disable();
+  }
+}
+
+void
+ChannelEndPoint::setSpec(const char *hostName, long port) {
+  int length;
+
+  if (spec_) free(spec_);
+  isUnix_ = false;
+  isTCP_ = false;
+
+  if (hostName && strlen(hostName) && port >= 1)
+  {
+    length = snprintf(NULL, 0, "tcp:%s:%ld", hostName, port);
+    spec_ = (char *)calloc(length + 1, sizeof(char));
+    snprintf(spec_, length+1, "tcp:%s:%ld", hostName, port);
+    isTCP_ = true;
+  }
+  else setSpec((char*)NULL);
+}
+
+bool
+ChannelEndPoint::getSpec(char **socketUri) const {
+
+  if (socketUri) *socketUri = NULL;
+
+  char *unixPath = NULL;
+  char *hostName = NULL;
+  long port = -1;
+
+  char *newSocketUri = NULL;
+  int length = -1;
+
+  if (getUnixPath(&unixPath))
+  {
+    length = snprintf(NULL, 0, "unix:%s", unixPath);
+  }
+  else if (getTCPHostAndPort(&hostName, &port))
+  {
+    length = snprintf(NULL, 0, "tcp:%s:%ld", hostName, port);
+  }
+
+  if (length > 0)
+  {
+    newSocketUri = (char *)calloc(length + 1, sizeof(char));
+    if (isUnixSocket())
+      snprintf(newSocketUri, length+1, "unix:%s", unixPath);
+    else
+      snprintf(newSocketUri, length+1, "tcp:%s:%ld", hostName, port);
+
+    if (socketUri)
+      *socketUri = strdup(newSocketUri);
+  }
+
+  free(newSocketUri);
+  free(unixPath);
+  free(hostName);
+
+  if (NULL != *socketUri)
+    return true;
+
+  return false;
+}
+
+void
+ChannelEndPoint::setDefaultTCPPort(long port) {
+  defaultTCPPort_ = port;
+}
+
+void
+ChannelEndPoint::setDefaultTCPInterface(int publicInterface) {
+  defaultTCPInterface_ = publicInterface;
+}
+
+void
+ChannelEndPoint::setDefaultUnixPath(char *path) {
+  if (defaultUnixPath_) free(defaultUnixPath_);
+
+  if (path && strlen(path))
+    defaultUnixPath_ = strdup(path);
+  else
+    defaultUnixPath_ = NULL;
+}
+
+void
+ChannelEndPoint::disable() {
+  setSpec("0");
+}
+
+bool
+ChannelEndPoint::getPort(long *port) const {
+  if (port) *port = 0;
+  long p = -1;
+  if (spec_) {
+    char *end;
+    p = strtol(spec_, &end, 10);
+    if ((end == spec_) || (*end != '\0'))
+      return false;
+  }
+
+  if (port) *port = p;
+  return true;
+}
+
+bool
+ChannelEndPoint::getUnixPath(char **unixPath) const {
+
+  if (unixPath) *unixPath = 0;
+
+  long p;
+  char *path = NULL;
+
+  if (getPort(&p)) {
+    if (p != 1) return false;
+  }
+  else if (spec_ && (strncmp("unix:", spec_, 5) == 0)) {
+    path = spec_ + 5;
+  }
+  else
+    return false;
+
+  if (!path || (*path == '\0')) {
+    path = defaultUnixPath_;
+    if (!path)
+      return false;
+  }
+
+  if (unixPath)
+    *unixPath = strdup(path);
+
+  return true;
+}
+
+bool
+ChannelEndPoint::isUnixSocket() const {
+  return isUnix_;
+}
+
+// FIXME!!!
+static const char *
+getComputerName() {
+  //
+  // Strangely enough, under some Windows OSes SMB
+  // service doesn't bind to localhost. Fall back
+  // to localhost if can't find computer name in
+  // the environment. In future we should try to
+  // bind to localhost and then try the other IPs.
+  //
+
+  const char *hostname = NULL;
+
+  #ifdef __CYGWIN32__
+
+  hostname = getenv("COMPUTERNAME");
+
+  #endif
+
+  if (hostname == NULL)
+  {
+    hostname = "localhost";
+  }
+
+  return hostname;
+}
+
+bool
+ChannelEndPoint::getTCPHostAndPort(char **host, long *port) const {
+  long p;
+  char *h = NULL;
+  ssize_t h_len;
+
+  if (host) *host = NULL;
+  if (port) *port = 0;
+
+  if (getPort(&p)) {
+    h_len = 0;
+  }
+  else if (spec_ && (strncmp("tcp:", spec_, 4) == 0)) {
+    h = spec_ + 4;
+    char *colon = strrchr(h, ':');
+    if (colon) {
+      char *end;
+      h_len = colon++ - h;
+      p = strtol(colon, &end, 10);
+      if ((end == colon) || (*end != '\0'))
+        return false;
+    }
+    else {
+      h_len = strlen(h);
+      p = 1;
+    }
+  }
+  else
+    return false;
+
+  if (p == 1) p = defaultTCPPort_;
+  if (p < 1) return false;
+
+  if (port)
+    *port = p;
+
+  if (host)
+    *host = ( h_len
+              ? strndup(h, h_len)
+              : strdup(defaultTCPInterface_ ? getComputerName() : "localhost"));
+
+  return true;
+}
+
+bool
+ChannelEndPoint::isTCPSocket() const {
+  return isTCP_;
+}
+
+long ChannelEndPoint::getTCPPort() const {
+  long port;
+  if (getTCPHostAndPort(NULL, &port)) return port;
+  return -1;
+}
+
+bool
+ChannelEndPoint::enabled() const {
+  return (isUnixSocket() || isTCPSocket());
+}
+
+bool
+ChannelEndPoint::validateSpec() {
+  isTCP_ = getTCPHostAndPort();
+  isUnix_ = getUnixPath();
+  return ( getPort() || isUnix_ || isTCP_ );
+}
+
+ChannelEndPoint &ChannelEndPoint::operator=(const ChannelEndPoint &other) {
+  char *old;
+  defaultTCPPort_ = other.defaultTCPPort_;
+  defaultTCPInterface_ = other.defaultTCPInterface_;
+  old = defaultUnixPath_;
+  defaultUnixPath_ = (other.defaultUnixPath_ ? strdup(other.defaultUnixPath_) : NULL);
+  free(old);
+  old = spec_;
+  spec_ = (other.spec_ ? strdup(other.spec_) : NULL);
+  free(old);
+  isUnix_ = getUnixPath();
+  isTCP_ = getTCPHostAndPort();
+  return *this;
+}
+
+std::ostream& operator<<(std::ostream& os, const ChannelEndPoint& endPoint) {
+  if (endPoint.enabled()) {
+    char* endPointSpec = NULL;
+    if (endPoint.getSpec(&endPointSpec))
+    {
+      os << endPointSpec;
+      free(endPointSpec);
+    }
+    else
+      os << "(invalid)";
+  }
+  else
+  {
+    os << "(disabled)";
+  }
+  return os;
+}
diff --git a/nxcomp/src/ChannelEndPoint.h b/nxcomp/src/ChannelEndPoint.h
new file mode 100644
index 000000000..4c0c728f3
--- /dev/null
+++ b/nxcomp/src/ChannelEndPoint.h
@@ -0,0 +1,71 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef ChannelEndPoint_H
+#define ChannelEndPoint_H
+
+#include <iostream>
+#include <sys/un.h>
+
+class ChannelEndPoint
+{
+ private:
+  long defaultTCPPort_;
+  int defaultTCPInterface_; // 0=localhost, otherwise IP of public interface.
+  char *defaultUnixPath_;
+  char *spec_;
+  bool isUnix_;
+  bool isTCP_;
+
+  bool getPort(long *port = NULL) const;
+
+ public:
+  ChannelEndPoint(const char *spec = NULL);
+  ~ChannelEndPoint();
+  ChannelEndPoint &operator=(const ChannelEndPoint &other);
+
+  bool enabled() const;
+  bool disabled() { return !enabled(); }
+  void disable();
+  void setSpec(const char *spec);
+  void setSpec(long port);
+  void setSpec(const char *hostName, long port);
+  bool getSpec(char **socketUri) const;
+  void setDefaultTCPPort(long port);
+  void setDefaultTCPInterface(int publicInterface);
+  void setDefaultUnixPath(char *path);
+
+  bool getUnixPath(char **path = NULL) const;
+  bool isUnixSocket() const;
+  bool getTCPHostAndPort(char **hostname = NULL, long *port = NULL) const;
+  long getTCPPort() const;
+  bool isTCPSocket() const;
+
+  bool validateSpec();
+};
+
+std::ostream& operator<<(std::ostream& os, const ChannelEndPoint& endPoint);
+
+#endif
diff --git a/nxcomp/src/ChannelStore.h b/nxcomp/src/ChannelStore.h
new file mode 100644
index 000000000..53bb60f73
--- /dev/null
+++ b/nxcomp/src/ChannelStore.h
@@ -0,0 +1,54 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef ChannelStore_H
+#define ChannelStore_H
+
+//
+// One message store for each opcode.
+//
+
+#define CHANNEL_STORE_OPCODE_LIMIT        256
+
+//
+// One split store for each resource.
+//
+
+#define CHANNEL_STORE_RESOURCE_LIMIT      256
+
+class ChannelStore
+{
+  public:
+
+  ChannelStore()
+  {
+  }
+
+  virtual ~ChannelStore()
+  {
+  }
+};
+
+#endif /* ChannelStore_H */
diff --git a/nxcomp/src/CharCache.cpp b/nxcomp/src/CharCache.cpp
new file mode 100644
index 000000000..ed0e5a02a
--- /dev/null
+++ b/nxcomp/src/CharCache.cpp
@@ -0,0 +1,73 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "CharCache.h"
+
+int CharCache::lookup(unsigned char value, unsigned int &index)
+{
+  for (unsigned int i = 0; i < length_; i++)
+    if (value == buffer_[i])
+    {
+      index = i;
+      if (i)
+      {
+        unsigned int target = (i >> 1);
+        do
+        {
+          buffer_[i] = buffer_[i - 1];
+          i--;
+        }
+        while (i > target);
+        buffer_[target] = value;
+      }
+      return 1;
+    }
+  insert(value);
+  return 0;
+}
+
+void CharCache::insert(unsigned char value)
+{
+  unsigned int insertionPoint = 0;
+  if (2 >= length_)
+    insertionPoint = length_;
+  else
+    insertionPoint = 2;
+  unsigned int start;
+  if (length_ >= 7)
+    start = 7 - 1;
+  else
+  {
+    start = length_;
+    length_++;
+  }
+  for (unsigned int k = start; k > insertionPoint; k--)
+    buffer_[k] = buffer_[k - 1];
+  buffer_[insertionPoint] = value;
+}
diff --git a/nxcomp/src/CharCache.h b/nxcomp/src/CharCache.h
new file mode 100644
index 000000000..b8891d2df
--- /dev/null
+++ b/nxcomp/src/CharCache.h
@@ -0,0 +1,91 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef CharCache_H
+#define CharCache_H
+
+//
+// CharCache is a counterpart of IntCache that is
+// optimized for use in compressing text composed
+// of 8-bit characters.
+//
+
+class CharCache
+{
+  public:
+
+  CharCache() : length_(0)
+  {
+  }
+
+  ~CharCache()
+  {
+  }
+
+  unsigned int getSize() const
+  {
+    return (unsigned int) length_;
+  }
+
+  int lookup(unsigned char value, unsigned int &index);
+
+  //
+  // This can be inlined as it is only
+  // called by decodeCachedValue().
+  //
+
+  unsigned int get(unsigned int index)
+  {
+    unsigned char result = buffer_[index];
+
+    if (index != 0)
+    {
+      unsigned int i = index;
+      unsigned int target = (i >> 1);
+
+      do
+      {
+        buffer_[i] = buffer_[i - 1];
+
+        i--;
+      }
+      while (i > target);
+
+      buffer_[target] = result;
+    }
+
+    return (unsigned int) result;
+  }
+
+  void insert(unsigned char value);
+
+  private:
+
+  unsigned char length_;
+
+  unsigned char buffer_[7];
+};
+
+#endif /* CharCache_H */
diff --git a/nxcomp/src/Children.cpp b/nxcomp/src/Children.cpp
new file mode 100644
index 000000000..49ab13352
--- /dev/null
+++ b/nxcomp/src/Children.cpp
@@ -0,0 +1,1059 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <unistd.h>
+#include <sys/types.h>
+#include <signal.h>
+#include <fcntl.h>
+
+#include "NX.h"
+
+#include "Misc.h"
+
+#include "Types.h"
+#include "Timestamp.h"
+
+#include "Control.h"
+#include "Statistics.h"
+#include "Proxy.h"
+
+#include "Keeper.h"
+#include "Fork.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+#define DISPLAY_LENGTH_LIMIT  256
+#define DEFAULT_STRING_LIMIT  512
+
+//
+// These are from the main loop.
+//
+
+extern Keeper *keeper;
+
+extern int (*handler)(int);
+
+extern int useUnixSocket;
+
+extern int lastDialog;
+extern int lastWatchdog;
+extern int lastKeeper;
+
+extern void CleanupListeners();
+extern void CleanupSockets();
+extern void CleanupAgent();
+extern void CleanupGlobal();
+
+extern void InstallSignals();
+
+extern char *GetClientPath();
+
+extern int CheckParent(const char *name, const char *type,
+                           int parent);
+
+#ifdef __sun
+extern char **environ;
+#endif
+
+//
+// Close all the unused descriptors and
+// install any signal handler that might
+// have been disabled in the main process.
+//
+
+static void SystemCleanup(const char *name);
+
+//
+// Release all objects allocated in the
+// heap.
+
+static void MemoryCleanup(const char *name);
+
+//
+// Remove 'name' from the environment.
+//
+
+static int UnsetEnv(const char *name);
+
+static int NXTransKeeperHandler(int signal);
+static void NXTransKeeperCheck();
+
+
+//
+// Start a nxclient process in dialog mode.
+//
+
+int NXTransDialog(const char *caption, const char *message,
+                      const char *window, const char *type, int local,
+                         const char* display)
+{
+  //
+  // Be sure log file is valid.
+  //
+
+  if (logofs == NULL)
+  {
+    logofs = &cerr;
+  }
+
+  int pid;
+
+  #ifdef TEST
+  *logofs << "NXTransDialog: Going to fork with NX pid '"
+          << getpid() << "'.\n" << logofs_flush;
+  #endif
+
+  pid = Fork();
+
+  if (pid != 0)
+  {
+    if (pid < 0)
+    {
+      #ifdef TEST
+      *logofs << "NXTransDialog: WARNING! Function fork failed. "
+              << "Error is " << EGET() << " '" << ESTR()
+              << "'.\n" << logofs_flush;
+      #endif
+
+      cerr << "Warning" << ": Function fork failed. "
+           << "Error is " << EGET() << " '" << ESTR()
+           << "'.\n";
+    }
+    #ifdef TEST
+    else
+    {
+      *logofs << "NXTransDialog: Created NX dialog process "
+              << "with pid '" << pid << "'.\n"
+              << logofs_flush;
+    }
+    #endif
+
+    return pid;
+  }
+
+  #ifdef TEST
+  *logofs << "NXTransDialog: Executing child with pid '"
+          << getpid() << "' and parent '" << getppid()
+          << "'.\n" << logofs_flush;
+  #endif
+
+  SystemCleanup("NXTransDialog");
+
+  //
+  // Copy the client command before
+  // freeing up the control class.
+  //
+
+  char command[DEFAULT_STRING_LIMIT];
+
+  if (control != NULL)
+  {
+    strcpy(command, control -> ClientPath);
+  }
+  else
+  {
+    char *path = GetClientPath();
+
+    strcpy(command, path);
+
+    delete [] path;
+  }
+
+  //
+  // Get rid of the unused resources.
+  //
+
+  MemoryCleanup("NXTransDialog");
+
+  #ifdef TEST
+  *logofs << "NXTransDialog: Running external NX dialog with caption '"
+          << caption << "' message '" << message << "' type '"
+          << type << "' local '" << local << "' display '"
+          << display << "'.\n"
+          << logofs_flush;
+  #endif
+
+  int pulldown = (strcmp(type, "pulldown") == 0);
+
+  char parent[DEFAULT_STRING_LIMIT];
+
+  snprintf(parent, DEFAULT_STRING_LIMIT, "%d", getppid());
+
+  parent[DEFAULT_STRING_LIMIT - 1] = '\0';
+
+  UnsetEnv("LD_LIBRARY_PATH");
+
+  for (int i = 0; i < 2; i++)
+  {
+    if (local != 0)
+    {
+      if (pulldown)
+      {
+        execlp(command, command, "--dialog", type, "--caption", caption,
+                   "--window", window, "--local", "--parent", parent,
+                       "--display", display, NULL);
+      }
+      else
+      {
+        execlp(command, command, "--dialog", type, "--caption", caption,
+                   "--message", message, "--local", "--parent", parent,
+                       "--display", display, NULL);
+      }
+    }
+    else
+    {
+      if (pulldown)
+      {
+        execlp(command, command, "--dialog", type, "--caption", caption,
+                   "--window", window, "--parent", parent,
+                       "--display", display, NULL);
+      }
+      else
+      {
+        execlp(command, command, "--dialog", type, "--caption", caption,
+                   "--message", message, "--parent", parent,
+                       "--display", display, NULL);
+      }
+    }
+
+    #ifdef WARNING
+    *logofs << "NXTransDialog: WARNING! Couldn't start '"
+            << command << "'. " << "Error is " << EGET()
+            << " '" << ESTR() << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Warning" << ": Couldn't start '" << command
+         << "'. Error is " << EGET() << " '" << ESTR()
+         << "'.\n";
+
+    //
+    // Retry by looking for the default name
+    // in the default NX path.
+    //
+
+    if (i == 0)
+    {
+
+      strcpy(command, "nxclient");
+
+      char newPath[DEFAULT_STRING_LIMIT];
+
+      strcpy(newPath, "/usr/NX/bin:/opt/NX/bin:/usr/local/NX/bin:");
+
+      #ifdef __APPLE__
+
+      strcat(newPath, "/Applications/NX Client for OSX.app/Contents/MacOS:");
+
+      #endif
+
+      #ifdef __CYGWIN32__
+
+      strcat(newPath, ".:");
+
+      #endif
+
+      int newLength = strlen(newPath);
+
+      char *oldPath = getenv("PATH");
+
+      strncpy(newPath + newLength, oldPath, DEFAULT_STRING_LIMIT - newLength - 1);
+
+      newPath[DEFAULT_STRING_LIMIT - 1] = '\0';
+
+      #ifdef WARNING
+      *logofs << "NXTransDialog: WARNING! Trying with path '"
+              << newPath << "'.\n" << logofs_flush;
+      #endif
+
+      cerr << "Warning" << ": Trying with path '" << newPath
+           << "'.\n";
+
+      //
+      // Solaris doesn't seem to have
+      // function setenv().
+      //
+
+      #ifdef __sun
+
+      char newEnv[DEFAULT_STRING_LIMIT + 5];
+
+      sprintf(newEnv,"PATH=%s", newPath);
+
+      putenv(newEnv);
+
+      #else
+
+      setenv("PATH", newPath, 1);
+
+      #endif
+
+    }
+  }
+
+  //
+  // Hopefully useless.
+  //
+
+  exit(0);
+}
+
+//
+// Start a nxclient process in dialog mode.
+//
+
+int NXTransClient(const char* display)
+{
+  //
+  // Be sure log file is valid.
+  //
+
+  if (logofs == NULL)
+  {
+    logofs = &cerr;
+  }
+
+  int pid;
+
+  #ifdef TEST
+  *logofs << "NXTransClient: Going to fork with NX pid '"
+          << getpid() << "'.\n" << logofs_flush;
+  #endif
+
+  pid = Fork();
+
+  if (pid != 0)
+  {
+    if (pid < 0)
+    {
+      #ifdef TEST
+      *logofs << "NXTransClient: WARNING! Function fork failed. "
+              << "Error is " << EGET() << " '" << ESTR()
+              << "'.\n" << logofs_flush;
+      #endif
+
+      cerr << "Warning" << ": Function fork failed. "
+           << "Error is " << EGET() << " '" << ESTR()
+           << "'.\n";
+    }
+    #ifdef TEST
+    else
+    {
+      *logofs << "NXTransClient: Created NX client process "
+              << "with pid '" << pid << "'.\n"
+              << logofs_flush;
+    }
+    #endif
+
+    return pid;
+  }
+
+  #ifdef TEST
+  *logofs << "NXTransClient: Executing child with pid '"
+          << getpid() << "' and parent '" << getppid()
+          << "'.\n" << logofs_flush;
+  #endif
+
+  SystemCleanup("NXTransClient");
+
+  //
+  // Copy the client command before
+  // freeing up the control class.
+  //
+
+  char command[DEFAULT_STRING_LIMIT];
+
+  if (control != NULL)
+  {
+    strcpy(command, control -> ClientPath);
+  }
+  else
+  {
+    char *path = GetClientPath();
+
+    strcpy(command, path);
+
+    delete [] path;
+  }
+
+  //
+  // Get rid of unused resources.
+  //
+
+  MemoryCleanup("NXTransClient");
+
+  #ifdef TEST
+  *logofs << "NXTransClient: Running external NX client with display '"
+          << display << "'.\n" << logofs_flush;
+  #endif
+
+  //
+  // Provide the display in the environment.
+  //
+
+  char newDisplay[DISPLAY_LENGTH_LIMIT];
+
+  #ifdef __sun
+
+  snprintf(newDisplay, DISPLAY_LENGTH_LIMIT - 1, "DISPLAY=%s", display);
+
+  newDisplay[DISPLAY_LENGTH_LIMIT - 1] = '\0';
+
+  putenv(newDisplay);
+
+  #else
+
+  strncpy(newDisplay, display, DISPLAY_LENGTH_LIMIT - 1);
+
+  newDisplay[DISPLAY_LENGTH_LIMIT - 1] = '\0';
+
+  setenv("DISPLAY", newDisplay, 1);
+
+  #endif
+
+  UnsetEnv("LD_LIBRARY_PATH");
+
+  for (int i = 0; i < 2; i++)
+  {
+    execlp(command, command, NULL);
+
+    #ifdef WARNING
+    *logofs << "NXTransClient: WARNING! Couldn't start '"
+            << command << "'. Error is " << EGET() << " '"
+            << ESTR() << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Warning" << ": Couldn't start '" << command
+         << "'. Error is " << EGET() << " '" << ESTR()
+         << "'.\n";
+
+    //
+    // Retry by looking for the default name
+    // in the default NX path.
+    //
+
+    if (i == 0)
+    {
+
+      strcpy(command, "nxclient");
+
+      char newPath[DEFAULT_STRING_LIMIT];
+
+      strcpy(newPath, "/usr/NX/bin:/opt/NX/bin:/usr/local/NX/bin:");
+
+      #ifdef __APPLE__
+
+      strcat(newPath, "/Applications/NX Client for OSX.app/Contents/MacOS:");
+
+      #endif
+
+      #ifdef __CYGWIN32__
+
+      strcat(newPath, ".:");
+
+      #endif
+
+      int newLength = strlen(newPath);
+
+      char *oldPath = getenv("PATH");
+
+      strncpy(newPath + newLength, oldPath, DEFAULT_STRING_LIMIT - newLength - 1);
+
+      newPath[DEFAULT_STRING_LIMIT - 1] = '\0';
+
+      #ifdef WARNING
+      *logofs << "NXTransClient: WARNING! Trying with path '"
+              << newPath << "'.\n" << logofs_flush;
+      #endif
+
+      cerr << "Warning" << ": Trying with path '" << newPath
+           << "'.\n";
+
+      //
+      // Solaris doesn't seem to have
+      // function setenv().
+      //
+
+      #ifdef __sun
+
+      char newEnv[DEFAULT_STRING_LIMIT + 5];
+
+      sprintf(newEnv,"PATH=%s", newPath);
+
+      putenv(newEnv);
+
+      #else
+
+      setenv("PATH", newPath, 1);
+
+      #endif
+    }
+
+  }
+  //
+  // Hopefully useless.
+  //
+
+  exit(0);
+}
+
+//
+// Wait until the timeout is expired.
+// The timeout is expressed in milli-
+// seconds.
+//
+
+int NXTransWatchdog(int timeout)
+{
+  //
+  // Be sure log file is valid.
+  //
+
+  if (logofs == NULL)
+  {
+    logofs = &cerr;
+  }
+
+  int pid;
+
+  #ifdef TEST
+  *logofs << "NXTransWatchdog: Going to fork with NX pid '"
+          << getpid() << "'.\n" << logofs_flush;
+  #endif
+
+  pid = Fork();
+
+  if (pid != 0)
+  {
+    if (pid < 0)
+    {
+      #ifdef TEST
+      *logofs << "NXTransWatchdog: WARNING! Function fork failed. "
+              << "Error is " << EGET() << " '" << ESTR()
+              << "'.\n" << logofs_flush;
+      #endif
+
+      cerr << "Warning" << ": Function fork failed. "
+           << "Error is " << EGET() << " '" << ESTR()
+           << "'.\n";
+    }
+    #ifdef TEST
+    else
+    {
+      *logofs << "NXTransWatchdog: Created NX watchdog process "
+              << "with pid '" << pid << "'.\n" << logofs_flush;
+    }
+    #endif
+
+    return pid;
+  }
+
+  int parent = getppid();
+
+  #ifdef TEST
+  *logofs << "NXTransWatchdog: Executing child with pid '"
+          << getpid() << "' and parent '" << parent
+          << "'.\n" << logofs_flush;
+  #endif
+
+  SystemCleanup("NXTransWatchdog");
+
+  //
+  // Get rid of unused resources.
+  //
+
+  MemoryCleanup("NXTransWatchdog");
+
+  //
+  // Run until the timeout is expired
+  // or forever, if no timeout is
+  // provided.
+  //
+
+  T_timestamp startTs = getTimestamp();
+
+  int diffTs = 0;
+
+  for (;;)
+  {
+    //
+    // Complain if the parent is dead.
+    //
+
+    if (CheckParent("NXTransWatchdog", "watchdog", parent) == 0)
+    {
+      #ifdef TEST
+      *logofs << "NXTransWatchdog: Exiting with no parent "
+              << "running.\n" << logofs_flush;
+      #endif
+
+      HandleCleanup();
+    }
+
+    if (timeout > 0)
+    {
+      if (diffTs >= timeout)
+      {
+        #ifdef TEST
+        *logofs << "NXTransWatchdog: Timeout of " << timeout
+                << " Ms raised in watchdog.\n" << logofs_flush;
+        #endif
+
+        //
+        // We will just exit. Our parent should be
+        // monitoring us and detect that the process
+        // is gone.
+        //
+
+        HandleCleanup();
+      }
+    }
+
+    if (timeout > 0)
+    {
+      #ifdef TEST
+      *logofs << "NXTransWatchdog: Waiting for the timeout "
+              << "with " << timeout - diffTs << " Ms to run.\n"
+              << logofs_flush;
+      #endif
+
+      usleep((timeout - diffTs) * 1000);
+
+      diffTs = diffTimestamp(startTs, getNewTimestamp());
+    }
+    else
+    {
+      #ifdef TEST
+      *logofs << "NXTransWatchdog: Waiting for a signal.\n"
+              << logofs_flush;
+      #endif
+
+      sleep(10);
+    }
+  }
+
+  //
+  // Hopefully useless.
+  //
+
+  exit(0);
+}
+
+int NXTransKeeperHandler(int signal)
+{
+  if (keeper != NULL)
+  {
+    switch (signal)
+    {
+      case SIGTERM:
+      case SIGINT:
+      case SIGHUP:
+      {
+        #ifdef TEST
+        *logofs << "NXTransKeeperHandler: Requesting giveup "
+                << "because of signal " << signal << " ,'"
+                << DumpSignal(signal) << "'.\n"
+                << logofs_flush;
+        #endif
+
+        keeper -> setSignal(signal);
+
+        return 0;
+      }
+    }
+  }
+
+  return 1;
+}
+
+void NXTransKeeperCheck()
+{
+  if (CheckParent("NXTransKeeper", "keeper",
+          keeper -> getParent()) == 0 || keeper -> getSignal() != 0)
+  {
+    #ifdef TEST
+    *logofs << "NXTransKeeperCheck: Exiting because of signal "
+            << "or no parent running.\n" << logofs_flush;
+    #endif
+
+    HandleCleanup();
+  }
+}
+
+int NXTransKeeper(int caches, int images, const char *root)
+{
+  //
+  // Be sure log file is valid.
+  //
+
+  if (logofs == NULL)
+  {
+    logofs = &cerr;
+  }
+
+  if (caches == 0 && images == 0)
+  {
+    #ifdef TEST
+    *logofs << "NXTransKeeper: No NX cache house-keeping needed.\n"
+            << logofs_flush;
+    #endif
+
+    return 0;
+  }
+
+  int pid;
+
+  #ifdef TEST
+  *logofs << "NXTransKeeper: Going to fork with NX pid '"
+          << getpid() << "'.\n" << logofs_flush;
+  #endif
+
+  pid = Fork();
+
+  if (pid != 0)
+  {
+    if (pid < 0)
+    {
+      #ifdef TEST
+      *logofs << "NXTransKeeper: WARNING! Function fork failed. "
+              << "Error is " << EGET() << " '" << ESTR()
+              << "'.\n" << logofs_flush;
+      #endif
+
+      cerr << "Warning" << ": Function fork failed. "
+           << "Error is " << EGET() << " '" << ESTR()
+           << "'.\n";
+    }
+    #ifdef TEST
+    else
+    {
+      *logofs << "NXTransKeeper: Created NX keeper process "
+              << "with pid '" << pid << "'.\n"
+              << logofs_flush;
+    }
+    #endif
+
+    return pid;
+  }
+
+  int parent = getppid();
+
+  #ifdef TEST
+  *logofs << "NXTransKeeper: Executing child with pid '"
+          << getpid() << "' and parent '" << parent
+          << "'.\n" << logofs_flush;
+  #endif
+
+  SystemCleanup("NXTransKeeper");
+
+  #ifdef TEST
+  *logofs << "NXTransKeeper: Going to run with caches " << caches
+          << " images " << images << " and root " << root
+          << " at " << strMsTimestamp() << ".\n" << logofs_flush;
+  #endif
+
+  //
+  // Create the house-keeper class.
+  //
+
+  int timeout = control -> KeeperTimeout;
+
+  keeper = new Keeper(caches, images, root, 100, parent);
+
+  handler = NXTransKeeperHandler;
+
+  if (keeper == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "NXTransKeeper: PANIC! Failed to create the keeper object.\n"
+            << logofs_flush;
+     #endif
+
+     cerr << "Error" << ": Failed to create the keeper object.\n";
+
+     HandleCleanup();
+  }
+
+  //
+  // Get rid of unused resources. Root path
+  // must be copied in keeper's constructor
+  // before control is deleted.
+  //
+  
+  MemoryCleanup("NXTransKeeper");
+
+  //
+  // Decrease the priority of this process.
+  //
+  // The following applies to Cygwin: "Cygwin processes can be 
+  // set to IDLE_PRIORITY_CLASS, NORMAL_PRIORITY_CLASS, HIGH_-
+  // PRIORITY_CLASS, or REALTIME_PRIORITY_CLASS with the nice
+  // call. If you pass a positive number to nice(), then the
+  // priority level will decrease by one (within the above list
+  // of priorities). A negative number would make it increase
+  // by one. It is not possible to change it by more than one
+  // at a time without making repeated calls".
+  //
+
+  if (nice(5) < 0 && errno != 0)
+  {
+    #ifdef WARNING
+    *logofs << "NXTransKeeper: WARNING! Failed to renice process to +5. "
+            << "Error is " << EGET() << " '" << ESTR()
+            << "'.\n" << logofs_flush;
+     #endif
+
+     cerr << "Warning" << ": Failed to renice process to +5. "
+          << "Error is " << EGET() << " '" << ESTR()
+          << "'.\n";
+  }
+
+  //
+  // Delay a bit the first run to give
+  // a boost to the session startup.
+  //
+
+  #ifdef TEST
+  *logofs << "NXTransKeeper: Going to sleep for "
+          << timeout / 20 << " Ms.\n" << logofs_flush;
+  #endif
+
+  usleep(timeout / 20 * 1000);
+
+  NXTransKeeperCheck();
+
+  //
+  // The house keeping of the persistent
+  // caches is performed only once.
+  //
+
+  if (caches != 0)
+  {
+    #ifdef TEST
+    *logofs << "NXTransKeeper: Going to cleanup the NX cache "
+            << "directories at " << strMsTimestamp() << ".\n"
+            << logofs_flush;
+    #endif
+
+    keeper -> cleanupCaches();
+
+    #ifdef TEST
+    *logofs << "NXTransKeeper: Completed cleanup of NX cache "
+            << "directories at " << strMsTimestamp() << ".\n"
+            << logofs_flush;
+    #endif
+  }
+  #ifdef TEST
+  else
+  {
+    *logofs << "NXTransKeeper: Nothing to do for the "
+            << "persistent caches.\n" << logofs_flush;
+  }
+  #endif
+
+  if (images == 0)
+  {
+    #ifdef TEST
+    *logofs << "NXTransKeeper: Nothing to do for the "
+            << "persistent images.\n" << logofs_flush;
+    #endif
+
+    HandleCleanup();
+  }
+
+  //
+  // Take care of the persisten image cache.
+  // Run a number of iterations and then exit,
+  // so we can keep the memory consumption
+  // low. The parent will check our exit code
+  // and will eventually restart us.
+  //
+
+  for (int iterations = 0; iterations < 100; iterations++)
+  {
+    #ifdef TEST
+    *logofs << "NXTransKeeper: Running iteration " << iterations
+            << " at " << strMsTimestamp() << ".\n"
+            << logofs_flush;
+    #endif
+
+    NXTransKeeperCheck();
+
+    #ifdef TEST
+    *logofs << "NXTransKeeper: Going to cleanup the NX images "
+            << "directories at " << strMsTimestamp() << ".\n"
+            << logofs_flush;
+    #endif
+
+    if (keeper -> cleanupImages() < 0)
+    {
+      #ifdef TEST
+      *logofs << "NXTransKeeper: Exiting because of error "
+              << "handling the image cache.\n" << logofs_flush;
+      #endif
+
+      HandleCleanup();
+    }
+
+    #ifdef TEST
+    *logofs << "NXTransKeeper: Completed cleanup of NX images "
+            << "directories at " << strMsTimestamp() << ".\n"
+            << logofs_flush;
+    #endif
+
+    NXTransKeeperCheck();
+
+    #ifdef TEST
+    *logofs << "NXTransKeeper: Going to sleep for " << timeout
+            << " Ms.\n" << logofs_flush;
+    #endif
+
+    usleep(timeout * 1000);
+  }
+
+  HandleCleanup(2);
+
+  //
+  // Hopefully useless.
+  //
+
+  exit(0);
+}
+
+void SystemCleanup(const char *name)
+{
+  #ifdef TEST
+  *logofs << name << ": Performing system cleanup in process "
+          << "with pid '" << getpid() << "'.\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // Reinstall signals that might
+  // have been restored by agents.
+  //
+
+  InstallSignals();
+}
+
+void MemoryCleanup(const char *name)
+{
+  #ifdef TEST
+  *logofs << name << ": Performing memory cleanup in process "
+          << "with pid '" << getpid() << "'.\n"
+          << logofs_flush;
+  #endif
+
+  DisableSignals();
+
+  //
+  // Prevent deletion of unix socket
+  // and lock file.
+  //
+
+  useUnixSocket = 0;
+
+  //
+  // Don't let cleanup kill other
+  // children.
+  //
+
+  lastDialog   = 0;
+  lastWatchdog = 0;
+  lastKeeper   = 0;
+
+  CleanupListeners();
+
+  CleanupSockets();
+
+  CleanupGlobal();
+
+  EnableSignals();
+}
+
+int UnsetEnv(const char *name)
+{
+  int result;
+
+  #ifdef __sun
+
+  char **pEnv = environ;
+
+  int nameLen = strlen(name) + 1;
+
+  char *varName = new char[nameLen + 1];
+
+  strcpy(varName, name);
+
+  strcat(varName, "=");
+
+  pEnv = environ;
+
+  while (*pEnv != NULL)
+  {
+    if (!strncmp(varName, *pEnv, nameLen))
+    {
+      break;
+    }
+
+    *pEnv++;
+  }
+
+  while (*pEnv != NULL)
+  {
+    *pEnv = *(pEnv + 1);
+
+    pEnv++;
+  }
+
+  result = 0;
+
+  #else
+
+  #ifdef __APPLE__
+
+  unsetenv(name);
+  result = 0;
+
+  #else
+
+  result = unsetenv(name);
+
+  #endif
+
+  #endif
+
+  return result;
+}
diff --git a/nxcomp/src/ClearArea.cpp b/nxcomp/src/ClearArea.cpp
new file mode 100644
index 000000000..0cb152d95
--- /dev/null
+++ b/nxcomp/src/ClearArea.cpp
@@ -0,0 +1,125 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "ClearArea.h"
+
+#include "ClientCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Here are the methods to handle messages' content.
+//
+
+int ClearAreaStore::parseIdentity(Message *message, const unsigned char *buffer,
+                                      unsigned int size, int bigEndian) const
+{
+  ClearAreaMessage *clearArea = (ClearAreaMessage *) message;
+
+  //
+  // Here is the fingerprint.
+  //
+
+  clearArea -> exposures = *(buffer + 1); 
+
+  clearArea -> window = GetULONG(buffer + 4, bigEndian); 
+
+  clearArea -> x      = GetUINT(buffer + 8, bigEndian);
+  clearArea -> y      = GetUINT(buffer + 10, bigEndian);
+  clearArea -> width  = GetUINT(buffer + 12, bigEndian);
+  clearArea -> height = GetUINT(buffer + 14, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsed Identity for message at " << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int ClearAreaStore::unparseIdentity(const Message *message, unsigned char *buffer,
+                                        unsigned int size, int bigEndian) const
+{
+  ClearAreaMessage *clearArea = (ClearAreaMessage *) message;
+
+  //
+  // Fill all the message's fields.
+  //
+
+  *(buffer + 1) = clearArea -> exposures;
+
+  PutULONG(clearArea -> window, buffer + 4, bigEndian);
+
+  PutUINT(clearArea -> x,      buffer + 8, bigEndian);
+  PutUINT(clearArea -> y,      buffer + 10, bigEndian);
+  PutUINT(clearArea -> width,  buffer + 12, bigEndian);
+  PutUINT(clearArea -> height, buffer + 14, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsed identity for message at " << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void ClearAreaStore::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  ClearAreaMessage *clearArea = (ClearAreaMessage *) message;
+
+  *logofs << name() << ": Identity exposures " << (unsigned int) clearArea -> exposures 
+          << ", window " << clearArea -> window  << ", x " << clearArea -> x 
+          << ", y " << clearArea -> y << ", width  " << clearArea -> width 
+          << ", height " << clearArea -> height << ", size " << clearArea -> size_ 
+          << ".\n";
+
+  #endif
+}
+
+void ClearAreaStore::identityChecksum(const Message *message, const unsigned char *buffer,
+                                          unsigned int size, int bigEndian) const
+{
+  md5_append(md5_state_, buffer + 1,  1);
+  md5_append(md5_state_, buffer + 4,  4);
+  md5_append(md5_state_, buffer + 8,  2);
+  md5_append(md5_state_, buffer + 10, 2);
+  md5_append(md5_state_, buffer + 12, 2);
+  md5_append(md5_state_, buffer + 14, 2);
+}
diff --git a/nxcomp/src/ClearArea.h b/nxcomp/src/ClearArea.h
new file mode 100644
index 000000000..8067edffd
--- /dev/null
+++ b/nxcomp/src/ClearArea.h
@@ -0,0 +1,182 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef ClearArea_H
+#define ClearArea_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+
+#define CLEARAREA_ENABLE_CACHE               1
+#define CLEARAREA_ENABLE_DATA                0
+#define CLEARAREA_ENABLE_SPLIT               0
+#define CLEARAREA_ENABLE_COMPRESS            0
+
+#define CLEARAREA_DATA_LIMIT                 0
+#define CLEARAREA_DATA_OFFSET                16
+
+#define CLEARAREA_CACHE_SLOTS                3000
+#define CLEARAREA_CACHE_THRESHOLD            5
+#define CLEARAREA_CACHE_LOWER_THRESHOLD      1
+
+//
+// The message class.
+//
+
+class ClearAreaMessage : public Message
+{
+  friend class ClearAreaStore;
+
+  public:
+
+  ClearAreaMessage()
+  {
+  }
+
+  ~ClearAreaMessage()
+  {
+  }
+
+  //
+  // Put here the fields which constitute 
+  // the 'identity' part of the message.
+  //
+
+  private:
+
+  unsigned char  exposures;
+  unsigned int   window;
+  unsigned short x;
+  unsigned short y;
+  unsigned short width;
+  unsigned short height;
+};
+
+class ClearAreaStore : public MessageStore
+{
+  //
+  // Constructors and destructors.
+  //
+
+  public:
+
+  ClearAreaStore() : MessageStore()
+  {
+    enableCache    = CLEARAREA_ENABLE_CACHE;
+    enableData     = CLEARAREA_ENABLE_DATA;
+    enableSplit    = CLEARAREA_ENABLE_SPLIT;
+    enableCompress = CLEARAREA_ENABLE_COMPRESS;
+
+    dataLimit  = CLEARAREA_DATA_LIMIT;
+    dataOffset = CLEARAREA_DATA_OFFSET;
+
+    cacheSlots          = CLEARAREA_CACHE_SLOTS;
+    cacheThreshold      = CLEARAREA_CACHE_THRESHOLD;
+    cacheLowerThreshold = CLEARAREA_CACHE_LOWER_THRESHOLD;
+
+    messages_ -> resize(cacheSlots);
+
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      *i = NULL;
+    }
+
+    temporary_ = NULL;
+  }
+
+  virtual ~ClearAreaStore()
+  {
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      destroy(*i);
+    }
+
+    destroy(temporary_);
+  }
+
+  virtual const char *name() const
+  {
+    return "ClearArea";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return X_ClearArea;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(ClearAreaMessage);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  public:
+
+  virtual Message *create() const
+  {
+    return new ClearAreaMessage();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new ClearAreaMessage((const ClearAreaMessage &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (ClearAreaMessage *) message;
+  }
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer,
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+                                    unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+};
+
+#endif /* ClearArea_H */
diff --git a/nxcomp/src/ClientCache.cpp b/nxcomp/src/ClientCache.cpp
new file mode 100644
index 000000000..47bb7db1d
--- /dev/null
+++ b/nxcomp/src/ClientCache.cpp
@@ -0,0 +1,392 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "ClientCache.h"
+
+ClientCache::ClientCache() :
+
+  freeGCCache(16), freeDrawableCache(16), freeWindowCache(16),
+
+  cursorCache(16), colormapCache(16), visualCache(16), lastFont(0),
+
+  changePropertyPropertyCache(16), changePropertyTypeCache(16),
+  changePropertyData32Cache(16),
+
+  configureWindowBitmaskCache(4),
+
+  convertSelectionRequestorCache(16),
+  convertSelectionLastTimestamp(0),
+
+  copyPlaneBitPlaneCache(8),
+
+  createGCBitmaskCache(8),
+
+  createPixmapIdCache(16), createPixmapLastId(0),
+  createPixmapXCache(8), createPixmapYCache(8),
+
+  createWindowBitmaskCache(8),
+
+  fillPolyNumPointsCache(8), fillPolyIndex(0),
+
+  getSelectionOwnerSelectionCache(8),
+
+  grabButtonEventMaskCache(8), grabButtonConfineCache(8),
+  grabButtonModifierCache(8),
+
+  grabKeyboardLastTimestamp(0),
+
+  imageTextLengthCache(8),
+  imageTextLastX(0), imageTextLastY(0),
+  imageTextCacheX(8), imageTextCacheY(8),
+
+  polySegmentCacheX(8), polySegmentCacheY(8), polySegmentCacheIndex(0),
+
+  polyTextLastX(0), polyTextLastY(0), polyTextCacheX(8),
+  polyTextCacheY(8), polyTextFontCache(8),
+
+  putImageWidthCache(8), putImageHeightCache(8), putImageLastX(0),
+  putImageLastY(0), putImageXCache(8), putImageYCache(8),
+
+  getImagePlaneMaskCache(8),
+
+  queryColorsLastPixel(0),
+
+  setClipRectanglesXCache(8), setClipRectanglesYCache(8),
+
+  setDashesLengthCache(8), setDashesOffsetCache(8),
+
+  setSelectionOwnerCache(8), setSelectionOwnerTimestampCache(8),
+
+  translateCoordsSrcCache(8), translateCoordsDstCache(8),
+  translateCoordsXCache(8), translateCoordsYCache(8),
+
+  sendEventMaskCache(16), sendEventLastSequence(0),
+  sendEventIntDataCache(16),
+
+  putPackedImageSrcLengthCache(16), putPackedImageDstLengthCache(16),
+
+  //
+  // RenderExtension requests.
+  //
+
+  renderFreePictureCache(16),
+
+  renderGlyphSetCache(16),
+  renderFreeGlyphSetCache(16),
+
+  renderIdCache(8),
+
+  renderLengthCache(16), renderFormatCache(16),
+  renderValueMaskCache(8), renderNumGlyphsCache(8),
+
+  renderXCache(16), renderYCache(16),
+  renderLastX(0), renderLastY(0),
+
+  renderWidthCache(16), renderHeightCache(16),
+
+  renderLastId(0),
+
+  renderGlyphXCache(16), renderGlyphYCache(16),
+  renderGlyphX(0), renderGlyphY(0),
+
+  renderLastCompositeGlyphsData(0),
+
+  setCacheParametersCache(8),
+
+  lastIdCache(16), lastId(0)
+
+{
+  unsigned int i;
+
+  for (i = 0; i < 3; i++)
+  {
+    allocColorRGBCache[i] = new IntCache(8);
+
+    convertSelectionAtomCache[i] = new IntCache(8);
+  }
+
+  for (i = 0; i < 4; i++)
+  {
+    clearAreaGeomCache[i] = new IntCache(8);
+  }
+
+  for (i = 0; i < 7; i++)
+  {
+    configureWindowAttrCache[i] = new IntCache(8);
+  }
+
+  for (i = 0; i < 6; i++)
+  {
+    copyAreaGeomCache[i] = new IntCache(8);
+    copyPlaneGeomCache[i] = new IntCache(8);
+  }
+
+  for (i = 0; i < 23; i++)
+  {
+    if (CREATEGC_FIELD_WIDTH[i] > 16)
+    {
+      createGCAttrCache[i] = new IntCache(16);
+    }
+    else
+    {
+      createGCAttrCache[i] = new IntCache(CREATEGC_FIELD_WIDTH[i]);
+    }
+  }
+
+  for (i = 0; i < 6; i++)
+  {
+    createWindowGeomCache[i] = new IntCache(8);
+  }
+
+  for (i = 0; i < 15; i++)
+  {
+    createWindowAttrCache[i] = new IntCache(8);
+  }
+
+  for (i = 0; i < 10; i++)
+  {
+    fillPolyXRelCache[i] = new IntCache(8);
+    fillPolyXAbsCache[i] = new IntCache(8);
+    fillPolyYRelCache[i] = new IntCache(8);
+    fillPolyYAbsCache[i] = new IntCache(8);
+  }
+
+  for (i = 0; i < 8; i++)
+  {
+    fillPolyRecentX[i] = 0;
+    fillPolyRecentY[i] = 0;
+  }
+
+  for (i = 0; i < 4; i++)
+  {
+    polyFillRectangleCacheX[i] = new IntCache(8);
+    polyFillRectangleCacheY[i] = new IntCache(8);
+    polyFillRectangleCacheWidth[i] = new IntCache(8);
+    polyFillRectangleCacheHeight[i] = new IntCache(8);
+  }
+
+  for (i = 0; i < 2; i++)
+  {
+    polyLineCacheX[i] = new IntCache(8);
+    polyLineCacheY[i] = new IntCache(8);
+  }
+
+  for (i = 0; i < 2; i++)
+  {
+    polyPointCacheX[i] = new IntCache(8);
+    polyPointCacheY[i] = new IntCache(8);
+  }
+
+  for (i = 0; i < 4; i++)
+  {
+    polyRectangleGeomCache[i] = new IntCache(8);
+  }
+
+  for (i = 0; i < 2; i++)
+  {
+    polySegmentLastX[i] = 0;
+    polySegmentLastY[i] = 0;
+  }
+
+  for (i = 0; i < 4; i++)
+  {
+    setClipRectanglesGeomCache[i] = new IntCache(8);
+  }
+
+  for (i = 0; i < 2; i++)
+  {
+    polyFillArcCacheX[i] = new IntCache(8);
+    polyFillArcCacheY[i] = new IntCache(8);
+    polyFillArcCacheWidth[i] = new IntCache(8);
+    polyFillArcCacheHeight[i] = new IntCache(8);
+    polyFillArcCacheAngle1[i] = new IntCache(8);
+    polyFillArcCacheAngle2[i] = new IntCache(8);
+  }
+
+  for (i = 0; i < 2; i++)
+  {
+    polyArcCacheX[i] = new IntCache(8);
+    polyArcCacheY[i] = new IntCache(8);
+    polyArcCacheWidth[i] = new IntCache(8);
+    polyArcCacheHeight[i] = new IntCache(8);
+    polyArcCacheAngle1[i] = new IntCache(8);
+    polyArcCacheAngle2[i] = new IntCache(8);
+  }
+
+  for (i = 0; i < 8; i++)
+  {
+    shapeDataCache[i] = new IntCache(8);
+  }
+
+  for (i = 0; i < 8; i++)
+  {
+    genericRequestDataCache[i] = new IntCache(8);
+  }
+
+  for (i = 0; i < 16; i++)
+  {
+    renderDataCache[i] = new IntCache(16);
+  }
+
+  for (i = 0; i < 16; i++)
+  {
+    renderCompositeGlyphsDataCache[i] = new IntCache(16);
+  }
+
+  for (i = 0; i < 3; i++)
+  {
+    renderCompositeDataCache[i] = new IntCache(16);
+  }
+}
+
+
+ClientCache::~ClientCache()
+{
+  unsigned int i;
+
+  for (i = 0; i < 3; i++)
+  {
+    delete allocColorRGBCache[i];
+    delete convertSelectionAtomCache[i];
+  }
+
+  for (i = 0; i < 4; i++)
+  {
+    delete clearAreaGeomCache[i];
+  }
+
+  for (i = 0; i < 7; i++)
+  {
+    delete configureWindowAttrCache[i];
+  }
+
+  for (i = 0; i < 6; i++)
+  {
+    delete copyAreaGeomCache[i];
+    delete copyPlaneGeomCache[i];
+  }
+
+  for (i = 0; i < 23; i++)
+  {
+    delete createGCAttrCache[i];
+  }
+
+  for (i = 0; i < 6; i++)
+  {
+    delete createWindowGeomCache[i];
+  }
+
+  for (i = 0; i < 15; i++)
+  {
+    delete createWindowAttrCache[i];
+  }
+
+  for (i = 0; i < 10; i++)
+  {
+    delete fillPolyXRelCache[i];
+    delete fillPolyXAbsCache[i];
+    delete fillPolyYRelCache[i];
+    delete fillPolyYAbsCache[i];
+  }
+
+  for (i = 0; i < 4; i++)
+  {
+    delete polyFillRectangleCacheX[i];
+    delete polyFillRectangleCacheY[i];
+    delete polyFillRectangleCacheWidth[i];
+    delete polyFillRectangleCacheHeight[i];
+  }
+
+  for (i = 0; i < 2; i++)
+  {
+    delete polyLineCacheX[i];
+    delete polyLineCacheY[i];
+  }
+
+  for (i = 0; i < 2; i++)
+  {
+    delete polyPointCacheX[i];
+    delete polyPointCacheY[i];
+  }
+
+  for (i = 0; i < 4; i++)
+  {
+    delete polyRectangleGeomCache[i];
+  }
+
+  for (i = 0; i < 4; i++)
+  {
+    delete setClipRectanglesGeomCache[i];
+  }
+
+  for (i = 0; i < 2; i++)
+  {
+    delete polyFillArcCacheX[i];
+    delete polyFillArcCacheY[i];
+    delete polyFillArcCacheWidth[i];
+    delete polyFillArcCacheHeight[i];
+    delete polyFillArcCacheAngle1[i];
+    delete polyFillArcCacheAngle2[i];
+  }
+
+  for (i = 0; i < 2; i++)
+  {
+    delete polyArcCacheX[i];
+    delete polyArcCacheY[i];
+    delete polyArcCacheWidth[i];
+    delete polyArcCacheHeight[i];
+    delete polyArcCacheAngle1[i];
+    delete polyArcCacheAngle2[i];
+  }
+
+  for (i = 0; i < 8; i++)
+  {
+    delete shapeDataCache[i];
+  }
+
+  for (i = 0; i < 8; i++)
+  {
+    delete genericRequestDataCache[i];
+  }
+
+  for (i = 0; i < 16; i++)
+  {
+    delete renderDataCache[i];
+  }
+
+  for (i = 0; i < 16; i++)
+  {
+    delete renderCompositeGlyphsDataCache[i];
+  }
+
+  for (i = 0; i < 3; i++)
+  {
+    delete renderCompositeDataCache[i];
+  }
+}
diff --git a/nxcomp/src/ClientCache.h b/nxcomp/src/ClientCache.h
new file mode 100644
index 000000000..ed3361097
--- /dev/null
+++ b/nxcomp/src/ClientCache.h
@@ -0,0 +1,417 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef ClientCache_H
+#define ClientCache_H
+
+#include "Misc.h"
+
+#include "IntCache.h"
+#include "CharCache.h"
+#include "OpcodeCache.h"
+#include "XidCache.h"
+#include "FreeCache.h"
+
+#include "ChannelCache.h"
+
+class ClientCache : public ChannelCache
+{
+  public:
+
+  ClientCache();
+
+  ~ClientCache();
+
+  //
+  // Opcode prediction caches.
+  //
+
+  OpcodeCache opcodeCache;
+
+  //
+  // GC and drawables caches.
+  //
+
+  XidCache gcCache;
+  FreeCache freeGCCache;
+
+  XidCache drawableCache;
+  FreeCache freeDrawableCache;
+
+  XidCache windowCache;
+  FreeCache freeWindowCache;
+
+  //
+  // General-purpose caches.
+  //
+
+  IntCache cursorCache;
+  IntCache colormapCache;
+  IntCache visualCache;
+  CharCache depthCache;
+  CharCache resourceCache;
+  CharCache methodCache;
+
+  unsigned int lastFont;
+
+  //
+  // AllocColor request.
+  //
+
+  IntCache *allocColorRGBCache[3];
+
+  //
+  // ChangeProperty request.
+  //
+
+  CharCache changePropertyFormatCache;
+  IntCache changePropertyPropertyCache;
+  IntCache changePropertyTypeCache;
+  IntCache changePropertyData32Cache;
+
+  //
+  // ClearArea request.
+  //
+
+  IntCache *clearAreaGeomCache[4];
+
+  //
+  // ConfigureWindow request.
+  //
+
+  IntCache configureWindowBitmaskCache;
+  IntCache *configureWindowAttrCache[7];
+
+  //
+  // ConvertSelection request.
+  //
+
+  IntCache convertSelectionRequestorCache;
+  IntCache* convertSelectionAtomCache[3];
+  unsigned int convertSelectionLastTimestamp;
+
+  //
+  // CopyArea request.
+  //
+
+  IntCache *copyAreaGeomCache[6];
+
+  //
+  // CopyPlane request.
+  //
+
+  IntCache *copyPlaneGeomCache[6];
+  IntCache copyPlaneBitPlaneCache;
+
+  //
+  // CreateGC request.
+  //
+
+  IntCache createGCBitmaskCache;
+  IntCache *createGCAttrCache[23];
+
+  //
+  // CreatePixmap request.
+  //
+
+  IntCache createPixmapIdCache;
+  unsigned int createPixmapLastId;
+  IntCache createPixmapXCache;
+  IntCache createPixmapYCache;
+
+  //
+  // CreateWindow request.
+  //
+
+  IntCache *createWindowGeomCache[6];
+  IntCache createWindowBitmaskCache;
+  IntCache *createWindowAttrCache[15];
+
+  //
+  // FillPoly request.
+  //
+
+  IntCache fillPolyNumPointsCache;
+  IntCache *fillPolyXRelCache[10];
+  IntCache *fillPolyXAbsCache[10];
+  IntCache *fillPolyYRelCache[10];
+  IntCache *fillPolyYAbsCache[10];
+  unsigned int fillPolyRecentX[8];
+  unsigned int fillPolyRecentY[8];
+  unsigned int fillPolyIndex;
+
+  //
+  // GetSelectionOwner request.
+  //
+
+  IntCache getSelectionOwnerSelectionCache;
+
+  //
+  // GrabButton request (also used for GrabPointer).
+  //
+
+  IntCache grabButtonEventMaskCache;
+  IntCache grabButtonConfineCache;
+  CharCache grabButtonButtonCache;
+  IntCache grabButtonModifierCache;
+
+  //
+  // GrabKeyboard request.
+  //
+
+  unsigned int grabKeyboardLastTimestamp;
+
+  //
+  // ImageText8/16 request.
+  //
+
+  IntCache imageTextLengthCache;
+  unsigned int imageTextLastX;
+  unsigned int imageTextLastY;
+  IntCache imageTextCacheX;
+  IntCache imageTextCacheY;
+
+  //
+  // PolyFillRectangle request.
+  //
+
+  IntCache *polyFillRectangleCacheX[4];
+  IntCache *polyFillRectangleCacheY[4];
+  IntCache *polyFillRectangleCacheWidth[4];
+  IntCache *polyFillRectangleCacheHeight[4];
+
+  //
+  // PolyLine request.
+  //
+
+  IntCache *polyLineCacheX[2];
+  IntCache *polyLineCacheY[2];
+
+  //
+  // PolyPoint request.
+  //
+
+  IntCache *polyPointCacheX[2];
+  IntCache *polyPointCacheY[2];
+
+  //
+  // PolyRectangle request.
+  //
+
+  IntCache *polyRectangleGeomCache[4];
+
+  //
+  // PolySegment request.
+  //
+
+  IntCache polySegmentCacheX;
+  IntCache polySegmentCacheY;
+  unsigned int polySegmentLastX[2];
+  unsigned int polySegmentLastY[2];
+  unsigned int polySegmentCacheIndex;
+
+  //
+  // PolyText8/16 request.
+  //
+
+  unsigned int polyTextLastX;
+  unsigned int polyTextLastY;
+  IntCache polyTextCacheX;
+  IntCache polyTextCacheY;
+  IntCache polyTextFontCache;
+  CharCache polyTextDeltaCache;
+
+  //
+  // PutImage request.
+  //
+
+  IntCache putImageWidthCache;
+  IntCache putImageHeightCache;
+  unsigned int putImageLastX;
+  unsigned int putImageLastY;
+  IntCache putImageXCache;
+  IntCache putImageYCache;
+  CharCache putImageLeftPadCache;
+
+  //
+  // GetImage request.
+  //
+
+  IntCache getImagePlaneMaskCache;
+
+  //
+  // QueryColors request.
+  //
+
+  unsigned int queryColorsLastPixel;
+
+  //
+  // SetClipRectangles request.
+  //
+
+  IntCache setClipRectanglesXCache;
+  IntCache setClipRectanglesYCache;
+  IntCache *setClipRectanglesGeomCache[4];
+
+  //
+  // SetDashes request.
+  //
+
+  IntCache setDashesLengthCache;
+  IntCache setDashesOffsetCache;
+  CharCache setDashesDashCache_[2];
+
+  //
+  // SetSelectionOwner request.
+  //
+
+  IntCache setSelectionOwnerCache;
+  IntCache setSelectionOwnerTimestampCache;
+
+  //
+  // TranslateCoords request.
+  //
+
+  IntCache translateCoordsSrcCache;
+  IntCache translateCoordsDstCache;
+  IntCache translateCoordsXCache;
+  IntCache translateCoordsYCache;
+
+  //
+  // SendEvent request.
+  //
+
+  IntCache     sendEventMaskCache;
+  CharCache    sendEventCodeCache;
+  CharCache    sendEventByteDataCache;
+  unsigned int sendEventLastSequence;
+  IntCache     sendEventIntDataCache;
+  CharCache    sendEventEventCache;
+
+  //
+  // PolyFillArc request.
+  //
+
+  IntCache *polyFillArcCacheX[2];
+  IntCache *polyFillArcCacheY[2];
+  IntCache *polyFillArcCacheWidth[2];
+  IntCache *polyFillArcCacheHeight[2];
+  IntCache *polyFillArcCacheAngle1[2];
+  IntCache *polyFillArcCacheAngle2[2];
+
+  //
+  // PolyArc request.
+  //
+
+  IntCache *polyArcCacheX[2];
+  IntCache *polyArcCacheY[2];
+  IntCache *polyArcCacheWidth[2];
+  IntCache *polyArcCacheHeight[2];
+  IntCache *polyArcCacheAngle1[2];
+  IntCache *polyArcCacheAngle2[2];
+
+  //
+  // PutPackedImage request.
+  //
+
+  IntCache  putPackedImageSrcLengthCache;
+  IntCache  putPackedImageDstLengthCache;
+
+  //
+  // Shape extension requests.
+  //
+
+  CharCache shapeOpcodeCache;
+  IntCache  *shapeDataCache[8];
+
+  //
+  // Generic requests.
+  //
+
+  CharCache genericRequestOpcodeCache;
+  IntCache  *genericRequestDataCache[8];
+
+  //
+  // Render extension requests.
+  //
+
+  OpcodeCache renderOpcodeCache;
+
+  CharCache renderOpCache;
+
+  XidCache  renderSrcPictureCache;
+  XidCache  renderMaskPictureCache;
+  XidCache  renderDstPictureCache;
+  FreeCache renderFreePictureCache;
+
+  IntCache  renderGlyphSetCache;
+  FreeCache renderFreeGlyphSetCache;
+
+  IntCache renderIdCache;
+  IntCache renderLengthCache;
+  IntCache renderFormatCache;
+  IntCache renderValueMaskCache;
+  IntCache renderNumGlyphsCache;
+
+  IntCache renderXCache;
+  IntCache renderYCache;
+
+  unsigned int renderLastX;
+  unsigned int renderLastY;
+
+  IntCache renderWidthCache;
+  IntCache renderHeightCache;
+
+  unsigned int renderLastId;
+
+  IntCache *renderDataCache[16];
+
+  IntCache renderGlyphXCache;
+  IntCache renderGlyphYCache;
+
+  unsigned int renderGlyphX;
+  unsigned int renderGlyphY;
+
+  IntCache *renderCompositeGlyphsDataCache[16];
+  unsigned int renderLastCompositeGlyphsData;
+
+  IntCache *renderCompositeDataCache[3];
+
+  //
+  // SetCacheParameters request.
+  //
+
+  IntCache setCacheParametersCache;
+
+  //
+  // Encode new XID values based
+  // on the last value encoded.
+  //
+
+  IntCache lastIdCache;
+  unsigned int lastId;
+};
+
+#endif /* ClientCache_H */
diff --git a/nxcomp/src/ClientChannel.cpp b/nxcomp/src/ClientChannel.cpp
new file mode 100644
index 000000000..2a182e49f
--- /dev/null
+++ b/nxcomp/src/ClientChannel.cpp
@@ -0,0 +1,7881 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <string.h>
+
+#include <X11/X.h>
+#include <X11/Xatom.h>
+
+#include "NXproto.h"
+#include "NXrender.h"
+
+#include "ClientChannel.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+#include "StaticCompressor.h"
+
+#include "Statistics.h"
+#include "Proxy.h"
+
+#include "PutImage.h"
+#include "PutPackedImage.h"
+
+extern Proxy *proxy;
+
+//
+// Set the verbosity level. You also
+// need to define OPCODES in Misc.cpp
+// if you want literals instead of
+// opcodes' numbers.
+//
+
+#define PANIC
+#define WARNING
+#undef  OPCODES
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Log the important tracepoints related
+// to writing packets to the peer proxy.
+//
+
+#undef  FLUSH
+
+//
+// Log the operations related to splits.
+//
+
+#undef  SPLIT
+
+//
+// Define this to trace the invocations
+// of the agent's callbacks.
+//
+
+#undef  CALLBACK
+
+//
+// By defining this, a simple procedure is activated at
+// startup which just allocates and deallocates plenty
+// of cache objects. This is used to help determine the
+// current memory requirements.
+//
+
+#undef  MEMORY
+
+//
+// Inspects target of common X operations.
+//
+
+#undef  TARGETS
+
+#ifdef TARGETS
+
+#include <set>
+#include <map>
+
+typedef set < unsigned int, less<unsigned int> > T_windows;
+typedef set < unsigned int, less<unsigned int> > T_pixmaps;
+typedef map < unsigned int, unsigned int, less<unsigned int> > T_gcontexts;
+
+T_windows   windows;
+T_pixmaps   pixmaps;
+T_gcontexts gcontexts;
+
+#endif
+
+//
+// Define this to log when a channel
+// is created or destroyed.
+//
+
+#undef  REFERENCES
+
+//
+// Here are the static members.
+//
+
+#ifdef REFERENCES
+
+int ClientChannel::references_ = 0;
+
+#endif
+
+ClientChannel::ClientChannel(Transport *transport, StaticCompressor *compressor)
+
+  : Channel(transport, compressor), readBuffer_(transport_, this)
+{
+  //
+  // Sequence number of the next message
+  // being encoded or decoded.
+  //
+
+  clientSequence_ = 0;
+  serverSequence_ = 0;
+
+  //
+  // Current sequence known by NX agent.
+  //
+
+  lastSequence_ = 0;
+
+  //
+  // This is used to test the synchronous
+  // flush in the proxy.
+  //
+
+  lastRequest_ = 0;
+
+  //
+  // Store information about the images
+  // being streamed.
+  //
+
+  splitState_.resource = nothing;
+  splitState_.pending  = 0;
+  splitState_.commit   = 0;
+  splitState_.mode     = split_none;
+
+  //
+  // Number of outstanding tainted replies.
+  //
+
+  taintCounter_ = 0;
+
+  #ifdef MEMORY
+
+  *logofs << "ClientChannel: Created 1 ClientCache and 1 ServerCache. "
+          << "You have 30 seconds to check the allocated size.\n"
+          << logofs_flush;
+
+  sleep(30);
+
+  ClientCache *clientCacheTestArray[100];
+  ServerCache *serverCacheTestArray[100];
+
+  for (int i = 0; i < 100; i++)
+  {
+    clientCacheTestArray[i] = new ClientCache();
+  }
+
+  *logofs << "ClientChannel: Created further 100 ClientCache. "
+          << "You have 30 seconds to check the allocated size.\n"
+          << logofs_flush;
+
+  sleep(30);
+
+  for (int i = 0; i < 100; i++)
+  {
+    serverCacheTestArray[i] = new ServerCache();
+  }
+
+  *logofs << "ClientChannel: Created further 100 ServerCache. "
+          << "You have 30 seconds to check the allocated size.\n"
+          << logofs_flush;
+
+  sleep(30);
+
+  for (int i = 0; i < 100; i++)
+  {
+    delete clientCacheTestArray[i];
+    delete serverCacheTestArray[i];
+  }
+
+  *logofs << "ClientChannel: Deleted 100 ClientCache and 100 ServerCache. "
+          << "You have 30 seconds to check the allocated size.\n"
+          << logofs_flush;
+
+  sleep(30);
+
+  #endif
+
+  #ifdef REFERENCES
+  *logofs << "ClientChannel: Created new object at " 
+          << this << " for FD#" << fd_ << " out of " 
+          << ++references_ << " allocated channels.\n"
+          << logofs_flush;
+  #endif
+}
+
+ClientChannel::~ClientChannel()
+{
+  #ifdef REFERENCES
+  *logofs << "ClientChannel: Deleted object at " 
+          << this << " for FD#" << fd_ << " out of "
+          << --references_ << " allocated channels.\n"
+          << logofs_flush;
+  #endif
+}
+
+//
+// Beginning of handleRead().
+//
+
+int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *message,
+                                  unsigned int length)
+{
+  #ifdef TEST
+  *logofs << "handleRead: Called for FD#" << fd_
+          << " with " << encodeBuffer.getLength()
+          << " bytes already encoded.\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // Pointer to located message and
+  // its size in bytes.
+  //
+
+  const unsigned char *inputMessage;
+  unsigned int inputLength;
+
+  //
+  // Set when message is found in
+  // cache.
+  //
+
+  int hit;
+
+  //
+  // Check if we can borrow the buffer
+  // from the caller.
+  //
+
+  if (message != NULL && length != 0)
+  {
+    readBuffer_.readMessage(message, length);
+  }
+  else
+  {
+    //
+    // Get the data from the transport.
+    //
+
+    #if defined(TEST) || defined(INFO)
+    *logofs << "handleRead: Trying to read from FD#"
+            << fd_ << " at " << strMsTimestamp() << ".\n"
+            << logofs_flush;
+    #endif
+
+    int result = readBuffer_.readMessage();
+
+    #ifdef DEBUG
+    *logofs << "handleRead: Read result on FD#" << fd_
+            << " is " << result << ".\n"
+            << logofs_flush;
+    #endif
+
+    if (result < 0)
+    {
+      //
+      // Let the proxy close the channel.
+      //
+
+      return -1;
+    }
+    else if (result == 0)
+    {
+      #if defined(TEST) || defined(INFO)
+
+      *logofs << "handleRead: PANIC! No data read from FD#"
+              << fd_ << " while encoding messages.\n"
+              << logofs_flush;
+
+      HandleCleanup();
+
+      #endif
+
+      return 0;
+    }
+  }
+
+  #if defined(TEST) || defined(INFO) || defined(FLUSH)
+  *logofs << "handleRead: Encoding messages for FD#" << fd_
+          << " with " << readBuffer_.getLength() << " bytes "
+          << "in the buffer.\n" << logofs_flush;
+  #endif
+
+  //
+  // Extract any complete message which 
+  // is available in the buffer.
+  //
+
+  if (proxy -> handleAsyncSwitch(fd_) < 0)
+  {
+    return -1;
+  }
+
+  while ((inputMessage = readBuffer_.getMessage(inputLength)) != NULL)
+  {
+    hit = 0;
+ 
+    if (firstRequest_)
+    {
+      //
+      // Need to add the length of the first
+      // request as it was not present in
+      // previous versions.
+      //
+
+      // Since ProtoStep7 (#issue 108)
+      encodeBuffer.encodeValue(inputLength, 8);
+
+      for (unsigned int i = 0; i < inputLength; i++)
+      {
+        encodeBuffer.encodeValue((unsigned int) inputMessage[i], 8);
+      }
+
+      firstRequest_ = 0;
+
+      #if defined(TEST) || defined(OPCODES)
+
+      int bits = encodeBuffer.diffBits();
+
+      *logofs << "handleRead: Handled first request. " << inputLength
+              << " bytes in, " << bits << " bits (" << ((float) bits) / 8
+              << " bytes) out.\n" << logofs_flush;
+      #endif
+
+      priority_++;
+    }
+    else
+    {
+      //
+      // First of all we get the opcode.
+      //
+
+      unsigned char inputOpcode = *inputMessage;
+
+      #if defined(TEST) || defined(INFO)
+
+      //
+      // This is used to test the synchronous
+      // flush in the parent proxy.
+      //
+
+      lastRequest_ = inputOpcode;
+
+      #endif
+
+      //
+      // Check if the request is supported by the
+      // remote. If not, only handle it locally and
+      // taint the opcode as a X_NoOperation. Also
+      // try to short-circuit some replies at this
+      // side. XSync requests, for example, weight
+      // for half of the total round-trips.
+      //
+
+      if (handleTaintRequest(inputOpcode, inputMessage,
+                                 inputLength) < 0)
+      {
+        return -1;
+      }
+
+      encodeBuffer.encodeOpcodeValue(inputOpcode, clientCache_ -> opcodeCache);
+
+      //
+      // Update the current sequence.
+      //
+
+      clientSequence_++;
+      clientSequence_ &= 0xffff;
+
+      #ifdef DEBUG
+      *logofs << "handleRead: Last client sequence number for FD#" 
+              << fd_ << " is " << clientSequence_ << ".\n"
+              << logofs_flush;
+      #endif
+
+      //
+      // If differential compression is disabled
+      // then use the most simple encoding.
+      //
+
+      if (control -> LocalDeltaCompression == 0)
+      {
+        int result = handleFastReadRequest(encodeBuffer, inputOpcode,
+                                               inputMessage, inputLength);
+        if (result < 0)
+        {
+          return -1;
+        }
+        else if (result > 0)
+        {
+          continue;
+        }
+      }
+
+      //
+      // Go to the message's specific encoding.
+      //
+
+      switch (inputOpcode)
+      {
+      case X_AllocColor:
+        {
+          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), 29,
+                             clientCache_ -> colormapCache);
+          const unsigned char *nextSrc = inputMessage + 8;
+          unsigned int colorData[3];
+          for (unsigned int i = 0; i < 3; i++)
+          {
+            unsigned int value = GetUINT(nextSrc, bigEndian_);
+            encodeBuffer.encodeCachedValue(value, 16,
+                               *(clientCache_ -> allocColorRGBCache[i]), 4);
+            colorData[i] = value;
+            nextSrc += 2;
+          }
+
+          sequenceQueue_.push(clientSequence_, inputOpcode,
+                                  colorData[0], colorData[1], colorData[2]);
+
+          priority_++;
+        }
+        break;
+      case X_ReparentWindow:
+        {
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
+                             clientCache_ -> windowCache);
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8, bigEndian_),
+                             clientCache_ -> windowCache);
+          encodeBuffer.encodeValue(GetUINT(inputMessage + 12, bigEndian_), 16, 11);
+          encodeBuffer.encodeValue(GetUINT(inputMessage + 14, bigEndian_), 16, 11);
+        }
+        break;
+      case X_ChangeProperty:
+        {
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_ChangeProperty);
+
+          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
+                                     inputMessage, inputLength))
+          {
+            hit = 1;
+
+            break;
+          }
+
+          unsigned char format = inputMessage[16];
+          encodeBuffer.encodeCachedValue(format, 8,
+                             clientCache_ -> changePropertyFormatCache);
+          unsigned int dataLength = GetULONG(inputMessage + 20, bigEndian_);
+          encodeBuffer.encodeValue(dataLength, 32, 6);
+          encodeBuffer.encodeValue(inputMessage[1], 2);
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
+                             clientCache_ -> windowCache);
+          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_), 29,
+                             clientCache_ -> changePropertyPropertyCache, 9);
+          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 12, bigEndian_), 29,
+                             clientCache_ -> changePropertyTypeCache, 9);
+          const unsigned char *nextSrc = inputMessage + 24;
+          if (format == 8)
+          {
+            // Since ProtoStep7 (#issue 108)
+            encodeBuffer.encodeTextData(nextSrc, dataLength);
+          }
+          else if (format == 32)
+          {
+            for (unsigned int i = 0; i < dataLength; i++)
+            {
+              encodeBuffer.encodeCachedValue(GetULONG(nextSrc, bigEndian_), 32,
+                                 clientCache_ -> changePropertyData32Cache);
+              nextSrc += 4;
+            }
+          }
+          else
+          {
+            for (unsigned int i = 0; i < dataLength; i++)
+            {
+              encodeBuffer.encodeValue(GetUINT(nextSrc, bigEndian_), 16);
+              nextSrc += 2;
+            }
+          }
+        }
+        break;
+      case X_SendEvent:
+        {
+          //
+          // TODO: This can be improved. In the worst
+          // cases, it appears to provide a poor 1.6:1
+          // ratio.
+          //
+
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_SendEvent);
+
+          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
+                                     inputMessage, inputLength))
+          {
+            hit = 1;
+
+            break;
+          }
+
+          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]);
+          unsigned int window = GetULONG(inputMessage + 4, bigEndian_);
+
+          if (window == 0 || window == 1)
+          {
+            encodeBuffer.encodeBoolValue(1);
+            encodeBuffer.encodeBoolValue(window);
+          }
+          else
+          {
+            encodeBuffer.encodeBoolValue(0);
+            encodeBuffer.encodeXidValue(window, clientCache_ -> windowCache);
+          }
+
+          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_), 32,
+                             clientCache_ -> sendEventMaskCache, 9);
+          encodeBuffer.encodeCachedValue(*(inputMessage + 12), 8, 
+                             clientCache_ -> sendEventCodeCache);
+          encodeBuffer.encodeCachedValue(*(inputMessage + 13), 8, 
+                             clientCache_ -> sendEventByteDataCache);
+
+          unsigned int newSeq = GetUINT(inputMessage + 14, bigEndian_);
+          unsigned int diffSeq = newSeq - clientCache_ -> sendEventLastSequence;
+          clientCache_ -> sendEventLastSequence = newSeq;
+          encodeBuffer.encodeValue(diffSeq, 16, 4);
+          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 16, bigEndian_), 32,
+                             clientCache_ -> sendEventIntDataCache);
+
+          for (unsigned int i = 20; i < 44; i++)
+          {
+            encodeBuffer.encodeCachedValue((unsigned int) inputMessage[i], 8,
+                               clientCache_ -> sendEventEventCache);
+          }
+        }
+        break;
+      case X_ChangeWindowAttributes:
+        {
+          encodeBuffer.encodeValue((inputLength - 12) >> 2, 4);
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
+                             clientCache_ -> windowCache);
+          unsigned int bitmask = GetULONG(inputMessage + 8, bigEndian_);
+          encodeBuffer.encodeCachedValue(bitmask, 15,
+                             clientCache_ -> createWindowBitmaskCache);
+          const unsigned char *nextSrc = inputMessage + 12;
+          unsigned int mask = 0x1;
+          for (unsigned int j = 0; j < 15; j++)
+          {
+            if (bitmask & mask)
+            {
+              encodeBuffer.encodeCachedValue(GetULONG(nextSrc, bigEndian_), 32,
+                                 *clientCache_ -> createWindowAttrCache[j]);
+              nextSrc += 4;
+            }
+            mask <<= 1;
+          }
+        }
+        break;
+      case X_ClearArea:
+        {
+          #ifdef TARGETS
+
+          unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
+
+          if (pixmaps.find(t_id) != pixmaps.end())
+          {
+            *logofs << "handleRead: X_ClearArea target id is pixmap "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else if (windows.find(t_id) != windows.end())
+          {
+            *logofs << "handleRead: X_ClearArea target id is window "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else
+          {
+            *logofs << "handleRead: X_ClearArea target id " << t_id
+                    << " is unrecognized.\n" << logofs_flush;
+          }
+
+          #endif
+
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_ClearArea);
+
+          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
+                                     inputMessage, inputLength))
+          {
+            hit = 1;
+
+            break;
+          }
+
+          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]);
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
+                             clientCache_ -> windowCache);
+          const unsigned char *nextSrc = inputMessage + 8;
+          for (unsigned int i = 0; i < 4; i++)
+          {
+            encodeBuffer.encodeCachedValue(GetUINT(nextSrc, bigEndian_), 16,
+                               *clientCache_ -> clearAreaGeomCache[i], 8);
+            nextSrc += 2;
+          }
+        }
+        break;
+      case X_CloseFont:
+        {
+          unsigned int font = GetULONG(inputMessage + 4, bigEndian_);
+          encodeBuffer.encodeValue(font - clientCache_ -> lastFont, 29, 5);
+          clientCache_ -> lastFont = font;
+        }
+        break;
+      case X_ConfigureWindow:
+        {
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_ConfigureWindow);
+
+          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
+                                     inputMessage, inputLength))
+          {
+            hit = 1;
+
+            break;
+          }
+
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
+                             clientCache_ -> windowCache);
+          unsigned int bitmask = GetUINT(inputMessage + 8, bigEndian_);
+          encodeBuffer.encodeCachedValue(bitmask, 7,
+                                  clientCache_ -> configureWindowBitmaskCache);
+          unsigned int mask = 0x1;
+          const unsigned char *nextSrc = inputMessage + 12;
+          for (unsigned int i = 0; i < 7; i++)
+          {
+            if (bitmask & mask)
+            {
+              encodeBuffer.encodeCachedValue(GetULONG(nextSrc, bigEndian_),
+                                 CONFIGUREWINDOW_FIELD_WIDTH[i],
+                                     *clientCache_ -> configureWindowAttrCache[i], 8);
+              nextSrc += 4;
+            }
+            mask <<= 1;
+          }
+        }
+        break;
+      case X_ConvertSelection:
+        {
+          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), 29,
+                             clientCache_ -> convertSelectionRequestorCache, 9);
+          const unsigned char* nextSrc = inputMessage + 8;
+          for (unsigned int i = 0; i < 3; i++)
+          {
+            encodeBuffer.encodeCachedValue(GetULONG(nextSrc, bigEndian_), 29,
+                               *(clientCache_ -> convertSelectionAtomCache[i]), 9);
+            nextSrc += 4;
+          }
+          unsigned int timestamp = GetULONG(nextSrc, bigEndian_);
+          encodeBuffer.encodeValue(timestamp -
+                             clientCache_ -> convertSelectionLastTimestamp, 32, 4);
+          clientCache_ -> convertSelectionLastTimestamp = timestamp;
+        }
+        break;
+      case X_CopyArea:
+        {
+          #ifdef TARGETS
+
+          unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
+
+          if (pixmaps.find(t_id) != pixmaps.end())
+          {
+            *logofs << "handleRead: X_CopyArea source id is pixmap "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else if (windows.find(t_id) != windows.end())
+          {
+            *logofs << "handleRead: X_CopyArea source id is window "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else
+          {
+            *logofs << "handleRead: X_CopyArea source id " << t_id
+                    << " is unrecognized.\n" << logofs_flush;
+          }
+
+          t_id = GetULONG(inputMessage + 8, bigEndian_);
+
+          if (pixmaps.find(t_id) != pixmaps.end())
+          {
+            *logofs << "handleRead: X_CopyArea target id is pixmap "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else if (windows.find(t_id) != windows.end())
+          {
+            *logofs << "handleRead: X_CopyArea target id is window "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else
+          {
+            *logofs << "handleRead: X_CopyArea target id " << t_id
+                    << " is unrecognized.\n" << logofs_flush;
+          }
+
+          #endif
+
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_CopyArea);
+
+          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
+                                     inputMessage, inputLength))
+          {
+            hit = 1;
+
+            break;
+          }
+
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
+                             bigEndian_), clientCache_ -> drawableCache);
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8,
+                             bigEndian_), clientCache_ -> drawableCache);
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 12,
+                             bigEndian_), clientCache_ -> gcCache);
+          const unsigned char *nextSrc = inputMessage + 16;
+          for (unsigned int i = 0; i < 6; i++)
+          {
+            encodeBuffer.encodeCachedValue(GetUINT(nextSrc, bigEndian_), 16,
+                               *clientCache_ -> copyAreaGeomCache[i], 8);
+            nextSrc += 2;
+          }
+        }
+        break;
+      case X_CopyGC:
+        {
+          #ifdef TARGETS
+
+          unsigned int s_g_id = GetULONG(inputMessage + 4, bigEndian_);
+          unsigned int d_g_id = GetULONG(inputMessage + 8, bigEndian_);
+
+          *logofs << "handleRead: X_CopyGC source gcontext id is " << s_g_id  
+                  << " destination gcontext id is " << d_g_id << ".\n" 
+                  << logofs_flush;
+
+          #endif
+
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
+                             bigEndian_), clientCache_ -> gcCache);
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8,
+                             bigEndian_), clientCache_ -> gcCache);
+          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 12,
+                             bigEndian_), 23, clientCache_ -> createGCBitmaskCache);
+        }
+        break;
+      case X_CopyPlane:
+        {
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
+                             bigEndian_), clientCache_ -> drawableCache);
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8,
+                             bigEndian_), clientCache_ -> drawableCache);
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 12,
+                             bigEndian_), clientCache_ -> gcCache);
+          const unsigned char *nextSrc = inputMessage + 16;
+          for (unsigned int i = 0; i < 6; i++)
+          {
+            encodeBuffer.encodeCachedValue(GetUINT(nextSrc, bigEndian_), 16,
+                               *clientCache_ -> copyPlaneGeomCache[i], 8);
+            nextSrc += 2;
+          }
+          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 28, bigEndian_), 32,
+                                         clientCache_ -> copyPlaneBitPlaneCache, 10);
+        }
+        break;
+      case X_CreateGC:
+        {
+          #ifdef TARGETS
+
+          unsigned int g_id = GetULONG(inputMessage + 4, bigEndian_);
+          unsigned int t_id = GetULONG(inputMessage + 8, bigEndian_);
+
+          if (pixmaps.find(t_id) != pixmaps.end())
+          {
+            *logofs << "handleRead: X_CreateGC id " << g_id
+                    << " target id is pixmap " << t_id
+                    << ".\n" << logofs_flush;
+          }
+          else if (windows.find(t_id) != windows.end())
+          {
+            *logofs << "handleRead: X_CreateGC id " << g_id
+                    << " target id is window " << t_id
+                    << ".\n" << logofs_flush;
+          }
+          else
+          {
+            *logofs << "handleRead: X_CreateGC id " << g_id
+                    << " target id is unrecognized.\n"
+                    << logofs_flush;
+          }
+
+          gcontexts.insert(T_gcontexts::value_type(g_id, t_id));
+
+          #endif
+
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_CreateGC);
+
+          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
+                                     inputMessage, inputLength))
+          {
+            hit = 1;
+
+            break;
+          }
+
+          // Since ProtoStep7 (#issue 108)
+          encodeBuffer.encodeNewXidValue(GetULONG(inputMessage + 4, bigEndian_),
+                             clientCache_ -> lastId, clientCache_ -> lastIdCache,
+                                 clientCache_ -> gcCache,
+                                     clientCache_ -> freeGCCache);
+
+          const unsigned char *nextSrc = inputMessage + 8;
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8,
+                             bigEndian_), clientCache_ -> drawableCache);
+          nextSrc += 4;
+          unsigned int bitmask = GetULONG(nextSrc, bigEndian_);
+          nextSrc += 4;
+          encodeBuffer.encodeCachedValue(bitmask, 23,
+                             clientCache_ -> createGCBitmaskCache);
+          unsigned int mask = 0x1;
+          for (unsigned int i = 0; i < 23; i++)
+          {
+            if (bitmask & mask)
+            {
+              unsigned int value = GetULONG(nextSrc, bigEndian_);
+              nextSrc += 4;
+              unsigned int fieldWidth = CREATEGC_FIELD_WIDTH[i];
+              if (fieldWidth <= 4)
+              {
+                encodeBuffer.encodeValue(value, fieldWidth);
+              }
+              else
+              {
+                encodeBuffer.encodeCachedValue(value, fieldWidth,
+                                   *clientCache_ -> createGCAttrCache[i]);
+              }
+            }
+            mask <<= 1;
+          }
+        }
+        break;
+      case X_ChangeGC:
+        {
+          #ifdef TARGETS
+
+          unsigned int g_id = GetULONG(inputMessage + 4, bigEndian_);
+
+          T_gcontexts::iterator i = gcontexts.find(g_id);
+
+          if (i != gcontexts.end())
+          {
+            unsigned int t_id = i -> second;
+
+            if (pixmaps.find(t_id) != pixmaps.end())
+            {
+              *logofs << "handleRead: X_ChangeGC gcontext id is " << g_id  
+                      << " target id is pixmap " << t_id << ".\n" 
+                      << logofs_flush;
+            }
+            else if (windows.find(t_id) != windows.end())
+            {
+              *logofs << "handleRead: X_ChangeGC gcontext id is " << g_id  
+                      << " target id is window " << t_id << ".\n" 
+                      << logofs_flush;
+            }
+            else
+            {
+              *logofs << "handleRead: X_ChangeGC gcontext is " << g_id  
+                      << " target id is unrecognized.\n" 
+                      << logofs_flush;
+            }
+          }
+          else
+          {
+            *logofs << "handleRead: X_ChangeGC gcontext id " << g_id  
+                    << " is unrecognized.\n" << logofs_flush;
+          }
+
+          gcontexts.erase(g_id);
+
+          #endif
+
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_ChangeGC);
+
+          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
+                                     inputMessage, inputLength))
+          {
+            hit = 1;
+
+            break;
+          }
+
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
+                             bigEndian_), clientCache_ -> gcCache);
+          const unsigned char *nextSrc = inputMessage + 8;
+          unsigned int bitmask = GetULONG(nextSrc, bigEndian_);
+          nextSrc += 4;
+          encodeBuffer.encodeCachedValue(bitmask, 23,
+                             clientCache_ -> createGCBitmaskCache);
+          unsigned int mask = 0x1;
+          for (unsigned int i = 0; i < 23; i++)
+          {
+            if (bitmask & mask)
+            {
+              unsigned int value = GetULONG(nextSrc, bigEndian_);
+              nextSrc += 4;
+              unsigned int fieldWidth = CREATEGC_FIELD_WIDTH[i];
+              if (fieldWidth <= 4)
+              {
+                encodeBuffer.encodeValue(value, fieldWidth);
+              }
+              else
+              {
+                encodeBuffer.encodeCachedValue(value, fieldWidth,
+                                   *clientCache_ -> createGCAttrCache[i]);
+              }
+            }
+            mask <<= 1;
+          }
+        }
+        break;
+      case X_CreatePixmap:
+        {
+          #ifdef TARGETS
+
+          *logofs << "handleRead: X_CreatePixmap depth " << (unsigned) inputMessage[1]
+                  << ", pixmap id " << GetULONG(inputMessage + 4, bigEndian_)
+                  << ", drawable " << GetULONG(inputMessage + 8, bigEndian_)
+                  << ", width " << GetUINT(inputMessage + 12, bigEndian_)
+                  << ", height " << GetUINT(inputMessage + 14, bigEndian_)
+                  << ", size " << GetUINT(inputMessage + 2, bigEndian_) << 2
+                  << ".\n" << logofs_flush;
+
+          unsigned int   p_id = GetULONG(inputMessage + 4, bigEndian_);
+          unsigned short p_sx = GetUINT(inputMessage + 12, bigEndian_);
+          unsigned short p_sy = GetUINT(inputMessage + 14, bigEndian_);
+
+          *logofs << "handleRead: X_CreatePixmap id is " << p_id 
+                  << " width is " << p_sx << " height is " << p_sy 
+                  << ".\n" << logofs_flush;
+
+          if (p_sx * p_sy <= 64 * 64)
+          {
+            *logofs << "handleRead: X_CreatePixmap id " << p_id << " of size "
+                    << p_sx << "x" << p_sy << "=" << p_sx * p_sy 
+                    << " will be painted at client side.\n" << logofs_flush;
+          }
+          else
+          {
+            *logofs << "handleRead: X_CreatePixmap id " << p_id << " of size "
+                    << p_sx << "x" << p_sy << "=" << p_sx * p_sy 
+                    << " will be painted at server side.\n" << logofs_flush;
+          }
+
+          pixmaps.insert(p_id);
+
+          #endif
+
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_CreatePixmap);
+
+          hit = handleEncode(encodeBuffer, clientCache_, messageStore,
+                                 inputOpcode, inputMessage, inputLength);
+        }
+        break;
+      case X_CreateWindow:
+        {
+          #ifdef TARGETS
+
+          unsigned int w_id = GetULONG(inputMessage + 4, bigEndian_);
+
+          *logofs << "handleRead: X_CreateWindow id is " << w_id
+                  << ".\n" << logofs_flush;
+
+          windows.insert(w_id);
+
+          #endif
+
+          unsigned bitmask = GetULONG(inputMessage + 28, bigEndian_);
+          encodeBuffer.encodeCachedValue((unsigned int) inputMessage[1], 8,
+                                         clientCache_ -> depthCache);
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8, bigEndian_),
+                             clientCache_ -> windowCache);
+
+          // Since ProtoStep7 (#issue 108)
+          encodeBuffer.encodeNewXidValue(GetULONG(inputMessage + 4, bigEndian_),
+                             clientCache_ -> lastId, clientCache_ -> lastIdCache,
+                                 clientCache_ -> windowCache,
+                                     clientCache_ -> freeWindowCache);
+
+          const unsigned char *nextSrc = inputMessage + 12;
+          for (unsigned int i = 0; i < 6; i++)
+          {
+            encodeBuffer.encodeCachedValue(GetUINT(nextSrc, bigEndian_), 16,
+                               *clientCache_ -> createWindowGeomCache[i], 8);
+            nextSrc += 2;
+          }
+          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 24,
+                                 bigEndian_), 29, clientCache_ -> visualCache);
+          encodeBuffer.encodeCachedValue(bitmask, 15,
+                                     clientCache_ -> createWindowBitmaskCache);
+          nextSrc = inputMessage + 32;
+          unsigned int mask = 0x1;
+          for (unsigned int j = 0; j < 15; j++)
+          {
+            if (bitmask & mask)
+            {
+              encodeBuffer.encodeCachedValue(GetULONG(nextSrc, bigEndian_), 32,
+                                 *clientCache_ -> createWindowAttrCache[j]);
+              nextSrc += 4;
+            }
+            mask <<= 1;
+          }
+        }
+        break;
+      case X_DeleteProperty:
+        {
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
+                             clientCache_ -> windowCache);
+          encodeBuffer.encodeValue(GetULONG(inputMessage + 8, bigEndian_), 29, 9);
+        }
+        break;
+      case X_FillPoly:
+        {
+          #ifdef TARGETS
+
+          unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
+
+          if (pixmaps.find(t_id) != pixmaps.end())
+          {
+            *logofs << "handleRead: X_FillPoly target id is pixmap "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else if (windows.find(t_id) != windows.end())
+          {
+            *logofs << "handleRead: X_FillPoly target id is window "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else
+          {
+            *logofs << "handleRead: X_FillPoly target id " << t_id
+                    << " is unrecognized.\n" << logofs_flush;
+          }
+
+          #endif
+
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_FillPoly);
+
+          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
+                                     inputMessage, inputLength))
+          {
+            hit = 1;
+
+            break;
+          }
+
+          unsigned int numPoints = ((inputLength - 16) >> 2);
+
+          // Since ProtoStep10 (#issue 108)
+          encodeBuffer.encodeCachedValue(numPoints, 16,
+                             clientCache_ -> fillPolyNumPointsCache, 4);
+
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
+                             clientCache_ -> drawableCache);
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8, bigEndian_),
+                             clientCache_ -> gcCache);
+          encodeBuffer.encodeValue((unsigned int) inputMessage[12], 2);
+          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[13]);
+          int relativeCoordMode = (inputMessage[13] != 0);
+          const unsigned char *nextSrc = inputMessage + 16;
+          unsigned int pointIndex = 0;
+
+          for (unsigned int i = 0; i < numPoints; i++)
+          {
+            if (relativeCoordMode)
+            {
+              encodeBuffer.encodeCachedValue(GetUINT(nextSrc, bigEndian_), 16,
+                                 *clientCache_ -> fillPolyXRelCache[pointIndex], 8);
+              nextSrc += 2;
+              encodeBuffer.encodeCachedValue(GetUINT(nextSrc, bigEndian_), 16,
+                                 *clientCache_ -> fillPolyYRelCache[pointIndex], 8);
+              nextSrc += 2;
+            }
+            else
+            {
+              unsigned int x = GetUINT(nextSrc, bigEndian_);
+              nextSrc += 2;
+              unsigned int y = GetUINT(nextSrc, bigEndian_);
+              nextSrc += 2;
+              unsigned int j;
+              for (j = 0; j < 8; j++)
+                if ((x == clientCache_ -> fillPolyRecentX[j]) &&
+                    (y == clientCache_ -> fillPolyRecentY[j]))
+                  break;
+              if (j < 8)
+              {
+                encodeBuffer.encodeBoolValue(1);
+                encodeBuffer.encodeValue(j, 3);
+              }
+              else
+              {
+                encodeBuffer.encodeBoolValue(0);
+                encodeBuffer.encodeCachedValue(x, 16,
+                             *clientCache_ -> fillPolyXAbsCache[pointIndex], 8);
+                encodeBuffer.encodeCachedValue(y, 16,
+                             *clientCache_ -> fillPolyYAbsCache[pointIndex], 8);
+                clientCache_ -> fillPolyRecentX[clientCache_ -> fillPolyIndex] = x;
+                clientCache_ -> fillPolyRecentY[clientCache_ -> fillPolyIndex] = y;
+                clientCache_ -> fillPolyIndex++;
+                if (clientCache_ -> fillPolyIndex == 8)
+                  clientCache_ -> fillPolyIndex = 0;
+              }
+            }
+
+            if (++pointIndex == 10) pointIndex = 0;
+          }
+        }
+        break;
+      case X_FreeColors:
+        {
+          unsigned int numPixels = GetUINT(inputMessage + 2, bigEndian_) - 3;
+          encodeBuffer.encodeValue(numPixels, 16, 4);
+          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), 29,
+                                         clientCache_ -> colormapCache);
+          encodeBuffer.encodeValue(GetULONG(inputMessage + 8, bigEndian_), 32, 4);
+          const unsigned char *nextSrc = inputMessage + 12;
+          while (numPixels)
+          {
+            encodeBuffer.encodeValue(GetULONG(nextSrc, bigEndian_), 32, 8);
+            nextSrc += 4;
+            numPixels--;
+          }
+        }
+        break;
+      case X_FreeCursor:
+        {
+          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_),
+                                         29, clientCache_ -> cursorCache, 9);
+        }
+        break;
+      case X_FreeGC:
+        {
+          #ifdef TARGETS
+
+          unsigned int g_id = GetULONG(inputMessage + 4, bigEndian_);
+
+          T_gcontexts::iterator i = gcontexts.find(g_id);
+
+          if (i != gcontexts.end())
+          {
+            unsigned int t_id = i -> second;
+
+            if (pixmaps.find(t_id) != pixmaps.end())
+            {
+              *logofs << "handleRead: X_FreeGC gcontext id is " << g_id  
+                      << " target id is pixmap " << t_id << ".\n" 
+                      << logofs_flush;
+            }
+            else if (windows.find(t_id) != windows.end())
+            {
+              *logofs << "handleRead: X_FreeGC gcontext id is " << g_id  
+                      << " target id is window " << t_id << ".\n" 
+                      << logofs_flush;
+            }
+            else
+            {
+              *logofs << "handleRead: X_FreeGC gcontext id is " << g_id  
+                      << " target id is unrecognized.\n" 
+                      << logofs_flush;
+            }
+          }
+          else
+          {
+            *logofs << "handleRead: X_FreeGC gcontext id " << g_id  
+                    << " is unrecognized.\n" << logofs_flush;
+          }
+
+          gcontexts.erase(g_id);
+
+          #endif
+
+          // Since ProtoStep7 (#issue 108)
+          encodeBuffer.encodeFreeXidValue(GetULONG(inputMessage + 4, bigEndian_),
+                             clientCache_ -> freeGCCache);
+        }
+        break;
+      case X_FreePixmap:
+        {
+          #ifdef TARGETS
+
+          unsigned int p_id = GetULONG(inputMessage + 4, bigEndian_);
+
+          *logofs << "handleRead: X_FreePixmap id is " << p_id << ".\n" << logofs_flush;
+
+          pixmaps.erase(p_id);
+
+          #endif
+
+          // Since ProtoStep7 (#issue 108)
+          encodeBuffer.encodeFreeXidValue(GetULONG(inputMessage + 4, bigEndian_),
+                             clientCache_ -> freeDrawableCache);
+        }
+        break;
+      case X_GetAtomName:
+        {
+          encodeBuffer.encodeValue(GetULONG(inputMessage + 4, bigEndian_), 29, 9);
+
+          sequenceQueue_.push(clientSequence_, inputOpcode);
+
+          priority_++;
+        }
+        break;
+      case X_GetGeometry:
+        {
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
+                             clientCache_ -> drawableCache);
+
+          sequenceQueue_.push(clientSequence_, inputOpcode);
+
+          priority_++;
+        }
+        break;
+      case X_GetInputFocus:
+        {
+          sequenceQueue_.push(clientSequence_, inputOpcode);
+
+          priority_++;
+        }
+        break;
+      case X_GetModifierMapping:
+        {
+          sequenceQueue_.push(clientSequence_, inputOpcode);
+
+          priority_++;
+        }
+        break;
+      case X_GetKeyboardMapping:
+        {
+          encodeBuffer.encodeValue((unsigned int) inputMessage[4], 8);
+          encodeBuffer.encodeValue((unsigned int) inputMessage[5], 8);
+
+          sequenceQueue_.push(clientSequence_, inputOpcode);
+
+          priority_++;
+        }
+        break;
+      case X_GetProperty:
+        {
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_GetProperty);
+
+          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
+                                     inputMessage, inputLength))
+          {
+            unsigned int property = GetULONG(inputMessage + 8, bigEndian_);
+
+            sequenceQueue_.push(clientSequence_, inputOpcode, property);
+
+            priority_++;
+
+            hit = 1;
+
+            break;
+          }
+
+          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]);
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
+                             clientCache_ -> windowCache);
+          unsigned int property = GetULONG(inputMessage + 8, bigEndian_);
+          encodeBuffer.encodeValue(property, 29, 9);
+          encodeBuffer.encodeValue(GetULONG(inputMessage + 12, bigEndian_), 29, 9);
+          encodeBuffer.encodeValue(GetULONG(inputMessage + 16, bigEndian_), 32, 2);
+          encodeBuffer.encodeValue(GetULONG(inputMessage + 20, bigEndian_), 32, 8);
+
+          sequenceQueue_.push(clientSequence_, inputOpcode, property);
+
+          priority_++;
+        }
+        break;
+      case X_GetSelectionOwner:
+        {
+          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), 29,
+                             clientCache_ -> getSelectionOwnerSelectionCache, 9);
+
+          sequenceQueue_.push(clientSequence_, inputOpcode);
+
+          priority_++;
+        }
+        break;
+      case X_GrabButton:
+        {
+          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]);
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
+                             clientCache_ -> windowCache);
+          encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 8, bigEndian_), 16,
+                             clientCache_ -> grabButtonEventMaskCache);
+          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[10]);
+          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[11]);
+          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 12, bigEndian_), 29,
+                             clientCache_ -> grabButtonConfineCache, 9);
+          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 16, bigEndian_), 29,
+                             clientCache_ -> cursorCache, 9);
+          encodeBuffer.encodeCachedValue(inputMessage[20], 8,
+                             clientCache_ -> grabButtonButtonCache);
+          encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 22, bigEndian_), 16,
+                             clientCache_ -> grabButtonModifierCache);
+        }
+        break;
+      case X_GrabPointer:
+        {
+          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]);
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
+                             clientCache_ -> windowCache);
+          encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 8, bigEndian_), 16,
+                             clientCache_ -> grabButtonEventMaskCache);
+          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[10]);
+          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[11]);
+          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 12,
+                           bigEndian_), 29,
+                               clientCache_ -> grabButtonConfineCache, 9);
+          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 16,
+                           bigEndian_), 29, clientCache_ -> cursorCache, 9);
+
+          unsigned int timestamp = GetULONG(inputMessage + 20, bigEndian_);
+          encodeBuffer.encodeValue(timestamp -
+                           clientCache_ -> grabKeyboardLastTimestamp, 32, 4);
+          clientCache_ -> grabKeyboardLastTimestamp = timestamp;
+
+          sequenceQueue_.push(clientSequence_, inputOpcode);
+
+          priority_++;
+        }
+        break;
+      case X_GrabKeyboard:
+        {
+          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]);
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
+                             clientCache_ -> windowCache);
+          unsigned int timestamp = GetULONG(inputMessage + 8, bigEndian_);
+          encodeBuffer.encodeValue(timestamp -
+                             clientCache_ -> grabKeyboardLastTimestamp, 32, 4);
+          clientCache_ -> grabKeyboardLastTimestamp = timestamp;
+          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[12]);
+          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[13]);
+
+          sequenceQueue_.push(clientSequence_, inputOpcode);
+
+          priority_++;
+        }
+        break;
+      case X_GrabServer:
+      case X_UngrabServer:
+      case X_NoOperation:
+        {
+        }
+        break;
+      case X_PolyText8:
+        {
+          #ifdef TARGETS
+
+          unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
+
+          if (pixmaps.find(t_id) != pixmaps.end())
+          {
+            *logofs << "handleRead: X_PolyText8 target id is pixmap "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else if (windows.find(t_id) != windows.end())
+          {
+            *logofs << "handleRead: X_PolyText8 target id is window "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else
+          {
+            *logofs << "handleRead: X_PolyText8 target id " << t_id
+                    << " is unrecognized.\n" << logofs_flush;
+          }
+
+          #endif
+
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_PolyText8);
+
+          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
+                                     inputMessage, inputLength))
+          {
+            hit = 1;
+
+            break;
+          }
+
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
+                             bigEndian_), clientCache_ -> drawableCache);
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8,
+                             bigEndian_), clientCache_ -> gcCache);
+          unsigned int x = GetUINT(inputMessage + 12, bigEndian_);
+          int xDiff = x - clientCache_ -> polyTextLastX;
+          clientCache_ -> polyTextLastX = x;
+          encodeBuffer.encodeCachedValue(xDiff, 16,
+                             clientCache_ -> polyTextCacheX);
+          unsigned int y = GetUINT(inputMessage + 14, bigEndian_);
+          int yDiff = y - clientCache_ -> polyTextLastY;
+          clientCache_ -> polyTextLastY = y;
+          encodeBuffer.encodeCachedValue(yDiff, 16,
+                             clientCache_ -> polyTextCacheY);
+          const unsigned char *end = inputMessage + inputLength - 1;
+          const unsigned char *nextSrc = inputMessage + 16;
+          while (nextSrc < end)
+          {
+            unsigned int textLength = (unsigned int) *nextSrc++;
+            encodeBuffer.encodeBoolValue(1);
+            encodeBuffer.encodeValue(textLength, 8);
+            if (textLength == 255)
+            {
+              encodeBuffer.encodeCachedValue(GetULONG(nextSrc, 1), 29,
+                                 clientCache_ -> polyTextFontCache);
+              nextSrc += 4;
+            }
+            else
+            {
+              encodeBuffer.encodeCachedValue(*nextSrc++, 8,
+                                 clientCache_ -> polyTextDeltaCache);
+
+              // Since ProtoStep7 (#issue 108)
+              encodeBuffer.encodeTextData(nextSrc, textLength);
+              nextSrc += textLength;
+            }
+          }
+          encodeBuffer.encodeBoolValue(0);
+        }
+        break;
+      case X_PolyText16:
+        {
+          #ifdef TARGETS
+
+          unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
+
+          if (pixmaps.find(t_id) != pixmaps.end())
+          {
+            *logofs << "handleRead: X_PolyText16 target id is pixmap "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else if (windows.find(t_id) != windows.end())
+          {
+            *logofs << "handleRead: X_PolyText16 target id is window "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else
+          {
+            *logofs << "handleRead: X_PolyText16 target id " << t_id
+                    << " is unrecognized.\n" << logofs_flush;
+          }
+
+          #endif
+
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_PolyText16);
+
+          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
+                                     inputMessage, inputLength))
+          {
+            hit = 1;
+
+            break;
+          }
+
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
+                             bigEndian_), clientCache_ -> drawableCache);
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8,
+                             bigEndian_), clientCache_ -> gcCache);
+          unsigned int x = GetUINT(inputMessage + 12, bigEndian_);
+          int xDiff = x - clientCache_ -> polyTextLastX;
+          clientCache_ -> polyTextLastX = x;
+          encodeBuffer.encodeCachedValue(xDiff, 16,
+                             clientCache_ -> polyTextCacheX);
+          unsigned int y = GetUINT(inputMessage + 14, bigEndian_);
+          int yDiff = y - clientCache_ -> polyTextLastY;
+          clientCache_ -> polyTextLastY = y;
+          encodeBuffer.encodeCachedValue(yDiff, 16,
+                             clientCache_ -> polyTextCacheY);
+          const unsigned char *end = inputMessage + inputLength - 1;
+          const unsigned char *nextSrc = inputMessage + 16;
+          while (nextSrc < end)
+          {
+            unsigned int textLength = (unsigned int) *nextSrc++;
+            encodeBuffer.encodeBoolValue(1);
+            encodeBuffer.encodeValue(textLength, 8);
+            if (textLength == 255)
+            {
+              encodeBuffer.encodeCachedValue(GetULONG(nextSrc, 1), 29,
+                                 clientCache_ -> polyTextFontCache);
+              nextSrc += 4;
+            }
+            else
+            {
+              encodeBuffer.encodeCachedValue(*nextSrc++, 8,
+                                 clientCache_ -> polyTextDeltaCache);
+
+              // Since ProtoStep7 (#issue 108)
+              encodeBuffer.encodeTextData(nextSrc, textLength * 2);
+              nextSrc += textLength * 2;
+            }
+          }
+          encodeBuffer.encodeBoolValue(0);
+        }
+        break;
+      case X_ImageText8:
+        {
+          #ifdef TARGETS
+
+          unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
+
+          if (pixmaps.find(t_id) != pixmaps.end())
+          {
+            *logofs << "handleRead: X_ImageText8 target id is pixmap "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else if (windows.find(t_id) != windows.end())
+          {
+            *logofs << "handleRead: X_ImageText8 target id is window "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else
+          {
+            *logofs << "handleRead: X_ImageText8 target id "
+                    << t_id << " is unrecognized.\n"
+                    << logofs_flush;
+          }
+
+          #endif
+
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_ImageText8);
+
+          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
+                                     inputMessage, inputLength))
+          {
+            hit = 1;
+
+            break;
+          }
+
+          unsigned int textLength = (unsigned int) inputMessage[1];
+          encodeBuffer.encodeCachedValue(textLength, 8,
+                             clientCache_ -> imageTextLengthCache, 4);
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
+                             bigEndian_), clientCache_ -> drawableCache);
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8,
+                             bigEndian_), clientCache_ -> gcCache);
+          unsigned int x = GetUINT(inputMessage + 12, bigEndian_);
+          int xDiff = x - clientCache_ -> imageTextLastX;
+          clientCache_ -> imageTextLastX = x;
+          encodeBuffer.encodeCachedValue(xDiff, 16,
+                             clientCache_ -> imageTextCacheX);
+          unsigned int y = GetUINT(inputMessage + 14, bigEndian_);
+          int yDiff = y - clientCache_ -> imageTextLastY;
+          clientCache_ -> imageTextLastY = y;
+          encodeBuffer.encodeCachedValue(yDiff, 16,
+                             clientCache_ -> imageTextCacheY);
+          const unsigned char *nextSrc = inputMessage + 16;
+
+          // Since ProtoStep7 (#issue 108)
+          encodeBuffer.encodeTextData(nextSrc, textLength);
+        }
+        break;
+      case X_ImageText16:
+        {
+          #ifdef TARGETS
+
+          unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
+
+          if (pixmaps.find(t_id) != pixmaps.end())
+          {
+            *logofs << "handleRead: X_ImageText16 target id is pixmap "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else if (windows.find(t_id) != windows.end())
+          {
+            *logofs << "handleRead: X_ImageText16 target id is window "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else
+          {
+            *logofs << "handleRead: X_ImageText16 target id "
+                    << t_id << " is unrecognized.\n"
+                    << logofs_flush;
+          }
+
+          #endif
+
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_ImageText16);
+
+          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
+                                     inputMessage, inputLength))
+          {
+            hit = 1;
+
+            break;
+          }
+
+          unsigned int textLength = (unsigned int) inputMessage[1];
+          encodeBuffer.encodeCachedValue(textLength, 8,
+                             clientCache_ -> imageTextLengthCache, 4);
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
+                             bigEndian_), clientCache_ -> drawableCache);
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8,
+                             bigEndian_), clientCache_ -> gcCache);
+          unsigned int x = GetUINT(inputMessage + 12, bigEndian_);
+          int xDiff = x - clientCache_ -> imageTextLastX;
+          clientCache_ -> imageTextLastX = x;
+          encodeBuffer.encodeCachedValue(xDiff, 16,
+                             clientCache_ -> imageTextCacheX);
+          unsigned int y = GetUINT(inputMessage + 14, bigEndian_);
+          int yDiff = y - clientCache_ -> imageTextLastY;
+          clientCache_ -> imageTextLastY = y;
+          encodeBuffer.encodeCachedValue(yDiff, 16,
+                             clientCache_ -> imageTextCacheY);
+          const unsigned char *nextSrc = inputMessage + 16;
+
+          // Since ProtoStep7 (#issue 108)
+          encodeBuffer.encodeTextData(nextSrc, textLength * 2);
+        }
+        break;
+      case X_InternAtom:
+        {
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_InternAtom);
+
+          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
+                                     inputMessage, inputLength))
+          {
+            sequenceQueue_.push(clientSequence_, inputOpcode);
+
+            //
+            // Set the priority, also if doing so will
+            // penalize all the well written clients
+            // using XInternAtoms() to pipeline multi-
+            // ple replies.
+            //
+
+            priority_++;
+
+            hit = 1;
+
+            break;
+          }
+
+          unsigned int nameLength = GetUINT(inputMessage + 4, bigEndian_);
+          encodeBuffer.encodeValue(nameLength, 16, 6);
+          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]);
+          const unsigned char *nextSrc = inputMessage + 8;
+
+          // Since ProtoStep7 (#issue 108)
+          encodeBuffer.encodeTextData(nextSrc, nameLength);
+
+          sequenceQueue_.push(clientSequence_, inputOpcode);
+
+          priority_++;
+        }
+        break;
+      case X_ListExtensions:
+        {
+          sequenceQueue_.push(clientSequence_, inputOpcode);
+
+          priority_++;
+        }
+        break;
+      case X_ListFonts:
+        {
+          unsigned int textLength = GetUINT(inputMessage + 6, bigEndian_);
+          encodeBuffer.encodeValue(textLength, 16, 6);
+          encodeBuffer.encodeValue(GetUINT(inputMessage + 4, bigEndian_), 16, 6);
+          const unsigned char* nextSrc = inputMessage + 8;
+
+          // Since ProtoStep7 (#issue 108)
+          encodeBuffer.encodeTextData(nextSrc, textLength);
+
+          sequenceQueue_.push(clientSequence_, inputOpcode);
+
+          priority_++;
+        }
+        break;
+      case X_LookupColor:
+      case X_AllocNamedColor:
+        {
+          unsigned int textLength = GetUINT(inputMessage + 8, bigEndian_);
+          encodeBuffer.encodeValue(textLength, 16, 6);
+          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_),
+                                         29, clientCache_ -> colormapCache);
+          const unsigned char *nextSrc = inputMessage + 12;
+
+          // Since ProtoStep7 (#issue 108)
+          encodeBuffer.encodeTextData(nextSrc, textLength);
+
+          sequenceQueue_.push(clientSequence_, inputOpcode);
+
+          priority_++;
+        }
+        break;
+      case X_MapWindow:
+      case X_UnmapWindow:
+      case X_MapSubwindows:
+      case X_GetWindowAttributes:
+      case X_DestroyWindow:
+      case X_DestroySubwindows:
+      case X_QueryPointer:
+      case X_QueryTree:
+        {
+          #ifdef TARGETS
+
+          if (inputOpcode == X_DestroyWindow)
+          {
+            unsigned int w_id = GetULONG(inputMessage + 4, bigEndian_);
+
+            *logofs << "handleRead: X_DestroyWindow id is "
+                    << w_id << ".\n" << logofs_flush;
+
+            windows.erase(w_id);
+          }
+
+          #endif
+
+          if (inputOpcode == X_DestroyWindow)
+          {
+            // Since ProtoStep7 (#issue 108)
+            encodeBuffer.encodeFreeXidValue(GetULONG(inputMessage + 4, bigEndian_),
+                               clientCache_ -> freeWindowCache);
+          }
+          else
+          {
+            encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
+                               clientCache_ -> windowCache);
+          }
+
+          if ((inputOpcode == X_QueryPointer) ||
+              (inputOpcode == X_GetWindowAttributes) ||
+              (inputOpcode == X_QueryTree))
+          {
+            sequenceQueue_.push(clientSequence_, inputOpcode);
+
+            priority_++;
+          }
+        }
+        break;
+      case X_OpenFont:
+        {
+          unsigned int nameLength = GetUINT(inputMessage + 8, bigEndian_);
+          encodeBuffer.encodeValue(nameLength, 16, 7);
+          unsigned int font = GetULONG(inputMessage + 4, bigEndian_);
+          encodeBuffer.encodeValue(font - clientCache_ -> lastFont, 29, 5);
+          clientCache_ -> lastFont = font;
+          const unsigned char *nextSrc = inputMessage + 12;
+
+          // Since ProtoStep7 (#issue 108)
+          encodeBuffer.encodeTextData(nextSrc, nameLength);
+        }
+        break;
+      case X_PolyFillRectangle:
+        {
+          #ifdef TARGETS
+
+          unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
+
+          if (pixmaps.find(t_id) != pixmaps.end())
+          {
+            *logofs << "handleRead: X_PolyFillRectangle target id is pixmap "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else if (windows.find(t_id) != windows.end())
+          {
+            *logofs << "handleRead: X_PolyFillRectangle target id is window "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else
+          {
+            *logofs << "handleRead: X_PolyFillRectangle target id "
+                    << t_id << " is unrecognized.\n"
+                    << logofs_flush;
+          }
+
+          #endif
+
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_PolyFillRectangle);
+
+          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
+                                     inputMessage, inputLength))
+          {
+            hit = 1;
+
+            break;
+          }
+
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
+                             bigEndian_), clientCache_ -> drawableCache);
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8,
+                             bigEndian_), clientCache_ -> gcCache);
+
+          unsigned int index = 0;
+          unsigned int lastX = 0, lastY = 0;
+          unsigned int lastWidth = 0, lastHeight = 0;
+
+          //
+          // TODO: Could send the size at the beginning
+          // instead of a bool at each iteration.
+          //
+
+          for (unsigned int i = 12; i < inputLength;)
+          {
+            unsigned int x = GetUINT(inputMessage + i, bigEndian_);
+            unsigned int newX = x;
+            x -= lastX;
+            lastX = newX;
+            encodeBuffer.encodeCachedValue(x, 16,
+                         *clientCache_ -> polyFillRectangleCacheX[index], 8);
+            i += 2;
+            unsigned int y = GetUINT(inputMessage + i, bigEndian_);
+            unsigned int newY = y;
+            y -= lastY;
+            lastY = newY;
+            encodeBuffer.encodeCachedValue(y, 16,
+                         *clientCache_ -> polyFillRectangleCacheY[index], 8);
+            i += 2;
+            unsigned int width = GetUINT(inputMessage + i, bigEndian_);
+            unsigned int newWidth = width;
+            width -= lastWidth;
+            lastWidth = newWidth;
+            encodeBuffer.encodeCachedValue(width, 16,
+                         *clientCache_ -> polyFillRectangleCacheWidth[index], 8);
+            i += 2;
+            unsigned int height = GetUINT(inputMessage + i, bigEndian_);
+            unsigned int newHeight = height;
+            height -= lastHeight;
+            lastHeight = newHeight;
+            encodeBuffer.encodeCachedValue(height, 16,
+                         *clientCache_ -> polyFillRectangleCacheHeight[index], 8);
+            i += 2;
+
+            if (++index == 4) index = 0;
+
+            encodeBuffer.encodeBoolValue((i < inputLength) ? 1 : 0);
+          }
+        }
+        break;
+      case X_PolyFillArc:
+        {
+          #ifdef TARGETS
+
+          unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
+
+          if (pixmaps.find(t_id) != pixmaps.end())
+          {
+            *logofs << "handleRead:  X_PolyFillArc target id is pixmap "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else if (windows.find(t_id) != windows.end())
+          {
+            *logofs << "handleRead:  X_PolyFillArc target id is window "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else
+          {
+            *logofs << "handleRead:  X_PolyFillArc target id " << t_id
+                    << " is unrecognized.\n" << logofs_flush;
+          }
+
+          #endif
+
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_PolyFillArc);
+
+          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
+                                     inputMessage, inputLength))
+          {
+            hit = 1;
+
+            break;
+          }
+
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
+                             bigEndian_), clientCache_ -> drawableCache);
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8,
+                             bigEndian_), clientCache_ -> gcCache);
+
+          unsigned int index = 0;
+          unsigned int lastX = 0, lastY = 0;
+          unsigned int lastWidth = 0, lastHeight = 0;
+          unsigned int lastAngle1 = 0, lastAngle2 = 0;
+
+          //
+          // TODO: Could send the size at the beginning
+          // instead of a bool at each iteration.
+          //
+
+          for (unsigned int i = 12; i < inputLength;)
+          {
+            unsigned int x = GetUINT(inputMessage + i, bigEndian_);
+            unsigned int newX = x;
+            x -= lastX;
+            lastX = newX;
+            encodeBuffer.encodeCachedValue(x, 16,
+                         *clientCache_ -> polyFillArcCacheX[index], 8);
+            i += 2;
+            unsigned int y = GetUINT(inputMessage + i, bigEndian_);
+            unsigned int newY = y;
+            y -= lastY;
+            lastY = newY;
+            encodeBuffer.encodeCachedValue(y, 16,
+                         *clientCache_ -> polyFillArcCacheY[index], 8);
+            i += 2;
+            unsigned int width = GetUINT(inputMessage + i, bigEndian_);
+            unsigned int newWidth = width;
+            width -= lastWidth;
+            lastWidth = newWidth;
+            encodeBuffer.encodeCachedValue(width, 16,
+                         *clientCache_ -> polyFillArcCacheWidth[index], 8);
+            i += 2;
+            unsigned int height = GetUINT(inputMessage + i, bigEndian_);
+            unsigned int newHeight = height;
+            height -= lastHeight;
+            lastHeight = newHeight;
+            encodeBuffer.encodeCachedValue(height, 16,
+                         *clientCache_ -> polyFillArcCacheHeight[index], 8);
+            i += 2;
+            unsigned int angle1 = GetUINT(inputMessage + i, bigEndian_);
+            unsigned int newAngle1 = angle1;
+            angle1 -= lastAngle1;
+            lastAngle1 = newAngle1;
+            encodeBuffer.encodeCachedValue(angle1, 16,
+                         *clientCache_ -> polyFillArcCacheAngle1[index], 8);
+            i += 2;
+            unsigned int angle2 = GetUINT(inputMessage + i, bigEndian_);
+            unsigned int newAngle2 = angle2;
+            angle2 -= lastAngle2;
+            lastAngle2 = newAngle2;
+            encodeBuffer.encodeCachedValue(angle2, 16,
+                         *clientCache_ -> polyFillArcCacheAngle2[index], 8);
+            i += 2;
+
+            if (++index == 2) index = 0;
+
+            encodeBuffer.encodeBoolValue((i < inputLength) ? 1 : 0);
+          }
+        }
+        break;
+      case X_PolyArc:
+        {
+          #ifdef TARGETS
+
+          unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
+
+          if (pixmaps.find(t_id) != pixmaps.end())
+          {
+            *logofs << "handleRead: X_PolyArc target id is pixmap "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else if (windows.find(t_id) != windows.end())
+          {
+            *logofs << "handleRead: X_PolyArc target id is window "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else
+          {
+            *logofs << "handleRead: X_PolyArc target id " << t_id
+                    << " is unrecognized.\n" << logofs_flush;
+          }
+
+          #endif
+
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_PolyArc);
+
+          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
+                                     inputMessage, inputLength))
+          {
+            hit = 1;
+
+            break;
+          }
+
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
+                             bigEndian_), clientCache_ -> drawableCache);
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8,
+                             bigEndian_), clientCache_ -> gcCache);
+
+          unsigned int index = 0;
+          unsigned int lastX = 0, lastY = 0;
+          unsigned int lastWidth = 0, lastHeight = 0;
+          unsigned int lastAngle1 = 0, lastAngle2 = 0;
+
+          //
+          // TODO: Could send the size at the beginning
+          // instead of a bool at each iteration.
+          //
+
+          for (unsigned int i = 12; i < inputLength;)
+          {
+            unsigned int x = GetUINT(inputMessage + i, bigEndian_);
+            unsigned int newX = x;
+            x -= lastX;
+            lastX = newX;
+            encodeBuffer.encodeCachedValue(x, 16,
+                         *clientCache_ -> polyArcCacheX[index], 8);
+            i += 2;
+            unsigned int y = GetUINT(inputMessage + i, bigEndian_);
+            unsigned int newY = y;
+            y -= lastY;
+            lastY = newY;
+            encodeBuffer.encodeCachedValue(y, 16,
+                         *clientCache_ -> polyArcCacheY[index], 8);
+            i += 2;
+            unsigned int width = GetUINT(inputMessage + i, bigEndian_);
+            unsigned int newWidth = width;
+            width -= lastWidth;
+            lastWidth = newWidth;
+            encodeBuffer.encodeCachedValue(width, 16,
+                         *clientCache_ -> polyArcCacheWidth[index], 8);
+            i += 2;
+            unsigned int height = GetUINT(inputMessage + i, bigEndian_);
+            unsigned int newHeight = height;
+            height -= lastHeight;
+            lastHeight = newHeight;
+            encodeBuffer.encodeCachedValue(height, 16,
+                         *clientCache_ -> polyArcCacheHeight[index], 8);
+            i += 2;
+            unsigned int angle1 = GetUINT(inputMessage + i, bigEndian_);
+            unsigned int newAngle1 = angle1;
+            angle1 -= lastAngle1;
+            lastAngle1 = newAngle1;
+            encodeBuffer.encodeCachedValue(angle1, 16,
+                         *clientCache_ -> polyArcCacheAngle1[index], 8);
+            i += 2;
+            unsigned int angle2 = GetUINT(inputMessage + i, bigEndian_);
+            unsigned int newAngle2 = angle2;
+            angle2 -= lastAngle2;
+            lastAngle2 = newAngle2;
+            encodeBuffer.encodeCachedValue(angle2, 16,
+                         *clientCache_ -> polyArcCacheAngle2[index], 8);
+            i += 2;
+
+            if (++index == 2) index = 0;
+
+            encodeBuffer.encodeBoolValue((i < inputLength) ? 1 : 0);
+          }
+        }
+        break;
+      case X_PolyPoint:
+        {
+          #ifdef TARGETS
+
+          unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
+
+          if (pixmaps.find(t_id) != pixmaps.end())
+          {
+            *logofs << "handleRead: X_PolyPoint target id is pixmap "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else if (windows.find(t_id) != windows.end())
+          {
+            *logofs << "handleRead: X_PolyPoint target id is window "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else
+          {
+            *logofs << "handleRead: X_PolyPoint target id " << t_id
+                    << " is unrecognized.\n" << logofs_flush;
+          }
+
+          #endif
+
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_PolyPoint);
+
+          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
+                                     inputMessage, inputLength))
+          {
+            hit = 1;
+
+            break;
+          }
+
+          encodeBuffer.encodeValue(GetUINT(inputMessage + 2, bigEndian_) - 3, 16, 4);
+          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]);
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
+                             clientCache_ -> drawableCache);
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8, bigEndian_),
+                             clientCache_ -> gcCache);
+          const unsigned char *nextSrc = inputMessage + 12;
+
+          unsigned int index = 0;
+          unsigned int lastX = 0, lastY = 0;
+
+          for (unsigned int i = 12; i < inputLength; i += 4)
+          {
+            unsigned int x = GetUINT(nextSrc, bigEndian_);
+            nextSrc += 2;
+            unsigned int tmp = x;
+            x -= lastX;
+            lastX = tmp;
+            encodeBuffer.encodeCachedValue(x, 16,
+                               *clientCache_ -> polyPointCacheX[index], 8);
+            unsigned int y = GetUINT(nextSrc, bigEndian_);
+            nextSrc += 2;
+            tmp = y;
+            y -= lastY;
+            lastY = tmp;
+            encodeBuffer.encodeCachedValue(y, 16,
+                               *clientCache_ -> polyPointCacheY[index], 8);
+
+            if (++index == 2) index = 0;
+          }
+        }
+        break;
+      case X_PolyLine:
+        {
+          #ifdef TARGETS
+
+          unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
+
+          if (pixmaps.find(t_id) != pixmaps.end())
+          {
+            *logofs << "handleRead: X_PolyLine target id is pixmap "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else if (windows.find(t_id) != windows.end())
+          {
+            *logofs << "handleRead: X_PolyLine target id is window "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else
+          {
+            *logofs << "handleRead: X_PolyLine target id " << t_id
+                    << " is unrecognized.\n" << logofs_flush;
+          }
+
+          #endif
+
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_PolyLine);
+
+          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
+                                     inputMessage, inputLength))
+          {
+            hit = 1;
+
+            break;
+          }
+
+          encodeBuffer.encodeValue(GetUINT(inputMessage + 2, bigEndian_) - 3, 16, 4);
+          encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]);
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
+                             bigEndian_), clientCache_ -> drawableCache);
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8,
+                             bigEndian_), clientCache_ -> gcCache);
+          const unsigned char *nextSrc = inputMessage + 12;
+
+          unsigned int index = 0;
+          unsigned int lastX = 0, lastY = 0;
+
+          for (unsigned int i = 12; i < inputLength; i += 4)
+          {
+            unsigned int x = GetUINT(nextSrc, bigEndian_);
+            nextSrc += 2;
+            unsigned int tmp = x;
+            x -= lastX;
+            lastX = tmp;
+            encodeBuffer.encodeCachedValue(x, 16,
+                               *clientCache_ -> polyLineCacheX[index], 8);
+            unsigned int y = GetUINT(nextSrc, bigEndian_);
+            nextSrc += 2;
+            tmp = y;
+            y -= lastY;
+            lastY = tmp;
+            encodeBuffer.encodeCachedValue(y, 16,
+                               *clientCache_ -> polyLineCacheY[index], 8);
+
+            if (++index == 2) index = 0;
+          }
+        }
+        break;
+      case X_PolyRectangle:
+        {
+          encodeBuffer.encodeValue((GetUINT(inputMessage + 2,
+                                            bigEndian_) - 3) >> 1, 16, 3);
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
+                             bigEndian_), clientCache_ -> drawableCache);
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8,
+                             bigEndian_), clientCache_ -> gcCache);
+          const unsigned char *end = inputMessage + inputLength;
+          const unsigned char *nextSrc = inputMessage + 12;
+          while (nextSrc < end)
+          {
+            for (unsigned int i = 0; i < 4; i++)
+            {
+              encodeBuffer.encodeCachedValue(GetUINT(nextSrc, bigEndian_), 16,
+                                 *clientCache_ -> polyRectangleGeomCache[i], 8);
+              nextSrc += 2;
+            }
+          }
+        }
+        break;
+      case X_PolySegment:
+        {
+          #ifdef TARGETS
+
+          unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
+
+          if (pixmaps.find(t_id) != pixmaps.end())
+          {
+            *logofs << "handleRead: X_PolySegment target id is pixmap "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else if (windows.find(t_id) != windows.end())
+          {
+            *logofs << "handleRead: X_PolySegment target id is window "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else
+          {
+            *logofs << "handleRead: X_PolySegment target id " << t_id
+                    << " is unrecognized.\n" << logofs_flush;
+          }
+
+          #endif
+
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_PolySegment);
+
+          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
+                                     inputMessage, inputLength))
+          {
+            hit = 1;
+
+            break;
+          }
+
+          encodeBuffer.encodeValue((GetUINT(inputMessage + 2,
+                                            bigEndian_) - 3) >> 1, 16, 4);
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
+                             bigEndian_), clientCache_ -> drawableCache);
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 8,
+                             bigEndian_), clientCache_ -> gcCache);
+          const unsigned char *end = inputMessage + inputLength;
+          const unsigned char *nextSrc = inputMessage + 12;
+          // unsigned int index = 0;
+          // unsigned int lastX1, lastY1, lastX2, lastY2;
+          while (nextSrc < end)
+          {
+            unsigned int x = GetUINT(nextSrc, bigEndian_);
+            nextSrc += 2;
+            unsigned int xDiff0 =
+            x - clientCache_ -> polySegmentLastX[0];
+            unsigned int xDiff1 =
+            x - clientCache_ -> polySegmentLastX[1];
+            int xDiff0Abs = (int) xDiff0;
+            if (xDiff0Abs < 0)
+              xDiff0Abs = -xDiff0Abs;
+            int xDiff1Abs = (int) xDiff1;
+            if (xDiff1Abs < 0)
+              xDiff1Abs = -xDiff1Abs;
+
+            unsigned int y = GetUINT(nextSrc, bigEndian_);
+            nextSrc += 2;
+            unsigned int yDiff0 =
+            y - clientCache_ -> polySegmentLastY[0];
+            unsigned int yDiff1 =
+            y - clientCache_ -> polySegmentLastY[1];
+            int yDiff0Abs = (int) yDiff0;
+            if (yDiff0Abs < 0)
+              yDiff0Abs = -yDiff0Abs;
+            int yDiff1Abs = (int) yDiff1;
+            if (yDiff1Abs < 0)
+              yDiff1Abs = -yDiff1Abs;
+
+            int diff0 = xDiff0Abs + yDiff0Abs;
+            int diff1 = xDiff1Abs + yDiff1Abs;
+            if (diff0 < diff1)
+            {
+              encodeBuffer.encodeBoolValue(0);
+              encodeBuffer.encodeCachedValue(xDiff0, 16,
+                                         clientCache_ -> polySegmentCacheX, 6);
+              encodeBuffer.encodeCachedValue(yDiff0, 16,
+                                         clientCache_ -> polySegmentCacheY, 6);
+            }
+            else
+            {
+              encodeBuffer.encodeBoolValue(1);
+              encodeBuffer.encodeCachedValue(xDiff1, 16,
+                                         clientCache_ -> polySegmentCacheX, 6);
+              encodeBuffer.encodeCachedValue(yDiff1, 16,
+                                         clientCache_ -> polySegmentCacheY, 6);
+            }
+
+            clientCache_ -> polySegmentLastX[clientCache_ -> polySegmentCacheIndex] = x;
+            clientCache_ -> polySegmentLastY[clientCache_ -> polySegmentCacheIndex] = y;
+
+            clientCache_ -> polySegmentCacheIndex =
+                  clientCache_ -> polySegmentCacheIndex == 1 ? 0 : 1;
+          }
+        }
+        break;
+      case X_PutImage:
+        {
+          #ifdef TARGETS
+
+          unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
+
+          if (pixmaps.find(t_id) != pixmaps.end())
+          {
+            *logofs << "handleRead: X_PutImage target id is pixmap "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else if (windows.find(t_id) != windows.end())
+          {
+            *logofs << "handleRead: X_PutImage target id is window "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else
+          {
+            *logofs << "handleRead: X_PutImage target id " << t_id
+                    << " is unrecognized.\n" << logofs_flush;
+          }
+
+          #endif
+
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_PutImage);
+
+          hit = handleEncode(encodeBuffer, clientCache_, messageStore,
+                                 inputOpcode, inputMessage, inputLength);
+        }
+        break;
+      case X_QueryBestSize:
+        {
+          encodeBuffer.encodeValue((unsigned int)inputMessage[1], 2);
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
+                             bigEndian_), clientCache_ -> drawableCache);
+          encodeBuffer.encodeValue(GetUINT(inputMessage + 8, bigEndian_), 16, 8);
+          encodeBuffer.encodeValue(GetUINT(inputMessage + 10, bigEndian_), 16, 8);
+
+          sequenceQueue_.push(clientSequence_, inputOpcode);
+
+          priority_++;
+        }
+        break;
+      case X_QueryColors:
+        {
+          // Differential encoding.
+          encodeBuffer.encodeBoolValue(1);
+
+          unsigned int numColors = ((inputLength - 8) >> 2);
+          encodeBuffer.encodeValue(numColors, 16, 5);
+          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), 29,
+                                         clientCache_ -> colormapCache);
+          const unsigned char *nextSrc = inputMessage + 8;
+          unsigned int predictedPixel = clientCache_ -> queryColorsLastPixel;
+          for (unsigned int i = 0; i < numColors; i++)
+          {
+            unsigned int pixel = GetULONG(nextSrc, bigEndian_);
+            nextSrc += 4;
+            if (pixel == predictedPixel)
+              encodeBuffer.encodeBoolValue(1);
+            else
+            {
+              encodeBuffer.encodeBoolValue(0);
+              encodeBuffer.encodeValue(pixel, 32, 9);
+            }
+            if (i == 0)
+              clientCache_ -> queryColorsLastPixel = pixel;
+            predictedPixel = pixel + 1;
+          }
+
+          sequenceQueue_.push(clientSequence_, inputOpcode);
+
+          priority_++;
+        }
+        break;
+      case X_QueryExtension:
+        {
+          #ifdef TEST
+
+          char data[256];
+
+          int length = GetUINT(inputMessage + 4, bigEndian_);
+
+          if (length > 256)
+          {
+            length = 256;
+          }
+
+          strncpy(data, (char *) inputMessage + 8, length);
+
+          *(data + length) = '\0';
+
+          *logofs << "handleRead: Going to query extension '"
+                  << data << "' for FD#" << fd_ << ".\n"
+                  << logofs_flush;
+          #endif
+
+          unsigned int nameLength = GetUINT(inputMessage + 4, bigEndian_);
+          encodeBuffer.encodeValue(nameLength, 16, 6);
+          const unsigned char *nextSrc = inputMessage + 8;
+
+          for (; nameLength; nameLength--)
+          {
+            encodeBuffer.encodeValue((unsigned int) *nextSrc++, 8);
+          }
+
+          unsigned int extension = 0;
+
+          if (strncmp((char *) inputMessage + 8, "SHAPE", 5) == 0)
+          {
+            extension = X_NXInternalShapeExtension;
+          }
+          else if (strncmp((char *) inputMessage + 8, "RENDER", 6) == 0)
+          {
+            extension = X_NXInternalRenderExtension;
+          }
+
+          sequenceQueue_.push(clientSequence_, inputOpcode, extension);
+
+          priority_++;
+        }
+        break;
+      case X_QueryFont:
+        {
+          unsigned int font = GetULONG(inputMessage + 4, bigEndian_);
+          encodeBuffer.encodeValue(font - clientCache_ -> lastFont, 29, 5);
+          clientCache_ -> lastFont = font;
+
+          sequenceQueue_.push(clientSequence_, inputOpcode);
+
+          priority_++;
+        }
+        break;
+      case X_SetClipRectangles:
+        {
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_SetClipRectangles);
+
+          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
+                                     inputMessage, inputLength))
+          {
+            hit = 1;
+
+            break;
+          }
+
+          unsigned int numRectangles = ((inputLength - 12) >> 3);
+
+          // Since ProtoStep9 (#issue 108)
+          encodeBuffer.encodeValue(numRectangles, 15, 4);
+
+          encodeBuffer.encodeValue((unsigned int) inputMessage[1], 2);
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
+                             clientCache_ -> gcCache);
+          encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 8, bigEndian_), 16,
+                             clientCache_ -> setClipRectanglesXCache, 8);
+          encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 10, bigEndian_), 16,
+                             clientCache_ -> setClipRectanglesYCache, 8);
+          const unsigned char *nextSrc = inputMessage + 12;
+          for (unsigned int i = 0; i < numRectangles; i++)
+          {
+            for (unsigned int j = 0; j < 4; j++)
+            {
+              encodeBuffer.encodeCachedValue(GetUINT(nextSrc, bigEndian_), 16,
+                                 *clientCache_ -> setClipRectanglesGeomCache[j], 8);
+              nextSrc += 2;
+            }
+          }
+        }
+        break;
+      case X_SetDashes:
+        {
+          unsigned int numDashes = GetUINT(inputMessage + 10, bigEndian_);
+          encodeBuffer.encodeCachedValue(numDashes, 16,
+                             clientCache_ -> setDashesLengthCache, 5);
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
+                             clientCache_ -> gcCache);
+          encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 8, bigEndian_), 16,
+                             clientCache_ -> setDashesOffsetCache, 5);
+          const unsigned char *nextSrc = inputMessage + 12;
+          for (unsigned int i = 0; i < numDashes; i++)
+            encodeBuffer.encodeCachedValue(*nextSrc++, 8,
+                                clientCache_ -> setDashesDashCache_[i & 1], 5);
+        }
+        break;
+      case X_SetSelectionOwner:
+        {
+          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), 29,
+                                    clientCache_ -> setSelectionOwnerCache, 9);
+          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_), 29,
+                           clientCache_ -> getSelectionOwnerSelectionCache, 9);
+          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 12, bigEndian_), 32,
+                           clientCache_ -> setSelectionOwnerTimestampCache, 9);
+        }
+        break;
+      case X_TranslateCoords:
+        {
+          #ifdef TARGETS
+
+          unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
+
+          if (pixmaps.find(t_id) != pixmaps.end())
+          {
+            *logofs << "handleRead: X_TranslateCoords source id is pixmap "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else if (windows.find(t_id) != windows.end())
+          {
+            *logofs << "handleRead: X_TranslateCoords source id is window "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else
+          {
+            *logofs << "handleRead: X_TranslateCoords source id " << t_id
+                    << " is unrecognized.\n" << logofs_flush;
+          }
+
+          t_id = GetULONG(inputMessage + 8, bigEndian_);
+
+          if (pixmaps.find(t_id) != pixmaps.end())
+          {
+            *logofs << "handleRead: X_TranslateCoords target id is pixmap "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else if (windows.find(t_id) != windows.end())
+          {
+            *logofs << "handleRead: X_TranslateCoords target id is window "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else
+          {
+            *logofs << "handleRead: X_TranslateCoords target id " << t_id
+                    << " is unrecognized.\n" << logofs_flush;
+          }
+
+          #endif
+
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_TranslateCoords);
+
+          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
+                                     inputMessage, inputLength))
+          {
+            sequenceQueue_.push(clientSequence_, inputOpcode);
+
+            priority_++;
+
+            hit = 1;
+
+            break;
+          }
+
+          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), 29,
+                                   clientCache_ -> translateCoordsSrcCache, 9);
+          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_), 29,
+                                   clientCache_ -> translateCoordsDstCache, 9);
+          encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 12, bigEndian_), 16,
+                                   clientCache_ -> translateCoordsXCache, 8);
+          encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 14, bigEndian_), 16,
+                                   clientCache_ -> translateCoordsYCache, 8);
+
+          sequenceQueue_.push(clientSequence_, inputOpcode);
+
+          priority_++;
+        }
+        break;
+      case X_GetImage:
+        {
+          #ifdef TARGETS
+
+          unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
+
+          if (pixmaps.find(t_id) != pixmaps.end())
+          {
+            *logofs << "handleRead: X_GetImage source id is pixmap "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else if (windows.find(t_id) != windows.end())
+          {
+            *logofs << "handleRead: X_GetImage source id is window "
+                    << t_id << ".\n" << logofs_flush;
+          }
+          else
+          {
+            *logofs << "handleRead: X_GetImage source id " << t_id
+                    << " is unrecognized.\n" << logofs_flush;
+          }
+
+          #endif
+
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_GetImage);
+
+          if (handleEncodeCached(encodeBuffer, clientCache_, messageStore,
+                                     inputMessage, inputLength))
+          {
+            sequenceQueue_.push(clientSequence_, inputOpcode);
+
+            priority_++;
+
+            hit = 1;
+
+            break;
+          }
+
+          // Format.
+          encodeBuffer.encodeValue((unsigned int) inputMessage[1], 2);
+          // Drawable.
+          encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4,
+                             bigEndian_), clientCache_ -> drawableCache);
+          // X.
+          unsigned int x = GetUINT(inputMessage + 8, bigEndian_);
+          int xDiff = x - clientCache_ -> putImageLastX;
+          clientCache_ -> putImageLastX = x;
+          encodeBuffer.encodeCachedValue(xDiff, 16,
+                             clientCache_ -> putImageXCache, 8);
+          // Y.
+          unsigned int y = GetUINT(inputMessage + 10, bigEndian_);
+          int yDiff = y - clientCache_ -> putImageLastY;
+          clientCache_ -> putImageLastY = y;
+          encodeBuffer.encodeCachedValue(yDiff, 16,
+                             clientCache_ -> putImageYCache, 8);
+          // Width.
+          unsigned int width = GetUINT(inputMessage + 12, bigEndian_);
+          encodeBuffer.encodeCachedValue(width, 16,
+                             clientCache_ -> putImageWidthCache, 8);
+          // Height.
+          unsigned int height = GetUINT(inputMessage + 14, bigEndian_);
+          encodeBuffer.encodeCachedValue(height, 16,
+                             clientCache_ -> putImageHeightCache, 8);
+          // Plane mask.
+          encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 16, bigEndian_), 32,
+                             clientCache_ -> getImagePlaneMaskCache, 5);
+
+          sequenceQueue_.push(clientSequence_, inputOpcode);
+
+          priority_++;
+        }
+        break;
+      case X_GetPointerMapping:
+        {
+          sequenceQueue_.push(clientSequence_, inputOpcode);
+
+          priority_++;
+        }
+        break;
+      case X_GetKeyboardControl:
+        {
+          sequenceQueue_.push(clientSequence_, inputOpcode);
+
+          priority_++;
+        }
+        break;
+      default:
+        {
+          if (inputOpcode == opcodeStore_ -> renderExtension)
+          {
+            MessageStore *messageStore = clientStore_ ->
+                                 getRequestStore(X_NXInternalRenderExtension);
+
+            hit = handleEncode(encodeBuffer, clientCache_, messageStore,
+                                   inputOpcode, inputMessage, inputLength);
+          }
+          else if (inputOpcode == opcodeStore_ -> shapeExtension)
+          {
+            MessageStore *messageStore = clientStore_ ->
+                                 getRequestStore(X_NXInternalShapeExtension);
+
+            hit = handleEncode(encodeBuffer, clientCache_, messageStore,
+                                   inputOpcode, inputMessage, inputLength);
+          }
+          else if (inputOpcode == opcodeStore_ -> putPackedImage)
+          {
+            #ifdef TARGETS
+
+            unsigned int t_id = GetULONG(inputMessage + 4, bigEndian_);
+
+            if (pixmaps.find(t_id) != pixmaps.end())
+            {
+              *logofs << "handleRead: X_NXPutPackedImage target id is pixmap "
+                      << t_id << ".\n" << logofs_flush;
+            }
+            else if (windows.find(t_id) != windows.end())
+            {
+              *logofs << "handleRead: X_NXPutPackedImage target id is window "
+                      << t_id << ".\n" << logofs_flush;
+            }
+            else
+            {
+              *logofs << "handleRead: X_NXPutPackedImage target id " << t_id
+                      << " is unrecognized.\n" << logofs_flush;
+            }
+
+            #endif
+
+            #ifdef DEBUG
+            *logofs << "handleRead: Encoding packed image request for FD#"
+                    << fd_ << ".\n" << logofs_flush;
+            #endif
+
+            //
+            // The field carries the destination data
+            // length. We add the request's size of
+            // the final X_PutImage.
+            //
+
+            unsigned int outputLength = GetULONG(inputMessage + 20, bigEndian_) + 24;
+
+            statistics -> addPackedBytesIn(inputLength);
+
+            statistics -> addPackedBytesOut(outputLength);
+
+            MessageStore *messageStore = clientStore_ ->
+                                 getRequestStore(X_NXPutPackedImage);
+
+            hit = handleEncode(encodeBuffer, clientCache_, messageStore,
+                                   inputOpcode, inputMessage, inputLength);
+          }
+          else if (inputOpcode == opcodeStore_ -> setUnpackColormap)
+          {
+            #ifdef DEBUG
+            *logofs << "handleRead: Encoding set unpack colormap request "
+                    << "for FD#" << fd_ << " with size " << inputLength
+                    << ".\n" << logofs_flush;
+            #endif
+
+            MessageStore *messageStore = clientStore_ ->
+                                 getRequestStore(X_NXSetUnpackColormap);
+
+            hit = handleEncode(encodeBuffer, clientCache_, messageStore,
+                                   inputOpcode, inputMessage, inputLength);
+          }
+          else if (inputOpcode == opcodeStore_ -> setUnpackAlpha)
+          {
+            #ifdef DEBUG
+            *logofs << "handleRead: Encoding set unpack alpha request "
+                    << "for FD#" << fd_ << " with size " << inputLength
+                    << ".\n" << logofs_flush;
+            #endif
+
+            MessageStore *messageStore = clientStore_ ->
+                                 getRequestStore(X_NXSetUnpackAlpha);
+
+            hit = handleEncode(encodeBuffer, clientCache_, messageStore,
+                                   inputOpcode, inputMessage, inputLength);
+          }
+          else if (inputOpcode == opcodeStore_ -> setUnpackGeometry)
+          {
+            #ifdef DEBUG
+            *logofs << "handleRead: Encoding set unpack geometry request "
+                    << "for FD#" << fd_ << " with size " << inputLength
+                    << ".\n" << logofs_flush;
+            #endif
+
+            MessageStore *messageStore = clientStore_ ->
+                                 getRequestStore(X_NXSetUnpackGeometry);
+
+            hit = handleEncode(encodeBuffer, clientCache_, messageStore,
+                                   inputOpcode, inputMessage, inputLength);
+          }
+          else if (inputOpcode == opcodeStore_ -> startSplit)
+          {
+            if (handleStartSplitRequest(encodeBuffer, inputOpcode,
+                                            inputMessage, inputLength) < 0)
+            {
+              return -1;
+            }
+          }
+          else if (inputOpcode == opcodeStore_ -> endSplit)
+          {
+            if (handleEndSplitRequest(encodeBuffer, inputOpcode,
+                                          inputMessage, inputLength) < 0)
+            {
+              return -1;
+            }
+          }
+          else if (inputOpcode == opcodeStore_ -> commitSplit)
+          {
+            if (handleCommitSplitRequest(encodeBuffer, inputOpcode,
+                                             inputMessage, inputLength) < 0)
+            {
+              return -1;
+            }
+          }
+          else if (inputOpcode == opcodeStore_ -> abortSplit)
+          {
+            if (handleAbortSplitRequest(encodeBuffer, inputOpcode,
+                                            inputMessage, inputLength) < 0)
+            {
+              return -1;
+            }
+          }
+          else if (inputOpcode == opcodeStore_ -> finishSplit)
+          {
+            if (handleFinishSplitRequest(encodeBuffer, inputOpcode,
+                                          inputMessage, inputLength) < 0)
+            {
+              return -1;
+            }
+          }
+          else if (inputOpcode == opcodeStore_ -> freeSplit)
+          {
+            #ifdef DEBUG
+            *logofs << "handleRead: Encoding free split request "
+                    << "for FD#" << fd_ << " with size " << inputLength
+                    << ".\n" << logofs_flush;
+            #endif
+
+            encodeBuffer.encodeCachedValue(*(inputMessage + 1), 8,
+                         clientCache_ -> resourceCache);
+          }
+          else if (inputOpcode == opcodeStore_ -> freeUnpack)
+          {
+            #ifdef DEBUG
+            *logofs << "handleRead: Encoding free unpack request "
+                    << "for FD#" << fd_ << " with size " << inputLength
+                    << ".\n" << logofs_flush;
+            #endif
+
+            encodeBuffer.encodeCachedValue(*(inputMessage + 1), 8,
+                         clientCache_ -> resourceCache);
+          }
+          else if (inputOpcode == opcodeStore_ -> getControlParameters)
+          {
+            #ifdef DEBUG
+            *logofs << "handleRead: Encoding get control parameters "
+                    << "request for FD#" << fd_ << " with size "
+                    << inputLength << ".\n" << logofs_flush;
+            #endif
+
+            //
+            // Add the reply to the write buffer. If found
+            // to contain a message, it it will be flushed
+            // to the X client before leaving the loop.
+            //
+
+            unsigned char *reply = writeBuffer_.addMessage(32);
+
+            *(reply + 0) = X_Reply;
+
+            PutUINT(clientSequence_, reply + 2, bigEndian_);
+
+            PutULONG(0, reply + 4, bigEndian_);
+
+            //
+            // Save the sequence number we used
+            // to auto-generate this reply.
+            //
+
+            lastSequence_ = clientSequence_;
+
+            #ifdef TEST
+            *logofs << "handleRead: Registered " << lastSequence_
+                    << " as last auto-generated sequence number.\n"
+                    << logofs_flush;
+            #endif
+
+            *(reply + 1) = control -> LinkMode;
+
+            *(reply + 8)  = control -> LocalVersionMajor;
+            *(reply + 9)  = control -> LocalVersionMinor;
+            *(reply + 10) = control -> LocalVersionPatch;
+
+            *(reply + 11) = control -> RemoteVersionMajor;
+            *(reply + 12) = control -> RemoteVersionMinor;
+            *(reply + 13) = control -> RemoteVersionPatch;
+
+            PutUINT(control -> SplitTimeout,  reply + 14, bigEndian_);
+            PutUINT(control -> MotionTimeout, reply + 16, bigEndian_);
+
+            *(reply + 18) = control -> SplitMode;
+
+            PutULONG(control -> SplitDataThreshold, reply + 20, bigEndian_);
+
+            *(reply + 24) = control -> PackMethod;
+            *(reply + 25) = control -> PackQuality;
+
+            *(reply + 26) = control -> LocalDataCompressionLevel;
+            *(reply + 27) = control -> LocalStreamCompressionLevel;
+            *(reply + 28) = control -> LocalDeltaCompression;
+
+            *(reply + 29) = (control -> LocalDeltaCompression == 1 &&
+                                 control -> PersistentCacheEnableLoad == 1);
+            *(reply + 30) = (control -> LocalDeltaCompression == 1 &&
+                                 control -> PersistentCacheEnableSave == 1);
+            *(reply + 31) = (control -> LocalDeltaCompression == 1 &&
+                                 control -> PersistentCacheEnableLoad == 1 &&
+                                     control -> PersistentCacheName != NULL);
+
+            if (handleFlush(flush_if_any) < 0)
+            {
+              return -1;
+            }
+          }
+          else if (inputOpcode == opcodeStore_ -> getCleanupParameters)
+          {
+            #ifdef WARNING
+            *logofs << "handleRead: WARNING! Encoding fake get cleanup "
+                    << "parameters request for FD#" << fd_ << " with size "
+                    << inputLength << ".\n" << logofs_flush;
+            #endif
+          }
+          else if (inputOpcode == opcodeStore_ -> getImageParameters)
+          {
+            #ifdef WARNING
+            *logofs << "handleRead: WARNING! Encoding fake get cleanup "
+                    << "parameters request for FD#" << fd_ << " with size "
+                    << inputLength << ".\n" << logofs_flush;
+            #endif
+          }
+          else if (inputOpcode == opcodeStore_ -> getUnpackParameters)
+          {
+            #ifdef DEBUG
+            *logofs << "handleRead: Encoding get unpack parameters "
+                    << "request for FD#" << fd_ << " with size "
+                    << inputLength << ".\n" << logofs_flush;
+            #endif
+
+            sequenceQueue_.push(clientSequence_, inputOpcode);
+          }
+          else if (inputOpcode == opcodeStore_ -> getShmemParameters)
+          {
+            if (handleShmemRequest(encodeBuffer, inputOpcode,
+                                       inputMessage, inputLength) < 0)
+            {
+              return -1;
+            }
+          }
+          else if (inputOpcode == opcodeStore_ -> setExposeParameters)
+          {
+            //
+            // Enable or disable expose events
+            // coming from the real server.
+            //
+
+            encodeBuffer.encodeBoolValue(*(inputMessage + 4));
+            encodeBuffer.encodeBoolValue(*(inputMessage + 5));
+            encodeBuffer.encodeBoolValue(*(inputMessage + 6));
+          }
+          else if (inputOpcode == opcodeStore_ -> setCacheParameters)
+          {
+            if (handleCacheRequest(encodeBuffer, inputOpcode,
+                                       inputMessage, inputLength) < 0)
+            {
+              return -1;
+            }
+          }
+          else if (inputOpcode == opcodeStore_ -> getFontParameters)
+          {
+            if (handleFontRequest(encodeBuffer, inputOpcode,
+                                      inputMessage, inputLength) < 0)
+            {
+              return -1;
+            }
+          }
+          else
+          {
+            MessageStore *messageStore = clientStore_ ->
+                                 getRequestStore(X_NXInternalGenericRequest);
+
+            hit = handleEncode(encodeBuffer, clientCache_, messageStore,
+                                   inputOpcode, inputMessage, inputLength);
+
+            //
+            // Don't flush if the opcode is unrecognized.
+            // We may optionally flush it is an extension
+            // but would penalize the well written clients.
+            //
+            // if (inputOpcode > 127)
+            // {
+            //   priority_++;
+            // }
+            //
+          }
+        }
+      } // End of switch on opcode.
+
+      int bits = encodeBuffer.diffBits();
+
+      #if defined(TEST) || defined(OPCODES)
+
+      const char *cacheString = (hit ? "cached " : "");
+
+      *logofs << "handleRead: Handled " << cacheString << "request OPCODE#" 
+              << (unsigned int) inputOpcode << " (" << DumpOpcode(inputOpcode)
+              << ")" << " for FD#" << fd_ << " sequence " << clientSequence_
+              << ". " << inputLength  << " bytes in, " << bits << " bits ("
+              << ((float) bits) / 8 << " bytes) out.\n" << logofs_flush;
+
+      #endif
+
+      if (hit)
+      {
+        statistics -> addCachedRequest(inputOpcode);
+      }
+
+      statistics -> addRequestBits(inputOpcode, inputLength << 3, bits);
+
+      if (inputOpcode == opcodeStore_ -> renderExtension)
+      {
+        if (hit)
+        {
+          statistics -> addRenderCachedRequest(*(inputMessage + 1));
+        }
+
+        statistics -> addRenderRequestBits(*(inputMessage + 1), inputLength << 3, bits);
+      }
+
+    }  // End if (firstRequest_)... else ...
+
+  } // End of while ((inputMessage = readBuffer_.getMessage(inputLength)) != 0) ...
+
+  //
+  // Check if we need to flush because of
+  // prioritized data.
+  //
+
+  if (priority_ > 0)
+  {
+    #if defined(TEST) || defined(INFO)
+    *logofs << "handleRead: WARNING! Requesting flush "
+            << "because of " << priority_ << " prioritized "
+            << "messages for FD#" << fd_ << ".\n"
+            << logofs_flush;
+    #endif
+
+    if (proxy -> handleAsyncPriority() < 0)
+    {
+      return -1;
+    }
+
+    //
+    // Reset the priority flag.
+    //
+
+    priority_ = 0;
+  }
+
+  //
+  // Flush if we exceeded the token length.
+  //
+
+  if (proxy -> canAsyncFlush() == 1)
+  {
+    #if defined(TEST) || defined(INFO)
+    *logofs << "handleRead: WARNING! Requesting flush "
+            << "because of token length exceeded.\n"
+            << logofs_flush;
+    #endif
+
+    if (proxy -> handleAsyncFlush() < 0)
+    {
+      return -1;
+    }
+  }
+
+  #if defined(TEST) || defined(INFO)
+
+  if (transport_ -> pending() != 0 ||
+          readBuffer_.checkMessage() != 0)
+  {
+    *logofs << "handleRead: PANIC! Buffer for X descriptor FD#"
+            << fd_ << " has " << transport_ -> pending()
+            << " bytes to read.\n" << logofs_flush;
+
+    HandleCleanup();
+  }
+
+  #endif
+
+  //
+  // Reset the read buffer.
+  //
+
+  readBuffer_.fullReset();
+
+  return 1;
+}
+
+//
+// End of handleRead().
+//
+
+//
+// Beginning of handleWrite().
+//
+
+int ClientChannel::handleWrite(const unsigned char *message, unsigned int length)
+{
+  #ifdef TEST
+  *logofs << "handleWrite: Called for FD#" << fd_
+          << ".\n" << logofs_flush;
+  #endif
+
+  //
+  // Create the buffer from which to 
+  // decode messages.
+  //
+
+  DecodeBuffer decodeBuffer(message, length);
+
+  #if defined(TEST) || defined(INFO) || defined(FLUSH)
+  *logofs << "handleWrite: Decoding messages for FD#" << fd_
+          << " with " << length << " bytes in the buffer.\n"
+          << logofs_flush;
+  #endif
+
+  if (firstReply_)
+  {
+    #ifdef TEST
+    *logofs << "handleWrite: First reply detected.\n" << logofs_flush;
+    #endif
+
+    unsigned int outputOpcode;
+
+    decodeBuffer.decodeValue(outputOpcode, 8);
+    unsigned int secondByte;
+    decodeBuffer.decodeValue(secondByte, 8);
+    unsigned int major;
+    decodeBuffer.decodeValue(major, 16);
+    unsigned int minor;
+    decodeBuffer.decodeValue(minor, 16);
+    unsigned int extraLength;
+    decodeBuffer.decodeValue(extraLength, 16);
+    unsigned int outputLength = 8 + (extraLength << 2);
+
+    unsigned char *outputMessage = writeBuffer_.addMessage(outputLength);
+    *outputMessage = (unsigned char) outputOpcode;
+    outputMessage[1] = (unsigned char) secondByte;
+    PutUINT(major, outputMessage + 2, bigEndian_);
+    PutUINT(minor, outputMessage + 4, bigEndian_);
+    PutUINT(extraLength, outputMessage + 6, bigEndian_);
+    unsigned char *nextDest = outputMessage + 8;
+    unsigned int cached;
+    decodeBuffer.decodeBoolValue(cached);
+
+    if (cached)
+    {
+      memcpy(nextDest, ServerCache::lastInitReply.getData(), outputLength - 8);
+    }
+    else
+    {
+      for (unsigned i = 8; i < outputLength; i++)
+      {
+        unsigned int nextByte;
+        decodeBuffer.decodeValue(nextByte, 8);
+        *nextDest++ = (unsigned char) nextByte;
+      }
+
+      ServerCache::lastInitReply.set(outputLength - 8, outputMessage + 8);
+    }
+
+    imageByteOrder_ = outputMessage[30];
+    bitmapBitOrder_ = outputMessage[31];
+    scanlineUnit_   = outputMessage[32];
+    scanlinePad_    = outputMessage[33];
+
+    firstReply_ = 0;
+
+  } // End of if (firstReply_)
+
+  //
+  // This was previously in a 'else' block.
+  // Due to the way the first request was
+  // handled, we could not decode multiple
+  // messages in the first frame.
+  //
+
+  { // Start of the decoding block.
+
+    #ifdef DEBUG
+    *logofs << "handleWrite: Starting loop on opcodes.\n"
+            << logofs_flush;
+    #endif
+
+    unsigned char outputOpcode;
+
+    //
+    // NX client needs this line to consider
+    // the initialization phase successfully
+    // completed.
+    //
+
+    if (firstClient_ == -1)
+    {
+      cerr << "Info" << ": Established X client connection.\n" ;
+
+      firstClient_ = fd_;
+    }
+
+    while (decodeBuffer.decodeOpcodeValue(outputOpcode, serverCache_ -> opcodeCache, 1))
+    {
+      #ifdef DEBUG
+      *logofs << "handleWrite: Decoded a new OPCODE#"
+              << (unsigned int) outputOpcode << ".\n"
+              << logofs_flush;
+      #endif
+
+      unsigned char *outputMessage = NULL;
+      unsigned int outputLength    = 0;
+
+      //
+      // General-purpose temp variables 
+      // for decoding ints and chars.
+      //
+
+      unsigned int value   = 0;
+      unsigned char cValue = 0;
+
+      //
+      // Check first if we need to abort any split,
+      // then if this is a reply, finally if it is
+      // en event or error.
+      //
+
+      if (outputOpcode == opcodeStore_ -> splitEvent)
+      {
+        //
+        // It's an abort split, not a normal
+        // burst of proxy data.
+        //
+
+        handleSplitEvent(decodeBuffer);
+
+        continue;
+      }
+      else if (outputOpcode == X_Reply)
+      {
+        #ifdef DEBUG
+        *logofs << "handleWrite: Decoding sequence number of reply.\n"
+                << logofs_flush;
+        #endif
+
+        unsigned int sequenceNum;
+        unsigned int sequenceDiff;
+
+        decodeBuffer.decodeCachedValue(sequenceDiff, 16,
+                           serverCache_ -> replySequenceCache, 7);
+
+        sequenceNum = (serverSequence_ + sequenceDiff) & 0xffff;
+
+        serverSequence_ = sequenceNum;
+
+        #ifdef DEBUG
+        *logofs << "handleWrite: Last server sequence number for FD#" 
+                << fd_ << " is " << serverSequence_ << " with "
+                << "difference " << sequenceDiff << ".\n"
+                << logofs_flush;
+        #endif
+
+        //
+        // In case of reply we can follow the X server and
+        // override any event's sequence number generated
+        // by this side.
+        //
+
+        #ifdef TEST
+        *logofs << "handleWrite: Updating last event's sequence "
+                << lastSequence_ << " to reply's sequence number "
+                << serverSequence_ << " for FD#" << fd_ << ".\n"
+                << logofs_flush;
+        #endif
+
+        lastSequence_ = serverSequence_;
+
+        unsigned short int requestSequenceNum;
+        unsigned char requestOpcode;
+
+        #ifdef DEBUG
+
+        requestSequenceNum = 0;
+        requestOpcode = 0;
+
+        *logofs << "handleWrite: Peek of sequence number returns ";
+
+        *logofs << sequenceQueue_.peek(requestSequenceNum, requestOpcode);
+
+        *logofs << " with sequence " << requestSequenceNum << " and opcode "
+                << (unsigned int) requestOpcode << ".\n" << logofs_flush;
+
+        #endif
+
+        if (sequenceQueue_.peek(requestSequenceNum, requestOpcode) == 1 &&
+                (requestSequenceNum == sequenceNum))
+        {
+          unsigned int requestData[3];
+
+          sequenceQueue_.pop(requestSequenceNum, requestOpcode,
+                                    requestData[0], requestData[1], requestData[2]);
+
+          #ifdef DEBUG
+          *logofs << "handleWrite: Identified reply to OPCODE#"
+                  << (unsigned int) requestOpcode << ".\n"
+                  << logofs_flush;
+          #endif
+
+          //
+          // Is differential encoding disabled?
+          //
+
+          if (control -> RemoteDeltaCompression == 0)
+          {
+            int result = handleFastWriteReply(decodeBuffer, requestOpcode,
+                                                  outputMessage, outputLength);
+            if (result < 0)
+            {
+              return -1;
+            }
+            else if (result > 0)
+            {
+              continue;
+            }
+          }
+
+          switch (requestOpcode)
+          {
+          case X_AllocColor:
+            {
+              outputLength = 32;
+              outputMessage = writeBuffer_.addMessage(outputLength);
+              unsigned char *nextDest = outputMessage + 8;
+              for (unsigned int i = 0; i < 3; i++)
+              {
+                decodeBuffer.decodeBoolValue(value);
+                if (value)
+                {
+                  PutUINT(requestData[i], nextDest, bigEndian_);
+                }
+                else
+                {
+                  decodeBuffer.decodeValue(value, 16, 6);
+                  PutUINT(requestData[i] + value, nextDest, bigEndian_);
+                }
+                nextDest += 2;
+              }
+              decodeBuffer.decodeValue(value, 32, 9);
+              PutULONG(value, outputMessage + 16, bigEndian_);
+            }
+            break;
+          case X_GetAtomName:
+            {
+              unsigned int nameLength;
+              decodeBuffer.decodeValue(nameLength, 16, 6);
+              outputLength = RoundUp4(nameLength) + 32;
+              outputMessage = writeBuffer_.addMessage(outputLength);
+              PutUINT(nameLength, outputMessage + 8, bigEndian_);
+              unsigned char* nextDest = outputMessage + 32;
+
+              // Since ProtoStep7 (#issue 108)
+              decodeBuffer.decodeTextData(nextDest, nameLength);
+            }
+            break;
+          case X_GetGeometry:
+            {
+              outputLength = 32;
+              outputMessage = writeBuffer_.addMessage(outputLength);
+              decodeBuffer.decodeCachedValue(cValue, 8,
+                                 serverCache_ -> depthCache);
+              outputMessage[1] = cValue;
+              decodeBuffer.decodeCachedValue(value, 29,
+                                 serverCache_ -> getGeometryRootCache, 9);
+              PutULONG(value, outputMessage + 8, bigEndian_);
+              unsigned char *nextDest = outputMessage + 12;
+              for (unsigned int i = 0; i < 5; i++)
+              {
+                decodeBuffer.decodeCachedValue(value, 16,
+                                   *serverCache_ -> getGeometryGeomCache[i], 8);
+                PutUINT(value, nextDest, bigEndian_);
+                nextDest += 2;
+              }
+            }
+            break;
+          case X_GetInputFocus:
+            {
+              outputLength = 32;
+              outputMessage = writeBuffer_.addMessage(outputLength);
+              decodeBuffer.decodeValue(value, 2);
+              outputMessage[1] = (unsigned char) value;
+              decodeBuffer.decodeCachedValue(value, 29,
+                                 serverCache_ -> getInputFocusWindowCache);
+              PutULONG(value, outputMessage + 8, bigEndian_);
+            }
+            break;
+          case X_GetKeyboardMapping:
+            {
+              decodeBuffer.decodeBoolValue(value);
+              if (value)
+              {
+                unsigned int dataLength =
+                ServerCache::getKeyboardMappingLastMap.getLength();
+                outputLength = 32 + dataLength;
+                outputMessage = writeBuffer_.addMessage(outputLength);
+                outputMessage[1] =
+                ServerCache::getKeyboardMappingLastKeysymsPerKeycode;
+                memcpy(outputMessage + 32,
+                           ServerCache::getKeyboardMappingLastMap.getData(),
+                               dataLength);
+                break;
+              }
+              unsigned int numKeycodes;
+              decodeBuffer.decodeValue(numKeycodes, 8);
+              unsigned int keysymsPerKeycode;
+              decodeBuffer.decodeValue(keysymsPerKeycode, 8, 4);
+              ServerCache::getKeyboardMappingLastKeysymsPerKeycode =
+                                  keysymsPerKeycode;
+              outputLength = 32 + numKeycodes * keysymsPerKeycode * 4;
+              outputMessage = writeBuffer_.addMessage(outputLength);
+              outputMessage[1] = (unsigned char) keysymsPerKeycode;
+              unsigned char *nextDest = outputMessage + 32;
+              unsigned char previous = 0;
+              for (unsigned int count = numKeycodes * keysymsPerKeycode;
+                       count; --count)
+              {
+                decodeBuffer.decodeBoolValue(value);
+                if (value)
+                  PutULONG((unsigned int) NoSymbol, nextDest, bigEndian_);
+                else
+                {
+                  unsigned int keysym;
+                  decodeBuffer.decodeCachedValue(keysym, 24,
+                             serverCache_ -> getKeyboardMappingKeysymCache, 9);
+                  decodeBuffer.decodeCachedValue(cValue, 8,
+                           serverCache_ -> getKeyboardMappingLastByteCache, 5);
+                  previous += cValue;
+                  PutULONG((keysym << 8) | previous, nextDest, bigEndian_);
+                }
+                nextDest += 4;
+              }
+              ServerCache::getKeyboardMappingLastMap.set(outputLength - 32,
+                                                             outputMessage + 32);
+            }
+            break;
+          case X_GetModifierMapping:
+            {
+              unsigned int keycodesPerModifier;
+              decodeBuffer.decodeValue(keycodesPerModifier, 8);
+              outputLength = 32 + (keycodesPerModifier << 3);
+              outputMessage = writeBuffer_.addMessage(outputLength);
+              outputMessage[1] = (unsigned char) keycodesPerModifier;
+              unsigned char *nextDest = outputMessage + 32;
+              decodeBuffer.decodeBoolValue(value);
+              if (value)
+              {
+                memcpy(outputMessage + 32,
+                           ServerCache::getModifierMappingLastMap.getData(),
+                               ServerCache::getModifierMappingLastMap.getLength());
+                break;
+              }
+              for (unsigned int count = outputLength - 32; count; count--)
+              {
+                decodeBuffer.decodeBoolValue(value);
+                if (value)
+                  *nextDest++ = 0;
+                else
+                {
+                  decodeBuffer.decodeValue(value, 8);
+                  *nextDest++ = value;
+                }
+              }
+              ServerCache::getModifierMappingLastMap.set(outputLength - 32,
+                                                             outputMessage + 32);
+            }
+            break;
+          case X_GetProperty:
+            {
+              MessageStore *messageStore = serverStore_ ->
+                                   getReplyStore(X_GetProperty);
+
+              handleDecode(decodeBuffer, serverCache_, messageStore,
+                               requestOpcode, outputMessage, outputLength);
+            }
+            break;
+          case X_GetSelectionOwner:
+            {
+              outputLength = 32;
+              outputMessage = writeBuffer_.addMessage(outputLength);
+              decodeBuffer.decodeCachedValue(value, 29,
+                                    serverCache_ -> getSelectionOwnerCache, 9);
+              PutULONG(value, outputMessage + 8, bigEndian_);
+            }
+            break;
+          case X_GetWindowAttributes:
+            {
+              outputLength = 44;
+              outputMessage = writeBuffer_.addMessage(outputLength);
+              decodeBuffer.decodeValue(value, 2);
+              outputMessage[1] = (unsigned char) value;
+              decodeBuffer.decodeCachedValue(value, 29,
+                                             serverCache_ -> visualCache);
+              PutULONG(value, outputMessage + 8, bigEndian_);
+              decodeBuffer.decodeCachedValue(value, 16,
+                             serverCache_ -> getWindowAttributesClassCache, 3);
+              PutUINT(value, outputMessage + 12, bigEndian_);
+              decodeBuffer.decodeCachedValue(cValue, 8,
+                           serverCache_ -> getWindowAttributesBitGravityCache);
+              outputMessage[14] = cValue;
+              decodeBuffer.decodeCachedValue(cValue, 8,
+                           serverCache_ -> getWindowAttributesWinGravityCache);
+              outputMessage[15] = cValue;
+              decodeBuffer.decodeCachedValue(value, 32,
+                            serverCache_ -> getWindowAttributesPlanesCache, 9);
+              PutULONG(value, outputMessage + 16, bigEndian_);
+              decodeBuffer.decodeCachedValue(value, 32,
+                             serverCache_ -> getWindowAttributesPixelCache, 9);
+              PutULONG(value, outputMessage + 20, bigEndian_);
+              decodeBuffer.decodeBoolValue(value);
+              outputMessage[24] = (unsigned char) value;
+              decodeBuffer.decodeBoolValue(value);
+              outputMessage[25] = (unsigned char) value;
+              decodeBuffer.decodeValue(value, 2);
+              outputMessage[26] = (unsigned char) value;
+              decodeBuffer.decodeBoolValue(value);
+              outputMessage[27] = (unsigned char) value;
+              decodeBuffer.decodeCachedValue(value, 29,
+                                             serverCache_ -> colormapCache, 9);
+              PutULONG(value, outputMessage + 28, bigEndian_);
+              decodeBuffer.decodeCachedValue(value, 32,
+                            serverCache_ -> getWindowAttributesAllEventsCache);
+              PutULONG(value, outputMessage + 32, bigEndian_);
+              decodeBuffer.decodeCachedValue(value, 32,
+                           serverCache_ -> getWindowAttributesYourEventsCache);
+              PutULONG(value, outputMessage + 36, bigEndian_);
+              decodeBuffer.decodeCachedValue(value, 16,
+                        serverCache_ -> getWindowAttributesDontPropagateCache);
+              PutUINT(value, outputMessage + 40, bigEndian_);
+            }
+            break;
+          case X_GrabKeyboard:
+          case X_GrabPointer:
+            {
+              outputLength = 32;
+              outputMessage = writeBuffer_.addMessage(outputLength);
+              decodeBuffer.decodeValue(value, 3);
+              outputMessage[1] = (unsigned char) value;
+            }
+            break;
+          case X_InternAtom:
+            {
+              outputLength = 32;
+              outputMessage = writeBuffer_.addMessage(outputLength);
+              decodeBuffer.decodeValue(value, 29, 9);
+              PutULONG(value, outputMessage + 8, bigEndian_);
+            }
+            break;
+          case X_ListExtensions:
+            {
+              decodeBuffer.decodeValue(value, 32, 8);
+              outputLength = 32 + (value << 2);
+              outputMessage = writeBuffer_.addMessage(outputLength);
+              unsigned int numExtensions;
+              decodeBuffer.decodeValue(numExtensions, 8);
+              outputMessage[1] = (unsigned char) numExtensions;
+              unsigned char *nextDest = outputMessage + 32;
+              for (; numExtensions; numExtensions--)
+              {
+                unsigned int length;
+                decodeBuffer.decodeValue(length, 8);
+                *nextDest++ = (unsigned char) length;
+                for (; length; length--)
+                {
+                  decodeBuffer.decodeValue(value, 8);
+                  *nextDest++ = value;
+                }
+              }
+            }
+            break;
+          case X_ListFonts:
+            {
+              //
+              // Differential compression can achieve a 12:1 to 14:1
+              // ratio, while the best ZLIB compression can achieve
+              // a mere 4:1 to 5:1. In the first case, though, the
+              // huge amount of data constituting the message would
+              // be stored uncompressed at the remote side. We need
+              // to find a compromise. The solution is to use diffe-
+              // rential compression at startup and ZLIB compression
+              // later on.
+              //
+
+              MessageStore *messageStore = serverStore_ ->
+                                   getReplyStore(X_ListFonts);
+
+              if (handleDecodeCached(decodeBuffer, serverCache_, messageStore,
+                                         outputMessage, outputLength))
+              {
+                break;
+              }
+
+              decodeBuffer.decodeValue(value, 32, 8);
+              outputLength = 32 + (value << 2);
+              outputMessage = writeBuffer_.addMessage(outputLength);
+              unsigned int numFonts;
+              decodeBuffer.decodeValue(numFonts, 16, 6);
+              PutUINT(numFonts, outputMessage + 8, bigEndian_);
+
+              // Differential or plain data compression?
+              decodeBuffer.decodeBoolValue(value);
+
+              if (value)
+              {
+                unsigned char* nextDest = outputMessage + 32;
+                for (; numFonts; numFonts--)
+                {
+                  unsigned int length;
+                  decodeBuffer.decodeValue(length, 8);
+                  *nextDest++ = (unsigned char)length;
+
+                  // Since ProtoStep7 (#issue 108)
+                  decodeBuffer.decodeTextData(nextDest, length);
+                  nextDest += length;
+                }
+
+                handleSave(messageStore, outputMessage, outputLength);
+              }
+              else
+              {
+                const unsigned char *compressedData = NULL;
+                unsigned int compressedDataSize = 0;
+
+                int decompressed = handleDecompress(decodeBuffer, requestOpcode, messageStore -> dataOffset,
+                                                        outputMessage, outputLength, compressedData,
+                                                            compressedDataSize);
+                if (decompressed < 0)
+                {
+                  return -1;
+                }
+                else if (decompressed > 0)
+                {
+                  handleSave(messageStore, outputMessage, outputLength,
+                                 compressedData, compressedDataSize);
+                }
+                else
+                {
+                  handleSave(messageStore, outputMessage, outputLength);
+                }
+              }
+            }
+            break;
+          case X_LookupColor:
+          case X_AllocNamedColor:
+            {
+              outputLength = 32;
+              outputMessage = writeBuffer_.addMessage(outputLength);
+              unsigned char *nextDest = outputMessage + 8;
+              if (requestOpcode == X_AllocNamedColor)
+              {
+                decodeBuffer.decodeValue(value, 32, 9);
+                PutULONG(value, nextDest, bigEndian_);
+                nextDest += 4;
+              }
+              unsigned int count = 3;
+              do
+              {
+                decodeBuffer.decodeValue(value, 16, 9);
+                PutUINT(value, nextDest, bigEndian_);
+                unsigned int visualColor;
+                decodeBuffer.decodeValue(visualColor, 16, 5);
+                visualColor += value;
+                visualColor &= 0xffff;
+                PutUINT(visualColor, nextDest + 6, bigEndian_);
+                nextDest += 2;
+              }
+              while (--count);
+            }
+            break;
+          case X_QueryBestSize:
+            {
+              outputLength = 32;
+              outputMessage = writeBuffer_.addMessage(outputLength);
+              decodeBuffer.decodeValue(value, 16, 8);
+              PutUINT(value, outputMessage + 8, bigEndian_);
+              decodeBuffer.decodeValue(value, 16, 8);
+              PutUINT(value, outputMessage + 10, bigEndian_);
+            }
+            break;
+          case X_QueryColors:
+            {
+              // Differential or plain data compression?
+              decodeBuffer.decodeBoolValue(value);
+
+              if (value)
+              {
+                decodeBuffer.decodeBoolValue(value);
+                if (value)
+                {
+                  unsigned int numColors =
+                  serverCache_ -> queryColorsLastReply.getLength() / 6;
+                  outputLength = 32 + (numColors << 3);
+                  outputMessage = writeBuffer_.addMessage(outputLength);
+                  PutUINT(numColors, outputMessage + 8, bigEndian_);
+                  const unsigned char *nextSrc =
+                  serverCache_ -> queryColorsLastReply.getData();
+                  unsigned char *nextDest = outputMessage + 32;
+                  for (; numColors; numColors--)
+                  {
+                    for (unsigned int i = 0; i < 6; i++)
+                      *nextDest++ = *nextSrc++;
+                    nextDest += 2;
+                  }
+                }
+                else
+                {
+                  unsigned int numColors;
+                  decodeBuffer.decodeValue(numColors, 16, 5);
+                  outputLength = 32 + (numColors << 3);
+                  outputMessage = writeBuffer_.addMessage(outputLength);
+                  PutUINT(numColors, outputMessage + 8, bigEndian_);
+                  unsigned char *nextDest = outputMessage + 32;
+                  for (unsigned int c = 0; c < numColors; c++)
+                  {
+                    for (unsigned int i = 0; i < 3; i++)
+                    {
+                      decodeBuffer.decodeValue(value, 16);
+                      PutUINT(value, nextDest, bigEndian_);
+                      nextDest += 2;
+                    }
+                  }
+                  serverCache_ -> queryColorsLastReply.set(numColors * 6,
+                                       outputMessage + 32);
+                  const unsigned char *nextSrc = nextDest - 1;
+                  nextDest = outputMessage + 32 + ((numColors - 1) << 3) + 5;
+                  for (; numColors > 1; numColors--)
+                  {
+                    for (unsigned int i = 0; i < 6; i++)
+                      *nextDest-- = *nextSrc--;
+                    nextDest -= 2;
+                  }
+                }
+              }
+              else
+              {
+                // Reply length.
+                unsigned int numColors;
+                decodeBuffer.decodeValue(numColors, 16, 5);
+                outputLength = 32 + (numColors << 3);
+                outputMessage = writeBuffer_.addMessage(outputLength);
+                PutUINT(numColors, outputMessage + 8, bigEndian_);
+
+                const unsigned char *compressedData = NULL;
+                unsigned int compressedDataSize = 0;
+
+                int decompressed = handleDecompress(decodeBuffer, requestOpcode, 32,
+                                                        outputMessage, outputLength, compressedData,
+                                                            compressedDataSize);
+                if (decompressed < 0)
+                {
+                  return -1;
+                }
+              }
+            }
+            break;
+          case X_QueryExtension:
+            {
+              outputLength = 32;
+              outputMessage = writeBuffer_.addMessage(outputLength);
+              decodeBuffer.decodeBoolValue(value);
+              outputMessage[8] = (unsigned char) value;
+              decodeBuffer.decodeValue(value, 8);
+              outputMessage[9] = (unsigned char) value;
+              decodeBuffer.decodeValue(value, 8);
+              outputMessage[10] = (unsigned char) value;
+              decodeBuffer.decodeValue(value, 8);
+              outputMessage[11] = (unsigned char) value;
+
+              //
+              // We use a predefined opcode to address
+              // extensions' message stores, while real
+              // opcodes are used for communication with
+              // X server and clients.
+              //
+
+              if (requestData[0] == X_NXInternalShapeExtension)
+              {
+                opcodeStore_ -> shapeExtension = outputMessage[9];
+
+                #ifdef TEST
+                *logofs << "handleWrite: Shape extension opcode for FD#" << fd_
+                        << " is " << (unsigned int) opcodeStore_ -> shapeExtension
+                        << ".\n" << logofs_flush;
+                #endif
+              }
+              else if (requestData[0] == X_NXInternalRenderExtension)
+              {
+                opcodeStore_ -> renderExtension = outputMessage[9];
+
+                #ifdef TEST
+                *logofs << "handleWrite: Render extension opcode for FD#" << fd_
+                        << " is " << (unsigned int) opcodeStore_ -> renderExtension
+                        << ".\n" << logofs_flush;
+                #endif
+              }
+            }
+            break;
+          case X_QueryFont:
+            {
+              //
+              // Use differential compression at startup and plain
+              // data compression later. Check X_ListFonts message
+              // for an explaination.
+              //
+
+              MessageStore *messageStore = serverStore_ ->
+                                   getReplyStore(X_QueryFont);
+
+              if (handleDecodeCached(decodeBuffer, serverCache_, messageStore,
+                                         outputMessage, outputLength))
+              {
+                break;
+              }
+
+              // Differential or plain data compression?
+              decodeBuffer.decodeBoolValue(value);
+
+              if (value)
+              {
+                unsigned int numProperties;
+                unsigned int numCharInfos;
+                decodeBuffer.decodeValue(numProperties, 16, 8);
+                decodeBuffer.decodeValue(numCharInfos, 32, 10);
+                outputLength = 60 + numProperties * 8 + numCharInfos * 12;
+                outputMessage = writeBuffer_.addMessage(outputLength);
+                PutUINT(numProperties, outputMessage + 46, bigEndian_);
+                PutULONG(numCharInfos, outputMessage + 56, bigEndian_);
+                handleDecodeCharInfo(decodeBuffer, outputMessage + 8);
+                handleDecodeCharInfo(decodeBuffer, outputMessage + 24);
+                decodeBuffer.decodeValue(value, 16, 9);
+                PutUINT(value, outputMessage + 40, bigEndian_);
+                decodeBuffer.decodeValue(value, 16, 9);
+                PutUINT(value, outputMessage + 42, bigEndian_);
+                decodeBuffer.decodeValue(value, 16, 9);
+                PutUINT(value, outputMessage + 44, bigEndian_);
+                decodeBuffer.decodeBoolValue(value);
+                outputMessage[48] = (unsigned char) value;
+                decodeBuffer.decodeValue(value, 8);
+                outputMessage[49] = (unsigned char) value;
+                decodeBuffer.decodeValue(value, 8);
+                outputMessage[50] = (unsigned char) value;
+                decodeBuffer.decodeBoolValue(value);
+                outputMessage[51] = (unsigned char) value;
+                decodeBuffer.decodeValue(value, 16, 9);
+                PutUINT(value, outputMessage + 52, bigEndian_);
+                decodeBuffer.decodeValue(value, 16, 9);
+                PutUINT(value, outputMessage + 54, bigEndian_);
+                unsigned char *nextDest = outputMessage + 60;
+                decodeBuffer.decodeBoolValue(value);
+
+                int end = 0;
+
+                if (value == 1)
+                {
+                  unsigned int index;
+                  decodeBuffer.decodeValue(index, 4);
+                  unsigned int length;
+                  const unsigned char *data;
+                  ServerCache::queryFontFontCache.get(index, length, data);
+                  memcpy(nextDest, data, length);
+
+                  end = 1;
+                }
+
+                if (end == 0)
+                {
+                  unsigned char *saveDest = nextDest;
+                  unsigned int length = numProperties * 8 + numCharInfos * 12;
+                  for (; numProperties; numProperties--)
+                  {
+                    decodeBuffer.decodeValue(value, 32, 9);
+                    PutULONG(value, nextDest, bigEndian_);
+                    decodeBuffer.decodeValue(value, 32, 9);
+                    PutULONG(value, nextDest + 4, bigEndian_);
+                    nextDest += 8;
+                  }
+                  for (; numCharInfos; numCharInfos--)
+                  {
+                    handleDecodeCharInfo(decodeBuffer, nextDest);
+
+                    nextDest += 12;
+                  }
+                  ServerCache::queryFontFontCache.set(length, saveDest);
+                }
+
+                handleSave(messageStore, outputMessage, outputLength);
+              }
+              else
+              {
+                // Reply length.
+                unsigned int replyLength;
+                decodeBuffer.decodeValue(replyLength, 32, 16);
+                outputLength = 32 + (replyLength << 2);
+                outputMessage = writeBuffer_.addMessage(outputLength);
+
+                const unsigned char *compressedData = NULL;
+                unsigned int compressedDataSize = 0;
+
+                int decompressed = handleDecompress(decodeBuffer, requestOpcode, messageStore -> dataOffset,
+                                                        outputMessage, outputLength, compressedData,
+                                                            compressedDataSize);
+                if (decompressed < 0)
+                {
+                  return -1;
+                }
+                else if (decompressed > 0)
+                {
+                  handleSave(messageStore, outputMessage, outputLength,
+                                 compressedData, compressedDataSize);
+                }
+                else
+                {
+                  handleSave(messageStore, outputMessage, outputLength);
+                }
+              }
+            }
+            break;
+          case X_QueryPointer:
+            {
+              outputLength = 32;
+              outputMessage = writeBuffer_.addMessage(outputLength);
+              decodeBuffer.decodeBoolValue(value);
+              outputMessage[1] = (unsigned char) value;
+              decodeBuffer.decodeCachedValue(value, 29,
+                                     serverCache_ -> queryPointerRootCache, 9);
+              PutULONG(value, outputMessage + 8, bigEndian_);
+              decodeBuffer.decodeCachedValue(value, 29,
+                                    serverCache_ -> queryPointerChildCache, 9);
+              PutULONG(value, outputMessage + 12, bigEndian_);
+              decodeBuffer.decodeCachedValue(value, 16,
+                                    serverCache_ -> motionNotifyRootXCache, 8);
+              serverCache_ -> motionNotifyLastRootX += value;
+              PutUINT(serverCache_ -> motionNotifyLastRootX, outputMessage + 16,
+                      bigEndian_);
+              decodeBuffer.decodeCachedValue(value, 16,
+                                    serverCache_ -> motionNotifyRootYCache, 8);
+              serverCache_ -> motionNotifyLastRootY += value;
+              PutUINT(serverCache_ -> motionNotifyLastRootY, outputMessage + 18,
+                      bigEndian_);
+              decodeBuffer.decodeCachedValue(value, 16,
+                                   serverCache_ -> motionNotifyEventXCache, 8);
+              PutUINT(serverCache_ -> motionNotifyLastRootX + value,
+                      outputMessage + 20, bigEndian_);
+              decodeBuffer.decodeCachedValue(value, 16,
+                                   serverCache_ -> motionNotifyEventYCache, 8);
+              PutUINT(serverCache_ -> motionNotifyLastRootY + value,
+                      outputMessage + 22, bigEndian_);
+              decodeBuffer.decodeCachedValue(value, 16,
+                                       serverCache_ -> motionNotifyStateCache);
+              PutUINT(value, outputMessage + 24, bigEndian_);
+            }
+            break;
+          case X_QueryTree:
+            {
+              unsigned int children;
+              decodeBuffer.decodeValue(children, 16, 8);
+
+              outputLength = 32 + (children << 2);
+              outputMessage = writeBuffer_.addMessage(outputLength);
+
+              PutULONG(outputLength, outputMessage + 4, bigEndian_);
+
+              decodeBuffer.decodeCachedValue(value, 29,
+                                 serverCache_ -> queryTreeWindowCache);
+
+              PutULONG(value, outputMessage + 8, bigEndian_);
+
+              decodeBuffer.decodeCachedValue(value, 29,
+                                 serverCache_ -> queryTreeWindowCache);
+
+              PutULONG(value, outputMessage + 12, bigEndian_);
+
+              unsigned char *next = outputMessage + 32;
+
+              PutUINT(children, outputMessage + 16, bigEndian_);
+
+              for (unsigned int i = 0; i < children; i++)
+              {
+                decodeBuffer.decodeCachedValue(value, 29,
+                                   serverCache_ -> queryTreeWindowCache);
+
+                PutULONG(value, next + (i * 4), bigEndian_);
+              }
+            }
+            break;
+          case X_TranslateCoords:
+            {
+              outputLength = 32;
+              outputMessage = writeBuffer_.addMessage(outputLength);
+              decodeBuffer.decodeBoolValue(value);
+              outputMessage[1] = (unsigned char) value;
+              decodeBuffer.decodeCachedValue(value, 29,
+                                 serverCache_ -> translateCoordsChildCache, 9);
+              PutULONG(value, outputMessage + 8, bigEndian_);
+              decodeBuffer.decodeCachedValue(value, 16,
+                                     serverCache_ -> translateCoordsXCache, 8);
+              PutUINT(value, outputMessage + 12, bigEndian_);
+              decodeBuffer.decodeCachedValue(value, 16,
+                                     serverCache_ -> translateCoordsYCache, 8);
+              PutUINT(value, outputMessage + 14, bigEndian_);
+            }
+            break;
+          case X_GetImage:
+            {
+              MessageStore *messageStore = serverStore_ ->
+                                   getReplyStore(X_GetImage);
+
+              if (handleDecodeCached(decodeBuffer, serverCache_, messageStore,
+                                         outputMessage, outputLength))
+              {
+                break;
+              }
+
+              // Depth.
+              decodeBuffer.decodeCachedValue(cValue, 8,
+                                 serverCache_ -> depthCache);
+              // Reply length.
+              unsigned int replyLength;
+              decodeBuffer.decodeValue(replyLength, 32, 9);
+              outputLength = 32 + (replyLength << 2);
+              outputMessage = writeBuffer_.addMessage(outputLength);
+              outputMessage[1] = (unsigned char) cValue;
+              // Visual.
+              unsigned int visual;
+              decodeBuffer.decodeCachedValue(visual, 29, 
+                                 serverCache_ -> visualCache);
+              PutULONG(visual, outputMessage + 8, bigEndian_);
+
+              // Since ProtoStep8 (#issue 108)
+              handleCopy(decodeBuffer, requestOpcode, messageStore ->
+                             dataOffset, outputMessage, outputLength);
+
+              handleSave(messageStore, outputMessage, outputLength);
+            }
+            break;
+          case X_GetPointerMapping:
+            {
+              unsigned int nextByte;
+              decodeBuffer.decodeValue(nextByte, 8, 4);
+              unsigned int replyLength;
+              decodeBuffer.decodeValue(replyLength, 32, 4);
+              outputLength = 32 + (replyLength << 2);
+              outputMessage = writeBuffer_.addMessage(outputLength);
+              outputMessage[1] = (unsigned char) nextByte;
+              unsigned char *nextDest = outputMessage + 32;
+              for (unsigned int i = 32; i < outputLength; i++)
+              {
+                decodeBuffer.decodeValue(nextByte, 8, 4);
+                *nextDest++ = (unsigned char) nextByte;
+              }
+            }
+            break;
+          case X_GetKeyboardControl:
+            {
+              unsigned int nextByte;
+              decodeBuffer.decodeValue(nextByte, 8, 2);
+              unsigned int replyLength;
+              decodeBuffer.decodeValue(replyLength, 32, 8);
+              outputLength = 32 + (replyLength << 2);
+              outputMessage = writeBuffer_.addMessage(outputLength);
+              outputMessage[1] = (unsigned char) nextByte;
+              unsigned char *nextDest = outputMessage + 8;
+              for (unsigned int i = 8; i < outputLength; i++)
+              {
+                decodeBuffer.decodeValue(nextByte, 8, 4);
+                *nextDest++ = (unsigned char) nextByte;
+              }
+            }
+            break;
+          default:
+            {
+              if (requestOpcode == opcodeStore_ -> getUnpackParameters)
+              {
+                #ifdef TEST
+                *logofs << "handleWrite: Received get unpack parameters reply "
+                        << "OPCODE#" << (unsigned int) opcodeStore_ -> getUnpackParameters
+                        << ".\n" << logofs_flush;
+                #endif
+
+                outputLength = 32 + PACK_METHOD_LIMIT;
+
+                outputMessage = writeBuffer_.addMessage(outputLength);
+
+                unsigned int method;
+
+                //
+                // Let agent use only the unpack methods
+                // implemented at both sides.
+                //
+
+                for (int i = 0; i < PACK_METHOD_LIMIT; i++)
+                {
+                  decodeBuffer.decodeBoolValue(method);
+
+                  control -> RemoteUnpackMethods[i] = method;
+
+                  *(outputMessage + 32 + i) =
+                      (control -> LocalUnpackMethods[i] == 1 &&
+                           method == 1);
+                }
+              }
+              else if (requestOpcode == opcodeStore_ -> getShmemParameters)
+              {
+                if (handleShmemReply(decodeBuffer, requestOpcode,
+                                         outputMessage, outputLength) < 0)
+                {
+                  return -1;
+                }
+              }
+              else if (requestOpcode == opcodeStore_ -> getFontParameters)
+              {
+                if (handleFontReply(decodeBuffer, requestOpcode,
+                                        outputMessage, outputLength) < 0)
+                {
+                  return -1;
+                }
+              }
+              else
+              {
+                #ifdef PANIC
+                *logofs << "handleWrite: PANIC! No matching request for "
+                        << "reply with sequence number " << sequenceNum
+                        << ".\n" << logofs_flush;
+                #endif
+
+                cerr << "Error" << ": No matching request for "
+                     << "reply with sequence number " << sequenceNum
+                     << ".\n";
+
+                return -1;
+              }
+            }
+          }
+
+          #if defined(TEST) || defined(OPCODES)
+          *logofs << "handleWrite: Handled reply to OPCODE#"
+                  << (unsigned) requestOpcode << " (" << DumpOpcode(requestOpcode)
+                  << ")" << " for FD#" << fd_ << " with sequence " << serverSequence_
+                  << ". Output size is " << outputLength << ".\n" << logofs_flush;
+          #endif
+
+          statistics -> addRepliedRequest(requestOpcode);
+        }
+        else // End of if (sequenceQueue_.peek() && ...)
+        {
+          //
+          // Reply didn't match any request opcode.
+          // Check again if differential encoding
+          // is disabled.
+          //
+
+          #ifdef DEBUG
+          *logofs << "handleWrite: Identified generic reply.\n"
+                  << logofs_flush;
+          #endif
+
+          requestOpcode = X_Reply;
+
+          if (control -> RemoteDeltaCompression == 0)
+          {
+            int result = handleFastWriteReply(decodeBuffer, requestOpcode,
+                                                  outputMessage, outputLength);
+            if (result < 0)
+            {
+              return -1;
+            }
+            else if (result > 0)
+            {
+              continue;
+            }
+          }
+
+          //
+          // All replies whose opcode is not pushed in
+          // sequence number queue are cached together.
+          // Among such replies are those to extension
+          // requests.
+          //
+
+          MessageStore *messageStore = serverStore_ ->
+                               getReplyStore(X_NXInternalGenericReply);
+
+          handleDecode(decodeBuffer, serverCache_, messageStore,
+                           requestOpcode, outputMessage, outputLength);
+
+          #if defined(TEST) || defined(OPCODES)
+          *logofs << "handleWrite: Handled generic reply for FD#" << fd_
+                  << " with sequence " << serverSequence_ << ". Output size is "
+                  << outputLength << ".\n" << logofs_flush;
+          #endif
+
+          statistics -> addRepliedRequest(requestOpcode);
+
+        } // End of if (sequenceQueue_.peek() && ...) else ...
+
+        //
+        // If any output was produced then write opcode,
+        // sequence number and size to the buffer.
+        //
+
+        if (outputLength > 0)
+        {
+          *outputMessage = outputOpcode;
+
+          PutUINT(serverSequence_, outputMessage + 2, bigEndian_);
+
+          PutULONG((outputLength - 32) >> 2, outputMessage + 4, bigEndian_);
+        }
+
+      } // End of if (outputOpcode == 1)...
+      else
+      {
+        //
+        // It's an event or error.
+        //
+
+        unsigned int sequenceNum;
+        unsigned int sequenceDiff;
+
+        decodeBuffer.decodeCachedValue(sequenceDiff, 16,
+                           serverCache_ -> eventSequenceCache, 7);
+
+        sequenceNum = (serverSequence_ + sequenceDiff) & 0xffff;
+
+        serverSequence_ = sequenceNum;
+
+        #ifdef DEBUG
+        *logofs << "handleWrite: Last server sequence number for FD#" 
+                << fd_ << " is " << serverSequence_ << " with "
+                << "difference " << sequenceDiff << ".\n"
+                << logofs_flush;
+        #endif
+
+        //
+        // Check if this is an error that matches
+        // a sequence number for which we were
+        // expecting a reply.
+        //
+
+        if (outputOpcode == X_Error)
+        {
+          unsigned short int errorSequenceNum;
+          unsigned char errorOpcode;
+
+          if (sequenceQueue_.peek(errorSequenceNum, errorOpcode) &&
+                  ((unsigned) errorSequenceNum == serverSequence_))
+          {
+            //
+            // Remove the queued sequence of the reply.
+            //
+
+            #ifdef TEST
+            *logofs << "handleWrite: WARNING! Removing reply to OPCODE#"
+                    << (unsigned) errorOpcode << " sequence "
+                    << errorSequenceNum << " for FD#" << fd_
+                    << " due to error.\n" << logofs_flush;
+            #endif
+
+            sequenceQueue_.pop(errorSequenceNum, errorOpcode);
+
+            //
+            // Send to the client the current sequence
+            // number, not the number that matched the
+            // reply. Because we are generating replies
+            // at our side, Xlib can incur in a sequence
+            // lost if the error comes after the auto-
+            // generated reply.
+            //
+
+            if (control -> SessionMode == session_proxy)
+            {
+              #ifdef TEST
+              *logofs << "handleWrite: Updating last event's sequence "
+                      << lastSequence_ << " to X server's error sequence "
+                      << "number " << serverSequence_ << " for FD#"
+                      << fd_ << ".\n" << logofs_flush;
+              #endif
+
+              lastSequence_ = serverSequence_;
+            }
+          }
+
+          //
+          // In case of errors always send to client the
+          // original X server's sequence associated to
+          // the failing request.
+          //
+
+          if (control -> SessionMode != session_proxy)
+          {
+            #ifdef TEST
+            *logofs << "handleWrite: Updating last event's sequence "
+                    << lastSequence_ << " to X server's error sequence "
+                    << "number " << serverSequence_ << " for FD#"
+                    << fd_ << ".\n" << logofs_flush;
+            #endif
+
+            lastSequence_ = serverSequence_;
+          }
+        }
+
+        //
+        // Check if by producing events at client side we
+        // have modified the events' sequence numbering.
+        // In this case taint the original sequence to
+        // comply with the last one known by client.
+        //
+
+/*
+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 "
+                  << lastSequence_ << " to X server's sequence number "
+                  << serverSequence_ << " for FD#" << fd_
+                  << ".\n" << logofs_flush;
+          #endif
+
+          lastSequence_ = serverSequence_;
+        }
+        #ifdef DEBUG
+        else if (serverSequence_ < lastSequence_)
+        {
+          //
+          // Use our last auto-generated sequence.
+          //
+
+          *logofs << "handleWrite: Tainting sequence number "
+                  << serverSequence_ << " to last event's sequence "
+                  << lastSequence_ << " for FD#" << fd_ << ".\n"
+                  << logofs_flush;
+        }
+        #endif
+
+        //
+        // Check if remote side used fast encoding.
+        //
+
+        if (control -> RemoteDeltaCompression == 0)
+        {
+          int result = handleFastWriteEvent(decodeBuffer, outputOpcode,
+                                                outputMessage, outputLength);
+          if (result < 0)
+          {
+            return -1;
+          }
+          else if (result > 0)
+          {
+            continue;
+          }
+        }
+
+        //
+        // Make space for message in the outgoing buffer
+        // and write opcode and sequence number.
+        //
+
+        outputLength = 32;
+        outputMessage = writeBuffer_.addMessage(outputLength);
+
+        *outputMessage = outputOpcode;
+
+        PutUINT(lastSequence_, outputMessage + 2, bigEndian_);
+
+        #ifdef DEBUG
+        *logofs << "handleWrite: Going to handle event or error OPCODE#"
+                << (unsigned int) outputOpcode << " for FD#" << fd_
+                << " sequence " << lastSequence_ << " (real was "
+                << serverSequence_ << ").\n" << logofs_flush;
+        #endif
+
+        switch (outputOpcode)
+        {
+        case X_Error:
+          {
+            unsigned char code;
+            decodeBuffer.decodeCachedValue(code, 8,
+                               serverCache_ -> errorCodeCache);
+            outputMessage[1] = code;
+
+            #if defined(TEST) || defined(OPCODES)
+            *logofs << "handleWrite: Handled error ERR_CODE#"
+                    << (unsigned int) code << " for FD#" << fd_;
+            #endif
+
+            if ((code != 11) && (code != 8) &&
+                    (code != 15) && (code != 1))
+            {
+              decodeBuffer.decodeValue(value, 32, 16);
+              PutULONG(value, outputMessage + 4, bigEndian_);
+
+              #if defined(TEST) || defined(OPCODES)
+              *logofs << " RES_ID#" << value;
+              #endif
+            }
+
+            if (code >= 18)
+            {
+              decodeBuffer.decodeCachedValue(value, 16,
+                                 serverCache_ -> errorMinorCache);
+              PutUINT(value, outputMessage + 8, bigEndian_);
+
+              #if defined(TEST) || defined(OPCODES)
+              *logofs << " MIN_OP#" << value;
+              #endif
+            }
+
+            decodeBuffer.decodeCachedValue(cValue, 8,
+                               serverCache_ -> errorMajorCache);
+            outputMessage[10] = cValue;
+
+            #if defined(TEST) || defined(OPCODES)
+            *logofs << " MAJ_OP#" << (unsigned int) cValue;
+            #endif
+
+            if (code >= 18)
+            {
+              unsigned char *nextDest = outputMessage + 11;
+              for (unsigned int i = 11; i < 32; i++)
+              {
+                decodeBuffer.decodeValue(value, 8);
+                *nextDest++ = (unsigned char) cValue;
+              }
+            }
+
+            #if defined(TEST) || defined(OPCODES)
+            *logofs << " sequence " << lastSequence_ << " (real was "
+                    << serverSequence_ << ") . Size is "
+                    << (unsigned int) outputLength << ".\n"
+                    << logofs_flush;
+            #endif
+          }
+          break;
+        case ButtonPress:
+        case ButtonRelease:
+        case KeyPress:
+        case KeyRelease:
+        case MotionNotify:
+        case EnterNotify:
+        case LeaveNotify:
+          {
+            if (outputOpcode == MotionNotify)
+            {
+              decodeBuffer.decodeBoolValue(value);
+            }
+            else if (outputOpcode == EnterNotify || outputOpcode == LeaveNotify)
+            {
+              decodeBuffer.decodeValue(value, 3);
+            }
+            else if (outputOpcode == KeyRelease)
+            {
+              decodeBuffer.decodeBoolValue(value);
+              if (value)
+              {
+                value = serverCache_ -> keyPressLastKey;
+              }
+              else
+              {
+                decodeBuffer.decodeValue(value, 8);
+              }
+            }
+            else if (outputOpcode == ButtonPress || outputOpcode == ButtonRelease)
+            {
+              decodeBuffer.decodeCachedValue(cValue, 8,
+                                 serverCache_ -> buttonCache);
+              value = (unsigned int) cValue;
+            }
+            else
+            {
+              decodeBuffer.decodeValue(value, 8);
+            }
+
+            outputMessage[1] = (unsigned char) value;
+            decodeBuffer.decodeCachedValue(value, 32,
+                               serverCache_ -> motionNotifyTimestampCache, 9);
+            serverCache_ -> lastTimestamp += value;
+            PutULONG(serverCache_ -> lastTimestamp, outputMessage + 4,
+                     bigEndian_);
+            unsigned char *nextDest = outputMessage + 8;
+            int skipRest = 0;
+            if (outputOpcode == KeyRelease)
+            {
+              decodeBuffer.decodeBoolValue(value);
+              if (value)
+              {
+                for (unsigned int i = 0; i < 23; i++)
+                {
+                  *nextDest++ = serverCache_ -> keyPressCache[i];
+                }
+                skipRest = 1;
+              }
+            }
+
+            if (!skipRest)
+            {
+              for (unsigned int i = 0; i < 3; i++)
+              {
+                decodeBuffer.decodeCachedValue(value, 29,
+                                   *serverCache_ -> motionNotifyWindowCache[i], 6);
+                PutULONG(value, nextDest, bigEndian_);
+                nextDest += 4;
+              }
+              decodeBuffer.decodeCachedValue(value, 16,
+                                    serverCache_ -> motionNotifyRootXCache, 6);
+              serverCache_ -> motionNotifyLastRootX += value;
+              PutUINT(serverCache_ -> motionNotifyLastRootX, outputMessage + 20,
+                      bigEndian_);
+              decodeBuffer.decodeCachedValue(value, 16,
+                                    serverCache_ -> motionNotifyRootYCache, 6);
+              serverCache_ -> motionNotifyLastRootY += value;
+              PutUINT(serverCache_ -> motionNotifyLastRootY, outputMessage + 22,
+                      bigEndian_);
+              decodeBuffer.decodeCachedValue(value, 16,
+                                   serverCache_ -> motionNotifyEventXCache, 6);
+              PutUINT(serverCache_ -> motionNotifyLastRootX + value,
+                      outputMessage + 24, bigEndian_);
+              decodeBuffer.decodeCachedValue(value, 16,
+                                   serverCache_ -> motionNotifyEventYCache, 6);
+              PutUINT(serverCache_ -> motionNotifyLastRootY + value,
+                      outputMessage + 26, bigEndian_);
+              decodeBuffer.decodeCachedValue(value, 16,
+                                       serverCache_ -> motionNotifyStateCache);
+              PutUINT(value, outputMessage + 28, bigEndian_);
+              if (outputOpcode == EnterNotify || outputOpcode == LeaveNotify)
+              {
+                decodeBuffer.decodeValue(value, 2);
+              }
+              else
+              {
+                decodeBuffer.decodeBoolValue(value);
+              }
+              outputMessage[30] = (unsigned char) value;
+              if (outputOpcode == EnterNotify || outputOpcode == LeaveNotify)
+              {
+                decodeBuffer.decodeValue(value, 2);
+                outputMessage[31] = (unsigned char) value;
+              }
+              else if (outputOpcode == KeyPress)
+              {
+                serverCache_ -> keyPressLastKey = outputMessage[1];
+                for (unsigned int i = 8; i < 31; i++)
+                {
+                  serverCache_ -> keyPressCache[i - 8] = outputMessage[i];
+                }
+              }
+            }
+          }
+          break;
+        case ColormapNotify:
+          {
+            decodeBuffer.decodeCachedValue(value, 29,
+                                 serverCache_ -> colormapNotifyWindowCache, 8);
+            PutULONG(value, outputMessage + 4, bigEndian_);
+            decodeBuffer.decodeCachedValue(value, 29,
+                               serverCache_ -> colormapNotifyColormapCache, 8);
+            PutULONG(value, outputMessage + 8, bigEndian_);
+            decodeBuffer.decodeBoolValue(value);
+            outputMessage[12] = (unsigned char) value;
+            decodeBuffer.decodeBoolValue(value);
+            outputMessage[13] = (unsigned char) value;
+          }
+          break;
+        case ConfigureNotify:
+          {
+            unsigned char *nextDest = outputMessage + 4;
+            for (unsigned int i = 0; i < 3; i++)
+            {
+              decodeBuffer.decodeCachedValue(value, 29,
+                                 *serverCache_ -> configureNotifyWindowCache[i], 9);
+              PutULONG(value, nextDest, bigEndian_);
+              nextDest += 4;
+            }
+            for (unsigned int j = 0; j < 5; j++)
+            {
+              decodeBuffer.decodeCachedValue(value, 16,
+                                 *serverCache_ -> configureNotifyGeomCache[j], 8);
+              PutUINT(value, nextDest, bigEndian_);
+              nextDest += 2;
+            }
+            decodeBuffer.decodeBoolValue(value);
+            *nextDest = value;
+          }
+          break;
+        case CreateNotify:
+          {
+            decodeBuffer.decodeCachedValue(value, 29,
+                                 serverCache_ -> createNotifyWindowCache, 9);
+            PutULONG(value, outputMessage + 4, bigEndian_);
+            decodeBuffer.decodeValue(value, 29, 5);
+            serverCache_ -> createNotifyLastWindow += value;
+            serverCache_ -> createNotifyLastWindow &= 0x1fffffff;
+            PutULONG(serverCache_ -> createNotifyLastWindow, outputMessage + 8,
+                     bigEndian_);
+            unsigned char* nextDest = outputMessage + 12;
+            for (unsigned int i = 0; i < 5; i++)
+            {
+              decodeBuffer.decodeValue(value, 16, 9);
+              PutUINT(value, nextDest, bigEndian_);
+              nextDest += 2;
+            }
+            decodeBuffer.decodeBoolValue(value);
+            *nextDest = (unsigned char) value;
+          }
+          break;
+        case Expose:
+          {
+            decodeBuffer.decodeCachedValue(value, 29,
+                               serverCache_ -> exposeWindowCache, 9);
+            PutULONG(value, outputMessage + 4, bigEndian_);
+            unsigned char *nextDest = outputMessage + 8;
+            for (unsigned int i = 0; i < 5; i++)
+            {
+              decodeBuffer.decodeCachedValue(value, 16,
+                                 *serverCache_ -> exposeGeomCache[i], 6);
+              PutUINT(value, nextDest, bigEndian_);
+              nextDest += 2;
+            }
+          }
+          break;
+        case FocusIn:
+        case FocusOut:
+          {
+            decodeBuffer.decodeValue(value, 3);
+            outputMessage[1] = (unsigned char) value;
+            decodeBuffer.decodeCachedValue(value, 29,
+                                        serverCache_ -> focusInWindowCache, 9);
+            PutULONG(value, outputMessage + 4, bigEndian_);
+            decodeBuffer.decodeValue(value, 2);
+            outputMessage[8] = (unsigned char) value;
+          }
+          break;
+        case KeymapNotify:
+          {
+            decodeBuffer.decodeBoolValue(value);
+            if (value)
+            memcpy(outputMessage + 1, ServerCache::lastKeymap.getData(), 31);
+            else
+            {
+              unsigned char *nextDest = outputMessage + 1;
+              for (unsigned int i = 1; i < 32; i++)
+              {
+                decodeBuffer.decodeValue(value, 8);
+                *nextDest++ = (unsigned char) value;
+              }
+            ServerCache::lastKeymap.set(31, outputMessage + 1);
+            }
+          }
+          break;
+        case MapNotify:
+        case UnmapNotify:
+        case DestroyNotify:
+          {
+            decodeBuffer.decodeCachedValue(value, 29,
+                                       serverCache_ -> mapNotifyEventCache, 9);
+            PutULONG(value, outputMessage + 4, bigEndian_);
+            decodeBuffer.decodeCachedValue(value, 29,
+                                      serverCache_ -> mapNotifyWindowCache, 9);
+            PutULONG(value, outputMessage + 8, bigEndian_);
+            if (outputOpcode == MapNotify || outputOpcode == UnmapNotify)
+            {
+              decodeBuffer.decodeBoolValue(value);
+              outputMessage[12] = (unsigned char) value;
+            }
+          }
+          break;
+        case NoExpose:
+          {
+            decodeBuffer.decodeCachedValue(value, 29,
+                                     serverCache_ -> noExposeDrawableCache, 9);
+            PutULONG(value, outputMessage + 4, bigEndian_);
+            decodeBuffer.decodeCachedValue(value, 16,
+                                           serverCache_ -> noExposeMinorCache);
+            PutUINT(value, outputMessage + 8, bigEndian_);
+            decodeBuffer.decodeCachedValue(cValue, 8,
+                                           serverCache_ -> noExposeMajorCache);
+            outputMessage[10] = cValue;
+          }
+          break;
+        case PropertyNotify:
+          {
+            decodeBuffer.decodeCachedValue(value, 29,
+                                 serverCache_ -> propertyNotifyWindowCache, 9);
+            PutULONG(value, outputMessage + 4, bigEndian_);
+            decodeBuffer.decodeCachedValue(value, 29,
+                                   serverCache_ -> propertyNotifyAtomCache, 9);
+            PutULONG(value, outputMessage + 8, bigEndian_);
+            decodeBuffer.decodeValue(value, 32, 9);
+            serverCache_ -> lastTimestamp += value;
+            PutULONG(serverCache_ -> lastTimestamp, outputMessage + 12,
+                     bigEndian_);
+            decodeBuffer.decodeBoolValue(value);
+            outputMessage[16] = (unsigned char) value;
+          }
+          break;
+        case ReparentNotify:
+          {
+            unsigned char* nextDest = outputMessage + 4;
+            for (unsigned int i = 0; i < 3; i++)
+            {
+              decodeBuffer.decodeCachedValue(value, 29,
+                             serverCache_ -> reparentNotifyWindowCache, 9);
+              PutULONG(value, nextDest, bigEndian_);
+              nextDest += 4;
+            }
+            decodeBuffer.decodeValue(value, 16, 6);
+            PutUINT(value, nextDest, bigEndian_);
+            decodeBuffer.decodeValue(value, 16, 6);
+            PutUINT(value, nextDest + 2, bigEndian_);
+            decodeBuffer.decodeBoolValue(value);
+            outputMessage[20] = (unsigned char)value;
+          }
+          break;
+        case SelectionClear:
+          {
+            decodeBuffer.decodeValue(value, 32, 9);
+            serverCache_ -> lastTimestamp += value;
+            PutULONG(serverCache_ -> lastTimestamp, outputMessage + 4,
+                     bigEndian_);
+            decodeBuffer.decodeCachedValue(value, 29,
+                                   serverCache_ -> selectionClearWindowCache, 9);
+            PutULONG(value, outputMessage + 8, bigEndian_);
+            decodeBuffer.decodeCachedValue(value, 29,
+                                   serverCache_ -> selectionClearAtomCache, 9);
+            PutULONG(value, outputMessage + 12, bigEndian_);
+          }
+          break;
+        case SelectionRequest:
+          {
+            decodeBuffer.decodeValue(value, 32, 9);
+            serverCache_ -> lastTimestamp += value;
+            PutULONG(serverCache_ -> lastTimestamp, outputMessage + 4,
+                     bigEndian_);
+            decodeBuffer.decodeCachedValue(value, 29,
+                                   serverCache_ -> selectionClearWindowCache, 9);
+            PutULONG(value, outputMessage + 8, bigEndian_);
+            decodeBuffer.decodeCachedValue(value, 29,
+                                   serverCache_ -> selectionClearWindowCache, 9);
+            PutULONG(value, outputMessage + 12, bigEndian_);
+            decodeBuffer.decodeCachedValue(value, 29,
+                                   serverCache_ -> selectionClearAtomCache, 9);
+            PutULONG(value, outputMessage + 16, bigEndian_);
+            decodeBuffer.decodeCachedValue(value, 29,
+                                   serverCache_ -> selectionClearAtomCache, 9);
+            PutULONG(value, outputMessage + 20, bigEndian_);
+            decodeBuffer.decodeCachedValue(value, 29,
+                                   serverCache_ -> selectionClearAtomCache, 9);
+            PutULONG(value, outputMessage + 24, bigEndian_);
+          }
+          break;
+        case VisibilityNotify:
+          {
+            decodeBuffer.decodeCachedValue(value, 29,
+                               serverCache_ -> visibilityNotifyWindowCache, 9);
+            PutULONG(value, outputMessage + 4, bigEndian_);
+            decodeBuffer.decodeValue(value, 2);
+            outputMessage[8] = (unsigned char) value;
+          }
+          break;
+        default:
+          {
+            #ifdef TEST
+            *logofs << "handleWrite: Using generic event compression "
+                    << "for OPCODE#" << (unsigned int) outputOpcode
+                    << ".\n" << logofs_flush;
+            #endif
+
+            decodeBuffer.decodeCachedValue(*(outputMessage + 1), 8,
+                         serverCache_ -> genericEventCharCache);
+
+            for (unsigned int i = 0; i < 14; i++)
+            {
+              decodeBuffer.decodeCachedValue(value, 16,
+                           *serverCache_ -> genericEventIntCache[i]);
+
+              PutUINT(value, outputMessage + i * 2 + 4, bigEndian_);
+            }
+          }
+        } // End of switch (outputOpcode)...
+
+        #if defined(TEST) || defined(OPCODES)
+        if (outputOpcode != X_Error)
+        {
+          *logofs << "handleWrite: Handled event OPCODE#"
+                  << (unsigned int) outputOpcode << " for FD#"
+                  << fd_ << " sequence " << lastSequence_ << " (real was "
+                  << serverSequence_ << "). Size is " << outputLength
+                  << ".\n" << logofs_flush;
+        }
+        #endif
+
+        //
+        // Check if we need to suppress the error.
+        //
+
+        if (outputOpcode == X_Error &&
+                handleTaintSyncError(*(outputMessage + 10)) > 0)
+        {
+          #if defined(TEST) || defined(OPCODES)
+          *logofs << "handleWrite: WARNING! Suppressed error OPCODE#"
+                  << (unsigned int) outputOpcode << " for FD#"
+                  << fd_ << " sequence " << lastSequence_ << ".\n"
+                  << logofs_flush;
+          #endif
+
+          writeBuffer_.removeMessage(32);
+        }
+
+      } // End of if (outputOpcode == 1)... else ...
+
+      //
+      // Check if we produced enough data. We need to
+      // decode all provided messages. Just update the
+      // finish flag in case of failure.
+      //
+
+      handleFlush(flush_if_needed);
+
+    } // End of while (decodeBuffer.decodeOpcodeValue(outputOpcode, 8, ...
+
+  } // End of the decoding block.
+
+  //
+  // Write any remaining data to the X connection.
+  //
+
+  if (handleFlush(flush_if_any) < 0)
+  {
+    return -1;
+  }
+
+  return 1;
+}
+
+//
+// End of handleWrite().
+//
+
+//
+// Other members.
+//
+
+int ClientChannel::handleSplit(EncodeBuffer &encodeBuffer, MessageStore *store,
+                                   T_store_action action, int position, const unsigned char opcode,
+                                       const unsigned char *buffer, const unsigned int size)
+{
+  #if defined(TEST) || defined(SPLIT)
+
+  // Since ProtoStep8 (#issue 108)
+  *logofs << "handleSplit: PANIC! SPLIT! Split should "
+          << "not be enabled for message " << "OPCODE#"
+          << (unsigned int) store -> opcode() << ".\n"
+          << logofs_flush;
+
+  HandleCleanup();
+
+  #endif
+
+  //
+  // Refuse the split if it is not introduced
+  // by a start split.
+  //
+
+  // Since ProtoStep7 (#issue 108)
+  if (splitState_.resource == nothing || enableSplit_ == 0)
+  {
+    #if defined(TEST) || defined(SPLIT)
+    *logofs << "handleSplit: SPLIT! Nothing to do for message "
+            << "OPCODE#" << (unsigned int) store -> opcode()
+            << " of size " << size << " position " << position
+            << " with action [" << DumpAction(action) << "] at "
+            << strMsTimestamp() << ".\n" << logofs_flush;
+    #endif
+
+    encodeBuffer.encodeBoolValue(0);
+
+    return 0;
+  }
+
+  //
+  // It's not advisable to allocate the store at
+  // the time we receive the start-split because
+  // we may process all the splits received and
+  // deallocate the store even before we receive
+  // the end split. Another message for the same
+  // split sequence may then come and we would
+  // have a null split store.
+  //
+
+  handleSplitStoreAlloc(&splitResources_, splitState_.resource);
+
+  //
+  // Check if the split was actually requested by
+  // the agent and if the request was saved in the
+  // message store. The split can also be refused
+  // if the message is smaller than the threshold
+  // or if the split store is already full.
+  //
+
+  if (mustSplitMessage(splitState_.resource) == 0)
+  {
+    if (action == IS_HIT || canSplitMessage(splitState_.mode, size) == 0)
+    {
+      #if defined(TEST) || defined(SPLIT)
+
+      if (splitState_.mode == split_none)
+      {
+        #ifdef PANIC
+        *logofs << "handleSplit: PANIC! SPLIT! Split state has "
+                << "mode 'none'.\n" << logofs_flush;
+        #endif
+
+        HandleCleanup();
+      }
+
+      if (action != IS_HIT && (int) size >=
+              control -> SplitDataThreshold)
+      {
+        #ifdef WARNING
+        *logofs << "handleSplit: WARNING! SPLIT! Split stores have "
+                << clientStore_ -> getSplitTotalSize() << " messages "
+                << "and " << clientStore_ -> getSplitTotalStorageSize()
+                << " allocated bytes.\n" << logofs_flush;
+        #endif
+      }
+
+      #endif
+
+      #if defined(TEST) || defined(SPLIT)
+      *logofs << "handleSplit: SPLIT! Message OPCODE#"
+              << (unsigned int) store -> opcode() << " of size " << size
+              << " [not split] with resource " << splitState_.resource
+              << " mode " << splitState_.mode << " position " << position
+              << " and action [" << DumpAction(action) << "] at "
+              << strMsTimestamp() << ".\n" << logofs_flush;
+      #endif
+
+      encodeBuffer.encodeBoolValue(0);
+
+      return 0;
+    }
+  }
+
+  #if defined(TEST) || defined(SPLIT)
+  *logofs << "handleSplit: SPLIT! Message OPCODE#"
+          << (unsigned int) store -> opcode() << " of size " << size
+          << " [split] with resource " << splitState_.resource
+          << " mode " << splitState_.mode << " position " << position
+          << " and action [" << DumpAction(action) << "] at "
+          << strMsTimestamp() << ".\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeBoolValue(1);
+
+  T_checksum checksum = NULL;
+
+  if (action == IS_ADDED)
+  {
+    checksum = store -> getChecksum(position);
+  }
+  else if (action == is_discarded)
+  {
+    //
+    // Generate the checksum on the fly.
+    //
+
+    checksum = store -> getChecksum(buffer, size, bigEndian_);
+  }
+
+  //
+  // The method must abort the connection
+  // if it can't allocate the split.
+  //
+
+  Split *splitMessage = clientStore_ -> getSplitStore(splitState_.resource) ->
+                              add(store, splitState_.resource, splitState_.mode,
+                                      position, action, checksum, buffer, size);
+
+  //
+  // Send the checksum. By using the checksum,
+  // the remote end will try to locate the
+  // message and load it from disk.
+  //
+
+  if (action == IS_HIT)
+  {
+    splitMessage -> setState(split_loaded);
+  }
+  else if (handleSplitChecksum(encodeBuffer, checksum) == 0)
+  {
+    //
+    // If the checksum is not sent, for example
+    // because loading of messages from disk is
+    // disabled, then mark the split as missed.
+    //
+
+    #ifdef WARNING
+    *logofs << "handleSplit: WARNING! Checksum not sent. "
+            << "Marking the split as [missed].\n"
+            << logofs_flush;
+    #endif
+
+    splitMessage -> setState(split_missed);
+  }
+
+  if (action == is_discarded)
+  {
+    delete [] checksum;
+  }
+
+  //
+  // Check if we are ready to send a new split
+  // for this store.
+  //
+
+  handleSplitPending(splitState_.resource);
+
+  #if defined(TEST) || defined(SPLIT)
+
+  *logofs << "handleSplit: SPLIT! There are " << clientStore_ ->
+             getSplitTotalSize() << " messages and " << clientStore_ ->
+             getSplitTotalStorageSize() << " bytes to send in "
+          << "the split stores.\n" << logofs_flush;
+
+  clientStore_ -> dumpSplitStore(splitState_.resource);
+
+  #endif
+
+  return 1;
+}
+
+int ClientChannel::handleSplit(EncodeBuffer &encodeBuffer)
+{
+  //
+  // Determine the maximum amount of bytes
+  // we can write in this iteration.
+  //
+
+  int total = control -> SplitDataPacketLimit;
+
+  int bytes  = total;
+  int splits = 0;
+
+  #if defined(TEST) || defined(SPLIT)
+  *logofs << "handleSplit: SPLIT! Handling splits "
+          << "for FD#" << fd_ << " with " << clientStore_ ->
+             getSplitTotalSize() << " elements and " << total
+          << " bytes to write at " << strMsTimestamp() << ".\n"
+          << logofs_flush;
+  #endif
+
+  if (proxy -> handleAsyncSwitch(fd_) < 0)
+  {
+    return -1;
+  }
+
+  #if defined(TEST) || defined(SPLIT)
+  *logofs << "handleSplit: SPLIT! Looping to find "
+          << "if there is any split to send.\n"
+          << logofs_flush;
+  #endif
+
+  SplitStore *splitStore;
+
+  Split *splitMessage;
+
+  //
+  // Divide the available bandwidth among all the active
+  // split stores by implementing a simple round-robin
+  // mechanism. This can be extended by using an external
+  // function returning the number of bytes to be written
+  // based on the state of the split (splits which didn't
+  // receive yet a confirmation event could be delayed),
+  // the current bitrate, and by letting the agent asso-
+  // ciate a priority to the resource in the start split
+  // operation.
+  //
+
+  splitState_.pending = 0;
+
+  splitResources_.rotate();
+
+  //
+  // Copy the list since elements can be removed
+  // in the middle of the loop.
+  //
+
+  T_list splitList = splitResources_.copyList();
+
+  for (T_list::iterator j = splitList.begin();
+           j != splitList.end(); j++)
+  {
+    int resource = *j;
+
+    #ifdef DEBUG
+    *logofs << "handleSplit: SPLIT! Looping with current "
+            << "resource " << resource << ".\n"
+            << logofs_flush;
+    #endif
+
+    splitStore = clientStore_ -> getSplitStore(resource);
+
+    if (splitStore != NULL)
+    {
+      //
+      // Don't send more than the the packet size
+      // bytes but ensure that we abort any split
+      // found in the disk cache.
+      //
+
+      for (;;)
+      {
+        #if defined(TEST) || defined(SPLIT)
+
+        clientStore_ -> dumpSplitStore(resource);
+
+        #endif
+
+        splitMessage = splitStore -> getFirstSplit();
+
+        if (splitMessage == NULL)
+        {
+          //
+          // We have created the store after a start
+          // split but no message was added yet.
+          //
+
+          #if defined(TEST) || defined(SPLIT)
+          *logofs << "handleSplit: WARNING! SPLIT! The split store "
+                  << "is still empty.\n" << logofs_flush;
+          #endif
+
+          break;
+        }
+
+        //
+        // Splits already aborted can't be in the
+        // split store.
+        //
+
+        #if defined(TEST) || defined(SPLIT)
+
+        if (splitMessage -> getState() == split_aborted)
+        {
+          *logofs << "handleSplit: PANIC! SPLIT! Found an "
+                  << "aborted split in store [" << resource
+                  << "].\n" << logofs_flush;
+
+          HandleCleanup();
+        }
+
+        #endif
+
+        //
+        // Check if there are more messages in the
+        // store that can be aborted or if we have
+        // exceeded the number of bytes we can send
+        // for this iteration.
+        //
+
+        #if defined(TEST) || defined(SPLIT)
+        *logofs << "handleSplit: SPLIT! Checking closure "
+                << "of the inner loop with " << bytes
+                << " bytes to write and split state ["
+                << DumpState(splitMessage -> getState())
+                << "].\n" << logofs_flush;
+        #endif
+
+        if ((splitMessage -> getMode() == split_sync &&
+                splitMessage -> getState() == split_added) ||
+                    (bytes <= 0 && splitMessage ->
+                        getState() != split_loaded))
+        {
+          break;
+        }
+
+        //
+        // If the split was loaded at the remote
+        // side abort it immediately.
+        //
+
+        if (splitMessage -> getState() == split_loaded)
+        {
+          #if defined(TEST) || defined(SPLIT)
+          *logofs << "handleSplit: SPLIT! Sending more data "
+                  << "for store [" << resource << "] with "
+                  << "a split to be aborted.\n"
+                  << logofs_flush;
+          #endif
+
+          if (handleSplitSend(encodeBuffer, resource, splits, bytes) < 0)
+          {
+            return -1;
+          }
+        }
+        else if (bytes > 0)
+        {
+          #if defined(TEST) || defined(SPLIT)
+          *logofs << "handleSplit: SPLIT! Sending more data "
+                  << "for store [" << resource << "] with "
+                  << bytes << " bytes to send.\n"
+                  << logofs_flush;
+          #endif
+
+          if (handleSplitSend(encodeBuffer, resource, splits, bytes) < 0)
+          {
+            return -1;
+          }
+        }
+
+        //
+        // Check if the split store was deleted.
+        //
+
+        splitStore = clientStore_ -> getSplitStore(resource);
+
+        if (splitStore == NULL)
+        {
+          #if defined(TEST) || defined(SPLIT)
+          *logofs << "handleSplit: SPLIT! Exiting from the "
+                  << "inner loop with split store [" << resource
+                  << "] destroyed.\n" << logofs_flush;
+          #endif
+
+          break;
+        }
+      }
+
+      #if defined(TEST) || defined(SPLIT)
+      *logofs << "handleSplit: SPLIT! Completed handling splits "
+              << "for store [" << resource << "] with " << bytes
+              << " bytes still to send.\n" << logofs_flush;
+      #endif
+
+      //
+      // Check if there is still a split to
+      // send for the store just processed.
+      //
+
+      handleSplitPending(resource);
+    }
+  }
+
+  #if defined(TEST) || defined(SPLIT)
+
+  if (splits == 0)
+  {
+    #ifdef PANIC
+    *logofs << "handleSplit: PANIC! Function called but "
+            << "no split message was sent.\n"
+            << logofs_flush;
+    #endif
+
+    HandleCleanup();
+  }
+
+  *logofs << "handleSplit: SPLIT! Sent " << splits
+          << " splits and " << total - bytes << " bytes for FD#" << fd_
+          << " with " << clientStore_ -> getSplitTotalStorageSize()
+          << " bytes and [" << clientStore_ -> getSplitTotalSize()
+          << "] splits remaining.\n" << logofs_flush;
+
+  *logofs << "handleSplit: SPLIT! The pending split flag is "
+          << splitState_.pending << " with " << clientStore_ ->
+             getSplitTotalSize() << " splits in the split stores.\n"
+          << logofs_flush;
+
+  clientStore_ -> dumpSplitStores();
+
+  #endif
+
+  return 1;
+}
+
+int ClientChannel::handleSplitSend(EncodeBuffer &encodeBuffer, int resource,
+                                       int &splits, int &bytes)
+{
+  #if defined(TEST) || defined(SPLIT) 
+
+  SplitStore *splitStore = clientStore_ -> getSplitStore(resource);
+
+  Split *splitMessage = splitStore -> getFirstSplit();
+
+  if (splitStore -> getResource() != resource ||
+          splitMessage -> getResource() != resource)
+  {
+    #ifdef PANIC
+    *logofs << "handleSplitSend: PANIC! The resource doesn't "
+            << "match the split store.\n" << logofs_flush;
+    #endif
+
+    HandleCleanup();
+  }
+
+  *logofs << "handleSplitSend: SPLIT! Sending message "
+          << "OPCODE#" << (unsigned) opcodeStore_ -> splitData
+          << " for resource " << splitMessage -> getResource()
+          << " with request " << splitMessage -> getRequest()
+          << " position " << splitMessage -> getPosition()
+          << " and " << bytes << " bytes to write.\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // Use a special opcode to signal the other
+  // side this is part of a split and not a
+  // new message.
+  //
+
+  encodeBuffer.encodeOpcodeValue(opcodeStore_ -> splitData,
+                                     clientCache_ -> opcodeCache);
+
+  encodeBuffer.encodeCachedValue(resource, 8,
+                     clientCache_ -> resourceCache);
+
+  int result = clientStore_ -> getSplitStore(resource) ->
+                     send(encodeBuffer, bytes);
+
+  if (result < 0)
+  {
+    #ifdef PANIC
+    *logofs << "handleSplit: PANIC! Error sending splits for FD#"
+            << fd_ << ".\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Error sending splits for FD#"
+           << fd_ << ".\n";
+
+    return -1;
+  }
+
+  //
+  // Get the bits written and update the
+  // statistics for this special opcode.
+  //
+
+  int bits = encodeBuffer.diffBits();
+
+  #if defined(TEST) || defined(SPLIT)|| defined(OPCODES)
+  *logofs << "handleSplitSend: SPLIT! Handled request OPCODE#"
+          << (unsigned int) opcodeStore_ -> splitData << " ("
+          << DumpOpcode(opcodeStore_ -> splitData) << ")" << " for FD#"
+          << fd_ << " sequence none. 0 bytes in, " << bits << " bits ("
+          << ((float) bits) / 8 << " bytes) out.\n" << logofs_flush;
+  #endif
+
+  statistics -> addRequestBits(opcodeStore_ -> splitData, 0, bits);
+
+  bytes -= bits >> 3;
+
+  splits++;
+
+  if (result == 1)
+  {
+    #if defined(TEST) || defined(SPLIT)
+    *logofs << "handleSplitSend: SPLIT! Split at the head "
+            << "of the list was completely transferred.\n"
+            << logofs_flush;
+    #endif
+
+    //
+    // The split at the head of the list was
+    // completely transferred.
+    //
+
+    handleRestart(sequence_deferred, resource);
+  }
+  #if defined(TEST) || defined(SPLIT)
+  else
+  {
+    *logofs << "handleSplitSend: SPLIT! More data to send "
+            << "for the split at the head of the list.\n"
+            << logofs_flush;
+  }
+  #endif
+
+  return result;
+}
+
+int ClientChannel::handleSplitChecksum(EncodeBuffer &encodeBuffer, T_checksum checksum)
+{
+  //
+  // Send the checksum only if the loading
+  // or the saving of the message to the
+  // persistent image cache is enabled.
+  //
+
+  if ((control -> ImageCacheEnableLoad == 1 ||
+          control -> ImageCacheEnableSave == 1) &&
+              (enableLoad_ == 1 || enableSave_ == 1))
+  {
+    encodeBuffer.encodeBoolValue(1);
+
+    for (unsigned int i = 0; i < MD5_LENGTH; i++)
+    {
+      encodeBuffer.encodeValue((unsigned int) checksum[i], 8);
+    }
+
+    #if defined(TEST) || defined(SPLIT)
+    *logofs << "handleSplitChecksum: SPLIT! Sent checksum "
+            <<  "[" << DumpChecksum(checksum) << "].\n"
+            << logofs_flush;
+    #endif
+
+    return 1;
+  }
+  else
+  {
+    encodeBuffer.encodeBoolValue(0);
+
+    return 0;
+  }
+}
+
+void ClientChannel::handleSplitPending()
+{
+  #if defined(TEST) || defined(SPLIT)
+
+  int previous = splitState_.pending;
+
+  #endif
+
+  if (clientStore_ -> getSplitTotalSize() == 0)
+  {
+    splitState_.pending = 0;
+
+    #if defined(TEST) || defined(SPLIT)
+    *logofs << "handleSplitPending: SPLIT! Set the pending "
+            << "split flag to " << splitState_.pending
+            << " with split stores empty.\n"
+            << logofs_flush;
+    #endif
+  }
+  else
+  {
+    //
+    // Loop through the stores to find if
+    // there is any split that has become
+    // ready.
+    //
+
+    #if defined(TEST) || defined(SPLIT)
+    *logofs << "handleSplitPending: WARNING! SPLIT! Looping to "
+            << "find if there is any split pending.\n"
+            << logofs_flush;
+    #endif
+
+    splitState_.pending = 0;
+
+    T_list &splitList = splitResources_.getList();
+
+    for (T_list::iterator j = splitList.begin();
+             j != splitList.end(); j++)
+    {
+      int resource = *j;
+
+      SplitStore *splitStore = clientStore_ -> getSplitStore(resource);
+
+      if (splitStore != NULL)
+      {
+        #if defined(TEST) || defined(SPLIT)
+
+        clientStore_ -> dumpSplitStore(resource);
+
+        #endif
+
+        Split *splitMessage = splitStore -> getFirstSplit();
+
+        if (splitMessage != NULL && canSendSplit(splitMessage) == 1)
+        {
+          #if defined(TEST) || defined(SPLIT)
+          *logofs << "handleSplitPending: SPLIT! Found a pending "
+                  << "split in store [" << resource << "].\n"
+                  << logofs_flush;
+          #endif
+
+          splitState_.pending = 1;
+
+          #if defined(TEST) || defined(SPLIT)
+
+          if (splitMessage -> getState() == split_loaded)
+          {
+            *logofs << "handleSplitPending: PANIC! SPLIT! Found a "
+                    << "loaded split in store [" << resource
+                    << "].\n" << logofs_flush;
+
+            HandleCleanup();
+          }
+
+          #endif
+
+          break;
+        }
+      }
+    }
+
+    #if defined(TEST) || defined(SPLIT)
+    *logofs << "handleSplitPending: SPLIT! Set the pending "
+            << "split flag to " << splitState_.pending
+            << " with " << clientStore_ -> getSplitTotalSize()
+            << " splits in the split stores.\n"
+            << logofs_flush;
+    #endif
+  }
+
+  #if defined(TEST) || defined(SPLIT)
+
+  if (splitState_.pending != previous)
+  {
+    *logofs << "handleSplitPending: SPLIT! Pending state "
+            << "changed from " << previous << " to "
+            << splitState_.pending << ".\n"
+            << logofs_flush;
+  }
+
+  #endif
+}
+
+int ClientChannel::handleSplitEvent(EncodeBuffer &encodeBuffer, Split *splitMessage)
+{
+  SplitStore *splitStore;
+
+  int resource = splitMessage -> getResource();
+
+  #if defined(TEST) || defined(INFO)
+
+  splitStore = clientStore_ -> getSplitStore(resource);
+
+  if (splitStore == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "handleSplitEvent: PANIC! The split store can't "
+            << "be NULL handling abort splits.\n"
+            << logofs_flush;
+    #endif
+
+    HandleCleanup();
+  }
+  else if (splitMessage -> getState() != split_loaded)
+  {
+    *logofs << "handleSplitEvent: PANIC! Can't find the split "
+            << "to be aborted.\n" << logofs_flush;
+
+    HandleCleanup();
+  }
+
+  #endif
+
+  //
+  // Send any split that it is possible to
+  // abort until the store is either empty
+  // or the next split can't be aborted.
+  //
+
+  if (proxy -> handleAsyncSwitch(fd_) < 0)
+  {
+    return -1;
+  }
+
+  while ((splitStore = clientStore_ ->
+             getSplitStore(resource)) != NULL &&
+                 (splitMessage = splitStore -> getFirstSplit()) != NULL &&
+                     splitMessage -> getState() == split_loaded)
+  {
+    #if defined(TEST) || defined(SPLIT)
+    *logofs << "handleSplitEvent: SPLIT! Aborting split with "
+            << "checksum [" << DumpChecksum(splitMessage ->
+               getChecksum()) << "] for resource " << resource
+            << " at " << strMsTimestamp() << ".\n"
+            << logofs_flush;
+    #endif
+
+    int any = 0;
+
+    if (handleSplitSend(encodeBuffer, resource, any, any) < 0)
+    {
+      return -1;
+    }
+  }
+
+  #if defined(TEST) || defined(SPLIT)
+
+  if ((splitStore = clientStore_ ->
+          getSplitStore(resource)) == NULL)
+  {
+    *logofs << "handleSplitEvent: SPLIT! The split store ["
+            << resource << "] has been destroyed.\n"
+            << logofs_flush;
+  }
+  else if ((splitMessage = splitStore ->
+               getFirstSplit()) == NULL)
+  {
+    *logofs << "handleSplitEvent: SPLIT! The split store ["
+            << resource << "] is empty.\n"
+            << logofs_flush;
+  }
+  else if (splitMessage -> getState() != split_loaded)
+  {
+    *logofs << "handleSplitEvent: SPLIT! The split at the "
+            << "head of store [" << resource << "] doesn't "
+            << "need to be aborted.\n" << logofs_flush;
+  }
+
+  #endif
+
+  return 1;
+}
+
+int ClientChannel::handleSplitEvent(DecodeBuffer &decodeBuffer)
+{
+  #if defined(TEST) || defined(SPLIT)
+  *logofs << "handleSplitEvent: SPLIT! Handling abort "
+          << "split messages for FD#" << fd_ << " at "
+          << strMsTimestamp() << ".\n" << logofs_flush;
+  #endif
+
+  // Since ProtoStep7 (#issue 108)
+
+  //
+  // Decode the information about the
+  // message to be updated.
+  //
+
+  unsigned char resource;
+
+  decodeBuffer.decodeCachedValue(resource, 8,
+                     serverCache_ -> resourceCache);
+
+  unsigned int loaded;
+
+  decodeBuffer.decodeBoolValue(loaded);
+
+  unsigned char request;
+  unsigned int  size;
+
+  if (loaded == 1)
+  {
+    decodeBuffer.decodeOpcodeValue(request, serverCache_ -> abortOpcodeCache);
+
+    decodeBuffer.decodeValue(size, 32, 14);
+  }
+  else
+  {
+    request = 0;
+    size    = 0;
+  }
+
+  unsigned int value;
+
+  md5_byte_t checksum[MD5_LENGTH];
+
+  for (unsigned int i = 0; i < MD5_LENGTH; i++)
+  {
+    decodeBuffer.decodeValue(value, 8);
+
+    checksum[i] = (unsigned char) value;
+  }
+
+  #if defined(TEST) || defined(SPLIT)
+  *logofs << "handleSplitEvent: SPLIT! Checking split "
+          << "with checksum [" << DumpChecksum(checksum)
+          << "] loaded " << loaded << " request " << (unsigned int)
+             request << " compressed size " << size << " at "
+          << strMsTimestamp() << ".\n" << logofs_flush;
+  #endif
+
+  Split *splitMessage = handleSplitFind(checksum, resource);
+
+  if (splitMessage != NULL)
+  {
+    if (loaded == 1)
+    {
+      #if defined(TEST) || defined(SPLIT)
+      *logofs << "handleSplitEvent: SPLIT! Marked split with "
+              << "checksum [" << DumpChecksum(checksum) << "] "
+              << "as [loaded] at " << strMsTimestamp() << ".\n"
+              << logofs_flush;
+      #endif
+
+      splitMessage -> setState(split_loaded);
+
+      #if defined(TEST) || defined(SPLIT)
+
+      if (splitMessage -> compressedSize() != (int) size)
+      {
+        *logofs << "handleSplitEvent: WARNING! SPLIT! Updating "
+                << "compressed data size from " << splitMessage ->
+                   compressedSize() << " to " << size << ".\n"
+                << logofs_flush;
+      }
+
+      #endif
+
+      splitMessage -> compressedSize(size);
+
+      //
+      // The splits to be aborted are checked by the split
+      // store at the time we are going to send a new chunk
+      // of split data. The splits must be strictly handled
+      // in the same order as they were added to the split
+      // store and the split we want to abort here may be
+      // not at the head of the list.
+      //
+
+      if (splitMessage == clientStore_ ->
+              getSplitStore(resource) -> getFirstSplit())
+      {
+        //
+        // We don't need to flush this packet immediately.
+        // The abort can be sent at any time to the remote
+        // proxy. What's important is that we restart the
+        // agent resource as soon as possible.
+        //
+
+        #if defined(TEST) || defined(SPLIT)
+
+        T_timestamp startTs = getTimestamp();
+
+        *logofs << "handleSplitEvent: SPLIT! Encoding abort "
+                << "split events for FD#" << fd_ << " with "
+                << "resource " << (unsigned) resource << " at "
+                << strMsTimestamp() << ".\n" << logofs_flush;
+        #endif
+
+        if (proxy -> handleAsyncSplit(fd_, splitMessage) < 0)
+        {
+          return -1;
+        }
+
+        #if defined(TEST) || defined(SPLIT)
+        *logofs << "handleSplitEvent: SPLIT! Spent "
+                << diffTimestamp(startTs, getTimestamp()) << " Ms "
+                << "handling abort split events for FD#" << fd_
+                << ".\n" << logofs_flush;
+        #endif
+
+        //
+        // Check if we can clear the pending flag.
+        //
+
+        handleSplitPending();
+      }
+      #if defined(TEST) || defined(SPLIT)
+      else
+      {
+        *logofs << "handleSplitEvent: WARNING! SPLIT! Abort split "
+                << "event not sent because not at the head "
+                << "of the list.\n" << logofs_flush;
+      }
+      #endif
+    }
+    else
+    {
+      #if defined(TEST) || defined(SPLIT)
+      *logofs << "handleSplitEvent: SPLIT! Marked split with "
+              << "checksum [" << DumpChecksum(checksum) << "] "
+              << "as [missed] at " << strMsTimestamp() << ".\n"
+              << logofs_flush;
+      #endif
+
+      splitMessage -> setState(split_missed);
+
+      //
+      // Check if we can set the pending flag.
+      //
+
+      handleSplitPending(resource);
+    }
+  }
+  else
+  {
+    //
+    // The split report came after the split was already
+    // sent or the split store deleted. If the message
+    // had been loaded from disk by the remote side, we
+    // need to update the compressed size in our message
+    // store or the checksum will not match at the time
+    // we will try to save the message store on disk.
+    //
+
+    if (loaded == 1 && size != 0)
+    {
+      #if defined(TEST) || defined(SPLIT)
+      *logofs << "handleSplitEvent: WARNING! SPLIT! Can't find "
+              << "the split. Updating in the message store.\n"
+              << logofs_flush;
+      #endif
+
+      MessageStore *store = clientStore_ -> getRequestStore(request);
+
+      if (store != NULL)
+      {
+        store -> updateData(checksum, size);
+      }
+      #if defined(TEST) || defined(SPLIT)
+      else
+      {
+        #ifdef PANIC
+        *logofs << "handleSplitEvent: PANIC! The message store "
+                << "can't be null.\n" << logofs_flush;
+        #endif
+
+        HandleCleanup();
+      }
+      #endif
+    }
+    #if defined(TEST) || defined(SPLIT)
+    else
+    {
+      *logofs << "handleSplitEvent: WARNING! SPLIT! No need to "
+              << "update the store with loaded " << loaded
+              << " and compressed size " << size << ".\n"
+              << logofs_flush;
+    }
+    #endif
+  }
+
+  return 1;
+}
+
+Split *ClientChannel::handleSplitFind(T_checksum checksum, int resource)
+{
+  //
+  // It can be that we handled all the splits,
+  // restarted the resource and deleted the
+  // store before the event could even reach
+  // our side.
+  //
+
+  SplitStore *splitStore = clientStore_ -> getSplitStore(resource);
+
+  if (splitStore != NULL)
+  {
+    Split *splitMessage;
+
+    T_splits *splitList = splitStore -> getSplits();
+
+    for (T_splits::iterator i = splitList -> begin();
+             i != splitList -> end(); i++)
+    {
+      splitMessage = (*i);
+
+      if (splitMessage -> getChecksum() != NULL)
+      {
+        #if defined(TEST) || defined(SPLIT)
+        *logofs << "handleSplitFind: SPLIT! Comparing with message ["
+                << DumpChecksum(splitMessage -> getChecksum())
+                << "].\n" << logofs_flush;
+        #endif
+
+        if (memcmp(checksum, splitMessage -> getChecksum(), MD5_LENGTH) == 0)
+        {
+          #if defined(TEST) || defined(SPLIT)
+          *logofs << "handleSplitFind: SPLIT! Located split for "
+                  << "checksum [" << DumpChecksum(checksum) << "] "
+                  << "in store [" << splitStore -> getResource()
+                  << "].\n" << logofs_flush;
+          #endif
+
+          return splitMessage;
+        }
+      }
+    }
+  }
+  #if defined(TEST) || defined(SPLIT)
+  else
+  {
+    *logofs << "handleSplitFind: WARNING! SPLIT! The split store "
+            << "was already deleted.\n" << logofs_flush;
+  }
+  #endif
+
+  #if defined(TEST) || defined(SPLIT)
+  *logofs << "handleSplitFind: WARNING! SPLIT! Can't find the "
+          << "split for checksum [" << DumpChecksum(checksum)
+          << "].\n" << logofs_flush;
+  #endif
+
+  return NULL;
+}
+
+int ClientChannel::handleRestart(T_sequence_mode mode, int resource)
+{
+  //
+  // The agent must send a start-split message, followed by the
+  // X messages that may be optionally split by the proxy. Usu-
+  // ally, in the middle of a start-split/end-split sequence is
+  // a single PutImage() or PutPackedImage(), that, in turn,
+  // can generate multiple partial requests, like a SetUnpack-
+  // Colormap() and SetUnpackAlpha() followed by the image that
+  // must be transferred. Multiple requests may be also genera-
+  // ted because the maximum size of a X request has been exce-
+  // eded, so that Xlib has divided the single image in multi-
+  // ple sub-image requests. The agent doesn't need to take care
+  // of that, except tracking the result of the split operation.
+  //
+  // By monitoring the notify events sent by the proxy, the
+  // agent will have to implement its own strategy to deal with
+  // its resources (for example its clients). For example:
+  //
+  // - It will issue a new image request and suspend a client
+  //   if the image was not entirely sent in the main X oputput
+  //   stream.
+  //
+  // - It will choose to commit or discard the messages after
+  //   they are recomposed at the remote side. The set of mes-
+  //   sages that will have to be committed will include all
+  //   messages that were part of the split (the colormap, the
+  //   alpha channel).
+  //
+  // - It will restart its own client, in the case it had been
+  //   suspended.
+  //
+  // A more useful strategy would be to replace the original im-
+  // age with a tiny 'placeholder' if a split took place, and
+  // synchronize the content of the drawable at later time. This
+  // is generally referred as 'lazy encoding'.
+  //
+  // The agent will be able to identify the original split ope-
+  // ration (the one marked with the start-spit) by the small
+  // integer number (0-255) referred to as the 'resource' field.
+  //
+  // Before the proxy will be able to report the status of the
+  // split, the agent will have to close the sequence by issueing
+  // an end-split. The proxy will then report the result of the
+  // operation, so that the agent will have the option of suspend-
+  // ing the client or marking the drawable as dirty and take
+  // care of synchronizing it at later time.
+  //
+  // One of the following cases may be encountered:
+  //
+  // notify_no_split:     All messages were sent in the main out-
+  //                      put stream, so that no split actually
+  //                      took place.
+  //
+  // notify_start_split:  One or more messages were split, so,
+  //                      at discrection of the agent, the client
+  //                      may be suspended until the transferral
+  //                      is completed.
+  //
+  // notify_commit_split: One of the requests that made up the
+  //                      split was recomposed. The agent should
+  //                      either commit the given request or tell
+  //                      the proxy to discard it.
+  //
+  // notify_end_split:    The split was duly completed. The agent
+  //                      can restart the client.
+  //
+  // notify_empty_split:  No more split operation are pending.
+  //                      The agent can use this information to
+  //                      implement specific strategies requiring
+  //                      that all messages have been recomposed
+  //                      at the remote end, like updating the
+  //                      drawables that were not synchronized
+  //                      because of the lazy encoding.
+  //
+  // By checking the split and commit store we can determine if we
+  // need to send a new notification event to the agent. There can
+  // be four different cases:
+  //
+  // - If the split store is not null and not empty, we are still
+  //   in the middle of a split.
+  //
+  // - If the commit store is not empty, we completely recomposed
+  //   a full message and can send a new commit notify.
+  //
+  // - If the split store has become empty, we recomposed all the
+  //   messages added for the given resource, and so will be able
+  //   to restart the resource.
+  //
+  // - If no more messages are in the split stores, we can notify
+  //   an empty split event to the agent.
+  //
+
+  #if defined(TEST) || defined(SPLIT)
+  *logofs << "handleRestart: SPLIT! Handling ["
+          << (mode == sequence_immediate ? "immediate" : "deferred")
+          << "] restart events for resource " << resource << " at "
+          << strMsTimestamp() << ".\n" << logofs_flush;
+  #endif
+
+  SplitStore *splitStore = clientStore_ -> getSplitStore(resource);
+
+  if (mode == sequence_immediate)
+  {
+    //
+    // We have received an end-split request. If the store
+    // was not deleted already, we mark the last split added
+    // as the one ending the row for this resource. If the
+    // commit() function returns 0 it means that the split
+    // store is either empty or that we did not add any split
+    // for this resource. This is because when connected to
+    // an old proxy version we only have a single store for
+    // all the resources.   
+    //
+    // It can happen that all the split messages that were
+    // originally appended to the list were completely sent
+    // before our client had the chance of ending the split
+    // sequence. In this case the split store will be empty
+    // or already deleted and so we will be able to restart
+    // the resource.
+    //
+
+    #if defined(TEST) || defined(SPLIT)
+
+    if (splitStore == NULL)
+    {
+      *logofs << "handleRestart: WARNING! SPLIT! Split store ["
+              << resource << "] was already deleted.\n"
+              << logofs_flush;
+    }
+    else
+    {
+      clientStore_ -> dumpSplitStore(resource);
+    }
+
+    #endif
+
+    if (splitStore == NULL || splitStore -> getSize() == 0)
+    {
+      #if defined(TEST) || defined(SPLIT)
+      *logofs << "handleRestart: SPLIT! Immediate agent split event "
+              << "TYPE#" << (unsigned) opcodeStore_ -> noSplitNotify
+              << " [no split] with resource " << resource
+              << " at " << strMsTimestamp() << ".\n"
+              << logofs_flush;
+      #endif
+
+      if (handleNotify(notify_no_split, sequence_immediate,
+                           resource, nothing, nothing) < 0)
+      {
+        return -1;
+      }
+    }
+    else
+    {
+      #if defined(TEST) || defined(SPLIT)
+      *logofs << "handleRestart: SPLIT! Immediate agent split event "
+              << "TYPE#" << (unsigned) opcodeStore_ -> startSplitNotify
+              << " [start split] with resource " << resource
+              << " at " << strMsTimestamp() << ".\n"
+              << logofs_flush;
+      #endif
+
+      if (handleNotify(notify_start_split, sequence_immediate,
+                           resource, nothing, nothing) < 0)
+      {
+        return -1;
+      }
+    }
+  }
+  else
+  {
+    //
+    // We have completely transferred a message
+    // that was put in the split store.
+    //
+    // The id of the resource can be different
+    // than the index of the store if we are
+    // connected to an old proxy.
+    //
+
+    #if defined(TEST) || defined(SPLIT)
+
+    if (splitStore == NULL)
+    {
+      #ifdef PANIC
+      *logofs << "handleRestart: PANIC! The split store can't "
+              << "be NULL handling deferred restart events.\n"
+              << logofs_flush;
+      #endif
+
+      HandleCleanup();
+    }
+    else
+    {
+      clientStore_ -> dumpSplitStore(resource);
+    }
+
+    #endif
+
+    CommitStore *commitStore = clientStore_ -> getCommitStore();
+
+    #if defined(TEST) || defined(SPLIT)
+
+    clientStore_ -> dumpCommitStore();
+
+    #endif
+
+    //
+    // Check if there is any commit to notify.
+    //
+
+    Split *split;
+
+    T_splits *commitList = commitStore -> getSplits();
+
+    for (T_splits::iterator i = commitList -> begin();
+             i != commitList -> end(); i++)
+    {
+      split = *i;
+
+      if (split -> getState() != split_notified)
+      {
+        #if defined(TEST) || defined(SPLIT) 
+
+        if (split -> getResource() != resource)
+        {
+          #ifdef PANIC
+          *logofs << "handleSplitSend: PANIC! The resource doesn't "
+                  << "match the split store.\n" << logofs_flush;
+          #endif
+
+          HandleCleanup();
+        }
+
+        #endif
+
+        int request  = split -> getRequest();
+        int position = split -> getPosition();
+
+        #if defined(TEST) || defined(SPLIT)
+        *logofs << "handleRestart: SPLIT! Deferred agent split event "
+                << "TYPE#" << (unsigned) opcodeStore_ -> commitSplitNotify
+                << " [commit split] with resource " << resource << " request "
+                << request << " position " << position << " at "
+                << strMsTimestamp() << ".\n" << logofs_flush;
+        #endif
+
+        if (handleNotify(notify_commit_split, sequence_deferred,
+                            resource, request, position) < 0)
+        {
+          return -1;
+        }
+
+        //
+        // Don't send the notification again.
+        //
+
+        split -> setState(split_notified);
+      }
+      #if defined(TEST) || defined(SPLIT)
+      else
+      {
+        *logofs << "handleRestart: SPLIT! Split for request "
+                << split -> getRequest() << " and position "
+                << split -> getPosition() << " was already "
+                << "notified.\n" << logofs_flush;
+      }
+      #endif
+    }
+
+    //
+    // Don't send the end split if we are still
+    // in the middle of a start-split/end-split
+    // sequence. We'll send a no-split at the
+    // time the end-split is received.
+    //
+
+    if (splitStore -> getSize() == 0 &&
+            splitStore -> getResource() != splitState_.resource)
+    {
+      #if defined(TEST) || defined(SPLIT)
+      *logofs << "handleRestart: SPLIT! Deferred agent split event "
+              << "TYPE#" << (unsigned) opcodeStore_ -> endSplitNotify
+              << " [end split] with resource " << resource << " at "
+              << strMsTimestamp() << ".\n" << logofs_flush;
+      #endif
+
+      if (handleNotify(notify_end_split, sequence_deferred,
+                           resource, nothing, nothing) < 0)
+      {
+        return -1;
+      }
+    }
+    #if defined(TEST) || defined(SPLIT)
+    else if (splitStore -> getSize() == 0 &&
+                splitStore -> getResource() == splitState_.resource)
+    {
+      *logofs << "handleRestart: SPLIT! WARNING! The split store "
+              << "for resource " << resource << " was emptied in the "
+              << "split sequence at " << strMsTimestamp() << ".\n"
+              << logofs_flush;
+    }
+    #endif
+  }
+
+  //
+  // Remove the split store if it's empty.
+  //
+
+  if (splitStore != NULL && splitStore -> getSize() == 0 &&
+          splitStore -> getResource() != splitState_.resource)
+  {
+    #if defined(TEST) || defined(SPLIT)
+    *logofs << "handleRestart: SPLIT! Removing the split store ["
+            << resource << "] at " << strMsTimestamp()
+            << ".\n" << logofs_flush;
+    #endif
+
+    handleSplitStoreRemove(&splitResources_, resource);
+
+    if (clientStore_ -> getSplitTotalSize() == 0)
+    {
+      #if defined(TEST) || defined(SPLIT)
+      *logofs << "handleRestart: SPLIT! Deferred agent split event "
+              << "TYPE#" << (unsigned) opcodeStore_ -> emptySplitNotify
+              << " [empty split] for FD#" << fd_ << " at "
+              << strMsTimestamp() << ".\n" << logofs_flush;
+      #endif
+
+      if (handleNotify(notify_empty_split, sequence_deferred,
+                           nothing, nothing, nothing) < 0)
+      {
+        return -1;
+      }
+    }
+
+    #if defined(TEST) || defined(SPLIT)
+    *logofs << "handleRestart: SPLIT! There are " << clientStore_ ->
+               getSplitTotalSize() << " messages and " << clientStore_ ->
+               getSplitTotalStorageSize() << " bytes to send in "
+            << "the split stores.\n" << logofs_flush;
+
+    if ((clientStore_ -> getSplitTotalSize() != 0 &&
+            clientStore_ -> getSplitTotalStorageSize() == 0) ||
+                (clientStore_ -> getSplitTotalSize() == 0 &&
+                    clientStore_ -> getSplitTotalStorageSize() != 0))
+    {
+      #ifdef PANIC
+      *logofs << "handleRestart: PANIC! Inconsistency detected "
+              << "while handling the split stores.\n"
+              << logofs_flush;
+      #endif
+
+      HandleCleanup();
+    }
+
+    #endif
+  }
+
+  return 1;
+}
+
+int ClientChannel::handleTaintLameRequest(unsigned char &opcode, const unsigned char *&buffer,
+                                              unsigned int &size)
+{
+  //
+  // Test the efficiency of the encoding
+  // without these RENDER requests.
+  //
+
+  if (opcode == opcodeStore_ -> renderExtension &&
+          (*(buffer + 1) == X_RenderCompositeGlyphs8 ||
+               *(buffer + 1) == X_RenderCompositeGlyphs16 ||
+                   *(buffer + 1) == X_RenderCompositeGlyphs32 ||
+                       *(buffer + 1) == X_RenderAddGlyphs ||
+                           *(buffer + 1) == X_RenderTrapezoids))
+  {
+    #ifdef TEST
+    *logofs << "handleTaintLameRequest: Tainting request "
+            << "OPCODE#" << (unsigned int) opcode << " MINOR#"
+            << (unsigned int) *(buffer + 1) << " for FD#"
+            << fd_ << ".\n" << logofs_flush;
+    #endif
+
+    opcode = X_NoOperation;
+
+    return 1;
+  }
+
+  return 0;
+}
+
+int ClientChannel::handleTaintSyncRequest(unsigned char &opcode, const unsigned char *&buffer,
+                                              unsigned int &size)
+{
+  //
+  // Should short-circuit other common replies
+  // whose values could be queried only once.
+  // Examples are X_InterAtom, X_ListExtension
+  // and X_QueryExtension.
+  //
+
+  if (taintCounter_ >= control -> TaintThreshold)
+  {
+    #ifdef DEBUG
+    *logofs << "handleTaintSyncRequest: Reset taint counter after "
+            << taintCounter_ << " replies managed.\n"
+            << logofs_flush;
+    #endif
+
+    taintCounter_ = 0;
+
+    return 0;
+  }
+
+  //
+  // Check if we are rolling the counter.
+  // The client sequence number has not
+  // been incremented yet in the loop.
+  //
+
+  unsigned int sequence = (clientSequence_ + 1) & 0xffff;
+
+  #ifdef DEBUG
+  *logofs << "handleTaintSyncRequest: Opcode is " << (unsigned) opcode
+          << " expected client sequence is " << sequence
+          << ".\n" << logofs_flush;
+  #endif
+
+  if (sequence == 0xffff)
+  {
+    return 0;
+  }
+
+  unsigned short t1;
+  unsigned char  t2;
+
+  //
+  // Check if there is a previous reply
+  // pending.
+  //
+
+  if (sequenceQueue_.peek(t1, t2) != 0)
+  {
+    #ifdef DEBUG
+    *logofs << "handleTaintSyncRequest: Skipping taint of reply due to "
+            << "pending request OPCODE#" << t1 << " with sequence "
+            << (unsigned int) t2 << ".\n" << logofs_flush;
+    #endif
+
+    return 0;
+  }
+
+  #ifdef DEBUG
+  *logofs << "handleTaintSyncRequest: Suppressing get input focus "
+          << "request for FD#" << fd_ << " with sequence "
+          << sequence << ".\n" << logofs_flush;
+  #endif
+
+  unsigned char *reply = writeBuffer_.addMessage(32);
+
+  *(reply + 0) = X_Reply;
+
+  PutUINT(sequence, reply + 2, bigEndian_);
+
+  PutULONG(0, reply + 4, bigEndian_);
+
+  //
+  // Set revert-to to none.
+  //
+
+  *(reply + 1) = 0;
+
+  //
+  // Set focus to none.
+  //
+
+  PutULONG(0, reply + 8, bigEndian_);
+
+  //
+  // Save the sequence number, not incremented
+  // yet, we used to auto-generate this reply.
+  //
+
+  lastSequence_ = clientSequence_ + 1;
+
+  #ifdef TEST
+  *logofs << "handleTaintSyncRequest: Registered " << lastSequence_
+          << " as last auto-generated sequence number.\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // Taint the request to a X_NoOperation.
+  //
+
+  opcode = X_NoOperation;
+
+  //
+  // We may assume that the client has finished
+  // drawing and flush immediately, even if this
+  // seems to perceively affect the performance.
+  //
+  // priority_++;
+  //
+
+  if (handleFlush(flush_if_any) < 0)
+  {
+    return -1;
+  }
+
+  taintCounter_++;
+
+  return 1;
+}
+
+int ClientChannel::handleTaintSyncError(unsigned char opcode)
+{
+  if (control -> TaintReplies > 0)
+  {
+    //
+    // By enabling short-circuiting of replies
+    // some window managers can get confused
+    // by some otherwise innocuous X errors.
+    //
+
+    if (opcode == X_GrabKey || opcode == X_ReparentWindow ||
+            opcode == X_ConfigureWindow)
+    {
+      #if defined(TEST) || defined(OPCODES)
+      *logofs << "handleTaintSyncError: WARNING! Suppressed error "
+              << "on OPCODE#" << (unsigned int) opcode << " for FD#"
+              << fd_ << " sequence " << lastSequence_ << " (real was "
+              << serverSequence_ << ").\n" << logofs_flush;
+      #endif
+
+      return 1;
+    }
+  }
+
+  return 0;
+}
+
+int ClientChannel::handleNotify(T_notification_type type, T_sequence_mode mode,
+                                    int resource, int request, int position)
+{
+  if (finish_ == 1)
+  {
+    #if defined(TEST) || defined(INFO)
+    *logofs << "handleNotify: Discarding notification on "
+            << "channel for FD#" << fd_ << ".\n"
+            << logofs_flush;
+    #endif
+
+    return 0;
+  }
+
+  //
+  // Add a new message to the write buffer.
+  //
+
+  unsigned char *event = writeBuffer_.addMessage(32);
+
+  //
+  // Event is ClientMessage, atom and
+  // window are 0, format is 32.
+  //
+
+  *(event + 0) = ClientMessage;
+
+  PutULONG(0, event + 4, bigEndian_);
+  PutULONG(0, event + 8, bigEndian_);
+
+  *(event + 1) = 32;
+
+  //
+  // If the event follows immediately the request (that is the
+  // sequence mode is 'immediate') then the sequence number is
+  // the one of the last request, else it should be the last
+  // sequence number encoded by peer proxy but, as we are ins-
+  // erting events in the stream, we must ensure that the se-
+  // quence we send is not less than the last sequence we have
+  // auto-generated.
+  //
+
+  if (mode == sequence_immediate)
+  {
+    //
+    // Save the sequence number we used
+    // to auto-generate this event.
+    //
+
+    lastSequence_ = clientSequence_;
+
+    #if defined(TEST) || defined(INFO)
+    *logofs << "handleNotify: Registered " << lastSequence_
+            << " as last auto-generated sequence number.\n"
+            << logofs_flush;
+    #endif
+  }
+  else
+  {
+    if (serverSequence_ > lastSequence_)
+    {
+      #ifdef DEBUG
+      *logofs << "handleNotify: Updating last event's sequence "
+              << lastSequence_ << " to X server's sequence number "
+              << serverSequence_ << " for FD#" << fd_ << ".\n"
+              << logofs_flush;
+      #endif
+
+      lastSequence_ = serverSequence_;
+    }
+    #ifdef DEBUG
+    else if (serverSequence_ < lastSequence_)
+    {
+      //
+      // Use our last auto-generated sequence.
+      //
+
+      *logofs << "handleNotify: Tainting sequence number "
+              << serverSequence_ << " to last event's sequence "
+              << lastSequence_ << " for FD#" << fd_ << ".\n"
+              << logofs_flush;
+    }
+    #endif
+  }
+
+  PutUINT(lastSequence_, event + 2, bigEndian_);
+
+  //
+  // Be sure we set to void the fields that
+  // are not significant for the specific
+  // notification message.
+  //
+
+  PutULONG(nothing, event + 16, bigEndian_);
+  PutULONG(nothing, event + 20, bigEndian_);
+  PutULONG(nothing, event + 24, bigEndian_);
+
+  switch (type)
+  {
+    case notify_no_split:
+    {
+      PutULONG(opcodeStore_ -> noSplitNotify,
+                   event + 12, bigEndian_);
+
+      PutULONG(resource, event + 16, bigEndian_);
+
+      break;
+    }
+    case notify_start_split:
+    {
+      PutULONG(opcodeStore_ -> startSplitNotify,
+                   event + 12, bigEndian_);
+
+      PutULONG(resource, event + 16, bigEndian_);
+
+      break;
+    }
+    case notify_commit_split:
+    {
+      PutULONG(opcodeStore_ -> commitSplitNotify,
+                   event + 12, bigEndian_);
+
+      PutULONG(resource, event + 16, bigEndian_);
+
+      PutULONG(request, event + 20, bigEndian_);
+
+      PutULONG(position, event + 24, bigEndian_);
+
+      break;
+    }
+    case notify_end_split:
+    {
+      PutULONG(opcodeStore_ -> endSplitNotify,
+                   event + 12, bigEndian_);
+
+      PutULONG(resource, event + 16, bigEndian_);
+
+      break;
+    }
+    case notify_empty_split:
+    {
+      PutULONG(opcodeStore_ -> emptySplitNotify,
+                   event + 12, bigEndian_);
+      break;
+    }
+    default:
+    {
+      #ifdef PANIC
+      *logofs << "handleNotify: PANIC! Unrecognized notify "
+              << "TYPE#" << type << ".\n"
+              << logofs_flush;
+      #endif
+
+      return -1;
+    }
+  }
+
+  #if defined(TEST) || defined(INFO) || defined (SPLIT)
+
+  *logofs << "handleNotify: Sending "
+          << (mode ==  sequence_immediate ? "immediate " : "deferred ")
+          << "agent notify event TYPE#" << GetULONG(event + 12, bigEndian_)
+          << logofs_flush;
+
+  if (resource != nothing)
+  {
+    *logofs << " with resource " << GetULONG(event + 16, bigEndian_)
+            << logofs_flush;
+
+    if (request != nothing && position != nothing)
+    {
+      *logofs << " request " << GetULONG(event + 20, bigEndian_)
+              << " position " << GetULONG(event + 24, bigEndian_)
+              << logofs_flush;
+    }
+  }
+
+  *logofs << ".\n" << logofs_flush;
+
+  #endif
+
+  //
+  // Send the notification now.
+  //
+
+  if (handleFlush(flush_if_any) < 0)
+  {
+    return -1;
+  }
+
+  return 1;
+}
+
+int ClientChannel::handleCommitSplitRequest(EncodeBuffer &encodeBuffer, const unsigned char opcode,
+                                                const unsigned char *buffer, const unsigned int size)
+{
+  //
+  // Get the data of the request to be
+  // committed.
+  //
+
+  unsigned char request = *(buffer + 5);
+
+  MessageStore *store = clientStore_ -> getRequestStore(request);
+
+  if (store == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "handleCommitSplitRequest: PANIC! Can't commit split for "
+            << "request OPCODE#" << (unsigned int) request
+            << ". No message store found.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Can't commit split for request "
+         << "OPCODE#" << (unsigned int) request
+         << ". No message store found.\n";
+
+    return -1;
+  }
+
+  //
+  // The position in cache of the message
+  // to commit. Encode it as difference in
+  // respect to the last encoded value.
+  //
+
+  unsigned int position = GetULONG(buffer + 8, bigEndian_);
+
+  unsigned char resource = *(buffer + 1);
+  unsigned int  commit   = *(buffer + 4);
+
+  #if defined(TEST) || defined(SPLIT)
+
+  if (commit == 1)
+  {
+    *logofs << "handleCommitSplitRequest: SPLIT! Committing request "
+            << "OPCODE#" << (unsigned) request << " at position "
+            << position << " for FD#" << fd_ << " with resource "
+            << (unsigned) resource << ".\n" << logofs_flush;
+  }
+  else
+  {
+    *logofs << "handleCommitSplitRequest: SPLIT! Discarding request "
+            << "OPCODE#" << (unsigned) request << " at position "
+            << position << " for FD#" << fd_ << " with resource "
+            << (unsigned) resource << ".\n" << logofs_flush;
+  }
+
+  #endif
+
+  encodeBuffer.encodeOpcodeValue(request, clientCache_ -> opcodeCache);
+
+  int diffCommit = position - splitState_.commit;
+
+  splitState_.commit = position;
+
+  encodeBuffer.encodeValue(diffCommit, 32, 5);
+
+  //
+  // Send the resource id and the commit
+  // flag.
+  //
+
+  encodeBuffer.encodeCachedValue(resource, 8,
+                     clientCache_ -> resourceCache);
+
+  encodeBuffer.encodeBoolValue(commit);
+
+  //
+  // Remove the split from the split queue.
+  //
+
+  Split *split = handleSplitCommitRemove(request, resource, splitState_.commit);
+
+  if (split == NULL)
+  {
+    return -1;
+  }
+
+  clientStore_ -> getCommitStore() -> update(split);
+
+  //
+  // Free the split.
+  //
+
+  #if defined(TEST) || defined(SPLIT)
+  *logofs << "handleCommitSplitRequest: SPLIT! Freeing up the "
+          << "committed split.\n" << logofs_flush;
+  #endif
+
+  delete split;
+
+  return 1;
+}
+
+int ClientChannel::handleAbortSplitRequest(EncodeBuffer &encodeBuffer, const unsigned char opcode,
+                                               const unsigned char *buffer, const unsigned int size)
+{
+  unsigned char resource = *(buffer + 1);
+
+  #if defined(TEST) || defined(SPLIT)
+  *logofs << "handleAbortSplitRequest: SPLIT! Handling abort split "
+          << "request for FD#"<< fd_ << " and resource "
+          << (unsigned int) resource << ".\n"
+          << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeCachedValue(resource, 8,
+                     clientCache_ -> resourceCache);
+
+  SplitStore *splitStore = clientStore_ -> getSplitStore(resource);
+
+  if (splitStore == NULL)
+  {
+    #ifdef WARNING
+    *logofs << "handleAbortSplitRequest: WARNING! SPLIT! The split "
+            << "store [" << (unsigned int) resource << "] "
+            << "is already empty.\n" << logofs_flush;
+    #endif
+
+    return 0;
+  }
+
+  //
+  // Loop through the messages in the split
+  // store and discard from the memory cache
+  // the messages that are still incomplete.
+  // Then remove the message from the split
+  // store.
+  //
+
+  #if defined(TEST) || defined(SPLIT)
+
+  clientStore_ -> dumpSplitStore(resource);
+
+  #endif
+
+  int splits = 0;
+
+  Split *splitMessage;
+
+  for (;;)
+  {
+    splitMessage = splitStore -> getFirstSplit();
+
+    if (splitMessage == NULL)
+    {
+      //
+      // Check if we had created the store
+      // but no message was added yet.
+      //
+
+      #ifdef WARNING
+
+      if (splits == 0)
+      {
+        *logofs << "handleAbortSplitRequest: WARNING! SPLIT! The "
+                << "split store [" << (unsigned int) resource
+                << "] is unexpectedly empty.\n"
+                << logofs_flush;
+      }
+
+      #endif
+
+      break;
+    }
+
+    //
+    // Splits already aborted can't be in the
+    // split store.
+    //
+
+    #if defined(TEST) || defined(SPLIT)
+
+    if (splitMessage -> getState() == split_aborted)
+    {
+      *logofs << "handleAbortSplitRequest: PANIC! SPLIT! Found an "
+              << "aborted split in store [" << (unsigned int) resource
+              << "].\n" << logofs_flush;
+
+      HandleCleanup();
+    }
+
+    #endif
+
+    if (splitMessage -> getAction() == IS_HIT)
+    {
+      #if defined(TEST) || defined(SPLIT)
+      *logofs << "handleAbortSplitRequest: SPLIT! Removing the "
+              << "split from the memory cache.\n"
+              << logofs_flush;
+      #endif
+
+      splitMessage -> getStore() -> remove(splitMessage -> getPosition(),
+                                               use_checksum, discard_data);
+    }
+
+    #if defined(TEST) || defined(SPLIT)
+    *logofs << "handleAbortSplitRequest: SPLIT! Removing the "
+            << "split from the split store.\n"
+            << logofs_flush;
+    #endif
+
+    splitMessage = splitStore -> pop();
+
+    #if defined(TEST) || defined(SPLIT)
+    *logofs << "handleAbortSplitRequest: SPLIT! Freeing up the "
+            << "aborted split.\n" << logofs_flush;
+    #endif
+
+    delete splitMessage;
+
+    splits++;
+  }
+
+  //
+  // If the start-split/end-split sequence
+  // was closed, send the notification now,
+  // else wait for the end-split.
+  //
+
+  if (resource != splitState_.resource)
+  {
+    #if defined(TEST) || defined(SPLIT)
+    *logofs << "handleAbortSplitRequest: SPLIT! Sending the "
+            << "deferred [end split] event.\n"
+           << logofs_flush;
+    #endif
+
+    handleRestart(sequence_deferred, resource);
+  }
+  #if defined(TEST) || defined(SPLIT)
+  else
+  {
+    *logofs << "handleAbortSplitRequest: WARNING! SPLIT! Still "
+            << "waiting for the closure of the split "
+            << "sequence.\n" << logofs_flush;
+  }
+  #endif
+
+  //
+  // Check if there is any other store
+  // having splits to send.
+  //
+
+  handleSplitPending();
+
+  return (splits > 0);
+}
+
+int ClientChannel::handleFinishSplitRequest(EncodeBuffer &encodeBuffer, const unsigned char opcode,
+                                                const unsigned char *buffer, const unsigned int size)
+{
+  unsigned char resource = *(buffer + 1);
+
+  #if defined(TEST) || defined(SPLIT)
+  *logofs << "handleFinishSplitRequest: SPLIT! Handling finish split "
+          << "request for FD#"<< fd_ << " and resource "
+          << (unsigned int) resource << ".\n"
+          << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeCachedValue(resource, 8,
+                     clientCache_ -> resourceCache);
+
+  //
+  // We need to get the protocol statistics
+  // for the finish message we are handling
+  // here because sending a new split will
+  // reset the bits counter.
+  //
+
+  int bits = encodeBuffer.diffBits();
+
+  statistics -> addRequestBits(opcode, size << 3, bits);
+
+  SplitStore *splitStore = clientStore_ -> getSplitStore(resource);
+
+  if (splitStore == NULL)
+  {
+    #ifdef WARNING
+    *logofs << "handleFinishSplitRequest: WARNING! SPLIT! The split "
+            << "store [" << (unsigned int) resource << "] "
+            << "is already empty.\n" << logofs_flush;
+    #endif
+
+    return 0;
+  }
+
+  //
+  // Send all the split queued for the given
+  // resource until the split store becomes
+  // empty.
+  //
+
+  #if defined(TEST) || defined(SPLIT)
+
+  clientStore_ -> dumpSplitStore(resource);
+
+  #endif
+
+  Split *splitMessage;
+
+  int total = MESSAGE_DATA_LIMIT;
+
+  int bytes  = total;
+  int splits = 0;
+
+  for (;;)
+  {
+    splitMessage = splitStore -> getFirstSplit();
+
+    if (splitMessage == NULL)
+    {
+      //
+      // We have presumably created the store
+      // after a start split but no message
+      // was added yet.
+      //
+
+      #ifdef WARNING
+      *logofs << "handleFinishSplitRequest: WARNING! SPLIT! The "
+              << "split store [" << (unsigned int) resource
+              << "] is unexpectedly empty.\n"
+              << logofs_flush;
+      #endif
+
+      break;
+    }
+
+    //
+    // Splits already aborted can't be in the
+    // split store.
+    //
+
+    #if defined(TEST) || defined(SPLIT)
+
+    if (splitMessage -> getState() == split_aborted)
+    {
+      *logofs << "handleFinishSplitRequest: PANIC! SPLIT! Found an "
+              << "aborted split in store [" << (unsigned int) resource
+              << "].\n" << logofs_flush;
+
+      HandleCleanup();
+    }
+
+    *logofs << "handleFinishSplitRequest: SPLIT! Sending more "
+            << "data for store [" << (unsigned int) resource
+            << "].\n" << logofs_flush;
+    #endif
+
+    if (handleSplitSend(encodeBuffer, resource, splits, bytes) < 0)
+    {
+      return -1;
+    }
+
+    //
+    // Check if the split store was deleted.
+    //
+
+    if (clientStore_ -> getSplitStore(resource) == NULL)
+    {
+      #if defined(TEST) || defined(SPLIT)
+      *logofs << "handleFinishSplitRequest: SPLIT! Exiting "
+              << "from the finish loop with split store ["
+              << (unsigned int) resource << "] destroyed.\n"
+              << logofs_flush;
+      #endif
+
+      break;
+    }
+  }
+
+  //
+  // Check if there is any other store
+  // having splits to send.
+  //
+
+  handleSplitPending();
+
+  #if defined(TEST) || defined(SPLIT)
+  *logofs << "handleFinishSplitRequest: SPLIT! Sent " << splits
+          << " splits and " << total - bytes << " bytes for FD#" << fd_
+          << " with " << clientStore_ -> getSplitTotalStorageSize()
+          << " bytes and [" << clientStore_ -> getSplitTotalSize()
+          << "] splits remaining.\n" << logofs_flush;
+  #endif
+
+  return (splits > 0);
+}
+
+int ClientChannel::handleConfiguration()
+{
+  #ifdef TEST
+  *logofs << "ClientChannel: Setting new buffer parameters.\n"
+          << logofs_flush;
+  #endif
+
+  readBuffer_.setSize(control -> ClientInitialReadSize,
+                          control -> ClientMaximumBufferSize);
+
+  writeBuffer_.setSize(control -> TransportXBufferSize,
+                           control -> TransportXBufferThreshold,
+                               control -> TransportMaximumBufferSize);
+
+  transport_ -> setSize(control -> TransportXBufferSize,
+                            control -> TransportXBufferThreshold,
+                                control -> TransportMaximumBufferSize);
+
+  return 1;
+}
+
+int ClientChannel::handleFinish()
+{
+  #ifdef TEST
+  *logofs << "ClientChannel: Finishing channel for FD#"
+          << fd_ << ".\n" << logofs_flush;
+  #endif
+
+  congestion_ = 0;
+  priority_   = 0;
+
+  finish_ = 1;
+
+  taintCounter_ = 0;
+
+  splitState_.resource = nothing;
+  splitState_.pending  = 0;
+  splitState_.commit   = 0;
+  splitState_.mode     = split_none;
+
+  transport_ -> finish();
+
+  return 1;
+}
+
+//
+// If differential compression is disabled then use the
+// most simple encoding but handle the image requests
+// and the X_ListExtensions and X_QueryExtension messa-
+// ges (needed to detect the opcode of the shape or the
+// other extensions) in the usual way.
+//
+
+int ClientChannel::handleFastReadRequest(EncodeBuffer &encodeBuffer, const unsigned char &opcode,
+                                             const unsigned char *&buffer, const unsigned int &size)
+{
+  //
+  // All the NX requests are handled in the
+  // main message loop. The X_PutImage can
+  // be handled here only if the split was
+  // not requested (since ProtoStep7 #issue 108).
+  //
+
+  if ((opcode >= X_NXFirstOpcode && opcode <= X_NXLastOpcode) ||
+           (opcode == X_PutImage && splitState_.resource != nothing) ||
+               opcode == X_ListExtensions ||
+                   opcode == X_QueryExtension)
+  {
+    return 0;
+  }
+
+  #ifdef DEBUG
+  *logofs << "handleFastReadRequest: Encoding raw request OPCODE#"
+          << (unsigned int) opcode << " for FD#" << fd_
+          << " with size " << size << ".\n"
+          << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeMemory(buffer, size);
+
+  //
+  // Put request on the fast track
+  // if it needs a reply.
+  //
+
+  switch (opcode)
+  {
+    case X_GetAtomName:
+    case X_GetGeometry:
+    case X_GetInputFocus:
+    case X_GetModifierMapping:
+    case X_GetKeyboardMapping:
+    case X_GetProperty:
+    case X_GetSelectionOwner:
+    case X_GrabPointer:
+    case X_GrabKeyboard:
+    case X_ListExtensions:
+    case X_ListFonts:
+    case X_LookupColor:
+    case X_AllocNamedColor:
+    case X_QueryPointer:
+    case X_GetWindowAttributes:
+    case X_QueryTree:
+    case X_QueryBestSize:
+    case X_QueryColors:
+    case X_QueryFont:
+    case X_TranslateCoords:
+    case X_GetImage:
+    case X_GetPointerMapping:
+    case X_GetKeyboardControl:
+    case X_InternAtom:
+    case X_AllocColor:
+    {
+      sequenceQueue_.push(clientSequence_, opcode);
+
+      priority_++;
+
+      break;
+    }
+    default:
+    {
+      break;
+    }
+  }
+
+  int bits = encodeBuffer.diffBits();
+
+  #if defined(TEST) || defined(OPCODES)
+
+  *logofs << "handleFastReadRequest: Handled raw request OPCODE#" 
+          << (unsigned int) opcode << " (" << DumpOpcode(opcode) << ")"
+          << " for FD#" << fd_ << " sequence " << clientSequence_
+          << ". " << size << " bytes in, " << bits << " bits ("
+          << ((float) bits) / 8 << " bytes) out.\n" << logofs_flush;
+
+  #endif
+
+  statistics -> addRequestBits(opcode, size << 3, bits);
+
+  if (opcode == opcodeStore_ -> renderExtension)
+  {
+    statistics -> addRenderRequestBits(*(buffer + 1), size << 3, bits);
+  }
+
+  return 1;
+}
+
+int ClientChannel::handleFastWriteReply(DecodeBuffer &decodeBuffer, unsigned char &opcode,
+                                            unsigned char *&buffer, unsigned int &size)
+{
+  if ((opcode >= X_NXFirstOpcode &&
+           opcode <= X_NXLastOpcode) ||
+               opcode == X_ListExtensions ||
+                   opcode == X_QueryExtension)
+  {
+    return 0;
+  }
+
+  #ifdef DEBUG
+  *logofs << "handleFastWriteReply: Decoding raw reply OPCODE#"
+          << (unsigned int) opcode << " for FD#" << fd_
+          << ".\n" << logofs_flush;
+  #endif
+
+  buffer = writeBuffer_.addMessage(8);
+
+  #ifndef __sun
+
+  unsigned int *next = (unsigned int *) decodeBuffer.decodeMemory(8);
+
+  *((unsigned int *) buffer)       = *next++;
+  *((unsigned int *) (buffer + 4)) = *next;
+
+  #else /* #ifndef __sun */
+
+  memcpy(buffer, decodeBuffer.decodeMemory(8), 8);
+
+  #endif /* #ifndef __sun */
+
+  size = 32 + (GetULONG(buffer + 4, bigEndian_) << 2);
+
+  writeBuffer_.registerPointer(&buffer);
+
+  if (writeBuffer_.getAvailable() < size - 8 ||
+          (int) size >= control -> TransportFlushBufferSize)
+  {
+    #ifdef DEBUG
+    *logofs << "handleFastWriteReply: Using scratch buffer for OPCODE#"
+            << (unsigned int) opcode << " with size " << size << " and "
+            << writeBuffer_.getLength() << " bytes in buffer.\n"
+            << logofs_flush;
+    #endif
+
+    writeBuffer_.removeMessage(8);
+
+    buffer = writeBuffer_.addScratchMessage(((unsigned char *)
+                             decodeBuffer.decodeMemory(size - 8)) - 8, size);
+  }
+  else
+  {
+    writeBuffer_.addMessage(size - 8);
+
+    #ifndef __sun
+
+    if (size == 32)
+    {
+      next = (unsigned int *) decodeBuffer.decodeMemory(size - 8);
+
+      for (int i = 8; i < 32; i += sizeof(unsigned int))
+      {
+        *((unsigned int *) (buffer + i)) = *next++;
+      }
+    }
+    else
+    {
+      memcpy(buffer + 8, decodeBuffer.decodeMemory(size - 8), size - 8);
+    }
+
+    #else /* #ifndef __sun */
+
+    memcpy(buffer + 8, decodeBuffer.decodeMemory(size - 8), size - 8);
+
+    #endif /* #ifndef __sun */
+  }
+
+  writeBuffer_.unregisterPointer();
+
+  //
+  // We don't need to write our local sequence
+  // number. Replies are always sent with the
+  // original X server's sequence number.
+  //
+
+  #if defined(TEST) || defined(OPCODES)
+  *logofs << "handleFastWriteReply: Handled raw reply OPCODE#"
+          << (unsigned int) opcode << " for FD#" << fd_ << " with sequence "
+          << serverSequence_ << ". Output size is " << size << ".\n"
+          << logofs_flush;
+  #endif
+
+  #ifdef DEBUG
+  *logofs << "handleFastWriteReply: Length of sequence queue is "
+          << sequenceQueue_.length() << ".\n" << logofs_flush;
+  #endif
+
+  statistics -> addRepliedRequest(opcode);
+
+  handleFlush(flush_if_needed);
+
+  return 1;
+}
+
+int ClientChannel::handleFastWriteEvent(DecodeBuffer &decodeBuffer, unsigned char &opcode,
+                                            unsigned char *&buffer, unsigned int &size)
+{
+  #ifdef DEBUG
+  *logofs << "handleFastWriteEvent: Decoding raw "
+          << (opcode == X_Error ? "error" : "event") << " OPCODE#"
+          << (unsigned int) opcode << " for FD#" << fd_
+          << ".\n" << logofs_flush;
+  #endif
+
+  size = 32;
+
+  buffer = writeBuffer_.addMessage(size);
+
+  #ifndef __sun
+
+  unsigned int *next = (unsigned int *) decodeBuffer.decodeMemory(size);
+
+  for (int i = 0; i < 32; i += sizeof(unsigned int))
+  {
+    *((unsigned int *) (buffer + i)) = *next++;
+  }
+
+  #else /* #ifndef __sun */
+
+  memcpy(buffer, decodeBuffer.decodeMemory(size), size);
+
+  #endif /* #ifndef __sun */
+
+  //
+  // Use our local sequence number.
+  //
+
+  PutUINT(lastSequence_, buffer + 2, bigEndian_);
+
+  #if defined(TEST) || defined(OPCODES)
+  *logofs << "handleFastWriteEvent: Handled raw "
+          << (opcode == X_Error ? "error" : "event") << " OPCODE#"
+          << (unsigned int) opcode << " for FD#" << fd_ << " with sequence "
+          << lastSequence_ << ". Output size is " << size << ".\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // Check if we need to suppress the error.
+  //
+
+  if (opcode == X_Error && handleTaintSyncError(*(buffer + 10)) > 0)
+  {
+    #if defined(TEST) || defined(OPCODES)
+    *logofs << "handleFastWriteEvent: WARNING! Suppressed error OPCODE#"
+            << (unsigned int) opcode << " for FD#" << fd_
+            << " with sequence " << lastSequence_ << ".\n"
+            << logofs_flush;
+    #endif
+
+    writeBuffer_.removeMessage(32);
+  }
+
+  handleFlush(flush_if_needed);
+
+  return 1;
+}
+
+int ClientChannel::handleShmemRequest(EncodeBuffer &encodeBuffer, const unsigned char opcode,
+                                          const unsigned char *buffer, const unsigned int size)
+{
+  //
+  // Will push sequence and set
+  // priority according to stage.
+  //
+
+  unsigned int stage = *(buffer + 1);
+
+  #ifdef TEST
+  *logofs << "handleShmemRequest: Encoding shmem request "
+          << "OPCODE#" << (unsigned int) opcode << " for FD#"
+          << fd_ << " with size " << size << " at stage "
+          << stage << ".\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeValue(stage, 2);
+
+  if (stage == 0)
+  {
+    unsigned int enableClient = 0;
+    unsigned int enableServer = 0;
+
+    if (control -> ShmemClient == 1)
+    {
+      enableClient = *(buffer + 4);
+    }
+
+    if (control -> ShmemServer == 1)
+    {
+      enableServer = *(buffer + 5);
+    }
+
+    encodeBuffer.encodeBoolValue(enableClient);
+    encodeBuffer.encodeBoolValue(enableServer);
+
+    unsigned int clientSegment = GetULONG(buffer + 8,  bigEndian_);
+    unsigned int serverSegment = GetULONG(buffer + 12, bigEndian_);
+
+    encodeBuffer.encodeValue(clientSegment, 29, 9);
+    encodeBuffer.encodeValue(serverSegment, 29, 9);
+
+    #ifdef TEST
+    *logofs << "handleShmemRequest: Enable client is "
+            << enableClient << " enable server is " << enableServer
+            << " client segment is " << (void *) clientSegment
+            << " server segment is " << (void *) serverSegment
+            << ".\n" << logofs_flush;
+    #endif
+
+    #ifdef TEST
+    *logofs << "handleShmemRequest: Size of the shared memory "
+            << "segment will be " << control -> ShmemServerSize
+            << ".\n" << logofs_flush;
+    #endif
+  }
+
+  if (stage != 1)
+  {
+    sequenceQueue_.push(clientSequence_, opcodeStore_ ->
+                            getShmemParameters);
+
+    priority_++;
+  }
+
+  return 1;
+}
+
+int ClientChannel::handleShmemReply(DecodeBuffer &decodeBuffer, unsigned char &opcode,
+                                        unsigned char *&buffer, unsigned int &size)
+{
+  #ifdef TEST
+  *logofs << "handleShmemReply: Received shmem parameters "
+          << "reply OPCODE#" << (unsigned int) opcode
+          << ".\n" << logofs_flush;
+  #endif
+
+  size   = 32;
+  buffer = writeBuffer_.addMessage(size);
+
+  unsigned int stage;
+
+  decodeBuffer.decodeValue(stage, 2);
+
+  *(buffer + 1) = stage;
+
+  if (stage == 2)
+  {
+    unsigned int clientEnabled;
+    unsigned int serverEnabled;
+
+    decodeBuffer.decodeBoolValue(clientEnabled);
+    decodeBuffer.decodeBoolValue(serverEnabled);
+
+    //
+    // Client support is not implemented
+    // and not useful. It is here only
+    // for compatibility.
+    //
+
+    clientEnabled = 0;
+
+    *(buffer + 8) = clientEnabled;
+    *(buffer + 9) = serverEnabled;
+
+    PutULONG(0, buffer + 12, bigEndian_);
+
+    if (serverEnabled == 1)
+    {
+      #ifdef TEST
+      *logofs << "handleShmemReply: Enabled shared memory "
+              << "support in X server with segment size "
+              << control -> ShmemServerSize << ".\n"
+              << logofs_flush;
+      #endif
+
+      PutULONG(control -> ShmemServerSize, buffer + 16, bigEndian_);
+    }
+    else
+    {
+      PutULONG(0, buffer + 16, bigEndian_);
+    }
+  }
+  else
+  {
+    *(buffer + 8) = 0;
+    *(buffer + 9) = 0;
+
+    PutULONG(0, buffer + 12, bigEndian_);
+    PutULONG(0, buffer + 16, bigEndian_);
+  }
+
+  return 1;
+}
+
+int ClientChannel::handleFontRequest(EncodeBuffer &encodeBuffer, const unsigned char opcode,
+                                         const unsigned char *buffer, const unsigned int size)
+{
+  #ifdef TEST
+  *logofs << "handleFontRequest: Encoding font request "
+          << "OPCODE#" << (unsigned int) opcode << " for FD#"
+          << fd_ << " with size " << size << ".\n"
+          << logofs_flush;
+  #endif
+
+  sequenceQueue_.push(clientSequence_, opcodeStore_ ->
+                          getFontParameters);
+
+  return 1;
+}
+
+int ClientChannel::handleFontReply(DecodeBuffer &decodeBuffer, unsigned char &opcode,
+                                       unsigned char *&buffer, unsigned int &size)
+{
+  #ifdef TEST
+  *logofs << "handleFontReply: Received font operation "
+          << "reply OPCODE#" << (unsigned int) opcode
+          << ".\n" << logofs_flush;
+  #endif
+
+  unsigned int length;
+
+  decodeBuffer.decodeValue(length, 8);
+
+  size   = 32 + RoundUp4(length + 1);
+  buffer = writeBuffer_.addMessage(size);
+
+  unsigned char *next = buffer + 32;
+
+  *next++ = length;
+
+  decodeBuffer.decodeTextData(next, length);
+
+  #ifdef TEST
+
+  *logofs << "handleFontReply: Received tunneled font server "
+          << "path '";
+
+  for (unsigned int i = 0; i < length; i++)
+  {
+    *logofs << *(buffer + 32 + 1 + i);
+  }
+
+  *logofs << "' for FD#" << fd_ << ".\n" << logofs_flush;
+
+  #endif
+
+  if (fontPort_ == -1)
+  {
+    //
+    // The local side is not going to forward
+    // the font server connections.
+    //
+
+    #ifdef TEST
+    *logofs << "handleFontReply: WARNING! Returning an empty "
+            << "font server path.\n" << logofs_flush;
+    #endif
+
+    writeBuffer_.removeMessage(size);
+
+    size   = 36;
+    buffer = writeBuffer_.addMessage(size);
+
+    //
+    // Set the length of the returned
+    // path to 0.
+    //
+
+    *(buffer + 32) = 0;
+  }
+  #ifdef TEST
+  else
+  {
+    *logofs << "handleFontReply: Returning the received "
+            << "font server path.\n" << logofs_flush;
+  }
+  #endif
+
+  return 1;
+}
+
+int ClientChannel::handleCacheRequest(EncodeBuffer &encodeBuffer, const unsigned char opcode,
+                                          const unsigned char *buffer, const unsigned int size)
+{
+  #ifdef TEST
+  *logofs << "handleCacheRequest: Handling cache request "
+          << "for FD#" << fd_ << ".\n" << logofs_flush;
+  #endif
+
+  enableCache_ = *(buffer + 4);
+  enableSplit_ = *(buffer + 5);
+  enableSave_  = *(buffer + 6);
+  enableLoad_  = *(buffer + 7);
+
+  #ifdef TEST
+  *logofs << "handleCacheRequest: Set cache parameters to "
+          << " cache " << enableCache_ << " split " << enableSplit_
+          << " save " << enableSave_ << " load " << enableLoad_
+          << ".\n" << logofs_flush;
+  #endif
+
+  //
+  // Encode all the parameters as a
+  // single unsigned int so we can
+  // use an int cache.
+  //
+
+  unsigned int mask = enableSave_ << 8 | enableLoad_;
+
+  encodeBuffer.encodeCachedValue(mask, 32, clientCache_ ->
+                     setCacheParametersCache);
+  return 0;
+}
+
+int ClientChannel::handleStartSplitRequest(EncodeBuffer &encodeBuffer, const unsigned char opcode,
+                                               const unsigned char *buffer, const unsigned int size)
+{
+  #if defined(TEST) || defined(SPLIT)
+  *logofs << "handleStartSplitRequest: SPLIT! Handling start split "
+          << "request for FD#"<< fd_ << ".\n" << logofs_flush;
+  #endif
+
+  if (splitState_.resource != nothing)
+  {
+    #ifdef PANIC
+    *logofs << "handleStartSplitRequest: PANIC! SPLIT! Split requested "
+            << "for resource id " << (unsigned int) *(buffer + 1)
+            << " while handling resource " << splitState_.resource
+            << ".\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Split requested for "
+         << "resource id " << (unsigned int) *(buffer + 1)
+         << " while handling resource " << splitState_.resource
+         << ".\n";
+
+    return -1;
+  }
+  else if (fd_ != firstClient_)
+  {
+    //
+    // It can be that an auxiliary channel is the
+    // first to connect, then comes the agent that
+    // is actually using the NX opcodes.
+    //
+
+    #ifdef WARNING
+    *logofs << "handleStartSplitRequest: WARNING SPLIT! Split requested "
+            << "on FD#" << fd_ << " while expecting FD#" << firstClient_
+            << ".\n" << logofs_flush;
+    #endif
+
+    firstClient_ = fd_;
+  }
+
+  //
+  // Set the agent's resource for which we are
+  // going to split the request.
+  //
+
+  splitState_.resource = *(buffer + 1);
+
+  #if defined(TEST) || defined(SPLIT)
+
+  *logofs << "handleStartSplitRequest: SPLIT! Registered id "
+          << splitState_.resource << " as resource "
+          << "waiting for a split.\n" << logofs_flush;
+
+  if (clientStore_ -> getSplitStore(splitState_.resource) != NULL)
+  {
+    *logofs << "handleStartSplitRequest: WARNING! SPLIT! A split "
+            << "store for resource id " << splitState_.resource
+            << " already exists.\n" << logofs_flush;
+
+    clientStore_ -> dumpSplitStore(splitState_.resource);
+  }
+
+  #endif
+
+  //
+  // Send the selected resource to the remote.
+  //
+
+  // Since ProtoStep7 (#issue 108)
+  encodeBuffer.encodeCachedValue(splitState_.resource, 8,
+                     clientCache_ -> resourceCache);
+
+  splitState_.mode = (T_split_mode) *(buffer + 4);
+
+  if (splitState_.mode != NXSplitModeAsync &&
+          splitState_.mode != NXSplitModeSync)
+  {
+    splitState_.mode = (T_split_mode) control -> SplitMode;
+
+    #if defined(TEST) || defined(SPLIT)
+    *logofs << "handleStartSplitRequest: SPLIT! Set split "
+            << "mode to '" << splitState_.mode << "' with "
+            << "provided value '" << (unsigned) *(buffer + 4)
+            << "'.\n" << logofs_flush;
+    #endif
+  }
+
+  #if defined(TEST) || defined(SPLIT)
+
+  if (splitState_.mode == NXSplitModeAsync)
+  {
+    *logofs << "handleStartSplitRequest: SPLIT! Selected split "
+            << "mode is [split_async].\n" << logofs_flush;
+  }
+  else if (splitState_.mode == NXSplitModeSync)
+  {
+    *logofs << "handleStartSplitRequest: SPLIT! Selected split "
+            << "mode is [split_sync].\n" << logofs_flush;
+  }
+
+  clientStore_ -> dumpSplitStores();
+
+  #endif
+
+  return 1;
+}
+
+int ClientChannel::handleEndSplitRequest(EncodeBuffer &encodeBuffer, const unsigned char opcode,
+                                             const unsigned char *buffer, const unsigned int size)
+{
+  #if defined(TEST) || defined(SPLIT)
+  *logofs << "handleEndSplitRequest: SPLIT! Handling end split "
+          << "request for FD#"<< fd_ << ".\n" << logofs_flush;
+  #endif
+
+  //
+  // Verify that the agent resource matches.
+  //
+
+  if (splitState_.resource == nothing)
+  {
+    #ifdef PANIC
+    *logofs << "handleEndSplitRequest: PANIC! SPLIT! Received an end of "
+            << "split for resource id " << (unsigned int) *(buffer + 1)
+            << " without a previous start.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Received an end of split "
+         << "for resource id " << (unsigned int) *(buffer + 1)
+         << " without a previous start.\n";
+
+    return -1;
+  }
+  else if (splitState_.resource != *(buffer + 1))
+  {
+    #ifdef PANIC
+    *logofs << "handleEndSplitRequest: PANIC! SPLIT! Invalid resource id "
+            << (unsigned int) *(buffer + 1) << " received while "
+            << "waiting for resource id " << splitState_.resource
+            << ".\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Invalid resource id "
+         << (unsigned int) *(buffer + 1) << " received while "
+         << "waiting for resource id " << splitState_.resource
+         << ".\n";
+
+    return -1;
+  }
+
+  //
+  // Send the selected resource to the remote.
+  //
+
+  // Since ProtoStep7 (#issue 108)
+  encodeBuffer.encodeCachedValue(splitState_.resource, 8,
+                     clientCache_ -> resourceCache);
+
+  //
+  // Send the split notification events
+  // to the agent.
+  //
+
+  handleRestart(sequence_immediate, splitState_.resource);
+
+  //
+  // Check if we still have splits to send.
+  //
+
+  handleSplitPending();
+
+  #if defined(TEST) || defined(SPLIT)
+  *logofs << "handleEndSplitRequest: SPLIT! Reset id "
+          << splitState_.resource << " as resource "
+          << "selected for splits.\n" << logofs_flush;
+  #endif
+
+  splitState_.resource = nothing;
+  splitState_.mode     = split_none;
+
+  #if defined(TEST) || defined(SPLIT)
+
+  clientStore_ -> dumpSplitStores();
+
+  #endif
+
+  return 1;
+}
+
+void ClientChannel::handleDecodeCharInfo(DecodeBuffer &decodeBuffer, unsigned char *nextDest)
+{
+  unsigned int value;
+
+  decodeBuffer.decodeCachedValue(value, 32,
+                     *serverCache_ -> queryFontCharInfoCache[0], 6);
+
+  PutUINT(value & 0xffff, nextDest, bigEndian_);
+  PutUINT(value >> 16, nextDest + 10, bigEndian_);
+
+  nextDest += 2;
+
+  for (unsigned int i = 1; i < 5; i++)
+  {
+    unsigned int value;
+
+    decodeBuffer.decodeCachedValue(value, 16,
+                       *serverCache_ -> queryFontCharInfoCache[i], 6);
+
+    PutUINT(value, nextDest, bigEndian_);
+
+    nextDest += 2;
+  }
+}
+
+int ClientChannel::setBigEndian(int flag)
+{
+  bigEndian_ = flag;
+
+  return 1;
+}
+
+int ClientChannel::setReferences()
+{
+  #ifdef TEST
+  *logofs << "ClientChannel: Initializing the static "
+          << "members for the client channels.\n"
+          << logofs_flush;
+  #endif
+
+  #ifdef REFERENCES
+
+  references_ = 0;
+
+  #endif
+
+  return 1;
+}
diff --git a/nxcomp/src/ClientChannel.h b/nxcomp/src/ClientChannel.h
new file mode 100644
index 000000000..ae92648d5
--- /dev/null
+++ b/nxcomp/src/ClientChannel.h
@@ -0,0 +1,434 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef ClientChannel_H
+#define ClientChannel_H
+
+#include "List.h"
+#include "Channel.h"
+
+#include "SequenceQueue.h"
+
+#include "ClientReadBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+//
+// If defined, the client channel will
+// have the chance of suppressing more
+// opcodes for test purposes.
+//
+
+#undef  LAME
+
+//
+// Define this to log a line when a
+// channel is created or destroyed.
+//
+
+#undef  REFERENCES
+
+//
+// This class implements the X client
+// side compression of the protocol.
+//
+
+class ClientChannel : public Channel
+{
+  public:
+
+  ClientChannel(Transport *transport, StaticCompressor *compressor);
+
+  virtual ~ClientChannel();
+
+  virtual int handleRead(EncodeBuffer &encodeBuffer, const unsigned char *message,
+                             unsigned int length);
+
+  virtual int handleWrite(const unsigned char *message, unsigned int length);
+
+  virtual int handleSplit(EncodeBuffer &encodeBuffer, MessageStore *store,
+                              T_store_action action, int position, const unsigned char opcode,
+                                  const unsigned char *buffer, const unsigned int size);
+
+  virtual int handleSplit(DecodeBuffer &decodeBuffer, MessageStore *store,
+                              T_store_action action, int position, unsigned char &opcode,
+                                  unsigned char *&buffer, unsigned int &size)
+  {
+    return 0;
+  }
+
+  virtual int handleSplit(EncodeBuffer &encodeBuffer);
+
+  virtual int handleSplit(DecodeBuffer &decodeBuffer)
+  {
+    return 0;
+  }
+
+  virtual int handleSplitEvent(EncodeBuffer &encodeBuffer, Split *split);
+
+  virtual int handleSplitEvent(DecodeBuffer &decodeBuffer);
+
+  virtual int handleMotion(EncodeBuffer &encodeBuffer)
+  {
+    return 0;
+  }
+
+  virtual int handleCompletion(EncodeBuffer &encodeBuffer)
+  {
+    return 0;
+  }
+
+  virtual int handleConfiguration();
+
+  virtual int handleFinish();
+
+  virtual int handleAsyncEvents()
+  {
+    return 0;
+  }
+
+  virtual int needSplit() const
+  {
+    #if defined(TEST) || defined(SPLIT)
+    *logofs << "needSplit: SPLIT! Returning pending split "
+            << "flag " << splitState_.pending << " with "
+            << clientStore_ -> getSplitTotalSize()
+            << " splits in the split stores.\n"
+            << logofs_flush;
+    #endif
+
+    return splitState_.pending;
+  }
+
+  virtual int needMotion() const
+  {
+    return 0;
+  }
+
+  virtual T_channel_type getType() const
+  {
+    return channel_x11;
+  }
+
+  int setBigEndian(int flag);
+
+  //
+  // Initialize the static members.
+  //
+
+  static int setReferences();
+
+  private:
+
+  int handleFastReadRequest(EncodeBuffer &encodeBuffer, const unsigned char &opcode,
+                                const unsigned char *&buffer, const unsigned int &size);
+
+  int handleFastWriteReply(DecodeBuffer &decodeBuffer, unsigned char &opcode,
+                               unsigned char *&buffer, unsigned int &size);
+
+  int handleFastWriteEvent(DecodeBuffer &decodeBuffer, unsigned char &opcode,
+                               unsigned char *&buffer, unsigned int &size);
+
+  //
+  // Intercept the request before the opcode
+  // is encoded.
+  //
+
+  int handleTaintRequest(unsigned char &opcode, const unsigned char *&buffer,
+                             unsigned int &size)
+  {
+    if (control -> TaintReplies > 0 &&
+            opcode == X_GetInputFocus)
+    {
+      return handleTaintSyncRequest(opcode, buffer, size);
+    }
+
+    #ifdef LAME
+
+    return handleTaintLameRequest(opcode, buffer, size);
+
+    #endif
+
+    return 0;
+  }
+
+  int handleTaintLameRequest(unsigned char &opcode, const unsigned char *&buffer,
+                                 unsigned int &size);
+
+  int handleTaintSyncRequest(unsigned char &opcode, const unsigned char *&buffer,
+                                 unsigned int &size);
+
+  int handleTaintSyncError(unsigned char opcode);
+
+  //
+  // How to handle sequence counter
+  // in notification event.
+  //
+
+  enum T_sequence_mode
+  {
+    sequence_immediate,
+    sequence_deferred
+  };
+
+  //
+  // Send split notifications to the
+  // agent.
+  //
+
+  int handleRestart(T_sequence_mode mode, int resource);
+
+  int handleNotify(T_notification_type type, T_sequence_mode mode,
+                       int resource, int request, int position);
+
+  //
+  // Other utility functions used in
+  // handling of the image streaming.
+  //
+
+  int mustSplitMessage(int resource)
+  {
+    return (clientStore_ -> getSplitStore(resource) ->
+                getSize() != 0);
+  }
+
+  int canSplitMessage(T_split_mode mode, unsigned int size)
+  {
+    return ((int) size >= control -> SplitDataThreshold &&
+                (clientStore_ -> getSplitTotalStorageSize() < control ->
+                     SplitTotalStorageSize && clientStore_ ->
+                         getSplitTotalSize() < control -> SplitTotalSize));
+  }
+
+  int canSendSplit(Split *split)
+  {
+    return (split -> getMode() != split_sync ||
+                split -> getState() == split_missed ||
+                    split -> getState() == split_loaded);
+  }
+
+  int handleSplitSend(EncodeBuffer &encodeBuffer, int resource,
+                          int &total, int &bytes);
+
+  Split *handleSplitFind(T_checksum checksum, int resource);
+
+  int handleSplitChecksum(EncodeBuffer &encodeBuffer, T_checksum checksum);
+
+  void handleSplitPending(int resource)
+  {
+    if (splitState_.pending == 0)
+    {
+      if (clientStore_ -> getSplitStore(resource) != NULL &&
+              clientStore_ -> getSplitStore(resource) ->
+                  getFirstSplit() != NULL)
+      {
+        splitState_.pending = canSendSplit(clientStore_ ->
+            getSplitStore(resource) -> getFirstSplit());
+
+        #if defined(TEST) || defined(SPLIT)
+        *logofs << "handleSplitPending: SPLIT! Set the pending "
+                << "split flag to " << splitState_.pending
+                << " with " << clientStore_ -> getSplitTotalSize()
+                << " splits in the split stores.\n"
+                << logofs_flush;
+        #endif
+      }
+    }
+  }
+
+  //
+  // Scan all the split stores to find
+  // if there is any split to send.
+  //
+
+  void handleSplitPending();
+
+  //
+  // Handle the MIT-SHM initialization
+  // messages exchanged with the remote
+  // proxy.
+  //
+
+  int handleShmemRequest(EncodeBuffer &encodeBuffer, const unsigned char opcode,
+                             const unsigned char *buffer, const unsigned int size);
+
+  int handleShmemReply(DecodeBuffer &decodeBuffer, unsigned char &opcode,
+                           unsigned char *&buffer, unsigned int &size);
+
+  //
+  // Query the port used to tunnel
+  // the font server connections.
+  //
+
+  int handleFontRequest(EncodeBuffer &encodeBuffer, const unsigned char opcode,
+                            const unsigned char *buffer, const unsigned int size);
+
+  int handleFontReply(DecodeBuffer &decodeBuffer, unsigned char &opcode,
+                          unsigned char *&buffer, unsigned int &size);
+
+  //
+  // Let the agent set the cache
+  // policy for image requests.
+  //
+
+  int handleCacheRequest(EncodeBuffer &encodeBuffer, const unsigned char opcode,
+                             const unsigned char *buffer, const unsigned int size);
+
+  //
+  // Encode the start and end split
+  // requests.
+  //
+
+  int handleStartSplitRequest(EncodeBuffer &encodeBuffer, const unsigned char opcode,
+                                  const unsigned char *buffer, const unsigned int size);
+
+  int handleEndSplitRequest(EncodeBuffer &encodeBuffer, const unsigned char opcode,
+                                const unsigned char *buffer, const unsigned int size);
+
+  //
+  // Empty a split store and send the
+  // restart event.
+  //
+
+  int handleAbortSplitRequest(EncodeBuffer &encodeBuffer, const unsigned char opcode,
+                                  const unsigned char *buffer, const unsigned int size);
+
+  //
+  // Force the proxy to finalize all
+  // the pending split operations and
+  // restart a resource.
+  //
+  
+  int handleFinishSplitRequest(EncodeBuffer &encodeBuffer, const unsigned char opcode,
+                                   const unsigned char *buffer, const unsigned int size);
+
+  //
+  // Tell the remote peer to send the
+  // split requests to the X server.
+  //
+
+  int handleCommitSplitRequest(EncodeBuffer &encodeBuffer, const unsigned char opcode,
+                                   const unsigned char *buffer, const unsigned int size);
+
+  //
+  // Other utilities.
+  //
+
+  void handleDecodeCharInfo(DecodeBuffer &, unsigned char *);
+
+  //
+  // Own read buffer. It is able to identify
+  // full messages read from the X descriptor.
+  //
+
+  ClientReadBuffer readBuffer_;
+
+  //
+  // Sequence number of last request coming
+  // from the X client or the X server.
+  //
+
+  unsigned int clientSequence_;
+  unsigned int serverSequence_;
+
+  //
+  // Last sequence number known by client. It can
+  // be the real sequence generated by server or
+  // the one of the last auto-generated event.
+  //
+
+  unsigned int lastSequence_;
+
+  //
+  // Used to identify replies based on sequence
+  // number of original request.
+  //
+
+  SequenceQueue sequenceQueue_;
+
+  //
+  // This is used to test the synchronous flush
+  // in the proxy.
+  //
+
+  int lastRequest_;
+
+  //
+  // Current resource id selected as target and
+  // other information related to the image split.
+  // The pending and abort flags are set when we
+  // want the proxy to give us a chance to send
+  // more split data. We also save the position
+  // of the last commit operation performed by
+  // channel so we can differentially encode the
+  // position of next message to commit.
+  //
+
+  typedef struct
+  {
+    int resource;
+    int pending;
+    int commit;
+    T_split_mode mode;
+
+  } T_split_state;
+
+  T_split_state splitState_;
+
+  //
+  // List of agent resources.
+  //
+
+  List splitResources_;
+
+  //
+  // How many sync requests we
+  // have tainted so far.
+  //
+
+  int taintCounter_;
+
+  private:
+
+  //
+  // Keep track of object 
+  // creation and deletion.
+  //
+
+  #ifdef REFERENCES
+
+  static int references_;
+
+  #endif
+};
+
+#endif /* ClientChannel_H */
diff --git a/nxcomp/src/ClientProxy.cpp b/nxcomp/src/ClientProxy.cpp
new file mode 100644
index 000000000..3574d3bf3
--- /dev/null
+++ b/nxcomp/src/ClientProxy.cpp
@@ -0,0 +1,553 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "Socket.h"
+#include "Agent.h"
+
+#include "ClientProxy.h"
+
+#include "ClientChannel.h"
+#include "GenericChannel.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+//
+// Log the operations related to sending
+// and receiving the control tokens.
+//
+
+#undef  TOKEN
+
+ClientProxy::ClientProxy(int proxyFd) : Proxy(proxyFd)
+{
+  fontServerPort_ = NULL;
+
+  #ifdef DEBUG
+  *logofs << "ClientProxy: Created new object at " << this
+          << ".\n" << logofs_flush;
+  #endif
+}
+
+ClientProxy::~ClientProxy()
+{
+  delete [] fontServerPort_;
+
+  #ifdef DEBUG
+  *logofs << "ClientProxy: Deleted object at " << this
+          << ".\n" << logofs_flush;
+  #endif
+}
+
+void ClientProxy::handleDisplayConfiguration(const char *xServerDisplay, int xServerAddrFamily,
+                                                 sockaddr * xServerAddr, unsigned int xServerAddrLength)
+{
+  #ifdef DEBUG
+  *logofs << "ClientProxy: No display configuration to set.\n"
+          << logofs_flush;
+  #endif
+}
+
+void ClientProxy::handlePortConfiguration(ChannelEndPoint &cupsServerPort,
+                                          ChannelEndPoint &smbServerPort,
+                                          ChannelEndPoint &mediaServerPort,
+                                          ChannelEndPoint &httpServerPort,
+                                          const char *fontServerPort)
+{
+  delete [] fontServerPort_;
+
+  fontServerPort_ = new char[strlen(fontServerPort) + 1];
+
+  strcpy(fontServerPort_, fontServerPort);
+
+  #ifdef DEBUG
+  *logofs << "ClientProxy: Set port configuration to font '"
+          << fontServerPort_ << "'.\n"
+          << logofs_flush;
+  #endif
+}
+
+int ClientProxy::handleNewConnection(T_channel_type type, int clientFd)
+{
+  switch (type)
+  {
+    case channel_x11:
+    {
+      return handleNewXConnection(clientFd);
+    }
+    case channel_cups:
+    {
+      return handleNewGenericConnection(clientFd, channel_cups, "CUPS");
+    }
+    case channel_smb:
+    {
+      return handleNewGenericConnection(clientFd, channel_smb, "SMB");
+    }
+    case channel_media:
+    {
+      return handleNewGenericConnection(clientFd, channel_media, "media");
+    }
+    case channel_http:
+    {
+      return handleNewGenericConnection(clientFd, channel_http, "HTTP");
+    }
+    case channel_slave:
+    {
+      return handleNewSlaveConnection(clientFd);
+    }
+    default:
+    {
+      #ifdef PANIC
+      *logofs << "ClientProxy: PANIC! Unsupported channel with type '"
+              << getTypeName(type) << "'.\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Unsupported channel with type '"
+           << getTypeName(type) << "'.\n";
+
+      return -1;
+    }
+  }
+}
+
+int ClientProxy::handleNewConnectionFromProxy(T_channel_type type, int channelId)
+{
+  switch (type)
+  {
+    case channel_font:
+    {
+      int port = atoi(fontServerPort_);
+
+      if (port > 0)
+      {
+        //
+        // Connect on the TCP port number.
+        //
+
+        return handleNewGenericConnectionFromProxyTCP(channelId, channel_font, "localhost",
+                                                      port, "font");
+      }
+      else
+      {
+        //
+        // Connect to the Unix path.
+        //
+
+        return handleNewGenericConnectionFromProxyUnix(channelId, channel_font,
+                                                       fontServerPort_, "font");
+      }
+    }
+    case channel_slave:
+    {
+      return handleNewSlaveConnectionFromProxy(channelId);
+    }
+    default:
+    {
+      #ifdef PANIC
+      *logofs << "ClientProxy: PANIC! Unsupported channel with type '"
+              << getTypeName(type) << "'.\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Unsupported channel with type '"
+           << getTypeName(type) << "'.\n";
+
+      return -1;
+    }
+  }
+}
+
+int ClientProxy::handleNewAgentConnection(Agent *agent)
+{
+  int clientFd = agent -> getLocalFd();
+
+  int channelId = allocateChannelMap(clientFd);
+
+  if (channelId == -1)
+  {
+    #ifdef PANIC
+    *logofs << "ClientProxy: PANIC! Maximum number of available "
+            << "channels exceeded.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Maximum number of available "
+         << "channels exceeded.\n";
+
+    return -1;
+  }
+
+  transports_[channelId] = agent -> getTransport();
+
+  agent_ = channelId;
+
+  return handleNewXConnection(clientFd);
+}
+
+int ClientProxy::handleNewXConnection(int clientFd)
+{
+  int channelId = getChannel(clientFd);
+
+  //
+  // Check if the channel has been
+  // already mapped.
+  //
+
+  if (channelId == -1)
+  {
+    channelId = allocateChannelMap(clientFd);
+
+    if (channelId == -1)
+    {
+      #ifdef PANIC
+      *logofs << "ClientProxy: PANIC! Maximum number of available "
+              << "channels exceeded.\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Maximum number of available "
+           << "channels exceeded.\n";
+
+      return -1;
+    }
+  }
+
+  #ifdef TEST
+  *logofs << "ClientProxy: X client descriptor FD#" << clientFd
+          << " mapped to channel ID#" << channelId << ".\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // Turn queuing off for path proxy-to-X-client.
+  //
+
+  if (control -> OptionClientNoDelay == 1)
+  {
+    SetNoDelay(clientFd, control -> OptionClientNoDelay);
+  }
+
+  //
+  // If requested, set the size of the TCP send
+  // and receive buffers.
+  //
+
+  if (control -> OptionClientSendBuffer != -1)
+  {
+    SetSendBuffer(clientFd, control -> OptionClientSendBuffer);
+  }
+
+  if (control -> OptionClientReceiveBuffer != -1)
+  {
+    SetReceiveBuffer(clientFd, control -> OptionClientReceiveBuffer);
+  }
+
+  if (allocateTransport(clientFd, channelId) < 0)
+  {
+    return -1;
+  }
+
+  //
+  // Starting from protocol level 3 client and server
+  // caches are created in proxy and shared between all
+  // channels. If remote proxy has older protocol level
+  // pointers are NULL and channels must create their
+  // own instances.
+  //
+
+  channels_[channelId] = new ClientChannel(transports_[channelId], compressor_);
+
+  if (channels_[channelId] == NULL)
+  {
+    deallocateTransport(channelId);
+
+    return -1;
+  }
+
+  increaseChannels(channelId);
+
+  //
+  // Propagate channel stores and caches to the new
+  // channel.
+  //
+
+  channels_[channelId] -> setOpcodes(opcodeStore_);
+
+  channels_[channelId] -> setStores(clientStore_, serverStore_);
+
+  channels_[channelId] -> setCaches(clientCache_, serverCache_);
+
+  int port = atoi(fontServerPort_);
+
+  if (port > 0 || *fontServerPort_ != '\0')
+  {
+    channels_[channelId] -> setPorts(1);
+  }
+
+  if (handleControl(code_new_x_connection, channelId) < 0)
+  {
+    return -1;
+  }
+
+  //
+  // Let channel configure itself according
+  // to control parameters.
+  //
+
+  channels_[channelId] -> handleConfiguration();
+
+  return 1;
+}
+
+int ClientProxy::handleNewXConnectionFromProxy(int channelId)
+{
+  #ifdef PANIC
+  *logofs << "ClientProxy: PANIC! Can't create a new X channel "
+          << "with ID#" << channelId << " at this side.\n"
+          << logofs_flush;
+  #endif
+
+  cerr << "Error" << ": Can't create a new X channel "
+       << "with ID#" << channelId << " at this side.\n";
+
+  return -1;
+}
+
+int ClientProxy::handleLoad(T_load_type type)
+{
+  int channelCount = getChannels(channel_x11);
+
+  if ((channelCount == 0 && type == load_if_first) ||
+          (channelCount > 0 && type == load_if_any))
+  {
+    #ifdef TEST
+    *logofs << "ClientProxy: Going to load content of client store.\n"
+            << logofs_flush;
+    #endif
+
+    int result = handleLoadStores();
+
+    if (result == 1)
+    {
+      if (handleControl(code_load_request) < 0)
+      {
+        return -1;
+      }
+ 
+      priority_ = 1;
+    }
+    else if (result < 0)
+    {
+      #ifdef WARNING
+      *logofs << "ClientProxy: WARNING! Failed to load content "
+              << "of persistent cache.\n" << logofs_flush;
+      #endif
+
+      //
+      // Don't abort the proxy connection in the case
+      // of a corrupted cache. By not sending the load
+      // message to the remote peer, both sides will
+      // start encoding messages using empty stores.
+      // This behaviour is compatible with old proxy
+      // versions.
+      //
+
+      if (channelCount == 0 && type == load_if_first)
+      {
+        if (handleResetStores() < 0)
+        {
+          #ifdef PANIC
+          *logofs << "ClientProxy: PANIC! Failed to reset message stores.\n"
+                  << logofs_flush;
+          #endif
+
+          return -1;
+        }
+      }
+      else
+      {
+        return -1;
+      }
+    }
+  }
+  else
+  {
+    #ifdef PANIC
+    *logofs << "ClientProxy: PANIC! Can't load the stores with "
+            << channelCount << " remaining channels.\n"
+            << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  return 1;
+}
+
+int ClientProxy::handleSave()
+{
+  //
+  // If no more X channels are remaining
+  // then save content of message stores.
+  //
+
+  int channelCount = getChannels(channel_x11);
+
+  if (channelCount == 0)
+  {
+    int result = handleSaveStores();
+
+    if (result == 1)
+    {
+      if (handleControl(code_save_request) < 0)
+      {
+        return -1;
+      }
+
+      priority_ = 1;
+
+      return 1;
+    }
+    else if (result < 0)
+    {
+      #ifdef PANIC
+      *logofs << "ClientProxy: PANIC! Failed to save stores "
+              << "to persistent cache.\n" << logofs_flush;
+      #endif
+
+      return -1;
+    }
+  }
+  else
+  {
+    #ifdef PANIC
+    *logofs << "ClientProxy: PANIC! Can't save the stores with "
+            << channelCount << " remaining channels.\n"
+            << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  return 1;
+}
+
+int ClientProxy::handleAsyncEvents()
+{
+  if (canRead() == 1)
+  {
+    #if defined(TEST) || defined(INFO)
+    *logofs << "Proxy: WARNING! Reading while writing "
+            << "with data available on the proxy link.\n"
+            << logofs_flush;
+    #endif
+
+    if (handleRead() < 0)
+    {
+      return -1;
+    }
+
+    return 1;
+  }
+
+  return 0;
+}
+
+int ClientProxy::handleLoadFromProxy()
+{
+  #ifdef PANIC
+  *logofs << "ClientProxy: PANIC! Invalid load control message "
+          << "received in proxy.\n" << logofs_flush;
+  #endif
+
+  cerr << "Error" << ": Invalid load control message "
+       << "received in proxy.\n";
+
+  return -1;
+}
+
+int ClientProxy::handleSaveFromProxy()
+{
+  #ifdef PANIC
+  *logofs << "ClientProxy: PANIC! Invalid save control message "
+          << "received in proxy.\n" << logofs_flush;
+  #endif
+
+  cerr << "Error" << ": Invalid save control message "
+       << "received in proxy.\n";
+
+  return -1;
+}
+
+int ClientProxy::handleSaveAllStores(ostream *cachefs, md5_state_t *md5StateStream,
+                                         md5_state_t *md5StateClient) const
+{
+  if (clientStore_ -> saveRequestStores(cachefs, md5StateStream, md5StateClient,
+                                            use_checksum, discard_data) < 0)
+  {
+    return -1;
+  }
+  else if (serverStore_ -> saveReplyStores(cachefs, md5StateStream, md5StateClient,
+                                               discard_checksum, use_data) < 0)
+  {
+    return -1;
+  }
+  else if (serverStore_ -> saveEventStores(cachefs, md5StateStream, md5StateClient,
+                                               discard_checksum, use_data) < 0)
+  {
+    return -1;
+  }
+
+  return 1;
+}
+
+int ClientProxy::handleLoadAllStores(istream *cachefs, md5_state_t *md5StateStream) const
+{
+  if (clientStore_ -> loadRequestStores(cachefs, md5StateStream,
+                                            use_checksum, discard_data) < 0)
+  {
+    return -1;
+  }
+  else if (serverStore_ -> loadReplyStores(cachefs, md5StateStream,
+                                               discard_checksum, use_data) < 0)
+  {
+    return -1;
+  }
+  else if (serverStore_ -> loadEventStores(cachefs, md5StateStream,
+                                               discard_checksum, use_data) < 0)
+  {
+    return -1;
+  }
+
+  return 1;
+}
+
diff --git a/nxcomp/src/ClientProxy.h b/nxcomp/src/ClientProxy.h
new file mode 100644
index 000000000..b89785b1a
--- /dev/null
+++ b/nxcomp/src/ClientProxy.h
@@ -0,0 +1,113 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef ClientProxy_H
+#define ClientProxy_H
+
+#include "Proxy.h"
+
+//
+// Set the verbosity level.
+//
+
+#undef  TEST
+#undef  DEBUG
+
+class ClientProxy : public Proxy
+{
+  public:
+
+  ClientProxy(int proxyFD);
+
+  virtual ~ClientProxy();
+
+  virtual void handleDisplayConfiguration(const char *xServerDisplay, int xServerAddrFamily,
+                                              sockaddr *xServerAddr, unsigned int xServerAddrLength);
+
+  virtual void handlePortConfiguration(ChannelEndPoint &cupsServerPort,
+                                       ChannelEndPoint &smbServerPort,
+                                       ChannelEndPoint &mediaServerPort,
+                                       ChannelEndPoint &httpServerPort,
+                                       const char *fontServerPort);
+
+  protected:
+
+  //
+  // Create a new channel.
+  //
+
+  virtual int handleNewConnection(T_channel_type type, int clientFd);
+
+  virtual int handleNewConnectionFromProxy(T_channel_type type, int channelId);
+
+  virtual int handleNewAgentConnection(Agent *agent);
+
+  virtual int handleNewXConnection(int clientFd);
+
+  virtual int handleNewXConnectionFromProxy(int channelId);
+
+  //
+  // Implement persistence according
+  // to our proxy mode.
+  //
+
+  virtual int handleLoad(T_load_type type);
+  virtual int handleSave();
+
+  virtual int handleAsyncEvents();
+
+  virtual int handleLoadFromProxy();
+  virtual int handleSaveFromProxy();
+
+  virtual int handleSaveAllStores(ostream *cachefs, md5_state_t *md5StateStream,
+                                      md5_state_t *md5StateClient) const;
+
+  virtual int handleLoadAllStores(istream *cachefs, md5_state_t *md5StateStream) const;
+
+  //
+  // Utility function used to realize
+  // a new connection.
+  //
+
+  protected:
+
+  virtual int checkLocalChannelMap(int channelId)
+  {
+    // Since ProtoStep7 (#issue 108)
+    return ((channelId & control -> ChannelMask) != 0);
+  }
+
+  //
+  // Ports where to forward extended services'
+  // TCP connections.
+  //
+
+  private:
+
+  char *fontServerPort_;
+};
+
+
+#endif /* ClientProxy_H */
diff --git a/nxcomp/src/ClientReadBuffer.cpp b/nxcomp/src/ClientReadBuffer.cpp
new file mode 100644
index 000000000..c8f4f69a4
--- /dev/null
+++ b/nxcomp/src/ClientReadBuffer.cpp
@@ -0,0 +1,178 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "ClientReadBuffer.h"
+
+#include "ClientChannel.h"
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+unsigned int ClientReadBuffer::suggestedLength(unsigned int pendingLength)
+{
+  //
+  // Even if the pending data is not
+  // enough to make a complete message,
+  // resize the buffer to accommodate
+  // it all.
+  //
+
+  unsigned int readLength = pendingLength;
+
+  if (pendingLength < remaining_)
+  {
+    readLength = remaining_;
+  }
+
+  return readLength;
+}  
+
+int ClientReadBuffer::locateMessage(const unsigned char *start,
+                                        const unsigned char *end,
+                                            unsigned int &controlLength,
+                                                unsigned int &dataLength,
+                                                    unsigned int &trailerLength)
+{
+  unsigned int size = end - start;
+
+  #ifdef TEST
+  *logofs << "ClientReadBuffer: Locating message for FD#"
+          << transport_ -> fd() << " with " << size
+          << " bytes.\n" << logofs_flush;
+  #endif
+
+  if (firstMessage_)
+  {
+    if (size < 12)
+    {
+      remaining_ = 12 - size;
+
+      #ifdef TEST
+      *logofs << "ClientReadBuffer: No message was located "
+              << "with remaining " << remaining_ << ".\n"
+              << logofs_flush;
+      #endif
+
+      return 0;
+    }
+
+    if (*start == 0x42)
+    {
+      bigEndian_ = 1;
+    }
+    else
+    {
+      bigEndian_ = 0;
+    }
+
+    channel_ -> setBigEndian(bigEndian_);
+
+    dataLength = 12 + RoundUp4(GetUINT(start + 6, bigEndian_)) +
+                          RoundUp4(GetUINT(start + 8, bigEndian_));
+
+    //
+    // Send the data immediately if this is unlikely
+    // to be a X connection attempt.
+    //
+
+    if (dataLength > 4096)
+    {
+      #ifdef WARNING
+      *logofs << "ClientReadBuffer: WARNING! Flushing suspicious X "
+              << "connection with first request of " << dataLength
+              << " bytes.\n" << logofs_flush;
+      #endif
+
+      dataLength = size;
+    }
+  }
+  else
+  {
+    if (size < 4)
+    {
+      remaining_ = 4 - size;
+
+      #ifdef TEST
+      *logofs << "ClientReadBuffer: No message was located "
+              << "with remaining " << remaining_ << ".\n"
+              << logofs_flush;
+      #endif
+
+      return 0;
+    }
+
+    dataLength = (GetUINT(start + 2, bigEndian_) << 2);
+
+    if (dataLength < 4)
+    {
+      #ifdef TEST
+      *logofs << "ClientReadBuffer: WARNING! Assuming length 4 "
+              << "for suspicious message of length " << dataLength
+              << ".\n" << logofs_flush;
+      #endif
+
+      dataLength = 4;
+    }
+  }
+
+  #ifdef TEST
+  *logofs << "ClientReadBuffer: Length of the next message is "
+          << dataLength << ".\n" << logofs_flush;
+  #endif
+
+  if (size < dataLength)
+  {
+    remaining_ = dataLength - size;
+
+    #ifdef TEST
+    *logofs << "ClientReadBuffer: No message was located "
+            << "with remaining " << remaining_ << ".\n"
+            << logofs_flush;
+    #endif
+
+    return 0;
+  }
+
+  firstMessage_ = 0;
+
+  controlLength = 0;
+  trailerLength = 0;
+
+  remaining_ = 0;
+
+  #ifdef TEST
+  *logofs << "ClientReadBuffer: Located message with "
+          << "remaining " << remaining_ << ".\n"
+          << logofs_flush;
+  #endif
+
+  return 1;
+}
diff --git a/nxcomp/src/ClientReadBuffer.h b/nxcomp/src/ClientReadBuffer.h
new file mode 100644
index 000000000..c557417fa
--- /dev/null
+++ b/nxcomp/src/ClientReadBuffer.h
@@ -0,0 +1,65 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef ClientReadBuffer_H
+#define ClientReadBuffer_H
+
+#include "Control.h"
+#include "ReadBuffer.h"
+
+class ClientChannel;
+
+class ClientReadBuffer : public ReadBuffer
+{
+  public:
+
+  ClientReadBuffer(Transport *transport, ClientChannel *channel)
+
+    : ReadBuffer(transport), firstMessage_(1), channel_(channel)
+  {
+  }
+
+  virtual ~ClientReadBuffer()
+  {
+  }
+
+  protected:
+
+  virtual unsigned int suggestedLength(unsigned int pendingLength);
+
+  virtual int locateMessage(const unsigned char *start,
+                                const unsigned char *end,
+                                    unsigned int &controlLength,
+                                        unsigned int &dataLength,
+                                            unsigned int &trailerLength);
+
+  int bigEndian_;
+
+  int firstMessage_;
+
+  ClientChannel *channel_;
+};
+
+#endif /* ClientReadBuffer_H */
diff --git a/nxcomp/src/ClientStore.cpp b/nxcomp/src/ClientStore.cpp
new file mode 100644
index 000000000..0c12eefd8
--- /dev/null
+++ b/nxcomp/src/ClientStore.cpp
@@ -0,0 +1,226 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "ClientStore.h"
+
+//
+// Cached request classes.
+//
+
+#include "ChangeProperty.h"
+#include "SendEvent.h"
+#include "CreateGC.h"
+#include "ChangeGC.h"
+#include "CreatePixmap.h"
+#include "SetClipRectangles.h"
+#include "CopyArea.h"
+#include "PolyLine.h"
+#include "PolySegment.h"
+#include "PolyFillRectangle.h"
+#include "PutImage.h"
+#include "TranslateCoords.h"
+#include "GetImage.h"
+#include "ClearArea.h"
+#include "ConfigureWindow.h"
+#include "ShapeExtension.h"
+#include "RenderExtension.h"
+#include "PolyText8.h"
+#include "PolyText16.h"
+#include "ImageText8.h"
+#include "ImageText16.h"
+#include "PolyPoint.h"
+#include "PolyFillArc.h"
+#include "PolyArc.h"
+#include "FillPoly.h"
+#include "InternAtom.h"
+#include "GetProperty.h"
+#include "SetUnpackGeometry.h"
+#include "SetUnpackColormap.h"
+#include "SetUnpackAlpha.h"
+#include "PutPackedImage.h"
+#include "GenericRequest.h"
+
+//
+// Set the verbosity level.
+//
+
+#define WARNING
+#define PANIC
+#undef  TEST
+
+ClientStore::ClientStore(StaticCompressor *compressor)
+
+  : compressor_(compressor)
+{
+  if (logofs == NULL)
+  {
+    logofs = &cout;
+  }
+
+  for (int i = 0; i < CHANNEL_STORE_OPCODE_LIMIT; i++)
+  {
+    requests_[i] = NULL;
+  }
+
+  requests_[X_ChangeProperty]    = new ChangePropertyStore();
+  requests_[X_SendEvent]         = new SendEventStore();
+  requests_[X_CreateGC]          = new CreateGCStore();
+  requests_[X_SetClipRectangles] = new SetClipRectanglesStore();
+  requests_[X_CopyArea]          = new CopyAreaStore();
+  requests_[X_PolyLine]          = new PolyLineStore();
+  requests_[X_PolySegment]       = new PolySegmentStore();
+  requests_[X_PolyFillRectangle] = new PolyFillRectangleStore();
+  requests_[X_PutImage]          = new PutImageStore(compressor);
+  requests_[X_TranslateCoords]   = new TranslateCoordsStore();
+  requests_[X_GetImage]          = new GetImageStore();
+  requests_[X_ClearArea]         = new ClearAreaStore();
+  requests_[X_ConfigureWindow]   = new ConfigureWindowStore();
+  requests_[X_PolyText8]         = new PolyText8Store();
+  requests_[X_PolyText16]        = new PolyText16Store();
+  requests_[X_ImageText8]        = new ImageText8Store();
+  requests_[X_ImageText16]       = new ImageText16Store();
+  requests_[X_PolyPoint]         = new PolyPointStore();
+  requests_[X_PolyFillArc]       = new PolyFillArcStore();
+  requests_[X_PolyArc]           = new PolyArcStore();
+  requests_[X_FillPoly]          = new FillPolyStore();
+  requests_[X_InternAtom]        = new InternAtomStore();
+  requests_[X_GetProperty]       = new GetPropertyStore();
+
+  requests_[X_NXInternalShapeExtension]  = new ShapeExtensionStore(compressor);
+  requests_[X_NXInternalGenericRequest]  = new GenericRequestStore(compressor);
+  requests_[X_NXInternalRenderExtension] = new RenderExtensionStore(compressor);
+  requests_[X_NXSetUnpackGeometry]       = new SetUnpackGeometryStore(compressor);
+  requests_[X_NXPutPackedImage]          = new PutPackedImageStore(compressor);
+
+  // Since ProtoStep7 (#issue 108)
+  requests_[X_ChangeGC]            = new ChangeGCStore();
+  requests_[X_CreatePixmap]        = new CreatePixmapStore();
+  requests_[X_NXSetUnpackColormap] = new SetUnpackColormapStore(compressor);
+  requests_[X_NXSetUnpackAlpha]    = new SetUnpackAlphaStore(compressor);
+
+  for (int i = 0; i < CHANNEL_STORE_RESOURCE_LIMIT; i++)
+  {
+    splits_[i] = NULL;
+  }
+
+  commits_ = new CommitStore(compressor);
+}
+
+ClientStore::~ClientStore()
+{
+  if (logofs == NULL)
+  {
+    logofs = &cout;
+  }
+
+  for (int i = 0; i < CHANNEL_STORE_OPCODE_LIMIT; i++)
+  {
+    delete requests_[i];
+  }
+
+  for (int i = 0; i < CHANNEL_STORE_RESOURCE_LIMIT; i++)
+  {
+    delete splits_[i];
+  }
+
+  delete commits_;
+}
+
+int ClientStore::saveRequestStores(ostream *cachefs, md5_state_t *md5StateStream,
+                                       md5_state_t *md5StateClient, T_checksum_action checksumAction,
+                                           T_data_action dataAction) const
+{
+  for (int i = 0; i < CHANNEL_STORE_OPCODE_LIMIT; i++)
+  {
+    if (requests_[i] != NULL &&
+            requests_[i] -> saveStore(cachefs, md5StateStream, md5StateClient,
+                                          checksumAction, dataAction,
+                                              storeBigEndian()) < 0)
+    {
+      #ifdef WARNING
+      *logofs << "ClientStore: WARNING! Error saving request store "
+              << "for OPCODE#" << (unsigned int) i << ".\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Warning" << ": Error saving request store "
+           << "for opcode '" << (unsigned int) i << "'.\n";
+
+      return -1;
+    }
+  }
+
+  return 1;
+}
+
+int ClientStore::loadRequestStores(istream *cachefs, md5_state_t *md5StateStream,
+                                       T_checksum_action checksumAction, T_data_action dataAction) const
+{
+  for (int i = 0; i < CHANNEL_STORE_OPCODE_LIMIT; i++)
+  {
+    if (requests_[i] != NULL &&
+            requests_[i] -> loadStore(cachefs, md5StateStream,
+                                          checksumAction, dataAction,
+                                              storeBigEndian()) < 0)
+    {
+      #ifdef WARNING
+      *logofs << "ClientStore: WARNING! Error loading request store "
+              << "for OPCODE#" << (unsigned int) i << ".\n"
+              << logofs_flush;
+      #endif
+
+      return -1;
+    }
+  }
+
+  return 1;
+}
+
+void ClientStore::dumpSplitStores() const
+{
+  for (int i = 0; i < CHANNEL_STORE_RESOURCE_LIMIT; i++)
+  {
+    if (splits_[i] != NULL)
+    {
+      splits_[i] -> dump();
+    }
+  }
+
+  if ((getSplitTotalSize() != 0 && getSplitTotalStorageSize() == 0) ||
+          (getSplitTotalSize() == 0 && getSplitTotalStorageSize() != 0))
+  {
+    #ifdef PANIC
+    *logofs << "ClientStore: PANIC! Inconsistency detected "
+            << "while handling the split stores.\n"
+            << logofs_flush;
+    #endif
+
+    HandleCleanup();
+  }
+}
diff --git a/nxcomp/src/ClientStore.h b/nxcomp/src/ClientStore.h
new file mode 100644
index 000000000..009d87d9f
--- /dev/null
+++ b/nxcomp/src/ClientStore.h
@@ -0,0 +1,143 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef ClientStore_H
+#define ClientStore_H
+
+#include "Message.h"
+#include "Split.h"
+
+#include "ChannelStore.h"
+
+class StaticCompressor;
+
+class ClientStore : public ChannelStore
+{
+  public:
+
+  ClientStore(StaticCompressor *compressor);
+
+  virtual ~ClientStore();
+
+  //
+  // Get the store based on the index.
+  //
+
+  MessageStore *getRequestStore(unsigned char opcode) const
+  {
+    return requests_[opcode];
+  }
+
+  SplitStore *getSplitStore(int resource) const
+  {
+    return splits_[resource];
+  }
+
+  int getSplitTotalSize() const
+  {
+    return SplitStore::getTotalSize();
+  }
+
+  int getSplitTotalStorageSize() const
+  {
+    return SplitStore::getTotalStorageSize();
+  }
+
+  CommitStore *getCommitStore() const
+  {
+    return commits_;
+  }
+
+  int getCommitSize() const
+  {
+    return commits_ -> getSize();
+  }
+
+  void dumpSplitStore(int resource) const
+  {
+    splits_[resource] -> dump();
+  }
+
+  void dumpCommitStore() const
+  {
+    commits_ -> dump();
+  }
+
+  void dumpSplitStores() const;
+
+  SplitStore *createSplitStore(int resource)
+  {
+    splits_[resource] = new SplitStore(compressor_, commits_, resource);
+
+    return splits_[resource];
+  }
+
+  void destroySplitStore(int resource)
+  {
+    delete splits_[resource];
+
+    splits_[resource] = NULL;
+  }
+
+  //
+  // Actually save the message store
+  // to disk according to proxy mode.
+  //
+
+  int saveRequestStores(ostream *cachefs, md5_state_t *md5StateStream,
+                            md5_state_t *md5StateClient, T_checksum_action checksumAction,
+                                T_data_action dataAction) const;
+
+  int loadRequestStores(istream *cachefs, md5_state_t *md5StateStream,
+                            T_checksum_action checksumAction, T_data_action dataAction) const;
+
+  private:
+
+  //
+  // A client store contains requests.
+  //
+
+  MessageStore *requests_[CHANNEL_STORE_OPCODE_LIMIT];
+
+  //
+  // Client messages being split.
+  //
+
+  SplitStore *splits_[CHANNEL_STORE_RESOURCE_LIMIT];
+
+  //
+  // Messages having been recomposed.
+  //
+
+  CommitStore *commits_;
+
+  //
+  // Passed forward to the other stores.
+  //
+
+  StaticCompressor *compressor_;
+};
+
+#endif /* ClientStore_H */
diff --git a/nxcomp/src/Colormap.cpp b/nxcomp/src/Colormap.cpp
new file mode 100644
index 000000000..afe99ecae
--- /dev/null
+++ b/nxcomp/src/Colormap.cpp
@@ -0,0 +1,106 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "Misc.h"
+#include "Unpack.h"
+#include "Colormap.h"
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+int UnpackColormap(unsigned char method, unsigned char *src_data, int src_size,
+                    unsigned char *dst_data, int dst_size)
+{
+  if (*src_data == 0)
+  {
+    if (dst_size != src_size - 1)
+    {
+      #ifdef TEST
+      *logofs << "UnpackColormap: PANIC! Invalid destination size "
+              << dst_size << " with source " << src_size
+              << ".\n" << logofs_flush;
+      #endif
+
+      return -1;
+    }
+
+    #ifdef TEST
+    *logofs << "UnpackColormap: Expanding " << src_size - 1
+            << " bytes of plain colormap data.\n" << logofs_flush;
+    #endif
+
+    memcpy(dst_data, src_data + 1, src_size - 1);
+
+    return 1;
+  }
+
+  unsigned int check_size = dst_size;
+
+  int result = ZDecompress(&unpackStream, dst_data, &check_size,
+                               src_data + 1, src_size - 1);
+
+  if (result != Z_OK)
+  {
+    #ifdef PANIC
+    *logofs << "UnpackColormap: PANIC! Failure decompressing colormap data. "
+            << "Error is '" << zError(result) << "'.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Failure decompressing colormap data. "
+         << "Error is '" << zError(result) << "'.\n";
+
+    return -1;
+  }
+  else if (check_size != (unsigned int) dst_size)
+  {
+    #ifdef PANIC
+    *logofs << "UnpackColormap: PANIC! Size mismatch in colormap data. "
+            << "Resulting size is " << check_size << " with "
+            << "expected size " << dst_size << ".\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Size mismatch in colormap data. "
+         << "Resulting size is " << check_size << " with "
+         << "expected size " << dst_size << ".\n";
+
+    return -1;
+  }
+
+  #ifdef TEST
+  *logofs << "UnpackColormap: Decompressed " << src_size - 1
+          << " bytes to " << dst_size << " bytes of colormap data.\n"
+          << logofs_flush;
+  #endif
+
+  return 1;
+}
diff --git a/nxcomp/src/Colormap.h b/nxcomp/src/Colormap.h
new file mode 100644
index 000000000..a96d003fa
--- /dev/null
+++ b/nxcomp/src/Colormap.h
@@ -0,0 +1,32 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef Colormap_H
+#define Colormap_H
+
+int UnpackColormap(unsigned char method, unsigned char *src_data, int src_size,
+                       unsigned char *dst_data, int dst_size);
+
+#endif /* Colormap_H */
diff --git a/nxcomp/src/ConfigureWindow.cpp b/nxcomp/src/ConfigureWindow.cpp
new file mode 100644
index 000000000..32d3153b9
--- /dev/null
+++ b/nxcomp/src/ConfigureWindow.cpp
@@ -0,0 +1,142 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "ConfigureWindow.h"
+
+#include "ClientCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Here are the methods to handle messages' content.
+//
+
+int ConfigureWindowStore::parseIdentity(Message *message, const unsigned char *buffer,
+                                            unsigned int size, int bigEndian) const
+{
+  ConfigureWindowMessage *configureWindow = (ConfigureWindowMessage *) message;
+
+  //
+  // Here is the fingerprint.
+  //
+
+  configureWindow -> window = GetULONG(buffer + 4, bigEndian); 
+
+  configureWindow -> value_mask = GetUINT(buffer + 8, bigEndian);
+
+  //
+  // To increase effectiveness of the caching algorithm 
+  // we remove the unused bytes carried in the data part.
+  //
+
+  if ((int) size > dataOffset)
+  {
+    #ifdef DEBUG
+    *logofs << name() << ": Removing unused bytes from the data payload.\n" << logofs_flush;
+    #endif
+
+    configureWindow -> value_mask &= (1 << 7) - 1;
+
+    unsigned int mask = 0x1;
+    unsigned char *source = (unsigned char *) buffer + CONFIGUREWINDOW_DATA_OFFSET;
+    unsigned long value = 0;
+
+    for (unsigned int i = 0; i < 7; i++)
+    {
+      if (configureWindow -> value_mask & mask)
+      {
+        value = GetULONG(source, bigEndian);
+
+        value &= (1 << CONFIGUREWINDOW_FIELD_WIDTH[i]) - 1;
+
+        PutULONG(value, source, bigEndian);
+
+        source += 4;
+      }
+      mask <<= 1;
+    }
+  }
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsed Identity for message at " << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int ConfigureWindowStore::unparseIdentity(const Message *message, unsigned char *buffer,
+                                              unsigned int size, int bigEndian) const
+{
+  ConfigureWindowMessage *configureWindow = (ConfigureWindowMessage *) message;
+
+  //
+  // Fill all the message's fields.
+  //
+
+  PutULONG(configureWindow -> window, buffer + 4, bigEndian);
+
+  PutUINT(configureWindow -> value_mask, buffer + 8, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsed identity for message at " << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void ConfigureWindowStore::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  ConfigureWindowMessage *configureWindow = (ConfigureWindowMessage *) message;
+
+  *logofs << "ConfigureWindow: window " << configureWindow -> window  
+          << ", value_mask " << configureWindow -> value_mask
+          << ", size " << configureWindow -> size_ << ".\n";
+
+  #endif
+}
+
+void ConfigureWindowStore::identityChecksum(const Message *message, const unsigned char *buffer,
+                                                unsigned int size, int bigEndian) const
+{
+  md5_append(md5_state_, buffer + 4, 4);
+  md5_append(md5_state_, buffer + 8, 2);
+}
diff --git a/nxcomp/src/ConfigureWindow.h b/nxcomp/src/ConfigureWindow.h
new file mode 100644
index 000000000..e02c2aae1
--- /dev/null
+++ b/nxcomp/src/ConfigureWindow.h
@@ -0,0 +1,178 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef ConfigureWindow_H
+#define ConfigureWindow_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+
+#define CONFIGUREWINDOW_ENABLE_CACHE               1
+#define CONFIGUREWINDOW_ENABLE_DATA                0
+#define CONFIGUREWINDOW_ENABLE_SPLIT               0
+#define CONFIGUREWINDOW_ENABLE_COMPRESS            0
+
+#define CONFIGUREWINDOW_DATA_LIMIT                 32
+#define CONFIGUREWINDOW_DATA_OFFSET                12
+
+#define CONFIGUREWINDOW_CACHE_SLOTS                3000
+#define CONFIGUREWINDOW_CACHE_THRESHOLD            5
+#define CONFIGUREWINDOW_CACHE_LOWER_THRESHOLD      1
+
+//
+// The message class.
+//
+
+class ConfigureWindowMessage : public Message
+{
+  friend class ConfigureWindowStore;
+
+  public:
+
+  ConfigureWindowMessage()
+  {
+  }
+
+  ~ConfigureWindowMessage()
+  {
+  }
+
+  //
+  // Put here the fields which constitute 
+  // the 'identity' part of the message.
+  //
+
+  private:
+
+  unsigned int   window;
+  unsigned short value_mask;
+};
+
+class ConfigureWindowStore : public MessageStore
+{
+  //
+  // Constructors and destructors.
+  //
+
+  public:
+
+  ConfigureWindowStore() : MessageStore()
+  {
+    enableCache    = CONFIGUREWINDOW_ENABLE_CACHE;
+    enableData     = CONFIGUREWINDOW_ENABLE_DATA;
+    enableSplit    = CONFIGUREWINDOW_ENABLE_SPLIT;
+    enableCompress = CONFIGUREWINDOW_ENABLE_COMPRESS;
+
+    dataLimit  = CONFIGUREWINDOW_DATA_LIMIT;
+    dataOffset = CONFIGUREWINDOW_DATA_OFFSET;
+
+    cacheSlots          = CONFIGUREWINDOW_CACHE_SLOTS;
+    cacheThreshold      = CONFIGUREWINDOW_CACHE_THRESHOLD;
+    cacheLowerThreshold = CONFIGUREWINDOW_CACHE_LOWER_THRESHOLD;
+
+    messages_ -> resize(cacheSlots);
+
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      *i = NULL;
+    }
+
+    temporary_ = NULL;
+  }
+
+  virtual ~ConfigureWindowStore()
+  {
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      destroy(*i);
+    }
+
+    destroy(temporary_);
+  }
+
+  virtual const char *name() const
+  {
+    return "ConfigureWindow";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return X_ConfigureWindow;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(ConfigureWindowMessage);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  public:
+
+  virtual Message *create() const
+  {
+    return new ConfigureWindowMessage();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new ConfigureWindowMessage((const ConfigureWindowMessage &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (ConfigureWindowMessage *) message;
+  }
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer,
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+                                    unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+};
+
+#endif /* ConfigureWindow_H */
diff --git a/nxcomp/src/Control.cpp b/nxcomp/src/Control.cpp
new file mode 100644
index 000000000..75fd56e3f
--- /dev/null
+++ b/nxcomp/src/Control.cpp
@@ -0,0 +1,822 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "NX.h"
+#include "NXpack.h"
+
+#include "Control.h"
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+//
+// Flush immediately on prioritized messages.
+//
+
+#define FLUSH_PRIORITY                           0
+
+//
+// Maximum number of bytes sent for each token.
+//
+
+#define TOKEN_SIZE                               1536
+
+//
+// Maximum number of tokens that can be spent
+// by the client proxy before having to block
+// waiting for a token reply.
+//
+
+#define TOKEN_LIMIT                              24
+
+//
+// By default assume the proxy is running as a
+// standalone program.
+//
+
+#define LINK_ENCRYPTED                           0
+
+//
+// Maximum number of pids the proxy will record
+// and kill at shutdown.
+//
+
+#define KILL_LIMIT                               16
+
+//
+// Allocate on the NX client side channels whose
+// ids are a multiple of 8 (starting from 0). All
+// the other ids can be used to allocate channels
+// at the NX server side (X client side).
+//
+
+#define CHANNEL_MASK                             0x07
+
+//
+// Kill session if control parameters cannot be
+// negotiated before this timeout.
+//
+
+#define INIT_TIMEOUT                             60000
+
+//
+// Enter the congestion state if the remote does
+// not reply to a ping within the given amount
+// of time.
+//
+
+#define PING_TIMEOUT                             5000
+
+//
+// Only send one motion event any N milliseconds.
+//
+
+#define MOTION_TIMEOUT                           0
+
+
+//
+// Force an update of the congestion counter if
+// the proxy is idle for this time.
+//
+
+#define IDLE_TIMEOUT                             50
+
+//
+// Close X connection if can't write before this
+// timeout.
+//
+
+#define CHANNEL_TIMEOUT                          10000
+
+//
+// Warn user (or close proxy connection) if don't
+// receive any data before this timeout.
+//
+
+#define PROXY_TIMEOUT                            120000
+
+//
+// How many milliseconds to wait for the shared
+// memory completion event to become available.
+//
+
+#define SHMEM_TIMEOUT                            200
+//
+// Before closing down the proxy, wait for the
+// given amount of miliseconds to let all the
+// running applications to close down their
+// connections.
+//
+// A null timeout will cause the proxy to wait
+// indefinitely, until the watchdog process is
+// killed. This is usually the way the proxy is
+// started by the NX server. If on the other
+// hand a timeout is given and there no channel
+// is remaining, the proxy will be closed down
+// using a small timeout, presently of 500 ms.
+//
+
+#define CLEANUP_TIMEOUT                          3000
+
+//
+// Wait this amount of milliseconds after any
+// iteration of the house-keeping process.
+//
+
+#define KEEPER_TIMEOUT                           60000
+
+//
+// In case of timeout, select can return control
+// to program earlier or later of this amount of
+// ms. Consider this when calculating if timeout
+// is elapsed.
+//
+
+#define LATENCY_TIMEOUT                          1
+
+//
+// Control memory allocation in transport
+// and other classes.
+//
+
+#define TRANSPORT_X_BUFFER_SIZE                  131072
+#define TRANSPORT_PROXY_BUFFER_SIZE              65536
+#define TRANSPORT_GENERIC_BUFFER_SIZE            16384
+
+#define TRANSPORT_X_BUFFER_THRESHOLD             262144
+#define TRANSPORT_PROXY_BUFFER_THRESHOLD         131072
+#define TRANSPORT_GENERIC_BUFFER_THRESHOLD       32768
+
+//
+// Never allow buffers to exceed this limit.
+//
+
+#define TRANSPORT_MAXIMUM_BUFFER_SIZE            393216
+
+//
+// Immediately flush the accumulated data to
+// the X server if the write buffer exceeds
+// this size.
+//
+
+#define TRANSPORT_FLUSH_BUFFER_SIZE              16384
+
+//
+// Defaults used for socket options.
+//
+
+#define OPTION_PROXY_KEEP_ALIVE                  0
+#define OPTION_PROXY_LOW_DELAY                   1
+#define OPTION_PROXY_CLIENT_NO_DELAY             1
+#define OPTION_PROXY_SERVER_NO_DELAY             1
+#define OPTION_CLIENT_NO_DELAY                   1
+#define OPTION_SERVER_NO_DELAY                   1
+
+#define OPTION_PROXY_RECEIVE_BUFFER              -1
+#define OPTION_CLIENT_RECEIVE_BUFFER             -1
+#define OPTION_SERVER_RECEIVE_BUFFER             -1
+
+#define OPTION_PROXY_SEND_BUFFER                 -1
+#define OPTION_CLIENT_SEND_BUFFER                -1
+#define OPTION_SERVER_SEND_BUFFER                -1
+
+#define OPTION_PROXY_RETRY_CONNECT               30
+#define OPTION_PROXY_RETRY_ACCEPT                3
+#define OPTION_SERVER_RETRY_CONNECT              3
+
+//
+// Defaults used for cache persistence.
+//
+
+#define PERSISTENT_CACHE_THRESHOLD               102400
+
+#define PERSISTENT_CACHE_ENABLE_LOAD             1
+#define PERSISTENT_CACHE_ENABLE_SAVE             1
+
+#define PERSISTENT_CACHE_CHECK_ON_SHUTDOWN       0
+
+#define PERSISTENT_CACHE_LOAD_PACKED             1
+#define PERSISTENT_CACHE_LOAD_RENDER             1
+
+#define PERSISTENT_CACHE_DISK_LIMIT              33554432
+
+//
+// Defaults used for image cache.
+//
+
+#define IMAGE_CACHE_ENABLE_LOAD                  0
+#define IMAGE_CACHE_ENABLE_SAVE                  0
+
+#define IMAGE_CACHE_DISK_LIMIT                   33554432
+
+//
+// Suggested defaults for read length parameters
+// used by read buffer classes.
+//
+
+#define CLIENT_INITIAL_READ_SIZE                 8192
+#define CLIENT_MAXIMUM_BUFFER_SIZE               262144
+
+#define SERVER_INITIAL_READ_SIZE                 8192
+#define SERVER_MAXIMUM_BUFFER_SIZE               65536
+
+#define PROXY_INITIAL_READ_SIZE                  65536
+#define PROXY_MAXIMUM_BUFFER_SIZE                262144 + 1024
+
+#define GENERIC_INITIAL_READ_SIZE                8192
+#define GENERIC_MAXIMUM_BUFFER_SIZE              8192
+
+//
+// Calculate bitrate in given time frames.
+// Values are in milliseconds.
+//
+
+#define SHORT_BITRATE_TIME_FRAME                 5000
+#define LONG_BITRATE_TIME_FRAME                  30000
+
+//
+// Bandwidth control. A value of 0 means no
+// limit. Values are stored internally in
+// bytes per second.
+//
+
+#define CLIENT_BITRATE_LIMIT                     0
+#define SERVER_BITRATE_LIMIT                     0
+
+//
+// Default values for cache control. We limit
+// the maximum size of a request to 262144 but
+// we need to consider the replies, whose size
+// may be up to 4MB.
+//
+
+#define MINIMUM_MESSAGE_SIZE                     4
+#define MAXIMUM_MESSAGE_SIZE                     4194304
+#define MAXIMUM_REQUEST_SIZE                     262144
+
+#define CLIENT_TOTAL_STORAGE_SIZE                8388608
+#define SERVER_TOTAL_STORAGE_SIZE                8388608
+
+#define STORE_TIME_LIMIT                         3600
+
+#define STORE_HITS_LOAD_BONUS                    10
+#define STORE_HITS_ADD_BONUS                     20
+#define STORE_HITS_LIMIT                         100
+
+#define STORE_HITS_TOUCH                         1
+#define STORE_HITS_UNTOUCH                       2
+
+//
+// Default parameters for message splitting.
+//
+
+#define SPLIT_MODE                               1
+#define SPLIT_TIMEOUT                            50
+#define SPLIT_TOTAL_SIZE                         128
+#define SPLIT_TOTAL_STORAGE_SIZE                 1048576
+#define SPLIT_DATA_THRESHOLD                     65536
+#define SPLIT_DATA_PACKET_LIMIT                  24576
+
+//
+// Agent related parameters.
+//
+
+#define PACK_METHOD                              63
+#define PACK_QUALITY                             9
+#define HIDE_RENDER                              0
+#define TAINT_REPLIES                            1
+#define TAINT_THRESHOLD                          8
+
+//
+// In current version only X server support is
+// implemented. Note that use of shared memory
+// is negotiated according to options provided
+// by the user.
+//
+
+#define SHMEM_CLIENT                             0
+#define SHMEM_SERVER                             1
+
+//
+// Default size of shared memory segments used
+// in MIT-SHM support.
+//
+
+#define SHMEM_CLIENT_SIZE                        0
+#define SHMEM_SERVER_SIZE                        2097152
+
+//
+// What do we do at the end of session? If this
+// flag is set, we launch a new client letting
+// the user run a new NX session.
+//
+
+#define ENABLE_RESTART_ON_SHUTDOWN               0
+
+//
+// Do we produce a core dump on fatal errors?
+//
+
+#define ENABLE_CORE_DUMP_ON_ABORT                0
+
+//
+// Reopen the log file if it exceeds this size.
+//
+
+#define FILE_SIZE_LIMIT                          60000000
+
+//
+// Check periodically if we need to truncate the
+// log file. By default check every minute.
+//
+
+#define FILE_SIZE_CHECK_TIMEOUT                  60000
+
+//
+// Protocol version compatibility values
+//
+
+const int Control::NX_MIN_PROTO_STEP = 10;
+const int Control::NX_MAX_PROTO_STEP = 10;
+const char* const Control::NXPROXY_COMPATIBILITY_VERSION = "3.5.0";
+
+//
+// Set defaults for control. They should be what
+// you get in case of 'local' connection.
+//
+
+Control::Control()
+{
+  ProxyMode   = proxy_undefined;
+  ProxyStage  = stage_undefined;
+  SessionMode = session_undefined;
+  FlushPolicy = policy_undefined;
+  LinkMode    = link_undefined;
+
+  LinkEncrypted = LINK_ENCRYPTED;
+  FlushPriority = FLUSH_PRIORITY;
+
+  TokenSize  = TOKEN_SIZE;
+  TokenLimit = TOKEN_LIMIT;
+
+  ChannelMask = CHANNEL_MASK;
+
+  InitTimeout   = INIT_TIMEOUT;
+  PingTimeout   = PING_TIMEOUT;
+  MotionTimeout = MOTION_TIMEOUT;
+  IdleTimeout   = IDLE_TIMEOUT;
+
+  ChannelTimeout = CHANNEL_TIMEOUT;
+  ProxyTimeout   = PROXY_TIMEOUT;
+  ShmemTimeout   = SHMEM_TIMEOUT;
+
+  CleanupTimeout  = CLEANUP_TIMEOUT;
+  KeeperTimeout   = KEEPER_TIMEOUT;
+  LatencyTimeout  = LATENCY_TIMEOUT;
+
+  FileSizeLimit        = FILE_SIZE_LIMIT;
+  FileSizeCheckTimeout = FILE_SIZE_CHECK_TIMEOUT;
+
+  EnableRestartOnShutdown = ENABLE_RESTART_ON_SHUTDOWN;
+
+  KillDaemonOnShutdownLimit = KILL_LIMIT;
+
+  KillDaemonOnShutdown = new int[KillDaemonOnShutdownLimit];
+
+  for (int i = 0; i < KILL_LIMIT; i++)
+  {
+    KillDaemonOnShutdown[i] = -1;
+  }
+
+  KillDaemonOnShutdownNumber = 0;
+
+  EnableCoreDumpOnAbort = ENABLE_CORE_DUMP_ON_ABORT;
+
+  //
+  // Collect statistics by default.
+  //
+
+  EnableStatistics = 1;
+
+  //
+  // Memory restrictions if any.
+  //
+
+  LocalMemoryLevel = -1;
+
+  //
+  // Compression must be negotiated between proxies.
+  //
+
+  LocalDeltaCompression   = -1;
+  RemoteDeltaCompression  = -1;
+
+  LocalDataCompression    = -1;
+  LocalStreamCompression  = -1;
+
+  RemoteDataCompression   = -1;
+  RemoteStreamCompression = -1;
+
+  LocalDataCompressionLevel     = -1;
+  LocalDataCompressionThreshold = -1;
+  LocalStreamCompressionLevel   = -1;
+
+  RemoteDataCompressionLevel    = -1;
+  RemoteStreamCompressionLevel  = -1;
+
+  //
+  // Transport buffers' allocation parameters.
+  // 
+
+  TransportXBufferSize            = TRANSPORT_X_BUFFER_SIZE;
+  TransportProxyBufferSize        = TRANSPORT_PROXY_BUFFER_SIZE;
+  TransportGenericBufferSize      = TRANSPORT_GENERIC_BUFFER_SIZE;
+
+  TransportXBufferThreshold       = TRANSPORT_X_BUFFER_THRESHOLD;
+  TransportProxyBufferThreshold   = TRANSPORT_PROXY_BUFFER_THRESHOLD;
+  TransportGenericBufferThreshold = TRANSPORT_GENERIC_BUFFER_THRESHOLD;
+
+  TransportMaximumBufferSize      = TRANSPORT_MAXIMUM_BUFFER_SIZE;
+
+  //
+  // Flush the write buffer if it exceeds
+  // this size.
+  //
+
+  TransportFlushBufferSize = TRANSPORT_FLUSH_BUFFER_SIZE;
+
+  //
+  // Socket options.
+  //
+
+  OptionProxyKeepAlive      = OPTION_PROXY_KEEP_ALIVE;
+  OptionProxyLowDelay       = OPTION_PROXY_LOW_DELAY;
+  OptionProxyClientNoDelay  = OPTION_PROXY_CLIENT_NO_DELAY;
+  OptionProxyServerNoDelay  = OPTION_PROXY_SERVER_NO_DELAY;
+  OptionClientNoDelay       = OPTION_CLIENT_NO_DELAY;
+  OptionServerNoDelay       = OPTION_SERVER_NO_DELAY;
+
+  OptionProxyReceiveBuffer  = OPTION_PROXY_RECEIVE_BUFFER;
+  OptionClientReceiveBuffer = OPTION_CLIENT_RECEIVE_BUFFER;
+  OptionServerReceiveBuffer = OPTION_SERVER_RECEIVE_BUFFER;
+
+  OptionProxySendBuffer     = OPTION_PROXY_SEND_BUFFER;
+  OptionClientSendBuffer    = OPTION_CLIENT_SEND_BUFFER;
+  OptionServerSendBuffer    = OPTION_SERVER_SEND_BUFFER;
+
+  OptionProxyRetryAccept    = OPTION_PROXY_RETRY_ACCEPT;
+  OptionProxyRetryConnect   = OPTION_PROXY_RETRY_CONNECT;
+  OptionServerRetryConnect  = OPTION_SERVER_RETRY_CONNECT;
+
+  //
+  // Base NX directories.
+  //
+
+  HomePath   = NULL;
+  RootPath   = NULL;
+  SystemPath = NULL;
+  TempPath   = NULL;
+  ClientPath = NULL;
+
+  //
+  // Set defaults for handling persistent cache.
+  //
+
+  PersistentCachePath = NULL;
+  PersistentCacheName = NULL;
+
+  PersistentCacheThreshold = PERSISTENT_CACHE_THRESHOLD;
+
+  PersistentCacheEnableLoad = PERSISTENT_CACHE_ENABLE_LOAD;
+  PersistentCacheEnableSave = PERSISTENT_CACHE_ENABLE_SAVE;
+
+  PersistentCacheCheckOnShutdown = PERSISTENT_CACHE_CHECK_ON_SHUTDOWN;
+
+  PersistentCacheLoadPacked = PERSISTENT_CACHE_LOAD_PACKED;
+  PersistentCacheLoadRender = PERSISTENT_CACHE_LOAD_RENDER;
+
+  PersistentCacheDiskLimit = PERSISTENT_CACHE_DISK_LIMIT;
+
+  //
+  // Set defaults for image cache.
+  //
+
+  ImageCachePath = NULL;
+
+  ImageCacheEnableLoad = IMAGE_CACHE_ENABLE_LOAD;
+  ImageCacheEnableSave = IMAGE_CACHE_ENABLE_SAVE;
+
+  ImageCacheDiskLimit = IMAGE_CACHE_DISK_LIMIT;
+
+  //
+  // Set defaults for the read buffers.
+  //
+
+  ClientInitialReadSize    = CLIENT_INITIAL_READ_SIZE;
+  ClientMaximumBufferSize  = CLIENT_MAXIMUM_BUFFER_SIZE;
+
+  ServerInitialReadSize    = SERVER_INITIAL_READ_SIZE;
+  ServerMaximumBufferSize  = SERVER_MAXIMUM_BUFFER_SIZE;
+
+  ProxyInitialReadSize     = PROXY_INITIAL_READ_SIZE;
+  ProxyMaximumBufferSize   = PROXY_MAXIMUM_BUFFER_SIZE;
+
+  GenericInitialReadSize   = GENERIC_INITIAL_READ_SIZE;
+  GenericMaximumBufferSize = GENERIC_MAXIMUM_BUFFER_SIZE;
+
+  ShortBitrateTimeFrame = SHORT_BITRATE_TIME_FRAME;
+  LongBitrateTimeFrame  = LONG_BITRATE_TIME_FRAME;
+
+  //
+  // Bandwidth control.
+  //
+
+  LocalBitrateLimit   = -1;
+
+  ClientBitrateLimit = CLIENT_BITRATE_LIMIT;
+  ServerBitrateLimit = SERVER_BITRATE_LIMIT;
+
+  //
+  // Default parameters for message handling.
+  //
+
+  ClientTotalStorageSize = CLIENT_TOTAL_STORAGE_SIZE;
+  ServerTotalStorageSize = SERVER_TOTAL_STORAGE_SIZE;
+
+  LocalTotalStorageSize  = -1;
+  RemoteTotalStorageSize = -1;
+
+  StoreTimeLimit = STORE_TIME_LIMIT;
+
+  StoreHitsLoadBonus = STORE_HITS_LOAD_BONUS;
+  StoreHitsAddBonus  = STORE_HITS_ADD_BONUS;
+  StoreHitsLimit     = STORE_HITS_LIMIT;
+
+  StoreHitsTouch   = STORE_HITS_TOUCH;
+  StoreHitsUntouch = STORE_HITS_UNTOUCH;
+
+  MinimumMessageSize = MINIMUM_MESSAGE_SIZE;
+  MaximumMessageSize = MAXIMUM_MESSAGE_SIZE;
+  MaximumRequestSize = MAXIMUM_REQUEST_SIZE;
+
+  SplitMode             = SPLIT_MODE;
+  SplitTimeout          = SPLIT_TIMEOUT;
+  SplitTotalSize        = SPLIT_TOTAL_SIZE;
+  SplitTotalStorageSize = SPLIT_TOTAL_STORAGE_SIZE;
+  SplitDataThreshold    = SPLIT_DATA_THRESHOLD;
+  SplitDataPacketLimit  = SPLIT_DATA_PACKET_LIMIT;
+
+  PackMethod     = PACK_METHOD;
+  PackQuality    = PACK_QUALITY;
+  HideRender     = HIDE_RENDER;
+  TaintReplies   = TAINT_REPLIES;
+  TaintThreshold = TAINT_THRESHOLD;
+
+  ShmemClient = SHMEM_CLIENT;
+  ShmemServer = SHMEM_SERVER;
+
+  ShmemClientSize = SHMEM_CLIENT_SIZE;
+  ShmemServerSize = SHMEM_SERVER_SIZE;
+
+  //
+  // Get local version number from compile time
+  // settings. Version of remote proxy will be
+  // checked at connection time.
+  //
+
+  RemoteVersionMajor = -1;
+  RemoteVersionMinor = -1;
+  RemoteVersionPatch = -1;
+  RemoteVersionMaintenancePatch = -1;
+
+  CompatVersionMajor = -1;
+  CompatVersionMinor = -1;
+  CompatVersionPatch = -1;
+  CompatVersionMaintenancePatch = -1;
+
+  LocalVersionMajor = NXMajorVersion();
+  LocalVersionMinor = NXMinorVersion();
+  LocalVersionPatch = NXPatchVersion();
+  LocalVersionMaintenancePatch = NXMaintenancePatchVersion();
+
+  #ifdef TEST
+  *logofs << "Control: Major version is " << LocalVersionMajor
+          << " minor is " << LocalVersionMinor << " patch is "
+          << LocalVersionPatch << " Maintenance version is "
+	  << LocalVersionMaintenancePatch << ".\n" << logofs_flush;
+  #endif
+
+  //
+  // Initialize local implemented methods later
+  // and negotiate remote methods at connection
+  // time.
+  //
+
+  LocalUnpackMethods  = NULL;
+  RemoteUnpackMethods = NULL;
+
+  //
+  // Set to 1 those methods which are implemented.
+  //
+
+  setLocalUnpackMethods();
+
+  //
+  // Set the protocol version at the
+  // time the session is negotiated.
+  //
+
+  protoStep_ = 0;
+}
+
+Control::~Control()
+{
+  if (KillDaemonOnShutdown != NULL)
+  {
+    delete [] KillDaemonOnShutdown;
+  }
+
+  if (HomePath != NULL)
+  {
+    delete [] HomePath;
+  }
+
+  if (RootPath != NULL)
+  {
+    delete [] RootPath;
+  }
+
+  if (SystemPath != NULL)
+  {
+    delete [] SystemPath;
+  }
+
+  if (TempPath != NULL)
+  {
+    delete [] TempPath;
+  }
+
+  if (ClientPath != NULL)
+  {
+    delete [] ClientPath;
+  }
+
+  if (PersistentCachePath != NULL)
+  {
+    delete [] PersistentCachePath;
+  }
+
+  if (PersistentCacheName != NULL)
+  {
+    delete [] PersistentCacheName;
+  }
+
+  if (LocalUnpackMethods != NULL)
+  {
+    delete [] LocalUnpackMethods;
+  }
+
+  if (RemoteUnpackMethods != NULL)
+  {
+    delete [] RemoteUnpackMethods;
+  }
+
+  if (ImageCachePath != NULL)
+  {
+    delete [] ImageCachePath;
+  }
+}
+
+//
+// Set the protocol step based on the
+// remote version.
+//
+
+void Control::setProtoStep(int step)
+{
+  if (isValidProtoStep(step))
+  {
+    protoStep_ = step;
+  }
+  else
+  {
+    #ifdef PANIC
+    *logofs << "Control: PANIC! Invalid protocol step "
+            << "with value " << step << ".\n"
+            << logofs_flush;
+    #endif
+
+    HandleCleanup();
+  }
+}
+
+int Control::getProtoStep()
+{
+  if (isValidProtoStep(protoStep_))
+  {
+    return protoStep_;
+  }
+  else
+  {
+    #ifdef PANIC
+    *logofs << "Control: PANIC! Can't identify the "
+            << "protocol step.\n" << logofs_flush;
+    #endif
+
+    HandleCleanup();
+  }
+}
+
+//
+// Set here the pack/unpack methods that are
+// implemented by this NX proxy.
+//
+
+void Control::setLocalUnpackMethods()
+{
+  LocalUnpackMethods  = new unsigned char[PACK_METHOD_LIMIT];
+  RemoteUnpackMethods = new unsigned char[PACK_METHOD_LIMIT];
+
+  for (int i = 0; i < PACK_METHOD_LIMIT; i++)
+  {
+    LocalUnpackMethods[i]  = 0;
+    RemoteUnpackMethods[i] = 0;
+  }
+
+  LocalUnpackMethods[NO_PACK]                         = 1;
+
+  LocalUnpackMethods[PACK_MASKED_8_COLORS]            = 1;
+  LocalUnpackMethods[PACK_MASKED_64_COLORS]           = 1;
+  LocalUnpackMethods[PACK_MASKED_256_COLORS]          = 1;
+  LocalUnpackMethods[PACK_MASKED_512_COLORS]          = 1;
+  LocalUnpackMethods[PACK_MASKED_4K_COLORS]           = 1;
+  LocalUnpackMethods[PACK_MASKED_32K_COLORS]          = 1;
+  LocalUnpackMethods[PACK_MASKED_64K_COLORS]          = 1;
+  LocalUnpackMethods[PACK_MASKED_256K_COLORS]         = 1;
+  LocalUnpackMethods[PACK_MASKED_2M_COLORS]           = 1;
+  LocalUnpackMethods[PACK_MASKED_16M_COLORS]          = 1;
+
+  LocalUnpackMethods[PACK_RAW_8_BITS]                 = 1;
+  LocalUnpackMethods[PACK_RAW_16_BITS]                = 1;
+  LocalUnpackMethods[PACK_RAW_24_BITS]                = 1;
+
+  LocalUnpackMethods[PACK_COLORMAP_256_COLORS]        = 1;
+
+  LocalUnpackMethods[PACK_JPEG_8_COLORS]              = 1;
+  LocalUnpackMethods[PACK_JPEG_64_COLORS]             = 1;
+  LocalUnpackMethods[PACK_JPEG_256_COLORS]            = 1;
+  LocalUnpackMethods[PACK_JPEG_512_COLORS]            = 1;
+  LocalUnpackMethods[PACK_JPEG_4K_COLORS]             = 1;
+  LocalUnpackMethods[PACK_JPEG_32K_COLORS]            = 1;
+  LocalUnpackMethods[PACK_JPEG_64K_COLORS]            = 1;
+  LocalUnpackMethods[PACK_JPEG_256K_COLORS]           = 1;
+  LocalUnpackMethods[PACK_JPEG_2M_COLORS]             = 1;
+  LocalUnpackMethods[PACK_JPEG_16M_COLORS]            = 1;
+
+  LocalUnpackMethods[PACK_PNG_8_COLORS]               = 1;
+  LocalUnpackMethods[PACK_PNG_64_COLORS]              = 1;
+  LocalUnpackMethods[PACK_PNG_256_COLORS]             = 1;
+  LocalUnpackMethods[PACK_PNG_512_COLORS]             = 1;
+  LocalUnpackMethods[PACK_PNG_4K_COLORS]              = 1;
+  LocalUnpackMethods[PACK_PNG_32K_COLORS]             = 1;
+  LocalUnpackMethods[PACK_PNG_64K_COLORS]             = 1;
+  LocalUnpackMethods[PACK_PNG_256K_COLORS]            = 1;
+  LocalUnpackMethods[PACK_PNG_2M_COLORS]              = 1;
+  LocalUnpackMethods[PACK_PNG_16M_COLORS]             = 1;
+
+  LocalUnpackMethods[PACK_RGB_16M_COLORS]             = 1;
+  LocalUnpackMethods[PACK_RLE_16M_COLORS]             = 1;
+
+  LocalUnpackMethods[PACK_ALPHA]                      = 1;
+  LocalUnpackMethods[PACK_COLORMAP]                   = 1;
+
+  LocalUnpackMethods[PACK_BITMAP_16M_COLORS]          = 1;
+}
diff --git a/nxcomp/src/Control.h b/nxcomp/src/Control.h
new file mode 100644
index 000000000..764fca2c1
--- /dev/null
+++ b/nxcomp/src/Control.h
@@ -0,0 +1,764 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef Control_H
+#define Control_H
+
+#include "NXpack.h"
+
+#include "Misc.h"
+#include "Types.h"
+#include "Timestamp.h"
+#include "Statistics.h"
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+//
+// This is the mode proxy is running.
+//
+
+typedef enum
+{
+  proxy_undefined = -1,
+  proxy_client,
+  proxy_server,
+  proxy_last_tag
+}
+T_proxy_mode;
+
+//
+// Handle advances in the connection
+// procedure.
+//
+
+typedef enum
+{
+  stage_undefined,
+  stage_initializing,
+  stage_connecting,
+  stage_connected,
+  stage_waiting_forwarder_version,
+  stage_waiting_forwarder_options,
+  stage_sending_forwarder_options,
+  stage_waiting_proxy_version,
+  stage_waiting_proxy_options,
+  stage_sending_proxy_options,
+  stage_waiting_proxy_caches,
+  stage_sending_proxy_caches,
+  stage_operational,
+  stage_terminating,
+  stage_terminated
+}
+T_proxy_stage;
+
+//
+// Hint about whether or not the proxy is
+// connected to a NX agen.
+//
+
+typedef enum
+{
+  session_undefined = -1,
+  session_agent,
+  session_shadow,
+  session_proxy,
+  session_last_tag
+}
+T_session_mode;
+
+//
+// Set how data will be written to the peer
+// socket.
+//
+
+typedef enum
+{
+  policy_undefined = -1,
+  policy_immediate,
+  policy_deferred
+}
+T_flush_policy;
+
+//
+// Link mode, after negotiation, will be set to
+// any of the values defined in the NXproto.h.
+//
+
+#define link_undefined  -1;
+
+//
+// This class collects functioning parameters, 
+// to be configurable at run-time. They are for
+// the most part regarding timeouts, transport
+// and message stores handling.
+//
+
+class Control
+{
+  public:
+
+  //
+  // Does proxy run in client mode or server mode?
+  // As soon as we'll have gone through parsing of
+  // the command line options the current mode will
+  // be propagated to the control class.
+  //
+
+  T_proxy_mode ProxyMode;
+
+  //
+  // Goes from initializing to operational.
+  //
+
+  T_proxy_stage ProxyStage;
+
+  //
+  // Hint about type of session currently running.
+  //
+
+  T_session_mode SessionMode;
+
+  //
+  // Either immediate or defferred flushes.
+  //
+
+  T_flush_policy FlushPolicy;
+
+  //
+  // If set, the channels will try to flush the
+  // encoded data whenever there is a prioritized
+  // message. Depending on the flush policy, this
+  // may determine an immediate flush or an event
+  // being generated telling to the agent that it
+  // should flush the proxy link.
+  //
+
+  int FlushPriority;
+
+  //
+  // Id corresponding to link speed negotiated
+  // between proxies.
+  //
+
+  int LinkMode;
+
+  //
+  // Set if the proxy is connected to a program
+  // providing the encryption of the point to
+  // point communication.
+  //
+
+  int LinkEncrypted;
+
+  //
+  // Maximum number of bytes sent for each token.
+  //
+
+  int TokenSize;
+
+  //
+  // Maximum number of tokens that can be spent
+  // by the client proxy before having to block
+  // waiting for a reply.
+  //
+
+  int TokenLimit;
+
+  //
+  // Bitmask used to determine the distribution
+  // of channel ids between the client and server
+  // proxies.
+  //
+
+  int ChannelMask;
+
+  //
+  // Kill session if control parameters cannot
+  // be negotiated before this timeout.
+  //
+
+  int InitTimeout;
+
+  //
+  // Enter the congestion state if the remote does
+  // not reply to the ping within the given amount
+  // of time.
+  //
+
+  int PingTimeout;
+
+  //
+  // Enqueue motion notify events in server channel.
+  //
+
+  int MotionTimeout;
+
+  //
+  // Force an update of the congestion counter if
+  // the proxy is idle for this time.
+  //
+
+  int IdleTimeout;
+
+  //
+  // Close the connection if can't write before
+  // this timeout.
+  //
+
+  int ChannelTimeout;
+
+  //
+  // Close connection if can't write before
+  // this timeout.
+  //
+
+  int ProxyTimeout;
+
+  //
+  // How many milliseconds to wait for the shared
+  // memory completion event to become available.
+  //
+
+  int ShmemTimeout;
+
+  //
+  // Wait for applications to complete at the time
+  // proxy is shut down.
+  //
+
+  int CleanupTimeout;
+
+  //
+  // Wait this amount of milliseconds before any
+  // iteration of the house-keeping process.
+  //
+
+  int KeeperTimeout;
+
+  //
+  // Adjust timeout calculations.
+  //
+
+  int LatencyTimeout;
+
+  //
+  // Maximum allowed size of log files.
+  //
+
+  int FileSizeLimit;
+  int FileSizeCheckTimeout;
+
+  //
+  // What do we do at the end of session? If
+  // this flag is set we launch a new client
+  // letting the user run a new NX session.
+  //
+
+  int EnableRestartOnShutdown;
+
+  //
+  // The client can request the proxy to kill
+  // a number of processes before exiting.
+  //
+
+  int *KillDaemonOnShutdown;
+  int KillDaemonOnShutdownNumber;
+  int KillDaemonOnShutdownLimit;
+
+  //
+  // Do we generate a core dump and exit in
+  // case of program errors?
+  //
+
+  int EnableCoreDumpOnAbort;
+
+  //
+  // Is statistic output enabled?
+  //
+
+  int EnableStatistics;
+
+  //
+  // Version number of local and remote proxy.
+  //
+
+  /* 
+   * LocalVersionMaintenancePatch, RemoteVersionMaintenancePatch
+   * CompatVersionMaintenancePatch
+   *
+   * currently not used, for future compatibility checks
+   */
+  int LocalVersionMajor;
+  int LocalVersionMinor;
+  int LocalVersionPatch;
+  int LocalVersionMaintenancePatch;
+
+  int RemoteVersionMajor;
+  int RemoteVersionMinor;
+  int RemoteVersionPatch;
+  int RemoteVersionMaintenancePatch;
+
+  int CompatVersionMajor;
+  int CompatVersionMinor;
+  int CompatVersionPatch;
+  int CompatVersionMaintenancePatch;
+
+  //
+  // Compatibility version for the proxy
+  //
+
+  static const char* const NXPROXY_COMPATIBILITY_VERSION;
+
+  //
+  // Which unpack methods are implemented in proxy?
+  //
+
+  unsigned char *LocalUnpackMethods;
+  unsigned char *RemoteUnpackMethods;
+
+  //
+  // Memory restriction imposed by user.
+  //
+
+  int LocalMemoryLevel;
+
+  //
+  // Use or not differential compression
+  // and caching of X protocol messages.
+  //
+
+  int LocalDeltaCompression;
+  int RemoteDeltaCompression;
+
+  //
+  // Compression of images and replies.
+  //
+
+  int LocalDataCompression;
+  int LocalDataCompressionLevel;
+
+  int RemoteDataCompression;
+  int RemoteDataCompressionLevel;
+
+  //
+  // Minimum packet size to be compressed.
+  //
+
+  int LocalDataCompressionThreshold;
+
+  //
+  // Compress or not data flowing through the proxy
+  // link. Level should be one of the ZLIB level as
+  // Z_DEFAULT_COMPRESSION or Z_BEST_COMPRESSION.
+  //
+
+  int LocalStreamCompression;
+  int LocalStreamCompressionLevel;
+
+  int RemoteStreamCompression;
+  int RemoteStreamCompressionLevel;
+
+  //
+  // Size of read operations in read buffer classes.
+  //
+
+  int ClientInitialReadSize;
+  int ClientMaximumBufferSize;
+
+  int ServerInitialReadSize;
+  int ServerMaximumBufferSize;
+
+  int ProxyInitialReadSize;
+  int ProxyMaximumBufferSize;
+
+  int GenericInitialReadSize;
+  int GenericMaximumBufferSize;
+
+  //
+  // Set initial size and resize policy of
+  // transport buffers. If maximum size is
+  // exceeded, print a warning.
+  //
+
+  int TransportXBufferSize;
+  int TransportProxyBufferSize;
+  int TransportGenericBufferSize;
+
+  int TransportXBufferThreshold;
+  int TransportProxyBufferThreshold;
+  int TransportGenericBufferThreshold;
+
+  int TransportMaximumBufferSize;
+
+  //
+  // Flush the data produced for the channel
+  // connection if it exceeds this size.
+  //
+
+  int TransportFlushBufferSize;
+
+  //
+  // Socket options.
+  //
+
+  int OptionProxyKeepAlive;
+  int OptionProxyLowDelay;
+  int OptionProxyClientNoDelay;
+  int OptionProxyServerNoDelay;
+  int OptionClientNoDelay;
+  int OptionServerNoDelay;
+
+  int OptionProxyReceiveBuffer;
+  int OptionClientReceiveBuffer;
+  int OptionServerReceiveBuffer;
+
+  int OptionProxySendBuffer;
+  int OptionClientSendBuffer;
+  int OptionServerSendBuffer;
+
+  int OptionProxyRetryAccept;
+  int OptionProxyRetryConnect;
+  int OptionServerRetryConnect;
+
+  //
+  // Calculate current bitrate on proxy link
+  // using these observation periods. Value
+  // is in milliseconds.  
+  //
+
+  int ShortBitrateTimeFrame;
+  int LongBitrateTimeFrame;
+
+  //
+  // Limit the bandwidth usage of the proxy
+  // link.
+  //
+
+  int LocalBitrateLimit;
+
+  int ClientBitrateLimit;
+  int ServerBitrateLimit;
+  
+  //
+  // This is the limit imposed by user on
+  // total cache size.
+  //
+
+  int ClientTotalStorageSize;
+  int ServerTotalStorageSize;
+
+  int LocalTotalStorageSize;
+  int RemoteTotalStorageSize;
+
+  //
+  // Discard messages in store older than
+  // this amount of seconds.
+  //
+
+  int StoreTimeLimit;
+
+  //
+  // Any new message in store starts with
+  // this amount of hits.
+  //
+
+  int StoreHitsAddBonus;
+
+  //
+  // Unless it is loaded from persistent
+  // cache.
+  //
+
+  int StoreHitsLoadBonus;
+
+  //
+  // Stop increasing hits at this threshold.
+  //
+
+  int StoreHitsLimit;
+
+  //
+  // Give a special weight to messages put or
+  // taken from cache during startup time.
+  //
+
+  int StoreHitsStartup;
+
+  //
+  // Weight of touch and untoch operations.
+  //
+
+  int StoreHitsTouch;
+  int StoreHitsUntouch;
+
+  //
+  // Directives on size of messages to cache.
+  //
+
+  int MinimumMessageSize;
+  int MaximumMessageSize;
+
+  //
+  // Maximum size of a single X request.
+  //
+
+  int MaximumRequestSize;
+
+  //
+  // Currently selected streaming mode.
+  //
+
+  int SplitMode;
+
+  //
+  // Send new split data any given amount of
+  // milliseconds.
+  //
+
+  int SplitTimeout;
+
+  //
+  // Maximum number of distinct messages and
+  // maximum size in bytes of the temporary
+  // storage.
+  //
+
+  int SplitTotalSize;
+  int SplitTotalStorageSize;
+
+  //
+  // Don't split messages smaller that this
+  // threshold and send no more than the
+  // given amount of bytes in a single data
+  // shot when streaming the split messages.
+  //
+
+  int SplitDataThreshold;
+  int SplitDataPacketLimit;
+
+  //
+  // Agent related parameters. These values apply
+  // to the agent which, at startup, must query
+  // the user's settings.
+  //
+
+  int PackMethod;
+  int PackQuality;
+  int HideRender;
+  int TaintReplies;
+  int TaintThreshold;
+
+  //
+  // Do we allow shared memory image support in
+  // client and or server?
+  //
+
+  int ShmemClient;
+  int ShmemServer;
+
+  //
+  // Default size of shared memory segments used
+  // in MIT-SHM support.
+  //
+
+  int ShmemClientSize;
+  int ShmemServerSize;
+
+  //
+  // The user's home directory.
+  //
+
+  char *HomePath;
+
+  //
+  // The ".nx" directory, usually in
+  // the user's home.
+  //
+
+  char *RootPath;
+
+  //
+  // Usually the /usr/NX" directory.
+  //
+
+  char *SystemPath;
+
+  //
+  // Usually the "/tmp" directory.
+  //
+
+  char *TempPath;
+
+  //
+  // The complete path to the client.
+  //
+
+  char *ClientPath;
+
+  //
+  // String containing path of cache
+  // file selected for load or save.
+  //
+
+  char *PersistentCachePath;
+
+  //
+  // Name of selected cache file.
+  //
+
+  char *PersistentCacheName;
+
+  //
+  // Minimum size of cache in memory
+  // to proceed to its storage on disk.
+  //
+
+  int PersistentCacheThreshold;
+
+  //
+  // Is persistent cache enabled?
+  //
+
+  int PersistentCacheEnableLoad;
+  int PersistentCacheEnableSave;
+
+  //
+  // This is used just for test because
+  // it requires that client and server
+  // reside on the same machine.
+  //
+
+  int PersistentCacheCheckOnShutdown;
+
+  //
+  // Load packed image and render extension
+  // message stores. This currently depends
+  // on the type of session.
+  //
+
+  int PersistentCacheLoadPacked;
+  int PersistentCacheLoadRender;
+
+  //
+  // Maximum disk consumption of message
+  // caches on disk.
+  //
+
+  int PersistentCacheDiskLimit;
+
+  //
+  // String containing the base path
+  // of image cache files.
+  //
+
+  char *ImageCachePath;
+
+  //
+  // Is image cache enabled?
+  //
+
+  int ImageCacheEnableLoad;
+  int ImageCacheEnableSave;
+
+  //
+  // Maximum disk consumption of image
+  // caches on disk.
+  //
+
+  int ImageCacheDiskLimit;
+
+  //
+  // Only constructor, destructor
+  // and a few utility functions.
+  //
+
+  Control();
+
+  ~Control();
+
+  //
+  // Should not leverage control to find channel
+  // stores' size limits. As most of values in
+  // control, this info must be moved elsewhere.
+  //
+
+  int getUpperStorageSize() const
+  {
+    return (ClientTotalStorageSize >
+                ServerTotalStorageSize ?
+                    ClientTotalStorageSize :
+                        ServerTotalStorageSize);
+  }
+
+  int getLowerStorageSize() const
+  {
+    return (ClientTotalStorageSize <
+                ServerTotalStorageSize ?
+                    ClientTotalStorageSize :
+                        ServerTotalStorageSize);
+  }
+
+  void setProtoStep(int step);
+
+  int getProtoStep();
+
+  private:
+
+  //
+  // Look in Control.cpp.
+  //
+
+  void setLocalUnpackMethods();
+
+  //
+  // Manage the encoding according
+  // to the protocol version.
+  //
+
+  int protoStep_;
+
+  //
+  // Min and max values allowed for protocol step
+  // depending on protocol version compatibility
+  //
+
+  static const int NX_MIN_PROTO_STEP;
+  static const int NX_MAX_PROTO_STEP;
+
+  //
+  // Check the validity of protocol step
+  //
+
+  bool isValidProtoStep(int step)
+  {
+    return ((step >= NX_MIN_PROTO_STEP) && (step <= NX_MAX_PROTO_STEP));
+  }
+
+};
+
+#endif /* Control_H */
diff --git a/nxcomp/src/CopyArea.cpp b/nxcomp/src/CopyArea.cpp
new file mode 100644
index 000000000..c2a19c2df
--- /dev/null
+++ b/nxcomp/src/CopyArea.cpp
@@ -0,0 +1,199 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "CopyArea.h"
+
+#include "ClientCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+int CopyAreaStore::parseIdentity(Message *message, const unsigned char *buffer,
+                                     unsigned int size, int bigEndian) const
+{
+  CopyAreaMessage *copyArea = (CopyAreaMessage *) message;
+
+  //
+  // Here is the fingerprint.
+  //
+
+  copyArea -> src_drawable = GetULONG(buffer + 4, bigEndian); 
+  copyArea -> dst_drawable = GetULONG(buffer + 8, bigEndian); 
+  copyArea -> gcontext     = GetULONG(buffer + 12, bigEndian);
+
+  copyArea -> src_x  = GetUINT(buffer + 16, bigEndian);
+  copyArea -> src_y  = GetUINT(buffer + 18, bigEndian);
+  copyArea -> dst_x  = GetUINT(buffer + 20, bigEndian);
+  copyArea -> dst_y  = GetUINT(buffer + 22, bigEndian);
+
+  copyArea -> width  = GetUINT(buffer + 24, bigEndian);
+  copyArea -> height = GetUINT(buffer + 26, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsed Identity for message at " << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int CopyAreaStore::unparseIdentity(const Message *message, unsigned char *buffer,
+                                       unsigned int size, int bigEndian) const
+{
+  CopyAreaMessage *copyArea = (CopyAreaMessage *) message;
+
+  //
+  // Fill all the message's fields.
+  //
+
+  PutULONG(copyArea -> src_drawable, buffer + 4, bigEndian);
+  PutULONG(copyArea -> dst_drawable, buffer + 8, bigEndian);
+  PutULONG(copyArea -> gcontext,     buffer + 12, bigEndian);
+
+  PutUINT(copyArea -> src_x, buffer + 16, bigEndian);
+  PutUINT(copyArea -> src_y, buffer + 18, bigEndian);
+  PutUINT(copyArea -> dst_x, buffer + 20, bigEndian);
+  PutUINT(copyArea -> dst_y, buffer + 22, bigEndian);
+
+  PutUINT(copyArea -> width,  buffer + 24, bigEndian);
+  PutUINT(copyArea -> height, buffer + 26, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsed identity for message at " << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void CopyAreaStore::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  CopyAreaMessage *copyArea = (CopyAreaMessage *) message;
+
+  *logofs << name() << ": Identity src_drawable " << copyArea -> src_drawable 
+          << ", dst_drawable " << copyArea -> dst_drawable << ", gcontext " << copyArea -> gcontext
+          << ", src_x " << copyArea -> src_x << ", src_y " << copyArea -> src_y
+          << ", dst_x " << copyArea -> dst_x << ", dst_y " << copyArea -> dst_y
+          << ", width  " << copyArea -> width << ", height " << copyArea -> height
+          << ", size " << copyArea -> size_ << ".\n";
+
+  #endif
+}
+
+void CopyAreaStore::identityChecksum(const Message *message, const unsigned char *buffer,
+                                         unsigned int size, int bigEndian) const
+{
+  md5_append(md5_state_, buffer + 16, 12);
+}
+
+void CopyAreaStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                       const Message *cachedMessage,
+                                           ChannelCache *channelCache) const
+{
+  CopyAreaMessage *copyArea       = (CopyAreaMessage *) message;
+  CopyAreaMessage *cachedCopyArea = (CopyAreaMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << copyArea -> src_drawable
+          << " as " << "src_drawable" << " field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeXidValue(copyArea -> src_drawable, clientCache -> drawableCache);
+
+  cachedCopyArea -> src_drawable = copyArea -> src_drawable;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << copyArea -> dst_drawable
+          << " as " << "dst_drawable" << " field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeXidValue(copyArea -> dst_drawable, clientCache -> drawableCache);
+
+  cachedCopyArea -> dst_drawable = copyArea -> dst_drawable;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << copyArea -> gcontext
+          << " as " << "gcontext" << " field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeXidValue(copyArea -> gcontext, clientCache -> gcCache);
+
+  cachedCopyArea -> gcontext = copyArea -> gcontext;
+}
+
+void CopyAreaStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                       ChannelCache *channelCache) const
+{
+  CopyAreaMessage *copyArea = (CopyAreaMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  unsigned int value;
+
+  decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
+
+  copyArea -> src_drawable = value;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << copyArea -> src_drawable
+          << " as " << "src_drawable" << " field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
+
+  copyArea -> dst_drawable = value;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << copyArea -> dst_drawable
+          << " as " << "dst_drawable" << " field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeXidValue(value, clientCache -> gcCache);
+
+  copyArea -> gcontext = value;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << copyArea -> gcontext
+          << " as gcontext field.\n" << logofs_flush;
+  #endif
+}
+
+
diff --git a/nxcomp/src/CopyArea.h b/nxcomp/src/CopyArea.h
new file mode 100644
index 000000000..6b2617875
--- /dev/null
+++ b/nxcomp/src/CopyArea.h
@@ -0,0 +1,192 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef CopyArea_H
+#define CopyArea_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+
+#define COPYAREA_ENABLE_CACHE               1
+#define COPYAREA_ENABLE_DATA                0
+#define COPYAREA_ENABLE_SPLIT               0
+#define COPYAREA_ENABLE_COMPRESS            0
+
+#define COPYAREA_DATA_LIMIT                 0
+#define COPYAREA_DATA_OFFSET                28
+
+#define COPYAREA_CACHE_SLOTS                3000
+#define COPYAREA_CACHE_THRESHOLD            5
+#define COPYAREA_CACHE_LOWER_THRESHOLD      1
+
+//
+// The message class.
+//
+
+class CopyAreaMessage : public Message
+{
+  friend class CopyAreaStore;
+
+  public:
+
+  CopyAreaMessage()
+  {
+  }
+
+  ~CopyAreaMessage()
+  {
+  }
+
+  //
+  // Put here the fields which constitute 
+  // the 'identity' part of the message.
+  //
+
+  private:
+
+  unsigned int   src_drawable;
+  unsigned int   dst_drawable;
+  unsigned int   gcontext;
+  unsigned short src_x;
+  unsigned short src_y;
+  unsigned short dst_x;
+  unsigned short dst_y;
+  unsigned short width;
+  unsigned short height;
+};
+
+class CopyAreaStore : public MessageStore
+{
+  //
+  // Constructors and destructors.
+  //
+
+  public:
+
+  CopyAreaStore() : MessageStore()
+  {
+    enableCache    = COPYAREA_ENABLE_CACHE;
+    enableData     = COPYAREA_ENABLE_DATA;
+    enableSplit    = COPYAREA_ENABLE_SPLIT;
+    enableCompress = COPYAREA_ENABLE_COMPRESS;
+
+    dataLimit  = COPYAREA_DATA_LIMIT;
+    dataOffset = COPYAREA_DATA_OFFSET;
+
+    cacheSlots          = COPYAREA_CACHE_SLOTS;
+    cacheThreshold      = COPYAREA_CACHE_THRESHOLD;
+    cacheLowerThreshold = COPYAREA_CACHE_LOWER_THRESHOLD;
+
+    messages_ -> resize(cacheSlots);
+
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      *i = NULL;
+    }
+
+    temporary_ = NULL;
+  }
+
+  virtual ~CopyAreaStore()
+  {
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      destroy(*i);
+    }
+
+    destroy(temporary_);
+  }
+
+  virtual const char *name() const
+  {
+    return "CopyArea";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return X_CopyArea;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(CopyAreaMessage);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  public:
+
+  virtual Message *create() const
+  {
+    return new CopyAreaMessage();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new CopyAreaMessage((const CopyAreaMessage &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (CopyAreaMessage *) message;
+  }
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer,
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                  const Message *cachedMessage,
+                                      ChannelCache *channelCache) const;
+
+  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                  ChannelCache *channelCache) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+                                    unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+};
+
+#endif /* CopyArea_H */
diff --git a/nxcomp/src/CreateGC.cpp b/nxcomp/src/CreateGC.cpp
new file mode 100644
index 000000000..34978de13
--- /dev/null
+++ b/nxcomp/src/CreateGC.cpp
@@ -0,0 +1,194 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "CreateGC.h"
+
+#include "ClientCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Here are the methods to handle messages' content.
+//
+
+int CreateGCStore::parseIdentity(Message *message, const unsigned char *buffer,
+                                     unsigned int size, int bigEndian) const
+{
+  CreateGCMessage *createGC = (CreateGCMessage *) message;
+
+  //
+  // Here is the fingerprint.
+  //
+
+  createGC -> gcontext   = GetULONG(buffer + 4, bigEndian);
+  createGC -> drawable   = GetULONG(buffer + 8, bigEndian);
+  createGC -> value_mask = GetULONG(buffer + 12, bigEndian);
+
+  //
+  // Clear the unused bytes carried in the
+  // payload to increase the effectiveness
+  // of the caching algorithm.
+  //
+
+  if ((int) size > dataOffset)
+  {
+    #ifdef DEBUG
+    *logofs << name() << ": Removing unused bytes from the "
+            << "data payload.\n" << logofs_flush;
+    #endif
+
+    createGC -> value_mask &= (1 << 23) - 1;
+
+    unsigned int mask = 0x1;
+    unsigned char *source = (unsigned char *) buffer + CREATEGC_DATA_OFFSET;
+    unsigned long value = 0;
+
+    for (unsigned int i = 0; i < 23; i++)
+    {
+      if (createGC -> value_mask & mask)
+      {
+        value = GetULONG(source, bigEndian);
+
+        value &= (0xffffffff >> (32 - CREATEGC_FIELD_WIDTH[i]));
+
+        PutULONG(value, source, bigEndian);
+
+        source += 4;
+      }
+
+      mask <<= 1;
+    }
+  }
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsed identity for message at "
+          << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int CreateGCStore::unparseIdentity(const Message *message, unsigned char *buffer,
+                                       unsigned int size, int bigEndian) const
+{
+  CreateGCMessage *createGC = (CreateGCMessage *) message;
+
+  //
+  // Fill all the message's fields.
+  //
+
+  PutULONG(createGC -> gcontext,   buffer + 4, bigEndian);
+  PutULONG(createGC -> drawable,   buffer + 8, bigEndian);
+  PutULONG(createGC -> value_mask, buffer + 12, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsed identity for message at "
+          << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void CreateGCStore::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  CreateGCMessage *createGC = (CreateGCMessage *) message;
+
+  *logofs << name() << ": Identity gcontext " << createGC -> gcontext << ", drawable "
+                    << createGC -> drawable << ", value_mask " << createGC -> value_mask
+                    << ", size " << createGC -> size_ << ".\n" << logofs_flush;
+  #endif
+}
+
+void CreateGCStore::identityChecksum(const Message *message, const unsigned char *buffer,
+                                         unsigned int size, int bigEndian) const
+{
+  //
+  // This didn't include the drawable
+  // in previous versions.
+  //
+
+  md5_append(md5_state_, buffer + 8, 8);
+}
+
+void CreateGCStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                       const Message *cachedMessage,
+                                           ChannelCache *channelCache) const
+{
+  CreateGCMessage *createGC       = (CreateGCMessage *) message;
+  CreateGCMessage *cachedCreateGC = (CreateGCMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  // Since ProtoStep7 (#issue 108)
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << createGC -> gcontext
+          << " as gcontext field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeNewXidValue(createGC -> gcontext, clientCache -> lastId,
+                     clientCache -> lastIdCache, clientCache -> gcCache,
+                         clientCache -> freeGCCache);
+
+  cachedCreateGC -> gcontext = createGC -> gcontext;
+}
+
+void CreateGCStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                       ChannelCache *channelCache) const
+{
+  CreateGCMessage *createGC = (CreateGCMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  unsigned int value;
+
+  // Since ProtoStep7 (#issue 108)
+  decodeBuffer.decodeNewXidValue(value, clientCache -> lastId,
+                     clientCache -> lastIdCache, clientCache -> gcCache,
+                         clientCache -> freeGCCache);
+
+  createGC -> gcontext = value;
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded value " << createGC -> gcontext
+          << " as gcontext field.\n" << logofs_flush;
+  #endif
+}
diff --git a/nxcomp/src/CreateGC.h b/nxcomp/src/CreateGC.h
new file mode 100644
index 000000000..03e27d685
--- /dev/null
+++ b/nxcomp/src/CreateGC.h
@@ -0,0 +1,186 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef CreateGC_H
+#define CreateGC_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+
+#define CREATEGC_ENABLE_CACHE               1
+#define CREATEGC_ENABLE_DATA                0
+#define CREATEGC_ENABLE_SPLIT               0
+#define CREATEGC_ENABLE_COMPRESS            0
+
+#define CREATEGC_DATA_LIMIT                 144
+#define CREATEGC_DATA_OFFSET                16
+
+#define CREATEGC_CACHE_SLOTS                2000
+#define CREATEGC_CACHE_THRESHOLD            2
+#define CREATEGC_CACHE_LOWER_THRESHOLD      1
+
+//
+// The message class.
+//
+
+class CreateGCMessage : public Message
+{
+  friend class CreateGCStore;
+
+  public:
+
+  CreateGCMessage()
+  {
+  }
+
+  ~CreateGCMessage()
+  {
+  }
+
+  //
+  // Put here the fields which constitute 
+  // the 'identity' part of the message.
+  //
+
+  private:
+
+  unsigned int gcontext;
+  unsigned int drawable;
+  unsigned int value_mask;
+};
+
+class CreateGCStore : public MessageStore
+{
+  //
+  // Constructors and destructors.
+  //
+
+  public:
+
+  CreateGCStore() : MessageStore()
+  {
+    enableCache    = CREATEGC_ENABLE_CACHE;
+    enableData     = CREATEGC_ENABLE_DATA;
+    enableSplit    = CREATEGC_ENABLE_SPLIT;
+    enableCompress = CREATEGC_ENABLE_COMPRESS;
+
+    dataLimit  = CREATEGC_DATA_LIMIT;
+    dataOffset = CREATEGC_DATA_OFFSET;
+
+    cacheSlots          = CREATEGC_CACHE_SLOTS;
+    cacheThreshold      = CREATEGC_CACHE_THRESHOLD;
+    cacheLowerThreshold = CREATEGC_CACHE_LOWER_THRESHOLD;
+
+    messages_ -> resize(cacheSlots);
+
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      *i = NULL;
+    }
+
+    temporary_ = NULL;
+  }
+
+  virtual ~CreateGCStore()
+  {
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      destroy(*i);
+    }
+
+    destroy(temporary_);
+  }
+
+  virtual const char *name() const
+  {
+    return "CreateGC";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return X_CreateGC;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(CreateGCMessage);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  public:
+
+  virtual Message *create() const
+  {
+    return new CreateGCMessage();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new CreateGCMessage((const CreateGCMessage &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (CreateGCMessage *) message;
+  }
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer,
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                  const Message *cachedMessage,
+                                      ChannelCache *channelCache) const;
+
+  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                  ChannelCache *channelCache) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+                                    unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+};
+
+#endif /* CreateGC_H */
diff --git a/nxcomp/src/CreatePixmap.cpp b/nxcomp/src/CreatePixmap.cpp
new file mode 100644
index 000000000..a60134cd5
--- /dev/null
+++ b/nxcomp/src/CreatePixmap.cpp
@@ -0,0 +1,280 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "CreatePixmap.h"
+
+#include "ClientCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+#include "WriteBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+//
+// Constructors and destructors.
+//
+
+CreatePixmapStore::CreatePixmapStore()
+
+  : MessageStore()
+{
+  enableCache    = CREATEPIXMAP_ENABLE_CACHE;
+  enableData     = CREATEPIXMAP_ENABLE_DATA;
+  enableSplit    = CREATEPIXMAP_ENABLE_SPLIT;
+  enableCompress = CREATEPIXMAP_ENABLE_COMPRESS;
+
+  dataLimit  = CREATEPIXMAP_DATA_LIMIT;
+  dataOffset = CREATEPIXMAP_DATA_OFFSET;
+
+  cacheSlots          = CREATEPIXMAP_CACHE_SLOTS;
+  cacheThreshold      = CREATEPIXMAP_CACHE_THRESHOLD;
+  cacheLowerThreshold = CREATEPIXMAP_CACHE_LOWER_THRESHOLD;
+
+  messages_ -> resize(cacheSlots);
+
+  for (T_messages::iterator i = messages_ -> begin();
+           i < messages_ -> end(); i++)
+  {
+    *i = NULL;
+  }
+
+  temporary_ = NULL;
+}
+
+CreatePixmapStore::~CreatePixmapStore()
+{
+  for (T_messages::iterator i = messages_ -> begin();
+           i < messages_ -> end(); i++)
+  {
+    destroy(*i);
+  }
+
+  destroy(temporary_);
+}
+
+//
+// Here are the methods to handle messages' content.
+//
+
+int CreatePixmapStore::encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                                          const unsigned int size, int bigEndian,
+                                              ChannelCache *channelCache) const
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  encodeBuffer.encodeCachedValue(*(buffer + 1), 8,
+                     clientCache -> depthCache);
+
+  encodeBuffer.encodeNewXidValue(GetULONG(buffer + 4, bigEndian),
+                     clientCache -> lastId, clientCache -> lastIdCache,
+                         clientCache -> drawableCache,
+                             clientCache -> freeDrawableCache);
+
+  encodeBuffer.encodeXidValue(GetULONG(buffer + 8, bigEndian),
+                     clientCache -> windowCache);
+
+  encodeBuffer.encodeCachedValue(GetUINT(buffer + 12, bigEndian), 16,
+                     clientCache -> createPixmapXCache, 8);
+
+  encodeBuffer.encodeCachedValue(GetUINT(buffer + 14, bigEndian), 16,
+                     clientCache -> createPixmapYCache, 8);
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded message. Size is "
+          << size << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int CreatePixmapStore::decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
+                                          unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
+                                              ChannelCache *channelCache) const
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  unsigned char cValue;
+  unsigned int  value;
+
+  size = 16;
+
+  buffer = writeBuffer -> addMessage(size);
+
+  decodeBuffer.decodeCachedValue(cValue, 8,
+                     clientCache -> depthCache);
+
+  *(buffer + 1) = cValue;
+
+  decodeBuffer.decodeNewXidValue(value,
+                     clientCache -> lastId, clientCache -> lastIdCache,
+                         clientCache -> drawableCache,
+                             clientCache -> freeDrawableCache);
+
+  PutULONG(value, buffer + 4, bigEndian);
+
+  decodeBuffer.decodeXidValue(value,
+                     clientCache -> windowCache);
+
+  PutULONG(value, buffer + 8, bigEndian);
+
+  decodeBuffer.decodeCachedValue(value, 16,
+                     clientCache -> createPixmapXCache, 8);
+
+  PutUINT(value, buffer + 12, bigEndian);
+
+  decodeBuffer.decodeCachedValue(value, 16,
+                     clientCache -> createPixmapYCache, 8);
+
+  PutUINT(value, buffer + 14, bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded message. Size is "
+          << size << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int CreatePixmapStore::parseIdentity(Message *message, const unsigned char *buffer,
+                                         unsigned int size, int bigEndian) const
+{
+  CreatePixmapMessage *createPixmap = (CreatePixmapMessage *) message;
+
+  createPixmap -> depth = *(buffer + 1);
+
+  createPixmap -> id       = GetULONG(buffer + 4, bigEndian);
+  createPixmap -> drawable = GetULONG(buffer + 8, bigEndian);
+
+  createPixmap -> width  = GetUINT(buffer + 12, bigEndian);
+  createPixmap -> height = GetUINT(buffer + 14, bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Parsed identity. Size is "
+          << createPixmap -> size_ << " identity is "
+          << createPixmap -> i_size_ << ".\n"
+          << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int CreatePixmapStore::unparseIdentity(const Message *message, unsigned char *buffer,
+                                           unsigned int size, int bigEndian) const
+{
+  CreatePixmapMessage *createPixmap = (CreatePixmapMessage *) message;
+
+  *(buffer + 1) = createPixmap -> depth;
+
+  PutULONG(createPixmap -> id,       buffer + 4, bigEndian);
+  PutULONG(createPixmap -> drawable, buffer + 8, bigEndian);
+
+  PutUINT(createPixmap -> width,  buffer + 12, bigEndian);
+  PutUINT(createPixmap -> height, buffer + 14, bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Unparsed identity. Size is "
+          << createPixmap -> size_ << " identity is "
+          << createPixmap -> i_size_ << ".\n"
+          << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void CreatePixmapStore::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  #ifdef WARNING
+  *logofs << name() << ": WARNING! Dump of identity not implemented.\n"
+          << logofs_flush;
+  #endif
+
+  #endif
+}
+
+void CreatePixmapStore::identityChecksum(const Message *message, const unsigned char *buffer,
+                                             unsigned int size, int bigEndian) const
+{
+  md5_append(md5_state_, buffer + 1, 1);
+  md5_append(md5_state_, buffer + 8, 8);
+}
+
+void CreatePixmapStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                           const Message *cachedMessage,
+                                               ChannelCache *channelCache) const
+{
+  CreatePixmapMessage *createPixmap       = (CreatePixmapMessage *) message;
+  CreatePixmapMessage *cachedCreatePixmap = (CreatePixmapMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  encodeBuffer.encodeNewXidValue(createPixmap -> id,
+                     clientCache -> lastId, clientCache -> lastIdCache,
+                         clientCache -> drawableCache,
+                             clientCache -> freeDrawableCache);
+
+  cachedCreatePixmap -> id = createPixmap -> id;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded update. Size is "
+          << createPixmap -> size_ << " identity is "
+          << createPixmap -> i_size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+
+void CreatePixmapStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                           ChannelCache *channelCache) const
+{
+  CreatePixmapMessage *createPixmap = (CreatePixmapMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  decodeBuffer.decodeNewXidValue(createPixmap -> id,
+                     clientCache -> lastId, clientCache -> lastIdCache,
+                         clientCache -> drawableCache,
+                             clientCache -> freeDrawableCache);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded update. Size is "
+          << createPixmap -> size_ << " identity is "
+          << createPixmap -> i_size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
diff --git a/nxcomp/src/CreatePixmap.h b/nxcomp/src/CreatePixmap.h
new file mode 100644
index 000000000..0a3212dd9
--- /dev/null
+++ b/nxcomp/src/CreatePixmap.h
@@ -0,0 +1,162 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef CreatePixmap_H
+#define CreatePixmap_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+
+#define CREATEPIXMAP_ENABLE_CACHE               1
+#define CREATEPIXMAP_ENABLE_DATA                0
+#define CREATEPIXMAP_ENABLE_SPLIT               0
+#define CREATEPIXMAP_ENABLE_COMPRESS            0
+
+#define CREATEPIXMAP_DATA_LIMIT                 16
+#define CREATEPIXMAP_DATA_OFFSET                16
+
+#define CREATEPIXMAP_CACHE_SLOTS                1000
+#define CREATEPIXMAP_CACHE_THRESHOLD            2
+#define CREATEPIXMAP_CACHE_LOWER_THRESHOLD      1
+
+//
+// The message class.
+//
+
+class CreatePixmapMessage : public Message
+{
+  friend class CreatePixmapStore;
+
+  public:
+
+  CreatePixmapMessage()
+  {
+  }
+
+  ~CreatePixmapMessage()
+  {
+  }
+
+  //
+  // Put here the fields which constitute 
+  // the 'identity' part of the message.
+  //
+
+  private:
+
+  unsigned char depth;
+
+  unsigned int id;
+  unsigned int drawable;
+
+  unsigned short width;
+  unsigned short height;
+};
+
+class CreatePixmapStore : public MessageStore
+{
+  public:
+
+  CreatePixmapStore();
+
+  virtual ~CreatePixmapStore();
+
+  virtual const char *name() const
+  {
+    return "CreatePixmap";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return X_CreatePixmap;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(CreatePixmapMessage);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  protected:
+
+  virtual Message *create() const
+  {
+    return new CreatePixmapMessage();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new CreatePixmapMessage((const CreatePixmapMessage &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (CreatePixmapMessage *) message;
+  }
+
+  virtual int encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                                 const unsigned int size, int bigEndian,
+                                     ChannelCache *channelCache) const;
+
+  virtual int decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
+                                 unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
+                                     ChannelCache *channelCache) const;
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer, 
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer, 
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                  const Message *cachedMessage,
+                                      ChannelCache *channelCache) const;
+
+  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                  ChannelCache *channelCache) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer, 
+                                    unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+};
+
+#endif /* CreatePixmap_H */
diff --git a/nxcomp/src/DecodeBuffer.cpp b/nxcomp/src/DecodeBuffer.cpp
new file mode 100644
index 000000000..4c1530d9b
--- /dev/null
+++ b/nxcomp/src/DecodeBuffer.cpp
@@ -0,0 +1,639 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "Misc.h"
+#include "Control.h"
+
+#include "DecodeBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+DecodeBuffer::DecodeBuffer(const unsigned char *data, unsigned int length)
+
+  : buffer_(data), end_(buffer_ + length), nextSrc_(buffer_), srcMask_(0x80)
+{
+  // Since ProtoStep7 (#issue 108)
+  end_ = buffer_ + length - DECODE_BUFFER_POSTFIX_SIZE;
+}
+
+int DecodeBuffer::decodeValue(unsigned int &value, unsigned int numBits,
+                                  unsigned int blockSize, int endOkay)
+{
+  #ifdef DUMP
+  *logofs << "DecodeBuffer: Decoding " << numBits
+          << " bits value with block " << blockSize
+          << " and " << (nextSrc_ - buffer_)
+          << " bytes in buffer.\n" << logofs_flush;
+  #endif
+
+  unsigned int result = 0;
+  unsigned int destMask = 0x1;
+  unsigned int bitsRead = 0;
+
+  if (blockSize == 0)
+    blockSize = numBits;
+
+  unsigned char nextSrcChar = *nextSrc_;
+  unsigned int numBlocks = 1;
+
+  do
+  {
+    if (numBlocks == 4)
+    {
+      blockSize = numBits;
+    }
+
+    unsigned int bitsToRead = (blockSize > numBits - bitsRead ?
+                                   numBits - bitsRead : blockSize);
+    unsigned int count = 0;
+    unsigned char lastBit;
+
+    do
+    {
+      if (nextSrc_ >= end_)
+      {
+        if (!endOkay)
+        {
+          #ifdef PANIC
+          *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [A] "
+                  << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_)
+                  << " end_ = " << (end_ - buffer_) << ".\n"
+                  << logofs_flush;
+          #endif
+
+          //
+          // Label "context" is just used to identify
+          // the routine which detected the problem in
+          // present source file.
+          //
+
+          cerr << "Error" << ": Failure decoding data in context [A].\n";
+
+          HandleAbort();
+        }
+
+        #ifdef PANIC
+        *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [B] "
+                << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_)
+                << " end_ = " << (end_ - buffer_) << ".\n"
+                << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Failure decoding data in context [B].\n";
+
+        HandleAbort();
+      }
+
+      lastBit = (nextSrcChar & srcMask_);
+
+      if (lastBit)
+        result |= destMask;
+
+      srcMask_ >>= 1;
+
+      if (srcMask_ == 0)
+      {
+        srcMask_ = 0x80;
+        nextSrc_++;
+        nextSrcChar = *nextSrc_;
+      }
+
+      destMask <<= 1;
+    }
+    while (bitsToRead > ++count);
+
+    bitsRead += bitsToRead;
+
+    if (bitsRead < numBits)
+    {
+      if (nextSrc_ >= end_)
+      {
+        if (!endOkay)
+        {
+          #ifdef PANIC
+          *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [C] "
+                  << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_)
+                  << " end_ = " << (end_ - buffer_) << ".\n"
+                  << logofs_flush;
+          #endif
+
+          cerr << "Error" << ": Failure decoding data in context [C].\n";
+
+          HandleAbort();
+        }
+
+        #ifdef PANIC
+        *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [D] "
+                << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_)
+                << " end_ = " << (end_ - buffer_) << ".\n"
+                << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Failure decoding data in context [D].\n";
+
+        HandleAbort();
+      }
+
+      unsigned char moreData = (nextSrcChar & srcMask_);
+
+      srcMask_ >>= 1;
+
+      if (srcMask_ == 0)
+      {
+        srcMask_ = 0x80;
+        nextSrc_++;
+        nextSrcChar = *nextSrc_;
+      }
+
+      if (!moreData)
+      {
+        if (lastBit)
+        {
+          do
+          {
+            result |= destMask;
+            destMask <<= 1;
+          }
+          while (numBits > ++bitsRead);
+        }
+        else
+          bitsRead = numBits;
+      }
+    }
+
+    blockSize >>= 1;
+
+    if (blockSize < 2)
+      blockSize = 2;
+
+    numBlocks++;
+  }
+  while (numBits > bitsRead);
+
+  value = result;
+
+  return 1;
+}
+
+int DecodeBuffer::decodeCachedValue(unsigned int &value, unsigned int numBits,
+                                        IntCache &cache, unsigned int blockSize,
+                                            int endOkay)
+{
+  #ifdef DUMP
+  *logofs << "DecodeBuffer: Decoding " << numBits
+          << " bits cached value with block " << blockSize
+          << " and " << (nextSrc_ - buffer_)
+          << " bytes in buffer.\n" << logofs_flush;
+  #endif
+
+  if (nextSrc_ >= end_)
+  {
+    #ifdef PANIC
+    *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [E] "
+            << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_)
+            << " end_ = " << (end_ - buffer_) << ".\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Failure decoding data in context [E].\n";
+
+    HandleAbort();
+  }
+
+  unsigned int index = 0;
+  unsigned char nextSrcChar = *nextSrc_;
+
+  while (!(nextSrcChar & srcMask_))
+  {
+    index++;
+    srcMask_ >>= 1;
+    if (srcMask_ == 0)
+    {
+      srcMask_ = 0x80;
+      nextSrc_++;
+      if (nextSrc_ >= end_)
+      {
+        if (!endOkay)
+        {
+          #ifdef PANIC
+          *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [F] "
+                  << "in decodeCachedValue() nextSrc_ = "
+                  << (nextSrc_ - buffer_) << " end_ = "
+                  << (end_ - buffer_) << ".\n" << logofs_flush;
+          #endif
+
+          cerr << "Error" << ": Failure decoding data in context [F].\n";
+
+          HandleAbort();
+        }
+
+        #ifdef PANIC
+        *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [G] "
+                << "in decodeValue() nextSrc_ = " << (nextSrc_ - buffer_)
+                << " end_ = " << (end_ - buffer_) << ".\n"
+                << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Failure decoding data in context [G].\n";
+
+        HandleAbort();
+      }
+
+      nextSrcChar = *nextSrc_;
+    }
+  }
+
+  srcMask_ >>= 1;
+
+  if (srcMask_ == 0)
+  {
+    srcMask_ = 0x80;
+    nextSrc_++;
+  }
+
+  if (index == 2)
+  {
+    // Since ProtoStep8 (#issue 108)
+    blockSize = cache.getBlockSize(blockSize);
+
+    if (decodeValue(value, numBits, blockSize, endOkay))
+    {
+      cache.insert(value, IntMask[numBits]);
+
+      return 1;
+    }
+
+    #ifdef PANIC
+    *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [H] "
+            << "in decodeCacheValue() with no value found.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Failure decoding data in context [H].\n";
+
+    HandleAbort();
+  }
+  else
+  {
+    if (index > 2)
+    {
+      index--;
+    }
+
+    if (index > cache.getSize())
+    {
+      #ifdef PANIC
+      *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [I] "
+              << "in decodeCachedValue() index = " << index
+              << " cache size = " << cache.getSize() << ".\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Failure decoding data in context [I].\n";
+
+      HandleAbort();
+    }
+
+    value = cache.get(index);
+
+    return 1;
+  }
+}
+
+int DecodeBuffer::decodeCachedValue(unsigned char &value, unsigned int numBits,
+                                        CharCache &cache, unsigned int blockSize,
+                                            int endOkay)
+{
+  #ifdef DUMP
+  *logofs << "DecodeBuffer: Decoding " << numBits
+          << " bits char cached value with block " << blockSize
+          << " and " << nextSrc_ - buffer_ << " bytes read out of "
+          << end_ - buffer_ << ".\n" << logofs_flush;
+  #endif
+
+  if (nextSrc_ >= end_)
+  {
+    #ifdef TEST
+    *logofs << "DecodeBuffer: End of buffer reached in context [J] with "
+            << nextSrc_ - buffer_ << " bytes read out of "
+            << end_ - buffer_ << ".\n" << logofs_flush;
+    #endif
+
+    return 0;
+  }
+
+  unsigned int index = 0;
+  unsigned char nextSrcChar = *nextSrc_;
+
+  while (!(nextSrcChar & srcMask_))
+  {
+    index++;
+    srcMask_ >>= 1;
+
+    if (srcMask_ == 0)
+    {
+      srcMask_ = 0x80;
+      nextSrc_++;
+
+      if (nextSrc_ >= end_)
+      {
+        if (!endOkay)
+        {
+          #ifdef PANIC
+          *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [K] "
+                  << "in decodeCachedValue() nextSrc_ "
+                  << (nextSrc_ - buffer_) << " end_ " << (end_ - buffer_)
+                  << ".\n" << logofs_flush;
+          #endif
+
+          cerr << "Error" << ": Failure decoding data in context [K].\n";
+
+          HandleAbort();
+        }
+
+        #ifdef TEST
+        *logofs << "DecodeBuffer: End of buffer reached in context [L] with "
+                << nextSrc_ - buffer_ << " bytes read out of "
+                << end_ - buffer_ << ".\n" << logofs_flush;
+        #endif
+
+        return 0;
+      }
+
+      nextSrcChar = *nextSrc_;
+    }
+  }
+
+  srcMask_ >>= 1;
+
+  if (srcMask_ == 0)
+  {
+    srcMask_ = 0x80;
+    nextSrc_++;
+  }
+
+  if (index == 2)
+  {
+    unsigned int temp;
+
+    if (decodeValue(temp, numBits, blockSize, endOkay))
+    {
+      value = (unsigned char) temp;
+
+      cache.insert(value);
+    }
+    else
+    {
+      #ifdef PANIC
+      *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [M] "
+              << "in decodeValue() with index = 2.\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Failure decoding data in context [M].\n";
+
+      HandleAbort();
+    }
+  }
+  else
+  {
+    if (index > 2)
+    {
+      index--;
+    }
+
+    if (index > cache.getSize())
+    {
+      #ifdef PANIC
+      *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [N] "
+              << "in decodeCachedValue() " << "index = " << index
+              << " cache size = " << cache.getSize() << ".\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Failure decoding data in context [N].\n";
+
+      HandleAbort();
+    }
+
+    value = cache.get(index);
+  }
+
+  return 1;
+}
+
+//
+// Simply returns a pointer to the correct spot in
+// the internal buffer. If the caller needs this
+// data to last beyond the lifetime of the internal
+// buffer, it must copy the data in its own memory.
+//
+
+const unsigned char *DecodeBuffer::decodeMemory(unsigned int numBytes)
+{
+  #ifdef DUMP
+  *logofs << "DecodeBuffer: Decoding " << numBytes
+          << " bytes of memory with " << (nextSrc_ - buffer_)
+          << " bytes in buffer.\n" << logofs_flush;
+  #endif
+
+  const unsigned char *result;     
+
+  //
+  // Force ourselves to a byte boundary.
+  // Is up to application to ensure data
+  // is word alligned when needed.
+  //
+
+  if (srcMask_ != 0x80)
+  {
+    srcMask_ = 0x80;
+    nextSrc_++;
+  }
+
+  result = nextSrc_;
+
+  if (numBytes > DECODE_BUFFER_OVERFLOW_SIZE)
+  {
+    #ifdef PANIC
+    *logofs << "DecodeBuffer: PANIC! Can't decode a buffer of "
+            << numBytes << " bytes with limit set to "
+            << DECODE_BUFFER_OVERFLOW_SIZE << ".\n"
+            << logofs_flush;
+
+    *logofs << "DecodeBuffer: PANIC! Assuming failure decoding "
+            << "data in context [O].\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Should never decode buffer of size "
+         << "greater than " << DECODE_BUFFER_OVERFLOW_SIZE
+         << " bytes.\n";
+
+    cerr << "Error" << ": Assuming failure decoding data in "
+         << "context [O].\n";
+
+    HandleAbort();
+  }
+  else if (end_ - nextSrc_ < (int) numBytes)
+  {
+    #ifdef PANIC
+    *logofs << "DecodeBuffer: PANIC! Assertion failed. Error [P] "
+            << "in decodeMemory() " << "with length " << numBytes
+            << " and " << (end_ - nextSrc_)
+            << " bytes remaining.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Failure decoding data in context [P].\n";
+
+    HandleAbort();
+  }
+
+  nextSrc_ += numBytes;
+
+  return result;
+}
+
+void DecodeBuffer::decodeActionValue(unsigned char &value, unsigned short &position,
+                                         ActionCache &cache)
+{
+  unsigned int t;
+
+  decodeCachedValue(t, 15, *(cache.base_[cache.slot_]));
+
+  cache.last_ += t;
+  cache.last_ &= 0x7fff;
+
+  value = cache.last_ >> 13;
+
+  position = cache.last_ & 0x1fff;
+
+  #ifdef DEBUG
+  *logofs << "DecodeBuffer: Decoded value "
+          << (unsigned) value << " and position "
+          << position << " with base " << cache.slot_
+          << ".\n" << logofs_flush;
+  #endif
+
+  #ifdef DEBUG
+  *logofs << "DecodeBuffer: Action block prediction is "
+          << (*(cache.base_[cache.slot_])).getBlockSize(15)
+          << ".\n" << logofs_flush;
+  #endif
+
+  cache.slot_ = (cache.last_ & 0xff);
+}
+
+void DecodeBuffer::decodeNewXidValue(unsigned int &value, unsigned int &lastId,
+                                         IntCache &lastIdCache, IntCache &cache,
+                                             FreeCache &freeCache)
+{
+  decodeCachedValue(value, 29, lastIdCache);
+
+  lastId += (value + 1);
+  lastId &= 0x1fffffff;
+
+  value = lastId;
+
+  cache.push(value, 0x1fffffff);
+
+  freeCache.push(value, 0x1fffffff);
+}
+
+void DecodeBuffer::decodeNewXidValue(unsigned int &value, unsigned int &lastId,
+                                         IntCache &lastIdCache, XidCache &cache,
+                                             FreeCache &freeCache)
+{
+  decodeCachedValue(value, 29, lastIdCache);
+
+  #ifdef DEBUG
+  *logofs << "DecodeBuffer: Decoded new Xid difference "
+          << value << ".\n" << logofs_flush;
+  #endif
+
+  lastId += (value + 1);
+  lastId &= 0x1fffffff;
+
+  value = lastId;
+
+  unsigned int t = (value - cache.last_);
+
+  cache.last_ = value;
+
+  #ifdef DEBUG
+  *logofs << "DecodeBuffer: Decoded new Xid " << value
+          << " with base " << cache.slot_ << ".\n"
+          << logofs_flush;
+  #endif
+
+  cache.slot_ = (value & 0xff);
+
+  cache.base_[cache.slot_] -> push(t, 0x1fffffff);
+
+  freeCache.push(value, 0x1fffffff);
+}
+
+void DecodeBuffer::decodeXidValue(unsigned int &value, XidCache &cache)
+{
+  unsigned int t;
+
+  decodeCachedValue(t, 29, *(cache.base_[cache.slot_]));
+
+  cache.last_ += t;
+  cache.last_ &= 0x1fffffff;
+
+  value = cache.last_;
+
+  #ifdef DEBUG
+  *logofs << "DecodeBuffer: Decoded Xid " << value
+          << " with base " << cache.slot_ << ".\n"
+          << logofs_flush;
+  #endif
+
+  cache.slot_ = (value & 0xff);
+
+  #ifdef DEBUG
+  *logofs << "DecodeBuffer: Xid block prediction is "
+          << (*(cache.base_[cache.slot_])).getBlockSize(29)
+          << ".\n" << logofs_flush;
+  #endif
+}
+
+void DecodeBuffer::decodeFreeXidValue(unsigned int &value, FreeCache &cache)
+{
+  decodeCachedValue(value, 29, cache);
+}
+
diff --git a/nxcomp/src/DecodeBuffer.h b/nxcomp/src/DecodeBuffer.h
new file mode 100644
index 000000000..f5f84c54f
--- /dev/null
+++ b/nxcomp/src/DecodeBuffer.h
@@ -0,0 +1,138 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef DecodeBuffer_H
+#define DecodeBuffer_H
+
+#include <string.h>
+
+#include "IntCache.h"
+#include "CharCache.h"
+#include "XidCache.h"
+#include "FreeCache.h"
+#include "OpcodeCache.h"
+#include "ActionCache.h"
+
+#define DECODE_BUFFER_OVERFLOW_SIZE        4194304
+
+#define DECODE_BUFFER_POSTFIX_SIZE         1
+
+class DecodeBuffer
+{
+  public:
+
+  DecodeBuffer(const unsigned char *data, unsigned int length);
+
+  ~DecodeBuffer()
+  {
+  }
+
+  int decodeValue(unsigned int &value, unsigned int numBits,
+                      unsigned int blockSize = 0, int endOkay = 0);
+
+  int decodeCachedValue(unsigned int &value, unsigned int numBits,
+                            IntCache &cache, unsigned int blockSize = 0,
+                                int endOkay = 0);
+
+  int decodeCachedValue(unsigned char &value, unsigned int numBits,
+                            CharCache &cache, unsigned int blockSize = 0,
+                                int endOkay = 0);
+
+  void decodeDiffCachedValue(unsigned int &value, unsigned int &previous,
+                                 unsigned int numBits, IntCache &cache,
+                                     unsigned int blockSize = 0)
+  {
+    decodeCachedValue(value, numBits, cache, blockSize);
+
+    previous += (value + 1);
+    previous &= (0xffffffff >> (32 - numBits));
+
+    value = previous;
+  }
+
+  void decodeBoolValue(unsigned int &value)
+  {
+    decodeValue(value, 1);
+  }
+
+  int decodeOpcodeValue(unsigned char &value, OpcodeCache &cache, int endOkay = 0)
+  {
+    int result = decodeCachedValue(value, 8, cache.base_[cache.slot_], 8, endOkay);
+
+    if (result == 1)
+    {
+      cache.slot_ = value;
+    }
+
+    return result;
+  }
+
+  void decodeActionValue(unsigned char &value, unsigned short &position,
+                             ActionCache &cache);
+
+  void decodeNewXidValue(unsigned int &value, unsigned int &lastId,
+                             IntCache &lastIdCache, IntCache &cache,
+                                 FreeCache &freeCache);
+
+  void decodeNewXidValue(unsigned int &value, unsigned int &lastId,
+                             IntCache &lastIdCache, XidCache &cache,
+                                 FreeCache &freeCache);
+
+  void decodeXidValue(unsigned int &value, XidCache &cache);
+
+  void decodeFreeXidValue(unsigned int &value, FreeCache &cache);
+
+  void decodeTextData(unsigned char *buffer, unsigned int numBytes)
+  {
+    decodeMemory(buffer, numBytes);
+  }
+
+  void decodeIntData(unsigned char *buffer, unsigned int numBytes)
+  {
+    decodeMemory(buffer, numBytes);
+  }
+
+  void decodeLongData(unsigned char *buffer, unsigned int numBytes)
+  {
+    decodeMemory(buffer, numBytes);
+  }
+
+  const unsigned char *decodeMemory(unsigned int numBytes);
+
+  void decodeMemory(unsigned char *buffer, unsigned int numBytes)
+  {
+    memcpy(buffer, decodeMemory(numBytes), numBytes);
+  }
+
+  private:
+
+  const unsigned char *buffer_;
+  const unsigned char *end_;
+  const unsigned char *nextSrc_;
+
+  unsigned char srcMask_;
+};
+
+#endif /* DecodeBuffer_H */
diff --git a/nxcomp/src/EncodeBuffer.cpp b/nxcomp/src/EncodeBuffer.cpp
new file mode 100644
index 000000000..e112113a8
--- /dev/null
+++ b/nxcomp/src/EncodeBuffer.cpp
@@ -0,0 +1,623 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "Misc.h"
+#include "Control.h"
+
+#include "EncodeBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+#define ADVANCE_DEST \
+\
+if (destShift_ == 0) \
+{ \
+  destShift_ = 7; nextDest_++; *nextDest_ = 0; \
+} \
+else \
+{ \
+  destShift_--; \
+}
+
+EncodeBuffer::EncodeBuffer()
+{
+  size_ = ENCODE_BUFFER_DEFAULT_SIZE;
+
+  buffer_ = new unsigned char[size_ + ENCODE_BUFFER_PREFIX_SIZE +
+                                  ENCODE_BUFFER_POSTFIX_SIZE] + ENCODE_BUFFER_PREFIX_SIZE;
+  end_ = buffer_ + size_;
+
+  nextDest_  = buffer_;
+  *nextDest_ = 0;
+  destShift_ = 7;
+
+  lastBits_ = 0;
+
+  initialSize_   = ENCODE_BUFFER_DEFAULT_SIZE;
+  thresholdSize_ = ENCODE_BUFFER_DEFAULT_SIZE << 1;
+  maximumSize_   = ENCODE_BUFFER_DEFAULT_SIZE << 4;
+}
+
+EncodeBuffer::~EncodeBuffer()
+{
+  delete [] (buffer_ - ENCODE_BUFFER_PREFIX_SIZE);
+}
+
+void EncodeBuffer::setSize(unsigned int initialSize, unsigned int thresholdSize,
+                               unsigned int maximumSize)
+{
+  initialSize_   = initialSize;
+  thresholdSize_ = thresholdSize;
+  maximumSize_   = maximumSize;
+
+  #ifdef TEST
+  *logofs << "EncodeBuffer: Set buffer sizes to "
+          << initialSize_ << "/" << thresholdSize_
+          << "/" << maximumSize_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+
+void EncodeBuffer::fullReset()
+{
+  if (size_ > initialSize_)
+  {
+    delete [] (buffer_ - ENCODE_BUFFER_PREFIX_SIZE);
+
+    size_ = initialSize_;
+
+    buffer_ = new unsigned char[size_ + ENCODE_BUFFER_PREFIX_SIZE +
+                                    ENCODE_BUFFER_POSTFIX_SIZE] + ENCODE_BUFFER_PREFIX_SIZE;
+  }
+
+  end_ = buffer_ + size_;
+
+  nextDest_  = buffer_;
+  *nextDest_ = 0;
+  destShift_ = 7;
+
+  lastBits_ = 0;
+}
+
+void EncodeBuffer::encodeValue(unsigned int value, unsigned int numBits,
+                                   unsigned int blockSize)
+{
+  #ifdef DUMP
+  *logofs << "EncodeBuffer: Encoding " << numBits
+          << " bits value with block " << blockSize
+          << " and " << (nextDest_ - buffer_)
+          << " bytes in buffer.\n" << logofs_flush;
+  #endif
+
+  value &= IntMask[numBits];
+
+  unsigned int srcMask = 0x1;
+  unsigned int bitsWritten = 0;
+
+  if (blockSize == 0)
+    blockSize = numBits;
+
+  if (end_ - nextDest_ < 8)
+  {
+    growBuffer();
+  }
+
+  unsigned int numBlocks = 1;
+
+  do
+  {
+    if (numBlocks == 4)
+      blockSize = numBits;
+
+    unsigned int bitsToWrite = (blockSize > numBits - bitsWritten ?
+                                    numBits - bitsWritten : blockSize);
+    unsigned int count = 0;
+    unsigned int lastBit;
+
+    do
+    {
+      lastBit = (value & srcMask);
+      if (lastBit)
+        *nextDest_ |= (1 << destShift_);
+      ADVANCE_DEST;
+      srcMask <<= 1;
+    }
+    while (bitsToWrite > ++count);
+
+    bitsWritten += bitsToWrite;
+
+    if (bitsWritten < numBits)
+    {
+      unsigned int tmpMask = srcMask;
+      unsigned int i = bitsWritten;
+
+      if (lastBit)
+      {
+        do
+        {
+          unsigned int nextBit = (value & tmpMask);
+
+          if (!nextBit)
+            break;
+
+          tmpMask <<= 1;
+        }
+        while (numBits > ++i);
+      }
+      else
+      {
+        do
+        {
+          unsigned int nextBit = (value & tmpMask);
+
+          if (nextBit)
+            break;
+
+          tmpMask <<= 1;
+        }
+        while (numBits > ++i);
+      }
+
+      if (i < numBits)
+        *nextDest_ |= (1 << destShift_);
+      else
+        bitsWritten = numBits;
+
+      ADVANCE_DEST;
+    }
+    blockSize >>= 1;
+
+    if (blockSize < 2)
+      blockSize = 2;
+
+    numBlocks++;
+  }
+  while (numBits > bitsWritten);
+}
+
+void EncodeBuffer::encodeCachedValue(unsigned int value, unsigned int numBits,
+                                         IntCache &cache, unsigned int blockSize)
+{
+  #ifdef DUMP
+  *logofs << "EncodeBuffer: Encoding " << numBits
+          << " bits cached value with block " << blockSize
+          << " and " << (nextDest_ - buffer_)
+          << " bytes in buffer.\n" << logofs_flush;
+  #endif
+
+  value &= IntMask[numBits];
+
+  if (end_ - nextDest_ < 8)
+  {
+    growBuffer();
+  }
+
+  blockSize = cache.getBlockSize(blockSize);
+
+  unsigned int index;
+  unsigned int sameDiff;
+
+  #ifdef DUMP
+
+  diffBits();
+
+  #endif
+
+  if (cache.lookup(value, index, IntMask[numBits], sameDiff))
+  {
+    if (index > 1)
+      index++;
+
+    while (destShift_ < index)
+    {
+      index -= destShift_;
+      index--;
+      destShift_ = 7;
+      nextDest_++;
+      *nextDest_ = 0;
+    }
+
+    destShift_ -= index;
+    *nextDest_ |= (1 << destShift_);
+    ADVANCE_DEST;
+
+    #ifdef DUMP
+    *logofs << "EncodeBuffer: Encoded cached int using "
+            << diffBits() << " bits out of " << numBits
+            << ".\n" << logofs_flush;
+    #endif
+  }
+  else
+  {
+    ADVANCE_DEST;
+    ADVANCE_DEST;
+    *nextDest_ |= (1 << destShift_);
+    ADVANCE_DEST;
+
+    //
+    // The attempt is very seldom successful.
+    // Avoid to encode the additional bool.
+    //
+
+    // Since ProtoStep8 (#issue 108)
+    #ifdef DUMP
+    *logofs << "EncodeBuffer: Encoded missed int using "
+            << diffBits() << " bits out of " << numBits
+            << ".\n" << logofs_flush;
+    #endif
+
+    encodeValue(value, numBits, blockSize);
+  }
+}
+
+void EncodeBuffer::encodeCachedValue(unsigned char value, unsigned int numBits,
+                                         CharCache &cache, unsigned int blockSize)
+{
+  #ifdef DUMP
+  *logofs << "EncodeBuffer: Encoding " << numBits
+          << " bits char cached value with block " << blockSize
+          << " and " << (nextDest_ - buffer_)
+          << " bytes in buffer.\n" << logofs_flush;
+  #endif
+
+  value &= IntMask[numBits];
+
+  if (end_ - nextDest_ < 8)
+  {
+    growBuffer();
+  }
+
+  unsigned int index;
+
+  #ifdef DUMP
+
+  diffBits();
+
+  #endif
+
+  if (cache.lookup(value, index))
+  {
+    if (index > 1)
+      index++;
+
+    while (destShift_ < index)
+    {
+      index -= destShift_;
+      index--;
+      destShift_ = 7;
+      nextDest_++;
+      *nextDest_ = 0;
+    }
+
+    destShift_ -= index;
+    *nextDest_ |= (1 << destShift_);
+    ADVANCE_DEST;
+
+    #ifdef DUMP
+    *logofs << "EncodeBuffer: Encoded cached char using "
+            << diffBits() << " bits out of " << numBits
+            << ".\n" << logofs_flush;
+    #endif
+  }
+  else
+  {
+    ADVANCE_DEST;
+    ADVANCE_DEST;
+    *nextDest_ |= (1 << destShift_);
+    ADVANCE_DEST;
+
+    encodeValue(value, numBits, blockSize);
+
+    #ifdef DUMP
+    *logofs << "EncodeBuffer: Encoded missed char using "
+            << diffBits() << " bits out of " << numBits
+            << ".\n" << logofs_flush;
+    #endif
+  }
+}
+
+void EncodeBuffer::encodeMemory(const unsigned char *buffer, unsigned int numBytes)
+{
+  #ifdef DUMP
+  *logofs << "EncodeBuffer: Encoding " << numBytes
+          << " bytes of memory with " << (nextDest_ - buffer_)
+          << " bytes in buffer.\n" << logofs_flush;
+  #endif
+
+  if (numBytes > ENCODE_BUFFER_OVERFLOW_SIZE)
+  {
+    #ifdef PANIC
+    *logofs << "EncodeBuffer: PANIC! Should never encode buffer "
+            << "of size greater than " << ENCODE_BUFFER_OVERFLOW_SIZE
+            << " bytes.\n" << logofs_flush;
+
+    *logofs << "EncodeBuffer: PANIC! Assuming failure encoding data "
+            << "in context [A].\n" << logofs_flush;
+    #endif
+
+    //
+    // Label "context" is just used to identify
+    // the routine which detected the problem in
+    // present source file.
+    //
+
+    cerr << "Error" << ": Should never encode buffer of size "
+         << "greater than " << ENCODE_BUFFER_OVERFLOW_SIZE
+         << " bytes.\n";
+
+    cerr << "Error" << ": Assuming failure encoding data "
+         << "in context [A].\n" ;
+
+    HandleAbort();
+  }
+
+  alignBuffer();
+
+  if (end_ - nextDest_ < (int) numBytes)
+  {
+    growBuffer(numBytes);
+  }
+
+  memcpy(nextDest_, buffer, numBytes);
+
+  nextDest_ += numBytes;
+
+  if (nextDest_ == end_)
+  {
+    growBuffer();
+  }
+  else if (nextDest_ > end_)
+  {
+    #ifdef PANIC
+    *logofs << "EncodeBuffer: PANIC! Assertion failed. Error [B] "
+            << "in encodeMemory() nextDest_ " << (nextDest_ - buffer)
+            << " end_ " << (end_ - buffer) << ".\n"
+            << logofs_flush;
+    #endif
+
+    //
+    // Label "context" is just used to identify
+    // the routine which detected the problem in
+    // present source file.
+    //
+
+    cerr << "Error" << ": Failure encoding raw data "
+         << "in context [B].\n" ;
+
+    HandleAbort();
+  }
+
+  *nextDest_ = 0; 
+}
+
+unsigned int EncodeBuffer::getLength() const
+{
+  unsigned int length = nextDest_ - buffer_;
+
+  if (destShift_ != 7)
+  {
+    length++;
+  }
+
+  // Since ProtoStep7 (#issue 108)
+  if (length > 0)
+  {
+    return length + ENCODE_BUFFER_POSTFIX_SIZE;
+  }
+
+  return length;
+}
+
+unsigned int EncodeBuffer::diffBits()
+{
+  unsigned int bits = ((nextDest_ - buffer_) << 3);
+
+  bits += (7 - destShift_);
+
+  unsigned int diff = bits - lastBits_;
+
+  lastBits_ = bits;
+
+  return diff;
+}
+
+void EncodeBuffer::growBuffer(unsigned int numBytes)
+{
+  if (numBytes == 0)
+  {
+    numBytes = initialSize_;
+  }
+
+  unsigned int bytesInBuffer = nextDest_ - buffer_;
+
+  unsigned int newSize = thresholdSize_;
+
+  while (newSize < bytesInBuffer + numBytes)
+  {
+    newSize <<= 1;
+
+    if (newSize > maximumSize_)
+    {
+      newSize = bytesInBuffer + numBytes + initialSize_;
+    }
+  }
+
+  unsigned char *newBuffer;
+
+  newBuffer = new unsigned char[newSize + ENCODE_BUFFER_PREFIX_SIZE +
+                                    ENCODE_BUFFER_POSTFIX_SIZE] + ENCODE_BUFFER_PREFIX_SIZE;
+
+  if (newBuffer == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "EncodeBuffer: PANIC! Error in context [C] "
+            << "growing buffer to accommodate " << numBytes
+            << " bytes .\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Error in context [C] "
+         << "growing encode buffer to accommodate "
+         << numBytes << " bytes.\n";
+
+    HandleAbort();
+  }
+
+  #ifdef TEST
+  if (newSize >= maximumSize_)
+  {
+    *logofs << "EncodeBuffer: WARNING! Buffer grown to reach "
+            << "size of " << newSize << " bytes.\n"
+            << logofs_flush;
+  }
+  #endif
+
+  //
+  // Prefix should not contain any valid data.
+  // It is proxy that will fill it with control
+  // messages and data length at the time a new
+  // frame is written to socket.
+  //
+
+  memcpy(newBuffer, buffer_, bytesInBuffer + 1);
+
+  newBuffer[bytesInBuffer + 1] = 0;
+
+  delete [] (buffer_ - ENCODE_BUFFER_PREFIX_SIZE);
+
+  buffer_ = newBuffer;
+  size_   = newSize;
+  end_    = buffer_ + size_;
+
+  nextDest_ = buffer_ + bytesInBuffer;
+}
+
+void EncodeBuffer::alignBuffer()
+{
+  if (destShift_ != 7)
+  {
+    destShift_ = 7;
+    nextDest_++;
+
+    if (nextDest_ >= end_)
+    {
+      growBuffer();
+    }
+    
+    *nextDest_ = 0;
+  }
+}
+
+void EncodeBuffer::encodeActionValue(unsigned char value, unsigned short position,
+                                         ActionCache &cache)
+{
+  unsigned int v = (value << 13) | position;
+
+  unsigned int t = (v - cache.last_);
+
+  encodeCachedValue(t, 15, *(cache.base_[cache.slot_]));
+
+  cache.last_ = v;
+
+  #ifdef DEBUG
+  *logofs << "EncodeBuffer: Encoded value "
+          << (unsigned) value << " and position "
+          << position << " with base " << cache.slot_
+          << ".\n" << logofs_flush;
+  #endif
+
+  cache.slot_ = (cache.last_ & 0xff);
+}
+
+void EncodeBuffer::encodeNewXidValue(unsigned int value, unsigned int &lastId,
+                                         IntCache &lastIdCache, IntCache &cache,
+                                             FreeCache &freeCache)
+{
+  encodeCachedValue((value - 1) - lastId, 29, lastIdCache);
+
+  lastId = value;
+
+  cache.push(value, 0x1fffffff);
+
+  freeCache.push(value, 0x1fffffff);
+}
+
+void EncodeBuffer::encodeNewXidValue(unsigned int value, unsigned int &lastId,
+                                         IntCache &lastIdCache, XidCache &cache,
+                                             FreeCache &freeCache)
+{
+  encodeCachedValue((value - 1) - lastId, 29, lastIdCache);
+
+  lastId = value;
+
+  unsigned int t = (value - cache.last_);
+
+  cache.last_ = value;
+
+  #ifdef DEBUG
+  *logofs << "EncodeBuffer: Encoded new Xid " << value
+          << " with base " << cache.slot_ << ".\n"
+          << logofs_flush;
+  #endif
+
+  cache.slot_ = (value & 0xff);
+
+  cache.base_[cache.slot_] -> push(t, 0x1fffffff);
+
+  freeCache.push(value, IntMask[29]);
+}
+
+void EncodeBuffer::encodeXidValue(unsigned int value, XidCache &cache)
+{
+  unsigned int t = (value - cache.last_);
+
+  encodeCachedValue(t, 29, *(cache.base_[cache.slot_]));
+
+  cache.last_ = value;
+
+  #ifdef DEBUG
+  *logofs << "EncodeBuffer: Encoded Xid " << value
+          << " with base " << cache.slot_ << ".\n"
+          << logofs_flush;
+  #endif
+
+  cache.slot_ = (value & 0xff);
+}
+
+void EncodeBuffer::encodeFreeXidValue(unsigned int value, FreeCache &cache)
+{
+  encodeCachedValue(value, 29, cache);
+}
diff --git a/nxcomp/src/EncodeBuffer.h b/nxcomp/src/EncodeBuffer.h
new file mode 100644
index 000000000..67f6ff093
--- /dev/null
+++ b/nxcomp/src/EncodeBuffer.h
@@ -0,0 +1,183 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef EncodeBuffer_H
+#define EncodeBuffer_H
+
+#include "IntCache.h"
+#include "CharCache.h"
+#include "XidCache.h"
+#include "FreeCache.h"
+#include "OpcodeCache.h"
+#include "ActionCache.h"
+
+#define ENCODE_BUFFER_DEFAULT_SIZE        16384
+
+//
+// This should match the maximum size of
+// a single message added to write buffer
+// (see WriteBuffer.h).
+//
+
+#define ENCODE_BUFFER_OVERFLOW_SIZE       4194304
+
+//
+// Adjust for the control messages and the
+// frame length added by the proxy.
+//
+
+#define ENCODE_BUFFER_PREFIX_SIZE         64
+
+//
+// The encode routines may write one byte
+// past the nominal end of the encode buffer.
+// This additional byte is included in the
+// payload. This is actually a harmless bug.
+//
+
+#define ENCODE_BUFFER_POSTFIX_SIZE        1
+
+class EncodeBuffer
+{
+  public:
+
+  EncodeBuffer();
+
+  ~EncodeBuffer();
+
+  void setSize(unsigned int initialSize, unsigned int thresholdSize,
+                   unsigned int maximumSize);
+
+  void encodeValue(unsigned int value, unsigned int numBits,
+                       unsigned int blockSize = 0);
+
+  void encodeCachedValue(unsigned int value, unsigned int numBits,
+                             IntCache &cache, unsigned int blockSize = 0);
+
+  void encodeCachedValue(unsigned char value, unsigned int numBits,
+                             CharCache &cache, unsigned int blockSize = 0);
+
+  void encodeDiffCachedValue(const unsigned int value, unsigned int &previous,
+                                 unsigned int numBits, IntCache &cache,
+                                     unsigned int blockSize = 0)
+  {
+    encodeCachedValue((value - 1) - previous, numBits, cache, blockSize);
+
+    previous = value;
+  }
+
+  void encodeBoolValue(unsigned int value)
+  {
+    encodeValue(value, 1);
+  }
+
+  void encodeOpcodeValue(unsigned char value, OpcodeCache &cache)
+  {
+    encodeCachedValue(value, 8, cache.base_[cache.slot_], 8);
+
+    cache.slot_ = value;
+  }
+
+  void encodeActionValue(unsigned char value, ActionCache &cache)
+  {
+    unsigned short position = 0;
+
+    encodeActionValue(value, position, cache);
+  }
+
+  void encodeActionValue(unsigned char value, unsigned short position,
+                             ActionCache &cache);
+
+  void encodeNewXidValue(unsigned int value, unsigned int &lastId,
+                             IntCache &lastIdCache, IntCache &cache,
+                                 FreeCache &freeCache);
+
+  void encodeNewXidValue(unsigned int value, unsigned int &lastId,
+                             IntCache &lastIdCache, XidCache &cache,
+                                 FreeCache &freeCache);
+
+  void encodeXidValue(unsigned int value, XidCache &cache);
+
+  void encodeFreeXidValue(unsigned int value, FreeCache &cache);
+
+  void encodeTextData(const unsigned char *buffer, unsigned int numBytes)
+  {
+    encodeMemory(buffer, numBytes);
+  }
+
+  void encodeIntData(const unsigned char *buffer, unsigned int numBytes)
+  {
+    encodeMemory(buffer, numBytes);
+  }
+
+  void encodeLongData(const unsigned char *buffer, unsigned int numBytes)
+  {
+    encodeMemory(buffer, numBytes);
+  }
+
+  void encodeMemory(const unsigned char *buffer, unsigned int numBytes);
+
+  unsigned char *getData()
+  {
+    return buffer_;
+  }
+
+  unsigned int getLength() const;
+
+  unsigned int getBits() const
+  {
+    return ((nextDest_ - buffer_) << 3) + (7 - destShift_);
+  }
+
+  unsigned int diffBits();
+
+  void fullReset();
+
+  private:
+
+  void growBuffer(unsigned int numBytes = 0);
+
+  void alignBuffer();
+
+  unsigned int size_;
+  unsigned char *buffer_;
+
+  //
+  // This points to the first byte
+  // just beyond end of the buffer.
+  //
+
+  const unsigned char *end_;
+
+  unsigned char *nextDest_;
+  unsigned int destShift_;
+  unsigned int lastBits_;
+
+  unsigned int initialSize_;
+  unsigned int thresholdSize_;
+  unsigned int maximumSize_;
+};
+
+#endif /* EncodeBuffer_H */
diff --git a/nxcomp/src/FillPoly.cpp b/nxcomp/src/FillPoly.cpp
new file mode 100644
index 000000000..b5928d5cf
--- /dev/null
+++ b/nxcomp/src/FillPoly.cpp
@@ -0,0 +1,239 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "FillPoly.h"
+
+#include "ClientCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Here are the methods to handle messages' content.
+//
+
+int FillPolyStore::parseIdentity(Message *message, const unsigned char *buffer,
+                                     unsigned int size, int bigEndian) const
+{
+  FillPolyMessage *fillPoly = (FillPolyMessage *) message;
+
+  //
+  // Here is the fingerprint.
+  //
+
+  fillPoly -> drawable = GetULONG(buffer + 4, bigEndian);
+  fillPoly -> gcontext = GetULONG(buffer + 8, bigEndian);
+
+  fillPoly -> shape = *(buffer + 12);
+  fillPoly -> mode  = *(buffer + 13);
+
+  // Since ProtoStep8 (#issue 108)
+  if (size >= (unsigned int) dataOffset)
+  {
+    fillPoly -> x_origin = GetUINT(buffer + 16, bigEndian);
+    fillPoly -> y_origin = GetUINT(buffer + 18, bigEndian);
+  }
+  else
+  {
+    fillPoly -> x_origin = 0;
+    fillPoly -> y_origin = 0;
+  }
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsed Identity for message at " << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int FillPolyStore::unparseIdentity(const Message *message, unsigned char *buffer,
+                                       unsigned int size, int bigEndian) const
+{
+  FillPolyMessage *fillPoly = (FillPolyMessage *) message;
+
+  //
+  // Fill all the message's fields.
+  //
+
+  PutULONG(fillPoly -> drawable, buffer + 4, bigEndian);
+  PutULONG(fillPoly -> gcontext, buffer + 8, bigEndian);
+
+  *(buffer + 12) = fillPoly -> shape;
+  *(buffer + 13) = fillPoly -> mode;
+
+  // Since ProtoStep8 (#issue 108)
+  if (size >= (unsigned int) dataOffset)
+  {
+    PutUINT(fillPoly -> x_origin, buffer + 16, bigEndian);
+    PutUINT(fillPoly -> y_origin, buffer + 18, bigEndian);
+  }
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsed identity for message at " << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void FillPolyStore::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  FillPolyMessage *fillPoly = (FillPolyMessage *) message;
+
+  *logofs << name() << ": Identity drawable " << fillPoly -> drawable
+                    << ", gcontext " << fillPoly -> gcontext << ", shape "
+                    << fillPoly -> shape << ", mode " << fillPoly -> mode
+                    << fillPoly -> size_ << ", x_origin " << fillPoly -> x_origin
+                    << ", y_origin " << fillPoly -> y_origin << ".\n"
+                    << logofs_flush;
+  #endif
+}
+
+void FillPolyStore::identityChecksum(const Message *message, const unsigned char *buffer,
+                                         unsigned int size, int bigEndian) const
+{
+  //
+  // Fields shape, mode.
+  //
+
+  md5_append(md5_state_, buffer + 12, 2);
+}
+
+void FillPolyStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                       const Message *cachedMessage,
+                                           ChannelCache *channelCache) const
+{
+  FillPolyMessage *fillPoly       = (FillPolyMessage *) message;
+  FillPolyMessage *cachedFillPoly = (FillPolyMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << fillPoly -> drawable
+          << " as drawable field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeXidValue(fillPoly -> drawable, clientCache -> drawableCache);
+
+  cachedFillPoly -> drawable = fillPoly -> drawable;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << fillPoly -> gcontext
+          << " as gcontext field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeXidValue(fillPoly -> gcontext, clientCache -> gcCache);
+
+  cachedFillPoly -> gcontext = fillPoly -> gcontext;
+
+  // Since ProtoStep8 (#issue 108)
+  if (fillPoly -> size_ >= dataOffset)
+  {
+    #ifdef TEST
+    *logofs << name() << ": Encoding value " << fillPoly -> x_origin
+        << " as x_origin field.\n" << logofs_flush;
+    #endif
+
+    encodeBuffer.encodeCachedValue(fillPoly -> x_origin, 16,
+                 *clientCache -> fillPolyXAbsCache[0], 8);
+
+    cachedFillPoly -> x_origin = fillPoly -> x_origin;
+
+    #ifdef TEST
+    *logofs << name() << ": Encoding value " << fillPoly -> y_origin
+            << " as y_origin field.\n" << logofs_flush;
+    #endif
+
+    encodeBuffer.encodeCachedValue(fillPoly -> y_origin, 16,
+                 *clientCache -> fillPolyYAbsCache[0], 8);
+
+    cachedFillPoly -> y_origin = fillPoly -> y_origin;
+  }
+}
+
+void FillPolyStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                       ChannelCache *channelCache) const
+{
+  FillPolyMessage *fillPoly = (FillPolyMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  decodeBuffer.decodeXidValue(fillPoly -> drawable, clientCache -> drawableCache);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded value " << fillPoly -> drawable
+          << " as drawable field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeXidValue(fillPoly -> gcontext, clientCache -> gcCache);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded value " << fillPoly -> gcontext
+          << " as gcontext field.\n" << logofs_flush;
+  #endif
+
+  // Since ProtoStep8 (#issue 108)
+  if (fillPoly -> size_ >= dataOffset)
+  {
+    unsigned int value;
+
+    decodeBuffer.decodeCachedValue(value, 16,
+                 *clientCache -> fillPolyXAbsCache[0], 8);
+
+    fillPoly -> x_origin = value;
+
+    #ifdef TEST
+    *logofs << name() << ": Decoded value " << fillPoly -> x_origin
+            << " as x_origin field.\n" << logofs_flush;
+    #endif
+
+    decodeBuffer.decodeCachedValue(value, 16,
+                 *clientCache -> fillPolyYAbsCache[0], 8);
+
+    fillPoly -> y_origin = value;
+
+    #ifdef TEST
+    *logofs << name() << ": Decoded value " << fillPoly -> y_origin
+            << " as y_origin field.\n" << logofs_flush;
+    #endif
+  }
+}
+
+
diff --git a/nxcomp/src/FillPoly.h b/nxcomp/src/FillPoly.h
new file mode 100644
index 000000000..4ceb96c09
--- /dev/null
+++ b/nxcomp/src/FillPoly.h
@@ -0,0 +1,200 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef FillPoly_H
+#define FillPoly_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+
+#define FILLPOLY_ENABLE_CACHE               1
+#define FILLPOLY_ENABLE_DATA                0
+#define FILLPOLY_ENABLE_SPLIT               0
+#define FILLPOLY_ENABLE_COMPRESS            0
+
+#define FILLPOLY_DATA_LIMIT                 512
+
+#define FILLPOLY_CACHE_SLOTS                2000
+#define FILLPOLY_CACHE_THRESHOLD            3
+#define FILLPOLY_CACHE_LOWER_THRESHOLD      1
+
+#define FILLPOLY_DATA_OFFSET_IF_PROTO_STEP_8    20
+
+//
+// The message class.
+//
+
+class FillPolyMessage : public Message
+{
+  friend class FillPolyStore;
+
+  public:
+
+  FillPolyMessage()
+  {
+  }
+
+  ~FillPolyMessage()
+  {
+  }
+
+  //
+  // Put here the fields which constitute 
+  // the 'identity' part of the message.
+  //
+
+  private:
+
+  unsigned char shape;
+  unsigned char mode;
+  unsigned int  drawable;
+  unsigned int  gcontext;
+
+  unsigned short x_origin;
+  unsigned short y_origin;
+};
+
+class FillPolyStore : public MessageStore
+{
+  //
+  // Constructors and destructors.
+  //
+
+  public:
+
+  FillPolyStore() : MessageStore()
+  {
+    enableCache    = FILLPOLY_ENABLE_CACHE;
+    enableData     = FILLPOLY_ENABLE_DATA;
+    enableSplit    = FILLPOLY_ENABLE_SPLIT;
+    enableCompress = FILLPOLY_ENABLE_COMPRESS;
+
+    dataLimit  = FILLPOLY_DATA_LIMIT;
+
+    // Since ProtoStep8 (#issue 108)
+    dataOffset = FILLPOLY_DATA_OFFSET_IF_PROTO_STEP_8;
+
+    cacheSlots          = FILLPOLY_CACHE_SLOTS;
+    cacheThreshold      = FILLPOLY_CACHE_THRESHOLD;
+    cacheLowerThreshold = FILLPOLY_CACHE_LOWER_THRESHOLD;
+
+    messages_ -> resize(cacheSlots);
+
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      *i = NULL;
+    }
+
+    temporary_ = NULL;
+  }
+
+  virtual ~FillPolyStore()
+  {
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      destroy(*i);
+    }
+
+    destroy(temporary_);
+  }
+
+  virtual const char *name() const
+  {
+    return "FillPoly";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return X_FillPoly;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(FillPolyMessage);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  public:
+
+  virtual Message *create() const
+  {
+    return new FillPolyMessage();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new FillPolyMessage((const FillPolyMessage &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (FillPolyMessage *) message;
+  }
+
+  virtual int identitySize(const unsigned char *buffer, unsigned int size)
+  {
+    // Since ProtoStep8 (#issue 108)
+    return (size >= FILLPOLY_DATA_OFFSET_IF_PROTO_STEP_8 ?
+                        FILLPOLY_DATA_OFFSET_IF_PROTO_STEP_8 : size);
+  }
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer,
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                  const Message *cachedMessage,
+                                      ChannelCache *channelCache) const;
+
+  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                  ChannelCache *channelCache) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+                                    unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+};
+
+#endif /* FillPoly_H */
diff --git a/nxcomp/src/Fork.cpp b/nxcomp/src/Fork.cpp
new file mode 100644
index 000000000..657c36134
--- /dev/null
+++ b/nxcomp/src/Fork.cpp
@@ -0,0 +1,110 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <unistd.h>
+
+#include "Fork.h"
+#include "Misc.h"
+#include "Timestamp.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+//
+// Only on Cygwin, retry n times waiting a
+// given amount of milliseconds after each
+// attempt.
+//
+
+#define RETRY_LIMIT    30
+#define RETRY_TIMEOUT  1000
+
+int Fork()
+{
+  #ifdef __CYGWIN32__
+
+  int limit   = RETRY_LIMIT;
+  int timeout = RETRY_TIMEOUT;
+
+  #else
+
+  int limit   = 1;
+  int timeout = 0;
+
+  #endif
+
+  int pid = 0;
+
+  for (int i = 0; i < limit; i++)
+  {
+    #ifdef TEST
+    *logofs << "Fork: Trying at " << strMsTimestamp()
+            << ".\n" << logofs_flush;
+    #endif
+
+    //
+    // It could optionally try again only if the
+    // error code is 11, 'Resource temporarily
+    // unavailable'.
+    //
+
+    if ((pid = fork()) >= 0)
+    {
+      break;
+    }
+    else if (i < limit - 1)
+    {
+      #ifdef WARNING
+      *logofs << "Fork: WARNING! Function fork failed. "
+              << "Error is " << EGET() << " '" << ESTR()
+              << "'. Retrying...\n" << logofs_flush;
+      #endif
+
+      usleep(timeout * 1000);
+    }
+  }
+
+  #ifdef TEST
+
+  if (pid <= 0)
+  {
+    *logofs << "Fork: Returning at " << strMsTimestamp()
+            << ".\n" << logofs_flush;
+  }
+
+  #endif
+
+  return pid;
+}
diff --git a/nxcomp/src/Fork.h b/nxcomp/src/Fork.h
new file mode 100644
index 000000000..94238ed90
--- /dev/null
+++ b/nxcomp/src/Fork.h
@@ -0,0 +1,31 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+//
+// Try again if the fork() fails, as it can happen
+// often on Cygwin.
+//
+
+extern int Fork();
diff --git a/nxcomp/src/FreeCache.h b/nxcomp/src/FreeCache.h
new file mode 100644
index 000000000..bf5c801e5
--- /dev/null
+++ b/nxcomp/src/FreeCache.h
@@ -0,0 +1,42 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef FreeCache_H
+#define FreeCache_H
+
+#include "IntCache.h"
+
+class FreeCache : public IntCache
+{
+  public:
+
+  FreeCache(unsigned int size)
+
+    : IntCache(size)
+  {
+  }
+};
+
+#endif /* FreeCache_H */
diff --git a/nxcomp/src/GenericChannel.cpp b/nxcomp/src/GenericChannel.cpp
new file mode 100644
index 000000000..877412cee
--- /dev/null
+++ b/nxcomp/src/GenericChannel.cpp
@@ -0,0 +1,495 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include "GenericChannel.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+#include "StaticCompressor.h"
+
+#include "Statistics.h"
+#include "Proxy.h"
+
+extern Proxy *proxy;
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+//
+// Log the important tracepoints related
+// to writing packets to the peer proxy.
+//
+
+#undef  FLUSH
+
+//
+// Define this to log when a channel
+// is created or destroyed.
+//
+
+#undef  REFERENCES
+
+//
+// Here are the static members.
+//
+
+#ifdef REFERENCES
+
+int GenericChannel::references_ = 0;
+
+#endif
+
+GenericChannel::GenericChannel(Transport *transport, StaticCompressor *compressor)
+
+  : Channel(transport, compressor), readBuffer_(transport_, this)
+{
+  #ifdef REFERENCES
+  *logofs << "GenericChannel: Created new object at " 
+          << this << " for FD#" << fd_ << " out of " 
+          << ++references_ << " allocated channels.\n"
+          << logofs_flush;
+  #endif
+}
+
+GenericChannel::~GenericChannel()
+{
+  #ifdef REFERENCES
+  *logofs << "GenericChannel: Deleted object at " 
+          << this << " for FD#" << fd_ << " out of "
+          << --references_ << " allocated channels.\n"
+          << logofs_flush;
+  #endif
+}
+
+//
+// Beginning of handleRead().
+//
+
+int GenericChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *message,
+                                   unsigned int length)
+{
+  #ifdef TEST
+  *logofs << "handleRead: Called for FD#" << fd_
+          << " with " << encodeBuffer.getLength()
+          << " bytes already encoded.\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // Pointer to located message and
+  // its size in bytes.
+  //
+
+  const unsigned char *inputMessage;
+  unsigned int inputLength;
+
+  //
+  // Tag message as generic data in compression
+  // routine. Opcode is not actually transferred
+  // over the network.
+  //
+
+  unsigned char inputOpcode = X_NXInternalGenericData;
+
+  #if defined(TEST) || defined(INFO)
+  *logofs << "handleRead: Trying to read from FD#"
+          << fd_ << " at " << strMsTimestamp() << ".\n"
+          << logofs_flush;
+  #endif
+
+  int result = readBuffer_.readMessage();
+
+  #ifdef DEBUG
+  *logofs << "handleRead: Read result on FD#" << fd_
+          << " is " << result << ".\n"
+          << logofs_flush;
+  #endif
+
+  if (result < 0)
+  {
+    //
+    // Let the proxy close the channel.
+    //
+
+    return -1;
+  }
+  else if (result == 0)
+  {
+    #if defined(TEST) || defined(INFO)
+
+    *logofs << "handleRead: PANIC! No data read from FD#"
+            << fd_ << " while encoding messages.\n"
+            << logofs_flush;
+
+    HandleCleanup();
+
+    #endif
+
+    return 0;
+  }
+
+  #if defined(TEST) || defined(INFO) || defined(FLUSH)
+  *logofs << "handleRead: Encoding messages for FD#" << fd_
+          << " with " << readBuffer_.getLength() << " bytes "
+          << "in the buffer.\n" << logofs_flush;
+  #endif
+
+  //
+  // Divide the available data in multiple
+  // messages and encode them one by one.
+  //
+
+  if (proxy -> handleAsyncSwitch(fd_) < 0)
+  {
+    return -1;
+  }
+
+  while ((inputMessage = readBuffer_.getMessage(inputLength)) != NULL)
+  {
+    encodeBuffer.encodeValue(inputLength, 32, 14);
+
+    if (isCompressed() == 1)
+    {
+      unsigned int compressedDataSize = 0;
+      unsigned char *compressedData   = NULL;
+
+      if (handleCompress(encodeBuffer, inputOpcode, 0,
+                             inputMessage, inputLength, compressedData,
+                                 compressedDataSize) < 0)
+      {
+        return -1;
+      }
+    }
+    else
+    {
+      encodeBuffer.encodeMemory(inputMessage, inputLength);
+    }
+
+    int bits = encodeBuffer.diffBits();
+
+    #if defined(TEST) || defined(OPCODES)
+    *logofs << "handleRead: Handled generic data for FD#" << fd_
+            << ". " << inputLength << " bytes in, " << bits << " bits ("
+            << ((float) bits) / 8 << " bytes) out.\n" << logofs_flush;
+    #endif
+
+    addProtocolBits(inputLength << 3, bits);
+
+    if (isPrioritized() == 1)
+    {
+      priority_++;
+    }
+
+  } // End of while ((inputMessage = readBuffer_.getMessage(inputLength)) != NULL) ...
+
+  //
+  // All data has been read from the read buffer.
+  // We still need to mark the end of the encode
+  // buffer just before sending the frame. This
+  // allows us to accommodate multiple reads in
+  // a single frame.
+  //
+
+  if (priority_ > 0)
+  {
+    #if defined(TEST) || defined(INFO)
+    *logofs << "handleRead: WARNING! Requesting flush "
+            << "because of " << priority_ << " prioritized "
+            << "messages for FD#" << fd_ << ".\n"
+            << logofs_flush;
+    #endif
+
+    if (proxy -> handleAsyncPriority() < 0)
+    {
+      return -1;
+    }
+
+    //
+    // Reset the priority flag.
+    //
+
+    priority_ = 0;
+  }
+
+  //
+  // Flush if we produced enough data.
+  //
+
+  if (proxy -> canAsyncFlush() == 1)
+  {
+    #if defined(TEST) || defined(INFO)
+    *logofs << "handleRead: WARNING! Requesting flush "
+            << "because of enough data or timeout on the "
+            << "proxy link.\n" << logofs_flush;
+    #endif
+
+    if (proxy -> handleAsyncFlush() < 0)
+    {
+      return -1;
+    }
+  }
+
+  #if defined(TEST) || defined(INFO)
+
+  if (transport_ -> pending() != 0 ||
+          readBuffer_.checkMessage() != 0)
+  {
+    *logofs << "handleRead: PANIC! Buffer for X descriptor FD#"
+            << fd_ << " has " << transport_ -> pending()
+            << " bytes to read.\n" << logofs_flush;
+
+    HandleCleanup();
+  }
+
+  #endif
+
+  //
+  // Reset the read buffer.
+  //
+
+  readBuffer_.fullReset();
+
+  return 1;
+}
+
+//
+// End of handleRead().
+//
+
+//
+// Beginning of handleWrite().
+//
+
+int GenericChannel::handleWrite(const unsigned char *message, unsigned int length)
+{
+  #ifdef TEST
+  *logofs << "handleWrite: Called for FD#" << fd_ << ".\n" << logofs_flush;
+  #endif
+
+  //
+  // Create the buffer from which to 
+  // decode messages.
+  //
+
+  DecodeBuffer decodeBuffer(message, length);
+
+  #if defined(TEST) || defined(INFO) || defined(FLUSH)
+  *logofs << "handleWrite: Decoding messages for FD#" << fd_
+          << " with " << length << " bytes in the buffer.\n"
+          << logofs_flush;
+  #endif
+
+  unsigned char *outputMessage;
+  unsigned int outputLength;
+
+  //
+  // Tag message as generic data
+  // in decompression.
+  //
+
+  unsigned char outputOpcode = X_NXInternalGenericData;
+
+  for (;;)
+  {
+    decodeBuffer.decodeValue(outputLength, 32, 14);
+
+    if (outputLength == 0)
+    {
+      break;
+    }
+
+    if (isCompressed() == 1)
+    {
+      if (writeBuffer_.getAvailable() < outputLength ||
+              (int) outputLength >= control -> TransportFlushBufferSize)
+      {
+        #ifdef DEBUG
+        *logofs << "handleWrite: Using scratch buffer for "
+                << "generic data with size " << outputLength << " and "
+                << writeBuffer_.getLength() << " bytes in buffer.\n"
+                << logofs_flush;
+        #endif
+
+        outputMessage = writeBuffer_.addScratchMessage(outputLength);
+      }
+      else
+      {
+        outputMessage = writeBuffer_.addMessage(outputLength);
+      }
+
+      const unsigned char *compressedData = NULL;
+      unsigned int compressedDataSize = 0;
+
+      int decompressed = handleDecompress(decodeBuffer, outputOpcode, 0,
+                                              outputMessage, outputLength, compressedData,
+                                                  compressedDataSize);
+      if (decompressed < 0)
+      {
+        return -1;
+      }
+    }
+    else
+    {
+      #ifdef DEBUG
+      *logofs << "handleWrite: Using scratch buffer for "
+              << "generic data with size " << outputLength << " and "
+              << writeBuffer_.getLength() << " bytes in buffer.\n"
+              << logofs_flush;
+      #endif
+
+      writeBuffer_.addScratchMessage((unsigned char *)
+                       decodeBuffer.decodeMemory(outputLength), outputLength);
+    }
+
+    #if defined(TEST) || defined(OPCODES)
+    *logofs << "handleWrite: Handled generic data for FD#" << fd_
+            << ". "  << outputLength << " bytes out.\n"
+            << logofs_flush;
+    #endif
+
+    handleFlush(flush_if_needed);
+  }
+
+  //
+  // Write any remaining data to socket.
+  //
+
+  if (handleFlush(flush_if_any) < 0)
+  {
+    return -1;
+  }
+
+  return 1;
+}
+
+//
+// End of handleWrite().
+//
+
+//
+// Other members.
+//
+
+int GenericChannel::handleCompletion(EncodeBuffer &encodeBuffer)
+{
+  //
+  // Add the bits telling to the remote
+  // that all data in the frame has been
+  // encoded.
+  //
+
+  if (encodeBuffer.getLength() > 0)
+  {
+    #if defined(TEST) || defined(INFO)
+    *logofs << "handleCompletion: Writing completion bits with "
+            << encodeBuffer.getLength() << " bytes encoded "
+            << "for FD#" << fd_ << ".\n" << logofs_flush;
+    #endif
+
+    encodeBuffer.encodeValue(0, 32, 14);
+
+    return 1;
+  }
+  #if defined(TEST) || defined(INFO)
+  else
+  {
+    *logofs << "handleCompletion: PANIC! No completion to write "
+            << "for FD#" << fd_ << ".\n" << logofs_flush;
+
+    HandleCleanup();
+  }
+  #endif
+
+  return 0;
+}
+
+int GenericChannel::handleConfiguration()
+{
+  #ifdef TEST
+  *logofs << "GenericChannel: Setting new buffer parameters.\n"
+          << logofs_flush;
+  #endif
+
+  readBuffer_.setSize(control -> GenericInitialReadSize,
+                          control -> GenericMaximumBufferSize);
+
+  writeBuffer_.setSize(control -> TransportGenericBufferSize,
+                           control -> TransportGenericBufferThreshold,
+                               control -> TransportMaximumBufferSize);
+
+  transport_ -> setSize(control -> TransportGenericBufferSize,
+                            control -> TransportGenericBufferThreshold,
+                                control -> TransportMaximumBufferSize);
+
+  return 1;
+}
+
+int GenericChannel::handleFinish()
+{
+  #ifdef TEST
+  *logofs << "GenericChannel: Finishing channel for FD#"
+          << fd_ << ".\n" << logofs_flush;
+  #endif
+
+  congestion_ = 0;
+  priority_   = 0;
+
+  finish_ = 1;
+
+  transport_ -> fullReset();
+
+  return 1;
+}
+
+int GenericChannel::setReferences()
+{
+  #ifdef TEST
+  *logofs << "GenericChannel: Initializing the static "
+          << "members for the generic channels.\n"
+          << logofs_flush;
+  #endif
+
+  #ifdef REFERENCES
+
+  references_ = 0;
+
+  #endif
+
+  return 1;
+}
diff --git a/nxcomp/src/GenericChannel.h b/nxcomp/src/GenericChannel.h
new file mode 100644
index 000000000..3df18f444
--- /dev/null
+++ b/nxcomp/src/GenericChannel.h
@@ -0,0 +1,440 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef GenericChannel_H
+#define GenericChannel_H
+
+#include "Channel.h"
+
+#include "Statistics.h"
+
+#include "GenericReadBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#undef  TEST
+#undef  DEBUG
+
+//
+// Define this to log a line when a channel
+// is created or destroyed.
+//
+
+#undef  REFERENCES
+
+//
+// This class implements the client
+// side compression of X protocol.
+//
+
+class GenericChannel : public Channel
+{
+  public:
+
+  GenericChannel(Transport *transport, StaticCompressor *compressor);
+
+  virtual ~GenericChannel();
+
+  virtual int handleRead(EncodeBuffer &encodeBuffer, const unsigned char *message,
+                             unsigned int length);
+
+  virtual int handleWrite(const unsigned char *message, unsigned int length);
+
+
+  virtual int handleSplit(EncodeBuffer &encodeBuffer, MessageStore *store,
+                              T_store_action action, int position, const unsigned char opcode,
+                                  const unsigned char *buffer, const unsigned int size)
+  {
+    return 0;
+  }
+
+  virtual int handleSplit(DecodeBuffer &decodeBuffer, MessageStore *store,
+                              T_store_action action, int position, unsigned char &opcode,
+                                  unsigned char *&buffer, unsigned int &size)
+  {
+    return 0;
+  }
+
+
+  virtual int handleSplit(EncodeBuffer &encodeBuffer)
+  {
+    return 0;
+  }
+
+  virtual int handleSplit(DecodeBuffer &decodeBuffer)
+  {
+    return 0;
+  }
+
+  virtual int handleSplitEvent(EncodeBuffer &encodeBuffer, Split *split)
+  {
+    return 0;
+  }
+
+  virtual int handleSplitEvent(DecodeBuffer &decodeBuffer)
+  {
+    return 0;
+  }
+
+  virtual int handleMotion(EncodeBuffer &encodeBuffer)
+  {
+    return 0;
+  }
+
+  virtual int handleCompletion(EncodeBuffer &encodeBuffer);
+
+  virtual int handleConfiguration();
+
+  virtual int handleFinish();
+
+  virtual int handleAsyncEvents()
+  {
+    return 0;
+  }
+
+  virtual int needSplit() const
+  {
+    return 0;
+  }
+
+  virtual int needMotion() const
+  {
+    return 0;
+  }
+
+  virtual T_channel_type getType() const = 0;
+
+  //
+  // Initialize the static members.
+  //
+
+  static int setReferences();
+
+  protected:
+
+  //
+  // Generic channels are considered to be
+  // in congestion state as soon as the
+  // socket is blocked for write.
+  //
+
+  virtual int isCongested()
+  {
+    return (transport_ -> blocked() == 1);
+  }
+
+  virtual int isReliable()
+  {
+    return 0;
+  }
+
+  //
+  // Model generic channels' encoding and
+  // decoding policy.
+  //
+
+  virtual int isCompressed() = 0;
+
+  //
+  // Return true if the channel contains
+  // time sensitive data.
+  //
+
+  virtual int isPrioritized() = 0;
+
+  //
+  // Record the protocol bits for the
+  // specific service.
+  //
+
+  virtual void addProtocolBits(unsigned int bitsIn, unsigned int bitsOut) = 0;
+
+  //
+  // Channel's own read buffer.
+  //
+
+  GenericReadBuffer readBuffer_;
+
+  private:
+
+  //
+  // Keep track of object's creation
+  // and deletion.
+  //
+
+  #ifdef REFERENCES
+
+  static int references_;
+
+  #endif
+};
+
+class CupsChannel : public GenericChannel
+{
+  public:
+
+  CupsChannel(Transport *transport, StaticCompressor *compressor)
+
+    : GenericChannel(transport, compressor)
+  {
+  }
+
+  virtual ~CupsChannel()
+  {
+  }
+
+  protected:
+
+  virtual T_channel_type getType() const
+  {
+    return channel_cups;
+  }
+
+  virtual int isCompressed()
+  {
+    // Since ProtoStep8 (#issue 108)
+    return 0;
+  }
+
+  virtual int isPrioritized()
+  {
+    return 0;
+  }
+
+  virtual void addProtocolBits(unsigned int bitsIn,
+                                   unsigned int bitsOut)
+  {
+    statistics -> addCupsBits(bitsIn, bitsOut);
+  }
+};
+
+class SmbChannel : public GenericChannel
+{
+  public:
+
+  SmbChannel(Transport *transport, StaticCompressor *compressor)
+
+    : GenericChannel(transport, compressor)
+  {
+  }
+
+  virtual ~SmbChannel()
+  {
+  }
+
+  protected:
+
+  virtual T_channel_type getType() const
+  {
+    return channel_smb;
+  }
+
+  virtual int isCompressed()
+  {
+    // Since ProtoStep8 (#issue 108)
+    return 0;
+  }
+
+  virtual int isPrioritized()
+  {
+    return 0;
+  }
+
+  virtual void addProtocolBits(unsigned int bitsIn,
+                                   unsigned int bitsOut)
+  {
+    statistics -> addSmbBits(bitsIn, bitsOut);
+  }
+};
+
+class MediaChannel : public GenericChannel
+{
+  public:
+
+  MediaChannel(Transport *transport, StaticCompressor *compressor)
+
+    : GenericChannel(transport, compressor)
+  {
+  }
+
+  virtual ~MediaChannel()
+  {
+  }
+
+  protected:
+
+  virtual T_channel_type getType() const
+  {
+    return channel_media;
+  }
+
+  //
+  // Don't try to compress the media data.
+  //
+
+  virtual int isCompressed()
+  {
+    return 0;
+  }
+
+  //
+  // Reduce the latency of media channels
+  // by setting them as prioritized, even
+  // if this will take away bandwidth from
+  // the X channels.
+  //
+
+  virtual int isPrioritized()
+  {
+    return 1;
+  }
+
+  virtual void addProtocolBits(unsigned int bitsIn,
+                                   unsigned int bitsOut)
+  {
+    statistics -> addMediaBits(bitsIn, bitsOut);
+  }
+};
+
+class HttpChannel : public GenericChannel
+{
+  public:
+
+  HttpChannel(Transport *transport, StaticCompressor *compressor)
+
+    : GenericChannel(transport, compressor)
+  {
+  }
+
+  virtual ~HttpChannel()
+  {
+  }
+
+  protected:
+
+  virtual T_channel_type getType() const
+  {
+    return channel_http;
+  }
+
+  virtual int isCompressed()
+  {
+    // Since ProtoStep8 (#issue 108)
+    return 0;
+  }
+
+  virtual int isPrioritized()
+  {
+    return 0;
+  }
+
+  virtual void addProtocolBits(unsigned int bitsIn,
+                                   unsigned int bitsOut)
+  {
+    statistics -> addHttpBits(bitsIn, bitsOut);
+  }
+};
+
+class FontChannel : public GenericChannel
+{
+  public:
+
+  FontChannel(Transport *transport, StaticCompressor *compressor)
+
+    : GenericChannel(transport, compressor)
+  {
+  }
+
+  virtual ~FontChannel()
+  {
+  }
+
+  protected:
+
+  virtual T_channel_type getType() const
+  {
+    return channel_font;
+  }
+
+  virtual int isCompressed()
+  {
+    // Since ProtoStep8 (#issue 108)
+    return 0;
+  }
+
+  virtual int isPrioritized()
+  {
+    return 1;
+  }
+
+  virtual void addProtocolBits(unsigned int bitsIn,
+                                   unsigned int bitsOut)
+  {
+    statistics -> addFontBits(bitsIn, bitsOut);
+  }
+};
+
+class SlaveChannel : public GenericChannel
+{
+  public:
+
+  SlaveChannel(Transport *transport, StaticCompressor *compressor)
+
+    : GenericChannel(transport, compressor)
+  {
+  }
+
+  virtual ~SlaveChannel()
+  {
+  }
+
+  protected:
+
+  virtual T_channel_type getType() const
+  {
+    return channel_slave;
+  }
+
+  virtual int isCompressed()
+  {
+    return 0;
+  }
+
+  virtual int isPrioritized()
+  {
+    return 0;
+  }
+
+  virtual void addProtocolBits(unsigned int bitsIn,
+                                   unsigned int bitsOut)
+  {
+    statistics -> addSlaveBits(bitsIn, bitsOut);
+  }
+};
+
+#endif /* GenericChannel_H */
diff --git a/nxcomp/src/GenericReadBuffer.cpp b/nxcomp/src/GenericReadBuffer.cpp
new file mode 100644
index 000000000..78217157e
--- /dev/null
+++ b/nxcomp/src/GenericReadBuffer.cpp
@@ -0,0 +1,82 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "GenericReadBuffer.h"
+
+#include "GenericChannel.h"
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+unsigned int GenericReadBuffer::suggestedLength(unsigned int pendingLength)
+{
+  //
+  // Always read the initial read size.
+  //
+
+  return 0;
+}  
+
+int GenericReadBuffer::locateMessage(const unsigned char *start,
+                                         const unsigned char *end,
+                                             unsigned int &controlLength,
+                                                 unsigned int &dataLength,
+                                                     unsigned int &trailerLength)
+{
+  //
+  // We don't care about the endianess
+  // in generic channels.
+  //
+
+  unsigned int size = end - start;
+
+  #ifdef TEST
+  *logofs << "GenericReadBuffer: Locating message for FD#"
+          << transport_ -> fd() << " with " << size
+          << " bytes.\n" << logofs_flush;
+  #endif
+
+  if (size == 0)
+  {
+    remaining_ = 1;
+
+    return 0;
+  }
+
+  dataLength = size;
+
+  controlLength = 0;
+  trailerLength = 0;
+
+  remaining_ = 0;
+
+  return 1;
+}
diff --git a/nxcomp/src/GenericReadBuffer.h b/nxcomp/src/GenericReadBuffer.h
new file mode 100644
index 000000000..5ea4d939d
--- /dev/null
+++ b/nxcomp/src/GenericReadBuffer.h
@@ -0,0 +1,61 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef GenericReadBuffer_H
+#define GenericReadBuffer_H
+
+#include "ReadBuffer.h"
+#include "Control.h"
+
+class GenericChannel;
+
+class GenericReadBuffer : public ReadBuffer
+{
+  public:
+
+  GenericReadBuffer(Transport *transport, GenericChannel *channel)
+
+    : ReadBuffer(transport), channel_(channel)
+  {
+  }
+
+  virtual ~GenericReadBuffer()
+  {
+  }
+
+  protected:
+
+  virtual unsigned int suggestedLength(unsigned int pendingLength);
+
+  virtual int locateMessage(const unsigned char *start,
+                                const unsigned char *end,
+                                    unsigned int &controlLength,
+                                        unsigned int &dataLength,
+                                            unsigned int &trailerLength);
+
+  GenericChannel *channel_;
+};
+
+#endif /* GenericReadBuffer_H */
diff --git a/nxcomp/src/GenericReply.cpp b/nxcomp/src/GenericReply.cpp
new file mode 100644
index 000000000..b56e579e8
--- /dev/null
+++ b/nxcomp/src/GenericReply.cpp
@@ -0,0 +1,302 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "GenericReply.h"
+
+#include "ServerCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+#include "WriteBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Constructors and destructors.
+//
+
+GenericReplyStore::GenericReplyStore(StaticCompressor *compressor)
+
+  : MessageStore(compressor)
+{
+  enableCache    = GENERICREPLY_ENABLE_CACHE;
+  enableData     = GENERICREPLY_ENABLE_DATA;
+  enableSplit    = GENERICREPLY_ENABLE_SPLIT;
+
+  // Since ProtoStep7 (#issue 108)
+  enableCompress = GENERICREPLY_ENABLE_COMPRESS_IF_PROTO_STEP_7;
+
+  dataLimit  = GENERICREPLY_DATA_LIMIT;
+  dataOffset = GENERICREPLY_DATA_OFFSET;
+
+  cacheSlots          = GENERICREPLY_CACHE_SLOTS;
+  cacheThreshold      = GENERICREPLY_CACHE_THRESHOLD;
+  cacheLowerThreshold = GENERICREPLY_CACHE_LOWER_THRESHOLD;
+
+  messages_ -> resize(cacheSlots);
+
+  for (T_messages::iterator i = messages_ -> begin();
+           i < messages_ -> end(); i++)
+  {
+    *i = NULL;
+  }
+
+  temporary_ = NULL;
+}
+
+GenericReplyStore::~GenericReplyStore()
+{
+  for (T_messages::iterator i = messages_ -> begin();
+           i < messages_ -> end(); i++)
+  {
+    destroy(*i);
+  }
+
+  destroy(temporary_);
+}
+
+//
+// Here are the methods to handle messages' content.
+//
+
+int GenericReplyStore::encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                                          const unsigned int size, int bigEndian,
+                                              ChannelCache *channelCache) const
+{
+  ServerCache *serverCache = (ServerCache *) channelCache;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Encoding full message identity.\n"
+          << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeValue(GetULONG(buffer + 4, bigEndian), 32, 15);
+
+  encodeBuffer.encodeCachedValue(*(buffer + 1), 8,
+                     serverCache -> genericReplyCharCache);
+
+  for (unsigned int i = 0; i < 6; i++)
+  {
+    encodeBuffer.encodeCachedValue(GetULONG(buffer + i * 4 + 8, bigEndian), 32,
+                 *serverCache -> genericReplyIntCache[i]);
+  }
+
+  #ifdef DEBUG
+  *logofs << name() << ": Encoded full message identity.\n"
+          << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int GenericReplyStore::decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
+                                          unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
+                                              ChannelCache *channelCache) const
+{
+  ServerCache *serverCache = (ServerCache *) channelCache;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoding full message identity.\n"
+          << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeValue(size, 32, 15);
+
+  size = 32 + (size << 2);
+
+  buffer = writeBuffer -> addMessage(size);
+
+  decodeBuffer.decodeCachedValue(*(buffer + 1), 8,
+                     serverCache -> genericReplyCharCache);
+
+  unsigned int value;
+
+  for (unsigned int i = 0; i < 6; i++)
+  {
+    decodeBuffer.decodeCachedValue(value, 32,
+                       *serverCache -> genericReplyIntCache[i]);
+
+    PutULONG(value, buffer + i * 4 + 8, bigEndian);
+  }
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded full message identity.\n"
+          << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int GenericReplyStore::parseIdentity(Message *message, const unsigned char *buffer,
+                                          unsigned int size, int bigEndian) const
+{
+  GenericReplyMessage *genericReply = (GenericReplyMessage *) message;
+
+  genericReply -> byte_data = *(buffer + 1);
+
+  for (int i = 0; i < 12; i++)
+  {
+    genericReply -> short_data[i] = GetUINT(buffer + i * 2 + 8, bigEndian);
+  }
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsed identity for message at "
+          << message << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int GenericReplyStore::unparseIdentity(const Message *message, unsigned char *buffer,
+                                            unsigned int size, int bigEndian) const
+{
+  GenericReplyMessage *genericReply = (GenericReplyMessage *) message;
+
+  *(buffer + 1) = genericReply -> byte_data;
+
+  for (int i = 0; i < 12; i++)
+  {
+    PutUINT(genericReply -> short_data[i], buffer + i * 2 + 8, bigEndian);
+  }
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsed identity for message at "
+          << message << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void GenericReplyStore::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  GenericReplyMessage *genericReply = (GenericReplyMessage *) message;
+
+  *logofs << name() << ": Identity byte_data "
+          << (unsigned) genericReply -> byte_data;
+
+  for (int i = 0; i < 12; i++)
+  {
+    *logofs << ", short_data[" << i << "]"
+            << (unsigned) genericReply -> short_data[i];
+  }
+
+  *logofs << ", size " << genericReply -> size_ << ".\n";
+
+  #endif
+}
+
+void GenericReplyStore::identityChecksum(const Message *message, const unsigned char *buffer,
+                                              unsigned int size, int bigEndian) const
+{
+}
+
+void GenericReplyStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                            const Message *cachedMessage,
+                                                ChannelCache *channelCache) const
+{
+  //
+  // Encode the variant part.
+  //
+
+  GenericReplyMessage *genericReply       = (GenericReplyMessage *) message;
+  GenericReplyMessage *cachedGenericReply = (GenericReplyMessage *) cachedMessage;
+
+  ServerCache *serverCache = (ServerCache *) channelCache;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value "
+          << (unsigned int) genericReply -> byte_data
+          << " as byte_data field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeCachedValue(genericReply -> byte_data, 8,
+                     serverCache -> genericReplyCharCache);
+
+  cachedGenericReply -> byte_data = genericReply -> byte_data;
+
+  for (unsigned int i = 0; i < 12; i++)
+  {
+    #ifdef TEST
+    *logofs << name() << ": Encoding value " << genericReply -> short_data[i]
+            << " as short_data[" << i << "] field.\n" << logofs_flush;
+    #endif
+
+    encodeBuffer.encodeCachedValue(genericReply -> short_data[i], 16,
+                       *serverCache -> genericReplyIntCache[i]);
+
+    cachedGenericReply -> short_data[i] = genericReply -> short_data[i];
+  }
+}
+
+void GenericReplyStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                            ChannelCache *channelCache) const
+{
+  //
+  // Decode the variant part.
+  //
+
+  GenericReplyMessage *genericReply = (GenericReplyMessage *) message;
+
+  ServerCache *serverCache = (ServerCache *) channelCache;
+
+  decodeBuffer.decodeCachedValue(genericReply -> byte_data, 8,
+               serverCache -> genericReplyCharCache);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded value "
+          << (unsigned int) genericReply -> byte_data
+          << " as byte_data field.\n" << logofs_flush;
+  #endif
+
+  unsigned int value;
+
+  for (unsigned int i = 0; i < 12; i++)
+  {
+    decodeBuffer.decodeCachedValue(value, 16,
+                 *serverCache -> genericReplyIntCache[i]);
+
+    genericReply -> short_data[i] = (unsigned short) value;
+
+    #ifdef TEST
+    *logofs << name() << ": Decoded value " << genericReply -> short_data[i]
+            << " as short_data[" << i << "] field.\n" << logofs_flush;
+    #endif
+  }
+}
diff --git a/nxcomp/src/GenericReply.h b/nxcomp/src/GenericReply.h
new file mode 100644
index 000000000..e899b8467
--- /dev/null
+++ b/nxcomp/src/GenericReply.h
@@ -0,0 +1,161 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef GenericReply_H
+#define GenericReply_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+
+#define GENERICREPLY_ENABLE_CACHE                       1
+#define GENERICREPLY_ENABLE_DATA                        1
+#define GENERICREPLY_ENABLE_SPLIT                       0
+
+#define GENERICREPLY_DATA_LIMIT                         1048576 - 32
+#define GENERICREPLY_DATA_OFFSET                        32
+
+#define GENERICREPLY_CACHE_SLOTS                        400
+#define GENERICREPLY_CACHE_THRESHOLD                    5
+#define GENERICREPLY_CACHE_LOWER_THRESHOLD              1
+
+#define GENERICREPLY_ENABLE_COMPRESS_IF_PROTO_STEP_7    0
+
+//
+// The message class.
+//
+
+class GenericReplyMessage : public Message
+{
+  friend class GenericReplyStore;
+
+  public:
+
+  GenericReplyMessage()
+  {
+  }
+
+  ~GenericReplyMessage()
+  {
+  }
+
+  //
+  // Put here the fields which constitute the
+  // 'identity' part of the message. Starting
+  // from protocol level 3 we use short data
+  // to increase cache efficiency.
+  //
+
+  private:
+
+  unsigned char  byte_data;
+  unsigned int   int_data[6];
+  unsigned short short_data[12];
+};
+
+class GenericReplyStore : public MessageStore
+{
+  public:
+
+  GenericReplyStore(StaticCompressor *compressor);
+
+  virtual ~GenericReplyStore();
+
+  virtual const char *name() const
+  {
+    return "GenericReply";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return X_NXInternalGenericReply;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(GenericReplyMessage);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  protected:
+
+  virtual Message *create() const
+  {
+    return new GenericReplyMessage();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new GenericReplyMessage((const GenericReplyMessage &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (GenericReplyMessage *) message;
+  }
+
+  virtual int encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                                 const unsigned int size, int bigEndian,
+                                     ChannelCache *channelCache) const;
+
+  virtual int decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
+                                 unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
+                                     ChannelCache *channelCache) const;
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer, 
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer, 
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                  const Message *cachedMessage,
+                                      ChannelCache *channelCache) const;
+
+  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                  ChannelCache *channelCache) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer, 
+                                    unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+};
+
+#endif /* GenericReply_H */
diff --git a/nxcomp/src/GenericRequest.cpp b/nxcomp/src/GenericRequest.cpp
new file mode 100644
index 000000000..c569d6a24
--- /dev/null
+++ b/nxcomp/src/GenericRequest.cpp
@@ -0,0 +1,334 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "GenericRequest.h"
+
+#include "ClientCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+#include "WriteBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Constructors and destructors.
+//
+
+GenericRequestStore::GenericRequestStore(StaticCompressor *compressor)
+
+  : MessageStore(compressor)
+{
+  enableCache    = GENERICREQUEST_ENABLE_CACHE;
+  enableData     = GENERICREQUEST_ENABLE_DATA;
+  enableSplit    = GENERICREQUEST_ENABLE_SPLIT;
+
+  // Since ProtoStep7 (#issue 108)
+  enableCompress = GENERICREQUEST_ENABLE_COMPRESS_IF_PROTO_STEP_7;
+
+  dataLimit  = GENERICREQUEST_DATA_LIMIT;
+  dataOffset = GENERICREQUEST_DATA_OFFSET;
+
+  cacheSlots          = GENERICREQUEST_CACHE_SLOTS;
+  cacheThreshold      = GENERICREQUEST_CACHE_THRESHOLD;
+  cacheLowerThreshold = GENERICREQUEST_CACHE_LOWER_THRESHOLD;
+
+  messages_ -> resize(cacheSlots);
+
+  for (T_messages::iterator i = messages_ -> begin();
+           i < messages_ -> end(); i++)
+  {
+    *i = NULL;
+  }
+
+  temporary_ = NULL;
+}
+
+GenericRequestStore::~GenericRequestStore()
+{
+  for (T_messages::iterator i = messages_ -> begin();
+           i < messages_ -> end(); i++)
+  {
+    destroy(*i);
+  }
+
+  destroy(temporary_);
+}
+
+//
+// Here are the methods to handle messages' content.
+//
+
+int GenericRequestStore::encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                                            const unsigned int size, int bigEndian,
+                                                ChannelCache *channelCache) const
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Encoding full message identity.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeValue(size >> 2, 16, 10);
+
+  encodeBuffer.encodeCachedValue(*(buffer + 1), 8,
+                     clientCache -> genericRequestOpcodeCache);
+
+  for (unsigned int i = 0; i < 8 && (i * 2 + 4) < size; i++)
+  {
+    #ifdef DEBUG
+    *logofs << name() << ": Encoding data[" << i << "] "
+            << "at position " << i * 2 + 4  << " with value "
+            << GetUINT(buffer + (i * 2) + 4, bigEndian)
+            << ".\n" << logofs_flush;
+    #endif
+
+    encodeBuffer.encodeCachedValue(GetUINT(buffer + (i * 2) + 4, bigEndian), 16,
+                       *clientCache -> genericRequestDataCache[i]);
+  }
+
+  #ifdef DEBUG
+  *logofs << name() << ": Encoded full message identity.\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int GenericRequestStore::decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
+                                            unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
+                                                ChannelCache *channelCache) const
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoding full message identity.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeValue(size, 16, 10);
+
+  size <<= 2;
+
+  buffer = writeBuffer -> addMessage(size);
+
+  decodeBuffer.decodeCachedValue(*(buffer + 1), 8,
+                     clientCache -> genericRequestOpcodeCache);
+
+  unsigned int value;
+
+  for (unsigned int i = 0; i < 8 && (i * 2 + 4) < size; i++)
+  {
+    decodeBuffer.decodeCachedValue(value, 16,
+                       *clientCache -> genericRequestDataCache[i]);
+
+    #ifdef DEBUG
+    *logofs << name() << ": Decoding data[" << i << "] "
+            << "at position " << i * 2 + 4  << " with value "
+            << value << ".\n" << logofs_flush;
+    #endif
+
+    PutUINT(value, buffer + 4 + (i * 2), bigEndian);
+  }
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded full message identity.\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int GenericRequestStore::parseIdentity(Message *message, const unsigned char *buffer,
+                                           unsigned int size, int bigEndian) const
+{
+  GenericRequestMessage *genericRequest = (GenericRequestMessage *) message;
+
+  genericRequest -> opcode = *(buffer + 1);
+
+  for (unsigned int i = 0; i < 8; i++)
+  {
+    if ((i * 2 + 4) < size)
+    {
+      genericRequest -> data[i] = GetUINT(buffer + i * 2 + 4, bigEndian); 
+
+      #ifdef DEBUG
+      *logofs << name() << ": Parsed data[" << i << "] "
+              << "with value " << genericRequest -> data[i]
+              << ".\n" << logofs_flush;
+      #endif
+    }
+    else
+    {
+      genericRequest -> data[i] = 0;
+    }
+  }
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsed identity for message at "
+          << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int GenericRequestStore::unparseIdentity(const Message *message, unsigned char *buffer,
+                                             unsigned int size, int bigEndian) const
+{
+  GenericRequestMessage *genericRequest = (GenericRequestMessage *) message;
+
+  *(buffer + 1) = genericRequest -> opcode;
+
+  for (unsigned int i = 0; i < 8 && (i * 2 + 4) < size; i++)
+  {
+    #ifdef DEBUG
+    *logofs << name() << ": Unparsed data[" << i << "] "
+            << "with value " << genericRequest -> data[i]
+            << ".\n" << logofs_flush;
+    #endif
+
+    PutUINT(genericRequest -> data[i], buffer + i * 2 + 4, bigEndian);
+  }
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsed identity for message at "
+          << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void GenericRequestStore::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  GenericRequestMessage *genericRequest = (GenericRequestMessage *) message;
+
+  *logofs << name() << ": Identity opcode " << (unsigned) genericRequest -> opcode;
+
+  for (int i = 0; i < 8; i++)
+  {
+    *logofs << ", data[" << i << "] " << genericRequest -> data[i];
+  }
+
+  *logofs << ", size " << genericRequest -> size_ << ".\n" << logofs_flush;
+
+  #endif
+}
+
+void GenericRequestStore::identityChecksum(const Message *message, const unsigned char *buffer,
+                                               unsigned int size, int bigEndian) const
+{
+  //
+  // As data offset can be beyond the real end of
+  // the message, we need to include the message's
+  // size or we will match any message whose size
+  // is less or equal to the data offset.
+  //
+
+  md5_append(md5_state_, buffer + 2,  2);
+}
+
+void GenericRequestStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                             const Message *cachedMessage,
+                                                 ChannelCache *channelCache) const
+{
+  //
+  // Encode the variant part.
+  //
+
+  GenericRequestMessage *genericRequest       = (GenericRequestMessage *) message;
+  GenericRequestMessage *cachedGenericRequest = (GenericRequestMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef TEST
+  *logofs << name() << ": Updating value "
+          << (unsigned) genericRequest -> opcode
+          << " as opcode field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeCachedValue((unsigned int) genericRequest -> opcode, 8,
+                     clientCache -> genericRequestOpcodeCache);
+
+  cachedGenericRequest -> opcode = genericRequest -> opcode;
+
+  for (int i = 0; i < 8 && (i * 2 + 4) < genericRequest -> size_; i++)
+  {
+    #ifdef TEST
+    *logofs << name() << ": Updating data[" << i << "] "
+            << "with value " << genericRequest -> data[i]
+            << ".\n" << logofs_flush;
+    #endif
+
+    encodeBuffer.encodeCachedValue((unsigned int) genericRequest -> data[i], 16,
+                 *clientCache -> genericRequestDataCache[i]);
+
+    cachedGenericRequest -> data[i] = genericRequest -> data[i];
+  }
+}
+
+void GenericRequestStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                             ChannelCache *channelCache) const
+{
+  GenericRequestMessage *genericRequest = (GenericRequestMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  decodeBuffer.decodeCachedValue(genericRequest -> opcode, 8,
+                     clientCache -> genericRequestOpcodeCache);
+
+  #ifdef TEST
+  *logofs << name() << ": Updated value "
+          << (unsigned) genericRequest -> opcode
+          << " as opcode field.\n" << logofs_flush;
+  #endif
+
+  unsigned int value;
+
+  for (int i = 0; i < 8 && (i * 2 + 4) < genericRequest -> size_; i++)
+  {
+    decodeBuffer.decodeCachedValue(value, 16,
+                 *clientCache -> genericRequestDataCache[i]);
+
+    genericRequest -> data[i] = (unsigned short) value;
+
+    #ifdef TEST
+    *logofs << name() << ": Updated data[" << i << "] "
+            << "with value " << genericRequest -> data[i]
+            << ".\n" << logofs_flush;
+    #endif
+  }
+}
diff --git a/nxcomp/src/GenericRequest.h b/nxcomp/src/GenericRequest.h
new file mode 100644
index 000000000..13ffea718
--- /dev/null
+++ b/nxcomp/src/GenericRequest.h
@@ -0,0 +1,160 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef GenericRequest_H
+#define GenericRequest_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+
+#define GENERICREQUEST_ENABLE_CACHE                      1
+#define GENERICREQUEST_ENABLE_DATA                       1
+#define GENERICREQUEST_ENABLE_SPLIT                      0
+
+#define GENERICREQUEST_DATA_LIMIT                        262144 - 20
+#define GENERICREQUEST_DATA_OFFSET                       20
+
+#define GENERICREQUEST_CACHE_SLOTS                       400
+#define GENERICREQUEST_CACHE_THRESHOLD                   5
+#define GENERICREQUEST_CACHE_LOWER_THRESHOLD             1
+
+#define GENERICREQUEST_ENABLE_COMPRESS_IF_PROTO_STEP_7   0
+
+//
+// The message class.
+//
+
+class GenericRequestMessage : public Message
+{
+  friend class GenericRequestStore;
+
+  public:
+
+  GenericRequestMessage()
+  {
+  }
+
+  ~GenericRequestMessage()
+  {
+  }
+
+  //
+  // Note that we consider for this message a data offset
+  // of 4 (or 20 starting from protocol 3). Bytes from 9
+  // to 20, if present, are taken as part of identity and
+  // encoded through an array of int caches.
+  //
+
+  private:
+
+  unsigned char  opcode;
+  unsigned short data[8];
+};
+
+class GenericRequestStore : public MessageStore
+{
+  public:
+
+  GenericRequestStore(StaticCompressor *compressor);
+
+  virtual ~GenericRequestStore();
+
+  virtual const char *name() const
+  {
+    return "GenericRequest";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return X_NXInternalGenericRequest;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(GenericRequestMessage);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  public:
+
+  virtual Message *create() const
+  {
+    return new GenericRequestMessage();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new GenericRequestMessage((const GenericRequestMessage &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (GenericRequestMessage *) message;
+  }
+
+  virtual int encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                                 const unsigned int size, int bigEndian,
+                                     ChannelCache *channelCache) const;
+
+  virtual int decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
+                                 unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
+                                     ChannelCache *channelCache) const;
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer,
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                  const Message *cachedMessage,
+                                      ChannelCache *channelCache) const;
+
+  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                  ChannelCache *channelCache) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+                                    unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+};
+
+#endif /* GenericRequest_H */
diff --git a/nxcomp/src/GetImage.cpp b/nxcomp/src/GetImage.cpp
new file mode 100644
index 000000000..20b6a07d1
--- /dev/null
+++ b/nxcomp/src/GetImage.cpp
@@ -0,0 +1,177 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "GetImage.h"
+
+#include "ClientCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Here are the methods to handle messages' content.
+//
+
+int GetImageStore::parseIdentity(Message *message, const unsigned char *buffer,
+                                     unsigned int size, int bigEndian) const
+{
+  GetImageMessage *getImage = (GetImageMessage *) message;
+
+  //
+  // Here is the fingerprint.
+  //
+
+  getImage -> format = *(buffer + 1);
+
+  #ifdef TEST
+  if (getImage -> format != 1 && getImage -> format != 2)
+  {
+    *logofs << name() << ": WARNING! Dirty value " << getImage -> format 
+            << " for field format.\n" << logofs_flush;
+  }
+  #endif
+
+  getImage -> drawable = GetULONG(buffer + 4, bigEndian);
+
+  getImage -> x      = GetUINT(buffer + 8, bigEndian);
+  getImage -> y      = GetUINT(buffer + 10, bigEndian);
+  getImage -> width  = GetUINT(buffer + 12, bigEndian);
+  getImage -> height = GetUINT(buffer + 14, bigEndian);
+
+  getImage -> plane_mask = GetULONG(buffer + 16, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsed Identity for message at " << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int GetImageStore::unparseIdentity(const Message *message, unsigned char *buffer,
+                                       unsigned int size, int bigEndian) const
+{
+  GetImageMessage *getImage = (GetImageMessage *) message;
+
+  //
+  // Fill all the message's fields.
+  //
+
+  *(buffer + 1) = getImage -> format;
+
+  PutULONG(getImage -> drawable, buffer + 4,  bigEndian);
+
+  PutUINT(getImage -> x,      buffer + 8,  bigEndian);
+  PutUINT(getImage -> y,      buffer + 10, bigEndian);
+  PutUINT(getImage -> width,  buffer + 12, bigEndian);
+  PutUINT(getImage -> height, buffer + 14, bigEndian);
+
+  PutULONG(getImage -> plane_mask, buffer + 16,  bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsed identity for message at " << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void GetImageStore::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  GetImageMessage *getImage = (GetImageMessage *) message;
+
+  *logofs << name() << ": Identity format " << (unsigned) getImage -> format 
+          << ", drawable " << getImage -> drawable << ", x " << getImage -> x 
+          << ", y " << getImage -> y << ", width " << getImage -> width 
+          << ", height " << getImage -> height << ", plane_mask " 
+          << getImage -> plane_mask << ", size " << getImage -> size_
+          << ".\n" << logofs_flush;
+
+  #endif
+}
+
+void GetImageStore::identityChecksum(const Message *message, const unsigned char *buffer,
+                                         unsigned int size, int bigEndian) const
+{
+  md5_append(md5_state_, buffer + 1,  1);
+  md5_append(md5_state_, buffer + 8,  2);
+  md5_append(md5_state_, buffer + 10, 2);
+  md5_append(md5_state_, buffer + 12, 2);
+  md5_append(md5_state_, buffer + 14, 2);
+  md5_append(md5_state_, buffer + 16, 4);
+}
+
+void GetImageStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                       const Message *cachedMessage,
+                                           ChannelCache *channelCache) const
+{
+  GetImageMessage *getImage       = (GetImageMessage *) message;
+  GetImageMessage *cachedGetImage = (GetImageMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << getImage -> drawable
+          << " as drawable field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeXidValue(getImage -> drawable, clientCache -> drawableCache);
+
+  cachedGetImage -> drawable = getImage -> drawable;
+}
+
+void GetImageStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                       ChannelCache *channelCache) const
+{
+  GetImageMessage *getImage = (GetImageMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  unsigned int value;
+
+  decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
+
+  getImage -> drawable = value;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << getImage -> drawable
+          << " as drawable field.\n" << logofs_flush;
+  #endif
+}
+
diff --git a/nxcomp/src/GetImage.h b/nxcomp/src/GetImage.h
new file mode 100644
index 000000000..1c3558d14
--- /dev/null
+++ b/nxcomp/src/GetImage.h
@@ -0,0 +1,190 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef GetImage_H
+#define GetImage_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+
+#define GETIMAGE_ENABLE_CACHE               1
+#define GETIMAGE_ENABLE_DATA                0
+#define GETIMAGE_ENABLE_SPLIT               0
+#define GETIMAGE_ENABLE_COMPRESS            0
+
+#define GETIMAGE_DATA_LIMIT                 0
+#define GETIMAGE_DATA_OFFSET                20
+
+#define GETIMAGE_CACHE_SLOTS                200
+#define GETIMAGE_CACHE_THRESHOLD            1
+#define GETIMAGE_CACHE_LOWER_THRESHOLD      0
+
+//
+// The message class.
+//
+
+class GetImageMessage : public Message
+{
+  friend class GetImageStore;
+
+  public:
+
+  GetImageMessage()
+  {
+  }
+
+  ~GetImageMessage()
+  {
+  }
+
+  //
+  // Put here the fields which constitute 
+  // the 'identity' part of the message.
+  //
+
+  private:
+
+  unsigned char      format;
+  unsigned int       drawable;
+  unsigned short int x;
+  unsigned short int y;
+  unsigned short int width;
+  unsigned short int height;
+  unsigned int       plane_mask;
+};
+
+class GetImageStore : public MessageStore
+{
+  //
+  // Constructors and destructors.
+  //
+
+  public:
+
+  GetImageStore() : MessageStore()
+  {
+    enableCache    = GETIMAGE_ENABLE_CACHE;
+    enableData     = GETIMAGE_ENABLE_DATA;
+    enableSplit    = GETIMAGE_ENABLE_SPLIT;
+    enableCompress = GETIMAGE_ENABLE_COMPRESS;
+
+    dataLimit  = GETIMAGE_DATA_LIMIT;
+    dataOffset = GETIMAGE_DATA_OFFSET;
+
+    cacheSlots          = GETIMAGE_CACHE_SLOTS;
+    cacheThreshold      = GETIMAGE_CACHE_THRESHOLD;
+    cacheLowerThreshold = GETIMAGE_CACHE_LOWER_THRESHOLD;
+
+    messages_ -> resize(cacheSlots);
+
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      *i = NULL;
+    }
+
+    temporary_ = NULL;
+  }
+
+  virtual ~GetImageStore()
+  {
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      destroy(*i);
+    }
+
+    destroy(temporary_);
+  }
+
+  virtual const char *name() const
+  {
+    return "GetImage";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return X_GetImage;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(GetImageMessage);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  public:
+
+  virtual Message *create() const
+  {
+    return new GetImageMessage();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new GetImageMessage((const GetImageMessage &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (GetImageMessage *) message;
+  }
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer,
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                  const Message *cachedMessage,
+                                      ChannelCache *channelCache) const;
+
+  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                  ChannelCache *channelCache) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+                                    unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+};
+
+#endif /* GetImage_H */
diff --git a/nxcomp/src/GetImageReply.cpp b/nxcomp/src/GetImageReply.cpp
new file mode 100644
index 000000000..5100804ab
--- /dev/null
+++ b/nxcomp/src/GetImageReply.cpp
@@ -0,0 +1,194 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "GetImageReply.h"
+
+#include "ServerCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Constructors and destructors.
+//
+
+GetImageReplyStore::GetImageReplyStore(StaticCompressor *compressor)
+
+  : MessageStore(compressor)
+{
+  enableCache    = GETIMAGEREPLY_ENABLE_CACHE;
+  enableData     = GETIMAGEREPLY_ENABLE_DATA;
+  enableSplit    = GETIMAGEREPLY_ENABLE_SPLIT;
+
+  // Since ProtoStep7 (#issue 108)
+  enableCompress = GETIMAGEREPLY_ENABLE_COMPRESS_IF_PROTO_STEP_7;
+
+  dataLimit  = GETIMAGEREPLY_DATA_LIMIT;
+  dataOffset = GETIMAGEREPLY_DATA_OFFSET;
+
+  cacheSlots          = GETIMAGEREPLY_CACHE_SLOTS;
+  cacheThreshold      = GETIMAGEREPLY_CACHE_THRESHOLD;
+  cacheLowerThreshold = GETIMAGEREPLY_CACHE_LOWER_THRESHOLD;
+
+  messages_ -> resize(cacheSlots);
+
+  for (T_messages::iterator i = messages_ -> begin();
+           i < messages_ -> end(); i++)
+  {
+    *i = NULL;
+  }
+
+  temporary_ = NULL;
+}
+
+GetImageReplyStore::~GetImageReplyStore()
+{
+  for (T_messages::iterator i = messages_ -> begin();
+           i < messages_ -> end(); i++)
+  {
+    destroy(*i);
+  }
+
+  destroy(temporary_);
+}
+
+//
+// Here are the methods to handle messages' content.
+//
+
+int GetImageReplyStore::parseIdentity(Message *message, const unsigned char *buffer,
+                                          unsigned int size, int bigEndian) const
+{
+  GetImageReplyMessage *getImageReply = (GetImageReplyMessage *) message;
+
+  //
+  // Here is the fingerprint.
+  //
+
+  getImageReply -> depth = *(buffer + 1);
+
+  getImageReply -> visual = GetULONG(buffer + 8, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsed identity for message at "
+          << message << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int GetImageReplyStore::unparseIdentity(const Message *message, unsigned char *buffer,
+                                            unsigned int size, int bigEndian) const
+{
+  GetImageReplyMessage *getImageReply = (GetImageReplyMessage *) message;
+
+  //
+  // Fill all the message's fields.
+  //
+
+  *(buffer + 1) = getImageReply -> depth;
+
+  PutULONG(getImageReply -> visual, buffer + 8, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsed identity for message at "
+          << message << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void GetImageReplyStore::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  GetImageReplyMessage *getImageReply = (GetImageReplyMessage *) message;
+
+  *logofs << name() << ": Identity depth " << (unsigned) getImageReply -> depth
+          << ",  visual " << getImageReply -> visual << ", size "
+          << getImageReply -> size_ << ".\n";
+
+  #endif
+}
+
+void GetImageReplyStore::identityChecksum(const Message *message, const unsigned char *buffer,
+                                              unsigned int size, int bigEndian) const
+{
+  //
+  // Field depth.
+  //
+
+  md5_append(md5_state_, buffer + 1,  1);
+}
+
+void GetImageReplyStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                            const Message *cachedMessage,
+                                                ChannelCache *channelCache) const
+{
+  //
+  // Encode the variant part.
+  //
+
+  GetImageReplyMessage *getImageReply = (GetImageReplyMessage *) message;
+
+  ServerCache *serverCache = (ServerCache *) channelCache;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << getImageReply -> visual
+          << " as visual field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeCachedValue(getImageReply -> visual, 29, 
+                     serverCache -> visualCache);
+}
+
+void GetImageReplyStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                            ChannelCache *channelCache) const
+{
+  //
+  // Decode the variant part.
+  //
+
+  GetImageReplyMessage *getImageReply = (GetImageReplyMessage *) message;
+
+  ServerCache *serverCache = (ServerCache *) channelCache;
+
+  decodeBuffer.decodeCachedValue(getImageReply -> visual, 29, 
+                     serverCache -> visualCache);
+}
diff --git a/nxcomp/src/GetImageReply.h b/nxcomp/src/GetImageReply.h
new file mode 100644
index 000000000..d4f7c4267
--- /dev/null
+++ b/nxcomp/src/GetImageReply.h
@@ -0,0 +1,150 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef GetImageReply_H
+#define GetImageReply_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+
+#define GETIMAGEREPLY_ENABLE_CACHE                       1
+#define GETIMAGEREPLY_ENABLE_DATA                        1
+#define GETIMAGEREPLY_ENABLE_SPLIT                       0
+
+#define GETIMAGEREPLY_DATA_LIMIT                         1048576 - 32
+#define GETIMAGEREPLY_DATA_OFFSET                        32
+
+#define GETIMAGEREPLY_CACHE_SLOTS                        1000
+#define GETIMAGEREPLY_CACHE_THRESHOLD                    20
+#define GETIMAGEREPLY_CACHE_LOWER_THRESHOLD              2
+
+#define GETIMAGEREPLY_ENABLE_COMPRESS_IF_PROTO_STEP_7    0
+
+//
+// The message class.
+//
+
+class GetImageReplyMessage : public Message
+{
+  friend class GetImageReplyStore;
+
+  public:
+
+  GetImageReplyMessage()
+  {
+  }
+
+  ~GetImageReplyMessage()
+  {
+  }
+
+  //
+  // Put here the fields which constitute 
+  // the 'identity' part of the message.
+  //
+
+  private:
+
+  unsigned char depth;
+  unsigned int  visual;
+};
+
+class GetImageReplyStore : public MessageStore
+{
+  public:
+
+  GetImageReplyStore(StaticCompressor *compressor);
+
+  virtual ~GetImageReplyStore();
+
+  virtual const char *name() const
+  {
+    return "GetImageReply";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return X_GetImage;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(GetImageReplyMessage);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  protected:
+
+  virtual Message *create() const
+  {
+    return new GetImageReplyMessage();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new GetImageReplyMessage((const GetImageReplyMessage &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (GetImageReplyMessage *) message;
+  }
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer, 
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer, 
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                  const Message *cachedMessage,
+                                      ChannelCache *channelCache) const;
+
+  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                  ChannelCache *channelCache) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer, 
+                                    unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+};
+
+#endif /* GetImageReply_H */
diff --git a/nxcomp/src/GetProperty.cpp b/nxcomp/src/GetProperty.cpp
new file mode 100644
index 000000000..1c5e77ccc
--- /dev/null
+++ b/nxcomp/src/GetProperty.cpp
@@ -0,0 +1,119 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "GetProperty.h"
+
+#include "ClientCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Here are the methods to handle messages' content.
+//
+
+int GetPropertyStore::parseIdentity(Message *message, const unsigned char *buffer,
+                                        unsigned int size, int bigEndian) const
+{
+  GetPropertyMessage *getProperty = (GetPropertyMessage *) message;
+
+  //
+  // Here is the fingerprint.
+  //
+
+  getProperty -> property_delete = *(buffer + 1);
+
+  getProperty -> window          = GetULONG(buffer + 4,  bigEndian);
+  getProperty -> property        = GetULONG(buffer + 8,  bigEndian);
+  getProperty -> type            = GetULONG(buffer + 12, bigEndian);
+  getProperty -> long_offset     = GetULONG(buffer + 16, bigEndian);
+  getProperty -> long_length     = GetULONG(buffer + 20, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsed identity for message at " << message << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int GetPropertyStore::unparseIdentity(const Message *message, unsigned char *buffer,
+                                          unsigned int size, int bigEndian) const
+{
+
+  GetPropertyMessage *getProperty = (GetPropertyMessage *) message;
+
+  //
+  // Fill all the message's fields.
+  //
+
+  *(buffer + 1) = getProperty -> property_delete;
+
+  PutULONG(getProperty -> window,      buffer + 4,  bigEndian);
+  PutULONG(getProperty -> property,    buffer + 8,  bigEndian);
+  PutULONG(getProperty -> type,        buffer + 12, bigEndian);
+  PutULONG(getProperty -> long_offset, buffer + 16, bigEndian);
+  PutULONG(getProperty -> long_length, buffer + 20, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsed identity for message at " << message << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void GetPropertyStore::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  GetPropertyMessage *getProperty = (GetPropertyMessage *) message;
+
+  *logofs << name() << ": Identity property_delete " << (unsigned int) getProperty -> property_delete
+          << ", window " << getProperty -> window << ", property " << getProperty -> property
+          << ", type " << getProperty -> type << ", long-offset " << getProperty -> long_offset
+          << ", long-length " << getProperty -> long_length << ".\n" << logofs_flush;
+
+  #endif
+}
+
+void GetPropertyStore::identityChecksum(const Message *message, const unsigned char *buffer,
+                                            unsigned int size, int bigEndian) const
+{
+  md5_append(md5_state_, buffer + 1, 1);
+  md5_append(md5_state_, buffer + 4, 20);
+}
diff --git a/nxcomp/src/GetProperty.h b/nxcomp/src/GetProperty.h
new file mode 100644
index 000000000..46727280b
--- /dev/null
+++ b/nxcomp/src/GetProperty.h
@@ -0,0 +1,183 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef GetProperty_H
+#define GetProperty_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+
+#define GETPROPERTY_ENABLE_CACHE               1
+#define GETPROPERTY_ENABLE_DATA                0
+#define GETPROPERTY_ENABLE_SPLIT               0
+#define GETPROPERTY_ENABLE_COMPRESS            0
+
+#define GETPROPERTY_DATA_LIMIT                 0
+#define GETPROPERTY_DATA_OFFSET                24
+
+#define GETPROPERTY_CACHE_SLOTS                2000
+#define GETPROPERTY_CACHE_THRESHOLD            2
+#define GETPROPERTY_CACHE_LOWER_THRESHOLD      1
+
+//
+// The message class.
+//
+
+class GetPropertyMessage : public Message
+{
+  friend class GetPropertyStore;
+
+  public:
+
+  GetPropertyMessage()
+  {
+  }
+
+  ~GetPropertyMessage()
+  {
+  }
+
+  //
+  // Put here the fields which constitute 
+  // the 'identity' part of the message.
+  //
+
+  private:
+
+  unsigned char  property_delete;
+  unsigned long  window;
+  unsigned long  property;
+  unsigned long  type;
+  unsigned long  long_offset;
+  unsigned long  long_length;
+};
+
+class GetPropertyStore : public MessageStore
+{
+
+  //
+  // Constructors and destructors.
+  //
+
+  public:
+
+  GetPropertyStore() : MessageStore()
+  {
+    enableCache    = GETPROPERTY_ENABLE_CACHE;
+    enableData     = GETPROPERTY_ENABLE_DATA;
+    enableSplit    = GETPROPERTY_ENABLE_SPLIT;
+    enableCompress = GETPROPERTY_ENABLE_COMPRESS;
+
+    dataLimit  = GETPROPERTY_DATA_LIMIT;
+    dataOffset = GETPROPERTY_DATA_OFFSET;
+
+    cacheSlots          = GETPROPERTY_CACHE_SLOTS;
+    cacheThreshold      = GETPROPERTY_CACHE_THRESHOLD;
+    cacheLowerThreshold = GETPROPERTY_CACHE_LOWER_THRESHOLD;
+
+    messages_ -> resize(cacheSlots);
+
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      *i = NULL;
+    }
+
+    temporary_ = NULL;
+  }
+
+  virtual ~GetPropertyStore()
+  {
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      destroy(*i);
+    }
+
+    destroy(temporary_);
+  }
+
+  virtual const char *name() const
+  {
+    return "GetProperty";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return X_GetProperty;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(GetPropertyMessage);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  protected:
+
+  virtual Message *create() const
+  {
+    return new GetPropertyMessage();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new GetPropertyMessage((const GetPropertyMessage &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (GetPropertyMessage *) message;
+  }
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer,
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+                                    unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+};
+
+#endif /* GetProperty_H */
diff --git a/nxcomp/src/GetPropertyReply.cpp b/nxcomp/src/GetPropertyReply.cpp
new file mode 100644
index 000000000..bf6879c5f
--- /dev/null
+++ b/nxcomp/src/GetPropertyReply.cpp
@@ -0,0 +1,304 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "GetPropertyReply.h"
+
+#include "ServerCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+#include "WriteBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Constructors and destructors.
+//
+
+GetPropertyReplyStore::GetPropertyReplyStore(StaticCompressor *compressor)
+
+  : MessageStore(compressor)
+{
+  enableCache    = GETPROPERTYREPLY_ENABLE_CACHE;
+  enableData     = GETPROPERTYREPLY_ENABLE_DATA;
+  enableSplit    = GETPROPERTYREPLY_ENABLE_SPLIT;
+
+  // Since ProtoStep7 (#issue 108)
+  enableCompress = GETPROPERTYREPLY_ENABLE_COMPRESS_IF_PROTO_STEP_7;
+
+  dataLimit  = GETPROPERTYREPLY_DATA_LIMIT;
+  dataOffset = GETPROPERTYREPLY_DATA_OFFSET;
+
+  cacheSlots          = GETPROPERTYREPLY_CACHE_SLOTS;
+  cacheThreshold      = GETPROPERTYREPLY_CACHE_THRESHOLD;
+  cacheLowerThreshold = GETPROPERTYREPLY_CACHE_LOWER_THRESHOLD;
+
+  messages_ -> resize(cacheSlots);
+
+  for (T_messages::iterator i = messages_ -> begin();
+           i < messages_ -> end(); i++)
+  {
+    *i = NULL;
+  }
+
+  temporary_ = NULL;
+}
+
+GetPropertyReplyStore::~GetPropertyReplyStore()
+{
+  for (T_messages::iterator i = messages_ -> begin();
+           i < messages_ -> end(); i++)
+  {
+    destroy(*i);
+  }
+
+  destroy(temporary_);
+}
+
+//
+// Here are the methods to handle messages' content.
+//
+
+int GetPropertyReplyStore::encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                                              const unsigned int size, int bigEndian,
+                                                  ChannelCache *channelCache) const
+{
+  ServerCache *serverCache = (ServerCache *) channelCache;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Encoding full message identity.\n"
+          << logofs_flush;
+  #endif
+
+  unsigned char format = (unsigned int) *(buffer + 1);
+
+  encodeBuffer.encodeCachedValue(format, 8,
+                     serverCache -> getPropertyFormatCache);
+
+  unsigned int numBytes = GetULONG(buffer + 16, bigEndian);
+
+  encodeBuffer.encodeValue(numBytes, 32, 9);
+
+  if (format == 16)
+  {
+    numBytes <<= 1;
+  }
+  else if (format == 32)
+  {
+    numBytes <<= 2;
+  }
+
+  encodeBuffer.encodeCachedValue(GetULONG(buffer + 8, bigEndian), 29,
+                     serverCache -> getPropertyTypeCache, 9);
+
+  encodeBuffer.encodeValue(GetULONG(buffer + 12, bigEndian), 32, 9);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Encoded full message identity.\n"
+          << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int GetPropertyReplyStore::decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
+                                              unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
+                                                  ChannelCache *channelCache) const
+{
+  ServerCache *serverCache = (ServerCache *) channelCache;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoding full message identity.\n"
+          << logofs_flush;
+  #endif
+
+  unsigned char format;
+
+  decodeBuffer.decodeCachedValue(format, 8,
+                     serverCache -> getPropertyFormatCache);
+
+  unsigned int length;
+
+  decodeBuffer.decodeValue(length, 32, 9);
+
+  unsigned int numBytes = length;
+
+  if (format == 16)
+  {
+    numBytes <<= 1;
+  }
+  else if (format == 32)
+  {
+    numBytes <<= 2;
+  }
+
+  size = 32 + RoundUp4(numBytes);
+
+  buffer = writeBuffer -> addMessage(size);
+
+  *(buffer + 1) = format;
+
+  PutULONG(length, buffer + 16, bigEndian);
+
+  unsigned int value;
+
+  decodeBuffer.decodeCachedValue(value, 29,
+                     serverCache -> getPropertyTypeCache, 9);
+
+  PutULONG(value, buffer + 8, bigEndian);
+
+  decodeBuffer.decodeValue(value, 32, 9);
+
+  PutULONG(value, buffer + 12, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded full message identity.\n"
+          << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int GetPropertyReplyStore::parseIdentity(Message *message, const unsigned char *buffer,
+                                             unsigned int size, int bigEndian) const
+{
+  GetPropertyReplyMessage *getPropertyReply = (GetPropertyReplyMessage *) message;
+
+  getPropertyReply -> format = *(buffer + 1);
+
+  getPropertyReply -> type  = GetULONG(buffer + 8,  bigEndian);
+  getPropertyReply -> after = GetULONG(buffer + 12, bigEndian);
+  getPropertyReply -> items = GetULONG(buffer + 16, bigEndian);
+
+  //
+  // Cleanup the padding bytes.
+  //
+
+  unsigned int uiLengthInBytes;
+  unsigned int uiFormat;
+
+  if ((int) size > GETPROPERTYREPLY_DATA_OFFSET)
+  {
+    uiLengthInBytes = getPropertyReply -> items;
+
+    uiFormat = *(buffer + 1);
+
+    #ifdef DEBUG
+    *logofs << name() << ": length " << uiLengthInBytes
+            << ", format " << uiFormat << ", size "
+            << size << ".\n" << logofs_flush;
+    #endif
+
+    if (uiFormat == 16)
+    {
+      uiLengthInBytes <<= 1;
+    }
+    else if (uiFormat == 32)
+    {
+      uiLengthInBytes <<= 2;
+    }
+
+    unsigned char *end = ((unsigned char *) buffer) + size;
+    unsigned char *pad = ((unsigned char *) buffer) + GETPROPERTYREPLY_DATA_OFFSET + uiLengthInBytes;
+
+    CleanData((unsigned char *) pad, end - pad);
+  }
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsed identity for message at "
+          << message << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int GetPropertyReplyStore::unparseIdentity(const Message *message, unsigned char *buffer,
+                                               unsigned int size, int bigEndian) const
+{
+  GetPropertyReplyMessage *getPropertyReply = (GetPropertyReplyMessage *) message;
+
+  *(buffer + 1) = getPropertyReply -> format;
+
+  PutULONG(getPropertyReply -> type,  buffer + 8,  bigEndian);
+  PutULONG(getPropertyReply -> after, buffer + 12, bigEndian);
+  PutULONG(getPropertyReply -> items, buffer + 16, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsed identity for message at "
+          << message << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void GetPropertyReplyStore::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  GetPropertyReplyMessage *getPropertyReply = (GetPropertyReplyMessage *) message;
+
+  *logofs << name() << ": Identity format "
+          << (unsigned) getPropertyReply -> format << ", type "
+          << getPropertyReply -> type << ", after " << getPropertyReply -> after
+          << ", items " << getPropertyReply -> items << ", size "
+          << getPropertyReply -> size_ << ".\n";
+
+  #endif
+}
+
+void GetPropertyReplyStore::identityChecksum(const Message *message, const unsigned char *buffer,
+                                                 unsigned int size, int bigEndian) const
+{
+  //
+  // Fields format, type, after, items.
+  //
+
+  md5_append(md5_state_, buffer + 1, 1);
+  md5_append(md5_state_, buffer + 8, 12);
+}
+
+void GetPropertyReplyStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                               const Message *cachedMessage,
+                                                ChannelCache *channelCache) const
+{
+}
+
+void GetPropertyReplyStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                               ChannelCache *channelCache) const
+{
+}
diff --git a/nxcomp/src/GetPropertyReply.h b/nxcomp/src/GetPropertyReply.h
new file mode 100644
index 000000000..01634b408
--- /dev/null
+++ b/nxcomp/src/GetPropertyReply.h
@@ -0,0 +1,160 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef GetPropertyReply_H
+#define GetPropertyReply_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+
+#define GETPROPERTYREPLY_ENABLE_CACHE                       1
+#define GETPROPERTYREPLY_ENABLE_DATA                        1
+#define GETPROPERTYREPLY_ENABLE_SPLIT                       0
+
+#define GETPROPERTYREPLY_DATA_LIMIT                         1048576 - 32
+#define GETPROPERTYREPLY_DATA_OFFSET                        32
+
+#define GETPROPERTYREPLY_CACHE_SLOTS                        400
+#define GETPROPERTYREPLY_CACHE_THRESHOLD                    5
+#define GETPROPERTYREPLY_CACHE_LOWER_THRESHOLD              1
+
+#define GETPROPERTYREPLY_ENABLE_COMPRESS_IF_PROTO_STEP_7    0
+
+//
+// The message class.
+//
+
+class GetPropertyReplyMessage : public Message
+{
+  friend class GetPropertyReplyStore;
+
+  public:
+
+  GetPropertyReplyMessage()
+  {
+  }
+
+  ~GetPropertyReplyMessage()
+  {
+  }
+
+  //
+  // Put here the fields which constitute 
+  // the 'identity' part of the message.
+  //
+
+  private:
+
+  unsigned char format;
+  unsigned int  type;
+  unsigned int  after;
+  unsigned int  items;
+};
+
+class GetPropertyReplyStore : public MessageStore
+{
+  public:
+
+  GetPropertyReplyStore(StaticCompressor *compressor);
+
+  virtual ~GetPropertyReplyStore();
+
+  virtual const char *name() const
+  {
+    return "GetPropertyReply";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return X_GetProperty;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(GetPropertyReplyMessage);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  protected:
+
+  virtual Message *create() const
+  {
+    return new GetPropertyReplyMessage();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new GetPropertyReplyMessage((const GetPropertyReplyMessage &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (GetPropertyReplyMessage *) message;
+  }
+
+  virtual int encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                                 const unsigned int size, int bigEndian,
+                                     ChannelCache *channelCache) const;
+
+  virtual int decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
+                                 unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
+                                     ChannelCache *channelCache) const;
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer, 
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer, 
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                  const Message *cachedMessage,
+                                      ChannelCache *channelCache) const;
+
+  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                  ChannelCache *channelCache) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer, 
+                                    unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+};
+
+#endif /* GetPropertyReply_H */
diff --git a/nxcomp/src/ImageText16.cpp b/nxcomp/src/ImageText16.cpp
new file mode 100644
index 000000000..af057635f
--- /dev/null
+++ b/nxcomp/src/ImageText16.cpp
@@ -0,0 +1,231 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "ImageText16.h"
+
+#include "ClientCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Here are the methods to handle messages' content.
+//
+
+int ImageText16Store::parseIdentity(Message *message, const unsigned char *buffer,
+                                       unsigned int size, int bigEndian) const
+{
+  ImageText16Message *imageText16 = (ImageText16Message *) message;
+
+  //
+  // Here is the fingerprint.
+  //
+
+  imageText16 -> len = *(buffer + 1); 
+
+  imageText16 -> drawable = GetULONG(buffer + 4, bigEndian); 
+  imageText16 -> gcontext = GetULONG(buffer + 8, bigEndian);
+
+  imageText16 -> x  = GetUINT(buffer + 12, bigEndian);
+  imageText16 -> y  = GetUINT(buffer + 14, bigEndian);
+
+  if ((int) size > dataOffset)
+  {
+    int pad = (size - dataOffset) - (imageText16 -> len * 2);
+ 
+    if (pad > 0)
+    {
+      CleanData((unsigned char *) buffer + size - pad, pad);
+    }
+  }
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsed Identity for message at " << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int ImageText16Store::unparseIdentity(const Message *message, unsigned char *buffer,
+                                         unsigned int size, int bigEndian) const
+{
+  ImageText16Message *imageText16 = (ImageText16Message *) message;
+
+  //
+  // Fill all the message's fields.
+  //
+
+  *(buffer + 1) = imageText16 -> len;
+
+  PutULONG(imageText16 -> drawable, buffer + 4, bigEndian);
+  PutULONG(imageText16 -> gcontext, buffer + 8, bigEndian);
+
+  PutUINT(imageText16 -> x, buffer + 12, bigEndian);
+  PutUINT(imageText16 -> y, buffer + 14, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsed identity for message at " << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void ImageText16Store::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  ImageText16Message *imageText16 = (ImageText16Message *) message;
+
+  *logofs << name() << ": Identity len " << (unsigned int) imageText16 -> len
+          << " drawable " << imageText16 -> drawable << ", gcontext " 
+          << imageText16 -> gcontext << ", x " << imageText16 -> x << ", y " 
+          << imageText16 -> y << ", size " << imageText16 -> size_ << ".\n";
+
+  #endif
+}
+
+void ImageText16Store::identityChecksum(const Message *message, const unsigned char *buffer,
+                                           unsigned int size, int bigEndian) const
+{
+  md5_append(md5_state_, buffer + 1,  1);
+}
+
+void ImageText16Store::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                         const Message *cachedMessage,
+                                             ChannelCache *channelCache) const
+{
+  ImageText16Message *imageText16       = (ImageText16Message *) message;
+  ImageText16Message *cachedImageText16 = (ImageText16Message *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << imageText16 -> drawable
+          << " as " << "drawable" << " field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeXidValue(imageText16 -> drawable, clientCache -> drawableCache);
+
+  cachedImageText16 -> drawable = imageText16 -> drawable;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << imageText16 -> gcontext
+          << " as " << "gcontext" << " field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeXidValue(imageText16 -> gcontext, clientCache -> gcCache);
+
+  cachedImageText16 -> gcontext = imageText16 -> gcontext;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << imageText16 -> x
+          << " as " << "x" << " field.\n" << logofs_flush;
+  #endif
+
+  unsigned short int diff_x = imageText16 -> x - cachedImageText16 -> x;
+
+  encodeBuffer.encodeCachedValue(diff_x, 16,
+                     clientCache -> imageTextCacheX);
+
+  cachedImageText16 -> x = imageText16 -> x;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << imageText16 -> y
+          << " as " << "y" << " field.\n" << logofs_flush;
+  #endif
+
+  unsigned short int diff_y = imageText16 -> y - cachedImageText16 -> y;
+
+  encodeBuffer.encodeCachedValue(diff_y, 16,
+                     clientCache -> imageTextCacheY);
+
+  cachedImageText16 -> y = imageText16 -> y;
+}
+
+void ImageText16Store::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                           ChannelCache *channelCache) const
+{
+  ImageText16Message *imageText16 = (ImageText16Message *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  unsigned int value;
+
+  decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
+
+  imageText16 -> drawable = value;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << imageText16 -> drawable
+          << " as " << "drawable" << " field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeXidValue(value, clientCache -> gcCache);
+
+  imageText16 -> gcontext = value;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << imageText16 -> gcontext
+          << " as gcontext field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeCachedValue(value, 16,
+               clientCache -> imageTextCacheX);
+
+  imageText16 -> x += value;
+  imageText16 -> x &= 0xffff;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << imageText16 -> x
+          << " as x field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeCachedValue(value, 16,
+               clientCache -> imageTextCacheY);
+
+  imageText16 -> y += value;
+  imageText16 -> y &= 0xffff;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << imageText16 -> y
+          << " as y field.\n" << logofs_flush;
+  #endif
+}
+
+
diff --git a/nxcomp/src/ImageText16.h b/nxcomp/src/ImageText16.h
new file mode 100644
index 000000000..98462ab35
--- /dev/null
+++ b/nxcomp/src/ImageText16.h
@@ -0,0 +1,190 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef ImageText16_H
+#define ImageText16_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+
+#define IMAGETEXT16_ENABLE_CACHE               1
+#define IMAGETEXT16_ENABLE_DATA                0
+#define IMAGETEXT16_ENABLE_SPLIT               0
+#define IMAGETEXT16_ENABLE_COMPRESS            0
+
+#define IMAGETEXT16_DATA_LIMIT                 512
+#define IMAGETEXT16_DATA_OFFSET                16
+
+#define IMAGETEXT16_CACHE_SLOTS                3000
+#define IMAGETEXT16_CACHE_THRESHOLD            5
+#define IMAGETEXT16_CACHE_LOWER_THRESHOLD      1
+
+//
+// The message class.
+//
+
+class ImageText16Message : public Message
+{
+  friend class ImageText16Store;
+
+  public:
+
+  ImageText16Message()
+  {
+  }
+
+  ~ImageText16Message()
+  {
+  }
+
+  //
+  // Put here the fields which constitute 
+  // the 'identity' part of the message.
+  //
+
+  private:
+
+  unsigned char len;
+
+  unsigned int drawable;
+  unsigned int gcontext;
+
+  unsigned short x;
+  unsigned short y;
+};
+
+class ImageText16Store : public MessageStore
+{
+  //
+  // Constructors and destructors.
+  //
+
+  public:
+
+  ImageText16Store() : MessageStore()
+  {
+    enableCache    = IMAGETEXT16_ENABLE_CACHE;
+    enableData     = IMAGETEXT16_ENABLE_DATA;
+    enableSplit    = IMAGETEXT16_ENABLE_SPLIT;
+    enableCompress = IMAGETEXT16_ENABLE_COMPRESS;
+
+    dataLimit  = IMAGETEXT16_DATA_LIMIT;
+    dataOffset = IMAGETEXT16_DATA_OFFSET;
+
+    cacheSlots           = IMAGETEXT16_CACHE_SLOTS;
+    cacheThreshold       = IMAGETEXT16_CACHE_THRESHOLD;
+    cacheLowerThreshold  = IMAGETEXT16_CACHE_LOWER_THRESHOLD;
+
+    messages_ -> resize(cacheSlots);
+
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      *i = NULL;
+    }
+
+    temporary_ = NULL;
+  }
+
+  virtual ~ImageText16Store()
+  {
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      destroy(*i);
+    }
+
+    destroy(temporary_);
+  }
+
+  virtual const char *name() const
+  {
+    return "ImageText16";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return X_ImageText16;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(ImageText16Message);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  public:
+
+  virtual Message *create() const
+  {
+    return new ImageText16Message();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new ImageText16Message((const ImageText16Message &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (ImageText16Message *) message;
+  }
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer,
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                  const Message *cachedMessage,
+                                      ChannelCache *channelCache) const;
+
+  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                  ChannelCache *channelCache) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+				unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+};
+
+#endif /* ImageText16_H */
diff --git a/nxcomp/src/ImageText8.cpp b/nxcomp/src/ImageText8.cpp
new file mode 100644
index 000000000..61fcef825
--- /dev/null
+++ b/nxcomp/src/ImageText8.cpp
@@ -0,0 +1,231 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "ImageText8.h"
+
+#include "ClientCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Here are the methods to handle messages' content.
+//
+
+int ImageText8Store::parseIdentity(Message *message, const unsigned char *buffer,
+                                       unsigned int size, int bigEndian) const
+{
+  ImageText8Message *imageText8 = (ImageText8Message *) message;
+
+  //
+  // Here is the fingerprint.
+  //
+
+  imageText8 -> len = *(buffer + 1); 
+
+  imageText8 -> drawable = GetULONG(buffer + 4, bigEndian); 
+  imageText8 -> gcontext = GetULONG(buffer + 8, bigEndian);
+
+  imageText8 -> x  = GetUINT(buffer + 12, bigEndian);
+  imageText8 -> y  = GetUINT(buffer + 14, bigEndian);
+
+  if ((int) size > dataOffset)
+  {
+    int pad = (size - dataOffset) - imageText8 -> len;
+ 
+    if (pad > 0)
+    {
+      CleanData((unsigned char *) buffer + size - pad, pad);
+    }
+  }
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsed Identity for message at " << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int ImageText8Store::unparseIdentity(const Message *message, unsigned char *buffer,
+                                         unsigned int size, int bigEndian) const
+{
+  ImageText8Message *imageText8 = (ImageText8Message *) message;
+
+  //
+  // Fill all the message's fields.
+  //
+
+  *(buffer + 1) = imageText8 -> len;
+
+  PutULONG(imageText8 -> drawable, buffer + 4, bigEndian);
+  PutULONG(imageText8 -> gcontext, buffer + 8, bigEndian);
+
+  PutUINT(imageText8 -> x, buffer + 12, bigEndian);
+  PutUINT(imageText8 -> y, buffer + 14, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsed identity for message at " << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void ImageText8Store::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  ImageText8Message *imageText8 = (ImageText8Message *) message;
+
+  *logofs << name() << ": Identity len " << (unsigned int) imageText8 -> len
+          << " drawable " << imageText8 -> drawable << ", gcontext " 
+          << imageText8 -> gcontext << ", x " << imageText8 -> x << ", y " 
+          << imageText8 -> y << ", size " << imageText8 -> size_ << ".\n";
+
+  #endif
+}
+
+void ImageText8Store::identityChecksum(const Message *message, const unsigned char *buffer,
+                                           unsigned int size, int bigEndian) const
+{
+  md5_append(md5_state_, buffer + 1,  1);
+}
+
+void ImageText8Store::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                         const Message *cachedMessage,
+                                             ChannelCache *channelCache) const
+{
+  ImageText8Message *imageText8       = (ImageText8Message *) message;
+  ImageText8Message *cachedImageText8 = (ImageText8Message *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << imageText8 -> drawable
+          << " as " << "drawable" << " field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeXidValue(imageText8 -> drawable, clientCache -> drawableCache);
+
+  cachedImageText8 -> drawable = imageText8 -> drawable;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << imageText8 -> gcontext
+          << " as " << "gcontext" << " field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeXidValue(imageText8 -> gcontext, clientCache -> gcCache);
+
+  cachedImageText8 -> gcontext = imageText8 -> gcontext;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << imageText8 -> x
+          << " as " << "x" << " field.\n" << logofs_flush;
+  #endif
+
+  unsigned short int diff_x = imageText8 -> x - cachedImageText8 -> x;
+
+  encodeBuffer.encodeCachedValue(diff_x, 16,
+                     clientCache -> imageTextCacheX);
+
+  cachedImageText8 -> x = imageText8 -> x;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << imageText8 -> y
+          << " as " << "y" << " field.\n" << logofs_flush;
+  #endif
+
+  unsigned short int diff_y = imageText8 -> y - cachedImageText8 -> y;
+
+  encodeBuffer.encodeCachedValue(diff_y, 16,
+                     clientCache -> imageTextCacheY);
+
+  cachedImageText8 -> y = imageText8 -> y;
+}
+
+void ImageText8Store::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                           ChannelCache *channelCache) const
+{
+  ImageText8Message *imageText8 = (ImageText8Message *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  unsigned int value;
+
+  decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
+
+  imageText8 -> drawable = value;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << imageText8 -> drawable
+          << " as " << "drawable" << " field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeXidValue(value, clientCache -> gcCache);
+
+  imageText8 -> gcontext = value;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << imageText8 -> gcontext
+          << " as gcontext field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeCachedValue(value, 16,
+               clientCache -> imageTextCacheX);
+
+  imageText8 -> x += value;
+  imageText8 -> x &= 0xffff;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << imageText8 -> x
+          << " as x field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeCachedValue(value, 16,
+               clientCache -> imageTextCacheY);
+
+  imageText8 -> y += value;
+  imageText8 -> y &= 0xffff;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << imageText8 -> y
+          << " as y field.\n" << logofs_flush;
+  #endif
+}
+
+
diff --git a/nxcomp/src/ImageText8.h b/nxcomp/src/ImageText8.h
new file mode 100644
index 000000000..aa9ccb5d9
--- /dev/null
+++ b/nxcomp/src/ImageText8.h
@@ -0,0 +1,190 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef ImageText8_H
+#define ImageText8_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+
+#define IMAGETEXT8_ENABLE_CACHE               1
+#define IMAGETEXT8_ENABLE_DATA                0
+#define IMAGETEXT8_ENABLE_SPLIT               0
+#define IMAGETEXT8_ENABLE_COMPRESS            0
+
+#define IMAGETEXT8_DATA_LIMIT                 256
+#define IMAGETEXT8_DATA_OFFSET                16
+
+#define IMAGETEXT8_CACHE_SLOTS                3000
+#define IMAGETEXT8_CACHE_THRESHOLD            5
+#define IMAGETEXT8_CACHE_LOWER_THRESHOLD      1
+
+//
+// The message class.
+//
+
+class ImageText8Message : public Message
+{
+  friend class ImageText8Store;
+
+  public:
+
+  ImageText8Message()
+  {
+  }
+
+  ~ImageText8Message()
+  {
+  }
+
+  //
+  // Put here the fields which constitute 
+  // the 'identity' part of the message.
+  //
+
+  private:
+
+  unsigned char len;
+
+  unsigned int drawable;
+  unsigned int gcontext;
+
+  unsigned short x;
+  unsigned short y;
+};
+
+class ImageText8Store : public MessageStore
+{
+  //
+  // Constructors and destructors.
+  //
+
+  public:
+
+  ImageText8Store() : MessageStore()
+  {
+    enableCache    = IMAGETEXT8_ENABLE_CACHE;
+    enableData     = IMAGETEXT8_ENABLE_DATA;
+    enableSplit    = IMAGETEXT8_ENABLE_SPLIT;
+    enableCompress = IMAGETEXT8_ENABLE_COMPRESS;
+
+    dataLimit            = IMAGETEXT8_DATA_LIMIT;
+    dataOffset           = IMAGETEXT8_DATA_OFFSET;
+
+    cacheSlots           = IMAGETEXT8_CACHE_SLOTS;
+    cacheThreshold       = IMAGETEXT8_CACHE_THRESHOLD;
+    cacheLowerThreshold  = IMAGETEXT8_CACHE_LOWER_THRESHOLD;
+
+    messages_ -> resize(cacheSlots);
+
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      *i = NULL;
+    }
+
+    temporary_ = NULL;
+  }
+
+  virtual ~ImageText8Store()
+  {
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      destroy(*i);
+    }
+
+    destroy(temporary_);
+  }
+
+  virtual const char *name() const
+  {
+    return "ImageText8";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return X_ImageText8;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(ImageText8Message);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  public:
+
+  virtual Message *create() const
+  {
+    return new ImageText8Message();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new ImageText8Message((const ImageText8Message &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (ImageText8Message *) message;
+  }
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer,
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                  const Message *cachedMessage,
+                                      ChannelCache *channelCache) const;
+
+  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                  ChannelCache *channelCache) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+				unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+};
+
+#endif /* ImageText8_H */
diff --git a/nxcomp/src/IntCache.cpp b/nxcomp/src/IntCache.cpp
new file mode 100644
index 000000000..c72b81200
--- /dev/null
+++ b/nxcomp/src/IntCache.cpp
@@ -0,0 +1,230 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <string.h>
+
+#include "Misc.h"
+#include "IntCache.h"
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+IntCache::IntCache(unsigned int size)
+
+  : size_(size), length_(0), buffer_(new unsigned int[size]),
+        lastDiff_(0), lastValueInserted_(0), predictedBlockSize_(0)
+{
+}
+
+int IntCache::lookup(unsigned int &value, unsigned int &index,
+                         unsigned int mask, unsigned int &sameDiff)
+{
+  for (unsigned int i = 0; i < length_; i++)
+  {
+    if (value == buffer_[i])
+    {
+      index = i;
+      if (i)
+      {
+        unsigned int target = (i >> 1);
+        do
+        {
+          buffer_[i] = buffer_[i - 1];
+          i--;
+        }
+        while (i > target);
+        buffer_[target] = value;
+      }
+      return 1;
+    }
+  }
+  unsigned int insertionPoint;
+  if (2 >= length_)
+    insertionPoint = length_;
+  else
+    insertionPoint = 2;
+  unsigned int start;
+  if (length_ >= size_)
+    start = size_ - 1;
+  else
+  {
+    start = length_;
+    length_++;
+  }
+  for (unsigned int k = start; k > insertionPoint; k--)
+    buffer_[k] = buffer_[k - 1];
+  buffer_[insertionPoint] = value;
+  unsigned int diff = value - lastValueInserted_;
+
+  lastValueInserted_ = (value & mask);
+  value = (diff & mask);
+  sameDiff = (value == lastDiff_);
+  if (!sameDiff)
+  {
+    lastDiff_ = value;
+
+    unsigned int lastChangeIndex = 0;
+    unsigned int lastBitIsOne = (lastDiff_ & 0x1);
+    unsigned int j = 1;
+    for (unsigned int nextMask = 0x2; nextMask & mask; nextMask <<= 1)
+    {
+      unsigned int nextBitIsOne = (lastDiff_ & nextMask);
+      if (nextBitIsOne)
+      {
+        if (!lastBitIsOne)
+        {
+          lastChangeIndex = j;
+          lastBitIsOne = nextBitIsOne;
+        }
+      }
+      else
+      {
+        if (lastBitIsOne)
+        {
+          lastChangeIndex = j;
+          lastBitIsOne = nextBitIsOne;
+        }
+      }
+      j++;
+    }
+    predictedBlockSize_ = lastChangeIndex + 1;
+    if (predictedBlockSize_ < 2)
+      predictedBlockSize_ = 2;
+  }
+  return 0;
+}
+
+void IntCache::insert(unsigned int &value, unsigned int mask)
+{
+  unsigned int insertionPoint;
+  if (2 >= length_)
+    insertionPoint = length_;
+  else
+    insertionPoint = 2;
+  unsigned int start;
+  if (length_ >= size_)
+    start = size_ - 1;
+  else
+  {
+    start = length_;
+    length_++;
+  }
+  for (unsigned int k = start; k > insertionPoint; k--)
+    buffer_[k] = buffer_[k - 1];
+  if (lastDiff_ != value)
+  {
+    lastDiff_ = value;
+    unsigned int lastChangeIndex = 0;
+    unsigned int lastBitIsOne = (lastDiff_ & 0x1);
+    unsigned int j = 1;
+    for (unsigned int nextMask = 0x2; nextMask & mask; nextMask <<= 1)
+    {
+      unsigned int nextBitIsOne = (lastDiff_ & nextMask);
+      if (nextBitIsOne)
+      {
+        if (!lastBitIsOne)
+        {
+          lastChangeIndex = j;
+          lastBitIsOne = nextBitIsOne;
+        }
+      }
+      else
+      {
+        if (lastBitIsOne)
+        {
+          lastChangeIndex = j;
+          lastBitIsOne = nextBitIsOne;
+        }
+      }
+      j++;
+    }
+    predictedBlockSize_ = lastChangeIndex + 1;
+    if (predictedBlockSize_ < 2)
+      predictedBlockSize_ = 2;
+  }
+  lastValueInserted_ += value;
+  lastValueInserted_ &= mask;
+  buffer_[insertionPoint] = lastValueInserted_;
+  value = lastValueInserted_;
+}
+
+void IntCache::push(unsigned int &value, unsigned int mask)
+{
+  //
+  // Using a memmove() appears to be slower.
+  //
+  // memmove((char *) &buffer_[1], (char *) &buffer_[0],
+  //             sizeof(unsigned int) * (size_ - 1));
+  //
+  // if (length_ < size_)
+  // {
+  //   length_++;
+  // }
+  //
+
+  unsigned int start;
+
+  if (length_ >= size_)
+  {
+    start = size_ - 1;
+  }
+  else
+  {
+    start = length_;
+
+    length_++;
+  }
+
+  for (unsigned int k = start; k > 0; k--)
+  {
+    buffer_[k] = buffer_[k - 1];
+  }
+
+  value &= mask;
+
+  buffer_[0] = value;
+}
+
+void IntCache::dump()
+{
+  #ifdef DUMP
+
+  *logofs << "IntCache: Dumping content of cache at "
+          << (void *) this << ":\n" << logofs_flush;
+
+  for (unsigned int i = 0; i < length_; i++)
+  {
+    *logofs << "IntCache: [" << i << "][" << buffer_[i] << "]\n";
+  }
+
+  #endif
+}
diff --git a/nxcomp/src/IntCache.h b/nxcomp/src/IntCache.h
new file mode 100644
index 000000000..69c522325
--- /dev/null
+++ b/nxcomp/src/IntCache.h
@@ -0,0 +1,119 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef IntCache_H
+#define IntCache_H
+
+class IntCache
+{
+  public:
+
+  IntCache(unsigned int size);
+
+  ~IntCache()
+  {
+    delete [] buffer_;
+  }
+
+  unsigned int getSize() const
+  {
+    return length_;
+  }
+
+  int lookup(unsigned int &value, unsigned int &index,
+                 unsigned int mask, unsigned int &sameDiff);
+
+  //
+  // This can be inlined as it is only
+  // called by decodeCachedValue().
+  //
+
+  unsigned int get(unsigned int index)
+  {
+    unsigned int result = buffer_[index];
+
+    if (index != 0)
+    {
+      //
+      // Using a memmove() appears to be slower.
+      //
+      // unsigned int target = index >> 1;
+      //
+      // memmove((char *) &buffer_[target + 1], (char *) &buffer_[target],
+      //             sizeof(unsigned int) * (index - target));
+      //
+      // buffer_[target] = result;
+      //
+
+      unsigned int i = index;
+
+      unsigned int target = (i >> 1);
+
+      do
+      {
+        buffer_[i] = buffer_[i - 1];
+
+        i--;
+      }
+      while (i > target);
+
+      buffer_[target] = result;
+    }
+
+    return result;
+  }
+
+  void insert(unsigned int &value, unsigned int mask);
+
+  void push(unsigned int &value, unsigned int mask);
+
+  void dump();
+
+  unsigned int getLastDiff(unsigned int mask) const
+  {
+    return lastDiff_;
+  }
+
+  unsigned int getBlockSize(unsigned int bits) const
+  {
+    if (bits > 0)
+    {
+      return (predictedBlockSize_ < bits ? predictedBlockSize_ : bits);
+    }
+
+    return predictedBlockSize_;
+  }
+
+  private:
+
+  unsigned int size_;
+  unsigned int length_;
+  unsigned int *buffer_;
+  unsigned int lastDiff_;
+  unsigned int lastValueInserted_;
+  unsigned int predictedBlockSize_;
+};
+
+#endif /* IntCache_H */
diff --git a/nxcomp/src/InternAtom.cpp b/nxcomp/src/InternAtom.cpp
new file mode 100644
index 000000000..9d0ab1b6d
--- /dev/null
+++ b/nxcomp/src/InternAtom.cpp
@@ -0,0 +1,131 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "InternAtom.h"
+
+#include "ClientCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Here are the methods to handle messages' content.
+//
+
+int InternAtomStore::parseIdentity(Message *message, const unsigned char *buffer,
+                                       unsigned int size, int bigEndian) const
+{
+  InternAtomMessage *internAtom = (InternAtomMessage *) message;
+
+  //
+  // Here is the fingerprint.
+  //
+
+  internAtom -> only_if_exists = *(buffer + 1);
+  internAtom -> name_length    = GetUINT(buffer + 4, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsed identity for message at " << message << ".\n" << logofs_flush;
+  #endif
+
+  //
+  // Clean up padding bytes.
+  //
+
+  if ((int) size > dataOffset)
+  {
+    unsigned char *end = ((unsigned char *) buffer) + size;
+
+    for (unsigned char *pad = ((unsigned char *) buffer) + 8 + 
+                                  internAtom -> name_length; pad < end; pad++)
+    {
+      *pad = 0;
+    }
+  }
+
+  return 1;
+}
+
+int InternAtomStore::unparseIdentity(const Message *message, unsigned char *buffer,
+                                         unsigned int size, int bigEndian) const
+{
+  InternAtomMessage *internAtom = (InternAtomMessage *) message;
+
+  //
+  // Fill all the message's fields.
+  //
+
+  *(buffer + 1) = internAtom -> only_if_exists;
+
+  PutUINT(internAtom -> name_length, buffer + 4, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsed identity for message at " << message << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void InternAtomStore::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  InternAtomMessage *internAtom = (InternAtomMessage *) message;
+
+  *logofs << name() << ": Identity only_if_exists " 
+          << (unsigned int) internAtom -> only_if_exists
+          << ", name_length " << internAtom -> name_length
+          << ", name '";
+
+          for (int i = 0; i < internAtom -> name_length; i++)
+          {
+            *logofs << internAtom -> data_[i];
+          }
+
+          *logofs << "'.\n" << logofs_flush;
+
+  #endif
+}
+
+void InternAtomStore::identityChecksum(const Message *message, const unsigned char *buffer,
+                                           unsigned int size, int bigEndian) const
+{
+  md5_append(md5_state_, buffer + 1, 1);
+  md5_append(md5_state_, buffer + 4, 2);
+}
diff --git a/nxcomp/src/InternAtom.h b/nxcomp/src/InternAtom.h
new file mode 100644
index 000000000..6e69eca24
--- /dev/null
+++ b/nxcomp/src/InternAtom.h
@@ -0,0 +1,178 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef InternAtom_H
+#define InternAtom_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+
+#define INTERNATOM_ENABLE_CACHE               1
+#define INTERNATOM_ENABLE_DATA                0
+#define INTERNATOM_ENABLE_SPLIT               0
+#define INTERNATOM_ENABLE_COMPRESS            0
+
+#define INTERNATOM_DATA_LIMIT                 80
+#define INTERNATOM_DATA_OFFSET                8
+
+#define INTERNATOM_CACHE_SLOTS                2000
+#define INTERNATOM_CACHE_THRESHOLD            2
+#define INTERNATOM_CACHE_LOWER_THRESHOLD      1
+
+//
+// The message class.
+//
+
+class InternAtomMessage : public Message
+{
+  friend class InternAtomStore;
+
+  public:
+
+  InternAtomMessage()
+  {
+  }
+
+  ~InternAtomMessage()
+  {
+  }
+
+  //
+  // Put here the fields which constitute 
+  // the 'identity' part of the message.
+  //
+
+  private:
+
+  unsigned char  only_if_exists;
+  unsigned short name_length;
+};
+
+class InternAtomStore : public MessageStore
+{
+  //
+  // Constructors and destructors.
+  //
+
+  public:
+
+  InternAtomStore() : MessageStore()
+  {
+    enableCache    = INTERNATOM_ENABLE_CACHE;
+    enableData     = INTERNATOM_ENABLE_DATA;
+    enableSplit    = INTERNATOM_ENABLE_SPLIT;
+    enableCompress = INTERNATOM_ENABLE_COMPRESS;
+
+    dataLimit  = INTERNATOM_DATA_LIMIT;
+    dataOffset = INTERNATOM_DATA_OFFSET;
+
+    cacheSlots          = INTERNATOM_CACHE_SLOTS;
+    cacheThreshold      = INTERNATOM_CACHE_THRESHOLD;
+    cacheLowerThreshold = INTERNATOM_CACHE_LOWER_THRESHOLD;
+
+    messages_ -> resize(cacheSlots);
+
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      *i = NULL;
+    }
+
+    temporary_ = NULL;
+  }
+
+  virtual ~InternAtomStore()
+  {
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      destroy(*i);
+    }
+
+    destroy(temporary_);
+  }
+
+  virtual const char *name() const
+  {
+    return "InternAtom";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return X_InternAtom;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(InternAtomMessage);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  protected:
+
+  virtual Message *create() const
+  {
+    return new InternAtomMessage();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new InternAtomMessage((const InternAtomMessage &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (InternAtomMessage *) message;
+  }
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer,
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+                                    unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+};
+
+#endif /* InternAtom_H */
diff --git a/nxcomp/src/Jpeg.cpp b/nxcomp/src/Jpeg.cpp
new file mode 100644
index 000000000..64a537497
--- /dev/null
+++ b/nxcomp/src/Jpeg.cpp
@@ -0,0 +1,890 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <X11/Xmd.h>
+
+#ifdef ANDROID
+#include <strings.h>
+#endif
+#include <unistd.h>
+#include <setjmp.h>
+#include <zlib.h>
+
+#ifdef __cplusplus
+
+extern "C"
+{
+  #include <stdio.h>
+  #include <jpeglib.h>
+}
+
+#else
+
+#include <stdio.h>
+#include <jpeglib.h>
+
+#endif
+
+#include "Misc.h"
+#include "Jpeg.h"
+#include "Unpack.h"
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+#define RGB24_TO_PIXEL(bpp,r,g,b)                               \
+   ((((CARD##bpp)(r) & 0xff) * srcRedMax + 127) / 255           \
+    << srcRedShift |                                            \
+    (((CARD##bpp)(g) & 0xff) * srcGreenMax + 127) / 255         \
+    << srcGreenShift |                                          \
+    (((CARD##bpp)(b) & 0xff) * srcBlueMax + 127) / 255          \
+    << srcBlueShift)
+
+#define RGB24_TO_PIXEL32(r,g,b)                                 \
+  (((CARD32)(r) & 0xff) << srcRedShift |                        \
+   ((CARD32)(g) & 0xff) << srcGreenShift |                      \
+   ((CARD32)(b) & 0xff) << srcBlueShift)
+
+//
+// Functions from Unpack.cpp
+//
+
+extern int Unpack32To32(const T_colormask *colormask, const unsigned int *data,
+                            unsigned int *out, unsigned int *end);
+
+extern int Unpack24To24(const T_colormask *colormask, const unsigned char *data,
+                            unsigned char *out, unsigned char *end);
+
+extern int Unpack16To16(const T_colormask *colormask, const unsigned char *data,
+                            unsigned char *out, unsigned char *end);
+
+//
+// Local functions used for the jpeg decompression.
+//
+
+static void JpegSetSrcManager(j_decompress_ptr cinfo, CARD8 *compressedData, int compressedLen);
+static void JpegInitSource(j_decompress_ptr cinfo);
+static void JpegTermSource(j_decompress_ptr cinfo);
+static void JpegSkipInputData(j_decompress_ptr cinfo, long num_bytes);
+
+static boolean JpegFillInputBuffer(j_decompress_ptr cinfo);
+
+static int DecompressJpeg16(unsigned char *compressedData, int compressedLen,
+                                unsigned int w, unsigned int h, unsigned char *dstBuf, int byteOrder);
+
+static int DecompressJpeg24(unsigned char *compressedData, int compressedLen,
+                                unsigned int w, unsigned int h, unsigned char *dstBuf, int byteOrder);
+
+static int DecompressJpeg32(unsigned char *compressedData, int compressedLen,
+                                unsigned int w, unsigned int h, unsigned char *dstBuf, int byteOrder);
+
+void UnpackJpegErrorHandler(j_common_ptr cinfo);
+
+//
+// Colormap stuff.
+//
+
+CARD16 srcRedMax, srcGreenMax, srcBlueMax;
+CARD8  srcRedShift, srcGreenShift, srcBlueShift;
+
+//
+// Error handler.
+//
+
+static bool jpegError;
+
+jmp_buf UnpackJpegContext;
+
+void UnpackJpegErrorHandler(j_common_ptr cinfo)
+{
+  #ifdef PANIC
+  *logofs << "UnpackJpegErrorHandler: PANIC! Detected error in JPEG decompression.\n"
+          << logofs_flush;
+
+  *logofs << "UnpackJpegErrorHandler: PANIC! Trying to revert to the previous context.\n"
+          << logofs_flush;
+  #endif
+
+  jpegError = 1;
+
+  longjmp(UnpackJpegContext, 1);
+}
+
+//
+// Attributes used for the jpeg decompression.
+//
+
+static struct  jpeg_source_mgr jpegSrcManager;
+static JOCTET  *jpegBufferPtr;
+static size_t  jpegBufferLen;
+
+static char    *tmpBuf;
+static int     tmpBufSize = 0;
+
+int UnpackJpeg(T_geometry *geometry, unsigned char method, unsigned char *srcData,
+                   int srcSize, int dstBpp, int dstWidth, int dstHeight,
+                       unsigned char *dstData, int dstSize)
+{
+  int byteOrder = geometry -> image_byte_order;
+
+  //
+  // Check if data is coming from a failed unsplit.
+  //
+
+  if (srcSize < 2 || (srcData[0] == SPLIT_PATTERN &&
+          srcData[1] == SPLIT_PATTERN))
+  {
+    #ifdef WARNING
+    *logofs << "UnpackJpeg: WARNING! Skipping unpack of dummy data.\n"
+            << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  #ifdef DEBUG
+  *logofs << "UnpackJpeg: Decompression. Source size "
+          << srcSize << " bits per plane " << dstBpp
+          << ".\n" << logofs_flush;
+  #endif
+
+  srcRedShift   = ffs(geometry -> red_mask)   - 1;
+  srcGreenShift = ffs(geometry -> green_mask) - 1;
+  srcBlueShift  = ffs(geometry -> blue_mask)  - 1;
+
+  #ifdef DEBUG
+  *logofs << "UnpackJpeg: Red shift " << (int) srcRedShift
+          << " green shift " << (int) srcGreenShift << " blue shift "
+          << (int) srcBlueShift << ".\n" << logofs_flush;
+  #endif
+
+  srcRedMax   = geometry -> red_mask   >> srcRedShift;
+  srcGreenMax = geometry -> green_mask >> srcGreenShift;
+  srcBlueMax  = geometry -> blue_mask  >> srcBlueShift;
+
+  #ifdef DEBUG
+  *logofs << "UnpackJpeg: Red mask " << (void *) geometry -> red_mask
+          << " green mask " << (void *) geometry -> green_mask
+          << " blue mask " << (void *) geometry -> blue_mask
+          << ".\n" << logofs_flush;
+  #endif
+
+  #ifdef DEBUG
+  *logofs << "UnpackJpeg: Red max " << srcRedMax << " green max "
+          << srcGreenMax << " blue max " << srcBlueMax
+          << ".\n" << logofs_flush;
+  #endif
+
+  //
+  // Make enough space in the temporary
+  // buffer to have one complete row of
+  // the image with 3 bytes for a pixel.
+  //
+
+  tmpBufSize = dstWidth * 3;
+  tmpBuf     = new char[tmpBufSize];
+
+  if (tmpBuf == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "UnpackJpeg: PANIC! Cannot allocate "
+            << dstWidth * 3 << " bytes for Jpeg "
+            << "decompressed data.\n" << logofs_flush;
+    #endif
+
+    delete [] tmpBuf;
+
+    return -1;
+  }
+
+  int result = 1;
+
+  switch(dstBpp)
+  {
+    case 8:
+    {
+      //
+      // Simply move the data from srcData to dstData
+      // taking into consideration the correct padding.
+      //
+
+      int row;
+
+      unsigned char * dstBuff = dstData;
+      unsigned char * srcBuff = srcData;
+
+      for (row = 0; row < dstHeight; row++)
+      {
+        memcpy(dstBuff, srcBuff, dstWidth);
+
+        dstBuff += RoundUp4(dstWidth);
+        srcBuff += dstWidth;
+      }
+
+      break;
+    }
+    case 16:
+    {
+      result = DecompressJpeg16(srcData, srcSize, dstWidth,
+                                    dstHeight, dstData, byteOrder);
+      break;
+    }
+    case 24:
+    {
+      result = DecompressJpeg24(srcData, srcSize, dstWidth,
+                                    dstHeight, dstData, byteOrder);
+      break;
+    }
+    case 32:
+    {
+      result = DecompressJpeg32(srcData, srcSize, dstWidth,
+                                    dstHeight, dstData, byteOrder);
+      break;
+    }
+    default:
+    {
+      #ifdef PANIC
+      *logofs << "UnpackJpeg: PANIC! Failed to decode Jpeg image. "
+              << " Unsupported Bpp value " << dstBpp
+              << " for the Jpeg compression"
+              << ".\n" << logofs_flush;
+      #endif
+
+      delete [] tmpBuf;
+
+      result = -1;
+    }
+  }
+
+  #ifdef DEBUG
+  *logofs << "UnpackJpeg: Decompression finished with result "
+          << result << ".\n" << logofs_flush;
+  #endif
+
+  if (result == -1)
+  {
+    delete [] tmpBuf;
+
+    #ifdef PANIC
+    *logofs << "UnpackJpeg: PANIC! Failed to decode Jpeg image using "
+            << dstBpp << " Bpp destination.\n" << logofs_flush;
+    #endif
+
+    return result;
+  }
+
+  //
+  // Apply the correction for the brightness.
+  //
+
+  int maskMethod;
+
+  switch(method)
+  {
+    case PACK_JPEG_8_COLORS:
+    {
+      maskMethod = MASK_8_COLORS;
+
+      break;
+    }
+    case PACK_JPEG_64_COLORS:
+    {
+      maskMethod = MASK_64_COLORS;
+
+      break;
+    }
+    case PACK_JPEG_256_COLORS:
+    {
+      maskMethod = MASK_256_COLORS;
+
+      break;
+    }
+    case PACK_JPEG_512_COLORS:
+    {
+      maskMethod = MASK_512_COLORS;
+
+      break;
+    }
+    case PACK_JPEG_4K_COLORS:
+    {
+      maskMethod = MASK_4K_COLORS;
+
+      break;
+    }
+    case PACK_JPEG_32K_COLORS:
+    {
+      maskMethod = MASK_32K_COLORS;
+
+      break;
+    }
+    case PACK_JPEG_64K_COLORS:
+    {
+      maskMethod = MASK_64K_COLORS;
+
+      break;
+    }
+    case PACK_JPEG_256K_COLORS:
+    {
+      maskMethod = MASK_256K_COLORS;
+
+      break;
+    }
+    case PACK_JPEG_2M_COLORS:
+    {
+      maskMethod = MASK_2M_COLORS;
+
+      break;
+    }
+    case PACK_JPEG_16M_COLORS:
+    {
+      maskMethod = MASK_16M_COLORS;
+
+      break;
+    }
+    default:
+    {
+      delete [] tmpBuf;
+
+      return -1;
+    }
+  }
+
+  const T_colormask *colorMask = MethodColorMask(maskMethod);
+
+  unsigned char *dstBuff = dstData;
+
+  switch (dstBpp)
+  {
+    case 16:
+    {
+      Unpack16To16(colorMask, dstBuff, dstBuff, dstBuff + dstSize);
+
+      break;
+    }
+    case 24:
+    {
+      break;
+    }
+    case 32:
+    {
+      Unpack32To32(colorMask, (unsigned int *) dstBuff, (unsigned int *) dstBuff,
+                       (unsigned int *) (dstBuff + dstSize));
+      break;
+    }
+    default:
+    {
+      delete [] tmpBuf;
+
+      return -1;
+    }
+  }
+
+  delete [] tmpBuf;
+
+  return 1;
+}
+
+//
+// Functions that actually do the Jpeg decompression.
+//
+
+int DecompressJpeg16(unsigned char *compressedData, int compressedLen,
+                         unsigned int w, unsigned int h, unsigned char *dstBuf, int byteOrder)
+{
+  struct jpeg_decompress_struct cinfo;
+  struct jpeg_error_mgr jerr;
+  unsigned char *data;
+  JSAMPROW rowPointer[1];
+
+  unsigned int dx = 0;
+  unsigned int dy = 0;
+
+  #ifdef DEBUG
+  *logofs << "DecompressJpeg16: Decompressing with length "
+          << compressedLen << " width " << w << " height "
+          << h << ".\n" << logofs_flush;
+  #endif
+
+  jpegError = 0;
+
+  cinfo.err = jpeg_std_error(&jerr);
+
+  jerr.error_exit = UnpackJpegErrorHandler;
+
+  if (setjmp(UnpackJpegContext) == 1)
+  {
+    #ifdef TEST
+    *logofs << "DecompressJpeg16: Out of the long jump with error '"
+            << jpegError << "'.\n" << logofs_flush;
+    #endif
+
+    goto AbortDecompressJpeg16;
+  }
+
+  jpeg_create_decompress(&cinfo);
+
+  if (jpegError) goto AbortDecompressJpeg16;
+
+  JpegSetSrcManager(&cinfo, compressedData, compressedLen);
+
+  jpeg_read_header(&cinfo, TRUE);
+
+  if (jpegError) goto AbortDecompressJpeg16;
+
+  cinfo.out_color_space = JCS_RGB;
+
+  jpeg_start_decompress(&cinfo);
+
+  if (jpegError) goto AbortDecompressJpeg16;
+
+  if (cinfo.output_width != w ||
+          cinfo.output_height != h ||
+              cinfo.output_components != 3)
+  {
+    #ifdef PANIC
+    *logofs << "DecompressJpeg16: PANIC! Wrong JPEG data received.\n"
+            << logofs_flush;
+    #endif
+
+    jpeg_destroy_decompress(&cinfo);
+
+    return -1;
+  }
+
+  //
+  // PixelPtr points to dstBuf which is
+  // already padded correctly for the final
+  // image to put
+  //
+
+  data = dstBuf;
+
+  rowPointer[0] = (JSAMPROW) tmpBuf;
+
+  unsigned long pixel;
+
+  while (cinfo.output_scanline < cinfo.output_height)
+  {
+    jpeg_read_scanlines(&cinfo, rowPointer, 1);
+
+    if (jpegError) goto AbortDecompressJpeg16;
+
+    for (dx = 0; dx < w; dx++)
+    {
+      pixel = RGB24_TO_PIXEL(16, tmpBuf[dx * 3], tmpBuf[dx * 3 + 1],
+                                 tmpBuf[dx * 3 + 2]);
+
+      //
+      // Follow the server byte order when arranging data.
+      //
+
+      if (byteOrder == LSBFirst)
+      {
+        data[0] = (unsigned char) (pixel & 0xff);
+        data[1] = (unsigned char) ((pixel >> 8) & 0xff);
+      }
+      else
+      {
+        data[1] = (unsigned char) (pixel & 0xff);
+        data[0] = (unsigned char) ((pixel >> 8) & 0xff);
+      }
+
+      data += 2;
+    }
+
+    //
+    // Move data at the beginning of the
+    // next line.
+    //
+
+    data = data + (RoundUp4(w * 2) - w * 2);
+
+    dy++;
+  }
+
+  AbortDecompressJpeg16:
+
+  if (jpegError == 0)
+  {
+    jpeg_finish_decompress(&cinfo);
+  }
+
+  jpeg_destroy_decompress(&cinfo);
+
+  if (jpegError == 1)
+  {
+    #ifdef PANIC
+    *logofs << "DecompressJpeg16: Failed to decompress JPEG image.\n"
+            << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  #ifdef TEST
+  *logofs << "DecompressJpeg16: Decompression finished with "
+          << dy << " lines handled.\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int DecompressJpeg24(unsigned char *compressedData, int compressedLen,
+                         unsigned int w, unsigned int h, unsigned char *dstBuf, int byteOrder)
+{
+  struct jpeg_decompress_struct cinfo;
+  struct jpeg_error_mgr jerr;
+  CARD8 *pixelPtr = NULL;
+  JSAMPROW rowPointer[1];
+
+  unsigned int dx = 0;
+  unsigned int dy = 0;
+
+  #ifdef TEST
+  *logofs << "DecompressJpeg24: Decompressing with length "
+          << compressedLen << " width " << w << " height "
+          << h << ".\n" << logofs_flush;
+  #endif
+
+  jpegError = 0;
+
+  cinfo.err = jpeg_std_error(&jerr);
+
+  jerr.error_exit = UnpackJpegErrorHandler;
+
+  if (setjmp(UnpackJpegContext) == 1)
+  {
+    #ifdef TEST
+    *logofs << "DecompressJpeg24: Out of the long jump with error '"
+            << jpegError << "'.\n" << logofs_flush;
+    #endif
+
+    goto AbortDecompressJpeg24;
+  }
+
+  jpeg_create_decompress(&cinfo);
+
+  if (jpegError) goto AbortDecompressJpeg24;
+
+  JpegSetSrcManager(&cinfo, compressedData, compressedLen);
+
+  jpeg_read_header(&cinfo, TRUE);
+
+  if (jpegError) goto AbortDecompressJpeg24;
+
+  cinfo.out_color_space = JCS_RGB;
+
+  jpeg_start_decompress(&cinfo);
+
+  if (jpegError) goto AbortDecompressJpeg24;
+
+  if (cinfo.output_width != w ||
+          cinfo.output_height != h ||
+              cinfo.output_components != 3)
+  {
+    #ifdef PANIC
+    *logofs << "DecompressJpeg24: PANIC! Wrong JPEG data received.\n"
+            << logofs_flush;
+    #endif
+
+    jpeg_destroy_decompress(&cinfo);
+
+    return -1;
+  }
+
+  //
+  // PixelPtr points to dstBuf which is
+  // already padded correctly for the final
+  // image to put.
+  //
+
+  pixelPtr = (CARD8 *) dstBuf;
+
+  rowPointer[0] = (JSAMPROW) tmpBuf;
+
+  while (cinfo.output_scanline < cinfo.output_height)
+  {
+    jpeg_read_scanlines(&cinfo, rowPointer, 1);
+
+    if (jpegError) goto AbortDecompressJpeg24;
+
+    for (dx = 0; dx < w; dx++)
+    {
+      //
+      // Follow the server byte order when arranging data.
+      //
+
+      if (byteOrder == LSBFirst)
+      {
+        pixelPtr[0] = tmpBuf[dx * 3];
+        pixelPtr[1] = tmpBuf[dx * 3 + 1];
+        pixelPtr[2] = tmpBuf[dx * 3 + 2];
+      }
+      else
+      {
+        pixelPtr[2] = tmpBuf[dx * 3];
+        pixelPtr[1] = tmpBuf[dx * 3 + 1];
+        pixelPtr[0] = tmpBuf[dx * 3 + 2];
+      }
+
+      pixelPtr += 3;
+    }
+
+    //
+    // Go to the next line.
+    //
+
+    pixelPtr = (CARD8 *) (((char *) pixelPtr) + (RoundUp4(w * 3) - w * 3));
+
+    dy++;
+  }
+
+  AbortDecompressJpeg24:
+
+  if (jpegError == 0)
+  {
+    jpeg_finish_decompress(&cinfo);
+  }
+
+  jpeg_destroy_decompress(&cinfo);
+
+  if (jpegError == 1)
+  {
+    #ifdef PANIC
+    *logofs << "DecompressJpeg24: Failed to decompress JPEG image.\n"
+            << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  #ifdef TEST
+  *logofs << "DecompressJpeg24: Decompression finished with "
+          << dy << " lines handled.\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int DecompressJpeg32(unsigned char *compressedData, int compressedLen,
+                         unsigned int w, unsigned int h, unsigned char *dstBuf, int byteOrder)
+{
+  struct jpeg_decompress_struct cinfo;
+  struct jpeg_error_mgr jerr;
+  unsigned char *data;
+  JSAMPROW rowPointer[1];
+
+  unsigned int dx = 0;
+  unsigned int dy = 0;
+
+  #ifdef TEST
+  *logofs << "DecompressJpeg32: Decompressing with length "
+          << compressedLen << " width " << w << " height "
+          << h << ".\n" << logofs_flush;
+  #endif
+
+  jpegError = 0;
+
+  cinfo.err = jpeg_std_error(&jerr);
+
+  jerr.error_exit = UnpackJpegErrorHandler;
+
+  if (setjmp(UnpackJpegContext) == 1)
+  {
+    #ifdef TEST
+    *logofs << "DecompressJpeg32: Out of the long jump with error '"
+            << jpegError << "'.\n" << logofs_flush;
+    #endif
+
+    goto AbortDecompressJpeg32;
+  }
+
+  jpeg_create_decompress(&cinfo);
+
+  if (jpegError) goto AbortDecompressJpeg32;
+
+  JpegSetSrcManager(&cinfo, compressedData, compressedLen);
+
+  jpeg_read_header(&cinfo, TRUE);
+
+  if (jpegError) goto AbortDecompressJpeg32;
+
+  cinfo.out_color_space = JCS_RGB;
+
+  jpeg_start_decompress(&cinfo);
+
+  if (jpegError) goto AbortDecompressJpeg32;
+
+  if (cinfo.output_width != w ||
+          cinfo.output_height != h ||
+              cinfo.output_components != 3)
+  {
+    #ifdef PANIC
+    *logofs << "DecompressJpeg32 : PANIC! Wrong JPEG data received.\n"
+            << logofs_flush;
+    #endif
+
+    jpeg_destroy_decompress(&cinfo);
+
+    return -1;
+  }
+
+  //
+  // PixelPtr points to dstBuf which is
+  // already padded correctly for the final
+  // image to put
+  //
+
+  data = dstBuf;
+
+  rowPointer[0] = (JSAMPROW) tmpBuf;
+  
+  unsigned long pixel;
+
+  int i;
+
+  while (cinfo.output_scanline < cinfo.output_height)
+  {
+    jpeg_read_scanlines(&cinfo, rowPointer, 1);
+
+    if (jpegError) goto AbortDecompressJpeg32;
+
+    for (dx = 0; dx < w; dx++)
+    {
+      pixel = RGB24_TO_PIXEL(32, tmpBuf[dx * 3], tmpBuf[dx * 3 + 1],
+                                 tmpBuf[dx * 3 + 2]);
+
+      //
+      // Follow the server byte order when arranging data.
+      //
+
+      if (byteOrder == LSBFirst)
+      {
+        for (i = 0; i < 4; i++)
+        {
+          data[i] = (unsigned char)(pixel & 0xff);
+          pixel >>= 8;
+        }
+      }
+      else
+      {
+        for (i = 3; i >= 0; i--)
+        {
+          data[i] = (unsigned char) (pixel & 0xff);
+          pixel >>= 8;
+        }
+      }
+
+      data += 4;
+    }
+
+    dy++;
+  }
+
+  AbortDecompressJpeg32:
+
+  if (jpegError == 0)
+  {
+    jpeg_finish_decompress(&cinfo);
+  }
+
+  jpeg_destroy_decompress(&cinfo);
+
+  if (jpegError == 1)
+  {
+    #ifdef PANIC
+    *logofs << "DecompressJpeg32: Failed to decompress JPEG image.\n"
+            << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  #ifdef TEST
+  *logofs << "DecompressJpeg32: Decompression finished with "
+          << dy << " lines handled.\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+static void JpegInitSource(j_decompress_ptr cinfo)
+{
+  jpegError = 0;
+}
+
+static boolean JpegFillInputBuffer(j_decompress_ptr cinfo)
+{
+  jpegError = 1;
+
+  jpegSrcManager.bytes_in_buffer = jpegBufferLen;
+  jpegSrcManager.next_input_byte = (JOCTET *)jpegBufferPtr;
+
+  return TRUE;
+}
+
+static void JpegSkipInputData(j_decompress_ptr cinfo, long num_bytes)
+{
+  if (num_bytes < 0 || (unsigned long) num_bytes > jpegSrcManager.bytes_in_buffer)
+  {
+    jpegError = 1;
+
+    jpegSrcManager.bytes_in_buffer = jpegBufferLen;
+    jpegSrcManager.next_input_byte = (JOCTET *)jpegBufferPtr;
+  }
+  else
+  {
+    jpegSrcManager.next_input_byte += (size_t) num_bytes;
+    jpegSrcManager.bytes_in_buffer -= (size_t) num_bytes;
+  }
+}
+
+static void JpegTermSource(j_decompress_ptr cinfo)
+{
+}
+
+static void JpegSetSrcManager(j_decompress_ptr cinfo,
+                                  CARD8 *compressedData,
+                                      int compressedLen)
+{
+  jpegBufferPtr = (JOCTET *) compressedData;
+  jpegBufferLen = (size_t) compressedLen;
+
+  jpegSrcManager.init_source       = JpegInitSource;
+  jpegSrcManager.fill_input_buffer = JpegFillInputBuffer;
+  jpegSrcManager.skip_input_data   = JpegSkipInputData;
+  jpegSrcManager.resync_to_restart = jpeg_resync_to_restart;
+  jpegSrcManager.term_source       = JpegTermSource;
+  jpegSrcManager.next_input_byte   = jpegBufferPtr;
+  jpegSrcManager.bytes_in_buffer   = jpegBufferLen;
+
+  cinfo->src = &jpegSrcManager;
+}
diff --git a/nxcomp/src/Jpeg.h b/nxcomp/src/Jpeg.h
new file mode 100644
index 000000000..58a5bffef
--- /dev/null
+++ b/nxcomp/src/Jpeg.h
@@ -0,0 +1,36 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef Jpeg_H
+#define Jpeg_H
+
+#include "Misc.h"
+#include "Unpack.h"
+
+int UnpackJpeg(T_geometry *geometry, unsigned char method, unsigned char *srcData,
+                   int srcSize, int dstBpp, int dstWidth, int dstHeight,
+                       unsigned char *dstData, int dstSize);
+
+#endif /* Jpeg_H */
diff --git a/nxcomp/src/Keeper.cpp b/nxcomp/src/Keeper.cpp
new file mode 100644
index 000000000..4babbe8a6
--- /dev/null
+++ b/nxcomp/src/Keeper.cpp
@@ -0,0 +1,612 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <dirent.h>
+
+#include "Keeper.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+//
+// Remove the directory if it's empty
+// since more than 30 * 24 h.
+//
+
+#define EMPTY_DIR_TIME  2592000
+
+//
+// Sleep once any ONCE entries.
+//
+
+#define ONCE  2
+
+//
+// Define this to trace messages while
+// they are allocated and deallocated.
+//
+
+#undef REFERENCES
+
+//
+// This is used for reference count.
+//
+
+#ifdef REFERENCES
+
+int File::references_ = 0;
+
+#endif
+
+bool T_older::operator () (File *a, File *b) const
+{
+  return a -> compare(b);
+}
+
+File::File()
+{
+  name_ = NULL;
+
+  size_ = 0;
+  time_ = 0;
+
+  #ifdef REFERENCES
+
+  references_++;
+
+  *logofs << "Keeper: Created new File at "
+          << this << " out of " << references_
+          << " allocated references.\n"
+          << logofs_flush;
+
+  #endif
+}
+
+//
+// TODO: This class can leak industrial amounts of memory.
+// I'm 100% sure that the desctructor is called and that
+// also the string pointed in the File structure is dele-
+// ted. Everything is logged, but still the memory is not
+// freed. This is less a problem on Windows, where the me-
+// mory occupation remains almost constant. Obviously the
+// problem lies in the STL allocators of the GNU libstc++.
+//
+
+File::~File()
+{
+  #ifdef TEST
+  *logofs << "Keeper: Deleting name for File at "
+          << this << ".\n" << logofs_flush;
+  #endif
+
+  delete [] name_;
+
+  #ifdef REFERENCES
+
+  *logofs << "Keeper: Deleted File at " 
+          << this << " out of " << references_ 
+          << " allocated references.\n"
+          << logofs_flush;
+
+  references_--;
+
+  #endif
+}
+
+bool File::compare(File *b) const
+{
+  if (this -> time_ == b -> time_)
+  {
+    return (this -> size_ < b -> size_);
+  }
+
+  return (this -> time_ < b -> time_);
+}
+
+Keeper::Keeper(int caches, int images, const char *root,
+                   int sleep, int parent)
+{
+  caches_ = caches;
+  images_ = images;
+  sleep_  = sleep;
+  parent_ = parent;
+
+  root_ = new char[strlen(root) + 1];
+
+  strcpy(root_, root);
+
+  total_  = 0;
+  signal_ = 0;
+
+  files_ = new T_files;
+}
+
+Keeper::~Keeper()
+{
+  empty();
+
+  delete files_;
+
+  delete [] root_;
+}
+
+int Keeper::cleanupCaches()
+{
+  #ifdef TEST
+  *logofs << "Keeper: Looking for cache directories in '"
+          << root_ << "'.\n" << logofs_flush;
+  #endif
+
+  DIR *rootDir = opendir(root_);
+
+  if (rootDir != NULL)
+  {
+    dirent *dirEntry;
+
+    struct stat fileStat;
+
+    int baseSize = strlen(root_);
+
+    int s = 0;
+
+    while (((dirEntry = readdir(rootDir)) != NULL))
+    {
+      if (s++ % ONCE == 0) usleep(sleep_ * 1000);
+
+      if (signal_ != 0) break;
+
+      if (strcmp(dirEntry -> d_name, "cache") == 0 ||
+              strncmp(dirEntry -> d_name, "cache-", 6) == 0)
+      {
+        char *dirName = new char[baseSize + strlen(dirEntry -> d_name) + 2];
+
+        if (dirName == NULL)
+        {
+          #ifdef WARNING
+          *logofs << "Keeper: WARNING! Can't check directory entry '"
+                  << dirEntry -> d_name << "'.\n" << logofs_flush;
+          #endif
+
+          delete [] dirName;
+
+          continue;
+        }
+
+        strcpy(dirName, root_);
+        strcpy(dirName + baseSize, "/");
+        strcpy(dirName + baseSize + 1, dirEntry -> d_name);
+
+        #ifdef TEST
+        *logofs << "Keeper: Checking directory '" << dirName
+                << "'.\n" << logofs_flush;
+        #endif
+
+        if (stat(dirName, &fileStat) == 0 &&
+                S_ISDIR(fileStat.st_mode) != 0)
+        {
+          //
+          // Add to repository all the "C-" and
+          // "S-" files in the given directory.
+          //
+
+          collect(dirName);
+        }
+
+        delete [] dirName;
+      }
+    }
+
+    closedir(rootDir);
+  }
+  else
+  {
+    #ifdef WARNING
+    *logofs << "Keeper: WARNING! Can't open NX root directory '"
+            << root_ << "'. Error is " << EGET() << " '"
+            << ESTR() << "'.\n" << logofs_flush;
+     #endif
+
+     cerr << "Warning" << ": Can't open NX root directory '"
+          << root_ << "'. Error is " << EGET() << " '"
+          << ESTR() << "'.\n";
+  }
+
+  //
+  // Remove older files.
+  //
+
+  cleanup(caches_);
+
+  //
+  // Empty the repository.
+  //
+
+  empty();
+
+  return 1;
+}
+
+int Keeper::cleanupImages()
+{
+  #ifdef TEST
+  *logofs << "Keeper: Looking for image directory in '"
+          << root_ << "'.\n" << logofs_flush;
+  #endif
+
+  char *imagesPath = new char[strlen(root_) + strlen("/images") + 1];
+
+  if (imagesPath == NULL)
+  {
+    return -1;
+  }
+
+  strcpy(imagesPath, root_);
+  strcat(imagesPath, "/images");
+
+  //
+  // Check if the cache directory does exist.
+  //
+
+  struct stat dirStat;
+
+  if (stat(imagesPath, &dirStat) == -1)
+  {
+    #ifdef WARNING
+    *logofs << "Keeper: WARNING! Can't stat NX images cache directory '"
+            << imagesPath << ". Error is " << EGET() << " '"
+            << ESTR() << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Warning" << ": Can't stat NX images cache directory '"
+         << imagesPath << ". Error is " << EGET() << " '"
+         << ESTR() << "'.\n";
+
+    delete [] imagesPath;
+
+    return -1;
+  }
+
+  //
+  // Check any of the 16 directories in the
+  // images root path.
+  //
+
+  char *digitPath = new char[strlen(imagesPath) + 5];
+
+  strcpy(digitPath, imagesPath);
+
+  for (char digit = 0; digit < 16; digit++)
+  {
+    //
+    // Give up if we received a signal or
+    // our parent is gone.
+    //
+
+    if (signal_ != 0)
+    {
+      #ifdef TEST
+      *logofs << "Keeper: Signal detected. Aborting.\n"
+              << logofs_flush;
+      #endif
+
+      goto KeeperCleanupImagesAbort;
+    }
+    else if (parent_ != getppid() || parent_ == 1)
+    {
+      #ifdef WARNING
+      *logofs << "Keeper: WARNING! Parent process appears "
+              << "to be dead. Returning.\n"
+              << logofs_flush;
+      #endif
+
+      goto KeeperCleanupImagesAbort;
+
+      return 0;
+    }
+
+    sprintf(digitPath + strlen(imagesPath), "/I-%01X", digit);
+
+    //
+    // Add to the repository all the files
+    // in the given directory.
+    //
+
+    collect(digitPath);
+  }
+
+  delete [] imagesPath;
+  delete [] digitPath;
+
+  //
+  // Remove the oldest files.
+  //
+
+  cleanup(images_);
+
+  //
+  // Empty the repository.
+  //
+
+  empty();
+
+  return 1;
+
+KeeperCleanupImagesAbort:
+
+  delete [] imagesPath;
+  delete [] digitPath;
+
+  empty();
+
+  return 0;
+}
+
+int Keeper::collect(const char *path)
+{
+  #ifdef TEST
+  *logofs << "Keeper: Looking for files in directory '"
+          << path << "'.\n" << logofs_flush;
+  #endif
+
+  DIR *cacheDir = opendir(path);
+
+  if (cacheDir != NULL)
+  {
+    File *file;
+
+    dirent *dirEntry;
+
+    struct stat fileStat;
+
+    int baseSize = strlen(path);
+    int fileSize = baseSize + 3 + MD5_LENGTH * 2 + 1;
+
+    int n = 0;
+    int s = 0;
+
+    while (((dirEntry = readdir(cacheDir)) != NULL))
+    {
+      if (s++ % ONCE == 0) usleep(sleep_ * 1000);
+
+      if (signal_ != 0) break;
+
+      if (strcmp(dirEntry -> d_name, ".") == 0 ||
+              strcmp(dirEntry -> d_name, "..") == 0)
+      {
+        continue;
+      }      
+
+      n++;
+
+      if (strlen(dirEntry -> d_name) == (MD5_LENGTH * 2 + 2) &&
+              (strncmp(dirEntry -> d_name, "I-", 2) == 0 ||
+                  strncmp(dirEntry -> d_name, "S-", 2) == 0 ||
+                      strncmp(dirEntry -> d_name, "C-", 2) == 0))
+      {
+        file = new File();
+
+        char *fileName = new char[fileSize];
+
+        if (file == NULL || fileName == NULL)
+        {
+          #ifdef WARNING
+          *logofs << "Keeper: WARNING! Can't add file '"
+                  << dirEntry -> d_name << "' to repository.\n"
+                  << logofs_flush;
+          #endif
+
+          delete [] fileName;
+
+          delete file;
+
+          continue;
+        }
+
+        strcpy(fileName, path);
+        strcpy(fileName + baseSize, "/");
+        strcpy(fileName + baseSize + 1, dirEntry -> d_name);
+
+        file -> name_ = fileName;
+
+        #ifdef DEBUG
+        *logofs << "Keeper: Adding file '" << file -> name_
+                << "'.\n" << logofs_flush;
+        #endif
+
+        if (stat(file -> name_, &fileStat) == -1)
+        {
+          #ifdef WARNING
+          *logofs << "Keeper: WARNING! Can't stat NX file '"
+                  << file -> name_ << ". Error is " << EGET()
+                  << " '" << ESTR() << "'.\n"
+                  << logofs_flush;
+          #endif
+
+          delete file;
+
+          continue;
+        }
+
+        file -> size_ = fileStat.st_size;
+        file -> time_ = fileStat.st_mtime;
+
+        files_ -> insert(T_files::value_type(file));
+
+        total_ += file -> size_;
+      }
+    }
+
+    closedir(cacheDir);
+
+    if (n == 0)
+    {
+      time_t now = time(NULL);
+
+      if (now > 0 && stat(path, &fileStat) == 0)
+      {
+        #ifdef TEST
+        *logofs << "Keeper: Empty NX subdirectory '" << path
+                << "' unused since " << now - fileStat.st_mtime
+                << " S.\n" << logofs_flush;
+        #endif
+
+        if (now - fileStat.st_mtime > EMPTY_DIR_TIME)
+        {
+          #ifdef TEST
+          *logofs << "Keeper: Removing empty NX subdirectory '"
+                  << path << "'.\n" << logofs_flush;
+          #endif
+
+          rmdir(path);
+        }
+      }
+    }
+  }
+  else
+  {
+    #ifdef WARNING
+    *logofs << "Keeper: WARNING! Can't open NX subdirectory '"
+            << path << ". Error is " << EGET() << " '" << ESTR()
+            << "'.\n" << logofs_flush;
+     #endif
+
+     cerr << "Warning" << ": Can't open NX subdirectory '"
+          << path << ". Error is " << EGET() << " '" << ESTR()
+          << "'.\n";
+  }
+
+  return 1;
+}
+
+int Keeper::cleanup(int threshold)
+{
+  #ifdef TEST
+  *logofs << "Keeper: Deleting the oldest files with "
+          << files_ -> size() << " elements threshold "
+          << threshold << " and size " << total_ << ".\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // At least some versions of the standard
+  // library don't allow erasing an element
+  // while looping. This is not the most ef-
+  // ficient way to release the objects, but
+  // it's better than making a copy of the
+  // container.
+  //
+
+  while (total_ > threshold && files_ -> size() > 0)
+  {
+    T_files::iterator i = files_ -> begin();
+
+    File *file = *i;
+
+    #ifdef TEST
+    *logofs << "Keeper: Removing '" << file -> name_
+            << "' with time " << file -> time_ << " and size "
+            << file -> size_ << ".\n" << logofs_flush;
+    #endif
+
+    unlink(file -> name_);
+
+    total_ -= file -> size_;
+
+    #ifdef DEBUG
+    *logofs << "Keeper: Going to delete the file at "
+            << file << " while cleaning up.\n"
+            << logofs_flush;
+    #endif
+
+    delete file;
+
+    #ifdef DEBUG
+    *logofs << "Keeper: Going to erase the element "
+            << "while cleaning up.\n"
+            << logofs_flush;
+    #endif
+
+    files_ -> erase(i);
+  }
+
+  #ifdef TEST
+  *logofs << "Keeper: Bytes in repository are "
+          << total_ << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void Keeper::empty()
+{
+  #ifdef TEST
+  *logofs << "Keeper: Getting rid of files in repository.\n"
+          << logofs_flush;
+  #endif
+
+  while (files_ -> size() > 0)
+  {
+    T_files::iterator i = files_ -> begin();
+
+    File *file = *i;
+
+    #ifdef DEBUG
+    *logofs << "Keeper: Going to delete the file at "
+            << file << " while emptying.\n"
+            << logofs_flush;
+    #endif
+
+    delete file;
+
+    #ifdef DEBUG
+    *logofs << "Keeper: Going to erase the element "
+            << "while emptying.\n"
+            << logofs_flush;
+    #endif
+
+    files_ -> erase(i);
+  }
+
+  total_ = 0;
+
+  #ifdef TEST
+  *logofs << "Keeper: Bytes in repository are "
+          << total_ << ".\n" << logofs_flush;
+  #endif
+}
diff --git a/nxcomp/src/Keeper.h b/nxcomp/src/Keeper.h
new file mode 100644
index 000000000..b440beceb
--- /dev/null
+++ b/nxcomp/src/Keeper.h
@@ -0,0 +1,199 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef Keeper_H
+#define Keeper_H
+
+#include "Misc.h"
+#include "Types.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+//
+// Define this to check how many file
+// nodes are allocated and deallocated.
+//
+
+#undef  REFERENCES
+
+class Keeper;
+
+class File
+{
+  friend class Keeper;
+
+  public:
+
+  File();
+
+  ~File();
+
+  //
+  // Allow sort by time and size. If time
+  // is the same, keep the bigger element.
+  //
+
+  bool compare(File *b) const;
+
+  private:
+
+  char *name_;
+
+  int    size_;
+  time_t time_;
+
+  #ifdef REFERENCES
+
+  static int references_;
+
+  #endif
+};
+
+class Keeper
+{
+  public:
+
+  Keeper(int caches, int images, const char *root,
+             int sleep, int parent);
+
+  ~Keeper();
+
+  //
+  // Call this just once.
+  //
+
+  int cleanupCaches();
+
+  //
+  // Call this at any given interval.
+  //
+
+  int cleanupImages();
+
+  //
+  // Call this if it's time to exit.
+  //
+
+  void setSignal(int signal)
+  {
+    signal_ = signal;
+  }
+
+  int getSignal()
+  {
+    return signal_;
+  }
+
+  int getParent()
+  {
+    return parent_;
+  }
+
+  private:
+
+  //
+  // Get a list of files in directory.
+  //
+  
+  int collect(const char *path);
+
+  //
+  // Sort the collected files according to
+  // last modification time and delete the
+  // older ones until disk size is below
+  // the threshold.
+  //
+
+  int cleanup(int threshold);
+
+  //
+  // Empty the files repository.
+  //
+
+  void empty();
+
+  //
+  // Size in bytes of total allowed
+  // storage for persistent caches.
+  //
+
+  int caches_;
+
+  //
+  // Size in bytes of total allowed
+  // storage for images cache.
+  //
+
+  int images_;
+
+  //
+  // Path of the NX root directory.
+  //
+
+  char *root_;
+
+  //
+  // The little delay to be introduced
+  // before reading a new entry.
+  //
+
+  int sleep_;
+
+  //
+  // Total size of files in repository.
+  //
+
+  int total_;
+
+  //
+  // The parent process, so we can exit
+  // if it is gone.
+  //
+
+  int parent_;
+
+  //
+  // Set if we need to give up because
+  // of a signal.
+  //
+
+  int signal_;
+
+  //
+  // Repository where to collect files.
+  //
+
+  T_files *files_;
+};
+
+#endif /* Keeper_H */
+
diff --git a/nxcomp/src/List.cpp b/nxcomp/src/List.cpp
new file mode 100644
index 000000000..b2db7151c
--- /dev/null
+++ b/nxcomp/src/List.cpp
@@ -0,0 +1,112 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "List.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+//
+// Define this to know how many instances
+// are allocated and deallocated.
+//
+
+#undef  REFERENCES
+
+#ifdef REFERENCES
+
+int List::references_ = 0;
+
+#endif
+
+List::List()
+{
+  #ifdef REFERENCES
+
+  references_++;
+
+  *logofs << "List: Created new List at " 
+          << this << " out of " << references_ 
+          << " allocated references.\n" << logofs_flush;
+  #endif
+}
+
+List::~List()
+{
+  #ifdef REFERENCES
+
+  references_--;
+
+  *logofs << "List: Deleted List at " 
+          << this << " out of " << references_ 
+          << " allocated references.\n" << logofs_flush;
+  #endif
+}
+
+void List::remove(int value)
+{
+  for (T_list::iterator i = list_.begin(); i != list_.end(); i++)
+  {
+    if (*i == value)
+    {
+      list_.erase(i);
+
+      return;
+    }
+  }
+
+  #ifdef PANIC
+  *logofs << "List: PANIC! Should not try to remove "
+          << "an element not found in the list.\n"
+          << logofs_flush;
+  #endif
+
+  cerr << "Error" << ": Should not try to remove "
+       << "an element not found in the list.\n";
+
+  HandleAbort();
+}
+
+void List::rotate()
+{
+  if (list_.size() > 1)
+  {
+    int value = *(list_.begin());
+
+    list_.pop_front();
+
+    list_.push_back(value);
+  }
+}
diff --git a/nxcomp/src/List.h b/nxcomp/src/List.h
new file mode 100644
index 000000000..31c80f835
--- /dev/null
+++ b/nxcomp/src/List.h
@@ -0,0 +1,95 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef List_H
+#define List_H
+
+#include "Misc.h"
+#include "Types.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+//
+// Define this to log when lists are
+// allocated and deallocated.
+//
+
+#undef  REFERENCES
+
+class List
+{
+  public:
+
+  List();
+
+  ~List();
+
+  int getSize()
+  {
+    return list_.size();
+  }
+
+  T_list &getList()
+  {
+    return list_;
+  }
+
+  T_list copyList()
+  {
+    return list_;
+  }
+
+  void add(int value)
+  {
+    list_.push_back(value);
+  }
+
+  void remove(int value);
+
+  void rotate();
+
+  private:
+
+  //
+  // The list container.
+  //
+
+  T_list list_;
+
+  #ifdef REFERENCES
+
+  static int references_;
+
+  #endif
+};
+
+#endif /* List_H */
diff --git a/nxcomp/src/ListFontsReply.cpp b/nxcomp/src/ListFontsReply.cpp
new file mode 100644
index 000000000..16be522a1
--- /dev/null
+++ b/nxcomp/src/ListFontsReply.cpp
@@ -0,0 +1,213 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "ListFontsReply.h"
+
+#include "ServerCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  DUMP
+#undef  TEST
+#undef  DEBUG
+
+ListFontsReplyStore::ListFontsReplyStore(StaticCompressor *compressor)
+
+  : MessageStore(compressor)
+{
+  enableCache    = LISTFONTSREPLY_ENABLE_CACHE;
+  enableData     = LISTFONTSREPLY_ENABLE_DATA;
+  enableSplit    = LISTFONTSREPLY_ENABLE_SPLIT;
+
+  // Since ProtoStep7 (#issue 108)
+  enableCompress = LISTFONTSREPLY_ENABLE_COMPRESS_IF_PROTO_STEP_7;
+
+  dataLimit  = LISTFONTSREPLY_DATA_LIMIT;
+  dataOffset = LISTFONTSREPLY_DATA_OFFSET;
+
+  cacheSlots          = LISTFONTSREPLY_CACHE_SLOTS;
+  cacheThreshold      = LISTFONTSREPLY_CACHE_THRESHOLD;
+  cacheLowerThreshold = LISTFONTSREPLY_CACHE_LOWER_THRESHOLD;
+
+  messages_ -> resize(cacheSlots);
+
+  for (T_messages::iterator i = messages_ -> begin();
+           i < messages_ -> end(); i++)
+  {
+    *i = NULL;
+  }
+
+  temporary_ = NULL;
+}
+
+ListFontsReplyStore::~ListFontsReplyStore()
+{
+  for (T_messages::iterator i = messages_ -> begin();
+           i < messages_ -> end(); i++)
+  {
+    destroy(*i);
+  }
+
+  destroy(temporary_);
+}
+
+//
+// Here are the methods to handle messages' content.
+//
+
+int ListFontsReplyStore::parseIdentity(Message *message, const unsigned char *buffer,
+                                           unsigned int size, int bigEndian) const
+{
+  ListFontsReplyMessage *listFontsReply = (ListFontsReplyMessage *) message;
+
+  //
+  // Here is the fingerprint.
+  //
+
+  listFontsReply -> number_of_names = GetUINT(buffer + 8, bigEndian);
+
+  //
+  // Clean up padding bytes.
+  //
+
+  if ((int) size > dataOffset)
+  {
+    unsigned int current;
+    unsigned int length;
+    unsigned int nstringInNames; 
+
+    unsigned char *end = NULL;
+    unsigned char *pad = NULL;
+
+    #ifdef DUMP
+
+    *logofs << "\n" << logofs_flush;
+
+    *logofs << "Number of STRING8 " << listFontsReply -> number_of_names << ".\n" << logofs_flush;
+
+    *logofs << "Size " << size << ".\n" << logofs_flush;
+
+    DumpHexData(buffer, size);
+
+    *logofs << "\n" << logofs_flush;
+
+    #endif
+
+    length = LISTFONTSREPLY_DATA_OFFSET;
+
+    for (nstringInNames = 0; 
+             nstringInNames < listFontsReply -> number_of_names &&
+                 listFontsReply -> number_of_names > 0;
+                     nstringInNames++)
+    {
+      //
+      // Start with offset LISTFONTSREPLY_DATA_OFFSET 32.
+      //
+
+      current = buffer[length];
+
+      length += current + 1;
+
+      #ifdef DUMP
+      *logofs << "\nString number : " << nstringInNames << " Current length : "
+              << current << "\n" << logofs_flush;
+      #endif
+    }
+    
+    #ifdef DUMP
+    *logofs << "\nFinal length " << length << "\n" << logofs_flush;
+    #endif
+
+    end = ((unsigned char *) buffer) + size;
+
+    for (pad = ((unsigned char *) buffer) + length; pad < end; pad++)
+    {
+      *pad = 0;
+
+      #ifdef DUMP
+      *logofs << "\nPadding ." << "\n" << logofs_flush;
+      #endif
+    }
+  }
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsed identity for message at " << message << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int ListFontsReplyStore::unparseIdentity(const Message *message, unsigned char *buffer,
+                                            unsigned int size, int bigEndian) const
+{
+  ListFontsReplyMessage *listFontsReply = (ListFontsReplyMessage *) message;
+
+  //
+  // Fill all the message's fields.
+  //
+
+  PutUINT(listFontsReply -> number_of_names, buffer + 8, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsed identity for message at "
+          << message << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void ListFontsReplyStore::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  ListFontsReplyMessage *listFontsReply = (ListFontsReplyMessage *) message;
+
+  *logofs << name() << ": Identity number_of_names "
+          << listFontsReply -> number_of_names << ", size "
+          << listFontsReply -> size_ << ".\n";
+
+  #endif
+}
+
+void ListFontsReplyStore::identityChecksum(const Message *message, const unsigned char *buffer,
+                                               unsigned int size, int bigEndian) const
+{
+  //
+  // Field number_of_names.
+  //
+
+  md5_append(md5_state_, buffer + 8,  2);
+}
diff --git a/nxcomp/src/ListFontsReply.h b/nxcomp/src/ListFontsReply.h
new file mode 100644
index 000000000..c731878e0
--- /dev/null
+++ b/nxcomp/src/ListFontsReply.h
@@ -0,0 +1,146 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef ListFontsReply_H
+#define ListFontsReply_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+
+#define LISTFONTSREPLY_ENABLE_CACHE                       1
+#define LISTFONTSREPLY_ENABLE_DATA                        1
+#define LISTFONTSREPLY_ENABLE_SPLIT                       0
+
+#define LISTFONTSREPLY_DATA_LIMIT                         1048576 - 32
+#define LISTFONTSREPLY_DATA_OFFSET                        32
+
+#define LISTFONTSREPLY_CACHE_SLOTS                        200
+#define LISTFONTSREPLY_CACHE_THRESHOLD                    20
+#define LISTFONTSREPLY_CACHE_LOWER_THRESHOLD              5
+
+#define LISTFONTSREPLY_ENABLE_COMPRESS_IF_PROTO_STEP_7    0
+
+//
+// The message class.
+//
+
+class ListFontsReplyMessage : public Message
+{
+  friend class ListFontsReplyStore;
+
+  public:
+
+  ListFontsReplyMessage()
+  {
+  }
+
+  ~ListFontsReplyMessage()
+  {
+  }
+
+  //
+  // Put here the fields which constitute 
+  // the 'identity' part of the message.
+  //
+
+  private:
+
+  unsigned short int number_of_names;
+};
+
+class ListFontsReplyStore : public MessageStore
+{
+  //
+  // Constructors and destructors.
+  //
+
+  public:
+
+  ListFontsReplyStore(StaticCompressor *compressor);
+
+  virtual ~ListFontsReplyStore();
+
+  virtual const char *name() const
+  {
+    return "ListFontsReply";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return X_ListFonts;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(ListFontsReplyMessage);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  protected:
+
+  virtual Message *create() const
+  {
+    return new ListFontsReplyMessage();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new ListFontsReplyMessage((const ListFontsReplyMessage &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (ListFontsReplyMessage *) message;
+  }
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer, 
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer, 
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer, 
+                                    unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+};
+
+#endif /* ListFontsReply_H */
diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
new file mode 100644
index 000000000..238e503b7
--- /dev/null
+++ b/nxcomp/src/Loop.cpp
@@ -0,0 +1,16693 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <errno.h>
+#include <signal.h>
+#include <setjmp.h>
+
+#include <math.h>
+#include <ctype.h>
+#include <string.h>
+#include <dirent.h>
+#include <pwd.h>
+
+#include <fcntl.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <sys/resource.h>
+#include <sys/utsname.h>
+#include <sys/un.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+#include "Misc.h"
+
+#ifdef __sun
+#include <strings.h>
+#endif
+
+//
+// MacOSX 10.4 defines socklen_t. This is
+// intended to ensure compatibility with
+// older versions.
+//
+
+#ifdef __APPLE__
+#include <AvailabilityMacros.h>
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_3
+typedef int socklen_t;
+#endif
+#endif
+
+#ifdef _AIX
+#include <strings.h>
+#include <sys/select.h>
+#endif
+
+#ifndef __CYGWIN32__
+#include <netinet/tcp.h>
+#endif
+
+//
+// NX include files.
+//
+
+#include "NX.h"
+#include "NXalert.h"
+
+#include "Misc.h"
+#include "Control.h"
+#include "Socket.h"
+#include "Statistics.h"
+#include "Auth.h"
+#include "Keeper.h"
+#include "Agent.h"
+
+#include "ClientProxy.h"
+#include "ServerProxy.h"
+
+#include "Message.h"
+#include "ChannelEndPoint.h"
+
+//
+// System specific defines.
+//
+
+
+//
+// HP-UX hides this define.
+//
+
+#if defined(hpux) && !defined(RLIM_INFINITY)
+
+#define RLIM_INFINITY  0x7fffffff
+
+#endif
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Enable log output in signal handler.
+// This is likely to hang the proxy at
+// random, at least on Linux.
+//
+
+#undef UNSAFE
+
+//
+// Let all logs go to the standard error.
+// This is useful to interleave the Xlib
+// log output with the proxy output in a
+// single file.
+//
+
+#undef  MIXED
+
+//
+// Define this to check if the client and
+// server caches match at shutdown. This
+// is a test facility as it requires that
+// both proxies are running on the same
+// host.
+//
+
+#undef  MATCH
+
+//
+// If defined, reduce the size of the log
+// file and be sure it never exceeds the
+// limit.
+//
+
+#undef  QUOTA
+
+//
+// If defined, force very strict limits for
+// the proxy tokens and force the proxy to
+// enter often in congestion state.
+//
+
+#undef  STRICT
+
+//
+// Print a line in the log if the time we
+// spent inside the select or handling the
+// messages exceeded a given time value.
+//
+
+#undef  TIME
+
+//
+// This can be useful when testing the forwarding
+// of the SSHD connection by nxssh to the agent.
+// The debug output will go to a well known file
+// that will be opened also by nxssh when BINDER
+// is enabled there.
+//
+
+#undef  BINDER
+
+//
+// Define this to override the limits on
+// the core dump size.
+//
+
+#define COREDUMPS
+
+//
+// Upper limit of pre-allocated buffers
+// for string parameters.
+//
+
+#define DEFAULT_STRING_LENGTH              256
+
+//
+// Maximum length of remote options data
+// passed by peer proxy at startup.
+//
+
+#define DEFAULT_REMOTE_OPTIONS_LENGTH      512
+
+//
+// Maximum length of NX display string.
+//
+
+#define DEFAULT_DISPLAY_OPTIONS_LENGTH     1024
+
+//
+// Maximum number of cache file names to
+// send to the server side.
+//
+
+#define DEFAULT_REMOTE_CACHE_ENTRIES       100
+
+//
+// Maximum length of remote options string
+// that can be received from the peer proxy.
+//
+
+#define MAXIMUM_REMOTE_OPTIONS_LENGTH      4096
+
+//
+// Macro is true if we determined our proxy
+// mode.
+//
+
+#define WE_SET_PROXY_MODE         (control -> ProxyMode != proxy_undefined)
+
+//
+// Macro is true if our side is the one that
+// should connect to remote.
+//
+
+#define WE_INITIATE_CONNECTION    (connectSocket.enabled())
+
+//
+// Is true if we must provide our credentials
+// to the remote peer.
+//
+
+#define WE_PROVIDE_CREDENTIALS    (control -> ProxyMode == proxy_server)
+
+//
+// Is true if we listen for a local forwarder
+// that will tunnel the traffic through a SSH
+// or HTTP link.
+//
+
+#define WE_LISTEN_FORWARDER       (control -> ProxyMode == proxy_server && \
+                                           listenSocket.enabled())
+
+//
+// You must define FLUSH in Misc.h if
+// you want an immediate flush of the
+// log output.
+//
+
+ostream *logofs = NULL;
+
+//
+// Other stream destriptors used for
+// logging.
+//
+
+ostream *statofs = NULL;
+ostream *errofs  = NULL;
+
+//
+// Save standard error's rdbuf here
+// and restore it when exiting.
+//
+
+static streambuf *errsbuf = NULL;
+
+//
+// Allow faults to be recovered by
+// jumping back into the main loop.
+//
+
+jmp_buf context;
+
+//
+// Provide operational parameters.
+//
+
+Control *control = NULL;
+
+//
+// Collect and print statistics.
+//
+
+Statistics *statistics = NULL;
+
+//
+// Keep data for X11 authentication.
+//
+
+Auth *auth = NULL;
+
+//
+// This class makes the hard work.
+//
+
+Proxy *proxy = NULL;
+
+//
+// Used to handle memory-to-memory
+// transport to the X agent.
+//
+
+Agent *agent = NULL;
+
+//
+// The image cache house-keeping class.
+//
+
+Keeper *keeper = NULL;
+
+//
+// Callback set by the child process
+// to be notified about signals.
+//
+
+int (*handler)(int) = NULL;
+
+//
+// Signal handling functions.
+//
+
+void DisableSignals();
+void EnableSignals();
+void InstallSignals();
+
+static void RestoreSignals();
+static void HandleSignal(int signal);
+
+//
+// Signal handling utilities.
+//
+
+static void InstallSignal(int signal, int action);
+static void RestoreSignal(int signal);
+
+static int HandleChildren();
+
+int HandleChild(int child);
+static int CheckChild(int pid, int status);
+static int WaitChild(int child, const char *label, int force);
+
+int CheckParent(const char *name, const char *type, int parent);
+
+void RegisterChild(int child);
+
+static int CheckAbort();
+
+//
+// Timer handling utilities.
+//
+
+void SetTimer(int timeout);
+void ResetTimer();
+
+static void HandleTimer(int signal);
+
+//
+// Kill or check a running child.
+//
+
+static int KillProcess(int pid, const char *label, int signal, int wait);
+static int CheckProcess(int pid, const char *label);
+
+//
+// Macros used to test the pid of a child.
+//
+
+#define IsFailed(pid)       ((pid) < 0)
+#define IsRunning(pid)      ((pid) > 1)
+#define IsNotRunning(pid)   ((pid) == 0)
+#define IsRestarting(pid)   ((pid) == 1)
+
+#define SetNotRunning(pid)  ((pid) = 0)
+#define SetRestarting(pid)  ((pid) = 1)
+
+//
+// Start or restart the house-keeper process.
+//
+
+static int StartKeeper();
+
+//
+// Cleanup functions.
+//
+
+void CleanupConnections();
+void CleanupListeners();
+void CleanupSockets();
+void CleanupGlobal();
+
+static void CleanupChildren();
+static void CleanupLocal();
+static void CleanupKeeper();
+static void CleanupStreams();
+
+//
+// Loop forever until the connections
+// to the peer proxy is dropped.
+//
+
+static void WaitCleanup();
+
+//
+// Initialization functions.
+//
+
+static int InitBeforeNegotiation();
+static int SetupProxyConnection();
+static int InitAfterNegotiation();
+static int SetupProxyInstance();
+static int SetupAuthInstance();
+static int SetupAgentInstance();
+
+static int SetupTcpSocket();
+static int SetupUnixSocket();
+static int SetupServiceSockets();
+static int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
+                                  unsigned int &xServerAddrLength);
+
+//
+// Setup a listening socket and accept
+// a new connection.
+//
+
+static int ListenConnection(ChannelEndPoint &endPoint, const char *label);
+static int ListenConnectionTCP(const char *host, long port, const char *label);
+static int ListenConnectionUnix(const char *path, const char *label);
+static int ListenConnectionAny(sockaddr *addr, socklen_t addrlen, const char *label);
+static int AcceptConnection(int fd, int domain, const char *label);
+
+//
+// Other convenience functions.
+//
+
+static int PrepareProxyConnectionTCP(char** hostName, long int* portNum, int* timeout, int* proxyFD, int* reason);
+static int PrepareProxyConnectionUnix(char** path, int* timeout, int* proxyFD, int* reason);
+
+static int WaitForRemote(ChannelEndPoint &socketAddress);
+static int ConnectToRemote(ChannelEndPoint &socketAddress);
+
+static int SendProxyOptions(int fd);
+static int SendProxyCaches(int fd);
+static int ReadProxyVersion(int fd);
+static int ReadProxyOptions(int fd);
+static int ReadProxyCaches(int fd);
+static int ReadForwarderVersion(int fd);
+static int ReadForwarderOptions(int fd);
+
+static int ReadRemoteData(int fd, char *buffer, int size, char stop);
+static int WriteLocalData(int fd, const char *buffer, int size);
+
+static void PrintVersionInfo();
+static void PrintProcessInfo();
+static void PrintConnectionInfo();
+static void PrintUsageInfo(const char *option, const int error);
+static void PrintOptionIgnored(const char *type, const char *name, const char *value);
+
+//
+// This is not static to avoid a warning.
+//
+
+void PrintCopyrightInfo();
+
+static const char *GetOptions(const char *options);
+static const char *GetArg(int &argi, int argc, const char **argv);
+static int CheckArg(const char *type, const char *name, const char *value);
+static int ParseArg(const char *type, const char *name, const char *value);
+static int ValidateArg(const char *type, const char *name, const char *value);
+static void SetAndValidateChannelEndPointArg(const char *type, const char *name, const char *value,
+                                             ChannelEndPoint &endPoint);
+static int LowercaseArg(const char *type, const char *name, char *value);
+static int CheckSignal(int signal);
+
+extern "C"
+{
+  int ParseCommandLineOptions(int argc, const char **argv);
+  int ParseEnvironmentOptions(const char *env, int force);
+  int ParseBindOptions(char **host, int *port);
+}
+
+static int ParseFileOptions(const char *file);
+static int ParseRemoteOptions(char *opts);
+static int ParseForwarderOptions(char *opts);
+
+//
+// These functions are used to parse literal
+// values provided by the user and set the
+// control parameters accordingly.
+//
+
+static int ParseLinkOption(const char *opt);
+static int ParseBitrateOption(const char *opt);
+static int ParseCacheOption(const char *opt);
+static int ParseShmemOption(const char *opt);
+static int ParseImagesOption(const char *opt);
+static int ParsePackOption(const char *opt);
+
+//
+// Set host and port where NX proxy is supposed
+// to be listening in case such parameters are
+// given on the command line.
+//
+
+static int ParseHostOption(const char *opt, char *host, long &port);
+
+//
+// Translate a font server port specification
+// to the corresponding Unix socket path.
+//
+
+static int ParseFontPath(char *path);
+
+//
+// Translate a pack method id in a literal.
+//
+
+static int ParsePackMethod(const int method, const int quality);
+
+//
+// Try to increase the size of the allowed
+// core dumps.
+//
+
+static int SetCore();
+
+//
+// Set the proxy mode to either client or
+// server.
+//
+
+static int SetMode(int mode);
+
+//
+// Determine the path of the NX_* directories
+// from the environment.
+//
+
+static int SetDirectories();
+
+//
+// Set the defaults used for the log file and
+// statistics.
+//
+
+static int SetLogs();
+
+//
+// Check if local and remote protocol versions
+// are compatible and, eventually, downgrade
+// local version to the minimum level that is
+// known to work.
+//
+
+static int SetVersion();
+
+//
+// Setup the listening TCP ports used for the
+// additional channels according to user's
+// wishes.
+//
+
+static int SetPorts();
+
+//
+// Set the maximum number of open descriptors.
+//
+
+static int SetDescriptors();
+
+//
+// Set the path used for choosing the cache.
+// It must be selected after determining the
+// session type.
+//
+
+static int SetCaches();
+
+//
+// Initialize, one after the other, all the
+// configuration parameters.
+//
+
+static int SetParameters();
+
+//
+// Set the specific configuration parameter.
+//
+
+static int SetSession();
+static int SetStorage();
+static int SetShmem();
+static int SetPack();
+static int SetImages();
+static int SetLimits();
+
+//
+// Set up the control parameters based on
+// the link speed negotiated between the
+// proxies.
+//
+
+static int SetLink();
+
+static int SetLinkModem();
+static int SetLinkIsdn();
+static int SetLinkAdsl();
+static int SetLinkWan();
+static int SetLinkLan();
+
+//
+// Adjust the compression parameters.
+//
+
+static int SetCompression();
+
+static int SetCompressionModem();
+static int SetCompressionIsdn();
+static int SetCompressionAdsl();
+static int SetCompressionWan();
+static int SetCompressionLan();
+
+//
+// Determine the NX paths based on the
+// user's parameters or the environment.
+//
+
+char *GetClientPath();
+
+static char *GetSystemPath();
+static char *GetHomePath();
+static char *GetTempPath();
+static char *GetRootPath();
+static char *GetCachePath();
+static char *GetImagesPath();
+static char *GetSessionPath();
+static char *GetLastCache(char *list, const char *path);
+
+static int OpenLogFile(char *name, ostream *&stream);
+static int ReopenLogFile(char *name, ostream *&stream, int limit);
+
+//
+// Perform operations on the managed
+// descriptors in the main loop.
+//
+
+static void handleCheckSessionInLoop();
+static void handleCheckBitrateInLoop();
+
+#if defined(TEST) || defined(INFO)
+static void handleCheckSelectInLoop(int &setFDs, fd_set &readSet,
+                                        fd_set &writeSet, T_timestamp selectTs);
+static void handleCheckResultInLoop(int &resultFDs, int &errorFDs, int &setFDs, fd_set &readSet,
+                                        fd_set &writeSet, struct timeval &selectTs,
+                                            struct timeval &startTs);
+static void handleCheckStateInLoop(int &setFDs);
+#endif
+
+static void handleCheckSessionInConnect();
+
+static inline void handleSetReadInLoop(fd_set &readSet, int &setFDs, struct timeval &selectTs);
+static inline void handleSetWriteInLoop(fd_set &writeSet, int &setFDs, struct timeval &selectTs);
+static inline void handleSetListenersInLoop(fd_set &writeSet, int &setFDs);
+static inline void handleSetAgentInLoop(int &setFDs, fd_set &readSet, fd_set &writeSet,
+                                            struct timeval &selectTs);
+
+static void handleAlertInLoop();
+static void handleStatisticsInLoop();
+
+static inline void handleAgentInLoop(int &resultFDs, int &errorFDs, int &setFDs, fd_set &readSet,
+                                         fd_set &writeSet, struct timeval &selectTs);
+static inline void handleAgentLateInLoop(int &resultFDs, int &errorFDs, int &setFDs, fd_set &readSet,
+                                             fd_set &writeSet, struct timeval &selectTs);
+
+static inline void handleReadableInLoop(int &resultFDs, fd_set &readSet);
+static inline void handleWritableInLoop(int &resultFDs, fd_set &writeSet);
+
+static inline void handleRotateInLoop();
+static inline void handleEventsInLoop();
+static inline void handleFlushInLoop();
+
+//
+// Manage the proxy link during the negotiation
+// phase.
+//
+
+static void handleNegotiationInLoop(int &setFDs, fd_set &readSet,
+                                        fd_set &writeSet, T_timestamp &selectTs);
+
+//
+// Print the 'terminating' messages in the
+// session log.
+//
+ 
+static inline void handleTerminatingInLoop();
+static inline void handleTerminatedInLoop();
+
+//
+// Monitor the size of the log file.
+//
+
+static void handleLogReopenInLoop(T_timestamp &logsTs, T_timestamp &nowTs);
+
+//
+// Directory where the NX binaries and libraries reside.
+//
+
+static char systemDir[DEFAULT_STRING_LENGTH] = { 0 };
+
+//
+// Directory used for temporary files.
+//
+
+static char tempDir[DEFAULT_STRING_LENGTH] = { 0 };
+
+//
+// Actually the full path to the client.
+//
+
+static char clientDir[DEFAULT_STRING_LENGTH] = { 0 };
+
+//
+// User's home directory.
+//
+
+static char homeDir[DEFAULT_STRING_LENGTH] = { 0 };
+
+//
+// Root of directory structure to be created by proxy.
+//
+
+static char rootDir[DEFAULT_STRING_LENGTH] = { 0 };
+
+//
+// Root of statistics and log files to be created by proxy.
+//
+
+static char sessionDir[DEFAULT_STRING_LENGTH] = { 0 };
+
+//
+// Log files for errors and statistics. Error log is
+// the place where we print also debug informations.
+// Both files are closed, deleted and reopened as
+// their size exceed the limit set in control class.
+// The session log is not reopened, as it is used by
+// the NX client and server to track the advance of
+// the session.
+//
+
+static char errorsFileName[DEFAULT_STRING_LENGTH]  = { 0 };
+static char statsFileName[DEFAULT_STRING_LENGTH]   = { 0 };
+static char sessionFileName[DEFAULT_STRING_LENGTH] = { 0 };
+static char optionsFileName[DEFAULT_STRING_LENGTH] = { 0 };
+
+//
+// String literal representing selected link speed
+// parameter. Value is translated in control values
+// used by proxies to stay synchronized.
+//
+
+static char linkSpeedName[DEFAULT_STRING_LENGTH] = { 0 };
+
+//
+// String literal representing selected
+// cache size.
+//
+
+static char cacheSizeName[DEFAULT_STRING_LENGTH] = { 0 };
+
+//
+// String literal representing selected
+// shared memory segment size.
+//
+
+static char shsegSizeName[DEFAULT_STRING_LENGTH] = { 0 };
+
+//
+// String literal of images cache size.
+//
+
+static char imagesSizeName[DEFAULT_STRING_LENGTH] = { 0 };
+
+//
+// String literal for bandwidth limit.
+//
+
+static char bitrateLimitName[DEFAULT_STRING_LENGTH] = { 0 };
+
+//
+// String literal for image packing method.
+//
+
+static char packMethodName[DEFAULT_STRING_LENGTH] = { 0 };
+
+//
+// Product name provided by the server or client.
+//
+
+static char productName[DEFAULT_STRING_LENGTH] = { 0 };
+
+//
+// Its corresponding value from NXpack.h.
+//
+
+static int packMethod  = -1;
+static int packQuality = -1;
+
+//
+// String literal for session type. Persistent caches
+// are searched in directory whose name matches this
+// parameter.
+//
+
+static char sessionType[DEFAULT_STRING_LENGTH] = { 0 };
+
+//
+// Unique id assigned to session. It is used as
+// name of directory where all files are placed.
+//
+
+static char sessionId[DEFAULT_STRING_LENGTH] = { 0 };
+
+//
+// Set if we already parsed the options.
+//
+
+static int parsedOptions = 0;
+static int parsedCommand = 0;
+
+//
+// Buffer data received from the remote proxy at
+// session negotiation.
+//
+
+static char remoteData[MAXIMUM_REMOTE_OPTIONS_LENGTH] = { 0 };
+static int  remotePosition = 0;
+
+//
+// Main loop file descriptors.
+//
+
+static int tcpFD   = -1;
+static int unixFD  = -1;
+static int cupsFD  = -1;
+static int auxFD   = -1;
+static int smbFD   = -1;
+static int mediaFD = -1;
+static int httpFD  = -1;
+static int fontFD  = -1;
+static int slaveFD = -1;
+static int proxyFD = -1;
+
+//
+// Used for internal communication
+// with the X agent.
+//
+
+static int agentFD[2] = { -1, -1 };
+
+//
+// Flags determining which protocols and
+// ports are forwarded.
+//
+
+int useUnixSocket = 1;
+
+static int useTcpSocket   = 1;
+static int useCupsSocket  = 0;
+static int useAuxSocket   = 0;
+static int useSmbSocket   = 0;
+static int useMediaSocket = 0;
+static int useHttpSocket  = 0;
+static int useFontSocket  = 0;
+static int useSlaveSocket = 0;
+static int useAgentSocket = 0;
+
+//
+// Set if the launchd service is running
+// and its socket must be used as X socket.
+//
+
+static int useLaunchdSocket = 0;
+
+//
+// Set by user if he/she wants to modify
+// the default TCP_NODELAY option as set
+// in control.
+//
+
+static int useNoDelay = -1;
+
+//
+// Set if user wants to override default
+// flush timeout set according to link.
+//
+
+static int usePolicy = -1;
+
+//
+// Set if user wants to hide the RENDER
+// extension or wants to short-circuit
+// some simple replies at client side.
+//
+
+static int useRender = -1;
+static int useTaint  = -1;
+
+//
+// Set if the user wants to reduce the
+// nominal size of the token messages
+// exchanged between the proxies.
+//
+
+static int useStrict = -1;
+
+//
+// Set if the proxy is running as part
+// of SSH on the client.
+//
+
+static int useEncryption = -1;
+
+//
+// Name of Unix socket created by the client proxy to
+// accept client connections. File must be unlinked
+// by cleanup function.
+//
+
+static char unixSocketName[DEFAULT_STRING_LENGTH] = { 0 };
+
+//
+// Other parameters.
+//
+
+static char acceptHost[DEFAULT_STRING_LENGTH]  = { 0 };
+static char displayHost[DEFAULT_STRING_LENGTH] = { 0 };
+static char authCookie[DEFAULT_STRING_LENGTH]  = { 0 };
+
+static int loopbackBind = DEFAULT_LOOPBACK_BIND;
+static int proxyPort = DEFAULT_NX_PROXY_PORT;
+static int xPort     = DEFAULT_NX_X_PORT;
+
+//
+// Used to setup the connection the real
+// X display socket.
+//
+
+static int xServerAddrFamily          = -1;
+static sockaddr *xServerAddr          = NULL;
+static unsigned int xServerAddrLength = 0;
+
+//
+// The representation of a Unix socket path or
+// a bind address, denoting where the local proxy
+// will await the peer connection.
+//
+
+static ChannelEndPoint listenSocket;
+
+//
+// The TCP host and port or Unix file socket where
+// the remote proxy will be contacted.
+//
+
+static ChannelEndPoint connectSocket;
+
+//
+// Helper channels are disabled by default.
+//
+
+static ChannelEndPoint cupsPort;
+static ChannelEndPoint auxPort;
+static ChannelEndPoint smbPort;
+static ChannelEndPoint mediaPort;
+static ChannelEndPoint httpPort;
+static ChannelEndPoint slavePort;
+
+//
+// Can be either a port number or a Unix
+// socket.
+//
+
+static char fontPort[DEFAULT_STRING_LENGTH] = { 0 };
+
+//
+// Host and port where the existing proxy
+// is running.
+//
+
+static char bindHost[DEFAULT_STRING_LENGTH] = { 0 };
+static int  bindPort = -1;
+
+//
+// Pointers to the callback functions and
+// parameter set by the agent
+//
+
+static void (*flushCallback)(void *, int) = NULL;
+static void *flushParameter = NULL;
+
+static void (*statisticsCallback)(void *, int) = NULL;
+static void *statisticsParameter = NULL;
+
+//
+// State variables shared between the init
+// function and the main loop.
+//
+
+T_timestamp initTs;
+T_timestamp startTs;
+T_timestamp logsTs;
+T_timestamp nowTs;
+
+int diffTs;
+
+//
+// This is set to the main proxy process id.
+// 
+
+int lastProxy = 0;
+
+//
+// Set to last dialog process launched by proxy.
+// 
+
+int lastDialog = 0;
+
+//
+// Set to watchdog process launched by proxy.
+// 
+
+int lastWatchdog = 0;
+
+//
+// Set if a cache house-keeper process is running.
+// 
+
+int lastKeeper = 0;
+
+//
+// Let an inner routine register the pid of a slave
+// process.
+//
+
+static int lastChild = 0;
+
+//
+// Exit code of the last child process exited.
+//
+
+static int lastStatus = 0;
+
+//
+// Set if shutdown was requested through a signal.
+//
+
+static int lastKill = 0;
+
+//
+// Set if the agent confirmed the destruction of
+// the NX transport.
+//
+
+static int lastDestroy = 0;
+
+//
+// This is set to the code and local flag of the
+// last requested alert.
+// 
+
+static struct
+{
+  int code;
+  int local;
+
+} lastAlert;
+
+//
+// Manage the current signal masks.
+//
+
+static struct
+{
+  sigset_t saved;
+
+  int blocked;
+  int installed;
+
+  int enabled[32];
+  int forward[32];
+
+  struct sigaction action[32];
+
+} lastMasks;
+
+//
+// Manage the current timer.
+//
+
+static struct
+{
+  struct sigaction action;
+  struct itimerval value;
+  struct timeval   start;
+  struct timeval   next;
+
+} lastTimer;
+
+//
+// This is set to last signal received in handler.
+//
+
+static int lastSignal = 0;
+
+//
+// Set to the last time bytes readable were queried
+// by the agent.
+//
+
+static T_timestamp lastReadableTs = nullTimestamp();
+
+//
+// Here are interfaces declared in NX.h.
+//
+
+int NXTransProxy(int fd, int mode, const char* options)
+{
+  //
+  // Let the log temporarily go to the standard
+  // error. Be also sure we have a jump context,
+  // in the case any subsequent operation will
+  // cause a cleanup.
+  //
+
+  if (logofs == NULL)
+  {
+    logofs = &cerr;
+  }
+
+  if (setjmp(context) == 1)
+  {
+    #ifdef TEST
+    *logofs << "NXTransProxy: Out of the long jump with pid '"
+            << lastProxy << "'.\n" << logofs_flush;
+    #endif
+    
+    return -1;
+  }
+
+  //
+  // Check if have already performed a parsing of
+  // parameters, as in the case we are running as
+  // a stand-alone process. If needed create the
+  // parameters repository
+  //
+
+  if (control == NULL)
+  {
+    control = new Control();
+  }
+
+  lastProxy = getpid();
+
+  #ifdef TEST
+  *logofs << "NXTransProxy: Main process started with pid '"
+          << lastProxy << "'.\n" << logofs_flush;
+  #endif
+
+  SetMode(mode);
+
+  if (mode == NX_MODE_CLIENT)
+  {
+    if (fd != NX_FD_ANY)
+    {
+      #ifdef TEST
+
+      *logofs << "NXTransProxy: Agent descriptor for X client connections is FD#"
+              << fd << ".\n" << logofs_flush;
+
+      *logofs << "NXTransProxy: Disabling listening on further X client connections.\n"
+              << logofs_flush;
+
+      #endif
+
+      useTcpSocket   = 0;
+      useUnixSocket  = 0;
+      useAgentSocket = 1;
+
+      agentFD[1] = fd;
+    }
+  }
+  else if (mode == NX_MODE_SERVER)
+  {
+    if (fd != NX_FD_ANY)
+    {
+      #ifdef TEST
+      *logofs << "NXTransProxy: PANIC! Agent descriptor for X server connections "
+              << "not supported yet.\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Agent descriptor for X server connections "
+           << "not supported yet.\n";
+
+      return -1;
+    }
+  }
+
+  const char *env = GetOptions(options);
+
+  if (ParseEnvironmentOptions(env, 0) < 0)
+  {
+    cerr << "Error" << ": Parsing of NX transport options failed.\n";
+
+    return -1;
+  }
+
+  //
+  // Set the path of the NX directories.
+  //
+
+  SetDirectories();
+
+  //
+  // Open the log files.
+  //
+
+  SetLogs();
+
+  #ifdef TEST
+  *logofs << "NXTransProxy: Going to run the NX transport loop.\n"
+          << logofs_flush;
+  #endif
+
+  WaitCleanup();
+
+  //
+  // This function should never return.
+  //
+
+  exit(0);
+}
+
+void NXTransExit(int code)
+{
+  if (logofs == NULL)
+  {
+    logofs = &cerr;
+  }
+
+  static int recurse;
+
+  if (++recurse > 1)
+  {
+    #ifdef TEST
+    *logofs << "NXTransExit: Aborting process with pid '"
+            << getpid() << "' due to recursion through "
+            << "exit.\n" << logofs_flush;
+    #endif
+
+    abort();
+  }
+
+  #ifdef TEST
+  *logofs << "NXTransExit: Process with pid '"
+          << getpid() << "' called exit with code '"
+          << code << "'.\n" << logofs_flush;
+  #endif
+
+  if (control != NULL)
+  {
+    //
+    // Be sure that there we can detect the
+    // termination of the watchdog.
+    //
+
+    EnableSignals();
+
+    //
+    // Close the NX transport if it was not
+    // shut down already.
+    //
+
+    NXTransDestroy(NX_FD_ANY);
+  }
+
+  exit(code);
+}
+
+int NXTransParseCommandLine(int argc, const char **argv)
+{
+  return ParseCommandLineOptions(argc, argv);
+}
+
+int NXTransParseEnvironment(const char *env, int force)
+{
+  return ParseEnvironmentOptions(env, force);
+}
+
+void NXTransCleanup()
+{
+  HandleCleanup();
+}
+
+void NXTransCleanupForReconnect()
+{
+  HandleCleanupForReconnect();
+}
+
+//
+// Check the parameters for subsequent
+// initialization of the NX transport.
+//
+
+int NXTransCreate(int fd, int mode, const char* options)
+{
+  if (logofs == NULL)
+  {
+    logofs = &cerr;
+  }
+
+  //
+  // Be sure we have a jump context, in the
+  // case a subsequent operation will cause
+  // a cleanup.
+  //
+
+  if (setjmp(context) == 1)
+  {
+    return -1;
+  }
+
+  //
+  // Create the parameters repository
+  //
+
+  if (control != NULL)
+  {
+    #ifdef PANIC
+    *logofs << "NXTransCreate: PANIC! The NX transport seems "
+            << "to be already running.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": The NX transport seems "
+         << "to be already running.\n";
+
+    return -1;
+  }
+
+  control = new Control();
+
+  if (control == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Error creating the NX transport.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Error creating the NX transport.\n";
+
+    return -1;
+  }
+
+  lastProxy = getpid();
+
+  #ifdef TEST
+  *logofs << "NXTransCreate: Caller process running with pid '"
+          << lastProxy << "'.\n" << logofs_flush;
+  #endif
+
+  //
+  // Set the local proxy mode an parse the
+  // display NX options.
+  //
+
+  SetMode(mode);
+
+  const char *env = GetOptions(options);
+
+  if (ParseEnvironmentOptions(env, 0) < 0)
+  {
+    cerr << "Error" << ": Parsing of NX transport options failed.\n";
+
+    return -1;
+  }
+
+  //
+  // Set the path of the NX directories.
+  //
+
+  SetDirectories();
+
+  //
+  // Open the log files.
+  //
+
+  SetLogs();
+
+  //
+  // Use the provided descriptor.
+  //
+
+  proxyFD = fd;
+
+  #ifdef TEST
+  *logofs << "NXTransCreate: Called with NX proxy descriptor '"
+          << proxyFD << "'.\n" << logofs_flush;
+  #endif
+
+  #ifdef TEST
+  *logofs << "NXTransCreate: Creation of the NX transport completed.\n"
+          << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+//
+// Tell the proxy to use the descriptor as the internal
+// connection to the X client side NX agent. This will
+// have the side effect of disabling listening for add-
+// itional X client connections.
+//
+
+int NXTransAgent(int fd[2])
+{
+  //
+  // Be sure we have a jump context, in the
+  // case a subsequent operation will cause
+  // a cleanup.
+  //
+
+  if (logofs == NULL)
+  {
+    logofs = &cerr;
+  }
+
+  if (setjmp(context) == 1)
+  {
+    return -1;
+  }
+
+  if (control == NULL)
+  {
+    cerr << "Error" << ": Can't set the NX agent without a NX transport.\n";
+
+    return -1;
+  }
+  else if (control -> ProxyMode != proxy_client)
+  {
+    #ifdef PANIC
+    *logofs << "NXTransAgent: Invalid mode while setting the NX agent.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Invalid mode while setting the NX agent.\n\n";
+
+    return -1;
+  }
+
+  useTcpSocket   = 0;
+  useUnixSocket  = 0;
+  useAgentSocket = 1;
+
+  agentFD[0] = fd[0];
+  agentFD[1] = fd[1];
+
+  #ifdef TEST
+
+  *logofs << "NXTransAgent: Internal descriptors for agent are FD#"
+          << agentFD[0] << " and FD#" << agentFD[1] << ".\n"
+          << logofs_flush;
+
+  *logofs << "NXTransAgent: Disabling listening for further X client "
+          << "connections.\n" << logofs_flush;
+
+  #endif
+
+  agent = new Agent(agentFD);
+
+  if (agent == NULL || agent -> isValid() != 1)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Error creating the NX memory transport .\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Error creating the NX memory transport.\n";
+
+    HandleCleanup();
+  }
+
+  #ifdef TEST
+  *logofs << "NXTransAgent: Enabling memory-to-memory transport.\n"
+          << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int NXTransClose(int fd)
+{
+  if (logofs == NULL)
+  {
+    logofs = &cerr;
+  }
+
+  /*
+   * Only handle the proxy connection. The X
+   * transport will take care of closing its
+   * end of the socket pair.
+   */
+
+  if (control != NULL && ((agent != NULL &&
+          (fd == agentFD[0] || fd == NX_FD_ANY)) ||
+              (fd == proxyFD || fd == NX_FD_ANY)))
+  {
+    if (proxy != NULL)
+    {
+      #ifdef TEST
+      *logofs << "NXTransClose: Closing down all the X connections.\n"
+              << logofs_flush;
+      #endif
+
+      CleanupConnections();
+    }
+  }
+  #ifdef TEST
+  else
+  {
+    *logofs << "NXTransClose: The NX transport is not running.\n"
+            << logofs_flush;
+  }
+  #endif
+
+  return 1;
+}
+
+//
+// Close down the transport and free the
+// allocated NX resources.
+//
+
+int NXTransDestroy(int fd)
+{
+  if (logofs == NULL)
+  {
+    logofs = &cerr;
+  }
+
+  if (control != NULL && ((agent != NULL &&
+          (fd == agentFD[0] || fd == NX_FD_ANY)) ||
+              (fd == proxyFD || fd == NX_FD_ANY)))
+  {
+    //
+    // Shut down the X connections and
+    // wait the cleanup to complete.
+    //
+
+    if (proxy != NULL)
+    {
+      #ifdef TEST
+      *logofs << "NXTransDestroy: Closing down all the X connections.\n"
+              << logofs_flush;
+      #endif
+
+      CleanupConnections();
+    }
+
+    #ifdef TEST
+    *logofs << "NXTransDestroy: Waiting for the NX transport to terminate.\n"
+            << logofs_flush;
+    #endif
+
+    lastDestroy = 1;
+
+    WaitCleanup();
+  }
+  #ifdef TEST
+  else
+  {
+    *logofs << "NXTransDestroy: The NX transport is not running.\n"
+            << logofs_flush;
+  }
+  #endif
+
+  return 1;
+}
+
+//
+// Assume that the NX transport is valid
+// as long as the control class has not
+// been destroyed.
+//
+
+int NXTransRunning(int fd)
+{
+  return (control != NULL);
+}
+
+int NXTransContinue(struct timeval *selectTs)
+{
+  if (control != NULL)
+  {
+    //
+    // If no timeout is provided use
+    // the default.
+    //
+
+    T_timestamp newTs;
+
+    if (selectTs == NULL)
+    {
+      setTimestamp(newTs, control -> PingTimeout);
+
+      selectTs = &newTs;
+    }
+
+    //
+    // Use empty masks and only get the
+    // descriptors set by the proxy.
+    //
+
+    fd_set readSet;
+    fd_set writeSet;
+
+    int setFDs;
+    int errorFDs;
+    int resultFDs;
+
+    setFDs = 0;
+
+    FD_ZERO(&readSet);
+    FD_ZERO(&writeSet);
+
+    //
+    // Run a new loop. If the transport
+    // is gone avoid sleeping until the
+    // timeout.
+    //
+
+    if (NXTransPrepare(&setFDs, &readSet, &writeSet, selectTs) != 0)
+    {
+      NXTransSelect(&resultFDs, &errorFDs, &setFDs, &readSet, &writeSet, selectTs);
+
+      NXTransExecute(&resultFDs, &errorFDs, &setFDs, &readSet, &writeSet, selectTs);
+    }
+  }
+
+  return (control != NULL);
+}
+
+int NXTransSignal(int signal, int action)
+{
+  if (logofs == NULL)
+  {
+    logofs = &cerr;
+  }
+
+  if (control == NULL)
+  {
+    return 0;
+  }
+
+  if (action == NX_SIGNAL_RAISE)
+  {
+    #ifdef TEST
+    *logofs << "NXTransSignal: Raising signal '" << DumpSignal(signal)
+            << "' in the proxy handler.\n" << logofs_flush;
+    #endif
+
+    HandleSignal(signal);
+
+    return 1;
+  }
+  else if (signal == NX_SIGNAL_ANY)
+  {
+    #ifdef TEST
+    *logofs << "NXTransSignal: Setting action of all signals to '"
+            << action << "'.\n" << logofs_flush;
+    #endif
+
+    for (int i = 0; i < 32; i++)
+    {
+      if (CheckSignal(i) == 1)
+      {
+        NXTransSignal(i, action);
+      }
+    }
+
+    return 1;
+  }
+  else if (CheckSignal(signal) == 1)
+  {
+    #ifdef TEST
+    *logofs << "NXTransSignal: Setting action of signal '"
+            << DumpSignal(signal) << "' to '" << action
+            << "'.\n" << logofs_flush;
+    #endif
+
+    if (action == NX_SIGNAL_ENABLE ||
+            action == NX_SIGNAL_FORWARD)
+    {
+      InstallSignal(signal, action);
+
+      return 1;
+    }
+    else if (action == NX_SIGNAL_DISABLE)
+    {
+      RestoreSignal(signal);
+
+      return 1;
+    }
+  }
+
+  #ifdef WARNING
+  *logofs << "NXTransSignal: WARNING! Unable to perform action '"
+          << action << "' on signal '" << DumpSignal(signal)
+          << "'.\n" << logofs_flush;
+  #endif
+
+  cerr << "Warning" << ": Unable to perform action '" << action
+       << "' on signal '" << DumpSignal(signal)
+       << "'.\n";
+
+  return -1;
+}
+
+int NXTransCongestion(int fd)
+{
+  if (control != NULL && proxy != NULL)
+  {
+    #ifdef DUMP
+
+    int congestion = proxy -> getCongestion(proxyFD);
+
+    *logofs << "NXTransCongestion: Returning " << congestion
+            << " as current congestion level.\n" << logofs_flush;
+
+    return congestion;
+
+    #endif
+
+    return (proxy -> getCongestion(proxyFD));
+  }
+
+  return 0;
+}
+
+int NXTransHandler(int fd, int type, void (*handler)(void *parameter,
+                       int reason), void *parameter)
+{
+  if (logofs == NULL)
+  {
+    logofs = &cerr;
+  }
+
+  switch (type)
+  {
+    case NX_HANDLER_FLUSH:
+    {
+      flushCallback  = handler;
+      flushParameter = parameter;
+
+      break;
+    }
+    case NX_HANDLER_STATISTICS:
+    {
+      //
+      // Reporting of statistics by the agent
+      // still needs to be implemented.
+      //
+
+      statisticsCallback  = handler;
+      statisticsParameter = parameter;
+
+      break;
+    }
+    default:
+    {
+      #ifdef TEST
+      *logofs << "NXTransHandler: WARNING! Failed to set "
+              << "the NX callback for event '" << type << "' to '"
+              << (void *) handler << "' and parameter '"
+              << parameter << "'.\n" << logofs_flush;
+      #endif
+
+      return 0;
+    }
+  }
+
+  #ifdef TEST
+  *logofs << "NXTransHandler: Set the NX "
+          << "callback for event '" << type << "' to '"
+          << (void *) handler << "' and parameter '"
+          << parameter << "'.\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int NXTransRead(int fd, char *data, int size)
+{
+  if (logofs == NULL)
+  {
+    logofs = &cerr;
+  }
+
+  if (control != NULL && agent != NULL &&
+          fd == agentFD[0])
+  {
+    #ifdef DUMP
+    *logofs << "NXTransRead: Dequeuing " << size << " bytes "
+            << "from FD#" << agentFD[0] << ".\n" << logofs_flush;
+    #endif
+
+    int result = agent -> dequeueData(data, size);
+
+    #ifdef DUMP
+
+    if (result < 0 && EGET() == EAGAIN)
+    {
+      *logofs << "NXTransRead: WARNING! Dequeuing from FD#"
+              << agentFD[0] << " would block.\n" << logofs_flush;
+    }
+    else
+    {
+      *logofs << "NXTransRead: Dequeued " << result << " bytes "
+              << "to FD#" << agentFD[0] << ".\n" << logofs_flush;
+    }
+
+    #endif
+
+    return result;
+  }
+  else
+  {
+    #ifdef DUMP
+    *logofs << "NXTransRead: Reading " << size << " bytes "
+            << "from FD#" << fd << ".\n" << logofs_flush;
+    #endif
+
+    return read(fd, data, size);
+  }
+}
+
+int NXTransReadVector(int fd, struct iovec *iovdata, int iovsize)
+{
+  if (logofs == NULL)
+  {
+    logofs = &cerr;
+  }
+
+  if (control != NULL && agent != NULL &&
+          fd == agentFD[0])
+  {
+    #if defined(DUMP)
+
+    if (control -> ProxyStage >= stage_operational &&
+            agent -> localReadable() > 0)
+    {
+      *logofs << "NXTransReadVector: WARNING! Agent has data readable.\n"
+              << logofs_flush;
+    }
+
+    #endif
+
+    char *base;
+
+    int length;
+    int result;
+
+    struct iovec *vector = iovdata;
+    int count = iovsize;
+
+    ESET(0);
+
+    int i = 0;
+    int total = 0;
+
+    for (;  i < count;  i++, vector++)
+    {
+      length = vector -> iov_len;
+      base = (char *) vector -> iov_base;
+
+      while (length > 0)
+      {
+        #ifdef DUMP
+        *logofs << "NXTransReadVector: Dequeuing " << length
+                << " bytes " << "from FD#" << agentFD[0] << ".\n"
+                << logofs_flush;
+        #endif
+
+        result = agent -> dequeueData(base, length);
+
+        #ifdef DUMP
+
+        if (result < 0 && EGET() == EAGAIN)
+        {
+          *logofs << "NXTransReadVector: WARNING! Dequeuing from FD#"
+                  << agentFD[0] << " would block.\n" << logofs_flush;
+        }
+        else
+        {
+          *logofs << "NXTransReadVector: Dequeued " << result
+                  << " bytes " << "from FD#" << agentFD[0] << ".\n"
+                  << logofs_flush;
+        }
+
+        #endif
+
+        if (result < 0 && total == 0)
+        {
+          return result;
+        }
+        else if (result <= 0)
+        {
+          return total;
+        }
+
+        ESET(0);
+
+        length -= result;
+        total  += result;
+        base   += result;
+      }
+    }
+
+    return total;
+  }
+  else
+  {
+    #ifdef DUMP
+    *logofs << "NXTransReadVector: Reading vector with "
+            << iovsize << " elements from FD#" << fd << ".\n"
+            << logofs_flush;
+    #endif
+
+    return readv(fd, iovdata, iovsize);
+  }
+}
+
+int NXTransReadable(int fd, int *readable)
+{
+  if (logofs == NULL)
+  {
+    logofs = &cerr;
+  }
+
+  if (control == NULL || agent == NULL ||
+          fd != agentFD[0])
+  {
+    #ifdef DUMP
+
+    int result = GetBytesReadable(fd, readable);
+
+    if (result == -1)
+    {
+      *logofs << "NXTransReadable: Error detected on FD#"
+              << fd << ".\n" << logofs_flush;
+    }
+    else
+    {
+      *logofs << "NXTransReadable: Returning " << *readable
+              << " bytes as readable from FD#" << fd
+              << ".\n" << logofs_flush;
+    }
+
+    return result;
+
+    #else
+
+    return GetBytesReadable(fd, readable);
+
+    #endif
+  }
+
+  int result = agent -> dequeuableData();
+
+  switch (result)
+  {
+    case 0:
+    {
+      //
+      // The client might have enqueued data to our side
+      // and is now checking for the available events. As
+      // _XEventsQueued() may omit to call _XSelect(), we
+      // handle here the new data that is coming from the
+      // proxy to avoid spinning through this function
+      // again.
+      //
+
+      if (proxy != NULL && proxy -> canRead() == 1)
+      {
+        #if defined(TEST) || defined(INFO)
+        *logofs << "NXTransReadable: WARNING! Trying to "
+                << "read to generate new agent data.\n"
+                << logofs_flush;
+        #endif
+
+        //
+        // Set the context as the function
+        // can cause a cleanup.
+        //
+
+        if (setjmp(context) == 1)
+        {
+          return -1;
+        }
+
+        if (proxy -> handleRead() < 0)
+        {
+          #if defined(TEST) || defined(INFO)
+          *logofs << "NXTransReadable: Failure reading "
+                  << "messages from proxy FD#" << proxyFD
+                  << ".\n" << logofs_flush;
+          #endif
+
+          HandleShutdown();
+        }
+
+        //
+        // Call again the routine. By reading
+        // new control messages from the proxy
+        // the agent channel may be gone.
+        //
+
+        return NXTransReadable(fd, readable);
+      }
+
+      #ifdef DUMP
+      *logofs << "NXTransReadable: Returning " << 0
+              << " bytes as readable from FD#" << fd
+              << " with result 0.\n" << logofs_flush;
+      #endif
+
+      *readable = 0;
+
+      return 0;
+    }
+    case -1:
+    {
+      #ifdef DUMP
+      *logofs << "NXTransReadable: Returning " << 0
+              << " bytes as readable from FD#" << fd
+              << " with result -1.\n" << logofs_flush;
+      #endif
+
+      *readable = 0;
+
+      return -1;
+    }
+    default:
+    {
+      #ifdef DUMP
+      *logofs << "NXTransReadable: Returning " << result
+              << " bytes as readable from FD#" << fd
+              << " with result 0.\n" << logofs_flush;
+      #endif
+
+      *readable = result;
+
+      return 0;
+    }
+  }
+}
+
+int NXTransWrite(int fd, char *data, int size)
+{
+  //
+  // Be sure we have a valid log file.
+  //
+
+  if (logofs == NULL)
+  {
+    logofs = &cerr;
+  }
+
+  if (control != NULL && agent != NULL &&
+          fd == agentFD[0])
+  {
+    int result;
+
+    if (proxy != NULL)
+    {
+      if (proxy -> canRead(agentFD[1]) == 0)
+      {
+        #if defined(DUMP) || defined(TEST)
+        *logofs << "NXTransWrite: WARNING! Delayed enqueuing to FD#"
+                << agentFD[0] << " with proxy unable to read.\n"
+                << logofs_flush;
+        #endif
+
+        ESET(EAGAIN);
+
+        return -1;
+      }
+
+      //
+      // Set the context as the function
+      // can cause a cleanup.
+      //
+
+      if (setjmp(context) == 1)
+      {
+        return -1;
+      }
+
+      //
+      // Don't enqueue the data to the transport
+      // but let the channel borrow the buffer.
+      //
+
+      #ifdef DUMP
+      *logofs << "NXTransWrite: Letting the channel borrow "
+              << size << " bytes from FD#" << agentFD[0]
+              << ".\n" << logofs_flush;
+      #endif
+
+      result = proxy -> handleRead(agentFD[1], data, size);
+
+      if (result == 1)
+      {
+        result = size;
+      }
+      else
+      {
+        if (result == 0)
+        {
+          ESET(EAGAIN);
+        }
+        else
+        {
+          ESET(EPIPE);
+        }
+
+        result = -1;
+      }
+    }
+    else
+    {
+      //
+      // We don't have a proxy connection, yet.
+      // Enqueue the data to the agent transport.
+      //
+
+      #ifdef DUMP
+      *logofs << "NXTransWrite: Enqueuing " << size << " bytes "
+              << "to FD#" << agentFD[0] << ".\n" << logofs_flush;
+      #endif
+
+      result = agent -> enqueueData(data, size);
+    }
+
+    #ifdef DUMP
+
+    if (result < 0)
+    {
+      if (EGET() == EAGAIN)
+      {
+        *logofs << "NXTransWrite: WARNING! Enqueuing to FD#"
+                << agentFD[0] << " would block.\n"
+                << logofs_flush;
+      }
+      else
+      {
+        *logofs << "NXTransWrite: WARNING! Error enqueuing to FD#"
+                << agentFD[0] << ".\n" << logofs_flush;
+      }
+    }
+    else
+    {
+      *logofs << "NXTransWrite: Enqueued " << result << " bytes "
+              << "to FD#" << agentFD[0] << ".\n" << logofs_flush;
+    }
+
+    #endif
+
+    return result;
+  }
+  else
+  {
+    #ifdef DUMP
+    *logofs << "NXTransWrite: Writing " << size << " bytes "
+            << "to FD#" << fd << ".\n" << logofs_flush;
+    #endif
+
+    return write(fd, data, size);
+  }
+}
+
+int NXTransWriteVector(int fd, struct iovec *iovdata, int iovsize)
+{
+  //
+  // Be sure we have a valid log file and a
+  // jump context because we will later call
+  // functions that can perform a cleanup.
+  //
+
+  if (logofs == NULL)
+  {
+    logofs = &cerr;
+  }
+
+  int result = 0;
+
+  if (control != NULL && agent != NULL &&
+          fd == agentFD[0])
+  {
+    //
+    // See the comment in NXTransWrite().
+    //
+
+    if (proxy != NULL)
+    {
+      if (proxy -> canRead(agentFD[1]) == 0)
+      {
+        #if defined(DUMP) || defined(TEST)
+        *logofs << "NXTransWriteVector: WARNING! Delayed enqueuing to FD#"
+                << agentFD[0] << " with proxy unable to read.\n"
+                << logofs_flush;
+        #endif
+
+        ESET(EAGAIN);
+
+        return -1;
+      }
+    }
+
+    //
+    // Set the context as the function
+    // can cause a cleanup.
+    //
+
+    if (setjmp(context) == 1)
+    {
+      return -1;
+    }
+
+    char *base;
+
+    int length;
+
+    struct iovec *vector = iovdata;
+    int count = iovsize;
+
+    ESET(0);
+
+    int i = 0;
+    int total = 0;
+
+    for (;  i < count;  i++, vector++)
+    {
+      length = vector -> iov_len;
+      base = (char *) vector -> iov_base;
+
+      while (length > 0)
+      {
+        if (proxy != NULL)
+        {
+          //
+          // Don't enqueue the data to the transport
+          // but let the channel borrow the buffer.
+          //
+
+          #ifdef DUMP
+          *logofs << "NXTransWriteVector: Letting the channel borrow "
+                  << length << " bytes from FD#" << agentFD[0]
+                  << ".\n" << logofs_flush;
+          #endif
+
+          result = proxy -> handleRead(agentFD[1], base, length);
+
+          if (result == 1)
+          {
+            result = length;
+          }
+          else
+          {
+            if (result == 0)
+            {
+              ESET(EAGAIN);
+            }
+            else
+            {
+              ESET(EPIPE);
+            }
+
+            result = -1;
+          }
+        }
+        else
+        {
+          //
+          // We don't have a proxy connection, yet.
+          // Enqueue the data to the agent transport.
+          //
+
+          #ifdef DUMP
+          *logofs << "NXTransWriteVector: Enqueuing " << length
+                  << " bytes " << "to FD#" << agentFD[0] << ".\n"
+                  << logofs_flush;
+          #endif
+
+          result = agent -> enqueueData(base, length);
+        }
+
+        #ifdef DUMP
+
+        if (result < 0)
+        {
+          if (EGET() == EAGAIN)
+          {
+            *logofs << "NXTransWriteVector: WARNING! Enqueuing to FD#"
+                    << agentFD[0] << " would block.\n"
+                    << logofs_flush;
+          }
+          else
+          {
+            *logofs << "NXTransWriteVector: WARNING! Error enqueuing to FD#"
+                    << agentFD[0] << ".\n" << logofs_flush;
+          }
+        }
+        else
+        {
+          *logofs << "NXTransWriteVector: Enqueued " << result
+                  << " bytes " << "to FD#" << agentFD[0] << ".\n"
+                  << logofs_flush;
+        }
+
+        #endif
+
+        if (result < 0 && total == 0)
+        {
+          return result;
+        }
+        else if (result <= 0)
+        {
+          return total;
+        }
+
+        ESET(0);
+
+        length -= result;
+        total  += result;
+        base   += result;
+      }
+    }
+
+    return total;
+  }
+  else
+  {
+    #ifdef DUMP
+    *logofs << "NXTransWriteVector: Writing vector with "
+            << iovsize << " elements to FD#" << fd << ".\n"
+            << logofs_flush;
+    #endif
+
+    return writev(fd, iovdata, iovsize);
+  }
+}
+
+int NXTransPolicy(int fd, int type)
+{
+  if (control != NULL)
+  {
+    if (usePolicy == -1)
+    {
+      #if defined(TEST) || defined(INFO)
+      *logofs << "NXTransPolicy: Setting flush policy on "
+              << "proxy FD#" << proxyFD << " to '"
+              << DumpPolicy(type == NX_POLICY_DEFERRED ?
+                     policy_deferred : policy_immediate)
+              << "'.\n" << logofs_flush;
+      #endif
+
+      control -> FlushPolicy = (type == NX_POLICY_DEFERRED ?
+                                    policy_deferred : policy_immediate);
+
+      if (proxy != NULL)
+      {
+        proxy -> handleFlush();
+      }
+
+      return 1;
+    }
+    else
+    {
+      #if defined(TEST) || defined(INFO)
+      *logofs << "NXTransPolicy: Ignoring the agent "
+              << "setting with user policy set to '"
+              << DumpPolicy(control -> FlushPolicy)
+              << "'.\n" << logofs_flush;
+      #endif
+
+      return 0;
+    }
+  }
+
+  return 0;
+}
+
+int NXTransFlushable(int fd)
+{
+  if (proxy == NULL || agent == NULL ||
+          fd != agentFD[0])
+  {
+    #ifdef DUMP
+    *logofs << "NXTransFlushable: Returning 0 bytes as "
+            << "flushable for unrecognized FD#" << fd
+            << ".\n" << logofs_flush;
+    #endif
+
+    return 0;
+  }
+  else
+  {
+    #if defined(DUMP) || defined(INFO)
+    *logofs << "NXTransFlushable: Returning " << proxy ->
+               getFlushable(proxyFD) << " as bytes flushable on "
+            << "proxy FD#" << proxyFD << ".\n"
+            << logofs_flush;
+    #endif
+
+    return proxy -> getFlushable(proxyFD);
+  }
+}
+
+int NXTransFlush(int fd)
+{
+  if (proxy != NULL)
+  {
+    #if defined(TEST) || defined(INFO)
+    *logofs << "NXTransFlush: Requesting an immediate flush of "
+            << "proxy FD#" << proxyFD << ".\n"
+            << logofs_flush;
+    #endif
+
+    return proxy -> handleFlush();
+  }
+
+  return 0;
+}
+
+int NXTransChannel(int fd, int channelFd, int type)
+{
+  if (proxy != NULL)
+  {
+    //
+    // Set the context as the function
+    // can cause a cleanup.
+    //
+
+    if (setjmp(context) == 1)
+    {
+      return -1;
+    }
+
+    #if defined(TEST) || defined(INFO)
+    *logofs << "NXTransChannel: Going to create a new channel "
+            << "with type '" << type << "' on FD#" << channelFd
+            << ".\n" << logofs_flush;
+    #endif
+
+    int result = -1;
+
+    switch (type)
+    {
+      case NX_CHANNEL_X11:
+      {
+        if (useUnixSocket == 1 || useTcpSocket == 1 ||
+                useAgentSocket == 1 || useAuxSocket == 1)
+        {
+          result = proxy -> handleNewConnection(channel_x11, channelFd);
+        }
+
+        break;
+      }
+      case NX_CHANNEL_CUPS:
+      {
+        if (useCupsSocket == 1)
+        {
+          result = proxy -> handleNewConnection(channel_cups, channelFd);
+        }
+
+        break;
+      }
+      case NX_CHANNEL_SMB:
+      {
+        if (useSmbSocket == 1)
+        {
+          result = proxy -> handleNewConnection(channel_smb, channelFd);
+        }
+
+        break;
+      }
+      case NX_CHANNEL_MEDIA:
+      {
+        if (useMediaSocket == 1)
+        {
+          result = proxy -> handleNewConnection(channel_media, channelFd);
+        }
+
+        break;
+      }
+      case NX_CHANNEL_HTTP:
+      {
+        if (useHttpSocket == 1)
+        {
+          result = proxy -> handleNewConnection(channel_http, channelFd);
+        }
+
+        break;
+      }
+      case NX_CHANNEL_FONT:
+      {
+        if (useFontSocket == 1)
+        {
+          result = proxy -> handleNewConnection(channel_font, channelFd);
+        }
+
+        break;
+      }
+      case NX_CHANNEL_SLAVE:
+      {
+        if (useSlaveSocket == 1)
+        {
+          result = proxy -> handleNewConnection(channel_slave, channelFd);
+        }
+
+        break;
+      }
+      default:
+      {
+        #ifdef WARNING
+        *logofs << "NXTransChannel: WARNING! Unrecognized channel "
+                << "type '" << type << "'.\n" << logofs_flush;
+        #endif
+
+        break;
+      }
+    }
+
+    #ifdef WARNING
+
+    if (result != 1)
+    {
+      *logofs << "NXTransChannel: WARNING! Could not create the "
+                << "new channel with type '" << type << "' on FD#"
+                << channelFd << ".\n" << logofs_flush;
+    }
+
+    #endif
+
+    return result;
+  }
+
+  return 0;
+}
+
+const char *NXTransFile(int type)
+{
+  char *name = NULL;
+
+  switch (type)
+  {
+    case NX_FILE_SESSION:
+    {
+      name = sessionFileName;
+
+      break;
+    }
+    case NX_FILE_ERRORS:
+    {
+      name = errorsFileName;
+
+      break;
+    }
+    case NX_FILE_OPTIONS:
+    {
+      name = optionsFileName;
+
+      break;
+    }
+    case NX_FILE_STATS:
+    {
+      name = statsFileName;
+
+      break;
+    }
+  }
+
+  if (name != NULL && *name != '\0')
+  {
+    return name;
+  }
+
+  return NULL;
+}
+
+long NXTransTime()
+{
+  static T_timestamp last = getTimestamp();
+
+  T_timestamp now = getTimestamp();
+
+  long diff = diffTimestamp(last, now);
+
+  last = now;
+
+  return diff;
+}
+
+int NXTransAlert(int code, int local)
+{
+  if (proxy != NULL)
+  {
+    #if defined(DUMP) || defined(INFO)
+    *logofs << "NXTransAlert: Requesting a NX dialog with code "
+            << code << " and local " << local << ".\n"
+            << logofs_flush;
+    #endif
+
+    if (local == 0)
+    {
+      //
+      // Set the context as the function
+      // can cause a cleanup.
+      //
+
+      if (setjmp(context) == 1)
+      {
+        return -1;
+      }
+
+      proxy -> handleAlert(code);
+    }
+    else
+    {
+      //
+      // Show the alert at the next loop.
+      //
+
+      HandleAlert(code, local);
+    }
+
+    return 1;
+  }
+  #if defined(DUMP) || defined(INFO)
+  else
+  {
+    if (logofs == NULL)
+    {
+      logofs = &cerr;
+    }
+
+    *logofs << "NXTransAlert: Can't request an alert without "
+            << "a valid NX transport.\n" << logofs_flush;
+  }
+  #endif
+
+  return 0;
+}
+
+//
+// Prepare the file sets and the timeout
+// for a later execution of the select().
+//
+
+int NXTransPrepare(int *setFDs, fd_set *readSet,
+                       fd_set *writeSet, struct timeval *selectTs)
+{
+  if (logofs == NULL)
+  {
+    logofs = &cerr;
+  }
+
+  //
+  // Control is NULL if the NX transport was
+  // reset or was never created. If control
+  // is valid then prepare to jump back when
+  // the transport is destroyed.
+  //
+
+  if (control == NULL || setjmp(context) == 1)
+  {
+    return 0;
+  }
+
+  #if defined(TEST) || defined(INFO)
+  *logofs << "\nNXTransPrepare: Going to prepare the NX transport.\n"
+          << logofs_flush;
+  #endif
+
+  if (control -> ProxyStage < stage_operational)
+  {
+    handleNegotiationInLoop(*setFDs, *readSet, *writeSet, *selectTs);
+  }
+  else
+  {
+    #if defined(TEST) || defined(INFO)
+
+    if (isTimestamp(*selectTs) == 0)
+    {
+      *logofs << "Loop: WARNING! Preparing the select with requested "
+              << "timeout of " << selectTs -> tv_sec << " S and "
+              << (double) selectTs -> tv_usec / 1000 << " Ms.\n"
+              << logofs_flush;
+    }
+    else
+    {
+      *logofs << "Loop: Preparing the select with requested "
+              << "timeout of " << selectTs -> tv_sec << " S and "
+              << (double) selectTs -> tv_usec / 1000 << " Ms.\n"
+              << logofs_flush;
+    }
+
+    #endif
+
+    //
+    // Set descriptors of listening sockets.
+    //
+
+    handleSetListenersInLoop(*readSet, *setFDs);
+
+    //
+    // Set descriptors of both proxy and X
+    // connections.
+    //
+
+    handleSetReadInLoop(*readSet, *setFDs, *selectTs);
+
+    //
+    // Find out which file descriptors have
+    // data to write.
+    //
+
+    handleSetWriteInLoop(*writeSet, *setFDs, *selectTs);
+  }
+
+  //
+  // Prepare the masks for handling the memory-
+  // to-memory transport. This is required even
+  // during session negotiation.
+  //
+
+  if (agent != NULL)
+  {
+    handleSetAgentInLoop(*setFDs, *readSet, *writeSet, *selectTs);
+  }
+
+  //
+  // Register time spent handling messages.
+  //
+
+  nowTs = getNewTimestamp();
+
+  diffTs = diffTimestamp(startTs, nowTs);
+
+  #ifdef TEST
+  *logofs << "Loop: Mark - 0 - at " << strMsTimestamp()
+          << " with " << diffTs << " Ms elapsed.\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // TODO: Should add the read time in two
+  // parts otherwise the limits are checked
+  // before the counters are updated with
+  // time spent in the last loop.
+  //
+
+  if (control -> ProxyStage >= stage_operational)
+  {
+    statistics -> addReadTime(diffTs);
+  }
+
+  startTs = nowTs;
+
+  #ifdef DEBUG
+  *logofs << "Loop: New timestamp is " << strMsTimestamp(startTs)
+          << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+//
+// Let's say that we call select() to find out
+// if any of the handled descriptors has data,
+// but actually things are a bit more complex
+// than that.
+//
+
+int NXTransSelect(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
+                      fd_set *writeSet, struct timeval *selectTs)
+{
+  #ifdef TIME
+
+  static T_timestamp lastTs;
+
+  #endif
+
+  if (logofs == NULL)
+  {
+    logofs = &cerr;
+  }
+
+  //
+  // Control is NULL if the NX transport was
+  // reset or never created. If control is
+  // valid then prepare for jumping back in
+  // the case of an error.
+  //
+
+  if (control == NULL || setjmp(context) == 1)
+  {
+    *resultFDs = select(*setFDs, readSet, writeSet, NULL, selectTs);
+
+    *errorFDs = errno;
+
+    return 0;
+  }
+
+  #if defined(TEST) || defined(INFO)
+  *logofs << "\nNXTransSelect: Going to select the NX descriptors.\n"
+          << logofs_flush;
+  #endif
+
+  #if defined(TEST) || defined(INFO)
+
+  handleCheckSelectInLoop(*setFDs, *readSet, *writeSet, *selectTs);
+
+  #endif
+
+  #ifdef TIME
+
+  diffTs = diffTimestamp(lastTs, getNewTimestamp());
+
+  if (diffTs > 20)
+  {
+    *logofs << "Loop: TIME! Spent " << diffTs
+            << " Ms handling messages for proxy FD#"
+            << proxyFD << ".\n" << logofs_flush;
+  }
+
+  lastTs = getNewTimestamp();
+
+  #endif
+
+  #if defined(TEST) || defined(INFO)
+
+  if (isTimestamp(*selectTs) == 0)
+  {
+    *logofs << "Loop: WARNING! Executing the select with requested "
+            << "timeout of " << selectTs -> tv_sec << " S and "
+            << (double) selectTs -> tv_usec / 1000 << " Ms.\n"
+            << logofs_flush;
+  }
+  else if (proxy != NULL && proxy -> getFlushable(proxyFD) > 0)
+  {
+    *logofs << "Loop: WARNING! Proxy FD#" << proxyFD
+            << " has " << proxy -> getFlushable(proxyFD)
+            << " bytes to write but timeout is "
+            << selectTs -> tv_sec << " S and "
+            << selectTs -> tv_usec / 1000 << " Ms.\n"
+            << logofs_flush;
+  }
+
+  #endif
+
+  //
+  // Wait for the selected sockets
+  // or the timeout.
+  //
+
+  ESET(0);
+
+  *resultFDs = select(*setFDs, readSet, writeSet, NULL, selectTs);
+
+  *errorFDs = EGET();
+
+  #ifdef TIME
+
+  diffTs = diffTimestamp(lastTs, getNewTimestamp());
+
+  if (diffTs > 100)
+  {
+    *logofs << "Loop: TIME! Spent " << diffTs
+            << " Ms waiting for new data for proxy FD#"
+            << proxyFD << ".\n" << logofs_flush;
+  }
+
+  lastTs = getNewTimestamp();
+
+  #endif
+
+  //
+  // Check the result of the select.
+  //
+
+  #if defined(TEST) || defined(INFO)
+
+  handleCheckResultInLoop(*resultFDs, *errorFDs, *setFDs, *readSet, *writeSet, *selectTs, startTs);
+
+  #endif
+
+  //
+  // Get time spent in select. The accouting is done
+  // in milliseconds. This is a real problem on fast
+  // machines where each loop is unlikely to take
+  // more than 500 us, so consider that the results
+  // can be inaccurate.
+  //
+
+  nowTs = getNewTimestamp();
+
+  diffTs = diffTimestamp(startTs, nowTs);
+
+  #ifdef TEST
+  *logofs << "Loop: Out of select after " << diffTs << " Ms "
+          << "at " << strMsTimestamp(nowTs) << " with result "
+          << *resultFDs << ".\n" << logofs_flush;
+  #endif
+
+  startTs = nowTs;
+
+  #ifdef DEBUG
+  *logofs << "Loop: New timestamp is " << strMsTimestamp(startTs)
+          << ".\n" << logofs_flush;
+  #endif
+
+  if (control -> ProxyStage >= stage_operational)
+  {
+    statistics -> addIdleTime(diffTs);
+  }
+
+  if (*resultFDs < 0)
+  {
+    //
+    // Check if the call was interrupted or if any of the
+    // managed descriptors has become invalid. This can
+    // happen to the X11 code, before the descriptor is
+    // removed from the managed set.
+    //
+
+    #ifdef __sun
+
+    if (*errorFDs == EINTR || *errorFDs == EBADF ||
+            *errorFDs == EINVAL)
+
+    #else
+
+    if (*errorFDs == EINTR || *errorFDs == EBADF)
+
+    #endif
+
+    {
+      #ifdef TEST
+
+      if (*errorFDs == EINTR)
+      {
+        *logofs << "Loop: Select failed due to EINTR error.\n"
+                << logofs_flush;
+      }
+      else
+      {
+        *logofs << "Loop: WARNING! Call to select failed. Error is "
+                << EGET() << " '" << ESTR() << "'.\n"
+                << logofs_flush;
+      }
+
+      #endif
+    }
+    else
+    {
+      #ifdef PANIC
+      *logofs << "Loop: PANIC! Call to select failed. Error is "
+              << EGET() << " '" << ESTR() << "'.\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Call to select failed. Error is "
+           << EGET() << " '" << ESTR() << "'.\n";
+
+      HandleCleanup();
+    }
+  }
+
+  return 1;
+}
+
+//
+// Perform the required actions on all
+// the descriptors having I/O pending.
+//
+
+int NXTransExecute(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
+                       fd_set *writeSet, struct timeval *selectTs)
+{
+  if (logofs == NULL)
+  {
+    logofs = &cerr;
+  }
+
+  //
+  // Control is NULL if the NX transport was
+  // reset or never created. If control is
+  // valid then prepare for jumping back in
+  // the case of an error.
+  //
+
+  if (control == NULL || setjmp(context) == 1)
+  {
+    return 0;
+  }
+
+  #if defined(TEST) || defined(INFO)
+  *logofs << "\nNXTransExecute: Going to execute I/O on the NX descriptors.\n"
+          << logofs_flush;
+  #endif
+
+  if (control -> ProxyStage >= stage_operational)
+  {
+    //
+    // Check if I/O is possible on the proxy and
+    // local agent descriptors.
+    //
+
+    if (agent != NULL)
+    {
+      handleAgentInLoop(*resultFDs, *errorFDs, *setFDs, *readSet, *writeSet, *selectTs);
+    }
+
+    #ifdef TEST
+    *logofs << "Loop: Mark - 1 - at " << strMsTimestamp()
+            << " with " << diffTimestamp(startTs, getTimestamp())
+            << " Ms elapsed.\n" << logofs_flush;
+    #endif
+
+    //
+    // Rotate the channel that will be handled
+    // first.
+    //
+
+    handleRotateInLoop();
+
+    //
+    // Flush any data on newly writable sockets.
+    //
+
+    handleWritableInLoop(*resultFDs, *writeSet);
+
+    #ifdef TEST
+    *logofs << "Loop: Mark - 2 - at " << strMsTimestamp()
+            << " with " << diffTimestamp(startTs, getTimestamp())
+            << " Ms elapsed.\n" << logofs_flush;
+    #endif
+
+    //
+    // Check if any socket has become readable.
+    //
+
+    handleReadableInLoop(*resultFDs, *readSet);
+
+    #ifdef TEST
+    *logofs << "Loop: Mark - 3 - at " << strMsTimestamp()
+            << " with " << diffTimestamp(startTs, getTimestamp())
+            << " Ms elapsed.\n" << logofs_flush;
+    #endif
+
+    //
+    // Handle the scheduled events on channels.
+    //
+    // - Restart, if possible, any client that was
+    //   put to sleep.
+    //
+    // - Check if there are pointer motion events to
+    //   flush. This applies only to X server side.
+    //
+    // - Check if any channel has exited the conges-
+    //   tion state.
+    //
+    // - Check if there are images that are currently
+    //   being streamed.
+    //
+
+    handleEventsInLoop();
+
+    #ifdef TEST
+    *logofs << "Loop: Mark - 4 - at " << strMsTimestamp()
+            << " with " << diffTimestamp(startTs, getTimestamp())
+            << " Ms elapsed.\n" << logofs_flush;
+    #endif
+
+    //
+    // Check if user sent a signal to produce
+    // statistics.
+    //
+
+    handleStatisticsInLoop();
+
+    //
+    // We may have flushed the proxy link or
+    // handled data coming from the remote.
+    // Post-process the masks and set the
+    // selected agent descriptors as ready.
+    //
+
+    if (agent != NULL)
+    {
+      handleAgentLateInLoop(*resultFDs, *errorFDs, *setFDs, *readSet, *writeSet, *selectTs);
+    }
+
+    #ifdef TEST
+    *logofs << "Loop: Mark - 5 - at " << strMsTimestamp()
+            << " with " << diffTimestamp(startTs, getTimestamp())
+            << " Ms elapsed.\n" << logofs_flush;
+    #endif
+
+    //
+    // Check if there is any data to flush.
+    // Agents should flush the proxy link
+    // explicitly.
+    //
+
+    handleFlushInLoop();
+
+    #ifdef TEST
+    *logofs << "Loop: Mark - 6 - at " << strMsTimestamp()
+            << " with " << diffTimestamp(startTs, getTimestamp())
+            << " Ms elapsed.\n" << logofs_flush;
+    #endif
+  }
+
+  //
+  // Check if we have an alert to show.
+  //
+
+  handleAlertInLoop();
+
+  if (control -> ProxyStage >= stage_operational)
+  {
+    //
+    // Check if it's time to give up.
+    //
+
+    handleCheckSessionInLoop();
+
+    //
+    // Check if local proxy is consuming
+    // too many resources.
+    //
+
+    handleCheckBitrateInLoop();
+
+    //
+    // Check coherency of internal state.
+    //
+
+    #if defined(TEST) || defined(INFO)
+
+    handleCheckStateInLoop(*setFDs);
+
+    #endif
+
+    #ifdef TEST
+    *logofs << "Loop: Mark - 7 - at " << strMsTimestamp()
+            << " with " << diffTimestamp(startTs, getTimestamp())
+            << " Ms elapsed.\n" << logofs_flush;
+    #endif
+  }
+
+  //
+  // Truncate the logs if needed.
+  //
+
+  handleLogReopenInLoop(logsTs, nowTs);
+
+  return 1;
+}
+
+//
+// Initialize the connection parameters and
+// prepare for negotiating the link with the
+// remote proxy.
+//
+
+int InitBeforeNegotiation()
+{
+  //
+  // Disable limits on core dumps.
+  //
+
+  SetCore();
+
+  //
+  // Install the signal handlers.
+  //
+
+  InstallSignals();
+
+  //
+  // Track how much time we spent in initialization.
+  //
+
+  nowTs = getNewTimestamp();
+
+  startTs = nowTs;
+  initTs  = nowTs;
+
+  #ifdef TEST
+  *logofs << "Loop: INIT! Taking mark for initialization at "
+          << strMsTimestamp(initTs) << ".\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // If not explicitly specified, determine if local
+  // mode is client or server according to parameters
+  // provided so far.
+  //
+
+  if (WE_SET_PROXY_MODE == 0)
+  {
+    cerr << "Error" << ": Please specify either the -C or -S option.\n";
+
+    HandleCleanup();
+  }
+
+  //
+  // Start a watchdog. If initialization cannot
+  // be completed before timeout, then clean up
+  // everything and exit.
+  //
+
+  if (control -> ProxyMode == proxy_client)
+  {
+    #ifdef TEST
+    *logofs << "Loop: Starting watchdog process with timeout of "
+            << control -> InitTimeout / 1000 << " seconds.\n"
+            << logofs_flush;
+    #endif
+
+    lastWatchdog = NXTransWatchdog(control -> InitTimeout);
+
+    if (IsFailed(lastWatchdog))
+    {
+      #ifdef PANIC
+      *logofs << "Loop: PANIC! Can't start the NX watchdog process.\n"
+              << logofs_flush;
+      #endif
+
+      SetNotRunning(lastWatchdog);
+    }
+    #ifdef TEST
+    else
+    {
+      *logofs << "Loop: Watchdog started with pid '"
+              << lastWatchdog << "'.\n" << logofs_flush;
+    }
+    #endif
+  }
+
+  //
+  // Print preliminary info.
+  //
+
+  PrintProcessInfo();
+
+  //
+  // Set cups, multimedia and other
+  // auxiliary ports.
+  //
+
+  SetPorts();
+
+  //
+  // Increase the number of maximum open
+  // file descriptors for this process.
+  //
+
+  SetDescriptors();
+
+  //
+  // Set local endianess.
+  //
+
+  unsigned int test = 1;
+
+  setHostBigEndian(*((unsigned char *) (&test)) == 0);
+
+  #ifdef TEST
+  *logofs << "Loop: Local host is "
+          << (hostBigEndian() ? "big endian" : "little endian")
+          << ".\n" << logofs_flush;
+  #endif
+
+  if (control -> ProxyMode == proxy_client)
+  {
+    //
+    // Listen on sockets that mimic an X display to
+    // which X clients will be able to connect (e.g.
+    // unix:8 and/or localhost:8).
+    //
+
+    if (useTcpSocket == 1)
+    {
+      SetupTcpSocket();
+    }
+
+    if (useUnixSocket == 1)
+    {
+      SetupUnixSocket();
+    }
+  }
+  else
+  {
+    //
+    // Don't listen for X connections.
+    //
+
+    useUnixSocket  = 0;
+    useTcpSocket   = 0;
+    useAgentSocket = 0;
+
+    //
+    // Get ready to open the local display.
+    //
+
+    SetupDisplaySocket(xServerAddrFamily, xServerAddr, xServerAddrLength);
+  }
+
+  //
+  // If we are the NX server-side proxy we need to
+  // complete our initializazion. We will mandate
+  // our parameters at the time the NX client will
+  // connect.
+  //
+
+  if (control -> ProxyMode == proxy_client)
+  {
+    SetParameters();
+  }
+
+  return 1;
+}
+
+int SetupProxyConnection()
+{
+
+  if (proxyFD == -1)
+  {
+
+    char *socketUri = NULL;
+
+    // Let's make sure, the default value for listenSocket is properly set. Doing this
+    // here, because we have to make sure that we call it after the connectSocket
+    // declaration is really really complete.
+
+    if (listenSocket.disabled() && connectSocket.disabled())
+    {
+      char listenPortValue[20] = { 0 };
+      sprintf(listenPortValue, "%ld", (long)(proxyPort + DEFAULT_NX_PROXY_PORT_OFFSET));
+
+      SetAndValidateChannelEndPointArg("local", "listen", listenPortValue, listenSocket);
+    }
+
+    #ifdef TEST
+    connectSocket.getSpec(&socketUri);
+    *logofs << "Loop: connectSocket is "<< ( connectSocket.enabled() ? "enabled" : "disabled") << ". "
+            << "The socket URI is '"<< ( socketUri != NULL ? socketUri : "<unset>") << "'.\n" << logofs_flush;
+    listenSocket.getSpec(&socketUri);
+    *logofs << "Loop: listenSocket is "<< ( listenSocket.enabled() ? "enabled" : "disabled") << ". "
+            << "The socket URI is '"<< ( socketUri != NULL ? socketUri : "<unset>") << "'.\n" << logofs_flush;
+    free(socketUri);
+    socketUri = NULL;
+    #endif
+
+    if (WE_INITIATE_CONNECTION)
+    {
+      if (connectSocket.getSpec(&socketUri))
+      {
+        #ifdef TEST
+        *logofs << "Loop: Going to connect to '" << socketUri
+                << "'.\n" << logofs_flush;
+        #endif
+        free(socketUri);
+
+        proxyFD = ConnectToRemote(connectSocket);
+
+        #ifdef TEST
+        *logofs << "Loop: Connected to remote proxy on FD#"
+                << proxyFD << ".\n" << logofs_flush;
+        #endif
+
+        cerr << "Info" << ": Connected to remote proxy on FD#"
+             << proxyFD << ".\n";
+      }
+    }
+    else
+    {
+
+      if (listenSocket.isTCPSocket() && (listenSocket.getTCPPort() < 0))
+      {
+        listenSocket.setSpec(DEFAULT_NX_PROXY_PORT_OFFSET + proxyPort);
+      }
+
+      if (listenSocket.getSpec(&socketUri))
+      {
+        #ifdef TEST
+        *logofs << "Loop: Going to wait for connection at '"
+                << socketUri << "'.\n" << logofs_flush;
+        #endif
+        free(socketUri);
+
+        proxyFD = WaitForRemote(listenSocket);
+
+        #ifdef TEST
+        if (WE_LISTEN_FORWARDER)
+        {
+          *logofs << "Loop: Connected to remote forwarder on FD#"
+                  << proxyFD << ".\n" << logofs_flush;
+        }
+        else
+        {
+          *logofs << "Loop: Connected to remote proxy on FD#"
+                  << proxyFD << ".\n" << logofs_flush;
+        }
+        #endif
+
+      }
+    }
+  }
+  #ifdef TEST
+  else
+  {
+    *logofs << "Loop: Using the inherited connection on FD#"
+            << proxyFD << ".\n" << logofs_flush;
+  }
+  #endif
+
+  //
+  // Set TCP_NODELAY on proxy descriptor
+  // to reduce startup time. Option will
+  // later be disabled if needed.
+  //
+  // either listenSocket or connectSocket is used here...
+
+  if(listenSocket.isTCPSocket() || connectSocket.isTCPSocket())
+
+    SetNoDelay(proxyFD, 1);
+
+  //
+  // We need non-blocking input since the
+  // negotiation phase.
+  //
+
+  SetNonBlocking(proxyFD, 1);
+
+  return 1;
+}
+
+//
+// Create the required proxy and channel classes
+// and get ready for handling the encoded traffic.
+//
+
+int InitAfterNegotiation()
+{
+  #ifdef TEST
+  *logofs << "Loop: Connection with remote proxy completed.\n"
+          << logofs_flush;
+  #endif
+
+  cerr << "Info" << ": Connection with remote proxy completed.\n"
+        << logofs_flush;
+
+  //
+  // If we are the server proxy we completed
+  // our initializazion phase according to
+  // the values provided by the client side.
+  //
+
+  if (control -> ProxyMode == proxy_server)
+  {
+    SetParameters();
+  }
+
+  //
+  // Set up the listeners for the additional
+  // services.
+  //
+
+  SetupServiceSockets();
+
+  //
+  // Create the proxy class and the statistics
+  // repository and pass all the configuration
+  // data we negotiated with the remote peer.
+  //
+
+  SetupProxyInstance();
+
+  //
+  // We completed both parsing of user's parameters
+  // and handlshaking with remote proxy. Now print
+  // a brief summary including the most significant
+  // control values.
+  //
+
+  PrintConnectionInfo();
+
+  //
+  // Cancel the initialization watchdog.
+  //
+
+  if (IsRunning(lastWatchdog))
+  {
+    KillProcess(lastWatchdog, "watchdog", SIGTERM, 1);
+
+    SetNotRunning(lastWatchdog);
+
+    lastSignal = 0;
+  }
+
+  //
+  // Start the house-keeper process. It will
+  // remove the oldest persistent caches, if
+  // the amount of storage exceed the limits
+  // set by the user.
+  //
+
+  StartKeeper();
+
+  //
+  // Set the log size check timestamp.
+  //
+
+  nowTs = getNewTimestamp();
+
+  logsTs = nowTs;
+
+  //
+  // TODO: Due to the way the new NX transport is working,
+  // the accounting of time spent handling messages must
+  // be rewritten. In particular, at the moment it only
+  // shows the time spent encoding and decoding messages
+  // in the main loop, after executing a select. It doesn't
+  // take into account the time spent in the NXTrans* calls
+  // where messages can be encoded and decoded implicitly,
+  // on demand of the agent. When the agent transport is
+  // in use, these calls constitute the vast majority of
+  // the encoding activity. The result is that the number
+  // of KB encoded per second shown by the proxy statistics
+  // is actually much lower than the real throughput gene-
+  // rated by the proxy.
+  //
+
+  #ifdef TEST
+  *logofs << "Loop: INIT! Completed initialization at "
+          << strMsTimestamp(nowTs) << " with "
+          << diffTimestamp(initTs, nowTs) << " Ms "
+          << "since the init mark.\n" << logofs_flush;
+  #endif
+
+  initTs = getNewTimestamp();
+
+  //
+  // We can now start handling binary data from
+  // our peer proxy.
+  //
+
+  if (agent == NULL)
+  {
+    cerr << "Session" << ": Session started at '"
+         << strTimestamp() << "'.\n";
+  }
+
+  return 1;
+}
+
+int SetMode(int mode)
+{
+  //
+  // Set the local proxy mode.
+  //
+
+  if (control -> ProxyMode == proxy_undefined)
+  {
+    if (mode == NX_MODE_CLIENT)
+    {
+      #ifdef TEST
+      *logofs << "Loop: INIT! Initializing with mode "
+              << "NX_MODE_CLIENT at " << strMsTimestamp()
+              << ".\n" << logofs_flush;
+      #endif
+
+      control -> ProxyMode = proxy_client;
+    }
+    else if (mode == NX_MODE_SERVER)
+    {
+      #ifdef TEST
+      *logofs << "Loop: INIT! Initializing with mode "
+              << "NX_MODE_SERVER at " << strMsTimestamp()
+              << ".\n" << logofs_flush;
+      #endif
+
+      control -> ProxyMode = proxy_server;
+    }
+    else
+    {
+      cerr << "Error" << ": Please specify either "
+           << "the -C or -S option.\n";
+
+      HandleCleanup();
+    }
+  }
+
+  return 1;
+}
+
+int SetupProxyInstance()
+{
+  if (control -> ProxyMode == proxy_client)
+  {
+    proxy = new ClientProxy(proxyFD);
+  }
+  else
+  {
+    proxy = new ServerProxy(proxyFD);
+  }
+
+  if (proxy == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Error creating the NX proxy.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Error creating the NX proxy.\n";
+
+    HandleCleanup();
+  }
+
+  //
+  // Create the statistics repository.
+  //
+
+  statistics = new Statistics(proxy);
+
+  if (statistics == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Error creating the NX statistics.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Error creating the NX statistics.\n";
+
+    HandleCleanup();
+  }
+
+  //
+  // If user gave us a proxy cookie than create the
+  // X11 authorization repository and find the real
+  // cookie to be used for our X display.
+  //
+
+  SetupAuthInstance();
+
+  //
+  // Reset the static members in channels.
+  //
+
+  proxy -> handleChannelConfiguration();
+
+  //
+  // Inform the proxies about the ports where they
+  // will have to forward the network connections.
+  //
+
+  proxy -> handleDisplayConfiguration(displayHost, xServerAddrFamily,
+                                          xServerAddr, xServerAddrLength);
+
+  proxy -> handlePortConfiguration(cupsPort, smbPort, mediaPort,
+                                       httpPort, fontPort);
+
+  //
+  // We handed over the sockaddr structure we
+  // created when we set up the display socket
+  // to the proxy.
+  //
+
+  xServerAddr = NULL;
+
+  //
+  // Set socket options on proxy link, then propagate link
+  // configuration to proxy. This includes translating some
+  // control parameters in 'local' and 'remote'. Finally
+  // adjust cache parameters according to pack method and
+  // session type selected by user.
+  //
+
+  if (proxy -> handleSocketConfiguration() < 0 ||
+          proxy -> handleLinkConfiguration() < 0 ||
+              proxy -> handleCacheConfiguration() < 0)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Error configuring the NX transport.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Error configuring the NX transport.\n";
+
+    HandleCleanup();
+  }
+
+  //
+  // Load the message stores from the persistent
+  // cache.
+  //
+
+  proxy -> handleLoad(load_if_first);
+
+  //
+  // Inform the proxy that from now on it can
+  // start handling the encoded data.
+  //
+
+  proxy -> setOperational();
+
+  //
+  // Are we going to use an internal IPC connection
+  // with an agent? In this case create the channel
+  // by using the socket descriptor provided by the
+  // caller at the proxy initialization.
+  //
+
+  SetupAgentInstance();
+
+  //
+  // Check if we need to verify the existence of
+  // a matching client cache at shutdown.
+  //
+
+  #ifdef MATCH
+
+  control -> PersistentCacheCheckOnShutdown = 1;
+
+  #endif
+
+  //
+  // Flush any data produced so far.
+  //
+
+  proxy -> handleFlush();
+
+  #if defined(TEST) || defined(INFO)
+
+  if (proxy -> getFlushable(proxyFD) > 0)
+  {
+    *logofs << "Loop: WARNING! Proxy FD#" << proxyFD << " has data "
+            << "to flush after setup of the NX transport.\n"
+            << logofs_flush;
+  }
+
+  #endif
+
+  return 1;
+}
+
+int SetupAuthInstance()
+{
+  //
+  // If user gave us a proxy cookie, then create the
+  // X11 authorization repository and find the real
+  // cookie to be used for our X display.
+  //
+
+  if (control -> ProxyMode == proxy_server)
+  {
+    if (authCookie != NULL && *authCookie != '\0')
+    {
+      if (useLaunchdSocket == 1)
+      {
+        //
+        // If we are going to retrieve the X11 autho-
+        // rization through the launchd service, make
+        // a connection to its socket to trigger the
+        // X server starting.
+        //
+
+        sockaddr_un launchdAddrUnix;
+
+        unsigned int launchdAddrLength = sizeof(sockaddr_un);
+
+        int launchdAddrFamily = AF_UNIX;
+
+        launchdAddrUnix.sun_family = AF_UNIX;
+
+        const int launchdAddrNameLength = 108;
+
+        int success = -1;
+
+        strncpy(launchdAddrUnix.sun_path, displayHost, launchdAddrNameLength);
+
+        *(launchdAddrUnix.sun_path + launchdAddrNameLength - 1) = '\0';
+
+        #ifdef TEST
+        *logofs << "Loop: Connecting to launchd service "
+                << "on Unix port '" << displayHost << "'.\n" << logofs_flush;
+        #endif
+
+        int launchdFd = socket(launchdAddrFamily, SOCK_STREAM, PF_UNSPEC);
+
+        if (launchdFd < 0)
+        {
+          #ifdef PANIC
+          *logofs << "Loop: PANIC! Call to socket failed. "
+                  << "Error is " << EGET() << " '" << ESTR()
+                  << "'.\n" << logofs_flush;
+          #endif
+        }
+        else if ((success = connect(launchdFd, (sockaddr *) &launchdAddrUnix, launchdAddrLength)) < 0)
+        {
+          #ifdef WARNING
+          *logofs << "Loop: WARNING! Connection to launchd service "
+                  << "on Unix port '" << displayHost << "' failed "
+                  << "with error " << EGET() << ", '" << ESTR() << "'.\n"
+                  << logofs_flush;
+          #endif
+        }
+
+        if (launchdFd >= 0)
+        {
+          close(launchdFd);
+        }
+
+        //
+        // The real cookie will not be available
+        // until the X server starts. Query for the
+        // cookie in a loop, unless the connection
+        // to the launchd service failed.
+        //
+
+        int attempts = (success < 0 ? 1 : 10);
+
+        for (int i = 0; i < attempts; i++)
+        {
+          delete auth;
+
+          auth = new Auth(displayHost, authCookie);
+
+          if (auth != NULL && auth -> isFake() == 1)
+          {
+            usleep(200000);
+
+            continue;
+          }
+
+          break;
+        }
+      }
+      else
+      {
+        auth = new Auth(displayHost, authCookie);
+      }
+
+      if (auth == NULL || auth -> isValid() != 1)
+      {
+        #ifdef PANIC
+        *logofs << "Loop: PANIC! Error creating the X authorization.\n"
+                << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Error creating the X authorization.\n";
+
+        HandleCleanup();
+      }
+      else if (auth -> isFake() == 1)
+      {
+        #ifdef WARNING
+        *logofs << "Loop: WARNING! Could not retrieve the X server "
+                << "authentication cookie.\n"
+                << logofs_flush;
+        #endif
+
+        cerr << "Warning" << ": Failed to read data from the X "
+             << "auth command.\n";
+
+        cerr << "Warning" << ": Generated a fake cookie for X "
+             << "authentication.\n";
+      }
+    }
+    else
+    {
+      #ifdef TEST
+      *logofs << "Loop: No proxy cookie was provided for "
+              << "authentication.\n" << logofs_flush;
+      #endif
+
+      cerr << "Info" << ": No proxy cookie was provided for "
+           << "authentication.\n";
+
+      #ifdef TEST
+      *logofs << "Loop: Forwarding the real X authorization "
+              << "cookie.\n" << logofs_flush;
+      #endif
+
+      cerr << "Info" << ": Forwarding the real X authorization "
+           << "cookie.\n";
+    }
+  }
+
+  return 1;
+}
+
+int SetupAgentInstance()
+{
+  if (control -> ProxyMode == proxy_client &&
+          useAgentSocket == 1)
+  {
+    //
+    // This will temporarily disable signals to safely
+    // load the cache, then will send a control packet
+    // to the remote end, telling that cache has to be
+    // loaded, so it's important that proxy is already
+    // set in operational state.
+    //
+
+    int result;
+
+    if (agent != NULL)
+    {
+      result = proxy -> handleNewAgentConnection(agent);
+    }
+    else
+    {
+      result = proxy -> handleNewConnection(channel_x11, agentFD[1]);
+    }
+
+    if (result < 0)
+    {
+      #ifdef PANIC
+      *logofs << "Loop: PANIC! Error creating the NX agent connection.\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Error creating the NX agent connection.\n";
+
+      HandleCleanup();
+    }
+  }
+
+  return 1;
+}
+
+int SetupTcpSocket()
+{
+  //
+  // Open TCP socket emulating local display.
+  //
+
+  return ListenConnectionTCP((loopbackBind ? "localhost" : "*"), X_TCP_PORT + proxyPort, "X11");
+}
+
+int SetupUnixSocket()
+{
+  //
+  // Open UNIX domain socket for display.
+  //
+
+  if (!control->TempPath) {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Temporal path is null.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Temporal path is null.\n";
+    HandleCleanup();
+  }
+
+  unsigned int required = snprintf(unixSocketName, DEFAULT_STRING_LENGTH, "%s/.X11-unix", control->TempPath);
+  if (required < sizeof(unixSocketName)) {
+
+    // No need to execute the following actions conditionally
+    mkdir(unixSocketName, (0777 | S_ISVTX));
+    chmod(unixSocketName, (0777 | S_ISVTX));
+
+    required = snprintf(unixSocketName, DEFAULT_STRING_LENGTH, "%s/.X11-unix/X%d", control->TempPath, proxyPort);
+    if (required < sizeof(unixSocketName)) {
+
+      unixFD = ListenConnectionUnix(unixSocketName, "x11");
+      if (unixFD >= 0)
+        chmod(unixSocketName, 0777);
+      return unixFD;
+    }
+  }
+
+  unixSocketName[0] = '\0'; // Just in case!
+
+  #ifdef PANIC
+  *logofs << "Loop: PANIC! path for unix socket is too long.\n" << logofs_flush;
+  #endif
+
+  cerr << "Error" << ": path for Unix socket is too long.\n";
+  HandleCleanup();
+}
+
+//
+// The following is a dumb copy-paste. The
+// nxcompsh library should offer a better
+// implementation.
+//
+
+int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
+                           unsigned int &xServerAddrLength)
+{
+  xServerAddrFamily = AF_INET;
+  xServerAddr = NULL;
+  xServerAddrLength = 0;
+
+  char *display;
+
+  if (*displayHost == '\0')
+  {
+    //
+    // Assume DISPLAY as the X server to which
+    // we will forward the proxied connections.
+    // This means that NX parameters have been
+    // passed through other means.
+    //
+
+    display = getenv("DISPLAY");
+
+    if (display == NULL || *display == '\0')
+    {
+      #ifdef PANIC
+      *logofs << "Loop: PANIC! Host X server DISPLAY is not set.\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Host X server DISPLAY is not set.\n";
+
+      HandleCleanup();
+    }
+    else if (strncasecmp(display, "nx/nx,", 6) == 0 ||
+                 strncasecmp(display, "nx,", 3) == 0 ||
+                     strncasecmp(display, "nx/nx:", 6) == 0 ||
+                         strncasecmp(display, "nx:", 3) == 0)
+    {
+      #ifdef PANIC
+      *logofs << "Loop: PANIC! NX transport on host X server '"
+              << display << "' not supported.\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": NX transport on host X server '"
+           << display << "' not supported.\n";
+
+      cerr << "Error" << ": Please run the local proxy specifying "
+           << "the host X server to connect to.\n";
+
+      HandleCleanup();
+    }
+    else if (strlen(display) >= DEFAULT_STRING_LENGTH)
+    {
+      #ifdef PANIC
+      *logofs << "Loop: PANIC! Host X server DISPLAY cannot exceed "
+              << DEFAULT_STRING_LENGTH << " characters.\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Host X server DISPLAY cannot exceed "
+           << DEFAULT_STRING_LENGTH << " characters.\n";
+
+      HandleCleanup();
+    }
+
+    strcpy(displayHost, display);
+  }
+
+  display = new char[strlen(displayHost) + 1];
+
+  if (display == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Out of memory handling DISPLAY variable.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Out of memory handling DISPLAY variable.\n";
+
+    HandleCleanup();
+  }
+
+  strcpy(display, displayHost);
+
+  #ifdef __APPLE__
+
+  if ((strncasecmp(display, "/tmp/launch", 11) == 0) || (strncasecmp(display, "/private/tmp/com.apple.launchd", 30) == 0))
+  {
+    #ifdef TEST
+    *logofs << "Loop: Using launchd service on socket '"
+            << display << "'.\n" << logofs_flush;
+    #endif
+
+    useLaunchdSocket = 1;
+  }
+
+  #endif
+
+  char *separator = strrchr(display, ':');
+
+  if ((separator == NULL) || !isdigit(*(separator + 1)))
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Invalid display '" << display << "'.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Invalid display '" << display << "'.\n";
+
+    HandleCleanup();
+  }
+
+  *separator = '\0';
+
+  xPort = atoi(separator + 1);
+
+  #ifdef TEST
+  *logofs << "Loop: Using local X display '" << displayHost
+          << "' with host '" << display << "' and port '"
+          << xPort << "'.\n" << logofs_flush;
+  #endif
+
+  #ifdef __APPLE__
+
+  if (separator == display || strcmp(display, "unix") == 0 ||
+          useLaunchdSocket == 1)
+
+  #else
+
+  if (separator == display || strcmp(display, "unix") == 0)
+
+  #endif
+  {
+    //
+    // UNIX domain port.
+    //
+
+    #ifdef TEST
+    *logofs << "Loop: Using real X server on UNIX domain socket.\n"
+            << logofs_flush;
+    #endif
+
+    sockaddr_un *xServerAddrUNIX = new sockaddr_un;
+
+    xServerAddrFamily = AF_UNIX;
+    xServerAddrUNIX -> sun_family = AF_UNIX;
+
+    //
+    // The scope of this function is to fill either the sockaddr_un
+    // (when the display is set to the Unix Domain socket) or the
+    // sockaddr_in structure (when connecting by TCP) only once, so
+    // that the structure will be later used at the time the server
+    // proxy will try to forward the connection to the X server. We
+    // don't need to verify that the socket does exist at the pre-
+    // sent moment. The method that forwards the connection will
+    // perform the required checks and will retry, if needed. Anyway
+    // we need to select the name of the socket, so we check if the
+    // well-known directory exists and take that as an indication of
+    // where the socket will be created.
+    //
+
+    // Try abstract X11 socket first (via a test connect), if that fails
+    // fall back to Unix domain socket file.
+
+    #ifdef __linux__
+    int testSocketFD;
+    testSocketFD = socket(xServerAddrFamily, SOCK_STREAM, PF_UNSPEC);
+
+    int len = sprintf(unixSocketName + 1, "/tmp/.X11-unix/X%d", xPort);
+    unixSocketName[0] = '\0';
+
+    sockaddr_un *xServerAddrABSTRACT = new sockaddr_un;
+    memset(xServerAddrABSTRACT, 0, xServerAddrLength);
+    xServerAddrABSTRACT -> sun_family = AF_UNIX;
+    memcpy(xServerAddrABSTRACT -> sun_path, unixSocketName, len+1);
+    xServerAddrLength = len +3;
+
+    int ret = connect(testSocketFD, (struct sockaddr *) xServerAddrABSTRACT, xServerAddrLength);
+    if (ret == 0) {
+
+        cerr << "Info" << ": Using abstract X11 socket in kernel namespace "
+             << "for accessing DISPLAY=:" << xPort << ".\n";
+
+        close(testSocketFD);
+        xServerAddr = (sockaddr *) xServerAddrABSTRACT;
+        return 1;
+
+    } else {
+
+        cerr << "Info" << ": Falling back to file system X11 socket "
+             << "for accessing DISPLAY=:" << xPort << ".\n";
+
+    #endif
+
+    struct stat statInfo;
+
+    char unixSocketDir[DEFAULT_STRING_LENGTH];
+
+    snprintf(unixSocketDir, DEFAULT_STRING_LENGTH - 1, "%s/.X11-unix",
+                 control -> TempPath);
+
+    #ifdef __APPLE__
+
+    if (useLaunchdSocket == 1)
+    {
+      char *slash = rindex(display, '/');
+
+      if (slash != NULL)
+      {
+        *slash = '\0';
+      }
+
+      snprintf(unixSocketDir, DEFAULT_STRING_LENGTH - 1, "%s", display);
+    }
+
+    #endif
+
+    *(unixSocketDir + DEFAULT_STRING_LENGTH - 1) = '\0';
+
+    #ifdef TEST
+    *logofs << "Loop: Assuming X socket in directory '"
+            << unixSocketDir << "'.\n" << logofs_flush;
+    #endif
+
+    if (stat(unixSocketDir, &statInfo) < 0)
+    {
+      #ifdef PANIC
+      *logofs << "Loop: PANIC! Can't determine the location of "
+              << "the X display socket.\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Can't determine the location of "
+           << "the X display socket.\n";
+
+      #ifdef PANIC
+      *logofs << "Loop: PANIC! Error " << EGET() << " '" << ESTR()
+              << "' checking '" << unixSocketDir << "'.\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Error " << EGET() << " '" << ESTR()
+           << "' checking '" << unixSocketDir << "'.\n";
+
+      HandleCleanup();
+    }
+
+    sprintf(unixSocketName, "%s/X%d", unixSocketDir, xPort);
+
+    #ifdef __APPLE__
+
+    if (useLaunchdSocket == 1)
+    {
+      strncpy(unixSocketName, displayHost, DEFAULT_STRING_LENGTH - 1);
+    }
+
+    #endif
+
+    #ifdef TEST
+    *logofs << "Loop: Assuming X socket name '" << unixSocketName
+            << "'.\n" << logofs_flush;
+    #endif
+
+    strcpy(xServerAddrUNIX -> sun_path, unixSocketName);
+
+    xServerAddr = (sockaddr *) xServerAddrUNIX;
+    xServerAddrLength = sizeof(sockaddr_un);
+
+    #ifdef __linux__
+
+    }
+    #endif
+  }
+  else
+  {
+    //
+    // TCP port.
+    //
+
+    #ifdef TEST
+    *logofs << "Loop: Using real X server on TCP port.\n"
+            << logofs_flush;
+    #endif
+
+    xServerAddrFamily = AF_INET;
+
+    int xServerIPAddr = GetHostAddress(display);
+
+    if (xServerIPAddr == 0)
+    {
+      #ifdef PANIC
+      *logofs << "Loop: PANIC! Unknown display host '" << display
+              << "'.\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Unknown display host '" << display
+           << "'.\n";
+
+      HandleCleanup();
+    }
+
+    sockaddr_in *xServerAddrTCP = new sockaddr_in;
+
+    xServerAddrTCP -> sin_family = AF_INET;
+    xServerAddrTCP -> sin_port = htons(X_TCP_PORT + xPort);
+    xServerAddrTCP -> sin_addr.s_addr = xServerIPAddr;
+
+    xServerAddr = (sockaddr *) xServerAddrTCP;
+    xServerAddrLength = sizeof(sockaddr_in);
+  }
+
+  delete [] display;
+
+  return 1;
+}
+
+int SetupServiceSockets()
+{
+  if (control -> ProxyMode == proxy_client)
+  {
+    if (useCupsSocket)
+    {
+      if ((cupsFD = ListenConnection(cupsPort, "CUPS")) < 0)
+      {
+        useCupsSocket = 0;
+      }
+    }
+
+    if (useAuxSocket)
+    {
+      if ((auxFD = ListenConnection(auxPort, "auxiliary X11")) < 0)
+      {
+        useAuxSocket = 0;
+      }
+    }
+
+    if (useSmbSocket)
+    {
+      if ((smbFD = ListenConnection(smbPort, "SMB")) < 0)
+      {
+        useSmbSocket = 0;
+      }
+    }
+
+    if (useMediaSocket)
+    {
+      if ((mediaFD = ListenConnection(mediaPort, "media")) < 0)
+      {
+        useMediaSocket = 0;
+      }
+    }
+
+    if (useHttpSocket)
+    {
+      if ((httpFD = ListenConnection(httpPort, "http")) < 0)
+      {
+        useHttpSocket = 0;
+      }
+    }
+
+    useFontSocket = 0;
+  }
+  else
+  {
+    //
+    // Get ready to listen for the font server connections
+    //
+
+    if (useFontSocket)
+    {
+      // Since ProtoStep7 (#issue 108)
+      int port = atoi(fontPort);
+
+      if ((fontFD = ListenConnectionTCP("localhost", port, "font")) < 0)
+      {
+        useFontSocket = 0;
+      }
+    }
+
+    useCupsSocket  = 0;
+    useAuxSocket   = 0;
+    useSmbSocket   = 0;
+    useMediaSocket = 0;
+    useHttpSocket  = 0;
+  }
+
+  //
+  // Slave channels can be originated
+  // by both sides.
+  //
+
+  if (useSlaveSocket)
+  {
+    // Since ProtoStep7 (#issue 108)
+    if ((slaveFD = ListenConnection(slavePort, "slave")) < 0)
+    {
+      useSlaveSocket = 0;
+    }
+  }
+
+  return 1;
+}
+
+int ListenConnectionAny(sockaddr *addr, socklen_t addrlen, const char *label)
+{
+  int newFD = socket(addr->sa_family, SOCK_STREAM, PF_UNSPEC);
+
+  if (newFD == -1)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Call to socket failed for " << label
+            << " socket. Error is " << EGET() << " '"
+            << ESTR() << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Call to socket failed for " << label
+         << " socket. Error is " << EGET() << " '"
+         << ESTR() << "'.\n";
+
+    goto SetupSocketError;
+  }
+
+  if (addr->sa_family == AF_INET)
+    if (SetReuseAddress(newFD) < 0)
+    {
+      // SetReuseAddress already warns with an error
+      goto SetupSocketError;
+    }
+
+  if (bind(newFD, addr, addrlen) == -1)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Call to bind failed for " << label
+            << ". Error is " << EGET()
+            << " '" << ESTR() << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Call to bind failed for " << label
+         << ". Error is " << EGET()
+         << " '" << ESTR() << "'.\n";
+    goto SetupSocketError;
+  }
+
+  if (listen(newFD, 8) == -1)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Call to listen failed for " << label
+            << ". Error is " << EGET()
+            << " '" << ESTR() << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Call to listen failed for " << label
+         << ". Error is " << EGET()
+         << " '" << ESTR() << "'.\n";
+
+    goto SetupSocketError;
+  }
+
+  return newFD;
+
+SetupSocketError:
+
+  if (newFD != -1)
+  {
+    close(newFD);
+  }
+
+  //
+  // May optionally return. The session would
+  // continue without the service. The problem
+  // with this approach is that it would make
+  // harder to track problems with allocation
+  // of ports in clients and server.
+  //
+
+  HandleCleanup();
+  return -1;
+}
+
+int ListenConnectionUnix(const char *path, const char *label)
+{
+
+  sockaddr_un unixAddr;
+  unixAddr.sun_family = AF_UNIX;
+#ifdef UNIX_PATH_MAX
+  if (strlen(path) >= UNIX_PATH_MAX)
+#else
+  if (strlen(path) >= sizeof(unixAddr.sun_path))
+#endif
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Socket path \"" << path << "\" for "
+            << label << " is too long.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Socket path \"" << path << "\" for "
+         << label << " is too long.\n";
+
+    HandleCleanup();
+    return -1;
+  }
+
+  strcpy(unixAddr.sun_path, path);
+  return ListenConnectionAny((sockaddr *)&unixAddr, sizeof(unixAddr), label);
+}
+
+int ListenConnectionTCP(const char *host, long port, const char *label)
+{
+  sockaddr_in tcpAddr;
+  tcpAddr.sin_family = AF_INET;
+  tcpAddr.sin_port = htons(port);
+
+  if (loopbackBind ||
+      !host ||
+      !strcmp(host, "") ||
+      !strcmp(host, "localhost")) {
+    tcpAddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+  }
+  else if(strcmp(host, "*") == 0) {
+    tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY);
+  }
+  else {
+    int ip = tcpAddr.sin_addr.s_addr = GetHostAddress(host);
+    if (ip == 0)
+    {
+      #ifdef PANIC
+      *logofs << "Loop: PANIC! Unknown " << label << " host '" << host
+              << "'.\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Unknown " << label << " host '" << host
+           << "'.\n";
+
+      HandleCleanup();
+      return -1;
+    }
+  }
+
+  return ListenConnectionAny((sockaddr *)&tcpAddr, sizeof(tcpAddr), label);
+}
+
+int ListenConnection(ChannelEndPoint &endpoint, const char *label)
+{
+  char *unixPath, *host;
+  long port;
+  if (endpoint.getUnixPath(&unixPath)) {
+    return ListenConnectionUnix(unixPath, label);
+  }
+  else if (endpoint.getTCPHostAndPort(&host, &port)) {
+    return ListenConnectionTCP(host, port, label);
+  }
+  return -1;
+}
+
+static int AcceptConnection(int fd, int domain, const char *label)
+{
+  struct sockaddr newAddr;
+
+  socklen_t addrLen = sizeof(newAddr);
+
+  #ifdef TEST
+
+  if (domain == AF_UNIX)
+  {
+    *logofs << "Loop: Going to accept new Unix " << label
+            << " connection on FD#" << fd << ".\n"
+            << logofs_flush;
+  }
+  else
+  {
+    *logofs << "Loop: Going to accept new TCP " << label
+            << " connection on FD#" << fd << ".\n"
+            << logofs_flush;
+  }
+
+  #endif
+
+  int newFD = accept(fd, &newAddr, &addrLen);
+
+  if (newFD < 0)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Call to accept failed for "
+            << label << " connection. Error is " << EGET()
+            << " '" << ESTR() << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Call to accept failed for "
+         << label << " connection. Error is " << EGET()
+         << " '" << ESTR() << "'.\n";
+  }
+
+  return newFD;
+}
+
+void HandleShutdown()
+{
+  if (proxy -> getShutdown() == 0)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! No shutdown of proxy link "
+            << "performed by remote proxy.\n"
+            << logofs_flush;
+    #endif
+
+    //
+    // Close the socket before showing the alert.
+    // It seems that the closure of the socket can
+    // sometimes take several seconds, even after
+    // the connection is broken. The result is that
+    // the dialog can be shown long after the user
+    // has gone after the failed session. Note that
+    // disabling the linger timeout does not seem
+    // to make any difference.
+    //
+
+    CleanupSockets();
+
+    cerr << "Error" << ": Connection with remote peer broken.\n";
+
+    #ifdef TEST
+    *logofs << "Loop: Bytes received so far are "
+            << (unsigned long long) statistics -> getBytesIn()
+            << ".\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Please check the state of your "
+         << "network and retry.\n";
+
+    handleTerminatingInLoop();
+
+    if (control -> ProxyMode == proxy_server)
+    {
+      #ifdef TEST
+      *logofs << "Loop: Showing the proxy abort dialog.\n"
+              << logofs_flush;
+      #endif
+
+      HandleAlert(ABORT_PROXY_CONNECTION_ALERT, 1);
+
+      handleAlertInLoop();
+    }
+  }
+  #ifdef TEST
+  else
+  {
+    *logofs << "Loop: Finalized the remote proxy shutdown.\n"
+            << logofs_flush;
+  }
+  #endif
+
+  HandleCleanup();
+}
+
+
+void WaitCleanup()
+{
+  T_timestamp selectTs;
+
+  while (NXTransRunning(NX_FD_ANY))
+  {
+    setTimestamp(selectTs, control -> PingTimeout);
+
+    NXTransContinue(&selectTs);
+  }
+}
+
+int KillProcess(int pid, const char *label, int signal, int wait)
+{
+  if (pid > 0)
+  {
+    #if defined(TEST) || defined(INFO)
+    *logofs << "Loop: Killing the " << label << " process '"
+            << pid << "' from process with pid '" << getpid()
+            << "' with signal '" << DumpSignal(signal)
+            << "'.\n" << logofs_flush;
+    #endif
+
+    signal = (signal == 0 ? SIGTERM : signal);
+
+    if (kill(pid, signal) < 0 && EGET() != ESRCH)
+    {
+      #ifdef PANIC
+      *logofs << "Loop: PANIC! Couldn't kill the " << label
+              << " process with pid '" << pid << "'.\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Couldn't kill the " << label
+           << " process with pid '" << pid << "'.\n";
+    }
+
+    if (wait == 1)
+    {
+      WaitChild(pid, label, 1);
+    }
+
+    return 1;
+  }
+  else
+  {
+    #ifdef TEST
+    *logofs << "Loop: No " << label << " process "
+            << "to kill with pid '" << pid
+            << "'.\n" << logofs_flush;
+    #endif
+
+    return 0;
+  }
+}
+
+int CheckProcess(int pid, const char *label)
+{
+  #if defined(TEST) || defined(INFO)
+  *logofs << "Loop: Checking the " << label << " process '"
+          << pid << "' from process with pid '" << getpid()
+          << "'.\n" << logofs_flush;
+  #endif
+
+  if (kill(pid, SIGCONT) < 0 && EGET() == ESRCH)
+  {
+    #ifdef WARNING
+    *logofs << "Loop: WARNING! The " << label << " process "
+            << "with pid '" << pid << "' has exited.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Warning" << ": The " << label << " process "
+         << "with pid '" << pid << "' has exited.\n";
+
+    return 0;
+  }
+
+  return 1;
+}
+
+int StartKeeper()
+{
+  #if defined(TEST) || defined(INFO)
+
+  if (IsRunning(lastKeeper) == 1 ||
+          IsRestarting(lastKeeper) == 1)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! The house-keeping process is "
+            << "alreay running with pid '" << lastKeeper
+            << "'.\n" << logofs_flush;
+    #endif
+
+    HandleCleanup();
+  }
+
+  #endif
+
+  //
+  // Don't care harvesting the persistent caches if
+  // the memory cache is not enabled. If the memory
+  // cache is not enabled neither we produced per-
+  // sistent caches. The user can still delete any
+  // persistent cache produced by the previous runs
+  // by using the client GUI.
+  //
+  // TODO: At the moment the user doesn't have a way
+  // to specify the amount of disk space to use for
+  // the persistent caches, but only the amount of
+  // space to use for images.
+  //
+
+  if (control -> LocalTotalStorageSize > 0)
+  {
+    #ifdef TEST
+    *logofs << "Loop: Starting the house-keeping process with "
+            << "storage size " << control -> PersistentCacheDiskLimit
+            << ".\n" << logofs_flush;
+    #endif
+
+    lastKeeper = NXTransKeeper(control -> PersistentCacheDiskLimit,
+                                   0, control -> RootPath);
+
+    if (IsFailed(lastKeeper))
+    {
+      #ifdef WARNING
+      *logofs << "Loop: WARNING! Failed to start the NX keeper process.\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Warning" << ": Failed to start the NX keeper process.\n";
+
+      SetNotRunning(lastKeeper);
+    }
+    #ifdef TEST
+    else
+    {
+      *logofs << "Loop: Keeper started with pid '"
+              << lastKeeper << "'.\n" << logofs_flush;
+    }
+    #endif
+  }
+  #ifdef TEST
+  else
+  {
+    *logofs << "Loop: Nothing to do for the keeper process "
+            << "with persistent cache not enabled.\n"
+            << logofs_flush;
+  }
+  #endif
+
+  return 1;
+}
+
+void HandleCleanupForReconnect()
+{
+  #ifdef TEST
+  *logofs << "Loop: Going to clean up system resources for Reconnect "
+          << "in process '" << getpid() << "'.\n"
+          << logofs_flush;
+  #endif
+  handleTerminatedInLoop();
+  DisableSignals();
+  if (control)
+    CleanupChildren();
+  CleanupListeners();
+  CleanupSockets();
+  CleanupKeeper();
+  CleanupStreams();
+  CleanupLocal();
+  CleanupGlobal();
+  RestoreSignals();
+  ServerCache::lastInitReply.set(0,NULL);
+  ServerCache::lastKeymap.set(0,NULL);
+  ServerCache::getKeyboardMappingLastMap.set(0,NULL);
+}
+void HandleCleanup(int code)
+{
+  #ifdef TEST
+  *logofs << "Loop: Going to clean up system resources "
+          << "in process '" << getpid() << "'.\n"
+          << logofs_flush;
+  #endif
+
+  handleTerminatedInLoop();
+
+  //
+  // Suspend any signal while cleaning up.
+  //
+
+  DisableSignals();
+
+  if (getpid() == lastProxy)
+  {
+    //
+    // Terminate all the children.
+    //
+
+    CleanupChildren();
+  
+    //
+    // Close all listeners.
+    //
+
+    CleanupListeners();
+
+    //
+    // Close all sockets.
+    //
+
+    CleanupSockets();
+
+    //
+    // Release the global objects.
+    //
+
+    CleanupGlobal();
+
+    //
+    // Restore the original signal handlers.
+    //
+
+    RestoreSignals();
+  }
+
+  //
+  // This is our last chance to print a message. If this
+  // is the process which created the transport we will
+  // jump back into the loop, letting the caller find out
+  // that the connection is broken, otherwise we assume
+  // that this is a child of the proxy and so we will
+  // safely exit.
+  //
+
+  #ifdef TEST
+
+  if (getpid() == lastProxy)
+  {
+    *logofs << "Loop: Reverting to loop context in process with "
+            << "pid '" << getpid() << "' at " << strMsTimestamp()
+            << ".\n" << logofs_flush;
+  }
+  else
+  {
+    *logofs << "Loop: Exiting from child process with pid '"
+            << getpid() << "' at " << strMsTimestamp()
+            << ".\n" << logofs_flush;
+  }
+
+  #endif
+
+  if (getpid() == lastProxy)
+  {
+    //
+    // Reset all values to their default.
+    //
+
+    CleanupLocal();
+
+    CleanupStreams();
+
+    longjmp(context, 1);
+  }
+  else
+  {
+    //
+    // Give a last chance to the process
+    // to cleanup the ancillary classes.
+    //
+
+    CleanupKeeper();
+
+    CleanupStreams();
+
+    exit(code);
+  }
+}
+
+void CleanupKeeper()
+{
+  if (keeper != NULL)
+  {
+    #ifdef TEST
+    *logofs << "Loop: Freeing up keeper in process "
+            << "with pid '" << getpid() << "'.\n"
+            << logofs_flush;
+    #endif
+
+    delete keeper;
+
+    keeper = NULL;
+  }
+}
+
+void CleanupStreams()
+{
+  //
+  // TODO: The cleanup procedure skips deletion of
+  // the I/O streams under Windows. This is intended
+  // to avoid a strange segfault occurring randomly,
+  // at the time the proxy is being shut down.
+  //
+
+  #ifndef __CYGWIN32__
+
+  #ifdef TEST
+  *logofs << "Loop: Freeing up streams in process "
+          << "with pid '" << getpid() << "'.\n"
+          << logofs_flush;
+  #endif
+
+  if (logofs != NULL && logofs != &cerr &&
+          *errorsFileName != '\0')
+  {
+    *logofs << flush;
+
+    delete logofs;
+
+    //
+    // Let the log go again to the standard
+    // error.
+    //
+
+    logofs = &cerr;
+  }
+
+  if (statofs != NULL && statofs != &cerr &&
+          *statsFileName != '\0')
+  {
+    *statofs << flush;
+
+    delete statofs;
+
+    statofs = NULL;
+  }
+
+  if (errofs != NULL)
+  {
+    *errofs << flush;
+
+    if (errofs == &cerr)
+    {
+      errofs = NULL;
+    }
+    else if (errsbuf != NULL)
+    {
+      cerr.rdbuf(errsbuf);
+
+      errsbuf = NULL;
+
+      delete errofs;
+    }
+
+    errofs = NULL;
+  }
+
+  #endif /* #ifndef __CYGWIN32__ */
+
+  //
+  // Reset these as they can't be reset
+  // in CleanupLocal().
+  //
+
+  *sessionFileName = '\0';
+  *errorsFileName  = '\0';
+  *optionsFileName = '\0';
+  *statsFileName   = '\0';
+}
+
+void CleanupChildren()
+{
+  //
+  // Remove any watchdog.
+  //
+
+  if (IsRunning(lastWatchdog))
+  {
+    KillProcess(lastWatchdog, "watchdog", SIGTERM, 1);
+
+    SetNotRunning(lastWatchdog);
+
+    lastSignal = 0;
+  }
+
+  //
+  // Kill the cache house-keeping process.
+  //
+
+  if (IsRunning(lastKeeper))
+  {
+    KillProcess(lastKeeper, "house-keeping", SIGTERM, 1);
+
+    SetNotRunning(lastKeeper);
+  }
+
+  //
+  // Let any running dialog to continue until it is
+  // closed by the user. In general this is the exp-
+  // ected behaviour, as for example when we are
+  // exiting because the link was abrouptedly shut
+  // down.
+  //
+
+  if (IsRunning(lastDialog))
+  {
+    #if defined(TEST) || defined(INFO)
+    *logofs << "Loop: WARNING! Leaving the dialog process '"
+            << lastDialog << "' running in process "
+            << "with pid '" << getpid() << "'.\n"
+            << logofs_flush;
+    #endif
+
+    SetNotRunning(lastDialog);
+  }
+
+  //
+  // Give user a chance to start a new session.
+  //
+
+  if (control -> EnableRestartOnShutdown == 1)
+  {
+    #ifdef WARNING
+    *logofs << "Loop: WARNING! Respawning the NX client "
+            << "on display '" << displayHost << "'.\n"
+            << logofs_flush;
+    #endif
+
+    NXTransClient(displayHost);
+  }
+
+  for (int i = 0; i < control -> KillDaemonOnShutdownNumber; i++)
+  {
+    #ifdef WARNING
+    *logofs << "Loop: WARNING! Killing the NX daemon with "
+            << "pid '" << control -> KillDaemonOnShutdown[i]
+            << "'.\n" << logofs_flush;
+    #endif
+
+    KillProcess(control -> KillDaemonOnShutdown[i], "daemon", SIGTERM, 0);
+  }    
+}
+
+void CleanupGlobal()
+{
+  if (proxy != NULL)
+  {
+    #ifdef TEST
+    *logofs << "Loop: Freeing up proxy in process "
+            << "with pid '" << getpid() << "'.\n"
+            << logofs_flush;
+    #endif
+
+    delete proxy;
+
+    proxy = NULL;
+  }
+
+  if (agent != NULL)
+  {
+    #ifdef TEST
+    *logofs << "Loop: Freeing up agent in process "
+            << "with pid '" << getpid() << "'.\n"
+            << logofs_flush;
+    #endif
+
+    delete agent;
+
+    agent = NULL;
+  }
+
+  if (auth != NULL)
+  {
+    #ifdef TEST
+    *logofs << "Loop: Freeing up auth data in process "
+            << "with pid '" << getpid() << "'.\n"
+            << logofs_flush;
+    #endif
+
+    delete auth;
+
+    auth = NULL;
+  }
+
+  if (statistics != NULL)
+  {
+    #ifdef TEST
+    *logofs << "Loop: Freeing up statistics in process "
+            << "with pid '" << getpid() << "'.\n"
+            << logofs_flush;
+    #endif
+
+    delete statistics;
+
+    statistics = NULL;
+  }
+
+  if (control != NULL)
+  {
+    #ifdef TEST
+    *logofs << "Loop: Freeing up control in process "
+            << "with pid '" << getpid() << "'.\n"
+            << logofs_flush;
+    #endif
+
+    delete control;
+
+    control = NULL;
+  }
+}
+
+void CleanupConnections()
+{
+  if (proxy -> getChannels(channel_x11) != 0)
+  {
+    #ifdef TEST
+    *logofs << "Loop: Closing any remaining X connections.\n"
+            << logofs_flush;
+    #endif
+
+    proxy -> handleCloseAllXConnections();
+
+    #ifdef TEST
+    *logofs << "Loop: Closing any remaining listener.\n"
+            << logofs_flush;
+    #endif
+
+    proxy -> handleCloseAllListeners();
+  }
+
+  proxy -> handleFinish();
+}
+
+void CleanupListeners()
+{
+  if (useTcpSocket == 1)
+  {
+    if (tcpFD != -1)
+    {
+      #ifdef TEST
+      *logofs << "Loop: Closing TCP listener in process "
+              << "with pid '" << getpid() << "'.\n"
+              << logofs_flush;
+      #endif
+
+      close(tcpFD);
+
+      tcpFD = -1;
+    }
+
+    useTcpSocket = 0;
+  }
+
+  if (useUnixSocket == 1)
+  {
+    if (unixFD != -1)
+    {
+      #ifdef TEST
+      *logofs << "Loop: Closing UNIX listener in process "
+              << "with pid '" << getpid() << "'.\n"
+              << logofs_flush;
+      #endif
+
+      close(unixFD);
+
+      unixFD = -1;
+    }
+
+    if (*unixSocketName != '\0')
+    {
+      #ifdef TEST
+      *logofs << "Loop: Going to remove the Unix domain socket '"
+              << unixSocketName << "' in process " << "with pid '"
+              << getpid() << "'.\n" << logofs_flush;
+      #endif
+
+      unlink(unixSocketName);
+    }
+
+    useUnixSocket = 0;
+  }
+
+  if (useAgentSocket == 1)
+  {
+    //
+    // There is no listener for the
+    // agent descriptor.
+    //
+
+    useAgentSocket = 0;
+  }
+
+  if (useCupsSocket == 1)
+  {
+    if (cupsFD != -1)
+    {
+      #ifdef TEST
+      *logofs << "Loop: Closing CUPS listener in process "
+              << "with pid '" << getpid() << "'.\n"
+              << logofs_flush;
+      #endif
+
+      close(cupsFD);
+
+      cupsFD = -1;
+    }
+
+    useCupsSocket = 0;
+  }
+
+  if (useAuxSocket == 1)
+  {
+    if (auxFD != -1)
+    {
+      #ifdef TEST
+      *logofs << "Loop: Closing auxiliary X11 listener "
+              << "in process " << "with pid '" << getpid()
+              << "'.\n" << logofs_flush;
+      #endif
+
+      close(auxFD);
+
+      auxFD = -1;
+    }
+
+    useAuxSocket = 0;
+  }
+
+  if (useSmbSocket == 1)
+  {
+    if (smbFD != -1)
+    {
+      #ifdef TEST
+      *logofs << "Loop: Closing SMB listener in process "
+              << "with pid '" << getpid() << "'.\n"
+              << logofs_flush;
+      #endif
+
+      close(smbFD);
+
+      smbFD = -1;
+    }
+
+    useSmbSocket = 0;
+  }
+
+  if (useMediaSocket == 1)
+  {
+    if (mediaFD != -1)
+    {
+      #ifdef TEST
+      *logofs << "Loop: Closing multimedia listener in process "
+              << "with pid '" << getpid() << "'.\n"
+              << logofs_flush;
+      #endif
+
+      close(mediaFD);
+
+      mediaFD = -1;
+    }
+
+    useMediaSocket = 0;
+  }
+
+  if (useHttpSocket == 1)
+  {
+    if (httpFD != -1)
+    {
+      #ifdef TEST
+      *logofs << "Loop: Closing http listener in process "
+              << "with pid '" << getpid() << "'.\n"
+              << logofs_flush;
+      #endif
+
+      close(httpFD);
+
+      httpFD = -1;
+    }
+
+    useHttpSocket = 0;
+  }
+
+  if (useFontSocket == 1)
+  {
+    if (fontFD != -1)
+    {
+      #ifdef TEST
+      *logofs << "Loop: Closing font server listener in process "
+              << "with pid '" << getpid() << "'.\n"
+              << logofs_flush;
+      #endif
+
+      close(fontFD);
+
+      fontFD = -1;
+    }
+
+    useFontSocket = 0;
+  }
+
+  if (useSlaveSocket == 1)
+  {
+    if (slaveFD != -1)
+    {
+      #ifdef TEST
+      *logofs << "Loop: Closing slave listener in process "
+              << "with pid '" << getpid() << "'.\n"
+              << logofs_flush;
+      #endif
+
+      close(slaveFD);
+
+      slaveFD = -1;
+    }
+
+    useSlaveSocket = 0;
+  }
+}
+
+void CleanupSockets()
+{
+  if (proxyFD != -1)
+  {
+    #ifdef TEST
+    *logofs << "Loop: Closing proxy FD in process "
+            << "with pid '" << getpid() << "'.\n"
+            << logofs_flush;
+    #endif
+
+    close(proxyFD);
+
+    proxyFD = -1;
+  }
+
+  if (agentFD[1] != -1)
+  {
+    #ifdef TEST
+    *logofs << "Loop: Closing agent FD in process "
+            << "with pid '" << getpid() << "'.\n"
+            << logofs_flush;
+    #endif
+
+    close(agentFD[1]);
+
+    agentFD[0] = -1;
+    agentFD[1] = -1;
+  }
+}
+
+void CleanupLocal()
+{
+  *homeDir    = '\0';
+  *rootDir    = '\0';
+  *tempDir    = '\0';
+  *systemDir  = '\0';
+  *sessionDir = '\0';
+
+  *linkSpeedName    = '\0';
+  *cacheSizeName    = '\0';
+  *shsegSizeName    = '\0';
+  *imagesSizeName   = '\0';
+  *bitrateLimitName = '\0';
+  *packMethodName   = '\0';
+  *productName      = '\0';
+
+  packMethod  = -1;
+  packQuality = -1;
+
+  *sessionType = '\0';
+  *sessionId   = '\0';
+
+  parsedOptions = 0;
+  parsedCommand = 0;
+
+  *remoteData = '\0';
+  remotePosition = 0;
+
+  tcpFD   = -1;
+  unixFD  = -1;
+  cupsFD  = -1;
+  auxFD   = -1;
+  smbFD   = -1;
+  mediaFD = -1;
+  httpFD  = -1;
+  fontFD  = -1;
+  slaveFD = -1;
+  proxyFD = -1;
+
+  agentFD[0] = -1;
+  agentFD[1] = -1;
+
+  useUnixSocket  = 1;
+  useTcpSocket   = 1;
+  useCupsSocket  = 0;
+  useAuxSocket   = 0;
+  useSmbSocket   = 0;
+  useMediaSocket = 0;
+  useHttpSocket  = 0;
+  useFontSocket  = 0;
+  useSlaveSocket = 0;
+  useAgentSocket = 0;
+
+  useNoDelay = -1;
+  usePolicy  = -1;
+  useRender  = -1;
+  useTaint   = -1;
+
+  *unixSocketName = '\0';
+
+  *acceptHost  = '\0';
+  *displayHost = '\0';
+  *authCookie  = '\0';
+
+  proxyPort = DEFAULT_NX_PROXY_PORT;
+  xPort     = DEFAULT_NX_X_PORT;
+
+  xServerAddrFamily = -1;
+  xServerAddrLength = 0;
+
+  delete xServerAddr;
+
+  xServerAddr = NULL;
+
+  listenSocket.disable();
+  connectSocket.disable();
+
+  cupsPort.disable();
+  auxPort.disable();
+  smbPort.disable();
+  mediaPort.disable();
+  httpPort.disable();
+  slavePort.disable();
+
+  *fontPort = '\0';
+
+  *bindHost = '\0';
+  bindPort = -1;
+
+  initTs  = nullTimestamp();
+  startTs = nullTimestamp();
+  logsTs  = nullTimestamp();
+  nowTs   = nullTimestamp();
+
+  diffTs = 0;
+
+  lastProxy    = 0;
+  lastDialog   = 0;
+  lastWatchdog = 0;
+  lastKeeper   = 0;
+  lastStatus   = 0;
+  lastKill     = 0;
+  lastDestroy  = 0;
+
+  lastReadableTs = nullTimestamp();
+
+  lastAlert.code  = 0;
+  lastAlert.local = 0;
+
+  lastMasks.blocked   = 0;
+  lastMasks.installed = 0;
+
+  memset(&lastMasks.saved, 0, sizeof(sigset_t));
+
+  for (int i = 0; i < 32; i++)
+  {
+    lastMasks.enabled[i] = 0;
+    lastMasks.forward[i] = 0;
+
+    memset(&lastMasks.action[i], 0, sizeof(struct sigaction));
+  }
+
+  lastSignal = 0;
+
+  memset(&lastTimer.action, 0, sizeof(struct sigaction));
+  memset(&lastTimer.value,  0, sizeof(struct itimerval));
+
+  lastTimer.start = nullTimestamp();
+  lastTimer.next  = nullTimestamp();
+}
+
+int CheckAbort()
+{
+  if (lastSignal != 0)
+  {
+    #ifdef TEST
+    *logofs << "Loop: Aborting the procedure due to signal '"
+            << lastSignal << "', '" << DumpSignal(lastSignal)
+            << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Info" << ": Aborting the procedure due to signal '"
+         << lastSignal << "'.\n";
+
+    lastSignal = 0;
+
+    return 1;
+  }
+
+  return 0;
+}
+
+void HandleAbort()
+{
+  if (logofs == NULL)
+  {
+    logofs = &cerr;
+  }
+
+  *logofs << flush;
+
+  handleTerminatingInLoop();
+
+  if (lastSignal == SIGHUP)
+  {
+    lastSignal = 0;
+  }
+
+  //
+  // The current default is to just quit the program.
+  // Code has not been updated to deal with the new
+  // NX transport loop.
+  //
+
+  if (control -> EnableCoreDumpOnAbort == 1)
+  {
+    if (agent != NULL)
+    {
+      cerr << "Session" << ": Terminating session at '"
+           << strTimestamp() << "'.\n";
+    }
+
+    cerr << "Error" << ": Generating a core file to help "
+         << "the investigations.\n";
+
+    cerr << "Session" << ": Session terminated at '"
+         << strTimestamp() << "'.\n";
+
+    cerr << flush;
+
+    signal(SIGABRT, SIG_DFL);
+
+    raise(SIGABRT);
+  }
+
+  #ifdef TEST
+  *logofs << "Loop: Showing the proxy abort dialog.\n"
+          << logofs_flush;
+  #endif
+
+  if (control -> ProxyMode == proxy_server)
+  {
+    //
+    // Close the socket before showing the alert.
+    // It seems that the closure of the socket can
+    // sometimes take several seconds, even after
+    // the connection is broken.
+    //
+
+    CleanupSockets();
+
+    if (lastKill == 0)
+    {
+      HandleAlert(ABORT_PROXY_CONNECTION_ALERT, 1);
+    }
+    else
+    {
+      HandleAlert(ABORT_PROXY_SHUTDOWN_ALERT, 1);
+    }
+
+    handleAlertInLoop();
+  }
+
+  HandleCleanup();
+}
+
+void HandleAlert(int code, int local)
+{
+  if (lastAlert.code == 0)
+  {
+    #if defined(TEST) || defined(INFO)
+    *logofs << "Loop: Requesting an alert dialog with code "
+            << code << " and local " << local << ".\n"
+            << logofs_flush;
+    #endif
+
+    lastAlert.code  = code;
+    lastAlert.local = local;
+  }
+  #if defined(TEST) || defined(INFO)
+  else
+  {
+    *logofs << "Loop: WARNING! Alert dialog already requested "
+            << "with code " << lastAlert.code << ".\n"
+            << logofs_flush;
+  }
+  #endif
+
+  return;
+}
+
+void FlushCallback(int length)
+{
+  if (flushCallback != NULL)
+  {
+    #if defined(TEST) || defined(INFO)
+    *logofs << "Loop: Reporting a flush request at "
+            << strMsTimestamp() << " with " << length
+            << " bytes written.\n" << logofs_flush;
+    #endif
+
+    (*flushCallback)(flushParameter, length);
+  }
+  #if defined(TEST) || defined(INFO)
+  else if (control -> ProxyMode == proxy_client)
+  {
+    *logofs << "Loop: WARNING! Can't find a flush "
+            << "callback in process with pid '" << getpid()
+            << "'.\n" << logofs_flush;
+  }
+  #endif
+}
+
+void KeeperCallback()
+{
+  if (IsRunning(lastKeeper) == 0)
+  {
+    //
+    // Let the house-keeping process take care
+    // of the persistent image cache.
+    //
+
+    if (control -> ImageCacheEnableLoad == 1 ||
+            control -> ImageCacheEnableSave == 1)
+    {
+      #ifdef TEST
+      *logofs << "Loop: Starting the house-keeping process with "
+              << "image storage size " << control -> ImageCacheDiskLimit
+              << ".\n" << logofs_flush;
+      #endif
+
+      lastKeeper = NXTransKeeper(0, control -> ImageCacheDiskLimit,
+                                     control -> RootPath);
+
+      if (IsFailed(lastKeeper))
+      {
+        #ifdef WARNING
+        *logofs << "Loop: WARNING! Can't start the NX keeper process.\n"
+                << logofs_flush;
+        #endif
+
+        SetNotRunning(lastKeeper);
+      }
+      #ifdef TEST
+      else
+      {
+        *logofs << "Loop: Keeper started with pid '"
+                << lastKeeper << "'.\n" << logofs_flush;
+      }
+      #endif
+    }
+    #ifdef TEST
+    else
+    {
+      *logofs << "Loop: Nothing to do for the keeper process "
+              << "with image cache not enabled.\n"
+              << logofs_flush;
+    }
+    #endif
+  }
+  #ifdef TEST
+  else
+  {
+    *logofs << "Loop: Nothing to do with the keeper process "
+            << "already running.\n" << logofs_flush;
+  }
+  #endif
+}
+
+void InstallSignals()
+{
+  #ifdef TEST
+  *logofs << "Loop: Installing signals in process with pid '"
+          << getpid() << "'.\n" << logofs_flush;
+  #endif
+
+  for (int i = 0; i < 32; i++)
+  {
+    if (CheckSignal(i) == 1 &&
+          lastMasks.enabled[i] == 0)
+    {
+      InstallSignal(i, NX_SIGNAL_ENABLE);
+    }
+  }
+
+  lastMasks.installed = 1;
+}
+
+void RestoreSignals()
+{
+  #ifdef TEST
+  *logofs << "Loop: Restoring signals in process with pid '"
+          << getpid() << "'.\n" << logofs_flush;
+  #endif
+
+  if (lastMasks.installed == 1)
+  {
+    //
+    // Need to keep monitoring the children.
+    //
+
+    for (int i = 0; i < 32; i++)
+    {
+      if (lastMasks.enabled[i] == 1)
+      {
+        RestoreSignal(i);
+      }
+    }
+  }
+
+  lastMasks.installed = 0;
+
+  if (lastMasks.blocked == 1)
+  {
+    EnableSignals();
+  }
+}
+
+void DisableSignals()
+{
+  if (lastMasks.blocked == 0)
+  {
+    sigset_t newMask;
+
+    sigemptyset(&newMask);
+
+    //
+    // Block also the other signals that may be
+    // installed by the agent, that are those
+    // signals for which the function returns 2.
+    //
+
+    for (int i = 0; i < 32; i++)
+    {
+      if (CheckSignal(i) > 0)
+      {
+        #ifdef DUMP
+        *logofs << "Loop: Disabling signal " << i << " '"
+                << DumpSignal(i) << "' in process with pid '"
+                << getpid() << "'.\n" << logofs_flush;
+        #endif
+
+        sigaddset(&newMask, i);
+      }
+    }
+
+    sigprocmask(SIG_BLOCK, &newMask, &lastMasks.saved);
+
+    lastMasks.blocked++;
+  }
+  #ifdef TEST
+  else
+  {
+    *logofs << "Loop: WARNING! Signals were already blocked in "
+            << "process with pid '" << getpid() << "'.\n"
+            << logofs_flush;
+  }
+  #endif
+}
+
+void EnableSignals()
+{
+  if (lastMasks.blocked == 1)
+  {
+    #ifdef TEST
+    *logofs << "Loop: Enabling signals in process with pid '"
+            << getpid() << "'.\n" << logofs_flush;
+    #endif
+
+    sigprocmask(SIG_SETMASK, &lastMasks.saved, NULL);
+
+    lastMasks.blocked = 0;
+  }
+  else
+  {
+    #ifdef WARNING
+    *logofs << "Loop: WARNING! Signals were not blocked in "
+            << "process with pid '" << getpid() << "'.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Warning" << ": Signals were not blocked in "
+         << "process with pid '" << getpid() << "'.\n";
+  }
+}
+
+void InstallSignal(int signal, int action)
+{
+  if (lastMasks.enabled[signal] == 1)
+  {
+    if (action == NX_SIGNAL_FORWARD)
+    {
+      #ifdef TEST
+      *logofs << "Loop: Forwarding handler for signal " << signal
+              << " '" << DumpSignal(signal) << "' in process "
+              << "with pid '" << getpid() << "'.\n"
+              << logofs_flush;
+      #endif
+
+      lastMasks.forward[signal] = 1;
+
+      return;
+    }
+    #ifdef TEST
+    else
+    {
+      *logofs << "Loop: Reinstalling handler for signal " << signal
+              << " '" << DumpSignal(signal) << "' in process "
+              << "with pid '" << getpid() << "'.\n"
+              << logofs_flush;
+    }
+    #endif
+  }
+  #ifdef TEST
+  else
+  {
+    *logofs << "Loop: Installing handler for signal " << signal
+            << " '" << DumpSignal(signal) << "' in process "
+            << "with pid '" << getpid() << "'.\n"
+            << logofs_flush;
+  }
+  #endif
+
+  if (signal == SIGALRM && isTimestamp(lastTimer.start))
+  {
+    ResetTimer();
+  }
+
+  struct sigaction newAction;
+
+  memset(&newAction, 0, sizeof(newAction));
+
+  newAction.sa_handler = HandleSignal;
+
+  sigemptyset(&(newAction.sa_mask));
+
+  if (signal == SIGCHLD)
+  {
+    newAction.sa_flags = SA_NOCLDSTOP;
+  }
+  else
+  {
+    newAction.sa_flags = 0;
+  }
+
+  sigaction(signal, &newAction, &lastMasks.action[signal]);
+
+  lastMasks.enabled[signal] = 1;
+
+  if (action == NX_SIGNAL_FORWARD)
+  {
+    lastMasks.forward[signal] = 1;
+  }
+}
+
+void RestoreSignal(int signal)
+{
+  if (lastMasks.enabled[signal] == 0)
+  {
+    #ifdef WARNING
+    *logofs << "Loop: WARNING! Signal '" << DumpSignal(signal)
+            << " not installed in process with pid '"
+            << getpid() << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Warning" << ": Signal '" << DumpSignal(signal)
+         << " not installed in process with pid '"
+         << getpid() << "'.\n";
+
+    return;
+  }
+
+  #ifdef TEST
+  *logofs << "Loop: Restoring handler for signal " << signal
+          << " '" << DumpSignal(signal) << "' in process "
+          << "with pid '" << getpid() << "'.\n"
+          << logofs_flush;
+  #endif
+
+  if (signal == SIGALRM && isTimestamp(lastTimer.start))
+  {
+    ResetTimer();
+  }
+
+  sigaction(signal, &lastMasks.action[signal], NULL);
+
+  lastMasks.enabled[signal] = 0;
+  lastMasks.forward[signal] = 0;
+}
+
+void HandleSignal(int signal)
+{
+  if (logofs == NULL)
+  {
+    logofs = &cerr;
+  }
+
+  #if defined(UNSAFE) && (defined(TEST) || defined(INFO))
+
+  if (lastSignal != 0)
+  {
+    *logofs << "Loop: WARNING! Last signal is '" << lastSignal
+            << "', '" << DumpSignal(signal) << "' and not zero "
+            << "in process with pid '" << getpid() << "'.\n"
+            << logofs_flush;
+  }
+
+  *logofs << "Loop: Signal '" << signal << "', '"
+          << DumpSignal(signal) << "' received in process "
+          << "with pid '" << getpid() << "'.\n" << logofs_flush;
+
+  #endif
+
+  if (getpid() != lastProxy && handler != NULL)
+  {
+    #if defined(UNSAFE) && (defined(TEST) || defined(INFO))
+    *logofs << "Loop: Calling slave handler in process "
+            << "with pid '" << getpid() << "'.\n"
+            << logofs_flush;
+    #endif
+
+    if ((*handler)(signal) == 0)
+    {
+      return;
+    }
+  }
+
+  switch (signal)
+  {
+    case SIGUSR1:
+    {
+      if (proxy != NULL && lastSignal == 0)
+      {
+        lastSignal = SIGUSR1;
+      }
+
+      break;
+    }
+    case SIGUSR2:
+    {
+      if (proxy != NULL && lastSignal == 0)
+      {
+        lastSignal = SIGUSR2;
+      }
+
+      break;
+    }
+    case SIGPIPE:
+    {
+      //
+      // It can happen that SIGPIPE is delivered
+      // to the proxy even in the case some other
+      // descriptor is unexpectedly closed.
+      //
+      // if (agentFD[1] != -1)
+      // {
+      //   cerr << "Info" << ": Received signal 'SIGPIPE'. "
+      //        << "Closing agent conection.\n";
+      //
+      //   shutdown(agentFD[1], SHUT_RDWR);
+      // }
+      //
+
+      break;
+    }
+    case SIGALRM:
+    {
+      //
+      // Nothing to do. Just wake up the
+      // process on blocking operations.
+      //
+
+      break;
+    }
+    case SIGCHLD:
+    {
+      //
+      // Check if any of our children has exited.
+      //
+
+      if (HandleChildren() != 0)
+      {
+        signal = 0;
+      }
+
+      //
+      // Don't save this signal or it will override
+      // any previous signal sent by child before
+      // exiting.
+      //
+
+      break;
+    }
+
+    #ifdef __CYGWIN32__
+
+    case 12:
+    {
+      //
+      // Nothing to do. This signal is what is delivered
+      // by the Cygwin library when trying use a shared
+      // memory function if the daemon is not running.
+      //
+
+      #ifdef TEST
+      *logofs << "Loop: WARNING! Received signal '12' in "
+              << "process with pid '" << getpid() << "'.\n"
+              << logofs_flush;
+
+      *logofs << "Loop: WARNING! Please check that the "
+              << "cygserver daemon is running.\n"
+              << logofs_flush;
+      #endif
+
+      break;
+    }
+
+    #endif
+
+    default:
+    {
+      //
+      // Register the signal so we can handle it
+      // inside the main loop. We will probably
+      // dispose any resource and exit.
+      //
+
+      if (getpid() == lastProxy)
+      {
+        #if defined(UNSAFE) && defined(TEST)
+        *logofs << "Loop: Registering end of session request "
+                << "due to signal '" << signal << "', '"
+                << DumpSignal(signal) << "'.\n"
+                << logofs_flush;
+        #endif
+
+        lastSignal = signal;
+      }
+      else
+      {
+        //
+        // This is a child, so exit immediately.
+        //
+
+        HandleCleanup();
+      }
+    }
+  }
+
+  if (signal != 0 && lastMasks.forward[signal] == 1)
+  {
+    if (lastMasks.action[signal].sa_handler != NULL &&
+            lastMasks.action[signal].sa_handler != HandleSignal)
+    {
+      #if defined(UNSAFE) && defined(TEST)
+      *logofs << "Loop: Forwarding signal '" << signal << "', '"
+              << DumpSignal(signal) << "' to previous handler.\n"
+              << logofs_flush;
+      #endif
+
+      lastMasks.action[signal].sa_handler(signal);
+    }
+    #ifdef WARNING
+    else if (lastMasks.action[signal].sa_handler == NULL)
+    {
+      *logofs << "Loop: WARNING! Parent requested to forward "
+              << "signal '" << signal << "', '" << DumpSignal(signal)
+              << "' but didn't set a handler.\n" << logofs_flush;
+    }
+    #endif
+  }
+}
+
+int HandleChildren()
+{
+  //
+  // Try to waitpid() for each child because the
+  // call might have return ECHILD and so we may
+  // have lost any of the processes.
+  //
+
+  if (IsRunning(lastDialog) && HandleChild(lastDialog) == 1)
+  {
+    #if defined(UNSAFE) && defined(TEST)
+    *logofs << "Loop: Resetting pid of last dialog process "
+            << "in handler.\n" << logofs_flush;
+    #endif
+
+    SetNotRunning(lastDialog);
+
+    if (proxy != NULL)
+    {
+      proxy -> handleResetAlert();
+    }
+
+    return 1;
+  }
+
+  if (IsRunning(lastWatchdog) && HandleChild(lastWatchdog) == 1)
+  {
+    #if defined(UNSAFE) && defined(TEST)
+    *logofs << "Loop: Watchdog is gone. Setting the last "
+            << "signal to SIGHUP.\n" << logofs_flush;
+    #endif
+
+    lastSignal = SIGHUP;
+
+    #if defined(UNSAFE) && defined(TEST)
+    *logofs << "Loop: Resetting pid of last watchdog process "
+            << "in handler.\n" << logofs_flush;
+    #endif
+
+    SetNotRunning(lastWatchdog);
+
+    return 1;
+  }
+
+  //
+  // The house-keeping process exits after a
+  // number of iterations to keep the memory
+  // pollution low. It is restarted on demand
+  // by the lower layers, using the callback
+  // function.
+  //
+
+  if (IsRunning(lastKeeper) && HandleChild(lastKeeper) == 1)
+  {
+    #if defined(UNSAFE) && defined(TEST)
+    *logofs << "Loop: Resetting pid of last house-keeping "
+            << "process in handler.\n" << logofs_flush;
+    #endif
+
+    SetNotRunning(lastKeeper);
+
+    return 1;
+  }
+
+  //
+  // The pid will be checked by the code
+  // that registered the child.
+  //
+
+  if (IsRunning(lastChild))
+  {
+    #if defined(UNSAFE) && defined(TEST)
+    *logofs << "Loop: Resetting pid of last child process "
+            << "in handler.\n" << logofs_flush;
+    #endif
+
+    SetNotRunning(lastChild);
+
+    return 1;
+  }
+
+  proxy->checkSlaves();
+
+  //
+  // This can actually happen either because we
+  // reset the pid of the child process as soon
+  // as we kill it, or because of a child process
+  // of our parent.
+  //
+
+  #if defined(UNSAFE) && (defined(TEST) || defined(INFO))
+  *logofs << "Loop: Ignoring signal received for the "
+          << "unregistered child.\n" << logofs_flush;
+  #endif
+
+  return 0;
+}
+
+int HandleChild(int child)
+{
+  int pid;
+
+  int status  = 0;
+  int options = WNOHANG | WUNTRACED;
+
+  while ((pid = waitpid(child, &status, options)) &&
+             pid == -1 && EGET() == EINTR);
+
+  return CheckChild(pid, status);
+}
+
+int WaitChild(int child, const char* label, int force)
+{
+  int pid;
+
+  int status  = 0;
+  int options = WUNTRACED;
+
+  for (;;)
+  {
+    #if defined(TEST) || defined(INFO)
+    *logofs << "Loop: Waiting for the " << label
+            << " process '" << child << "' to die.\n"
+            << logofs_flush;
+    #endif
+
+    pid = waitpid(child, &status, options);
+
+    if (pid == -1 && EGET() == EINTR)
+    {
+      if (force == 0)
+      {
+        return 0;
+      }
+
+      #ifdef WARNING
+      *logofs << "Loop: WARNING! Ignoring signal while "
+              << "waiting for the " << label << " process '"
+              << child << "' to die.\n"
+              << logofs_flush;
+      #endif
+
+      continue;
+    }
+
+    break;
+  }
+
+  return (EGET() == ECHILD ? 1 : CheckChild(pid, status));
+}
+
+int CheckChild(int pid, int status)
+{
+  lastStatus = 0;
+
+  if (pid > 0)
+  {
+    if (WIFSTOPPED(status))
+    {
+      #if defined(UNSAFE) && defined(TEST)
+      *logofs << "Loop: Child process '" << pid << "' was stopped "
+              << "with signal " << (WSTOPSIG(status)) << ".\n"
+              << logofs_flush;
+      #endif
+
+      return 0;
+    }
+    else
+    {
+      if (WIFEXITED(status))
+      {
+        #if defined(UNSAFE) && defined(TEST)
+        *logofs << "Loop: Child process '" << pid << "' exited "
+                << "with status '" << (WEXITSTATUS(status))
+                << "'.\n" << logofs_flush;
+        #endif
+
+        lastStatus = WEXITSTATUS(status);
+      }
+      else if (WIFSIGNALED(status))
+      {
+        if (CheckSignal(WTERMSIG(status)) != 1)
+        {
+          #ifdef WARNING
+          *logofs << "Loop: WARNING! Child process '" << pid
+                  << "' died because of signal " << (WTERMSIG(status))
+                  << ", '" << DumpSignal(WTERMSIG(status)) << "'.\n"
+                  << logofs_flush;
+          #endif
+
+          cerr << "Warning" << ": Child process '" << pid
+               << "' died because of signal " << (WTERMSIG(status))
+               << ", '" << DumpSignal(WTERMSIG(status)) << "'.\n";
+        }
+        #if defined(UNSAFE) && defined(TEST)
+        else
+        {
+          *logofs << "Loop: Child process '" << pid
+                  << "' died because of signal " << (WTERMSIG(status))
+                  << ", '" << DumpSignal(WTERMSIG(status)) << "'.\n"
+                  << logofs_flush;
+        }
+        #endif
+
+        lastStatus = 1;
+      }
+
+      return 1;
+    }
+  }
+  else if (pid < 0)
+  {
+    if (EGET() != ECHILD)
+    {
+      #ifdef PANIC
+      *logofs << "Loop: PANIC! Call to waitpid failed. "
+              << "Error is " << EGET() << " '" << ESTR()
+              << "'.\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Call to waitpid failed. "
+           << "Error is " << EGET() << " '" << ESTR()
+           << "'.\n";
+
+      HandleCleanup();
+    }
+
+    //
+    // This can happen when the waitpid() is
+    // blocking, as the SIGCHLD is received
+    // within the call.
+    //
+
+    #ifdef TEST
+    *logofs << "Loop: No more children processes running.\n"
+            << logofs_flush;
+    #endif
+
+    return 1;
+  }
+
+  return 0;
+}
+
+void RegisterChild(int child)
+{
+  #if defined(TEST) || defined(INFO)
+
+  if (IsNotRunning(lastChild))
+  {
+    *logofs << "Loop: Registering child process '" << child
+            << "' in process with pid '" << getpid()
+            << "'.\n" << logofs_flush;
+  }
+  else
+  {
+    *logofs << "Loop: WARNING! Overriding registered child '"
+            << lastChild << "' with new child '" << child
+            << "' in process with pid '" << getpid()
+            << "'.\n" << logofs_flush;
+  }
+
+  #endif
+
+  lastChild = child;
+}
+
+int CheckParent(const char *name, const char *type, int parent)
+{
+  if (parent != getppid() || parent == 1)
+  {
+    #ifdef WARNING
+    *logofs << name << ": WARNING! Parent process appears "
+            << "to be dead. Exiting " << type << ".\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Warning" << ": Parent process appears "
+         << "to be dead. Exiting " << type << ".\n";
+
+    return 0;
+  }
+
+  return 1;
+}
+
+void HandleTimer(int signal)
+{
+  if (signal == SIGALRM)
+  {
+    if (isTimestamp(lastTimer.start))
+    {
+      #if defined(UNSAFE) && defined(TEST)
+      *logofs << "Loop: Timer expired at " << strMsTimestamp()
+              << " in process with pid '" << getpid() << "'.\n"
+              << logofs_flush;
+      #endif
+
+      if (proxy != NULL)
+      {
+        proxy -> handleTimer();
+      }
+
+      ResetTimer();
+    }
+    else
+    {
+      #ifdef PANIC
+      *logofs << "Loop: PANIC! Inconsistent timer state "
+              << " in process with pid '" << getpid() << "'.\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Inconsistent timer state "
+           << " in process with pid '" << getpid() << "'.\n";
+    }
+  }
+  else
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Inconsistent signal '"
+            << signal << "', '" << DumpSignal(signal)
+            << "' received in process with pid '"
+            << getpid() << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Inconsistent signal '"
+         << signal << "', '" << DumpSignal(signal)
+         << "' received in process with pid '"
+         << getpid() << "'.\n";
+  }
+}
+
+void SetTimer(int value)
+{
+  getNewTimestamp();
+
+  if (isTimestamp(lastTimer.start))
+  {
+    int diffTs = diffTimestamp(lastTimer.start, getTimestamp());
+
+    if (diffTs > lastTimer.next.tv_usec / 1000 * 2)
+    {
+      #ifdef WARNING
+      *logofs << "Loop: WARNING! Timer missed to expire at "
+              << strMsTimestamp() << " in process with pid '"
+              << getpid() << "'.\n" << logofs_flush;
+      #endif
+
+      cerr << "Warning" << ": Timer missed to expire at "
+           << strMsTimestamp() << " in process with pid '"
+           << getpid() << "'.\n";
+
+      HandleTimer(SIGALRM);
+    }
+    else
+    {
+      #ifdef TEST
+      *logofs << "Loop: Timer already running at "
+              << strMsTimestamp() << " in process with pid '"
+              << getpid() << "'.\n" << logofs_flush;
+      #endif
+
+      return;
+    }
+  }
+
+  //
+  // Save the former handler.
+  //
+
+  struct sigaction action;
+
+  memset(&action, 0, sizeof(action));
+
+  action.sa_handler = HandleTimer;
+
+  sigemptyset(&action.sa_mask);
+
+  action.sa_flags = 0;
+
+  sigaction(SIGALRM, &action, &lastTimer.action);
+
+  //
+  // Start the timer.
+  //
+
+  lastTimer.next = getTimestamp(value);
+
+  struct itimerval timer;
+
+  timer.it_interval = lastTimer.next;
+  timer.it_value    = lastTimer.next;
+
+  #ifdef TEST
+  *logofs << "Loop: Timer set to " << lastTimer.next.tv_sec
+          << " S and " << lastTimer.next.tv_usec / 1000
+          << " Ms at " << strMsTimestamp() << " in process "
+          << "with pid '" << getpid() << "'.\n"
+          << logofs_flush;
+  #endif
+
+  if (setitimer(ITIMER_REAL, &timer, &lastTimer.value) < 0)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Call to setitimer failed. "
+            << "Error is " << EGET() << " '" << ESTR()
+            << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Call to setitimer failed. "
+         << "Error is " << EGET() << " '" << ESTR()
+         << "'.\n";
+
+    lastTimer.next = nullTimestamp();
+
+    return;
+  }
+
+  lastTimer.start = getTimestamp();
+}
+
+void ResetTimer()
+{
+  if (isTimestamp(lastTimer.start) == 0)
+  {
+    #if defined(UNSAFE) && defined(TEST)
+    *logofs << "Loop: Timer not running in process "
+            << "with pid '" << getpid() << "'.\n"
+            << logofs_flush;
+    #endif
+
+    return;
+  }
+
+  #if defined(UNSAFE) && defined(TEST)
+  *logofs << "Loop: Timer reset at " << strMsTimestamp()
+          << " in process with pid '" << getpid()
+          << "'.\n" << logofs_flush;
+  #endif
+
+  //
+  // Restore the old signal mask and timer.
+  //
+
+  if (setitimer(ITIMER_REAL, &lastTimer.value, NULL) < 0)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Call to setitimer failed. "
+            << "Error is " << EGET() << " '" << ESTR()
+            << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Call to setitimer failed. "
+         << "Error is " << EGET() << " '" << ESTR()
+         << "'.\n";
+  }
+
+  if (sigaction(SIGALRM, &lastTimer.action, NULL) < 0)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Call to sigaction failed. "
+            << "Error is " << EGET() << " '" << ESTR()
+            << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Call to sigaction failed. "
+         << "Error is " << EGET() << " '" << ESTR()
+         << "'.\n";
+  }
+
+  lastTimer.start = lastTimer.next = nullTimestamp();
+}
+
+//
+// Open TCP or UNIX file socket to listen for remote proxy
+// and block until remote connects. If successful close
+// the listening socket and return FD on which the other
+// party is connected.
+//
+
+int WaitForRemote(ChannelEndPoint &socketAddress)
+{
+  char hostLabel[DEFAULT_STRING_LENGTH] = { 0 };
+  char *socketUri = NULL;
+
+  int retryAccept  = -1;
+
+  int proxyFD = -1;
+  int newFD   = -1;
+
+  int acceptIPAddr = 0;
+
+  if (socketAddress.isTCPSocket())
+  {
+
+    //
+    // Get IP address of host to be awaited.
+    //
+
+    if (*acceptHost != '\0')
+    {
+      acceptIPAddr = GetHostAddress(acceptHost);
+
+      if (acceptIPAddr == 0)
+      {
+        #ifdef PANIC
+        *logofs << "Loop: PANIC! Cannot accept connections from unknown host '"
+                << acceptHost << "'.\n" << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Cannot accept connections from unknown host '"
+             << acceptHost << "'.\n";
+
+        goto WaitForRemoteError;
+      }
+      snprintf(hostLabel, sizeof(hostLabel), "'%s'", acceptHost);
+    }
+    else
+    {
+      strcpy(hostLabel, "any host");
+    }
+
+    long bindPort;
+    if (socketAddress.getTCPHostAndPort(NULL, &bindPort))
+    {
+      socketAddress.setSpec(loopbackBind ? "localhost" : "*", bindPort);
+    }
+    else
+    {
+      // This should never happen
+      cerr << "Error" << ": Unable to change bind host\n";
+    }
+  }
+  else if (socketAddress.isUnixSocket())
+    strcpy(hostLabel, "this host");
+  else
+    strcpy(hostLabel, "unknown origin (something went wrong!!!)");
+
+
+  proxyFD = ListenConnection(socketAddress, "NX");
+
+  socketAddress.getSpec(&socketUri);
+  #ifdef TEST
+  *logofs << "Loop: Waiting for connection from "
+          << hostLabel  << " on socket '" << socketUri
+          << "'.\n" << logofs_flush;
+  #endif
+  cerr << "Info" << ": Waiting for connection from "
+       << hostLabel << " on socket '" << socketUri
+       << "'.\n";
+  free(socketUri);
+
+  //
+  // How many times to loop waiting for connections
+  // from the selected host? Each loop wait for at
+  // most 20 seconds so a default value of 3 gives
+  // a timeout of 1 minute.
+  //
+  // TODO: Handling of timeouts and retry attempts
+  // must be rewritten.
+  //
+
+  retryAccept = control -> OptionProxyRetryAccept;
+
+  for (;;)
+  {
+    fd_set readSet;
+
+    FD_ZERO(&readSet);
+    FD_SET(proxyFD, &readSet);
+
+    T_timestamp selectTs;
+
+    selectTs.tv_sec  = 20;
+    selectTs.tv_usec = 0;
+
+    int result = select(proxyFD + 1, &readSet, NULL, NULL, &selectTs);
+
+    getNewTimestamp();
+
+    if (result == -1)
+    {
+      if (EGET() == EINTR)
+      {
+        if (CheckAbort() != 0)
+        {
+          goto WaitForRemoteError;
+        }
+
+        continue;
+      }
+ 
+      #ifdef PANIC
+      *logofs << "Loop: PANIC! Call to select failed. Error is "
+              << EGET() << " '" << ESTR() << "'.\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Call to select failed. Error is "
+           << EGET() << " '" << ESTR() << "'.\n";
+
+      goto WaitForRemoteError;
+    }
+    else if (result > 0 && FD_ISSET(proxyFD, &readSet))
+    {
+
+      sockaddr_in newAddrINET;
+
+      if (socketAddress.isUnixSocket())
+      {
+        socklen_t addrLen = sizeof(sockaddr_un);
+        newFD = accept(proxyFD, NULL, &addrLen);
+      }
+      else if (socketAddress.isTCPSocket())
+      {
+        socklen_t addrLen = sizeof(sockaddr_in);
+        newFD = accept(proxyFD, (sockaddr *) &newAddrINET, &addrLen);
+      }
+      if (newFD == -1)
+      {
+        #ifdef PANIC
+        *logofs << "Loop: PANIC! Call to accept failed. Error is "
+                << EGET() << " '" << ESTR() << "'.\n"
+                << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Call to accept failed. Error is "
+             << EGET() << " '" << ESTR() << "'.\n";
+
+        goto WaitForRemoteError;
+      }
+
+      if (socketAddress.isUnixSocket())
+      {
+
+        char * unixPath = NULL;
+        socketAddress.getUnixPath(&unixPath);
+        #ifdef TEST
+        *logofs << "Loop: Accepted connection from this host on Unix file socket '"
+                << unixPath << "'.\n"
+                << logofs_flush;
+        #endif
+
+        cerr << "Info" << ": Accepted connection from this host on Unix file socket '"
+             << unixPath << "'.\n";
+        free(unixPath);
+
+        break;
+      }
+      else if (socketAddress.isTCPSocket())
+      {
+
+        char *connectedHost = inet_ntoa(newAddrINET.sin_addr);
+
+        if (*acceptHost == '\0' || (int) newAddrINET.sin_addr.s_addr == acceptIPAddr)
+        {
+
+          #ifdef TEST
+
+          unsigned int connectedPort = ntohs(newAddrINET.sin_port);
+
+          *logofs << "Loop: Accepted connection from '" << connectedHost
+                  << "' with port '" << connectedPort << "'.\n"
+                  << logofs_flush;
+          #endif
+
+          cerr << "Info" << ": Accepted connection from '"
+               << connectedHost << "'.\n";
+
+          break;
+        }
+        else
+        {
+          #ifdef PANIC
+          *logofs << "Loop: WARNING! Refusing connection from '" << connectedHost
+                  << "' on port '" << socketAddress.getTCPPort() << "'.\n" << logofs_flush;
+          #endif
+
+          cerr << "Warning" << ": Refusing connection from '"
+               << connectedHost << "'.\n";
+	}
+
+        //
+        // Not the best way to elude a DOS attack...
+        //
+
+        sleep(5);
+
+        close(newFD);
+
+      }
+
+    }
+
+    if (--retryAccept == 0)
+    {
+      if (socketAddress.isUnixSocket())
+      {
+        #ifdef PANIC
+        *logofs << "Loop: PANIC! Connection via Unix file socket from this host "
+                << "could not be established.\n"
+                << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Connection via Unix file socket from this host "
+             << "could not be established.\n";
+      }
+      else if (*acceptHost == '\0')
+      {
+        #ifdef PANIC
+        *logofs << "Loop: PANIC! Connection with remote host "
+                << "could not be established.\n"
+                << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Connection with remote host "
+             << "could not be established.\n";
+      }
+      else
+      {
+        #ifdef PANIC
+        *logofs << "Loop: PANIC! Connection with remote host '"
+                << acceptHost << "' could not be established.\n"
+                << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Connection with remote host '"
+             << acceptHost << "' could not be established.\n";
+      }
+
+      goto WaitForRemoteError;
+    }
+    else
+    {
+      handleCheckSessionInConnect();
+    }
+  }
+
+  close(proxyFD);
+
+  return newFD;
+
+WaitForRemoteError:
+
+  close(proxyFD);
+
+  HandleCleanup();
+}
+
+int PrepareProxyConnectionTCP(char** hostName, long int* portNum, int* timeout, int* proxyFD, int* reason)
+{
+
+  if (!proxyFD)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Implementation error (PrepareProxyConnectionTCP). "
+            << "'proxyFD' must not be a NULL pointer.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ":  Implementation error (PrepareProxyConnectionTCP). "
+            << "'proxyFD' must not be a NULL pointer.\n";
+
+    return -1;
+  }
+
+  if (!reason)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Implementation error (PrepareProxyConnectionTCP). "
+            << "'reason' must not be a NULL pointer.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ":  Implementation error (PrepareProxyConnectionTCP). "
+            << "'reason' must not be a NULL pointer.\n";
+
+    return -1;
+  }
+
+  int remoteIPAddr = GetHostAddress(*hostName);
+  if (remoteIPAddr == 0)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Unknown remote host '"
+            << *hostName << "'.\n" << logofs_flush;
+    #endif
+        cerr << "Error" << ": Unknown remote host '"
+         << *hostName << "'.\n";
+
+    HandleCleanup();
+  }
+
+  #ifdef TEST
+  *logofs << "Loop: Connecting to remote host '" 
+          << *hostName << ":" << *portNum << "'.\n"
+          << logofs_flush;
+  #endif
+
+  cerr << "Info" << ": Connecting to remote host '"
+       << *hostName << ":" << *portNum << "'.\n"
+       << logofs_flush;
+
+  *proxyFD = -1;
+  *reason = -1;
+
+  sockaddr_in addr;
+  addr.sin_family = AF_INET;
+  addr.sin_port = htons(*portNum);
+  addr.sin_addr.s_addr = remoteIPAddr;
+
+  *proxyFD = socket(AF_INET, SOCK_STREAM, PF_UNSPEC);
+  *reason = EGET();
+
+  if (*proxyFD == -1)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Call to socket failed. "
+            << "Error is " << *reason << " '" << ESTR()
+            << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Call to socket failed. "
+         << "Error is " << *reason << " '" << ESTR()
+         << "'.\n";
+    return -1;
+
+  }
+  else if (SetReuseAddress(*proxyFD) < 0)
+  {
+    return -1;
+  }
+
+  //
+  // Ensure operation is timed out
+  // if there is a network problem.
+  //
+
+  if (timeout)
+    SetTimer(*timeout);
+  else
+    SetTimer(20000);
+
+  int result = connect(*proxyFD, (sockaddr *) &addr, sizeof(sockaddr_in));
+
+  *reason = EGET();
+
+  ResetTimer();
+
+  return result;
+
+}
+
+int PrepareProxyConnectionUnix(char** path, int* timeout, int* proxyFD, int* reason)
+{
+
+  if (!proxyFD)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Implementation error (PrepareProxyConnectionUnix). "
+            << "proxyFD must not be a NULL pointer.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ":  Implementation error (PrepareProxyConnectionUnix). "
+            << "proxyFD must not be a NULL pointer.\n";
+
+    return -1;
+  }
+
+  if (!reason)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Implementation error (PrepareProxyConnectionUnix). "
+            << "'reason' must not be a NULL pointer.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ":  Implementation error (PrepareProxyConnectionUnix). "
+            << "'reason' must not be a NULL pointer.\n";
+
+    return -1;
+  }
+
+  /* FIXME: Add socket file existence and permission checks */
+
+  *proxyFD = -1;
+  *reason = -1;
+
+  sockaddr_un addr;
+  addr.sun_family = AF_UNIX;
+  strncpy(addr.sun_path, *path, 108 - 1);
+
+  *proxyFD = socket(AF_UNIX, SOCK_STREAM, PF_UNSPEC);
+  *reason = EGET();
+
+  if (*proxyFD == -1)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Call to socket failed. "
+            << "Error is " << *reason << " '" << ESTR()
+            << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Call to socket failed. "
+         << "Error is " << *reason << " '" << ESTR()
+         << "'.\n";
+
+    return -1;
+  }
+
+  //
+  // Ensure operation is timed out
+  // if there is a network problem.
+  //
+
+  if (timeout)
+    SetTimer(*timeout);
+  else
+    SetTimer(20000);
+
+  int result = connect(*proxyFD, (sockaddr *) &addr, sizeof(sockaddr_un));
+
+  *reason = EGET();
+
+  ResetTimer();
+
+  return result;
+}
+
+//
+// Connect to remote proxy. If successful
+// return FD of connection, else return -1.
+//
+
+int ConnectToRemote(ChannelEndPoint &socketAddress)
+{
+
+  //
+  // How many times we retry to connect to remote
+  // host / Unix domain socket in case of failure?
+  //
+
+  int retryConnect = control -> OptionProxyRetryConnect;
+
+  //
+  // Show an alert after 20 seconds and use the
+  // same timeout to interrupt the connect. The
+  // retry timeout is incremental, starting from
+  // 100 miliseconds up to 1 second.
+  //
+
+  int alertTimeout   = 20000;
+  int connectTimeout = 20000;
+  int retryTimeout   = 100;
+
+  T_timestamp lastRetry = getNewTimestamp();
+
+  int result = -1;
+  int reason = -1;
+  int proxyFD = -1;
+
+  char *hostName = NULL;
+  long int portNum = -1;
+  char *unixPath = NULL;
+
+  for (;;)
+  {
+
+    #ifdef DEBUG
+    *logofs << "Loop: Timer set to " << connectTimeout / 1000
+            << " S " << "with retry set to " << retryConnect
+            << " in process with pid '" << getpid()
+            << "'.\n" << logofs_flush;
+    #endif
+
+    if (socketAddress.getUnixPath(&unixPath))
+      result = PrepareProxyConnectionUnix(&unixPath, &connectTimeout, &proxyFD, &reason);
+    else if (socketAddress.getTCPHostAndPort(&hostName, &portNum))
+      result = PrepareProxyConnectionTCP(&hostName, &portNum, &connectTimeout, &proxyFD, &reason);
+
+    if (result < 0)
+    {
+      close(proxyFD);
+
+      if (CheckAbort() != 0)
+      {
+        goto ConnectToRemoteError;
+      }
+      else if (--retryConnect == 0)
+      {
+        ESET(reason);
+
+        if (socketAddress.isUnixSocket())
+        {
+          #ifdef PANIC
+          *logofs << "Loop: PANIC! Connection to Unix file socket '"
+                  << unixPath << "' failed. Error is "
+                  << EGET() << " '" << ESTR() << "'.\n"
+                  << logofs_flush;
+          #endif
+
+          cerr << "Error" << ": Connection to Unix file socket '"
+                  << unixPath << "' failed. Error is "
+                  << EGET() << " '" << ESTR() << "'.\n";
+        }
+        else
+        {
+
+          #ifdef PANIC
+          *logofs << "Loop: PANIC! Connection to '" << hostName
+                  << ":" << portNum << "' failed. Error is "
+                  << EGET() << " '" << ESTR() << "'.\n"
+                  << logofs_flush;
+          #endif
+
+          cerr << "Error" << ": Connection to '" << hostName
+               << ":" << portNum << "' failed. Error is "
+               << EGET() << " '" << ESTR() << "'.\n";
+        }
+        goto ConnectToRemoteError;
+      }
+      else
+      {
+        #ifdef TEST
+        *logofs << "Loop: Sleeping " << retryTimeout
+                << " ms before retrying.\n"
+                << logofs_flush;
+        #endif
+
+        usleep(retryTimeout * 1000);
+
+        retryTimeout <<= 1;
+
+        if (retryTimeout > 1000 * 1000)
+        {
+          retryTimeout = 1000 * 1000;
+        }
+      }
+
+      //
+      // Check if it is time to show an alert dialog.
+      //
+
+      if (diffTimestamp(lastRetry, getNewTimestamp()) >=
+              (alertTimeout - control -> LatencyTimeout))
+      {
+        if (IsNotRunning(lastDialog))
+        {
+          handleCheckSessionInConnect();
+
+          //
+          // Wait for the dialog process to die
+          // unless a signal is received.
+          //
+
+          while (IsRunning(lastDialog))
+          {
+            WaitChild(lastDialog, "dialog", 0);
+
+            if (CheckAbort() != 0)
+            {
+              //
+              // The client ignores the TERM signal
+              // on Windows.
+              //
+
+              #ifdef __CYGWIN32__
+
+              KillProcess(lastDialog, "dialog", SIGKILL, 1);
+
+              #else
+
+              KillProcess(lastDialog, "dialog", SIGTERM, 1);
+
+              #endif
+
+              goto ConnectToRemoteError;
+            }
+          }
+
+          lastRetry = getTimestamp();
+        }
+      }
+      #ifdef TEST
+      {
+        *logofs << "Loop: Not showing the dialog with "
+                << (diffTimestamp(lastRetry, getTimestamp()) / 1000)
+                << " seconds elapsed.\n" << logofs_flush;
+      }
+      #endif
+
+      ESET(reason);
+
+      #ifdef TEST
+      if (unixPath && unixPath[0] != '\0' )
+      {
+        *logofs << "Loop: Connection to Unix socket file '"
+                << unixPath << "' failed with error '"
+                << ESTR() << "'. Retrying.\n"
+                << logofs_flush;
+      }
+      else
+      {
+        *logofs << "Loop: Connection to '" << hostName
+                << ":" << portNum << "' failed with error '"
+                << ESTR() << "'. Retrying.\n"
+                << logofs_flush;
+      }
+      #endif
+    }
+    else
+    {
+      //
+      // Connection was successful.
+      //
+
+      break;
+    }
+  }
+
+  return proxyFD;
+
+ConnectToRemoteError:
+
+  if (proxyFD != -1)
+  {
+    close(proxyFD);
+  }
+
+  HandleCleanup();
+}
+
+//
+// Make a string of options for the remote
+// proxy and write it to the descriptor.
+// The string includes the local version.
+//
+
+int SendProxyOptions(int fd)
+{
+  char options[DEFAULT_REMOTE_OPTIONS_LENGTH];
+
+  //
+  // Send the "compatibility" version first, then our
+  // actual version. Old proxies will take the first
+  // value and ignore the second.
+  //
+
+  sprintf(options, "NXPROXY-%s-%i.%i.%i",
+              control -> NXPROXY_COMPATIBILITY_VERSION,
+                  control -> LocalVersionMajor,
+                      control -> LocalVersionMinor,
+                          control -> LocalVersionPatch);
+
+  //
+  // If you want to send options from proxy
+  // initiating the connection use something
+  // like this:
+  //
+  // if (WE_PROVIDE_CREDENTIALS)
+  // {
+  //   sprintf(options + strlen(options), "%s=%s", option, value);
+  // }
+  //
+  // If you want to send options according to
+  // local proxy mode use something like this:
+  //
+  // if (control -> ProxyMode == proxy_client)
+  // {
+  //   sprintf(options + strlen(options), "%s=%s", option, value);
+  // }
+  //
+
+  //
+  // Send the authorization cookie if any. We assume
+  // user can choose to not provide any auth cookie
+  // and allow any connection to be accepted.
+  //
+
+  if (WE_PROVIDE_CREDENTIALS && *authCookie != '\0')
+  {
+    sprintf(options + strlen(options), " cookie=%s,", authCookie);
+  }
+  else
+  {
+    sprintf(options + strlen(options), " ");
+  }
+
+  //
+  // Now link characteristics and compression
+  // options. Delta compression, as well as
+  // preferred pack method, are imposed by
+  // client proxy.
+  //
+
+  if (control -> ProxyMode == proxy_client)
+  {
+    sprintf(options + strlen(options), "link=%s,pack=%s,cache=%s,",
+                linkSpeedName, packMethodName, cacheSizeName);
+
+    if (*bitrateLimitName != '\0')
+    {
+      sprintf(options + strlen(options), "limit=%s,",
+                  bitrateLimitName);
+    }
+
+    //
+    // Let the user disable the render extension
+    // and let the X client proxy know if it can
+    // short-circuit the X replies. Also pass
+    // along the session type to ensure that the
+    // remote proxy gets the right value.
+    //
+
+    sprintf(options + strlen(options), "render=%d,taint=%d,",
+                (control -> HideRender == 0),
+                    control -> TaintReplies);
+
+    if (*sessionType != '\0')
+    {
+      sprintf(options + strlen(options), "type=%s,", sessionType);
+    }
+    else
+    {
+      sprintf(options + strlen(options), "type=default,");
+    }
+
+    //
+    // Add the 'strict' option, if needed.
+    //
+
+    // Since ProtoStep7 (#issue 108)
+    if (useStrict != -1)
+    {
+      sprintf(options + strlen(options), "strict=%d,", useStrict);
+    }
+
+    //
+    // Tell the remote the size of the shared
+    // memory segment.
+    //
+
+    // Since ProtoStep7 (#issue 108)
+    if (*shsegSizeName != '\0')
+    {
+      sprintf(options + strlen(options), "shseg=%s,", shsegSizeName);
+    }
+
+    //
+    // Send image cache parameters.
+    //
+
+    sprintf(options + strlen(options), "images=%s,", imagesSizeName);
+
+    sprintf(options + strlen(options), "delta=%d,stream=%d,data=%d ",
+                control -> LocalDeltaCompression,
+                    control -> LocalStreamCompressionLevel,
+                        control -> LocalDataCompressionLevel);
+  }
+  else
+  {
+    //
+    // If no special compression level was selected,
+    // server side will use compression levels set
+    // by client.
+    //
+
+    if (control -> LocalStreamCompressionLevel < 0)
+    {
+      sprintf(options + strlen(options), "stream=default,");
+    }
+    else
+    {
+      sprintf(options + strlen(options), "stream=%d,",
+                  control -> LocalStreamCompressionLevel);
+    }
+
+    if (control -> LocalDataCompressionLevel < 0)
+    {
+      sprintf(options + strlen(options), "data=default ");
+    }
+    else
+    {
+      sprintf(options + strlen(options), "data=%d ",
+                  control -> LocalDataCompressionLevel);
+    }
+  }
+
+  #ifdef TEST
+  *logofs << "Loop: Sending remote options '"
+          << options << "'.\n" << logofs_flush;
+  #endif
+
+  return WriteLocalData(fd, options, strlen(options));
+}
+
+int ReadProxyVersion(int fd)
+{
+  #ifdef TEST
+  *logofs << "Loop: Going to read the remote proxy version "
+          << "from FD#" << fd << ".\n" << logofs_flush;
+  #endif
+
+  //
+  // Read until the first space in string.
+  // We expect the remote version number.
+  //
+
+  char options[DEFAULT_REMOTE_OPTIONS_LENGTH];
+
+  int result = ReadRemoteData(fd, options, sizeof(options), ' ');
+
+  if (result <= 0)
+  {
+    if (result < 0)
+    {
+      if (control -> ProxyMode == proxy_server)
+      {
+        HandleAlert(ABORT_PROXY_NEGOTIATION_ALERT, 1);
+      }
+
+      handleAlertInLoop();
+    }
+
+    return result;
+  }
+
+  #ifdef TEST
+  *logofs << "Loop: Received remote version string '"
+          << options << "' from FD#" << fd << ".\n"
+          << logofs_flush;
+  #endif
+
+  if (strncmp(options, "NXPROXY-", strlen("NXPROXY-")) != 0)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Parse error in remote options string '"
+            << options << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Parse error in remote options string '"
+         << options << "'.\n";
+
+    return -1;
+  }
+
+  //
+  // Try to determine if this is a pre-2.0.0
+  // version advertising itself as compatible
+  // with the 1.2.2.
+  //
+
+  int major = -1;
+  int minor = -1;
+  int patch = -1;
+
+  sscanf(options, "NXPROXY-%i.%i.%i-%i.%i.%i", &(control -> RemoteVersionMajor),
+             &(control -> RemoteVersionMinor), &(control -> RemoteVersionPatch),
+                 &major, &minor, &patch);
+
+  if (control -> RemoteVersionMajor == 1 &&
+          control -> RemoteVersionMinor == 2 &&
+              control -> RemoteVersionPatch == 2 &&
+                  major != -1 && minor != -1 && patch != -1)
+  {
+    #ifdef TEST
+    *logofs << "Loop: Read trailing remote version '" << major
+            << "." << minor << "." << patch << "'.\n"
+            << logofs_flush;
+    #endif
+
+    control -> CompatVersionMajor = major;
+    control -> CompatVersionMinor = minor;
+    control -> CompatVersionPatch = patch;
+
+    control -> RemoteVersionMajor = major;
+    control -> RemoteVersionMinor = minor;
+    control -> RemoteVersionPatch = patch;
+  }
+  else
+  {
+    //
+    // We read the remote version at the first
+    // round. If the second version is missing,
+    // we will retain the values read before.
+    //
+
+    sscanf(options, "NXPROXY-%i.%i.%i-%i.%i.%i", &(control -> CompatVersionMajor),
+               &(control -> CompatVersionMinor), &(control -> CompatVersionPatch),
+                   &(control -> RemoteVersionMajor), &(control -> RemoteVersionMinor),
+                       &(control -> RemoteVersionPatch));
+  }
+
+  *logofs << "Loop: Identified remote version '" << control -> RemoteVersionMajor
+          << "." << control -> RemoteVersionMinor << "." << control -> RemoteVersionPatch
+          << "'.\n" << logofs_flush;
+
+  *logofs << "Loop: Remote compatibility version '" << control -> CompatVersionMajor
+          << "." << control -> CompatVersionMinor << "." << control -> CompatVersionPatch
+          << "'.\n" << logofs_flush;
+
+  *logofs << "Loop: Local version '" << control -> LocalVersionMajor
+          << "." << control -> LocalVersionMinor << "." << control -> LocalVersionPatch
+          << "'.\n" << logofs_flush;
+
+  if (SetVersion() < 0)
+  {
+    if (control -> ProxyMode == proxy_server)
+    {
+      HandleAlert(WRONG_PROXY_VERSION_ALERT, 1);
+    }
+
+    handleAlertInLoop();
+
+    return -1;
+  }
+
+  return 1;
+}
+
+int ReadProxyOptions(int fd)
+{
+  #ifdef TEST
+  *logofs << "Loop: Going to read the remote proxy options "
+          << "from FD#" << fd << ".\n" << logofs_flush;
+  #endif
+
+  char options[DEFAULT_REMOTE_OPTIONS_LENGTH];
+
+  int result = ReadRemoteData(fd, options, sizeof(options), ' ');
+
+  if (result <= 0)
+  {
+    return result;
+  }
+
+  #ifdef TEST
+  *logofs << "Loop: Received remote options string '"
+          << options << "' from FD#" << fd << ".\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // Get the remote options, delimited by a space character.
+  // Note that there will be a further initialization phase
+  // at the time proxies negotiate cache file to restore.
+  //
+
+  if (ParseRemoteOptions(options) < 0)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Couldn't negotiate a valid "
+            << "session with remote NX proxy.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Couldn't negotiate a valid "
+         << "session with remote NX proxy.\n";
+
+    return -1;
+  }
+
+  return 1;
+}
+
+int SendProxyCaches(int fd)
+{
+  #ifdef TEST
+  *logofs << "Loop: Synchronizing local and remote caches.\n"
+          << logofs_flush;
+  #endif
+
+  if (control -> ProxyMode == proxy_client)
+  {
+    //
+    // Prepare a list of caches matching this
+    // session type and send it to the remote.
+    //
+
+    #ifdef TEST
+    *logofs << "Loop: Going to send the list of local caches.\n"
+            << logofs_flush;
+    #endif
+
+    SetCaches();
+
+    int entries = DEFAULT_REMOTE_CACHE_ENTRIES;
+
+    const char prefix = 'C';
+
+    if (control -> LocalDeltaCompression == 0 ||
+            control -> PersistentCacheEnableLoad == 0)
+    {
+      #ifdef TEST
+      *logofs << "Loop: Writing an empty list to FD#" << fd
+              << ".\n" << logofs_flush;
+      #endif
+
+      return WriteLocalData(fd, "cachelist=none ", strlen("cachelist=none "));
+    }
+
+    int count = 0;
+
+    #ifdef TEST
+    *logofs << "Loop: Looking for cache files in directory '"
+            << control -> PersistentCachePath << "'.\n" << logofs_flush;
+    #endif
+
+    DIR *cacheDir = opendir(control -> PersistentCachePath);
+
+    if (cacheDir != NULL)
+    {
+      dirent *dirEntry;
+
+      int prologue = 0;
+
+      while (((dirEntry = readdir(cacheDir)) != NULL) && (count < entries))
+      {
+        if (*dirEntry -> d_name == prefix &&
+                strlen(dirEntry -> d_name) == (MD5_LENGTH * 2 + 2))
+        {
+          if (prologue == 0)
+          {
+            WriteLocalData(fd, "cachelist=", strlen("cachelist="));
+
+            prologue = 1;
+          }
+          else
+          {
+            WriteLocalData(fd, ",", strlen(","));
+          }
+
+          #ifdef TEST
+          *logofs << "Loop: Writing entry '" << control -> PersistentCachePath
+                  << "/" << dirEntry -> d_name << "' to FD#" << fd
+                  << ".\n" << logofs_flush;
+          #endif
+
+          //
+          // Write cache file name to the socket,
+          // including leading 'C-' or 'S-'.
+          //
+
+          WriteLocalData(fd, dirEntry -> d_name, MD5_LENGTH * 2 + 2);
+
+          count++;
+        }
+      }
+
+      closedir(cacheDir);
+    }
+
+    if (count == 0)
+    {
+      #ifdef TEST
+      *logofs << "Loop: Writing an empty list to FD#" << fd
+              << ".\n" << logofs_flush;
+      #endif
+
+      return WriteLocalData(fd, "cachelist=none ", strlen("cachelist=none "));
+    }
+    else
+    {
+      return WriteLocalData(fd, " ", 1);
+    }
+  }
+  else
+  {
+    //
+    // Send back the selected cache name.
+    //
+
+    #ifdef TEST
+    *logofs << "Loop: Going to send the selected cache.\n"
+            << logofs_flush;
+    #endif
+
+    char buffer[DEFAULT_STRING_LENGTH];
+
+    if (control -> PersistentCacheName != NULL)
+    {
+      #ifdef TEST
+      *logofs << "Loop: Name of selected cache file is '"
+              << control -> PersistentCacheName << "'.\n"
+              << logofs_flush;
+      #endif
+
+      sprintf(buffer, "cachefile=%s%s ",
+                  *(control -> PersistentCacheName) == 'C' ? "S-" : "C-",
+                      control -> PersistentCacheName + 2);
+    }
+    else
+    {
+      #ifdef TEST
+      *logofs << "Loop: No valid cache file was selected.\n"
+              << logofs_flush;
+      #endif
+
+      sprintf(buffer, "cachefile=none ");
+    }
+
+    #ifdef TEST
+    *logofs << "Loop: Sending string '" << buffer
+            << "' as selected cache file.\n"
+            << logofs_flush;
+    #endif
+
+    return WriteLocalData(fd, buffer, strlen(buffer));
+  }
+}
+
+int ReadProxyCaches(int fd)
+{
+  if (control -> ProxyMode == proxy_client)
+  {
+    #ifdef TEST
+    *logofs << "Loop: Going to receive the selected proxy cache.\n"
+            << logofs_flush;
+    #endif
+
+    //
+    // We will read the name of cache plus the stop character.
+    //
+
+    char buffer[DEFAULT_STRING_LENGTH];
+
+    //
+    // Leave space for a trailing null.
+    //
+
+    int result = ReadRemoteData(fd, buffer, sizeof("cachefile=") + MD5_LENGTH * 2 + 3, ' ');
+
+    if (result <= 0)
+    {
+      return result;
+    }
+
+    char *cacheName = strstr(buffer, "cachefile=");
+
+    if (cacheName == NULL)
+    {
+      #ifdef PANIC
+      *logofs << "Loop: PANIC! Invalid cache file option '"
+              << buffer << "' provided by remote proxy.\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Invalid cache file option '"
+           << buffer << "' provided by remote proxy.\n";
+
+      HandleCleanup();
+    }
+
+    cacheName += strlen("cachefile=");
+
+    if (control -> PersistentCacheName != NULL)
+    {
+      delete [] control -> PersistentCacheName;
+    }
+
+    control -> PersistentCacheName = NULL;
+
+    if (strncasecmp(cacheName, "none", strlen("none")) == 0)
+    {
+      #ifdef TEST
+      *logofs << "Loop: No cache file selected by remote proxy.\n"
+              << logofs_flush;
+      #endif
+    }
+    else if (strlen(cacheName) != MD5_LENGTH * 2 + 3 ||
+                 *(cacheName + MD5_LENGTH * 2 + 2) != ' ')
+    {
+      #ifdef PANIC
+      *logofs << "Loop: PANIC! Invalid cache file name '"
+              << cacheName << "' provided by remote proxy.\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Invalid cache file name '"
+           << cacheName << "' provided by remote proxy.\n";
+
+      HandleCleanup();
+    }
+    else
+    {
+      //
+      // It is "C-" + 32 + "\0".
+      //
+
+      control -> PersistentCacheName = new char[MD5_LENGTH * 2 + 3];
+
+      *(cacheName + MD5_LENGTH * 2 + 2) = '\0';
+
+      strcpy(control -> PersistentCacheName, cacheName);
+
+      #ifdef TEST
+      *logofs << "Loop: Cache file '" << control -> PersistentCacheName
+              << "' selected by remote proxy.\n" << logofs_flush;
+      #endif
+    }
+  }
+  else
+  {
+    #ifdef TEST
+    *logofs << "Loop: Going to receive the list of remote caches.\n"
+            << logofs_flush;
+    #endif
+
+    SetCaches();
+
+    int size = ((MD5_LENGTH * 2 + 2) + strlen(",")) * DEFAULT_REMOTE_CACHE_ENTRIES +
+                   strlen("cachelist=") + strlen(" ") + 1;
+
+    char *buffer = new char[size];
+
+    int result = ReadRemoteData(fd, buffer, size - 1, ' ');
+
+    if (result <= 0)
+    {
+      delete [] buffer;
+
+      return result;
+    }
+
+    #ifdef TEST
+    *logofs << "Loop: Read list of caches from remote side as '"
+            << buffer << "'.\n" << logofs_flush;
+    #endif
+
+    //
+    // Prepare the buffer. What we want is a list
+    // like "cache1,cache2,cache2" terminated by
+    // null.
+    //
+
+    *(buffer + strlen(buffer) - 1) = '\0';
+
+    if (strncasecmp(buffer, "cachelist=", strlen("cachelist=")) != 0)
+    {
+      #ifdef PANIC
+      *logofs << "Loop: Wrong format for list of cache files "
+              << "read from FD#" << fd << ".\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Wrong format for list of cache files.\n";
+
+      delete [] buffer;
+
+      return -1;
+    }
+
+    control -> PersistentCacheName = GetLastCache(buffer, control -> PersistentCachePath);
+
+    //
+    // Get rid of list of caches.
+    //
+
+    delete [] buffer;
+  }
+
+  return 1;
+}
+
+int ReadForwarderVersion(int fd)
+{
+  #ifdef TEST
+  *logofs << "Loop: Going to negotiate the forwarder version.\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // Check if we actually expect the session cookie.
+  //
+
+  if (*authCookie == '\0')
+  {
+    #ifdef TEST
+    *logofs << "Loop: No authentication cookie required "
+            << "from FD#" << fd << ".\n" << logofs_flush;
+    #endif
+
+    return 1;
+  }
+
+  char options[DEFAULT_REMOTE_OPTIONS_LENGTH];
+
+  int result = ReadRemoteData(fd, options, sizeof(options), ' ');
+
+  if (result <= 0)
+  {
+    return result;
+  }
+
+  #ifdef TEST
+  *logofs << "Loop: Received forwarder version string '" << options
+          << "' from FD#" << fd << ".\n" << logofs_flush;
+  #endif
+
+  if (strncmp(options, "NXSSH-", strlen("NXSSH-")) != 0)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Parse error in forwarder options string '"
+            << options << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Parse error in forwarder options string '"
+         << options << "'.\n";
+
+    return -1;
+  }
+
+  //
+  // Accept whatever forwarder version.
+  //
+
+  sscanf(options, "NXSSH-%i.%i.%i", &(control -> RemoteVersionMajor),
+             &(control -> RemoteVersionMinor), &(control -> RemoteVersionPatch));
+
+  #ifdef TEST
+  *logofs << "Loop: Read forwarder version '" << control -> RemoteVersionMajor
+          << "." << control -> RemoteVersionMinor << "." << control -> RemoteVersionPatch
+          << "'.\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int ReadForwarderOptions(int fd)
+{
+  //
+  // Get the forwarder cookie.
+  //
+
+  if (*authCookie == '\0')
+  {
+    #ifdef TEST
+    *logofs << "Loop: No authentication cookie required "
+            << "from FD#" << fd << ".\n" << logofs_flush;
+    #endif
+
+    return 1;
+  }
+
+  char options[DEFAULT_REMOTE_OPTIONS_LENGTH];
+
+  int result = ReadRemoteData(fd, options, sizeof(options), ' ');
+
+  if (result <= 0)
+  {
+    return result;
+  }
+
+  #ifdef TEST
+  *logofs << "Loop: Received forwarder options string '"
+          << options << "' from FD#" << fd << ".\n"
+          << logofs_flush;
+  #endif
+
+  if (ParseForwarderOptions(options) < 0)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Couldn't negotiate a valid "
+            << "cookie with the NX forwarder.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Couldn't negotiate a valid "
+         << "cookie with the NX forwarder.\n";
+
+    return -1;
+  }
+
+  return 1;
+}
+
+int ReadRemoteData(int fd, char *buffer, int size, char stop)
+{
+  #ifdef TEST
+  *logofs << "Loop: Going to read remote data from FD#"
+          << fd << ".\n" << logofs_flush;
+  #endif
+
+  if (size >= MAXIMUM_REMOTE_OPTIONS_LENGTH)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Maximum remote options buffer "
+            << "limit exceeded.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Maximum remote options buffer "
+         << "limit exceeded.\n";
+
+    HandleCleanup();
+  }
+
+  while (remotePosition < (size - 1))
+  {
+    int result = read(fd, remoteData + remotePosition, 1);
+
+    getNewTimestamp();
+
+    if (result <= 0)
+    {
+      if (result == -1)
+      {
+        if (EGET() == EAGAIN)
+        {
+          #ifdef TEST
+          *logofs << "Loop: Reading data from FD#" << fd
+                  << " would block.\n" << logofs_flush;
+          #endif
+
+          return 0;
+        }
+        else if (EGET() == EINTR)
+        {
+          if (CheckAbort() != 0)
+          {
+            return -1;
+          }
+
+          continue;
+        }
+      }
+
+      #ifdef PANIC
+      *logofs << "Loop: PANIC! The remote NX proxy closed "
+              << "the connection.\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": The remote NX proxy closed "
+           << "the connection.\n";
+
+      return -1;
+    }
+    else if (*(remoteData + remotePosition) == stop)
+    {
+      #ifdef TEST
+      *logofs << "Loop: Read stop character from FD#"
+              << fd << ".\n" << logofs_flush;
+      #endif
+
+      remotePosition++;
+
+      //
+      // Copy the fake terminating null
+      // in the buffer.
+      //
+
+      *(remoteData + remotePosition) = '\0';
+
+      memcpy(buffer, remoteData, remotePosition + 1);
+
+      #ifdef TEST
+      *logofs << "Loop: Remote string '" << remoteData
+              << "' read from FD#" << fd << ".\n"
+              << logofs_flush;
+      #endif
+
+      int t = remotePosition;
+
+      remotePosition = 0;
+
+      return t;
+    }
+    else
+    {
+      //
+      // Make sure string received
+      // from far end is printable.
+      //
+
+      if (isgraph(*(remoteData + remotePosition)) == 0)
+      {
+        #ifdef WARNING
+        *logofs << "Loop: WARNING! Non printable character decimal '"
+                << (unsigned int) *(remoteData + remotePosition)
+                << "' received in remote data from FD#"
+                << fd << ".\n" << logofs_flush;
+        #endif
+
+        cerr << "Warning" << ": Non printable character decimal '"
+                << (unsigned int) *(remoteData + remotePosition)
+                << "' received in remote data from FD#"
+                << fd << ".\n" << logofs_flush;
+
+        *(remoteData + remotePosition) = ' ';
+      }
+
+      #ifdef DEBUG
+      *logofs << "Loop: Read a further character "
+              << "from FD#" << fd << ".\n"
+              << logofs_flush;
+      #endif
+
+      remotePosition++;
+    }
+  }
+
+  *(remoteData + remotePosition) = '\0';
+
+  #ifdef PANIC
+  *logofs << "Loop: PANIC! Stop character missing "
+          << "from FD#" << fd << " after " << remotePosition 
+          << " characters read in string '" << remoteData
+          << "'.\n" << logofs_flush;
+  #endif
+
+  cerr << "Error" << ": Stop character missing "
+       << "from FD#" << fd << " after " << remotePosition 
+       << " characters read in string '" << remoteData
+       << "'.\n";
+
+  memcpy(buffer, remoteData, remotePosition);
+
+  remotePosition = 0;
+
+  return -1;
+}
+
+static int
+hexval(char c) {
+  if ((c >= '0') && (c <= '9'))
+    return c - '0';
+  if ((c >= 'a') && (c <= 'f'))
+    return c - 'a' + 10;
+  if ((c >= 'A') && (c <= 'F'))
+    return c - 'A' + 10;
+  return -1;
+}
+
+static void
+URLDecodeInPlace(char *str) {
+  if (str) {
+    char *to = str;
+    while (str[0]) {
+      if ((str[0] == '%') &&
+          (hexval(str[1]) >= 0) &&
+          (hexval(str[2]) >= 0)) {
+        *(to++) = hexval(str[1]) * 16 + hexval(str[2]);
+        str += 3;
+      }
+      else
+        *(to++) = *(str++);
+    }
+    *to = '\0';
+  }
+}
+
+int WriteLocalData(int fd, const char *buffer, int size)
+{
+  int position = 0;
+  int ret = 0;
+  fd_set writeSet;
+  struct timeval selectTs = {30, 0};
+
+  while (position < size)
+  {
+
+    // A write to a non-blocking socket may fail with EAGAIN. The problem is
+    // that cache data is done in several writes, and there's no easy way
+    // to handle failure without rewriting a significant amount of code.
+    //
+    // Bailing out of the outer loop would result in restarting the sending
+    // of the entire cache list, which would confuse the other side.
+
+    FD_ZERO(&writeSet);
+    FD_SET(fd, &writeSet);
+
+    ret = select(fd+1, NULL, &writeSet, NULL, &selectTs);
+
+    #ifdef DEBUG
+    *logofs << "Loop: WriteLocalData: select() returned with a code of " << ret << " and remaining timeout of "
+            << selectTs.tv_sec << " sec, " << selectTs.tv_usec << "usec\n" << logofs_flush;
+    #endif
+
+    if ( ret < 0 )
+    {
+      *logofs << "Loop: Error in select() when writing data to FD#" << fd << ": " << strerror(EGET()) << "\n" << logofs_flush;
+
+      if ( EGET() == EINTR )
+        continue;
+
+      return -1;
+    }
+    else if ( ret == 0 )
+    {
+      *logofs << "Loop: Timeout expired in select() when writing data to FD#" << fd << ": " << strerror(EGET()) << "\n" << logofs_flush;
+      return -1;
+    }
+
+    int result = write(fd, buffer + position, size - position);
+
+    getNewTimestamp();
+
+    if (result <= 0)
+    {
+      if (result < 0 && (EGET() == EINTR || EGET() == EAGAIN || EGET() == EWOULDBLOCK))
+      {
+        continue;
+      }
+
+      #ifdef TEST
+      *logofs << "Loop: Error writing data to FD#"
+              << fd << ".\n" << logofs_flush;
+      #endif
+
+      return -1;
+    }
+
+    position += result;
+  }
+
+  return position;
+}
+
+//
+// Parse the string passed by calling process in
+// the environment. This is not necessarily the
+// content of DISPLAY variable, but can be the
+// parameters passed when creating the process
+// or thread.
+//
+
+int ParseEnvironmentOptions(const char *env, int force)
+{
+  //
+  // Be sure log file is valid.
+  //
+
+  if (logofs == NULL)
+  {
+    logofs = &cerr;
+  }
+
+  //
+  // Be sure we have a parameters repository
+  // and a context to jump into because this
+  // can be called before creating the proxy.
+  //
+
+  if (control == NULL)
+  {
+    control = new Control();
+  }
+
+  if (setjmp(context) == 1)
+  {
+    #ifdef TEST
+    *logofs << "Loop: Out of the long jump while parsing "
+            << "the environment options.\n"
+            << logofs_flush;
+    #endif
+    
+    return -1;
+  }
+
+  if (force == 0 && parsedOptions == 1)
+  {
+    #ifdef TEST
+    *logofs << "Loop: Skipping a further parse of environment "
+            << "options string '" << (env != NULL ? env : "")
+            << "'.\n" << logofs_flush;
+    #endif
+
+    return 1;
+  }
+
+  if (env == NULL || *env == '\0')
+  {
+    #ifdef TEST
+    *logofs << "Loop: Nothing to do with empty environment "
+            << "options string '" << (env != NULL ? env : "")
+            << "'.\n" << logofs_flush;
+    #endif
+
+    return 0;
+  }
+
+  #ifdef TEST
+  *logofs << "Loop: Going to parse the environment options "
+          << "string '" << env << "'.\n"
+          << logofs_flush;
+  #endif
+
+  parsedOptions = 1;
+
+  //
+  // Copy the string passed as parameter
+  // because we need to modify it.
+  //
+
+  char opts[DEFAULT_DISPLAY_OPTIONS_LENGTH];
+
+  #ifdef VALGRIND
+
+  memset(opts, '\0', DEFAULT_DISPLAY_OPTIONS_LENGTH);
+
+  #endif
+
+  if (strlen(env) >= DEFAULT_DISPLAY_OPTIONS_LENGTH)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Environment options string '" << env
+            << "' exceeds length of " << DEFAULT_DISPLAY_OPTIONS_LENGTH
+            << " characters.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Environment options string '" << env
+         << "' exceeds length of " << DEFAULT_DISPLAY_OPTIONS_LENGTH
+         << " characters.\n";
+
+    return -1;
+  }
+
+  strcpy(opts, env);
+
+  char *nextOpts = opts;
+
+  //
+  // Ensure that DISPLAY environment variable
+  // (roughly) follows the X convention for
+  // transport notation.
+  //
+
+  if (strncasecmp(opts, "nx/nx,:", 7) == 0 ||
+          strncasecmp(opts, "nx,:", 4) == 0)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Parse error in options string '"
+            << opts << "' at 'nx,:'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Parse error in options string '"
+         << opts << "' at 'nx,:'.\n";
+
+    return -1;
+  }
+  else if (strncasecmp(opts, "nx/nx,", 6) == 0)
+  {
+    nextOpts += 6;
+  }
+  else if (strncasecmp(opts, "nx,", 3) == 0)
+  {
+    nextOpts += 3;
+  }
+  else if (strncasecmp(opts, "nx:", 3) == 0)
+  {
+    nextOpts += 3;
+  }
+  else if (force == 0)
+  {
+    #ifdef TEST
+    *logofs << "Loop: Ignoring host X server display string '"
+            << opts << "'.\n" << logofs_flush;
+    #endif
+
+    return 0;
+  }
+
+  //
+  // Save here the name of the options file and
+  // parse it after all the other options.
+  //
+
+  char fileOptions[DEFAULT_STRING_LENGTH] = { 0 };
+
+  //
+  // The options string is intended to be a series
+  // of name/value tuples in the form name=value
+  // separated by the ',' character ended by a ':'
+  // followed by remote NX proxy port.
+  //
+
+  char *name;
+  char *value;
+
+  value = strrchr(nextOpts, ':');
+
+  if (value != NULL)
+  {
+    char *check = value + 1;
+
+    if (*check == '\0' || isdigit(*check) == 0)
+    {
+      #ifdef PANIC
+      *logofs << "Loop: PANIC! Can't identify NX port in string '"
+              << value << "'.\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Can't identify NX port in string '"
+           << value << "'.\n";
+
+      return -1;
+    }
+
+    proxyPort = atoi(check);
+
+    //
+    // Get rid of the port specification.
+    //
+
+    *value = '\0';
+  }
+  else if (proxyPort == DEFAULT_NX_PROXY_PORT && force == 0)
+  {
+    //
+    // Complain only if user didn't specify
+    // the port on the command line.
+    //
+
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Can't identify NX port in string '"
+            << opts << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Can't identify NX port in string '"
+         << opts << "'.\n";
+
+    return -1;
+  }
+
+  #ifdef TEST
+  *logofs << "Loop: Parsing options string '"
+          << nextOpts << "'.\n" << logofs_flush;
+  #endif
+
+  //
+  // Now all the other optional parameters.
+  //
+
+  name = strtok(nextOpts, "=");
+
+  char connectHost[DEFAULT_STRING_LENGTH] = { 0 };
+  long connectPort = -1;
+
+  while (name)
+  {
+    value = strtok(NULL, ",");
+    URLDecodeInPlace(value);
+
+    if (CheckArg("environment", name, value) < 0)
+    {
+      return -1;
+    }
+
+    if (strcasecmp(name, "options") == 0)
+    {
+      strncpy(fileOptions, value, DEFAULT_STRING_LENGTH - 1);
+    }
+    else if (strcasecmp(name, "display") == 0)
+    {
+      strncpy(displayHost, value, DEFAULT_STRING_LENGTH - 1);
+    }
+    else if (strcasecmp(name, "link") == 0)
+    {
+
+      if (control -> ProxyMode == proxy_server)
+      {
+        PrintOptionIgnored("local", name, value);
+      }
+      else if (ParseLinkOption(value) < 0)
+      {
+        #ifdef PANIC
+        *logofs << "Loop: PANIC! Can't identify 'link' option in string '"
+                << value << "'.\n" << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Can't identify 'link' option in string '"
+             << value << "'.\n";
+        if (ParseLinkOption("adsl") < 0)
+           return -1;
+      }
+    }
+    else if (strcasecmp(name, "limit") == 0)
+    {
+      if (control -> ProxyMode == proxy_server)
+      {
+        PrintOptionIgnored("local", name, value);
+      }
+      else if (ParseBitrateOption(value) < 0)
+      {
+        #ifdef PANIC
+        *logofs << "Loop: PANIC! Can't identify option 'limit' in string '"
+                << value << "'.\n" << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Can't identify option 'limit' in string '"
+             << value << "'.\n";
+
+        return -1;
+      }
+    }
+    else if (strcasecmp(name, "type") == 0)
+    {
+      //
+      // Type of session, for example "desktop",
+      // "application", "windows", etc.
+      //
+
+      if (control -> ProxyMode == proxy_server)
+      {
+        PrintOptionIgnored("local", name, value);
+      }
+      else
+      {
+        if (strcasecmp(value, "default") == 0)
+        {
+          *sessionType = '\0';
+        }
+        else
+        {
+          strncpy(sessionType, value, DEFAULT_STRING_LENGTH - 1);
+        }
+      }
+    }
+    else if (strcasecmp(name, "listen") == 0)
+    {
+      char *socketUri = NULL;
+      if (connectSocket.getSpec(&socketUri))
+      {
+        #ifdef PANIC
+        *logofs << "Loop: PANIC! Can't handle 'listen' and 'connect' parameters "
+                << "at the same time.\n" << logofs_flush;
+
+        *logofs << "Loop: PANIC! Refusing 'listen' parameter with 'connect' being '"
+                << socketUri << "'.\n" << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Can't handle 'listen' and 'connect' parameters "
+             << "at the same time.\n";
+
+        cerr << "Error" << ": Refusing 'listen' parameter with 'connect' being '"
+             << socketUri << "'.\n";
+
+        free(socketUri);
+        return -1;
+      }
+
+      SetAndValidateChannelEndPointArg("local", name, value, listenSocket);
+
+    }
+    else if (strcasecmp(name, "loopback") == 0)
+    {
+      loopbackBind = ValidateArg("local", name, value);
+    }
+    else if (strcasecmp(name, "accept") == 0)
+    {
+      char *socketUri = NULL;
+      if (connectSocket.getSpec(&socketUri))
+      {
+        #ifdef PANIC
+        *logofs << "Loop: PANIC! Can't handle 'accept' and 'connect' parameters "
+                << "at the same time.\n" << logofs_flush;
+
+        *logofs << "Loop: PANIC! Refusing 'accept' parameter with 'connect' being '"
+                << socketUri << "'.\n" << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Can't handle 'accept' and 'connect' parameters "
+             << "at the same time.\n";
+
+        cerr << "Error" << ": Refusing 'accept' parameter with 'connect' being '"
+             << socketUri << "'.\n";
+
+	free(socketUri);
+        return -1;
+      }
+
+      strncpy(acceptHost, value, DEFAULT_STRING_LENGTH - 1);
+    }
+    else if (strcasecmp(name, "connect") == 0)
+    {
+      if (*acceptHost != '\0')
+      {
+        #ifdef PANIC
+        *logofs << "Loop: PANIC! Can't handle 'connect' and 'accept' parameters "
+                << "at the same time.\n" << logofs_flush;
+
+        *logofs << "Loop: PANIC! Refusing 'connect' parameter with 'accept' being '"
+                << acceptHost << "'.\n" << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Can't handle 'connect' and 'accept' parameters "
+             << "at the same time.\n";
+
+        cerr << "Error" << ": Refusing 'connect' parameter with 'accept' being '"
+             << acceptHost << "'.\n";
+
+        return -1;
+      }
+      if ((strncmp(value, "tcp:", 4) == 0) || (strncmp(value, "unix:", 5) == 0))
+        SetAndValidateChannelEndPointArg("local", name, value, connectSocket);
+      else
+        // if the "connect" parameter does not start with "unix:" or "tcp:" assume
+        // old parameter usage style (providing hostname string only).
+        strcpy(connectHost, value);
+    }
+    else if (strcasecmp(name, "port") == 0)
+    {
+      connectPort = ValidateArg("local", name, value);
+    }
+    else if (strcasecmp(name, "retry") == 0)
+    {
+      control -> OptionProxyRetryConnect  = ValidateArg("local", name, value);
+      control -> OptionServerRetryConnect = ValidateArg("local", name, value);
+    }
+    else if (strcasecmp(name, "session") == 0)
+    {
+      strncpy(sessionFileName, value, DEFAULT_STRING_LENGTH - 1);
+    }
+    else if (strcasecmp(name, "errors") == 0)
+    {
+      //
+      // The old name of the parameter was 'log'
+      // but the default name for the file is
+      // 'errors' so it is more logical to use
+      // the same name.
+      //
+
+      strncpy(errorsFileName, value, DEFAULT_STRING_LENGTH - 1);
+    }
+    else if (strcasecmp(name, "root") == 0)
+    {
+      strncpy(rootDir, value, DEFAULT_STRING_LENGTH - 1);
+    }
+    else if (strcasecmp(name, "id") == 0)
+    {
+      strncpy(sessionId, value, DEFAULT_STRING_LENGTH - 1);
+    }
+    else if (strcasecmp(name, "stats") == 0)
+    {
+      control -> EnableStatistics = 1;
+
+      strncpy(statsFileName, value, DEFAULT_STRING_LENGTH - 1);
+    }
+    else if (strcasecmp(name, "cookie") == 0)
+    {
+      LowercaseArg("local", name, value);
+
+      strncpy(authCookie, value, DEFAULT_STRING_LENGTH - 1);
+    }
+    else if (strcasecmp(name, "nodelay") == 0)
+    {
+      useNoDelay = ValidateArg("local", name, value);
+    }
+    else if (strcasecmp(name, "policy") == 0)
+    {
+      if (control -> ProxyMode == proxy_server)
+      {
+        PrintOptionIgnored("local", name, value);
+      }
+      else
+      {
+        usePolicy = ValidateArg("local", name, value);
+      }
+    }
+    else if (strcasecmp(name, "render") == 0)
+    {
+      if (control -> ProxyMode == proxy_server)
+      {
+        PrintOptionIgnored("local", name, value);
+      }
+      else
+      {
+        useRender = ValidateArg("local", name, value);
+      }
+    }
+    else if (strcasecmp(name, "taint") == 0)
+    {
+      if (control -> ProxyMode == proxy_server)
+      {
+        PrintOptionIgnored("local", name, value);
+      }
+      else
+      {
+        useTaint = ValidateArg("local", name, value);
+      }
+    }
+    else if (strcasecmp(name, "delta") == 0)
+    {
+      if (control -> ProxyMode == proxy_server)
+      {
+        PrintOptionIgnored("local", name, value);
+      }
+      else
+      {
+        control -> LocalDeltaCompression = ValidateArg("local", name, value);
+      }
+    }
+    else if (strcasecmp(name, "data") == 0)
+    {
+      control -> LocalDataCompressionLevel = ValidateArg("local", name, value);
+
+      if (control -> LocalDataCompressionLevel == 0)
+      {
+        control -> LocalDataCompression = 0;
+      }
+      else
+      {
+        control -> LocalDataCompression = 1;
+      }
+    }
+    else if (strcasecmp(name, "stream") == 0)
+    {
+      control -> LocalStreamCompressionLevel = ValidateArg("local", name, value);
+
+      if (control -> LocalStreamCompressionLevel == 0)
+      {
+        control -> LocalStreamCompression = 0;
+      }
+      else
+      {
+        control -> LocalStreamCompression = 1;
+      }
+    }
+    else if (strcasecmp(name, "memory") == 0)
+    {
+      control -> LocalMemoryLevel = ValidateArg("local", name, value);
+    }
+    else if (strcasecmp(name, "cache") == 0)
+    {
+      if (control -> ProxyMode == proxy_server)
+      {
+        PrintOptionIgnored("local", name, value);
+      }
+      else if (ParseCacheOption(value) < 0)
+      {
+        #ifdef PANIC
+        *logofs << "Loop: PANIC! Can't identify cache size for string '"
+                << value << "'.\n" << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Can't identify cache size for string '"
+             << value << "'.\n";
+
+        return -1;
+      }
+    }
+    else if (strcasecmp(name, "images") == 0)
+    {
+      if (control -> ProxyMode == proxy_server)
+      {
+        PrintOptionIgnored("local", name, value);
+      }
+      else if (ParseImagesOption(value) < 0)
+      {
+        #ifdef PANIC
+        *logofs << "Loop: PANIC! Can't identify images cache size for string '"
+                << value << "'.\n" << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Can't identify images cache size for string '"
+             << value << "'.\n";
+
+        return -1;
+      }
+    }
+    else if (strcasecmp(name, "shseg") == 0)
+    {
+      //
+      // The 'shmem' option is used by the agent, together
+      // with 'shpix' literal. We make the 'shseg' option
+      // specific to the proxy and use it to determine the
+      // size of the shared memory segment, or otherwise 0,
+      // if the use of the shared memory extension should
+      // not be enabled on the real X server.
+      //
+ 
+      if (control -> ProxyMode == proxy_server)
+      {
+        PrintOptionIgnored("local", name, value);
+      }
+      else if (ParseShmemOption(value) < 0)
+      {
+        #ifdef PANIC
+        *logofs << "Loop: PANIC! Can't identify size of shared memory "
+                << "segment in string '" << value << "'.\n"
+                << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Can't identify size of shared memory "
+             << "segment in string '" << value << "'.\n";
+
+        return -1;
+      }
+    }
+    else if (strcasecmp(name, "load") == 0)
+    {
+      if (control -> ProxyMode == proxy_server)
+      {
+        PrintOptionIgnored("local", name, value);
+      }
+      else
+      {
+        control -> PersistentCacheEnableLoad = ValidateArg("local", name, value);
+
+        if (control -> PersistentCacheEnableLoad > 0)
+        {
+          control -> PersistentCacheEnableLoad = 1;
+        }
+        else
+        {
+          if (control -> PersistentCacheName != NULL)
+          {
+            delete [] control -> PersistentCacheName;
+          }
+
+          control -> PersistentCacheName = NULL;
+
+          control -> PersistentCacheEnableLoad = 0;
+        }
+      }
+    }
+    else if (strcasecmp(name, "save") == 0)
+    {
+      if (control -> ProxyMode == proxy_server)
+      {
+        PrintOptionIgnored("local", name, value);
+      }
+      else
+      {
+        control -> PersistentCacheEnableSave = ValidateArg("local", name, value);
+
+        if (control -> PersistentCacheEnableSave > 0)
+        {
+          control -> PersistentCacheEnableSave = 1;
+        }
+        else
+        {
+          if (control -> PersistentCacheName != NULL)
+          {
+            delete [] control -> PersistentCacheName;
+          }
+
+          control -> PersistentCacheName = NULL;
+
+          control -> PersistentCacheEnableSave = 0;
+        }
+      }
+    }
+    else if (strcasecmp(name, "cups") == 0)
+    {
+      SetAndValidateChannelEndPointArg("local", name, value, cupsPort);
+    }
+    else if (strcasecmp(name, "sync") == 0)
+    {
+      #ifdef WARNING
+      *logofs << "Loop: WARNING! No 'sync' channel in current version. "
+              << "Assuming 'cups' channel.\n" << logofs_flush;
+      #endif
+
+      cerr << "Warning" << ": No 'sync' channel in current version. "
+           << "Assuming 'cups' channel.\n";
+
+      SetAndValidateChannelEndPointArg("local", name, value, cupsPort);
+    }
+    else if (strcasecmp(name, "keybd") == 0 ||
+                 strcasecmp(name, "aux") == 0)
+    {
+      SetAndValidateChannelEndPointArg("local", name, value, auxPort);
+    }
+    else if (strcasecmp(name, "samba") == 0 ||
+                 strcasecmp(name, "smb") == 0)
+    {
+      SetAndValidateChannelEndPointArg("local", name, value, smbPort);
+    }
+    else if (strcasecmp(name, "media") == 0)
+    {
+      SetAndValidateChannelEndPointArg("local", name, value, mediaPort);
+    }
+    else if (strcasecmp(name, "http") == 0)
+    {
+      SetAndValidateChannelEndPointArg("local", name, value, httpPort);
+    }
+    else if (strcasecmp(name, "font") == 0)
+    {
+      strncpy(fontPort, value, DEFAULT_STRING_LENGTH - 1);
+    }
+    else if (strcasecmp(name, "slave") == 0)
+    {
+      SetAndValidateChannelEndPointArg("local", name, value, slavePort);
+    }
+    else if (strcasecmp(name, "mask") == 0)
+    {
+      control -> ChannelMask = ValidateArg("local", name, value);
+    }
+    else if (strcasecmp(name, "timeout") == 0)
+    {
+      int timeout = ValidateArg("local", name, value);
+
+      if (timeout == 0)
+      {
+        #ifdef TEST
+        *logofs << "Loop: Disabling timeout on broken "
+                << "proxy connection.\n" << logofs_flush;
+        #endif
+
+        control -> ProxyTimeout = 0;
+      }
+      else
+      {
+        control -> ProxyTimeout = timeout * 1000;
+      }
+    }
+    else if (strcasecmp(name, "cleanup") == 0)
+    {
+      int cleanup = ValidateArg("local", name, value);
+
+      if (cleanup == 0)
+      {
+        #ifdef TEST
+        *logofs << "Loop: Disabling grace timeout on "
+                << "proxy shutdown.\n" << logofs_flush;
+        #endif
+
+        control -> CleanupTimeout = 0;
+      }
+      else
+      {
+        control -> CleanupTimeout = cleanup * 1000;
+      }
+    }
+    else if (strcasecmp(name, "pack") == 0)
+    {
+      if (control -> ProxyMode == proxy_server)
+      {
+        PrintOptionIgnored("local", name, value);
+      }
+      else if (ParsePackOption(value) < 0)
+      {
+        #ifdef PANIC
+        *logofs << "Loop: PANIC! Can't identify pack method for string '"
+                << value << "'.\n" << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Can't identify pack method for string '"
+             << value << "'.\n";
+        if (ParsePackOption("nopack")<0)
+           return -1;
+      }
+    }
+    else if (strcasecmp(name, "core") == 0)
+    {
+      control -> EnableCoreDumpOnAbort = ValidateArg("local", name, value);
+    }
+    else if (strcasecmp(name, "kill") == 0)
+    {
+      if (control -> KillDaemonOnShutdownNumber <
+              control -> KillDaemonOnShutdownLimit)
+      {
+        #ifdef TEST
+        *logofs << "Loop: WARNING! Adding process with pid '"
+                << ValidateArg("local", name, value) << " to the "
+                << "daemons to kill at shutdown.\n"
+                << logofs_flush;
+        #endif
+
+        control -> KillDaemonOnShutdown[control ->
+                       KillDaemonOnShutdownNumber] =
+                           ValidateArg("local", name, value);
+
+        control -> KillDaemonOnShutdownNumber++;
+      }
+      else
+      {
+        #ifdef WARNING
+        *logofs << "Loop: WARNING! Number of daemons to kill "
+                << "at shutdown exceeded.\n" << logofs_flush;
+        #endif
+
+        cerr << "Warning" << ": Number of daemons to kill "
+             << "at shutdown exceeded.\n";
+      }
+    }
+    else if (strcasecmp(name, "strict") == 0)
+    {
+      if (control -> ProxyMode == proxy_server)
+      {
+        PrintOptionIgnored("local", name, value);
+      }
+      else
+      {
+        useStrict = ValidateArg("local", name, value);
+      }
+    }
+    else if (strcasecmp(name, "encryption") == 0)
+    {
+      useEncryption = ValidateArg("local", name, value);
+    }
+    else if (strcasecmp(name, "product") == 0)
+    {
+      strncpy(productName, value, DEFAULT_STRING_LENGTH - 1);
+    }
+    else if (strcasecmp(name, "rootless") == 0 ||
+                 strcasecmp(name, "geometry") == 0 ||
+                     strcasecmp(name, "resize") == 0 ||
+                         strcasecmp(name, "fullscreen") == 0 ||
+                             strcasecmp(name, "keyboard") == 0 ||
+                                 strcasecmp(name, "clipboard") == 0 ||
+                                     strcasecmp(name, "streaming") == 0 ||
+                                         strcasecmp(name, "backingstore") == 0 ||
+                                             strcasecmp(name, "sleep") == 0 ||
+                                                 strcasecmp(name, "tolerancechecks") == 0)
+    {
+      #ifdef DEBUG
+      *logofs << "Loop: Ignoring agent option '" << name
+              << "' with value '" << value << "'.\n"
+              << logofs_flush;
+      #endif
+    }
+    else if (strcasecmp(name, "composite") == 0 ||
+                 strcasecmp(name, "shmem") == 0 ||
+                     strcasecmp(name, "shpix") == 0 ||
+                         strcasecmp(name, "kbtype") == 0 ||
+                             strcasecmp(name, "client") == 0 ||
+                                 strcasecmp(name, "shadow") == 0 ||
+                                     strcasecmp(name, "shadowuid") == 0 ||
+                                         strcasecmp(name, "shadowmode") == 0 ||
+                                             strcasecmp(name, "clients") == 0 ||
+                                                 strcasecmp(name, "xinerama") == 0)
+    {
+      #ifdef DEBUG
+      *logofs << "Loop: Ignoring agent option '" << name
+              << "' with value '" << value << "'.\n"
+              << logofs_flush;
+      #endif
+    }
+    else if (strcasecmp(name, "defer") == 0 ||
+                 strcasecmp(name, "tile") == 0 ||
+                     strcasecmp(name, "menu") == 0 ||
+                        strcasecmp(name, "state") == 0 )
+    {
+      #ifdef DEBUG
+      *logofs << "Loop: Ignoring agent option '" << name
+              << "' with value '" << value << "'.\n"
+              << logofs_flush;
+      #endif
+    }
+    else
+    {
+      #ifdef WARNING
+      *logofs << "Loop: WARNING! Ignoring unknown option '"
+              << name << "' with value '" << value << "'.\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Warning" << ": Ignoring unknown option '"
+           << name << "' with value '" << value << "'.\n";
+    }
+
+    name = strtok(NULL, "=");
+
+  } // End of while (name) ...
+
+  // Assemble the connectSocket channel end point if parameter values have been old-school...
+  if (connectSocket.disabled() && (connectHost[0] != '\0') && (proxyPort > 0 || connectPort > 0))
+  {
+    if (connectPort < 0)
+      connectPort = proxyPort + DEFAULT_NX_PROXY_PORT_OFFSET;
+
+    char tcpHostAndPort[DEFAULT_STRING_LENGTH] = { 0 };
+    sprintf(tcpHostAndPort, "tcp:%s:%ld", connectHost, connectPort);
+    SetAndValidateChannelEndPointArg("local", name, tcpHostAndPort, connectSocket);
+  }
+
+  #ifdef TEST
+  *logofs << "Loop: Completed parsing of string '"
+          << env << "'.\n" << logofs_flush;
+  #endif
+
+  if ((*fileOptions != '\0') && (strncmp(fileOptions, "/dev/", 5) != 0) && (strncmp(fileOptions, "/proc/", 6) != 0) && (strncmp(fileOptions, "/sys/", 5) != 0))
+  {
+    if (strcmp(fileOptions, optionsFileName) != 0)
+    {
+      #ifdef TEST
+      *logofs << "Loop: Reading options from '" << fileOptions
+              << "'.\n" << logofs_flush;
+      #endif
+
+      if (ParseFileOptions(fileOptions) < 0)
+      {
+        return -1;
+      }
+    }
+    #ifdef WARNING
+    else
+    {
+      *logofs << "Loop: WARNING! Name of the options file "
+              << "specified multiple times. Not parsing "
+              << "again.\n" << logofs_flush;
+    }
+    #endif
+
+    if (*optionsFileName == '\0')
+    {
+      strncpy(optionsFileName, value, DEFAULT_STRING_LENGTH - 1);
+
+      #ifdef TEST
+      *logofs << "Loop: Assuming name of options file '"
+              << optionsFileName << "'.\n"
+              << logofs_flush;
+      #endif
+    }
+  }
+
+  //
+  // If port where proxy is acting as an X server
+  // was not specified assume the same port where
+  // proxy is listening for the remote peer.
+  //
+
+  if (xPort == DEFAULT_NX_X_PORT)
+  {
+    xPort = proxyPort;
+  }
+
+  return 1;
+}
+
+//
+// Parse the command line options passed by user when
+// running proxy in stand alone mode. Note that passing
+// parameters this way is strongly discouraged. These
+// command line switch can change (and they do often).
+// Please, use the form "option=value" instead and set
+// the DISPLAY environment variable.
+//
+
+int ParseCommandLineOptions(int argc, const char **argv)
+{
+  //
+  // Be sure log file is valid.
+  //
+
+  if (logofs == NULL)
+  {
+    logofs = &cerr;
+  }
+
+  if (setjmp(context) == 1)
+  {
+    #ifdef TEST
+    *logofs << "Loop: Out of the long jump while parsing "
+            << "the command line options.\n"
+            << logofs_flush;
+    #endif
+    
+    return -1;
+  }
+
+  //
+  // Be sure we have a parameters repository
+  //
+
+  if (control == NULL)
+  {
+    control = new Control();
+  }
+
+  if (parsedCommand == 1)
+  {
+    #ifdef TEST
+    *logofs << "Loop: Skipping a further parse of command line options.\n"
+            << logofs_flush;
+    #endif
+
+    return 1;
+  }
+
+  #ifdef TEST
+  *logofs << "Loop: Going to parse the command line options.\n"
+          << logofs_flush;
+  #endif
+
+  parsedCommand = 1;
+
+  //
+  // Print out arguments.
+  //
+
+  #ifdef TEST
+
+  *logofs << "Loop: Argc is " << argc << ".\n" << logofs_flush;
+
+  for (int argi = 0; argi < argc; argi++)
+  {
+    *logofs << "Loop: Argv[" << argi << "] is " << argv[argi]
+            << ".\n" << logofs_flush;
+  }
+
+  #endif
+
+  //
+  // Shall use getopt here.
+  //
+
+  for (int argi = 1; argi < argc; argi++)
+  {
+    const char *nextArg = argv[argi];
+
+    if (*nextArg == '-')
+    {
+      switch (*(nextArg + 1))
+      {
+        case 'h':
+        {
+          PrintUsageInfo(nextArg, 0);
+
+          return -1;
+        }
+        case 'C':
+        {
+          //
+          // Start proxy in CLIENT mode.
+          //
+
+          if (WE_SET_PROXY_MODE == 0)
+          {
+            #ifdef TEST
+            *logofs << "Loop: Setting local proxy mode to proxy_client.\n"
+                    << logofs_flush;
+            #endif
+
+            control -> ProxyMode = proxy_client;
+          }
+          else if (control -> ProxyMode != proxy_client)
+          {
+            #ifdef PANIC
+            *logofs << "Loop: PANIC! Can't redefine local proxy to "
+                    << "client mode.\n" << logofs_flush;
+            #endif
+
+            cerr << "Error" << ": Can't redefine local proxy to "
+                 << "client mode.\n";
+
+            return -1;
+          }
+
+          break;
+        }
+        case 'S':
+        {
+          //
+          // Start proxy in SERVER mode.
+          //
+
+          if (WE_SET_PROXY_MODE == 0)
+          {
+            #ifdef TEST
+            *logofs << "Loop: Setting local proxy mode to proxy_server.\n"
+                    << logofs_flush;
+            #endif
+
+            control -> ProxyMode = proxy_server;
+          }
+          else if (control -> ProxyMode != proxy_server)
+          {
+            #ifdef PANIC
+            *logofs << "Loop: PANIC! Can't redefine local proxy to "
+                    << "server mode.\n" << logofs_flush;
+            #endif
+
+            cerr << "Error" << ": Can't redefine local proxy to "
+                 << "server mode.\n";
+
+            return -1;
+          }
+
+          break;
+        }
+        case 'v':
+        {
+          PrintVersionInfo();
+
+          return -1;
+        }
+        default:
+        {
+          PrintUsageInfo(nextArg, 1);
+
+          //
+          // Function GetArg() is not used anymore.
+          // Add a dummy call to avoid the warning.
+          //
+
+          if (0)
+          {
+            GetArg(argi, argc, argv);
+          }
+
+          return -1;
+        }
+      }
+    }
+    else
+    {
+      if (nextArg)
+      {
+        //
+        // Try to parse the option as a remote host:port
+        // specification as in 'localhost:8'. Such a
+        // parameter can be specified at the end of the
+        // command line at the connecting side.
+        //
+
+        char cHost[DEFAULT_STRING_LENGTH] = { '\0' };
+        long cPort = 0;
+
+        if (ParseHostOption(nextArg, cHost, cPort) > 0)
+          {
+            //
+            // Assume port is at a proxied display offset.
+            //
+
+            proxyPort = cPort;
+
+            cPort += DEFAULT_NX_PROXY_PORT_OFFSET;
+            connectSocket.setSpec(cHost, cPort);
+
+          }
+        else if (ParseEnvironmentOptions(nextArg, 1) < 0)
+        {
+          return -1;
+        }
+      }
+    }
+  }
+
+  return 1;
+}
+
+//
+// Set the variable to the values of host and
+// port where this proxy is going to hook to
+// an existing proxy.
+//
+
+int ParseBindOptions(char **host, int *port)
+{
+  if (*bindHost != '\0')
+  {
+    *host = bindHost;
+    *port = bindPort;
+
+    return 1;
+  }
+  else
+  {
+    return 0;
+  }
+}
+
+//
+// Read options from file and merge with environment.
+//
+
+int ParseFileOptions(const char *file)
+{
+  char *fileName;
+
+  if (*file != '/' && *file != '.')
+  {
+    char *filePath = GetSessionPath();
+
+    if (filePath == NULL)
+    {
+      cerr << "Error" << ": Cannot determine directory for NX option file.\n";
+
+      HandleCleanup();
+    }
+
+    fileName = new char[strlen(filePath) + strlen("/") +
+                            strlen(file) + 1];
+
+    strcpy(fileName, filePath);
+
+    strcat(fileName, "/");
+    strcat(fileName, file);
+
+    delete [] filePath;
+  }
+  else
+  {
+    fileName = new char[strlen(file) + 1];
+
+    strcpy(fileName, file);
+  }
+
+  #ifdef TEST
+  *logofs << "Loop: Going to read options from file '"
+          << fileName << "'.\n" << logofs_flush;
+  #endif
+
+  FILE *filePtr = fopen(fileName, "r");
+
+  if (filePtr == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Can't open options file '" << fileName
+            << "'. Error is " << EGET() << " '" << ESTR() << "'.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Can't open options file '" << fileName
+         << "'. Error is " << EGET() << " '" << ESTR() << "'.\n";
+
+    delete [] fileName;
+
+    return -1;
+  }
+
+  char options[DEFAULT_DISPLAY_OPTIONS_LENGTH];
+
+  #ifdef VALGRIND
+
+  memset(options, '\0', DEFAULT_DISPLAY_OPTIONS_LENGTH);
+
+  #endif
+
+  if (fgets(options, DEFAULT_DISPLAY_OPTIONS_LENGTH, filePtr) == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Can't read options from file '" << fileName
+            << "'. Error is " << EGET() << " '" << ESTR() << "'.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Can't read options from file '" << fileName
+         << "'. Error is " << EGET() << " '" << ESTR() << "'.\n";
+
+    fclose(filePtr);
+
+    delete [] fileName;
+
+    return -1;
+  }
+
+  fclose(filePtr);
+
+  //
+  // Purge the newline and the other non-
+  // printable characters in the string.
+  //
+
+  char *next = options;
+  
+  while (*next != '\0')
+  {
+    if (isprint(*next) == 0)
+    {
+      *next = '\0';
+    }
+
+    next++;
+  }
+
+  #ifdef TEST
+  *logofs << "Loop: Read options '" << options << "' from file '"
+          << fileName << "'.\n" << logofs_flush;
+  #endif
+
+  if (ParseEnvironmentOptions(options, 1) < 0)
+  {
+    delete [] fileName;
+
+    return -1;
+  }
+
+  delete [] fileName;
+
+  return 1;
+}
+
+//
+// Parse the option string passed from the
+// remote proxy at startup.
+//
+
+int ParseRemoteOptions(char *opts)
+{
+  #ifdef TEST
+  *logofs << "Loop: Going to parse the remote options "
+          << "string '" << opts << "'.\n"
+          << logofs_flush;
+  #endif
+
+  char *name;
+  char *value;
+
+  //
+  // The options string is intended to be a series
+  // of name/value tuples in the form name=value
+  // separated by the ',' character.
+  //
+
+  int hasCookie = 0;
+  int hasLink   = 0;
+  int hasPack   = 0;
+  int hasCache  = 0;
+  int hasImages = 0;
+  int hasDelta  = 0;
+  int hasStream = 0;
+  int hasData   = 0;
+  int hasType   = 0;
+
+  //
+  // Get rid of the terminating space.
+  //
+
+  if (*(opts + strlen(opts) - 1) == ' ')
+  {
+    *(opts + strlen(opts) - 1) = '\0';
+  }
+
+  name = strtok(opts, "=");
+
+  while (name)
+  {
+    value = strtok(NULL, ",");
+
+    if (CheckArg("remote", name, value) < 0)
+    {
+      return -1;
+    }
+
+    if (strcasecmp(name, "cookie") == 0)
+    {
+      if (WE_PROVIDE_CREDENTIALS)
+      {
+        #ifdef WARNING
+        *logofs << "Loop: WARNING! Ignoring remote option 'cookie' "
+                << "with value '" << value << "' when initiating "
+                << "connection.\n" << logofs_flush;
+        #endif
+
+        cerr << "Warning" << ": Ignoring remote option 'cookie' "
+             << "with value '" << value << "' when initiating "
+             << "connection.\n";
+      }
+      else if (strncasecmp(authCookie, value, strlen(authCookie)) != 0)
+      {
+        #ifdef PANIC
+        *logofs << "Loop: PANIC! Authentication cookie '" << value
+                << "' doesn't match '" << authCookie << "'.\n"
+                << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Authentication cookie '" << value
+             << "' doesn't match '" << authCookie << "'.\n";
+
+        return -1;
+      }
+
+      hasCookie = 1;
+    }
+    else if (strcasecmp(name, "link") == 0)
+    {
+      if (control -> ProxyMode == proxy_client)
+      {
+        PrintOptionIgnored("remote", name, value);
+      }
+      else
+      {
+        if (*linkSpeedName != '\0' && strcasecmp(linkSpeedName, value) != 0)
+        {
+          #ifdef WARNING
+          *logofs << "Loop: WARNING! Overriding option 'link' "
+                  << "with new value '" << value << "'.\n"
+                  << logofs_flush;
+          #endif
+
+          cerr << "Warning" << ": Overriding option 'link' "
+               << "with new value '" << value << "'.\n";
+        }
+
+        if (ParseLinkOption(value) < 0)
+        {
+          #ifdef PANIC
+          *logofs << "Loop: PANIC! Can't identify remote 'link' "
+                  << "option in string '" << value << "'.\n"
+                  << logofs_flush;
+          #endif
+
+          cerr << "Error" << ": Can't identify remote 'link' "
+               << "option in string '" << value << "'.\n";
+
+          return -1;
+        }
+      }
+
+      hasLink = 1;
+    }
+    else if (strcasecmp(name, "pack") == 0)
+    {
+      if (control -> ProxyMode == proxy_client)
+      {
+        PrintOptionIgnored("remote", name, value);
+      }
+      else
+      {
+        if (*packMethodName != '\0' && strcasecmp(packMethodName, value) != 0)
+        {
+          #ifdef WARNING
+          *logofs << "Loop: WARNING! Overriding option 'pack' "
+                  << "with remote value '" << value << "'.\n"
+                  << logofs_flush;
+          #endif
+
+          cerr << "Warning" << ": Overriding option 'pack' "
+               << "with remote value '" << value << "'.\n";
+        }
+
+        if (ParsePackOption(value) < 0)
+        {
+          #ifdef PANIC
+          *logofs << "Loop: PANIC! Invalid pack option '"
+                  << value << "' requested by remote.\n"
+                  << logofs_flush;
+          #endif
+
+          cerr << "Error" << ": Invalid pack option '"
+               << value << "' requested by remote.\n";
+
+          return -1;
+        }
+      }
+
+      hasPack = 1;
+    }
+    else if (strcasecmp(name, "cache") == 0)
+    {
+      if (control -> ProxyMode == proxy_client)
+      {
+        PrintOptionIgnored("remote", name, value);
+      }
+      else
+      {
+        //
+        // Cache size is sent as a hint of how much memory
+        // the remote proxy is going to consume. A very low
+        // powered thin client could choose to refuse the
+        // connection.
+        //
+
+        if (ParseCacheOption(value) < 0)
+        {
+          #ifdef PANIC
+          *logofs << "Loop: PANIC! Can't identify remote 'cache' "
+                  << "option in string '" << value << "'.\n"
+                  << logofs_flush;
+          #endif
+
+          cerr << "Error" << ": Can't identify remote 'cache' "
+               << "option in string '" << value << "'.\n";
+
+          return -1;
+        }
+      }
+
+      hasCache = 1;
+    }
+    else if (strcasecmp(name, "images") == 0)
+    {
+      if (control -> ProxyMode == proxy_client)
+      {
+        PrintOptionIgnored("remote", name, value);
+      }
+      else
+      {
+        //
+        // Images cache size is sent as a hint.
+        // There is no obbligation for the local
+        // proxy to use the persistent cache.
+        //
+
+        if (ParseImagesOption(value) < 0)
+        {
+          #ifdef PANIC
+          *logofs << "Loop: PANIC! Can't identify remote 'images' "
+                  << "option in string '" << value << "'.\n"
+                  << logofs_flush;
+          #endif
+
+          cerr << "Error" << ": Can't identify remote 'images' "
+               << "option in string '" << value << "'.\n";
+
+          return -1;
+        }
+      }
+
+      hasImages = 1;
+    }
+    else if (strcasecmp(name, "limit") == 0)
+    {
+      if (control -> ProxyMode == proxy_client)
+      {
+        PrintOptionIgnored("remote", name, value);
+      }
+      else
+      {
+        if (*bitrateLimitName != '\0' &&
+                strcasecmp(bitrateLimitName, value) != 0)
+        {
+          #ifdef WARNING
+          *logofs << "Loop: WARNING! Overriding option 'limit' "
+                  << "with new value '" << value << "'.\n"
+                  << logofs_flush;
+          #endif
+
+          cerr << "Warning" << ": Overriding option 'limit' "
+               << "with new value '" << value << "'.\n";
+        }
+
+        if (ParseBitrateOption(value) < 0)
+        {
+          #ifdef PANIC
+          *logofs << "Loop: PANIC! Can't identify 'limit' "
+                  << "option in string '" << value << "'.\n"
+                  << logofs_flush;
+          #endif
+
+          cerr << "Error" << ": Can't identify 'limit' "
+               << "option in string '" << value << "'.\n";
+
+          return -1;
+        }
+      }
+
+    }
+    else if (strcasecmp(name, "render") == 0)
+    {
+      if (control -> ProxyMode == proxy_client)
+      {
+        PrintOptionIgnored("remote", name, value);
+      }
+      else
+      {
+        useRender = ValidateArg("remote", name, value);
+      }
+
+    }
+    else if (strcasecmp(name, "taint") == 0)
+    {
+      if (control -> ProxyMode == proxy_client)
+      {
+        PrintOptionIgnored("remote", name, value);
+      }
+      else
+      {
+        useTaint = ValidateArg("remote", name, value);
+      }
+
+    }
+    else if (strcasecmp(name, "type") == 0)
+    {
+      if (control -> ProxyMode == proxy_client)
+      {
+        PrintOptionIgnored("remote", name, value);
+      }
+      else
+      {
+        if (strcasecmp(value, "default") == 0)
+        {
+          *sessionType = '\0';
+        }
+        else
+        {
+          strncpy(sessionType, value, DEFAULT_STRING_LENGTH - 1);
+        }
+      }
+
+      hasType = 1;
+    }
+    else if (strcasecmp(name, "strict") == 0)
+    {
+      if (control -> ProxyMode == proxy_client)
+      {
+        PrintOptionIgnored("remote", name, value);
+      }
+      else
+      {
+        useStrict = ValidateArg("remote", name, value);
+      }
+
+    }
+    else if (strcasecmp(name, "shseg") == 0)
+    {
+      if (control -> ProxyMode == proxy_client)
+      {
+        PrintOptionIgnored("remote", name, value);
+      }
+      else if (ParseShmemOption(value) < 0)
+      {
+        #ifdef PANIC
+        *logofs << "Loop: PANIC! Can't identify size of shared memory "
+                << "segment in string '" << value << "'.\n"
+               << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Can't identify size of shared memory "
+             << "segment in string '" << value << "'.\n";
+
+        return -1;
+      }
+
+    }
+    else if (strcasecmp(name, "delta") == 0)
+    {
+      if (control -> ProxyMode == proxy_client)
+      {
+        PrintOptionIgnored("remote", name, value);
+      }
+      else
+      {
+        control -> RemoteDeltaCompression = ValidateArg("remote", name, value);
+
+        //
+        // Follow for delta compression the
+        // same settings as the client proxy.
+        //
+
+        control -> LocalDeltaCompression  = control -> RemoteDeltaCompression;
+      }
+
+      hasDelta = 1;
+    }
+    else if (strcasecmp(name, "stream") == 0)
+    {
+      //
+      // If remote side didn't choose its own
+      // stream compression level then assume
+      // local settings.
+      //
+
+      if (strcasecmp(value, "default") == 0)
+      {
+        //
+        // This applies only at client side.
+        //
+
+        control -> RemoteStreamCompression =
+            control -> LocalStreamCompression;
+
+        control -> RemoteStreamCompressionLevel =
+            control -> LocalStreamCompressionLevel;
+      }
+      else
+      {
+        control -> RemoteStreamCompressionLevel = ValidateArg("remote", name, value);
+
+        if (control -> RemoteStreamCompressionLevel > 0)
+        {
+          control -> RemoteStreamCompression = 1;
+        }
+        else
+        {
+          control -> RemoteStreamCompression = 0;
+        }
+
+        if (control -> LocalStreamCompressionLevel < 0)
+        {
+          control -> LocalStreamCompressionLevel = ValidateArg("remote", name, value);
+
+          if (control -> LocalStreamCompressionLevel > 0)
+          {
+            control -> LocalStreamCompression = 1;
+          }
+          else
+          {
+            control -> LocalStreamCompression = 0;
+          }
+        }
+      }
+
+      hasStream = 1;
+    }
+    else if (strcasecmp(name, "data") == 0)
+    {
+      //
+      // Apply the same to data compression level.
+      //
+
+      if (strcasecmp(value, "default") == 0)
+      {
+        control -> RemoteDataCompression =
+            control -> LocalDataCompression;
+
+        control -> RemoteDataCompressionLevel =
+            control -> LocalDataCompressionLevel;
+      }
+      else
+      {
+        control -> RemoteDataCompressionLevel = ValidateArg("remote", name, value);
+
+        if (control -> RemoteDataCompressionLevel > 0)
+        {
+          control -> RemoteDataCompression = 1;
+        }
+        else
+        {
+          control -> RemoteDataCompression = 0;
+        }
+
+        if (control -> LocalDataCompressionLevel < 0)
+        {
+          control -> LocalDataCompressionLevel = ValidateArg("remote", name, value);
+
+          if (control -> LocalDataCompressionLevel > 0)
+          {
+            control -> LocalDataCompression = 1;
+          }
+          else
+          {
+            control -> LocalDataCompression = 0;
+          }
+        }
+      }
+
+      hasData = 1;
+    }
+    else if (strcasecmp(name, "flush") == 0)
+    {
+      //
+      // This option has no effect in recent
+      // versions.
+      //
+
+      #ifdef DEBUG
+      *logofs << "Loop: Ignoring obsolete remote option '"
+              << name << "' with value '" << value
+              << "'.\n" << logofs_flush;
+      #endif
+    }
+    else
+    {
+      #ifdef WARNING
+      *logofs << "Loop: WARNING! Ignoring unknown remote option '"
+              << name << "' with value '" << value << "'.\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Warning" << ": Ignoring unknown remote option '"
+           << name << "' with value '" << value << "'.\n";
+    }
+
+    name = strtok(NULL, "=");
+
+  } // End of while (name) ...
+
+  //
+  // If we are client side, we need remote 'stream'
+  // and 'data' options. If we are server, we need
+  // all the above plus 'link' and some others.
+  //
+
+  char missing[DEFAULT_STRING_LENGTH];
+
+  *missing = '\0';
+
+  if (control -> ProxyMode == proxy_client)
+  {
+    if (hasStream == 0)
+    {
+      strcpy(missing, "stream");
+    }
+    else if (hasData == 0)
+    {
+      strcpy(missing, "data");
+    }
+  }
+  else
+  {
+    //
+    // Don't complain if the optional 'flush',
+    // 'render' and 'taint' options are not
+    // provided.
+    //
+
+    if (hasLink == 0)
+    {
+      strcpy(missing, "link");
+    }
+    else if (hasCache == 0)
+    {
+      strcpy(missing, "cache");
+    }
+    else if (hasPack == 0)
+    {
+      strcpy(missing, "pack");
+    }
+    else if (hasDelta == 0)
+    {
+      strcpy(missing, "delta");
+    }
+    else if (hasStream == 0)
+    {
+      strcpy(missing, "stream");
+    }
+    else if (hasData == 0)
+    {
+      strcpy(missing, "data");
+    }
+    else if (hasType == 0)
+    {
+      strcpy(missing, "type");
+    }
+    else if (hasImages == 0)
+    {
+      strcpy(missing, "images");
+    }
+  }
+
+  if (WE_PROVIDE_CREDENTIALS == 0)
+  {
+    //
+    // Can be that user doesn't have requested to
+    // check the authorization cookie provided by
+    // the connecting peer.
+    //
+
+    if (hasCookie == 0 && *authCookie != '\0')
+    {
+      strcpy(missing, "cookie");
+    }
+  }
+
+  if (*missing != '\0')
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! The remote peer didn't specify the option '"
+            << missing << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": The remote peer didn't specify the option '"
+         << missing << "'.\n";
+
+    return -1;
+  }
+
+  return 1;
+}
+
+//
+// Parse the cookie provided by the NX proxy
+// connection forwarder.
+//
+
+int ParseForwarderOptions(char *opts)
+{
+  #ifdef TEST
+  *logofs << "Loop: Going to parse the forwarder options "
+          << "string '" << opts << "'.\n"
+          << logofs_flush;
+  #endif
+
+  char *name;
+  char *value;
+
+  int hasCookie = 0;
+
+  //
+  // Get rid of the terminating space.
+  //
+
+  if (*(opts + strlen(opts) - 1) == ' ')
+  {
+    *(opts + strlen(opts) - 1) = '\0';
+  }
+
+  name = strtok(opts, "=");
+
+  while (name)
+  {
+    value = strtok(NULL, ",");
+
+    if (CheckArg("forwarder", name, value) < 0)
+    {
+      return -1;
+    }
+
+    if (strcasecmp(name, "cookie") == 0)
+    {
+      if (strncasecmp(authCookie, value, strlen(authCookie)) != 0)
+      {
+        #ifdef PANIC
+        *logofs << "Loop: PANIC! The NX forwarder cookie '" << value
+                << "' doesn't match '" << authCookie << "'.\n"
+                << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": The NX forwarder cookie '" << value
+             << "' doesn't match '" << authCookie << "'.\n";
+
+        return -1;
+      }
+
+      hasCookie = 1;
+    }
+    else
+    {
+      #ifdef WARNING
+      *logofs << "Loop: WARNING! Ignoring unknown forwarder option '"
+              << name << "' with value '" << value << "'.\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Warning" << ": Ignoring unknown forwarder option '"
+           << name << "' with value '" << value << "'.\n";
+    }
+
+    name = strtok(NULL, "=");
+
+  } // End of while (name) ...
+
+  if (hasCookie == 0)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! The NX forwarder didn't provide "
+            << "the authentication cookie.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": The NX forwarder didn't provide "
+         << "the authentication cookie.\n";
+
+    return -1;
+  }
+
+  return 1;
+}
+
+int SetCore()
+{
+  #ifdef COREDUMPS
+
+  rlimit rlim;
+
+  if (getrlimit(RLIMIT_CORE, &rlim))
+  {
+    #ifdef TEST
+    *logofs << "Loop: Cannot read RLIMIT_CORE. Error is '"
+            << ESTR() << "'.\n" << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  if (rlim.rlim_cur < rlim.rlim_max)
+  {
+    rlim.rlim_cur = rlim.rlim_max;
+
+    if (setrlimit(RLIMIT_CORE, &rlim))
+    {
+      #ifdef TEST
+      *logofs << "Loop: Cannot set RLIMIT_CORE. Error is '"
+              << ESTR() << "'.\n" << logofs_flush;
+      #endif
+
+      return -2;
+    }
+  }
+
+  #ifdef TEST
+  *logofs << "Loop: RLIMIT_CORE is "<< rlim.rlim_max
+          << ".\n" << logofs_flush;
+  #endif
+
+  #endif // #ifdef COREDUMPS
+
+  return 1;
+}
+
+char *GetLastCache(char *listBuffer, const char *searchPath)
+{
+  if (listBuffer == NULL || searchPath == NULL ||
+          strncmp(listBuffer, "cachelist=", strlen("cachelist=")) != 0)
+  {
+    #ifdef TEST
+    *logofs << "Loop: Invalid parameters '" << listBuffer << "' and '"
+            << (searchPath != NULL ? searchPath : "")
+            << "'. Can't select any cache.\n" << logofs_flush;
+    #endif
+
+    return NULL;
+  }
+
+  char *selectedName = new char[MD5_LENGTH * 2 + 3];
+
+  *selectedName = '\0';
+
+  const char *localPrefix;
+  const char *remotePrefix;
+
+  if (control -> ProxyMode == proxy_client)
+  {
+    localPrefix  = "C-";
+    remotePrefix = "S-";
+  }
+  else
+  {
+    localPrefix  = "S-";
+    remotePrefix = "C-";
+  }
+
+  //
+  // Get rid of prefix.
+  //
+
+  listBuffer += strlen("cachelist=");
+
+  char *fileName;
+
+  fileName = strtok(listBuffer, ",");
+
+  //
+  // It is "/path/to/file" + "/" + "C-" + 32 + "\0".
+  //
+
+  char fullPath[strlen(searchPath) + MD5_LENGTH * 2 + 4];
+
+  time_t selectedTime = 0;
+
+  struct stat fileStat;
+
+  while (fileName)
+  {
+    if (strncmp(fileName, "none", strlen("none")) == 0)
+    {
+      #ifdef TEST
+      *logofs << "Loop: No cache files seem to be available.\n"
+              << logofs_flush;
+      #endif
+
+      delete [] selectedName;
+
+      return NULL;
+    }
+    else if (strlen(fileName) != MD5_LENGTH * 2 + 2 ||
+                 strncmp(fileName, remotePrefix, 2) != 0)
+    {
+      #ifdef PANIC
+      *logofs << "Loop: PANIC! Bad cache file name '"
+               << fileName << "'.\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Bad cache file name '"
+           << fileName << "'.\n";
+
+      delete [] selectedName;
+
+      HandleCleanup();
+    }
+
+    #ifdef TEST
+    *logofs << "Loop: Parsing remote cache name '"
+            << fileName << "'.\n" << logofs_flush;
+    #endif
+
+    //
+    // Prefix, received as "S-", becomes
+    // "C-" and viceversa.
+    //
+
+    *fileName = *localPrefix;
+
+    strcpy(fullPath, searchPath);
+    strcat(fullPath, "/");
+    strcat(fullPath, fileName);
+
+    if (stat(fullPath, &fileStat) == 0)
+    {
+      #ifdef TEST
+      *logofs << "Loop: Found a matching cache '"
+              << fullPath << "'.\n" << logofs_flush;
+      #endif
+
+      if (fileStat.st_mtime >= selectedTime)
+      {
+        strcpy(selectedName, fileName);
+
+        selectedTime = fileStat.st_mtime;
+      }
+    }
+    #ifdef TEST
+    else
+    {
+      *logofs << "Loop: Can't get stats of file '"
+              << fullPath << "'.\n" << logofs_flush;
+    }
+    #endif
+
+    fileName = strtok(NULL, ",");
+  }
+
+  if (*selectedName != '\0')
+  {
+    return selectedName;
+  }
+  else
+  {
+    delete [] selectedName;
+
+    return NULL;
+  }
+}
+
+char *GetTempPath()
+{
+  if (*tempDir == '\0')
+  {
+    //
+    // Check the NX_TEMP environment, first,
+    // then the TEMP variable.
+    //
+
+    const char *tempEnv = getenv("NX_TEMP");
+
+    if (tempEnv == NULL || *tempEnv == '\0')
+    {
+      #ifdef TEST
+      *logofs << "Loop: WARNING! No environment for NX_TEMP.\n"
+              << logofs_flush;
+      #endif
+
+      tempEnv = getenv("TEMP");
+
+      if (tempEnv == NULL || *tempEnv == '\0')
+      {
+        #ifdef TEST
+        *logofs << "Loop: WARNING! No environment for TEMP.\n"
+                << logofs_flush;
+        #endif
+
+        tempEnv = "/tmp";
+      }
+    }
+
+    if (strlen(tempEnv) > DEFAULT_STRING_LENGTH - 1)
+    {
+      #ifdef PANIC
+      *logofs << "Loop: PANIC! Invalid value for the NX "
+              << "temporary directory '" << tempEnv
+              << "'.\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Invalid value for the NX "
+           << "temporary directory '" << tempEnv
+           << "'.\n";
+
+      HandleCleanup();
+    }
+
+    strcpy(tempDir, tempEnv);
+
+    #ifdef TEST
+    *logofs << "Loop: Assuming temporary NX directory '"
+            << tempDir << "'.\n" << logofs_flush;
+    #endif
+  }
+
+  char *tempPath = new char[strlen(tempDir) + 1];
+
+  if (tempPath == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Can't allocate memory "
+            << "for the temp path.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Can't allocate memory "
+         << "for the temp path.\n";
+
+    HandleCleanup();
+  }
+
+  strcpy(tempPath, tempDir);
+
+  return tempPath;
+}
+
+char *GetClientPath()
+{
+  if (*clientDir == '\0')
+  {
+    //
+    // Check the NX_CLIENT environment.
+    //
+
+    const char *clientEnv = getenv("NX_CLIENT");
+
+    if (clientEnv == NULL || *clientEnv == '\0')
+    {
+      #ifdef TEST
+      *logofs << "Loop: WARNING! No environment for NX_CLIENT.\n"
+              << logofs_flush;
+      #endif
+
+      //
+      // Try to guess the location of the client.
+      //
+
+      clientEnv = "/usr/NX/bin/nxclient";
+
+      #ifdef __APPLE__
+
+      clientEnv = "/Applications/NX Client for OSX.app/Contents/MacOS/nxclient";
+
+      #endif
+
+      #ifdef __CYGWIN32__
+
+      clientEnv = "C:\\Program Files\\NX Client for Windows\\nxclient";
+
+      #endif
+    }
+
+    if (strlen(clientEnv) > DEFAULT_STRING_LENGTH - 1)
+    {
+      #ifdef PANIC
+      *logofs << "Loop: PANIC! Invalid value for the NX "
+              << "client directory '" << clientEnv
+              << "'.\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Invalid value for the NX "
+           << "client directory '" << clientEnv
+           << "'.\n";
+
+      HandleCleanup();
+    }
+
+    strcpy(clientDir, clientEnv);
+
+    #ifdef TEST
+    *logofs << "Loop: Assuming NX client location '"
+            << clientDir << "'.\n" << logofs_flush;
+    #endif
+  }
+
+  char *clientPath = new char[strlen(clientDir) + 1];
+
+  if (clientPath == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Can't allocate memory "
+            << "for the client path.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Can't allocate memory "
+         << "for the client path.\n";
+
+    HandleCleanup();
+  }
+
+  strcpy(clientPath, clientDir);
+
+  return clientPath;
+}
+
+char *GetSystemPath()
+{
+  if (*systemDir == '\0')
+  {
+    //
+    // Check the NX_SYSTEM environment.
+    //
+
+    const char *systemEnv = getenv("NX_SYSTEM");
+
+    if (systemEnv == NULL || *systemEnv == '\0')
+    {
+      #ifdef TEST
+      *logofs << "Loop: WARNING! No environment for NX_SYSTEM.\n"
+              << logofs_flush;
+      #endif
+
+      systemEnv = "/usr/NX";
+    }
+
+    if (strlen(systemEnv) > DEFAULT_STRING_LENGTH - 1)
+    {
+      #ifdef PANIC
+      *logofs << "Loop: PANIC! Invalid value for the NX "
+              << "system directory '" << systemEnv
+              << "'.\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Invalid value for the NX "
+           << "system directory '" << systemEnv
+           << "'.\n";
+
+      HandleCleanup();
+    }
+
+    strcpy(systemDir, systemEnv);
+
+    #ifdef TEST
+    *logofs << "Loop: Assuming system NX directory '"
+            << systemDir << "'.\n" << logofs_flush;
+    #endif
+  }
+
+  char *systemPath = new char[strlen(systemDir) + 1];
+
+  if (systemPath == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Can't allocate memory "
+            << "for the system path.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Can't allocate memory "
+         << "for the system path.\n";
+
+    HandleCleanup();
+  }
+
+  strcpy(systemPath, systemDir);
+
+  return systemPath;
+}
+
+char *GetHomePath()
+{
+  if (*homeDir == '\0')
+  {
+    //
+    // Check the NX_HOME environment.
+    //
+
+    const char *homeEnv = getenv("NX_HOME");
+
+    if (homeEnv == NULL || *homeEnv == '\0')
+    {
+      #ifdef TEST
+      *logofs << "Loop: WARNING! No environment for NX_HOME.\n"
+              << logofs_flush;
+      #endif
+
+      homeEnv = getenv("HOME");
+
+      if (homeEnv == NULL || *homeEnv == '\0')
+      {
+        #ifdef PANIC
+        *logofs << "Loop: PANIC! No environment for HOME.\n"
+                << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": No environment for HOME.\n";
+
+        HandleCleanup();
+      }
+    }
+
+    if (strlen(homeEnv) > DEFAULT_STRING_LENGTH - 1)
+    {
+      #ifdef PANIC
+      *logofs << "Loop: PANIC! Invalid value for the NX "
+              << "home directory '" << homeEnv
+              << "'.\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Invalid value for the NX "
+           << "home directory '" << homeEnv
+           << "'.\n";
+
+      HandleCleanup();
+    }
+
+    strcpy(homeDir, homeEnv);
+
+    #ifdef TEST
+    *logofs << "Loop: Assuming NX user's home directory '"
+            << homeDir << "'.\n" << logofs_flush;
+    #endif
+  }
+
+  char *homePath = new char[strlen(homeDir) + 1];
+
+  if (homePath == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Can't allocate memory "
+            << "for the home path.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Can't allocate memory "
+         << "for the home path.\n";
+
+    HandleCleanup();
+  }
+
+  strcpy(homePath, homeDir);
+
+  return homePath;
+}
+
+char *GetRootPath()
+{
+  if (*rootDir == '\0')
+  {
+    //
+    // Check the NX_ROOT environment.
+    //
+
+    const char *rootEnv = getenv("NX_ROOT");
+
+    if (rootEnv == NULL || *rootEnv == '\0')
+    {
+      #ifdef TEST
+      *logofs << "Loop: WARNING! No environment for NX_ROOT.\n"
+              << logofs_flush;
+      #endif
+
+      //
+      // We will determine the root NX directory
+      // based on the NX_HOME or HOME directory
+      // settings.
+      //
+
+      const char *homeEnv = GetHomePath();
+
+      if (strlen(homeEnv) > DEFAULT_STRING_LENGTH -
+              strlen("/.nx") - 1)
+      {
+        #ifdef PANIC
+        *logofs << "Loop: PANIC! Invalid value for the NX "
+                << "home directory '" << homeEnv
+                << "'.\n" << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Invalid value for the NX "
+             << "home directory '" << homeEnv
+             << "'.\n";
+
+        HandleCleanup();
+      }
+
+      #ifdef TEST
+      *logofs << "Loop: Assuming NX root directory in "
+              << "the user's home '" << homeEnv
+              << "'.\n" << logofs_flush;
+      #endif
+
+      strcpy(rootDir, homeEnv);
+      strcat(rootDir, "/.nx");
+
+      delete [] homeEnv;
+
+      //
+      // Create the NX root directory.
+      //
+
+      struct stat dirStat;
+
+      if ((stat(rootDir, &dirStat) == -1) && (EGET() == ENOENT))
+      {
+        if (mkdir(rootDir, 0700) < 0 && (EGET() != EEXIST))
+        {
+          #ifdef PANIC
+          *logofs << "Loop: PANIC! Can't create directory '"
+                  << rootDir << ". Error is " << EGET() << " '"
+                  << ESTR() << "'.\n" << logofs_flush;
+          #endif
+
+          cerr << "Error" << ": Can't create directory '"
+               << rootDir << ". Error is " << EGET() << " '"
+               << ESTR() << "'.\n";
+
+          HandleCleanup();
+        }
+      }
+    }
+    else
+    {
+      if (strlen(rootEnv) > DEFAULT_STRING_LENGTH - 1)
+      {
+        #ifdef PANIC
+        *logofs << "Loop: PANIC! Invalid value for the NX "
+                << "root directory '" << rootEnv
+                << "'.\n" << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Invalid value for the NX "
+             << "root directory '" << rootEnv
+             << "'.\n";
+
+        HandleCleanup();
+      }
+
+      strcpy(rootDir, rootEnv);
+    }
+        
+    #ifdef TEST
+    *logofs << "Loop: Assuming NX root directory '"
+            << rootDir << "'.\n" << logofs_flush;
+    #endif
+  }
+
+  char *rootPath = new char[strlen(rootDir) + 1];
+
+  if (rootPath == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Can't allocate memory "
+            << "for the root path.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Can't allocate memory "
+         << "for the root path.\n";
+
+    HandleCleanup();
+  }
+
+  strcpy(rootPath, rootDir);
+
+  return rootPath;
+}
+
+char *GetCachePath()
+{
+  char *rootPath = GetRootPath();
+
+  char *cachePath;
+
+  if (*sessionType != '\0')
+  {
+    cachePath = new char[strlen(rootPath) + strlen("/cache-") +
+                             strlen(sessionType) + 1];
+  }
+  else
+  {
+    cachePath = new char[strlen(rootPath) + strlen("/cache") + 1];
+  }
+
+  strcpy(cachePath, rootPath);
+
+  if (*sessionType != '\0')
+  {
+    strcat(cachePath, "/cache-");
+
+    strcat(cachePath, sessionType);
+  }
+  else
+  {
+    strcat(cachePath, "/cache");
+  }
+
+  //
+  // Create the cache directory if needed.
+  //
+
+  struct stat dirStat;
+
+  if ((stat(cachePath, &dirStat) == -1) && (EGET() == ENOENT))
+  {
+    if (mkdir(cachePath, 0700) < 0 && (EGET() != EEXIST))
+    {
+      #ifdef PANIC
+      *logofs << "Loop: PANIC! Can't create directory '" << cachePath
+              << ". Error is " << EGET() << " '" << ESTR() << "'.\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Can't create directory '" << cachePath
+           << ". Error is " << EGET() << " '" << ESTR() << "'.\n";
+
+      delete [] rootPath;
+      delete [] cachePath;
+
+      return NULL;
+    }
+  }
+
+  delete [] rootPath;
+
+  return cachePath;
+}
+
+char *GetImagesPath()
+{
+  char *rootPath = GetRootPath();
+
+  char *imagesPath = new char[strlen(rootPath) + strlen("/images") + 1];
+
+  strcpy(imagesPath, rootPath);
+
+  strcat(imagesPath, "/images");
+
+  //
+  // Create the cache directory if needed.
+  //
+
+  struct stat dirStat;
+
+  if ((stat(imagesPath, &dirStat) == -1) && (EGET() == ENOENT))
+  {
+    if (mkdir(imagesPath, 0700) < 0 && (EGET() != EEXIST))
+    {
+      #ifdef PANIC
+      *logofs << "Loop: PANIC! Can't create directory '" << imagesPath
+              << ". Error is " << EGET() << " '" << ESTR() << "'.\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Can't create directory '" << imagesPath
+           << ". Error is " << EGET() << " '" << ESTR() << "'.\n";
+
+      delete [] rootPath;
+      delete [] imagesPath;
+
+      return NULL;
+    }
+  }
+
+  //
+  // Create 16 directories in the path to
+  // hold the images whose name begins with
+  // the corresponding hexadecimal digit.
+  //
+
+  char *digitPath = new char[strlen(imagesPath) + 5];
+
+  strcpy(digitPath, imagesPath);
+
+  //
+  // Image paths have format "[path][/I-c][\0]",
+  // where c is the first digit of the checksum.
+  //
+
+  for (char digit = 0; digit < 16; digit++)
+  {
+    sprintf(digitPath + strlen(imagesPath), "/I-%01X", digit);
+
+    if ((stat(digitPath, &dirStat) == -1) && (EGET() == ENOENT))
+    {
+      if (mkdir(digitPath, 0700) < 0 && (EGET() != EEXIST))
+      {
+        #ifdef PANIC
+        *logofs << "Loop: PANIC! Can't create directory '" << digitPath
+                << ". Error is " << EGET() << " '" << ESTR() << "'.\n"
+                << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Can't create directory '" << digitPath
+             << ". Error is " << EGET() << " '" << ESTR() << "'.\n";
+
+        delete [] rootPath;
+        delete [] imagesPath;
+        delete [] digitPath;
+
+        return NULL;
+      }
+    }
+  }
+
+  delete [] rootPath;
+  delete [] digitPath;
+
+  return imagesPath;
+}
+
+char *GetSessionPath()
+{
+  if (*sessionDir == '\0')
+  {
+    char *rootPath = GetRootPath();
+
+    strcpy(sessionDir, rootPath);
+
+    if (control -> ProxyMode == proxy_client)
+    {
+      strcat(sessionDir, "/C-");
+    }
+    else
+    {
+      strcat(sessionDir, "/S-");
+    }
+
+    if (*sessionId == '\0')
+    {
+      char port[DEFAULT_STRING_LENGTH];
+
+      sprintf(port, "%d", proxyPort);
+
+      strcpy(sessionId, port);
+    }
+
+    strcat(sessionDir, sessionId);
+
+    struct stat dirStat;
+
+    if ((stat(sessionDir, &dirStat) == -1) && (EGET() == ENOENT))
+    {
+      if (mkdir(sessionDir, 0700) < 0 && (EGET() != EEXIST))
+      {
+        #ifdef PANIC
+        *logofs << "Loop: PANIC! Can't create directory '" << sessionDir
+                << ". Error is " << EGET() << " '" << ESTR() << "'.\n"
+                << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Can't create directory '" << sessionDir
+             << ". Error is " << EGET() << " '" << ESTR() << "'.\n";
+
+        delete [] rootPath;
+
+        return NULL;
+      }
+    }
+
+    #ifdef TEST
+    *logofs << "Loop: Root of NX session is '" << sessionDir
+            << "'.\n" << logofs_flush;
+    #endif
+
+    delete [] rootPath;
+  }
+
+  char *sessionPath = new char[strlen(sessionDir) + 1];
+
+  strcpy(sessionPath, sessionDir);
+
+  return sessionPath;
+}
+
+//
+// Identify requested link characteristics
+// and set control parameters accordingly.
+//
+
+int ParseLinkOption(const char *opt)
+{
+  //
+  // Normalize the user input.
+  //
+
+  if (strcasecmp(opt, "modem") == 0 ||
+          strcasecmp(opt, "33k") == 0 ||
+              strcasecmp(opt, "56k") == 0)
+  {
+    strcpy(linkSpeedName, "MODEM");
+  }
+  else if (strcasecmp(opt, "isdn")  == 0 ||
+               strcasecmp(opt, "64k")  == 0 ||
+                   strcasecmp(opt, "128k") == 0)
+  {
+    strcpy(linkSpeedName, "ISDN");
+  }
+  else if (strcasecmp(opt, "adsl") == 0 ||
+               strcasecmp(opt, "256k") == 0 ||
+                   strcasecmp(opt, "640k") == 0)
+  {
+    strcpy(linkSpeedName, "ADSL");
+  }
+  else if (strcasecmp(opt, "wan")  == 0 ||
+               strcasecmp(opt, "1m")  == 0 ||
+                   strcasecmp(opt, "2m")  == 0 ||
+                       strcasecmp(opt, "34m") == 0)
+  {
+    strcpy(linkSpeedName, "WAN");
+  }
+  else if (strcasecmp(opt, "lan")   == 0 ||
+               strcasecmp(opt, "10m")   == 0 ||
+                   strcasecmp(opt, "100m")  == 0 ||
+                       strcasecmp(opt, "local") == 0)
+  {
+    strcpy(linkSpeedName, "LAN");
+  }
+
+  if (strcasecmp(linkSpeedName, "modem") != 0 &&
+          strcasecmp(linkSpeedName, "isdn")  != 0 &&
+              strcasecmp(linkSpeedName, "adsl")  != 0 &&
+                  strcasecmp(linkSpeedName, "wan")   != 0 &&
+                      strcasecmp(linkSpeedName, "lan")   != 0)
+  {
+    return -1;
+  }
+
+  return 1;
+}
+
+int ParsePackOption(const char *opt)
+{
+  #ifdef DEBUG
+  *logofs << "Loop: Pack method is " << packMethod
+          << " quality is " << packQuality << ".\n"
+          << logofs_flush;
+  #endif
+
+  #ifdef DEBUG
+  *logofs << "Loop: Parsing pack method '" << opt
+          << "'.\n" << logofs_flush;
+  #endif
+
+  if (strcasecmp(opt, "0") == 0 ||
+          strcasecmp(opt, "none") == 0 ||
+              strcasecmp(opt, "nopack") == 0 ||
+                  strcasecmp(opt, "no-pack") == 0)
+  {
+    packMethod = PACK_NONE;
+  }
+  else if (strcasecmp(opt, "8") == 0)
+  {
+    packMethod = PACK_MASKED_8_COLORS;
+  }
+  else if (strcasecmp(opt, "64") == 0)
+  {
+    packMethod = PACK_MASKED_64_COLORS;
+  }
+  else if (strcasecmp(opt, "256") == 0)
+  {
+    packMethod = PACK_MASKED_256_COLORS;
+  }
+  else if (strcasecmp(opt, "512") == 0)
+  {
+    packMethod = PACK_MASKED_512_COLORS;
+  }
+  else if (strcasecmp(opt, "4k") == 0)
+  {
+    packMethod = PACK_MASKED_4K_COLORS;
+  }
+  else if (strcasecmp(opt, "32k") == 0)
+  {
+    packMethod = PACK_MASKED_32K_COLORS;
+  }
+  else if (strcasecmp(opt, "64k") == 0)
+  {
+    packMethod = PACK_MASKED_64K_COLORS;
+  }
+  else if (strcasecmp(opt, "256k") == 0)
+  {
+    packMethod = PACK_MASKED_256K_COLORS;
+  }
+  else if (strcasecmp(opt, "2m") == 0)
+  {
+    packMethod = PACK_MASKED_2M_COLORS;
+  }
+  else if (strcasecmp(opt, "16m") == 0)
+  {
+    packMethod = PACK_MASKED_16M_COLORS;
+  }
+  else if (strncasecmp(opt, "8-jpeg", strlen("8-jpeg")) == 0)
+  {
+    packMethod = PACK_JPEG_8_COLORS;
+  }
+  else if (strncasecmp(opt, "64-jpeg", strlen("64-jpeg")) == 0)
+  {
+    packMethod = PACK_JPEG_64_COLORS;
+  }
+  else if (strncasecmp(opt, "256-jpeg", strlen("256-jpeg")) == 0)
+  {
+    packMethod = PACK_JPEG_256_COLORS;
+  }
+  else if (strncasecmp(opt, "512-jpeg", strlen("512-jpeg")) == 0)
+  {
+    packMethod = PACK_JPEG_512_COLORS;
+  }
+  else if (strncasecmp(opt, "4k-jpeg", strlen("4k-jpeg")) == 0)
+  {
+    packMethod = PACK_JPEG_4K_COLORS;
+  }
+  else if (strncasecmp(opt, "32k-jpeg", strlen("32k-jpeg")) == 0)
+  {
+    packMethod = PACK_JPEG_32K_COLORS;
+  }
+  else if (strncasecmp(opt, "64k-jpeg", strlen("64k-jpeg")) == 0)
+  {
+    packMethod = PACK_JPEG_64K_COLORS;
+  }
+  else if (strncasecmp(opt, "256k-jpeg", strlen("256k-jpeg")) == 0)
+  {
+    packMethod = PACK_JPEG_256K_COLORS;
+  }
+  else if (strncasecmp(opt, "2m-jpeg", strlen("2m-jpeg")) == 0)
+  {
+    packMethod = PACK_JPEG_2M_COLORS;
+  }
+  else if (strncasecmp(opt, "16m-jpeg", strlen("16m-jpeg")) == 0)
+  {
+    packMethod = PACK_JPEG_16M_COLORS;
+  }
+  else if (strncasecmp(opt, "8-png", strlen("8-png")) == 0)
+  {
+    packMethod = PACK_PNG_8_COLORS;
+  }
+  else if (strncasecmp(opt, "64-png", strlen("64-png")) == 0)
+  {
+    packMethod = PACK_PNG_64_COLORS;
+  }
+  else if (strncasecmp(opt, "256-png", strlen("256-png")) == 0)
+  {
+    packMethod = PACK_PNG_256_COLORS;
+  }
+  else if (strncasecmp(opt, "512-png", strlen("512-png")) == 0)
+  {
+    packMethod = PACK_PNG_512_COLORS;
+  }
+  else if (strncasecmp(opt, "4k-png", strlen("4k-png")) == 0)
+  {
+    packMethod = PACK_PNG_4K_COLORS;
+  }
+  else if (strncasecmp(opt, "32k-png", strlen("32k-png")) == 0)
+  {
+    packMethod = PACK_PNG_32K_COLORS;
+  }
+  else if (strncasecmp(opt, "64k-png", strlen("64k-png")) == 0)
+  {
+    packMethod = PACK_PNG_64K_COLORS;
+  }
+  else if (strncasecmp(opt, "256k-png", strlen("256k-png")) == 0)
+  {
+    packMethod = PACK_PNG_256K_COLORS;
+  }
+  else if (strncasecmp(opt, "2m-png", strlen("2m-png")) == 0)
+  {
+    packMethod = PACK_PNG_2M_COLORS;
+  }
+  else if (strncasecmp(opt, "16m-png", strlen("16m-png")) == 0)
+  {
+    packMethod = PACK_PNG_16M_COLORS;
+  }
+  else if (strncasecmp(opt, "16m-rgb", strlen("16m-rgb")) == 0 ||
+               strncasecmp(opt, "rgb", strlen("rgb")) == 0)
+  {
+    packMethod = PACK_RGB_16M_COLORS;
+  }
+  else if (strncasecmp(opt, "16m-rle", strlen("16m-rle")) == 0 ||
+               strncasecmp(opt, "rle", strlen("rle")) == 0)
+  {
+    packMethod = PACK_RLE_16M_COLORS;
+  }
+  else if (strncasecmp(opt, "16m-bitmap", strlen("16m-bitmap")) == 0 ||
+               strncasecmp(opt, "bitmap", strlen("bitmap")) == 0)
+  {
+    packMethod = PACK_BITMAP_16M_COLORS;
+  }
+  else if (strncasecmp(opt, "lossy", strlen("lossy")) == 0)
+  {
+    packMethod = PACK_LOSSY;
+  }
+  else if (strncasecmp(opt, "lossless", strlen("lossless")) == 0)
+  {
+    packMethod = PACK_LOSSLESS;
+  }
+  else if (strncasecmp(opt, "adaptive", strlen("adaptive")) == 0)
+  {
+    packMethod = PACK_ADAPTIVE;
+  }
+  else
+  {
+    return -1;
+  }
+
+  if (packMethod == PACK_NONE)
+  {
+    strcpy(packMethodName, "none");
+  }
+  else
+  {
+    strcpy(packMethodName, opt);
+  }
+
+  if (packMethod == PACK_RGB_16M_COLORS ||
+          packMethod == PACK_RLE_16M_COLORS ||
+              packMethod == PACK_BITMAP_16M_COLORS ||
+                  (packMethod >= PACK_JPEG_8_COLORS &&
+                      packMethod <= PACK_JPEG_16M_COLORS) ||
+                          (packMethod >= PACK_PNG_8_COLORS &&
+                              packMethod <= PACK_PNG_16M_COLORS) ||
+                                  packMethod == PACK_LOSSY ||
+                                      packMethod == PACK_LOSSLESS ||
+                                          packMethod == PACK_ADAPTIVE)
+  {
+    const char *dash = strrchr(opt, '-');
+
+    if (dash != NULL && strlen(dash) == 2 &&
+            *(dash + 1) >= '0' && *(dash + 1) <= '9')
+    {
+      packQuality = atoi(dash + 1);
+
+      #ifdef DEBUG
+      *logofs << "Loop: Using pack quality '"
+              << packQuality << "'.\n" << logofs_flush;
+      #endif
+    }
+  }
+  else
+  {
+    packQuality = 0;
+  }
+
+  return 1;
+}
+
+int ParsePackMethod(const int method, const int quality)
+{
+  switch (method)
+  {
+    case PACK_NONE:
+    {
+      strcpy(packMethodName, "none");
+
+      break;
+    }
+    case PACK_MASKED_8_COLORS:
+    {
+      strcpy(packMethodName, "8");
+
+      break;
+    }
+    case PACK_MASKED_64_COLORS:
+    {
+      strcpy(packMethodName, "64");
+
+      break;
+    }
+    case PACK_MASKED_256_COLORS:
+    {
+      strcpy(packMethodName, "256");
+
+      break;
+    }
+    case PACK_MASKED_512_COLORS:
+    {
+      strcpy(packMethodName, "512");
+
+      break;
+    }
+    case PACK_MASKED_4K_COLORS:
+    {
+      strcpy(packMethodName, "4k");
+
+      break;
+    }
+    case PACK_MASKED_32K_COLORS:
+    {
+      strcpy(packMethodName, "32k");
+
+      break;
+    }
+    case PACK_MASKED_64K_COLORS:
+    {
+      strcpy(packMethodName, "64k");
+
+      break;
+    }
+    case PACK_MASKED_256K_COLORS:
+    {
+      strcpy(packMethodName, "256k");
+
+      break;
+    }
+    case PACK_MASKED_2M_COLORS:
+    {
+      strcpy(packMethodName, "2m");
+
+      break;
+    }
+    case PACK_MASKED_16M_COLORS:
+    {
+      strcpy(packMethodName, "16m");
+
+      break;
+    }
+    case PACK_JPEG_8_COLORS:
+    {
+      strcpy(packMethodName, "8-jpeg");
+
+      break;
+    }
+    case PACK_JPEG_64_COLORS:
+    {
+      strcpy(packMethodName, "64-jpeg");
+
+      break;
+    }
+    case PACK_JPEG_256_COLORS:
+    {
+      strcpy(packMethodName, "256-jpeg");
+
+      break;
+    }
+    case PACK_JPEG_512_COLORS:
+    {
+      strcpy(packMethodName, "512-jpeg");
+
+      break;
+    }
+    case PACK_JPEG_4K_COLORS:
+    {
+      strcpy(packMethodName, "4k-jpeg");
+
+      break;
+    }
+    case PACK_JPEG_32K_COLORS:
+    {
+      strcpy(packMethodName, "32k-jpeg");
+
+      break;
+    }
+    case PACK_JPEG_64K_COLORS:
+    {
+      strcpy(packMethodName, "64k-jpeg");
+
+      break;
+    }
+    case PACK_JPEG_256K_COLORS:
+    {
+      strcpy(packMethodName, "256k-jpeg");
+
+      break;
+    }
+    case PACK_JPEG_2M_COLORS:
+    {
+      strcpy(packMethodName, "2m-jpeg");
+
+      break;
+    }
+    case PACK_JPEG_16M_COLORS:
+    {
+      strcpy(packMethodName, "16m-jpeg");
+
+      break;
+    }
+    case PACK_PNG_8_COLORS:
+    {
+      strcpy(packMethodName, "8-png");
+
+      break;
+    }
+    case PACK_PNG_64_COLORS:
+    {
+      strcpy(packMethodName, "64-png");
+
+      break;
+    }
+    case PACK_PNG_256_COLORS:
+    {
+      strcpy(packMethodName, "256-png");
+
+      break;
+    }
+    case PACK_PNG_512_COLORS:
+    {
+      strcpy(packMethodName, "512-png");
+
+      break;
+    }
+    case PACK_PNG_4K_COLORS:
+    {
+      strcpy(packMethodName, "4k-png");
+
+      break;
+    }
+    case PACK_PNG_32K_COLORS:
+    {
+      strcpy(packMethodName, "32k-png");
+
+      break;
+    }
+    case PACK_PNG_64K_COLORS:
+    {
+      strcpy(packMethodName, "64k-png");
+
+      break;
+    }
+    case PACK_PNG_256K_COLORS:
+    {
+      strcpy(packMethodName, "256k-png");
+
+      break;
+    }
+    case PACK_PNG_2M_COLORS:
+    {
+      strcpy(packMethodName, "2m-png");
+
+      break;
+    }
+    case PACK_PNG_16M_COLORS:
+    {
+      strcpy(packMethodName, "16m-png");
+
+      break;
+    }
+    case PACK_RGB_16M_COLORS:
+    {
+      strcpy(packMethodName, "16m-rgb");
+
+      break;
+    }
+    case PACK_RLE_16M_COLORS:
+    {
+      strcpy(packMethodName, "16m-rle");
+
+      break;
+    }
+    case PACK_BITMAP_16M_COLORS:
+    {
+      strcpy(packMethodName, "16m-bitmap");
+
+      break;
+    }
+    case PACK_LOSSY:
+    {
+      strcpy(packMethodName, "lossy");
+
+      break;
+    }
+    case PACK_LOSSLESS:
+    {
+      strcpy(packMethodName, "lossless");
+
+      break;
+    }
+    case PACK_ADAPTIVE:
+    {
+      strcpy(packMethodName, "adaptive");
+
+      break;
+    }
+    default:
+    {
+      return -1;
+    }
+  }
+
+  if (quality < 0 || quality > 9)
+  {
+    return -1;
+  }
+
+  if (packMethod == PACK_RGB_16M_COLORS ||
+          packMethod == PACK_RLE_16M_COLORS ||
+              packMethod == PACK_BITMAP_16M_COLORS ||
+                  (packMethod >= PACK_JPEG_8_COLORS &&
+                      packMethod <= PACK_JPEG_16M_COLORS) ||
+                          (packMethod >= PACK_PNG_8_COLORS &&
+                              packMethod <= PACK_PNG_16M_COLORS) ||
+                                  packMethod == PACK_LOSSY ||
+                                      packMethod == PACK_LOSSLESS ||
+                                          packMethod == PACK_ADAPTIVE)
+  {
+    sprintf(packMethodName + strlen(packMethodName),
+                "-%d", quality);
+  }
+
+  packMethod  = method;
+  packQuality = quality;
+
+  control -> PackMethod  = packMethod;
+  control -> PackQuality = packQuality;
+
+  return 1;
+}
+
+int SetDirectories()
+{
+  //
+  // Determine the location of the user's NX
+  // directory and the other relevant paths.
+  // The functions below will check the pa-
+  // rameters passed to the program and will
+  // query the environment, if needed.
+  //
+
+  control -> HomePath   = GetHomePath();
+  control -> RootPath   = GetRootPath();
+  control -> SystemPath = GetSystemPath();
+  control -> TempPath   = GetTempPath();
+  control -> ClientPath = GetClientPath();
+
+  return 1;
+}
+
+int SetLogs()
+{
+  //
+  // So far we used stderr (or stdout under
+  // WIN32). Now use the files selected by
+  // the user.
+  //
+
+  if (*statsFileName == '\0')
+  {
+    strcpy(statsFileName, "stats");
+
+    #ifdef TEST
+    *logofs << "Loop: Assuming default statistics file '"
+            << statsFileName << "'.\n" << logofs_flush;
+    #endif
+  }
+  #ifdef TEST
+  else
+  {
+    *logofs << "Loop: Name selected for statistics is '"
+            << statsFileName << "'.\n" << logofs_flush;
+  }
+  #endif
+
+  if (OpenLogFile(statsFileName, statofs) < 0)
+  {
+    HandleCleanup();
+  }
+
+  #ifndef MIXED
+
+  if (*errorsFileName == '\0')
+  {
+    strcpy(errorsFileName, "errors");
+
+    #ifdef TEST
+    *logofs << "Loop: Assuming default log file name '"
+            << errorsFileName << "'.\n" << logofs_flush;
+    #endif
+  }
+  #ifdef TEST
+  else
+  {
+    *logofs << "Loop: Name selected for log file is '"
+            << errorsFileName << "'.\n" << logofs_flush;
+  }
+  #endif
+
+  //
+  // Share the bebug output with the nxssh binder
+  // process. The file must be made writable by
+  // everybody because the nxssh process is run by
+  // nxserver as the nx user.
+  //
+
+  #ifdef BINDER
+
+  strcpy(errorsFileName, "/tmp/errors");
+
+  ostream *tmpfs = new ofstream(errorsFileName, ios::out);
+
+  delete tmpfs;
+
+  chmod(errorsFileName, S_IRUSR | S_IWUSR | S_IRGRP |
+            S_IWGRP | S_IROTH | S_IWOTH);
+
+  #endif
+                
+  if (OpenLogFile(errorsFileName, logofs) < 0)
+  {
+    HandleCleanup();
+  }
+
+  //
+  // By default the session log is the standard error
+  // of the process. It is anyway required to set the
+  // option when running inside SSH, otherwise the
+  // output will go to the same file as the SSH log,
+  // depending where the NX client has redirected the
+  // output.
+  //
+
+  if (*sessionFileName != '\0')
+  {
+    #ifdef TEST
+    *logofs << "Loop: Name selected for session file is '"
+            << sessionFileName << "'.\n" << logofs_flush;
+    #endif
+
+    if (errofs != NULL)
+    {
+      #ifdef WARNING
+      *logofs << "Loop: WARNING! Unexpected value for stream errofs.\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Warning" << ": Unexpected value for stream errofs.\n";
+    }
+
+    if (errsbuf != NULL)
+    {
+      #ifdef WARNING
+      *logofs << "Loop: WARNING! Unexpected value for buffer errsbuf.\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Warning" << ": Unexpected value for buffer errsbuf.\n";
+    }
+
+    errofs  = NULL;
+    errsbuf = NULL;
+
+    if (OpenLogFile(sessionFileName, errofs) < 0)
+    {
+      HandleCleanup();
+    }
+
+    //
+    // Redirect the standard error to the file.
+    //
+
+    errsbuf = cerr.rdbuf(errofs -> rdbuf());
+  }
+
+  #endif
+
+  return 1;
+}
+
+int SetPorts()
+{
+  //
+  // Depending on the proxy side, we need to determine on which
+  // port to listen for the given protocol or to which port we
+  // will have to forward the connection. Three possibilities
+  // are given for each supported protocol:
+  //
+  // Port <= 0: Disable port forwarding.
+  // Port == 1: Use the default port.
+  // Port >  1: Use the specified port.
+  //
+  // At the connectiong side the user should always explicitly
+  // set the ports where the connections will be forwarded. This
+  // is both for security reasons and because, when running both
+  // proxies on the same host, there is a concrete possibility
+  // that, by using the default ports, the connection will be
+  // forwarded to the same port where the peer proxy is listen-
+  // ing, causing a loop.
+  //
+
+  useCupsSocket = 0;
+  if (cupsPort.enabled()) {
+    if (control -> ProxyMode == proxy_client) {
+      cupsPort.setDefaultTCPPort(DEFAULT_NX_CUPS_PORT_OFFSET + proxyPort);
+      useCupsSocket = 1;
+    }
+    else
+      cupsPort.setDefaultTCPPort(631);
+  }
+
+#ifdef TEST
+  *logofs << "Loop: cups port: " << cupsPort << "\n"
+            << logofs_flush;
+#endif
+
+  useAuxSocket = 0;
+  if (auxPort.enabled()) {
+    if (control -> ProxyMode == proxy_client) {
+      auxPort.setDefaultTCPPort(DEFAULT_NX_AUX_PORT_OFFSET + proxyPort);
+      useAuxSocket = 1;
+    }
+    else {
+      auxPort.setDefaultTCPPort(1);
+
+      if (auxPort.getTCPPort() != 1) {
+
+#ifdef WARNING
+        *logofs << "Loop: WARNING! Overriding auxiliary X11 "
+                << "port with new value '" << 1 << "'.\n"
+                << logofs_flush;
+#endif
+
+        cerr << "Warning" << ": Overriding auxiliary X11 "
+             << "port with new value '" << 1 << "'.\n";
+
+	auxPort.setSpec("1");
+      }
+    }
+  }
+
+#ifdef TEST
+  *logofs << "Loop: aux port: " << auxPort << "\n"
+	  << logofs_flush;
+#endif
+
+  useSmbSocket = 0;
+  if (smbPort.enabled()) {
+    if (control -> ProxyMode == proxy_client) {
+      auxPort.setDefaultTCPPort(DEFAULT_NX_SMB_PORT_OFFSET + proxyPort);
+      useAuxSocket = 1;
+    }
+    else
+      auxPort.setDefaultTCPPort(139);
+  }
+
+
+#ifdef TEST
+  *logofs << "Loop: smb port: " << smbPort << "\n"
+	  << logofs_flush;
+#endif
+
+  useMediaSocket = 0;
+  if (mediaPort.enabled()) {
+    if (control -> ProxyMode == proxy_client) {
+      mediaPort.setDefaultTCPPort(DEFAULT_NX_MEDIA_PORT_OFFSET + proxyPort);
+      useMediaSocket = 1;
+    }
+    else if (mediaPort.getTCPPort() == 1) {
+#ifdef PANIC
+      *logofs << "Loop: PANIC! No port specified for multimedia connections.\n"
+              << logofs_flush;
+#endif
+
+      cerr << "Error" << ": No port specified for multimedia connections.\n";
+
+      HandleCleanup();
+    }
+  }
+
+#ifdef TEST
+  *logofs << "Loop: Using multimedia port '" << mediaPort
+	  << "'.\n" << logofs_flush;
+#endif
+
+  useHttpSocket = 0;
+  if (httpPort.enabled()) {
+    if (control -> ProxyMode == proxy_client) {
+      httpPort.setDefaultTCPPort(DEFAULT_NX_HTTP_PORT_OFFSET + proxyPort);
+      useHttpSocket = 1;
+    }
+    else
+      httpPort.setDefaultTCPPort(80);
+  }
+
+#ifdef TEST
+  *logofs << "Loop: Using HTTP port '" << httpPort
+	  << "'.\n" << logofs_flush;
+#endif
+
+  if (ParseFontPath(fontPort) <= 0)
+  {
+    #ifdef TEST
+    *logofs << "Loop: Disabling font server connections.\n"
+            << logofs_flush;
+    #endif
+
+    *fontPort = '\0';
+
+    useFontSocket = 0;
+  }
+  else
+  {
+    //
+    // We don't know yet if the remote proxy supports
+    // the font server connections. If needed, we will
+    // disable the font server connections at later
+    // time.
+    //
+
+    if (control -> ProxyMode == proxy_server)
+    {
+      useFontSocket = 1;
+    }
+    else
+    {
+      useFontSocket = 0;
+    }
+
+    #ifdef TEST
+    *logofs << "Loop: Using font server port '" << fontPort
+            << "'.\n" << logofs_flush;
+    #endif
+  }
+
+  useSlaveSocket = 0;
+  if (slavePort.enabled()) {
+    useSlaveSocket = 1;
+    if (control -> ProxyMode == proxy_client)
+      slavePort.setDefaultTCPPort(DEFAULT_NX_SLAVE_PORT_CLIENT_OFFSET + proxyPort);
+    else
+      slavePort.setDefaultTCPPort(DEFAULT_NX_SLAVE_PORT_SERVER_OFFSET + proxyPort);
+  }
+
+#ifdef TEST
+  *logofs << "Loop: Using slave port '" << slavePort
+	  << "'.\n" << logofs_flush;
+#endif
+
+  return 1;
+}
+
+int SetDescriptors()
+{
+  unsigned int limit = 0;
+
+  #ifdef RLIMIT_NOFILE
+
+  rlimit limits;
+
+  if (getrlimit(RLIMIT_NOFILE, &limits) == 0)
+  {
+    if (limits.rlim_max == RLIM_INFINITY)
+    {
+      limit = 0;
+    }
+    else
+    {
+      limit = (unsigned int) limits.rlim_max;
+    }
+  }
+
+  #endif
+
+  #ifdef _SC_OPEN_MAX
+
+  if (limit == 0)
+  {
+    limit = sysconf(_SC_OPEN_MAX);
+  }
+
+  #endif
+
+  #ifdef FD_SETSIZE
+
+  if (limit > FD_SETSIZE)
+  {
+    limit = FD_SETSIZE;
+  }
+
+  #endif
+
+  #ifdef RLIMIT_NOFILE
+
+  if (limits.rlim_cur < limit)
+  {
+    limits.rlim_cur = limit;
+
+    setrlimit(RLIMIT_NOFILE, &limits);
+  }
+
+  #endif
+
+  if (limit == 0)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Cannot determine number of available "
+            << "file descriptors.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Cannot determine number of available "
+         << "file descriptors.\n";
+
+    return -1;
+  }
+
+  return 1;
+}
+
+//
+// Find the directory containing the caches
+// matching the session type.
+//
+
+int SetCaches()
+{
+  if ((control -> PersistentCachePath = GetCachePath()) == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Error getting or creating the cache path.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Error getting or creating the cache path.\n";
+
+    HandleCleanup();
+  }
+
+  #ifdef TEST
+  *logofs << "Loop: Path of cache files is '" << control -> PersistentCachePath
+          << "'.\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+//
+// Initialize all configuration parameters.
+//
+
+int SetParameters()
+{
+  //
+  // Find out the type of session.
+  //
+
+  SetSession();
+
+  //
+  // Initialize the network and compression
+  // parameters according to the settings
+  // suggested by the user.
+  //
+
+  SetLink();
+
+  //
+  // Set compression according to link speed.
+  //
+
+  SetCompression();
+
+  //
+  // Be sure that we have a literal for current
+  // cache size. Value will reflect control's
+  // default unless we already parsed a 'cache'
+  // option. Server side has no control on size
+  // of cache but is informed at session nego-
+  // tiation about how much memory is going to
+  // be used.
+  //
+
+  SetStorage();
+
+  //
+  // Set size of shared memory segments.
+  //
+
+  SetShmem();
+
+  //
+  // Make adjustments to cache based
+  // on the pack method.
+  //
+
+  SetPack();
+
+  //
+  // Set disk-based image cache.
+  //
+
+  SetImages();
+
+  //
+  // Set CPU and bandwidth limits.
+  //
+
+  SetLimits();
+
+  return 1;
+}
+
+//
+// According to session literal determine
+// the type of traffic that is going to be
+// transported. Literals should be better
+// standardized in future NX versions.
+//
+
+int SetSession()
+{
+  if (strncmp(sessionType, "agent", strlen("agent")) == 0 ||
+          strncmp(sessionType, "desktop", strlen("desktop")) == 0 ||
+              strncmp(sessionType, "rootless", strlen("rootless")) == 0 ||
+                  strncmp(sessionType, "console", strlen("console")) == 0 ||
+                      strncmp(sessionType, "default", strlen("default")) == 0 ||
+                          strncmp(sessionType, "gnome", strlen("gnome")) == 0 ||
+                              strncmp(sessionType, "kde", strlen("kde")) == 0 ||
+                                  strncmp(sessionType, "cde", strlen("cde")) == 0 ||
+                                      strncmp(sessionType, "xdm", strlen("xdm")) == 0)
+  {
+    control -> SessionMode = session_agent;
+  }
+  else if (strncmp(sessionType, "win", strlen("win")) == 0 ||
+               strncmp(sessionType, "vnc", strlen("vnc")) == 0)
+  {
+    control -> SessionMode = session_agent;
+  }
+  else if (strncmp(sessionType, "shadow", strlen("shadow")) == 0)
+  {
+    control -> SessionMode = session_shadow;
+  }
+  else if (strncmp(sessionType, "proxy", strlen("proxy")) == 0 ||
+               strncmp(sessionType, "application", strlen("application")) == 0 ||
+                   strncmp(sessionType, "raw", strlen("raw")) == 0)
+  {
+    control -> SessionMode = session_proxy;
+  }
+  else
+  {
+    //
+    // If the session type is not passed or
+    // it is not among the recognized strings,
+    // we assume that the proxy is connected
+    // to the agent.
+    //
+
+    //
+    // Since ProtoStep8 (#issue 108) and also
+    // with older "unix-" sessions
+    //
+
+    if (*sessionType != '\0')
+    {
+      #ifdef WARNING
+      *logofs << "Loop: WARNING! Unrecognized session type '"
+              << sessionType << "'. Assuming agent session.\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Warning" << ": Unrecognized session type '"
+           << sessionType << "'. Assuming agent session.\n";
+    }
+
+    control -> SessionMode = session_agent;
+  }
+
+  #if defined(TEST) || defined(INFO)
+  *logofs << "Loop: Assuming session type '"
+          << DumpSession(control -> SessionMode) << "' with "
+          << "string '" << sessionType << "'.\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // By default the policy is immediate. Agents
+  // will set a different policy, if they like.
+  // Anyway we need to check if the user has
+  // provided a custom flush policy.
+  //
+
+  if (usePolicy != -1)
+  {
+    if (usePolicy > 0)
+    {
+      control -> FlushPolicy = policy_deferred;
+    }
+    else
+    {
+      control -> FlushPolicy = policy_immediate;
+    }
+
+    #if defined(TEST) || defined(INFO)
+    *logofs << "Loop: WARNING! Forcing flush policy to '"
+            << DumpPolicy(control -> FlushPolicy)
+            << ".\n" << logofs_flush;
+    #endif
+  }
+  else
+  {
+    control -> FlushPolicy = policy_immediate;
+
+    #if defined(TEST) || defined(INFO)
+    *logofs << "Loop: Setting initial flush policy to '"
+            << DumpPolicy(control -> FlushPolicy)
+            << "'.\n" << logofs_flush;
+    #endif
+  }
+
+  //
+  // Check if the proxy library is run inside
+  // another program providing encryption, as
+  // it is the case of the SSH client.
+  //
+
+  if (useEncryption != -1)
+  {
+    if (useEncryption > 0)
+    {
+      control -> LinkEncrypted = 1;
+    }
+    else
+    {
+      control -> LinkEncrypted = 0;
+    }
+  }
+
+  if (control -> LinkEncrypted == 1)
+  {
+    #if defined(TEST) || defined(INFO)
+    *logofs << "Loop: Proxy running as part of an "
+            << "encrypting client.\n"
+            << logofs_flush;
+    #endif
+  }
+  else
+  {
+    #if defined(TEST) || defined(INFO)
+    *logofs << "Loop: Assuming proxy running as a "
+            << "standalone program.\n"
+            << logofs_flush;
+    #endif
+  }
+
+  //
+  // Check if the system administrator has
+  // enabled the respawn of the client at
+  // the end of session.
+  //
+
+  if (control -> ProxyMode == proxy_server)
+  {
+    struct stat fileStat;
+
+    char fileName[DEFAULT_STRING_LENGTH];
+
+    snprintf(fileName, DEFAULT_STRING_LENGTH - 1,
+                 "%s/share/noexit", control -> SystemPath);
+
+    *(fileName + DEFAULT_STRING_LENGTH - 1) = '\0';
+
+    if (stat(fileName, &fileStat) == 0)
+    {
+      #ifdef TEST
+      *logofs << "Loop: Enabling respawn of client at session shutdown.\n"
+              << logofs_flush;
+      #endif
+
+      control -> EnableRestartOnShutdown = 1;
+    }
+  }
+
+  return 1;
+}
+
+int SetStorage()
+{
+  //
+  // If differential compression is disabled
+  // we don't need a cache at all.
+  //
+
+  if (control -> LocalDeltaCompression == 0)
+  {
+    control -> ClientTotalStorageSize = 0;
+    control -> ServerTotalStorageSize = 0;
+  }
+
+  //
+  // Set a a cache size literal.
+  //
+
+  int size = control -> getUpperStorageSize();
+
+  if (size / 1024 > 0)
+  {
+    sprintf(cacheSizeName, "%dk", size / 1024);
+  }
+  else
+  { 
+    sprintf(cacheSizeName, "%d", size);
+  }
+
+  if (control -> ProxyMode == proxy_client)
+  {
+    control -> LocalTotalStorageSize =
+        control -> ClientTotalStorageSize;
+
+    control -> RemoteTotalStorageSize =
+        control -> ServerTotalStorageSize;
+  }
+  else
+  {
+    control -> LocalTotalStorageSize =
+        control -> ServerTotalStorageSize;
+
+    control -> RemoteTotalStorageSize =
+        control -> ClientTotalStorageSize;
+  }
+
+  #ifdef DEBUG
+  *logofs << "Loop: Storage size limit is "
+          << control -> ClientTotalStorageSize
+          << " at client and "
+          << control -> ServerTotalStorageSize
+          << " at server.\n"
+          << logofs_flush;
+  #endif
+
+  #ifdef DEBUG
+  *logofs << "Loop: Storage local limit set to "
+          << control -> LocalTotalStorageSize
+          << " remote limit set to "
+          << control -> RemoteTotalStorageSize
+          << ".\n" << logofs_flush;
+  #endif
+
+  //
+  // Never reserve for split store more than
+  // half the memory available for messages.
+  //
+
+  if (size > 0 && control ->
+          SplitTotalStorageSize > size / 2)
+  {
+    #ifdef TEST
+    *logofs << "Loop: Reducing size of split store to "
+            << size / 2 << " bytes.\n"
+            << logofs_flush;
+    #endif
+
+    control -> SplitTotalStorageSize = size / 2;
+  }
+
+  //
+  // Don't load render from persistent
+  // cache if extension is hidden or
+  // not supported by agent.
+  //
+
+  if (control -> HideRender == 1)
+  {
+    #ifdef TEST
+    *logofs << "Loop: Not loading render extension "
+            << "from persistent cache.\n"
+            << logofs_flush;
+    #endif
+
+    control -> PersistentCacheLoadRender = 0;
+  }
+
+  return 1;
+}
+
+int SetShmem()
+{
+  //
+  // If not set, adjust the size of the shared
+  // memory segment according to size of the
+  // message cache.
+  //
+
+  if (*shsegSizeName == '\0')
+  {
+    int size = control -> getUpperStorageSize();
+
+    const int mega = 1048576;
+
+    if (size > 0)
+    {
+      if (size <= 1 * mega)
+      {
+        size = 0;
+      }
+      else if (size <= 2 * mega)
+      {
+        size = 524288;
+      }
+      else if (size < 4 * mega)
+      {
+        size = 1048576;
+      }
+      else
+      {
+        size = size / 4;
+      }
+
+      if (size > 4194304)
+      {
+        size = 4194304;
+      }
+
+      control -> ShmemClientSize = size;
+      control -> ShmemServerSize = size;
+    }
+    else
+    {
+      //
+      // The delta compression is disabled.
+      // Use a default segment size of 2 MB.
+      //
+
+      control -> ShmemServerSize = 2 * mega;
+    }
+  }
+
+  //
+  // Client side shared memory support is
+  // not useful and not implemented.
+  //
+
+  if (control -> ShmemServerSize >= 524288)
+  {
+    control -> ShmemServer = 1;
+
+    #if defined(TEST) || defined(INFO)
+    *logofs << "Loop: Set initial shared memory size "
+            << "to " << control -> ShmemServerSize
+            << " bytes.\n" << logofs_flush;
+    #endif
+  }
+  else
+  {
+    #if defined(TEST) || defined(INFO)
+    *logofs << "Loop: Disabled use of the shared memory "
+            << "extension.\n" << logofs_flush;
+    #endif
+
+    control -> ShmemServer = 0;
+  }
+
+  // For android, no shared memory available
+  control -> ShmemServer = 0;
+  control -> ShmemClientSize = 0;
+
+  return 1;
+}
+
+//
+// Adjust the pack method according to the
+// type of the session.
+//
+
+int SetPack()
+{
+  #ifdef TEST
+  *logofs << "Loop: Setting pack with initial method "
+          << packMethod << " and quality " << packQuality
+          << ".\n" << logofs_flush;
+  #endif
+
+  //
+  // Check if this is a proxy session and, in
+  // this case, set the pack method to none.
+  // Packed images are not supported by plain
+  // X applications.
+  //
+
+  if (control -> SessionMode == session_proxy)
+  {
+    #ifdef TEST
+    *logofs << "Loop: WARNING! Disabling pack with proxy session.\n"
+            << logofs_flush;
+    #endif
+
+    packMethod = PACK_NONE;
+  }
+
+  //
+  // Adjust the internal settings according
+  // to the newly selected pack method.
+  //
+
+  ParsePackMethod(packMethod, packQuality);
+
+  //
+  // Don't load messages from persistent
+  // cache if packed images are disabled.
+  //
+
+  if (control -> PackMethod == PACK_NONE)
+  {
+    control -> PersistentCacheLoadPacked = 0;
+
+    #ifdef TEST
+    *logofs << "Loop: Not loading packed images "
+            << "from persistent cache.\n"
+            << logofs_flush;
+    #endif
+  }
+
+  return 1;
+}
+
+//
+// Set the disk-based image cache parameters
+// according to the user's wishes.
+//
+
+int SetImages()
+{
+  //
+  // Be sure we disable the image cache if we
+  // are connecting to plain X clients.
+  //
+
+  if (control -> SessionMode == session_proxy)
+  {
+    #ifdef TEST
+    *logofs << "Loop: Disabling image cache with "
+            << "session '" << DumpSession(control ->
+               SessionMode) << "'.\n" << logofs_flush;
+    #endif
+
+    sprintf(imagesSizeName, "0");
+
+    control -> ImageCacheEnableLoad = 0;
+    control -> ImageCacheEnableSave = 0;
+
+    return 1;
+  }
+
+  int size = control -> ImageCacheDiskLimit;
+
+  if (size / 1024 > 0)
+  {
+    sprintf(imagesSizeName, "%dk", size / 1024);
+  }
+  else
+  {
+    sprintf(imagesSizeName, "%d", size);
+  }
+
+  if (size > 0)
+  {
+    control -> ImageCacheEnableLoad = 1;
+    control -> ImageCacheEnableSave = 1;
+
+    if (control -> ProxyMode == proxy_server)
+    {
+      if ((control -> ImageCachePath = GetImagesPath()) == NULL)
+      {
+        #ifdef PANIC
+        *logofs << "Loop: PANIC! Error getting or creating image cache path.\n"
+                << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Error getting or creating image cache path.\n";
+
+        HandleCleanup();
+      }
+
+      #ifdef TEST
+      *logofs << "Loop: Path of image cache files is '" << control -> ImageCachePath
+              << "'.\n" << logofs_flush;
+      #endif
+    }
+  }
+  else
+  {
+    #ifdef TEST
+    *logofs << "Loop: Disabling the persistent image cache.\n"
+            << logofs_flush;
+    #endif
+
+    control -> ImageCacheEnableLoad = 0;
+    control -> ImageCacheEnableSave = 0;
+  }
+
+  return 1;
+}
+
+int SetVersion()
+{
+  //
+  // Normalize the different proxy versions.
+  //
+
+  int local = (control -> LocalVersionMajor << 24) |
+                  (control -> LocalVersionMinor << 16) |
+                      control -> LocalVersionPatch;
+
+  int remote = (control -> RemoteVersionMajor << 24) |
+                   (control -> RemoteVersionMinor << 16) |
+                       control -> RemoteVersionPatch;
+
+  int major = -1;
+  int minor = -1;
+  int patch = -1;
+
+  if (control -> RemoteVersionMajor <= 1)
+  {
+    //
+    // The remote proxy uses a different
+    // logic to determine the version so
+    // we default to the compatibility
+    // version.
+    //
+
+    major = control -> CompatVersionMajor;
+    minor = control -> CompatVersionMinor;
+    patch = control -> CompatVersionPatch;
+
+    #ifdef TEST
+    *logofs << "Loop: Using compatibility version '"
+            << major << "." << minor << "." << patch
+            << "'.\n" << logofs_flush;
+    #endif
+  }
+  else if (control -> LocalVersionMajor >
+               control -> RemoteVersionMajor)
+  {
+    //
+    // We use a more recent version. Let's
+    // negotiate the version based on the
+    // version supported by the remote.
+    //
+
+    major = control -> RemoteVersionMajor;
+    minor = control -> RemoteVersionMinor;
+    patch = control -> RemoteVersionPatch;
+
+    #ifdef TEST
+    *logofs << "Loop: Using remote version '"
+            << major << "." << minor << "." << patch
+            << "'.\n" << logofs_flush;
+    #endif
+  }
+  else
+  {
+    //
+    // We support a major version that is
+    // equal or older than the remote. We
+    // assume the smaller version between
+    // the two, including the minor and
+    // the patch numbers.
+    //
+
+    if (local > remote)
+    {
+      major = control -> RemoteVersionMajor;
+      minor = control -> RemoteVersionMinor;
+      patch = control -> RemoteVersionPatch;
+
+      #ifdef TEST
+      *logofs << "Loop: Using remote version '"
+              << major << "." << minor << "." << patch
+              << "'.\n" << logofs_flush;
+      #endif
+    }
+    else
+    {
+      major = control -> LocalVersionMajor;
+      minor = control -> LocalVersionMinor;
+      patch = control -> LocalVersionPatch;
+
+      #ifdef TEST
+      *logofs << "Loop: Using local version '"
+              << major << "." << minor << "." << patch
+              << "'.\n" << logofs_flush;
+      #endif
+    }
+  }
+
+  //
+  // Handle versions from 3.5.0. The protocol
+  // step 10 is the minimum supported version.
+  //
+
+  int step = 0;
+
+  if (major == 3)
+  {
+    if (minor >= 5)
+    {
+      step = 10;
+    }
+  }
+  else if (major > 3)
+  {
+    step = 10;
+  }
+
+  if (step == 0)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Unable to set the protocol step value from "
+         << "the negotiated protocol version " << major << "." << minor
+         << "." << patch << ".\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Unable to set the protocol step value from "
+         << "the negotiated protocol version " << major << "." << minor
+         << "." << patch << ".\n";
+
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Incompatible remote version "
+            << control -> RemoteVersionMajor << "." << control -> RemoteVersionMinor
+            << "." << control -> RemoteVersionPatch << " with local version "
+            << control -> LocalVersionMajor << "." << control -> LocalVersionMinor
+            << "." << control -> LocalVersionPatch << ".\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Incompatible remote version "
+         << control -> RemoteVersionMajor << "." << control -> RemoteVersionMinor
+         << "." << control -> RemoteVersionPatch << " with local version "
+         << control -> LocalVersionMajor << "." << control -> LocalVersionMinor
+         << "." << control -> LocalVersionPatch << ".\n";
+
+    return -1;
+  }
+
+  #ifdef TEST
+  *logofs << "Loop: Using NX protocol step "
+          << step << ".\n" << logofs_flush;
+  #endif
+
+  control -> setProtoStep(step);
+
+  //
+  // Ignore the differences in patch version
+  // and print a warning if the local version
+  // is different or obsolete compared to
+  // the remote.
+  //
+
+  local  &= 0xffff0000;
+  remote &= 0xffff0000;
+
+  if (local != remote)
+  {
+    #ifdef WARNING
+    *logofs << "Loop: WARNING! Connected to remote version "
+            << control -> RemoteVersionMajor << "." << control -> RemoteVersionMinor
+            << "." << control -> RemoteVersionPatch << " with local version "
+            << control -> LocalVersionMajor << "." << control -> LocalVersionMinor
+            << "." << control -> LocalVersionPatch << ".\n" << logofs_flush;
+    #endif
+
+    cerr << "Warning" << ": Connected to remote version "
+         << control -> RemoteVersionMajor << "." << control -> RemoteVersionMinor
+         << "." << control -> RemoteVersionPatch << " with local version "
+         << control -> LocalVersionMajor << "." << control -> LocalVersionMinor
+         << "." << control -> LocalVersionPatch << ".\n" << logofs_flush;
+  }
+
+  if (local < remote)
+  {
+    cerr << "Warning" << ": Consider checking https://github.com/ArcticaProject/nx-libs/releases for updates.\n";
+  }
+
+  //
+  // Now that we are aware of the remote
+  // version, let's adjust the options to
+  // be compatible with the remote proxy.
+  //
+
+  if (control -> ProxyMode == proxy_client)
+  {
+    //
+    // Since ProtoStep8 (#issue 108)
+    //
+    // Now it's assumed that the remote is
+    // able to handle the selected pack
+    // method
+    //
+
+    #ifdef TEST
+    *logofs << __FILE__ << " : " << __LINE__ << " - "
+            << "step = " << control -> getProtoStep()
+            << " packMethod = " << packMethod
+            << " packQuality = " << packQuality
+            << ".\n"  << logofs_flush;
+    #endif
+
+    //
+    // Update the pack method name.
+    //
+
+    ParsePackMethod(packMethod, packQuality);
+  }
+
+  //
+  // At the moment the image cache is not used by the
+  // agent. Proxy versions older than 3.0.0 assumed
+  // that it was enabled and sent specific bits as part
+  // of the encoding. Conversely, it is advisable to
+  // disable the cache right now. By not enabling the
+  // the image cache, the house-keeping process will
+  // only take care of cleaning up the "cache-" direc-
+  // tories.
+  //
+
+  //
+  // Considering that compatibility with older versions
+  // has been set to cover as far as 3.5.0, the cache can
+  // be disabled at this point without any concern
+  //
+
+  // Since ProtoStep8 (#issue 108)
+  #ifdef TEST
+  *logofs << "Loop: Disabling image cache with protocol "
+          << "step '" << control -> getProtoStep()
+          << "'.\n"  << logofs_flush;
+  #endif
+
+  sprintf(imagesSizeName, "0");
+
+  control -> ImageCacheEnableLoad = 0;
+  control -> ImageCacheEnableSave = 0;
+
+  return 1;
+}
+
+//
+// Identify the requested link settings
+// and update the control parameters
+// accordingly.
+//
+
+int SetLink()
+{
+  #ifdef TEST
+  *logofs << "Loop: Setting link with initial value "
+          << linkSpeedName << ".\n" << logofs_flush;
+  #endif
+
+  if (*linkSpeedName == '\0')
+  {
+    strcpy(linkSpeedName, "lan");
+  }
+  
+  #ifdef TEST
+  *logofs << "Loop: Link speed is " << linkSpeedName
+          << ".\n" << logofs_flush;
+  #endif
+
+  if (strcasecmp(linkSpeedName, "modem") == 0)
+  {
+    SetLinkModem();
+  }
+  else if (strcasecmp(linkSpeedName, "isdn") == 0)
+  {
+    SetLinkIsdn();
+  }
+  else if (strcasecmp(linkSpeedName, "adsl") == 0)
+  {
+    SetLinkAdsl();
+  }
+  else if (strcasecmp(linkSpeedName, "wan") == 0)
+  {
+    SetLinkWan();
+  }
+  else if (strcasecmp(linkSpeedName, "lan") == 0)
+  {
+    SetLinkLan();
+  }
+  else
+  {
+    return -1;
+  }
+
+  //
+  // Set TCP_NODELAY according to the user's
+  // wishes.
+  //
+
+  if (useNoDelay != -1)
+  {
+    control -> OptionProxyClientNoDelay = useNoDelay;
+    control -> OptionProxyServerNoDelay = useNoDelay;
+  }
+
+  //
+  // Select the image compression method.
+  //
+
+  if (packMethod == -1)
+  {
+    packMethod = control -> PackMethod;
+  }
+
+  if (packQuality == -1)
+  {
+    packQuality = control -> PackQuality;
+  }
+
+  if (ParsePackMethod(packMethod, packQuality) < 0)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Unrecognized pack method id "
+            << packMethod << " with quality " << packQuality
+            << ".\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Unrecognized pack method id "
+         << packMethod << " with quality " << packQuality
+         << ".\n";
+
+    HandleCleanup();
+  }
+
+  //
+  // Check if the user disabled the ability
+  // to generate simple replies at the client
+  // side.
+  //
+
+  if (control -> SessionMode == session_proxy)
+  {
+    if (useTaint != -1)
+    {
+      control -> TaintReplies = (useTaint == 1);
+    }
+    else
+    {
+      #ifdef WARNING
+      *logofs << "Loop: WARNING! Forcing taint of replies "
+              << "with a proxy session.\n"
+              << logofs_flush;
+      #endif
+
+      control -> TaintReplies = 1;
+    }
+  }
+  else
+  {
+    //
+    // There is no need to taint the
+    // replies if we have an agent.
+    //
+
+    control -> TaintReplies = 0;
+  }
+
+  //
+  // Be sure that the requests needing a reply
+  // are flushed immediately. Normal X clients
+  // use so many replies to make the queuing
+  // completely useless.
+  //
+
+  if (control -> SessionMode == session_proxy)
+  {
+    #ifdef WARNING
+    *logofs << "Loop: WARNING! Forcing flush on priority "
+            << "with a proxy session.\n"
+            << logofs_flush;
+    #endif
+
+    control -> FlushPriority = 1;
+  }
+
+  return 1;
+}
+
+//
+// Parameters for MODEM 28.8/33.6/56 Kbps.
+//
+
+int SetLinkModem()
+{
+  #ifdef TEST
+  *logofs << "Loop: Setting parameters for MODEM.\n"
+          << logofs_flush;
+  #endif
+
+  control -> LinkMode = LINK_TYPE_MODEM;
+
+  control -> TokenSize  = 256;
+  control -> TokenLimit = 24;
+
+  control -> SplitMode             = 1;
+  control -> SplitTotalSize        = 128;
+  control -> SplitTotalStorageSize = 1048576;
+
+  control -> SplitTimeout   = 50;
+  control -> MotionTimeout  = 50;
+  control -> IdleTimeout    = 50;
+
+  control -> PackMethod  = PACK_ADAPTIVE;
+  control -> PackQuality = 3;
+
+  return 1;
+}
+
+//
+// Parameters for ISDN 64/128 Kbps.
+//
+
+int SetLinkIsdn()
+{
+  #ifdef TEST
+  *logofs << "Loop: Setting parameters for ISDN.\n"
+          << logofs_flush;
+  #endif
+
+  control -> LinkMode = LINK_TYPE_ISDN;
+
+  control -> TokenSize  = 384;
+  control -> TokenLimit = 24;
+
+  control -> SplitMode             = 1;
+  control -> SplitTotalSize        = 128;
+  control -> SplitTotalStorageSize = 1048576;
+
+  control -> SplitTimeout   = 50;
+  control -> MotionTimeout  = 20;
+  control -> IdleTimeout    = 50;
+
+  control -> PackMethod  = PACK_ADAPTIVE;
+  control -> PackQuality = 5;
+
+  return 1;
+}
+
+//
+// Parameters for ADSL 256 Kbps.
+//
+
+int SetLinkAdsl()
+{
+  #ifdef TEST
+  *logofs << "Loop: Setting parameters for ADSL.\n"
+          << logofs_flush;
+  #endif
+
+  control -> LinkMode = LINK_TYPE_ADSL;
+
+  control -> TokenSize  = 1536;
+  control -> TokenLimit = 24;
+
+  control -> SplitMode             = 1;
+  control -> SplitTotalSize        = 128;
+  control -> SplitTotalStorageSize = 1048576;
+
+  control -> SplitTimeout   = 50;
+  control -> MotionTimeout  = 10;
+  control -> IdleTimeout    = 50;
+
+  control -> PackMethod  = PACK_ADAPTIVE;
+  control -> PackQuality = 7;
+
+  return 1;
+}
+
+//
+// Parameters for XDSL/FDDI/ATM 1/2/34 Mbps WAN.
+//
+
+int SetLinkWan()
+{
+  #ifdef TEST
+  *logofs << "Loop: Setting parameters for WAN.\n"
+          << logofs_flush;
+  #endif
+
+  control -> LinkMode = LINK_TYPE_WAN;
+
+  control -> TokenSize  = 1536;
+  control -> TokenLimit = 24;
+
+  control -> SplitMode             = 1;
+  control -> SplitTotalSize        = 128;
+  control -> SplitTotalStorageSize = 1048576;
+
+  control -> SplitTimeout   = 50;
+  control -> MotionTimeout  = 5;
+  control -> IdleTimeout    = 50;
+
+  control -> PackMethod  = PACK_ADAPTIVE;
+  control -> PackQuality = 9;
+
+  return 1;
+}
+
+//
+// Parameters for LAN 10/100 Mbps.
+//
+
+int SetLinkLan()
+{
+  #ifdef TEST
+  *logofs << "Loop: Setting parameters for LAN.\n"
+          << logofs_flush;
+  #endif
+
+  control -> LinkMode = LINK_TYPE_LAN;
+
+  control -> TokenSize  = 1536;
+  control -> TokenLimit = 24;
+
+  control -> SplitMode             = 1;
+  control -> SplitTotalSize        = 128;
+  control -> SplitTotalStorageSize = 1048576;
+
+  control -> SplitTimeout   = 50;
+  control -> MotionTimeout  = 0;
+  control -> IdleTimeout    = 50;
+
+  control -> PackMethod  = PACK_ADAPTIVE;
+  control -> PackQuality = 9;
+
+  return 1;
+}
+
+//
+// Identify the requested link type and set
+// the control parameters accordingly.
+//
+
+int SetCompression()
+{
+  if (strcasecmp(linkSpeedName, "modem") == 0)
+  {
+    SetCompressionModem();
+  }
+  else if (strcasecmp(linkSpeedName, "isdn") == 0)
+  {
+    SetCompressionIsdn();
+  }
+  else if (strcasecmp(linkSpeedName, "adsl") == 0)
+  {
+    SetCompressionAdsl();
+  }
+  else if (strcasecmp(linkSpeedName, "wan") == 0)
+  {
+    SetCompressionWan();
+  }
+  else if (strcasecmp(linkSpeedName, "lan") == 0)
+  {
+    SetCompressionLan();
+  }
+  else
+  {
+    return -1;
+  }
+
+  if (control -> LocalDeltaCompression < 0)
+  {
+    control -> LocalDeltaCompression = 1;
+  }
+
+  //
+  // If we didn't set remote delta compression
+  // (as it should always be the case at client
+  // side) assume value of local side.
+  //
+
+  if (control -> RemoteDeltaCompression < 0)
+  {
+    control -> RemoteDeltaCompression =
+        control -> LocalDeltaCompression;
+  }
+
+  //
+  // If we didn't set remote compression levels
+  // assume values of local side.
+  //
+
+  if (control -> RemoteStreamCompression < 0)
+  {
+    control -> RemoteStreamCompressionLevel =
+        control -> LocalStreamCompressionLevel;
+
+    if (control -> RemoteStreamCompressionLevel > 0)
+    {
+      control -> RemoteStreamCompression = 1;
+    }
+    else
+    {
+      control -> RemoteStreamCompression = 0;
+    }
+  }
+
+  if (control -> RemoteDataCompression < 0)
+  {
+    control -> RemoteDataCompressionLevel =
+        control -> LocalDataCompressionLevel;
+
+    if (control -> RemoteDataCompressionLevel > 0)
+    {
+      control -> RemoteDataCompression = 1;
+    }
+    else
+    {
+      control -> RemoteDataCompression = 0;
+    }
+  }
+
+  return 1;
+}
+
+//
+// Compression for MODEM.
+//
+
+int SetCompressionModem()
+{
+  if (control -> LocalDataCompression < 0)
+  {
+    control -> LocalDataCompression      = 1;
+    control -> LocalDataCompressionLevel = 1;
+  }
+
+  if (control -> LocalDataCompressionThreshold < 0)
+  {
+    control -> LocalDataCompressionThreshold = 32;
+  }
+
+  if (control -> LocalStreamCompression < 0)
+  {
+    control -> LocalStreamCompression      = 1;
+    control -> LocalStreamCompressionLevel = 9;
+  }
+
+  return 1;
+}
+
+//
+// Compression for ISDN.
+//
+
+int SetCompressionIsdn()
+{
+  if (control -> LocalDataCompression < 0)
+  {
+    control -> LocalDataCompression      = 1;
+    control -> LocalDataCompressionLevel = 1;
+  }
+
+  if (control -> LocalDataCompressionThreshold < 0)
+  {
+    control -> LocalDataCompressionThreshold = 32;
+  }
+
+  if (control -> LocalStreamCompression < 0)
+  {
+    control -> LocalStreamCompression      = 1;
+    control -> LocalStreamCompressionLevel = 6;
+  }
+
+  return 1;
+}
+
+//
+// Compression for ADSL.
+//
+
+int SetCompressionAdsl()
+{
+  if (control -> LocalDataCompression < 0)
+  {
+    control -> LocalDataCompression      = 1;
+    control -> LocalDataCompressionLevel = 1;
+  }
+
+  if (control -> LocalDataCompressionThreshold < 0)
+  {
+    control -> LocalDataCompressionThreshold = 32;
+  }
+
+  if (control -> LocalStreamCompression < 0)
+  {
+    control -> LocalStreamCompression      = 1;
+    control -> LocalStreamCompressionLevel = 4;
+  }
+
+  return 1;
+}
+
+//
+// Compression for WAN.
+//
+
+int SetCompressionWan()
+{
+  if (control -> LocalDataCompression < 0)
+  {
+    control -> LocalDataCompression      = 1;
+    control -> LocalDataCompressionLevel = 1;
+  }
+
+  if (control -> LocalDataCompressionThreshold < 0)
+  {
+    control -> LocalDataCompressionThreshold = 32;
+  }
+
+  if (control -> LocalStreamCompression < 0)
+  {
+    control -> LocalStreamCompression      = 1;
+    control -> LocalStreamCompressionLevel = 1;
+  }
+
+  return 1;
+}
+
+//
+// Compression for LAN.
+//
+
+int SetCompressionLan()
+{
+  //
+  // Disable delta compression if not
+  // explicitly enabled.
+  //
+
+  if (control -> LocalDeltaCompression < 0)
+  {
+    control -> LocalDeltaCompression = 0;
+  }
+
+  if (control -> LocalDataCompression < 0)
+  {
+    control -> LocalDataCompression      = 0;
+    control -> LocalDataCompressionLevel = 0;
+  }
+
+  if (control -> LocalDataCompressionThreshold < 0)
+  {
+    control -> LocalDataCompressionThreshold = 0;
+  }
+
+  if (control -> LocalStreamCompression < 0)
+  {
+    control -> LocalStreamCompression      = 0;
+    control -> LocalStreamCompressionLevel = 0;
+  }
+
+  return 1;
+}
+
+int SetLimits()
+{
+  //
+  // Check if the user requested strict
+  // control flow parameters.
+  //
+
+  if (useStrict == 1)
+  {
+    #if defined(TEST) || defined(INFO)
+    *logofs << "Loop: LIMIT! Decreasing the token limit "
+            << "to " << control -> TokenLimit / 2
+            << " with option 'strict'.\n"
+            << logofs_flush;
+    #endif
+
+    control -> TokenLimit /= 2;
+  }
+
+  #ifdef STRICT
+
+  control -> TokenLimit = 1;
+
+  #if defined(TEST) || defined(INFO)
+  *logofs << "Loop: WARNING! LIMIT! Setting the token limit "
+          << "to " << control -> TokenLimit
+          << " to simulate the proxy congestion.\n"
+          << logofs_flush;
+  #endif
+
+  #endif
+
+  //
+  // Reduce the size of the log file.
+  //
+
+  #ifdef QUOTA
+
+  control -> FileSizeLimit = 8388608;
+
+  #endif
+
+  //
+  // Check the bitrate limits.
+  //
+
+  if (control -> LocalBitrateLimit == -1)
+  {
+    if (control -> ProxyMode == proxy_client)
+    {
+      control -> LocalBitrateLimit =
+          control -> ClientBitrateLimit;
+    }
+    else
+    {
+      control -> LocalBitrateLimit =
+          control -> ServerBitrateLimit;
+    }
+  }
+
+  #if defined(TEST) || defined(INFO)
+  *logofs << "Loop: LIMIT! Setting client bitrate limit "
+          << "to " << control -> ClientBitrateLimit
+          << " server bitrate limit to " << control ->
+             ServerBitrateLimit << " with local limit "
+          << control -> LocalBitrateLimit << ".\n"
+          << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+//
+// These functions are used to parse literal
+// values provided by the user and set the
+// control parameters accordingly.
+//
+
+int ParseCacheOption(const char *opt)
+{
+  int size = ParseArg("", "cache", opt);
+
+  if (size < 0)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Invalid value '"
+            << opt << "' for option 'cache'.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Invalid value '"
+         << opt << "' for option 'cache'.\n";
+
+    return -1;
+  }
+
+  #ifdef TEST
+  *logofs << "Loop: Setting size of cache to "
+          << size << " bytes.\n" << logofs_flush;
+  #endif
+
+  control -> ClientTotalStorageSize = size;
+  control -> ServerTotalStorageSize = size;
+
+  strcpy(cacheSizeName, opt);
+
+  if (size == 0)
+  {
+    #ifdef WARNING
+    *logofs << "Loop: WARNING! Disabling NX delta compression.\n"
+            << logofs_flush;
+    #endif
+
+    control -> LocalDeltaCompression = 0;
+
+    #ifdef WARNING
+    *logofs << "Loop: WARNING! Disabling use of NX persistent cache.\n"
+            << logofs_flush;
+    #endif
+
+    control -> PersistentCacheEnableLoad = 0;
+    control -> PersistentCacheEnableSave = 0;
+  }
+
+  return 1;
+}
+
+int ParseImagesOption(const char *opt)
+{
+  int size = ParseArg("", "images", opt);
+
+  if (size < 0)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Invalid value '"
+            << opt << "' for option 'images'.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Invalid value '"
+         << opt << "' for option 'images'.\n";
+
+    return -1;
+  }
+
+  #ifdef TEST
+  *logofs << "Loop: Setting size of images cache to "
+          << size << " bytes.\n" << logofs_flush;
+  #endif
+
+  control -> ImageCacheDiskLimit = size;
+
+  strcpy(imagesSizeName, opt);
+
+  return 1;
+}
+
+int ParseShmemOption(const char *opt)
+{
+  int size = ParseArg("", "shseg", opt);
+
+  if (size < 0)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Invalid value '"
+            << opt << "' for option 'shseg'.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Invalid value '"
+         << opt << "' for option 'shseg'.\n";
+
+    return -1;
+  }
+
+  control -> ShmemClientSize = size;
+  control -> ShmemServerSize = size;
+
+  #if defined(TEST) || defined(INFO)
+  *logofs << "Loop: Set shared memory size to "
+          << control -> ShmemServerSize << " bytes.\n"
+          << logofs_flush;
+  #endif
+
+  strcpy(shsegSizeName, opt);
+
+  return 1;
+}
+
+int ParseBitrateOption(const char *opt)
+{
+  int bitrate = ParseArg("", "limit", opt);
+
+  if (bitrate < 0)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Invalid value '"
+            << opt << "' for option 'limit'.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Invalid value '"
+         << opt << "' for option 'limit'.\n";
+
+    return -1;
+  }
+
+  strcpy(bitrateLimitName, opt);
+
+  if (bitrate == 0)
+  {
+    #ifdef TEST
+    *logofs << "Loop: Disabling bitrate limit on proxy link.\n"
+            << logofs_flush;
+    #endif
+
+    control -> LocalBitrateLimit = 0;
+  }
+  else
+  {
+    #ifdef TEST
+    *logofs << "Loop: Setting bitrate to " << bitrate
+            << " bits per second.\n" << logofs_flush;
+    #endif
+
+    //
+    // Internal representation is in bytes
+    // per second.
+    //
+
+    control -> LocalBitrateLimit = bitrate >> 3;
+  }
+
+  return 1;
+}
+
+int ParseHostOption(const char *opt, char *host, long &port)
+{
+  #ifdef TEST
+  *logofs << "Loop: Trying to parse options string '" << opt
+          << "' as a remote NX host.\n" << logofs_flush;
+  #endif
+
+  if (opt == NULL || *opt == '\0')
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! No host parameter provided.\n"
+            << logofs_flush;
+    #endif
+
+    return 0;
+  }
+  else if (strlen(opt) >= DEFAULT_STRING_LENGTH)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Host parameter exceeds length of "
+            << DEFAULT_STRING_LENGTH << " characters.\n"
+            << logofs_flush;
+    #endif
+
+    return 0;
+  }
+
+  //
+  // Look for a host name followed
+  // by a colon followed by port.
+  //
+
+  int newPort = port;
+
+  const char *separator = strrchr(opt, ':');
+
+  if (separator != NULL)
+  {
+    const char *check = separator + 1;
+
+    while (*check != '\0' && *check != ',' &&
+               *check != '=' && isdigit(*check) != 0)
+    {
+      check++;
+    }
+
+    newPort = atoi(separator + 1);
+
+    if (newPort < 0 || *check != '\0')
+    {
+      #ifdef TEST
+      *logofs << "Loop: Can't identify remote NX port in string '"
+              << separator << "'.\n" << logofs_flush;
+      #endif
+
+      return 0;
+    }
+  }
+  else if (newPort < 0)
+  {
+    //
+    // Complain if port was not passed
+    // by other means.
+    //
+
+    #ifdef TEST
+    *logofs << "Loop: Can't identify remote NX port in string '"
+            << opt << "'.\n" << logofs_flush;
+    #endif
+
+    return 0;
+  }
+  else
+  {
+    separator = opt + strlen(opt);
+  }
+
+  char newHost[DEFAULT_STRING_LENGTH] = { 0 };
+
+  strncpy(newHost, opt, strlen(opt) - strlen(separator));
+
+  *(newHost + strlen(opt) - strlen(separator)) = '\0';
+
+  const char *check = newHost;
+
+  while (*check != '\0' && *check != ',' &&
+             *check != '=')
+  {
+    check++;
+  }
+
+  if (*check != '\0')
+  {
+    #ifdef TEST
+    *logofs << "Loop: Can't identify remote NX host in string '"
+            << newHost << "'.\n" << logofs_flush;
+    #endif
+
+    return 0;
+  }
+  else if (*acceptHost != '\0')
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Can't manage to connect and accept connections "
+            << "at the same time.\n" << logofs_flush;
+
+    *logofs << "Loop: PANIC! Refusing remote NX host with string '"
+            << opt << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Can't manage to connect and accept connections "
+         << "at the same time.\n";
+
+    cerr << "Error" << ": Refusing remote NX host with string '"
+         << opt << "'.\n";
+
+    return -1;
+  }
+
+  if (*host != '\0' && strcmp(host, newHost) != 0)
+  {
+    #ifdef WARNING
+    *logofs << "Loop: WARNING! Overriding remote NX host '"
+            << host << "' with new value '" << newHost
+            << "'.\n" << logofs_flush;
+    #endif
+  }
+
+  strcpy(host, newHost);
+
+  if (port != -1 && port != newPort)
+  {
+    #ifdef WARNING
+    *logofs << "Loop: WARNING! Overriding remote NX port '"
+            << port << "' with new value '" << newPort
+            << "'.\n" << logofs_flush;
+    #endif
+  }
+
+  #ifdef TEST
+  *logofs << "Loop: Parsed options string '" << opt
+          << "' with host '" << newHost << "' and port '"
+          << newPort << "'.\n" << logofs_flush;
+  #endif
+
+  port = newPort;
+
+  return 1;
+}
+
+int ParseFontPath(char *path)
+{
+  char oldPath[DEFAULT_STRING_LENGTH];
+
+  strcpy(oldPath, path);
+
+  if (path == NULL || *path == '\0' || strcmp(path, "0") == 0)
+  {
+    return 0;
+  }
+
+  #ifdef TEST
+  *logofs << "Loop: Parsing font server option '" << path
+          << "'.\n" << logofs_flush;
+  #endif
+
+  //
+  // Convert the value to our default port.
+  //
+
+  if (strcmp(fontPort, "1") == 0)
+  {
+    if (control -> ProxyMode == proxy_server)
+    {
+      snprintf(fontPort, DEFAULT_STRING_LENGTH - 1, "%d",
+                   DEFAULT_NX_FONT_PORT_OFFSET + proxyPort);
+    }
+    else
+    {
+      //
+      // Let the client use the well-known
+      // "unix/:7100" font path.
+      //
+
+      snprintf(fontPort, DEFAULT_STRING_LENGTH - 1, "unix/:7100");
+    }
+  }
+
+  //
+  // Check if a simple numaric value was given.
+  //
+
+  if (atoi(path) > 0)
+  {
+    #ifdef TEST
+    *logofs << "Loop: Assuming numeric TCP port '" << atoi(path)
+            << "' for font server.\n" << logofs_flush;
+    #endif
+
+    return 1;
+  }
+
+  //
+  // Let's assume that a port specification "unix/:7100"
+  // corresponds to "$TEMP/.font-unix/fs7100" and a port
+  // "unix/:-1" corresponds to "$TEMP/.font-unix/fs-1".
+  //
+
+  if (strncmp("unix/:", path, 6) == 0)
+  {
+    snprintf(path, DEFAULT_STRING_LENGTH - 1, "%s/.font-unix/fs%s",
+                 control -> TempPath, oldPath + 6);
+
+    *(path + DEFAULT_STRING_LENGTH - 1) = '\0';
+
+    #ifdef TEST
+    *logofs << "Loop: Assuming Unix socket '" << path
+            << "' for font server.\n" << logofs_flush;
+    #endif
+  }
+  else if (strncmp("tcp/:", path, 5) == 0)
+  {
+    snprintf(path, DEFAULT_STRING_LENGTH - 1, "%d", atoi(oldPath + 5));
+
+    *(path + DEFAULT_STRING_LENGTH - 1) = '\0';
+
+    if (atoi(path) <= 0)
+    {
+      goto ParseFontPathError;
+    }
+
+    #ifdef TEST
+    *logofs << "Loop: Assuming TCP port '" << atoi(path)
+            << "' for font server.\n" << logofs_flush;
+    #endif
+  }
+  else
+  {
+    //
+    // Accept an absolute file path as
+    // a valid Unix socket.
+    //
+
+    if (*path != '/')
+    {
+      goto ParseFontPathError;
+    }
+
+    #ifdef TEST
+    *logofs << "Loop: Assuming Unix socket '" << path
+            << "' for font server.\n" << logofs_flush;
+    #endif
+  }
+
+  return 1;
+
+ParseFontPathError:
+
+  #ifdef TEST
+  *logofs << "Loop: Unable to determine the font server "
+          << "port in string '" << path << "'.\n"
+          << logofs_flush;
+  #endif
+
+  return -1;
+}
+
+int OpenLogFile(char *name, ostream *&stream)
+{
+  if (name == NULL || *name == '\0')
+  {
+    #ifdef TEST
+    *logofs << "Loop: WARNING! No name provided for output. Using standard error.\n"
+            << logofs_flush;
+    #endif
+
+    if (stream == NULL)
+    {
+      stream = &cerr;
+    }
+
+    return 1;
+  }
+
+  if (stream == NULL || stream == &cerr)
+  {
+    if (*name != '/' && *name != '.')
+    {
+      char *filePath = GetSessionPath();
+
+      if (filePath == NULL)
+      {
+        #ifdef PANIC
+        *logofs << "Loop: PANIC! Cannot determine directory of NX session file.\n"
+                << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Cannot determine directory of NX session file.\n";
+
+        return -1;
+      }
+
+      if (strlen(filePath) + strlen("/") +
+              strlen(name) + 1 > DEFAULT_STRING_LENGTH)
+      {
+        #ifdef PANIC
+        *logofs << "Loop: PANIC! Full name of NX file '" << name
+                << " would exceed length of " << DEFAULT_STRING_LENGTH
+                << " characters.\n" << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Full name of NX file '" << name
+             << " would exceed length of " << DEFAULT_STRING_LENGTH
+             << " characters.\n";
+
+        return -1;
+      }
+
+      char *file = new char[strlen(filePath) + strlen("/") +
+                                strlen(name) + 1];
+
+      //
+      // Transform name in a fully qualified name.
+      //
+
+      strcpy(file, filePath);
+      strcat(file, "/");
+      strcat(file, name);
+
+      strcpy(name, file);
+
+      delete [] filePath;
+      delete [] file;
+    }
+
+    mode_t fileMode = umask(0077);
+
+    for (;;)
+    {
+      if ((stream = new ofstream(name, ios::app)) != NULL)
+      {
+        break;
+      }
+
+      usleep(200000);
+    }
+
+    umask(fileMode);
+  }
+  else
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Bad stream provided for output.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Bad stream provided for output.\n";
+
+    return -1;
+  }
+
+  return 1;
+}
+
+int ReopenLogFile(char *name, ostream *&stream, int limit)
+{
+  if (*name != '\0' && limit >= 0)
+  {
+    struct stat fileStat;
+
+    if (limit > 0)
+    {
+      //
+      // This is used for the log file, if the
+      // size exceeds the limit.
+      //
+
+      if (stat(name, &fileStat) != 0)
+      {
+        #ifdef WARNING
+        *logofs << "Loop: WARNING! Can't get stats of file '"
+                << name  << "'. Error is " << EGET() 
+                << " '" << ESTR() << "'.\n" << logofs_flush;
+        #endif
+
+        return 0;
+      }
+      else if (fileStat.st_size < (long) limit)
+      {
+        return 0;
+      }
+    }
+
+    #ifdef TEST
+    *logofs << "Loop: Deleting file '" << name
+            << "' with size " << fileStat.st_size
+            << ".\n" << logofs_flush;
+    #endif
+
+    //
+    // Create a new stream over the previous
+    // file. Trying to delete the file fails
+    // to work on recent Cygwin installs.
+    //
+
+    *stream << flush;
+
+    delete stream;
+
+    mode_t fileMode = umask(0077);
+
+    for (;;)
+    {
+      if ((stream = new ofstream(name, ios::out)) != NULL)
+      {
+        break;
+      }
+
+      usleep(200000);
+    }
+
+    umask(fileMode);
+
+    #ifdef TEST
+    *logofs << "Loop: Reopened file '" << name
+            << "'.\n" << logofs_flush;
+    #endif
+  }
+
+  return 1;
+}
+
+void PrintProcessInfo()
+{
+  if (agent == NULL)
+  {
+
+    cerr << endl;
+
+    PrintVersionInfo();
+
+    cerr << endl;
+
+    cerr << GetCopyrightInfo()
+         << endl
+         << GetOtherCopyrightInfo()
+         << endl
+         << "See https://github.com/ArcticaProject/nx-libs for more information." << endl << endl;
+  }
+
+  //
+  // People get confused by the fact that client
+  // mode is running on NX server and viceversa.
+  // Let's adopt an user-friendly naming conven-
+  // tion here.
+  //
+
+  cerr << "Info: Proxy running in "
+       << (control -> ProxyMode == proxy_client ? "client" : "server")
+       << " mode with pid '" << getpid() << "'.\n";
+
+  if (agent == NULL)
+  {
+    cerr << "Session" << ": Starting session at '"
+         << strTimestamp() << "'.\n";
+  }
+
+  #ifdef TEST
+
+  if (*errorsFileName != '\0')
+  {
+    cerr << "Info" << ": Using errors file '" << errorsFileName << "'.\n";
+  }
+
+  if (*statsFileName != '\0')
+  {
+    cerr << "Info" << ": Using stats file '" << statsFileName << "'.\n";
+  }
+
+  #endif
+}
+
+void PrintConnectionInfo()
+{
+  cerr << "Info" << ": Using "
+       << linkSpeedName << " link parameters "
+       << control -> TokenSize
+       << "/" << control -> TokenLimit
+       << "/" << control -> FlushPolicy + 1
+       << "/" << control -> FlushPriority
+       << ".\n";
+
+  if (control -> ProxyMode == proxy_client)
+  {
+    cerr << "Info" << ": Using agent parameters "
+         << control -> PingTimeout
+         << "/" << control -> MotionTimeout
+         << "/" << control -> IdleTimeout
+         << "/" << control -> TaintReplies
+         << "/" << control -> HideRender
+         << ".\n";
+  }
+
+  if (control -> LocalDeltaCompression == 1)
+  {
+    cerr << "Info" << ": Using cache parameters "
+         << control -> MinimumMessageSize
+         << "/" << control -> MaximumMessageSize / 1024 << "KB"
+         << "/" << control -> ClientTotalStorageSize / 1024 << "KB"
+         << "/" << control -> ServerTotalStorageSize / 1024 << "KB"
+         << ".\n";
+  }
+
+  if (control -> ImageCacheEnableLoad == 1 ||
+          control -> ImageCacheEnableSave == 1)
+  {
+    cerr << "Info" << ": Using image streaming parameters "
+         << control -> SplitTimeout
+         << "/" << control -> SplitTotalSize
+         << "/" << control -> SplitTotalStorageSize / 1024 << "KB"
+         << "/" << control -> SplitDataThreshold
+         << "/" << control -> SplitDataPacketLimit
+         << ".\n";
+
+    cerr << "Info" << ": Using image cache parameters "
+         << control -> ImageCacheEnableLoad
+         << "/" << control -> ImageCacheEnableSave
+         << "/" << control -> ImageCacheDiskLimit / 1024 << "KB"
+         << ".\n";
+  }
+
+  cerr << "Info" << ": Using pack method '"
+       << packMethodName << "' with session '"
+       << sessionType << "'.\n";
+
+  if (*productName != '\0')
+  {
+    cerr << "Info" << ": Using product '" << productName
+         << "'.\n" << logofs_flush;
+  }
+
+  if (control -> LocalDeltaCompression == 0)
+  {
+    cerr << "Info" << ": Not using NX delta compression.\n";
+  }
+
+  if (control -> LocalDataCompression == 1 ||
+          control -> RemoteDataCompression == 1)
+  {
+    cerr << "Info" << ": Using ZLIB data compression "
+         << control -> LocalDataCompressionLevel
+         << "/" << control -> RemoteDataCompressionLevel
+         << "/" << control -> LocalDataCompressionThreshold
+         << ".\n";
+  }
+  else
+  {
+    cerr << "Info" << ": Not using ZLIB data compression.\n";
+  }
+
+  if (control -> LocalStreamCompression == 1 ||
+          control -> RemoteStreamCompression == 1)
+  {
+    cerr << "Info" << ": Using ZLIB stream compression "
+         << control -> LocalStreamCompressionLevel
+         << "/" << control -> RemoteStreamCompressionLevel
+         << ".\n";
+  }
+  else
+  {
+    cerr << "Info" << ": Not using ZLIB stream compression.\n";
+  }
+
+  if (control -> LocalBitrateLimit > 0)
+  {
+    cerr << "Info" << ": Using bandwidth limit of "
+         << bitrateLimitName << " bits per second.\n";
+  }
+
+  if (control -> PersistentCacheName != NULL)
+  {
+    cerr << "Info" << ": Using cache file '"
+         << control -> PersistentCachePath << "/"
+         << control -> PersistentCacheName << "'.\n";
+  }
+  else
+  {
+    if (control -> PersistentCacheEnableLoad == 0 ||
+            control -> LocalDeltaCompression == 0)
+    {
+      cerr << "Info" << ": Not using a persistent cache.\n";
+    }
+    else
+    {
+      cerr << "Info" << ": No suitable cache file found.\n";
+    }
+  }
+
+  if (control -> ProxyMode == proxy_client &&
+          (useUnixSocket > 0 || useTcpSocket > 0 ||
+              useAgentSocket > 0))
+  {
+    cerr << "Info" << ": Listening to X11 connections "
+         << "on display ':" << xPort << "'.\n";
+  }
+  else if (control -> ProxyMode == proxy_server)
+  {
+    cerr << "Info" << ": Forwarding X11 connections "
+         << "to display '" << displayHost << "'.\n";
+  }
+
+  if (control -> ProxyMode == proxy_client &&
+      useCupsSocket > 0 && cupsPort.enabled())
+  {
+    cerr << "Info" << ": Listening to CUPS connections "
+         << "on port '" << cupsPort << "'.\n";
+  }
+  else if (control -> ProxyMode == proxy_server &&
+           cupsPort.enabled())
+  {
+    cerr << "Info" << ": Forwarding CUPS connections "
+         << "to port '" << cupsPort << "'.\n";
+  }
+
+  if (control -> ProxyMode == proxy_client &&
+      useAuxSocket > 0 && auxPort.enabled())
+  {
+    cerr << "Info" << ": Listening to auxiliary X11 connections "
+         << "on port '" << auxPort << "'.\n";
+  }
+  else if (control -> ProxyMode == proxy_server &&
+           auxPort.enabled())
+  {
+    cerr << "Info" << ": Forwarding auxiliary X11 connections "
+         << "to display '" << displayHost << "'.\n";
+  }
+
+  if (control -> ProxyMode == proxy_client &&
+      useSmbSocket > 0 && smbPort.enabled())
+  {
+    cerr << "Info" << ": Listening to SMB connections "
+         << "on port '" << smbPort << "'.\n";
+  }
+  else if (control -> ProxyMode == proxy_server &&
+           smbPort.enabled())
+  {
+    cerr << "Info" << ": Forwarding SMB connections "
+         << "to port '" << smbPort << "'.\n";
+  }
+
+  if (control -> ProxyMode == proxy_client &&
+      useMediaSocket > 0 && mediaPort.enabled())
+  {
+    cerr << "Info" << ": Listening to multimedia connections "
+         << "on port '" << mediaPort << "'.\n";
+  }
+  else if (control -> ProxyMode == proxy_server &&
+           mediaPort.enabled())
+  {
+    cerr << "Info" << ": Forwarding multimedia connections "
+         << "to port '" << mediaPort << "'.\n";
+  }
+
+  if (control -> ProxyMode == proxy_client &&
+      useHttpSocket > 0 && httpPort.enabled())
+  {
+    cerr << "Info" << ": Listening to HTTP connections "
+         << "on port '" << httpPort << "'.\n";
+  }
+  else if (control -> ProxyMode == proxy_server &&
+           httpPort.enabled())
+  {
+    cerr << "Info" << ": Forwarding HTTP connections "
+         << "to port '" << httpPort << "'.\n";
+  }
+
+  if (control -> ProxyMode == proxy_server &&
+          useFontSocket > 0 && *fontPort != '\0')
+  {
+    cerr << "Info" << ": Listening to font server connections "
+         << "on port '" << fontPort << "'.\n";
+  }
+  else if (control -> ProxyMode == proxy_client &&
+               *fontPort != '\0')
+  {
+    cerr << "Info" << ": Forwarding font server connections "
+         << "to port '" << fontPort << "'.\n";
+  }
+
+  if (useSlaveSocket > 0 && slavePort.enabled())
+  {
+    cerr << "Info" << ": Listening to slave connections "
+         << "on port '" << slavePort << "'.\n";
+  }
+}
+
+void PrintVersionInfo()
+{
+  cerr << "NXPROXY - " << "Version "
+       << control -> LocalVersionMajor << "."
+       << control -> LocalVersionMinor << "."
+       << control -> LocalVersionPatch << "."
+       << control -> LocalVersionMaintenancePatch;
+
+  cerr << endl;
+}
+
+void PrintCopyrightInfo()
+{
+  cerr << endl;
+
+  PrintVersionInfo();
+
+  cerr << endl;
+
+  cerr << GetCopyrightInfo();
+
+  //
+  // Print third party's copyright info.
+  //
+
+  cerr << endl;
+
+  cerr << GetOtherCopyrightInfo();
+
+  cerr << endl;
+}
+
+void PrintOptionIgnored(const char *type, const char *name, const char *value)
+{
+  if (control -> ProxyMode == proxy_server)
+  {
+    #ifdef WARNING
+    *logofs << "Loop: WARNING! Ignoring " << type
+            << " option '" << name << "' with value '"
+            << value << "' at " << "NX client side.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Warning" << ": Ignoring " << type
+         << " option '" << name << "' with value '"
+         << value << "' at " << "NX client side.\n";
+  }
+  else
+  {
+    #ifdef WARNING
+    *logofs << "Loop: WARNING! Ignoring " << type
+            << " option '" << name << "' with value '"
+            << value << "' at " << "NX server side.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Warning" << ": Ignoring " << type
+         << " option '" << name << "' with value '"
+         << value << "' at " << "NX server side.\n";
+  }
+}
+
+const char *GetOptions(const char *options)
+{
+  if (options != NULL)
+  {
+    if (strncasecmp(options, "nx/nx,", 6) != 0 &&
+            strncasecmp(options, "nx,", 3) != 0 &&
+                strncasecmp(options, "nx:", 3) != 0)
+    {
+      #ifdef TEST
+      *logofs << "Loop: PANIC! Display options string '" << options
+              << "' must start with 'nx' or 'nx/nx' prefix.\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Display options string '" << options
+           << "' must start with 'nx' or 'nx/nx' prefix.\n";
+
+      HandleCleanup();
+    }
+  }
+  else
+  {
+    options = getenv("DISPLAY");
+  }
+
+  return options;
+}
+
+const char *GetArg(int &argi, int argc, const char **argv)
+{
+  //
+  // Skip "-" and flag character.
+  //
+
+  const char *arg = argv[argi] + 2;
+
+  if (*arg == 0)
+  {
+    if (argi + 1 == argc)
+    {
+      return NULL;
+    }
+    else
+    {
+      argi++;
+
+      return (*argv[argi] == '-' ? NULL : argv[argi]);
+    }
+  }
+  else
+  {
+    return (*arg == '-' ? NULL : arg);
+  }
+}
+
+int CheckArg(const char *type, const char *name, const char *value)
+{
+  #ifdef TEST
+  *logofs << "Loop: Parsing " << type << " option '" << name
+          << "' with value '" << (value ? value : "(null)")
+          << "'.\n" << logofs_flush;
+  #endif
+
+  if (value == NULL || strstr(value, "=") != NULL)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Error in " << type << " option '"
+            << name << "'. No value found.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Error in " << type << " option '"
+         << name << "'. No value found.\n";
+
+    return -1;
+  }
+  else if (strstr(name, ",") != NULL)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Parse error at " << type << " option '"
+            << name << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Parse error at " << type << " option '"
+         << name << "'.\n";
+
+    return -1;
+  }
+  else if (strlen(value) >= DEFAULT_STRING_LENGTH)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Value '" << value << "' of "
+            << type << " option '" << name << "' exceeds length of "
+            << DEFAULT_STRING_LENGTH << " characters.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Value '" << value << "' of "
+         << type << " option '" << name << "' exceeds length of "
+         << DEFAULT_STRING_LENGTH << " characters.\n";
+
+    return -1;
+  }
+
+  return 1;
+}
+
+int ParseArg(const char *type, const char *name, const char *value)
+{
+  if (strcasecmp(value, "0") == 0)
+  {
+    return 0;
+  }
+
+  //
+  // Find the base factor.
+  //
+
+  double base;
+
+  const char *id = value + strlen(value) - 1;
+
+  if (strcasecmp(id, "g") == 0)
+  {
+    base = 1024 * 1024 * 1024;
+  }
+  else if (strcasecmp(id, "m") == 0)
+  {
+    base = 1024 * 1024;
+  }
+  else if (strcasecmp(id, "k") == 0)
+  {
+    base = 1024;
+  }
+  else if (strcasecmp(id, "b") == 0 || isdigit(*id) == 1)
+  {
+    base = 1;
+  }
+  else
+  {
+    return -1;
+  }
+
+  char *string = new char[strlen(value)];
+
+  strncpy(string, value, strlen(value) - 1);
+
+  *(string + (strlen(value) - 1)) = '\0';
+
+  #ifdef TEST
+
+  *logofs << "Loop: Parsing integer option '" << name
+          << "' from string '" << string << "' with base set to ";
+
+  switch (tolower(*id))
+  {
+    case 'k':
+    case 'm':
+    case 'g':
+    {
+      *logofs << (char) toupper(*id);
+    }
+    break;
+  }
+
+  *logofs << ".\n" << logofs_flush;
+
+  #endif
+
+  double result = atof(string) * base;
+
+  if (result < 0 || result > (((unsigned) -1) >> 1))
+  {
+    delete [] string;
+
+    return -1;
+  }
+
+  delete [] string;
+
+  #ifdef TEST
+  *logofs << "Loop: Integer option parsed to '"
+          << (int) result << "'.\n" << logofs_flush;
+  #endif
+
+  return (int) result;
+}
+
+void SetAndValidateChannelEndPointArg(const char *type, const char *name, const char *value,
+                                      ChannelEndPoint &endPoint) {
+  endPoint.setSpec(value);
+  if (!endPoint.validateSpec()) {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Invalid " << type
+            << " option '" << name << "' with value '"
+            << value << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Invalid " << type
+         << " option '" << name << "' with value '"
+         << value << "'.\n";
+
+    HandleCleanup();
+  }
+}
+
+
+int ValidateArg(const char *type, const char *name, const char *value)
+{
+  int number = atoi(value);
+
+  if (number < 0)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Invalid " << type
+            << " option '" << name << "' with value '"
+            << value << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Invalid " << type
+         << " option '" << name << "' with value '"
+         << value << "'.\n";
+
+    HandleCleanup();
+  }
+
+  return number;
+} 
+
+int LowercaseArg(const char *type, const char *name, char *value)
+{
+  char *next = value;
+
+  while (*next != '\0')
+  {
+    *next = tolower(*next);
+
+    next++;
+  }
+
+  return 1;
+}
+
+int CheckSignal(int signal)
+{
+  //
+  // Return 1 if the signal needs to be handled
+  // by the proxy, 2 if the signal just needs to
+  // be blocked to avoid interrupting a system
+  // call.
+  //
+
+  switch (signal)
+  {
+    case SIGCHLD:
+    case SIGUSR1:
+    case SIGUSR2:
+    case SIGHUP:
+    case SIGINT:
+    case SIGTERM:
+    case SIGPIPE:
+    case SIGALRM:
+    {
+      return 1;
+    }
+    case SIGVTALRM:
+    case SIGWINCH:
+    case SIGIO:
+    case SIGTSTP:
+    case SIGTTIN:
+    case SIGTTOU:
+    {
+      return 2;
+    }
+    default:
+    {
+      #ifdef __CYGWIN32__
+
+      //
+      // This signal can be raised by the Cygwin
+      // library.
+      //
+
+      if (signal == 12)
+      {
+        return 1;
+      }
+
+      #endif
+
+      return 0;
+    }
+  }
+}
+
+static void PrintUsageInfo(const char *option, int error)
+{
+  if (error == 1)
+  {
+    cerr << "Error" << ": Invalid command line option '" << option << "'.\n";
+  }
+
+  cerr << GetUsageInfo();
+
+  if (error == 1)
+  {
+    cerr << "Error" << ": NX transport initialization failed.\n";
+  }
+}
+
+static void handleCheckSessionInLoop()
+{
+  //
+  // Check if we completed the shutdown procedure
+  // and the remote confirmed the shutdown. The
+  // tear down should be always initiated by the
+  // agent, but the X server side may unilateral-
+  // ly shut down the link without our permission.
+  //
+
+  if (proxy -> getShutdown() > 0)
+  {
+    #ifdef TEST
+    *logofs << "Loop: End of NX transport requested "
+            << "by remote.\n" << logofs_flush;
+    #endif
+
+    handleTerminatingInLoop();
+
+    if (control -> ProxyMode == proxy_server)
+    {
+      #ifdef TEST
+      *logofs << "Loop: Bytes received so far are "
+              << (unsigned long long) statistics -> getBytesIn()
+              << ".\n" << logofs_flush;
+      #endif
+
+      if (statistics -> getBytesIn() < 1024)
+      {
+        cerr << "Info" << ": Your session was closed before reaching "
+             << "a usable state.\n";
+        cerr << "Info" << ": This can be due to the local X server "
+             << "refusing access to the client.\n";
+        cerr << "Info" << ": Please check authorization provided "
+             << "by the remote X application.\n";
+      }
+    }
+
+    #ifdef TEST
+    *logofs << "Loop: Shutting down the NX transport.\n"
+            << logofs_flush;
+    #endif
+ 
+    HandleCleanup();
+  }
+  else if (proxy -> handlePing() < 0)
+  {
+    #ifdef TEST
+    *logofs << "Loop: Failure handling the ping for "
+            << "proxy FD#" << proxyFD << ".\n"
+            << logofs_flush;
+    #endif
+
+    HandleShutdown();
+  }
+
+  //
+  // Check if the watchdog has exited and we didn't
+  // get the SIGCHLD. This can happen if the parent
+  // has overridden our signal handlers.
+  //
+
+  if (IsRunning(lastWatchdog) && CheckProcess(lastWatchdog, "watchdog") == 0)
+  {
+    #ifdef WARNING
+    *logofs << "Loop: WARNING! Watchdog is gone unnoticed. "
+            << "Setting the last signal to SIGTERM.\n"
+            << logofs_flush;
+    #endif
+
+    lastSignal = SIGTERM;
+
+    #ifdef WARNING
+    *logofs << "Loop: WARNING! Resetting pid of last "
+            << "watchdog process.\n" << logofs_flush;
+    #endif
+
+    SetNotRunning(lastWatchdog);
+  }
+
+  //
+  // Let the client proxy find out if the agent's
+  // channel is gone. This is the normal shutdown
+  // procedure in the case of an internal connect-
+  // ion to the agent.
+  // 
+
+  int cleanup = 0;
+
+  if (control -> ProxyMode == proxy_client &&
+          agent != NULL && proxy -> getType(agentFD[1]) ==
+              channel_none && lastKill == 0 && lastDestroy == 1)
+  {
+    #ifdef TEST
+    *logofs << "Loop: End of NX transport requested "
+            << "by agent.\n" << logofs_flush;
+    #endif
+
+    #ifdef TEST
+    *logofs << "Loop: Bytes sent so far are "
+            << (unsigned long long) statistics -> getBytesOut()
+            << ".\n" << logofs_flush;
+    #endif
+
+    if (statistics -> getBytesOut() < 1024)
+    {
+      cerr << "Info" << ": Your session has died before reaching "
+           << "an usable state.\n";
+      cerr << "Info" << ": This can be due to the remote X server "
+           << "refusing access to the client.\n";
+      cerr << "Info" << ": Please check the authorization provided "
+           << "by your X application.\n";
+    }
+
+    cleanup = 1;
+  }
+
+  //
+  // Check if the user requested the end of the
+  // session by sending a signal to the proxy.
+  // All signals are handled in the main loop
+  // so we need to reset the value to get ready
+  // for the next iteration.
+  //
+
+  int signal = 0;
+
+  if (lastSignal != 0)
+  {
+    switch (lastSignal)
+    {
+      case SIGCHLD:
+      case SIGUSR1:
+      case SIGUSR2:
+      {
+        break;
+      }
+      default:
+      {
+        signal = lastSignal;
+
+        cleanup = 1;
+
+        break;
+      }
+    }
+
+    lastSignal = 0;
+  }
+
+  if (cleanup == 1)
+  {
+    //
+    // The first time termination signal is received
+    // disable all further connections, close down any
+    // X channel and wait for a second signal.
+    //
+
+    if (lastKill == 0)
+    {
+      //
+      // Don't print a message if cleanup is
+      // due to normal termination of agent.
+      //
+
+      if (signal != 0)
+      {
+        #ifdef TEST
+        *logofs << "Loop: End of NX transport requested by signal '"
+                << signal << "' '" << DumpSignal(signal)
+                << "'.\n" << logofs_flush;
+        #endif
+
+        handleTerminatingInLoop();
+      }
+
+      //
+      // Disable any further connection.
+      //
+
+      CleanupListeners();
+
+      //
+      // Close all the remaining X channels and
+      // let proxies save their persistent cache
+      // on disk.
+      //
+
+      CleanupConnections();
+
+      //
+      // We'll need to wait for the X channels
+      // to be shut down before waiting for the
+      // cleanup signal.
+      //
+
+      lastKill = 1;
+    }
+    else if (lastKill == 2)
+    {
+      #ifdef TEST
+      *logofs << "Loop: Shutting down the NX transport.\n"
+              << logofs_flush;
+      #endif
+
+      proxy -> handleShutdown();
+
+      HandleCleanup();
+    }
+  }
+
+  if (lastKill == 1 && proxy -> getChannels(channel_x11) == 0)
+  {
+    //
+    // Save the message stores to the
+    // persistent cache.
+    //
+
+    proxy -> handleSave();
+
+    //
+    // Run a watchdog process so we can finally
+    // give up at the time the watchdog exits.
+    //
+
+    if (IsNotRunning(lastWatchdog))
+    {
+      int timeout = control -> CleanupTimeout;
+
+      if (timeout > 0)
+      {
+        if (proxy -> getChannels() == 0)
+        {
+          timeout = 500;
+        }
+
+        #ifdef TEST
+        *logofs << "Loop: Starting watchdog process with timeout "
+                << "of " << timeout << " Ms.\n"
+                << logofs_flush;
+        #endif
+      }
+      #ifdef TEST
+      else
+      {
+        *logofs << "Loop: Starting watchdog process without "
+                << "a timeout.\n" << logofs_flush;
+      }
+      #endif
+
+      lastWatchdog = NXTransWatchdog(timeout);
+
+      if (IsFailed(lastWatchdog))
+      {
+        #ifdef PANIC
+        *logofs << "Loop: PANIC! Can't start the NX watchdog "
+                << "process in shutdown.\n" << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Can't start the NX watchdog "
+             << "process in shutdown.\n";
+
+        HandleCleanup();
+      }
+      #ifdef TEST
+      else
+      {
+        *logofs << "Loop: Watchdog started with pid '"
+                << lastWatchdog << "'.\n" << logofs_flush;
+      }
+      #endif
+    }
+    else
+    {
+      #ifdef PANIC
+      *logofs << "Loop: PANIC! Previous watchdog detected "
+              << "in shutdown with pid '" << lastWatchdog
+              << "'.\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Previous watchdog detected "
+           << "in shutdown with pid '" << lastWatchdog
+           << "'.\n";
+
+      HandleCleanup();
+    }
+
+    if (control -> CleanupTimeout > 0)
+    {
+      #ifdef TEST
+      *logofs << "Loop: Waiting the cleanup timeout to complete.\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Info" << ": Waiting the cleanup timeout to complete.\n";
+    }
+    else
+    {
+      //
+      // The NX server will kill the watchdog
+      // process after having shut down the
+      // service channels.
+      //
+
+      cerr << "Info" << ": Watchdog running with pid '" << lastWatchdog
+           << "'.\n";
+
+      #ifdef TEST
+      *logofs << "Loop: Waiting the watchdog process to complete.\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Info" << ": Waiting the watchdog process to complete.\n";
+    }
+
+    lastKill = 2;
+  }
+}
+
+static void handleCheckBitrateInLoop()
+{
+  static long int slept = 0;
+
+  #ifdef TEST
+  *logofs << "Loop: Bitrate is " << statistics -> getBitrateInShortFrame()
+          << " B/s and " << statistics -> getBitrateInLongFrame()
+          << " B/s in " << control -> ShortBitrateTimeFrame / 1000
+          << "/" << control -> LongBitrateTimeFrame / 1000
+          << " seconds timeframes.\n" << logofs_flush;
+  #endif
+
+  //
+  // This can be improved. We may not jump out
+  // of the select often enough to guarantee
+  // the necessary accuracy.
+  //
+
+  if (control -> LocalBitrateLimit > 0)
+  {
+    #ifdef TEST
+    *logofs << "Loop: Calculating bandwidth usage with limit "
+            << control -> LocalBitrateLimit << ".\n"
+            << logofs_flush;
+    #endif
+
+    int reference = (statistics -> getBitrateInLongFrame() +
+                         statistics -> getBitrateInShortFrame()) / 2;
+
+    if (reference > control -> LocalBitrateLimit)
+    {
+      double ratio = ((double) reference) /
+                         ((double) control -> LocalBitrateLimit);
+
+      if (ratio > 1.2)
+      {
+        ratio = 1.2;
+      }
+
+      slept += (unsigned int) (pow(50000, ratio) / 1000);
+
+      if (slept > 2000)
+      {
+        #ifdef WARNING
+        *logofs << "Loop: WARNING! Sleeping due to "
+                << "reference bitrate of " << reference
+                << " B/s.\n" << logofs_flush;
+        #endif
+
+        cerr << "Warning" << ": Sleeping due to "
+             << "reference bitrate of " << reference
+             << " B/s.\n";
+
+        slept %= 2000;
+      }
+
+      T_timestamp idleTs = getNewTimestamp();
+
+      usleep((unsigned int) pow(50000, ratio));
+
+      int diffTs = diffTimestamp(idleTs, getNewTimestamp());
+
+      statistics -> addIdleTime(diffTs);
+
+      statistics -> subReadTime(diffTs);
+    }
+  }
+}
+
+#if defined(TEST) || defined(INFO)
+
+static void handleCheckStateInLoop(int &setFDs)
+{
+  int fdLength;
+  int fdPending;
+  int fdSplits;
+
+  for (int j = 0; j < setFDs; j++)
+  {
+    if (j != proxyFD)
+    {
+      fdPending = proxy -> getPending(j);
+
+      if (fdPending > 0)
+      {
+        #ifdef PANIC
+        *logofs << "Loop: PANIC! Buffer for descriptor FD#"
+                << j << " has pending bytes to read.\n"
+                << logofs_flush;
+        #endif
+
+        HandleCleanup();
+      }
+
+      fdLength = proxy -> getLength(j);
+
+      if (fdLength > 0)
+      {
+        #ifdef TEST
+        *logofs << "Loop: WARNING! Buffer for descriptor FD#"
+                << j << " has " << fdLength << " bytes to write.\n"
+                << logofs_flush;
+        #endif
+      }
+    }
+  }
+
+  fdPending = proxy -> getPending(proxyFD);
+
+  if (fdPending > 0)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Buffer for proxy descriptor FD#"
+            << proxyFD << " has pending bytes to read.\n"
+            << logofs_flush;
+    #endif
+
+    HandleCleanup();
+  }
+
+  fdLength = proxy -> getFlushable(proxyFD);
+
+  if (fdLength > 0)
+  {
+    if (control -> FlushPolicy == policy_immediate &&
+            proxy -> getBlocked(proxyFD) == 0)
+    {
+      #ifdef PANIC
+      *logofs << "Loop: PANIC! Buffer for proxy descriptor FD#"
+              << proxyFD << " has " << fdLength << " bytes "
+              << "to write with policy 'immediate'.\n"
+              << logofs_flush;
+      #endif
+
+      HandleCleanup();
+    }
+    else
+    {
+      #ifdef TEST
+      *logofs << "Loop: WARNING! Buffer for proxy descriptor FD#"
+              << proxyFD << " has " << fdLength << " bytes "
+              << "to write.\n" << logofs_flush;
+      #endif
+    }
+  }
+
+  fdSplits = proxy -> getSplitSize();
+
+  if (fdSplits > 0)
+  {
+    #ifdef WARNING
+    *logofs << "Loop: WARNING! Proxy descriptor FD#" << proxyFD
+            << " has " << fdSplits << " splits to send.\n"
+            << logofs_flush;
+    #endif
+  }
+}
+
+static void handleCheckSelectInLoop(int &setFDs, fd_set &readSet,
+                                        fd_set &writeSet, T_timestamp selectTs)
+{
+  #if defined(TEST) || defined(INFO)
+  *logofs << "Loop: Maximum descriptors is ["
+          << setFDs << "] at " << strMsTimestamp()
+          << ".\n" << logofs_flush;
+  #endif
+
+  int i;
+
+  if (setFDs > 0)
+  {
+    i = 0;
+
+    #if defined(TEST) || defined(INFO)
+    *logofs << "Loop: Selected for read are ";
+    #endif
+
+    for (int j = 0; j < setFDs; j++)
+    {
+      if (FD_ISSET(j, &readSet))
+      {
+        #if defined(TEST) || defined(INFO)
+        *logofs << "[" << j << "]" << logofs_flush;
+        #endif
+
+        i++;
+      }
+    }
+
+    if (i > 0)
+    {
+      #if defined(TEST) || defined(INFO)
+      *logofs << ".\n" << logofs_flush;
+      #endif
+    }
+    else
+    {
+      #if defined(TEST) || defined(INFO)
+      *logofs << "[none].\n" << logofs_flush;
+      #endif
+    }
+
+    i = 0;
+
+    #if defined(TEST) || defined(INFO)
+    *logofs << "Loop: Selected for write are ";
+    #endif
+
+    for (int j = 0; j < setFDs; j++)
+    {
+      if (FD_ISSET(j, &writeSet))
+      {
+        #if defined(TEST) || defined(INFO)
+        *logofs << "[" << j << "]" << logofs_flush;
+        #endif
+
+        i++;
+      }
+    }
+
+    if (i > 0)
+    {
+      #if defined(TEST) || defined(INFO)
+      *logofs << ".\n" << logofs_flush;
+      #endif
+    }
+    else
+    {
+      #if defined(TEST) || defined(INFO)
+      *logofs << "[none].\n" << logofs_flush;
+      #endif
+    }
+  }
+
+  #if defined(TEST) || defined(INFO)
+  *logofs << "Loop: Select timeout is "
+          << selectTs.tv_sec << " S and "
+          << (double) selectTs.tv_usec / 1000
+          << " Ms.\n" << logofs_flush;
+  #endif
+}
+
+static void handleCheckResultInLoop(int &resultFDs, int &errorFDs, int &setFDs, fd_set &readSet,
+                                        fd_set &writeSet, struct timeval &selectTs,
+                                            struct timeval &startTs)
+{
+  int diffTs = diffTimestamp(startTs, getNewTimestamp());
+
+  #if defined(TEST) || defined(INFO)
+
+  if (diffTs >= (control -> PingTimeout -
+                     (control -> LatencyTimeout * 4)))
+  {
+    *logofs << "Loop: Select result is [" << resultFDs
+            << "] at " << strMsTimestamp() << " with no "
+            << "communication within " << diffTs
+            << " Ms.\n" << logofs_flush;
+  }
+  else
+  {
+    *logofs << "Loop: Select result is [" << resultFDs
+            << "] error is [" << errorFDs << "] at "
+            << strMsTimestamp() << " after " << diffTs
+            << " Ms.\n" << logofs_flush;
+  }
+
+  #endif
+
+  int i;
+
+  if (resultFDs > 0)
+  {
+    i = 0;
+
+    #if defined(TEST) || defined(INFO)
+    *logofs << "Loop: Selected for read are ";
+    #endif
+
+    for (int j = 0; j < setFDs; j++)
+    {
+      if (FD_ISSET(j, &readSet))
+      {
+        #if defined(TEST) || defined(INFO)
+        *logofs << "[" << j << "]" << logofs_flush;
+        #endif
+
+        i++;
+      }
+    }
+
+    if (i > 0)
+    {
+      #if defined(TEST) || defined(INFO)
+      *logofs << ".\n" << logofs_flush;
+      #endif
+    }
+    else
+    {
+      #if defined(TEST) || defined(INFO)
+      *logofs << "[none].\n" << logofs_flush;
+      #endif
+    }
+
+    i = 0;
+
+    #if defined(TEST) || defined(INFO)
+    *logofs << "Loop: Selected for write are ";
+    #endif
+
+    for (int j = 0; j < setFDs; j++)
+    {
+      if (FD_ISSET(j, &writeSet))
+      {
+        #if defined(TEST) || defined(INFO)
+        *logofs << "[" << j << "]" << logofs_flush;
+        #endif
+
+        i++;
+      }
+    }
+
+    if (i > 0)
+    {
+      #if defined(TEST) || defined(INFO)
+      *logofs << ".\n" << logofs_flush;
+      #endif
+    }
+    else
+    {
+      #if defined(TEST) || defined(INFO)
+      *logofs << "[none].\n" << logofs_flush;
+      #endif
+    }
+  }
+}
+
+#endif
+
+static void handleCheckSessionInConnect()
+{
+  #ifdef TEST
+  *logofs << "Loop: Going to check session in connect.\n"
+          << logofs_flush;
+  #endif
+
+  if (control -> ProxyMode == proxy_client)
+  {
+    HandleAlert(FAILED_PROXY_CONNECTION_CLIENT_ALERT, 1);
+  }
+  else if (IsNotRunning(lastDialog))
+  {
+    HandleAlert(FAILED_PROXY_CONNECTION_SERVER_ALERT, 1);
+  }
+
+  handleAlertInLoop();
+}
+
+static void handleStatisticsInLoop()
+{
+  if (lastSignal == 0)
+  {
+    return;
+  }
+
+  int mode = NO_STATS;
+
+  if (control -> EnableStatistics == 1)
+  {
+    if (lastSignal == SIGUSR1)
+    {
+      //
+      // Print overall statistics.
+      //
+
+      mode = TOTAL_STATS;
+    }
+    else if (lastSignal == SIGUSR2)
+    {
+      //
+      // Print partial statistics.
+      //
+
+      mode = PARTIAL_STATS;
+    }
+
+    if (mode == TOTAL_STATS || mode == PARTIAL_STATS)
+    {
+      #ifdef TEST
+      *logofs << "Loop: Going to request proxy statistics "
+              << "with signal '" << DumpSignal(lastSignal)
+              << "'.\n" << logofs_flush;
+      #endif
+
+      if (proxy != NULL)
+      {
+        if (ReopenLogFile(statsFileName, statofs, 0) < 0)
+        {
+          HandleCleanup();
+        }
+
+        proxy -> handleStatistics(mode, statofs);
+      }
+    }
+  }
+}
+
+static void handleNegotiationInLoop(int &setFDs, fd_set &readSet,
+                                        fd_set &writeSet, T_timestamp &selectTs)
+{
+  int yield = 0;
+
+  while (yield == 0)
+  {
+    #ifdef TEST
+    *logofs << "Loop: Going to run a new negotiation loop "
+            << "with stage " << control -> ProxyStage
+            << " at " << strMsTimestamp() << ".\n"
+            << logofs_flush;
+    #endif
+
+    switch (control -> ProxyStage)
+    {
+      case stage_undefined:
+      {
+        #ifdef TEST
+        *logofs << "Loop: Handling negotiation with '"
+                << "stage_undefined" << "'.\n"
+                << logofs_flush;
+        #endif
+
+        control -> ProxyStage = stage_initializing;
+
+        break;
+      }
+      case stage_initializing:
+      {
+        #ifdef TEST
+        *logofs << "Loop: Handling negotiation with '"
+                << "stage_initializing" << "'.\n"
+                << logofs_flush;
+        #endif
+
+        InitBeforeNegotiation();
+
+        control -> ProxyStage = stage_connecting;
+
+        break;
+      }
+      case stage_connecting:
+      {
+        #ifdef TEST
+        *logofs << "Loop: Handling negotiation with '"
+                << "stage_connecting" << "'.\n"
+                << logofs_flush;
+        #endif
+
+        SetupProxyConnection();
+
+        control -> ProxyStage = stage_connected;
+
+        break;
+      }
+      case stage_connected:
+      {
+        #ifdef TEST
+        *logofs << "Loop: Handling negotiation with '"
+                << "stage_connected" << "'.\n"
+                << logofs_flush;
+        #endif
+
+        //
+        // Server side proxy must always be the one that
+        // sends its version and options first, so, in
+        // some way, client side can be the the one that
+        // has the last word on the matter.
+        //
+
+        if (control -> ProxyMode == proxy_server)
+        {
+          //
+          // Check if we have been listening for a
+          // forwarder. In this case it will have to
+          // authenticate itself.
+          //
+
+          if (WE_LISTEN_FORWARDER)
+          {
+            control -> ProxyStage = stage_waiting_forwarder_version;
+
+            break;
+          }
+
+          control -> ProxyStage = stage_sending_proxy_options;
+        }
+        else
+        {
+          //
+          // The X client side is the side that has to wait
+          // for the authorization cookie and any remote
+          // option.
+          //
+
+          control -> ProxyStage = stage_waiting_proxy_version;
+        }
+
+        break;
+      }
+      case stage_sending_proxy_options:
+      {
+        #ifdef TEST
+        *logofs << "Loop: Handling negotiation with '"
+                << "stage_sending_proxy_options" << "'.\n"
+                << logofs_flush;
+        #endif
+
+        if (SendProxyOptions(proxyFD) < 0)
+        {
+          goto handleNegotiationInLoopError;
+        }
+
+        if (control -> ProxyMode == proxy_server)
+        {
+          control -> ProxyStage = stage_waiting_proxy_version;
+        }
+        else
+        {
+          control -> ProxyStage = stage_sending_proxy_caches;
+        }
+
+        break;
+      }
+      case stage_waiting_forwarder_version:
+      {
+        #ifdef TEST
+        *logofs << "Loop: Handling negotiation with '"
+                << "stage_waiting_forwarder_version" << "'.\n"
+                << logofs_flush;
+        #endif
+
+        int result = ReadForwarderVersion(proxyFD);
+
+        if (result == 0)
+        {
+          yield = 1;
+        }
+        else if (result == 1)
+        {
+          control -> ProxyStage = stage_waiting_forwarder_options;
+        }
+        else
+        {
+          goto handleNegotiationInLoopError;
+        }
+
+        break;
+      }
+      case stage_waiting_forwarder_options:
+      {
+        #ifdef TEST
+        *logofs << "Loop: Handling negotiation with '"
+                << "stage_waiting_forwarder_options" << "'.\n"
+                << logofs_flush;
+        #endif
+
+        int result = ReadForwarderOptions(proxyFD);
+
+        if (result == 0)
+        {
+          yield = 1;
+        }
+        else if (result == 1)
+        {
+          control -> ProxyStage = stage_sending_proxy_options;
+        }
+        else
+        {
+          goto handleNegotiationInLoopError;
+        }
+
+        break;
+      }
+      case stage_waiting_proxy_version:
+      {
+        #ifdef TEST
+        *logofs << "Loop: Handling negotiation with '"
+                << "stage_waiting_proxy_version" << "'.\n"
+                << logofs_flush;
+        #endif
+
+        int result = ReadProxyVersion(proxyFD);
+
+        if (result == 0)
+        {
+          yield = 1;
+        }
+        else if (result == 1)
+        {
+          control -> ProxyStage = stage_waiting_proxy_options;
+        }
+        else
+        {
+          goto handleNegotiationInLoopError;
+        }
+
+        break;
+      }
+      case stage_waiting_proxy_options:
+      {
+        #ifdef TEST
+        *logofs << "Loop: Handling negotiation with '"
+                << "stage_waiting_proxy_options" << "'.\n"
+                << logofs_flush;
+        #endif
+
+        int result = ReadProxyOptions(proxyFD);
+
+        if (result == 0)
+        {
+          yield = 1;
+        }
+        else if (result == 1)
+        {
+          if (control -> ProxyMode == proxy_server)
+          {
+            control -> ProxyStage = stage_waiting_proxy_caches;
+          }
+          else
+          {
+            control -> ProxyStage = stage_sending_proxy_options;
+          }
+        }
+        else
+        {
+          goto handleNegotiationInLoopError;
+        }
+
+        break;
+      }
+      case stage_sending_proxy_caches:
+      {
+        #ifdef TEST
+        *logofs << "Loop: Handling negotiation with '"
+                << "stage_sending_proxy_caches" << "'.\n"
+                << logofs_flush;
+        #endif
+
+        if (SendProxyCaches(proxyFD) < 0)
+        {
+          goto handleNegotiationInLoopError;
+        }
+
+        if (control -> ProxyMode == proxy_server)
+        {
+          control -> ProxyStage = stage_operational;
+        }
+        else
+        {
+          control -> ProxyStage = stage_waiting_proxy_caches;
+        }
+
+        break;
+      }
+      case stage_waiting_proxy_caches:
+      {
+        #ifdef TEST
+        *logofs << "Loop: Handling negotiation with '"
+                << "stage_waiting_proxy_caches" << "'.\n"
+                << logofs_flush;
+        #endif
+
+        int result = ReadProxyCaches(proxyFD);
+
+        if (result == 0)
+        {
+          yield = 1;
+        }
+        else if (result == 1)
+        {
+          if (control -> ProxyMode == proxy_server)
+          {
+            control -> ProxyStage = stage_sending_proxy_caches;
+          }
+          else
+          {
+            control -> ProxyStage = stage_operational;
+          }
+        }
+        else
+        {
+          goto handleNegotiationInLoopError;
+        }
+
+        break;
+      }
+      case stage_operational:
+      {
+        #ifdef TEST
+        *logofs << "Loop: Handling negotiation with '"
+                << "stage_operational" << "'.\n"
+                << logofs_flush;
+        #endif
+
+        InitAfterNegotiation();
+
+        yield = 1;
+
+        break;
+      }
+      default:
+      {
+        #ifdef PANIC
+        *logofs << "Loop: PANIC! Unmanaged case '" << control -> ProxyStage
+                << "' while handling negotiation.\n" << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Unmanaged case '" << control -> ProxyStage
+             << "' while handling negotiation.\n";
+
+        HandleCleanup();
+      }
+    }
+  }
+
+  //
+  // Check if the user requested the end of
+  // the session.
+  //
+  
+  if (CheckAbort() != 0)
+  {
+    HandleCleanup();
+  }
+
+  //
+  // Select the proxy descriptor so that we
+  // can proceed negotiating the session.
+  //
+
+  FD_SET(proxyFD, &readSet);
+
+  if (proxyFD >= setFDs)
+  {
+    setFDs = proxyFD + 1;
+  }
+
+  setMinTimestamp(selectTs, control -> PingTimeout);
+
+  #ifdef TEST
+  *logofs << "Loop: Selected proxy FD#" << proxyFD << " in negotiation "
+          << "phase with timeout of " << selectTs.tv_sec << " S and "
+          << selectTs.tv_usec << " Ms.\n" << logofs_flush;
+  #endif
+
+  return;
+
+handleNegotiationInLoopError:
+
+  #ifdef PANIC
+  *logofs << "Loop: PANIC! Failure negotiating the session in stage '"
+          << control -> ProxyStage << "'.\n" << logofs_flush;
+  #endif
+
+  cerr << "Error" << ": Failure negotiating the session in stage '"
+       << control -> ProxyStage << "'.\n";
+
+
+  if (control -> ProxyMode == proxy_server &&
+          control -> ProxyStage == stage_waiting_proxy_version)
+  {
+    #ifdef PANIC
+    *logofs << "Loop: PANIC! Wrong version or invalid session "
+            << "authentication cookie.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Wrong version or invalid session "
+         << "authentication cookie.\n";
+  }
+
+  handleTerminatingInLoop();
+
+  HandleCleanup();
+}
+
+static void handleTerminatingInLoop()
+{
+  if (getpid() == lastProxy)
+  {
+    if (control -> ProxyStage < stage_terminating)
+    {
+      if (agent == NULL)
+      {
+        cerr << "Session" << ": Terminating session at '"
+             << strTimestamp() << "'.\n";
+      }
+
+      control -> ProxyStage = stage_terminating;
+    }
+  }
+}
+
+static void handleTerminatedInLoop()
+{
+  if (getpid() == lastProxy)
+  {
+    if (control -> ProxyStage < stage_terminated)
+    {
+      if (agent == NULL)
+      {
+        cerr << "Session" << ": Session terminated at '"
+             << strTimestamp() << "'.\n";
+      }
+
+      control -> ProxyStage = stage_terminated;
+    }
+  }
+}
+
+static void handleAlertInLoop()
+{
+  if (lastAlert.code == 0)
+  {
+    return;
+  }
+
+  //
+  // Since ProtoStep7 (#issue 108)
+  //
+  // Now the remote proxy should always
+  // be able to handle the alert
+  //
+
+  if (lastAlert.local == 0)
+  {
+    if (proxy != NULL)
+    {
+      #if defined(TEST) || defined(INFO)
+      *logofs << "Loop: Requesting a remote alert with code '"
+              << lastAlert.code << "'.\n" << logofs_flush;
+      #endif
+
+      if (proxy -> handleAlert(lastAlert.code) < 0)
+      {
+        HandleShutdown();
+      }
+    }
+  }
+  else
+  {
+    #if defined(TEST) || defined(INFO)
+    *logofs << "Loop: Handling a local alert with code '"
+            << lastAlert.code << "'.\n" << logofs_flush;
+    #endif
+
+    if (control -> ProxyMode == proxy_client)
+    {
+      //
+      // If we are at X client side and server
+      // proxy is not responding, we don't have
+      // any possibility to interact with user.
+      //
+
+      if (lastAlert.code != CLOSE_DEAD_PROXY_CONNECTION_CLIENT_ALERT &&
+              lastAlert.code != RESTART_DEAD_PROXY_CONNECTION_CLIENT_ALERT &&
+                  lastAlert.code != FAILED_PROXY_CONNECTION_CLIENT_ALERT)
+      {
+        //
+        // Let the server proxy show the dialog.
+        //
+
+        if (proxy != NULL &&
+                proxy -> handleAlert(lastAlert.code) < 0)
+        {
+          HandleShutdown();
+        }
+      }
+    }
+    else
+    {
+      char caption[DEFAULT_STRING_LENGTH];
+
+      strcpy(caption, ALERT_CAPTION_PREFIX);
+
+      int length = strlen(sessionId);
+
+      //
+      // Get rid of the trailing MD5 from session id.
+      //
+
+      if (length > (MD5_LENGTH * 2 + 1) &&
+              *(sessionId + (length - (MD5_LENGTH * 2 + 1))) == '-')
+      {
+        strncat(caption, sessionId, length - (MD5_LENGTH * 2 + 1));
+      }
+      else
+      {
+        strcat(caption, sessionId);
+      }
+
+      //
+      // Use the display to which we are forwarding
+      // the remote X connections.
+      // 
+
+      char *display = displayHost;
+
+      int replace = 1;
+      int local   = 1;
+
+      const char *message;
+      const char *type;
+
+      switch (lastAlert.code)
+      {
+        case CLOSE_DEAD_X_CONNECTION_CLIENT_ALERT:
+        {
+          message = CLOSE_DEAD_X_CONNECTION_CLIENT_ALERT_STRING;
+          type    = CLOSE_DEAD_X_CONNECTION_CLIENT_ALERT_TYPE;
+
+          break;
+        }
+        case CLOSE_DEAD_X_CONNECTION_SERVER_ALERT:
+        {
+          message = CLOSE_DEAD_X_CONNECTION_SERVER_ALERT_STRING;
+          type    = CLOSE_DEAD_X_CONNECTION_SERVER_ALERT_TYPE;
+
+          break;
+        }
+        case CLOSE_DEAD_PROXY_CONNECTION_SERVER_ALERT:
+        {
+          message = CLOSE_DEAD_PROXY_CONNECTION_SERVER_ALERT_STRING;
+          type    = CLOSE_DEAD_PROXY_CONNECTION_SERVER_ALERT_TYPE;
+
+          break;
+        }
+        case RESTART_DEAD_PROXY_CONNECTION_SERVER_ALERT:
+        {
+          message = RESTART_DEAD_PROXY_CONNECTION_SERVER_ALERT_STRING;
+          type    = RESTART_DEAD_PROXY_CONNECTION_SERVER_ALERT_TYPE;
+
+          break;
+        }
+        case CLOSE_UNRESPONSIVE_X_SERVER_ALERT:
+        {
+          message = CLOSE_UNRESPONSIVE_X_SERVER_ALERT_STRING;
+          type    = CLOSE_UNRESPONSIVE_X_SERVER_ALERT_TYPE;
+
+          break;
+        }
+        case WRONG_PROXY_VERSION_ALERT:
+        {
+          message = WRONG_PROXY_VERSION_ALERT_STRING;
+          type    = WRONG_PROXY_VERSION_ALERT_TYPE;
+
+          break;
+        }
+        case FAILED_PROXY_CONNECTION_SERVER_ALERT:
+        {
+          message = FAILED_PROXY_CONNECTION_SERVER_ALERT_STRING;
+          type    = FAILED_PROXY_CONNECTION_SERVER_ALERT_TYPE;
+
+          break;
+        }
+        case MISSING_PROXY_CACHE_ALERT:
+        {
+          message = MISSING_PROXY_CACHE_ALERT_STRING;
+          type    = MISSING_PROXY_CACHE_ALERT_TYPE;
+
+          break;
+        }
+        case ABORT_PROXY_CONNECTION_ALERT:
+        {
+          message = ABORT_PROXY_CONNECTION_ALERT_STRING;
+          type    = ABORT_PROXY_CONNECTION_ALERT_TYPE;
+
+          break;
+        }
+        case DISPLACE_MESSAGE_ALERT:
+        {
+          message = DISPLACE_MESSAGE_ALERT_STRING;
+          type    = DISPLACE_MESSAGE_ALERT_TYPE;
+
+          break;
+        }
+        case GREETING_MESSAGE_ALERT:
+        {
+          message = GREETING_MESSAGE_ALERT_STRING;
+          type    = GREETING_MESSAGE_ALERT_TYPE;
+
+          break;
+        }
+        case START_RESUME_SESSION_ALERT:
+        {
+          message = START_RESUME_SESSION_ALERT_STRING;
+          type    = START_RESUME_SESSION_ALERT_TYPE;
+
+          break;
+        }
+        case FAILED_RESUME_DISPLAY_ALERT:
+        {
+          message = FAILED_RESUME_DISPLAY_ALERT_STRING;
+          type    = FAILED_RESUME_DISPLAY_ALERT_TYPE;
+
+          break;
+        }
+        case FAILED_RESUME_DISPLAY_BROKEN_ALERT:
+        {
+          message = FAILED_RESUME_DISPLAY_BROKEN_STRING;
+          type    = FAILED_RESUME_DISPLAY_BROKEN_TYPE;
+
+          break;
+        }
+        case FAILED_RESUME_VISUALS_ALERT:
+        {
+          message = FAILED_RESUME_VISUALS_ALERT_STRING;
+          type    = FAILED_RESUME_VISUALS_ALERT_TYPE;
+
+          break;
+        }
+        case FAILED_RESUME_COLORMAPS_ALERT:
+        {
+          message = FAILED_RESUME_COLORMAPS_ALERT_STRING;
+          type    = FAILED_RESUME_COLORMAPS_ALERT_TYPE;
+
+          break;
+        }
+        case FAILED_RESUME_PIXMAPS_ALERT:
+        {
+          message = FAILED_RESUME_PIXMAPS_ALERT_STRING;
+          type    = FAILED_RESUME_PIXMAPS_ALERT_TYPE;
+
+          break;
+        }
+        case FAILED_RESUME_DEPTHS_ALERT:
+        {
+          message = FAILED_RESUME_DEPTHS_ALERT_STRING;
+          type    = FAILED_RESUME_DEPTHS_ALERT_TYPE;
+
+          break;
+        }
+        case FAILED_RESUME_RENDER_ALERT:
+        {
+          message = FAILED_RESUME_RENDER_ALERT_STRING;
+          type    = FAILED_RESUME_RENDER_ALERT_TYPE;
+
+          break;
+        }
+        case FAILED_RESUME_FONTS_ALERT:
+        {
+          message = FAILED_RESUME_FONTS_ALERT_STRING;
+          type    = FAILED_RESUME_FONTS_ALERT_TYPE;
+
+          break;
+        }
+        case INTERNAL_ERROR_ALERT:
+        {
+          message = INTERNAL_ERROR_ALERT_STRING;
+          type    = INTERNAL_ERROR_ALERT_TYPE;
+
+          break;
+        }
+        case ABORT_PROXY_NEGOTIATION_ALERT:
+        {
+          message = ABORT_PROXY_NEGOTIATION_ALERT_STRING;
+          type    = ABORT_PROXY_NEGOTIATION_ALERT_TYPE;
+
+          break;
+        }
+        case ABORT_PROXY_SHUTDOWN_ALERT:
+        {
+          message = ABORT_PROXY_SHUTDOWN_ALERT_STRING;
+          type    = ABORT_PROXY_SHUTDOWN_ALERT_TYPE;
+
+          break;
+        }
+        case FAILED_XDMCP_CONNECTION_ALERT:
+        {
+          message = FAILED_XDMCP_CONNECTION_ALERT_STRING;
+          type    = FAILED_XDMCP_CONNECTION_ALERT_TYPE;
+
+          break;
+        }
+        default:
+        {
+          if (lastAlert.code > LAST_PROTO_STEP_7_ALERT)
+          {
+            #ifdef WARNING
+            *logofs << "Loop: WARNING! An unrecognized alert type '"
+                    << lastAlert.code << "' was requested.\n"
+                    << logofs_flush;
+            #endif
+
+            cerr << "Warning" << ": An unrecognized alert type '"
+                 << lastAlert.code << "' was requested.\n";
+          }
+          #ifdef WARNING
+          else
+          {
+            *logofs << "Loop: WARNING! Ignoring obsolete alert type '"
+                    << lastAlert.code << "'.\n" << logofs_flush;
+          }
+          #endif
+
+          message = NULL;
+          type    = NULL;
+
+          replace = 0;
+
+          break;
+        }
+      }
+
+      if (replace == 1 && IsRunning(lastDialog))
+      {
+        #if defined(TEST) || defined(INFO)
+        *logofs << "Loop: Killing the previous dialog with pid '"
+                << lastDialog << "'.\n" << logofs_flush;
+        #endif
+
+        //
+        // The client ignores the TERM signal
+        // on Windows.
+        //
+
+        #ifdef __CYGWIN32__
+
+        KillProcess(lastDialog, "dialog", SIGKILL, 0);
+
+        #else
+
+        KillProcess(lastDialog, "dialog", SIGTERM, 0);
+
+        #endif
+
+        SetNotRunning(lastDialog);
+
+        if (proxy != NULL)
+        {
+          proxy -> handleResetAlert();
+        }
+      }
+
+      if (message != NULL && type != NULL)
+      {
+        lastDialog = NXTransDialog(caption, message, 0, type, local, display);
+
+        if (IsFailed(lastDialog))
+        {
+          #ifdef PANIC
+          *logofs << "Loop: PANIC! Can't start the NX dialog process.\n"
+                  << logofs_flush;
+          #endif
+
+          SetNotRunning(lastDialog);
+        }
+        #if defined(TEST) || defined(INFO)
+        else
+        {
+          *logofs << "Loop: Dialog started with pid '"
+                  << lastDialog << "'.\n" << logofs_flush;
+        }
+        #endif
+      }
+      #if defined(TEST) || defined(INFO)
+      else
+      {
+        *logofs << "Loop: No new dialog required for code '"
+                << lastAlert.code << "'.\n" << logofs_flush;
+      }
+      #endif
+    }
+  }
+
+  //
+  // Reset state.
+  //
+
+  lastAlert.code  = 0;
+  lastAlert.local = 0;
+}
+
+static inline void handleSetAgentInLoop(int &setFDs, fd_set &readSet,
+                                            fd_set &writeSet, struct timeval &selectTs)
+{
+  #ifdef TEST
+  *logofs << "Loop: Preparing the masks for the agent descriptors.\n"
+          << logofs_flush;
+  #endif
+
+  agent -> saveChannelState();
+
+  agent -> saveReadMask(&readSet);
+  agent -> saveWriteMask(&writeSet);
+
+  if (control -> ProxyStage >= stage_operational)
+  {
+    if (agent -> remoteCanRead(&readSet) ||
+            agent -> remoteCanWrite(&writeSet) ||
+                agent -> localCanRead() ||
+                    agent -> proxyCanRead())
+    {
+      #ifdef TEST
+      *logofs << "Loop: Setting a null timeout with agent descriptors ready.\n"
+              << logofs_flush;
+      #endif
+
+      //
+      // Force a null timeout so we'll bail out
+      // of the select immediately. We will ac-
+      // comodate the result code later.
+      //
+
+      selectTs.tv_sec  = 0;
+      selectTs.tv_usec = 0;
+    }
+  }
+
+  #ifdef TEST
+  *logofs << "Loop: Clearing the read and write agent descriptors.\n"
+          << logofs_flush;
+  #endif
+
+  agent -> clearReadMask(&readSet);
+  agent -> clearWriteMask(&writeSet);
+}
+
+static inline void handleAgentInLoop(int &resultFDs, int &errorFDs, int &setFDs, fd_set &readSet,
+                                         fd_set &writeSet, struct timeval &selectTs)
+{
+  #if defined(TEST) || defined(INFO)
+  *logofs << "Loop: Setting proxy and local agent descriptors.\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // Check if I/O is possible on the local
+  // agent or the proxy descriptor.
+  //
+  
+  if (resultFDs >= 0)
+  {
+    //
+    // Save if the proxy can read from the
+    // the agent descriptor.
+    //
+
+    agent -> saveChannelState();
+
+    #if defined(TEST) || defined(INFO)
+    *logofs << "Loop: Values were resultFDs " << resultFDs
+            << " errorFDs " << errorFDs << " setFDs "
+            << setFDs << ".\n" << logofs_flush;
+    #endif
+
+    if (agent -> localCanRead() == 1)
+    {
+      #if defined(TEST) || defined(INFO)
+      *logofs << "Loop: Setting agent descriptor FD#" << agent ->
+                 getLocalFd() << " as ready to read.\n"
+              << logofs_flush;
+      #endif
+
+      agent -> setLocalRead(&readSet, &resultFDs);
+    }
+
+    #if defined(TEST) || defined(INFO)
+
+    if (agent -> proxyCanRead(&readSet) == 0 &&
+            agent -> proxyCanRead() == 1)
+    {
+      *logofs << "Loop: WARNING! Can read from proxy FD#"
+              << proxyFD << " but the descriptor "
+              << "is not selected.\n" << logofs_flush;
+    }
+
+    if (agent -> proxyCanRead(&readSet) == 1)
+    {
+      *logofs << "Loop: Setting proxy descriptor FD#" << agent ->
+                 getProxyFd() << " as ready to read.\n"
+              << logofs_flush;
+    }
+
+    #endif
+
+    #if defined(TEST) || defined(INFO)
+    *logofs << "Loop: Values are now resultFDs " << resultFDs
+            << " errorFDs " << errorFDs << " setFDs "
+            << setFDs << ".\n" << logofs_flush;
+    #endif
+  }
+}
+
+static inline void handleAgentLateInLoop(int &resultFDs, int &errorFDs, int &setFDs, fd_set &readSet,
+                                             fd_set &writeSet, struct timeval &selectTs)
+{
+  #if defined(TEST) || defined(INFO)
+  *logofs << "Loop: Setting remote agent descriptors.\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // We reset the masks before calling our select.
+  // We now set the descriptors that are ready but
+  // only if they were set in the original mask.
+  // We do this after having executed our loop as
+  // we may have produced more data and the agent
+  // descriptors may have become readable or writ-
+  // able in the meanwhile.
+  //
+  
+  if (resultFDs >= 0)
+  {
+    //
+    // Save if the proxy can read from the
+    // the agent descriptor.
+    //
+
+    agent -> saveChannelState();
+
+    #if defined(TEST) || defined(INFO)
+    *logofs << "Loop: Values were resultFDs " << resultFDs
+            << " errorFDs " << errorFDs << " setFDs "
+            << setFDs << ".\n" << logofs_flush;
+    #endif
+
+    if (agent -> remoteCanRead(agent ->
+            getSavedReadMask()) == 1)
+    {
+      #if defined(TEST) || defined(INFO)
+      *logofs << "Loop: Setting agent descriptor FD#" << agent ->
+                 getRemoteFd() << " as ready to read.\n"
+              << logofs_flush;
+      #endif
+
+      agent -> setRemoteRead(&readSet, &resultFDs);
+    }
+
+    if (agent -> remoteCanWrite(agent ->
+            getSavedWriteMask()) == 1)
+    {
+      #if defined(TEST) || defined(INFO)
+      *logofs << "Loop: Setting agent descriptor FD#" << agent ->
+                 getRemoteFd() << " as ready to write.\n"
+              << logofs_flush;
+      #endif
+
+      agent -> setRemoteWrite(&writeSet, &resultFDs);
+    }
+
+    #if defined(TEST) || defined(INFO)
+    *logofs << "Loop: Values are now resultFDs " << resultFDs
+            << " errorFDs " << errorFDs << " setFDs "
+            << setFDs << ".\n" << logofs_flush;
+    #endif
+  }
+}
+
+static inline void handleReadableInLoop(int &resultFDs, fd_set &readSet)
+{
+  if (resultFDs > 0)
+  {
+    T_channel_type type = channel_none;
+
+    const char *label = NULL;
+    int domain  = -1;
+    int fd      = -1;
+
+    if (tcpFD != -1 && FD_ISSET(tcpFD, &readSet))
+    {
+      type   = channel_x11;
+      label  = "X";
+      domain = AF_INET;
+      fd     = tcpFD;
+
+      resultFDs--;
+    }
+
+    if (unixFD != -1 && FD_ISSET(unixFD, &readSet))
+    {
+      type   = channel_x11;
+      label  = "X";
+      domain = AF_UNIX;
+      fd     = unixFD;
+
+      resultFDs--;
+    }
+
+    if (cupsFD != -1 && FD_ISSET(cupsFD, &readSet))
+    {
+      type   = channel_cups;
+      label  = "CUPS";
+      domain = AF_INET;
+      fd     = cupsFD;
+
+      resultFDs--;
+    }
+
+    if (auxFD != -1 && FD_ISSET(auxFD, &readSet))
+    {
+      //
+      // Starting from version 1.5.0 we create real X
+      // connections for the keyboard channel, so they
+      // can use the fake authorization cookie. This
+      // means that there is not such a thing like a
+      // channel_aux anymore.
+      //
+
+      type   = channel_x11;
+      label  = "auxiliary X11";
+      domain = AF_INET;
+      fd     = auxFD;
+
+      resultFDs--;
+    }
+
+    if (smbFD != -1 && FD_ISSET(smbFD, &readSet))
+    {
+      type   = channel_smb;
+      label  = "SMB";
+      domain = AF_INET;
+      fd     = smbFD;
+
+      resultFDs--;
+    }
+
+    if (mediaFD != -1 && FD_ISSET(mediaFD, &readSet))
+    {
+      type   = channel_media;
+      label  = "media";
+      domain = AF_INET;
+      fd     = mediaFD;
+
+      resultFDs--;
+    }
+
+    if (httpFD != -1 && FD_ISSET(httpFD, &readSet))
+    {
+      type   = channel_http;
+      label  = "HTTP";
+      domain = AF_INET;
+      fd     = httpFD;
+
+      resultFDs--;
+    }
+
+    if (fontFD != -1 && FD_ISSET(fontFD, &readSet))
+    {
+      type   = channel_font;
+      label  = "font server";
+      domain = AF_INET;
+      fd     = fontFD;
+
+      resultFDs--;
+    }
+
+    if (slaveFD != -1 && FD_ISSET(slaveFD, &readSet))
+    {
+      type   = channel_slave;
+      label  = "slave";
+      domain = AF_INET;
+      fd     = slaveFD;
+
+      resultFDs--;
+    }
+
+    if (type != channel_none)
+    {
+      int newFD = AcceptConnection(fd, domain, label);
+
+      if (newFD != -1)
+      {
+        if (proxy -> handleNewConnection(type, newFD) < 0)
+        {
+          #ifdef PANIC
+          *logofs << "Loop: PANIC! Error creating new " << label
+                  << " connection.\n" << logofs_flush;
+          #endif
+
+          cerr << "Error" << ": Error creating new " << label
+               << " connection.\n";
+
+          close(newFD);
+
+          //
+          // Don't kill the proxy in the case of an error.
+          //
+          // HandleCleanup();
+          //
+        }
+        else if (proxy -> getReadable(newFD) > 0)
+        {
+          //
+          // Add the descriptor, so we can try
+          // to read immediately.
+          //
+
+          #ifdef TEST
+          *logofs << "Loop: Trying to read immediately "
+                  << "from descriptor FD#" << newFD
+                  << ".\n" << logofs_flush;
+          #endif
+
+          FD_SET(newFD, &readSet);
+
+          resultFDs++;
+        }
+        #ifdef TEST
+        else
+        {
+          *logofs << "Loop: Nothing to read immediately "
+                  << "from descriptor FD#" << newFD
+                  << ".\n" << logofs_flush;
+        }
+        #endif
+      }
+    }
+  }
+
+  #ifdef DEBUG
+  *logofs << "Loop: Going to check the readable descriptors.\n"
+          << logofs_flush;
+  #endif
+
+  if (proxy -> handleRead(resultFDs, readSet) < 0)
+  {
+    #ifdef TEST
+    *logofs << "Loop: Failure reading from descriptors "
+            << "for proxy FD#" << proxyFD << ".\n"
+            << logofs_flush;
+    #endif
+
+    HandleShutdown();
+  }
+}
+
+static inline void handleWritableInLoop(int &resultFDs, fd_set &writeSet)
+{
+  #ifdef DEBUG
+  *logofs << "Loop: Going to check the writable descriptors.\n"
+          << logofs_flush;
+  #endif
+
+  if (resultFDs > 0 && proxy -> handleFlush(resultFDs, writeSet) < 0)
+  {
+    #ifdef TEST
+    *logofs << "Loop: Failure writing to descriptors "
+            << "for proxy FD#" << proxyFD << ".\n"
+            << logofs_flush;
+    #endif
+
+    HandleShutdown();
+  }
+}
+
+static inline void handleFlushInLoop()
+{
+  #ifdef DEBUG
+  *logofs << "Loop: Going to flush any data to the proxy.\n"
+          << logofs_flush;
+  #endif
+
+  if (agent == NULL || control ->
+          FlushPolicy == policy_immediate)
+  {
+    #if defined(TEST) || defined(INFO)
+
+    if (usePolicy == -1 && control ->
+            ProxyMode == proxy_client)
+    {
+      *logofs << "Loop: WARNING! Flushing the proxy link "
+              << "on behalf of the agent.\n" << logofs_flush;
+    }
+
+    #endif
+
+    if (proxy -> handleFlush() < 0)
+    {
+      #ifdef TEST
+      *logofs << "Loop: Failure flushing the proxy FD#"
+              << proxyFD << ".\n" << logofs_flush;
+      #endif
+
+      HandleShutdown();
+    }
+  }
+}
+
+static inline void handleRotateInLoop()
+{
+  #ifdef DEBUG
+  *logofs << "Loop: Going to rotate channels "
+          << "for proxy FD#" << proxyFD << ".\n"
+          << logofs_flush;
+  #endif
+
+  proxy -> handleRotate();
+}
+
+static inline void handleEventsInLoop()
+{
+  #ifdef DEBUG
+  *logofs << "Loop: Going to check channel events "
+          << "for proxy FD#" << proxyFD << ".\n"
+          << logofs_flush;
+  #endif
+
+  if (proxy -> handleEvents() < 0)
+  {
+    #ifdef TEST
+    *logofs << "Loop: Failure handling channel events "
+            << "for proxy FD#" << proxyFD << ".\n"
+            << logofs_flush;
+    #endif
+
+    HandleShutdown();
+  }
+}
+
+static void handleLogReopenInLoop(T_timestamp &logsTs, T_timestamp &nowTs)
+{
+  //
+  // If need to limit the size of the
+  // log file, check the size at each
+  // loop.
+  //
+
+  #ifndef QUOTA
+
+  if (diffTimestamp(logsTs, nowTs) > control -> FileSizeCheckTimeout)
+
+  #endif
+  {
+    #ifdef DEBUG
+    *logofs << "Loop: Checking size of log file '"
+            << errorsFileName << "'.\n" << logofs_flush;
+    #endif
+
+    #ifndef MIXED
+
+    if (ReopenLogFile(errorsFileName, logofs, control -> FileSizeLimit) < 0)
+    {
+      HandleShutdown();
+    }
+
+    #endif
+
+    //
+    // Reset to current timestamp.
+    //
+
+    logsTs = nowTs;
+  }
+}
+
+static inline void handleSetReadInLoop(fd_set &readSet, int &setFDs, struct timeval &selectTs)
+{
+  proxy -> setReadDescriptors(&readSet, setFDs, selectTs);
+}
+
+static inline void handleSetWriteInLoop(fd_set &writeSet, int &setFDs, struct timeval &selectTs)
+{
+  proxy -> setWriteDescriptors(&writeSet, setFDs, selectTs);
+}
+
+static void handleSetListenersInLoop(fd_set &readSet, int &setFDs)
+{
+  //
+  // Set descriptors of listening sockets.
+  //
+
+  if (control -> ProxyMode == proxy_client)
+  {
+    if (useTcpSocket == 1)
+    {
+      FD_SET(tcpFD, &readSet);
+
+      if (tcpFD >= setFDs)
+      {
+        setFDs = tcpFD + 1;
+      }
+
+      #ifdef DEBUG
+      *logofs << "Loop: Selected listener tcpFD " << tcpFD
+              << " with setFDs " << setFDs << ".\n"
+              << logofs_flush;
+      #endif
+    }
+
+    if (useUnixSocket == 1)
+    {
+      FD_SET(unixFD, &readSet);
+
+      if (unixFD >= setFDs)
+      {
+        setFDs = unixFD + 1;
+      }
+
+      #ifdef DEBUG
+      *logofs << "Loop: Selected listener unixFD " << unixFD
+              << " with setFDs " << setFDs << ".\n"
+              << logofs_flush;
+      #endif
+    }
+
+    if (useCupsSocket == 1)
+    {
+      FD_SET(cupsFD, &readSet);
+
+      if (cupsFD >= setFDs)
+      {
+        setFDs = cupsFD + 1;
+      }
+
+      #ifdef DEBUG
+      *logofs << "Loop: Selected listener cupsFD " << cupsFD
+              << " with setFDs " << setFDs << ".\n"
+              << logofs_flush;
+      #endif
+    }
+
+    if (useAuxSocket == 1)
+    {
+      FD_SET(auxFD, &readSet);
+
+      if (auxFD >= setFDs)
+      {
+        setFDs = auxFD + 1;
+      }
+
+      #ifdef DEBUG
+      *logofs << "Loop: Selected listener auxFD " << auxFD
+              << " with setFDs " << setFDs << ".\n"
+              << logofs_flush;
+      #endif
+    }
+
+    if (useSmbSocket == 1)
+    {
+      FD_SET(smbFD, &readSet);
+
+      if (smbFD >= setFDs)
+      {
+        setFDs = smbFD + 1;
+      }
+
+      #ifdef DEBUG
+      *logofs << "Loop: Selected listener smbFD " << smbFD
+              << " with setFDs " << setFDs << ".\n"
+              << logofs_flush;
+      #endif
+    }
+
+    if (useMediaSocket == 1)
+    {
+      FD_SET(mediaFD, &readSet);
+
+      if (mediaFD >= setFDs)
+      {
+        setFDs = mediaFD + 1;
+      }
+
+      #ifdef DEBUG
+      *logofs << "Loop: Selected listener mediaFD " << mediaFD
+              << " with setFDs " << setFDs << ".\n"
+              << logofs_flush;
+      #endif
+    }
+
+    if (useHttpSocket == 1)
+    {
+      FD_SET(httpFD, &readSet);
+
+      if (httpFD >= setFDs)
+      {
+        setFDs = httpFD + 1;
+      }
+
+      #ifdef DEBUG
+      *logofs << "Loop: Selected listener httpFD " << httpFD
+              << " with setFDs " << setFDs << ".\n"
+              << logofs_flush;
+      #endif
+    }
+  }
+  else
+  {
+    if (useFontSocket == 1)
+    {
+      FD_SET(fontFD, &readSet);
+
+      if (fontFD >= setFDs)
+      {
+        setFDs = fontFD + 1;
+      }
+
+      #ifdef DEBUG
+      *logofs << "Loop: Selected listener fontFD " << fontFD
+              << " with setFDs " << setFDs << ".\n"
+              << logofs_flush;
+      #endif
+    }
+  }
+
+  if (useSlaveSocket == 1)
+  {
+    FD_SET(slaveFD, &readSet);
+
+    if (slaveFD >= setFDs)
+    {
+      setFDs = slaveFD + 1;
+    }
+
+    #ifdef DEBUG
+    *logofs << "Loop: Selected listener slaveFD " << slaveFD
+            << " with setFDs " << setFDs << ".\n"
+            << logofs_flush;
+    #endif
+  }
+}
diff --git a/nxcomp/src/MD5.c b/nxcomp/src/MD5.c
new file mode 100644
index 000000000..7255ca5c0
--- /dev/null
+++ b/nxcomp/src/MD5.c
@@ -0,0 +1,403 @@
+/*
+  Copyright (C) 1999, 2000, 2002 Aladdin Enterprises.  All rights reserved.
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  L. Peter Deutsch
+  ghost@aladdin.com
+
+ */
+/* $Id: md5.c,v 1.6 2002/04/13 19:20:28 lpd Exp $ */
+/*
+  Independent implementation of MD5 (RFC 1321).
+
+  This code implements the MD5 Algorithm defined in RFC 1321, whose
+  text is available at
+	http://www.ietf.org/rfc/rfc1321.txt
+  The code is derived from the text of the RFC, including the test suite
+  (section A.5) but excluding the rest of Appendix A.  It does not include
+  any code or documentation that is identified in the RFC as being
+  copyrighted.
+
+  The original and principal author of md5.c is L. Peter Deutsch
+  <ghost@aladdin.com>.  Other authors are noted in the change history
+  that follows (in reverse chronological order):
+
+  2002-04-13 lpd Clarified derivation from RFC 1321; now handles byte order
+	either statically or dynamically; added missing #include <string.h>
+	in library.
+  2002-03-11 lpd Corrected argument list for main(), and added int return
+	type, in test program and T value program.
+  2002-02-21 lpd Added missing #include <stdio.h> in test program.
+  2000-07-03 lpd Patched to eliminate warnings about "constant is
+	unsigned in ANSI C, signed in traditional"; made test program
+	self-checking.
+  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
+  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5).
+  1999-05-03 lpd Original version.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "MD5.h"
+
+#include <string.h>
+
+/*
+ * Try to determine the CPU endianess
+ * at compile time.
+ */
+
+#if defined(__linux) || defined(__CYGWIN32__)
+
+#include <endian.h>
+
+#if (__BYTE_ORDER == __LITTLE_ENDIAN)
+#define ARCH_IS_BIG_ENDIAN 0
+#else
+#define ARCH_IS_BIG_ENDIAN 1
+#endif
+
+#endif /* #if defined(__linux) || defined(__CYGWIN32__) */
+
+#undef BYTE_ORDER	/* 1 = big-endian, -1 = little-endian, 0 = unknown */
+#ifdef ARCH_IS_BIG_ENDIAN
+#  define BYTE_ORDER (ARCH_IS_BIG_ENDIAN ? 1 : -1)
+#else
+#  define BYTE_ORDER 0
+#endif
+
+#define T_MASK ((md5_word_t)~0)
+#define T1 /* 0xd76aa478 */ (T_MASK ^ 0x28955b87)
+#define T2 /* 0xe8c7b756 */ (T_MASK ^ 0x173848a9)
+#define T3    0x242070db
+#define T4 /* 0xc1bdceee */ (T_MASK ^ 0x3e423111)
+#define T5 /* 0xf57c0faf */ (T_MASK ^ 0x0a83f050)
+#define T6    0x4787c62a
+#define T7 /* 0xa8304613 */ (T_MASK ^ 0x57cfb9ec)
+#define T8 /* 0xfd469501 */ (T_MASK ^ 0x02b96afe)
+#define T9    0x698098d8
+#define T10 /* 0x8b44f7af */ (T_MASK ^ 0x74bb0850)
+#define T11 /* 0xffff5bb1 */ (T_MASK ^ 0x0000a44e)
+#define T12 /* 0x895cd7be */ (T_MASK ^ 0x76a32841)
+#define T13    0x6b901122
+#define T14 /* 0xfd987193 */ (T_MASK ^ 0x02678e6c)
+#define T15 /* 0xa679438e */ (T_MASK ^ 0x5986bc71)
+#define T16    0x49b40821
+#define T17 /* 0xf61e2562 */ (T_MASK ^ 0x09e1da9d)
+#define T18 /* 0xc040b340 */ (T_MASK ^ 0x3fbf4cbf)
+#define T19    0x265e5a51
+#define T20 /* 0xe9b6c7aa */ (T_MASK ^ 0x16493855)
+#define T21 /* 0xd62f105d */ (T_MASK ^ 0x29d0efa2)
+#define T22    0x02441453
+#define T23 /* 0xd8a1e681 */ (T_MASK ^ 0x275e197e)
+#define T24 /* 0xe7d3fbc8 */ (T_MASK ^ 0x182c0437)
+#define T25    0x21e1cde6
+#define T26 /* 0xc33707d6 */ (T_MASK ^ 0x3cc8f829)
+#define T27 /* 0xf4d50d87 */ (T_MASK ^ 0x0b2af278)
+#define T28    0x455a14ed
+#define T29 /* 0xa9e3e905 */ (T_MASK ^ 0x561c16fa)
+#define T30 /* 0xfcefa3f8 */ (T_MASK ^ 0x03105c07)
+#define T31    0x676f02d9
+#define T32 /* 0x8d2a4c8a */ (T_MASK ^ 0x72d5b375)
+#define T33 /* 0xfffa3942 */ (T_MASK ^ 0x0005c6bd)
+#define T34 /* 0x8771f681 */ (T_MASK ^ 0x788e097e)
+#define T35    0x6d9d6122
+#define T36 /* 0xfde5380c */ (T_MASK ^ 0x021ac7f3)
+#define T37 /* 0xa4beea44 */ (T_MASK ^ 0x5b4115bb)
+#define T38    0x4bdecfa9
+#define T39 /* 0xf6bb4b60 */ (T_MASK ^ 0x0944b49f)
+#define T40 /* 0xbebfbc70 */ (T_MASK ^ 0x4140438f)
+#define T41    0x289b7ec6
+#define T42 /* 0xeaa127fa */ (T_MASK ^ 0x155ed805)
+#define T43 /* 0xd4ef3085 */ (T_MASK ^ 0x2b10cf7a)
+#define T44    0x04881d05
+#define T45 /* 0xd9d4d039 */ (T_MASK ^ 0x262b2fc6)
+#define T46 /* 0xe6db99e5 */ (T_MASK ^ 0x1924661a)
+#define T47    0x1fa27cf8
+#define T48 /* 0xc4ac5665 */ (T_MASK ^ 0x3b53a99a)
+#define T49 /* 0xf4292244 */ (T_MASK ^ 0x0bd6ddbb)
+#define T50    0x432aff97
+#define T51 /* 0xab9423a7 */ (T_MASK ^ 0x546bdc58)
+#define T52 /* 0xfc93a039 */ (T_MASK ^ 0x036c5fc6)
+#define T53    0x655b59c3
+#define T54 /* 0x8f0ccc92 */ (T_MASK ^ 0x70f3336d)
+#define T55 /* 0xffeff47d */ (T_MASK ^ 0x00100b82)
+#define T56 /* 0x85845dd1 */ (T_MASK ^ 0x7a7ba22e)
+#define T57    0x6fa87e4f
+#define T58 /* 0xfe2ce6e0 */ (T_MASK ^ 0x01d3191f)
+#define T59 /* 0xa3014314 */ (T_MASK ^ 0x5cfebceb)
+#define T60    0x4e0811a1
+#define T61 /* 0xf7537e82 */ (T_MASK ^ 0x08ac817d)
+#define T62 /* 0xbd3af235 */ (T_MASK ^ 0x42c50dca)
+#define T63    0x2ad7d2bb
+#define T64 /* 0xeb86d391 */ (T_MASK ^ 0x14792c6e)
+
+
+static void
+md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
+{
+    md5_word_t
+	a = pms->abcd[0], b = pms->abcd[1],
+	c = pms->abcd[2], d = pms->abcd[3];
+    md5_word_t t;
+#if BYTE_ORDER > 0
+    /* Define storage only for big-endian CPUs. */
+    md5_word_t X[16];
+#else
+    /* Define storage for little-endian or both types of CPUs. */
+    md5_word_t xbuf[16];
+    const md5_word_t *X;
+#endif
+
+    {
+#if BYTE_ORDER == 0
+	/*
+	 * Determine dynamically whether this is a big-endian or
+	 * little-endian machine, since we can use a more efficient
+	 * algorithm on the latter.
+	 */
+	static const int w = 1;
+
+	if (*((const md5_byte_t *)&w)) /* dynamic little-endian */
+#endif
+#if BYTE_ORDER <= 0		/* little-endian */
+	{
+	    /*
+	     * On little-endian machines, we can process properly aligned
+	     * data without copying it.
+	     */
+	    if (!((data - (const md5_byte_t *)0) & 3)) {
+		/* data are properly aligned */
+		X = (const md5_word_t *)data;
+	    } else {
+		/* not aligned */
+		memcpy(xbuf, data, 64);
+		X = xbuf;
+	    }
+	}
+#endif
+#if BYTE_ORDER == 0
+	else			/* dynamic big-endian */
+#endif
+#if BYTE_ORDER >= 0		/* big-endian */
+	{
+	    /*
+	     * On big-endian machines, we must arrange the bytes in the
+	     * right order.
+	     */
+	    const md5_byte_t *xp = data;
+	    int i;
+
+#  if BYTE_ORDER == 0
+	    X = xbuf;		/* (dynamic only) */
+#  else
+#    define xbuf X		/* (static only) */
+#  endif
+	    for (i = 0; i < 16; ++i, xp += 4)
+		xbuf[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24);
+	}
+#endif
+    }
+
+#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
+
+    /* Round 1. */
+    /* Let [abcd k s i] denote the operation
+       a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */
+#define F(x, y, z) (((x) & (y)) | (~(x) & (z)))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + F(b,c,d) + X[k] + Ti;\
+  a = ROTATE_LEFT(t, s) + b
+    /* Do the following 16 operations. */
+    SET(a, b, c, d,  0,  7,  T1);
+    SET(d, a, b, c,  1, 12,  T2);
+    SET(c, d, a, b,  2, 17,  T3);
+    SET(b, c, d, a,  3, 22,  T4);
+    SET(a, b, c, d,  4,  7,  T5);
+    SET(d, a, b, c,  5, 12,  T6);
+    SET(c, d, a, b,  6, 17,  T7);
+    SET(b, c, d, a,  7, 22,  T8);
+    SET(a, b, c, d,  8,  7,  T9);
+    SET(d, a, b, c,  9, 12, T10);
+    SET(c, d, a, b, 10, 17, T11);
+    SET(b, c, d, a, 11, 22, T12);
+    SET(a, b, c, d, 12,  7, T13);
+    SET(d, a, b, c, 13, 12, T14);
+    SET(c, d, a, b, 14, 17, T15);
+    SET(b, c, d, a, 15, 22, T16);
+#undef SET
+
+     /* Round 2. */
+     /* Let [abcd k s i] denote the operation
+          a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */
+#define G(x, y, z) (((x) & (z)) | ((y) & ~(z)))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + G(b,c,d) + X[k] + Ti;\
+  a = ROTATE_LEFT(t, s) + b
+     /* Do the following 16 operations. */
+    SET(a, b, c, d,  1,  5, T17);
+    SET(d, a, b, c,  6,  9, T18);
+    SET(c, d, a, b, 11, 14, T19);
+    SET(b, c, d, a,  0, 20, T20);
+    SET(a, b, c, d,  5,  5, T21);
+    SET(d, a, b, c, 10,  9, T22);
+    SET(c, d, a, b, 15, 14, T23);
+    SET(b, c, d, a,  4, 20, T24);
+    SET(a, b, c, d,  9,  5, T25);
+    SET(d, a, b, c, 14,  9, T26);
+    SET(c, d, a, b,  3, 14, T27);
+    SET(b, c, d, a,  8, 20, T28);
+    SET(a, b, c, d, 13,  5, T29);
+    SET(d, a, b, c,  2,  9, T30);
+    SET(c, d, a, b,  7, 14, T31);
+    SET(b, c, d, a, 12, 20, T32);
+#undef SET
+
+     /* Round 3. */
+     /* Let [abcd k s t] denote the operation
+          a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */
+#define H(x, y, z) ((x) ^ (y) ^ (z))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + H(b,c,d) + X[k] + Ti;\
+  a = ROTATE_LEFT(t, s) + b
+     /* Do the following 16 operations. */
+    SET(a, b, c, d,  5,  4, T33);
+    SET(d, a, b, c,  8, 11, T34);
+    SET(c, d, a, b, 11, 16, T35);
+    SET(b, c, d, a, 14, 23, T36);
+    SET(a, b, c, d,  1,  4, T37);
+    SET(d, a, b, c,  4, 11, T38);
+    SET(c, d, a, b,  7, 16, T39);
+    SET(b, c, d, a, 10, 23, T40);
+    SET(a, b, c, d, 13,  4, T41);
+    SET(d, a, b, c,  0, 11, T42);
+    SET(c, d, a, b,  3, 16, T43);
+    SET(b, c, d, a,  6, 23, T44);
+    SET(a, b, c, d,  9,  4, T45);
+    SET(d, a, b, c, 12, 11, T46);
+    SET(c, d, a, b, 15, 16, T47);
+    SET(b, c, d, a,  2, 23, T48);
+#undef SET
+
+     /* Round 4. */
+     /* Let [abcd k s t] denote the operation
+          a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */
+#define I(x, y, z) ((y) ^ ((x) | ~(z)))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + I(b,c,d) + X[k] + Ti;\
+  a = ROTATE_LEFT(t, s) + b
+     /* Do the following 16 operations. */
+    SET(a, b, c, d,  0,  6, T49);
+    SET(d, a, b, c,  7, 10, T50);
+    SET(c, d, a, b, 14, 15, T51);
+    SET(b, c, d, a,  5, 21, T52);
+    SET(a, b, c, d, 12,  6, T53);
+    SET(d, a, b, c,  3, 10, T54);
+    SET(c, d, a, b, 10, 15, T55);
+    SET(b, c, d, a,  1, 21, T56);
+    SET(a, b, c, d,  8,  6, T57);
+    SET(d, a, b, c, 15, 10, T58);
+    SET(c, d, a, b,  6, 15, T59);
+    SET(b, c, d, a, 13, 21, T60);
+    SET(a, b, c, d,  4,  6, T61);
+    SET(d, a, b, c, 11, 10, T62);
+    SET(c, d, a, b,  2, 15, T63);
+    SET(b, c, d, a,  9, 21, T64);
+#undef SET
+
+     /* Then perform the following additions. (That is increment each
+        of the four registers by the value it had before this block
+        was started.) */
+    pms->abcd[0] += a;
+    pms->abcd[1] += b;
+    pms->abcd[2] += c;
+    pms->abcd[3] += d;
+}
+
+void
+md5_init(md5_state_t *pms)
+{
+    pms->count[0] = pms->count[1] = 0;
+    pms->abcd[0] = 0x67452301;
+    pms->abcd[1] = /*0xefcdab89*/ T_MASK ^ 0x10325476;
+    pms->abcd[2] = /*0x98badcfe*/ T_MASK ^ 0x67452301;
+    pms->abcd[3] = 0x10325476;
+}
+
+void
+md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes)
+{
+    const md5_byte_t *p = data;
+    int left = nbytes;
+    int offset = (pms->count[0] >> 3) & 63;
+    md5_word_t nbits = (md5_word_t)(nbytes << 3);
+
+    if (nbytes <= 0)
+	return;
+
+    /* Update the message length. */
+    pms->count[1] += nbytes >> 29;
+    pms->count[0] += nbits;
+    if (pms->count[0] < nbits)
+	pms->count[1]++;
+
+    /* Process an initial partial block. */
+    if (offset) {
+	int copy = (offset + nbytes > 64 ? 64 - offset : nbytes);
+
+	memcpy(pms->buf + offset, p, copy);
+	if (offset + copy < 64)
+	    return;
+	p += copy;
+	left -= copy;
+	md5_process(pms, pms->buf);
+    }
+
+    /* Process full blocks. */
+    for (; left >= 64; p += 64, left -= 64)
+	md5_process(pms, p);
+
+    /* Process a final partial block. */
+    if (left)
+	memcpy(pms->buf, p, left);
+}
+
+void
+md5_finish(md5_state_t *pms, md5_byte_t digest[16])
+{
+    static const md5_byte_t pad[64] = {
+	0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    };
+    md5_byte_t data[8];
+    int i;
+
+    /* Save the length before padding. */
+    for (i = 0; i < 8; ++i)
+	data[i] = (md5_byte_t)(pms->count[i >> 2] >> ((i & 3) << 3));
+    /* Pad to 56 bytes mod 64. */
+    md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1);
+    /* Append the length. */
+    md5_append(pms, data, 8);
+    for (i = 0; i < 16; ++i)
+	digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3));
+}
diff --git a/nxcomp/src/Makefile.am b/nxcomp/src/Makefile.am
new file mode 100644
index 000000000..2264cb347
--- /dev/null
+++ b/nxcomp/src/Makefile.am
@@ -0,0 +1,146 @@
+NULL =
+
+lib_LTLIBRARIES = libXcomp.la
+
+libXcomp_la_SOURCES =					\
+    ActionCache.cpp					\
+    Agent.cpp						\
+    Alpha.cpp						\
+    Auth.cpp						\
+    Bitmap.cpp						\
+    BlockCache.cpp					\
+    BlockCacheSet.cpp					\
+    ChangeGC.cpp					\
+    ChangeProperty.cpp					\
+    ChannelCache.cpp					\
+    Channel.cpp						\
+    ChannelEndPoint.cpp					\
+    CharCache.cpp					\
+    Children.cpp					\
+    ClearArea.cpp					\
+    ClientCache.cpp					\
+    ClientChannel.cpp					\
+    ClientProxy.cpp					\
+    ClientReadBuffer.cpp				\
+    ClientStore.cpp					\
+    Colormap.cpp					\
+    ConfigureWindow.cpp					\
+    Control.cpp						\
+    CopyArea.cpp					\
+    CreateGC.cpp					\
+    CreatePixmap.cpp					\
+    DecodeBuffer.cpp					\
+    EncodeBuffer.cpp					\
+    FillPoly.cpp					\
+    Fork.cpp						\
+    GenericChannel.cpp					\
+    GenericReadBuffer.cpp				\
+    GenericReply.cpp					\
+    GenericRequest.cpp					\
+    GetImage.cpp					\
+    GetImageReply.cpp					\
+    GetProperty.cpp					\
+    GetPropertyReply.cpp				\
+    ImageText16.cpp					\
+    ImageText8.cpp					\
+    IntCache.cpp					\
+    InternAtom.cpp					\
+    Jpeg.cpp						\
+    Keeper.cpp						\
+    List.cpp						\
+    ListFontsReply.cpp					\
+    Loop.cpp						\
+    Message.cpp						\
+    MD5.c						\
+    Misc.cpp						\
+    OpcodeStore.cpp					\
+    Pack.c						\
+    Pgn.cpp						\
+    Pipe.cpp						\
+    PolyArc.cpp						\
+    PolyFillArc.cpp					\
+    PolyFillRectangle.cpp				\
+    PolyLine.cpp					\
+    PolyPoint.cpp					\
+    PolySegment.cpp					\
+    PolyText16.cpp					\
+    PolyText8.cpp					\
+    Proxy.cpp						\
+    ProxyReadBuffer.cpp					\
+    PutImage.cpp					\
+    PutPackedImage.cpp					\
+    QueryFontReply.cpp					\
+    ReadBuffer.cpp					\
+    RenderAddGlyphs.cpp					\
+    RenderChangePicture.cpp				\
+    RenderComposite.cpp					\
+    RenderCompositeGlyphs.cpp				\
+    RenderCreateGlyphSet.cpp				\
+    RenderCreatePicture.cpp				\
+    RenderExtension.cpp					\
+    RenderFillRectangles.cpp				\
+    RenderFreeGlyphSet.cpp				\
+    RenderFreePicture.cpp				\
+    RenderGenericRequest.cpp				\
+    RenderPictureClip.cpp				\
+    RenderPictureFilter.cpp				\
+    RenderPictureTransform.cpp				\
+    RenderTrapezoids.cpp				\
+    RenderTriangles.cpp					\
+    Rgb.cpp						\
+    Rle.cpp						\
+    SendEvent.cpp					\
+    SequenceQueue.cpp					\
+    ServerCache.cpp					\
+    ServerChannel.cpp					\
+    ServerProxy.cpp					\
+    ServerReadBuffer.cpp				\
+    ServerStore.cpp					\
+    SetClipRectangles.cpp				\
+    SetUnpackAlpha.cpp					\
+    SetUnpackColormap.cpp				\
+    SetUnpackGeometry.cpp				\
+    ShapeExtension.cpp					\
+    Socket.cpp						\
+    Split.cpp						\
+    StaticCompressor.cpp				\
+    Statistics.cpp					\
+    Timestamp.cpp					\
+    TranslateCoords.cpp					\
+    Transport.cpp					\
+    Unpack.cpp						\
+    Vars.c						\
+    Version.c						\
+    WriteBuffer.cpp					\
+    XidCache.cpp					\
+    Z.cpp						\
+    $(NULL)
+
+libXcomp_la_LIBADD =					\
+    @JPEG_LIBS@						\
+    @PNG_LIBS@						\
+    @Z_LIBS@						\
+    $(NULL)
+
+AM_CXXFLAGS = 						\
+    $(BASE_CXXFLAGS)					\
+    $(JPEG_CFLAGS)					\
+    $(PNG_CFLAGS)					\
+    $(Z_CFLAGS)						\
+    $(NULL)
+
+AM_CPPFLAGS =						\
+    -I$(top_srcdir)/include				\
+    $(NULL)
+
+libXcomp_la_LDFLAGS = -version-number @LT_COMP_VERSION@ -no-undefined
+
+libXcompincludedir = $(includedir)/nx
+libXcompinclude_HEADERS =				\
+    $(top_srcdir)/include/MD5.h				\
+    $(top_srcdir)/include/NX.h				\
+    $(top_srcdir)/include/NXalert.h			\
+    $(top_srcdir)/include/NXpack.h			\
+    $(top_srcdir)/include/NXproto.h			\
+    $(top_srcdir)/include/NXvars.h			\
+    $(NULL)
diff --git a/nxcomp/src/Message.cpp b/nxcomp/src/Message.cpp
new file mode 100644
index 000000000..b75d90c24
--- /dev/null
+++ b/nxcomp/src/Message.cpp
@@ -0,0 +1,2343 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <cstdio>
+#include <unistd.h>
+#include <cstring>
+
+#include <algorithm>
+
+#include "Misc.h"
+
+//
+// We need channel's cache data.
+//
+
+#include "Message.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+//
+// Set the verbosity level. You also
+// need to define DUMP in Misc.cpp
+// if DUMP is defined here.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Define this to log when messages
+// are allocated and deallocated.
+//
+
+#undef  REFERENCES
+
+//
+// Keep track of how many bytes are
+// occupied by cache.
+//
+
+int MessageStore::totalLocalStorageSize_  = 0;
+int MessageStore::totalRemoteStorageSize_ = 0;
+
+//
+// These are used for reference count.
+//
+
+#ifdef REFERENCES
+
+int Message::references_        = 0;
+int MessageStore::references_   = 0;
+
+#endif
+
+//
+// Here are the methods to handle cached messages.
+//
+
+MessageStore::MessageStore(StaticCompressor *compressor)
+
+  : compressor_(compressor)
+{
+  //
+  // Public members.
+  //
+
+  enableCache    = MESSAGE_ENABLE_CACHE;
+  enableData     = MESSAGE_ENABLE_DATA;
+  enableSplit    = MESSAGE_ENABLE_SPLIT;
+  enableCompress = MESSAGE_ENABLE_COMPRESS;
+
+  dataLimit  = MESSAGE_DATA_LIMIT;
+  dataOffset = MESSAGE_DATA_OFFSET;
+
+  cacheSlots          = MESSAGE_CACHE_SLOTS;
+  cacheThreshold      = MESSAGE_CACHE_THRESHOLD;
+  cacheLowerThreshold = MESSAGE_CACHE_LOWER_THRESHOLD;
+
+  #ifdef TEST
+  *logofs << "MessageStore: Static compressor is at "
+          << compressor_ << ".\n" << logofs_flush;
+  #endif
+
+  md5_state_ = new md5_state_t();
+
+  #ifdef DEBUG
+  *logofs << "MessageStore: Created MD5 state for object at " 
+          << this << ".\n" << logofs_flush;
+  #endif
+
+  lastAdded   = cacheSlots;
+  lastHit     = 0;
+  lastRemoved = 0;
+  lastRated   = nothing;
+  lastAction  = is_discarded;
+
+  //
+  // Private members.
+  //
+
+  localStorageSize_  = 0;
+  remoteStorageSize_ = 0;
+
+  #ifdef TEST
+  *logofs << "MessageStore: Size of total cache is " 
+          << totalLocalStorageSize_ << " bytes at local side and " 
+          << totalRemoteStorageSize_ << " bytes at remote side.\n" 
+          << logofs_flush;
+  #endif
+
+  messages_  = new T_messages();
+  checksums_ = new T_checksums();
+
+  temporary_ = NULL;
+
+  #ifdef REFERENCES
+
+  references_++;
+
+  *logofs << "MessageStore: Created new store at " 
+          << this << "out of " << references_
+          << " allocated stores.\n" << logofs_flush;
+
+  #endif
+}
+
+MessageStore::~MessageStore()
+{
+  //
+  // The virtual destructor of specialized class
+  // must get rid of both messages in container
+  // and temporary.
+  //
+
+  #ifdef DEBUG
+  *logofs << "MessageStore: Deleting MD5 state for object at "
+          << this << ".\n" << logofs_flush;
+  #endif
+
+  delete md5_state_;
+
+  delete messages_;
+  delete checksums_;
+
+  //
+  // Update the static members tracking
+  // size of total memory allocated for
+  // all stores.
+  //
+
+  totalLocalStorageSize_  -= localStorageSize_;
+  totalRemoteStorageSize_ -= remoteStorageSize_;
+
+  #ifdef TEST
+  *logofs << "MessageStore: Size of total cache is " 
+          << totalLocalStorageSize_ << " bytes at local side and " 
+          << totalRemoteStorageSize_ << " bytes at remote side.\n" 
+          << logofs_flush;
+  #endif
+
+  #ifdef REFERENCES
+
+  references_--;
+
+  *logofs << "MessageStore: Deleted store at " 
+          << this << " out of " << references_
+          << " allocated stores.\n" << logofs_flush;
+
+  #endif
+}
+
+//
+// Here are the methods to parse and cache
+// messages in the message stores.
+//
+
+int MessageStore::parse(Message *message, int split, const unsigned char *buffer,
+                            unsigned int size, T_checksum_action checksumAction,
+                                T_data_action dataAction, int bigEndian)
+{
+  //
+  // Save the message size as received on the link.
+  // This information will be used to create an ap-
+  // propriate buffer at the time the message will
+  // be unparsed.
+  //
+
+  message -> size_   = size;
+  message -> i_size_ = identitySize(buffer, size);
+  message -> c_size_ = 0;
+
+  validateSize(size);
+
+  if (checksumAction == use_checksum)
+  {
+    beginChecksum(message);
+
+    parseIdentity(message, buffer, size, bigEndian);
+
+    identityChecksum(message, buffer, size, bigEndian);
+
+    parseData(message, split, buffer, size, checksumAction, dataAction, bigEndian);
+
+    endChecksum(message);
+  }
+  else
+  {
+    parseIdentity(message, buffer, size, bigEndian);
+
+    parseData(message, split, buffer, size, checksumAction, dataAction, bigEndian);
+  }
+
+  return 1;
+}
+
+int MessageStore::parse(Message *message, const unsigned char *buffer,
+                            unsigned int size, const unsigned char *compressedData,
+                                const unsigned int compressedDataSize,
+                                    T_checksum_action checksumAction,
+                                        T_data_action dataAction, int bigEndian)
+{
+  int offset = identitySize(buffer, size);
+
+  message -> size_   = size;
+  message -> i_size_ = offset;
+  message -> c_size_ = compressedDataSize + offset;
+
+  validateSize(message -> size_ - offset, compressedDataSize);
+
+  if (checksumAction == use_checksum)
+  {
+    beginChecksum(message);
+
+    parseIdentity(message, buffer, size, bigEndian);
+
+    identityChecksum(message, buffer, size, bigEndian);
+
+    parseData(message, buffer, size, compressedData, compressedDataSize,
+                  checksumAction, dataAction, bigEndian);
+
+    endChecksum(message);
+  }
+  else
+  {
+    parseIdentity(message, buffer, size, bigEndian);
+
+    parseData(message, buffer, size, compressedData, compressedDataSize,
+                  checksumAction, dataAction, bigEndian);
+  }
+
+  return 1;
+}
+
+int MessageStore::parseData(Message *message, int split, const unsigned char *buffer,
+                                unsigned int size, T_checksum_action checksumAction,
+                                    T_data_action dataAction, int bigEndian)
+{
+  if ((int) size > message -> i_size_)
+  {
+    unsigned int dataSize = size - message -> i_size_;
+
+    if (checksumAction == use_checksum)
+    {
+      #ifdef DEBUG
+      *logofs << name() << ": Calculating checksum of object at "
+              << message << " with data size " << dataSize
+              << ".\n" << logofs_flush;
+      #endif
+
+      dataChecksum(message, buffer, size, bigEndian);
+    }
+
+    if (dataAction == discard_data)
+    {
+      #ifdef DEBUG
+      *logofs << name() << ": Discarded " << dataSize
+              << " bytes of plain data. Real size is "
+              << message -> size_ << " compressed size is "
+              << message -> c_size_ << ".\n" << logofs_flush;
+      #endif
+
+      return 1;
+    }
+
+    //
+    // Accept anyway data beyond the
+    // expected limit.
+    //
+
+    #ifdef TEST
+
+    if (dataSize > (unsigned int) dataLimit)
+    {
+      *logofs << name() << ": WARNING! Data is " << dataSize
+              << " bytes. Ignoring the established limit.\n"
+              << logofs_flush;
+    }
+
+    #endif
+
+    if (dataSize != message -> data_.size())
+    {
+      #ifdef DEBUG
+      *logofs << name() << ": Data will be resized from "
+              << message -> data_.size() << " to hold a plain buffer of "
+              << dataSize << " bytes.\n" << logofs_flush;
+      #endif
+
+      message -> data_.clear();
+
+      message -> data_.resize(dataSize);
+    }
+
+    if (split == 0)
+    {
+      memcpy(message -> data_.begin(), buffer + message -> i_size_, dataSize);
+    }
+    #ifdef TEST
+    else
+    {
+      *logofs << name() << ": Not copied " << dataSize
+              << " bytes of fake data for the split message.\n"
+              << logofs_flush;
+    }
+    #endif
+
+    #ifdef DEBUG
+    *logofs << name() << ": Parsed " << dataSize
+            << " bytes of plain data. Real size is "
+            << message -> size_ << " compressed size is "
+            << message -> c_size_ << ".\n" << logofs_flush;
+    #endif
+  }
+
+  return 1;
+}
+
+//
+// Store the data part in compressed format.
+//
+
+int MessageStore::parseData(Message *message, const unsigned char *buffer,
+                                unsigned int size, const unsigned char *compressedData,
+                                    const unsigned int compressedDataSize,
+                                        T_checksum_action checksumAction,
+                                             T_data_action dataAction, int bigEndian)
+{
+  if ((int) size > message -> i_size_)
+  {
+    unsigned int dataSize = size - message -> i_size_;
+
+    if (checksumAction == use_checksum)
+    {
+      #ifdef DEBUG
+      *logofs << name() << ": Calculating checksum of object at "
+              << message << " with data size " << dataSize
+              << ".\n" << logofs_flush;
+      #endif
+
+      dataChecksum(message, buffer, size, bigEndian);
+    }
+
+    if (dataAction == discard_data)
+    {
+      #ifdef DEBUG
+      *logofs << name() << ": Discarded " << dataSize
+              << " bytes of compressed data. Real size is "
+              << message -> size_ << " compressed size is "
+              << message -> c_size_ << ".\n" << logofs_flush;
+      #endif
+
+      return 1;
+    }
+
+    #ifdef WARNING
+    if (dataSize > (unsigned int) dataLimit)
+    {
+      *logofs << name() << ": WARNING! Data is " << dataSize
+              << " bytes. Ignoring the established limit!\n"
+              << logofs_flush;
+    }
+    #endif
+
+    dataSize = compressedDataSize;
+
+    if (dataSize != message -> data_.size())
+    {
+      #ifdef DEBUG
+      *logofs << name() << ": Data will be resized from "
+              << message -> data_.size() << " to hold a compressed buffer of "
+              << dataSize << " bytes.\n" << logofs_flush;
+      #endif
+
+      message -> data_.clear();
+
+      message -> data_.resize(compressedDataSize);
+    }
+
+    memcpy(message -> data_.begin(), compressedData, compressedDataSize);
+
+    #ifdef DEBUG
+    *logofs << name() << ": Parsed " << dataSize
+            << " bytes of compressed data. Real size is "
+            << message -> size_ << " compressed size is "
+            << message -> c_size_ << ".\n" << logofs_flush;
+    #endif
+  }
+
+  return 1;
+}
+
+int MessageStore::unparseData(const Message *message, unsigned char *buffer,
+                                  unsigned int size, int bigEndian)
+{
+  //
+  // Copy data, if any, to the buffer.
+  //
+
+  if ((int) size > message -> i_size_)
+  {
+    //
+    // Check if message has been stored
+    // in compressed format.
+    //
+
+    if (message -> c_size_ == 0)
+    {
+      memcpy(buffer + message -> i_size_, message -> data_.begin(), size - message -> i_size_);
+
+      #ifdef DEBUG
+      *logofs << name() << ": Unparsed " << message -> size_ - message -> i_size_
+              << " bytes of data to a buffer of " << message -> size_ - message -> i_size_
+              << ".\n" << logofs_flush;
+      #endif
+    }
+    else
+    {
+      #ifdef DEBUG
+      *logofs << name() << ": Using static compressor at " << (void *) compressor_
+              << ".\n" << logofs_flush;
+      #endif
+
+      if (compressor_ ->
+              decompressBuffer(buffer + message -> i_size_,
+                                   size - message -> i_size_,
+                                       message -> data_.begin(),
+                                           message -> c_size_ - message -> i_size_) < 0)
+      {
+        #ifdef PANIC
+        *logofs << name() << ": PANIC! Data decompression failed.\n"
+                << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Data decompression failed.\n";
+
+        return -1;
+      }
+
+      #ifdef DEBUG
+      *logofs << name() << ": Unparsed " << message -> c_size_ - message -> i_size_
+              << " bytes of compressed data to a buffer of "
+              << message -> size_ - message -> i_size_ << ".\n" << logofs_flush;
+      #endif
+    }
+  }
+
+  //
+  // We could write size to the buffer but this
+  // is something the channel class is doing by
+  // itself.
+  //
+  // PutUINT(size >> 2, buffer + 2, bigEndian);
+  //
+
+  return 1;
+}
+
+void MessageStore::dumpData(const Message *message) const
+{
+  #ifdef DUMP
+
+  *logofs << name() << ": Dumping enumerated data:\n" << logofs_flush; 
+
+  DumpData(message -> data_.begin(), message -> data_.size());
+
+  #endif
+
+  #ifdef DUMP
+
+  *logofs << name() << ": Dumping checksum data:\n" << logofs_flush; 
+
+  DumpData(message -> md5_digest_, MD5_LENGTH);
+
+  #endif
+}
+
+T_checksum MessageStore::getChecksum(const unsigned char *buffer,
+                                         unsigned int size, int bigEndian)
+{
+  Message *message = getTemporary();
+
+  message -> size_   = size;
+  message -> i_size_ = identitySize(buffer, size);
+  message -> c_size_ = 0;
+
+  validateSize(size);
+
+  beginChecksum(message);
+
+  //
+  // We don't need to extract the identity
+  // data from the buffer.
+  //
+  // parseIdentity(message, buffer, size, bigEndian);
+  //
+
+  identityChecksum(message, buffer, size, bigEndian);
+
+  parseData(message, 0, buffer, size, use_checksum, discard_data, bigEndian);
+
+  endChecksum(message);
+
+  //
+  // The caller will have to explicitly
+  // deallocated the memory after use.
+  //
+
+  T_checksum checksum = new md5_byte_t[MD5_LENGTH];
+
+  memcpy(checksum, message -> md5_digest_, MD5_LENGTH);
+
+  return checksum;
+}
+
+int MessageStore::clean(T_checksum_action checksumAction)
+{
+  int position = lastRemoved + 1;
+
+  if (position >= cacheSlots)
+  {
+    position = 0;
+  }
+
+  #ifdef DEBUG
+  *logofs << name() << ": Searching a message to remove "
+          << "starting at position " << position
+          << " with " << checksums_ -> size()
+          << " elements in cache.\n"
+          << logofs_flush;
+  #endif
+
+  while (position != lastRemoved)
+  {
+    #ifdef DEBUG
+    *logofs << name() << ": Examining position "
+            << position << ".\n" << logofs_flush;
+    #endif
+
+    if ((*messages_)[position] != NULL)
+    {
+      if (getRating((*messages_)[position], rating_for_clean) == 0)
+      {
+        break;
+      }
+      else
+      {
+        untouch((*messages_)[position]);
+      }
+    }
+
+    if (++position == cacheSlots)
+    {
+      #ifdef DEBUG
+      *logofs << name() << ": Rolled position at "
+              << strMsTimestamp() << ".\n"
+              << logofs_flush;
+      #endif
+
+      position = 0;
+    }
+  }
+
+  //
+  // If no message is a good candidate,
+  // then try the object at the next slot
+  // in respect to last element removed.
+  //
+
+  if (position == lastRemoved)
+  {
+    position = lastRemoved + 1;
+
+    if (position >= cacheSlots)
+    {
+      position = 0;
+    }
+
+    if ((*messages_)[position] == NULL ||
+            (*messages_)[position] -> locks_ != 0)
+    {
+      #ifdef DEBUG
+      *logofs << name() << ": WARNING! No message found "
+            << "to be actually removed.\n"
+            << logofs_flush;
+      #endif
+
+      return nothing;
+    }
+
+    #ifdef DEBUG
+    *logofs << name() << ": WARNING! Assuming object "
+            << "at position " << position << ".\n"
+            << logofs_flush;
+    #endif
+  }
+
+  return position;
+}
+
+//
+// This is the insertion method used at local side 
+// side. Cache at remote side side will be kept in
+// sync by telling the to other party where to 
+// store the message. 
+//
+
+int MessageStore::findOrAdd(Message *message, T_checksum_action checksumAction,
+                                T_data_action dataAction, int &added, int &locked)
+{
+  if (checksumAction != use_checksum)
+  {
+    #ifdef PANIC
+    *logofs << name() << ": PANIC! Internal error in context [A]. "
+            << "Cannot find or add message to repository "
+            << "without using checksum.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Internal error in context [A]. "
+         << "Cannot find or add message to repository "
+         << "without using checksum.\n";
+
+    HandleAbort();
+  }
+
+  //
+  // Set added to true only if message
+  // is inserted in cache.
+  //
+
+  added  = 0;
+  locked = 0;
+
+  //
+  // First of all figure out where to
+  // store this object.
+  //
+
+  #ifdef DEBUG
+  *logofs << name() << ": Searching an empty slot "
+          << "with last rated " << lastRated << " and "
+          << "last added " << lastAdded << ".\n"
+          << logofs_flush;
+  #endif
+
+  int position = lastRated;
+
+  if (position == nothing)
+  {
+    position = lastAdded + 1;
+
+    if (position >= cacheSlots)
+    {
+      position = 0;
+    }
+
+    #ifdef DEBUG
+    *logofs << name() << ": Searching an empty slot "
+            << "starting at position " << position
+            << " with " << checksums_ -> size()
+            << " elements in cache.\n"
+            << logofs_flush;
+    #endif
+
+    while (position != lastAdded)
+    {
+      #ifdef DEBUG
+      *logofs << name() << ": Examining position "
+              << position << ".\n" << logofs_flush;
+      #endif
+
+      if ((*messages_)[position] == NULL)
+      {
+        break;
+      }
+      else if (getRating((*messages_)[position], rating_for_insert) == 0)
+      {
+        break;
+      }
+      else
+      {
+        untouch((*messages_)[position]);
+      }
+
+      if (++position == cacheSlots)
+      {
+        #ifdef DEBUG
+        *logofs << name() << ": Rolled position at "
+                << strMsTimestamp() << ".\n"
+                << logofs_flush;
+        #endif
+
+        position = 0;
+      }
+    }
+  }
+  #ifdef DEBUG
+  else
+  {
+    *logofs << name() << ": Using last rated position "
+            << position << ".\n" << logofs_flush;
+  }
+  #endif
+
+  //
+  // If we made an extensive check but did not
+  // find neither a free slot or a message to
+  // replace, assume slot at next position in
+  // respect to last added. This can happen if
+  // all objects in repository have got an hit
+  // recently.
+  //
+
+  if (position == lastAdded)
+  {
+    position = lastAdded + 1;
+
+    if (position >= cacheSlots)
+    {
+      position = 0;
+    }
+
+    #ifdef DEBUG
+    *logofs << name() << ": WARNING! Assuming slot "
+            << "at position " << position << ".\n"
+            << logofs_flush;
+    #endif
+  }
+  #ifdef DEBUG
+  else
+  {
+    *logofs << name() << ": Found candidate slot "
+            << "at position " << position << ".\n"
+            << logofs_flush;
+  }
+  #endif
+
+  //
+  // Save the search result so if the message
+  // is found in cache, we can use the slot
+  // at next run.
+  //
+
+  lastRated = position;
+
+  if ((*messages_)[position] != NULL &&
+          (*messages_)[position] -> locks_ != 0)
+  {
+    #ifdef WARNING
+    *logofs << name() << ": WARNING! Insertion at position "
+            << position << " would replace a locked message. "
+            << "Forcing channel to discard the message.\n"
+            << logofs_flush;
+    #endif
+
+    #ifdef TEST
+    *logofs << name() << ": Invalidating rating of object "
+            << "at position " << position << ".\n"
+            << logofs_flush;
+    #endif
+
+    return (lastRated = nothing);
+  }
+
+  if (checksumAction == use_checksum)
+  {
+    T_checksum checksum = getChecksum(message);
+
+    #ifdef TEST
+    *logofs << name() << ": Searching checksum ["
+            << DumpChecksum(checksum) << "] in repository.\n"
+            << logofs_flush;
+
+    #endif
+
+    pair<T_checksums::iterator, bool> result;
+
+    result = checksums_ -> insert(T_checksums::value_type(checksum, position));
+
+    //
+    // Message was found in cache or
+    // insertion couldn't take place.
+    //
+
+    if (result.second == 0)
+    {
+      if (result.first == checksums_ -> end())
+      {
+        #ifdef PANIC
+        *logofs << name() << ": PANIC! Failed to insert object "
+                << "in the cache.\n" << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Failed to insert object of type "
+             << name() << " in the cache.\n";
+
+        return nothing;
+      }
+
+      //
+      // Message is in cache.
+      //
+
+      #ifdef TEST
+      *logofs << name() << ": Object is already in cache "
+              << "at position " << (result.first) -> second
+              << ".\n" << logofs_flush;
+      #endif
+
+      #ifdef DEBUG
+
+      printStorageSize();
+
+      #endif
+
+      //
+      // Message is locked, probably because
+      // it has not completely recomposed at
+      // remote side after a split.
+      //
+
+      if ((*messages_)[(result.first) -> second] -> locks_ != 0)
+      {
+        #ifdef TEST
+        *logofs << name() << ": WARNING! Object at position "
+                << (result.first) -> second << " is locked.\n"
+                << logofs_flush;
+        #endif
+
+        locked = 1;
+      }
+
+      //
+      // Object got a hit, so prevent
+      // its removal.
+      //
+
+      if (lastRated == (result.first) -> second)
+      {
+        #ifdef TEST
+        *logofs << name() << ": Resetting rating of object "
+                << "at position " << (result.first) -> second
+                << ".\n" << logofs_flush;
+        #endif
+
+        lastRated = nothing;
+      }
+
+      return (result.first) -> second;
+    }
+
+    #ifdef DEBUG
+    *logofs << name() << ": Could not find message in cache.\n"
+            << logofs_flush;
+    #endif
+  }
+
+  //
+  // Message not found in hash table (or insertion
+  // of checksum in hash table was not requested).
+  // Message was added to cache.
+  //
+
+  added = 1;
+
+  //
+  // Log data about the missed message.
+  //
+
+  #ifdef TEST
+
+  if (opcode() == X_PutImage || opcode() == X_NXPutPackedImage)
+  {
+    #ifdef WARNING
+    *logofs << name() << ": WARNING! Dumping identity of "
+            << "missed image object of type " << name()
+            << ".\n" << logofs_flush;
+    #endif
+
+    dumpIdentity(message);
+  }
+
+  #endif
+
+  if ((*messages_)[position] != NULL)
+  {
+    #ifdef DEBUG
+    *logofs << name() << ": The message replaces "
+            << "the old one at position " << position
+            << ".\n" << logofs_flush;
+    #endif
+
+    remove(position, checksumAction, dataAction);
+  }
+
+  (*messages_)[position] = message;
+
+  //
+  // We used the slot. Perform a new
+  // search at next run.
+  //
+
+  lastRated = nothing;
+
+  #ifdef TEST
+  *logofs << name() << ": Stored message object of size "
+          << plainSize(position) << " (" << message -> size_
+          << "/" << message -> c_size_ << ") at position "
+          << position << ".\n" << logofs_flush;
+  #endif
+
+  unsigned int localSize;
+  unsigned int remoteSize;
+
+  storageSize(message, localSize, remoteSize);
+
+  localStorageSize_  += localSize;
+  remoteStorageSize_ += remoteSize;
+
+  totalLocalStorageSize_  += localSize;
+  totalRemoteStorageSize_ += remoteSize;
+
+  #ifdef DEBUG
+
+  printStorageSize();
+
+  #endif
+
+  //
+  // Set hits and timestamp at insertion in cache.
+  //
+
+  message -> hits_ = control -> StoreHitsAddBonus;
+  message -> last_ = (getTimestamp()).tv_sec;
+
+  message -> locks_ = 0;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Set last hit of object at " 
+          << strMsTimestamp() << " with a bonus of "
+          << message -> hits_ << ".\n" << logofs_flush;
+  #endif
+
+  return position;
+}
+
+//
+// Add a parsed message to repository. It is normally used
+// at decoding side or at encoding side when we load store
+// from disk. To handle messages coming from network, the
+// encoding side uses the optimized method findOrAdd().
+//
+
+int MessageStore::add(Message *message, const int position,
+                          T_checksum_action checksumAction, T_data_action dataAction)
+{
+  if (position < 0 || position >= cacheSlots)
+  {
+    #ifdef PANIC
+    *logofs << name() << ": PANIC! Cannot add a message "
+            << "at non existing position " << position
+            << ".\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Cannot add a message "
+         << "at non existing position " << position
+         << ".\n";
+
+    HandleAbort();
+  }
+
+  if ((*messages_)[position] != NULL)
+  {
+    #ifdef DEBUG
+    *logofs << name() << ": The message will replace "
+            << "the old one at position " << position
+            << ".\n" << logofs_flush;
+    #endif
+
+    remove(position, checksumAction, dataAction);
+  }
+
+  #ifdef DEBUG
+  *logofs << name() << ": Inserting object in repository at position "
+          << position << ".\n" << logofs_flush;
+  #endif
+
+  (*messages_)[position] = message;
+
+  //
+  // Get the object's checksum value
+  // and insert it in the table.
+  //
+
+  if (checksumAction == use_checksum)
+  {
+    #ifdef DEBUG
+    *logofs << name() << ": Inserting object's checksum in repository.\n";
+    #endif
+
+    T_checksum checksum = getChecksum(message);
+
+    checksums_ -> insert(T_checksums::value_type(checksum, position));
+  }
+
+  #ifdef DEBUG
+  *logofs << name() << ": Stored message object of size "
+          << plainSize(position) << " (" << message -> size_ 
+          << "/" << message -> c_size_ << ") at position "
+          << position << ".\n" << logofs_flush;
+  #endif
+
+  unsigned int localSize;
+  unsigned int remoteSize;
+
+  storageSize(message, localSize, remoteSize);
+
+  localStorageSize_  += localSize;
+  remoteStorageSize_ += remoteSize;
+
+  totalLocalStorageSize_  += localSize;
+  totalRemoteStorageSize_ += remoteSize;
+
+  #ifdef DEBUG
+
+  printStorageSize();
+
+  #endif
+
+  //
+  // Set hits and timestamp at insertion in cache.
+  //
+
+  message -> hits_ = control -> StoreHitsAddBonus;
+  message -> last_ = (getTimestamp()).tv_sec;
+
+  message -> locks_ = 0;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Set last hit of object at " 
+          << strMsTimestamp() << " with a bonus of "
+          << message -> hits_ << ".\n" << logofs_flush;
+  #endif
+
+  return position;
+}
+
+//
+// The following functions don't modify data,
+// so they are supposed to be called only at
+// the encoding side.
+//
+
+void MessageStore::updateData(const int position, unsigned int dataSize,
+                                  unsigned int compressedDataSize)
+{
+  Message *message = (*messages_)[position];
+
+  validateSize(dataSize, compressedDataSize);
+
+  if (compressedDataSize != 0)
+  {
+    unsigned int localSize;
+    unsigned int remoteSize;
+
+    storageSize(message, localSize, remoteSize);
+
+    localStorageSize_  -= localSize;
+    remoteStorageSize_ -= remoteSize;
+
+    totalLocalStorageSize_  -= localSize;
+    totalRemoteStorageSize_ -= remoteSize;
+
+    message -> c_size_ = compressedDataSize + message -> i_size_;
+
+    #ifdef TEST
+
+    if (message -> size_ != (int) (dataSize + message -> i_size_))
+    {
+      #ifdef PANIC
+      *logofs << name() << ": PANIC! Size of object looks "
+              << message -> size_ << " bytes while it "
+              << "should be " << dataSize + message -> i_size_
+              << ".\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Size of object looks "
+           << message -> size_ << " bytes while it "
+           << "should be " << dataSize + message -> i_size_
+           << ".\n";
+
+      HandleAbort();
+    }
+
+    #endif
+
+    storageSize(message, localSize, remoteSize);
+
+    localStorageSize_  += localSize;
+    remoteStorageSize_ += remoteSize;
+
+    totalLocalStorageSize_  += localSize;
+    totalRemoteStorageSize_ += remoteSize;
+
+    #ifdef DEBUG
+
+    printStorageSize();
+
+    #endif
+  }
+}
+
+void MessageStore::updateData(const T_checksum checksum, unsigned int compressedDataSize)
+{
+  #ifdef TEST
+  *logofs << name() << ": Searching checksum ["
+          << DumpChecksum(checksum) << "] in repository.\n"
+          << logofs_flush;
+  #endif
+
+  T_checksums::iterator found = checksums_ -> find(checksum);
+
+  if (found != checksums_ -> end())
+  {
+    Message *message = (*messages_)[found -> second];
+
+    #ifdef TEST
+    *logofs << name() << ": Message found in cache at "
+            << "position " << found -> second << " with size "
+            << message -> size_ << " and compressed size "
+            << message -> c_size_ << ".\n" << logofs_flush;
+    #endif
+
+    updateData(found -> second, message -> size_ -
+                   message -> i_size_, compressedDataSize);
+  }
+  #ifdef TEST
+  else if (checksums_ -> size() > 0)
+  {
+    *logofs << name() << ": WARNING! Can't locate the "
+            << "checksum [" << DumpChecksum(checksum)
+            << "] for the update.\n" << logofs_flush;
+  }
+  #endif
+}
+
+//
+// This function replaces the data part of the message
+// and updates the information about its size. Split
+// messages are advertised to the decoding side with
+// their uncompressed size, data is then compressed
+// before sending the first chunk. This function is
+// called by the decoding side after the split message
+// is fully recomposed to replace the dummy data and
+// set the real size.
+//
+
+void MessageStore::updateData(const int position, const unsigned char *newData,
+                                  unsigned int dataSize, unsigned int compressedDataSize)
+{
+  Message *message = (*messages_)[position];
+
+  validateSize(dataSize, compressedDataSize);
+
+  #ifdef TEST
+
+  if (message -> size_ != (int) (dataSize + message -> i_size_))
+  {
+    #ifdef PANIC
+    *logofs << name() << ": PANIC! Data of object looks "
+            << dataSize << " bytes while it " << "should be "
+            << message -> size_ - message -> i_size_
+            << ".\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Data of object looks "
+         << dataSize << " bytes while it " << "should be "
+         << message -> size_ - message -> i_size_
+         << ".\n";
+
+    HandleAbort();
+  }
+
+  #endif
+
+  //
+  // A compressed data size of 0 means that
+  // message's data was not compressed.
+  //
+
+  if (compressedDataSize != 0)
+  {
+    unsigned int localSize;
+    unsigned int remoteSize;
+
+    storageSize(message, localSize, remoteSize);
+
+    localStorageSize_  -= localSize;
+    remoteStorageSize_ -= remoteSize;
+
+    totalLocalStorageSize_  -= localSize;
+    totalRemoteStorageSize_ -= remoteSize;
+
+    if (message -> c_size_ != (int) compressedDataSize +
+            message -> i_size_)
+    {
+      #ifdef TEST
+      *logofs << name() << ": Resizing data of message at "
+              << "position " << position << " from " << message ->
+                  c_size_ << " to " << compressedDataSize +
+                  message -> i_size_ << " bytes.\n"
+              << logofs_flush;
+      #endif
+
+      message -> data_.clear();
+
+      message -> data_.resize(compressedDataSize);
+    }
+
+    memcpy(message -> data_.begin(), newData, compressedDataSize);
+
+    #ifdef TEST
+    *logofs << name() << ": Data of message at position "
+            << position << " has size " << message -> data_.size()
+            << " and capacity " << message -> data_.capacity()
+            << ".\n" << logofs_flush;
+    #endif
+
+    message -> c_size_ = compressedDataSize + message -> i_size_;
+
+    storageSize(message, localSize, remoteSize);
+
+    localStorageSize_  += localSize;
+    remoteStorageSize_ += remoteSize;
+
+    totalLocalStorageSize_  += localSize;
+    totalRemoteStorageSize_ += remoteSize;
+
+    #ifdef DEBUG
+
+    printStorageSize();
+
+    #endif
+  }
+  else
+  {
+    #ifdef TEST
+    *logofs << name() << ": No changes to data size for message "
+            << "at position " << position << ".\n" << logofs_flush;
+    #endif
+
+    memcpy(message -> data_.begin(), newData, dataSize);
+  }
+}
+
+int MessageStore::remove(const int position, T_checksum_action checksumAction,
+                             T_data_action dataAction)
+{
+  Message *message;
+
+  if (position < 0 || position >= cacheSlots ||
+          (message = (*messages_)[position]) == NULL)
+  {
+    #ifdef PANIC
+    *logofs << name() << ": PANIC! Cannot remove "
+            << "a non existing message at position "
+            << position << ".\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Cannot remove "
+         << "a non existing message at position "
+         << position << ".\n";
+
+    HandleAbort();
+  }
+
+  #if defined(TEST) || defined(INFO)
+
+  if (opcode() == X_PutImage || opcode() == X_NXPutPackedImage)
+  {
+    #ifdef WARNING
+    *logofs << name() << ": WARNING! Discarding image object "
+            << "of type " << name() << " at position "
+            << position << ".\n" << logofs_flush;
+    #endif
+  }
+
+  #endif
+
+  //
+  // The checksum is only stored at the encoding
+  // side.
+  //
+
+  if (checksumAction == use_checksum)
+  {
+    #ifdef DEBUG
+    *logofs << name() << ": Removing checksum for object at "
+            << "position " << position << ".\n" << logofs_flush;
+    #endif
+
+    //
+    // TODO: If we had stored the iterator and
+    // not the pointer to the message, we could
+    // have removed the message without having
+    // to look up the checksum.
+    //
+
+    T_checksum checksum = getChecksum(message);
+
+    #ifdef TEST
+    *logofs << name() << ": Searching checksum ["
+            << DumpChecksum(checksum) << "] in repository.\n"
+            << logofs_flush;
+    #endif
+
+    T_checksums::iterator found = checksums_ -> find(checksum);
+
+    if (found == checksums_ -> end())
+    {
+      #ifdef PANIC
+      *logofs << name() << ": PANIC! No checksum found for "
+              << "object at position " << position << ".\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": No checksum found for "
+           << "object at position " << position << ".\n";
+
+      HandleAbort();
+    }
+
+    #ifdef TEST
+
+    else if (position != found -> second)
+    {
+      #ifdef PANIC
+      *logofs << name() << ": PANIC! Value of position for object "
+              << "doesn't match position " << position << ".\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Value of position for object "
+           << "doesn't match position " << position << ".\n";
+
+      HandleAbort();
+    }
+
+    #endif
+
+    checksums_ -> erase(found);
+  }
+
+  #ifdef DEBUG
+  *logofs << name() << ": Removing message at position "
+          << position << " of size " << plainSize(position)
+          << " (" << message -> size_ << "/" << message -> c_size_
+          << ").\n" << logofs_flush;
+  #endif
+
+  unsigned int localSize;
+  unsigned int remoteSize;
+
+  storageSize(message, localSize, remoteSize);
+
+  localStorageSize_  -= localSize;
+  remoteStorageSize_ -= remoteSize;
+
+  totalLocalStorageSize_  -= localSize;
+  totalRemoteStorageSize_ -= remoteSize;
+
+  recycle(message);
+
+  (*messages_)[position] = NULL;
+
+  #ifdef DEBUG
+
+  printStorageSize();
+
+  #endif
+
+  return position;
+}
+
+//
+// This should only be called at encoding side.
+// The decoding side can't rely on the counter
+// as it is decremented by the encoding side
+// every time the repository is searched for a
+// message to be removed.
+//
+
+int MessageStore::getRating(Message *message, T_rating type) const
+{
+  if (message -> locks_ != 0)
+  {
+    #ifdef TEST
+    *logofs << name() << ": Rate set to -1 as locks of object are "
+            << (int) message -> locks_ << ".\n"
+            << logofs_flush;
+    #endif
+
+    return -1;
+  }
+  else if ((type == rating_for_clean ||
+                (int) checksums_ -> size() == cacheSlots) &&
+                    message -> hits_ <= control -> StoreHitsLoadBonus)
+  {
+    //
+    // We don't have any free slot or we exceeded the
+    // available storage size. This is likely to happen
+    // after having loaded objects from persistent cache.
+    // It's not a bad idea to discard some messages that
+    // were restored but never referenced.
+    //
+
+    #ifdef TEST
+
+    if (type == rating_for_clean)
+    {
+      *logofs << name() << ": Rate set to 0 with hits "
+              << message -> hits_ << " as maximum storage size "
+              << "was exceeded.\n" << logofs_flush;
+    }
+    else
+    {
+      *logofs << name() << ": Rate set to 0 with hits "
+              << message -> hits_ << " as there are no available "
+              << "slots in store.\n" << logofs_flush;
+    }
+
+    #endif
+
+    return 0;
+  }
+  else if (type == rating_for_clean &&
+               (getTimestamp()).tv_sec - message -> last_ >=
+                   control -> StoreTimeLimit)
+  {
+    #ifdef TEST
+    *logofs << name() << ": Rate set to 0 as last hit of object was "
+            << (getTimestamp()).tv_sec - message -> last_
+            << " seconds ago with limit set to " << control ->
+               StoreTimeLimit << ".\n" << logofs_flush;
+    #endif
+
+    return 0;
+  }
+  else
+  {
+    #ifdef TEST
+    if (message -> hits_ < 0)
+    {
+      *logofs << name() << ": PANIC! Rate of object shouldn't be "
+              << message -> hits_ << ".\n" << logofs_flush;
+
+      cerr << "Error" << ": Rate of object of type " << name()
+           << " shouldn't be " << message -> hits_ << ".\n";
+
+      HandleAbort();
+    }
+    #endif
+
+    #ifdef TEST
+    *logofs << name() << ": Rate of object is " << message -> hits_
+            << " with last hit " << (getTimestamp()).tv_sec -
+               message -> last_ << " seconds ago.\n"
+            << logofs_flush;
+    #endif
+
+    return message -> hits_;
+  }
+}
+
+int MessageStore::touch(Message *message) const
+{
+  message -> last_ = (getTimestamp()).tv_sec;
+
+  message -> hits_ += control -> StoreHitsTouch;
+
+  if (message -> hits_ > control -> StoreHitsLimit)
+  {
+    message -> hits_ = control -> StoreHitsLimit;
+  }
+
+  #ifdef TEST
+  *logofs << name() << ": Increased hits of object to "
+          << message -> hits_ << " at " << strMsTimestamp()
+          << ".\n" << logofs_flush;
+  #endif
+
+  return message -> hits_;
+}
+
+int MessageStore::untouch(Message *message) const
+{
+  message -> hits_ -= control -> StoreHitsUntouch;
+
+  if (message -> hits_ < 0)
+  {
+    message -> hits_ = 0;
+  }
+
+  #ifdef TEST
+  *logofs << name() << ": Decreased hits of object to " 
+          << message -> hits_ << ".\n"
+          << logofs_flush;
+  #endif
+
+  return message -> hits_;
+}
+
+int MessageStore::lock(const int position) const
+{
+  Message *message = (*messages_)[position];
+
+  if (message == NULL)
+  {
+    #ifdef PANIC
+    *logofs << name() << ": PANIC! Can't lock the null "
+            << "object at position " << position
+            << ".\n" << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  #ifdef DEBUG
+  *logofs << name() << ": Increasing locks of object to " 
+          << (int) message -> locks_ + 1 << ".\n"
+          << logofs_flush;
+  #endif
+
+  return ++(message -> locks_);
+}
+
+int MessageStore::unlock(const int position) const
+{
+  Message *message = (*messages_)[position];
+
+  if (message == NULL)
+  {
+    #ifdef PANIC
+    *logofs << name() << ": PANIC! Can't unlock the null "
+            << "object at position " << position
+            << ".\n" << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decreasing locks of object to " 
+          << (int) message -> locks_ - 1 << ".\n"
+          << logofs_flush;
+  #endif
+
+  return --(message -> locks_);
+}
+
+int MessageStore::saveStore(ostream *cachefs, md5_state_t *md5StateStream,
+                                md5_state_t *md5StateClient, T_checksum_action checksumAction,
+                                    T_data_action dataAction, int bigEndian)
+{
+  Message *message;
+
+  #ifdef TEST
+  *logofs << name() << ": Opcode of this store is "
+          << (unsigned int) opcode() << " default size of "
+          << "identity is " << dataOffset << ".\n"
+          << logofs_flush;
+  #endif
+
+  unsigned char *identityBuffer = new unsigned char[dataOffset];
+  unsigned char *sizeBuffer     = new unsigned char[4 * 2];
+  unsigned char *positionBuffer = new unsigned char[4];
+  unsigned char *opcodeBuffer   = new unsigned char[4];
+
+  #ifdef DUMP
+
+  char *md5ClientDump = new char[dataOffset * 2 + 128];
+
+  #endif
+
+  unsigned char value;
+
+  int offset;
+
+  int failed = 0;
+
+  for (int position = 0; position < cacheSlots; position++)
+  {
+    message = (*messages_)[position];
+
+    //
+    // Don't save split messages.
+    //
+
+    if (message != NULL && message -> locks_ == 0)
+    {
+      //
+      // Use the total size if offset is
+      // beyond the real end of message.
+      //
+
+      offset = dataOffset;
+
+      if (offset > message -> size_)
+      {
+        offset = message -> size_;
+      }
+        
+      #ifdef TEST
+      *logofs << name() << ": Going to save message at position "
+              << position << ".\n" << logofs_flush;
+      #endif
+
+      value = 1;
+
+      PutULONG(position, positionBuffer, bigEndian);
+      PutULONG(opcode(), opcodeBuffer, bigEndian);
+
+      md5_append(md5StateClient, positionBuffer, 4);
+      md5_append(md5StateClient, opcodeBuffer, 4);
+
+      #ifdef DUMP
+
+      *logofs << "Name=" << name() << logofs_flush;
+
+      sprintf(md5ClientDump," Pos=%d Op=%d\n", position, opcode());
+
+      *logofs << md5ClientDump << logofs_flush;
+
+      #endif
+
+      if (PutData(cachefs, &value, 1) < 0)
+      {
+        #ifdef DEBUG
+        *logofs << name() << ": PANIC! Failure writing " << 1
+                << " bytes.\n" << logofs_flush;
+        #endif
+
+        failed = 1;
+
+        break;
+      }
+
+      md5_append(md5StateStream, &value, 1);
+
+      PutULONG(message -> size_, sizeBuffer, bigEndian);
+      PutULONG(message -> c_size_, sizeBuffer + 4, bigEndian);
+
+      //
+      // Note that the identity size is not saved with
+      // the message and will be determined from the
+      // data read when restoring the identity.
+      //
+
+      if (PutData(cachefs, sizeBuffer, 4 * 2) < 0)
+      {
+        #ifdef DEBUG
+        *logofs << name() << ": PANIC! Failure writing " << 4 * 2
+                << " bytes.\n" << logofs_flush;
+        #endif
+
+        failed = 1;
+
+        break;
+      }
+
+      md5_append(md5StateStream, sizeBuffer, 4 * 2);
+      md5_append(md5StateClient, sizeBuffer, 4 * 2);
+
+      #ifdef DUMP
+
+      sprintf(md5ClientDump, "size = %d c_size = %d\n",
+                  message -> size_, message -> c_size_);
+
+      *logofs << md5ClientDump << logofs_flush;
+
+      #endif
+
+      //
+      // Prepare a clean buffer for unparse.
+      //
+
+      CleanData(identityBuffer, offset);
+
+      unparseIdentity(message, identityBuffer, offset, bigEndian);
+
+      if (PutData(cachefs, identityBuffer, offset) < 0)
+      {
+        #ifdef DEBUG
+        *logofs << name() << ": PANIC! Failure writing " << offset
+                << " bytes.\n" << logofs_flush;
+        #endif
+
+        failed = 1;
+
+        break;
+      }
+
+      md5_append(md5StateStream, identityBuffer, offset);
+      md5_append(md5StateClient, identityBuffer, offset);
+
+      #ifdef DUMP
+
+      for (int i = 0; i < offset; i++)
+      {
+        sprintf(md5ClientDump + (i * 2), "%02X", identityBuffer[i]);
+      }
+
+      *logofs << "Identity = " << md5ClientDump << "\n" << logofs_flush;
+
+      #endif
+
+      //
+      // Set the real identity size before
+      // saving the data.
+      //
+
+      offset = message -> i_size_;
+
+      if (offset > message -> size_)
+      {
+        offset = message -> size_;
+      }
+
+      if (checksumAction == use_checksum)
+      {
+        if (PutData(cachefs, message -> md5_digest_, MD5_LENGTH) < 0)
+        {
+          #ifdef DEBUG
+          *logofs << name() << ": PANIC! Failure writing " << MD5_LENGTH
+                  << " bytes.\n" << logofs_flush;
+          #endif
+
+          failed = 1;
+
+          break;
+        }
+
+        md5_append(md5StateStream, message -> md5_digest_, MD5_LENGTH);
+      }
+      else if (dataAction == use_data)
+      {
+        int dataSize = (message -> c_size_ == 0 ?
+                             message -> size_ - offset :
+                                 message -> c_size_ - offset);
+        if (dataSize > 0)
+        {
+          if (PutData(cachefs, message -> data_.begin(), dataSize) < 0)
+          {
+            #ifdef DEBUG
+            *logofs << name() << ": PANIC! Failure writing " << dataSize
+                    << " bytes.\n" << logofs_flush;
+            #endif
+
+            failed = 1;
+
+            break;
+          }
+
+          md5_append(md5StateStream, message -> data_.begin(), dataSize);
+        }
+      }
+    }
+    else
+    {
+      #ifdef TEST
+      *logofs << name() << ": Not saving message at position "
+              << position << ".\n" << logofs_flush;
+      #endif
+
+      value = 0;
+
+      if (PutData(cachefs, &value, 1) < 0)
+      {
+        #ifdef DEBUG
+        *logofs << name() << ": PANIC! Failure writing " << 1
+                << " bytes.\n" << logofs_flush;
+        #endif
+
+        failed = 1;
+
+        break;
+      }
+
+      md5_append(md5StateStream, &value, 1);
+    }
+  }
+
+  if (failed == 1)
+  {
+    #ifdef PANIC
+    *logofs << name() << ": PANIC! Write to persistent cache file failed.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Write to persistent cache file failed.\n";
+  }
+
+  delete [] identityBuffer;
+  delete [] sizeBuffer;
+  delete [] positionBuffer;
+  delete [] opcodeBuffer;
+
+  #ifdef DUMP
+
+  delete [] md5ClientDump;
+
+  #endif
+
+  return (failed == 0 ? 1 : -1);
+}
+
+int MessageStore::loadStore(istream *cachefs, md5_state_t *md5StateStream,
+                                T_checksum_action checksumAction, T_data_action dataAction,
+                                    int bigEndian)
+{
+  Message *message;
+
+  #ifdef TEST
+  *logofs << name() << ": Opcode of this store is "
+          << (unsigned int) opcode() << " default size of "
+          << "identity is " << dataOffset << " slots are "
+          << cacheSlots << ".\n" << logofs_flush;
+  #endif
+
+  //
+  // If packed images or the render extension has been
+  // disabled we don't need to restore these messages
+  // in the cache. Encoding of RENDER in 1.4.0 is also
+  // changed so we want to skip messages saved using
+  // the old format. We want to restore all the other
+  // messages so we'll need to skip these one by one.
+  //
+
+  int skip = 0;
+
+  if ((opcode() == X_NXPutPackedImage &&
+          control -> PersistentCacheLoadPacked == 0) ||
+              (opcode() == X_NXInternalRenderExtension &&
+                  control -> PersistentCacheLoadRender == 0))
+  {
+    #ifdef TEST
+    *logofs << name() << ": All messages for OPCODE#"
+            << (unsigned int) opcode() << " will be discarded.\n"
+            << logofs_flush;
+    #endif
+
+    skip = 1;
+  }
+
+  unsigned char *identityBuffer = new unsigned char[dataOffset];
+  unsigned char *sizeBuffer     = new unsigned char[4 * 2];
+
+  unsigned char value;
+
+  int offset;
+
+  int failed = 0;
+
+  for (int position = 0; position < cacheSlots; position++)
+  {
+    if (GetData(cachefs, &value, 1) < 0)
+    {
+      #ifdef DEBUG
+      *logofs << name() << ": PANIC! Failure reading " << 1
+              << " bytes.\n" << logofs_flush;
+      #endif
+
+      failed = 1;
+
+      break;
+    }
+
+    md5_append(md5StateStream, &value, 1);
+
+    if (value == 1)
+    {
+      #ifdef TEST
+      *logofs << name() << ": Going to load message at position "
+              << position << ".\n" << logofs_flush;
+      #endif
+
+      if (GetData(cachefs, sizeBuffer, 4 * 2) < 0)
+      {
+        #ifdef DEBUG
+        *logofs << name() << ": PANIC! Failure reading " << 4 * 2
+                << " bytes.\n" << logofs_flush;
+        #endif
+
+        failed = 1;
+
+        break;
+      }
+
+      md5_append(md5StateStream, sizeBuffer, 4 * 2);
+
+      message = getTemporary();
+
+      if (message == NULL)
+      {
+        #ifdef PANIC
+        *logofs << name() << ": PANIC! Can't access temporary storage "
+                << "for message in context [B].\n" << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Can't access temporary storage "
+             << "for message in context [B].\n";
+
+        failed = 1;
+
+        break;
+      }
+
+      message -> size_   = GetULONG(sizeBuffer, bigEndian);
+      message -> c_size_ = GetULONG(sizeBuffer + 4, bigEndian);
+
+      #ifdef DEBUG
+      *logofs << name() << ": Size is " << message -> size_
+              << " compressed size is " << message -> c_size_
+              << ".\n" << logofs_flush;
+      #endif
+
+      //
+      // Use the total size if offset is
+      // beyond the real end of message.
+      //
+
+      offset = dataOffset;
+
+      if (offset > message -> size_)
+      {
+        offset = message -> size_;
+      }
+
+      if (GetData(cachefs, identityBuffer, offset) < 0)
+      {
+        #ifdef DEBUG
+        *logofs << name() << ": PANIC! Failure reading " << offset
+                << " bytes.\n" << logofs_flush;
+        #endif
+
+        failed = 1;
+
+        break;
+      }
+
+      md5_append(md5StateStream, identityBuffer, offset);
+
+      //
+      // Get the real identity size based on the value
+      // reported by the message store. The dataOffset
+      // value is guaranteed to be greater or equal to
+      // the maximum identity size of the messages in
+      // the major store.
+      //
+
+      offset = identitySize(identityBuffer, offset);
+
+      if (offset > message -> size_)
+      {
+        offset = message -> size_;
+      }
+
+      message -> i_size_ = offset;
+
+      //
+      // Get identity of message from the buffer we just
+      // created. Don't calculate neither checksum nor
+      // data, restore them from stream. Don't pass the
+      // message's size but the default size of identity.
+      //
+
+      parseIdentity(message, identityBuffer, offset, bigEndian);
+
+      if (checksumAction == use_checksum)
+      {
+        if (message -> md5_digest_ == NULL)
+        {
+          message -> md5_digest_ = new md5_byte_t[MD5_LENGTH];
+        }
+
+        if (GetData(cachefs, message -> md5_digest_, MD5_LENGTH) < 0)
+        {
+          #ifdef DEBUG
+          *logofs << name() << ": PANIC! Failure reading " << MD5_LENGTH
+                  << " bytes.\n" << logofs_flush;
+          #endif
+
+          failed = 1;
+
+          break;
+        }
+
+        //
+        // Add message's checksum to checksum that will
+        // be saved together with this cache. Checksum
+        // will be verified when cache file is restored
+        // to ensure file is not corrupted.
+        //
+
+        md5_append(md5StateStream, message -> md5_digest_, MD5_LENGTH);
+
+        if (skip == 1)
+        {
+          #ifdef TEST
+          *logofs << name() << ": Discarding message for OPCODE#"
+                  << (unsigned int) opcode() << ".\n"
+                  << logofs_flush;
+          #endif
+          
+          continue;
+        }
+      }
+      else if (dataAction == use_data)
+      {
+        //
+        // Restore the data part.
+        //
+
+        int dataSize = (message -> c_size_ == 0 ?
+                             message -> size_ - offset :
+                                 message -> c_size_ - offset);
+
+        if (dataSize < 0 || dataSize > control -> MaximumMessageSize)
+        {
+          #ifdef PANIC
+          *logofs << name() << ": PANIC! Bad data size "
+                  << dataSize << " loading persistent cache.\n"
+                  << logofs_flush;
+          #endif
+
+          cerr << "Error" << ": Bad data size " << dataSize
+               << " loading persistent cache.\n";
+
+          failed = 1;
+
+          break;
+        }
+        else if (dataSize > 0)
+        {
+          //
+          // If need to skip the message let anyway
+          // it to be part of the calculated MD5.
+          //
+
+          if (skip == 1)
+          {
+            unsigned char *dummy = new unsigned char[dataSize];
+
+            if (dummy == NULL)
+            {
+              #ifdef PANIC
+              *logofs << name() << ": PANIC! Can't allocate dummy buffer "
+                      << "of size " << dataSize << " loading cache.\n"
+                      << logofs_flush;
+              #endif
+
+              cerr << "Error" << ": Can't allocate dummy buffer "
+                   << "of size " << dataSize << " loading cache.\n";
+
+              failed = 1;
+
+              break;
+            }
+
+            if (GetData(cachefs, dummy, dataSize) < 0)
+            {
+              #ifdef DEBUG
+              *logofs << name() << ": PANIC! Failure reading " << dataSize
+                      << " bytes.\n" << logofs_flush;
+              #endif
+
+              failed = 1;
+
+              break;
+            }
+
+            md5_append(md5StateStream, dummy, dataSize);
+
+            delete [] dummy;
+
+            #ifdef TEST
+            *logofs << name() << ": Discarding message for OPCODE#"
+                    << (unsigned int) opcode() << ".\n"
+                    << logofs_flush;
+            #endif
+
+            continue;
+          }
+          else
+          {
+            message -> data_.clear();
+
+            message -> data_.resize(dataSize);
+
+            if (GetData(cachefs, message -> data_.begin(), dataSize) < 0)
+            {
+              #ifdef DEBUG
+              *logofs << name() << ": PANIC! Failure reading " << dataSize
+                      << " bytes.\n" << logofs_flush;
+              #endif
+
+              failed = 1;
+
+              break;
+            }
+
+            //
+            // Add message's data to cache checksum.
+            //
+
+            md5_append(md5StateStream, message -> data_.begin(), dataSize);
+          }
+        }
+        else
+        {
+          //
+          // We are here if data part is zero.
+          //
+
+          if (skip == 1)
+          {
+            #ifdef TEST
+            *logofs << name() << ": Discarding message for OPCODE#"
+                    << (unsigned int) opcode() << ".\n"
+                    << logofs_flush;
+            #endif
+
+            continue;
+          }
+        }
+      }
+
+      int added;
+
+      added = add(message, position, checksumAction, dataAction);
+
+      if (added != position)
+      {
+        #ifdef PANIC
+        *logofs << name() << ": PANIC! Can't store message "
+                << "in the cache at position " << position
+                << ".\n" << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Can't store message "
+             << "in the cache at position " << position
+             << ".\n";
+
+        failed = 1;
+
+        break;
+      }
+      else
+      {
+        //
+        // Replace default value of hits set by add
+        // function. Messages read from cache start
+        // with a lower bonus than fresh messages
+        // inserted.
+        //
+
+        message -> hits_ = control -> StoreHitsLoadBonus;
+
+        #ifdef DEBUG
+        *logofs << name() << ": Updated last hit of object at " 
+                << strMsTimestamp() << " with a bonus of "
+                << message -> hits_ << ".\n" << logofs_flush;
+        #endif
+
+        resetTemporary();
+      }
+    }
+    else if ((*messages_)[position] != NULL)
+    {
+      #ifdef TEST
+      *logofs << name() << ": Going to remove message at position "
+              << position << ".\n" << logofs_flush;
+      #endif
+
+      int removed;
+
+      removed = remove(position, checksumAction, dataAction);
+
+      if (removed != position)
+      {
+        #ifdef PANIC
+        *logofs << name() << ": PANIC! Can't remove message from cache "
+                << "at position " << position << ".\n"
+                << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Can't remove message from cache "
+             << "at position " << position << ".\n";
+
+        failed = 1;
+
+        break;
+      }
+    }
+    #ifdef TEST
+    else
+    {
+      *logofs << name() << ": Not loading message at position "
+              << position << ".\n" << logofs_flush;
+    }
+    #endif
+  }
+
+  #ifdef WARNING
+
+  if (failed == 1)
+  {
+    *logofs << name() << ": WARNING! Read from persistent cache file failed.\n"
+            << logofs_flush;
+  }
+
+  #endif
+
+  delete [] identityBuffer;
+  delete [] sizeBuffer;
+
+  return (failed == 0 ? 1 : -1);
+}
+
+void MessageStore::storageSize(const Message *message, unsigned int &local,
+                                   unsigned int &remote) const
+{
+  local = remote = storage();
+
+  //
+  // Encoding side includes 48 bytes for
+  // the map of checksums and 24 bytes
+  // of adjustment for total overhead.
+  //
+
+  local += MD5_LENGTH + 48 + 24;
+
+  //
+  // At decoding side we include size of
+  // data part and 24 bytes of adjustment
+  // for total overhead.
+  //
+
+  if (message -> c_size_ == 0)
+  {
+    remote += message -> size_ + 24;
+  }
+  else
+  {
+    remote += message -> c_size_ + 24;
+  }
+
+  //
+  // Check if we are the encoding or the
+  // decoding side and, if needed, swap
+  // the values.
+  //
+
+  if (message -> md5_digest_ == NULL)
+  {
+    unsigned int t = local;
+
+    local = remote;
+
+    remote = t;
+  }
+}
+
+void MessageStore::printStorageSize()
+{
+  #ifdef TEST
+
+  *logofs << name() << ": There are "
+          << checksums_ -> size() << " checksums in this store "
+          << "out of " << cacheSlots << " slots.\n"
+          << logofs_flush;
+
+  *logofs << name() << ": Size of this store is "
+          << localStorageSize_ << " bytes at local side and "
+          << remoteStorageSize_ << " bytes at remote side.\n"
+          << logofs_flush;
+
+  *logofs << name() << ": Size of total cache is "
+          << totalLocalStorageSize_ << " bytes at local side and "
+          << totalRemoteStorageSize_ << " bytes at remote side.\n"
+          << logofs_flush;
+
+  #endif
+}
diff --git a/nxcomp/src/Message.h b/nxcomp/src/Message.h
new file mode 100644
index 000000000..30883f101
--- /dev/null
+++ b/nxcomp/src/Message.h
@@ -0,0 +1,1089 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef Message_H
+#define Message_H
+
+#include <X11/Xproto.h>
+
+#include "NXproto.h"
+
+#include "Misc.h"
+#include "Control.h"
+
+#include "Types.h"
+#include "Timestamp.h"
+
+#include "ActionCache.h"
+
+#include "StaticCompressor.h"
+
+//
+// Forward class declarations.
+//
+
+class ChannelCache;
+
+class EncodeBuffer;
+class DecodeBuffer;
+
+class WriteBuffer;
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+//
+// Define this to know how many messages
+// are allocated and deallocated.
+//
+
+#undef  REFERENCES
+
+//
+// Set default values.  We limit the maximum
+// size of a request to 262144 but we need to
+// consider the replies, whose size may be up
+// to 4MB.
+//
+
+#define MESSAGE_ENABLE_CACHE                        0
+#define MESSAGE_ENABLE_DATA                         0
+#define MESSAGE_ENABLE_SPLIT                        0
+#define MESSAGE_ENABLE_COMPRESS                     0
+
+#define MESSAGE_DATA_LIMIT                          4194304 - 4
+#define MESSAGE_DATA_OFFSET                         4
+
+#define MESSAGE_CACHE_SLOTS                         6000
+#define MESSAGE_CACHE_THRESHOLD                     50
+#define MESSAGE_CACHE_LOWER_THRESHOLD               5
+
+//
+// Base message class.
+//
+
+class Message
+{
+  friend class MessageStore;
+  friend class RenderExtensionStore;
+
+  public:
+
+  Message()
+  {
+    hits_  = 0;
+    last_  = 0;
+    locks_ = 0;
+
+    size_   = 0;
+    c_size_ = 0;
+
+    md5_digest_ = NULL;
+
+    #ifdef REFERENCES
+
+    references_++;
+
+    *logofs << "Message: Created new message at "
+            << this << " out of " << references_
+            << " allocated messages.\n"
+            << logofs_flush;
+
+    #endif
+  }
+
+  Message(const Message &message)
+  {
+    size_   = message.size_;
+    c_size_ = message.c_size_;
+    i_size_ = message.i_size_;
+
+    hits_  = message.hits_;
+    last_  = message.last_;
+    locks_ = message.locks_;
+
+    data_ = message.data_;
+
+    #ifdef REFERENCES
+
+    references_++;
+
+    *logofs << "Message: Creating new copied message at "
+            << this << " out of " << references_
+            << " allocated messages.\n"
+            << logofs_flush;
+    #endif
+
+    if (message.md5_digest_ != NULL)
+    {
+      md5_digest_ = new md5_byte_t[MD5_LENGTH];
+
+      memcpy(md5_digest_, message.md5_digest_, MD5_LENGTH);
+
+      #ifdef DEBUG
+      *logofs << "Message: Created MD5 digest for object at "
+              << this << ".\n" << logofs_flush;
+      #endif
+    }
+    else
+    {
+      md5_digest_ = NULL;
+    }
+  }
+
+  ~Message()
+  {
+    #ifdef DEBUG
+    if (md5_digest_ != NULL)
+    {
+      *logofs << "Message: Deleted MD5 digest for object at "
+              << this << ".\n" << logofs_flush;
+    }
+    #endif
+
+    delete [] md5_digest_;
+
+    #ifdef REFERENCES
+
+    references_--;
+
+    *logofs << "Message: Deleted message at "
+            << this << " out of " << references_
+            << " allocated messages.\n"
+            << logofs_flush;
+    #endif
+  }
+
+  //
+  // This is the original message size 
+  // including the data part regardless
+  // data is still stored in the object.
+  //
+
+  int size_;
+
+  //
+  // This is the size of the identity.
+  //
+
+  int i_size_;
+
+  //
+  // This is the size, including identity,
+  // after message has been 'updated' to 
+  // reflect storage of data in compressed
+  // format.
+  //
+
+  int c_size_;
+
+  protected:
+
+  //
+  // This is the data part.
+  //
+
+  T_data data_;
+
+  //
+  // Time of last hit.
+  //
+
+  time_t last_;
+
+  //
+  // This is the number of cache hits 
+  // registered for the object.
+  //
+
+  short int hits_;
+
+  //
+  // This is used to mark messages
+  // that have been split. 
+  //
+
+  short int locks_;
+
+  //
+  // This is the MD5 checksum.
+  //
+
+  md5_byte_t *md5_digest_;
+
+  //
+  // Keep a reference counter
+  // of allocated objects.
+  //
+
+  #ifdef REFERENCES
+
+  static int references_;
+
+  #endif
+};
+
+//
+// Repository of messages.
+//
+
+class MessageStore
+{
+  public:
+
+  //
+  // Enable or disable cache of messages in store.
+  //
+
+  int enableCache;
+
+  //
+  // Does message have a distinct data part.
+  //
+
+  int enableData;
+
+  //
+  // Enable or disable split of data part.
+  //
+
+  int enableSplit;
+
+  //
+  // Enable or disable compression of data part.
+  //
+
+  int enableCompress;
+
+  //
+  // Set starting point of data part in the message.
+  //
+
+  int dataOffset;
+
+  //
+  // Set maximum size for the data part of each message.
+  //
+
+  int dataLimit;
+
+  //
+  // Set maximum elements in cache.
+  //
+
+  int cacheSlots;
+
+  //
+  // Set the percentage of total cache memory which
+  // a given type of message is allowed to occupy.
+  // When threshold is exceeded store is cleaned to
+  // make room for a new message of the same type.
+  //
+
+  int cacheThreshold;
+
+  //
+  // Don't clean the store if percentage of cache
+  // memory occupied by messages of this type is
+  // below the threshold.
+  //
+
+  int cacheLowerThreshold;
+
+  //
+  // Last operation performed on cache.
+  //
+
+  T_store_action lastAction;
+
+  //
+  // Position of last element stored in cache.
+  //
+
+  short int lastAdded;
+
+  //
+  // Positions of last element found in cache.
+  //
+
+  short int lastHit;
+
+  //
+  // Position of last element erased.
+  //
+
+  short int lastRemoved;
+
+  //
+  // Used to encode the the action to
+  // perform on the store and the slot
+  // involved.
+  //
+
+  ActionCache lastActionCache;
+
+  //
+  // Position in cache where next insertion
+  // is going to take place.
+  //
+
+  short int lastRated;
+
+  //
+  // Constructors and destructors.
+  //
+
+  public:
+
+  MessageStore(StaticCompressor *compressor = NULL);
+
+  virtual ~MessageStore();
+
+  virtual const char *name() const = 0;
+
+  virtual unsigned char opcode() const = 0;
+
+  virtual unsigned int storage() const = 0;
+
+  //
+  // These are members that must be specialized.
+  //
+
+  public:
+
+  virtual Message *create() const = 0;
+
+  virtual Message *create(const Message &message) const = 0;
+
+  virtual void destroy(Message *message) const = 0;
+
+  void validateSize(int size)
+  {
+    if (size < control -> MinimumMessageSize ||
+            size > control -> MaximumMessageSize)
+    {
+      *logofs << name() << ": PANIC! Invalid size " << size
+              << " for message.\n" << logofs_flush;
+
+      cerr << "Error" << ": Invalid size " << size
+           << " for message opcode " << opcode() << ".\n";
+
+      HandleAbort();
+    }
+  }
+
+  void validateSize(int dataSize, int compressedDataSize)
+  {
+    if (dataSize < 0 || dataSize > control ->
+            MaximumMessageSize - 4 || compressedDataSize < 0 ||
+                compressedDataSize >= dataSize)
+    {
+      *logofs << name() << ": PANIC! Invalid data size "
+              << dataSize << " and compressed data size "
+              << compressedDataSize << " for message.\n"
+              << logofs_flush;
+
+      cerr << "Error" << ": Invalid data size "
+           << dataSize << " and compressed data size "
+           << compressedDataSize << " for message "
+           << "opcode " << (unsigned) opcode() << ".\n";
+
+      HandleAbort();
+    }
+  }
+
+  //
+  // Determine if the message can be stored
+  // in the cache.
+  //
+
+  virtual int validateMessage(const unsigned char *buffer, int size)
+  {
+    return (size >= control -> MinimumMessageSize &&
+                size <= control -> MaximumMessageSize);
+  }
+
+  //
+  // Get data offset based on major and minor
+  // opcode of the message.
+  //
+
+  virtual int identitySize(const unsigned char *buffer, unsigned int size)
+  {
+    return dataOffset;
+  }
+
+  //
+  // Encode identity and data using the
+  // specific message encoding.
+  //
+  // Some messages do not implement these
+  // methods because the encoding is done
+  // directly in the channel loop. Should
+  // move the encoding methods in in the
+  // message classes.
+  //
+
+  virtual int encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                                 unsigned int size, int bigEndian,
+                                     ChannelCache *channelCache) const
+  {
+    return 1;
+  }
+
+  virtual int decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
+                                 unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
+                                      ChannelCache *channelCache) const
+  {
+    return 1;
+  }
+
+  //
+  // Encode differences between message
+  // in cache and the one to be encoded.
+  //
+
+  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                  const Message *cachedMessage, ChannelCache *channelCache) const
+  {
+  }
+
+  //
+  // Decode differences and update the
+  // cached version of the same message.
+  //
+
+  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                  ChannelCache *channelCache) const
+  {
+  }
+
+  //
+  // Post process the message information
+  // contained in the store by either up-
+  // dating the size record or the actual
+  // data part once the message has been
+  // completely sent to our peer.
+  //
+
+  void updateData(const int position, unsigned int dataSize,
+                      unsigned int compressedDataSize);
+
+  void updateData(const T_checksum checksum, unsigned int compressedDataSize);
+
+  void updateData(const int position, const unsigned char *newData,
+                      unsigned int dataSize, unsigned int compressedDataSize);
+
+  //
+  // These members, used internally
+  // in the message store class, are
+  // mandatory.
+  //
+
+  protected:
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer,
+                                unsigned int size, int bigEndian) const = 0;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+                                  unsigned int size, int bigEndian) const = 0;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+                                    unsigned int size, int bigEndian) const = 0;
+
+  virtual void dumpIdentity(const Message *message) const = 0;
+
+  //
+  // Design should preserve these from being
+  // virtual.
+  //
+
+  int parseData(Message *message, int split, const unsigned char *buffer,
+                    unsigned int size, T_checksum_action checksumAction,
+                        T_data_action dataAction, int bigEndian);
+
+  int parseData(Message *message, const unsigned char *buffer,
+                    unsigned int size, const unsigned char *compressedData,
+                        const unsigned int compressedDataSize, T_checksum_action checksumAction,
+                            T_data_action dataAction, int bigEndian);
+
+  int unparseData(const Message *message, unsigned char *buffer,
+                      unsigned int size, int bigEndian);
+
+  //
+  // Manage efficient allocation of messages
+  // in the heap.
+  //
+
+  void recycle(Message *message)
+  {
+    #ifdef TEST
+
+    if (message == NULL)
+    {
+      *logofs << name() << ": PANIC! Cannot recycle a null message.\n"
+              << logofs_flush;
+
+      cerr << "Error" << ": Cannot recycle a null message.\n";
+
+      HandleAbort();
+    }
+
+    #endif
+
+    if (temporary_ == NULL)
+    {
+      //
+      // Be careful when reusing the message as
+      // it can contain valid data that must be
+      // explicitly deallocated if not needed.
+      // Note also that you cannot count on the
+      // initialization made in costructor.
+      //
+
+      temporary_ = message;
+    }
+    else
+    {
+      destroy(message);
+    }
+  }
+
+  void beginChecksum(Message *message)
+  {
+    if (message -> md5_digest_ == NULL)
+    {
+      message -> md5_digest_ = new md5_byte_t[MD5_LENGTH];
+
+      #ifdef DEBUG
+      *logofs << name() << ": Created MD5 digest structure "
+              << "for object at " << message << ".\n"
+              << logofs_flush;
+      #endif
+    }
+    #ifdef DEBUG
+    else
+    {
+      *logofs << name() << ": Using existing MD5 digest structure "
+              << "for object at " << message << ".\n"
+              << logofs_flush;
+    }
+    #endif
+
+    #ifdef DEBUG
+    *logofs << name() << ": Prepared MD5 digest for object at "
+            << message << ".\n" << logofs_flush;
+    #endif
+
+    md5_init(md5_state_);
+  }
+
+  void endChecksum(Message *message)
+  {
+    md5_finish(md5_state_, message -> md5_digest_);
+
+    #ifdef DEBUG
+    *logofs << name() << ": Calculated checksum for object at "
+            << message << ".\n" << logofs_flush;
+    #endif
+  }
+
+  void dataChecksum(Message *message, const unsigned char *buffer,
+                        unsigned int size, int bigEndian)
+  {
+    //
+    // Messages that have a data part starting
+    // at an offset possibly beyond the end of
+    // the message, must include the size in
+    // the identity checksum.
+    //
+
+    if ((int) size > message -> i_size_)
+    {
+      md5_append(md5_state_, buffer + message -> i_size_,
+                     size - message -> i_size_);
+    }
+  }
+
+  //
+  // Repository handling methods.
+  //
+
+  public:
+
+  //
+  // Extract identity and data from buffer.
+  // The size field will be updated at the
+  // time of data parsing.
+  //
+
+  int parse(Message *message, int split, const unsigned char *buffer, unsigned int size,
+                T_checksum_action checksumAction, T_data_action dataAction, int bigEndian);
+
+  int parse(Message *message, const unsigned char *buffer, unsigned int size,
+                const unsigned char *compressedData, const unsigned int compressedDataSize,
+                     T_checksum_action checksumAction, T_data_action dataAction, int bigEndian);
+
+  //
+  // From identity and data write the
+  // final message to the raw buffer.
+  //
+
+  int unparse(const Message *message, unsigned char *buffer,
+                  unsigned int size, int bigEndian)
+  {
+    return (unparseData(message, buffer, size, bigEndian) &&
+                unparseIdentity(message, buffer, size, bigEndian));
+  }
+
+  void dump(const Message *message) const
+  {
+    dumpIdentity(message);
+
+    dumpData(message);
+  }
+
+  void dumpData(const Message *message) const;
+
+  //
+  // This returns the original message size as it
+  // was received on the link. It takes in account
+  // the data part, regardless data is still stored
+  // in the message object. This information will
+  // be used at the time message is unparsed.
+  //
+
+  int plainSize(const int position) const
+  {
+    return (*messages_)[position] -> size_;
+  }
+
+  //
+  // This returns either the size of identity plus
+  // the compressed data part or 0 if message is
+  // stored in uncompressed format.
+  //
+
+  int compressedSize(const int position) const
+  {
+    return (*messages_)[position] -> c_size_;
+  }
+
+  //
+  // Returns a pointer to message
+  // given its position in cache.
+  //
+
+  Message *get(const int position) const
+  {
+    if (position < 0 || position >= cacheSlots)
+    {
+      #ifdef PANIC
+      *logofs << name() << ": PANIC! Requested position "
+              << position << " is not inside the "
+              << "container.\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Requested position "
+           << position << " is not inside the"
+           << "container.\n";
+
+      HandleAbort();
+    }
+    else if ((*messages_)[position] == NULL)
+    {
+      #ifdef PANIC
+      *logofs << name() << ": PANIC! Message at position "
+              << position << " is NULL.\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Message at position "
+           << position << " is NULL.\n";
+
+      HandleAbort();
+    }
+
+    return (*messages_)[position];
+  }
+
+  //
+  // This is the method called at encoding
+  // side to add a message to cache.
+  //
+
+  int findOrAdd(Message *message, T_checksum_action checksumAction,
+                    T_data_action dataAction, int &added, int &locked);
+
+  //
+  // Utility interfaces to message insertion
+  // and deletion.
+  //
+
+  int add(Message *message, const int position,
+              T_checksum_action checksumAction, T_data_action dataAction);
+
+  int remove(const int position, T_checksum_action checksumAction,
+                 T_data_action dataAction);
+
+  //
+  // Make space in the repository by remove
+  // the first suitable message object.
+  //
+
+  int clean(T_checksum_action checksumAction);
+
+  //
+  // Increase or decrease the "rating" of
+  // the message object.
+  //
+
+  int touch(Message *message) const;
+  int untouch(Message *message) const;
+
+  int getTouches(const int position) const
+  {
+    Message *message = (*messages_)[position];
+
+    if (message == NULL)
+    {
+      return 0;
+    }
+
+    return message -> hits_;
+  }
+
+  //
+  // Gives a 'weight' to the cached message. A zero
+  // value means object can be safely removed. A value
+  // greater than zero means it is advisable to retain
+  // the object. A negative result means it is mandato-
+  // ry to keep object in cache.
+  //
+
+  int getRating(Message *message, T_rating type) const;
+
+  //
+  // Increase or decrease locks of message at given
+  // position. A locked message will not be removed
+  // from the message store until the lock counter
+  // is zero.
+  //
+
+  int lock(const int position) const;
+  int unlock(const int position) const;
+
+  int getLocks(const int position) const
+  {
+    Message *message = (*messages_)[position];
+
+    if (message == NULL)
+    {
+      return 0;
+    }
+
+    return message -> locks_;
+  }
+
+  T_checksum const getChecksum(const int position) const
+  {
+    return getChecksum(get(position));
+  }
+
+  T_checksum const getChecksum(const Message *message) const
+  {
+    if (message -> md5_digest_ == NULL)
+    {
+      #ifdef PANIC
+      *logofs << name() << ": PANIC! Checksum not initialized "
+              << "for object at " << message << ".\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Checksum not initialized "
+           << "for object at " << message << ".\n";
+
+      HandleAbort();
+    }
+
+    #ifdef DEBUG
+    *logofs << name() << ": Got checksum for object at " 
+            << message << ".\n" << logofs_flush;
+    #endif
+
+    return message -> md5_digest_;
+  }
+
+  //
+  // Calculate the checksum on the fly based the
+  // opcode in the buffer. Useful in the case a
+  // message was not processed or was not stored
+  // in the cache. The returned checksum must be
+  // explicitly deallocated by the caller, after
+  // use.
+  //
+
+  T_checksum getChecksum(const unsigned char *buffer,
+                             unsigned int size, int bigEndian);
+
+  const unsigned char *getData(const Message *message) const
+  {
+    return message -> data_.begin();
+  }
+
+  int plainSize(const Message *message) const
+  {
+    return message -> size_;
+  }
+
+  int identitySize(Message *message)
+  {
+    return message -> i_size_;
+  }
+
+  int compressedSize(const Message *message) const
+  {
+    return message -> c_size_;
+  }
+
+  Message *getTemporary()
+  {
+    if (temporary_ == NULL)
+    {
+      temporary_ = create();
+    }
+
+    return temporary_;
+  }
+
+  void resetTemporary()
+  {
+    temporary_ = NULL;
+  }
+
+  //
+  // On side where we don't have checksums, we
+  // count how many messages are in the array.
+  // This is obviously expensive and should be
+  // only performed when reporting statistics.
+  //
+
+  int getSize() const
+  {
+    int size = checksums_ -> size();
+
+    if (size == 0)
+    {
+      for (int i = 0; i < cacheSlots; i++)
+      {
+        if ((*messages_)[i] != NULL)
+        {
+          size++;
+        }
+      }
+    }
+
+    return size;
+  }
+
+  int getLocalStorageSize() const
+  {
+    return localStorageSize_;
+  }
+
+  int getRemoteStorageSize() const
+  {
+    return remoteStorageSize_;
+  }
+
+  int getLocalTotalStorageSize() const
+  {
+    return totalLocalStorageSize_;
+  }
+
+  int getRemoteTotalStorageSize() const
+  {
+    return totalRemoteStorageSize_;
+  }
+
+  static int getCumulativeTotalStorageSize()
+  {
+    return (totalLocalStorageSize_ > totalRemoteStorageSize_ ?
+                totalLocalStorageSize_ : totalRemoteStorageSize_);
+  }
+
+  int saveStore(ostream *cachefs, md5_state_t *md5_state_stream,
+                    md5_state_t *md5_state_client, T_checksum_action checksumAction,
+                        T_data_action dataAction, int bigEndian);
+
+  int loadStore(istream *cachefs, md5_state_t *md5_state_stream,
+                    T_checksum_action checksumAction, T_data_action dataAction,
+                        int bigEndian);
+
+  protected:
+
+  //
+  // Estimate the memory requirements of given
+  // instance of message. Size includes memory
+  // allocated from heap to store checksum and
+  // data.
+  //
+
+  void storageSize(const Message *message, unsigned int &local,
+                       unsigned int &remote) const;
+
+  //
+  // Just used for debug.
+  //
+
+  void printStorageSize();
+
+  //
+  // Repositories where to save cached messages.
+  // First is a vector of pointers, the second
+  // is a hash table used for fast lookups.
+  //
+
+  T_messages  *messages_;
+  T_checksums *checksums_;
+
+  //
+  // A message object to be used as a temporary.
+  // Reuse the temporary object if possible, if
+  // not, create a new instance.
+  //
+
+  Message *temporary_;
+
+  //
+  // Used to calculate message's checksum.
+  //
+
+  md5_state_t *md5_state_;
+
+  private:
+
+  //
+  // Used to compress data payload.
+  //
+
+  StaticCompressor *compressor_;
+
+  //
+  // Keep track of how many bytes 
+  // are taken by cache.
+  //
+
+  int localStorageSize_;
+  int remoteStorageSize_;
+
+  static int totalLocalStorageSize_;
+  static int totalRemoteStorageSize_;
+
+  //
+  // Used to track object allocation and deallocation.
+  //
+
+  #ifdef REFERENCES
+
+  static int references_;
+
+  #endif
+};
+
+//
+// This is an ancillary class of the message
+// store, used to encode extensions based on
+// the minor opcode.
+//
+
+class MinorMessageStore
+{
+  public:
+
+  virtual ~MinorMessageStore()
+  {
+  }
+
+  virtual const char *name() const = 0;
+
+  virtual int identitySize(const unsigned char *buffer, unsigned int size) = 0;
+
+  virtual int encodeMessage(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                                const unsigned int size, int bigEndian,
+                                    ChannelCache *channelCache) const
+  {
+    return 1;
+  }
+
+  virtual int decodeMessage(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
+                                unsigned int &size, unsigned char type, int bigEndian,
+                                    WriteBuffer *writeBuffer, ChannelCache *channelCache) const
+  {
+    return 1;
+  }
+
+  virtual void encodeData(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                              unsigned int size, int bigEndian,
+                                  ChannelCache *channelCache) const
+  {
+  }
+
+  virtual void decodeData(DecodeBuffer &decodeBuffer, unsigned char *buffer,
+                              unsigned int size, int bigEndian,
+                                  ChannelCache *channelCache) const
+  {
+  }
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer,
+                                unsigned int size, int bigEndian) const = 0;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+                                  unsigned int size, int bigEndian) const = 0;
+
+  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                  const Message *cachedMessage,
+                                      ChannelCache *channelCache) const
+  {
+  }
+
+  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                  ChannelCache *channelCache) const
+  {
+  }
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+                                    unsigned int size, md5_state_t *md5_state,
+                                        int bigEndian) const = 0;
+};
+
+#endif /* Message_H */
+
diff --git a/nxcomp/src/Misc.cpp b/nxcomp/src/Misc.cpp
new file mode 100644
index 000000000..b40e6409e
--- /dev/null
+++ b/nxcomp/src/Misc.cpp
@@ -0,0 +1,1934 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <cstdio>
+#include <cctype>
+#include <cstdlib>
+#include <unistd.h>
+#include <csignal>
+
+#include <errno.h>
+#include <string.h>
+
+#include "NXproto.h"
+
+#include "MD5.h"
+
+#include "Misc.h"
+#include "Proxy.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#define OPCODES
+#undef  TEST
+#undef  DEBUG
+
+//
+// By default nxproxy binds to all network interfaces, setting
+// DEFAULT_LOOPBACK_BIND to 1 enables binding to the loopback
+// device only.
+//
+
+const int DEFAULT_LOOPBACK_BIND = 0;
+
+//
+// TCP port offset applied to any NX port specification.
+//
+
+const int DEFAULT_NX_PROXY_PORT_OFFSET = 4000;
+
+//
+// Default TCP port used by client proxy to listen to  
+// X clients and by server proxy to connect to remote.
+//
+
+const int DEFAULT_NX_PROXY_PORT = 8;
+
+//
+// Default X display number that client proxy imitates.
+//
+
+const int DEFAULT_NX_X_PORT = 8;
+
+//
+// Default ports used for listening for cups, samba, http,
+// multimedia and auxiliary X connections. Arbitrary ports
+// can be used by passing the service's port at the proxy
+// startup. By default ports are determined by adding the
+// offset below to the offset of the proxied display. For
+// example, if the proxy is impersonating the display :8,
+// SMB tunnels can be created by connecting to port 3008.
+//
+// Considering that the NX server uses to start the first
+// session at display offset 1000, we must lower the CUPS
+// and SMB ports to avoid interference with normal X ses-
+// sions run on the server.
+//
+// Font server connections are used to let the X server on
+// the client connect to a font server on the NX server.
+//
+// Slave channels can be originated by both sides so we need
+// different offsets in the case the user runs both proxies
+// on the same host.
+//
+
+const int DEFAULT_NX_CUPS_PORT_OFFSET  = 2000;
+const int DEFAULT_NX_SMB_PORT_OFFSET   = 3000;
+const int DEFAULT_NX_MEDIA_PORT_OFFSET = 7000;
+const int DEFAULT_NX_AUX_PORT_OFFSET   = 8000;
+const int DEFAULT_NX_HTTP_PORT_OFFSET  = 9000;
+const int DEFAULT_NX_FONT_PORT_OFFSET  = 10000;
+
+const int DEFAULT_NX_SLAVE_PORT_CLIENT_OFFSET = 11000;
+const int DEFAULT_NX_SLAVE_PORT_SERVER_OFFSET = 12000;
+
+//
+// Usage info and copyright.
+//
+
+static const char UsageInfo[] =
+"\n\
+  Usage: nxproxy [OPTIONS] host:port\n\
+\n\
+  -C           Specify that nxproxy has to run on the 'X client'\n\
+               side, listening for connections and impersonating\n\
+               an X server.\n\
+\n\
+  -S           Specify that nxproxy has to run in 'X server' mode,\n\
+               thus forwarding the connections to daemons running\n\
+               on the client.\n\
+\n\
+  -h           Print this message.\n\
+\n\
+  -v           Print version information.\n\
+\n\
+  host:port    Put at the end, specifies the host and port of the\n\
+               listening proxy.\n\
+\n\
+  name=value   Set the NX option to the provided value.\n\
+\n\
+  Multiple NX options can be specified in the DISPLAY environment\n\
+  or on the command line, by using the nx/nx,option=value notation.\n\
+\n\
+  Options:\n\
+\n\
+  link=s       An indication of the link speed that is going to be\n\
+               used between the proxies. Usually the compression\n\
+               and the other link parameters depend on this setting.\n\
+               The value can be either 'modem', 'isdn', 'adsl',\n\
+               'wan', 'lan', 'local' or a bandwidth specification,\n\
+               like for example '56k', '1m', '100m', etc.\n\
+\n\
+  type=s       Type of session, for example 'windows', 'unix-kde'.\n\
+               'unix-application', etc.\n\
+\n\
+  display=s    Specify the real display where X connections have\n\
+               to be forwarded by the proxy running on the client.\n\
+\n\
+  listen=n     Local port used for accepting the proxy connection.\n\
+\n\
+  loopback=b   Bind to the loopback device only.\n\
+\n\
+  accept=s     Name or IP of host that can connect to the proxy.\n\
+\n\
+  connect=s    Name or IP of host that the proxy will connect to.\n\
+\n\
+  port=n       Remote port used for the connection.\n\
+\n\
+  retry=n      Number of connection atempts.\n\
+\n\
+  root=s       The root directory for the session. Usually is the\n\
+               C-* or S-* in the .nx directory in the user's home,\n\
+               with '*' being the virtual display.\n\
+\n\
+  session=s    Name of the session file. The default is the name\n\
+               'session' in the session directory.\n\
+\n\
+  errors=s     Name of the log file used by the proxy. The default\n\
+               is the name 'errors' in the session directory.\n\
+\n\
+  stats=s      Name of the file where are written the proxy stat-\n\
+               istics. The default is a file 'stats' in the session\n\
+               directory. The proxy replaces the data in the file\n\
+               whenever it receives a SIGUSR1 or SIGUSR2 signal:\n\
+\n\
+               SIGUSR1    Gives total statistics, i.e. statistics\n\
+                          collected since the beginning of the\n\
+                          session.\n\
+\n\
+               SIGUSR2    Gives partial statistics, i.e. statist-\n\
+                          ics collected since the last time this\n\
+                          signal was received.\n\
+\n\
+  cookie=s     Use the provided cookie for authenticating to the\n\
+               remote proxy. The same cookie is used as the fake\n\
+               value used for the X authorization. The fake cookie\n\
+               is replaced on the X server side with the real cookie\n\
+               to be used for the display, so that the real cookie\n\
+               doesn't have to travel over the net. When not using\n\
+               a proxy cookie, any host will be able to connect to\n\
+               the proxy. See also the 'accept' parameter.\n\
+\n\
+  nodelay=b    A boolean indicating if TCP_NODELAY has to be set\n\
+               on the proxy link. Old Linux kernels had problems\n\
+               with handling TCP_NODELAY on PPP links.\n\
+\n\
+  policy=b     Let or not the agent decide when it is the best time\n\
+               to flush the proxy link. If set to 0, the proxy will\n\
+               flush any encoded data immediately. The option has\n\
+               only effect on the X client side proxy.\n\
+\n\
+  render=b     Enable or disable use of the RENDER extension.\n\
+\n\
+  taint=b      Try to suppress trivial sources of X roundtrips by\n\
+               generating the reply on the X client side.\n\
+\n\
+  delta=b      Enable X differential compression.\n\
+\n\
+  data=n       Enable or disable the ZLIB data compression. It is\n\
+               possible to specify a value between 0 and 9. Usual-\n\
+               ly the value is chosen automatically based on the\n\
+               requested link setting.\n\
+\n\
+  stream=n     Enable or disable the ZLIB stream compression. The\n\
+               value, between 0 and 9, is usually determined accor-\n\
+               ding to the requested link setting.\n\
+\n\
+  limit=n      Specify a bitrate limit allowed for this session.\n\
+\n\
+  memory=n     Trigger memory optimizations used to keep small the\n\
+               size of X buffers. This is useful on embedded plat-\n\
+               forms, or where memory is scarce.\n\
+\n\
+  cache=n      Size of the in-memory X message cache. Setting the\n\
+               value to 0 will disable the memory cache as well\n\
+               as the NX differential compression.\n\
+\n\
+  images=n     Size of the persistent image cache.\n\
+\n\
+  shseg=n      Enable the use of the MIT-SHM extension between the\n\
+               NX client proxy and the real X server. A value greater\n\
+               than 1 is assumed to be the size of requested shared\n\
+               memory segment. By default, the size of the segment is\n\
+               determined based on the size of the in-memory cache.\n\
+\n\
+  load=b       Enable loading a persistent X message cache at the\n\
+               proxy startup.\n\
+\n\
+  save=b       Enable saving a persistent X message cache at the\n\
+               end of session.\n\
+\n\
+  cups=n       Enable or disable forwarding of CUPS connections,\n\
+               by listening on the optional port 'n'.\n\
+\n\
+  aux=n        Enable or disable forwarding of the auxiliary X chan-\n\
+               nel used for controlling the keyboard. The 'keybd=n'\n\
+               form is accepted for backward compatibility.\n\
+\n\
+  smb=n        Enable or disable forwarding of SMB connections. The\n\
+               'samba=n' form is accepted for backward compatibility.\n\
+\n\
+  media=n      Enable forwarding of audio connections.\n\
+\n\
+  http=n       Enable forwarding of HTTP connections.\n\
+\n\
+  font=n       Enable forwarding of reversed connections to a font\n\
+               server running on the NX server.\n\
+\n\
+  file=n       Enable forwarding of file transfer connections.\n\
+\n\
+  mask=n       Determine the distribution of channel ids between the\n\
+               proxies. By default, channels whose ids are multiple\n\
+               of 8 (starting from 0) are reserved for the NX client\n\
+               side. All the other channels can be allocated by the\n\
+               NX server side.\n\
+\n\
+  timeout=t    Specify the keep-alive timeout used by proxies to\n\
+               determine if there is a network problem preventing\n\
+               communication with the remote peer. A value of 0\n\
+               disables the check.\n\
+\n\
+  cleanup=t    Specify the number of seconds the proxy has to wait\n\
+               at session shutdown before closing all channels.\n\
+               The feature is used by the NX server to ensure that\n\
+               services are disconnected before shutting down the\n\
+               link.\n\
+\n\
+  pack=s       Determine the method used to compress images.\n\
+\n\
+  product=s    The product id of the client or server. The value is\n\
+               ignored by the proxy, but the client or server can\n\
+               provide it to facilitate the support.\n\
+\n\
+  core=b       Enable production of core dumps when aborting the\n\
+               proxy connection.\n\
+\n\
+  options=s    Specify an additional file containing options that\n\
+               has to be merged with option read from the command\n\
+               line or the environment.\n\
+\n\
+  kill=n       Add the given process to the list of daemons that\n\
+               must be terminated at session shutdown. Multiple\n\
+               'kill=n' options can be specified. The proxy will\n\
+               send them a SIGTERM signal just before exiting.\n\
+\n\
+  strict=b     Optimize for responsiveness, rather than for the best\n\
+               use of all the available bandwidth.\n\
+\n\
+  encryption=b Should be set to 1 if the proxy is running as part of\n\
+               a program providing encryption of the point to point\n\
+               communication.\n\
+\n\
+rootless=b\n\
+geometry=s\n\
+resize=b\n\
+fullscreen=b\n\
+keyboard=s\n\
+clipboard=s\n\
+streaming=n\n\
+backingstore=n\n\
+composite=n\n\
+xinerama=n\n\
+shmem=b\n\
+shpix=b\n\
+kbtype=s\n\
+client=s\n\
+shadow=n\n\
+shadowuid=n\n\
+shadowmode=s\n\
+defer=n\n\
+tile=s\n\
+menu=n\n\
+sleep=n\n\
+tolerancechecks=s\n\
+               These options are interpreted by the NX agent. They\n\
+               are ignored by the proxy.\n\
+\n\
+  Environment:\n\
+\n\
+  NX_ROOT      The root NX directory is the place where the session\n\
+               directory and the cache files are created. This is\n\
+               usually overridden by passing the 'root=' option. By\n\
+               default, the root NX directory is assumed to be the\n\
+               directory '.nx' in the user's home.\n\
+\n\
+  NX_SYSTEM    The directory where NX programs and libraries reside.\n\
+               If not set, the value is assumed to be '/usr/NX'.\n\
+               Programs, libraries and data files are respectedly\n\
+               searched in the 'bin', 'lib' and 'share' subdirecto-\n\
+               ries.\n\
+\n\
+  NX_HOME      The NX user's home directory. If NX_ROOT is not set\n\
+               or invalid, the user's NX directory is created here.\n\
+\n\
+  NX_TEMP      The directory where the X11 Unix Domain Sockets and\n\
+               all temporary files are to be created.\n\
+\n\
+  NX_CLIENT    The full path to the nxclient executable. If the va-\n\
+               riable is not set, the nxclient executable will be\n\
+               run assuming that the program is in the system path.\n\
+               This can be useful on platforms like Windows and the\n\
+               Mac where nxclient is located in a different direct-\n\
+               ory compared to the other programs, to make easier\n\
+               for the user to execute the program from the shell.\n\
+\n\
+  NX_SLAVE_CMD The full path to the slave channel handler. When the\n\
+               slave channel is enabled, the agent will listen on a\n\
+               port and forward the connection to the NX_SLAVE_CMD\n\
+               program. This can be used to implement agent/proxy\n\
+               communication for applications such as serial port and\n\
+               USB forwarding.\n\
+\n\
+  Shell environment:\n\
+\n\
+  HOME         The variable is checked in the case NX_HOME is not\n\
+               set, null or invalid.\n\
+\n\
+  TEMP         The variable is checked whenever the NX_TEMP direct-\n\
+               ory is not set, null or invalid.\n\
+\n\
+  PATH         The path where all executables are searched, except\n\
+               nxclient. If NX_CLIENT is not set, also the client\n\
+               executable is searched in the system path.\n\
+\n\
+  LD_LIBRARY_PATH\n\
+               System-wide library search order. This should be set\n\
+               by the program invoking the proxy.\n\
+\n\
+  DISPLAY      On the X server side, the DISPLAY variable indicates\n\
+               the location of the X11 server. When nxcomp is used\n\
+               as a transport library, the DISPLAY may represent a\n\
+               NX transport specification and options can passed in\n\
+               the form nx/nx,option=value...\n\
+\n\
+  XAUTHORITY   This is the file containing the X11 authorization\n\
+               cookie. If not set, the file is assumed to be in\n\
+               the user's home (either NX_HOME or HOME).\n\
+\n\
+";
+
+const char *GetUsageInfo()
+{
+  return UsageInfo;
+}
+
+static const char CopyrightInfo[] =
+"\
+Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)\n\
+Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>\n\
+Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>\n\
+Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>\n\
+Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n\
+Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)\n\
+\n\
+NXCOMP, NX protocol compression and NX extensions to this software\n\
+are copyright of the aforementioned persons and companies.\n\
+\n\
+Redistribution and use of the present software is allowed according\n\
+to terms specified in the file LICENSE.nxcomp which comes in the\n\
+source distribution.\n\
+\n\
+All rights reserved.\n\
+\n\
+NOTE: This software has received contributions from various other\n\
+contributors, only the core maintainers and supporters are listed as\n\
+copyright holders. Please contact us, if you feel you should be listed\n\
+as copyright holder, as well.\n\
+";
+
+const char *GetCopyrightInfo()
+{
+  return CopyrightInfo;
+}
+
+static const char OtherCopyrightInfo[] =
+"\
+NX protocol compression is derived from DXPC project.\n\
+\n\
+Copyright (c) 1995,1996 Brian Pane\n\
+Copyright (c) 1996,1997 Zachary Vonler and Brian Pane\n\
+Copyright (c) 1999 Kevin Vigor and Brian Pane\n\
+Copyright (c) 2000,2003 Gian Filippo Pinzari and Brian Pane\n\
+\n\
+All rights reserved.\n\
+";
+
+const char *GetOtherCopyrightInfo()
+{
+  return OtherCopyrightInfo;
+}
+
+int _hostBigEndian  = 0;
+int _storeBigEndian = 0;
+
+const unsigned int IntMask[33] =
+{
+  0x00000000,
+  0x00000001,
+  0x00000003,
+  0x00000007,
+  0x0000000f,
+  0x0000001f,
+  0x0000003f,
+  0x0000007f,
+  0x000000ff,
+  0x000001ff,
+  0x000003ff,
+  0x000007ff,
+  0x00000fff,
+  0x00001fff,
+  0x00003fff,
+  0x00007fff,
+  0x0000ffff,
+  0x0001ffff,
+  0x0003ffff,
+  0x0007ffff,
+  0x000fffff,
+  0x001fffff,
+  0x003fffff,
+  0x007fffff,
+  0x00ffffff,
+  0x01ffffff,
+  0x03ffffff,
+  0x07ffffff,
+  0x0fffffff,
+  0x1fffffff,
+  0x3fffffff,
+  0x7fffffff,
+  0xffffffff
+};
+
+unsigned int GetUINT(unsigned const char *buffer, int bigEndian)
+{
+  //
+  // It doesn't work on SPARCs if the buffer
+  // is not aligned to the word boundary. We
+  // should check the CPU, not the OS as this
+  // surely applies to other architectures.
+  //
+
+  #ifndef __sun
+
+  if (_hostBigEndian == bigEndian)
+  {
+    return *((unsigned short *) buffer);
+  }
+
+  #else
+
+  if (_hostBigEndian == bigEndian && ((unsigned int) buffer) & 0x1 == 0)
+  {
+    return *((unsigned short *) buffer);
+  }
+
+  #endif
+
+  unsigned int result;
+
+  if (bigEndian)
+  {
+    result = *buffer;
+
+    result <<= 8;
+
+    result += buffer[1];
+  }
+  else
+  {
+    result = buffer[1];
+
+    result <<= 8;
+
+    result += *buffer;
+  }
+
+  return result;
+}
+
+unsigned int GetULONG(unsigned const char *buffer, int bigEndian)
+{
+  //
+  // It doesn't work on SPARCs if the buffer
+  // is not aligned to word the boundary.
+  //
+
+  #ifndef __sun
+
+  if (_hostBigEndian == bigEndian)
+  {
+    return *((unsigned int *) buffer);
+  }
+
+  #else
+
+  if (_hostBigEndian == bigEndian && ((unsigned int) buffer) & 0x3 == 0)
+  {
+    return *((unsigned int *) buffer);
+  }
+
+  #endif
+
+  const unsigned char *next = (bigEndian ? buffer : buffer + 3);
+
+  unsigned int result = 0;
+
+  for (int i = 0; i < 4; i++)
+  {
+    result <<= 8;
+
+    result += *next;
+
+    if (bigEndian)
+    {
+      next++;
+    }
+    else
+    {
+      next--;
+    }
+  }
+
+  return result;
+}
+
+void PutUINT(unsigned int value, unsigned char *buffer, int bigEndian)
+{
+  if (_hostBigEndian == bigEndian)
+  {
+    *((unsigned short *) buffer) = value;
+
+    return;
+  }
+
+  if (bigEndian)
+  {
+    buffer[1] = (unsigned char) (value & 0xff);
+
+    value >>= 8;
+
+    *buffer = (unsigned char) value;
+  }
+  else
+  {
+    *buffer = (unsigned char) (value & 0xff);
+
+    value >>= 8;
+
+    buffer[1] = (unsigned char) value;
+  }
+}
+
+void PutULONG(unsigned int value, unsigned char *buffer, int bigEndian)
+{
+  if (_hostBigEndian == bigEndian)
+  {
+    *((unsigned int *) buffer) = value;
+
+    return;
+  }
+
+  if (bigEndian)
+  {
+    buffer += 3;
+
+    for (int i = 4; i > 0; i--)
+    {
+      *buffer-- = (unsigned char) (value & 0xff);
+
+      value >>= 8;
+    }
+  }
+  else
+  {
+    for (int i = 4; i > 0; i--)
+    {
+      *buffer++ = (unsigned char) (value & 0xff);
+
+      value >>= 8;
+    }
+  }
+}
+
+int CheckData(istream *fs)
+{
+  if (fs == NULL || fs -> fail())
+  {
+    return -1;
+  }
+
+  return 1;
+}
+
+int CheckData(ostream *fs)
+{
+  if (fs == NULL || fs -> fail())
+  {
+    return -1;
+  }
+
+  return 1;
+}
+
+int PutData(ostream *fs, const unsigned char *buffer, int size)
+{
+  fs -> write((char *) buffer, size);
+
+  #ifdef DEBUG
+  *logofs << "PutData: Written " << size << " bytes with eof "
+          << fs -> eof() << " fail " << fs -> fail() << " and bad "
+          << fs -> bad() << ".\n" << logofs_flush;
+  #endif
+
+  if (fs -> fail())
+  {
+    return -1;
+  }
+
+  return size;
+}
+
+int GetData(istream *fs, unsigned char *buffer, int size)
+{
+  fs -> read((char *) buffer, size);
+
+  #ifdef DEBUG
+  *logofs << "GetData: Read " << size << " bytes with eof "
+          << fs -> eof() << " fail " << fs -> fail()
+          << " and bad " << fs -> bad() << ".\n"
+          << logofs_flush;
+  #endif
+
+  #ifdef __APPLE__
+
+  if (fs -> bad())
+  {
+    return -1;
+  }
+
+  #else
+
+  if (fs -> fail())
+  {
+    return -1;
+  }
+
+  #endif
+
+  return size;
+}
+
+int FlushData(ostream *fs)
+{
+  fs -> flush();
+
+  if (fs -> fail())
+  {
+    return -1;
+  }
+
+  return 1;
+}
+
+unsigned int RoundUp2(unsigned int x)
+{
+  unsigned int y = x / 2;
+
+  y *= 2;
+
+  if (y != x)
+  {
+    y += 2;
+  }
+
+  return y;
+}
+
+unsigned int RoundUp4(unsigned int x)
+{
+  unsigned int y = x / 4;
+
+  y *= 4;
+
+  if (y != x)
+  {
+    y += 4;
+  }
+
+  return y;
+}
+
+unsigned int RoundUp8(unsigned int x)
+{
+  unsigned int y = x / 8;
+
+  y *= 8;
+
+  if (y != x)
+  {
+    y += 8;
+  }
+
+  return y;
+}
+
+const char *DumpSignal(int signal)
+{
+  switch (signal)
+  {
+    case SIGCHLD:
+    {
+      return "SIGCHLD";
+    }
+    case SIGUSR1:
+    {
+      return "SIGUSR1";
+    }
+    case SIGUSR2:
+    {
+      return "SIGUSR2";
+    }
+    case SIGHUP:
+    {
+      return "SIGHUP";
+    }
+    case SIGINT:
+    {
+      return "SIGINT";
+    }
+    case SIGTERM:
+    {
+      return "SIGTERM";
+    }
+    case SIGPIPE:
+    {
+      return "SIGPIPE";
+    }
+    case SIGALRM:
+    {
+      return "SIGALRM";
+    }
+    case SIGVTALRM:
+    {
+      return "SIGVTALRM";
+    }
+    case SIGWINCH:
+    {
+      return "SIGWINCH";
+    }
+    case SIGIO:
+    {
+      return "SIGIO";
+    }
+    case SIGTSTP:
+    {
+      return "SIGTSTP";
+    }
+    case SIGTTIN:
+    {
+      return "SIGTTIN";
+    }
+    case SIGTTOU:
+    {
+      return "SIGTTOU";
+    }
+    case SIGSEGV:
+    {
+      return "SIGSEGV";
+    }
+    case SIGABRT:
+    {
+      return "SIGABRT";
+    }
+    default:
+    {
+      return "Unknown";
+    }
+  }
+}
+
+const char *DumpPolicy(int type)
+{
+  switch ((T_flush_policy) type)
+  {
+    case policy_immediate:
+    {
+      return "immediate";
+    }
+    case policy_deferred:
+    {
+      return "deferred";
+    }
+    default:
+    {
+      #ifdef PANIC
+      *logofs << "Misc: PANIC! Unknown policy type '"
+              << type << "'.\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Unknown policy type '"
+           << type << "'.\n";
+
+      HandleCleanup();
+    }
+  }
+}
+
+const char *DumpAction(int type)
+{
+  T_store_action action = (T_store_action) type;
+
+  if (action == IS_HIT)
+  {
+    return "is_hit";
+  }
+  else if (action == IS_ADDED)
+  {
+    return "is_added";
+  }
+  else if (action == is_discarded)
+  {
+    return "is_discarded";
+  }
+  else if (action == is_removed)
+  {
+    return "is_removed";
+  }
+  else
+  {
+    #ifdef PANIC
+    *logofs << "Misc: PANIC! Unknown store action '"
+            << type << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Unknown store action '"
+         << type << "'.\n";
+
+    HandleCleanup();
+  }
+}
+
+const char *DumpState(int type)
+{
+  switch ((T_split_state) type)
+  {
+    case split_added:
+    {
+      return "split_added";
+    }
+    case split_missed:
+    {
+      return "split_missed";
+    }
+    case split_loaded:
+    {
+      return "split_loaded";
+    }
+    case split_aborted:
+    {
+      return "split_aborted";
+    }
+    case split_notified:
+    {
+      return "split_notified";
+    }
+    default:
+    {
+      #ifdef PANIC
+      *logofs << "Misc: PANIC! Unknown split state '"
+              << type << "'.\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Unknown split state '"
+           << type << "'.\n";
+
+      HandleCleanup();
+    }
+  }
+}
+
+const char *DumpControl(int code)
+{
+  switch ((T_proxy_code) code)
+  {
+    case code_new_x_connection:
+    {
+      return "code_new_x_connection";
+    }
+    case code_new_cups_connection:
+    {
+      return "code_new_cups_connection";
+    }
+    case code_new_aux_connection:
+    {
+      return "code_new_aux_connection";
+    }
+    case code_new_smb_connection:
+    {
+      return "code_new_smb_connection";
+    }
+    case code_new_media_connection:
+    {
+      return "code_new_media_connection";
+    }
+    case code_switch_connection:
+    {
+      return "code_switch_connection";
+    }
+    case code_drop_connection:
+    {
+      return "code_drop_connection";
+    }
+    case code_finish_connection:
+    {
+      return "code_finish_connection";
+    }
+    case code_begin_congestion:
+    {
+      return "code_begin_congestion";
+    }
+    case code_end_congestion:
+    {
+      return "code_end_congestion";
+    }
+    case code_alert_request:
+    {
+      return "code_alert_request";
+    }
+    case code_alert_reply:
+    {
+      return "code_alert_reply";
+    }
+    case code_reset_request:
+    {
+      return "code_reset_request";
+    }
+    case code_reset_reply:
+    {
+      return "code_reset_reply";
+    }
+    case code_load_request:
+    {
+      return "code_load_request";
+    }
+    case code_load_reply:
+    {
+      return "code_load_reply";
+    }
+    case code_save_request:
+    {
+      return "code_save_request";
+    }
+    case code_save_reply:
+    {
+      return "code_save_reply";
+    }
+    case code_shutdown_request:
+    {
+      return "code_shutdown_request";
+    }
+    case code_shutdown_reply:
+    {
+      return "code_shutdown_reply";
+    }
+    case code_control_token_request:
+    {
+      return "code_control_token_request";
+    }
+    case code_control_token_reply:
+    {
+      return "code_control_token_reply";
+    }
+    case code_configuration_request:
+    {
+      return "code_configuration_request";
+    }
+    case code_configuration_reply:
+    {
+      return "code_configuration_reply";
+    }
+    case code_statistics_request:
+    {
+      return "code_statistics_request";
+    }
+    case code_statistics_reply:
+    {
+      return "code_statistics_reply";
+    }
+    case code_new_http_connection:
+    {
+      return "code_new_http_connection";
+    }
+    case code_sync_request:
+    {
+      return "code_sync_request";
+    }
+    case code_sync_reply:
+    {
+      return "code_sync_reply";
+    }
+    case code_new_font_connection:
+    {
+      return "code_new_font_connection";
+    }
+    case code_new_slave_connection:
+    {
+      return "code_new_slave_connection";
+    }
+    case code_finish_listeners:
+    {
+      return "code_finish_listeners";
+    }
+    case code_split_token_request:
+    {
+      return "code_split_token_request";
+    }
+    case code_split_token_reply:
+    {
+      return "code_split_token_reply";
+    }
+    case code_data_token_request:
+    {
+      return "code_data_token_request";
+    }
+    case code_data_token_reply:
+    {
+      return "code_data_token_reply";
+    }
+    default:
+    {
+      #ifdef WARNING
+      *logofs << "Misc: WARNING! Unknown control code '"
+              << code << "'.\n" << logofs_flush;
+      #endif
+
+      cerr << "Warning" << ": Unknown control code '"
+           << code << "'.\n";
+
+      return "unknown";
+    }
+  }
+}
+
+const char *DumpSession(int code)
+{
+  switch ((T_session_mode) code)
+  {
+    case session_agent:
+    {
+      return "session_agent";
+    }
+    case session_shadow:
+    {
+      return "session_shadow";
+    }
+    case session_proxy:
+    {
+      return "session_proxy";
+    }
+    default:
+    {
+      #ifdef WARNING
+      *logofs << "Misc: WARNING! Unknown session type '"
+              << code << "'.\n" << logofs_flush;
+      #endif
+
+      cerr << "Warning" << ": Unknown session type '"
+           << code << "'.\n";
+
+      return "unknown";
+    }
+  }
+}
+
+const char *DumpToken(int type)
+{
+  switch ((T_token_type) type)
+  {
+    case token_control:
+    {
+      return "token_control";
+    }
+    case token_split:
+    {
+      return "token_split";
+    }
+    case token_data:
+    {
+      return "token_data";
+    }
+    default:
+    {
+      #ifdef WARNING
+      *logofs << "Misc: WARNING! Unknown token type '"
+              << type << "'.\n" << logofs_flush;
+      #endif
+
+      cerr << "Warning" << ": Unknown token type '"
+           << type << "'.\n";
+
+      return "unknown";
+    }
+  }
+}
+
+//
+// Always include this in code as it is generally
+// needed to test channels and split store.
+//
+
+const char *DumpChecksum(const void *checksum)
+{
+  static char string[MD5_LENGTH * 2 + 1];
+
+  if (checksum != NULL)
+  {
+    for (unsigned int i = 0; i < MD5_LENGTH; i++)
+    {
+      sprintf(string + (i * 2), "%02X", ((unsigned char *) checksum)[i]);
+    }
+  }
+  else
+  {
+    strcpy(string, "null");
+  }
+
+  return string;
+}
+
+//
+// Define OPCODES here and in the channel
+// if you want to log the opcode literal.
+//
+
+#ifdef OPCODES
+
+const char *DumpOpcode(const int &opcode)
+{
+  switch (opcode)
+  {
+    case X_CreateWindow:
+    {
+      return "X_CreateWindow";
+    }
+    case X_ChangeWindowAttributes:
+    {
+      return "X_ChangeWindowAttributes";
+    }
+    case X_GetWindowAttributes:
+    {
+      return "X_GetWindowAttributes";
+    }
+    case X_DestroyWindow:
+    {
+      return "X_DestroyWindow";
+    }
+    case X_DestroySubwindows:
+    {
+      return "X_DestroySubwindows";
+    }
+    case X_ChangeSaveSet:
+    {
+      return "X_ChangeSaveSet";
+    }
+    case X_ReparentWindow:
+    {
+      return "X_ReparentWindow";
+    }
+    case X_MapWindow:
+    {
+      return "X_MapWindow";
+    }
+    case X_MapSubwindows:
+    {
+      return "X_MapSubwindows";
+    }
+    case X_UnmapWindow:
+    {
+      return "X_UnmapWindow";
+    }
+    case X_UnmapSubwindows:
+    {
+      return "X_UnmapSubwindows";
+    }
+    case X_ConfigureWindow:
+    {
+      return "X_ConfigureWindow";
+    }
+    case X_CirculateWindow:
+    {
+      return "X_CirculateWindow";
+    }
+    case X_GetGeometry:
+    {
+      return "X_GetGeometry";
+    }
+    case X_QueryTree:
+    {
+      return "X_QueryTree";
+    }
+    case X_InternAtom:
+    {
+      return "X_InternAtom";
+    }
+    case X_GetAtomName:
+    {
+      return "X_GetAtomName";
+    }
+    case X_ChangeProperty:
+    {
+      return "X_ChangeProperty";
+    }
+    case X_DeleteProperty:
+    {
+      return "X_DeleteProperty";
+    }
+    case X_GetProperty:
+    {
+      return "X_GetProperty";
+    }
+    case X_ListProperties:
+    {
+      return "X_ListProperties";
+    }
+    case X_SetSelectionOwner:
+    {
+      return "X_SetSelectionOwner";
+    }
+    case X_GetSelectionOwner:
+    {
+      return "X_GetSelectionOwner";
+    }
+    case X_ConvertSelection:
+    {
+      return "X_ConvertSelection";
+    }
+    case X_SendEvent:
+    {
+      return "X_SendEvent";
+    }
+    case X_GrabPointer:
+    {
+      return "X_GrabPointer";
+    }
+    case X_UngrabPointer:
+    {
+      return "X_UngrabPointer";
+    }
+    case X_GrabButton:
+    {
+      return "X_GrabButton";
+    }
+    case X_UngrabButton:
+    {
+      return "X_UngrabButton";
+    }
+    case X_ChangeActivePointerGrab:
+    {
+      return "X_ChangeActivePointerGrab";
+    }
+    case X_GrabKeyboard:
+    {
+      return "X_GrabKeyboard";
+    }
+    case X_UngrabKeyboard:
+    {
+      return "X_UngrabKeyboard";
+    }
+    case X_GrabKey:
+    {
+      return "X_GrabKey";
+    }
+    case X_UngrabKey:
+    {
+      return "X_UngrabKey";
+    }
+    case X_AllowEvents:
+    {
+      return "X_AllowEvents";
+    }
+    case X_GrabServer:
+    {
+      return "X_GrabServer";
+    }
+    case X_UngrabServer:
+    {
+      return "X_UngrabServer";
+    }
+    case X_QueryPointer:
+    {
+      return "X_QueryPointer";
+    }
+    case X_GetMotionEvents:
+    {
+      return "X_GetMotionEvents";
+    }
+    case X_TranslateCoords:
+    {
+      return "X_TranslateCoords";
+    }
+    case X_WarpPointer:
+    {
+      return "X_WarpPointer";
+    }
+    case X_SetInputFocus:
+    {
+      return "X_SetInputFocus";
+    }
+    case X_GetInputFocus:
+    {
+      return "X_GetInputFocus";
+    }
+    case X_QueryKeymap:
+    {
+      return "X_QueryKeymap";
+    }
+    case X_OpenFont:
+    {
+      return "X_OpenFont";
+    }
+    case X_CloseFont:
+    {
+      return "X_CloseFont";
+    }
+    case X_QueryFont:
+    {
+      return "X_QueryFont";
+    }
+    case X_QueryTextExtents:
+    {
+      return "X_QueryTextExtents";
+    }
+    case X_ListFonts:
+    {
+      return "X_ListFonts";
+    }
+    case X_ListFontsWithInfo:
+    {
+      return "X_ListFontsWithInfo";
+    }
+    case X_SetFontPath:
+    {
+      return "X_SetFontPath";
+    }
+    case X_GetFontPath:
+    {
+      return "X_GetFontPath";
+    }
+    case X_CreatePixmap:
+    {
+      return "X_CreatePixmap";
+    }
+    case X_FreePixmap:
+    {
+      return "X_FreePixmap";
+    }
+    case X_CreateGC:
+    {
+      return "X_CreateGC";
+    }
+    case X_ChangeGC:
+    {
+      return "X_ChangeGC";
+    }
+    case X_CopyGC:
+    {
+      return "X_CopyGC";
+    }
+    case X_SetDashes:
+    {
+      return "X_SetDashes";
+    }
+    case X_SetClipRectangles:
+    {
+      return "X_SetClipRectangles";
+    }
+    case X_FreeGC:
+    {
+      return "X_FreeGC";
+    }
+    case X_ClearArea:
+    {
+      return "X_ClearArea";
+    }
+    case X_CopyArea:
+    {
+      return "X_CopyArea";
+    }
+    case X_CopyPlane:
+    {
+      return "X_CopyPlane";
+    }
+    case X_PolyPoint:
+    {
+      return "X_PolyPoint";
+    }
+    case X_PolyLine:
+    {
+      return "X_PolyLine";
+    }
+    case X_PolySegment:
+    {
+      return "X_PolySegment";
+    }
+    case X_PolyRectangle:
+    {
+      return "X_PolyRectangle";
+    }
+    case X_PolyArc:
+    {
+      return "X_PolyArc";
+    }
+    case X_FillPoly:
+    {
+      return "X_FillPoly";
+    }
+    case X_PolyFillRectangle:
+    {
+      return "X_PolyFillRectangle";
+    }
+    case X_PolyFillArc:
+    {
+      return "X_PolyFillArc";
+    }
+    case X_PutImage:
+    {
+      return "X_PutImage";
+    }
+    case X_GetImage:
+    {
+      return "X_GetImage";
+    }
+    case X_PolyText8:
+    {
+      return "X_PolyText8";
+    }
+    case X_PolyText16:
+    {
+      return "X_PolyText16";
+    }
+    case X_ImageText8:
+    {
+      return "X_ImageText8";
+    }
+    case X_ImageText16:
+    {
+      return "X_ImageText16";
+    }
+    case X_CreateColormap:
+    {
+      return "X_CreateColormap";
+    }
+    case X_FreeColormap:
+    {
+      return "X_FreeColormap";
+    }
+    case X_CopyColormapAndFree:
+    {
+      return "X_CopyColormapAndFree";
+    }
+    case X_InstallColormap:
+    {
+      return "X_InstallColormap";
+    }
+    case X_UninstallColormap:
+    {
+      return "X_UninstallColormap";
+    }
+    case X_ListInstalledColormaps:
+    {
+      return "X_ListInstalledColormaps";
+    }
+    case X_AllocColor:
+    {
+      return "X_AllocColor";
+    }
+    case X_AllocNamedColor:
+    {
+      return "X_AllocNamedColor";
+    }
+    case X_AllocColorCells:
+    {
+      return "X_AllocColorCells";
+    }
+    case X_AllocColorPlanes:
+    {
+      return "X_AllocColorPlanes";
+    }
+    case X_FreeColors:
+    {
+      return "X_FreeColors";
+    }
+    case X_StoreColors:
+    {
+      return "X_StoreColors";
+    }
+    case X_StoreNamedColor:
+    {
+      return "X_StoreNamedColor";
+    }
+    case X_QueryColors:
+    {
+      return "X_QueryColors";
+    }
+    case X_LookupColor:
+    {
+      return "X_LookupColor";
+    }
+    case X_CreateCursor:
+    {
+      return "X_CreateCursor";
+    }
+    case X_CreateGlyphCursor:
+    {
+      return "X_CreateGlyphCursor";
+    }
+    case X_FreeCursor:
+    {
+      return "X_FreeCursor";
+    }
+    case X_RecolorCursor:
+    {
+      return "X_RecolorCursor";
+    }
+    case X_QueryBestSize:
+    {
+      return "X_QueryBestSize";
+    }
+    case X_QueryExtension:
+    {
+      return "X_QueryExtension";
+    }
+    case X_ListExtensions:
+    {
+      return "X_ListExtensions";
+    }
+    case X_ChangeKeyboardMapping:
+    {
+      return "X_ChangeKeyboardMapping";
+    }
+    case X_GetKeyboardMapping:
+    {
+      return "X_GetKeyboardMapping";
+    }
+    case X_ChangeKeyboardControl:
+    {
+      return "X_ChangeKeyboardControl";
+    }
+    case X_GetKeyboardControl:
+    {
+      return "X_GetKeyboardControl";
+    }
+    case X_Bell:
+    {
+      return "X_Bell";
+    }
+    case X_ChangePointerControl:
+    {
+      return "X_ChangePointerControl";
+    }
+    case X_GetPointerControl:
+    {
+      return "X_GetPointerControl";
+    }
+    case X_SetScreenSaver:
+    {
+      return "X_SetScreenSaver";
+    }
+    case X_GetScreenSaver:
+    {
+      return "X_GetScreenSaver";
+    }
+    case X_ChangeHosts:
+    {
+      return "X_ChangeHosts";
+    }
+    case X_ListHosts:
+    {
+      return "X_ListHosts";
+    }
+    case X_SetAccessControl:
+    {
+      return "X_SetAccessControl";
+    }
+    case X_SetCloseDownMode:
+    {
+      return "X_SetCloseDownMode";
+    }
+    case X_KillClient:
+    {
+      return "X_KillClient";
+    }
+    case X_RotateProperties:
+    {
+      return "X_RotateProperties";
+    }
+    case X_ForceScreenSaver:
+    {
+      return "X_ForceScreenSaver";
+    }
+    case X_SetPointerMapping:
+    {
+      return "X_SetPointerMapping";
+    }
+    case X_GetPointerMapping:
+    {
+      return "X_GetPointerMapping";
+    }
+    case X_SetModifierMapping:
+    {
+      return "X_SetModifierMapping";
+    }
+    case X_GetModifierMapping:
+    {
+      return "X_GetModifierMapping";
+    }
+    case X_NoOperation:
+    {
+      return "X_NoOperation";
+    }
+    case X_NXInternalGenericData:
+    {
+      return "X_NXInternalGenericData";
+    }
+    //
+    // case X_NXInternalGenericReply:
+    // {
+    //   return "X_NXInternalGenericReply";
+    // }
+    //
+    case X_NXInternalGenericRequest:
+    {
+      return "X_NXInternalGenericRequest";
+    }
+    case X_NXInternalShapeExtension:
+    {
+      return "X_NXInternalShapeExtension";
+    }
+    case X_NXGetControlParameters:
+    {
+      return "X_NXGetControlParameters";
+    }
+    case X_NXGetCleanupParameters:
+    {
+      return "X_NXGetCleanupParameters";
+    }
+    case X_NXGetImageParameters:
+    {
+      return "X_NXGetImageParameters";
+    }
+    case X_NXGetUnpackParameters:
+    {
+      return "X_NXGetUnpackParameters";
+    }
+    case X_NXGetShmemParameters:
+    {
+      return "X_NXGetShmemParameters";
+    }
+    case X_NXGetFontParameters:
+    {
+      return "X_NXGetFontParameters";
+    }
+    case X_NXSetExposeParameters:
+    {
+      return "X_NXSetExposeParameters";
+    }
+    case X_NXSetCacheParameters:
+    {
+      return "X_NXSetCacheParameters";
+    }
+    case X_NXStartSplit:
+    {
+      return "X_NXStartSplit";
+    }
+    case X_NXEndSplit:
+    {
+      return "X_NXEndSplit";
+    }
+    case X_NXSplitData:
+    {
+      return "X_NXSplitData";
+    }
+    case X_NXSplitEvent:
+    {
+      return "X_NXSplitEvent";
+    }
+    case X_NXCommitSplit:
+    {
+      return "X_NXCommitSplit";
+    }
+    case X_NXFinishSplit:
+    {
+      return "X_NXFinishSplit";
+    }
+    case X_NXAbortSplit:
+    {
+      return "X_NXAbortSplit";
+    }
+    case X_NXFreeSplit:
+    {
+      return "X_NXFreeSplit";
+    }
+    case X_NXSetUnpackGeometry:
+    {
+      return "X_NXSetUnpackGeometry";
+    }
+    case X_NXSetUnpackColormap:
+    {
+      return "X_NXSetUnpackColormap";
+    }
+    case X_NXSetUnpackAlpha:
+    {
+      return "X_NXSetUnpackAlpha";
+    }
+    case X_NXPutPackedImage:
+    {
+      return "X_NXPutPackedImage";
+    }
+    case X_NXFreeUnpack:
+    {
+      return "X_NXFreeUnpack";
+    }
+    default:
+    {
+      if (opcode > 127)
+      {
+        return "Extension";
+      }
+      else
+      {
+        return "?";
+      }
+    }
+  }
+}
+
+#else /* #ifdef OPCODES */
+
+const char *DumpOpcode(const int &opcode)
+{
+  return "?";
+}
+
+#endif /* #ifdef OPCODES */
+
+void DumpData(const unsigned char *buffer, unsigned int size)
+{
+  if (buffer != NULL)
+  {
+    unsigned int i = 0;
+
+    while (i < size)
+    {
+      *logofs << "[" << i << "]\t";
+
+      for (unsigned int ii = 0; i < size && ii < 8; i++, ii++)
+      {
+        *logofs << (unsigned int) (buffer[i]) << "\t";
+      }
+
+      *logofs << "\n" << logofs_flush;
+    }
+  }
+}
+
+void DumpChecksum(const unsigned char *buffer, unsigned int size)
+{
+  if (buffer != NULL)
+  {
+    md5_byte_t md5_digest[MD5_LENGTH];
+
+    md5_state_t md5_state;
+
+    md5_init(&md5_state);
+
+    md5_append(&md5_state, buffer, size);
+
+    md5_finish(&md5_state, md5_digest);
+
+    char md5_string[MD5_LENGTH * 2 + 1];
+
+    for (unsigned int i = 0; i < MD5_LENGTH; i++)
+    {
+      sprintf(md5_string + (i * 2), "%02X", md5_digest[i]);
+    }
+
+    *logofs << "[" << md5_string << "]" << logofs_flush;
+  }
+}
+
+void DumpBlockChecksums(const unsigned char *buffer,
+                            unsigned int size, unsigned int block)
+{
+  for (unsigned int i = 0; i < (size / block); i++)
+  {
+    *logofs << "[" << i * block << "]";
+
+    DumpChecksum(buffer + (i * block), block);
+
+    *logofs << "\n";
+  }
+
+  if (size % block > 0)
+  {
+    *logofs << "[" << size / block * block << "]";
+
+    DumpChecksum(buffer + (size / block * block), size % block);
+
+    *logofs << "\n";
+  }
+}
+
+void DumpHexData(const unsigned char *buffer, unsigned int size)
+{
+  char message [65536];
+  char ascii   [17];
+
+  unsigned int index = 0;
+  unsigned int linescan = 0;
+  unsigned int index_ascii = 0;
+
+  sprintf  (message,"\n####  Start Dump Buffer of [%.5d] Bytes ####\n\n",size);
+
+  *logofs << message << logofs_flush;
+
+  // 
+  // "Index    0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f  Ascii           "
+  // "-----   -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --  ----------------"
+  // "00000 : 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................"
+  // 
+
+  sprintf (message,"Index   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f  Ascii           \n");
+  *logofs << message << logofs_flush;
+  sprintf (message,"-----  -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --  ----------------\n");
+  *logofs << message << logofs_flush;
+
+  index = 0;
+
+  while (index < size)
+  {
+    memset (ascii, ' ', sizeof(ascii));
+
+    ascii[16] = '\0';
+
+    sprintf  (message,"%.5d  ", index);
+
+    for (index_ascii = 0, linescan = index;
+             ((index < (linescan + 16)) && (index < size)); 
+                  index++, index_ascii++)
+    {
+      if (isprint(buffer [index]))
+      {
+        ascii[index_ascii] = buffer [index];
+      }
+      else
+      {
+        ascii[index_ascii] = '.';
+      }
+
+      sprintf  (&message [strlen (message)],"%.2x ", (unsigned char) buffer [index]);
+    }
+
+    for (linescan = index_ascii; linescan < 16; linescan++)
+    {
+      strcat (&message [strlen (message)], "   ");
+    }
+
+    sprintf  (&message [strlen (message)]," %s\n", ascii);
+
+    *logofs << message << logofs_flush;
+  } 
+
+  sprintf  (message,"\n####  End Dump Buffer ####\n\n");
+
+  *logofs << message << logofs_flush;
+}
diff --git a/nxcomp/src/Misc.h b/nxcomp/src/Misc.h
new file mode 100644
index 000000000..997630137
--- /dev/null
+++ b/nxcomp/src/Misc.h
@@ -0,0 +1,279 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef Misc_H
+#define Misc_H
+
+#include <iostream>
+#include <fstream>
+
+#include <cerrno>
+#include <cstring>
+
+#ifdef __sun
+
+#include <strings.h>
+
+#endif
+
+using namespace std;
+
+//
+// This is MD5 length.
+//
+
+#define MD5_LENGTH          16
+
+//
+// Error handling macros.
+//
+
+#define ESET(e)  (errno = (e))
+#define EGET()   (errno)
+#define ESTR()   strerror(errno)
+
+//
+// TCP port offset applied to NX port specification.
+//
+
+extern const int DEFAULT_NX_PROXY_PORT_OFFSET;
+
+//
+// Default TCP port used by client proxy to listen
+// to X clients and by server proxy to connect to
+// remote.
+//
+
+extern const int DEFAULT_NX_PROXY_PORT;
+
+//
+// Default X display number that client
+// proxy imitates.
+//
+
+extern const int DEFAULT_NX_X_PORT;
+
+//
+// Establish the port offsets for the additional
+// services.
+//
+
+extern const int DEFAULT_NX_CUPS_PORT_OFFSET;
+extern const int DEFAULT_NX_SMB_PORT_OFFSET;
+extern const int DEFAULT_NX_MEDIA_PORT_OFFSET;
+extern const int DEFAULT_NX_AUX_PORT_OFFSET;
+extern const int DEFAULT_NX_HTTP_PORT_OFFSET;
+extern const int DEFAULT_NX_FONT_PORT_OFFSET;
+
+//
+// Slave channels can be originated by both sides
+// so they need to have different port offsets
+// in the case the user runs both proxies on the
+// same host.
+//
+
+extern const int DEFAULT_NX_SLAVE_PORT_CLIENT_OFFSET;
+extern const int DEFAULT_NX_SLAVE_PORT_SERVER_OFFSET;
+
+//
+// NX proxy binds to all network interfaces by default
+// With the -loopback parameter, you can switch
+// over to binding to the loopback device only.
+//
+
+extern const int DEFAULT_LOOPBACK_BIND;
+
+//
+// Return strings containing various info.
+//
+
+const char *GetUsageInfo();
+const char *GetCopyrightInfo();
+const char *GetOtherCopyrightInfo();
+
+//
+// Define this if you want immediate flush of
+// the log output.
+//
+
+#define FLUSH_LOGOFS
+
+//
+// Global objects providing shared functions.
+//
+
+class Auth;
+class Control;
+class Statistics;
+
+extern Auth       *auth;
+extern Control    *control;
+extern Statistics *statistics;
+
+//
+// Log file.
+//
+
+extern ostream *logofs;
+
+//
+// Cleanup code.
+//
+
+void HandleAbort() __attribute__((noreturn));
+void HandleShutdown() __attribute__((noreturn));
+
+extern "C"
+{
+  void HandleCleanup(int code = 0) __attribute__((noreturn));
+  void HandleCleanupForReconnect();
+}
+
+//
+// Manage signal handlers.
+//
+
+void DisableSignals();
+void EnableSignals();
+
+//
+// Manage timers.
+//
+
+void SetTimer(int value);
+void ResetTimer();
+
+//
+// Show a dialog asking the user if he/she
+// wants to close the current session. Look
+// in the alerts file for the known critical
+// events.
+//
+
+void HandleAlert(int code, int local);
+
+//
+// Run the callback registered by the proxy
+// or the agent.
+//
+
+void KeeperCallback();
+void FlushCallback(int length);
+
+//
+// Return the string literal corresponding
+// the value.
+//
+
+const char *DumpSignal(int signal);
+const char *DumpPolicy(int type);
+const char *DumpControl(int code);
+const char *DumpSession(int code);
+const char *DumpAction(int type);
+const char *DumpState(int type);
+const char *DumpToken(int type);
+
+//
+// Print out content of buffer to log file.
+// You need to define DUMP or OPCODES in
+// the source to have these compiled.
+//
+
+const char *DumpOpcode(const int &opcode);
+const char *DumpChecksum(const void *checksum);
+
+void DumpData(const unsigned char *data, unsigned int length);
+void DumpHexData(const unsigned char *data, unsigned int length);
+void DumpChecksum(const unsigned char *data, unsigned int length);
+void DumpBlockChecksums(const unsigned char *data, unsigned int length,
+                            unsigned int block);
+
+//
+// Defines logofs_flush as an empty string to
+// avoid calling the corresponding ostream's
+// flush() function.
+//
+
+#ifdef FLUSH_LOGOFS
+
+#define logofs_flush "" ; logofs -> flush()
+
+#else
+
+#define logofs_flush ""
+
+#endif
+
+//
+// Is the host where local proxy is running
+// big-endian?
+//
+
+extern int _hostBigEndian;
+extern int _storeBigEndian;
+
+inline void setHostBigEndian(int flag)
+{
+  _hostBigEndian = flag;
+}
+
+inline int hostBigEndian()
+{
+  return _hostBigEndian;
+}
+
+inline int storeBigEndian()
+{
+  return _storeBigEndian;
+}
+
+extern const unsigned int IntMask[33];
+
+unsigned int GetUINT(unsigned const char *buffer, int bigEndian);
+unsigned int GetULONG(unsigned const char *buffer, int bigEndian);
+void PutUINT(unsigned int value, unsigned char *buffer, int bigEndian);
+void PutULONG(unsigned int value, unsigned char *buffer, int bigEndian);
+
+inline void CleanData(unsigned char *buffer, int size)
+{
+  unsigned char *end = buffer + size;
+
+  while (buffer < end)
+  {
+    *buffer++ = 0x00;
+  }
+}
+  
+int CheckData(istream *fs);
+int CheckData(ostream *fs);
+int PutData(ostream *fs, const unsigned char *buffer, int size);
+int GetData(istream *fs, unsigned char *buffer, int size);
+int FlushData(ostream *fs);
+
+unsigned int RoundUp2(unsigned int x);
+unsigned int RoundUp4(unsigned int x);
+unsigned int RoundUp8(unsigned int x);
+
+#endif /* Misc_H */
diff --git a/nxcomp/src/NXmitshm.h b/nxcomp/src/NXmitshm.h
new file mode 100644
index 000000000..939d488fb
--- /dev/null
+++ b/nxcomp/src/NXmitshm.h
@@ -0,0 +1,56 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef NXmitshm_H
+#define NXmitshm_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Import opcodes from <X11/extensions/XShm.h>
+ * to get rid of weird dependencies from other
+ * headers of X environment.
+ */
+
+#define X_ShmQueryVersion		0
+#define X_ShmAttach			1
+#define X_ShmDetach			2
+#define X_ShmPutImage			3
+#define X_ShmGetImage			4
+#define X_ShmCreatePixmap		5
+
+#define ShmCompletion			0
+#define ShmNumberEvents			(ShmCompletion + 1)
+
+#define BadShmSeg			0
+#define ShmNumberErrors			(BadShmSeg + 1)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* NXmitshm_H */
diff --git a/nxcomp/src/NXrender.h b/nxcomp/src/NXrender.h
new file mode 100644
index 000000000..280715833
--- /dev/null
+++ b/nxcomp/src/NXrender.h
@@ -0,0 +1,78 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef NXrender_H
+#define NXrender_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Import this from <X11/extensions/render.h>
+ * to compile under old XFree86 distributions
+ * when render extension was not present yet.
+ */
+
+#define X_RenderQueryVersion		    0
+#define X_RenderQueryPictFormats	    1
+#define X_RenderQueryPictIndexValues	    2
+#define X_RenderQueryDithers		    3
+#define X_RenderCreatePicture		    4
+#define X_RenderChangePicture		    5
+#define X_RenderSetPictureClipRectangles    6
+#define X_RenderFreePicture		    7
+#define X_RenderComposite		    8
+#define X_RenderScale			    9
+#define X_RenderTrapezoids		    10
+#define X_RenderTriangles		    11
+#define X_RenderTriStrip		    12
+#define X_RenderTriFan			    13
+#define X_RenderColorTrapezoids		    14
+#define X_RenderColorTriangles		    15
+#define X_RenderTransform		    16
+#define X_RenderCreateGlyphSet		    17
+#define X_RenderReferenceGlyphSet	    18
+#define X_RenderFreeGlyphSet		    19
+#define X_RenderAddGlyphs		    20
+#define X_RenderAddGlyphsFromPicture	    21
+#define X_RenderFreeGlyphs		    22
+#define X_RenderCompositeGlyphs8	    23
+#define X_RenderCompositeGlyphs16	    24
+#define X_RenderCompositeGlyphs32	    25
+#define X_RenderFillRectangles		    26
+/* 0.5 */
+#define X_RenderCreateCursor		    27
+/* 0.6 */
+#define X_RenderSetPictureTransform	    28
+#define X_RenderQueryFilters		    29
+#define X_RenderSetPictureFilter	    30
+#define X_RenderCreateAnimCursor	    31
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* NXrender_H */
diff --git a/nxcomp/src/OpcodeCache.h b/nxcomp/src/OpcodeCache.h
new file mode 100644
index 000000000..e07a1b997
--- /dev/null
+++ b/nxcomp/src/OpcodeCache.h
@@ -0,0 +1,53 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef OpcodeCache_H
+#define OpcodeCache_H
+
+#include "CharCache.h"
+
+class OpcodeCache
+{
+  friend class EncodeBuffer;
+  friend class DecodeBuffer;
+  
+  public:
+
+  OpcodeCache()
+  {
+    slot_ = 0;
+  }
+
+  ~OpcodeCache()
+  {
+  }
+
+  private:
+
+  CharCache base_[256];
+  unsigned char slot_;
+};
+
+#endif /* OpcodeCache_H */
diff --git a/nxcomp/src/OpcodeStore.cpp b/nxcomp/src/OpcodeStore.cpp
new file mode 100644
index 000000000..21b919c8a
--- /dev/null
+++ b/nxcomp/src/OpcodeStore.cpp
@@ -0,0 +1,88 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "OpcodeStore.h"
+
+OpcodeStore::OpcodeStore()
+{
+  //
+  // Assign values of the specific
+  // NX opcodes.
+  //
+
+  getControlParameters = X_NXGetControlParameters;
+  getCleanupParameters = X_NXGetCleanupParameters;
+  getImageParameters   = X_NXGetImageParameters;
+  getUnpackParameters  = X_NXGetUnpackParameters;
+  getShmemParameters   = X_NXGetShmemParameters;
+  getFontParameters    = X_NXGetFontParameters;
+
+  startSplit  = X_NXStartSplit;
+  endSplit    = X_NXEndSplit;
+  commitSplit = X_NXCommitSplit;
+  finishSplit = X_NXFinishSplit;
+  abortSplit  = X_NXAbortSplit;
+
+  splitData  = X_NXSplitData;
+  splitEvent = X_NXSplitEvent;
+
+  setCacheParameters  = X_NXSetCacheParameters;
+  setExposeParameters = X_NXSetExposeParameters;
+
+  setUnpackGeometry = X_NXSetUnpackGeometry;
+  setUnpackColormap = X_NXSetUnpackColormap;
+  setUnpackAlpha    = X_NXSetUnpackAlpha;
+
+  putPackedImage = X_NXPutPackedImage;
+
+  freeUnpack = X_NXFreeUnpack;
+  freeSplit  = X_NXFreeSplit;
+
+  //
+  // These values must be fetched
+  // from the X server.
+  //
+
+  shapeExtension  = 0;
+  renderExtension = 0;
+
+  //
+  // Events sent as ClientMessage.
+  //
+
+  noSplitNotify     = NXNoSplitNotify;
+  startSplitNotify  = NXStartSplitNotify;
+  commitSplitNotify = NXCommitSplitNotify;
+  endSplitNotify    = NXEndSplitNotify;
+  emptySplitNotify  = NXEmptySplitNotify;
+}
+
+OpcodeStore::~OpcodeStore()
+{
+}
diff --git a/nxcomp/src/OpcodeStore.h b/nxcomp/src/OpcodeStore.h
new file mode 100644
index 000000000..d041ed4b8
--- /dev/null
+++ b/nxcomp/src/OpcodeStore.h
@@ -0,0 +1,91 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef OpcodeStore_H
+#define OpcodeStore_H
+
+#include "NXproto.h"
+
+class OpcodeStore
+{
+  public:
+
+  OpcodeStore();
+
+  ~OpcodeStore();
+
+  //
+  // Map NX protocol messages. At the moment mapping is hard-
+  // coded. Opcodes should be instead agreed with the proxied
+  // X server (by excluding all opcodes used for extensions)
+  // and exported by the proxy class to channels.
+  //
+  // Some toolkits query the server only once for extensions'
+  // opcodes and share the same settings across all channels.
+  // This could be a problem as channels needed to monitor the
+  // traffic to find out the extensions' opcodes themselves,
+  // so it is important that proxy passes an instance of this
+  // class to new channels.
+  //
+
+  unsigned char getControlParameters;
+  unsigned char getCleanupParameters;
+  unsigned char getImageParameters;
+  unsigned char getUnpackParameters;
+  unsigned char getShmemParameters;
+  unsigned char getFontParameters;
+
+  unsigned char startSplit;
+  unsigned char endSplit;
+  unsigned char commitSplit;
+  unsigned char finishSplit;
+  unsigned char abortSplit;
+
+  unsigned char splitData;
+  unsigned char splitEvent;
+
+  unsigned char setCacheParameters;
+  unsigned char setExposeParameters;
+
+  unsigned char setUnpackGeometry;
+  unsigned char setUnpackColormap;
+  unsigned char setUnpackAlpha;
+
+  unsigned char putPackedImage;
+
+  unsigned char freeUnpack;
+  unsigned char freeSplit;
+
+  unsigned char shapeExtension;
+  unsigned char renderExtension;
+
+  unsigned char noSplitNotify;
+  unsigned char startSplitNotify;
+  unsigned char commitSplitNotify;
+  unsigned char endSplitNotify;
+  unsigned char emptySplitNotify;
+};
+
+#endif /* OpcodeStore_H */
diff --git a/nxcomp/src/Pack.c b/nxcomp/src/Pack.c
new file mode 100644
index 000000000..97fb93b5f
--- /dev/null
+++ b/nxcomp/src/Pack.c
@@ -0,0 +1,180 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdio.h>
+
+#include "NXpack.h"
+
+const ColorMask Mask8TrueColor    = { 128, 63, 240, 7 };
+const ColorMask Mask64TrueColor   = { 192, 7,  240, 4 };
+const ColorMask Mask256TrueColor  = { 255, 0,  255, 0 };
+const ColorMask Mask512TrueColor  = { 224, 5,  240, 4 };
+const ColorMask Mask4KTrueColor   = { 240, 4,  240, 2 };
+const ColorMask Mask32KTrueColor  = { 248, 3,  248, 2 };
+const ColorMask Mask64KTrueColor  = { 255, 0,  255, 0 };
+const ColorMask Mask256KTrueColor = { 252, 1,  252, 1 };
+const ColorMask Mask2MTrueColor   = { 255, 0,  254, 1 };
+const ColorMask Mask16MTrueColor  = { 255, 0,  255, 0 };
+
+const ColorMask *MethodColorMask(unsigned int method)
+{
+  switch (method)
+  {
+    case MASK_8_COLORS:
+    {
+      return &Mask8TrueColor;
+    }
+    case MASK_64_COLORS:
+    {
+      return &Mask64TrueColor;
+    }
+    case MASK_256_COLORS:
+    {
+      return &Mask256TrueColor;
+    }
+    case MASK_512_COLORS:
+    {
+      return &Mask512TrueColor;
+    }
+    case MASK_4K_COLORS:
+    {
+      return &Mask4KTrueColor;
+    }
+    case MASK_32K_COLORS:
+    {
+      return &Mask32KTrueColor;
+    }
+    case MASK_64K_COLORS:
+    {
+      return &Mask64KTrueColor;
+    }
+    case MASK_256K_COLORS:
+    {
+      return &Mask256KTrueColor;
+    }
+    case MASK_2M_COLORS:
+    {
+      return &Mask2MTrueColor;
+    }
+    case MASK_16M_COLORS:
+    {
+      return &Mask16MTrueColor;
+    }
+    default:
+    {
+      return NULL;
+    }
+  }
+}
+
+int MethodBitsPerPixel(unsigned int method)
+{
+  switch (method)
+  {
+    case PACK_MASKED_8_COLORS:
+    case PACK_JPEG_8_COLORS:
+    case PACK_PNG_8_COLORS:
+    {
+      return 8;
+    }
+    case PACK_MASKED_64_COLORS:
+    case PACK_JPEG_64_COLORS:
+    case PACK_PNG_64_COLORS:
+    {
+      return 8;
+    }
+    case PACK_MASKED_256_COLORS:
+    case PACK_JPEG_256_COLORS:
+    case PACK_PNG_256_COLORS:
+    {
+      return 8;
+    }
+    case PACK_MASKED_512_COLORS:
+    case PACK_JPEG_512_COLORS:
+    case PACK_PNG_512_COLORS:
+    {
+      return 16;
+    }
+    case PACK_MASKED_4K_COLORS:
+    case PACK_JPEG_4K_COLORS:
+    case PACK_PNG_4K_COLORS:
+    {
+      return 16;
+    }
+    case PACK_MASKED_32K_COLORS:
+    case PACK_JPEG_32K_COLORS:
+    case PACK_PNG_32K_COLORS:
+    {
+      return 16;
+    }
+    case PACK_MASKED_64K_COLORS:
+    case PACK_JPEG_64K_COLORS:
+    case PACK_PNG_64K_COLORS:
+    {
+      return 16;
+    }
+    case PACK_MASKED_256K_COLORS:
+    case PACK_JPEG_256K_COLORS:
+    case PACK_PNG_256K_COLORS:
+    {
+      return 24;
+    }
+    case PACK_MASKED_2M_COLORS:
+    case PACK_JPEG_2M_COLORS:
+    case PACK_PNG_2M_COLORS:
+    {
+      return 24;
+    }
+    case PACK_MASKED_16M_COLORS:
+    case PACK_JPEG_16M_COLORS:
+    case PACK_PNG_16M_COLORS:
+    {
+      return 24;
+    }
+    case PACK_BITMAP_16M_COLORS:
+    case PACK_RGB_16M_COLORS:
+    case PACK_RLE_16M_COLORS:
+    {
+      return 24;
+    }
+    default:
+    {
+      return 0;
+    }
+  }
+}
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/nxcomp/src/Pgn.cpp b/nxcomp/src/Pgn.cpp
new file mode 100644
index 000000000..649227f52
--- /dev/null
+++ b/nxcomp/src/Pgn.cpp
@@ -0,0 +1,809 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+//
+// This file obviously supports PNG
+// decompression. It was renamed to
+// avoid name clashes on Windows.
+//
+
+#include <X11/Xmd.h>
+
+#ifdef ANDROID
+#include <strings.h>
+#endif
+#include <unistd.h>
+#include <stdio.h>
+#include <png.h>
+
+#include "Unpack.h"
+#include "Pgn.h"
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+#define RGB24_TO_PIXEL(bpp,r,g,b)                         \
+   ((((CARD##bpp)(r) & 0xFF) * srcRedMax2 + 127) / 255    \
+    << srcRedShift2 |                                     \
+    (((CARD##bpp)(g) & 0xFF) * srcGreenMax2 + 127) / 255  \
+    << srcGreenShift2 |                                   \
+    (((CARD##bpp)(b) & 0xFF) * srcBlueMax2 + 127) / 255   \
+    << srcBlueShift2)
+
+#define RGB24_TO_PIXEL32(r,g,b)                           \
+  (((CARD32)(r) & 0xFF) << srcRedShift2 |                 \
+   ((CARD32)(g) & 0xFF) << srcGreenShift2 |               \
+   ((CARD32)(b) & 0xFF) << srcBlueShift2)
+
+//
+// Functions from Unpack.cpp
+//
+
+extern int Unpack32To32(const T_colormask *colormask, const unsigned int *data,
+                            unsigned int *out, unsigned int *end);
+
+extern int Unpack24To24(const T_colormask *colormask, const unsigned char *data,
+                            unsigned char *out, unsigned char *end);
+
+extern int Unpack16To16(const T_colormask *colormask, const unsigned char *data,
+                            unsigned char *out, unsigned char *end);
+
+//
+// Local functions used for the png decompression.
+//
+
+static int DecompressPng16(unsigned char *compressedData, int compressedLen,
+                                unsigned int w, unsigned int h, unsigned char *dstBuf,
+                                    int byteOrder);
+
+static int DecompressPng24(unsigned char *compressedData, int compressedLen,
+                                unsigned int w, unsigned int h, unsigned char *dstBuf,
+                                    int byteOrder);
+
+static int DecompressPng32(unsigned char *compressedData, int compressedLen,
+                                unsigned int w, unsigned int h, unsigned char *dstBuf,
+                                    int byteOrder);
+
+static void PngReadData(png_structp png_ptr, png_bytep data, png_size_t length);
+
+//
+// Colormap stuff.
+//
+
+CARD16 srcRedMax2, srcGreenMax2, srcBlueMax2;
+CARD8  srcRedShift2, srcGreenShift2, srcBlueShift2;
+
+//
+// Attributes used for the png decompression.
+//
+
+static char *tmpBuf;
+static int  tmpBufSize = 0;
+static int  streamPos;
+
+int UnpackPng(T_geometry *geometry, unsigned char method, unsigned char *srcData,
+                  int srcSize, int dstBpp, int dstWidth, int dstHeight,
+                      unsigned char *dstData, int dstSize)
+{
+  int byteOrder = geometry -> image_byte_order;
+
+  //
+  // Check if data is coming from a failed unsplit.
+  //
+
+  if (srcSize < 2 || (srcData[0] == SPLIT_PATTERN &&
+          srcData[1] == SPLIT_PATTERN))
+  {
+    #ifdef WARNING
+    *logofs << "UnpackPng: WARNING! Skipping unpack of dummy data.\n"
+            << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  #ifdef DEBUG
+  *logofs << "UnpackPng: Decompressing image with "
+          << "srcSize " << srcSize << " and bpp "
+          << dstBpp  << ".\n" << logofs_flush;
+  #endif
+
+  srcRedShift2   = ffs(geometry -> red_mask) - 1;
+  srcGreenShift2 = ffs(geometry -> green_mask) - 1;
+  srcBlueShift2  = ffs(geometry -> blue_mask) - 1;
+  srcRedMax2     = geometry -> red_mask >> srcRedShift2;
+  srcGreenMax2   = geometry -> green_mask >> srcGreenShift2;
+  srcBlueMax2    = geometry -> blue_mask >> srcBlueShift2;
+
+  //
+  // Make enough space in the temporary
+  // buffer to have one complete row of
+  // the image with 3 bytes per pixel.
+  //
+
+  tmpBufSize = dstWidth * 3;
+  tmpBuf = new char [tmpBufSize];
+
+  if (tmpBuf == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "UnpackPng: PANIC! Cannot allocate "
+            << dstWidth * 3 << " bytes for PNG "
+            << "decompressed data.\n" << logofs_flush;
+    #endif
+
+    delete [] tmpBuf;
+
+    return -1;
+  }
+
+  int result = 1;
+
+  switch (dstBpp)
+  {
+    case 8:
+    {
+      //
+      // Simply move the data from srcData to dstData
+      // taking into consideration the correct padding.
+      //
+
+      int row;
+
+      unsigned char * dstBuff = dstData;
+      unsigned char * srcBuff = srcData;
+
+      for (row = 0; row < dstHeight; row++)
+      {
+        memcpy(dstBuff, srcBuff, dstWidth );
+
+        dstBuff += RoundUp4(dstWidth);
+        srcBuff += dstWidth;
+      }
+    }
+    case 16:
+    {
+      result = DecompressPng16(srcData, srcSize, dstWidth,
+                                    dstHeight, dstData, byteOrder);
+      break;
+    }
+    case 24:
+    {
+      result = DecompressPng24(srcData, srcSize, dstWidth,
+                                    dstHeight, dstData, byteOrder);
+      break;
+    }
+    case 32:
+    {
+      result = DecompressPng32(srcData, srcSize, dstWidth,
+                                    dstHeight, dstData, byteOrder);
+      break;
+    }
+    default:
+    {
+      #ifdef PANIC
+      *logofs << "UnpackPng: PANIC! Error in PNG compression. "
+              << " Unsupported Bpp value " << dstBpp
+              << " for the PNG compression"
+              << ".\n" << logofs_flush;
+      #endif
+
+      delete [] tmpBuf;
+
+      result = -1;
+    }
+  }
+
+  if (result == -1)
+  {
+    delete [] tmpBuf;
+
+    return result;
+  }
+
+  //
+  // Apply the correction for the brightness
+  //
+
+  int maskMethod;
+
+  switch (method)
+  {
+    case PACK_PNG_8_COLORS:
+    {
+      maskMethod = MASK_8_COLORS;
+
+      break;
+    }
+    case PACK_PNG_64_COLORS:
+    {
+      maskMethod = MASK_64_COLORS;
+
+      break;
+    }
+    case PACK_PNG_256_COLORS:
+    {
+      maskMethod = MASK_256_COLORS;
+
+      break;
+    }
+    case PACK_PNG_512_COLORS:
+    {
+      maskMethod = MASK_512_COLORS;
+
+      break;
+    }
+    case PACK_PNG_4K_COLORS:
+    {
+      maskMethod = MASK_4K_COLORS;
+
+      break;
+    }
+    case PACK_PNG_32K_COLORS:
+    {
+      maskMethod = MASK_32K_COLORS;
+
+      break;
+    }
+    case PACK_PNG_64K_COLORS:
+    {
+      maskMethod = MASK_64K_COLORS;
+
+      break;
+    }
+    case PACK_PNG_256K_COLORS:
+    {
+      maskMethod = MASK_256K_COLORS;
+
+      break;
+    }
+    case PACK_PNG_2M_COLORS:
+    {
+      maskMethod = MASK_2M_COLORS;
+
+      break;
+    }
+    case PACK_PNG_16M_COLORS:
+    {
+      maskMethod = MASK_16M_COLORS;
+
+      break;
+    }
+    default:
+    {
+      #ifdef PANIC
+      *logofs << "DecompressPng16: PANIC! "
+              << " No matching decompression method.\n"
+              << logofs_flush;
+      #endif
+
+      delete [] tmpBuf;
+
+      return -1;
+    }
+  }
+
+  const T_colormask *colorMask = MethodColorMask(maskMethod);
+
+  unsigned char *dstBuff = dstData;
+
+  switch (dstBpp)
+  {
+    case 16:
+    {
+      Unpack16To16(colorMask, dstBuff, dstBuff, dstBuff + dstSize);
+
+      break;
+    }
+    case 24:
+    {
+      break;
+    }
+    case 32:
+    {
+      Unpack32To32(colorMask, (unsigned int *)dstBuff, (unsigned int *)dstBuff,
+                       (unsigned int *)(dstBuff + dstSize));
+      break;
+    }
+    default:
+    {
+      #ifdef PANIC
+      *logofs << "DecompressPng16: PANIC! "
+              << " No matching destination bits per plane.\n"
+              << logofs_flush;
+      #endif
+
+      delete [] tmpBuf;
+
+      return -1;
+    }
+  }
+
+  delete [] tmpBuf;
+
+  return 1;
+}
+
+
+//
+// Functions that actually do
+// the PNG decompression.
+//
+
+int DecompressPng16(unsigned char *compressedData, int compressedLen,
+                         unsigned int w, unsigned int h, unsigned char *dstBuf, int byteOrder)
+{
+  unsigned char *data;
+  unsigned int dx, dy;
+
+  png_structp pngPtr;
+  png_infop   infoPtr;
+  png_bytep   rowPointers;
+
+
+  streamPos = 0;
+
+  pngPtr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+
+  if (!pngPtr)
+  {
+    #ifdef PANIC
+    *logofs << "DecompressPng16: PANIC! "
+            << " Failed png_create_read_struct operation"
+            << ".\n" << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  infoPtr = png_create_info_struct(pngPtr);
+
+  if (!infoPtr)
+  {
+    #ifdef PANIC
+    *logofs << "DecompressPng16: PANIC! "
+            << "Failed png_create_info_struct operation"
+            << ".\n" << logofs_flush;
+    #endif
+
+    png_destroy_read_struct(&pngPtr, NULL, NULL);
+
+    return -1;
+  }
+
+  if (setjmp(png_jmpbuf(pngPtr)))
+  {
+    #ifdef PANIC
+    *logofs << "DecompressPng16: PANIC! "
+            << "Error during IO initialization"
+            << ".\n" << logofs_flush;
+    #endif
+
+    png_destroy_read_struct(&pngPtr, &infoPtr, NULL);
+
+    return -1;
+  }
+
+  png_set_read_fn(pngPtr, (void *)compressedData, PngReadData);
+
+  if (setjmp(png_jmpbuf(pngPtr)))
+  {
+    #ifdef PANIC
+    *logofs << "DecompressPng16: PANIC! "
+            << "Error during read of PNG header"
+            << ".\n" << logofs_flush;
+    #endif
+
+    png_destroy_read_struct(&pngPtr, &infoPtr, NULL);
+
+    return -1;
+  }
+
+  png_read_info(pngPtr, infoPtr);
+
+  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
+  {
+    png_set_expand(pngPtr);
+  }
+
+  //
+  // data points to dstBuf which is
+  // already padded correctly for the final
+  // image to put
+  //
+
+  data = dstBuf;
+  rowPointers = (png_byte *) tmpBuf;
+
+  //
+  // We use setjmp() to save our context.
+  // The PNG library will call longjmp()
+  // in case of error.
+  //
+
+  if (setjmp(png_jmpbuf(pngPtr)))
+  {
+    #ifdef PANIC
+    *logofs << "DecompressPng16: PANIC! "
+            << "Error during read of PNG rows"
+            << ".\n" << logofs_flush;
+    #endif
+
+    png_destroy_read_struct(&pngPtr, &infoPtr, NULL);
+
+    return -1;
+  }
+
+  unsigned long pixel;
+
+  for (dy = 0; dy < h; dy++)
+  {
+    png_read_row(pngPtr, rowPointers, NULL);
+
+    for (dx = 0; dx < w; dx++)
+    {
+      pixel = RGB24_TO_PIXEL(16, tmpBuf[dx*3], tmpBuf[dx*3+1], tmpBuf[dx*3+2]);
+
+      //
+      // Follow the server byte order when arranging data.
+      //
+ 
+      if (byteOrder == LSBFirst)
+      {
+        data[0] = (unsigned char) (pixel & 0xff);
+        data[1] = (unsigned char) ((pixel >> 8) & 0xff);
+      }
+      else
+      {
+        data[1] = (unsigned char) (pixel & 0xff);
+        data[0] = (unsigned char) ((pixel >> 8) & 0xff);
+      }
+ 
+      data += 2; 
+    }
+
+    //
+    // Move pixelPtr at the beginning of the
+    // next line.
+    //
+
+    data = data + (RoundUp4(w * 2) - w * 2);
+  }
+
+  png_destroy_read_struct(&pngPtr, &infoPtr,NULL);
+
+  #ifdef DEBUG
+  *logofs << "DecompressPng16: Decompression finished."
+          << dy << " lines handled.\n"
+          << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int DecompressPng24(unsigned char *compressedData, int compressedLen,
+                        unsigned int w, unsigned int h, unsigned char *dstBuf, int byteOrder)
+{
+  static CARD8 *pixelPtr = NULL;
+  unsigned int dx, dy;
+
+  png_structp pngPtr;
+  png_infop   infoPtr;
+  png_bytep   rowPointers;
+
+
+  streamPos = 0;
+
+  pngPtr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+
+  if (!pngPtr)
+  {
+    #ifdef PANIC
+    *logofs << "DecompressPng24: PANIC! "
+            << "Failed png_create_read_struct operation"
+            << ".\n" << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  infoPtr = png_create_info_struct(pngPtr);
+
+  if (!infoPtr)
+  {
+    #ifdef PANIC
+    *logofs << "DecompressPng24: PANIC! "
+            << "Failed png_create_info_struct operation"
+            << ".\n" << logofs_flush;
+    #endif
+
+    png_destroy_read_struct(&pngPtr, NULL, NULL);
+
+    return -1;
+  }
+
+  if (setjmp(png_jmpbuf(pngPtr)))
+  {
+    #ifdef PANIC
+    *logofs << "DecompressPng24: PANIC! "
+            << "Error during IO initialization"
+            << ".\n" << logofs_flush;
+    #endif
+
+    png_destroy_read_struct(&pngPtr, &infoPtr, NULL);
+
+    return -1;
+  }
+
+  png_set_read_fn(pngPtr, (void *)compressedData, PngReadData);
+
+  if (setjmp(png_jmpbuf(pngPtr)))
+  {
+    #ifdef PANIC
+    *logofs << "DecompressPng24: PANIC! "
+            << "Error during read of PNG header"
+            << ".\n" << logofs_flush;
+    #endif
+
+    png_destroy_read_struct(&pngPtr, &infoPtr, NULL);
+
+    return -1;
+  }
+
+  png_read_info( pngPtr, infoPtr ) ;
+
+  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
+  {
+    png_set_expand(pngPtr);
+  }
+
+  //
+  // PixelPtr points to dstBuf which is
+  // already padded correctly for the final
+  // image to put
+  //
+
+  pixelPtr = (CARD8 *) dstBuf;
+
+  rowPointers = (png_byte *)tmpBuf;
+  
+  if (setjmp(png_jmpbuf(pngPtr)))
+  {
+    #ifdef PANIC
+    *logofs << "DecompressPng24: PANIC! "
+            << "Error during read of PNG rows"
+            << ".\n" << logofs_flush;
+    #endif
+
+    png_destroy_read_struct(&pngPtr, &infoPtr, NULL);
+
+    return -1;
+  }
+
+  for (dy = 0; dy < h; dy++)
+  {
+    png_read_row(pngPtr, rowPointers, NULL);
+
+    for (dx = 0; dx < w; dx++)
+    {
+      //
+      // Follow the server byte order when arranging data.
+      //
+
+      if (byteOrder == LSBFirst)
+      {
+        pixelPtr[0] = tmpBuf[dx * 3];
+        pixelPtr[1] = tmpBuf[dx * 3 + 1];
+        pixelPtr[2] = tmpBuf[dx * 3 + 2];
+      }
+      else
+      {
+        pixelPtr[2] = tmpBuf[dx * 3];
+        pixelPtr[1] = tmpBuf[dx * 3 + 1];
+        pixelPtr[0] = tmpBuf[dx * 3 + 2];
+      }
+
+      pixelPtr += 3;
+    }
+
+    //
+    // Go to the next line.
+    //
+
+    pixelPtr = (CARD8 *) (((char *) pixelPtr) + (RoundUp4(w * 3) - w * 3));
+  }
+
+  png_destroy_read_struct(&pngPtr, &infoPtr,NULL);
+
+  #ifdef DEBUG
+  *logofs << "DecompressPng24: Decompression finished."
+          << dy << " lines handled.\n"
+          << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int DecompressPng32(unsigned char *compressedData, int compressedLen,
+                         unsigned int w, unsigned int h, unsigned char *dstBuf, int byteOrder)
+{
+  unsigned char *data;
+
+  unsigned int dx, dy;
+
+  png_structp pngPtr;
+  png_infop   infoPtr;
+  png_bytep   rowPointers;
+
+  streamPos = 0;
+
+  pngPtr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+
+  if (!pngPtr)
+  { 
+    #ifdef PANIC
+    *logofs << "DecompressPng32: PANIC! "
+            << "Failed png_create_read_struct operation"
+            << ".\n" << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  infoPtr = png_create_info_struct(pngPtr);
+
+  if (!infoPtr)
+  { 
+    #ifdef PANIC
+    *logofs << "DecompressPng32: PANIC! "
+            << "Failed png_create_info_struct operation."
+            << ".\n" << logofs_flush;
+    #endif
+    
+    png_destroy_read_struct(&pngPtr, NULL, NULL);
+
+    return -1;
+  }
+
+  if (setjmp(png_jmpbuf(pngPtr)))
+  {
+    #ifdef PANIC
+    *logofs << "DecompressPng32: PANIC! "
+            << "Error during IO initialization"
+            << ".\n" << logofs_flush;
+    #endif
+
+    png_destroy_read_struct(&pngPtr, &infoPtr, NULL);
+
+    return -1;
+  }
+
+  png_set_read_fn(pngPtr, (void *)compressedData, PngReadData);
+ 
+  if (setjmp(png_jmpbuf(pngPtr)))
+  {
+    #ifdef PANIC
+    *logofs << "DecompressPng32: PANIC! "
+            << "Error during read of PNG header"
+            << ".\n" << logofs_flush;
+    #endif
+
+    png_destroy_read_struct(&pngPtr, &infoPtr, NULL);
+
+    return -1;
+  }
+
+  png_read_info(pngPtr, infoPtr) ;
+
+
+  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
+  {
+    png_set_expand(pngPtr);
+  }
+
+  //
+  // data points to dstBuf which is
+  // already padded correctly for the final
+  // image to put
+  //
+
+  data = dstBuf;
+
+  rowPointers = (png_byte *) tmpBuf;
+  
+  if (setjmp(png_jmpbuf(pngPtr)))
+  {
+    #ifdef PANIC
+    *logofs << "DecompressPng32: PANIC! "
+            << "Error during read of PNG rows"
+            << ".\n" << logofs_flush;
+    #endif
+
+    png_destroy_read_struct(&pngPtr, &infoPtr, NULL);
+
+    return -1;
+  }
+
+  unsigned long pixel;
+
+  int i;
+
+  for (dy = 0; dy < h; dy++)
+  {
+    png_read_row(pngPtr, rowPointers, NULL);
+
+    for (dx = 0; dx < w; dx++)
+    {
+      pixel = RGB24_TO_PIXEL(32, tmpBuf[dx * 3], tmpBuf[dx * 3 + 1],
+                                 tmpBuf[dx * 3 + 2]);
+
+      //
+      // Follow the server byte order when arranging data.
+      //
+
+      if (byteOrder == LSBFirst)
+      {
+        for (i = 0; i < 4; i++)
+        {
+          data[i] = (unsigned char)(pixel & 0xff);
+          pixel >>= 8;
+        }
+      }
+      else
+      {
+        for (i = 3; i >= 0; i--)
+        {
+          data[i] = (unsigned char) (pixel & 0xff);
+          pixel >>= 8;
+        }
+      }
+
+      data += 4;
+    }
+  }
+
+  png_destroy_read_struct(&pngPtr, &infoPtr,NULL);
+
+  #ifdef DEBUG
+  *logofs << "DecompressPng32: Decompression finished."
+          << dy << " lines handled.\n"
+          << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+static void PngReadData(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+  memcpy((char *) data, (char *) png_get_io_ptr(png_ptr) + streamPos, length);
+
+  streamPos += length;
+}
diff --git a/nxcomp/src/Pgn.h b/nxcomp/src/Pgn.h
new file mode 100644
index 000000000..e5ea36715
--- /dev/null
+++ b/nxcomp/src/Pgn.h
@@ -0,0 +1,42 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef Pgn_H
+#define Pgn_H
+
+//
+// This file obviously supports PNG
+// decompression. It was renamed to
+// avoid name clashes on Windows.
+//
+
+#include "Misc.h"
+#include "Unpack.h"
+
+int UnpackPng(T_geometry *geometry, unsigned char method, unsigned char *srcData,
+                  int srcSize, int dstBpp, int dstWidth, int dstHeight,
+                      unsigned char *dstData, int dstSize);
+
+#endif /* Pgn_H */
diff --git a/nxcomp/src/Pipe.cpp b/nxcomp/src/Pipe.cpp
new file mode 100644
index 000000000..4fa149412
--- /dev/null
+++ b/nxcomp/src/Pipe.cpp
@@ -0,0 +1,433 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <pwd.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <grp.h>
+
+#include "Pipe.h"
+#include "Misc.h"
+#include "Fork.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+extern void RegisterChild(int child);
+
+static int Psplit(const char *command, char *parameters[], int limit);
+
+//
+// These are slightly modified versions of popen(3) and pclose(3)
+// that don't rely on a shell to be available on the system, so
+// that they can also work on Windows. As an additional benefit,
+// these functions give up all privileges before running the com-
+// mand. Code is taken from the X distribution and, in turn, is
+// based on libc from FreeBSD 2.2.
+//
+
+static struct pid
+{
+  struct pid *next;
+  FILE *fp;
+  int self;
+
+} *pidlist;
+
+//
+// A very unsofisticated attempt to parse the command line and
+// split each parameter in distinct strings. This is not going
+// to work when dealing with parameters containing spaces, even
+// if they are enclosed in quotes.
+// 
+
+int Psplit(const char *command, char *parameters[], int limit)
+{
+  char *line;
+  char *value;
+
+  int number;
+
+  //
+  // Preapare the list of parameters.
+  //
+
+  for (number = 0; number < limit; number++)
+  {
+    parameters[number] = NULL;
+  }
+
+  //
+  // Copy the command to get rid of the
+  // const qualifier.
+  //
+
+  line = new char[strlen(command) + 1];
+
+  if (line == NULL)
+  {
+    goto PsplitError;
+  }
+
+  strcpy(line, command);
+
+  number = 0;
+
+  value = strtok(line, " ");
+
+  while (value != NULL && number < limit)
+  {
+    #ifdef DEBUG
+    *logofs << "Psplit: Got parameter '" << value
+            << "'.\n" << logofs_flush;
+    #endif
+
+    parameters[number] = new char[strlen(value) + 1];
+
+    if (parameters[number] == NULL)
+    {
+      goto PsplitError;
+    }
+
+    strcpy(parameters[number], value);
+
+    number++;
+
+    //
+    // If this is the first parameter, then
+    // copy it in the second position and
+    // use it as the name of the command.
+    //
+
+    if (number == 1)
+    {
+      parameters[number] = new char[strlen(value) + 1];
+
+      if (parameters[number] == NULL)
+      {
+        goto PsplitError;
+      }
+
+      strcpy(parameters[number], value);
+
+      number++;
+    }
+
+    value = strtok(NULL, " ");
+  }
+
+  //
+  // Needs at least to have the command itself and
+  // the first argument, being again the name of
+  // the command.
+  //
+
+  if (number < 2)
+  {
+    goto PsplitError;
+  }
+
+  return number;
+
+PsplitError:
+
+  #ifdef PANIC
+  *logofs << "Psplit: PANIC! Can't split command line '"
+          << command << "'.\n" << logofs_flush;
+  #endif
+
+  cerr << "Error" << ": Can't split command line '"
+       << command << "'.\n";
+
+  delete [] line;
+
+  return -1;
+}
+
+FILE *Popen(char * const parameters[], const char *type)
+{
+  FILE *iop;
+
+  struct pid *cur;
+  int pdes[2], pid;
+
+  if (parameters == NULL || type == NULL)
+  {
+    return NULL;
+  }
+
+  if ((*type != 'r' && *type != 'w') || type[1])
+  {
+    return NULL;
+  }
+
+  if ((cur = (struct pid *) malloc(sizeof(struct pid))) == NULL)
+  {
+    return NULL;
+  }
+
+  if (pipe(pdes) < 0)
+  {
+    free(cur);
+
+    return NULL;
+  }
+
+  //
+  // Block all signals until command is exited.
+  // We need to gather information about the
+  // child in Pclose().
+  //
+
+  DisableSignals();
+
+  switch (pid = Fork())
+  {
+    case -1:
+    {
+      //
+      // Error.
+      //
+
+      #ifdef PANIC
+      *logofs << "Popen: PANIC! Function fork failed. "
+              << "Error is " << EGET() << " '" << ESTR()
+              << "'.\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Function fork failed. "
+           << "Error is " << EGET() << " '" << ESTR()
+           << "'.\n";
+
+      close(pdes[0]);
+      close(pdes[1]);
+
+      free(cur);
+
+      return NULL;
+    }
+    case 0:
+    {
+      //
+      // Child.
+      //
+
+      struct passwd *pwent = getpwuid(getuid());
+      if (pwent) initgroups(pwent->pw_name,getgid());
+      if (setgid(getgid()) == -1)
+      {
+        _exit(127);
+      }
+      if (setuid(getuid()) == -1)
+      {
+        _exit(127);
+      }
+
+      if (*type == 'r')
+      {
+        if (pdes[1] != 1)
+        {
+          //
+          // Set up stdout.
+          //
+
+          dup2(pdes[1], 1);
+          close(pdes[1]);
+        }
+
+        close(pdes[0]);
+      }
+      else
+      {
+        if (pdes[0] != 0)
+        {
+          //
+          // Set up stdin.
+          //
+
+          dup2(pdes[0], 0);
+          close(pdes[0]);
+        }
+
+        close(pdes[1]);
+      }
+
+      execvp(parameters[0], parameters + 1);
+
+      exit(127);
+    }
+  }
+
+  //
+  // Parent. Save data about the child.
+  //
+
+  RegisterChild(pid);
+
+  if (*type == 'r')
+  {
+    iop = fdopen(pdes[0], type);
+
+    close(pdes[1]);
+  }
+  else
+  {
+    iop = fdopen(pdes[1], type);
+
+    close(pdes[0]);
+  }
+
+  cur -> fp = iop;
+  cur -> self = pid;
+  cur -> next = pidlist;
+
+  pidlist = cur;
+
+  #ifdef TEST
+  *logofs << "Popen: Executing ";
+
+  for (int i = 0; i < 256 && parameters[i] != NULL; i++)
+  {
+    *logofs << "[" << parameters[i] << "]";
+  }
+
+  *logofs << " with descriptor " << fileno(iop)
+          << ".\n" << logofs_flush;
+  #endif
+
+  return iop;
+}
+
+FILE *Popen(const char *command, const char *type)
+{
+  char *parameters[256];
+
+  if (Psplit(command, parameters, 256) > 0)
+  {
+    FILE *file = Popen(parameters, type);
+
+    for (int i = 0; i < 256; i++)
+    {
+      delete [] parameters[i];
+    }
+
+    return file;
+  }
+  else
+  {
+    #ifdef PANIC
+    *logofs << "Popen: PANIC! Failed to parse command '"
+            << command << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Failed to parse command '"
+         << command << "'.\n";
+
+    return NULL;
+  }
+}
+
+int Pclose(FILE *iop)
+{
+  struct pid *cur, *last;
+
+  int pstat;
+  int pid;
+
+  #ifdef TEST
+  *logofs << "Pclose: Closing command with output "
+          << "on descriptor " << fileno(iop) << ".\n"
+          << logofs_flush;
+  #endif
+
+  fclose((FILE *) iop);
+
+  for (last = NULL, cur = pidlist; cur; last = cur, cur = cur -> next)
+  {
+    if (cur -> fp == iop)
+    {
+      break;
+    }
+  }
+
+  if (cur == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "Pclose: PANIC! Failed to find the process "
+            << "for descriptor " << fileno(iop) << ".\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Failed to find the process "
+         << "for descriptor " << fileno(iop) << ".\n";
+
+    return -1;
+  }
+
+  do
+  {
+    #ifdef TEST
+    *logofs << "Pclose: Going to wait for process "
+            << "with pid '" << cur -> self << "'.\n"
+            << logofs_flush;
+    #endif
+
+    pid = waitpid(cur -> self, &pstat, 0);
+  }
+  while (pid == -1 && errno == EINTR);
+
+  if (last == NULL)
+  {
+    pidlist = cur -> next;
+  }
+  else
+  {
+    last -> next = cur -> next;
+  }
+
+  free(cur);
+
+  //
+  // Child has finished and we called the
+  // waitpid(). We can enable signals again.
+  //
+
+  EnableSignals();
+
+  return (pid == -1 ? -1 : pstat);
+}
diff --git a/nxcomp/src/Pipe.h b/nxcomp/src/Pipe.h
new file mode 100644
index 000000000..fd1061d30
--- /dev/null
+++ b/nxcomp/src/Pipe.h
@@ -0,0 +1,35 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+//
+// These are slightly modified versions of popen(3) and pclose(3)
+// that don't rely on a shell to be available on the system, so
+// that they can also work on Windows.
+//
+
+extern FILE *Popen(char * const parameters[], const char *type);
+extern FILE *Popen(const char *command, const char *type);
+
+extern int Pclose(FILE *file);
diff --git a/nxcomp/src/PolyArc.cpp b/nxcomp/src/PolyArc.cpp
new file mode 100644
index 000000000..42dbb265d
--- /dev/null
+++ b/nxcomp/src/PolyArc.cpp
@@ -0,0 +1,162 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "PolyArc.h"
+
+#include "ClientCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Here are the methods to handle messages' content.
+//
+
+int PolyArcStore::parseIdentity(Message *message, const unsigned char *buffer,
+                                    unsigned int size, int bigEndian) const
+{
+  PolyArcMessage *polyArc = (PolyArcMessage *) message;
+
+  //
+  // Here is the fingerprint.
+  //
+
+  polyArc -> drawable = GetULONG(buffer + 4, bigEndian);
+  polyArc -> gcontext = GetULONG(buffer + 8, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsed Identity for message at " << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int PolyArcStore::unparseIdentity(const Message *message, unsigned char *buffer,
+                                      unsigned int size, int bigEndian) const
+{
+  PolyArcMessage *polyArc = (PolyArcMessage *) message;
+
+  //
+  // Fill all the message's fields.
+  //
+
+  PutULONG(polyArc -> drawable, buffer + 4, bigEndian);
+  PutULONG(polyArc -> gcontext, buffer + 8, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsed identity for message at " << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void PolyArcStore::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  PolyArcMessage *polyArc = (PolyArcMessage *) message;
+
+  *logofs << name() << ": Identity drawable " << polyArc -> drawable
+                    << ", gcontext " << polyArc -> gcontext
+                    << ", size " << polyArc -> size_ << ".\n" << logofs_flush;
+  #endif
+}
+
+void PolyArcStore::identityChecksum(const Message *message, const unsigned char *buffer,
+                                        unsigned int size, int bigEndian) const
+{
+}
+
+void PolyArcStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                      const Message *cachedMessage,
+                                          ChannelCache *channelCache) const
+{
+  PolyArcMessage *polyArc       = (PolyArcMessage *) message;
+  PolyArcMessage *cachedPolyArc = (PolyArcMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << polyArc -> drawable
+          << " as drawable field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeXidValue(polyArc -> drawable, clientCache -> drawableCache);
+
+  cachedPolyArc -> drawable = polyArc -> drawable;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << polyArc -> gcontext
+          << " as gcontext field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeXidValue(polyArc -> gcontext, clientCache -> gcCache);
+
+  cachedPolyArc -> gcontext = polyArc -> gcontext;
+}
+
+void PolyArcStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                      ChannelCache *channelCache) const
+{
+  PolyArcMessage *polyArc = (PolyArcMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  unsigned int value;
+
+  decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
+
+  polyArc -> drawable = value;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << polyArc -> drawable
+          << " as drawable field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeXidValue(value, clientCache -> gcCache);
+
+  polyArc -> gcontext = value;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << polyArc -> gcontext
+          << " as gcontext field.\n" << logofs_flush;
+  #endif
+}
+
+
diff --git a/nxcomp/src/PolyArc.h b/nxcomp/src/PolyArc.h
new file mode 100644
index 000000000..d744d6a10
--- /dev/null
+++ b/nxcomp/src/PolyArc.h
@@ -0,0 +1,185 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef PolyArc_H
+#define PolyArc_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+
+#define POLYARC_ENABLE_CACHE               1
+#define POLYARC_ENABLE_DATA                0
+#define POLYARC_ENABLE_SPLIT               0
+#define POLYARC_ENABLE_COMPRESS            0
+
+#define POLYARC_DATA_LIMIT                 1980
+#define POLYARC_DATA_OFFSET                12
+
+#define POLYARC_CACHE_SLOTS                2000
+#define POLYARC_CACHE_THRESHOLD            2
+#define POLYARC_CACHE_LOWER_THRESHOLD      1
+
+//
+// The message class.
+//
+
+class PolyArcMessage : public Message
+{
+  friend class PolyArcStore;
+
+  public:
+
+  PolyArcMessage()
+  {
+  }
+
+  ~PolyArcMessage()
+  {
+  }
+
+  //
+  // Put here the fields which constitute 
+  // the 'identity' part of the message.
+  //
+
+  private:
+
+  unsigned int drawable;
+  unsigned int gcontext;
+};
+
+class PolyArcStore : public MessageStore
+{
+  //
+  // Constructors and destructors.
+  //
+
+  public:
+
+  PolyArcStore() : MessageStore()
+  {
+    enableCache    = POLYARC_ENABLE_CACHE;
+    enableData     = POLYARC_ENABLE_DATA;
+    enableSplit    = POLYARC_ENABLE_SPLIT;
+    enableCompress = POLYARC_ENABLE_COMPRESS;
+
+    dataLimit  = POLYARC_DATA_LIMIT;
+    dataOffset = POLYARC_DATA_OFFSET;
+
+    cacheSlots          = POLYARC_CACHE_SLOTS;
+    cacheThreshold      = POLYARC_CACHE_THRESHOLD;
+    cacheLowerThreshold = POLYARC_CACHE_LOWER_THRESHOLD;
+
+    messages_ -> resize(cacheSlots);
+
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      *i = NULL;
+    }
+
+    temporary_ = NULL;
+  }
+
+  virtual ~PolyArcStore()
+  {
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      destroy(*i);
+    }
+
+    destroy(temporary_);
+  }
+
+  virtual const char *name() const
+  {
+    return "PolyArc";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return X_PolyArc;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(PolyArcMessage);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  public:
+
+  virtual Message *create() const
+  {
+    return new PolyArcMessage();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new PolyArcMessage((const PolyArcMessage &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (PolyArcMessage *) message;
+  }
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer,
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                  const Message *cachedMessage,
+                                      ChannelCache *channelCache) const;
+
+  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                  ChannelCache *channelCache) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+                                    unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+};
+
+#endif /* PolyArc_H */
diff --git a/nxcomp/src/PolyFillArc.cpp b/nxcomp/src/PolyFillArc.cpp
new file mode 100644
index 000000000..35125f0d3
--- /dev/null
+++ b/nxcomp/src/PolyFillArc.cpp
@@ -0,0 +1,162 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "PolyFillArc.h"
+
+#include "ClientCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Here are the methods to handle messages' content.
+//
+
+int PolyFillArcStore::parseIdentity(Message *message, const unsigned char *buffer,
+                                        unsigned int size, int bigEndian) const
+{
+  PolyFillArcMessage *polyFillArc = (PolyFillArcMessage *) message;
+
+  //
+  // Here is the fingerprint.
+  //
+
+  polyFillArc -> drawable = GetULONG(buffer + 4, bigEndian);
+  polyFillArc -> gcontext = GetULONG(buffer + 8, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsed Identity for message at " << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int PolyFillArcStore::unparseIdentity(const Message *message, unsigned char *buffer,
+                                          unsigned int size, int bigEndian) const
+{
+  PolyFillArcMessage *polyFillArc = (PolyFillArcMessage *) message;
+
+  //
+  // Fill all the message's fields.
+  //
+
+  PutULONG(polyFillArc -> drawable, buffer + 4, bigEndian);
+  PutULONG(polyFillArc -> gcontext, buffer + 8, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsed identity for message at " << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void PolyFillArcStore::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  PolyFillArcMessage *polyFillArc = (PolyFillArcMessage *) message;
+
+  *logofs << name() << ": Identity drawable " << polyFillArc -> drawable
+                    << ", gcontext " << polyFillArc -> gcontext
+                    << ", size " << polyFillArc -> size_ << ".\n" << logofs_flush;
+  #endif
+}
+
+void PolyFillArcStore::identityChecksum(const Message *message, const unsigned char *buffer,
+                                            unsigned int size, int bigEndian) const
+{
+}
+
+void PolyFillArcStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                          const Message *cachedMessage,
+                                              ChannelCache *channelCache) const
+{
+  PolyFillArcMessage *polyFillArc       = (PolyFillArcMessage *) message;
+  PolyFillArcMessage *cachedPolyFillArc = (PolyFillArcMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << polyFillArc -> drawable
+          << " as drawable field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeXidValue(polyFillArc -> drawable, clientCache -> drawableCache);
+
+  cachedPolyFillArc -> drawable = polyFillArc -> drawable;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << polyFillArc -> gcontext
+          << " as gcontext field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeXidValue(polyFillArc -> gcontext, clientCache -> gcCache);
+
+  cachedPolyFillArc -> gcontext = polyFillArc -> gcontext;
+}
+
+void PolyFillArcStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                          ChannelCache *channelCache) const
+{
+  PolyFillArcMessage *polyFillArc = (PolyFillArcMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  unsigned int value;
+
+  decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
+
+  polyFillArc -> drawable = value;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << polyFillArc -> drawable
+          << " as drawable field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeXidValue(value, clientCache -> gcCache);
+
+  polyFillArc -> gcontext = value;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << polyFillArc -> gcontext
+          << " as gcontext field.\n" << logofs_flush;
+  #endif
+}
+
+
diff --git a/nxcomp/src/PolyFillArc.h b/nxcomp/src/PolyFillArc.h
new file mode 100644
index 000000000..a4eff5b48
--- /dev/null
+++ b/nxcomp/src/PolyFillArc.h
@@ -0,0 +1,185 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef PolyFillArc_H
+#define PolyFillArc_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+
+#define POLYFILLARC_ENABLE_CACHE               1
+#define POLYFILLARC_ENABLE_DATA                0
+#define POLYFILLARC_ENABLE_SPLIT               0
+#define POLYFILLARC_ENABLE_COMPRESS            0
+
+#define POLYFILLARC_DATA_LIMIT                 6144
+#define POLYFILLARC_DATA_OFFSET                12
+
+#define POLYFILLARC_CACHE_SLOTS                2000
+#define POLYFILLARC_CACHE_THRESHOLD            2
+#define POLYFILLARC_CACHE_LOWER_THRESHOLD      1
+
+//
+// The message class.
+//
+
+class PolyFillArcMessage : public Message
+{
+  friend class PolyFillArcStore;
+
+  public:
+
+  PolyFillArcMessage()
+  {
+  }
+
+  ~PolyFillArcMessage()
+  {
+  }
+
+  //
+  // Put here the fields which constitute 
+  // the 'identity' part of the message.
+  //
+
+  private:
+
+  unsigned int drawable;
+  unsigned int gcontext;
+};
+
+class PolyFillArcStore : public MessageStore
+{
+  //
+  // Constructors and destructors.
+  //
+
+  public:
+
+  PolyFillArcStore() : MessageStore()
+  {
+    enableCache    = POLYFILLARC_ENABLE_CACHE;
+    enableData     = POLYFILLARC_ENABLE_DATA;
+    enableSplit    = POLYFILLARC_ENABLE_SPLIT;
+    enableCompress = POLYFILLARC_ENABLE_COMPRESS;
+
+    dataLimit  = POLYFILLARC_DATA_LIMIT;
+    dataOffset = POLYFILLARC_DATA_OFFSET;
+
+    cacheSlots          = POLYFILLARC_CACHE_SLOTS;
+    cacheThreshold      = POLYFILLARC_CACHE_THRESHOLD;
+    cacheLowerThreshold = POLYFILLARC_CACHE_LOWER_THRESHOLD;
+
+    messages_ -> resize(cacheSlots);
+
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      *i = NULL;
+    }
+
+    temporary_ = NULL;
+  }
+
+  virtual ~PolyFillArcStore()
+  {
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      destroy(*i);
+    }
+
+    destroy(temporary_);
+  }
+
+  virtual const char *name() const
+  {
+    return "PolyFillArc";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return X_PolyFillArc;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(PolyFillArcMessage);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  public:
+
+  virtual Message *create() const
+  {
+    return new PolyFillArcMessage();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new PolyFillArcMessage((const PolyFillArcMessage &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (PolyFillArcMessage *) message;
+  }
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer,
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                  const Message *cachedMessage,
+                                      ChannelCache *channelCache) const;
+
+  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                  ChannelCache *channelCache) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+                                    unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+};
+
+#endif /* PolyFillArc_H */
diff --git a/nxcomp/src/PolyFillRectangle.cpp b/nxcomp/src/PolyFillRectangle.cpp
new file mode 100644
index 000000000..95694e582
--- /dev/null
+++ b/nxcomp/src/PolyFillRectangle.cpp
@@ -0,0 +1,160 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "PolyFillRectangle.h"
+
+#include "ClientCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Here are the methods to handle messages' content.
+//
+
+int PolyFillRectangleStore::parseIdentity(Message *message, const unsigned char *buffer,
+                                              unsigned int size, int bigEndian) const
+{
+  PolyFillRectangleMessage *polyFillRectangle = (PolyFillRectangleMessage *) message;
+
+  //
+  // Here is the fingerprint.
+  //
+
+  polyFillRectangle -> drawable = GetULONG(buffer + 4, bigEndian);
+  polyFillRectangle -> gcontext = GetULONG(buffer + 8, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsed Identity for message at " << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int PolyFillRectangleStore::unparseIdentity(const Message *message, unsigned char *buffer,
+                                                unsigned int size, int bigEndian) const
+{
+  PolyFillRectangleMessage *polyFillRectangle = (PolyFillRectangleMessage *) message;
+
+  //
+  // Fill all the message's fields.
+  //
+
+  PutULONG(polyFillRectangle -> drawable, buffer + 4, bigEndian);
+  PutULONG(polyFillRectangle -> gcontext, buffer + 8, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsed identity for message at " << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void PolyFillRectangleStore::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  PolyFillRectangleMessage *polyFillRectangle = (PolyFillRectangleMessage *) message;
+
+  *logofs << name() << ": Identity drawable " << polyFillRectangle -> drawable
+                    << ", gcontext " << polyFillRectangle -> gcontext
+                    << ", size " << polyFillRectangle -> size_ << ".\n" << logofs_flush;
+  #endif
+}
+
+void PolyFillRectangleStore::identityChecksum(const Message *message, const unsigned char *buffer,
+                                                  unsigned int size, int bigEndian) const
+{
+}
+
+void PolyFillRectangleStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                                const Message *cachedMessage,
+                                                    ChannelCache *channelCache) const
+{
+  PolyFillRectangleMessage *polyFillRectangle       = (PolyFillRectangleMessage *) message;
+  PolyFillRectangleMessage *cachedPolyFillRectangle = (PolyFillRectangleMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Encoding value " << polyFillRectangle -> drawable
+          << " as drawable field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeXidValue(polyFillRectangle -> drawable, clientCache -> drawableCache);
+
+  cachedPolyFillRectangle -> drawable = polyFillRectangle -> drawable;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Encoding value " << polyFillRectangle -> gcontext
+          << " as gcontext field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeXidValue(polyFillRectangle -> gcontext, clientCache -> gcCache);
+
+  cachedPolyFillRectangle -> gcontext = polyFillRectangle -> gcontext;
+}
+
+void PolyFillRectangleStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                                ChannelCache *channelCache) const
+{
+  PolyFillRectangleMessage *polyFillRectangle = (PolyFillRectangleMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  unsigned int value;
+
+  decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
+
+  polyFillRectangle -> drawable = value;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << polyFillRectangle -> drawable
+          << " as drawable field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeXidValue(value, clientCache -> gcCache);
+
+  polyFillRectangle -> gcontext = value;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << polyFillRectangle -> gcontext
+          << " as gcontext field.\n" << logofs_flush;
+  #endif
+}
diff --git a/nxcomp/src/PolyFillRectangle.h b/nxcomp/src/PolyFillRectangle.h
new file mode 100644
index 000000000..7ebb9270d
--- /dev/null
+++ b/nxcomp/src/PolyFillRectangle.h
@@ -0,0 +1,185 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef PolyFillRectangle_H
+#define PolyFillRectangle_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+
+#define POLYFILLRECTANGLE_ENABLE_CACHE                           1
+#define POLYFILLRECTANGLE_ENABLE_DATA                            0
+#define POLYFILLRECTANGLE_ENABLE_SPLIT                           0
+#define POLYFILLRECTANGLE_ENABLE_COMPRESS                        0
+
+#define POLYFILLRECTANGLE_DATA_LIMIT                             2048
+#define POLYFILLRECTANGLE_DATA_OFFSET                            12
+
+#define POLYFILLRECTANGLE_CACHE_SLOTS                            4000
+#define POLYFILLRECTANGLE_CACHE_THRESHOLD                        5
+#define POLYFILLRECTANGLE_CACHE_LOWER_THRESHOLD                  1
+
+//
+// The message class.
+//
+
+class PolyFillRectangleMessage : public Message
+{
+  friend class PolyFillRectangleStore;
+
+  public:
+
+  PolyFillRectangleMessage()
+  {
+  }
+
+  ~PolyFillRectangleMessage()
+  {
+  }
+
+  //
+  // Put here the fields which constitute 
+  // the 'identity' part of the message.
+  //
+
+  private:
+
+  unsigned int drawable;
+  unsigned int gcontext;
+};
+
+class PolyFillRectangleStore : public MessageStore
+{
+  //
+  // Constructors and destructors.
+  //
+
+  public:
+
+  PolyFillRectangleStore() : MessageStore()
+  {
+    enableCache    = POLYFILLRECTANGLE_ENABLE_CACHE;
+    enableData     = POLYFILLRECTANGLE_ENABLE_DATA;
+    enableSplit    = POLYFILLRECTANGLE_ENABLE_SPLIT;
+    enableCompress = POLYFILLRECTANGLE_ENABLE_COMPRESS;
+
+    dataLimit  = POLYFILLRECTANGLE_DATA_LIMIT;
+    dataOffset = POLYFILLRECTANGLE_DATA_OFFSET;
+
+    cacheSlots          = POLYFILLRECTANGLE_CACHE_SLOTS;
+    cacheThreshold      = POLYFILLRECTANGLE_CACHE_THRESHOLD;
+    cacheLowerThreshold = POLYFILLRECTANGLE_CACHE_LOWER_THRESHOLD;
+
+    messages_ -> resize(cacheSlots);
+
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      *i = NULL;
+    }
+
+    temporary_ = NULL;
+  }
+
+  virtual ~PolyFillRectangleStore()
+  {
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      destroy(*i);
+    }
+
+    destroy(temporary_);
+  }
+
+  virtual const char *name() const
+  {
+    return "PolyFillRectangle";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return X_PolyFillRectangle;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(PolyFillRectangleMessage);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  public:
+
+  virtual Message *create() const
+  {
+    return new PolyFillRectangleMessage();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new PolyFillRectangleMessage((const PolyFillRectangleMessage &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (PolyFillRectangleMessage *) message;
+  }
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer,
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                  const Message *cachedMessage,
+                                      ChannelCache *channelCache) const;
+
+  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                  ChannelCache *channelCache) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+                                    unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+};
+
+#endif /* PolyFillRectangle_H */
diff --git a/nxcomp/src/PolyLine.cpp b/nxcomp/src/PolyLine.cpp
new file mode 100644
index 000000000..1b12bbe98
--- /dev/null
+++ b/nxcomp/src/PolyLine.cpp
@@ -0,0 +1,168 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "PolyLine.h"
+
+#include "ClientCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Here are the methods to handle messages' content.
+//
+
+int PolyLineStore::parseIdentity(Message *message, const unsigned char *buffer,
+                                     unsigned int size, int bigEndian) const
+{
+  PolyLineMessage *polyLine = (PolyLineMessage *) message;
+
+  //
+  // Here is the fingerprint.
+  //
+
+  polyLine -> mode = *(buffer + 1);
+
+  polyLine -> drawable = GetULONG(buffer + 4, bigEndian);
+  polyLine -> gcontext = GetULONG(buffer + 8, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsed Identity for message at " << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int PolyLineStore::unparseIdentity(const Message *message, unsigned char *buffer,
+                                       unsigned int size, int bigEndian) const
+{
+  PolyLineMessage *polyLine = (PolyLineMessage *) message;
+
+  //
+  // Fill all the message's fields.
+  //
+
+  *(buffer + 1) = polyLine -> mode;
+
+  PutULONG(polyLine -> drawable, buffer + 4, bigEndian);
+  PutULONG(polyLine -> gcontext, buffer + 8, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsed identity for message at " << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void PolyLineStore::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  PolyLineMessage *polyLine = (PolyLineMessage *) message;
+
+  *logofs << name() << ": Identity drawable " << polyLine -> drawable
+                    << ", gcontext " << polyLine -> gcontext
+                    << ", size " << polyLine -> size_ << ".\n" << logofs_flush;
+  #endif
+}
+
+void PolyLineStore::identityChecksum(const Message *message, const unsigned char *buffer,
+                                         unsigned int size, int bigEndian) const
+{
+  // Since ProtoStep8 (#issue 108)
+  md5_append(md5_state_, buffer + 1, 1);
+}
+
+void PolyLineStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                       const Message *cachedMessage,
+                                           ChannelCache *channelCache) const
+{
+  PolyLineMessage *polyLine       = (PolyLineMessage *) message;
+  PolyLineMessage *cachedPolyLine = (PolyLineMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << polyLine -> drawable
+          << " as drawable field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeXidValue(polyLine -> drawable, clientCache -> drawableCache);
+
+  cachedPolyLine -> drawable = polyLine -> drawable;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << polyLine -> gcontext
+          << " as gcontext field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeXidValue(polyLine -> gcontext, clientCache -> gcCache);
+
+  cachedPolyLine -> gcontext = polyLine -> gcontext;
+}
+
+void PolyLineStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                       ChannelCache *channelCache) const
+{
+  PolyLineMessage *polyLine = (PolyLineMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  unsigned int value;
+
+  decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
+
+  polyLine -> drawable = value;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << polyLine -> drawable
+          << " as drawable field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeXidValue(value, clientCache -> gcCache);
+
+  polyLine -> gcontext = value;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << polyLine -> gcontext
+          << " as gcontext field.\n" << logofs_flush;
+  #endif
+}
+
+
diff --git a/nxcomp/src/PolyLine.h b/nxcomp/src/PolyLine.h
new file mode 100644
index 000000000..66fa5df1a
--- /dev/null
+++ b/nxcomp/src/PolyLine.h
@@ -0,0 +1,186 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef PolyLine_H
+#define PolyLine_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+
+#define POLYLINE_ENABLE_CACHE               1
+#define POLYLINE_ENABLE_DATA                0
+#define POLYLINE_ENABLE_SPLIT               0
+#define POLYLINE_ENABLE_COMPRESS            0
+
+#define POLYLINE_DATA_LIMIT                 144
+#define POLYLINE_DATA_OFFSET                12
+
+#define POLYLINE_CACHE_SLOTS                3000
+#define POLYLINE_CACHE_THRESHOLD            3
+#define POLYLINE_CACHE_LOWER_THRESHOLD      1
+
+//
+// The message class.
+//
+
+class PolyLineMessage : public Message
+{
+  friend class PolyLineStore;
+
+  public:
+
+  PolyLineMessage()
+  {
+  }
+
+  ~PolyLineMessage()
+  {
+  }
+
+  //
+  // Put here the fields which constitute 
+  // the 'identity' part of the message.
+  //
+
+  private:
+
+  unsigned char mode;
+  unsigned int  drawable;
+  unsigned int  gcontext;
+};
+
+class PolyLineStore : public MessageStore
+{
+  //
+  // Constructors and destructors.
+  //
+
+  public:
+
+  PolyLineStore() : MessageStore()
+  {
+    enableCache    = POLYLINE_ENABLE_CACHE;
+    enableData     = POLYLINE_ENABLE_DATA;
+    enableSplit    = POLYLINE_ENABLE_SPLIT;
+    enableCompress = POLYLINE_ENABLE_COMPRESS;
+
+    dataLimit  = POLYLINE_DATA_LIMIT;
+    dataOffset = POLYLINE_DATA_OFFSET;
+
+    cacheSlots          = POLYLINE_CACHE_SLOTS;
+    cacheThreshold      = POLYLINE_CACHE_THRESHOLD;
+    cacheLowerThreshold = POLYLINE_CACHE_LOWER_THRESHOLD;
+
+    messages_ -> resize(cacheSlots);
+
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      *i = NULL;
+    }
+
+    temporary_ = NULL;
+  }
+
+  virtual ~PolyLineStore()
+  {
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      destroy(*i);
+    }
+
+    destroy(temporary_);
+  }
+
+  virtual const char *name() const
+  {
+    return "PolyLine";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return X_PolyLine;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(PolyLineMessage);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  public:
+
+  virtual Message *create() const
+  {
+    return new PolyLineMessage();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new PolyLineMessage((const PolyLineMessage &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (PolyLineMessage *) message;
+  }
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer,
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                  const Message *cachedMessage,
+                                      ChannelCache *channelCache) const;
+
+  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                  ChannelCache *channelCache) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+                                    unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+};
+
+#endif /* PolyLine_H */
diff --git a/nxcomp/src/PolyPoint.cpp b/nxcomp/src/PolyPoint.cpp
new file mode 100644
index 000000000..70151cc0d
--- /dev/null
+++ b/nxcomp/src/PolyPoint.cpp
@@ -0,0 +1,168 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "PolyPoint.h"
+
+#include "ClientCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Here are the methods to handle messages' content.
+//
+
+int PolyPointStore::parseIdentity(Message *message, const unsigned char *buffer,
+                                      unsigned int size, int bigEndian) const
+{
+  PolyPointMessage *polyPoint = (PolyPointMessage *) message;
+
+  //
+  // Here is the fingerprint.
+  //
+
+  polyPoint -> mode = *(buffer + 1);
+
+  polyPoint -> drawable = GetULONG(buffer + 4, bigEndian);
+  polyPoint -> gcontext = GetULONG(buffer + 8, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsed Identity for message at " << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int PolyPointStore::unparseIdentity(const Message *message, unsigned char *buffer,
+                                        unsigned int size, int bigEndian) const
+{
+  PolyPointMessage *polyPoint = (PolyPointMessage *) message;
+
+  //
+  // Fill all the message's fields.
+  //
+
+  *(buffer + 1) = polyPoint -> mode;
+
+  PutULONG(polyPoint -> drawable, buffer + 4, bigEndian);
+  PutULONG(polyPoint -> gcontext, buffer + 8, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsed identity for message at " << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void PolyPointStore::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  PolyPointMessage *polyPoint = (PolyPointMessage *) message;
+
+  *logofs << name() << ": Identity drawable " << polyPoint -> drawable
+                    << ", gcontext " << polyPoint -> gcontext
+                    << ", size " << polyPoint -> size_ << ".\n" << logofs_flush;
+  #endif
+}
+
+void PolyPointStore::identityChecksum(const Message *message, const unsigned char *buffer,
+                                          unsigned int size, int bigEndian) const
+{
+  // Since ProtoStep8 (#issue 108)
+  md5_append(md5_state_, buffer + 1, 1);
+}
+
+void PolyPointStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                        const Message *cachedMessage,
+                                            ChannelCache *channelCache) const
+{
+  PolyPointMessage *polyPoint       = (PolyPointMessage *) message;
+  PolyPointMessage *cachedPolyPoint = (PolyPointMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << polyPoint -> drawable
+          << " as drawable field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeXidValue(polyPoint -> drawable, clientCache -> drawableCache);
+
+  cachedPolyPoint -> drawable = polyPoint -> drawable;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << polyPoint -> gcontext
+          << " as gcontext field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeXidValue(polyPoint -> gcontext, clientCache -> gcCache);
+
+  cachedPolyPoint -> gcontext = polyPoint -> gcontext;
+}
+
+void PolyPointStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                        ChannelCache *channelCache) const
+{
+  PolyPointMessage *polyPoint = (PolyPointMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  unsigned int value;
+
+  decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
+
+  polyPoint -> drawable = value;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << polyPoint -> drawable
+          << " as drawable field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeXidValue(value, clientCache -> gcCache);
+
+  polyPoint -> gcontext = value;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << polyPoint -> gcontext
+          << " as gcontext field.\n" << logofs_flush;
+  #endif
+}
+
+
diff --git a/nxcomp/src/PolyPoint.h b/nxcomp/src/PolyPoint.h
new file mode 100644
index 000000000..b8ea183bf
--- /dev/null
+++ b/nxcomp/src/PolyPoint.h
@@ -0,0 +1,186 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef PolyPoint_H
+#define PolyPoint_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+
+#define POLYPOINT_ENABLE_CACHE               1
+#define POLYPOINT_ENABLE_DATA                0
+#define POLYPOINT_ENABLE_SPLIT               0
+#define POLYPOINT_ENABLE_COMPRESS            0
+
+#define POLYPOINT_DATA_LIMIT                 3200
+#define POLYPOINT_DATA_OFFSET                12
+
+#define POLYPOINT_CACHE_SLOTS                3000
+#define POLYPOINT_CACHE_THRESHOLD            3
+#define POLYPOINT_CACHE_LOWER_THRESHOLD      1
+
+//
+// The message class.
+//
+
+class PolyPointMessage : public Message
+{
+  friend class PolyPointStore;
+
+  public:
+
+  PolyPointMessage()
+  {
+  }
+
+  ~PolyPointMessage()
+  {
+  }
+
+  //
+  // Put here the fields which constitute 
+  // the 'identity' part of the message.
+  //
+
+  private:
+
+  unsigned char mode;
+  unsigned int  drawable;
+  unsigned int  gcontext;
+};
+
+class PolyPointStore : public MessageStore
+{
+  //
+  // Constructors and destructors.
+  //
+
+  public:
+
+  PolyPointStore() : MessageStore()
+  {
+    enableCache    = POLYPOINT_ENABLE_CACHE;
+    enableData     = POLYPOINT_ENABLE_DATA;
+    enableSplit    = POLYPOINT_ENABLE_SPLIT;
+    enableCompress = POLYPOINT_ENABLE_COMPRESS;
+
+    dataLimit  = POLYPOINT_DATA_LIMIT;
+    dataOffset = POLYPOINT_DATA_OFFSET;
+
+    cacheSlots          = POLYPOINT_CACHE_SLOTS;
+    cacheThreshold      = POLYPOINT_CACHE_THRESHOLD;
+    cacheLowerThreshold = POLYPOINT_CACHE_LOWER_THRESHOLD;
+
+    messages_ -> resize(cacheSlots);
+
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      *i = NULL;
+    }
+
+    temporary_ = NULL;
+  }
+
+  virtual ~PolyPointStore()
+  {
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      destroy(*i);
+    }
+
+    destroy(temporary_);
+  }
+
+  virtual const char *name() const
+  {
+    return "PolyPoint";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return X_PolyPoint;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(PolyPointMessage);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  public:
+
+  virtual Message *create() const
+  {
+    return new PolyPointMessage();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new PolyPointMessage((const PolyPointMessage &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (PolyPointMessage *) message;
+  }
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer,
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                  const Message *cachedMessage,
+                                      ChannelCache *channelCache) const;
+
+  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                  ChannelCache *channelCache) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+                                    unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+};
+
+#endif /* PolyPoint_H */
diff --git a/nxcomp/src/PolySegment.cpp b/nxcomp/src/PolySegment.cpp
new file mode 100644
index 000000000..aa2d4efe3
--- /dev/null
+++ b/nxcomp/src/PolySegment.cpp
@@ -0,0 +1,162 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "PolySegment.h"
+
+#include "ClientCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Here are the methods to handle messages' content.
+//
+
+int PolySegmentStore::parseIdentity(Message *message, const unsigned char *buffer,
+                                        unsigned int size, int bigEndian) const
+{
+  PolySegmentMessage *polySegment = (PolySegmentMessage *) message;
+
+  //
+  // Here is the fingerprint.
+  //
+
+  polySegment -> drawable = GetULONG(buffer + 4, bigEndian);
+  polySegment -> gcontext = GetULONG(buffer + 8, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsed Identity for message at " << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int PolySegmentStore::unparseIdentity(const Message *message, unsigned char *buffer,
+                                          unsigned int size, int bigEndian) const
+{
+  PolySegmentMessage *polySegment = (PolySegmentMessage *) message;
+
+  //
+  // Fill all the message's fields.
+  //
+
+  PutULONG(polySegment -> drawable, buffer + 4, bigEndian);
+  PutULONG(polySegment -> gcontext, buffer + 8, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsed identity for message at " << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void PolySegmentStore::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  PolySegmentMessage *polySegment = (PolySegmentMessage *) message;
+
+  *logofs << name() << ": Identity drawable " << polySegment -> drawable
+                    << ", gcontext " << polySegment -> gcontext
+                    << ", size " << polySegment -> size_ << ".\n" << logofs_flush;
+  #endif
+}
+
+void PolySegmentStore::identityChecksum(const Message *message, const unsigned char *buffer,
+                                            unsigned int size, int bigEndian) const
+{
+}
+
+void PolySegmentStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                          const Message *cachedMessage,
+                                              ChannelCache *channelCache) const
+{
+  PolySegmentMessage *polySegment       = (PolySegmentMessage *) message;
+  PolySegmentMessage *cachedPolySegment = (PolySegmentMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << polySegment -> drawable
+          << " as drawable field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeXidValue(polySegment -> drawable, clientCache -> drawableCache);
+
+  cachedPolySegment -> drawable = polySegment -> drawable;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << polySegment -> gcontext
+          << " as gcontext field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeXidValue(polySegment -> gcontext, clientCache -> gcCache);
+
+  cachedPolySegment -> gcontext = polySegment -> gcontext;
+}
+
+void PolySegmentStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                          ChannelCache *channelCache) const
+{
+  PolySegmentMessage *polySegment = (PolySegmentMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  unsigned int value;
+
+  decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
+
+  polySegment -> drawable = value;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << polySegment -> drawable
+          << " as drawable field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeXidValue(value, clientCache -> gcCache);
+
+  polySegment -> gcontext = value;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << polySegment -> gcontext
+          << " as gcontext field.\n" << logofs_flush;
+  #endif
+}
+
+
diff --git a/nxcomp/src/PolySegment.h b/nxcomp/src/PolySegment.h
new file mode 100644
index 000000000..53fd42c60
--- /dev/null
+++ b/nxcomp/src/PolySegment.h
@@ -0,0 +1,185 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef PolySegment_H
+#define PolySegment_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+
+#define POLYSEGMENT_ENABLE_CACHE               1
+#define POLYSEGMENT_ENABLE_DATA                0
+#define POLYSEGMENT_ENABLE_SPLIT               0
+#define POLYSEGMENT_ENABLE_COMPRESS            0
+
+#define POLYSEGMENT_DATA_LIMIT                 8192
+#define POLYSEGMENT_DATA_OFFSET                12
+
+#define POLYSEGMENT_CACHE_SLOTS                3000
+#define POLYSEGMENT_CACHE_THRESHOLD            5
+#define POLYSEGMENT_CACHE_LOWER_THRESHOLD      1
+
+//
+// The message class.
+//
+
+class PolySegmentMessage : public Message
+{
+  friend class PolySegmentStore;
+
+  public:
+
+  PolySegmentMessage()
+  {
+  }
+
+  ~PolySegmentMessage()
+  {
+  }
+
+  //
+  // Put here the fields which constitute 
+  // the 'identity' part of the message.
+  //
+
+  private:
+
+  unsigned int drawable;
+  unsigned int gcontext;
+};
+
+class PolySegmentStore : public MessageStore
+{
+  //
+  // Constructors and destructors.
+  //
+
+  public:
+
+  PolySegmentStore() : MessageStore()
+  {
+    enableCache    = POLYSEGMENT_ENABLE_CACHE;
+    enableData     = POLYSEGMENT_ENABLE_DATA;
+    enableSplit    = POLYSEGMENT_ENABLE_SPLIT;
+    enableCompress = POLYSEGMENT_ENABLE_COMPRESS;
+
+    dataLimit           = POLYSEGMENT_DATA_LIMIT;
+    dataOffset          = POLYSEGMENT_DATA_OFFSET;
+
+    cacheSlots          = POLYSEGMENT_CACHE_SLOTS;
+    cacheThreshold      = POLYSEGMENT_CACHE_THRESHOLD;
+    cacheLowerThreshold = POLYSEGMENT_CACHE_LOWER_THRESHOLD;
+
+    messages_ -> resize(cacheSlots);
+
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      *i = NULL;
+    }
+
+    temporary_ = NULL;
+  }
+
+  virtual ~PolySegmentStore()
+  {
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      destroy(*i);
+    }
+
+    destroy(temporary_);
+  }
+
+  virtual const char *name() const
+  {
+    return "PolySegment";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return X_PolySegment;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(PolySegmentMessage);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  public:
+
+  virtual Message *create() const
+  {
+    return new PolySegmentMessage();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new PolySegmentMessage((const PolySegmentMessage &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (PolySegmentMessage *) message;
+  }
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer,
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                  const Message *cachedMessage,
+                                      ChannelCache *channelCache) const;
+
+  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                  ChannelCache *channelCache) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+                                    unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+};
+
+#endif /* PolySegment_H */
diff --git a/nxcomp/src/PolyText16.cpp b/nxcomp/src/PolyText16.cpp
new file mode 100644
index 000000000..32be45482
--- /dev/null
+++ b/nxcomp/src/PolyText16.cpp
@@ -0,0 +1,312 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "PolyText16.h"
+
+#include "ClientCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Here are the methods to handle messages' content.
+//
+
+int PolyText16Store::parseIdentity(Message *message, const unsigned char *buffer,
+                                       unsigned int size, int bigEndian) const
+{
+  PolyText16Message *polyText16 = (PolyText16Message *) message;
+
+  //
+  // Here is the fingerprint.
+  //
+
+  polyText16 -> drawable = GetULONG(buffer + 4, bigEndian); 
+  polyText16 -> gcontext = GetULONG(buffer + 8, bigEndian);
+
+  polyText16 -> x = GetUINT(buffer + 12, bigEndian);
+  polyText16 -> y = GetUINT(buffer + 14, bigEndian);
+
+  //
+  // Clean up padding bytes.
+  //
+
+  #ifdef DUMP
+
+  DumpData(buffer, size);
+
+  *logofs << "\n" << logofs_flush;
+
+  #endif
+
+  if ((int) size > dataOffset)
+  {
+    int current;
+    int length;
+    int delta;
+    int item;
+    
+    unsigned int nitem;
+
+    unsigned char *pad = NULL; 
+    unsigned char *end = NULL;
+
+    delta = 1;
+    nitem = 0;
+
+    #ifdef DUMP
+    *logofs << name() << " Size " << size << ".\n" << logofs_flush;
+    #endif
+
+    //
+    // Data is a list of TextItem where element
+    // can be a string or a font shift.
+    //
+
+    current = POLYTEXT16_DATA_OFFSET;
+    length  = POLYTEXT16_DATA_OFFSET;
+
+    do
+    {
+      #ifdef DUMP
+      *logofs << name() << " Current " << current << ".\n" << logofs_flush;
+      #endif
+
+      item = GetUINT(buffer + length , bigEndian);
+
+      if (item < 255)
+      {
+        //
+        // Text element. Number represents
+        // the 'Length of CHAR2B string'
+        // field.
+        //
+
+        length += ((item * 2) + delta + 1);
+
+        nitem++;
+      }
+      else if (item == 255)
+      {
+        //
+        // Element is a font shift.
+        //
+
+        length += 5;
+
+        nitem++;
+      }
+
+      #ifdef DUMP
+      *logofs << name() << " Item " << item << ".\n" << logofs_flush;
+      #endif
+
+      current += length;
+    }
+    while(current < (int) size && item != 0);
+
+    #ifdef DUMP
+    *logofs << name() << " Final length " << length << ".\n" << logofs_flush;
+    #endif
+
+    end = ((unsigned char *) buffer) + size;
+
+    pad = ((unsigned char *) buffer) + length;
+
+    for (; pad < end && nitem >= 1; pad++)
+    {
+      #ifdef DUMP
+      *logofs << name() << " Padding " << " .\n" << logofs_flush;
+      #endif
+
+      *pad = 0;
+    }
+  }
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsed Identity for message at " << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int PolyText16Store::unparseIdentity(const Message *message, unsigned char *buffer,
+                                         unsigned int size, int bigEndian) const
+{
+  PolyText16Message *polyText16 = (PolyText16Message *) message;
+
+  //
+  // Fill all the message's fields.
+  //
+
+  PutULONG(polyText16 -> drawable, buffer + 4, bigEndian);
+  PutULONG(polyText16 -> gcontext, buffer + 8, bigEndian);
+
+  PutUINT(polyText16 -> x, buffer + 12, bigEndian);
+  PutUINT(polyText16 -> y, buffer + 14, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsed identity for message at " << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void PolyText16Store::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  PolyText16Message *polyText16 = (PolyText16Message *) message;
+
+  *logofs << name() << ": Identity drawable " << polyText16 -> drawable 
+          << ", gcontext " << polyText16 -> gcontext << ", x " << polyText16 -> x 
+          << ", y " << polyText16 -> y << ", size " << polyText16 -> size_ 
+          << ".\n";
+
+  #endif
+}
+
+void PolyText16Store::identityChecksum(const Message *message, const unsigned char *buffer,
+                                           unsigned int size, int bigEndian) const
+{
+}
+
+void PolyText16Store::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                         const Message *cachedMessage,
+                                             ChannelCache *channelCache) const
+{
+  PolyText16Message *polyText16       = (PolyText16Message *) message;
+  PolyText16Message *cachedPolyText16 = (PolyText16Message *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << polyText16 -> drawable
+          << " as " << "drawable" << " field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeXidValue(polyText16 -> drawable, clientCache -> drawableCache);
+
+  cachedPolyText16 -> drawable = polyText16 -> drawable;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << polyText16 -> gcontext
+          << " as " << "gcontext" << " field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeXidValue(polyText16 -> gcontext, clientCache -> gcCache);
+
+  cachedPolyText16 -> gcontext = polyText16 -> gcontext;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << polyText16 -> x
+          << " as " << "x" << " field.\n" << logofs_flush;
+  #endif
+
+  unsigned short int diff_x = polyText16 -> x - cachedPolyText16 -> x;
+
+  encodeBuffer.encodeCachedValue(diff_x, 16,
+                     clientCache -> polyTextCacheX);
+
+  cachedPolyText16 -> x = polyText16 -> x;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << polyText16 -> y
+          << " as " << "y" << " field.\n" << logofs_flush;
+  #endif
+
+  unsigned short int diff_y = polyText16 -> y - cachedPolyText16 -> y;
+
+  encodeBuffer.encodeCachedValue(diff_y, 16,
+                     clientCache -> polyTextCacheY);
+
+  cachedPolyText16 -> y = polyText16 -> y;
+}
+
+void PolyText16Store::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                         ChannelCache *channelCache) const
+{
+  PolyText16Message *polyText16 = (PolyText16Message *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  unsigned int value;
+
+  decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
+
+  polyText16 -> drawable = value;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << polyText16 -> drawable
+          << " as " << "drawable" << " field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeXidValue(value, clientCache -> gcCache);
+
+  polyText16 -> gcontext = value;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << polyText16 -> gcontext
+          << " as gcontext field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeCachedValue(value, 16,
+               clientCache -> polyTextCacheX);
+
+  polyText16 -> x += value;
+  polyText16 -> x &= 0xffff;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << polyText16 -> x
+          << " as x field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeCachedValue(value, 16,
+               clientCache -> polyTextCacheY);
+
+  polyText16 -> y += value;
+  polyText16 -> y &= 0xffff;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << polyText16 -> y
+          << " as y field.\n" << logofs_flush;
+  #endif
+}
+
+
diff --git a/nxcomp/src/PolyText16.h b/nxcomp/src/PolyText16.h
new file mode 100644
index 000000000..805e1fa04
--- /dev/null
+++ b/nxcomp/src/PolyText16.h
@@ -0,0 +1,188 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef PolyText16_H
+#define PolyText16_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+
+#define POLYTEXT16_ENABLE_CACHE               1
+#define POLYTEXT16_ENABLE_DATA                0
+#define POLYTEXT16_ENABLE_SPLIT               0
+#define POLYTEXT16_ENABLE_COMPRESS            0
+
+#define POLYTEXT16_DATA_LIMIT                 420
+#define POLYTEXT16_DATA_OFFSET                16
+
+#define POLYTEXT16_CACHE_SLOTS                3000
+#define POLYTEXT16_CACHE_THRESHOLD            4
+#define POLYTEXT16_CACHE_LOWER_THRESHOLD      1
+
+//
+// The message class.
+//
+
+class PolyText16Message : public Message
+{
+  friend class PolyText16Store;
+
+  public:
+
+  PolyText16Message()
+  {
+  }
+
+  ~PolyText16Message()
+  {
+  }
+
+  //
+  // Put here the fields which constitute 
+  // the 'identity' part of the message.
+  //
+
+  private:
+
+  unsigned int drawable;
+  unsigned int gcontext;
+
+  unsigned short x;
+  unsigned short y;
+};
+
+class PolyText16Store : public MessageStore
+{
+  //
+  // Constructors and destructors.
+  //
+
+  public:
+
+  PolyText16Store() : MessageStore()
+  {
+    enableCache    = POLYTEXT16_ENABLE_CACHE;
+    enableData     = POLYTEXT16_ENABLE_DATA;
+    enableSplit    = POLYTEXT16_ENABLE_SPLIT;
+    enableCompress = POLYTEXT16_ENABLE_COMPRESS;
+
+    dataLimit  = POLYTEXT16_DATA_LIMIT;
+    dataOffset = POLYTEXT16_DATA_OFFSET;
+
+    cacheSlots          = POLYTEXT16_CACHE_SLOTS;
+    cacheThreshold      = POLYTEXT16_CACHE_THRESHOLD;
+    cacheLowerThreshold = POLYTEXT16_CACHE_LOWER_THRESHOLD;
+
+    messages_ -> resize(cacheSlots);
+
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      *i = NULL;
+    }
+
+    temporary_ = NULL;
+  }
+
+  virtual ~PolyText16Store()
+  {
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      destroy(*i);
+    }
+
+    destroy(temporary_);
+  }
+
+  virtual const char *name() const
+  {
+    return "PolyText16";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return X_PolyText16;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(PolyText16Message);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  public:
+
+  virtual Message *create() const
+  {
+    return new PolyText16Message();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new PolyText16Message((const PolyText16Message &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (PolyText16Message *) message;
+  }
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer,
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                  const Message *cachedMessage,
+                                      ChannelCache *channelCache) const;
+
+  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                  ChannelCache *channelCache) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+				unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+};
+
+#endif /* PolyText16_H */
diff --git a/nxcomp/src/PolyText8.cpp b/nxcomp/src/PolyText8.cpp
new file mode 100644
index 000000000..61fef5a4f
--- /dev/null
+++ b/nxcomp/src/PolyText8.cpp
@@ -0,0 +1,310 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "PolyText8.h"
+
+#include "ClientCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Here are the methods to handle messages' content.
+//
+
+int PolyText8Store::parseIdentity(Message *message, const unsigned char *buffer,
+                                      unsigned int size, int bigEndian) const
+{
+  PolyText8Message *polyText8 = (PolyText8Message *) message;
+
+  //
+  // Here is the fingerprint.
+  //
+
+  polyText8 -> drawable = GetULONG(buffer + 4, bigEndian); 
+  polyText8 -> gcontext = GetULONG(buffer + 8, bigEndian);
+
+  polyText8 -> x = GetUINT(buffer + 12, bigEndian);
+  polyText8 -> y = GetUINT(buffer + 14, bigEndian);
+
+  //
+  // Clean up padding bytes.
+  //
+
+  #ifdef DUMP
+
+  DumpData(buffer, size);
+
+  *logofs << "\n\n" << logofs_flush;
+
+  #endif
+
+  if ((int) size > dataOffset)
+  { 
+    int length;
+    int current;
+    int delta;
+    int item;
+
+    unsigned int nitem;
+
+    unsigned char *pad = NULL;
+    unsigned char *end = NULL;
+
+    delta = 1;
+    nitem = 0;
+
+    #ifdef DUMP 
+    *logofs << name() << " Size " << size << ".\n" << logofs_flush;
+    #endif
+
+    //
+    // Data is a list of TextItem where element
+    // can be a string or a font shift.
+    //
+
+    current = POLYTEXT8_DATA_OFFSET;
+    length  = POLYTEXT8_DATA_OFFSET;
+
+    do
+    {
+      #ifdef DUMP
+      *logofs << name() << " Current " << current << ".\n" << logofs_flush;
+      #endif
+
+      item = GetUINT(buffer + length , bigEndian);
+      
+      if (item < 255)
+      {
+        //
+        // Text element. Number represents
+        // the 'Length of string' field.
+        //
+        
+        length += (item + delta + 1);
+
+	nitem++;
+      }	
+      else if (item == 255)
+      {
+        //
+        // Element is a font shift.
+        //
+        
+        length += 5;
+
+        nitem++;
+      }
+
+      #ifdef DUMP 
+      *logofs << name() << " Item " << item << ".\n" << logofs_flush;
+      #endif
+
+      current += length;
+    }
+    while(current < (int) size && item != 0);
+     
+     
+    #ifdef DUMP
+    *logofs << name() << " Final length " << length << ".\n" << logofs_flush;
+    #endif
+
+    end = ((unsigned char *) buffer) + size;
+
+    pad = ((unsigned char *) buffer) + length;
+
+    for (; pad < end && nitem >= 1; pad++)
+    {
+      #ifdef DUMP
+      *logofs << name() << " Padding " << " .\n" << logofs_flush;
+      #endif
+
+      *pad = 0;
+    }
+  }
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsed Identity for message at " << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int PolyText8Store::unparseIdentity(const Message *message, unsigned char *buffer,
+                                        unsigned int size, int bigEndian) const
+{
+  PolyText8Message *polyText8 = (PolyText8Message *) message;
+
+  //
+  // Fill all the message's fields.
+  //
+
+  PutULONG(polyText8 -> drawable, buffer + 4, bigEndian);
+  PutULONG(polyText8 -> gcontext, buffer + 8, bigEndian);
+
+  PutUINT(polyText8 -> x, buffer + 12, bigEndian);
+  PutUINT(polyText8 -> y, buffer + 14, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsed identity for message at " << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void PolyText8Store::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  PolyText8Message *polyText8 = (PolyText8Message *) message;
+
+  *logofs << name() << ": Identity drawable " << polyText8 -> drawable 
+          << ", gcontext " << polyText8 -> gcontext << ", x " << polyText8 -> x 
+          << ", y " << polyText8 -> y << ", size " << polyText8 -> size_ 
+          << ".\n";
+
+  #endif
+}
+
+void PolyText8Store::identityChecksum(const Message *message, const unsigned char *buffer,
+                                          unsigned int size, int bigEndian) const
+{
+}
+
+void PolyText8Store::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                        const Message *cachedMessage,
+                                            ChannelCache *channelCache) const
+{
+  PolyText8Message *polyText8       = (PolyText8Message *) message;
+  PolyText8Message *cachedPolyText8 = (PolyText8Message *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << polyText8 -> drawable
+          << " as " << "drawable" << " field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeXidValue(polyText8 -> drawable, clientCache -> drawableCache);
+
+  cachedPolyText8 -> drawable = polyText8 -> drawable;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << polyText8 -> gcontext
+          << " as " << "gcontext" << " field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeXidValue(polyText8 -> gcontext, clientCache -> gcCache);
+
+  cachedPolyText8 -> gcontext = polyText8 -> gcontext;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << polyText8 -> x
+          << " as " << "x" << " field.\n" << logofs_flush;
+  #endif
+
+  unsigned short int diff_x = polyText8 -> x - cachedPolyText8 -> x;
+
+  encodeBuffer.encodeCachedValue(diff_x, 16,
+                     clientCache -> polyTextCacheX);
+
+  cachedPolyText8 -> x = polyText8 -> x;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << polyText8 -> y
+          << " as " << "y" << " field.\n" << logofs_flush;
+  #endif
+
+  unsigned short int diff_y = polyText8 -> y - cachedPolyText8 -> y;
+
+  encodeBuffer.encodeCachedValue(diff_y, 16,
+                     clientCache -> polyTextCacheY);
+
+  cachedPolyText8 -> y = polyText8 -> y;
+}
+
+void PolyText8Store::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                        ChannelCache *channelCache) const
+{
+  PolyText8Message *polyText8 = (PolyText8Message *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  unsigned int value;
+
+  decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
+
+  polyText8 -> drawable = value;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << polyText8 -> drawable
+          << " as " << "drawable" << " field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeXidValue(value, clientCache -> gcCache);
+
+  polyText8 -> gcontext = value;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << polyText8 -> gcontext
+          << " as gcontext field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeCachedValue(value, 16,
+               clientCache -> polyTextCacheX);
+
+  polyText8 -> x += value;
+  polyText8 -> x &= 0xffff;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << polyText8 -> x
+          << " as x field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeCachedValue(value, 16,
+               clientCache -> polyTextCacheY);
+
+  polyText8 -> y += value;
+  polyText8 -> y &= 0xffff;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << polyText8 -> y
+          << " as y field.\n" << logofs_flush;
+  #endif
+}
diff --git a/nxcomp/src/PolyText8.h b/nxcomp/src/PolyText8.h
new file mode 100644
index 000000000..3d5ff533a
--- /dev/null
+++ b/nxcomp/src/PolyText8.h
@@ -0,0 +1,188 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef PolyText8_H
+#define PolyText8_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+
+#define POLYTEXT8_ENABLE_CACHE               1
+#define POLYTEXT8_ENABLE_DATA                0
+#define POLYTEXT8_ENABLE_SPLIT               0
+#define POLYTEXT8_ENABLE_COMPRESS            0
+
+#define POLYTEXT8_DATA_LIMIT                 380
+#define POLYTEXT8_DATA_OFFSET                16
+
+#define POLYTEXT8_CACHE_SLOTS                3000
+#define POLYTEXT8_CACHE_THRESHOLD            5
+#define POLYTEXT8_CACHE_LOWER_THRESHOLD      1
+
+//
+// The message class.
+//
+
+class PolyText8Message : public Message
+{
+  friend class PolyText8Store;
+
+  public:
+
+  PolyText8Message()
+  {
+  }
+
+  ~PolyText8Message()
+  {
+  }
+
+  //
+  // Put here the fields which constitute 
+  // the 'identity' part of the message.
+  //
+
+  private:
+
+  unsigned int drawable;
+  unsigned int gcontext;
+
+  unsigned short x;
+  unsigned short y;
+};
+
+class PolyText8Store : public MessageStore
+{
+  //
+  // Constructors and destructors.
+  //
+
+  public:
+
+  PolyText8Store() : MessageStore()
+  {
+    enableCache    = POLYTEXT8_ENABLE_CACHE;
+    enableData     = POLYTEXT8_ENABLE_DATA;
+    enableSplit    = POLYTEXT8_ENABLE_SPLIT;
+    enableCompress = POLYTEXT8_ENABLE_COMPRESS;
+
+    dataLimit  = POLYTEXT8_DATA_LIMIT;
+    dataOffset = POLYTEXT8_DATA_OFFSET;
+
+    cacheSlots          = POLYTEXT8_CACHE_SLOTS;
+    cacheThreshold      = POLYTEXT8_CACHE_THRESHOLD;
+    cacheLowerThreshold = POLYTEXT8_CACHE_LOWER_THRESHOLD;
+
+    messages_ -> resize(cacheSlots);
+
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      *i = NULL;
+    }
+
+    temporary_ = NULL;
+  }
+
+  virtual ~PolyText8Store()
+  {
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      destroy(*i);
+    }
+
+    destroy(temporary_);
+  }
+
+  virtual const char *name() const
+  {
+    return "PolyText8";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return X_PolyText8;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(PolyText8Message);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  public:
+
+  virtual Message *create() const
+  {
+    return new PolyText8Message();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new PolyText8Message((const PolyText8Message &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (PolyText8Message *) message;
+  }
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer,
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                  const Message *cachedMessage,
+                                      ChannelCache *channelCache) const;
+
+  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                  ChannelCache *channelCache) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+				unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+};
+
+#endif /* PolyText8_H */
diff --git a/nxcomp/src/Proxy.cpp b/nxcomp/src/Proxy.cpp
new file mode 100644
index 000000000..72b2cee21
--- /dev/null
+++ b/nxcomp/src/Proxy.cpp
@@ -0,0 +1,6529 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <cstdio>
+#include <unistd.h>
+#include <cstdlib>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <signal.h>
+
+#ifdef ANDROID
+#include <netinet/in.h>
+#include <netinet/ip.h>
+#include <netinet/tcp.h>
+#endif
+
+#include "Misc.h"
+
+#if defined(__CYGWIN32__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__sun)
+#include <netinet/in_systm.h>
+#endif
+
+#ifndef ANDROID
+#include <netinet/in.h>
+#include <netinet/ip.h>
+#include <netinet/tcp.h>
+#endif
+
+#include "NXalert.h"
+#include "NXvars.h"
+
+#include "Proxy.h"
+
+#include "Socket.h"
+#include "Channel.h"
+#include "Statistics.h"
+
+#include "ClientChannel.h"
+#include "ServerChannel.h"
+#include "GenericChannel.h"
+#include "ChannelEndPoint.h"
+
+//
+// We need to adjust some values related
+// to these messages at the time the mes-
+// sage stores are reconfigured.
+//
+
+#include "PutImage.h"
+#include "ChangeGC.h"
+#include "PolyFillRectangle.h"
+#include "PutPackedImage.h"
+
+//
+// This is from the main loop.
+//
+
+extern void CleanupListeners();
+
+extern int HandleChild(int);
+
+//
+// Default size of string buffers.
+//
+
+#define DEFAULT_STRING_LENGTH  512
+
+//
+// Set the verbosity level. You also need
+// to define DUMP in Misc.cpp if DUMP is
+// defined here.
+//
+
+#define WARNING
+#define PANIC
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Log the important tracepoints related
+// to writing packets to the peer proxy.
+//
+
+#undef  FLUSH
+
+//
+// Log the operations related to splits.
+//
+
+#undef  SPLIT
+
+//
+// Log the operations related to sending
+// and receiving the control tokens.
+//
+
+#undef  TOKEN
+
+//
+// Log the operations related to setting
+// the token limits.
+//
+
+#undef  LIMIT
+
+//
+// Log a warning if no data is written by
+// the proxy within a timeout.
+//
+
+#undef  TIME
+
+//
+// Log the operation related to generating
+// the ping message at idle time.
+//
+
+#undef  PING
+
+Proxy::Proxy(int fd)
+
+  : transport_(new ProxyTransport(fd)), fd_(fd), readBuffer_(transport_)
+{
+  for (int channelId = 0;
+           channelId < CONNECTIONS_LIMIT;
+               channelId++)
+  {
+    channels_[channelId]    = NULL;
+    transports_[channelId]  = NULL;
+    congestions_[channelId] = 0;
+
+    fdMap_[channelId]      = nothing;
+    channelMap_[channelId] = nothing;
+    slavePidMap_[channelId] = nothing;
+  }
+
+  inputChannel_  = nothing;
+  outputChannel_ = nothing;
+
+  controlLength_ = 0;
+
+  operation_ = operation_in_negotiation;
+
+  draining_   = 0;
+  priority_   = 0;
+  finish_     = 0;
+  shutdown_   = 0;
+  congestion_ = 0;
+
+  timer_ = 0;
+  alert_ = 0;
+
+  agent_ = nothing;
+
+  //
+  // Set null timeouts. This will require
+  // a new link configuration.
+  //
+
+  timeouts_.split  = 0;
+  timeouts_.motion = 0;
+
+  timeouts_.readTs  = getTimestamp();
+  timeouts_.writeTs = getTimestamp();
+
+  timeouts_.loopTs  = getTimestamp();
+  timeouts_.pingTs  = getTimestamp();
+  timeouts_.alertTs = nullTimestamp();
+  timeouts_.loadTs  = nullTimestamp();
+
+  timeouts_.splitTs  = nullTimestamp();
+  timeouts_.motionTs = nullTimestamp();
+
+  //
+  // Initialize the token counters. This
+  // will require a new link configuration.
+  //
+
+  for (int i = token_control; i <= token_data; i++)
+  {
+    tokens_[i].size      = 0;
+    tokens_[i].limit     = 0;
+
+    tokens_[i].bytes     = 0;
+    tokens_[i].remaining = 0;
+  }
+
+  tokens_[token_control].request = code_control_token_request;
+  tokens_[token_control].reply   = code_control_token_reply;
+  tokens_[token_control].type    = token_control;
+
+  tokens_[token_split].request = code_split_token_request;
+  tokens_[token_split].reply   = code_split_token_reply;
+  tokens_[token_split].type    = token_split;
+
+  tokens_[token_data].request = code_data_token_request;
+  tokens_[token_data].reply   = code_data_token_reply;
+  tokens_[token_data].type    = token_data;
+
+  currentStatistics_ = NULL;
+
+  //
+  // Create compressor and decompressor
+  // for image and data payload.
+  //
+
+  compressor_ = new StaticCompressor(control -> LocalDataCompressionLevel,
+                                         control -> LocalDataCompressionThreshold);
+
+  //
+  // Create object storing NX specific
+  // opcodes.
+  //
+
+  opcodeStore_ = new OpcodeStore();
+
+  //
+  // Create the message stores.
+  //
+
+  clientStore_ = new ClientStore(compressor_);
+  serverStore_ = new ServerStore(compressor_);
+
+  clientCache_ = new ClientCache();
+  serverCache_ = new ServerCache();
+
+  if (clientCache_ == NULL || serverCache_ == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "Proxy: PANIC! Failed to create the channel cache.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Failed to create the channel cache.\n";
+
+    HandleCleanup();
+  }
+
+  //
+  // Prepare for image decompression.
+  //
+
+  UnpackInit();
+
+  #ifdef DEBUG
+  *logofs << "Proxy: Created new object at " << this
+          << ".\n" << logofs_flush;
+  #endif
+}
+
+Proxy::~Proxy()
+{
+  for (int channelId = 0;
+           channelId < CONNECTIONS_LIMIT;
+               channelId++)
+  {
+    if (channels_[channelId] != NULL)
+    {
+      deallocateTransport(channelId);
+
+      delete channels_[channelId];
+      channels_[channelId] = NULL;
+    }
+  }
+
+  //
+  // Kill all active slave channel children, and
+  // give them 5 seconds to exit nicely.
+
+  #ifdef DEBUG
+  *logofs << "Proxy: Killing active slaves" << endl;
+  #endif
+
+  int slave_count = 999;
+  int loop_count = 0;
+
+  while(slave_count > 0 && loop_count < 50)
+  {
+    slave_count = 0;
+
+    for (int channelId = 0; channelId<CONNECTIONS_LIMIT; channelId++)
+    {
+      int pid = slavePidMap_[channelId];
+
+      if (pid > 1) {
+         slave_count++;
+
+         #ifdef DEBUG
+         *logofs << "Proxy: Active slave with pid " << pid << logofs_flush;
+         #endif
+
+         if ( loop_count == 0 )
+         {
+             #ifdef DEBUG
+             *logofs << "Proxy: Sending SIGTERM to " << pid << logofs_flush;
+             #endif
+             kill(pid, SIGTERM);
+         }
+         else if ( loop_count == 25 )
+         {
+             #ifdef DEBUG
+             *logofs << "Proxy: Sending SIGKILL to " << pid << logofs_flush;
+             #endif
+             kill(pid, SIGKILL);
+         }
+
+         if (HandleChild(pid))
+         {
+             #ifdef DEBUG
+             *logofs << "Proxy: Slave " << pid << " terminated" << logofs_flush;
+             #endif
+             slavePidMap_[channelId] = nothing;
+         }
+      }
+    }
+
+    if ( slave_count > 0 )
+    {
+      cerr << "Proxy: Error: Failed to kill all slave channel processes. " << slave_count << " processes still remaining." << endl;
+    }
+
+    usleep(200000);
+    loop_count++;
+  }
+
+  delete transport_;
+  delete compressor_;
+
+  //
+  // Delete storage shared among channels.
+  //
+
+  delete opcodeStore_;
+
+  delete clientStore_;
+  delete serverStore_;
+
+  delete clientCache_;
+  delete serverCache_;
+
+  //
+  // Get rid of the image decompression
+  // resources.
+  //
+
+  UnpackDestroy();
+
+  #ifdef DEBUG
+  *logofs << "Proxy: Deleted proxy object at " << this
+          << ".\n" << logofs_flush;
+  #endif
+}
+
+int Proxy::setOperational()
+{
+  #ifdef TEST
+  *logofs << "Proxy: Entering operational mode.\n"
+          << logofs_flush;
+  #endif
+
+  operation_ = operation_in_messages;
+
+  return 1;
+}
+
+int Proxy::setReadDescriptors(fd_set *fdSet, int &fdMax, T_timestamp &tsMax)
+{
+  //
+  // Set the initial timeout to the time of
+  // the next ping. If the congestion count
+  // is greater than zero, anyway, use a
+  // shorter timeout to force a congestion
+  // update.
+  //
+
+  if (agent_ != nothing && congestions_[agent_] == 0 &&
+          statistics -> getCongestionInFrame() >= 1 &&
+              tokens_[token_control].remaining >=
+                  (tokens_[token_control].limit - 1))
+  {
+    setMinTimestamp(tsMax, control -> IdleTimeout);
+
+    #ifdef TEST
+    *logofs << "Proxy: Initial timeout is " << tsMax.tv_sec
+            << " S and " << (double) tsMax.tv_usec /
+               1000 << " Ms with congestion "
+            << statistics -> getCongestionInFrame()
+            << ".\n" << logofs_flush;
+    #endif
+  }
+  else
+  {
+    setMinTimestamp(tsMax, control -> PingTimeout);
+
+    #ifdef TEST
+    *logofs << "Proxy: Initial timeout is " << tsMax.tv_sec
+            << " S and " << (double) tsMax.tv_usec /
+               1000 << " Ms.\n" << logofs_flush;
+    #endif
+  }
+
+  int fd = -1;
+
+  if (isTimeToRead() == 1)
+  {
+    //
+    // If we don't have split tokens available
+    // don't set the timeout.
+    //
+
+    if (tokens_[token_split].remaining > 0 &&
+            isTimestamp(timeouts_.splitTs) == 1)
+    {
+      int diffTs = getTimeToNextSplit();
+
+      #if defined(TEST) || defined(INFO) || \
+              defined(FLUSH) || defined(SPLIT)
+
+      if (diffTimestamp(timeouts_.splitTs,
+              getTimestamp()) > timeouts_.split)
+      {
+        *logofs << "Proxy: FLUSH! SPLIT! WARNING! Running with "
+                << diffTimestamp(timeouts_.splitTs, getTimestamp())
+                << " Ms elapsed since the last split.\n"
+                << logofs_flush;
+      }
+
+      *logofs << "Proxy: FLUSH! SPLIT! Requesting timeout of "
+              << diffTs << " Ms as there are splits to send.\n"
+              << logofs_flush;
+
+      #endif
+
+      setMinTimestamp(tsMax, diffTs);
+    }
+    #if defined(TEST) || defined(INFO)
+    else if (isTimestamp(timeouts_.splitTs) == 1)
+    {
+      *logofs << "Proxy: WARNING! Not requesting a split "
+              << "timeout with " << tokens_[token_split].remaining
+              << " split tokens remaining.\n" << logofs_flush;
+    }
+    #endif
+
+    //
+    // Loop through the valid channels and set
+    // the descriptors selected for read and
+    // the timeout.
+    //
+
+    T_list &channelList = activeChannels_.getList();
+
+    for (T_list::iterator j = channelList.begin();
+           j != channelList.end(); j++)
+    {
+      int channelId = *j;
+
+      if (channels_[channelId] == NULL)
+      {
+        continue;
+      }
+
+      fd = getFd(channelId);
+
+      if (channels_[channelId] -> getFinish() == 0 &&
+              (channels_[channelId] -> getType() == channel_x11 ||
+                  tokens_[token_data].remaining > 0) &&
+                      congestions_[channelId] == 0)
+      {
+        FD_SET(fd, fdSet);
+
+        if (fd >= fdMax)
+        {
+          fdMax = fd + 1;
+        }
+
+        #ifdef TEST
+        *logofs << "Proxy: Descriptor FD#" << fd
+                << " selected for read with buffer length "
+                << transports_[channelId] -> length()
+                << ".\n" << logofs_flush;
+        #endif
+
+        //
+        // Wakeup the proxy if there are motion
+        // events to flush.
+        //
+
+        if (isTimestamp(timeouts_.motionTs) == 1)
+        {
+          int diffTs = getTimeToNextMotion();
+
+          #if defined(TEST) || defined(INFO)
+
+          if (diffTimestamp(timeouts_.motionTs,
+                  getTimestamp()) > timeouts_.motion)
+          {
+            *logofs << "Proxy: FLUSH! WARNING! Running with "
+                    << diffTimestamp(timeouts_.motionTs, getTimestamp())
+                    << " Ms elapsed since the last motion.\n"
+                    << logofs_flush;
+          }
+
+          *logofs << "Proxy: FLUSH! Requesting timeout of "
+                  << diffTs << " Ms as FD#" << fd << " has motion "
+                  << "events to send.\n" << logofs_flush;
+
+          #endif
+
+          setMinTimestamp(tsMax, diffTs);
+        }
+      }
+      #if defined(TEST) || defined(INFO)
+      else
+      {
+        if (channels_[channelId] -> getType() != channel_x11 &&
+                tokens_[token_data].remaining <= 0)
+        {
+          *logofs << "Proxy: WARNING! Descriptor FD#" << fd
+                  << " not selected for read with "
+                  << tokens_[token_data].remaining << " data "
+                  << "tokens remaining.\n" << logofs_flush;
+        }
+      }
+      #endif
+    }
+  }
+  #if defined(TEST) || defined(INFO)
+  else
+  {
+    *logofs << "Proxy: WARNING! Disabled reading from channels.\n"
+            << logofs_flush;
+
+    *logofs << "Proxy: WARNING! Congestion is " << congestion_
+            << " pending " << transport_ -> pending() << " blocked "
+            << transport_ -> blocked() << " length " << transport_ ->
+               length() << ".\n" << logofs_flush;
+  }
+  #endif
+
+  //
+  // Include the proxy descriptor.
+  //
+
+  FD_SET(fd_, fdSet);
+
+  if (fd_ >= fdMax)
+  {
+    fdMax = fd_ + 1;
+  }
+
+  #ifdef TEST
+  *logofs << "Proxy: Proxy descriptor FD#" << fd_
+          << " selected for read with buffer length "
+          << transport_ -> length() << ".\n"
+          << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+//
+// Add to the mask the file descriptors of all
+// X connections to write to.
+//
+
+int Proxy::setWriteDescriptors(fd_set *fdSet, int &fdMax, T_timestamp &tsMax)
+{
+  int fd = -1;
+
+  T_list &channelList = activeChannels_.getList();
+
+  for (T_list::iterator j = channelList.begin();
+           j != channelList.end(); j++)
+  {
+    int channelId = *j;
+
+    if (channels_[channelId] != NULL)
+    {
+      fd = getFd(channelId);
+
+      if (transports_[channelId] -> length() > 0)
+      {
+        FD_SET(fd, fdSet);
+
+        #ifdef TEST
+        *logofs << "Proxy: Descriptor FD#" << fd << " selected "
+                << "for write with blocked " << transports_[channelId] ->
+                   blocked() << " and length " << transports_[channelId] ->
+                   length() << ".\n" << logofs_flush;
+        #endif
+
+        if (fd >= fdMax)
+        {
+          fdMax = fd + 1;
+        }
+      }
+      #ifdef TEST
+      else
+      {
+        *logofs << "Proxy: Descriptor FD#" << fd << " not selected "
+                << "for write with blocked " << transports_[channelId] ->
+                   blocked() << " and length " << transports_[channelId] ->
+                   length() << ".\n" << logofs_flush;
+      }
+      #endif
+
+      #if defined(TEST) || defined(INFO)
+
+      if (transports_[channelId] -> getType() !=
+              transport_agent && transports_[channelId] ->
+                   length() > 0 && transports_[channelId] ->
+                       blocked() != 1)
+      {
+        *logofs << "Proxy: PANIC! Descriptor FD#" << fd
+                << " has data to write but blocked flag is "
+                << transports_[channelId] -> blocked()
+                << ".\n" << logofs_flush;
+
+        cerr << "Error" << ": Descriptor FD#" << fd
+             << " has data to write but blocked flag is "
+             << transports_[channelId] -> blocked()
+             << ".\n";
+
+        HandleCleanup();
+      }
+
+      #endif
+    }
+  }
+
+  //
+  // Check if the proxy transport has data
+  // from a previous blocking write.
+  //
+
+  if (transport_ -> blocked() == 1)
+  {
+    FD_SET(fd_, fdSet);
+
+    #ifdef TEST
+    *logofs << "Proxy: Proxy descriptor FD#"
+            << fd_ << " selected for write. Blocked is "
+            << transport_ -> blocked() << " length is "
+            << transport_ -> length() << ".\n"
+            << logofs_flush;
+    #endif
+
+    if (fd_ >= fdMax)
+    {
+      fdMax = fd_ + 1;
+    }
+  }
+  #ifdef TEST
+  else
+  {
+    *logofs << "Proxy: Proxy descriptor FD#"
+            << fd_ << " not selected for write. Blocked is "
+            << transport_ -> blocked() << " length is "
+            << transport_ -> length() << ".\n"
+            << logofs_flush;
+  }
+  #endif
+
+  //
+  // We are entering the main select. Save
+  // the timestamp of the last loop so that
+  // we can detect the clock drifts.
+  //
+
+  timeouts_.loopTs = getTimestamp();
+
+  return 1;
+}
+
+int Proxy::getChannels(T_channel_type type)
+{
+  int channels = 0;
+
+  T_list &channelList = activeChannels_.getList();
+
+  for (T_list::iterator j = channelList.begin();
+           j != channelList.end(); j++)
+  {
+    int channelId = *j;
+
+    if (channels_[channelId] != NULL &&
+            (type == channel_none ||
+                 type == channels_[channelId] ->
+                     getType()))
+    {
+      channels++;
+    }
+  }
+
+  return channels;
+}
+
+T_channel_type Proxy::getType(int fd)
+{
+  int channelId = getChannel(fd);
+
+  if (channelId < 0 || channels_[channelId] == NULL)
+  {
+    return channel_none;
+  }
+
+  return channels_[channelId] -> getType();
+}
+
+const char *Proxy::getTypeName(T_channel_type type)
+{
+  switch (type)
+  {
+    case channel_x11:
+    {
+      return "X";
+    }
+    case channel_cups:
+    {
+      return "CUPS";
+    }
+    case channel_smb:
+    {
+      return "SMB";
+    }
+    case channel_media:
+    {
+      return "media";
+    }
+    case channel_http:
+    {
+      return "HTTP";
+    }
+    case channel_font:
+    {
+      return "font";
+    }
+    case channel_slave:
+    {
+      return "slave";
+    }
+    default:
+    {
+      return "unknown";
+    }
+  }
+}
+
+const char *Proxy::getComputerName()
+{
+  //
+  // Strangely enough, under some Windows OSes SMB
+  // service doesn't bind to localhost. Fall back
+  // to localhost if can't find computer name in
+  // the environment. In future we should try to
+  // bind to localhost and then try the other IPs.
+  //
+
+  const char *hostname = NULL;
+
+  #ifdef __CYGWIN32__
+
+  hostname = getenv("COMPUTERNAME");
+
+  #endif
+
+  if (hostname == NULL)
+  {
+    hostname = "localhost";
+  }
+
+  return hostname;
+}
+
+//
+// Handle data from channels selected for read.
+//
+
+int Proxy::handleRead(int &resultFds, fd_set &readSet)
+{
+  #ifdef DEBUG
+  *logofs << "Proxy: Checking descriptors selected for read.\n"
+          << logofs_flush;
+  #endif
+
+  T_list &channelList = activeChannels_.getList();
+
+  for (T_list::iterator j = channelList.begin();
+           j != channelList.end(); j++)
+  {
+    #ifdef DEBUG
+    *logofs << "Proxy: Looping with current channel "
+            << *j << ".\n" << logofs_flush;
+    #endif
+
+    int fd = getFd(*j);
+
+    if (fd >= 0 && resultFds > 0 && FD_ISSET(fd, &readSet))
+    {
+      #ifdef DEBUG
+      *logofs << "Proxy: Going to read messages from FD#"
+              << fd << ".\n" << logofs_flush;
+      #endif
+
+      int result = handleRead(fd);
+
+      if (result < 0)
+      {
+        #ifdef TEST
+        *logofs << "Proxy: Failure reading messages from FD#"
+                << fd << ".\n" << logofs_flush;
+        #endif
+
+        return -1;
+      }
+
+      #ifdef DEBUG
+      *logofs << "Proxy: Clearing the read descriptor "
+              << "for FD#" << fd << ".\n" << logofs_flush;
+      #endif
+
+      FD_CLR(fd, &readSet);
+
+      resultFds--;
+    }
+  }
+
+  if (resultFds > 0 && FD_ISSET(fd_, &readSet))
+  {
+    #ifdef DEBUG
+    *logofs << "Proxy: Going to read messages from "
+            << "proxy FD#" << fd_ << ".\n"
+            << logofs_flush;
+    #endif
+
+    if (handleRead() < 0)
+    {
+      #ifdef TEST
+      *logofs << "Proxy: Failure reading from proxy FD#"
+              << fd_ << ".\n" << logofs_flush;
+      #endif
+
+      return -1;
+    }
+
+    #ifdef DEBUG
+    *logofs << "Proxy: Clearing the read descriptor "
+            << "for proxy FD#" << fd_ << ".\n"
+            << logofs_flush;
+    #endif
+
+    FD_CLR(fd_, &readSet);
+
+    resultFds--;
+  }
+
+  return 1;
+}
+
+//
+// Perform flush on descriptors selected for write.
+//
+
+int Proxy::handleFlush(int &resultFds, fd_set &writeSet)
+{
+  #ifdef DEBUG
+  *logofs << "Proxy: Checking descriptors selected for write.\n"
+          << logofs_flush;
+  #endif
+
+  if (resultFds > 0 && FD_ISSET(fd_, &writeSet))
+  {
+    #ifdef TEST
+    *logofs << "Proxy: FLUSH! Proxy descriptor FD#" << fd_
+            << " reported to be writable.\n"
+            << logofs_flush;
+    #endif
+
+    if (handleFlush() < 0)
+    {
+      #ifdef TEST
+      *logofs << "Proxy: Failure flushing the writable "
+              << "proxy FD#" << fd_ << ".\n"
+              << logofs_flush;
+      #endif
+
+      return -1;
+    }
+
+    #ifdef DEBUG
+    *logofs << "Proxy: Clearing the write descriptor "
+            << "for proxy FD#" << fd_ << ".\n"
+            << logofs_flush;
+    #endif
+
+    FD_CLR(fd_, &writeSet);
+
+    resultFds--;
+  }
+
+  T_list &channelList = activeChannels_.getList();
+
+  for (T_list::iterator j = channelList.begin();
+           resultFds > 0 && j != channelList.end(); j++)
+  {
+    #ifdef DEBUG
+    *logofs << "Proxy: Looping with current channel "
+            << *j << ".\n" << logofs_flush;
+    #endif
+
+    int fd = getFd(*j);
+
+    if (fd >= 0 && FD_ISSET(fd, &writeSet))
+    {
+      #ifdef TEST
+      *logofs << "Proxy: X descriptor FD#" << fd
+              << " reported to be writable.\n"
+              << logofs_flush;
+      #endif
+
+      //
+      // It can happen that, in handling reads, we
+      // have destroyed the buffer associated to a
+      // closed socket, so don't complain about
+      // the errors.
+      //
+
+      handleFlush(fd);
+
+      //
+      // Clear the descriptor from the mask so
+      // we don't confuse the agent if it's
+      // not checking only its own descriptors.
+      //
+
+      #ifdef DEBUG
+      *logofs << "Proxy: Clearing the write descriptor "
+              << "for FD#" << fd << ".\n"
+              << logofs_flush;
+      #endif
+
+      FD_CLR(fd, &writeSet);
+
+      resultFds--;
+    }
+  }
+
+  return 1;
+}
+
+int Proxy::handleRead()
+{
+  #if defined(TEST) || defined(INFO)
+  *logofs << "Proxy: Decoding data from proxy FD#"
+          << fd_ << ".\n" << logofs_flush;
+  #endif
+
+  //
+  // Decode all the available messages from
+  // the remote proxy until is not possible
+  // to read more.
+  //
+
+  for (;;)
+  {
+    int result = readBuffer_.readMessage();
+
+    #if defined(TEST) || defined(DEBUG) || defined(INFO)
+    *logofs << "Proxy: Read result on proxy FD#" << fd_
+            << " is " << result << ".\n"
+            << logofs_flush;
+    #endif
+
+    if (result < 0)
+    {
+      if (shutdown_ == 0)
+      {
+        if (finish_ == 0)
+        {
+          #ifdef PANIC
+          *logofs << "Proxy: PANIC! Failure reading from the "
+                  << "peer proxy on FD#" << fd_ << ".\n"
+                  << logofs_flush;
+          #endif
+
+          cerr << "Error" << ": Failure reading from the "
+               << "peer proxy.\n";
+        }
+      }
+      #ifdef TEST
+      else
+      {
+        *logofs << "Proxy: Closure of the proxy link detected "
+                << "after clean shutdown.\n" << logofs_flush;
+      }
+      #endif
+
+      priority_   = 0;
+      finish_     = 1;
+      congestion_ = 0;
+
+      return -1;
+    }
+    else if (result == 0)
+    {
+      #if defined(TEST) || defined(DEBUG) || defined(INFO)
+      *logofs << "Proxy: No data read from proxy FD#"
+              << fd_ << "\n" << logofs_flush;
+      #endif
+
+      return 0;
+    }
+
+    //
+    // We read some data from the remote. If we set
+    // the congestion flag because we couldn't read
+    // before the timeout and have tokens available,
+    // then reset the congestion flag.
+    //
+
+    if (congestion_ == 1 &&
+            tokens_[token_control].remaining > 0)
+    {
+      #if defined(TEST) || defined(INFO)
+      *logofs << "Proxy: Exiting congestion due to "
+              << "proxy data with " << tokens_[token_control].remaining
+              << " tokens.\n" << logofs_flush;
+      #endif
+
+      congestion_ = 0;
+    }
+
+    //
+    // Set the timestamp of the last read
+    // operation from the remote proxy and
+    // enable again showing the 'no data
+    // received' dialog at the next timeout.
+    //
+
+    timeouts_.readTs  = getTimestamp();
+
+    if (alert_ != 0)
+    {
+      #if defined(TEST) || defined(INFO)
+      *logofs << "Proxy: Displacing the dialog "
+              << "for proxy FD#" << fd_ << ".\n"
+              << logofs_flush;
+      #endif
+
+      HandleAlert(DISPLACE_MESSAGE_ALERT, 1);
+    }
+
+    timeouts_.alertTs = nullTimestamp();
+
+    #if defined(TEST) || defined(INFO)
+    *logofs << "Proxy: Getting messages from proxy FD#" << fd_
+            << " with " << readBuffer_.getLength() << " bytes "
+            << "in the read buffer.\n" << logofs_flush;
+    #endif
+
+    unsigned int controlLength;
+    unsigned int dataLength;
+
+    const unsigned char *message;
+
+    while ((message = readBuffer_.getMessage(controlLength, dataLength)) != NULL)
+    {
+      statistics -> addFrameIn();
+
+      if (controlLength == 3 && *message == 0 &&
+              *(message + 1) < code_last_tag)
+      {
+        if (handleControlFromProxy(message) < 0)
+        {
+          return -1;
+        }
+      }
+      else if (operation_ == operation_in_messages)
+      {
+        int channelId = inputChannel_;
+
+        #if defined(TEST) || defined(INFO)
+        *logofs << "Proxy: Identified message of " << dataLength
+                << " bytes for FD#" << getFd(channelId) << " channel ID#"
+                 << channelId << ".\n" << logofs_flush;
+        #endif
+
+        if (channelId >= 0 && channelId < CONNECTIONS_LIMIT &&
+                channels_[channelId] != NULL)
+        {
+          int finish = channels_[channelId] -> getFinish();
+
+          #ifdef WARNING
+
+          if (finish == 1)
+          {
+            *logofs << "Proxy: WARNING! Handling data for finishing "
+                    << "FD#" << getFd(channelId) << " channel ID#"
+                    << channelId << ".\n" << logofs_flush;
+          }
+
+          #endif
+
+          //
+          // We need to decode all the data to preserve
+          // the consistency of the cache, so can't re-
+          // turn as soon as the first error is encount-
+          // ered. Check if this is the first time that
+          // the failure is detected.
+          //
+
+          int result = channels_[channelId] -> handleWrite(message, dataLength);
+
+          if (result < 0 && finish == 0)
+          {
+            #ifdef TEST
+            *logofs << "Proxy: Failed to write proxy data to FD#"
+                    << getFd(channelId) << " channel ID#"
+                    << channelId << ".\n" << logofs_flush;
+            #endif
+
+            if (handleFinish(channelId) < 0)
+            {
+              return -1;
+            }
+          }
+
+          //
+          // Check if we have splits or motion
+          // events to send.
+          //
+
+          setSplitTimeout(channelId);
+          setMotionTimeout(channelId);
+        }
+        #ifdef WARNING
+        else
+        {
+          *logofs << "Proxy: WARNING! Received data for "
+                  << "invalid channel ID#" << channelId
+                  << ".\n" << logofs_flush;
+        }
+        #endif
+      }
+      else if (operation_ == operation_in_statistics)
+      {
+        #ifdef TEST
+        *logofs << "Proxy: Received statistics data from remote proxy.\n"
+                << logofs_flush;
+        #endif
+
+        if (handleStatisticsFromProxy(message, dataLength) < 0)
+        {
+          return -1;
+        }
+
+        operation_ = operation_in_messages;
+      }
+      else if (operation_ == operation_in_negotiation)
+      {
+        #ifdef TEST
+        *logofs << "Proxy: Received new negotiation data from remote proxy.\n"
+                << logofs_flush;
+        #endif
+
+        if (handleNegotiationFromProxy(message, dataLength) < 0)
+        {
+          return -1;
+        }
+      }
+
+      //
+      // if (controlLength == 3 && *message == 0 && ...) ...
+      // else if (operation_ == operation_in_statistics) ...
+      // else if (operation_ == operation_in_messages) ...
+      // else if (operation_ == operation_in_negotiation) ...
+      // else ...
+      //
+
+      else
+      {
+        #ifdef PANIC
+        *logofs << "Proxy: PANIC! Unrecognized message received on proxy FD#"
+                << fd_ << ".\n" << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Unrecognized message received on proxy FD#"
+             << fd_ << ".\n";
+
+        return -1;
+      }
+
+    } // while ((message = readBuffer_.getMessage(controlLength, dataLength)) != NULL) ...
+
+    //
+    // Reset the read buffer.
+    //
+
+    readBuffer_.fullReset();
+
+    //
+    // Give up if no data is readable.
+    //
+
+    if (transport_ -> readable() == 0)
+    {
+      break;
+    }
+
+  } // End of for (;;) ...
+
+  return 1;
+}
+
+int Proxy::handleControlFromProxy(const unsigned char *message)
+{
+  #if defined(TEST) || defined(INFO)
+  *logofs << "Proxy: Received message '" << DumpControl(*(message + 1))
+          << "' at " << strMsTimestamp() << " with data ID#"
+          << (int) *(message + 2) << ".\n" << logofs_flush;
+  #endif
+
+  T_channel_type channelType = channel_none;
+
+  switch (*(message + 1))
+  {
+    case code_switch_connection:
+    {
+      int channelId = *(message + 2);
+
+      //
+      // If channel is invalid further messages will
+      // be ignored. The acknowledged shutdown of
+      // channels should prevent this.
+      //
+
+      inputChannel_ = channelId;
+
+      break;
+    }
+    case code_begin_congestion:
+    {
+      //
+      // Set the congestion state for the
+      // channel reported by the remote.
+      //
+
+      int channelId = *(message + 2);
+
+      if (channels_[channelId] != NULL)
+      {
+        congestions_[channelId] = 1;
+
+        #if defined(TEST) || defined(INFO)
+        *logofs << "Proxy: Received a begin congestion "
+                << "for channel id ID#" << channelId
+                << ".\n" << logofs_flush;
+        #endif
+
+        if (channelId == agent_ && congestions_[agent_] != 0)
+        {
+          #if defined(TEST) || defined(INFO)
+          *logofs << "Proxy: Forcing an update of the congestion "
+                  << "counter with agent congested.\n"
+                  << logofs_flush;
+          #endif
+
+          statistics -> updateCongestion(-tokens_[token_control].remaining,
+                                             tokens_[token_control].limit);
+        }
+      }
+      #ifdef WARNING
+      else
+      {
+        *logofs << "Proxy: WARNING! Received a begin congestion "
+                << "for invalid channel id ID#" << channelId
+                << ".\n" << logofs_flush;
+      }
+      #endif
+
+      break;
+    }
+    case code_end_congestion:
+    {
+      //
+      // Attend again to the channel.
+      //
+
+      int channelId = *(message + 2);
+
+      if (channels_[channelId] != NULL)
+      {
+        congestions_[channelId] = 0;
+
+        #if defined(TEST) || defined(INFO)
+        *logofs << "Proxy: Received an end congestion "
+                << "for channel id ID#" << channelId
+                << ".\n" << logofs_flush;
+        #endif
+
+        if (channelId == agent_ && congestions_[agent_] != 0)
+        {
+          #if defined(TEST) || defined(INFO)
+          *logofs << "Proxy: Forcing an update of the congestion "
+                  << "counter with agent decongested.\n"
+                  << logofs_flush;
+          #endif
+
+          statistics -> updateCongestion(tokens_[token_control].remaining,
+                                             tokens_[token_control].limit);
+        }
+      }
+      #ifdef WARNING
+      else
+      {
+        *logofs << "Proxy: WARNING! Received an end congestion "
+                << "for invalid channel id ID#" << channelId
+                << ".\n" << logofs_flush;
+      }
+      #endif
+
+      break;
+    }
+    case code_control_token_request:
+    {
+      T_proxy_token &token = tokens_[token_control];
+
+      if (handleTokenFromProxy(token, *(message + 2)) < 0)
+      {
+        return -1;
+      }
+
+      break;
+    }
+    case code_split_token_request:
+    {
+      T_proxy_token &token = tokens_[token_split];
+
+      if (handleTokenFromProxy(token, *(message + 2)) < 0)
+      {
+        return -1;
+      }
+
+      break;
+    }
+    case code_data_token_request:
+    {
+      T_proxy_token &token = tokens_[token_data];
+
+      if (handleTokenFromProxy(token, *(message + 2)) < 0)
+      {
+        return -1;
+      }
+
+      break;
+    }
+    case code_control_token_reply:
+    {
+      T_proxy_token &token = tokens_[token_control];
+
+      if (handleTokenReplyFromProxy(token, *(message + 2)) < 0)
+      {
+        return -1;
+      }
+
+      break;
+    }
+    case code_split_token_reply:
+    {
+      T_proxy_token &token = tokens_[token_split];
+
+      if (handleTokenReplyFromProxy(token, *(message + 2)) < 0)
+      {
+        return -1;
+      }
+
+      break;
+    }
+    case code_data_token_reply:
+    {
+      T_proxy_token &token = tokens_[token_data];
+
+      if (handleTokenReplyFromProxy(token, *(message + 2)) < 0)
+      {
+        return -1;
+      }
+
+      break;
+    }
+    case code_new_x_connection:
+    {
+      //
+      // Opening the channel is handled later.
+      //
+
+      channelType = channel_x11;
+
+      break;
+    }
+    case code_new_cups_connection:
+    {
+      channelType = channel_cups;
+
+      break;
+    }
+    case code_new_aux_connection:
+    {
+      //
+      // Starting from version 1.5.0 we create real X
+      // connections for the keyboard channel. We need
+      // to refuse old auxiliary X connections because
+      // they would be unable to leverage the new fake
+      // authorization cookie.
+      //
+
+      #ifdef WARNING
+      *logofs << "Proxy: WARNING! Can't open outdated auxiliary X "
+              << "channel for code " << *(message + 1) << ".\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Warning" << ": Can't open outdated auxiliary X "
+           << "channel for code " << *(message + 1) << ".\n";
+
+      if (handleControl(code_drop_connection, *(message + 2)) < 0)
+      {
+        return -1;
+      }
+
+      break;
+    }
+    case code_new_smb_connection:
+    {
+      channelType = channel_smb;
+
+      break;
+    }
+    case code_new_media_connection:
+    {
+      channelType = channel_media;
+
+      break;
+    }
+    case code_new_http_connection:
+    {
+      channelType = channel_http;
+
+      break;
+    }
+    case code_new_font_connection:
+    {
+      channelType = channel_font;
+
+      break;
+    }
+    case code_new_slave_connection:
+    {
+      channelType = channel_slave;
+
+      break;
+    }
+    case code_drop_connection:
+    {
+      int channelId = *(message + 2);
+
+      if (channelId >= 0 && channelId < CONNECTIONS_LIMIT &&
+              channels_[channelId] != NULL)
+      {
+        handleDropFromProxy(channelId);
+      }
+      #ifdef WARNING
+      else
+      {
+        *logofs << "Proxy: WARNING! Received a drop message "
+                << "for invalid channel id ID#" << channelId
+                << ".\n" << logofs_flush;
+      }
+      #endif
+
+      break;
+    }
+    case code_finish_connection:
+    {
+      int channelId = *(message + 2);
+
+      if (channelId >= 0 && channelId < CONNECTIONS_LIMIT &&
+              channels_[channelId] != NULL)
+      {
+        //
+        // Force the finish state on the channel.
+        // We can receive this message while in
+        // the read loop, so we only mark the
+        // channel for deletion.
+        //
+
+        #ifdef TEST
+        *logofs << "Proxy: Received a finish message for FD#"
+                << getFd(channelId) << " channel ID#"
+                << channelId << ".\n" << logofs_flush;
+        #endif
+
+        handleFinishFromProxy(channelId);
+      }
+      #ifdef WARNING
+      else
+      {
+        *logofs << "Proxy: WARNING! Received a finish message "
+                << "for invalid channel id ID#" << channelId
+                << ".\n" << logofs_flush;
+      }
+      #endif
+
+      break;
+    }
+    case code_finish_listeners:
+    {
+      //
+      // This is from the main loop.
+      //
+
+      #ifdef TEST
+      *logofs << "Proxy: Closing down all local listeners.\n"
+              << logofs_flush;
+      #endif
+
+      CleanupListeners();
+
+      finish_ = 1;
+
+      break;
+    }
+    case code_reset_request:
+    {
+      #ifdef PANIC
+      *logofs << "Proxy: PANIC! Proxy reset not supported "
+              << "in this version.\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Proxy reset not supported "
+           << "in this version.\n";
+
+      HandleCleanup();
+    }
+    case code_shutdown_request:
+    {
+      //
+      // Time to rest in peace.
+      //
+
+      shutdown_ = 1;
+
+      break;
+    }
+    case code_load_request:
+    {
+      if (handleLoadFromProxy() < 0)
+      {
+        return -1;
+      }
+
+      break;
+    }
+    case code_save_request:
+    {
+      //
+      // Don't abort the connection
+      // if can't write to disk.
+      //
+
+      handleSaveFromProxy();
+
+      break;
+    }
+    case code_statistics_request:
+    {
+      int type = *(message + 2);
+
+      if (handleStatisticsFromProxy(type) < 0)
+      {
+        return -1;
+      }
+
+      break;
+    }
+    case code_statistics_reply:
+    {
+      operation_ = operation_in_statistics;
+
+      break;
+    }
+    case code_alert_request:
+    {
+      HandleAlert(*(message + 2), 1);
+
+      break;
+    }
+    case code_sync_request:
+    {
+      int channelId = *(message + 2);
+
+      if (handleSyncFromProxy(channelId) < 0)
+      {
+        return -1;
+      }
+
+      break;
+    }
+    case code_sync_reply:
+    {
+      //
+      // We are not the one that issued
+      // the request.
+      //
+
+      #if defined(TEST) || defined(INFO)
+      *logofs << "Proxy: PANIC! Received an unexpected "
+              << "synchronization reply.\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Received an unexpected "
+           << "synchronization reply.\n";
+
+      HandleCleanup();
+    }
+    default:
+    {
+      #ifdef PANIC
+      *logofs << "Proxy: PANIC! Received bad control message number "
+              << (unsigned int) *(message + 1) << " with attribute "
+              << (unsigned int) *(message + 2) << ".\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Received bad control message number "
+           << (unsigned int) *(message + 1) << " with attribute "
+           << (unsigned int) *(message + 2) << ".\n";
+
+      HandleCleanup();
+    }
+
+  } // End of switch (*(message + 1)) ...
+
+  if (channelType == channel_none)
+  {
+    return 1;
+  }
+
+  //
+  // Handle the channel allocation that we
+  // left from the main switch case.
+  //
+
+  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.
+  //
+
+  int result = checkChannelMap(channelId);
+
+  if (result >= 0)
+  {
+    result = handleNewConnectionFromProxy(channelType, channelId);
+  }
+
+  if (result < 0)
+  {
+    //
+    // Realization of new channel failed.
+    // Send channel shutdown message to
+    // the peer proxy.
+    //
+
+    if (handleControl(code_drop_connection, channelId) < 0)
+    {
+      return -1;
+    }
+  }
+  else
+  {
+    int fd =  getFd(channelId);
+
+    if (getReadable(fd) > 0)
+    {
+      #ifdef TEST
+      *logofs << "Proxy: Trying to read immediately "
+              << "from descriptor FD#" << fd << ".\n"
+              << logofs_flush;
+      #endif
+
+      if (handleRead(fd) < 0)
+      {
+        return -1;
+      }
+    }
+    #ifdef TEST
+    *logofs << "Proxy: Nothing to read immediately "
+            << "from descriptor FD#" << fd << ".\n"
+            << logofs_flush;
+    #endif
+  }
+
+  return 1;
+}
+
+int Proxy::handleRead(int fd, const char *data, int size)
+{
+  #if defined(TEST) || defined(INFO)
+  *logofs << "Proxy: Handling data for connection on FD#"
+          << fd << ".\n" << logofs_flush;
+  #endif
+
+  if (canRead(fd) == 0)
+  {
+    #if defined(TEST) || defined(INFO)
+
+    if (getChannel(fd) < 0)
+    {
+      *logofs << "Proxy: PANIC! Can't read from invalid FD#"
+              << fd << ".\n" << logofs_flush;
+
+      HandleCleanup();
+    }
+    else
+    {
+      *logofs << "Proxy: WARNING! Read method called for FD#"
+              << fd << " but operation is not possible.\n"
+              << logofs_flush;
+    }
+
+    #endif
+
+    return 0;
+  }
+
+  int channelId = getChannel(fd);
+
+  //
+  // Let the channel object read all the new data from
+  // its file descriptor, isolate messages, compress
+  // those messages, and append the compressed form to
+  // the encode buffer.
+  //
+
+  #if defined(TEST) || defined(INFO)
+  *logofs << "Proxy: Reading messages from FD#" << fd
+          << " channel ID#" << channelId << ".\n"
+          << logofs_flush;
+  #endif
+
+  int result = channels_[channelId] -> handleRead(encodeBuffer_, (const unsigned char *) data,
+                                                      (unsigned int) size);
+
+  //
+  // Even in the case of a failure, write the produced
+  // data to the proxy connection. To keep the stores
+  // synchronized, the remote side needs to decode any
+  // message encoded by this side, also if the X socket
+  // was closed in the meanwhile. If this is the case,
+  // the decompressed output will be silently discarded.
+  //
+
+  if (result < 0)
+  {
+    #ifdef TEST
+    *logofs << "Proxy: Failed to read data from connection FD#"
+            << fd << " channel ID#" << channelId << ".\n"
+            << logofs_flush;
+    #endif
+
+    if (handleFinish(channelId) < 0)
+    {
+      return -1;
+    }
+  }
+
+  //
+  // Check if there are new splits or
+  // motion events to send.
+  //
+
+  setSplitTimeout(channelId);
+  setMotionTimeout(channelId);
+
+  return 1;
+}
+
+int Proxy::handleEvents()
+{
+  #ifdef TEST
+  *logofs << "Proxy: Going to check the events on channels.\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // Check if we can safely write to the
+  // proxy link.
+  //
+
+  int read = isTimeToRead();
+
+  //
+  // Loop on channels and send the pending
+  // events. We must copy the list because
+  // channels can be removed in the middle
+  // of the loop.
+  //
+
+  T_list channelList = activeChannels_.copyList();
+
+  for (T_list::iterator j = channelList.begin();
+           j != channelList.end(); j++)
+  {
+    int channelId = *j;
+
+    if (channels_[channelId] == NULL)
+    {
+      continue;
+    }
+
+    //
+    // Check if we need to drop the channel.
+    //
+
+    if (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
+
+      if (handleDrop(channelId) < 0)
+      {
+        return -1;
+      }
+
+      continue;
+    }
+    else if (channels_[channelId] -> getFinish() == 1)
+    {
+      #ifdef TEST
+      *logofs << "Proxy: Skipping finishing "
+              << "descriptor FD#" << getFd(channelId)
+              << " channel ID#" << channelId << ".\n"
+              << logofs_flush;
+      #endif
+
+      continue;
+    }
+
+    //
+    // If the proxy link or the channel is
+    // in congestion state, don't handle
+    // the further events.
+    //
+
+    if (read == 0 || congestions_[channelId] == 1)
+    {
+      #ifdef TEST
+
+      if (read == 0)
+      {
+        *logofs << "Proxy: Can't handle events for FD#"
+                << getFd(channelId) << " channel ID#"
+                << channelId << " with proxy not available.\n"
+                << logofs_flush;
+      }
+      else
+      {
+        *logofs << "Proxy: Can't handle events for FD#"
+                << getFd(channelId) << " channel ID#"
+                << channelId << " with channel congested.\n"
+                << logofs_flush;
+      }
+
+      #endif
+
+      continue;
+    }
+
+    //
+    // Handle the timeouts on the channel
+    // operations.
+    //
+
+    int result = 0;
+
+    //
+    // Handle the motion events.
+    //
+
+    if (result >= 0 && channels_[channelId] -> needMotion() == 1)
+    {
+      if (isTimeToMotion() == 1)
+      {
+        #if defined(TEST) || defined(INFO) || defined(FLUSH)
+
+        *logofs << "Proxy: FLUSH! Motion timeout expired after "
+                << diffTimestamp(timeouts_.motionTs, getTimestamp())
+                << " Ms.\n" << logofs_flush;
+
+        #endif
+
+        result = channels_[channelId] -> handleMotion(encodeBuffer_);
+
+        #ifdef TEST
+
+        if (result < 0)
+        {
+          *logofs << "Proxy: Failed to handle motion events for FD#"
+                  << getFd(channelId) << " channel ID#" << channelId
+                  << ".\n" << logofs_flush;
+        }
+
+        #endif
+
+        timeouts_.motionTs = nullTimestamp();
+
+        setMotionTimeout(channelId);
+      }
+      #if defined(TEST) || defined(INFO)
+      else if (isTimestamp(timeouts_.motionTs) == 1)
+      {
+        *logofs << "Proxy: Running with "
+                << diffTimestamp(timeouts_.motionTs, getTimestamp())
+                << " Ms elapsed since the last motion.\n"
+                << logofs_flush;
+      }
+      #endif
+    }
+
+    if (result >= 0 && channels_[channelId] -> needSplit() == 1)
+    {
+      //
+      // Check if it is time to send more splits
+      // and how many bytes are going to be sent.
+      //
+
+      if (isTimeToSplit() == 1)
+      {
+        #if defined(TEST) || defined(INFO) || defined(SPLIT)
+        *logofs << "Proxy: SPLIT! Split timeout expired after "
+                << diffTimestamp(timeouts_.splitTs, getTimestamp())
+                << " Ms.\n" << logofs_flush;
+        #endif
+
+        #if defined(TEST) || defined(INFO) || defined(SPLIT)
+
+        *logofs << "Proxy: SPLIT! Encoding splits for FD#"
+                << getFd(channelId) << " at " << strMsTimestamp()
+                << " with " << clientStore_ -> getSplitTotalStorageSize()
+                << " total bytes and " << control -> SplitDataPacketLimit
+                << " bytes " << "to write.\n"
+                << logofs_flush;
+
+        #endif
+
+        result = channels_[channelId] -> handleSplit(encodeBuffer_);
+
+        #ifdef TEST
+
+        if (result < 0)
+        {
+          *logofs << "Proxy: Failed to handle splits for FD#"
+                  << getFd(channelId) << " channel ID#" << channelId
+                  << ".\n" << logofs_flush;
+        }
+
+        #endif
+
+        timeouts_.splitTs = nullTimestamp();
+
+        setSplitTimeout(channelId);
+      }
+      #if defined(TEST) || defined(INFO) || defined(SPLIT)
+      else if (channels_[channelId] -> needSplit() == 1 &&
+                   isTimestamp(timeouts_.splitTs) == 0)
+      {
+        *logofs << "Proxy: SPLIT! WARNING! Channel for FD#"
+                << getFd(channelId) << " has split to send but "
+                << "there is no timeout.\n" << logofs_flush;
+      }
+      else if (isTimestamp(timeouts_.splitTs) == 1)
+      {
+        *logofs << "Proxy: SPLIT! Running with "
+                << diffTimestamp(timeouts_.splitTs, getTimestamp())
+                << " Ms elapsed since the last split.\n"
+                << logofs_flush;
+      }
+      #endif
+    }
+
+    if (result < 0)
+    {
+      #ifdef TEST
+      *logofs << "Proxy: Error handling events for FD#"
+              << getFd(channelId) << " channel ID#"
+              << channelId << ".\n" << logofs_flush;
+      #endif
+
+      if (handleFinish(channelId) < 0)
+      {
+        return -1;
+      }
+    }
+  }
+
+  return 1;
+}
+
+int Proxy::handleFrame(T_frame_type type)
+{
+  //
+  // Write any outstanding control message, followed by the
+  // content of the encode buffer, to the proxy transport.
+  //
+  // This code assumes that the encode buffer data is at an
+  // offset several bytes from start of the buffer, so that
+  // the length header and any necessary control bytes can
+  // be inserted in front of the data already in the buffer.
+  // This is the easiest way to encapsulate header and data
+  // together in a single frame.
+  //
+  // The way framing is implemented is very efficient but
+  // inherently limited and does not allow for getting the
+  // best performance, especially when running over a fast
+  // link. Framing should be rewritten to include the length
+  // of the packets in a fixed size header and, possibly,
+  // to incapsulate the control messages and the channel's
+  // data in a pseudo X protocol message, so that the proxy
+  // itself would be treated like any other channel.
+  //
+
+  #if defined(TEST) || defined(INFO)
+
+  if (congestion_ == 1)
+  {
+    //
+    // This can happen because there may be control
+    // messages to send, like a proxy shutdown mes-
+    // sage or a statistics request. All the other
+    // cases should be considered an error.
+    //
+
+    #ifdef WARNING
+    *logofs << "Proxy: WARNING! Data is to be sent while "
+            << "congestion is " << congestion_ << ".\n"
+            << logofs_flush;
+    #endif
+  }
+
+  #endif
+
+  //
+  // Check if there is any data available on
+  // the socket. Recent Linux kernels are very
+  // picky. They require that we read often or
+  // they assume that the process is non-inter-
+  // active.
+  //
+
+  if (handleAsyncEvents() < 0)
+  {
+    return -1;
+  }
+
+  //
+  // Check if this is a ping, not a data frame.
+  //
+
+  if (type == frame_ping)
+  {
+    if (handleToken(frame_ping) < 0)
+    {
+      return -1;
+    }
+  }
+
+  unsigned int dataLength = encodeBuffer_.getLength();
+
+  #ifdef DEBUG
+  *logofs << "Proxy: Data length is " << dataLength
+          << " control length is " << controlLength_
+          << ".\n" << logofs_flush;
+  #endif
+
+  if (dataLength > 0)
+  {
+    //
+    // If this is a generic channel we need
+    // to add the completion bits. Data can
+    // also have been encoded because of a
+    // statistics request, even if no output
+    // channel was currently selected.
+    //
+
+    if (outputChannel_ != -1)
+    {
+      #if defined(TEST) || defined(INFO)
+
+      if (channels_[outputChannel_] == NULL)
+      {
+        *logofs << "Proxy: PANIC! A new frame was requested "
+                << "but the channel is invalid.\n"
+                << logofs_flush;
+
+        HandleCleanup();
+      }
+
+      #endif
+
+      channels_[outputChannel_] -> handleCompletion(encodeBuffer_);
+
+      dataLength = encodeBuffer_.getLength();
+    }
+  }
+  else if (controlLength_ == 0)
+  {
+    #if defined(TEST) || defined(INFO)
+
+    *logofs << "Proxy: PANIC! A new frame was requested "
+            << "but there is no data to write.\n"
+            << logofs_flush;
+
+    HandleCleanup();
+
+    #endif
+
+    return 0;
+  }
+
+  #ifdef DEBUG
+  *logofs << "Proxy: Data length is now " << dataLength
+          << " control length is " << controlLength_
+          << ".\n" << logofs_flush;
+  #endif
+
+  //
+  // Check if this frame needs to carry a new
+  // token request.
+  //
+
+  if (type == frame_data)
+  {
+    if (handleToken(frame_data) < 0)
+    {
+      return -1;
+    }
+  }
+
+  #ifdef DEBUG
+  *logofs << "Proxy: Adding a new frame for the remote proxy.\n"
+          << logofs_flush;
+  #endif
+
+  unsigned char temp[5];
+
+  unsigned int lengthLength = 0;
+  unsigned int shift = dataLength;
+
+  while (shift)
+  {
+    temp[lengthLength++] = (unsigned char) (shift & 0x7f);
+
+    shift >>= 7;
+  }
+
+  unsigned char *data = encodeBuffer_.getData();
+
+  unsigned char *outputMessage = data - (controlLength_ + lengthLength);
+
+  unsigned char *nextDest = outputMessage;
+
+  for (int i = 0; i < controlLength_; i++)
+  {
+    *nextDest++ = controlCodes_[i];
+  }
+
+  for (int j = lengthLength - 1; j > 0; j--)
+  {
+    *nextDest++ = (temp[j] | 0x80);
+  }
+
+  if (lengthLength)
+  {
+    *nextDest++ = temp[0];
+  }
+
+  unsigned int outputLength = dataLength + controlLength_ + lengthLength;
+
+  #if defined(TEST) || defined(INFO)
+  *logofs << "Proxy: Produced plain output for " << dataLength << "+"
+          << controlLength_ << "+" << lengthLength << " out of "
+          << outputLength << " bytes.\n" << logofs_flush;
+  #endif
+
+  #if defined(TEST) || defined(INFO) || defined(FLUSH) || defined(TIME)
+
+  T_timestamp nowTs = getTimestamp();
+
+  *logofs << "Proxy: FLUSH! Immediate with blocked " << transport_ ->
+             blocked() << " length " << transport_ -> length()
+          << " new " << outputLength << " flushable " << transport_ ->
+             flushable() << " tokens " << tokens_[token_control].remaining
+          << " after " << diffTimestamp(timeouts_.writeTs, nowTs)
+          << " Ms.\n" << logofs_flush;
+
+  *logofs << "Proxy: FLUSH! Immediate flush to proxy FD#" << fd_
+          << " of " << outputLength << " bytes at " << strMsTimestamp()
+          << " with priority " << priority_ << ".\n" << logofs_flush;
+
+  *logofs << "Proxy: FLUSH! Current bitrate is "
+          << statistics -> getBitrateInShortFrame() << " with "
+          << statistics -> getBitrateInLongFrame() << " in the "
+          << "long frame and top " << statistics ->
+             getTopBitrate() << ".\n" << logofs_flush;
+  #endif
+
+  statistics -> addWriteOut();
+
+  int result = transport_ -> write(write_immediate, outputMessage, outputLength);
+
+  #ifdef TIME
+
+  if (diffTimestamp(timeouts_.writeTs, nowTs) > 50)
+  {
+    *logofs << "Proxy: WARNING! TIME! Data written to proxy FD#"
+            << fd_ << " at " << strMsTimestamp() << " after "
+            << diffTimestamp(timeouts_.writeTs, nowTs)
+            << " Ms.\n" << logofs_flush;
+  }
+
+  #endif
+
+  #ifdef DUMP
+  *logofs << "Proxy: Sent " << outputLength << " bytes of data "
+          << "with checksum ";
+
+  DumpChecksum(outputMessage, outputLength);
+
+  *logofs << " on proxy FD#" << fd_ << ".\n" << logofs_flush;
+  #endif
+
+  #ifdef DUMP
+  *logofs << "Proxy: Partial checksums are:\n";
+
+  DumpBlockChecksums(outputMessage, outputLength, 256);
+
+  *logofs << logofs_flush;
+  #endif
+
+  //
+  // Clean up the encode buffer and
+  // bring it to the initial size.
+  //
+
+  encodeBuffer_.fullReset();
+
+  //
+  // Close the connection if we got
+  // an error.
+  //
+
+  if (result < 0)
+  {
+    #ifdef TEST
+    *logofs << "Proxy: Failed write to proxy FD#"
+            << fd_ << ".\n" << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  //
+  // Account for the data frame and the
+  // framing overhead.
+  //
+
+  if (dataLength > 0)
+  {
+    statistics -> addFrameOut();
+  }
+
+  statistics -> addFramingBits((controlLength_ + lengthLength) << 3);
+
+  controlLength_ = 0;
+
+  //
+  // Reset all buffers, counters and the
+  // priority flag.
+  //
+
+  handleResetFlush();
+
+  //
+  // Check if more data became available
+  // after writing.
+  //
+
+  if (handleAsyncEvents() < 0)
+  {
+    return -1;
+  }
+
+  //
+  // Drain the proxy link if we are in
+  // congestion state.
+  //
+  // if (needDrain() == 1 && draining_ == 0)
+  // {
+  //   if (handleDrain() < 0)
+  //   {
+  //     return -1;
+  //   }
+  // }
+  //
+
+  return result;
+}
+
+int Proxy::handleFlush()
+{
+  //
+  // We can have data in the encode buffer or
+  // control bytes to send. In the case make
+  // up a new frame.
+  //
+
+  if (encodeBuffer_.getLength() + controlLength_ > 0)
+  {
+    #if defined(TEST) || defined(INFO)
+    *logofs << "Proxy: Flushing data in the encode buffer.\n"
+            << logofs_flush;
+    #endif
+
+    priority_ = 1;
+
+    if (handleFrame(frame_data) < 0)
+    {
+      return -1;
+    }
+  }
+
+  //
+  // Check if we have something to write.
+  //
+
+  if (transport_ -> length() + transport_ -> flushable() == 0)
+  {
+    #if defined(TEST) || defined(INFO)
+    *logofs << "Proxy: Nothing else to flush for proxy FD#"
+            << fd_ << ".\n" << logofs_flush;
+    #endif
+
+    return 0;
+  }
+
+  #if defined(TEST) || defined(INFO)
+
+  if (transport_ -> blocked() == 0)
+  {
+    #ifdef PANIC
+    *logofs << "Proxy: PANIC! Proxy descriptor FD#" << fd_
+            << " has data to flush but the transport "
+            << "is not blocked.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Proxy descriptor FD#" << fd_
+         << " has data to flush but the transport "
+         << "is not blocked.\n";
+
+    HandleCleanup();
+  }
+
+  #endif
+
+  #if defined(TEST) || defined(INFO) || defined(FLUSH)
+  *logofs << "Proxy: FLUSH! Deferred with blocked " << transport_ ->
+             blocked() << " length " << transport_ -> length()
+          << " flushable " << transport_ -> flushable() << " tokens "
+          << tokens_[token_control].remaining << ".\n"
+          << logofs_flush;
+
+  *logofs << "Proxy: FLUSH! Deferred flush to proxy FD#" << fd_
+          << " of " << transport_ -> length() + transport_ ->
+             flushable() << " bytes at " << strMsTimestamp()
+          << " with priority " << priority_ << ".\n"
+          << logofs_flush;
+
+  *logofs << "Proxy: FLUSH! Current bitrate is "
+          << statistics -> getBitrateInShortFrame() << " with "
+          << statistics -> getBitrateInLongFrame() << " in the "
+          << "long frame and top " << statistics ->
+             getTopBitrate() << ".\n" << logofs_flush;
+  #endif
+
+  statistics -> addWriteOut();
+
+  int result = transport_ -> flush();
+
+  if (result < 0)
+  {
+    return -1;
+  }
+
+  //
+  // Reset the counters and update the
+  // timestamp of the last write.
+  //
+
+  handleResetFlush();
+
+  return result;
+}
+
+int Proxy::handleDrain()
+{
+  //
+  // If the proxy is run in the same process
+  // as SSH, we can't block or the program
+  // would not have a chance to read or write
+  // its data.
+  //
+
+  if (control -> LinkEncrypted == 1)
+  {
+    return 0;
+  }
+
+  if (needDrain() == 0 || draining_ == 1)
+  {
+    #if defined(TEST) || defined(INFO)
+
+    if (draining_ == 1)
+    {
+      *logofs << "Proxy: WARNING! Already draining proxy FD#"
+              << fd_ << " at " << strMsTimestamp() << ".\n"
+              << logofs_flush;
+    }
+    else
+    {
+      *logofs << "Proxy: WARNING! No need to drain proxy FD#"
+              << fd_ << " with congestion " << congestion_
+              << " length " << transport_ -> length()
+              << " and blocked " << transport_ -> blocked()
+              << ".\n" << logofs_flush;
+    }
+
+    #endif
+
+    return 0;
+  }
+
+  draining_ = 1;
+
+  #if defined(TEST) || defined(INFO)
+  *logofs << "Proxy: Going to drain the proxy FD#" << fd_
+          << " at " << strMsTimestamp() << ".\n"
+          << logofs_flush;
+  #endif
+
+  int timeout = control -> PingTimeout / 2;
+
+  T_timestamp startTs = getNewTimestamp();
+
+  T_timestamp nowTs = startTs;
+
+  int remaining;
+  int result;
+
+  //
+  // Keep draining the proxy socket while
+  // reading the incoming messages until
+  // the timeout is expired.
+  // 
+
+  for (;;)
+  {
+    remaining = timeout - diffTimestamp(startTs, nowTs);
+
+    if (remaining <= 0)
+    {
+      #if defined(TEST) || defined(INFO)
+      *logofs << "Proxy: Timeout raised while draining "
+              << "FD#" << fd_ << " at " << strMsTimestamp()
+              << " after " << diffTimestamp(startTs, nowTs)
+              << " Ms.\n" << logofs_flush;
+      #endif
+
+      result = 0;
+
+      goto ProxyDrainEnd;
+    }
+
+    if (transport_ -> length() > 0)
+    {
+      #if defined(TEST) || defined(INFO)
+      *logofs << "Proxy: Trying to write to FD#" << fd_
+              << " at " << strMsTimestamp() << " with length "
+              << transport_ -> length() << " and "
+              << remaining << " Ms remaining.\n"
+              << logofs_flush;
+      #endif
+
+      result = transport_ -> drain(0, remaining);
+
+      if (result == -1)
+      {
+        result = -1;
+
+        goto ProxyDrainEnd;
+      }
+      else if (result == 0 && transport_ -> readable() > 0)
+      {
+        #if defined(TEST) || defined(INFO)
+        *logofs << "Proxy: Decoding more data from proxy FD#"
+                << fd_ << " at " << strMsTimestamp() << " with "
+                << transport_ -> length() << " bytes to write and "
+                << transport_ -> readable() << " readable.\n"
+                << logofs_flush;
+        #endif
+
+        if (handleRead() < 0)
+        {
+          result = -1;
+
+          goto ProxyDrainEnd;
+        }
+      }
+      #if defined(TEST) || defined(INFO)
+      else if (result == 1)
+      {
+        *logofs << "Proxy: Transport for proxy FD#" << fd_
+                << " drained down to " << transport_ -> length()
+                << " bytes.\n" << logofs_flush;
+      }
+      #endif
+    }
+    else
+    {
+      #if defined(TEST) || defined(INFO)
+      *logofs << "Proxy: Waiting for more data from proxy "
+              << "FD#" << fd_ << " at " << strMsTimestamp()
+              << " with " << remaining << " Ms remaining.\n"
+              << logofs_flush;
+      #endif
+
+
+      result = transport_ -> wait(remaining);
+
+      if (result == -1)
+      {
+        result = -1;
+
+        goto ProxyDrainEnd;
+      }
+      else if (result > 0)
+      {
+        #if defined(TEST) || defined(INFO)
+        *logofs << "Proxy: Decoding more data from proxy FD#"
+                << fd_ << " at " << strMsTimestamp() << " with "
+                << transport_ -> readable() << " bytes readable.\n"
+                << logofs_flush;
+        #endif
+
+        if (handleRead() < 0)
+        {
+          result = -1;
+
+          goto ProxyDrainEnd;
+        }
+      }
+    }
+
+    //
+    // Check if we finally got the tokens
+    // that would allow us to come out of
+    // the congestion state.
+    //
+
+    if (needDrain() == 0)
+    {
+      #if defined(TEST) || defined(INFO)
+      *logofs << "Proxy: Got decongestion for proxy FD#"
+              << fd_ << " at " << strMsTimestamp() << " after "
+              << diffTimestamp(startTs, getTimestamp())
+              << " Ms.\n" << logofs_flush;
+      #endif
+
+      result = 1;
+
+      goto ProxyDrainEnd;
+    }
+
+    nowTs = getNewTimestamp();
+  }
+
+ProxyDrainEnd:
+
+  draining_ = 0;
+
+  return result;
+}
+
+int Proxy::handleFlush(int fd)
+{
+  int channelId = getChannel(fd);
+
+  if (channelId < 0 || channels_[channelId] == NULL)
+  {
+    #ifdef TEST
+    *logofs << "Proxy: WARNING! Skipping flush on invalid "
+            << "descriptor FD#" << fd << " channel ID#"
+            << channelId << ".\n" << logofs_flush;
+    #endif
+
+    return 0;
+  }
+  else if (channels_[channelId] -> getFinish() == 1)
+  {
+    #ifdef TEST
+    *logofs << "Proxy: Skipping flush on finishing "
+            << "descriptor FD#" << fd << " channel ID#"
+            << channelId << ".\n" << logofs_flush;
+    #endif
+
+    return 0;
+  }
+
+  #ifdef TEST
+  *logofs << "Proxy: Going to flush FD#" << fd
+          << " with blocked " << transports_[channelId] -> blocked()
+          << " length " << transports_[channelId] -> length()
+          << ".\n" << logofs_flush;
+  #endif
+
+  if (channels_[channelId] -> handleFlush() < 0)
+  {
+    #ifdef TEST
+    *logofs << "Proxy: Failed to flush data to FD#"
+            << getFd(channelId) << " channel ID#"
+            << channelId << ".\n" << logofs_flush;
+    #endif
+
+    handleFinish(channelId);
+
+    return -1;
+  }
+
+  return 1;
+}
+
+int Proxy::handleStatistics(int type, ostream *stream)
+{
+  if (stream == NULL || control -> EnableStatistics == 0)
+  {
+    #ifdef WARNING
+    *logofs << "Proxy: WARNING! Cannot produce statistics "
+            << " for proxy FD#" << fd_ << ". Invalid settings "
+            << "for statistics or stream.\n" << logofs_flush;
+    #endif
+
+    return 0;
+  }
+  else if (currentStatistics_ != NULL)
+  {
+    //
+    // Need to update the stream pointer as the
+    // previous one could have been destroyed.
+    //
+ 
+    #ifdef WARNING
+    *logofs << "Proxy: WARNING! Replacing stream while producing "
+            << "statistics in stream at " << currentStatistics_
+            << " for proxy FD#" << fd_ << ".\n"
+            << logofs_flush;
+    #endif
+  }
+
+  currentStatistics_ = stream;
+
+  //
+  // Get statistics of remote peer.
+  //
+
+  if (handleControl(code_statistics_request, type) < 0)
+  {
+    return -1;
+  }
+
+  return 1;
+}
+
+int Proxy::handleStatisticsFromProxy(int type)
+{
+  if (needFlush() == 1)
+  {
+    #if defined(TEST) || defined(INFO) || defined(FLUSH)
+    *logofs << "Proxy: WARNING! Data for the previous "
+            << "channel ID#" << outputChannel_
+            << " flushed in statistics.\n"
+            << logofs_flush;
+    #endif
+
+    if (handleFrame(frame_data) < 0)
+    {
+      return -1;
+    }
+  }
+
+  if (control -> EnableStatistics == 1)
+  {
+    //
+    // Allocate a buffer for the output.
+    //
+
+    char *buffer = new char[STATISTICS_LENGTH];
+ 
+    *buffer = '\0';
+
+    if (control -> ProxyMode == proxy_client)
+    {
+      #ifdef TEST
+      *logofs << "Proxy: Producing "
+              << (type == TOTAL_STATS ? "total" : "partial")
+              << " client statistics for proxy FD#"
+              << fd_ << ".\n" << logofs_flush;
+      #endif
+
+      statistics -> getClientProtocolStats(type, buffer);
+
+      statistics -> getClientOverallStats(type, buffer);
+    }
+    else
+    {
+      #ifdef TEST
+      *logofs << "Proxy: Producing "
+              << (type == TOTAL_STATS ? "total" : "partial")
+              << " server statistics for proxy FD#"
+              << fd_ << ".\n" << logofs_flush;
+      #endif
+
+      statistics -> getServerProtocolStats(type, buffer);
+    }
+
+    if (type == PARTIAL_STATS)
+    {
+      statistics -> resetPartialStats();
+    }
+
+    unsigned int length = strlen((char *) buffer) + 1;
+
+    encodeBuffer_.encodeValue(type, 8);
+
+    encodeBuffer_.encodeValue(length, 32);
+
+    #ifdef TEST
+    *logofs << "Proxy: Encoding " << length
+            << " bytes of statistics data for proxy FD#"
+            << fd_ << ".\n" << logofs_flush;
+    #endif
+
+    encodeBuffer_.encodeMemory((unsigned char *) buffer, length);
+
+    //
+    // Account statistics data as framing bits.
+    //
+
+    statistics -> addFramingBits(length << 3);
+
+    delete [] buffer;
+  }
+  else
+  {
+    #ifdef WARNING
+    *logofs << "Proxy: WARNING! Got statistics request "
+            << "but local statistics are disabled.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Warning" << ": Got statistics request "
+         << "but local statistics are disabled.\n";
+
+    type = NO_STATS;
+
+    encodeBuffer_.encodeValue(type, 8);
+
+    #ifdef TEST
+    *logofs << "Proxy: Sending error code to remote proxy on FD#"
+            << fd_ << ".\n" << logofs_flush;
+    #endif
+  }
+
+  //
+  // The next write will flush the statistics
+  // data and the control message.
+  //
+
+  if (handleControl(code_statistics_reply, type) < 0)
+  {
+    return -1;
+  }
+
+  return 1;
+}
+
+int Proxy::handleStatisticsFromProxy(const unsigned char *message, unsigned int length)
+{
+  if (currentStatistics_ == NULL)
+  {
+    #ifdef WARNING
+    *logofs << "Proxy: WARNING! Unexpected statistics data received "
+            << "from remote proxy on FD#" << fd_ << ".\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Warning" << ": Unexpected statistics data received "
+         << "from remote proxy.\n";
+
+    return 0;
+  }
+
+  //
+  // Allocate the decode buffer and at least
+  // the 'type' field to see if there was an
+  // error.
+  //
+
+  DecodeBuffer decodeBuffer(message, length);
+
+  unsigned int type;
+
+  decodeBuffer.decodeValue(type, 8);
+
+  if (type == NO_STATS)
+  {
+    #ifdef PANIC
+    *logofs << "Proxy: PANIC! Couldn't get statistics from remote "
+            << "proxy on FD#" << fd_ << ".\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Couldn't get statistics from remote proxy.\n";
+  }
+  else if (type != TOTAL_STATS && type != PARTIAL_STATS)
+  {
+    #ifdef PANIC
+    *logofs << "Proxy: PANIC! Cannot produce statistics "
+            << "with qualifier '" << type << "'.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Cannot produce statistics "
+         << "with qualifier '" << type << "'.\n";
+
+    return -1;
+  }
+  else
+  {
+    unsigned int size;
+
+    decodeBuffer.decodeValue(size, 32);
+
+    char *buffer = new char[STATISTICS_LENGTH];
+
+    *buffer = '\0';
+
+    if (control -> EnableStatistics == 1)
+    {
+      if (control -> ProxyMode == proxy_client)
+      {
+        #ifdef TEST
+        *logofs << "Proxy: Finalizing "
+                << (type == TOTAL_STATS ? "total" : "partial")
+                << " client statistics for proxy FD#"
+                << fd_ << ".\n" << logofs_flush;
+        #endif
+
+        statistics -> getClientCacheStats(type, buffer);
+
+        #ifdef TEST
+        *logofs << "Proxy: Decoding " << size
+                << " bytes of statistics data for proxy FD#"
+                << fd_ << ".\n" << logofs_flush;
+        #endif
+
+        strncat(buffer, (char *) decodeBuffer.decodeMemory(size), size);
+
+        statistics -> getClientProtocolStats(type, buffer);
+
+        statistics -> getClientOverallStats(type, buffer);
+      }
+      else
+      {
+        #ifdef TEST
+        *logofs << "Proxy: Finalizing "
+                << (type == TOTAL_STATS ? "total" : "partial")
+                << " server statistics for proxy FD#"
+                << fd_ << ".\n" << logofs_flush;
+        #endif
+
+        statistics -> getServerCacheStats(type, buffer);
+
+        statistics -> getServerProtocolStats(type, buffer);
+
+        #ifdef TEST
+        *logofs << "Proxy: Decoding " << size
+                << " bytes of statistics data for proxy FD#"
+                << fd_ << ".\n" << logofs_flush;
+        #endif
+
+        strncat(buffer, (char *) decodeBuffer.decodeMemory(size), size);
+      }
+
+      if (type == PARTIAL_STATS)
+      {
+        statistics -> resetPartialStats();
+      }
+
+      *currentStatistics_ << buffer;
+
+      //
+      // Mark the end of text to help external parsing.
+      //
+
+      *currentStatistics_ << '\4';
+
+      *currentStatistics_ << flush;
+    }
+    else
+    {
+      //
+      // It can be that statistics were enabled at the time
+      // we issued the request (otherwise we could not have
+      // set the stream), but now they have been disabled
+      // by user. We must decode statistics data if we want
+      // to keep the connection.
+      //
+
+      #ifdef TEST
+      *logofs << "Proxy: Discarding " << size
+              << " bytes of statistics data for proxy FD#"
+              << fd_ << ".\n" << logofs_flush;
+      #endif
+
+      strncat(buffer, (char *) decodeBuffer.decodeMemory(size), size);
+    }
+
+    delete [] buffer;
+  }
+
+  currentStatistics_ = NULL;
+
+  return 1;
+}
+
+int Proxy::handleNegotiation(const unsigned char *message, unsigned int length)
+{
+  #ifdef PANIC
+  *logofs << "Proxy: PANIC! Writing data during proxy "
+          << "negotiation is not implemented.\n"
+          << logofs_flush;
+  #endif
+
+  cerr << "Error" << ": Writing data during proxy "
+       << "negotiation is not implemented.\n";
+
+  return -1;
+}
+
+int Proxy::handleNegotiationFromProxy(const unsigned char *message, unsigned int length)
+{
+  #ifdef PANIC
+  *logofs << "Proxy: PANIC! Reading data during proxy "
+          << "negotiation is not implemented.\n"
+          << logofs_flush;
+  #endif
+
+  cerr << "Error" << ": Reading data during proxy "
+       << "negotiation is not implemented.\n";
+
+  return -1;
+}
+
+int Proxy::handleAlert(int alert)
+{
+  if (handleControl(code_alert_request, alert) < 0)
+  {
+    return -1;
+  }
+
+  return 1;
+}
+
+int Proxy::handleCloseConnection(int clientFd)
+{
+  int channelId = getChannel(clientFd);
+
+  if (channels_[channelId] != NULL &&
+          channels_[channelId] -> getFinish() == 0)
+  {
+    #ifdef TEST
+    *logofs << "Proxy: Closing down the channel for FD#"
+            << clientFd << ".\n" << logofs_flush;
+    #endif
+
+    if (handleFinish(channelId) < 0)
+    {
+      return -1;
+    }
+
+    return 1;
+  }
+
+  return 0;
+}
+
+int Proxy::handleCloseAllXConnections()
+{
+  #ifdef TEST
+  *logofs << "Proxy: Closing down any remaining X channel.\n"
+          << logofs_flush;
+  #endif
+
+  T_list &channelList = activeChannels_.getList();
+
+  for (T_list::iterator j = channelList.begin();
+           j != channelList.end(); j++)
+  {
+    int channelId = *j;
+
+    if (channels_[channelId] != NULL &&
+            channels_[channelId] -> getType() == channel_x11 &&
+                channels_[channelId] -> getFinish() == 0)
+    {
+      #ifdef TEST
+      *logofs << "Proxy: Closing down the channel for FD#"
+              << getFd(channelId) << ".\n" << logofs_flush;
+      #endif
+
+      if (handleFinish(channelId) < 0)
+      {
+        return -1;
+      }
+    }
+  }
+
+  return 1;
+}
+
+int Proxy::handleCloseAllListeners()
+{
+  // Since ProtoStep7 (#issue 108)
+  if (finish_ == 0)
+  {
+    #ifdef TEST
+    *logofs << "Proxy: Closing down all remote listeners.\n"
+            << logofs_flush;
+    #endif
+
+    if (handleControl(code_finish_listeners) < 0)
+    {
+      return -1;
+    }
+
+    finish_ = 1;
+  }
+
+  return 1;
+}
+
+void Proxy::handleResetAlert()
+{
+  if (alert_ != 0)
+  {
+    #ifdef TEST
+    *logofs << "Proxy: The proxy alert '" << alert_
+            << "' was displaced.\n" << logofs_flush;
+    #endif
+
+    alert_ = 0;
+  }
+
+  T_list &channelList = activeChannels_.getList();
+
+  for (T_list::iterator j = channelList.begin();
+           j != channelList.end(); j++)
+  {
+    int channelId = *j;
+
+    if (channels_[channelId] != NULL)
+    {
+      channels_[channelId] -> handleResetAlert();
+    }
+  }
+}
+
+int Proxy::handleFinish(int channelId)
+{
+  //
+  // Send any outstanding encoded data and
+  // do any finalization needed on the
+  // channel.
+  //
+
+  if (needFlush(channelId) == 1)
+  {
+    if (channels_[channelId] -> getFinish() == 1)
+    {
+      #ifdef WARNING
+      *logofs << "Proxy: WARNING! The finishing channel ID#"
+              << channelId << " has data to flush.\n"
+              << logofs_flush;
+      #endif
+    }
+
+    #if defined(TEST) || defined(INFO) || defined(FLUSH)
+    *logofs << "Proxy: WARNING! Flushing data for the "
+            << "finishing channel ID#" << channelId
+            << ".\n" << logofs_flush;
+    #endif
+
+    if (handleFrame(frame_data) < 0)
+    {
+      return -1;
+    }
+  }
+
+  //
+  // Reset the congestion state and the
+  // timeouts, if needed.
+  //
+
+  congestions_[channelId] = 0;
+
+  setSplitTimeout(channelId);
+  setMotionTimeout(channelId);
+
+  if (channels_[channelId] -> getFinish() == 0)
+  {
+    channels_[channelId] -> handleFinish();
+
+    //
+    // Force a failure in the case somebody
+    // would try to read from the channel.
+    //
+
+    shutdown(getFd(channelId), SHUT_RD);
+
+    //
+    // If the failure was not originated by
+    // the remote, send a channel shutdown
+    // message.
+    //
+
+    if (channels_[channelId] -> getClosing() == 0)
+    {
+      #ifdef TEST
+      *logofs << "Proxy: Finishing channel for FD#"
+              << getFd(channelId) << " channel ID#"
+              << channelId << " because of failure.\n"
+              << logofs_flush;
+      #endif
+
+      if (handleControl(code_finish_connection, channelId) < 0)
+      {
+        return -1;
+      }
+    }
+  }
+
+  return 1;
+}
+
+int Proxy::handleFinishFromProxy(int channelId)
+{
+  //
+  // Check if this channel has pending
+  // data to send.
+  //
+
+  if (needFlush(channelId) == 1)
+  {
+    #if defined(TEST) || defined(INFO) || defined(FLUSH)
+    *logofs << "Proxy: WARNING! Flushing data for the "
+            << "finishing channel ID#" << channelId
+            << ".\n" << logofs_flush;
+    #endif
+
+    if (handleFrame(frame_data) < 0)
+    {
+      return -1;
+    }
+  }
+
+  //
+  // Mark the channel. We will free its
+  // resources at the next loop and will
+  // send the drop message to the remote.
+  //
+
+  if (channels_[channelId] -> getClosing() == 0)
+  {
+    #ifdef TEST
+    *logofs << "Proxy: Marking channel for FD#"
+            << getFd(channelId) << " channel ID#"
+            << channelId << " as closing.\n"
+            << logofs_flush;
+    #endif
+
+    channels_[channelId] -> handleClosing();
+  }
+
+  if (channels_[channelId] -> getFinish() == 0)
+  {
+    #ifdef TEST
+    *logofs << "Proxy: Finishing channel for FD#"
+            << getFd(channelId) << " channel ID#"
+            << channelId << " because of proxy.\n"
+            << logofs_flush;
+    #endif
+
+    channels_[channelId] -> handleFinish();
+  }
+
+  if (handleFinish(channelId) < 0)
+  {
+    return -1;
+  }
+
+  return 1;
+}
+
+int Proxy::handleDropFromProxy(int channelId)
+{
+  //
+  // Only mark the channel.
+  //
+
+  #ifdef TEST
+  *logofs << "Proxy: Marking channel for FD#"
+          << getFd(channelId) << " channel ID#"
+          << channelId << " as being dropped.\n"
+          << logofs_flush;
+  #endif
+
+  if (channels_[channelId] -> getDrop() == 0)
+  {
+    channels_[channelId] -> handleDrop();
+  }
+
+  return 1;
+}
+
+//
+// Close the channel and deallocate all its
+// resources.
+//
+
+int Proxy::handleDrop(int channelId)
+{
+  //
+  // Check if this channel has pending
+  // data to send.
+  //
+
+  if (needFlush(channelId) == 1)
+  {
+    if (channels_[channelId] -> getFinish() == 1)
+    {
+      #ifdef WARNING
+      *logofs << "Proxy: WARNING! The dropping channel ID#"
+              << channelId << " has data to flush.\n"
+              << logofs_flush;
+      #endif
+    }
+
+    #if defined(TEST) || defined(INFO) || defined(FLUSH)
+    *logofs << "Proxy: WARNING! Flushing data for the "
+            << "dropping channel ID#" << channelId
+            << ".\n" << logofs_flush;
+    #endif
+
+    if (handleFrame(frame_data) < 0)
+    {
+      return -1;
+    }
+  }
+
+  #ifdef TEST
+  *logofs << "Proxy: Dropping channel for FD#"
+          << getFd(channelId) << " channel ID#"
+          << channelId << ".\n" << logofs_flush;
+  #endif
+
+  if (channels_[channelId] -> getFinish() == 0)
+  {
+    #ifdef WARNING
+    *logofs << "Proxy: WARNING! The channel for FD#"
+            << getFd(channelId) << " channel ID#"
+            << channelId << " was not marked as "
+            << "finishing.\n" << logofs_flush;
+    #endif
+
+    cerr << "Warning" << ": The channel for FD#"
+         << getFd(channelId) << " channel ID#"
+         << channelId << " was not marked as "
+         << "finishing.\n";
+
+    channels_[channelId] -> handleFinish();
+  }
+
+  //
+  // Send the channel shutdown message
+  // to the peer proxy.
+  //
+
+  if (channels_[channelId] -> getClosing() == 1)
+  {
+    if (handleControl(code_drop_connection, channelId) < 0)
+    {
+      return -1;
+    }
+  }
+
+  //
+  // Get rid of the channel.
+  //
+
+  if (channels_[channelId] -> getType() != channel_x11)
+  {
+    #ifdef TEST
+    *logofs << "Proxy: Closed connection to "
+            << getTypeName(channels_[channelId] -> getType())
+            << " server.\n" << logofs_flush;
+    #endif
+
+    cerr << "Info" << ": Closed connection to "
+         << getTypeName(channels_[channelId] -> getType())
+         << " server.\n";
+  }
+
+  delete channels_[channelId];
+  channels_[channelId] = NULL;
+
+  cleanupChannelMap(channelId);
+
+  //
+  // Get rid of the transport.
+  //
+
+  deallocateTransport(channelId);
+
+  congestions_[channelId] = 0;
+
+  decreaseChannels(channelId);
+
+  //
+  // Check if the channel was the
+  // one currently selected for
+  // output.
+  //
+
+  if (outputChannel_ == channelId)
+  {
+    outputChannel_ = -1;
+  }
+  
+  return 1;
+}
+
+//
+// Send an empty message to the remote peer
+// to verify if the link is alive and let
+// the remote proxy detect a congestion.
+//
+
+int Proxy::handlePing()
+{
+  T_timestamp nowTs = getTimestamp();
+
+  #if defined(DEBUG) || defined(PING)
+
+  *logofs << "Proxy: Checking ping at "
+          << strMsTimestamp(nowTs) << logofs_flush;
+
+  *logofs << " with last loop at "
+          << strMsTimestamp(timeouts_.loopTs) << ".\n"
+          << logofs_flush;
+
+  *logofs << "Proxy: Last bytes in at "
+          << strMsTimestamp(timeouts_.readTs) << logofs_flush;
+
+  *logofs << " last bytes out at "
+          << strMsTimestamp(timeouts_.writeTs) << ".\n"
+          << logofs_flush;
+
+  *logofs << "Proxy: Last ping at "
+          << strMsTimestamp(timeouts_.pingTs) << ".\n"
+          << logofs_flush;
+
+  #endif
+
+  //
+  // Be sure we take into account any clock drift. This
+  // can be caused by the user changing the system timer
+  // or by small adjustments introduced by the operating
+  // system making the clock go backward.
+  //
+
+  if (checkDiffTimestamp(timeouts_.loopTs, nowTs) == 0)
+  {
+    #ifdef WARNING
+    *logofs << "Proxy: WARNING! Detected drift in system "
+            << "timer. Resetting to current time.\n"
+            << logofs_flush;
+    #endif
+
+    timeouts_.pingTs  = nowTs;
+    timeouts_.readTs  = nowTs;
+    timeouts_.writeTs = nowTs;
+  }
+
+  //
+  // Check timestamp of last read from remote proxy. It can
+  // happen that we stayed in the main loop long enough to
+  // have idle timeout expired, for example if the proxy was
+  // stopped and restarted or because of an extremely high
+  // load of the system. In this case we don't complain if
+  // there is something new to read from the remote.
+  //
+
+  int diffIn = diffTimestamp(timeouts_.readTs, nowTs);
+
+  if (diffIn >= (control -> PingTimeout * 2) -
+          control -> LatencyTimeout)
+  {
+    //
+    // Force a read to detect whether the remote proxy
+    // aborted the connection.
+    //
+
+    int result = handleRead();
+
+    if (result < 0)
+    {
+      #if defined(TEST) || defined(INFO) || defined(PING)
+      *logofs << "Proxy: WARNING! Detected shutdown waiting "
+              << "for the ping after " << diffIn / 1000
+              << " seconds.\n" << logofs_flush;
+      #endif
+
+      return -1;
+    }
+    else if (result > 0)
+    {
+      diffIn = diffTimestamp(timeouts_.readTs, nowTs);
+
+      if (handleFlush() < 0)
+      {
+        return -1;
+      }
+    }
+  }
+
+  if (diffIn >= (control -> PingTimeout * 2) -
+          control -> LatencyTimeout)
+  {
+    #if defined(TEST) || defined(INFO) || defined(PING)
+    *logofs << "Proxy: Detected congestion at "
+            << strMsTimestamp() << " with " << diffIn / 1000
+            << " seconds since the last read.\n"
+            << logofs_flush;
+    #endif
+
+    //
+    // There are two types of proxy congestion. The first,
+    // affecting the ability of the proxy to write the
+    // encoded data to the network, is controlled by the
+    // congestion_ flag. The flag is raised when no data
+    // is received from the remote proxy within a timeout.
+    // On the X client side, the flag is also raised when
+    // the proxy runs out of tokens.
+    //
+
+    if (control -> ProxyMode == proxy_server)
+    {
+      //
+      // At X server side we must return to read data
+      // from the channels after a while, because we
+      // need to give a chance to the channel to read
+      // the key sequence CTRL+ALT+SHIFT+ESC.
+      //
+
+      if (congestion_ == 0)
+      {
+        #if defined(TEST) || defined(INFO)
+        *logofs << "Proxy: Forcibly entering congestion due to "
+                << "timeout with " << tokens_[token_control].remaining
+                << " tokens.\n" << logofs_flush;
+        #endif
+
+        congestion_ = 1;
+      }
+      else
+      {
+        #if defined(TEST) || defined(INFO)
+        *logofs << "Proxy: Forcibly exiting congestion due to "
+                << "timeout with " << tokens_[token_control].remaining
+                << " tokens.\n" << logofs_flush;
+        #endif
+
+        congestion_ = 0;
+      }
+    }
+    else
+    {
+      #if defined(TEST) || defined(INFO)
+
+      if (congestion_ == 0)
+      {
+        *logofs << "Proxy: Entering congestion due to timeout "
+                << "with " << tokens_[token_control].remaining
+                << " tokens.\n" << logofs_flush;
+      }
+
+      #endif
+
+      congestion_ = 1;
+    }
+
+    if (control -> ProxyTimeout > 0 &&
+            diffIn >= (control -> ProxyTimeout -
+                control -> LatencyTimeout))
+    {
+      #ifdef PANIC
+      *logofs << "Proxy: PANIC! No data received from "
+              << "remote proxy on FD#" << fd_ << " within "
+              << (diffIn + control -> LatencyTimeout) / 1000
+              << " seconds.\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": No data received from remote "
+           << "proxy within " << (diffIn + control ->
+              LatencyTimeout) / 1000 << " seconds.\n";
+
+      HandleAbort();
+    }
+    else
+    {
+      #if defined(TEST) || defined(INFO)
+      *logofs << "Proxy: WARNING! No data received from "
+              << "remote proxy on FD#" << fd_ << " since "
+              << diffIn << " Ms.\n" << logofs_flush;
+      #endif
+
+      if (control -> ProxyTimeout > 0 &&
+              isTimestamp(timeouts_.alertTs) == 0 &&
+                  diffIn >= (control -> ProxyTimeout -
+                      control -> LatencyTimeout) / 4)
+      {
+        //
+        // If we are in the middle of a shutdown
+        // procedure but the remote is not resp-
+        // onding, force the closure of the link.
+        //
+
+        if (finish_ != 0)
+        {
+          #ifdef PANIC
+          *logofs << "Proxy: PANIC! No response received from "
+                  << "the remote proxy on FD#" << fd_ << " while "
+                  << "waiting for the shutdown.\n"
+                  << logofs_flush;
+          #endif
+
+          cerr << "Error" << ": No response received from remote "
+               << "proxy while waiting for the shutdown.\n";
+
+          HandleAbort();
+        }
+        else
+        {
+          cerr << "Warning" << ": No data received from remote "
+               << "proxy within " << (diffIn + control ->
+                  LatencyTimeout) / 1000 << " seconds.\n";
+
+          if (alert_ == 0)
+          {
+            if (control -> ProxyMode == proxy_client)
+            {
+              alert_ = CLOSE_DEAD_PROXY_CONNECTION_CLIENT_ALERT;
+            }
+            else
+            {
+              alert_ = CLOSE_DEAD_PROXY_CONNECTION_SERVER_ALERT;
+            }
+
+            HandleAlert(alert_, 1);
+          }
+
+          timeouts_.alertTs = nowTs;
+        }
+      }
+    }
+  }
+
+  //
+  // Check if we need to update the congestion
+  // counter.
+  //
+
+  int diffOut = diffTimestamp(timeouts_.writeTs, nowTs);
+
+  if (agent_ != nothing && congestions_[agent_] == 0 &&
+          statistics -> getCongestionInFrame() >= 1 &&
+              diffOut >= (control -> IdleTimeout -
+                  control -> LatencyTimeout * 5))
+  {
+    #if defined(TEST) || defined(INFO) || defined(PING)
+    *logofs << "Proxy: Forcing an update of the "
+            << "congestion counter after timeout.\n"
+            << logofs_flush;
+    #endif
+
+    statistics -> updateCongestion(tokens_[token_control].remaining,
+                                       tokens_[token_control].limit);
+  }
+
+  //
+  // Send a new token if we didn't send any data to
+  // the remote for longer than the ping timeout.
+  // The client side sends a token, the server side
+  // responds with a token reply.
+  //
+  // VMWare virtual machines can have the system
+  // timer deadly broken. Try to send a ping regard-
+  // less we are the client or the server proxy to
+  // force a write by the remote.
+  //
+
+  if (control -> ProxyMode == proxy_client ||
+          diffIn >= (control -> PingTimeout * 4) -
+              control -> LatencyTimeout)
+  {
+    //
+    // We need to send a new ping even if we didn't
+    // receive anything from the remote within the
+    // ping timeout. The server side will respond
+    // to our ping, so we use the ping to force the
+    // remote end to send some data.
+    //
+
+    if (diffIn >= (control -> PingTimeout -
+            control -> LatencyTimeout * 5) ||
+                diffOut >= (control -> PingTimeout -
+                    control -> LatencyTimeout * 5))
+    {
+      int diffPing = diffTimestamp(timeouts_.pingTs, nowTs);
+
+      if (diffPing < 0 || diffPing >= (control -> PingTimeout -
+              control -> LatencyTimeout * 5))
+      {
+        #if defined(TEST) || defined(INFO) || defined(PING)
+        *logofs << "Proxy: Sending a new ping at " << strMsTimestamp()
+                << " with " << tokens_[token_control].remaining
+                << " tokens and elapsed in " << diffIn << " out "
+                << diffOut << " ping " << diffPing
+                << ".\n" << logofs_flush;
+        #endif
+
+        if (handleFrame(frame_ping) < 0)
+        {
+          return -1;
+        }
+
+        timeouts_.pingTs = nowTs;
+      }
+      #if defined(TEST) || defined(INFO) || defined(PING)
+      else
+      {
+        *logofs << "Proxy: Not sending a new ping with "
+                << "elapsed in " << diffIn << " out "
+                << diffOut << " ping " << diffPing
+                << ".\n" << logofs_flush;
+      }
+      #endif
+    }
+  }
+
+  return 1;
+}
+
+int Proxy::handleSyncFromProxy(int channelId)
+{
+  #if defined(TEST) || defined(INFO)
+  *logofs << "Proxy: WARNING! Received a synchronization "
+          << "request from the remote proxy.\n"
+          << logofs_flush;
+  #endif
+
+  if (handleControl(code_sync_reply, channelId) < 0)
+  {
+    return -1;
+  }
+
+  return 1;
+}
+
+int Proxy::handleResetStores()
+{
+  //
+  // Recreate the message stores.
+  //
+
+  delete clientStore_;
+  delete serverStore_;
+
+  clientStore_ = new ClientStore(compressor_);
+  serverStore_ = new ServerStore(compressor_);
+
+  timeouts_.loadTs = nullTimestamp();
+
+  //
+  // Replace message stores in channels.
+  //
+
+  T_list &channelList = activeChannels_.getList();
+
+  for (T_list::iterator j = channelList.begin();
+           j != channelList.end(); j++)
+  {
+    int channelId = *j;
+
+    if (channels_[channelId] != NULL)
+    {
+      if (channels_[channelId] -> setStores(clientStore_, serverStore_) < 0)
+      {
+        #ifdef PANIC
+        *logofs << "Proxy: PANIC! Failed to replace message stores in "
+                << "channel for FD#" << getFd(channelId) << ".\n"
+                << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Failed to replace message stores in "
+             << "channel for FD#" << getFd(channelId) << ".\n";
+
+        return -1;
+      }
+      #ifdef TEST
+      else
+      {
+        *logofs << "Proxy: Replaced message stores in channel "
+                << "for FD#" << getFd(channelId) << ".\n"
+                << logofs_flush;
+      }
+      #endif
+    }
+  }
+
+  return 1;
+}
+
+int Proxy::handleResetPersistentCache()
+{
+  char *fullName = new char[strlen(control -> PersistentCachePath) +
+                                strlen(control -> PersistentCacheName) + 2];
+
+  strcpy(fullName, control -> PersistentCachePath);
+  strcat(fullName, "/");
+  strcat(fullName, control -> PersistentCacheName);
+
+  #ifdef TEST
+  *logofs << "Proxy: Going to remove persistent cache file '"
+          << fullName << "'\n" << logofs_flush;
+  #endif
+
+  unlink(fullName);
+
+  delete [] fullName;
+
+  delete [] control -> PersistentCacheName;
+
+  control -> PersistentCacheName = NULL;
+
+  return 1;
+}
+
+void Proxy::handleResetFlush()
+{
+  #ifdef TEST
+  *logofs << "Proxy: Going to reset flush counters "
+          << "for proxy FD#" << fd_ << ".\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // Reset the proxy priority flag.
+  //
+
+  priority_ = 0;
+
+  //
+  // Restore buffers to their initial
+  // size.
+  //
+
+  transport_ -> partialReset();
+
+  //
+  // Update the timestamp of the last
+  // write operation performed on the
+  // socket.
+  //
+
+  timeouts_.writeTs = getTimestamp();
+}
+
+int Proxy::handleFinish()
+{
+  //
+  // Reset the timestamps to give the proxy
+  // another chance to show the 'no response'
+  // dialog if the shutdown message doesn't
+  // come in time.
+  //
+
+  timeouts_.readTs = getTimestamp();
+
+  timeouts_.alertTs = nullTimestamp();
+
+  finish_ = 1;
+
+  return 1;
+}
+
+int Proxy::handleShutdown()
+{
+  //
+  // Send shutdown message to remote proxy.
+  //
+
+  shutdown_ = 1;
+
+  handleControl(code_shutdown_request);
+
+  #ifdef TEST
+  *logofs << "Proxy: Starting shutdown procedure "
+          << "for proxy FD#" << fd_ << ".\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // Ensure that all the data accumulated
+  // in the transport buffer is flushed
+  // to the network layer.
+  //
+
+  for (int i = 0; i < 100; i++)
+  {
+    if (canFlush() == 1)
+    {
+      handleFlush();
+    }
+    else
+    {
+      break;
+    }
+
+    usleep(100000);
+  }
+
+  //
+  // Now wait for the network layers to
+  // consume all the data.
+  //
+
+  for (int i = 0; i < 100; i++)
+  {
+    if (transport_ -> queued() <= 0)
+    {
+      break;
+    }
+
+    usleep(100000);
+  }
+
+  //
+  // Give time to the remote end to read
+  // the shutdown message and close the
+  // connection.
+  //
+
+  transport_ -> wait(10000);
+
+  #ifdef TEST
+  *logofs << "Proxy: Ending shutdown procedure "
+          << "for proxy FD#" << fd_ << ".\n"
+          << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int Proxy::handleChannelConfiguration()
+{
+  if (activeChannels_.getSize() == 0)
+  {
+    #ifdef TEST
+    *logofs << "Proxy: Going to initialize the static "
+            << "members in channels for proxy FD#"
+            << fd_ << ".\n" << logofs_flush;
+    #endif
+
+    Channel::setReferences();
+
+    ClientChannel::setReferences();
+    ServerChannel::setReferences();
+
+    GenericChannel::setReferences();
+  }
+
+  return 1;
+}
+
+int Proxy::handleSocketConfiguration()
+{
+  //
+  // Set linger mode on proxy to correctly
+  // get shutdown notification.
+  //
+
+  SetLingerTimeout(fd_, 30);
+
+  //
+  // Set keep-alive on socket so that if remote link
+  // terminates abnormally (as killed hard or because
+  // of a power-off) process will get a SIGPIPE. In
+  // practice this is useless as proxies already ping
+  // each other every few seconds.
+  //
+
+  if (control -> OptionProxyKeepAlive == 1)
+  {
+    SetKeepAlive(fd_);
+  }
+
+  //
+  // Set 'priority' flag at TCP layer for path
+  // proxy-to-proxy. Look at IPTOS_LOWDELAY in
+  // man 7 ip.
+  //
+
+  if (control -> OptionProxyLowDelay == 1)
+  {
+    SetLowDelay(fd_);
+  }
+
+  //
+  // Update size of TCP send and receive buffers.
+  //
+
+  if (control -> OptionProxySendBuffer != -1)
+  {
+    SetSendBuffer(fd_, control -> OptionProxySendBuffer);
+  }
+
+  if (control -> OptionProxyReceiveBuffer != -1)
+  {
+    SetReceiveBuffer(fd_, control -> OptionProxyReceiveBuffer);
+  }
+
+  //
+  // Update TCP_NODELAY settings. Note that on old Linux
+  // kernels turning off the Nagle algorithm didn't work
+  // when proxy was run through a PPP link. Trying to do
+  // so caused the kernel to stop delivering data to us
+  // if a serious network congestion was encountered.
+  //
+
+  if (control -> ProxyMode == proxy_client)
+  {
+    if (control -> OptionProxyClientNoDelay != -1)
+    {
+      SetNoDelay(fd_, control -> OptionProxyClientNoDelay);
+    }
+  }
+  else
+  {
+    if (control -> OptionProxyServerNoDelay != -1)
+    {
+      SetNoDelay(fd_, control -> OptionProxyServerNoDelay);
+    }
+  }
+
+  return 1;
+}
+
+int Proxy::handleLinkConfiguration()
+{
+  #ifdef TEST
+  *logofs << "Proxy: Propagating parameters to "
+          << "channels' read buffers.\n"
+          << logofs_flush;
+  #endif
+
+  T_list &channelList = activeChannels_.getList();
+
+  for (T_list::iterator j = channelList.begin();
+           j != channelList.end(); j++)
+  {
+    int channelId = *j;
+
+    if (channels_[channelId] != NULL)
+    {
+      channels_[channelId] -> handleConfiguration();
+    }
+  }
+
+  #ifdef TEST
+  *logofs << "Proxy: Propagating parameters to "
+          << "proxy buffers.\n"
+          << logofs_flush;
+  #endif
+
+  readBuffer_.setSize(control -> ProxyInitialReadSize,
+                          control -> ProxyMaximumBufferSize);
+
+  encodeBuffer_.setSize(control -> TransportProxyBufferSize,
+                            control -> TransportProxyBufferThreshold,
+                                control -> TransportMaximumBufferSize);
+
+  transport_ -> setSize(control -> TransportProxyBufferSize,
+                            control -> TransportProxyBufferThreshold,
+                                control -> TransportMaximumBufferSize);
+
+  #ifdef TEST
+  *logofs << "Proxy: Configuring the proxy timeouts.\n"
+          << logofs_flush;
+  #endif
+
+  timeouts_.split  = control -> SplitTimeout;
+  timeouts_.motion = control -> MotionTimeout;
+
+  #ifdef TEST
+  *logofs << "Proxy: Configuring the proxy tokens.\n"
+          << logofs_flush;
+  #endif
+
+  tokens_[token_control].size  = control -> TokenSize;
+  tokens_[token_control].limit = control -> TokenLimit;
+
+  if (tokens_[token_control].limit < 1)
+  {
+    tokens_[token_control].limit = 1;
+  }
+
+  #if defined(TEST) || defined(INFO) || defined(LIMIT)
+  *logofs << "Proxy: TOKEN! LIMIT! Setting token ["
+          << DumpToken(token_control) << "] size to "
+          << tokens_[token_control].size << " and limit to "
+          << tokens_[token_control].limit << ".\n"
+          << logofs_flush;
+  #endif
+
+  tokens_[token_split].size  = control -> TokenSize;
+  tokens_[token_split].limit = control -> TokenLimit / 2;
+
+  if (tokens_[token_split].limit < 1)
+  {
+    tokens_[token_split].limit = 1;
+  }
+
+  #if defined(TEST) || defined(INFO) || defined(LIMIT)
+  *logofs << "Proxy: TOKEN! LIMIT! Setting token ["
+          << DumpToken(token_split) << "] size to "
+          << tokens_[token_split].size << " and limit to "
+          << tokens_[token_split].limit << ".\n"
+          << logofs_flush;
+  #endif
+
+  tokens_[token_data].size  = control -> TokenSize;
+  tokens_[token_data].limit = control -> TokenLimit / 4;
+
+  if (tokens_[token_data].limit < 1)
+  {
+    tokens_[token_data].limit = 1;
+  }
+
+  #if defined(TEST) || defined(INFO) || defined(LIMIT)
+  *logofs << "Proxy: TOKEN! LIMIT! Setting token ["
+          << DumpToken(token_data) << "] size to "
+          << tokens_[token_data].size << " and limit to "
+          << tokens_[token_data].limit << ".\n"
+          << logofs_flush;
+  #endif
+
+  for (int i = token_control; i <= token_data; i++)
+  {
+    tokens_[i].remaining = tokens_[i].limit;
+  }
+
+  #if defined(TEST) || defined(INFO) || defined(LIMIT)
+  *logofs << "Proxy: LIMIT! Using client bitrate "
+          << "limit " << control -> ClientBitrateLimit
+          << " server bitrate limit " << control ->
+             ServerBitrateLimit << " with local limit "
+          << control -> LocalBitrateLimit << ".\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // Set the other parameters based on
+  // the token size.
+  //
+
+  int base = control -> TokenSize;
+
+  control -> SplitDataThreshold   = base * 4;
+  control -> SplitDataPacketLimit = base / 2;
+
+  #if defined(TEST) || defined(INFO)
+  *logofs << "Proxy: LIMIT! Setting split data threshold "
+          << "to " << control -> SplitDataThreshold
+          << " split packet limit to " << control ->
+             SplitDataPacketLimit << " with base "
+          << base << ".\n" << logofs_flush;
+  #endif
+
+  //
+  // Set the number of bytes read from the
+  // data channels at each loop. This will
+  // basically determine the maximum band-
+  // width available for the generic chan-
+  // nels.
+  //
+
+  control -> GenericInitialReadSize   = base / 2;
+  control -> GenericMaximumBufferSize = base / 2;
+
+  #if defined(TEST) || defined(INFO)
+  *logofs << "Proxy: LIMIT! Setting generic channel "
+          << "initial read size to " << control ->
+             GenericInitialReadSize << " maximum read "
+          << "size to " << control -> GenericMaximumBufferSize
+          << " with base " << base << ".\n"
+          << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int Proxy::handleCacheConfiguration()
+{
+  #ifdef TEST
+  *logofs << "Proxy: Configuring cache according to pack parameters.\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // Further adjust the cache parameters. If
+  // packing of the images is enabled, reduce
+  // the size available for plain images.
+  //
+
+  if (control -> SessionMode == session_agent)
+  {
+    if (control -> PackMethod != NO_PACK)
+    {
+      clientStore_ -> getRequestStore(X_PutImage) ->
+          cacheThreshold = PUTIMAGE_CACHE_THRESHOLD_IF_PACKED;
+
+      clientStore_ -> getRequestStore(X_PutImage) ->
+          cacheLowerThreshold = PUTIMAGE_CACHE_LOWER_THRESHOLD_IF_PACKED;
+    }
+  }
+
+  //
+  // If this is a shadow session increase the
+  // size of the image cache.
+  //
+
+  if (control -> SessionMode == session_shadow)
+  {
+    if (control -> PackMethod != NO_PACK)
+    {
+      clientStore_ -> getRequestStore(X_NXPutPackedImage) ->
+          cacheThreshold = PUTPACKEDIMAGE_CACHE_THRESHOLD_IF_PACKED_SHADOW;
+
+      clientStore_ -> getRequestStore(X_NXPutPackedImage) ->
+          cacheLowerThreshold = PUTPACKEDIMAGE_CACHE_LOWER_THRESHOLD_IF_PACKED_SHADOW;
+    }
+    else
+    {
+      clientStore_ -> getRequestStore(X_PutImage) ->
+          cacheThreshold = PUTIMAGE_CACHE_THRESHOLD_IF_SHADOW;
+
+      clientStore_ -> getRequestStore(X_PutImage) ->
+          cacheLowerThreshold = PUTIMAGE_CACHE_LOWER_THRESHOLD_IF_SHADOW;
+    }
+  }
+
+  return 1;
+}
+
+int Proxy::handleSaveStores()
+{
+  //
+  // Save content of stores on disk.
+  //
+
+  char *cacheToAdopt = NULL;
+
+  //
+  // Set to false the indicator for cumulative store
+  // size too small
+  //
+  bool isTooSmall = false;
+
+  if (control -> PersistentCacheEnableSave)
+  {
+    #ifdef TEST
+    *logofs << "Proxy: Going to save content of client store.\n"
+            << logofs_flush;
+    #endif
+
+    cacheToAdopt = handleSaveAllStores(control -> PersistentCachePath, isTooSmall);
+  }
+  #ifdef TEST
+  else
+  {
+    if (control -> ProxyMode == proxy_client)
+    {
+      *logofs << "Proxy: Saving persistent cache to disk disabled.\n"
+              << logofs_flush;
+    }
+    else
+    {
+      *logofs << "Proxy: PANIC! Protocol violation in command save.\n"
+              << logofs_flush;
+
+      cerr << "Error" << ": Protocol violation in command save.\n";
+
+      HandleCleanup();
+    }
+  }
+  #endif
+
+  if (cacheToAdopt != NULL)
+  {
+    //
+    // Do we have a cache already?
+    //
+
+    if (control -> PersistentCacheName != NULL)
+    {
+      //
+      // Check if old and new cache are the same.
+      // In this case don't remove the old cache.
+      //
+
+      if (strcasecmp(control -> PersistentCacheName, cacheToAdopt) != 0)
+      {
+        handleResetPersistentCache();
+      }
+
+      delete [] control -> PersistentCacheName;
+    }
+
+    #ifdef TEST
+    *logofs << "Proxy: Setting current persistent cache file to '"
+            << cacheToAdopt << "'\n" << logofs_flush;
+    #endif
+
+    control -> PersistentCacheName = cacheToAdopt;
+
+    return 1;
+  }
+  else
+  {
+    #ifdef TEST
+      *logofs << "Proxy: No cache file produced from message stores.\n"
+              << logofs_flush;
+    #endif
+
+    //
+    // It can be that we didn't generate a new cache
+    // because store was too small or persistent cache
+    // was disabled. This is not an error.
+    //
+
+    if (control -> PersistentCacheEnableSave && !isTooSmall)
+    {
+      return -1;
+    }
+    else
+    {
+      return 0;
+    }
+  }
+}
+
+int Proxy::handleLoadStores()
+{
+  //
+  // Restore the content of the client store
+  // from disk if a valid cache was negotiated
+  // at session startup.
+  //
+
+  if (control -> PersistentCacheEnableLoad == 1 &&
+          control -> PersistentCachePath != NULL &&
+              control -> PersistentCacheName != NULL)
+  {
+    #ifdef TEST
+    *logofs << "Proxy: Going to load content of client store.\n"
+            << logofs_flush;
+    #endif
+
+    //
+    // Returns the same string passed as name of
+    // the cache, or NULL if it was not possible
+    // to load the cache from disk.
+    //
+
+    if (handleLoadAllStores(control -> PersistentCachePath,
+                                control -> PersistentCacheName) == NULL)
+    {
+      //
+      // The corrupted cache should have been
+      // removed from disk. Get rid of the
+      // reference so we don't try to delete
+      // it once again.
+      //
+
+      if (control -> PersistentCacheName != NULL)
+      {
+        delete [] control -> PersistentCacheName;
+      }
+
+      control -> PersistentCacheName = NULL;
+ 
+      return -1;
+    }
+
+    //
+    // Set timestamp of last time cache
+    // was loaded from data on disk.
+    //
+
+    timeouts_.loadTs = getTimestamp();
+
+    return 1;
+  }
+  #ifdef TEST
+  else
+  {
+    if (control -> ProxyMode == proxy_client)
+    {
+      *logofs << "Proxy: Loading of cache disabled or no cache file selected.\n"
+              << logofs_flush;
+    }
+    else
+    {
+      *logofs << "Proxy: PANIC! Protocol violation in command load.\n"
+              << logofs_flush;
+
+      cerr << "Error" << ": Protocol violation in command load.\n";
+
+      HandleCleanup();
+    }
+  }
+  #endif
+
+  return 0;
+}
+
+int Proxy::handleControl(T_proxy_code code, int data)
+{
+  //
+  // Send the given control messages
+  // to the remote proxy.
+  //
+
+  #if defined(TEST) || defined(INFO)
+
+  if (data != -1)
+  {
+    if (code == code_control_token_reply ||
+            code == code_split_token_reply ||
+                code == code_data_token_reply)
+    {
+      *logofs << "Proxy: TOKEN! Sending message '" << DumpControl(code)
+              << "' at " << strMsTimestamp() << " with count "
+              << data << ".\n" << logofs_flush;
+    }
+    else
+    {
+      *logofs << "Proxy: Sending message '" << DumpControl(code)
+              << "' at " << strMsTimestamp() << " with data ID#"
+              << data << ".\n" << logofs_flush;
+    }
+  }
+  else
+  {
+    *logofs << "Proxy: Sending message '" << DumpControl(code)
+            << "' at " << strMsTimestamp() << ".\n"
+            << logofs_flush;
+  }
+
+  #endif
+
+  //
+  // Add the control message and see if the
+  // data has to be flushed immediately.
+  //
+
+  if (addControlCodes(code, data) < 0)
+  {
+    return -1;
+  }
+
+  switch (code)
+  {
+    //
+    // Append the first data read from the opened
+    // channel to the control code.
+    // 
+
+    case code_new_x_connection:
+    case code_new_cups_connection:
+    case code_new_aux_connection:
+    case code_new_smb_connection:
+    case code_new_media_connection:
+    case code_new_http_connection:
+    case code_new_font_connection:
+    case code_new_slave_connection:
+
+    //
+    // Do we send the token reply immediately?
+    // The control messages are put at the begin-
+    // ning of the of the encode buffer, so we may
+    // reply to multiple tokens before having the
+    // chance of handling the actual frame data.
+    // On the other hand, the sooner we reply, the
+    // sooner the remote proxy is restarted.
+    //
+
+    case code_control_token_reply:
+    case code_split_token_reply:
+    case code_data_token_reply:
+    {
+      break;
+    }
+
+    //
+    // Also send the congestion control codes
+    // immediately.
+    //
+    // case code_begin_congestion:
+    // case code_end_congestion:
+    //
+
+    default:
+    {
+      priority_ = 1;
+
+      break;
+    }
+  }
+
+  if (priority_ == 1)
+  {
+    if (handleFrame(frame_data) < 0)
+    {
+      return -1;
+    }
+  }
+
+  return 1;
+}
+
+int Proxy::handleSwitch(int channelId)
+{
+  //
+  // If data is for a different channel than last
+  // selected for output, prepend to the data the
+  // new channel id.
+  //
+
+  #ifdef DEBUG
+  *logofs << "Proxy: Requested a switch with "
+          << "current channel ID#" << outputChannel_
+          << " new channel ID#" << channelId << ".\n"
+          << logofs_flush;
+  #endif
+
+  if (channelId != outputChannel_)
+  {
+    if (needFlush() == 1)
+    {
+      #if defined(TEST) || defined(INFO) || defined(FLUSH)
+      *logofs << "Proxy: WARNING! Flushing data for the "
+              << "previous channel ID#" << outputChannel_
+              << ".\n" << logofs_flush;
+      #endif
+
+      if (handleFrame(frame_data) < 0)
+      {
+        return -1;
+      }
+    }
+
+    #if defined(TEST) || defined(INFO)
+    *logofs << "Proxy: Sending message '"
+            << DumpControl(code_switch_connection) << "' at "
+            << strMsTimestamp() << " with FD#" << getFd(channelId)
+            << " channel ID#" << channelId << ".\n"
+            << logofs_flush;
+    #endif
+
+    if (addControlCodes(code_switch_connection, channelId) < 0)
+    {
+      return -1;
+    }
+
+    outputChannel_ = channelId;
+  }
+
+  return 1;
+}
+
+int Proxy::addTokenCodes(T_proxy_token &token)
+{
+  #if defined(TEST) || defined(INFO) || defined(TOKEN)
+  *logofs << "Proxy: TOKEN! Sending token ["
+          << DumpToken(token.type) << "] with "
+          << token.bytes << " bytes accumulated size "
+          << token.size << " and " << token.remaining
+          << " available.\n" << logofs_flush;
+  #endif
+
+  //
+  // Give a 'weight' to the token. The tokens
+  // remaining can become negative if we sent
+  // a packet that was exceptionally big.
+  //
+
+  int count = 0;
+
+  // Since ProtoStep7 (#issue 108)
+  count = token.bytes / token.size;
+
+  //
+  // Force a count of 1, for example
+  // if this is a ping.
+  //
+
+  if (count < 1)
+  {
+    count = 1;
+
+    token.bytes = 0;
+  }
+  else
+  {
+    // Since ProtoStep7 (#issue 108)
+    if (count > 255)
+    {
+      count = 255;
+    }
+
+    //
+    // Let the next token account for the
+    // remaining bytes.
+    //
+
+    token.bytes %= token.size;
+  }
+
+  #if defined(TEST) || defined(INFO) || defined(TOKEN)
+  *logofs << "Proxy: Sending message '"
+          << DumpControl(token.request) << "' at "
+          << strMsTimestamp() << " with count " << count
+          << ".\n" << logofs_flush;
+  #endif
+
+  controlCodes_[controlLength_++] = 0;
+  controlCodes_[controlLength_++] = (unsigned char) token.request;
+  controlCodes_[controlLength_++] = (unsigned char) count;
+
+  statistics -> addFrameOut();
+
+  token.remaining -= count;
+
+  return 1;
+}
+
+int Proxy::handleToken(T_frame_type type)
+{
+  #if defined(TEST) || defined(INFO) || defined(TOKEN)
+  *logofs << "Proxy: TOKEN! Checking tokens with "
+          << "frame type [";
+
+  *logofs << (type == frame_ping ? "frame_ping" : "frame_data");
+
+  *logofs << "] with stream ratio " << statistics ->
+             getStreamRatio() << ".\n" << logofs_flush;
+  #endif
+
+  if (type == frame_data)
+  {
+    //
+    // Since ProtoStep7 (#issue 108)
+    //
+
+    // Send a distinct token for each data type.
+    // We don't want to slow down the sending of
+    // the X events, X replies and split confir-
+    // mation events on the X server side, so
+    // take care only of the generic data token.
+    //
+
+    if (control -> ProxyMode == proxy_client)
+    {
+      statistics -> updateControlToken(tokens_[token_control].bytes);
+
+      if (tokens_[token_control].bytes > tokens_[token_control].size)
+      {
+        if (addTokenCodes(tokens_[token_control]) < 0)
+        {
+          return -1;
+        }
+
+        #if defined(TEST) || defined(INFO) || defined(TOKEN)
+
+        T_proxy_token &token = tokens_[token_control];
+
+        *logofs << "Proxy: TOKEN! Token class ["
+                << DumpToken(token.type) << "] has now "
+                << token.bytes << " bytes accumulated and "
+                << token.remaining << " tokens remaining.\n"
+                << logofs_flush;
+        #endif
+      }
+
+      statistics -> updateSplitToken(tokens_[token_split].bytes);
+
+      if (tokens_[token_split].bytes > tokens_[token_split].size)
+      {
+        if (addTokenCodes(tokens_[token_split]) < 0)
+        {
+          return -1;
+        }
+
+        #if defined(TEST) || defined(INFO) || defined(TOKEN)
+
+        T_proxy_token &token = tokens_[token_split];
+
+        *logofs << "Proxy: TOKEN! Token class ["
+                << DumpToken(token.type) << "] has now "
+                << token.bytes << " bytes accumulated and "
+                << token.remaining << " tokens remaining.\n"
+                << logofs_flush;
+        #endif
+      }
+    }
+
+    statistics -> updateDataToken(tokens_[token_data].bytes);
+
+    if (tokens_[token_data].bytes > tokens_[token_data].size)
+    {
+      if (addTokenCodes(tokens_[token_data]) < 0)
+      {
+        return -1;
+      }
+
+      #if defined(TEST) || defined(INFO) || defined(TOKEN)
+
+      T_proxy_token &token = tokens_[token_data];
+
+      *logofs << "Proxy: TOKEN! Token class ["
+              << DumpToken(token.type) << "] has now "
+              << token.bytes << " bytes accumulated and "
+              << token.remaining << " tokens remaining.\n"
+              << logofs_flush;
+      #endif
+    }
+  }
+  else
+  {
+    if (addTokenCodes(tokens_[token_control]) < 0)
+    {
+      return -1;
+    }
+
+    //
+    // Reset all counters on a ping.
+    //
+
+    tokens_[token_control].bytes = 0;
+    tokens_[token_split].bytes   = 0;
+    tokens_[token_data].bytes    = 0;
+
+    #if defined(TEST) || defined(INFO) || defined(TOKEN)
+
+    T_proxy_token &token = tokens_[token_control];
+
+    *logofs << "Proxy: TOKEN! Token class ["
+            << DumpToken(token.type) << "] has now "
+            << token.bytes << " bytes accumulated and "
+            << token.remaining << " tokens remaining.\n"
+            << logofs_flush;
+    #endif
+  }
+
+  //
+  // Check if we have entered in
+  // congestion state.
+  //
+
+  if (congestion_ == 0 &&
+          tokens_[token_control].remaining <= 0)
+  {
+    #if defined(TEST) || defined(INFO)
+    *logofs << "Proxy: Entering congestion with "
+            << tokens_[token_control].remaining
+            << " tokens remaining.\n" << logofs_flush;
+    #endif
+
+    congestion_ = 1;
+  }
+
+  statistics -> updateCongestion(tokens_[token_control].remaining,
+                                     tokens_[token_control].limit);
+
+  return 1;
+}
+
+int Proxy::handleTokenFromProxy(T_proxy_token &token, int count)
+{
+  #if defined(TEST) || defined(INFO) || defined(TOKEN)
+  *logofs << "Proxy: TOKEN! Received token ["
+          << DumpToken(token.type) << "] request at "
+          << strMsTimestamp() << " with count "
+          << count << ".\n" << logofs_flush;
+  #endif
+
+  //
+  // Since ProtoStep7 (#issue 108) with no limitations
+  // concerning invalid token requests at this point
+  //
+
+  //
+  // Add our token reply.
+  //
+
+  if (handleControl(token.reply, count) < 0)
+  {
+    return -1;
+  }
+
+  return 1;
+}
+
+int Proxy::handleTokenReplyFromProxy(T_proxy_token &token, int count)
+{
+  #if defined(TEST) || defined(INFO) || defined(TOKEN)
+  *logofs << "Proxy: TOKEN! Received token ["
+          << DumpToken(token.type) << "] reply at "
+          << strMsTimestamp() << " with count " << count
+          << ".\n" << logofs_flush;
+  #endif
+
+  //
+  // Since ProtoStep7 (#issue 108) with no limitations
+  // concerning invalid token requests at this point
+  //
+
+  //
+  // Increment the available tokens.
+  //
+
+  token.remaining += count;
+
+  if (token.remaining > token.limit)
+  {
+    #ifdef PANIC
+    *logofs << "Proxy: PANIC! Token overflow handling messages.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Token overflow handling messages.\n";
+
+    HandleCleanup();
+  }
+
+  #if defined(TEST) || defined(INFO) || defined(TOKEN)
+  *logofs << "Proxy: TOKEN! Token class ["
+          << DumpToken(token.type) << "] has now " << token.bytes
+          << " bytes accumulated and " << token.remaining
+          << " tokens remaining.\n" << logofs_flush;
+  #endif
+
+  //
+  // Check if we can jump out of the
+  // congestion state.
+  //
+
+  if (congestion_ == 1 &&
+          tokens_[token_control].remaining > 0)
+  {
+    #if defined(TEST) || defined(INFO)
+    *logofs << "Proxy: Exiting congestion with "
+            << tokens_[token_control].remaining
+            << " tokens remaining.\n" << logofs_flush;
+    #endif
+
+    congestion_ = 0;
+  }
+
+  statistics -> updateCongestion(tokens_[token_control].remaining,
+                                     tokens_[token_control].limit);
+
+  return 1;
+}
+
+void Proxy::handleFailOnSave(const char *fullName, const char *failContext) const
+{
+  #ifdef WARNING
+  *logofs << "Proxy: WARNING! Error saving stores to cache file "
+          << "in context [" << failContext << "].\n" << logofs_flush;
+  #endif
+
+  cerr << "Warning" << ": Error saving stores to cache file "
+       << "in context [" << failContext << "].\n";
+
+  #ifdef WARNING
+  *logofs << "Proxy: WARNING! Removing invalid cache '"
+          << fullName << "'.\n" << logofs_flush;
+  #endif
+
+  cerr << "Warning" << ": Removing invalid cache '"
+       << fullName << "'.\n";
+
+  unlink(fullName);
+}
+
+void Proxy::handleFailOnLoad(const char *fullName, const char *failContext) const
+{
+  #ifdef WARNING
+  *logofs << "Proxy: WARNING! Error loading stores from cache file "
+          << "in context [" << failContext << "].\n" << logofs_flush;
+  #endif
+
+  cerr << "Warning" << ": Error loading stores from cache file "
+       << "in context [" << failContext << "].\n";
+
+  #ifdef WARNING
+  *logofs << "Proxy: WARNING! Removing invalid cache '"
+          << fullName << "'.\n" << logofs_flush;
+  #endif
+
+  cerr << "Warning" << ": Removing invalid cache '"
+       << fullName << "'.\n";
+
+  unlink(fullName);
+}
+
+int Proxy::handleSaveVersion(unsigned char *buffer, int &major,
+                                 int &minor, int &patch) const
+{
+  // Since ProtoStep8 (#issue 108)
+  major = 3;
+  minor = 0;
+  patch = 0;
+
+  *(buffer + 0) = major;
+  *(buffer + 1) = minor;
+
+  PutUINT(patch, buffer + 2, storeBigEndian());
+
+  return 1;
+}
+
+int Proxy::handleLoadVersion(const unsigned char *buffer, int &major,
+                                 int &minor, int &patch) const
+{
+  major = *(buffer + 0);
+  minor = *(buffer + 1);
+
+  patch = GetUINT(buffer + 2, storeBigEndian());
+
+  //
+  // Force the proxy to discard the
+  // incompatible caches.
+  // 
+
+  // Since ProtoStep8 (#issue 108)
+  if (major < 3)
+  {
+    return -1;
+  }
+
+  return 1;
+}
+
+char *Proxy::handleSaveAllStores(const char *savePath, bool & isTooSmall) const
+{
+  isTooSmall = false;
+
+  int cumulativeSize = MessageStore::getCumulativeTotalStorageSize();
+
+  if (cumulativeSize < control -> PersistentCacheThreshold)
+  {
+    #ifdef TEST
+    *logofs << "Proxy: Cache not saved as size is "
+            << cumulativeSize << " with threshold set to "
+            << control -> PersistentCacheThreshold
+            << ".\n" << logofs_flush;
+    #endif
+
+    //
+    // Cumulative store size is smaller than threshold
+    // so the indicator is set to true
+    //
+
+    isTooSmall = true;
+
+    return NULL;
+  }
+  else if (savePath == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "Proxy: PANIC! No name provided for save path.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": No name provided for save path.\n";
+
+    return NULL;
+  }
+
+  #ifdef TEST
+  *logofs << "Proxy: Going to save content of message stores.\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // Our parent process is likely going to terminate.
+  // Until we finish saving cache we must ignore its
+  // SIGIPE.
+  //
+
+  DisableSignals();
+
+  ofstream *cachefs = NULL;
+
+  md5_state_t *md5StateStream = NULL;
+  md5_byte_t  *md5DigestStream = NULL;
+
+  md5_state_t *md5StateClient = NULL;
+  md5_byte_t  *md5DigestClient = NULL;
+
+  char md5String[MD5_LENGTH * 2 + 2];
+
+  char fullName[strlen(savePath) + MD5_LENGTH * 2 + 4];
+
+  //
+  // Prepare the template for the temporary file
+  //
+
+  const char* const uniqueTemplate = "XXXXXX";
+  char tempName[strlen(savePath) + strlen("/") + 4 + strlen(uniqueTemplate) + 1];
+
+  snprintf(tempName, sizeof tempName, "%s/%s%s",
+               savePath,
+               control -> ProxyMode == proxy_client ?
+                   "Z-C-" :
+                   "Z-S-",
+               uniqueTemplate);
+
+  #ifdef TEST
+  *logofs << "Proxy: Generating temporary file with template '"
+          << tempName << "'.\n" << logofs_flush;
+  #endif
+
+  //
+  // Change the mask to make the file only
+  // readable by the user, then restore the
+  // old mask.
+  //
+
+  mode_t fileMode = umask(0077);
+
+  //
+  // Generate a unique temporary filename from tempName
+  // and then create and open the file
+  //
+
+  int fdTemp = mkstemp(tempName);
+  if (fdTemp == -1)
+  {
+    #ifdef PANIC
+    *logofs << "Proxy: PANIC! Can't create temporary file in '"
+            << savePath << "'. Cause = " << strerror(errno) << ".\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Can't create temporary file in '"
+         << savePath << "'. Cause = " << strerror(errno) << ".\n";
+
+    umask(fileMode);
+
+    EnableSignals();
+
+    return NULL;
+  }
+
+  #ifdef TEST
+  *logofs << "Proxy: Saving cache to file '"
+          << tempName << "'.\n" << logofs_flush;
+  #endif
+
+  //
+  // Create and open the output stream for the new temporary
+  // file
+  //
+
+  cachefs = new (std::nothrow) ofstream(tempName, ios::out | ios::binary);
+  if ((cachefs == NULL) || cachefs->fail())
+  {
+    #ifdef PANIC
+    *logofs << "Proxy: PANIC! Can't create stream for temporary file '"
+            << tempName << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Can't create stream for temporary file '"
+         << tempName << "'.\n";
+
+    close(fdTemp);
+    unlink(tempName);
+
+    umask(fileMode);
+
+    EnableSignals();
+
+    return NULL;
+  }
+
+  //
+  // Close the file descriptor returned by mkstemp
+  // and restore the old mask
+  //
+
+  close(fdTemp);
+  umask(fileMode);
+
+  md5StateStream  = new md5_state_t();
+  md5DigestStream = new md5_byte_t[MD5_LENGTH];
+
+  md5_init(md5StateStream);
+
+  //
+  // First write the proxy version.
+  //
+
+  unsigned char version[4];
+
+  int major;
+  int minor;
+  int patch;
+
+  handleSaveVersion(version, major, minor, patch);
+
+  #ifdef TEST
+  *logofs << "Proxy: Saving cache using version '"
+          << major << "." << minor << "." << patch
+          << "'.\n" << logofs_flush;
+  #endif
+
+  if (PutData(cachefs, version, 4) < 0)
+  {
+    handleFailOnSave(tempName, "A");
+
+    delete cachefs;
+
+    delete md5StateStream;
+    delete [] md5DigestStream;
+
+    EnableSignals();
+
+    return NULL;
+  }
+
+  //
+  // Make space for the calculated MD5 so we
+  // can later rewind the file and write it
+  // at this position.
+  //
+
+  if (PutData(cachefs, md5DigestStream, MD5_LENGTH) < 0)
+  {
+    handleFailOnSave(tempName, "B");
+
+    delete cachefs;
+
+    delete md5StateStream;
+    delete [] md5DigestStream;
+
+    EnableSignals();
+
+    return NULL;
+  }
+
+  md5StateClient  = new md5_state_t();
+  md5DigestClient = new md5_byte_t[MD5_LENGTH];
+
+  md5_init(md5StateClient);
+
+  #ifdef DUMP
+
+  ofstream *cacheDump = NULL;
+
+  ofstream *tempfs = (ofstream*) logofs;
+
+  char cacheDumpName[DEFAULT_STRING_LENGTH];
+
+  if (control -> ProxyMode == proxy_client)
+  {
+    snprintf(cacheDumpName, DEFAULT_STRING_LENGTH - 1,
+                 "%s/client-cache-dump", control -> TempPath);
+  }
+  else
+  {
+    snprintf(cacheDumpName, DEFAULT_STRING_LENGTH - 1,
+                 "%s/server-cache-dump", control -> TempPath);
+  }
+
+  *(cacheDumpName + DEFAULT_STRING_LENGTH - 1) = '\0';
+
+  fileMode = umask(0077);
+
+  cacheDump = new ofstream(cacheDumpName, ios::out);
+
+  umask(fileMode);
+
+  logofs = cacheDump;
+
+  #endif
+
+  //
+  // Use the virtual method of the concrete proxy class.
+  //
+
+  int allSaved = handleSaveAllStores(cachefs, md5StateStream, md5StateClient);
+
+  #ifdef DUMP
+
+  logofs = tempfs;
+
+  delete cacheDump;
+
+  #endif
+
+  if (allSaved == -1)
+  {
+    handleFailOnSave(tempName, "C");
+
+    delete cachefs;
+
+    delete md5StateStream;
+    delete [] md5DigestStream;
+
+    delete md5StateClient;
+    delete [] md5DigestClient;
+
+    EnableSignals();
+
+    return NULL;
+  }
+
+  md5_finish(md5StateClient, md5DigestClient);
+
+  for (unsigned int i = 0; i < MD5_LENGTH; i++)
+  {
+    sprintf(md5String + (i * 2), "%02X", md5DigestClient[i]);
+  }
+
+  strcpy(fullName, (control -> ProxyMode == proxy_client) ? "C-" : "S-");
+
+  strcat(fullName, md5String);
+
+  md5_append(md5StateStream, (const md5_byte_t *) fullName, strlen(fullName));
+  md5_finish(md5StateStream, md5DigestStream);
+
+  //
+  // Go to the beginning of file plus
+  // the integer where we wrote our
+  // proxy version.
+  //
+
+  cachefs -> seekp(4);
+
+  if (PutData(cachefs, md5DigestStream, MD5_LENGTH) < 0)
+  {
+    handleFailOnSave(tempName, "D");
+
+    delete cachefs;
+
+    delete md5StateStream;
+    delete [] md5DigestStream;
+
+    delete md5StateClient;
+    delete [] md5DigestClient;
+
+    EnableSignals();
+
+    return NULL;
+  }
+
+  delete cachefs;
+
+  //
+  // Copy the resulting cache name without
+  // the path so that we can return it to
+  // the caller.
+  //
+
+  char *cacheName = new char[MD5_LENGTH * 2 + 4];
+
+  strcpy(cacheName, fullName);
+
+  //
+  // Add the path to the full name and move
+  // the cache into the path.
+  //
+
+  strcpy(fullName, savePath);
+  strcat(fullName, (control -> ProxyMode == proxy_client) ? "/C-" : "/S-");
+  strcat(fullName, md5String);
+
+  #ifdef TEST
+  *logofs << "Proxy: Renaming cache file from '"
+          << tempName << "' to '" << fullName
+          << "'.\n" << logofs_flush;
+  #endif
+
+  rename(tempName, fullName);
+
+  delete md5StateStream;
+  delete [] md5DigestStream;
+
+  delete md5StateClient;
+  delete [] md5DigestClient;
+
+  //
+  // Restore the original handlers.
+  //
+
+  EnableSignals();
+
+  #ifdef TEST
+  *logofs << "Proxy: Successfully saved cache file '"
+          << cacheName << "'.\n" << logofs_flush;
+  #endif
+
+  //
+  // This must be enabled only for test
+  // because it requires that client and
+  // server reside on the same machine.
+  //
+
+  if (control -> PersistentCacheCheckOnShutdown == 1 &&
+          control -> ProxyMode == proxy_server)
+  {
+    #if defined(TEST) || defined(INFO)
+    *logofs << "Proxy: MATCH! Checking if the file '"
+            << fullName << "' matches a client cache.\n"
+            << logofs_flush;
+    #endif
+
+    strcpy(fullName, savePath);
+    strcat(fullName, "/C-");
+    strcat(fullName, md5String);
+
+    struct stat fileStat;
+
+    if (stat(fullName, &fileStat) != 0)
+    {
+      #ifdef PANIC
+      *logofs << "Proxy: PANIC! Can't find a client cache "
+              << "with name '" << fullName << "'.\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Can't find a client cache "
+           << "with name '" << fullName << "'.\n";
+
+      HandleShutdown();
+    }
+
+    #if defined(TEST) || defined(INFO)
+    *logofs << "Proxy: MATCH! Client cache '" << fullName
+            << "' matches the local cache.\n"
+            << logofs_flush;
+    #endif
+  }
+
+  return cacheName;
+}
+
+const char *Proxy::handleLoadAllStores(const char *loadPath, const char *loadName) const
+{
+  #ifdef TEST
+  *logofs << "Proxy: Going to load content of message stores.\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // Until we finish loading cache we
+  // must at least ignore any SIGIPE.
+  //
+
+  DisableSignals();
+
+  if (loadPath == NULL || loadName == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "Proxy: PANIC! No path or no file name provided for cache to restore.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": No path or no file name provided for cache to restore.\n";
+
+    EnableSignals();
+
+    return NULL;
+  }
+  else if (strlen(loadName) != MD5_LENGTH * 2 + 2)
+  {
+    #ifdef PANIC
+    *logofs << "Proxy: PANIC! Bad file name provided for cache to restore.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Bad file name provided for cache to restore.\n";
+
+    EnableSignals();
+
+    return NULL;
+  }
+
+  istream *cachefs = NULL;
+  char md5String[(MD5_LENGTH * 2) + 2];
+  md5_byte_t md5FromFile[MD5_LENGTH];
+
+  char *cacheName = new char[strlen(loadPath) + strlen(loadName) + 3];
+
+  strcpy(cacheName, loadPath);
+  strcat(cacheName, "/");
+  strcat(cacheName, loadName);
+
+  #ifdef TEST
+  *logofs << "Proxy: Name of cache file is '"
+          << cacheName << "'.\n" << logofs_flush;
+  #endif
+
+  cachefs = new ifstream(cacheName, ios::in | ios::binary);
+
+  unsigned char version[4];
+
+  if (cachefs == NULL || GetData(cachefs, version, 4) < 0)
+  {
+    #ifdef PANIC
+    *logofs << "Proxy: PANIC! Can't read cache file '"
+            << cacheName << "'.\n" << logofs_flush;;
+    #endif
+
+    handleFailOnLoad(cacheName, "A");
+
+    delete cachefs;
+
+    delete [] cacheName;
+
+    EnableSignals();
+
+    return NULL;
+  }
+
+  int major;
+  int minor;
+  int patch;
+
+  if (handleLoadVersion(version, major, minor, patch) < 0)
+  {
+    #ifdef PANIC
+    *logofs << "Proxy: WARNING! Incompatible version '"
+            << major << "." << minor << "." << patch
+            << "' in cache file '" << cacheName
+            << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Warning" << ": Incompatible version '"
+         << major << "." << minor << "." << patch
+         << "' in cache file '" << cacheName
+         << "'.\n" << logofs_flush;
+
+    if (control -> ProxyMode == proxy_server)
+    {
+      handleFailOnLoad(cacheName, "B");
+    }
+    else
+    {
+      //
+      // Simply remove the cache file.
+      //
+
+      unlink(cacheName);
+    }
+
+    delete cachefs;
+
+    delete [] cacheName;
+
+    EnableSignals();
+
+    return NULL;
+  }
+
+  #ifdef TEST
+  *logofs << "Proxy: Reading from cache file version '"
+          << major << "." << minor << "." << patch
+          << "'.\n" << logofs_flush;
+  #endif
+
+  if (GetData(cachefs, md5FromFile, MD5_LENGTH) < 0)
+  {
+    #ifdef PANIC
+    *logofs << "Proxy: PANIC! No checksum in cache file '"
+            << loadName << "'.\n" << logofs_flush;
+    #endif
+
+    handleFailOnLoad(cacheName, "C");
+
+    delete cachefs;
+
+    delete [] cacheName;
+
+    EnableSignals();
+
+    return NULL;
+  }
+
+  md5_state_t *md5StateStream = NULL;
+  md5_byte_t  *md5DigestStream = NULL;
+
+  md5StateStream  = new md5_state_t();
+  md5DigestStream = new md5_byte_t[MD5_LENGTH];
+
+  md5_init(md5StateStream);
+
+  //
+  // Use the virtual method of the proxy class.
+  //
+
+  if (handleLoadAllStores(cachefs, md5StateStream) < 0)
+  {
+    handleFailOnLoad(cacheName, "D");
+
+    delete cachefs;
+
+    delete md5StateStream;
+    delete [] md5DigestStream;
+
+    delete [] cacheName;
+
+    EnableSignals();
+
+    return NULL;
+  }
+
+  md5_append(md5StateStream, (const md5_byte_t *) loadName, strlen(loadName));
+  md5_finish(md5StateStream, md5DigestStream);
+
+  for (int i = 0; i < MD5_LENGTH; i++)
+  {
+    if (md5DigestStream[i] != md5FromFile[i])
+    {
+      #ifdef PANIC
+
+      *logofs << "Proxy: PANIC! Bad checksum for cache file '"
+              << cacheName << "'.\n" << logofs_flush;
+
+      for (unsigned int i = 0; i < MD5_LENGTH; i++)
+      {
+        sprintf(md5String + (i * 2), "%02X", md5FromFile[i]);
+      }
+
+      *logofs << "Proxy: PANIC! Saved checksum is '"
+              << md5String << "'.\n" << logofs_flush;
+
+      for (unsigned int i = 0; i < MD5_LENGTH; i++)
+      {
+        sprintf(md5String + (i * 2),"%02X", md5DigestStream[i]);
+      }
+
+      *logofs << "Proxy: PANIC! Calculated checksum is '"
+              << md5String << "'.\n" << logofs_flush;
+
+      #endif
+
+      handleFailOnLoad(cacheName, "E");
+
+      delete cachefs;
+
+      delete md5StateStream;
+      delete [] md5DigestStream;
+
+      delete [] cacheName;
+
+      EnableSignals();
+
+      return NULL;
+    }
+  }
+
+  delete cachefs;
+
+  delete md5StateStream;
+  delete [] md5DigestStream;
+
+  delete [] cacheName;
+
+  //
+  // Restore the original handlers.
+  //
+
+  EnableSignals();
+
+  #ifdef TEST
+  *logofs << "Proxy: Successfully loaded cache file '"
+          << loadName << "'.\n" << logofs_flush;
+  #endif
+
+  //
+  // Return the string provided by caller.
+  //
+
+  return loadName;
+}
+
+int Proxy::allocateChannelMap(int fd)
+{
+  //
+  // We assume that the fd is lower than
+  // the maximum allowed number. This is
+  // checked at the time the connection
+  // is accepted.
+  //
+
+  if (fd < 0 || fd >= CONNECTIONS_LIMIT)
+  {
+    #ifdef PANIC
+    *logofs << "Proxy: PANIC! Internal error allocating "
+            << "new channel with FD#" << fd_ << ".\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Internal error allocating "
+         << "new channel with FD#" << fd_ << ".\n";
+
+    HandleCleanup();
+  }
+
+  for (int channelId = 0;
+           channelId < CONNECTIONS_LIMIT;
+               channelId++)
+  {
+    if (checkLocalChannelMap(channelId) == 1 &&
+            fdMap_[channelId] == -1)
+    {
+      fdMap_[channelId] = fd;
+      channelMap_[fd] = channelId;
+
+      #ifdef TEST
+      *logofs << "Proxy: Allocated new channel ID#"
+              << channelId << " with FD#" << fd << ".\n"
+              << logofs_flush;
+      #endif
+
+      return channelId;
+    }
+  }
+
+  //
+  // No available channel is remaining.
+  //
+
+  #ifdef TEST
+  *logofs << "Proxy: WARNING! Can't allocate a new channel "
+          << "for FD#" << fd_ << ".\n" << logofs_flush;
+  #endif
+
+  return -1;
+}
+
+int Proxy::checkChannelMap(int channelId)
+{
+  //
+  // To be acceptable, the channel id must
+  // be an id that is not possible to use
+  // to allocate channels at this side.
+  //
+
+  if (checkLocalChannelMap(channelId) == 1)
+  {
+    #ifdef PANIC
+    *logofs << "Proxy: PANIC! Can't open a new channel "
+            << "with invalid ID#" << channelId << ".\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Can't open a new channel "
+         << "with invalid ID#" << channelId << ".\n";
+
+    return -1;
+  }
+  else if (channels_[channelId] != NULL)
+  {
+    #ifdef PANIC
+    *logofs << "Proxy: PANIC! Can't open a new channel "
+            << "over an existing ID#" << channelId
+            << " with FD#" << getFd(channelId)
+            << ".\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Can't open a new channel "
+         << "over an existing ID#" << channelId
+         << " with FD#" << getFd(channelId)
+         << ".\n";
+
+    return -1;
+  }
+
+  return 1;
+}
+
+int Proxy::assignChannelMap(int channelId, int fd)
+{
+  //
+  // We assume that the fd is lower than
+  // the maximum allowed number. This is
+  // checked at the time the connection
+  // is accepted.
+  //
+
+  if (channelId < 0 || channelId >= CONNECTIONS_LIMIT ||
+          fd < 0 || fd >= CONNECTIONS_LIMIT)
+  {
+    #ifdef PANIC
+    *logofs << "Proxy: PANIC! Internal error assigning "
+            << "new channel with FD#" << fd_ << ".\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Internal error assigning "
+         << "new channel with FD#" << fd_ << ".\n";
+
+    HandleCleanup();
+  }
+
+  fdMap_[channelId] = fd;
+  channelMap_[fd] = channelId;
+
+  return 1;
+}
+
+void Proxy::cleanupChannelMap(int channelId)
+{
+  int fd = fdMap_[channelId];
+
+  if (fd != -1)
+  {
+    fdMap_[channelId] = -1;
+    channelMap_[fd] = -1;
+  }
+}
+
+int Proxy::addControlCodes(T_proxy_code code, int data)
+{
+  //
+  // Flush the encode buffer plus all the outstanding
+  // control codes if there is not enough space for
+  // the new control message. We need to ensure that
+  // there are further bytes available, in the case
+  // we will need to add more token control messages.
+  //
+
+  if (controlLength_ + 3 > CONTROL_CODES_THRESHOLD)
+  {
+    #ifdef WARNING
+    *logofs << "Proxy: WARNING! Flushing control messages "
+            << "while sending code '" << DumpControl(code)
+            << "'.\n" << logofs_flush;
+    #endif
+
+    if (handleFlush() < 0)
+    {
+      return -1;
+    }
+  }
+
+  controlCodes_[controlLength_++] = 0;
+  controlCodes_[controlLength_++] = (unsigned char) code;
+  controlCodes_[controlLength_++] = (unsigned char) (data == -1 ? 0 : data);
+
+  //
+  // Account for the control frame.
+  //
+
+  statistics -> addFrameOut();
+
+  return 1;
+}
+
+void Proxy::setSplitTimeout(int channelId)
+{
+  int needed = channels_[channelId] -> needSplit();
+
+  if (needed != isTimestamp(timeouts_.splitTs))
+  {
+    if (needed == 1)
+    {
+      #if defined(TEST) || defined(INFO) || defined(SPLIT)
+      *logofs << "Proxy: SPLIT! Allocating split timestamp at "
+              << strMsTimestamp() << ".\n" << logofs_flush;
+      #endif
+
+      timeouts_.splitTs = getTimestamp();
+    }
+    else
+    {
+      T_list &channelList = activeChannels_.getList();
+
+      for (T_list::iterator j = channelList.begin();
+               j != channelList.end(); j++)
+      {
+        int channelId = *j;
+
+        if (channels_[channelId] != NULL &&
+                channels_[channelId] -> needSplit() == 1)
+        {
+          #ifdef TEST
+          *logofs << "Proxy: SPLIT! Channel for FD#"
+                  << getFd(channelId) << " still needs splits.\n"
+                  << logofs_flush;
+          #endif
+
+          return;
+        }
+      }
+
+      #if defined(TEST) || defined(INFO) || defined(SPLIT)
+      *logofs << "Proxy: SPLIT! Resetting split timestamp at "
+              << strMsTimestamp() << ".\n" << logofs_flush;
+      #endif
+
+      timeouts_.splitTs = nullTimestamp();
+    }
+  }
+}
+
+void Proxy::setMotionTimeout(int channelId)
+{
+  int needed = channels_[channelId] -> needMotion();
+
+  if (needed != isTimestamp(timeouts_.motionTs))
+  {
+    if (channels_[channelId] -> needMotion() == 1)
+    {
+      #if defined(TEST) || defined(INFO) || defined(SPLIT)
+      *logofs << "Proxy: Allocating motion timestamp at "
+              << strMsTimestamp() << ".\n" << logofs_flush;
+      #endif
+
+      timeouts_.motionTs = getTimestamp();
+    }
+    else
+    {
+      T_list &channelList = activeChannels_.getList();
+
+      for (T_list::iterator j = channelList.begin();
+               j != channelList.end(); j++)
+      {
+        int channelId = *j;
+
+        if (channels_[channelId] != NULL &&
+                channels_[channelId] -> needMotion() == 1)
+        {
+          #ifdef TEST
+          *logofs << "Proxy: SPLIT! Channel for FD#"
+                  << getFd(channelId) << " still needs motions.\n"
+                  << logofs_flush;
+          #endif
+
+          return;
+        }
+      }
+
+      #if defined(TEST) || defined(INFO) || defined(SPLIT)
+      *logofs << "Proxy: Resetting motion timestamp at "
+              << strMsTimestamp() << ".\n" << logofs_flush;
+      #endif
+
+      timeouts_.motionTs = nullTimestamp();
+    }
+  }
+}
+
+void Proxy::increaseChannels(int channelId)
+{
+  #ifdef TEST
+  *logofs << "Proxy: Adding channel " << channelId
+          << " to the list of active channels.\n"
+          << logofs_flush;
+  #endif
+
+  activeChannels_.add(channelId);
+
+  #ifdef TEST
+  *logofs << "Proxy: There are " << activeChannels_.getSize()
+          << " allocated channels for proxy FD#" << fd_
+          << ".\n" << logofs_flush;
+  #endif
+}
+
+void Proxy::decreaseChannels(int channelId)
+{
+  #ifdef TEST
+  *logofs << "Proxy: Removing channel " << channelId
+          << " from the list of active channels.\n"
+          << logofs_flush;
+  #endif
+
+  activeChannels_.remove(channelId);
+
+  #ifdef TEST
+  *logofs << "Proxy: There are " << activeChannels_.getSize()
+          << " allocated channels for proxy FD#" << fd_
+          << ".\n" << logofs_flush;
+  #endif
+}
+
+int Proxy::allocateTransport(int channelFd, int channelId)
+{
+  if (transports_[channelId] == NULL)
+  {
+    transports_[channelId] = new Transport(channelFd);
+
+    if (transports_[channelId] == NULL)
+    {
+      #ifdef PANIC
+      *logofs << "Proxy: PANIC! Can't allocate transport for "
+              << "channel id " << channelId << ".\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Can't allocate transport for "
+           << "channel id " << channelId << ".\n";
+
+      return -1;
+    }
+  }
+  else if (transports_[channelId] ->
+               getType() != transport_agent)
+  {
+    #ifdef PANIC
+    *logofs << "Proxy: PANIC! Transport for channel id "
+            << channelId << " should be null.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Transport for channel id "
+         << channelId << " should be null.\n";
+
+    return -1;
+  }
+
+  return 1;
+}
+
+int Proxy::deallocateTransport(int channelId)
+{
+  //
+  // Transport for the agent connection
+  // is passed from the outside when
+  // creating the channel.
+  //
+
+  if (transports_[channelId] ->
+          getType() != transport_agent)
+  {
+    delete transports_[channelId];
+  }
+
+  transports_[channelId] = NULL;
+
+  return 1;
+}
+
+int Proxy::handleNewGenericConnection(int clientFd, T_channel_type type, const char *label)
+{
+  int channelId = allocateChannelMap(clientFd);
+
+  if (channelId == -1)
+  {
+    #ifdef PANIC
+    *logofs << "Proxy: PANIC! Maximum number of available "
+            << "channels exceeded.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Maximum number of available "
+         << "channels exceeded.\n";
+
+    return -1;
+  }
+
+  #ifdef TEST
+  *logofs << "Proxy: Channel for " << label << " descriptor "
+          << "FD#" << clientFd << " mapped to ID#"
+          << channelId << ".\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // Turn queuing off for path server-to-proxy.
+  //
+
+  SetNoDelay(clientFd, 1);
+
+  if (allocateTransport(clientFd, channelId) < 0)
+  {
+    return -1;
+  }
+
+  switch (type)
+  {
+    case channel_cups:
+    {
+      channels_[channelId] = new CupsChannel(transports_[channelId], compressor_);
+
+      break;
+    }
+    case channel_smb:
+    {
+      channels_[channelId] = new SmbChannel(transports_[channelId], compressor_);
+
+      break;
+    }
+    case channel_media:
+    {
+      channels_[channelId] = new MediaChannel(transports_[channelId], compressor_);
+
+      break;
+    }
+    case channel_http:
+    {
+      channels_[channelId] = new HttpChannel(transports_[channelId], compressor_);
+
+      break;
+    }
+    case channel_font:
+    {
+      channels_[channelId] = new FontChannel(transports_[channelId], compressor_);
+
+      break;
+    }
+    default:
+    {
+      channels_[channelId] = new SlaveChannel(transports_[channelId], compressor_);
+
+      break;
+    }
+  }
+
+  if (channels_[channelId] == NULL)
+  {
+    deallocateTransport(channelId);
+
+    return -1;
+  }
+
+  #ifdef TEST
+  *logofs << "Proxy: Accepted new connection to "
+          << label << " server.\n" << logofs_flush;
+  #endif
+
+  cerr << "Info" << ": Accepted new connection to "
+       << label << " server.\n";
+
+  increaseChannels(channelId);
+
+  switch (type)
+  {
+    case channel_cups:
+    {
+      if (handleControl(code_new_cups_connection, channelId) < 0)
+      {
+        return -1;
+      }
+
+      break;
+    }
+    case channel_smb:
+    {
+      if (handleControl(code_new_smb_connection, channelId) < 0)
+      {
+        return -1;
+      }
+
+      break;
+    }
+    case channel_media:
+    {
+      if (handleControl(code_new_media_connection, channelId) < 0)
+      {
+        return -1;
+      }
+
+      break;
+    }
+    case channel_http:
+    {
+      if (handleControl(code_new_http_connection, channelId) < 0)
+      {
+        return -1;
+      }
+
+      break;
+    }
+    case channel_font:
+    {
+      if (handleControl(code_new_font_connection, channelId) < 0)
+      {
+        return -1;
+      }
+
+      break;
+    }
+    default:
+    {
+      if (handleControl(code_new_slave_connection, channelId) < 0)
+      {
+        return -1;
+      }
+
+      break;
+    }
+  }
+
+  channels_[channelId] -> handleConfiguration();
+
+  return 1;
+}
+
+int Proxy::handleNewSlaveConnection(int clientFd)
+{
+  // Since ProtoStep7 (#issue 108)
+  return handleNewGenericConnection(clientFd, channel_slave, "slave");
+}
+
+
+
+int Proxy::handleNewGenericConnectionFromProxy(int channelId, T_channel_type type,
+                                               ChannelEndPoint &endPoint, const char *label)
+{
+  char *unixPath, *host;
+  long port;
+
+  if (endPoint.getUnixPath(&unixPath)) {
+    return handleNewGenericConnectionFromProxyUnix(channelId, type, unixPath, label);
+  }
+
+  if (endPoint.getTCPHostAndPort(&host, &port)) {
+    return handleNewGenericConnectionFromProxyTCP(channelId, type, host, port, label);
+  }
+
+  #ifdef WARNING
+  *logofs << "Proxy: WARNING! Refusing attempted connection "
+      << "to " << label << " server.\n" << logofs_flush;
+  #endif
+
+  cerr << "Warning" << ": Refusing attempted connection "
+      << "to " << label << " server.\n";
+
+  return -1;
+}
+
+int Proxy::handleNewGenericConnectionFromProxyTCP(int channelId, T_channel_type type,
+                                                  const char *hostname, long port, const char *label)
+
+{
+  if (port <= 0)
+  {
+    //
+    // This happens when user has disabled
+    // forwarding of the specific service.
+    //
+
+    #ifdef WARNING
+    *logofs << "Proxy: WARNING! Refusing attempted connection "
+            << "to " << label << " server.\n" << logofs_flush;
+    #endif
+
+    cerr << "Warning" << ": Refusing attempted connection "
+         << "to " << label << " server.\n";
+
+    return -1;
+  }
+
+  const char *serverHost = hostname;
+  int serverAddrFamily = AF_INET;
+  sockaddr *serverAddr = NULL;
+  unsigned int serverAddrLength = 0;
+
+  #ifdef TEST
+  *logofs << "Proxy: Connecting to " << label
+          << " server '" << serverHost << "' on TCP port '"
+          << port << "'.\n" << logofs_flush;
+  #endif
+
+  int serverIPAddr = GetHostAddress(serverHost);
+
+  if (serverIPAddr == 0)
+  {
+    #ifdef PANIC
+    *logofs << "Proxy: PANIC! Unknown " << label
+            << " server host '" << serverHost << "'.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Unknown " << label
+         << " server host '" << serverHost
+         << "'.\n";
+
+    return -1;
+  }
+
+  sockaddr_in *serverAddrTCP = new sockaddr_in;
+
+  serverAddrTCP -> sin_family = AF_INET;
+  serverAddrTCP -> sin_port = htons(port);
+  serverAddrTCP -> sin_addr.s_addr = serverIPAddr;
+
+  serverAddr = (sockaddr *) serverAddrTCP;
+  serverAddrLength = sizeof(sockaddr_in);
+
+  //
+  // Connect to the requested server.
+  //
+
+  int serverFd = socket(serverAddrFamily, SOCK_STREAM, PF_UNSPEC);
+
+  if (serverFd < 0)
+  {
+    #ifdef PANIC
+    *logofs << "Proxy: PANIC! Call to socket failed. "
+            << "Error is " << EGET() << " '" << ESTR()
+            << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Call to socket failed. "
+         << "Error is " << EGET() << " '" << ESTR()
+         << "'.\n";
+
+    delete serverAddrTCP;
+
+    return -1;
+  }
+  else if (connect(serverFd, serverAddr, serverAddrLength) < 0)
+  {
+    #ifdef WARNING
+    *logofs << "Proxy: WARNING! Connection to " << label
+            << " server '" << serverHost << ":" << port
+            << "' failed with error '" << ESTR() << "'.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Warning" << ": Connection to " << label
+         << " server '" << serverHost << ":" << port
+         << "' failed with error '" << ESTR() << "'.\n";
+
+    close(serverFd);
+
+    delete serverAddrTCP;
+
+    return -1;
+  }
+
+  delete serverAddrTCP;
+
+  if (handlePostConnectionFromProxy(channelId, serverFd, type, label) < 0)
+  {
+    return -1;
+  }
+
+  #ifdef TEST
+  *logofs << "Proxy: Forwarded new connection to "
+          << label << " server on port '" << port
+          << "'.\n" << logofs_flush;
+  #endif
+
+  cerr << "Info" << ": Forwarded new connection to "
+       << label << " server on port '" << port
+       << "'.\n";
+
+  return 1;
+}
+
+int Proxy::handleNewGenericConnectionFromProxyUnix(int channelId, T_channel_type type,
+                                                   const char *path, const char *label)
+{
+  if (path == NULL || *path == '\0' )
+  {
+    //
+    // This happens when user has disabled
+    // forwarding of the specific service.
+    //
+
+    #ifdef WARNING
+    *logofs << "Proxy: WARNING! Refusing attempted connection "
+            << "to " << label << " server.\n" << logofs_flush;
+    #endif
+
+    cerr << "Warning" << ": Refusing attempted connection "
+         << "to " << label << " server.\n";
+
+    return -1;
+  }
+
+  sockaddr_un serverAddrUnix;
+
+  unsigned int serverAddrLength = sizeof(sockaddr_un);
+
+  int serverAddrFamily = AF_UNIX;
+
+  serverAddrUnix.sun_family = AF_UNIX;
+
+  const int serverAddrNameLength = 108;
+
+  strncpy(serverAddrUnix.sun_path, path, serverAddrNameLength);
+
+  *(serverAddrUnix.sun_path + serverAddrNameLength - 1) = '\0';
+
+  #ifdef TEST
+  *logofs << "Proxy: Connecting to " << label << " server "
+          << "on Unix port '" << path << "'.\n" << logofs_flush;
+  #endif
+
+  //
+  // Connect to the requested server.
+  //
+
+  int serverFd = socket(serverAddrFamily, SOCK_STREAM, PF_UNSPEC);
+
+  if (serverFd < 0)
+  {
+    #ifdef PANIC
+    *logofs << "Proxy: PANIC! Call to socket failed. "
+            << "Error is " << EGET() << " '" << ESTR()
+            << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Call to socket failed. "
+         << "Error is " << EGET() << " '" << ESTR()
+         << "'.\n";
+
+    return -1;
+  }
+  else if (connect(serverFd, (sockaddr *) &serverAddrUnix, serverAddrLength) < 0)
+  {
+    #ifdef WARNING
+    *logofs << "Proxy: WARNING! Connection to " << label
+            << " server on Unix port '" << path << "' failed "
+            << "with error " << EGET() << ", '" << ESTR() << "'.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Warning" << ": Connection to " << label
+         << " server on Unix port '" << path << "' failed "
+        << "with error " << EGET() << ", '" << ESTR() << "'.\n";
+
+    close(serverFd);
+
+    return -1;
+  }
+
+  if (handlePostConnectionFromProxy(channelId, serverFd, type, label) < 0)
+  {
+    return -1;
+  }
+
+  #ifdef TEST
+  *logofs << "Proxy: Forwarded new connection to "
+          << label << " server on Unix port '" << path
+          << "'.\n" << logofs_flush;
+  #endif
+
+  cerr << "Info" << ": Forwarded new connection to "
+       << label << " server on Unix port '" << path
+       << "'.\n";
+
+  return 1;
+}
+
+int Proxy::handleNewSlaveConnectionFromProxy(int channelId)
+{
+
+  cerr << "Info" << ": New slave connection on "
+       << "channel ID#" << channelId << "\n";
+
+  char *nx_slave_cmd = getenv("NX_SLAVE_CMD");
+  if (nx_slave_cmd == NULL) {
+    return -1;
+  }
+
+  int spair[2];
+  if (socketpair(AF_UNIX, SOCK_STREAM, 0, spair) == -1) {
+    perror("socketpair");
+    return -1;
+  }
+
+  int serverFd = spair[0];
+  int clientFd = spair[1];
+
+  if (handlePostConnectionFromProxy(channelId, serverFd, channel_slave, "slave") < 0)
+  {
+    close(serverFd);
+    close(clientFd);
+    return -1;
+  }
+
+
+  int pid = fork();
+  if (pid == 0)
+  {
+
+    if (dup2(clientFd, 0) == -1)
+    {
+      perror("dup2");
+      exit(1);
+    }
+
+    if (dup2(clientFd, 1) == -1)
+    {
+      perror("dup2");
+      exit(1);
+    }
+
+    close(serverFd);
+    close(clientFd);
+
+    /* Close FDs used by NX, QVD #1208 */
+    for (int fd = 3; fd < 256; fd++) {
+        close(fd);
+    }
+
+    char *const argv[2] = {nx_slave_cmd, NULL};
+
+    if (execv(nx_slave_cmd, argv) == -1)
+    {
+      perror("execv");
+    }
+    exit(1);
+
+  }
+  else if (pid == -1)
+  {
+    // TODO Test this!
+    perror("fork");
+    close(serverFd);
+    close(clientFd);
+    return -1;
+  }
+
+  close(clientFd);
+  slavePidMap_[channelId] = pid;
+
+  cerr << "Info" << ": slave channel ID#" << channelId << " handler has PID " << pid << endl;
+
+  return 1;
+}
+
+void Proxy::checkSlaves()
+{
+  for (int channelId = 0; channelId<CONNECTIONS_LIMIT; channelId++)
+  {
+    int pid = slavePidMap_[channelId];
+
+    if (pid > 1 && HandleChild(pid))
+    {
+      slavePidMap_[channelId] = nothing;
+      cerr << "Info:" << " Handled death of slave with pid " << pid << endl;
+    }
+  }
+}
+
+int Proxy::handlePostConnectionFromProxy(int channelId, int serverFd,
+                                             T_channel_type type, const char *label)
+{
+  //
+  // Turn queuing off for path proxy-to-server.
+  //
+
+  SetNoDelay(serverFd, 1);
+
+  assignChannelMap(channelId, serverFd);
+
+  #ifdef TEST
+  *logofs << "Proxy: Descriptor FD#" << serverFd 
+          << " mapped to channel ID#" << channelId << ".\n"
+          << logofs_flush;
+  #endif
+
+  if (allocateTransport(serverFd, channelId) < 0)
+  {
+    return -1;
+  }
+
+  switch (type)
+  {
+    case channel_cups:
+    {
+      channels_[channelId] = new CupsChannel(transports_[channelId], compressor_);
+      break;
+    }
+    case channel_smb:
+    {
+      channels_[channelId] = new SmbChannel(transports_[channelId], compressor_);
+
+      break;
+    }
+    case channel_media:
+    {
+      channels_[channelId] = new MediaChannel(transports_[channelId], compressor_);
+
+      break;
+    }
+    case channel_http:
+    {
+      channels_[channelId] = new HttpChannel(transports_[channelId], compressor_);
+
+      break;
+    }
+    case channel_font:
+    {
+      channels_[channelId] = new FontChannel(transports_[channelId], compressor_);
+
+      break;
+    }
+    default:
+    {
+      channels_[channelId] = new SlaveChannel(transports_[channelId], compressor_);
+
+      break;
+    }
+  }
+
+  if (channels_[channelId] == NULL)
+  {
+    deallocateTransport(channelId);
+
+    return -1;
+  }
+
+  increaseChannels(channelId);
+
+  channels_[channelId] -> handleConfiguration();
+
+  return 1;
+}
diff --git a/nxcomp/src/Proxy.h b/nxcomp/src/Proxy.h
new file mode 100644
index 000000000..ea60c827a
--- /dev/null
+++ b/nxcomp/src/Proxy.h
@@ -0,0 +1,1276 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef Proxy_H
+#define Proxy_H
+
+#include <sys/types.h>
+
+#ifdef _AIX
+#include <sys/select.h>
+#endif
+
+#include "Misc.h"
+#include "Timestamp.h"
+
+#include "List.h"
+#include "Channel.h"
+#include "Transport.h"
+#include "EncodeBuffer.h"
+#include "ProxyReadBuffer.h"
+#include "ChannelEndPoint.h"
+
+//
+// Forward declaration as we
+// need a pointer.
+//
+
+class Agent;
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+//
+// Log the important tracepoints related
+// to writing packets to the peer proxy.
+//
+
+#undef  FLUSH
+
+//
+// Codes used for control messages in
+// proxy-to-proxy protocol.
+//
+// The following codes are currently
+// unused.
+//
+// code_alert_reply,
+// code_reset_request,
+// code_reset_reply,
+// code_load_reply,
+// code_save_reply,
+// code_shutdown_reply,
+// code_configuration_request,
+// code_configuration_reply.
+//
+// These are for compatibility with
+// old versions.
+//
+// code_sync_request,
+// code_sync_reply,
+//
+// The code_new_aux_connection should not
+// be used anymore. Auxiliary X connections
+// are treated as normal X channels since
+// version 1.5.0.
+//
+
+typedef enum
+{
+  code_new_x_connection,
+  code_new_cups_connection,
+  code_new_aux_connection,
+  code_new_smb_connection,
+  code_new_media_connection,
+  code_switch_connection,
+  code_drop_connection,
+  code_finish_connection,
+  code_begin_congestion,
+  code_end_congestion,
+  code_alert_request,
+  code_alert_reply,
+  code_reset_request,
+  code_reset_reply,
+  code_load_request,
+  code_load_reply,
+  code_save_request,
+  code_save_reply,
+  code_shutdown_request,
+  code_shutdown_reply,
+  code_control_token_request,
+  code_control_token_reply,
+  code_configuration_request,
+  code_configuration_reply,
+  code_statistics_request,
+  code_statistics_reply,
+  code_new_http_connection,
+  code_sync_request,
+  code_sync_reply,
+  code_new_font_connection,
+  code_new_slave_connection,
+  code_finish_listeners,
+  code_split_token_request,
+  code_split_token_reply,
+  code_data_token_request,
+  code_data_token_reply,
+  code_last_tag
+
+} T_proxy_code;
+
+typedef enum
+{
+  operation_in_negotiation,
+  operation_in_messages,
+  operation_in_configuration,
+  operation_in_statistics,
+  operation_last_tag
+
+} T_proxy_operation;
+
+typedef enum
+{
+  frame_ping,
+  frame_data,
+
+} T_frame_type;
+
+typedef enum
+{
+  token_control,
+  token_split,
+  token_data
+
+} T_token_type;
+
+typedef enum
+{
+  load_if_any,
+  load_if_first
+
+} T_load_type;
+
+class Proxy
+{
+  public:
+
+  //
+  // Maximum number of supported channels.
+  //
+
+  static const int CONNECTIONS_LIMIT  = 256;
+
+  //
+  // Numboer of token types.
+  //
+
+  static const int TOKEN_TYPES = 3;
+
+  //
+  // Lenght of buffer we use to add our
+  // control messages plus the length of
+  // the data frame.
+  //
+
+  static const int CONTROL_CODES_LENGTH = ENCODE_BUFFER_PREFIX_SIZE - 5;
+
+  static const int CONTROL_CODES_THRESHOLD = CONTROL_CODES_LENGTH - 9;
+
+  Proxy(int fd);
+
+  virtual ~Proxy();
+
+  //
+  // Inform the proxy that the negotiation phase is
+  // completed and that it can start handling binary
+  // messages.
+  //
+
+  int setOperational();
+
+  int getOperational()
+  {
+    return (operation_ != operation_in_negotiation);
+  }
+
+  int setReadDescriptors(fd_set *fdSet, int &fdMax, T_timestamp &tsMax);
+
+  int setWriteDescriptors(fd_set *fdSet, int &fdMax, T_timestamp &tsMax);
+
+  //
+  // Perform the operation on the proxy
+  // link or its own channels.
+  //
+
+  int handleRead(int &resultFds, fd_set &fdSet);
+
+  int handleFlush(int &resultFds, fd_set &fdSet);
+
+  int handleRead();
+
+  int handleRead(int fd, const char *data = NULL, int size = 0);
+
+  int handleEvents();
+
+  int handleFlush();
+
+  int handleFlush(int fd);
+
+  int handlePing();
+
+  int handleFinish();
+
+  int handleShutdown();
+
+  int handleStatistics(int type, ostream *statofs);
+
+  int handleAlert(int alert);
+
+  int handleRotate()
+  {
+    activeChannels_.rotate();
+
+    return 1;
+  }
+
+  int handleChannelConfiguration();
+
+  int handleSocketConfiguration();
+
+  int handleLinkConfiguration();
+
+  int handleCacheConfiguration();
+
+  //
+  // These must be called just after initialization to
+  // tell to the proxy where the network connections
+  // have to be forwarded.
+  //
+
+  virtual void handleDisplayConfiguration(const char *xServerDisplay, int xServerAddrFamily,
+                                              sockaddr * xServerAddr, unsigned int xServerAddrLength) = 0;
+
+  virtual void handlePortConfiguration(ChannelEndPoint &cupsServerPort,
+                                       ChannelEndPoint &smbServerPort,
+                                       ChannelEndPoint &mediaServerPort,
+                                       ChannelEndPoint &httpServerPort,
+                                       const char *fontServerPort) = 0;
+
+  //
+  // Create new tunneled channels.
+  //
+
+  virtual int handleNewConnection(T_channel_type type, int clientFd) = 0;
+
+  virtual int handleNewConnectionFromProxy(T_channel_type type, int channelId) = 0;
+
+  virtual int handleNewAgentConnection(Agent *agent) = 0;
+
+  virtual int handleNewXConnection(int clientFd) = 0;
+
+  virtual int handleNewXConnectionFromProxy(int channelId) = 0;
+
+  int handleNewGenericConnection(int clientFd, T_channel_type type, const char *label);
+
+  int handleNewGenericConnectionFromProxy(int channelId, T_channel_type type,
+                                          ChannelEndPoint &endpoint, const char *label);
+
+  int handleNewGenericConnectionFromProxyUnix(int channelId, T_channel_type type,
+                                              const char *path, const char *label);
+
+  int handleNewGenericConnectionFromProxyTCP(int channelId, T_channel_type type,
+                                             const char *hostname, long port, const char *label);
+
+  int handleNewSlaveConnection(int clientFd);
+
+  int handleNewSlaveConnectionFromProxy(int channelId);
+
+  void checkSlaves();
+
+  //
+  // Force closure of channels.
+  //
+
+  int handleCloseConnection(int clientFd);
+
+  int handleCloseAllXConnections();
+
+  int handleCloseAllListeners();
+
+  //
+  // Called when the loop has replaced
+  // or closed a previous alert.
+  //
+
+  void handleResetAlert();
+
+  //
+  // Handle the persistent cache.
+  //
+
+  virtual int handleLoad(T_load_type type) = 0;
+
+  virtual int handleSave() = 0;
+
+  protected:
+
+  //
+  // Timeout related data:
+  //
+  // flush
+  // split
+  // motion
+  //
+  // Timeouts in milliseconds after which the
+  // proxy will have to perform the operation.
+  //
+  // readTs, writeTs
+  //
+  // Timestamp of last packet received or sent
+  // to remote proxy. Used to detect lost con-
+  // nection.
+  //
+  // loopTs
+  //
+  // Timestamp of last loop completed by the
+  // proxy
+  //
+  // pingTs
+  //
+  // Timestamp of last ping request sent to the
+  // remote peer.
+  //
+  // alertTs
+  //
+  // Timestamp of last 'no data received' alert
+  // dialog shown to the user.
+  //
+  // loadTs
+  //
+  // Were message stores populated from data on
+  // disk.
+  //
+  // splitTs
+  // motionTs
+  //
+  // Timestamps of the last operation of this
+  // kind handled by the proxy.
+  //
+
+  typedef struct
+  {
+    int split;
+    int motion;
+
+    T_timestamp readTs;
+    T_timestamp writeTs;
+
+    T_timestamp loopTs;
+    T_timestamp pingTs;
+    T_timestamp alertTs;
+    T_timestamp loadTs;
+
+    T_timestamp splitTs;
+    T_timestamp motionTs;
+
+  } T_proxy_timeouts;
+
+  //
+  // Bytes accumulated so far while waiting
+  // to send the next token, number of tokens
+  // remaining for each token type and other
+  // token related information.
+  //
+
+  typedef struct
+  {
+    int size;
+    int limit;
+
+    int bytes;
+    int remaining;
+
+    T_proxy_code request;
+    T_proxy_code reply;
+
+    T_token_type type;
+
+  } T_proxy_token;
+
+  int handlePostConnectionFromProxy(int channelId, int serverFd,
+                                        T_channel_type type, const char *label);
+
+  int handleDrain();
+
+  int handleFrame(T_frame_type type);
+
+  int handleFinish(int channelId);
+
+  int handleDrop(int channelId);
+
+  int handleFinishFromProxy(int channelId);
+
+  int handleDropFromProxy(int channelId);
+
+  int handleStatisticsFromProxy(int type);
+
+  int handleStatisticsFromProxy(const unsigned char *message, unsigned int length);
+
+  int handleNegotiation(const unsigned char *message, unsigned int length);
+
+  int handleNegotiationFromProxy(const unsigned char *message, unsigned int length);
+
+  int handleToken(T_frame_type type);
+
+  int handleTokenFromProxy(T_proxy_token &token, int count);
+
+  int handleTokenReplyFromProxy(T_proxy_token &token, int count);
+
+  int handleSyncFromProxy(int channelId);
+
+  int handleSwitch(int channelId);
+
+  int handleControl(T_proxy_code code, int data = -1);
+
+  int handleControlFromProxy(const unsigned char *message);
+
+  //
+  // Interleave reads of the X server
+  // events while writing data to the
+  // remote proxy.
+  //
+
+  virtual int handleAsyncEvents() = 0;
+
+  //
+  // Timer related functions.
+  //
+
+  protected:
+
+  void setTimer(int value)
+  {
+    SetTimer(value);
+  }
+
+  void resetTimer()
+  {
+    ResetTimer();
+
+    timer_ = 0;
+  }
+
+  public:
+
+  void handleTimer()
+  {
+    timer_ = 1;
+  }
+
+  int getTimer()
+  {
+    return timer_;
+  }
+
+  //
+  // Can the channel consume data and the
+  // proxy produce more output?
+  //
+
+  int canRead(int fd) const
+  {
+    return (isTimeToRead() == 1 &&
+                isTimeToRead(getChannel(fd)) == 1);
+  }
+
+  //
+  // Can the proxy read more data from its
+  // peer?
+  //
+
+  int canRead() const
+  {
+    return (transport_ -> readable() != 0);
+  }
+
+  int canFlush() const
+  {
+    return (encodeBuffer_.getLength() +
+                controlLength_ + transport_ -> length() +
+                    transport_ -> flushable() > 0);
+  }
+
+  int needFlush(int channelId) const
+  {
+    return (outputChannel_ == channelId &&
+                encodeBuffer_.getLength() > 0);
+  }
+
+  int needFlush() const
+  {
+    return (encodeBuffer_.getLength() > 0);
+  }
+
+  int shouldFlush() const
+  {
+    if ((int) ((encodeBuffer_.getLength() +
+            controlLength_) / statistics ->
+                getStreamRatio()) >= control -> TokenSize)
+    {
+      #if defined(TEST) || defined(INFO) || defined(FLUSH)
+      *logofs << "Proxy: FLUSH! Requesting a flush with "
+              << (encodeBuffer_.getLength() + controlLength_)
+              << " bytes and stream ratio " << (double) statistics ->
+                 getStreamRatio() << ".\n" << logofs_flush;
+      #endif
+
+      return 1;
+    }
+
+    #if defined(TEST) || defined(INFO) || defined(FLUSH)
+    *logofs << "Proxy: Not requesting a flush with "
+            << (encodeBuffer_.getLength() + controlLength_)
+            << " bytes and stream ratio " << (double) statistics ->
+               getStreamRatio() << ".\n" << logofs_flush;
+    #endif
+
+    return 0;
+  }
+
+  int needDrain() const
+  {
+    return (congestion_ == 1 || transport_ -> length() >
+                control -> TransportProxyBufferThreshold);
+  }
+
+  int getFd() const
+  {
+    return fd_;
+  }
+
+  int getFlushable(int fd) const
+  {
+    if (fd == fd_)
+    {
+      return (encodeBuffer_.getLength() + controlLength_ +
+                  transport_ -> flushable());
+    }
+
+    return 0;
+  }
+
+  int getSplitSize()
+  {
+    return (clientStore_ != NULL ? clientStore_ ->
+                getSplitTotalSize() : 0);
+  }
+
+  int getSplitStorageSize()
+  {
+    return (clientStore_ != NULL ? clientStore_ ->
+                getSplitTotalStorageSize() : 0);
+  }
+
+  //
+  // Returns the number of active channels
+  // that currently managed by this proxy.
+  //
+
+  int getChannels(T_channel_type type = channel_none);
+
+  //
+  // If descriptor corresponds to a valid
+  // channel, returns the type of traffic
+  // carried by it.
+  //
+
+  T_channel_type getType(int fd);
+
+  //
+  // Given a channel type, returns the
+  // literal name.
+  //
+
+  const char *getTypeName(T_channel_type type);
+
+  //
+  // Get a convenient name for 'localhost'.
+  //
+
+  const char *getComputerName();
+
+  //
+  // Set if we have initiated the shutdown
+  // procedure and if the shutdown request
+  // has been received from the remote.
+  //
+
+  int getFinish() const
+  {
+    return finish_;
+  }
+
+  int getShutdown() const
+  {
+    return shutdown_;
+  }
+
+  //
+  // Interfaces to the transport buffers.
+  //
+
+  int getLength(int fd) const
+  {
+    if (fd == fd_)
+    {
+      return transport_ -> length();
+    }
+
+    int channelId = getChannel(fd);
+
+    if (channelId < 0 || channels_[channelId] == NULL)
+    {
+      return 0;
+    }
+
+    return transports_[channelId] -> length();
+  }
+
+  int getPending(int fd) const
+  {
+    if (fd == fd_)
+    {
+      return transport_ -> pending();
+    }
+
+    int channelId = getChannel(fd);
+
+    if (channelId < 0 || channels_[channelId] == NULL)
+    {
+      return 0;
+    }
+
+    return transports_[channelId] -> pending();
+  }
+
+  //
+  // Check if the proxy or the given channel
+  // has data in the buffer because of a
+  // blocking write.
+  //
+
+  int getBlocked(int fd) const
+  {
+    if (fd == fd_)
+    {
+      return transport_ -> blocked();
+    }
+
+    int channelId = getChannel(fd);
+
+    if (channelId < 0 || channels_[channelId] == NULL)
+    {
+      return 0;
+    }
+
+    return transports_[channelId] -> blocked();
+  }
+
+  //
+  // Check if the proxy or the given channel has
+  // data to read.
+  //
+
+  int getReadable(int fd) const
+  {
+    if (fd == fd_)
+    {
+      return transport_ -> readable();
+    }
+
+    int channelId = getChannel(fd);
+
+    if (channelId < 0 || channels_[channelId] == NULL)
+    {
+      return 0;
+    }
+
+    return transports_[channelId] -> readable();
+  }
+
+  //
+  // Return a vale between 0 and 9 in the case
+  // of the proxy descriptor.
+  //
+
+  int getCongestion(int fd) const
+  {
+    if (fd == fd_)
+    {
+      return (agent_ != nothing && congestions_[agent_] == 1 ? 9 :
+                  (int) statistics -> getCongestionInFrame());
+    }
+
+    int channelId = getChannel(fd);
+
+    if (channelId < 0 || channels_[channelId] == NULL)
+    {
+      return 0;
+    }
+
+    return channels_[channelId] -> getCongestion();
+  }
+
+  //
+  // Let the statistics class get info
+  // from the message stores.
+  //
+
+  const ClientStore * const getClientStore() const
+  {
+    return clientStore_;
+  }
+
+  const ServerStore * const getServerStore() const
+  {
+    return serverStore_;
+  }
+
+  //
+  // These can be called asynchronously by
+  // channels during their read or write
+  // loop.
+  //
+
+  int handleAsyncRead(int fd)
+  {
+    return handleRead(fd);
+  }
+
+  int handleAsyncCongestion(int fd)
+  {
+    int channelId = getChannel(fd);
+
+    return handleControl(code_begin_congestion, channelId);
+  }
+
+  int handleAsyncDecongestion(int fd)
+  {
+    int channelId = getChannel(fd);
+
+    return handleControl(code_end_congestion, channelId);
+  }
+
+  int handleAsyncSplit(int fd, Split *split)
+  {
+    return channels_[getChannel(fd)] ->
+               handleSplitEvent(encodeBuffer_, split);
+  }
+
+  int handleAsyncPriority()
+  {
+    if (control -> FlushPriority == 1)
+    {
+      return handleFlush();
+    }
+
+    return 0;
+  }
+
+  int canAsyncFlush() const
+  {
+    return shouldFlush();
+  }
+
+  int handleAsyncFlush()
+  {
+    return handleFlush();
+  }
+
+  int handleAsyncSwitch(int fd)
+  {
+    return handleSwitch(getChannel(fd));
+  }
+
+  int handleAsyncKeeperCallback()
+  {
+    KeeperCallback();
+
+    return 1;
+  }
+
+  //
+  // Internal interfaces used to verify the
+  // availability of channels and the proxy
+  // link.
+  //
+
+  protected:
+
+  int isTimeToRead() const
+  {
+    if (congestion_ == 0 && transport_ ->
+            blocked() == 0)
+    {
+      return 1;
+    }
+    else
+    {
+      #if defined(TEST) || defined(INFO)
+      *logofs << "Proxy: Can't read from channels "
+              << "with congestion " << congestion_
+              << " and blocked " << transport_ ->
+                 blocked() << ".\n" << logofs_flush;
+      #endif
+
+      return 0;
+    }
+  }
+
+  int isTimeToRead(int channelId) const
+  {
+    if (channelId >= 0 && channelId < CONNECTIONS_LIMIT &&
+            channels_[channelId] != NULL &&
+                congestions_[channelId] == 0)
+    {
+      if (channels_[channelId] -> getType() == channel_x11 ||
+              tokens_[token_data].remaining > 0 ||
+                  channels_[channelId] ->
+                      getFinish() == 1)
+      {
+        return 1;
+      }
+
+      #if defined(TEST) || defined(INFO)
+      *logofs << "Proxy: Can't read from generic "
+              << "descriptor FD#" << getFd(channelId)
+              << " channel ID#" << channelId << " with "
+              << tokens_[token_data].remaining
+              << " data tokens remaining.\n"
+              << logofs_flush;
+      #endif
+
+      return 0;
+    }
+
+    #if defined(TEST) || defined(INFO)
+
+    if (channelId < 0 || channelId >= CONNECTIONS_LIMIT ||
+            channels_[channelId] == NULL)
+    {
+      *logofs << "Proxy: WARNING! No valid channel for ID#"
+              << channelId << ".\n" << logofs_flush;
+    }
+    else if (channels_[channelId] -> getFinish())
+    {
+      *logofs << "Proxy: Can't read from finishing "
+              << "descriptor FD#" << getFd(channelId)
+              << " channel ID#" << channelId << ".\n"
+              << logofs_flush;
+    }
+    else if (congestions_[channelId] == 1)
+    {
+      *logofs << "Proxy: Can't read from congested "
+              << "descriptor FD#" << getFd(channelId)
+              << " channel ID#" << channelId << ".\n"
+              << logofs_flush;
+    }
+
+    #endif
+
+    return 0;
+  }
+
+  //
+  // Handle the flush and split timeouts.
+  // All these functions should round up
+  // to the value of the latency timeout
+  // to save a further loop.
+  //
+
+  protected:
+
+  int isTimeToSplit() const
+  {
+    if (isTimestamp(timeouts_.splitTs) &&
+            getTimeToNextSplit() <= control ->
+                LatencyTimeout)
+    {
+      if (tokens_[token_split].remaining > 0)
+      {
+        return 1;
+      }
+
+      #if defined(TEST) || defined(INFO)
+      *logofs << "Proxy: WARNING! Can't encode splits "
+              << "with " << tokens_[token_split].remaining
+              << " split tokens remaining.\n"
+              << logofs_flush;
+      #endif
+    }
+
+    return 0;
+  }
+
+  int isTimeToMotion() const
+  {
+    return (isTimestamp(timeouts_.motionTs) &&
+                getTimeToNextMotion() <= control ->
+                    LatencyTimeout);
+  }
+
+  int getTimeToNextSplit() const
+  {
+    #if defined(TEST) || defined(INFO) || defined(FLUSH)
+
+    if (isTimestamp(timeouts_.splitTs) == 0)
+    {
+      #ifdef PANIC
+      *logofs << "Proxy: PANIC! No split timeout was set "
+              << "for proxy FD#" << fd_ << ".\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": No split timeout was set "
+           << "for proxy FD#" << fd_ << ".\n";
+
+      HandleCleanup();
+    }
+
+    #endif
+
+    int diffTs = timeouts_.split -
+                     diffTimestamp(timeouts_.splitTs,
+                         getTimestamp());
+
+    return (diffTs > 0 ? diffTs : 0);
+  }
+
+  int getTimeToNextMotion() const
+  {
+    #if defined(TEST) || defined(INFO) || defined(FLUSH)
+
+    if (isTimestamp(timeouts_.motionTs) == 0)
+    {
+      #ifdef PANIC
+      *logofs << "Proxy: PANIC! No motion timeout was set "
+              << "for proxy FD#" << fd_ << ".\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": No motion timeout was set "
+           << "for proxy FD#" << fd_ << ".\n";
+
+      HandleCleanup();
+    }
+
+    #endif
+
+    int diffTs = timeouts_.motion -
+                     diffTimestamp(timeouts_.motionTs,
+                         getTimestamp());
+
+    return (diffTs > 0 ? diffTs : 0);
+  }
+
+  protected:
+
+  //
+  // Implement persistence of cache on disk.
+  //
+
+  virtual int handleLoadFromProxy() = 0;
+  virtual int handleSaveFromProxy() = 0;
+
+  int handleLoadStores();
+  int handleSaveStores();
+
+  char *handleSaveAllStores(const char *savePath, bool & isTooSmall) const;
+
+  virtual int handleSaveAllStores(ostream *cachefs, md5_state_t *md5StateStream,
+                                      md5_state_t *md5StateClient) const = 0;
+
+  int handleSaveVersion(unsigned char *buffer, int &major, int &minor, int &patch) const;
+
+  void handleFailOnSave(const char *fullName, const char *failContext) const;
+
+  const char *handleLoadAllStores(const char *loadPath, const char *loadName) const;
+
+  virtual int handleLoadAllStores(istream *cachefs, md5_state_t *md5StateStream) const = 0;
+
+  int handleLoadVersion(const unsigned char *buffer, int &major, int &minor, int &patch) const;
+
+  void handleFailOnLoad(const char *fullName, const char *failContext) const;
+
+  //
+  // Prepare for a new persistent cache.
+  //
+
+  int handleResetPersistentCache();
+
+  //
+  // Reset the stores in the case of a
+  // failure loading the cache.
+  //
+
+  int handleResetStores();
+
+  //
+  // Reset the transport buffer and the
+  // other counters.
+  //
+
+  void handleResetFlush();
+
+  //
+  // Utility functions used to map file
+  // descriptors to channel ids.
+  //
+
+  protected:
+
+  int allocateChannelMap(int fd);
+  int checkChannelMap(int channelId);
+  int assignChannelMap(int channelId, int fd);
+
+  void cleanupChannelMap(int channelId);
+
+  virtual int checkLocalChannelMap(int channelId) = 0;
+
+  int addControlCodes(T_proxy_code code, int data);
+  int addTokenCodes(T_proxy_token &token);
+
+  int getFd(int channelId) const
+  {
+    if (channelId >= 0 && channelId < CONNECTIONS_LIMIT)
+    {
+      return fdMap_[channelId];
+    }
+
+    return -1;
+  }
+
+  int getChannel(int fd) const
+  {
+    if (fd >= 0 && fd < CONNECTIONS_LIMIT)
+    {
+      return channelMap_[fd];
+    }
+
+    return -1;
+  }
+
+  protected:
+
+  void setSplitTimeout(int channelId);
+  void setMotionTimeout(int channelId);
+
+  void increaseChannels(int channelId);
+  void decreaseChannels(int channelId);
+
+  int allocateTransport(int channelFd, int channelId);
+  int deallocateTransport(int channelId);
+
+  //
+  // The proxy has its own transport.
+  //
+
+  ProxyTransport *transport_;
+
+  //
+  // The static compressor is shared among
+  // channels and all the message stores.
+  //
+
+  StaticCompressor *compressor_;
+
+  //
+  // Map NX specific opcodes.
+  //
+
+  OpcodeStore *opcodeStore_;
+
+  //
+  // Stores are shared between channels.
+  //
+
+  ClientStore *clientStore_;
+  ServerStore *serverStore_;
+
+  //
+  // Client and server caches are shared
+  // between channels.
+  //
+
+  ClientCache *clientCache_;
+  ServerCache *serverCache_;
+
+  //
+  // The proxy's file descriptor.
+  //
+
+  int fd_;
+
+  //
+  // Channels currently selected for I/O
+  // operations.
+  //
+
+  int inputChannel_;
+  int outputChannel_;
+
+  //
+  // List of active channels.
+  //
+
+  List activeChannels_;
+
+  //
+  // Used to read data sent from peer proxy.
+  //
+
+  ProxyReadBuffer readBuffer_;
+
+  //
+  // Used to send data to peer proxy.
+  //
+
+  EncodeBuffer encodeBuffer_;
+
+  //
+  // Control messages' array.
+  //
+
+  int controlLength_;
+
+  unsigned char controlCodes_[CONTROL_CODES_LENGTH];
+
+  //
+  // Table of channel classes taking
+  // care of open X connections.
+  //
+
+  Channel *channels_[CONNECTIONS_LIMIT];
+
+  //
+  // Table of open sockets.
+  //
+
+  Transport *transports_[CONNECTIONS_LIMIT];
+
+  //
+  // Timeout related data.
+  //
+
+  T_proxy_timeouts timeouts_;
+
+  //
+  // Proxy can be decoding messages,
+  // handling a link reconfiguration,
+  // or decoding statistics.
+  //
+
+  int operation_;
+
+  //
+  // True if we are currently draining
+  // the proxy link.
+  //
+
+  int draining_;
+
+  //
+  // Force flush because of prioritized
+  // control messages to send.
+  //
+
+  int priority_;
+
+  //
+  // Set if we have initiated the close
+  // down procedure.
+  //
+
+  int finish_;
+
+  //
+  // Remote peer requested the shutdown.
+  //
+
+  int shutdown_;
+
+  //
+  // We are in the middle of a network
+  // congestion in the path to remote
+  // proxy.
+  //
+
+  int congestion_;
+
+  //
+  // Channels at the remote end that
+  // are not consuming their data.
+  //
+
+  int congestions_[CONNECTIONS_LIMIT];
+
+  //
+  // Is the timer expired?
+  //
+
+  int timer_;
+
+  //
+  // Did the proxy request an alert?
+  //
+
+  int alert_;
+
+  //
+  // The channel id of the agent.
+  //
+
+  int agent_;
+
+  //
+  // Token related data.
+  //
+
+  T_proxy_token tokens_[TOKEN_TYPES];
+
+  //
+  // Pointer to stream descriptor where
+  // proxy is producing statistics.
+  //
+
+  ostream *currentStatistics_;
+
+  private:
+
+  //
+  // Map channel ids to file descriptors.
+  //
+
+  int channelMap_[CONNECTIONS_LIMIT];
+  int fdMap_[CONNECTIONS_LIMIT];
+  int slavePidMap_[CONNECTIONS_LIMIT];
+};
+
+#endif /* Proxy_H */
diff --git a/nxcomp/src/ProxyReadBuffer.cpp b/nxcomp/src/ProxyReadBuffer.cpp
new file mode 100644
index 000000000..77f12771b
--- /dev/null
+++ b/nxcomp/src/ProxyReadBuffer.cpp
@@ -0,0 +1,211 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "ProxyReadBuffer.h"
+
+#include "Transport.h"
+
+//
+// Set the verbosity level. You also
+// need to define DUMP in Misc.cpp
+// if DUMP is defined here.
+//
+
+#define WARNING
+#define PANIC
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+unsigned int ProxyReadBuffer::suggestedLength(unsigned int pendingLength)
+{
+  //
+  // Always read all the data that
+  // is available.
+  //
+
+  int readable = transport_ -> readable();
+
+  unsigned int readLength = (readable == -1 ? 0 : (unsigned int) readable);
+
+  if (readLength < pendingLength)
+  {
+    readLength = pendingLength;
+  }
+
+  //
+  // Even if the readable data is not
+  // enough to make a complete message,
+  // resize the buffer to accommodate
+  // it all.
+  //
+
+  if (pendingLength < remaining_)
+  {
+    readLength = remaining_;
+  }
+
+  return readLength;
+}  
+
+int ProxyReadBuffer::locateMessage(const unsigned char *start,
+                                       const unsigned char *end,
+                                           unsigned int &controlLength,
+                                               unsigned int &dataLength,
+                                                   unsigned int &trailerLength)
+{
+  unsigned int lengthLength = 0;
+  const unsigned char *nextSrc = start;
+  unsigned char next;
+
+  dataLength = 0;
+
+  #ifdef TEST
+  *logofs << "ProxyReadBuffer: Locating message for FD#"
+          << transport_ -> fd() << " with " << end - start
+          << " bytes.\n" << logofs_flush;
+  #endif
+
+  //
+  // Use something like the following if
+  // you are looking for errors.
+  //
+
+  #ifdef DUMP
+  if (control -> ProxyMode == proxy_server && start < end &&
+          transport_ -> fd() == 6 || transport_ -> fd() == 11)
+  {
+    *logofs << "ProxyReadBuffer: Partial checksums are:\n";
+
+    DumpBlockChecksums(start, end - start, 256);
+
+    *logofs << logofs_flush;
+  }
+  #endif
+
+  do
+  {
+    if (nextSrc >= end)
+    {
+      remaining_ = 1;
+
+      #ifdef TEST
+      *logofs << "ProxyReadBuffer: No message was located "
+              << "with remaining " << remaining_ << ".\n"
+              << logofs_flush;
+      #endif
+
+      return 0;
+    }
+
+    next = *nextSrc++;
+
+    dataLength <<= 7;
+    dataLength |= (unsigned int) (next & 0x7f);
+
+    lengthLength++;
+  }
+  while (next & 0x80);
+
+  unsigned int totalLength;
+
+  if (dataLength == 0)
+  {
+    trailerLength = 0;
+    controlLength = 3;
+    totalLength   = controlLength;
+  }
+  else
+  {
+    trailerLength = lengthLength;
+    controlLength = 0;
+    totalLength   = dataLength + trailerLength;
+  }
+
+  if (start + totalLength > end)
+  {
+    //
+    // When having to decompress a ZLIB stream,
+    // a single byte can be enough to complete
+    // the frame.
+    //
+
+    if (control -> RemoteStreamCompression == 0)
+    {
+      remaining_ = totalLength - (end - start);
+    }
+    else
+    {
+      remaining_ = 1;
+    }
+
+    #ifdef TEST
+    *logofs << "ProxyReadBuffer: No message was located "
+            << "with remaining " << remaining_ << ".\n"
+            << logofs_flush;
+    #endif
+
+    return 0;
+  }
+  else
+  {
+    #ifdef DUMP
+    *logofs << "ProxyReadBuffer: Received " << totalLength << " bytes of data "
+            << "with checksum ";
+
+    DumpChecksum(start, totalLength);
+
+    *logofs << " on proxy FD#" << transport_ -> fd() << ".\n" << logofs_flush;
+    #endif
+
+    #if defined(TEST) || defined(INFO)
+    *logofs << "ProxyReadBuffer: Produced plain input for " << dataLength 
+            << "+" << trailerLength << "+" << controlLength << " bytes out of " 
+            << totalLength << " bytes.\n" << logofs_flush;
+    #endif
+
+    #ifdef DUMP
+    *logofs << "ProxyReadBuffer: Partial checksums are:\n";
+
+    DumpBlockChecksums(start, totalLength, 256);
+
+    *logofs << logofs_flush;
+    #endif
+
+    remaining_ = 0;
+
+    #ifdef TEST
+    *logofs << "ProxyReadBuffer: Located message with "
+            << "remaining " << remaining_ << ".\n"
+            << logofs_flush;
+    #endif
+
+    return 1;
+  }
+}
diff --git a/nxcomp/src/ProxyReadBuffer.h b/nxcomp/src/ProxyReadBuffer.h
new file mode 100644
index 000000000..68e9e95fa
--- /dev/null
+++ b/nxcomp/src/ProxyReadBuffer.h
@@ -0,0 +1,57 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef ProxyReadBuffer_H
+#define ProxyReadBuffer_H
+
+#include "ReadBuffer.h"
+#include "Control.h"
+
+class ProxyReadBuffer : public ReadBuffer
+{
+  public:
+
+  ProxyReadBuffer(Transport *transport)
+
+    : ReadBuffer(transport)
+  {
+  }
+
+  virtual ~ProxyReadBuffer()
+  {
+  }
+
+  protected:
+
+  virtual unsigned int suggestedLength(unsigned int pendingLength);
+
+  virtual int locateMessage(const unsigned char *start,
+                                const unsigned char *end,
+                                    unsigned int &controlLength,
+                                        unsigned int &dataLength,
+                                            unsigned int &trailerLength);
+};
+
+#endif /* ProxyReadBuffer_H */
diff --git a/nxcomp/src/PutImage.cpp b/nxcomp/src/PutImage.cpp
new file mode 100644
index 000000000..d14f922c3
--- /dev/null
+++ b/nxcomp/src/PutImage.cpp
@@ -0,0 +1,411 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "PutImage.h"
+
+#include "ClientCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+#include "WriteBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Constructors and destructors.
+//
+
+PutImageStore::PutImageStore(StaticCompressor *compressor)
+
+  : MessageStore(compressor)
+{
+  enableCache    = PUTIMAGE_ENABLE_CACHE;
+  enableData     = PUTIMAGE_ENABLE_DATA;
+
+  // Since ProtoStep7 (#issue 108)
+  enableCompress = PUTIMAGE_ENABLE_COMPRESS_IF_PROTO_STEP_7;
+
+  dataLimit  = PUTIMAGE_DATA_LIMIT;
+  dataOffset = PUTIMAGE_DATA_OFFSET;
+
+  cacheSlots          = PUTIMAGE_CACHE_SLOTS;
+  cacheThreshold      = PUTIMAGE_CACHE_THRESHOLD;
+  cacheLowerThreshold = PUTIMAGE_CACHE_LOWER_THRESHOLD;
+
+  // Since ProtoStep8 (#issue 108)
+  enableSplit = PUTIMAGE_ENABLE_SPLIT_IF_PROTO_STEP_8;
+
+  messages_ -> resize(cacheSlots);
+
+  for (T_messages::iterator i = messages_ -> begin();
+           i < messages_ -> end(); i++)
+  {
+    *i = NULL;
+  }
+
+  temporary_ = NULL;
+}
+
+PutImageStore::~PutImageStore()
+{
+  for (T_messages::iterator i = messages_ -> begin();
+           i < messages_ -> end(); i++)
+  {
+    destroy(*i);
+  }
+
+  destroy(temporary_);
+}
+
+//
+// Here are the methods to handle messages' content.
+//
+
+int PutImageStore::encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                                      const unsigned int size, int bigEndian,
+                                          ChannelCache *channelCache) const
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Encoding full message identity.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeValue(GetUINT(buffer + 2, bigEndian), 16, 8);
+
+  encodeBuffer.encodeValue((unsigned int) buffer[1], 2);
+
+  encodeBuffer.encodeXidValue(GetULONG(buffer + 4, bigEndian),
+                     clientCache -> drawableCache);
+  encodeBuffer.encodeXidValue(GetULONG(buffer + 8, bigEndian),
+                     clientCache -> gcCache);
+
+  unsigned int width = GetUINT(buffer + 12, bigEndian);
+  encodeBuffer.encodeCachedValue(width, 16,
+                     clientCache -> putImageWidthCache, 8);
+
+  unsigned int height = GetUINT(buffer + 14, bigEndian);
+  encodeBuffer.encodeCachedValue(height, 16,
+                     clientCache -> putImageHeightCache, 8);
+
+  unsigned int x = GetUINT(buffer + 16, bigEndian);
+  int xDiff = x - clientCache -> putImageLastX;
+  clientCache -> putImageLastX = x;
+  encodeBuffer.encodeCachedValue(xDiff, 16,
+                     clientCache -> putImageXCache, 8);
+
+  unsigned int y = GetUINT(buffer + 18, bigEndian);
+  int yDiff = y - clientCache -> putImageLastY;
+  clientCache -> putImageLastY = y;
+  encodeBuffer.encodeCachedValue(yDiff, 16,
+                     clientCache -> putImageYCache, 8);
+
+  encodeBuffer.encodeCachedValue(buffer[20], 8,
+                     clientCache -> putImageLeftPadCache);
+
+  encodeBuffer.encodeCachedValue(buffer[21], 8,
+                     clientCache -> depthCache);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Encoded full message identity.\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int PutImageStore::decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
+                                      unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
+                                          ChannelCache *channelCache) const
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoding full message identity.\n" << logofs_flush;
+  #endif
+
+  unsigned int  value;
+  unsigned char cValue;
+
+  decodeBuffer.decodeValue(value, 16, 8);
+
+  size = (value << 2);
+
+  buffer = writeBuffer -> addMessage(size);
+
+  decodeBuffer.decodeValue(value, 2);
+  buffer[1] = (unsigned char) value;
+
+  decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
+  PutULONG(value, buffer + 4, bigEndian);
+
+  decodeBuffer.decodeXidValue(value, clientCache -> gcCache);
+  PutULONG(value, buffer + 8, bigEndian);
+
+  unsigned int width;
+  decodeBuffer.decodeCachedValue(width, 16,
+                     clientCache -> putImageWidthCache, 8);
+  PutUINT(width, buffer + 12, bigEndian);
+
+  unsigned int height;
+  decodeBuffer.decodeCachedValue(height, 16,
+                     clientCache -> putImageHeightCache, 8);
+  PutUINT(height, buffer + 14, bigEndian);
+
+  decodeBuffer.decodeCachedValue(value, 16,
+                     clientCache -> putImageXCache, 8);
+  clientCache -> putImageLastX += value;
+  clientCache -> putImageLastX &= 0xffff;
+  PutUINT(clientCache -> putImageLastX, buffer + 16, bigEndian);
+
+  decodeBuffer.decodeCachedValue(value, 16,
+                     clientCache -> putImageYCache, 8);
+  clientCache -> putImageLastY += value;
+  clientCache -> putImageLastY &= 0xffff;
+  PutUINT(clientCache -> putImageLastY, buffer + 18, bigEndian);
+
+  decodeBuffer.decodeCachedValue(cValue, 8,
+                     clientCache -> putImageLeftPadCache);
+  buffer[20] = cValue;
+
+  decodeBuffer.decodeCachedValue(cValue, 8,
+                     clientCache -> depthCache);
+  buffer[21] = cValue;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded full message identity.\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int PutImageStore::parseIdentity(Message *message, const unsigned char *buffer,
+                                     unsigned int size, int bigEndian) const
+{
+  PutImageMessage *putImage = (PutImageMessage *) message;
+
+  //
+  // Here is the fingerprint.
+  //
+
+  putImage -> format   = *(buffer + 1);
+  putImage -> depth    = *(buffer + 21);
+  putImage -> left_pad = *(buffer + 20);
+
+  putImage -> width  = GetUINT(buffer + 12, bigEndian);
+  putImage -> height = GetUINT(buffer + 14, bigEndian);
+  putImage -> pos_x  = GetUINT(buffer + 16, bigEndian);
+  putImage -> pos_y  = GetUINT(buffer + 18, bigEndian);
+
+  putImage -> drawable = GetULONG(buffer + 4, bigEndian); 
+  putImage -> gcontext = GetULONG(buffer + 8, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsed identity for message at " << message << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int PutImageStore::unparseIdentity(const Message *message, unsigned char *buffer,
+                                       unsigned int size, int bigEndian) const
+{
+  PutImageMessage *putImage = (PutImageMessage *) message;
+
+  //
+  // Fill all the message's fields.
+  //
+
+  *(buffer + 1) = putImage -> format;
+
+  PutULONG(putImage -> drawable, buffer + 4, bigEndian);
+  PutULONG(putImage -> gcontext, buffer + 8, bigEndian);
+
+  PutUINT(putImage -> width, buffer + 12, bigEndian);
+  PutUINT(putImage -> height, buffer + 14, bigEndian);
+  PutUINT(putImage -> pos_x, buffer + 16, bigEndian);
+  PutUINT(putImage -> pos_y, buffer + 18, bigEndian);
+
+  *(buffer + 20) = (unsigned char) putImage -> left_pad;
+  *(buffer + 21) = (unsigned char) putImage -> depth;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsed identity for message at "
+          << message << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void PutImageStore::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  PutImageMessage *putImage = (PutImageMessage *) message;
+
+  *logofs << name() << ": Identity format " << (unsigned) putImage -> format 
+          << ", depth " << (unsigned) putImage -> depth << ", left_pad " 
+          << (unsigned) putImage -> left_pad << ", width " << putImage -> width  
+          << ", height " << putImage -> height << ", pos_x " << putImage -> pos_x 
+          << ", pos_y " << putImage -> pos_y << ", drawable " << putImage -> drawable 
+          << ", gcontext " << putImage -> gcontext  << ", size " << putImage -> size_
+          << ".\n" << logofs_flush;
+
+  #endif
+}
+
+void PutImageStore::identityChecksum(const Message *message, const unsigned char *buffer,
+                                         unsigned int size, int bigEndian) const
+{
+  //
+  // Fields format, width, height, left_pad, depth.
+  //
+
+  md5_append(md5_state_, buffer + 1,  1);
+  md5_append(md5_state_, buffer + 12, 4);
+  md5_append(md5_state_, buffer + 20, 2);
+}
+
+void PutImageStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                       const Message *cachedMessage,
+                                           ChannelCache *channelCache) const
+{
+  //
+  // Encode the variant part.
+  //
+
+  PutImageMessage *putImage       = (PutImageMessage *) message;
+  PutImageMessage *cachedPutImage = (PutImageMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << putImage -> drawable
+          << " as drawable field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeXidValue(putImage -> drawable, clientCache -> drawableCache);
+
+  cachedPutImage -> drawable = putImage -> drawable;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << putImage -> gcontext
+          << " as gcontext field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeXidValue(putImage -> gcontext, clientCache -> gcCache);
+
+  cachedPutImage -> gcontext = putImage -> gcontext;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << putImage -> pos_x
+          << " as " << "pos_x" << " field.\n" << logofs_flush;
+  #endif
+
+  unsigned short int diff_x = putImage -> pos_x - cachedPutImage -> pos_x;
+
+  encodeBuffer.encodeCachedValue(diff_x, 16,
+                     clientCache -> putImageXCache, 8);
+
+  cachedPutImage -> pos_x = putImage -> pos_x;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << putImage -> pos_y
+          << " as " << "pos_y" << " field.\n" << logofs_flush;
+  #endif
+
+  unsigned short int diff_y = putImage -> pos_y - cachedPutImage -> pos_y;
+
+  encodeBuffer.encodeCachedValue(diff_y, 16,
+                     clientCache -> putImageYCache, 8);
+
+  cachedPutImage -> pos_y = putImage -> pos_y;
+}
+
+void PutImageStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                       ChannelCache *channelCache) const
+{
+  //
+  // Decode the variant part.
+  //
+
+  PutImageMessage *putImage = (PutImageMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  unsigned int value;
+
+  decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
+
+  putImage -> drawable = value;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << putImage -> drawable
+          << " as drawable field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeXidValue(value, clientCache -> gcCache);
+
+  putImage -> gcontext = value;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << putImage -> gcontext
+          << " as gcontext field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeCachedValue(value, 16,
+               clientCache -> putImageXCache, 8);
+
+  putImage -> pos_x += value;
+  putImage -> pos_x &= 0xffff;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << putImage -> pos_x
+          << " as pos_x field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeCachedValue(value, 16,
+               clientCache -> putImageYCache, 8);
+
+  putImage -> pos_y += value;
+  putImage -> pos_y &= 0xffff;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << putImage -> pos_y
+          << " as pos_y field.\n" << logofs_flush;
+  #endif
+}
diff --git a/nxcomp/src/PutImage.h b/nxcomp/src/PutImage.h
new file mode 100644
index 000000000..93dde9dfb
--- /dev/null
+++ b/nxcomp/src/PutImage.h
@@ -0,0 +1,172 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef PutImage_H
+#define PutImage_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+
+#define PUTIMAGE_ENABLE_CACHE                            1
+#define PUTIMAGE_ENABLE_DATA                             1
+
+#define PUTIMAGE_DATA_LIMIT                              262144 - 24
+#define PUTIMAGE_DATA_OFFSET                             24
+
+#define PUTIMAGE_CACHE_SLOTS                             6000
+#define PUTIMAGE_CACHE_THRESHOLD                         70
+#define PUTIMAGE_CACHE_LOWER_THRESHOLD                   50
+
+#define PUTIMAGE_ENABLE_COMPRESS_IF_PROTO_STEP_7         0
+
+#define PUTIMAGE_CACHE_THRESHOLD_IF_PACKED               10
+#define PUTIMAGE_CACHE_LOWER_THRESHOLD_IF_PACKED         5
+
+#define PUTIMAGE_CACHE_THRESHOLD_IF_SHADOW               97
+#define PUTIMAGE_CACHE_LOWER_THRESHOLD_IF_SHADOW         90
+
+#define PUTIMAGE_ENABLE_SPLIT_IF_PROTO_STEP_8            0
+
+//
+// The message class.
+//
+
+class PutImageMessage : public Message
+{
+  friend class PutImageStore;
+
+  public:
+
+  PutImageMessage()
+  {
+  }
+
+  ~PutImageMessage()
+  {
+  }
+
+  //
+  // Put here the fields which constitute 
+  // the 'identity' part of the message.
+  //
+
+  private:
+
+  unsigned char  format;
+  unsigned char  depth;
+  unsigned char  left_pad;
+  unsigned short width;
+  unsigned short height;
+  unsigned int   drawable;
+  unsigned int   gcontext;
+  unsigned short pos_x;
+  unsigned short pos_y;
+};
+
+class PutImageStore : public MessageStore
+{
+  public:
+
+  PutImageStore(StaticCompressor *compressor);
+
+  virtual ~PutImageStore();
+
+  virtual const char *name() const
+  {
+    return "PutImage";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return X_PutImage;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(PutImageMessage);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  protected:
+
+  virtual Message *create() const
+  {
+    return new PutImageMessage();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new PutImageMessage((const PutImageMessage &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (PutImageMessage *) message;
+  }
+
+  virtual int encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                                 const unsigned int size, int bigEndian,
+                                     ChannelCache *channelCache) const;
+
+  virtual int decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
+                                 unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
+                                     ChannelCache *channelCache) const;
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer, 
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer, 
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                  const Message *cachedMessage,
+                                      ChannelCache *channelCache) const;
+
+  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                  ChannelCache *channelCache) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer, 
+                                    unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+};
+
+#endif /* PutImage_H */
diff --git a/nxcomp/src/PutPackedImage.cpp b/nxcomp/src/PutPackedImage.cpp
new file mode 100644
index 000000000..0bae2c0d4
--- /dev/null
+++ b/nxcomp/src/PutPackedImage.cpp
@@ -0,0 +1,604 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "PutPackedImage.h"
+
+#include "ClientCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+#include "WriteBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Constructors and destructors.
+//
+
+PutPackedImageStore::PutPackedImageStore(StaticCompressor *compressor)
+
+  : MessageStore(compressor)
+{
+  enableCache    = PUTPACKEDIMAGE_ENABLE_CACHE;
+  enableData     = PUTPACKEDIMAGE_ENABLE_DATA;
+  enableCompress = PUTPACKEDIMAGE_ENABLE_COMPRESS;
+
+  dataLimit  = PUTPACKEDIMAGE_DATA_LIMIT;
+  dataOffset = PUTPACKEDIMAGE_DATA_OFFSET;
+
+  cacheSlots          = PUTPACKEDIMAGE_CACHE_SLOTS;
+  cacheThreshold      = PUTPACKEDIMAGE_CACHE_THRESHOLD;
+  cacheLowerThreshold = PUTPACKEDIMAGE_CACHE_LOWER_THRESHOLD;
+
+  // Since ProtoStep8 (#issue 108)
+  enableSplit = PUTPACKEDIMAGE_ENABLE_SPLIT_IF_PROTO_STEP_8;
+
+  messages_ -> resize(cacheSlots);
+
+  for (T_messages::iterator i = messages_ -> begin();
+           i < messages_ -> end(); i++)
+  {
+    *i = NULL;
+  }
+
+  temporary_ = NULL;
+}
+
+PutPackedImageStore::~PutPackedImageStore()
+{
+  for (T_messages::iterator i = messages_ -> begin();
+           i < messages_ -> end(); i++)
+  {
+    destroy(*i);
+  }
+
+  destroy(temporary_);
+}
+
+//
+// Here are the methods to handle messages' content.
+//
+
+int PutPackedImageStore::encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                                            const unsigned int size, int bigEndian,
+                                                ChannelCache *channelCache) const
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Encoding full message identity.\n" << logofs_flush;
+  #endif
+
+  // Client.
+  encodeBuffer.encodeCachedValue(*(buffer + 1), 8,
+                     clientCache -> resourceCache);
+
+  // Size.
+  encodeBuffer.encodeValue(GetUINT(buffer + 2, bigEndian), 16, 10);
+
+  // Drawable.
+  encodeBuffer.encodeXidValue(GetULONG(buffer + 4, bigEndian),
+                     clientCache -> drawableCache);
+  // GC.
+  encodeBuffer.encodeXidValue(GetULONG(buffer + 8, bigEndian),
+                     clientCache -> gcCache);
+  // Method.
+  encodeBuffer.encodeCachedValue(*(buffer + 12), 8,
+                     clientCache -> methodCache);
+  // Format.
+  encodeBuffer.encodeValue(*(buffer + 13), 2);
+
+  // SrcDepth.
+  encodeBuffer.encodeCachedValue(*(buffer + 14), 8,
+                     clientCache -> depthCache);
+  // DstDepth.
+  encodeBuffer.encodeCachedValue(*(buffer + 15), 8,
+                     clientCache -> depthCache);
+  // SrcLength.
+  encodeBuffer.encodeCachedValue(GetULONG(buffer + 16, bigEndian), 24,
+                     clientCache -> putPackedImageSrcLengthCache);
+  // DstLength.
+  encodeBuffer.encodeCachedValue(GetULONG(buffer + 20, bigEndian), 24,
+                     clientCache -> putPackedImageDstLengthCache);
+  // SrcX.
+  unsigned int x = GetUINT(buffer + 24, bigEndian);
+  int xDiff = x - clientCache -> putImageLastX;
+  clientCache -> putImageLastX = x;
+  encodeBuffer.encodeCachedValue(xDiff, 16,
+                     clientCache -> putImageXCache, 8);
+  // SrcY.
+  unsigned int y = GetUINT(buffer + 26, bigEndian);
+  int yDiff = y - clientCache -> putImageLastY;
+  clientCache -> putImageLastY = y;
+  encodeBuffer.encodeCachedValue(yDiff, 16,
+                     clientCache -> putImageYCache, 8);
+  // SrcWidth.
+  encodeBuffer.encodeCachedValue(GetUINT(buffer + 28, bigEndian), 16,
+                     clientCache -> putImageWidthCache, 8);
+  // SrcHeight.
+  encodeBuffer.encodeCachedValue(GetUINT(buffer + 30, bigEndian), 16,
+                     clientCache -> putImageHeightCache, 8);
+  // DstX.
+  x = GetUINT(buffer + 32, bigEndian);
+  xDiff = x - clientCache -> putImageLastX;
+  clientCache -> putImageLastX = x;
+  encodeBuffer.encodeCachedValue(xDiff, 16,
+                     clientCache -> putImageXCache, 8);
+  // DstY.
+  y = GetUINT(buffer + 34, bigEndian);
+  yDiff = y - clientCache -> putImageLastY;
+  clientCache -> putImageLastY = y;
+  encodeBuffer.encodeCachedValue(yDiff, 16,
+                     clientCache -> putImageYCache, 8);
+  // DstWidth.
+  encodeBuffer.encodeCachedValue(GetUINT(buffer + 36, bigEndian), 16,
+                     clientCache -> putImageWidthCache, 8);
+  // DstHeight.
+  encodeBuffer.encodeCachedValue(GetUINT(buffer + 38, bigEndian), 16,
+                     clientCache -> putImageHeightCache, 8);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Encoded full message identity.\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int PutPackedImageStore::decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
+                                            unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
+                                                ChannelCache *channelCache) const
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoding full message identity.\n" << logofs_flush;
+  #endif
+
+  unsigned int value;
+  unsigned char cValue;
+
+  // Client.
+  decodeBuffer.decodeCachedValue(cValue, 8,
+                     clientCache -> resourceCache);
+
+  // Size.
+  decodeBuffer.decodeValue(size, 16, 10);
+
+  size <<= 2;
+
+  buffer = writeBuffer -> addMessage(size);
+
+  *(buffer + 1) = cValue;
+
+  // Drawable.
+  decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
+  PutULONG(value, buffer + 4, bigEndian);
+
+  // GC.
+  decodeBuffer.decodeXidValue(value, clientCache -> gcCache);
+  PutULONG(value, buffer + 8, bigEndian);
+
+  // Method.
+  decodeBuffer.decodeCachedValue(cValue, 8,
+                     clientCache -> methodCache);
+  *(buffer + 12) = cValue;
+
+  // Format.
+  decodeBuffer.decodeValue(value, 2);
+  *(buffer + 13) = value;
+
+  // SrcDepth.
+  decodeBuffer.decodeCachedValue(cValue, 8,
+                     clientCache -> depthCache);
+  *(buffer + 14) = cValue;
+
+  // DstDepth.
+  decodeBuffer.decodeCachedValue(cValue, 8,
+                     clientCache -> depthCache);
+  *(buffer + 15) = cValue;
+
+  // SrcLength.
+  decodeBuffer.decodeCachedValue(value, 24,
+                     clientCache -> putPackedImageSrcLengthCache);
+  PutULONG(value, buffer + 16, bigEndian);
+
+  // DstLength.
+  decodeBuffer.decodeCachedValue(value, 24,
+                     clientCache -> putPackedImageDstLengthCache);
+  PutULONG(value, buffer + 20, bigEndian);
+
+  // SrcX.
+  decodeBuffer.decodeCachedValue(value, 16,
+                     clientCache -> putImageXCache, 8);
+  clientCache -> putImageLastX += value;
+  clientCache -> putImageLastX &= 0xffff;
+  PutUINT(clientCache -> putImageLastX, buffer + 24, bigEndian);
+
+  // SrcY.
+  decodeBuffer.decodeCachedValue(value, 16,
+                     clientCache -> putImageYCache, 8);
+  clientCache -> putImageLastY += value;
+  clientCache -> putImageLastY &= 0xffff;
+  PutUINT(clientCache -> putImageLastY, buffer + 26, bigEndian);
+
+  // SrcWidth.
+  decodeBuffer.decodeCachedValue(value, 16,
+                     clientCache -> putImageWidthCache, 8);
+  PutUINT(value, buffer + 28, bigEndian);
+
+  // SrcHeight.
+  decodeBuffer.decodeCachedValue(value, 16,
+                     clientCache -> putImageHeightCache, 8);
+  PutUINT(value, buffer + 30, bigEndian);
+
+  // DstX.
+  decodeBuffer.decodeCachedValue(value, 16,
+                     clientCache -> putImageXCache, 8);
+  clientCache -> putImageLastX += value;
+  clientCache -> putImageLastX &= 0xffff;
+  PutUINT(clientCache -> putImageLastX, buffer + 32, bigEndian);
+
+  // DstY.
+  decodeBuffer.decodeCachedValue(value, 16,
+                     clientCache -> putImageYCache, 8);
+  clientCache -> putImageLastY += value;
+  clientCache -> putImageLastY &= 0xffff;
+  PutUINT(clientCache -> putImageLastY, buffer + 34, bigEndian);
+
+  // DstWidth.
+  decodeBuffer.decodeCachedValue(value, 16,
+                     clientCache -> putImageWidthCache, 8);
+  PutUINT(value, buffer + 36, bigEndian);
+
+  // DstHeight.
+  decodeBuffer.decodeCachedValue(value, 16,
+                     clientCache -> putImageHeightCache, 8);
+  PutUINT(value, buffer + 38, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded full message identity.\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int PutPackedImageStore::parseIdentity(Message *message, const unsigned char *buffer,
+                                           unsigned int size, int bigEndian) const
+{
+  PutPackedImageMessage *putPackedImage = (PutPackedImageMessage *) message;
+
+  //
+  // Here is the fingerprint.
+  //
+
+  putPackedImage -> client = *(buffer + 1);
+
+  putPackedImage -> drawable = GetULONG(buffer + 4,  bigEndian); 
+  putPackedImage -> gcontext = GetULONG(buffer + 8,  bigEndian);
+
+  putPackedImage -> method = *(buffer + 12);
+
+  putPackedImage -> format    = *(buffer + 13);
+  putPackedImage -> src_depth = *(buffer + 14);
+  putPackedImage -> dst_depth = *(buffer + 15);
+
+  putPackedImage -> src_length = GetULONG(buffer + 16,  bigEndian);
+  putPackedImage -> dst_length = GetULONG(buffer + 20,  bigEndian);
+
+  putPackedImage -> src_x      = GetUINT(buffer + 24, bigEndian);
+  putPackedImage -> src_y      = GetUINT(buffer + 26, bigEndian);
+  putPackedImage -> src_width  = GetUINT(buffer + 28, bigEndian);
+  putPackedImage -> src_height = GetUINT(buffer + 30, bigEndian);
+
+  putPackedImage -> dst_x      = GetUINT(buffer + 32, bigEndian);
+  putPackedImage -> dst_y      = GetUINT(buffer + 34, bigEndian);
+  putPackedImage -> dst_width  = GetUINT(buffer + 36, bigEndian);
+  putPackedImage -> dst_height = GetUINT(buffer + 38, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsed identity for message at "
+          << message << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int PutPackedImageStore::unparseIdentity(const Message *message, unsigned char *buffer,
+                                             unsigned int size, int bigEndian) const
+{
+  PutPackedImageMessage *putPackedImage = (PutPackedImageMessage *) message;
+
+  //
+  // Fill all the message's fields.
+  //
+
+  *(buffer + 1) = putPackedImage -> client;
+
+  PutULONG(putPackedImage -> drawable, buffer + 4, bigEndian);
+  PutULONG(putPackedImage -> gcontext, buffer + 8, bigEndian);
+
+  *(buffer + 12) = putPackedImage -> method;
+
+  *(buffer + 13) = putPackedImage -> format;
+  *(buffer + 14) = putPackedImage -> src_depth;
+  *(buffer + 15) = putPackedImage -> dst_depth;
+
+  PutULONG(putPackedImage -> src_length, buffer + 16, bigEndian);
+  PutULONG(putPackedImage -> dst_length, buffer + 20, bigEndian);
+
+  PutUINT(putPackedImage -> src_x,      buffer + 24, bigEndian);
+  PutUINT(putPackedImage -> src_y,      buffer + 26, bigEndian);
+  PutUINT(putPackedImage -> src_width,  buffer + 28, bigEndian);
+  PutUINT(putPackedImage -> src_height, buffer + 30, bigEndian);
+
+  PutUINT(putPackedImage -> dst_x,      buffer + 32, bigEndian);
+  PutUINT(putPackedImage -> dst_y,      buffer + 34, bigEndian);
+  PutUINT(putPackedImage -> dst_width,  buffer + 36, bigEndian);
+  PutUINT(putPackedImage -> dst_height, buffer + 38, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsed identity for message at "
+          << message << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void PutPackedImageStore::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  PutPackedImageMessage *putPackedImage = (PutPackedImageMessage *) message;
+
+  *logofs << name() << ": Identity format "
+
+          << "drawable " << putPackedImage -> drawable << ", "
+          << "gcontext " << putPackedImage -> gcontext << ", "
+
+          << "format "     << (unsigned int) putPackedImage -> format     << ", "
+          << "method "     << (unsigned int) putPackedImage -> method     << ", "
+
+          << "src_depth "  << (unsigned int) putPackedImage -> src_depth  << ", "
+          << "dst_depth "  << (unsigned int) putPackedImage -> dst_depth  << ", "
+
+          << "src_length " << putPackedImage -> src_length << ", "
+          << "dst_length " << putPackedImage -> dst_length << ", "
+
+          << "src_x "      << putPackedImage -> src_x      << ", "
+          << "src_y "      << putPackedImage -> src_y      << ", "
+          << "src_width "  << putPackedImage -> src_width  << ", "
+          << "src_height " << putPackedImage -> src_height << ", "
+
+          << "dst_x "      << putPackedImage -> dst_x      << ", "
+          << "dst_y "      << putPackedImage -> dst_y      << ", "
+          << "dst_width "  << putPackedImage -> dst_width  << ", "
+          << "dst_height " << putPackedImage -> dst_height << ", "
+
+          << "size "   << putPackedImage -> size_   << ".\n"
+          << logofs_flush;
+
+  #endif
+}
+
+void PutPackedImageStore::identityChecksum(const Message *message, const unsigned char *buffer,
+                                               unsigned int size, int bigEndian) const
+{
+  //
+  // Fields method, format, src_depth, dst_depth,
+  // src_length, dst_length, src_x, src_y, src_width,
+  // src_height.
+  //
+  //
+  // TODO: We should better investigate the effect of
+  // having fields src_x and src_y in identity instead
+  // of keeping them in differences.
+  //
+
+  md5_append(md5_state_, buffer + 12, 20);
+}
+
+void PutPackedImageStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                             const Message *cachedMessage,
+                                                 ChannelCache *channelCache) const
+{
+  //
+  // Encode the variant part.
+  //
+
+  PutPackedImageMessage *putPackedImage       = (PutPackedImageMessage *) message;
+  PutPackedImageMessage *cachedPutPackedImage = (PutPackedImageMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value "
+          << (unsigned int) putPackedImage -> client
+          << " as client field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeCachedValue(putPackedImage -> client, 8,
+                     clientCache -> resourceCache);
+
+  cachedPutPackedImage -> client = putPackedImage -> client;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << putPackedImage -> drawable
+          << " as drawable field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeXidValue(putPackedImage -> drawable, clientCache -> drawableCache);
+
+  cachedPutPackedImage -> drawable = putPackedImage -> drawable;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << putPackedImage -> gcontext
+          << " as gcontext field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeXidValue(putPackedImage -> gcontext, clientCache -> gcCache);
+
+  cachedPutPackedImage -> gcontext = putPackedImage -> gcontext;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << putPackedImage -> dst_x
+          << " as " << "dst_x" << " field.\n" << logofs_flush;
+  #endif
+
+  unsigned short int diff_x = putPackedImage -> dst_x - cachedPutPackedImage -> dst_x;
+
+  encodeBuffer.encodeCachedValue(diff_x, 16,
+                     clientCache -> putImageXCache, 8);
+
+  cachedPutPackedImage -> dst_x = putPackedImage -> dst_x;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << putPackedImage -> dst_y
+          << " as " << "dst_y" << " field.\n" << logofs_flush;
+  #endif
+
+  unsigned short int diff_y = putPackedImage -> dst_y - cachedPutPackedImage -> dst_y;
+
+  encodeBuffer.encodeCachedValue(diff_y, 16,
+                     clientCache -> putImageYCache, 8);
+
+  cachedPutPackedImage -> dst_y = putPackedImage -> dst_y;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << putPackedImage -> dst_width
+          << " as " << "dst_width" << " field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeCachedValue(putPackedImage -> dst_width, 16,
+                     clientCache -> putImageWidthCache, 8);
+
+  cachedPutPackedImage -> dst_width = putPackedImage -> dst_width;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << putPackedImage -> dst_height
+          << " as " << "dst_height" << " field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeCachedValue(putPackedImage -> dst_height, 16,
+                     clientCache -> putImageHeightCache, 8);
+
+  cachedPutPackedImage -> dst_height = putPackedImage -> dst_height;
+}
+
+void PutPackedImageStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                             ChannelCache *channelCache) const
+{
+  //
+  // Decode the variant part.
+  //
+
+  PutPackedImageMessage *putPackedImage = (PutPackedImageMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  unsigned int  value;
+
+  decodeBuffer.decodeCachedValue(putPackedImage -> client, 8,
+                     clientCache -> resourceCache);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value "
+          << (unsigned int) putPackedImage -> client
+          << " as client field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeXidValue(value, clientCache -> drawableCache);
+
+  putPackedImage -> drawable = value;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << putPackedImage -> drawable
+          << " as drawable field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeXidValue(value, clientCache -> gcCache);
+
+  putPackedImage -> gcontext = value;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << putPackedImage -> gcontext
+          << " as gcontext field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeCachedValue(value, 16,
+               clientCache -> putImageXCache, 8);
+
+  putPackedImage -> dst_x += value;
+  putPackedImage -> dst_x &= 0xffff;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << putPackedImage -> dst_x
+          << " as dst_x field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeCachedValue(value, 16,
+               clientCache -> putImageYCache, 8);
+
+  putPackedImage -> dst_y += value;
+  putPackedImage -> dst_y &= 0xffff;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << putPackedImage -> dst_y
+          << " as dst_y field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeCachedValue(value, 16,
+               clientCache -> putImageWidthCache, 8);
+
+  putPackedImage -> dst_width = value;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << putPackedImage -> dst_width
+          << " as dst_width field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeCachedValue(value, 16,
+               clientCache -> putImageHeightCache, 8);
+
+  putPackedImage -> dst_height = value;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << putPackedImage -> dst_height
+          << " as dst_height field.\n" << logofs_flush;
+  #endif
+}
+
diff --git a/nxcomp/src/PutPackedImage.h b/nxcomp/src/PutPackedImage.h
new file mode 100644
index 000000000..d28ad39eb
--- /dev/null
+++ b/nxcomp/src/PutPackedImage.h
@@ -0,0 +1,218 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef PutPackedImage_H
+#define PutPackedImage_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+
+#define PUTPACKEDIMAGE_ENABLE_CACHE                            1
+#define PUTPACKEDIMAGE_ENABLE_DATA                             1
+#define PUTPACKEDIMAGE_ENABLE_COMPRESS                         0
+
+//
+// We can't exceed lenght of 262144 bytes.
+//
+
+#define PUTPACKEDIMAGE_DATA_LIMIT                              262144 - 40
+#define PUTPACKEDIMAGE_DATA_OFFSET                             40
+
+#define PUTPACKEDIMAGE_CACHE_SLOTS                             6000
+#define PUTPACKEDIMAGE_CACHE_THRESHOLD                         70
+#define PUTPACKEDIMAGE_CACHE_LOWER_THRESHOLD                   50
+
+#define PUTPACKEDIMAGE_CACHE_THRESHOLD_IF_PACKED_SHADOW        97
+#define PUTPACKEDIMAGE_CACHE_LOWER_THRESHOLD_IF_PACKED_SHADOW  90
+
+#define PUTPACKEDIMAGE_ENABLE_SPLIT_IF_PROTO_STEP_8            0
+
+//
+// The message class.
+//
+
+class PutPackedImageMessage : public Message
+{
+  friend class PutPackedImageStore;
+
+  public:
+
+  PutPackedImageMessage()
+  {
+  }
+
+  ~PutPackedImageMessage()
+  {
+  }
+
+  //
+  // Here are the fields which constitute
+  // the 'identity' part of the message.
+  //
+
+  private:
+
+  unsigned char  client;
+
+  unsigned int   drawable;
+  unsigned int   gcontext;
+
+  unsigned char  format;
+  unsigned char  method;
+
+  unsigned char  src_depth;
+  unsigned char  dst_depth;
+
+  unsigned int   src_length;
+  unsigned int   dst_length;
+
+  short int      src_x;
+  short int      src_y;
+  unsigned short src_width;
+  unsigned short src_height;
+
+  short int      dst_x;
+  short int      dst_y;
+  unsigned short dst_width;
+  unsigned short dst_height;
+};
+
+class PutPackedImageStore : public MessageStore
+{
+  //
+  // Constructors and destructors.
+  //
+
+  public:
+
+  PutPackedImageStore(StaticCompressor *compressor);
+
+  virtual ~PutPackedImageStore();
+
+  virtual const char *name() const
+  {
+    return "PutPackedImage";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return X_NXPutPackedImage;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(PutPackedImageMessage);
+  }
+
+  //
+  // Very special of this class.
+  //
+
+  int getPackedSize(const int position) const
+  {
+    PutPackedImageMessage *message = (PutPackedImageMessage *) (*messages_)[position];
+
+    if (message == NULL)
+    {
+      return 0;
+    }
+
+    return dataOffset + message -> src_length;
+  }
+
+  int getUnpackedSize(const int position) const
+  {
+    PutPackedImageMessage *message = (PutPackedImageMessage *) (*messages_)[position];
+
+    if (message == NULL)
+    {
+      return 0;
+    }
+
+    return dataOffset + message -> dst_length;
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  protected:
+
+  virtual Message *create() const
+  {
+    return new PutPackedImageMessage();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new PutPackedImageMessage((const PutPackedImageMessage &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (PutPackedImageMessage *) message;
+  }
+
+  virtual int encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                                 const unsigned int size, int bigEndian,
+                                     ChannelCache *channelCache) const;
+
+  virtual int decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
+                                 unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
+                                     ChannelCache *channelCache) const;
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer, 
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer, 
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                  const Message *cachedMessage,
+                                      ChannelCache *channelCache) const;
+
+  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                  ChannelCache *channelCache) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer, 
+                                    unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+};
+
+#endif /* PutPackedImage_H */
diff --git a/nxcomp/src/QueryFontReply.cpp b/nxcomp/src/QueryFontReply.cpp
new file mode 100644
index 000000000..fde873140
--- /dev/null
+++ b/nxcomp/src/QueryFontReply.cpp
@@ -0,0 +1,154 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "QueryFontReply.h"
+
+#include "ServerCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+QueryFontReplyStore::QueryFontReplyStore(StaticCompressor *compressor)
+
+  : MessageStore(compressor)
+{
+  enableCache    = QUERYFONTREPLY_ENABLE_CACHE;
+  enableData     = QUERYFONTREPLY_ENABLE_DATA;
+  enableSplit    = QUERYFONTREPLY_ENABLE_SPLIT;
+
+  // Since ProtoStep7 (#issue 108)
+  enableCompress = QUERYFONTREPLY_ENABLE_COMPRESS_IF_PROTO_STEP_7;
+
+  dataLimit  = QUERYFONTREPLY_DATA_LIMIT;
+  dataOffset = QUERYFONTREPLY_DATA_OFFSET;
+
+  cacheSlots          = QUERYFONTREPLY_CACHE_SLOTS;
+  cacheThreshold      = QUERYFONTREPLY_CACHE_THRESHOLD;
+  cacheLowerThreshold = QUERYFONTREPLY_CACHE_LOWER_THRESHOLD;
+
+  messages_ -> resize(cacheSlots);
+
+  for (T_messages::iterator i = messages_ -> begin();
+           i < messages_ -> end(); i++)
+  {
+    *i = NULL;
+  }
+
+  temporary_ = NULL;
+}
+
+QueryFontReplyStore::~QueryFontReplyStore()
+{
+  for (T_messages::iterator i = messages_ -> begin();
+           i < messages_ -> end(); i++)
+  {
+    destroy(*i);
+  }
+
+  destroy(temporary_);
+}
+
+//
+// Here are the methods to handle messages' content.
+//
+
+int QueryFontReplyStore::parseIdentity(Message *message, const unsigned char *buffer,
+                                          unsigned int size, int bigEndian) const
+{
+  //
+  // Clear the padding bytes.
+  //
+
+  unsigned char *pad = (unsigned char *) buffer;
+
+  if (size >= 24)
+  {
+    PutULONG(0, pad + 20, bigEndian);
+  }
+
+  if (size >= 40)
+  {
+    PutULONG(0, pad + 36, bigEndian);
+  }
+
+  //
+  // TODO: This doesn't work. Probably these
+  // padding bytes are not padding anymore.
+  // This is to be investigated.
+  //
+  // pad += 60;
+  //
+  // while (pad + 16 <= (buffer + size))
+  // {
+  //   PutULONG(0, pad + 12, bigEndian);
+  //
+  //   pad += 16;
+  // }
+  //
+
+  #ifdef DEBUG
+  *logofs << name() << ": Cleaned padding bytes of "
+          << "message at " << message << ".\n"
+          << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int QueryFontReplyStore::unparseIdentity(const Message *message, unsigned char *buffer,
+                                            unsigned int size, int bigEndian) const
+{
+  return 1;
+}
+
+void QueryFontReplyStore::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  QueryFontReplyMessage *queryFontReply = (QueryFontReplyMessage *) message;
+
+  *logofs << name() << ": Identity size " << queryFontReply -> size_ << ".\n";
+
+  #endif
+}
+
+void QueryFontReplyStore::identityChecksum(const Message *message, const unsigned char *buffer,
+                                               unsigned int size, int bigEndian) const
+{
+}
diff --git a/nxcomp/src/QueryFontReply.h b/nxcomp/src/QueryFontReply.h
new file mode 100644
index 000000000..e12fe4e4b
--- /dev/null
+++ b/nxcomp/src/QueryFontReply.h
@@ -0,0 +1,136 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef QueryFontReply_H
+#define QueryFontReply_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+#define QUERYFONTREPLY_ENABLE_CACHE                       1
+#define QUERYFONTREPLY_ENABLE_DATA                        1
+#define QUERYFONTREPLY_ENABLE_SPLIT                       0
+
+#define QUERYFONTREPLY_DATA_LIMIT                         1048576 - 32
+#define QUERYFONTREPLY_DATA_OFFSET                        8
+
+#define QUERYFONTREPLY_CACHE_SLOTS                        200
+#define QUERYFONTREPLY_CACHE_THRESHOLD                    20
+#define QUERYFONTREPLY_CACHE_LOWER_THRESHOLD              5
+
+#define QUERYFONTREPLY_ENABLE_COMPRESS_IF_PROTO_STEP_7    0
+
+//
+// The message class.
+//
+
+class QueryFontReplyMessage : public Message
+{
+  friend class QueryFontReplyStore;
+
+  public:
+
+  QueryFontReplyMessage()
+  {
+  }
+
+  ~QueryFontReplyMessage()
+  {
+  }
+};
+
+class QueryFontReplyStore : public MessageStore
+{
+  //
+  // Constructors and destructors.
+  //
+
+  public:
+
+  QueryFontReplyStore(StaticCompressor *compressor);
+
+  virtual ~QueryFontReplyStore();
+
+  virtual const char *name() const
+  {
+    return "QueryFontReply";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return X_QueryFont;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(QueryFontReplyMessage);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  protected:
+
+  virtual Message *create() const
+  {
+    return new QueryFontReplyMessage();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new QueryFontReplyMessage((const QueryFontReplyMessage &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (QueryFontReplyMessage *) message;
+  }
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer, 
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer, 
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer, 
+                                    unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+};
+
+#endif /* QueryFontReply_H */
diff --git a/nxcomp/src/ReadBuffer.cpp b/nxcomp/src/ReadBuffer.cpp
new file mode 100644
index 000000000..154225e75
--- /dev/null
+++ b/nxcomp/src/ReadBuffer.cpp
@@ -0,0 +1,639 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "ReadBuffer.h"
+
+#include "Transport.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+ReadBuffer::ReadBuffer(Transport *transport)
+
+  : transport_(transport)
+{
+  //
+  // The read buffer will grow until
+  // reaching the maximum buffer size
+  // and then will remain stable at
+  // that size.
+  //
+
+  initialReadSize_   = READ_BUFFER_DEFAULT_SIZE;
+  maximumBufferSize_ = READ_BUFFER_DEFAULT_SIZE;
+
+  size_   = 0;
+  buffer_ = NULL;
+
+  owner_  = 1;
+  length_ = 0;
+  start_  = 0;
+
+  remaining_ = 0;
+}
+
+ReadBuffer::~ReadBuffer()
+{
+  if (owner_ == 1)
+  {
+    delete [] buffer_;
+  }
+}
+
+void ReadBuffer::readMessage(const unsigned char *message, unsigned int length)
+{
+  //
+  // To be here we must be the real owner
+  // of the buffer and there must not be
+  // pending bytes in the transport.
+  //
+
+  #ifdef TEST
+
+  if (owner_ == 0)
+  {
+    *logofs << "ReadBuffer: PANIC! Class for FD#"
+            << transport_ -> fd() << " doesn't "
+            << "appear to be the owner of the buffer "
+            << "while borrowing from the caller.\n"
+            << logofs_flush;
+
+    HandleCleanup();
+  }
+
+  #endif
+
+  //
+  // Be sure that any outstanding data from
+  // the transport is appended to our own
+  // byffer.
+  //
+
+  if (transport_ -> pending() != 0)
+  {
+    #ifdef WARNING
+    *logofs << "ReadBuffer: WARNING! Class for FD#"
+            << transport_ -> fd() << " has pending "
+            << "data in the transport while "
+            << "borrowing from the caller.\n"
+            << logofs_flush;
+    #endif
+
+    readMessage();
+
+    if (owner_ == 0)
+    {
+      convertBuffer();
+    }
+  }
+
+  //
+  // Can't borrow the buffer if there is data
+  // from a partial message. In this case add
+  // the new data to the end of our buffer.
+  //
+
+  if (length_ == 0)
+  {
+    #ifdef TEST
+    *logofs << "ReadBuffer: Borrowing " << length
+            << " bytes from the caller for FD#"
+            << transport_ -> fd() << " with "
+            << length_ << " bytes in the buffer.\n"
+            << logofs_flush;
+    #endif
+
+    delete [] buffer_;
+
+    buffer_ = (unsigned char *) message;
+    size_   = length;
+
+    length_ = length;
+
+    owner_ = 0;
+    start_ = 0;
+  }
+  else
+  {
+    #ifdef TEST
+    *logofs << "ReadBuffer: Appending " << length
+            << " bytes from the caller for FD#"
+            << transport_ -> fd() << " with "
+            << length_ << " bytes in the buffer.\n"
+            << logofs_flush;
+    #endif
+
+    appendBuffer(message, length);
+  }
+}
+
+int ReadBuffer::readMessage()
+{
+  int pendingLength = transport_ -> pending();
+
+  if (pendingLength > 0)
+  {
+    //
+    // Can't move the data in the borrowed buffer,
+    // so use the tansport buffer only if we don't
+    // have any partial message. This can happen
+    // with the proxy where we need to deflate the
+    // stream.
+    //
+
+    if (length_ == 0)
+    {
+      unsigned char *newBuffer;
+
+      length_ = transport_ -> getPending(newBuffer);
+
+      if (newBuffer == NULL)
+      {
+        #ifdef PANIC
+        *logofs << "ReadBuffer: PANIC! Failed to borrow "
+                << length_ << " bytes of memory for buffer "
+                << "in context [A].\n" << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Failed to borrow memory for "
+             << "read buffer in context [A].\n";
+
+        HandleCleanup();
+      }
+
+      delete [] buffer_;
+
+      buffer_ = newBuffer;
+      size_   = length_;
+
+      owner_ = 0;
+      start_ = 0;
+
+      #ifdef TEST
+      *logofs << "ReadBuffer: Borrowed " << length_
+              << " pending bytes for FD#" << transport_ ->
+                 fd() << ".\n" << logofs_flush;
+      #endif
+
+      return length_;
+    }
+    #ifdef TEST
+    else
+    {
+      *logofs << "ReadBuffer: WARNING! Cannot borrow "
+              << pendingLength << " bytes for FD#"
+              << transport_ -> fd() << " with "
+              << length_ << " bytes in the buffer.\n"
+              << logofs_flush;
+    }
+    #endif
+  }
+
+  unsigned int readLength = suggestedLength(pendingLength);
+
+  #ifdef DEBUG
+  *logofs << "ReadBuffer: Requested " << readLength
+          << " bytes for FD#" << transport_ -> fd()
+          << " with readable " << transport_ -> readable()
+          << " remaining " << remaining_ << " pending "
+          << transport_ -> pending() << ".\n"
+          << logofs_flush;
+  #endif
+
+  if (readLength < initialReadSize_)
+  {
+    readLength = initialReadSize_;
+  }
+
+  #ifdef DEBUG
+  *logofs << "ReadBuffer: Buffer size is " << size_
+          << " length " << length_ << " and start "
+          << start_  << ".\n" << logofs_flush;
+  #endif
+
+  //
+  // We can't use the transport buffer
+  // to read our own data in it.
+  //
+
+  #ifdef TEST
+
+  if (owner_ == 0)
+  {
+    *logofs << "ReadBuffer: PANIC! Class for FD#"
+            << transport_ -> fd() << " doesn't "
+            << "appear to be the owner of the buffer "
+            << "while reading.\n" << logofs_flush;
+
+    HandleCleanup();
+  }
+
+  #endif
+
+  //
+  // Be sure that we have enough space
+  // to store all the requested data.
+  //
+
+  if (buffer_ == NULL || length_ + readLength > size_)
+  {
+    unsigned int newSize = length_ + readLength;
+
+    #ifdef TEST
+    *logofs << "ReadBuffer: Resizing buffer for FD#"
+            << transport_ -> fd() << " in read from "
+            << size_ << " to " << newSize << " bytes.\n"
+            << logofs_flush;
+    #endif
+
+    unsigned char *newBuffer = allocateBuffer(newSize);
+
+    memcpy(newBuffer, buffer_ + start_, length_);
+
+    delete [] buffer_;
+
+    buffer_ = newBuffer;
+    size_   = newSize;
+
+    transport_ -> pendingReset();
+
+    owner_ = 1;
+  }
+  else if (start_ != 0 && length_ != 0)
+  {
+    //
+    // If any bytes are left due to a partial
+    // message, shift them to the beginning
+    // of the buffer.
+    //
+
+    #ifdef TEST
+    *logofs << "ReadBuffer: Moving " << length_
+            << " bytes of data " << "at beginning of "
+            << "the buffer for FD#" << transport_ -> fd() 
+            << ".\n" << logofs_flush;
+    #endif
+
+    memmove(buffer_, buffer_ + start_, length_);
+  }
+
+  start_ = 0;
+
+  #ifdef DEBUG
+  *logofs << "ReadBuffer: Buffer size is now " << size_ 
+          << " length is " << length_ << " and start is " 
+          << start_ << ".\n" << logofs_flush;
+  #endif
+
+  unsigned char *readData = buffer_ + length_;
+
+  #ifdef DEBUG
+  *logofs << "ReadBuffer: Going to read " << readLength 
+          << " bytes from FD#" << transport_ -> fd() << ".\n"
+          << logofs_flush;
+  #endif
+
+  int bytesRead = transport_ -> read(readData, readLength);
+
+  if (bytesRead > 0)
+  {
+    #ifdef TEST
+    *logofs << "ReadBuffer: Read " << bytesRead
+            << " bytes from FD#" << transport_ -> fd()
+            << ".\n" << logofs_flush;
+    #endif
+
+    length_ += bytesRead;
+  }
+  else if (bytesRead < 0)
+  {
+    //
+    // Check if there is more data pending than the
+    // size of the provided buffer. After reading
+    // the requested amount, in fact, the transport
+    // may have decompressed the data and produced
+    // more input. This trick allows us to always
+    // borrow the buffer from the transport, even
+    // when the partial read would have prevented
+    // that.
+    //
+
+    if (transport_ -> pending() > 0)
+    {
+      #ifdef TEST
+      *logofs << "ReadBuffer: WARNING! Trying to read some "
+              << "more with " << transport_ -> pending()
+              << " bytes pending for FD#" << transport_ ->
+                 fd() << ".\n" << logofs_flush;
+      #endif
+
+      return readMessage();
+    }
+
+    #ifdef TEST
+    *logofs << "ReadBuffer: Error detected reading "
+            << "from FD#" << transport_ -> fd()
+            << ".\n" << logofs_flush;
+    #endif
+
+    return -1;
+  }
+  #ifdef TEST
+  else
+  {
+    *logofs << "ReadBuffer: No data read from FD#"
+            << transport_ -> fd() << " with remaining "
+            << remaining_ << ".\n" << logofs_flush;
+  }
+  #endif
+
+  return bytesRead;
+}
+
+const unsigned char *ReadBuffer::getMessage(unsigned int &controlLength,
+                                                unsigned int &dataLength)
+{
+  #ifdef TEST
+
+  if (transport_ -> pending() > 0)
+  {
+    *logofs << "ReadBuffer: PANIC! The transport "
+            << "appears to have data pending.\n"
+            << logofs_flush;
+
+    HandleCleanup();
+  }
+
+  #endif
+
+  if (length_ == 0)
+  {
+    #ifdef DEBUG
+    *logofs << "ReadBuffer: No message can be located "
+            << "for FD#" << transport_ -> fd() << ".\n"
+            << logofs_flush;
+    #endif
+
+    if (owner_ == 0)
+    {
+      buffer_ = NULL;
+      size_   = 0;
+
+      transport_ -> pendingReset();
+
+      owner_ = 1;
+      start_ = 0;
+    }
+
+    return NULL;
+  }
+
+  unsigned int trailerLength;
+
+  #ifdef DEBUG
+  *logofs << "ReadBuffer: Going to locate message with "
+          << "start at " << start_ << " and length "
+          << length_ << " for FD#" << transport_ -> fd()
+          << ".\n" << logofs_flush;
+  #endif
+
+  int located = locateMessage(buffer_ + start_, buffer_ + start_ + length_,
+                                  controlLength, dataLength, trailerLength);
+
+  if (located == 0)
+  {
+    //
+    // No more complete messages are in
+    // the buffer.
+    //
+
+    #ifdef DEBUG
+    *logofs << "ReadBuffer: No message was located "
+            << "for FD#" << transport_ -> fd()
+            << ".\n" << logofs_flush;
+    #endif
+
+    if (owner_ == 0)
+    {
+      //
+      // Must move the remaining bytes in
+      // our own buffer.
+      //
+
+      convertBuffer();
+    }
+  
+    return NULL;
+  }
+  else
+  {
+    const unsigned char *result = buffer_ + start_;
+
+    if (dataLength > 0)
+    {
+      //
+      // Message contains data, so go to the
+      // first byte of payload.
+      //
+
+      result += trailerLength;
+
+      start_  += (dataLength + trailerLength);
+      length_ -= (dataLength + trailerLength);
+    }
+    else
+    {
+      //
+      // It is a control message.
+      //
+
+      start_  += (controlLength + trailerLength);
+      length_ -= (controlLength + trailerLength);
+    }
+
+    #ifdef DEBUG
+    *logofs << "ReadBuffer: Located message for FD#"
+            << transport_ -> fd() << " with control length "
+            << controlLength << " and data length "
+            << dataLength << ".\n" << logofs_flush;
+    #endif
+
+    remaining_ = 0;
+
+    return result;
+  }
+}
+
+int ReadBuffer::setSize(int initialReadSize, int maximumBufferSize)
+{
+  initialReadSize_   = initialReadSize;
+  maximumBufferSize_ = maximumBufferSize;
+
+  #ifdef TEST
+  *logofs << "ReadBuffer: WARNING! Set buffer parameters to "
+          << initialReadSize_ << "/" << maximumBufferSize_
+          << " for object at "<< this << ".\n"
+          << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void ReadBuffer::fullReset()
+{
+  #ifdef TEST
+
+  if (owner_ == 0)
+  {
+    *logofs << "ReadBuffer: PANIC! Class for FD#"
+            << transport_ -> fd() << " doesn't "
+            << "appear to be the owner of the buffer "
+            << "in reset.\n" << logofs_flush;
+
+    HandleCleanup();
+  }
+
+  #endif
+
+  if (length_ == 0 && size_ > maximumBufferSize_)
+  {
+    #ifdef TEST
+    *logofs << "ReadBuffer: Resizing buffer for FD#"
+            << transport_ -> fd() << " in reset from "
+            << size_ << " to " << maximumBufferSize_
+            << " bytes.\n" << logofs_flush;
+    #endif
+
+    delete [] buffer_;
+
+    int newSize = maximumBufferSize_;
+
+    unsigned char *newBuffer = allocateBuffer(newSize);
+
+    buffer_ = newBuffer;
+    size_   = newSize;
+
+    transport_ -> pendingReset();
+
+    owner_ = 1;
+    start_ = 0;
+  }
+}
+
+unsigned char *ReadBuffer::allocateBuffer(unsigned int newSize)
+{
+  unsigned char *newBuffer = new unsigned char[newSize];
+
+  if (newBuffer == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "ReadBuffer: PANIC! Can't allocate "
+            << newSize << " bytes of memory for buffer "
+            << "in context [B].\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Can't allocate memory for "
+         << "read buffer in context [B].\n";
+
+    HandleCleanup();
+  }
+
+  #ifdef VALGRIND
+
+  memset(newBuffer, '\0', newSize);
+
+  #endif
+
+  return newBuffer;
+}
+
+void ReadBuffer::appendBuffer(const unsigned char *message, unsigned int length)
+{
+  if (start_ + length_ + length > size_)
+  {
+    unsigned int newSize = length_ + length + initialReadSize_;
+
+    #ifdef TEST
+    *logofs << "ReadBuffer: WARNING! Resizing buffer "
+            << "for FD#" << transport_ -> fd()
+            << " from " << size_ << " to " << newSize
+            << " bytes.\n" << logofs_flush;
+    #endif
+
+    unsigned char *newBuffer = allocateBuffer(newSize);
+
+    memcpy(newBuffer, buffer_ + start_, length_);
+
+    delete [] buffer_;
+
+    buffer_ = newBuffer;
+    size_   = newSize;
+
+    start_ = 0;
+  }
+
+  memcpy(buffer_ + start_ + length_, message, length);
+
+  length_ += length;
+
+  transport_ -> pendingReset();
+
+  owner_ = 1;
+}
+
+void ReadBuffer::convertBuffer()
+{
+  unsigned int newSize = length_ + initialReadSize_;
+
+  #ifdef TEST
+  *logofs << "ReadBuffer: WARNING! Converting "
+          << length_ << " bytes to own buffer "
+          << "for FD#" << transport_ -> fd()
+          << " with new size " << newSize
+          << " bytes.\n" << logofs_flush;
+  #endif
+
+  unsigned char *newBuffer = allocateBuffer(newSize);
+
+  memcpy(newBuffer, buffer_ + start_, length_);
+
+  buffer_ = newBuffer;
+  size_   = newSize;
+
+  transport_ -> pendingReset();
+
+  owner_ = 1;
+  start_ = 0;
+}
diff --git a/nxcomp/src/ReadBuffer.h b/nxcomp/src/ReadBuffer.h
new file mode 100644
index 000000000..a12bcc9b3
--- /dev/null
+++ b/nxcomp/src/ReadBuffer.h
@@ -0,0 +1,128 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef ReadBuffer_H
+#define ReadBuffer_H
+
+#include "Misc.h"
+#include "Timestamp.h"
+#include "Transport.h"
+
+#define READ_BUFFER_DEFAULT_SIZE  8192
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+class ReadBuffer
+{
+  public:
+
+  ReadBuffer(Transport *transport);
+
+  virtual ~ReadBuffer();
+
+  int readMessage();
+
+  void readMessage(const unsigned char *message, unsigned int length);
+
+  const unsigned char *getMessage(unsigned int &dataLength)
+  {
+    unsigned int controlLength;
+
+    return getMessage(controlLength, dataLength);
+  }
+
+  const unsigned char *getMessage(unsigned int &controlLength, unsigned int &dataLength);
+
+  unsigned int getLength() const
+  {
+    return length_;
+  }
+
+  unsigned int getRemaining() const
+  {
+    return remaining_;
+  }
+
+  int setSize(int initialReadSize, int initialbufferSize);
+
+  void fullReset();
+
+  //
+  // Check if there is a complete
+  // message in the buffer.
+  //
+
+  int checkMessage()
+  {
+    if (length_ == 0)
+    {
+      return 0;
+    }
+    else
+    {
+      unsigned int controlLength;
+      unsigned int dataLength;
+      unsigned int trailerLength;
+
+      return (locateMessage(buffer_ + start_, buffer_ + start_ + length_,
+                  controlLength, dataLength, trailerLength));
+    }
+  }
+
+  protected:
+
+  virtual unsigned int suggestedLength(unsigned int pendingLength) = 0;
+
+  virtual int locateMessage(const unsigned char *start,
+                                const unsigned char *end,
+                                    unsigned int &controlLength,
+                                        unsigned int &dataLength,
+                                            unsigned int &trailerLength) = 0;
+
+  unsigned char *allocateBuffer(unsigned int newSize);
+
+  void appendBuffer(const unsigned char *message, unsigned int length);
+
+  void convertBuffer();
+
+  Transport *transport_;
+
+  unsigned char *buffer_;
+
+  unsigned int length_;
+  unsigned int size_;
+  unsigned int start_;
+  unsigned int remaining_;
+
+  int owner_;
+
+  unsigned int initialReadSize_;
+  unsigned int maximumBufferSize_;
+};
+
+#endif /* ReadBuffer_H */
diff --git a/nxcomp/src/RenderAddGlyphs.cpp b/nxcomp/src/RenderAddGlyphs.cpp
new file mode 100644
index 000000000..ef13d6890
--- /dev/null
+++ b/nxcomp/src/RenderAddGlyphs.cpp
@@ -0,0 +1,233 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+//
+// Include the template for
+// this message class.
+//
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "RenderAddGlyphs.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+#include MESSAGE_TAGS
+
+//
+// Message handling methods.
+//
+
+MESSAGE_BEGIN_ENCODE_SIZE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  encodeBuffer.encodeCachedValue((size - MESSAGE_OFFSET) >> 2, 16,
+                     clientCache -> renderLengthCache, 5);
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded size with value "
+          << size << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_SIZE
+
+MESSAGE_BEGIN_DECODE_SIZE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  decodeBuffer.decodeCachedValue(size, 16,
+                     clientCache -> renderLengthCache, 5);
+
+  size = MESSAGE_OFFSET + (size << 2);
+
+  buffer = writeBuffer -> addMessage(size);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded size with value "
+          << size << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_SIZE
+
+MESSAGE_BEGIN_ENCODE_MESSAGE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  encodeBuffer.encodeCachedValue(GetULONG(buffer + 4, bigEndian), 29,
+                     clientCache -> renderGlyphSetCache);
+
+  encodeBuffer.encodeCachedValue(GetULONG(buffer + 8, bigEndian), 32,
+                     clientCache -> renderNumGlyphsCache, 8);
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded message. Type is "
+          << (unsigned int) *(buffer + 1) << " size is "
+          << size << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_MESSAGE
+
+MESSAGE_BEGIN_DECODE_MESSAGE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  unsigned int value;
+
+  *(buffer + 1) = type;
+
+  decodeBuffer.decodeCachedValue(value, 29,
+                     clientCache -> renderGlyphSetCache);
+
+  PutULONG(value, buffer + 4, bigEndian);
+
+  decodeBuffer.decodeCachedValue(value, 32,
+                     clientCache -> renderNumGlyphsCache, 8);
+
+  PutULONG(value, buffer + 8, bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded message. Type is "
+          << (unsigned int) type << " size is " << size
+          << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_MESSAGE
+
+MESSAGE_BEGIN_ENCODE_DATA
+{
+  encodeCharData(encodeBuffer, buffer, MESSAGE_OFFSET,
+                     size, bigEndian, channelCache);
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded " << size - MESSAGE_OFFSET
+          << " bytes of data.\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_DATA
+
+MESSAGE_BEGIN_DECODE_DATA
+{
+  decodeCharData(decodeBuffer, buffer, MESSAGE_OFFSET,
+                     size, bigEndian, channelCache);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded " << size - MESSAGE_OFFSET
+          << " bytes of data.\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_DATA
+
+MESSAGE_BEGIN_PARSE_IDENTITY
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  renderExtension -> data.add_glyphs.type = *(buffer + 1);
+
+  renderExtension -> data.add_glyphs.set_id  = GetULONG(buffer + 4, bigEndian);
+  renderExtension -> data.add_glyphs.num_elm = GetULONG(buffer + 8,  bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Parsed identity. Type is "
+          << (unsigned int) renderExtension -> data.add_glyphs.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_PARSE_IDENTITY
+
+MESSAGE_BEGIN_UNPARSE_IDENTITY
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  *(buffer + 1) = renderExtension -> data.add_glyphs.type;
+
+  PutULONG(renderExtension -> data.add_glyphs.set_id,  buffer + 4,  bigEndian);
+  PutULONG(renderExtension -> data.add_glyphs.num_elm, buffer + 8,  bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Unparsed identity. Type is "
+          << (unsigned int) renderExtension -> data.add_glyphs.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_UNPARSE_IDENTITY
+
+MESSAGE_BEGIN_IDENTITY_CHECKSUM
+{
+  md5_append(md5_state, buffer + 1, 3);
+  md5_append(md5_state, buffer + 8, 4);
+}
+MESSAGE_END_IDENTITY_CHECKSUM
+
+MESSAGE_BEGIN_ENCODE_UPDATE
+{
+  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
+  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  encodeBuffer.encodeCachedValue(renderExtension -> data.add_glyphs.set_id, 29,
+                     clientCache -> renderGlyphSetCache);
+
+  cachedRenderExtension -> data.add_glyphs.set_id =
+              renderExtension -> data.add_glyphs.set_id;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded update. Type is "
+          << (unsigned int) renderExtension -> data.add_glyphs.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_UPDATE
+
+MESSAGE_BEGIN_DECODE_UPDATE
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  decodeBuffer.decodeCachedValue(renderExtension -> data.add_glyphs.set_id, 29,
+                     clientCache -> renderGlyphSetCache);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded update. Type is "
+          << (unsigned int) renderExtension -> data.add_glyphs.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_UPDATE
diff --git a/nxcomp/src/RenderAddGlyphs.h b/nxcomp/src/RenderAddGlyphs.h
new file mode 100644
index 000000000..d3c8cd158
--- /dev/null
+++ b/nxcomp/src/RenderAddGlyphs.h
@@ -0,0 +1,88 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef RenderAddGlyphs_H
+#define RenderAddGlyphs_H
+
+//
+// Define the characteristics
+// of this message class here.
+//
+
+#undef  MESSAGE_NAME
+#define MESSAGE_NAME          "RenderAddGlyphs"
+
+#undef  MESSAGE_STORE
+#define MESSAGE_STORE         RenderAddGlyphsStore
+
+#undef  MESSAGE_CLASS
+#define MESSAGE_CLASS         RenderMinorExtensionStore
+
+#undef  MESSAGE_METHODS
+#define MESSAGE_METHODS       "RenderMinorExtensionMethods.h"
+
+#undef  MESSAGE_HEADERS
+#define MESSAGE_HEADERS       "RenderMinorExtensionHeaders.h"
+
+#undef  MESSAGE_TAGS
+#define MESSAGE_TAGS          "RenderMinorExtensionTags.h"
+
+#undef  MESSAGE_OFFSET
+#define MESSAGE_OFFSET        12
+
+#undef  MESSAGE_HAS_SIZE
+#define MESSAGE_HAS_SIZE      1
+
+#undef  MESSAGE_HAS_DATA
+#define MESSAGE_HAS_DATA      1
+
+#undef  MESSAGE_HAS_FILTER
+#define MESSAGE_HAS_FILTER    0
+
+//
+// Declare the message class.
+//
+
+#include MESSAGE_HEADERS
+
+class MESSAGE_STORE : public MESSAGE_CLASS
+{
+  public:
+
+  virtual const char *name() const
+  {
+    return MESSAGE_NAME;
+  }
+
+  virtual int identitySize(const unsigned char *buffer,
+                               unsigned int size)
+  {
+    return MESSAGE_OFFSET;
+  }
+
+  #include MESSAGE_METHODS
+};
+
+#endif /* RenderAddGlyphs_H */
diff --git a/nxcomp/src/RenderChangePicture.cpp b/nxcomp/src/RenderChangePicture.cpp
new file mode 100644
index 000000000..d202b92ad
--- /dev/null
+++ b/nxcomp/src/RenderChangePicture.cpp
@@ -0,0 +1,238 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+//
+// Include the template for
+// this message class.
+//
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "RenderChangePicture.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+#include MESSAGE_TAGS
+
+//
+// Message handling methods.
+//
+
+MESSAGE_BEGIN_ENCODE_SIZE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  encodeBuffer.encodeCachedValue((size - MESSAGE_OFFSET) >> 2, 16,
+                     clientCache -> renderLengthCache, 5);
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded size with value "
+          << size << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_SIZE
+
+MESSAGE_BEGIN_DECODE_SIZE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  decodeBuffer.decodeCachedValue(size, 16,
+                     clientCache -> renderLengthCache, 5);
+
+  size = MESSAGE_OFFSET + (size << 2);
+
+  buffer = writeBuffer -> addMessage(size);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded size with value "
+          << size << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_SIZE
+
+MESSAGE_BEGIN_ENCODE_MESSAGE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  encodeBuffer.encodeXidValue(GetULONG(buffer + 4, bigEndian),
+                                  clientCache -> renderSrcPictureCache);
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded message. Type is "
+          << (unsigned int) *(buffer + 1) << " size is "
+          << size << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_MESSAGE
+
+MESSAGE_BEGIN_DECODE_MESSAGE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  unsigned int value;
+
+  *(buffer + 1) = type;
+
+  decodeBuffer.decodeXidValue(value, clientCache -> renderSrcPictureCache);
+
+  PutULONG(value, buffer + 4, bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded message. Type is "
+          << (unsigned int) type << " size is " << size
+          << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_MESSAGE
+
+MESSAGE_BEGIN_ENCODE_DATA
+{
+  #ifdef DEBUG
+
+  if (size == MESSAGE_OFFSET + 4)
+  {
+    *logofs << name() << ": Mask is " << GetULONG(buffer + 8, bigEndian)
+            << " value is " << GetULONG(buffer + 12, bigEndian)
+            << ".\n" << logofs_flush;
+  }
+  else
+  {
+    *logofs << name() << ": WARNING! Unexpected size. Mask is "
+            << GetULONG(buffer + 8, bigEndian) << ".\n"
+            << logofs_flush;
+  }
+
+  #endif
+
+  encodeLongData(encodeBuffer, buffer, MESSAGE_OFFSET,
+                     size, bigEndian, channelCache);
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded " << size - MESSAGE_OFFSET
+          << " bytes of data.\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_DATA
+
+MESSAGE_BEGIN_DECODE_DATA
+{
+  decodeLongData(decodeBuffer, buffer, MESSAGE_OFFSET,
+                     size, bigEndian, channelCache);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded " << size - MESSAGE_OFFSET
+          << " bytes of data.\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_DATA
+
+MESSAGE_BEGIN_PARSE_IDENTITY
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  renderExtension -> data.change_picture.type = *(buffer + 1);
+
+  renderExtension -> data.change_picture.src_id = GetULONG(buffer + 4,  bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Parsed identity. Type is "
+          << (unsigned int) renderExtension -> data.change_picture.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_PARSE_IDENTITY
+
+MESSAGE_BEGIN_UNPARSE_IDENTITY
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  *(buffer + 1) = renderExtension -> data.change_picture.type;
+
+  PutULONG(renderExtension -> data.change_picture.src_id, buffer + 4,  bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Unparsed identity. Type is "
+          << (unsigned int) renderExtension -> data.change_picture.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_UNPARSE_IDENTITY
+
+MESSAGE_BEGIN_IDENTITY_CHECKSUM
+{
+  md5_append(md5_state, buffer + 1, 3);
+}
+MESSAGE_END_IDENTITY_CHECKSUM
+
+MESSAGE_BEGIN_ENCODE_UPDATE
+{
+  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
+  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  encodeBuffer.encodeXidValue(renderExtension -> data.change_picture.src_id,
+                     clientCache -> renderSrcPictureCache);
+
+  cachedRenderExtension -> data.change_picture.src_id =
+              renderExtension -> data.change_picture.src_id;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded update. Type is "
+          << (unsigned int) renderExtension -> data.change_picture.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_UPDATE
+
+MESSAGE_BEGIN_DECODE_UPDATE
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  decodeBuffer.decodeXidValue(renderExtension -> data.change_picture.src_id,
+                     clientCache -> renderSrcPictureCache);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded update. Type is "
+          << (unsigned int) renderExtension -> data.change_picture.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_UPDATE
diff --git a/nxcomp/src/RenderChangePicture.h b/nxcomp/src/RenderChangePicture.h
new file mode 100644
index 000000000..4bab1ef98
--- /dev/null
+++ b/nxcomp/src/RenderChangePicture.h
@@ -0,0 +1,88 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef RenderChangePicture_H
+#define RenderChangePicture_H
+
+//
+// Define the characteristics
+// of this message class here.
+//
+
+#undef  MESSAGE_NAME
+#define MESSAGE_NAME          "RenderChangePicture"
+
+#undef  MESSAGE_STORE
+#define MESSAGE_STORE         RenderChangePictureStore
+
+#undef  MESSAGE_CLASS
+#define MESSAGE_CLASS         RenderMinorExtensionStore
+
+#undef  MESSAGE_METHODS
+#define MESSAGE_METHODS       "RenderMinorExtensionMethods.h"
+
+#undef  MESSAGE_HEADERS
+#define MESSAGE_HEADERS       "RenderMinorExtensionHeaders.h"
+
+#undef  MESSAGE_TAGS
+#define MESSAGE_TAGS          "RenderMinorExtensionTags.h"
+
+#undef  MESSAGE_OFFSET
+#define MESSAGE_OFFSET        8
+
+#undef  MESSAGE_HAS_SIZE
+#define MESSAGE_HAS_SIZE      1
+
+#undef  MESSAGE_HAS_DATA
+#define MESSAGE_HAS_DATA      1
+
+#undef  MESSAGE_HAS_FILTER
+#define MESSAGE_HAS_FILTER    0
+
+//
+// Declare the message class.
+//
+
+#include MESSAGE_HEADERS
+
+class MESSAGE_STORE : public MESSAGE_CLASS
+{
+  public:
+
+  virtual const char *name() const
+  {
+    return MESSAGE_NAME;
+  }
+
+  virtual int identitySize(const unsigned char *buffer,
+                               unsigned int size)
+  {
+    return MESSAGE_OFFSET;
+  }
+
+  #include MESSAGE_METHODS
+};
+
+#endif /* RenderChangePicture_H */
diff --git a/nxcomp/src/RenderComposite.cpp b/nxcomp/src/RenderComposite.cpp
new file mode 100644
index 000000000..f82f80f06
--- /dev/null
+++ b/nxcomp/src/RenderComposite.cpp
@@ -0,0 +1,400 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+//
+// Include the template for
+// this message class.
+//
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "RenderComposite.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+#include MESSAGE_TAGS
+
+//
+// Message handling methods.
+//
+
+MESSAGE_BEGIN_ENCODE_MESSAGE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  encodeBuffer.encodeCachedValue(*(buffer + 4), 8,
+                     clientCache -> renderOpCache);
+
+  encodeBuffer.encodeXidValue(GetULONG(buffer + 8, bigEndian),
+                     clientCache -> renderSrcPictureCache);
+
+  encodeBuffer.encodeXidValue(GetULONG(buffer + 12, bigEndian),
+                     clientCache -> renderMaskPictureCache);
+
+  encodeBuffer.encodeXidValue(GetULONG(buffer + 16, bigEndian),
+                     clientCache -> renderDstPictureCache);
+
+  //
+  // Src X and Y.
+  //
+
+  encodeBuffer.encodeDiffCachedValue(GetUINT(buffer + 20, bigEndian),
+                     clientCache -> renderLastX, 16,
+                         clientCache -> renderXCache, 11);
+
+  encodeBuffer.encodeDiffCachedValue(GetUINT(buffer + 22, bigEndian),
+                     clientCache -> renderLastY, 16,
+                         clientCache -> renderYCache, 11);
+  //
+  // Mask X and Y.
+  //
+
+  encodeBuffer.encodeDiffCachedValue(GetUINT(buffer + 24, bigEndian),
+                     clientCache -> renderLastX, 16,
+                         clientCache -> renderXCache, 11);
+
+  encodeBuffer.encodeDiffCachedValue(GetUINT(buffer + 26, bigEndian),
+                     clientCache -> renderLastY, 16,
+                         clientCache -> renderYCache, 11);
+
+  //
+  // Dst X and Y.
+  //
+
+  encodeBuffer.encodeDiffCachedValue(GetUINT(buffer + 28, bigEndian),
+                     clientCache -> renderLastX, 16,
+                         clientCache -> renderXCache, 11);
+
+  encodeBuffer.encodeDiffCachedValue(GetUINT(buffer + 30, bigEndian),
+                     clientCache -> renderLastY, 16,
+                         clientCache -> renderYCache, 11);
+
+  //
+  // Width and height.
+  //
+
+  encodeBuffer.encodeCachedValue(GetUINT(buffer + 32, bigEndian), 16,
+                     clientCache -> renderWidthCache, 11);
+
+  encodeBuffer.encodeCachedValue(GetUINT(buffer + 34, bigEndian), 16,
+                     clientCache -> renderHeightCache, 11);
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded message. Type is "
+          << (unsigned int) *(buffer + 1) << " size is "
+          << size << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_MESSAGE
+
+MESSAGE_BEGIN_DECODE_MESSAGE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  unsigned int value;
+
+  *(buffer + 1) = type;
+
+  decodeBuffer.decodeCachedValue(*(buffer + 4), 8,
+                     clientCache -> renderOpCache);
+
+  decodeBuffer.decodeXidValue(value, clientCache -> renderSrcPictureCache);
+
+  PutULONG(value, buffer + 8, bigEndian);
+
+  decodeBuffer.decodeXidValue(value, clientCache -> renderMaskPictureCache);
+
+  PutULONG(value, buffer + 12, bigEndian);
+
+  decodeBuffer.decodeXidValue(value, clientCache -> renderDstPictureCache);
+
+  PutULONG(value, buffer + 16, bigEndian);
+
+  //
+  // Src X and Y.
+  //
+
+  decodeBuffer.decodeDiffCachedValue(value,
+                     clientCache -> renderLastX, 16,
+                         clientCache -> renderXCache, 11);
+
+  PutUINT(clientCache -> renderLastX, buffer + 20, bigEndian);
+
+  decodeBuffer.decodeDiffCachedValue(value,
+                     clientCache -> renderLastY, 16,
+                         clientCache -> renderYCache, 11);
+
+  PutUINT(clientCache -> renderLastY, buffer + 22, bigEndian);
+
+  //
+  // Mask X and Y.
+  //
+
+  decodeBuffer.decodeDiffCachedValue(value,
+                     clientCache -> renderLastX, 16,
+                         clientCache -> renderXCache, 11);
+
+  PutUINT(clientCache -> renderLastX, buffer + 24, bigEndian);
+
+  decodeBuffer.decodeDiffCachedValue(value,
+                     clientCache -> renderLastY, 16,
+                         clientCache -> renderYCache, 11);
+
+  PutUINT(clientCache -> renderLastY, buffer + 26, bigEndian);
+
+  //
+  // Dst X and Y.
+  //
+
+  decodeBuffer.decodeDiffCachedValue(value,
+                     clientCache -> renderLastX, 16,
+                         clientCache -> renderXCache, 11);
+
+  PutUINT(clientCache -> renderLastX, buffer + 28, bigEndian);
+
+  decodeBuffer.decodeDiffCachedValue(value,
+                     clientCache -> renderLastY, 16,
+                         clientCache -> renderYCache, 11);
+
+  PutUINT(clientCache -> renderLastY, buffer + 30, bigEndian);
+
+  //
+  // Width and height.
+  //
+
+  decodeBuffer.decodeCachedValue(value, 16,
+                     clientCache -> renderWidthCache, 11);
+
+  PutUINT(value, buffer + 32, bigEndian);
+
+  decodeBuffer.decodeCachedValue(value, 16,
+                     clientCache -> renderHeightCache, 11);
+
+  PutUINT(value, buffer + 34, bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded message. Type is "
+          << (unsigned int) type << " size is " << size
+          << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_MESSAGE
+
+MESSAGE_BEGIN_PARSE_IDENTITY
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  renderExtension -> data.composite.type = *(buffer + 1);
+  renderExtension -> data.composite.op   = *(buffer + 4);
+
+  renderExtension -> data.composite.src_id = GetULONG(buffer + 8,  bigEndian);
+  renderExtension -> data.composite.msk_id = GetULONG(buffer + 12, bigEndian);
+  renderExtension -> data.composite.dst_id = GetULONG(buffer + 16, bigEndian);
+
+  renderExtension -> data.composite.src_x = GetUINT(buffer + 20, bigEndian);
+  renderExtension -> data.composite.src_y = GetUINT(buffer + 22, bigEndian);
+
+  renderExtension -> data.composite.msk_x = GetUINT(buffer + 24, bigEndian);
+  renderExtension -> data.composite.msk_y = GetUINT(buffer + 26, bigEndian);
+
+  renderExtension -> data.composite.dst_x = GetUINT(buffer + 28, bigEndian);
+  renderExtension -> data.composite.dst_y = GetUINT(buffer + 30, bigEndian);
+
+  renderExtension -> data.composite.width  = GetUINT(buffer + 32, bigEndian);
+  renderExtension -> data.composite.height = GetUINT(buffer + 34, bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Parsed identity. Type is "
+          << (unsigned int) renderExtension -> data.composite.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_PARSE_IDENTITY
+
+MESSAGE_BEGIN_UNPARSE_IDENTITY
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  *(buffer + 1) = renderExtension -> data.composite.type;
+  *(buffer + 4) = renderExtension -> data.composite.op;
+
+  PutULONG(renderExtension -> data.composite.src_id, buffer + 8,  bigEndian);
+  PutULONG(renderExtension -> data.composite.msk_id, buffer + 12, bigEndian);
+  PutULONG(renderExtension -> data.composite.dst_id, buffer + 16, bigEndian);
+
+  PutUINT(renderExtension -> data.composite.src_x, buffer + 20, bigEndian);
+  PutUINT(renderExtension -> data.composite.src_y, buffer + 22, bigEndian);
+
+  PutUINT(renderExtension -> data.composite.msk_x, buffer + 24, bigEndian);
+  PutUINT(renderExtension -> data.composite.msk_y, buffer + 26, bigEndian);
+
+  PutUINT(renderExtension -> data.composite.dst_x, buffer + 28, bigEndian);
+  PutUINT(renderExtension -> data.composite.dst_y, buffer + 30, bigEndian);
+
+  PutUINT(renderExtension -> data.composite.width,  buffer + 32, bigEndian);
+  PutUINT(renderExtension -> data.composite.height, buffer + 34, bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Unparsed identity. Type is "
+          << (unsigned int) renderExtension -> data.composite.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_UNPARSE_IDENTITY
+
+MESSAGE_BEGIN_IDENTITY_CHECKSUM
+{
+  //
+  // Include the minor opcode and size in the
+  // identity, plus the operator, the x and y
+  // of the source and mask and the width and
+  // height of the destination.
+  //
+
+  md5_append(md5_state, buffer + 1,  4);
+  md5_append(md5_state, buffer + 20, 8);
+  md5_append(md5_state, buffer + 32, 4);
+}
+MESSAGE_END_IDENTITY_CHECKSUM
+
+MESSAGE_BEGIN_ENCODE_UPDATE
+{
+  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
+  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Source " << renderExtension -> data.composite.src_id
+          << " mask " << renderExtension -> data.composite.msk_id
+          << " destination " << renderExtension -> data.composite.msk_id
+          << ".\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeXidValue(renderExtension -> data.composite.src_id,
+                     clientCache -> renderSrcPictureCache);
+
+  cachedRenderExtension -> data.composite.src_id =
+              renderExtension -> data.composite.src_id;
+
+  encodeBuffer.encodeXidValue(renderExtension -> data.composite.msk_id,
+                     clientCache -> renderMaskPictureCache);
+
+  cachedRenderExtension -> data.composite.msk_id =
+              renderExtension -> data.composite.msk_id;
+
+  encodeBuffer.encodeXidValue(renderExtension -> data.composite.dst_id,
+                     clientCache -> renderDstPictureCache);
+
+  cachedRenderExtension -> data.composite.dst_id =
+              renderExtension -> data.composite.dst_id;
+
+  //
+  // Dst X and Y.
+  //
+
+  unsigned int value;
+  unsigned int previous;
+
+  value    = renderExtension -> data.composite.dst_x;
+  previous = cachedRenderExtension -> data.composite.dst_x;
+
+  encodeBuffer.encodeDiffCachedValue(value, previous, 16,
+                     clientCache -> renderXCache, 11);
+
+  cachedRenderExtension -> data.composite.dst_x = value;
+
+  value    = renderExtension -> data.composite.dst_y;
+  previous = cachedRenderExtension -> data.composite.dst_y;
+
+  encodeBuffer.encodeDiffCachedValue(value, previous, 16,
+                     clientCache -> renderYCache, 11);
+
+  cachedRenderExtension -> data.composite.dst_y = value;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded update. Type is "
+          << (unsigned int) renderExtension -> data.composite.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_UPDATE
+
+MESSAGE_BEGIN_DECODE_UPDATE
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  decodeBuffer.decodeXidValue(renderExtension -> data.composite.src_id,
+                     clientCache -> renderSrcPictureCache);
+
+  decodeBuffer.decodeXidValue(renderExtension -> data.composite.msk_id,
+                     clientCache -> renderMaskPictureCache);
+
+  decodeBuffer.decodeXidValue(renderExtension -> data.composite.dst_id,
+                     clientCache -> renderDstPictureCache);
+
+  //
+  // Dst X and Y.
+  //
+
+  unsigned int value;
+  unsigned int previous;
+
+  previous = renderExtension -> data.composite.dst_x;
+
+  decodeBuffer.decodeDiffCachedValue(value, previous, 16,
+                     clientCache -> renderXCache, 11);
+
+  renderExtension -> data.composite.dst_x = value;
+
+  previous = renderExtension -> data.composite.dst_y;
+
+  decodeBuffer.decodeDiffCachedValue(value, previous, 16,
+                     clientCache -> renderYCache, 11);
+
+  renderExtension -> data.composite.dst_y = value;
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded update. Type is "
+          << (unsigned int) renderExtension -> data.composite.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_UPDATE
diff --git a/nxcomp/src/RenderComposite.h b/nxcomp/src/RenderComposite.h
new file mode 100644
index 000000000..aafa1e776
--- /dev/null
+++ b/nxcomp/src/RenderComposite.h
@@ -0,0 +1,88 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef RenderComposite_H
+#define RenderComposite_H
+
+//
+// Define the characteristics
+// of this message class here.
+//
+
+#undef  MESSAGE_NAME
+#define MESSAGE_NAME          "RenderComposite"
+
+#undef  MESSAGE_STORE
+#define MESSAGE_STORE         RenderCompositeStore
+
+#undef  MESSAGE_CLASS
+#define MESSAGE_CLASS         RenderMinorExtensionStore
+
+#undef  MESSAGE_METHODS
+#define MESSAGE_METHODS       "RenderMinorExtensionMethods.h"
+
+#undef  MESSAGE_HEADERS
+#define MESSAGE_HEADERS       "RenderMinorExtensionHeaders.h"
+
+#undef  MESSAGE_TAGS
+#define MESSAGE_TAGS          "RenderMinorExtensionTags.h"
+
+#undef  MESSAGE_OFFSET
+#define MESSAGE_OFFSET        36
+
+#undef  MESSAGE_HAS_SIZE
+#define MESSAGE_HAS_SIZE      0
+
+#undef  MESSAGE_HAS_DATA
+#define MESSAGE_HAS_DATA      0
+
+#undef  MESSAGE_HAS_FILTER
+#define MESSAGE_HAS_FILTER    0
+
+//
+// Declare the message class.
+//
+
+#include MESSAGE_HEADERS
+
+class MESSAGE_STORE : public MESSAGE_CLASS
+{
+  public:
+
+  virtual const char *name() const
+  {
+    return MESSAGE_NAME;
+  }
+
+  virtual int identitySize(const unsigned char *buffer,
+                               unsigned int size)
+  {
+    return MESSAGE_OFFSET;
+  }
+
+  #include MESSAGE_METHODS
+};
+
+#endif /* RenderComposite_H */
diff --git a/nxcomp/src/RenderCompositeGlyphs.cpp b/nxcomp/src/RenderCompositeGlyphs.cpp
new file mode 100644
index 000000000..0949d3e2c
--- /dev/null
+++ b/nxcomp/src/RenderCompositeGlyphs.cpp
@@ -0,0 +1,629 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+//
+// Include the template for
+// this message class.
+//
+
+#include "RenderCompositeGlyphs.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+#include MESSAGE_TAGS
+
+//
+// Message handling methods.
+//
+
+MESSAGE_BEGIN_ENCODE_SIZE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Encoding value "
+          << ((size - MESSAGE_OFFSET) >> 2) << ".\n"
+          << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeCachedValue((size - MESSAGE_OFFSET) >> 2, 16,
+                     clientCache -> renderLengthCache, 5);
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded size with value "
+          << size << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_SIZE
+
+MESSAGE_BEGIN_DECODE_SIZE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  decodeBuffer.decodeCachedValue(size, 16,
+                     clientCache -> renderLengthCache, 5);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << size
+          << ".\n" << logofs_flush;
+  #endif
+
+  size = MESSAGE_OFFSET + (size << 2);
+
+  buffer = writeBuffer -> addMessage(size);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded size with value "
+          << size << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_SIZE
+
+MESSAGE_BEGIN_ENCODE_MESSAGE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  encodeBuffer.encodeCachedValue(*(buffer + 4), 8,
+                     clientCache -> renderOpCache);
+
+  encodeBuffer.encodeXidValue(GetULONG(buffer + 8, bigEndian),
+                     clientCache -> renderSrcPictureCache);
+
+  encodeBuffer.encodeXidValue(GetULONG(buffer + 12, bigEndian),
+                     clientCache -> renderDstPictureCache);
+
+  encodeBuffer.encodeCachedValue(GetULONG(buffer + 16, bigEndian), 32,
+                     clientCache -> renderFormatCache);
+
+  encodeBuffer.encodeCachedValue(GetULONG(buffer + 20, bigEndian), 29,
+                     clientCache -> renderGlyphSetCache);
+
+  unsigned int src_x = GetUINT(buffer + 24, bigEndian);
+  unsigned int src_y = GetUINT(buffer + 26, bigEndian);
+
+  // Since ProtoStep8 (#issue 108)
+  encodeBuffer.encodeDiffCachedValue(src_x,
+                     clientCache -> renderGlyphX, 16,
+                         clientCache -> renderGlyphXCache, 11);
+
+  encodeBuffer.encodeDiffCachedValue(src_y,
+                     clientCache -> renderGlyphY, 16,
+                         clientCache -> renderGlyphYCache, 11);
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded source X "
+          << GetUINT(buffer + 24, bigEndian) << " source Y "
+          << GetUINT(buffer + 26, bigEndian) << ".\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // Bytes from 28 to 36 contain in the order:
+  //
+  // 1 byte for the length of the first string.
+  // 3 bytes of padding.
+  // 2 bytes for the X offset.
+  // 2 bytes for the Y offset.
+  //
+  // Encode these bytes differentially to match
+  // all the strings that have equal glyphs.
+  //
+  // Only manage the first string of glyphs. The
+  // others strings should match, if they contain
+  // the same glyphs, since the offset are rela-
+  // tive to the first offset coordinates.
+  //
+
+  // Since ProtoStep8 (#issue 108)
+  if (size >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
+  {
+    unsigned int numGlyphs = *(buffer + 28);
+
+    encodeBuffer.encodeCachedValue(numGlyphs, 8,
+                       clientCache -> renderNumGlyphsCache);
+
+    unsigned int offset_x = GetUINT(buffer + 32, bigEndian);
+    unsigned int offset_y = GetUINT(buffer + 34, bigEndian);
+
+    if (offset_x == src_x && offset_y == src_y)
+    {
+      encodeBuffer.encodeBoolValue(0);
+
+      #ifdef TEST
+      *logofs << name() << ": Matched offset X "
+              << GetUINT(buffer + 32, bigEndian) << " offset Y "
+              << GetUINT(buffer + 34, bigEndian) << ".\n"
+              << logofs_flush;
+      #endif
+    }
+    else
+    {
+      encodeBuffer.encodeBoolValue(1);
+
+      encodeBuffer.encodeDiffCachedValue(offset_x,
+                         clientCache -> renderGlyphX, 16,
+                             clientCache -> renderGlyphXCache, 11);
+
+      encodeBuffer.encodeDiffCachedValue(offset_y,
+                         clientCache -> renderGlyphY, 16,
+                             clientCache -> renderGlyphYCache, 11);
+
+      #ifdef TEST
+      *logofs << name() << ": Missed offset X "
+              << GetUINT(buffer + 32, bigEndian) << " offset Y "
+              << GetUINT(buffer + 34, bigEndian) << ".\n"
+              << logofs_flush;
+      #endif
+    }
+  }
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded message. Type is "
+          << (unsigned int) *(buffer + 1) << " size is "
+          << size << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_MESSAGE
+
+MESSAGE_BEGIN_DECODE_MESSAGE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  unsigned int value;
+
+  *(buffer + 1) = type;
+
+  decodeBuffer.decodeCachedValue(*(buffer + 4), 8,
+                     clientCache -> renderOpCache);
+
+  decodeBuffer.decodeXidValue(value,
+                     clientCache -> renderSrcPictureCache);
+
+  PutULONG(value, buffer + 8, bigEndian);
+
+  decodeBuffer.decodeXidValue(value,
+                     clientCache -> renderDstPictureCache);
+
+  PutULONG(value, buffer + 12, bigEndian);
+
+  decodeBuffer.decodeCachedValue(value, 32,
+                     clientCache -> renderFormatCache);
+
+  PutULONG(value, buffer + 16, bigEndian);
+
+  decodeBuffer.decodeCachedValue(value, 29,
+                     clientCache -> renderGlyphSetCache);
+
+  PutULONG(value, buffer + 20, bigEndian);
+
+  unsigned int src_x;
+  unsigned int src_y;
+
+  // Since ProtoStep8 (#issue 108)
+  decodeBuffer.decodeDiffCachedValue(src_x,
+                     clientCache -> renderGlyphX, 16,
+                         clientCache -> renderGlyphXCache, 11);
+
+  decodeBuffer.decodeDiffCachedValue(src_y,
+                     clientCache -> renderGlyphY, 16,
+                         clientCache -> renderGlyphYCache, 11);
+
+  PutUINT(src_x, buffer + 24, bigEndian);
+  PutUINT(src_y, buffer + 26, bigEndian);
+
+  // Since ProtoStep8 (#issue 108)
+  if (size >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
+  {
+    decodeBuffer.decodeCachedValue(value, 8,
+                       clientCache -> renderNumGlyphsCache);
+
+    *(buffer + 28) = value;
+
+    decodeBuffer.decodeBoolValue(value);
+
+    if (value == 0)
+    {
+      PutUINT(src_x, buffer + 32, bigEndian);
+      PutUINT(src_y, buffer + 34, bigEndian);
+    }
+    else
+    {
+      decodeBuffer.decodeDiffCachedValue(src_x,
+                         clientCache -> renderGlyphX, 16,
+                             clientCache -> renderGlyphXCache, 11);
+
+      PutUINT(src_x, buffer + 32, bigEndian);
+
+      decodeBuffer.decodeDiffCachedValue(src_y,
+                         clientCache -> renderGlyphY, 16,
+                             clientCache -> renderGlyphYCache, 11);
+
+      PutUINT(src_y, buffer + 34, bigEndian);
+    }
+  }
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded message. Type is "
+          << (unsigned int) type << " size is " << size
+          << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_MESSAGE
+
+MESSAGE_BEGIN_ENCODE_DATA
+{
+  // Since ProtoStep8 (#issue 108)
+  if (size >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
+  {
+    encodeCharData(encodeBuffer, buffer, MESSAGE_OFFSET_IF_PROTO_STEP_8,
+                       size, bigEndian, channelCache);
+  }
+  else if (size > MESSAGE_OFFSET)
+  {
+    encodeCharData(encodeBuffer, buffer, MESSAGE_OFFSET,
+                       size, bigEndian, channelCache);
+  }
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded " << size - MESSAGE_OFFSET
+          << " bytes of text data.\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_DATA
+
+MESSAGE_BEGIN_DECODE_DATA
+{
+  // Since ProtoStep8 (#issue 108)
+  if (size >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
+  {
+    decodeCharData(decodeBuffer, buffer, MESSAGE_OFFSET_IF_PROTO_STEP_8,
+                       size, bigEndian, channelCache);
+  }
+  else if (size > MESSAGE_OFFSET)
+  {
+    decodeCharData(decodeBuffer, buffer, MESSAGE_OFFSET,
+                       size, bigEndian, channelCache);
+  }
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded " << size - MESSAGE_OFFSET
+          << " bytes of data.\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_DATA
+
+MESSAGE_BEGIN_PARSE_IDENTITY
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  renderExtension -> data.composite_glyphs.type = *(buffer + 1);
+  renderExtension -> data.composite_glyphs.op   = *(buffer + 4);
+
+  renderExtension -> data.composite_glyphs.src_id = GetULONG(buffer + 8,  bigEndian);
+  renderExtension -> data.composite_glyphs.dst_id = GetULONG(buffer + 12, bigEndian);
+
+  renderExtension -> data.composite_glyphs.format = GetULONG(buffer + 16, bigEndian);
+  renderExtension -> data.composite_glyphs.set_id = GetULONG(buffer + 20, bigEndian);
+
+  renderExtension -> data.composite_glyphs.src_x = GetUINT(buffer + 24, bigEndian);
+  renderExtension -> data.composite_glyphs.src_y = GetUINT(buffer + 26, bigEndian);
+
+  // Since ProtoStep8 (#issue 108)
+  if (size >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
+  {
+    renderExtension -> data.composite_glyphs.num_elm = *(buffer + 28);
+
+    renderExtension -> data.composite_glyphs.offset_x = GetUINT(buffer + 32, bigEndian);
+    renderExtension -> data.composite_glyphs.offset_y = GetUINT(buffer + 34, bigEndian);
+  }
+
+  #ifdef TEST
+  *logofs << name() << ": Parsed identity. Type is "
+          << (unsigned int) renderExtension -> data.composite_glyphs.type
+          << " size is " << renderExtension -> size_ << " identity size "
+          << renderExtension -> i_size_ << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_PARSE_IDENTITY
+
+MESSAGE_BEGIN_UNPARSE_IDENTITY
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  *(buffer + 1) = renderExtension -> data.composite_glyphs.type;
+  *(buffer + 4) = renderExtension -> data.composite_glyphs.op;
+
+  PutULONG(renderExtension -> data.composite_glyphs.src_id, buffer + 8,  bigEndian);
+  PutULONG(renderExtension -> data.composite_glyphs.dst_id, buffer + 12, bigEndian);
+
+  PutULONG(renderExtension -> data.composite_glyphs.format, buffer + 16, bigEndian);
+  PutULONG(renderExtension -> data.composite_glyphs.set_id, buffer + 20, bigEndian);
+
+  PutUINT(renderExtension -> data.composite_glyphs.src_x, buffer + 24, bigEndian);
+  PutUINT(renderExtension -> data.composite_glyphs.src_y, buffer + 26, bigEndian);
+
+  // Since ProtoStep8 (#issue 108)
+  if (size >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
+  {
+    *(buffer + 28) = renderExtension -> data.composite_glyphs.num_elm;
+
+    PutUINT(renderExtension -> data.composite_glyphs.offset_x, buffer + 32, bigEndian);
+    PutUINT(renderExtension -> data.composite_glyphs.offset_y, buffer + 34, bigEndian);
+  }
+
+  #ifdef TEST
+  *logofs << name() << ": Unparsed identity. Type is "
+          << (unsigned int) renderExtension -> data.composite_glyphs.type
+          << " size is " << renderExtension -> size_  << " identity size "
+          << renderExtension -> i_size_ <<  ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_UNPARSE_IDENTITY
+
+MESSAGE_BEGIN_IDENTITY_CHECKSUM
+{
+  //
+  // Include minor opcode, size and
+  // the composite operator in the
+  // identity.
+  //
+
+  md5_append(md5_state, buffer + 1, 4);
+
+  //
+  // Include the format.
+  //
+
+  md5_append(md5_state, buffer + 16, 4);
+
+  //
+  // Also include the length of the
+  // first string.
+  //
+
+  // Since ProtoStep8 (#issue 108)
+  if (size >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
+  {
+    md5_append(md5_state, buffer + 28, 1);
+  }
+}
+MESSAGE_END_IDENTITY_CHECKSUM
+
+MESSAGE_BEGIN_ENCODE_UPDATE
+{
+  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
+  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  encodeBuffer.encodeXidValue(renderExtension -> data.composite_glyphs.src_id,
+                     clientCache -> renderSrcPictureCache);
+
+  cachedRenderExtension -> data.composite_glyphs.src_id =
+              renderExtension -> data.composite_glyphs.src_id;
+
+  encodeBuffer.encodeXidValue(renderExtension -> data.composite_glyphs.dst_id,
+                     clientCache -> renderDstPictureCache);
+
+  cachedRenderExtension -> data.composite_glyphs.dst_id =
+              renderExtension -> data.composite_glyphs.dst_id;
+
+  encodeBuffer.encodeCachedValue(renderExtension -> data.composite_glyphs.set_id, 29,
+                     clientCache -> renderGlyphSetCache);
+
+  cachedRenderExtension -> data.composite_glyphs.set_id =
+              renderExtension -> data.composite_glyphs.set_id;
+
+  //
+  // Src X and Y.
+  //
+  // The source X and Y coordinates are
+  // encoded as differerences in respect
+  // to the cached message.
+  //
+
+  unsigned int value;
+  unsigned int previous;
+
+  // Since ProtoStep8 (#issue 108)
+  value    = renderExtension -> data.composite_glyphs.src_x;
+  previous = cachedRenderExtension -> data.composite_glyphs.src_x;
+
+  encodeBuffer.encodeDiffCachedValue(value, previous, 16,
+                     clientCache -> renderGlyphXCache, 11);
+
+  cachedRenderExtension -> data.composite_glyphs.src_x = value;
+
+  value    = renderExtension -> data.composite_glyphs.src_y;
+  previous = cachedRenderExtension -> data.composite_glyphs.src_y;
+
+  encodeBuffer.encodeDiffCachedValue(value, previous, 16,
+                     clientCache -> renderGlyphYCache, 11);
+
+  cachedRenderExtension -> data.composite_glyphs.src_y = value;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded source X "
+          << renderExtension -> data.composite_glyphs.src_x << " source Y "
+          << renderExtension -> data.composite_glyphs.src_y << ".\n"
+          << logofs_flush;
+  #endif
+
+  // Since ProtoStep8 (#issue 108)
+  if (renderExtension -> size_ >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
+  {
+    //
+    // Offset X and Y.
+    //
+
+    if (renderExtension -> data.composite_glyphs.offset_x ==
+            renderExtension -> data.composite_glyphs.src_x &&
+                renderExtension -> data.composite_glyphs.offset_y ==
+                    renderExtension -> data.composite_glyphs.src_y)
+    {
+      encodeBuffer.encodeBoolValue(0);
+
+      cachedRenderExtension -> data.composite_glyphs.offset_x =
+            renderExtension -> data.composite_glyphs.offset_x;
+
+      cachedRenderExtension -> data.composite_glyphs.offset_y =
+            renderExtension -> data.composite_glyphs.offset_y;
+
+      #ifdef TEST
+      *logofs << name() << ": Matched offset X "
+              << renderExtension -> data.composite_glyphs.offset_x << " offset Y "
+              << renderExtension -> data.composite_glyphs.offset_y << ".\n"
+              << logofs_flush;
+      #endif
+    }
+    else
+    {
+      encodeBuffer.encodeBoolValue(1);
+
+      value    = renderExtension -> data.composite_glyphs.offset_x;
+      previous = cachedRenderExtension -> data.composite_glyphs.offset_x;
+
+      encodeBuffer.encodeDiffCachedValue(value, previous, 16,
+                         clientCache -> renderGlyphXCache, 11);
+
+      cachedRenderExtension -> data.composite_glyphs.offset_x = value;
+
+      value    = renderExtension -> data.composite_glyphs.offset_y;
+      previous = cachedRenderExtension -> data.composite_glyphs.offset_y;
+
+      encodeBuffer.encodeDiffCachedValue(value, previous, 16,
+                         clientCache -> renderGlyphYCache, 11);
+
+      cachedRenderExtension -> data.composite_glyphs.offset_y = value;
+
+      #ifdef TEST
+      *logofs << name() << ": Missed offset X "
+              << renderExtension -> data.composite_glyphs.offset_x << " offset Y "
+              << renderExtension -> data.composite_glyphs.offset_y << ".\n"
+              << logofs_flush;
+      #endif
+    }
+  }
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded update. Type is "
+          << (unsigned int) renderExtension -> data.composite_glyphs.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_UPDATE
+
+MESSAGE_BEGIN_DECODE_UPDATE
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  decodeBuffer.decodeXidValue(renderExtension -> data.composite_glyphs.src_id,
+                     clientCache -> renderSrcPictureCache);
+
+  decodeBuffer.decodeXidValue(renderExtension -> data.composite_glyphs.dst_id,
+                     clientCache -> renderDstPictureCache);
+
+  decodeBuffer.decodeCachedValue(renderExtension -> data.composite_glyphs.set_id, 29,
+                     clientCache -> renderGlyphSetCache);
+
+  //
+  // Src X and Y.
+  //
+
+  unsigned int value;
+  unsigned int previous;
+
+  // Since ProtoStep8 (#issue 108)
+  previous = renderExtension -> data.composite_glyphs.src_x;
+
+  decodeBuffer.decodeDiffCachedValue(value, previous, 16,
+                     clientCache -> renderGlyphXCache, 11);
+
+  renderExtension -> data.composite_glyphs.src_x = value;
+
+  previous = renderExtension -> data.composite_glyphs.src_y;
+
+  decodeBuffer.decodeDiffCachedValue(value, previous, 16,
+                     clientCache -> renderGlyphYCache, 11);
+
+  renderExtension -> data.composite_glyphs.src_y = value;
+
+  // Since ProtoStep8 (#issue 108)
+  if (renderExtension -> size_ >= MESSAGE_OFFSET_IF_PROTO_STEP_8)
+  {
+    //
+    // Offset X and Y.
+    //
+
+    decodeBuffer.decodeBoolValue(value);
+
+    if (value == 0)
+    {
+      renderExtension -> data.composite_glyphs.offset_x =
+            renderExtension -> data.composite_glyphs.src_x;
+
+      renderExtension -> data.composite_glyphs.offset_y =
+            renderExtension -> data.composite_glyphs.src_y;
+    }
+    else
+    {
+      previous = renderExtension -> data.composite_glyphs.offset_x;
+
+      decodeBuffer.decodeDiffCachedValue(value, previous, 16,
+                         clientCache -> renderGlyphXCache, 11);
+
+      renderExtension -> data.composite_glyphs.offset_x = value;
+
+      previous = renderExtension -> data.composite_glyphs.offset_y;
+
+      decodeBuffer.decodeDiffCachedValue(value, previous, 16,
+                         clientCache -> renderGlyphYCache, 11);
+
+      renderExtension -> data.composite_glyphs.offset_y = value;
+    }
+  }
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded update. Type is "
+          << (unsigned int) renderExtension -> data.composite_glyphs.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_UPDATE
diff --git a/nxcomp/src/RenderCompositeGlyphs.h b/nxcomp/src/RenderCompositeGlyphs.h
new file mode 100644
index 000000000..1062ee781
--- /dev/null
+++ b/nxcomp/src/RenderCompositeGlyphs.h
@@ -0,0 +1,100 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef RenderCompositeGlyphs_H
+#define RenderCompositeGlyphs_H
+
+//
+// Define the characteristics
+// of this message class here.
+//
+
+#undef  MESSAGE_NAME
+#define MESSAGE_NAME          "RenderCompositeGlyphs"
+
+#undef  MESSAGE_STORE
+#define MESSAGE_STORE         RenderCompositeGlyphsStore
+
+#undef  MESSAGE_CLASS
+#define MESSAGE_CLASS         RenderMinorExtensionStore
+
+#undef  MESSAGE_METHODS
+#define MESSAGE_METHODS       "RenderMinorExtensionMethods.h"
+
+#undef  MESSAGE_HEADERS
+#define MESSAGE_HEADERS       "RenderMinorExtensionHeaders.h"
+
+#undef  MESSAGE_TAGS
+#define MESSAGE_TAGS          "RenderMinorExtensionTags.h"
+
+#undef  MESSAGE_OFFSET
+#define MESSAGE_OFFSET        28
+
+#undef  MESSAGE_HAS_SIZE
+#define MESSAGE_HAS_SIZE      1
+
+#undef  MESSAGE_HAS_DATA
+#define MESSAGE_HAS_DATA      1
+
+#undef  MESSAGE_HAS_FILTER
+#define MESSAGE_HAS_FILTER    0
+
+//
+// Encode the first 8 bytes of the
+// data differentially in newer
+// protocol versions.
+//
+
+#undef  MESSAGE_OFFSET_IF_PROTO_STEP_8
+#define MESSAGE_OFFSET_IF_PROTO_STEP_8  36
+
+//
+// Declare the message class.
+//
+
+#include MESSAGE_HEADERS
+
+class MESSAGE_STORE : public MESSAGE_CLASS
+{
+  public:
+
+  virtual const char *name() const
+  {
+    return MESSAGE_NAME;
+  }
+
+  virtual int identitySize(const unsigned char *buffer,
+                               unsigned int size)
+  {
+    // Since ProtoStep8 (#issue 108)
+    unsigned int offset = MESSAGE_OFFSET_IF_PROTO_STEP_8;
+
+    return (size >= offset ? offset : size);
+  }
+
+  #include MESSAGE_METHODS
+};
+
+#endif /* RenderCompositeGlyphs_H */
diff --git a/nxcomp/src/RenderCreateGlyphSet.cpp b/nxcomp/src/RenderCreateGlyphSet.cpp
new file mode 100644
index 000000000..e3a842de9
--- /dev/null
+++ b/nxcomp/src/RenderCreateGlyphSet.cpp
@@ -0,0 +1,185 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+//
+// Include the template for
+// this message class.
+//
+
+#include "RenderCreateGlyphSet.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+#include MESSAGE_TAGS
+
+//
+// Message handling methods.
+//
+
+MESSAGE_BEGIN_ENCODE_MESSAGE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  encodeBuffer.encodeNewXidValue(GetULONG(buffer + 4, bigEndian),
+                     clientCache -> lastId, clientCache -> lastIdCache,
+                         clientCache -> renderGlyphSetCache,
+                             clientCache -> renderFreeGlyphSetCache);
+
+  encodeBuffer.encodeCachedValue(GetULONG(buffer + 8, bigEndian), 32,
+                     clientCache -> renderFormatCache);
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded message. Type is "
+          << (unsigned int) *(buffer + 1) << " size is "
+          << size << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_MESSAGE
+
+MESSAGE_BEGIN_DECODE_MESSAGE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  unsigned int value;
+
+  *(buffer + 1) = type;
+
+  decodeBuffer.decodeNewXidValue(value,
+                     clientCache -> lastId, clientCache -> lastIdCache,
+                         clientCache -> renderGlyphSetCache,
+                             clientCache -> renderFreeGlyphSetCache);
+
+  PutULONG(value, buffer + 4, bigEndian);
+
+  decodeBuffer.decodeCachedValue(value, 32,
+                     clientCache -> renderFormatCache);
+
+  PutULONG(value, buffer + 8, bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded message. Type is "
+          << (unsigned int) type << " size is " << size
+          << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_MESSAGE
+
+MESSAGE_BEGIN_PARSE_IDENTITY
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  renderExtension -> data.create_set.type = *(buffer + 1);
+
+  renderExtension -> data.create_set.set_id = GetULONG(buffer + 4, bigEndian);
+  renderExtension -> data.create_set.format = GetULONG(buffer + 8, bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Parsed identity. Type is "
+          << (unsigned int) renderExtension -> data.create_set.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_PARSE_IDENTITY
+
+MESSAGE_BEGIN_UNPARSE_IDENTITY
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  *(buffer + 1) = renderExtension -> data.create_set.type;
+
+  PutULONG(renderExtension -> data.create_set.set_id, buffer + 4,  bigEndian);
+  PutULONG(renderExtension -> data.create_set.format,   buffer + 8,  bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Unparsed identity. Type is "
+          << (unsigned int) renderExtension -> data.create_set.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_UNPARSE_IDENTITY
+
+MESSAGE_BEGIN_IDENTITY_CHECKSUM
+{
+  md5_append(md5_state, buffer + 1, 3);
+  md5_append(md5_state, buffer + 8, 4);
+}
+MESSAGE_END_IDENTITY_CHECKSUM
+
+MESSAGE_BEGIN_ENCODE_UPDATE
+{
+  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
+  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  encodeBuffer.encodeNewXidValue(renderExtension -> data.create_set.set_id,
+                     clientCache -> lastId, clientCache -> lastIdCache,
+                         clientCache -> renderGlyphSetCache,
+                             clientCache -> renderFreeGlyphSetCache);
+
+  cachedRenderExtension -> data.create_set.set_id =
+              renderExtension -> data.create_set.set_id;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded update. Type is "
+          << (unsigned int) renderExtension -> data.create_set.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_UPDATE
+
+MESSAGE_BEGIN_DECODE_UPDATE
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  decodeBuffer.decodeNewXidValue(renderExtension -> data.create_set.set_id,
+                     clientCache -> lastId, clientCache -> lastIdCache,
+                         clientCache -> renderGlyphSetCache,
+                             clientCache -> renderFreeGlyphSetCache);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded update. Type is "
+          << (unsigned int) renderExtension -> data.create_set.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_UPDATE
diff --git a/nxcomp/src/RenderCreateGlyphSet.h b/nxcomp/src/RenderCreateGlyphSet.h
new file mode 100644
index 000000000..10f5d6699
--- /dev/null
+++ b/nxcomp/src/RenderCreateGlyphSet.h
@@ -0,0 +1,88 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef RenderCreateGlyphSet_H
+#define RenderCreateGlyphSet_H
+
+//
+// Define the characteristics
+// of this message class here.
+//
+
+#undef  MESSAGE_NAME
+#define MESSAGE_NAME          "RenderCreateGlyphSet"
+
+#undef  MESSAGE_STORE
+#define MESSAGE_STORE         RenderCreateGlyphSetStore
+
+#undef  MESSAGE_CLASS
+#define MESSAGE_CLASS         RenderMinorExtensionStore
+
+#undef  MESSAGE_METHODS
+#define MESSAGE_METHODS       "RenderMinorExtensionMethods.h"
+
+#undef  MESSAGE_HEADERS
+#define MESSAGE_HEADERS       "RenderMinorExtensionHeaders.h"
+
+#undef  MESSAGE_TAGS
+#define MESSAGE_TAGS          "RenderMinorExtensionTags.h"
+
+#undef  MESSAGE_OFFSET
+#define MESSAGE_OFFSET        12
+
+#undef  MESSAGE_HAS_SIZE
+#define MESSAGE_HAS_SIZE      0
+
+#undef  MESSAGE_HAS_DATA
+#define MESSAGE_HAS_DATA      0
+
+#undef  MESSAGE_HAS_FILTER
+#define MESSAGE_HAS_FILTER    0
+
+//
+// Declare the message class.
+//
+
+#include MESSAGE_HEADERS
+
+class MESSAGE_STORE : public MESSAGE_CLASS
+{
+  public:
+
+  virtual const char *name() const
+  {
+    return MESSAGE_NAME;
+  }
+
+  virtual int identitySize(const unsigned char *buffer,
+                               unsigned int size)
+  {
+    return MESSAGE_OFFSET;
+  }
+
+  #include MESSAGE_METHODS
+};
+
+#endif /* RenderCreateGlyphSet_H */
diff --git a/nxcomp/src/RenderCreatePicture.cpp b/nxcomp/src/RenderCreatePicture.cpp
new file mode 100644
index 000000000..f3f9f8b8a
--- /dev/null
+++ b/nxcomp/src/RenderCreatePicture.cpp
@@ -0,0 +1,278 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+//
+// Include the template for
+// this message class.
+//
+
+#include "RenderCreatePicture.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+#include MESSAGE_TAGS
+
+//
+// Message handling methods.
+//
+
+MESSAGE_BEGIN_ENCODE_SIZE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  encodeBuffer.encodeCachedValue((size - MESSAGE_OFFSET) >> 2, 16,
+                     clientCache -> renderLengthCache, 5);
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded size with value "
+          << size << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_SIZE
+
+MESSAGE_BEGIN_DECODE_SIZE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  decodeBuffer.decodeCachedValue(size, 16,
+                     clientCache -> renderLengthCache, 5);
+
+  size = MESSAGE_OFFSET + (size << 2);
+
+  buffer = writeBuffer -> addMessage(size);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded size with value "
+          << size << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_SIZE
+
+MESSAGE_BEGIN_ENCODE_MESSAGE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  encodeBuffer.encodeNewXidValue(GetULONG(buffer + 4, bigEndian),
+                     clientCache -> lastId, clientCache -> lastIdCache,
+                         clientCache -> renderSrcPictureCache,
+                             clientCache -> renderFreePictureCache);
+
+  encodeBuffer.encodeXidValue(GetULONG(buffer + 8, bigEndian),
+                     clientCache -> drawableCache);
+
+  encodeBuffer.encodeCachedValue(GetULONG(buffer + 12, bigEndian), 32,
+                     clientCache -> renderFormatCache);
+
+  encodeBuffer.encodeCachedValue(GetULONG(buffer + 16, bigEndian), 32,
+                     clientCache -> renderValueMaskCache);
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded message. Type is "
+          << (unsigned int) *(buffer + 1) << " size is "
+          << size << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_MESSAGE
+
+MESSAGE_BEGIN_DECODE_MESSAGE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  unsigned int value;
+
+  *(buffer + 1) = type;
+
+  decodeBuffer.decodeNewXidValue(value,
+                     clientCache -> lastId, clientCache -> lastIdCache,
+                         clientCache -> renderSrcPictureCache,
+                             clientCache -> renderFreePictureCache);
+
+  PutULONG(value, buffer + 4, bigEndian);
+
+  decodeBuffer.decodeXidValue(value,
+                     clientCache -> drawableCache);
+
+  PutULONG(value, buffer + 8, bigEndian);
+
+  decodeBuffer.decodeCachedValue(value, 32,
+                     clientCache -> renderFormatCache);
+
+  PutULONG(value, buffer + 12, bigEndian);
+
+  decodeBuffer.decodeCachedValue(value, 32,
+                     clientCache -> renderValueMaskCache);
+
+  PutULONG(value, buffer + 16, bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded message. Type is "
+          << (unsigned int) type << " size is " << size
+          << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_MESSAGE
+
+MESSAGE_BEGIN_ENCODE_DATA
+{
+  encodeLongData(encodeBuffer, buffer, MESSAGE_OFFSET,
+                     size, bigEndian, channelCache);
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded " << size - MESSAGE_OFFSET
+          << " bytes of data.\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_DATA
+
+MESSAGE_BEGIN_DECODE_DATA
+{
+  decodeLongData(decodeBuffer, buffer, MESSAGE_OFFSET,
+                     size, bigEndian, channelCache);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded " << size - MESSAGE_OFFSET
+          << " bytes of data.\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_DATA
+
+MESSAGE_BEGIN_PARSE_IDENTITY
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  renderExtension -> data.create_picture.type = *(buffer + 1);
+
+  renderExtension -> data.create_picture.src_id = GetULONG(buffer + 4,  bigEndian);
+  renderExtension -> data.create_picture.dst_id = GetULONG(buffer + 8,  bigEndian);
+
+  renderExtension -> data.create_picture.format = GetULONG(buffer + 12,  bigEndian);
+  renderExtension -> data.create_picture.mask   = GetULONG(buffer + 16,  bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Parsed identity. Type is "
+          << (unsigned int) renderExtension -> data.create_picture.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_PARSE_IDENTITY
+
+MESSAGE_BEGIN_UNPARSE_IDENTITY
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  *(buffer + 1) = renderExtension -> data.create_picture.type;
+
+  PutULONG(renderExtension -> data.create_picture.src_id, buffer + 4,  bigEndian);
+  PutULONG(renderExtension -> data.create_picture.dst_id, buffer + 8, bigEndian);
+
+  PutULONG(renderExtension -> data.create_picture.format, buffer + 12, bigEndian);
+  PutULONG(renderExtension -> data.create_picture.mask,   buffer + 16, bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Unparsed identity. Type is "
+          << (unsigned int) renderExtension -> data.create_picture.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_UNPARSE_IDENTITY
+
+MESSAGE_BEGIN_IDENTITY_CHECKSUM
+{
+  md5_append(md5_state, buffer + 1,  3);
+  md5_append(md5_state, buffer + 12, 8);
+}
+MESSAGE_END_IDENTITY_CHECKSUM
+
+MESSAGE_BEGIN_ENCODE_UPDATE
+{
+  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
+  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Encoding new id value "
+          << renderExtension -> data.create_picture.src_id
+          << ".\n";
+  #endif
+
+  encodeBuffer.encodeNewXidValue(renderExtension -> data.create_picture.src_id,
+                     clientCache -> lastId, clientCache -> lastIdCache,
+                         clientCache -> renderSrcPictureCache,
+                             clientCache -> renderFreePictureCache);
+
+  cachedRenderExtension -> data.create_picture.src_id =
+              renderExtension -> data.create_picture.src_id;
+
+  encodeBuffer.encodeXidValue(renderExtension -> data.create_picture.dst_id,
+                     clientCache -> drawableCache);
+
+  cachedRenderExtension -> data.create_picture.dst_id =
+              renderExtension -> data.create_picture.dst_id;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded update. Type is "
+          << (unsigned int) renderExtension -> data.create_picture.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_UPDATE
+
+MESSAGE_BEGIN_DECODE_UPDATE
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  decodeBuffer.decodeNewXidValue(renderExtension -> data.create_picture.src_id,
+                     clientCache -> lastId, clientCache -> lastIdCache,
+                         clientCache -> renderSrcPictureCache,
+                             clientCache -> renderFreePictureCache);
+
+  decodeBuffer.decodeXidValue(renderExtension -> data.create_picture.dst_id,
+                     clientCache -> drawableCache);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded update. Type is "
+          << (unsigned int) renderExtension -> data.create_picture.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_UPDATE
diff --git a/nxcomp/src/RenderCreatePicture.h b/nxcomp/src/RenderCreatePicture.h
new file mode 100644
index 000000000..ae2f583a0
--- /dev/null
+++ b/nxcomp/src/RenderCreatePicture.h
@@ -0,0 +1,88 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef RenderCreatePicture_H
+#define RenderCreatePicture_H
+
+//
+// Define the characteristics
+// of this message class here.
+//
+
+#undef  MESSAGE_NAME
+#define MESSAGE_NAME          "RenderCreatePicture"
+
+#undef  MESSAGE_STORE
+#define MESSAGE_STORE         RenderCreatePictureStore
+
+#undef  MESSAGE_CLASS
+#define MESSAGE_CLASS         RenderMinorExtensionStore
+
+#undef  MESSAGE_METHODS
+#define MESSAGE_METHODS       "RenderMinorExtensionMethods.h"
+
+#undef  MESSAGE_HEADERS
+#define MESSAGE_HEADERS       "RenderMinorExtensionHeaders.h"
+
+#undef  MESSAGE_TAGS
+#define MESSAGE_TAGS          "RenderMinorExtensionTags.h"
+
+#undef  MESSAGE_OFFSET
+#define MESSAGE_OFFSET        20
+
+#undef  MESSAGE_HAS_SIZE
+#define MESSAGE_HAS_SIZE      1
+
+#undef  MESSAGE_HAS_DATA
+#define MESSAGE_HAS_DATA      1
+
+#undef  MESSAGE_HAS_FILTER
+#define MESSAGE_HAS_FILTER    0
+
+//
+// Declare the message class.
+//
+
+#include MESSAGE_HEADERS
+
+class MESSAGE_STORE : public MESSAGE_CLASS
+{
+  public:
+
+  virtual const char *name() const
+  {
+    return MESSAGE_NAME;
+  }
+
+  virtual int identitySize(const unsigned char *buffer,
+                               unsigned int size)
+  {
+    return MESSAGE_OFFSET;
+  }
+
+  #include MESSAGE_METHODS
+};
+
+#endif /* RenderCreatePicture_H */
diff --git a/nxcomp/src/RenderExtension.cpp b/nxcomp/src/RenderExtension.cpp
new file mode 100644
index 000000000..64761bc05
--- /dev/null
+++ b/nxcomp/src/RenderExtension.cpp
@@ -0,0 +1,427 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "NXrender.h"
+
+#include "ClientCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+#include "WriteBuffer.h"
+
+#include "RenderExtension.h"
+
+#include "RenderGenericRequest.h"
+#include "RenderCreatePicture.h"
+#include "RenderChangePicture.h"
+#include "RenderFreePicture.h"
+#include "RenderPictureClip.h"
+#include "RenderPictureTransform.h"
+#include "RenderPictureFilter.h"
+#include "RenderCreateGlyphSet.h"
+#include "RenderFreeGlyphSet.h"
+#include "RenderAddGlyphs.h"
+#include "RenderComposite.h"
+#include "RenderCompositeGlyphs.h"
+#include "RenderFillRectangles.h"
+#include "RenderTrapezoids.h"
+#include "RenderTriangles.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+//
+// Constructor and destructor.
+//
+
+RenderExtensionStore::RenderExtensionStore(StaticCompressor *compressor)
+
+  : MessageStore(compressor)
+{
+  enableCache    = RENDEREXTENSION_ENABLE_CACHE;
+  enableData     = RENDEREXTENSION_ENABLE_DATA;
+  enableSplit    = RENDEREXTENSION_ENABLE_SPLIT;
+  enableCompress = RENDEREXTENSION_ENABLE_COMPRESS;
+
+  generic_ = new RenderGenericRequestStore();
+
+  for (int i = 0; i < RENDEREXTENSION_MINOR_OPCODE_LIMIT; i++)
+  {
+    minors_[i] = generic_;
+  }
+
+  minors_[X_RenderChangePicture]  = new RenderChangePictureStore();
+  minors_[X_RenderFillRectangles] = new RenderFillRectanglesStore();
+  minors_[X_RenderAddGlyphs]      = new RenderAddGlyphsStore();
+
+  // Since ProtoStep7 (#issue 108)
+  minors_[X_RenderCreatePicture]            = new RenderCreatePictureStore();
+  minors_[X_RenderFreePicture]              = new RenderFreePictureStore();
+  minors_[X_RenderSetPictureClipRectangles] = new RenderPictureClipStore();
+  minors_[X_RenderCreateGlyphSet]           = new RenderCreateGlyphSetStore();
+  minors_[X_RenderComposite]                = new RenderCompositeStore();
+  minors_[X_RenderCompositeGlyphs8]         = new RenderCompositeGlyphsStore();
+  minors_[X_RenderCompositeGlyphs16]        = new RenderCompositeGlyphsStore();
+  minors_[X_RenderCompositeGlyphs32]        = new RenderCompositeGlyphsStore();
+
+  minors_[X_RenderSetPictureTransform] = new RenderPictureTransformStore();
+  minors_[X_RenderSetPictureFilter]    = new RenderPictureFilterStore();
+  minors_[X_RenderFreeGlyphSet]        = new RenderFreeGlyphSetStore();
+  minors_[X_RenderTrapezoids]          = new RenderTrapezoidsStore();
+  minors_[X_RenderTriangles]           = new RenderTrianglesStore();
+
+  dataLimit  = RENDEREXTENSION_DATA_LIMIT;
+  dataOffset = RENDEREXTENSION_DATA_OFFSET;
+
+  // Since ProtoStep7 (#issue 108)
+  cacheSlots = RENDEREXTENSION_CACHE_SLOTS_IF_PROTO_STEP_7;
+
+  cacheThreshold      = RENDEREXTENSION_CACHE_THRESHOLD;
+  cacheLowerThreshold = RENDEREXTENSION_CACHE_LOWER_THRESHOLD;
+
+  opcode_ = X_NXInternalRenderExtension;
+
+  messages_ -> resize(cacheSlots);
+
+  for (T_messages::iterator i = messages_ -> begin();
+           i < messages_ -> end(); i++)
+  {
+    *i = NULL;
+  }
+
+  temporary_ = NULL;
+}
+
+RenderExtensionStore::~RenderExtensionStore()
+{
+  for (int i = 0; i < RENDEREXTENSION_MINOR_OPCODE_LIMIT; i++)
+  {
+    if (minors_[i] != generic_)
+    {
+      delete minors_[i];
+    }
+  }
+
+  delete generic_;
+
+  for (T_messages::iterator i = messages_ -> begin();
+           i < messages_ -> end(); i++)
+  {
+    destroy(*i);
+  }
+
+  destroy(temporary_);
+}
+
+int RenderExtensionStore::validateMessage(const unsigned char *buffer, int size)
+{
+  #ifdef TEST
+  *logofs << name() << ": Encoding message OPCODE#"
+          << (unsigned) *buffer << " MINOR#" << (unsigned)
+             *(buffer + 1) << " with size " << size
+          << ".\n" << logofs_flush;
+  #endif
+
+  return (size >= control -> MinimumMessageSize &&
+              size <= control -> MaximumMessageSize);
+}
+
+//
+// Here are the methods to handle the messages' content.
+//
+
+int RenderExtensionStore::identitySize(const unsigned char *buffer, unsigned int size)
+{
+  return minors_[*(buffer + 1)] -> identitySize(buffer, size);
+}
+
+int RenderExtensionStore::encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                                             const unsigned int size, int bigEndian,
+                                                 ChannelCache *channelCache) const
+{
+  encodeBuffer.encodeOpcodeValue(*(buffer + 1),
+                     ((ClientCache *) channelCache) -> renderOpcodeCache);
+
+  minors_[*(buffer + 1)] -> encodeMessage(encodeBuffer, buffer, size,
+                                              bigEndian, channelCache);
+
+  return 1;
+}
+
+int RenderExtensionStore::decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
+                                             unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
+                                                 ChannelCache *channelCache) const
+{
+  unsigned char type;
+
+  decodeBuffer.decodeOpcodeValue(type,
+                     ((ClientCache *) channelCache) -> renderOpcodeCache);
+
+  minors_[type] -> decodeMessage(decodeBuffer, buffer, size, type,
+                                     bigEndian, writeBuffer, channelCache);
+
+  return 1;
+}
+
+int RenderExtensionStore::parseIdentity(Message *message, const unsigned char *buffer,
+                                            unsigned int size, int bigEndian) const
+{
+  return minors_[*(buffer + 1)] -> parseIdentity(message, buffer, size, bigEndian);
+}
+
+int RenderExtensionStore::unparseIdentity(const Message *message, unsigned char *buffer,
+                                              unsigned int size, int bigEndian) const
+{
+  return minors_[((RenderExtensionMessage *) message) -> data.any.type] ->
+                     unparseIdentity(message, buffer, size, bigEndian);
+}
+
+void RenderExtensionStore::identityChecksum(const Message *message, const unsigned char *buffer,
+                                               unsigned int size, int bigEndian) const
+{
+  minors_[*(buffer + 1)] -> identityChecksum(message, buffer, size, md5_state_, bigEndian);
+}
+
+void RenderExtensionStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                              const Message *cachedMessage,
+                                                   ChannelCache *channelCache) const
+{
+  minors_[((RenderExtensionMessage *) message) -> data.any.type] ->
+              updateIdentity(encodeBuffer, message, cachedMessage, channelCache);
+}
+
+void RenderExtensionStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                              ChannelCache *channelCache) const
+{
+  minors_[((RenderExtensionMessage *) message) -> data.any.type] ->
+              updateIdentity(decodeBuffer, message, channelCache);
+}
+
+void RenderExtensionStore::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  #ifdef WARNING
+  *logofs << name() << ": WARNING! Dump of identity not implemented.\n"
+          << logofs_flush;
+  #endif
+
+  #endif
+}
+
+//
+// TODO: The following encoding and decoding functions
+// could be generalized further, for example by passing
+// the pointer to the data cache, the number of caches
+// made available by the caller and the first cache to
+// iterate through.
+//
+
+void RenderMinorExtensionStore::encodeLongData(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                                                   unsigned int offset, unsigned int size, int bigEndian,
+                                                       ChannelCache *channelCache) const
+{
+  // Since ProtoStep7 (#issue 108)
+  encodeBuffer.encodeLongData(buffer + offset, size - offset);
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded " << size - offset
+          << " bytes of long data.\n" << logofs_flush;
+  #endif
+}
+
+void RenderMinorExtensionStore::encodeIntData(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                                                  unsigned int offset, unsigned int size, int bigEndian,
+                                                      ChannelCache *channelCache) const
+{
+  // Since ProtoStep7 (#issue 108)
+  encodeBuffer.encodeIntData(buffer + offset, size - offset);
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded " << size - offset
+          << " bytes of int data.\n" << logofs_flush;
+  #endif
+}
+
+void RenderMinorExtensionStore::encodeCharData(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                                                   unsigned int offset, unsigned int size, int bigEndian,
+                                                       ChannelCache *channelCache) const
+{
+  // Since ProtoStep7 (#issue 108)
+  encodeBuffer.encodeTextData(buffer + offset, size - offset);
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded " << size - offset
+          << " bytes of text data.\n" << logofs_flush;
+  #endif
+}
+
+void RenderMinorExtensionStore::decodeLongData(DecodeBuffer &decodeBuffer, unsigned char *buffer,
+                                                   unsigned int offset, unsigned int size, int bigEndian,
+                                                       ChannelCache *channelCache) const
+{
+  // Since ProtoStep7 (#issue 108)
+  decodeBuffer.decodeLongData(buffer + offset, size - offset);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded " << size - offset
+          << " bytes of long data.\n" << logofs_flush;
+  #endif
+}
+
+void RenderMinorExtensionStore::decodeIntData(DecodeBuffer &decodeBuffer, unsigned char *buffer,
+                                                  unsigned int offset, unsigned int size, int bigEndian,
+                                                      ChannelCache *channelCache) const
+{
+  // Since ProtoStep7 (#issue 108)
+  decodeBuffer.decodeIntData(buffer + offset, size - offset);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded " << size - offset
+          << " bytes of int data.\n" << logofs_flush;
+  #endif
+}
+
+void RenderMinorExtensionStore::decodeCharData(DecodeBuffer &decodeBuffer, unsigned char *buffer,
+                                                   unsigned int offset, unsigned int size, int bigEndian,
+                                                       ChannelCache *channelCache) const
+{
+  // Since ProtoStep7 (#issue 108)
+  decodeBuffer.decodeTextData(buffer + offset, size - offset);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded " << size - offset
+          << " bytes of text data.\n" << logofs_flush;
+  #endif
+}
+
+void RenderMinorExtensionStore::parseIntData(const Message *message, const unsigned char *buffer,
+                                                 unsigned int offset, unsigned int size,
+                                                     int bigEndian) const
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  unsigned int last = ((unsigned) message -> i_size_ > size ? size : message -> i_size_);
+
+  for (unsigned int i = offset, c = (offset - 4) % 16; i < last; i += 2)
+  {
+    #ifdef DEBUG
+    *logofs << name() << ": Parsing int with i = " << i << " c = "
+            << c << ".\n" << logofs_flush;
+    #endif
+
+    renderExtension -> data.any.short_data[c] = GetUINT(buffer + i, bigEndian);
+
+    if (++c == 16) c = 0;
+  }
+}
+
+void RenderMinorExtensionStore::unparseIntData(const Message *message, unsigned char *buffer,
+                                                   unsigned int offset, unsigned int size,
+                                                       int bigEndian) const
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  unsigned int last = ((unsigned) message -> i_size_ > size ? size : message -> i_size_);
+
+  for (unsigned int i = offset, c = (offset - 4) % 16; i < last; i += 2)
+  {
+    #ifdef DEBUG
+    *logofs << name() << ": Unparsing int with i = " << i << " c = "
+            << c << ".\n" << logofs_flush;
+    #endif
+
+    PutUINT(renderExtension -> data.any.short_data[c], buffer + i, bigEndian);
+
+    if (++c == 16) c = 0;
+  }
+}
+
+void RenderMinorExtensionStore::updateIntData(EncodeBuffer &encodeBuffer, const Message *message,
+                                                  const Message *cachedMessage, unsigned int offset,
+                                                      unsigned int size, ChannelCache *channelCache) const
+{
+  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
+  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  unsigned int last = ((unsigned) message -> i_size_ > size ? size : message -> i_size_);
+
+  for (unsigned int i = offset, c = (offset - 4) % 16; i < last; i += 2)
+  {
+    #ifdef DEBUG
+    *logofs << name() << ": Encoding int update with i = " << i
+            << " c = " << c << ".\n" << logofs_flush;
+    #endif
+
+    encodeBuffer.encodeCachedValue(renderExtension -> data.any.short_data[c], 16,
+                       *clientCache -> renderDataCache[c]);
+
+    cachedRenderExtension -> data.any.short_data[c] =
+                renderExtension -> data.any.short_data[c];
+
+    if (++c == 16) c = 0;
+  }
+}
+
+void RenderMinorExtensionStore::updateIntData(DecodeBuffer &decodeBuffer, const Message *message,
+                                                  unsigned int offset, unsigned int size,
+                                                      ChannelCache *channelCache) const
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  unsigned int last = ((unsigned) message -> i_size_ > size ? size : message -> i_size_);
+
+  unsigned int value;
+
+  for (unsigned int i = offset, c = (offset - 4) % 16; i < last; i += 2)
+  {
+    #ifdef DEBUG
+    *logofs << name() << ": Decoding int update with i = " << i
+            << " c = " << c << ".\n" << logofs_flush;
+    #endif
+
+    decodeBuffer.decodeCachedValue(value, 16,
+                       *clientCache -> renderDataCache[c]);
+
+    renderExtension -> data.any.short_data[c] = value;
+
+    if (++c == 16) c = 0;
+  }
+}
diff --git a/nxcomp/src/RenderExtension.h b/nxcomp/src/RenderExtension.h
new file mode 100644
index 000000000..aa9db1b55
--- /dev/null
+++ b/nxcomp/src/RenderExtension.h
@@ -0,0 +1,504 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef RenderExtension_H
+#define RenderExtension_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Compression of data part is not enabled as
+// most messages of this type are smaller than
+// the current data size compression threshold.
+//
+
+#define RENDEREXTENSION_ENABLE_CACHE               1
+#define RENDEREXTENSION_ENABLE_DATA                0
+#define RENDEREXTENSION_ENABLE_SPLIT               0
+#define RENDEREXTENSION_ENABLE_COMPRESS            0
+
+#define RENDEREXTENSION_DATA_LIMIT                 6144
+#define RENDEREXTENSION_DATA_OFFSET                36
+
+#define RENDEREXTENSION_CACHE_THRESHOLD            20
+#define RENDEREXTENSION_CACHE_LOWER_THRESHOLD      10
+
+#define RENDEREXTENSION_CACHE_SLOTS_IF_PROTO_STEP_7    8000
+
+//
+// Used to build the table of minor opcodes.
+//
+
+#define RENDEREXTENSION_MINOR_OPCODE_LIMIT         256
+
+//
+// The message class.
+//
+
+class RenderMinorExtensionStore;
+
+class RenderExtensionMessage : public Message
+{
+  friend class RenderExtensionStore;
+  friend class RenderMinorExtensionStore;
+
+  friend class RenderGenericRequestStore;
+  friend class RenderCreatePictureStore;
+  friend class RenderChangePictureStore;
+  friend class RenderFreePictureStore;
+  friend class RenderPictureClipStore;
+  friend class RenderPictureTransformStore;
+  friend class RenderPictureFilterStore;
+  friend class RenderCreateGlyphSetStore;
+  friend class RenderFreeGlyphSetStore;
+  friend class RenderAddGlyphsStore;
+  friend class RenderCompositeStore;
+  friend class RenderCompositeGlyphsStore;
+  friend class RenderFillRectanglesStore;
+  friend class RenderTrapezoidsStore;
+  friend class RenderTrianglesStore;
+
+  public:
+
+  RenderExtensionMessage()
+  {
+  }
+
+  ~RenderExtensionMessage()
+  {
+  }
+
+  //
+  // We consider for this message a data offset of 36,
+  // that is size of the biggest among all requests of
+  // this extension. The most common requests have a
+  // specific differential encoding, others are simply
+  // encoded through an array of int or char caches.
+  //
+
+  private:
+
+  union
+  {
+    struct
+    {
+      unsigned char type;
+
+      unsigned char  char_data[32];
+      unsigned short short_data[16];
+      unsigned short long_data[8];
+    }
+    any;
+
+    struct
+    {
+      unsigned char type;
+
+      unsigned int src_id;
+      unsigned int dst_id;
+
+      unsigned int format;
+      unsigned int mask;
+    }
+    create_picture;
+
+    struct
+    {
+      unsigned char type;
+
+      unsigned int src_id;
+    }
+    change_picture;
+
+    struct
+    {
+      unsigned char type;
+
+      unsigned int src_id;
+    }
+    free_picture;
+
+    struct
+    {
+      unsigned char type;
+
+      unsigned int src_id;
+
+      unsigned short src_x;
+      unsigned short src_y;
+    }
+    picture_clip;
+
+    struct
+    {
+      unsigned char type;
+
+      unsigned int src_id;
+    }
+    picture_transform;
+
+    struct
+    {
+      unsigned char type;
+
+      unsigned int src_id;
+      unsigned int num_elm;
+    }
+    picture_filter;
+
+    struct
+    {
+      unsigned char type;
+
+      unsigned int set_id;
+      unsigned int format;
+    }
+    create_set;
+
+    struct
+    {
+      unsigned char type;
+
+      unsigned int set_id;
+    }
+    free_set;
+
+    struct
+    {
+      unsigned char type;
+
+      unsigned int set_id;
+      unsigned int num_elm;
+    }
+    add_glyphs;
+
+    struct
+    {
+      unsigned char type;
+
+      unsigned char op;
+
+      unsigned int src_id;
+      unsigned int msk_id;
+      unsigned int dst_id;
+
+      unsigned short src_x;
+      unsigned short src_y;
+
+      unsigned short msk_x;
+      unsigned short msk_y;
+
+      unsigned short dst_x;
+      unsigned short dst_y;
+
+      unsigned short width;
+      unsigned short height;
+    }
+    composite;
+
+    struct
+    {
+      unsigned char type;
+
+      unsigned char op;
+
+      unsigned char num_elm;
+
+      unsigned int src_id;
+      unsigned int dst_id;
+
+      unsigned int format;
+      unsigned int set_id;
+
+      unsigned short src_x;
+      unsigned short src_y;
+
+      unsigned short offset_x;
+      unsigned short offset_y;
+    }
+    composite_glyphs;
+
+    struct
+    {
+      unsigned char type;
+
+      unsigned char op;
+
+      unsigned int dst_id;
+    }
+    fill_rectangles;
+
+    struct
+    {
+      unsigned char type;
+
+      unsigned char op;
+
+      unsigned int src_id;
+      unsigned int dst_id;
+
+      unsigned int format;
+
+      unsigned short src_x;
+      unsigned short src_y;
+    }
+    trapezoids;
+
+    struct
+    {
+      unsigned char type;
+
+      unsigned char op;
+
+      unsigned int src_id;
+      unsigned int dst_id;
+
+      unsigned int format;
+
+      unsigned short src_x;
+      unsigned short src_y;
+    }
+    triangles;
+
+    struct
+    {
+      unsigned char type;
+
+      unsigned char op;
+
+      unsigned char num_elm;
+
+      unsigned int src_id;
+      unsigned int dst_id;
+
+      unsigned int format;
+      unsigned int set_id;
+
+      unsigned short src_x;
+      unsigned short src_y;
+
+      unsigned short delta_x;
+      unsigned short delta_y;
+    }
+    composite_glyphs_compat;
+
+  }
+  data;
+};
+
+class RenderExtensionStore : public MessageStore
+{
+  public:
+
+  RenderExtensionStore(StaticCompressor *compressor);
+
+  virtual ~RenderExtensionStore();
+
+  virtual const char *name() const
+  {
+    return "RenderExtension";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return opcode_;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(RenderExtensionMessage);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  public:
+
+  virtual Message *create() const
+  {
+    return new RenderExtensionMessage();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new RenderExtensionMessage((const RenderExtensionMessage &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (RenderExtensionMessage *) message;
+  }
+
+  //
+  // Determine if the message must be stored
+  // in the cache.
+  //
+
+  virtual int validateMessage(const unsigned char *buffer, int size);
+
+  //
+  // Since protocol step 5 these methods are
+  // specialized in their minor opcode stores.
+  //
+
+  virtual int identitySize(const unsigned char *buffer, unsigned int size);
+
+  virtual int encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                                 const unsigned int size, int bigEndian,
+                                     ChannelCache *channelCache) const;
+
+  virtual int decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
+                                 unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
+                                     ChannelCache *channelCache) const;
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer,
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                  const Message *cachedMessage,
+                                      ChannelCache *channelCache) const;
+
+  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                  ChannelCache *channelCache) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+                                    unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+
+  private:
+
+  unsigned char opcode_;
+
+  //
+  // Keep pointers to specialized classes.
+  //
+
+  RenderMinorExtensionStore *minors_[RENDEREXTENSION_MINOR_OPCODE_LIMIT];
+
+  RenderMinorExtensionStore *generic_;
+};
+
+class RenderMinorExtensionStore : public MinorMessageStore
+{
+  public:
+
+  virtual const char *name() const = 0;
+
+  virtual int identitySize(const unsigned char *buffer, unsigned int size) = 0;
+
+  virtual int encodeMessage(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                                const unsigned int size, int bigEndian,
+                                    ChannelCache *channelCache) const = 0;
+
+  virtual int decodeMessage(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
+                                unsigned int &size, unsigned char type, int bigEndian,
+                                    WriteBuffer *writeBuffer, ChannelCache *channelCache) const = 0;
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer,
+                                unsigned int size, int bigEndian) const = 0;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+                                  unsigned int size, int bigEndian) const = 0;
+
+  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                  const Message *cachedMessage,
+                                      ChannelCache *channelCache) const = 0;
+
+  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                  ChannelCache *channelCache) const = 0;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+                                    unsigned int size, md5_state_t *md5_state,
+                                        int bigEndian) const = 0;
+
+  //
+  // Internal encode and decode utilities.
+  //
+
+  protected:
+
+  void encodeLongData(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                          unsigned int offset, unsigned int size, int bigEndian,
+                              ChannelCache *channelCache) const;
+ 
+  void encodeIntData(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                         unsigned int offset, unsigned int size, int bigEndian,
+                             ChannelCache *channelCache) const;
+ 
+  void encodeCharData(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                          unsigned int offset, unsigned int size, int bigEndian,
+                              ChannelCache *channelCache) const;
+
+  void decodeLongData(DecodeBuffer &decodeBuffer, unsigned char *buffer,
+                          unsigned int offset, unsigned int size, int bigEndian,
+                              ChannelCache *channelCache) const;
+
+  void decodeIntData(DecodeBuffer &decodeBuffer, unsigned char *buffer,
+                         unsigned int offset, unsigned int size, int bigEndian,
+                             ChannelCache *channelCache) const;
+
+  void decodeCharData(DecodeBuffer &decodeBuffer, unsigned char *buffer,
+                          unsigned int offset, unsigned int size, int bigEndian,
+                              ChannelCache *channelCache) const;
+
+  /*
+   * The following methods are only used in the
+   * encoding of the generic render request. To
+   * be removed in future.
+   */
+
+  void parseIntData(const Message *message, const unsigned char *buffer,
+                        unsigned int offset, unsigned int size,
+                            int bigEndian) const;
+
+  void unparseIntData(const Message *message, unsigned char *buffer,
+                          unsigned int offset, unsigned int size,
+                              int bigEndian) const;
+
+  void updateIntData(EncodeBuffer &encodeBuffer, const Message *message,
+                         const Message *cachedMessage, unsigned int offset,
+                             unsigned int size, ChannelCache *channelCache) const;
+
+  void updateIntData(DecodeBuffer &decodeBuffer, const Message *message,
+                         unsigned int offset, unsigned int size,
+                             ChannelCache *channelCache) const;
+};
+
+#endif /* RenderExtension_H */
diff --git a/nxcomp/src/RenderFillRectangles.cpp b/nxcomp/src/RenderFillRectangles.cpp
new file mode 100644
index 000000000..db05887ab
--- /dev/null
+++ b/nxcomp/src/RenderFillRectangles.cpp
@@ -0,0 +1,237 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+//
+// Include the template for
+// this message class.
+//
+
+#include "RenderFillRectangles.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+#include MESSAGE_TAGS
+
+//
+// Message handling methods.
+//
+
+MESSAGE_BEGIN_ENCODE_SIZE
+{
+  //
+  // The color structure (4 components, 2 bytes
+  // each) is included in the data part, so that
+  // it gets into the checksum. The rectangles
+  // are in the format x, y, width, height with
+  // 2 bytes per each field, so each request is
+  // at least 12 + 8 + 8 = 28 bytes long.
+  //
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  encodeBuffer.encodeCachedValue((size - MESSAGE_OFFSET) >> 2, 16,
+                     clientCache -> renderLengthCache, 5);
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded size with value "
+          << size << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_SIZE
+
+MESSAGE_BEGIN_DECODE_SIZE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  decodeBuffer.decodeCachedValue(size, 16,
+                     clientCache -> renderLengthCache, 5);
+
+  size = MESSAGE_OFFSET + (size << 2);
+
+  buffer = writeBuffer -> addMessage(size);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded size with value "
+          << size << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_SIZE
+
+MESSAGE_BEGIN_ENCODE_MESSAGE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  encodeBuffer.encodeCachedValue(*(buffer + 4), 8,
+                     clientCache -> renderOpCache);
+
+  encodeBuffer.encodeXidValue(GetULONG(buffer + 8, bigEndian),
+                     clientCache -> renderSrcPictureCache);
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded message. Type is "
+          << (unsigned int) *(buffer + 1) << " size is "
+          << size << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_MESSAGE
+
+MESSAGE_BEGIN_DECODE_MESSAGE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  unsigned int value;
+
+  *(buffer + 1) = type;
+
+  decodeBuffer.decodeCachedValue(*(buffer + 4), 8,
+                     clientCache -> renderOpCache);
+
+  decodeBuffer.decodeXidValue(value, clientCache -> renderSrcPictureCache);
+
+  PutULONG(value, buffer + 8, bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded message. Type is "
+          << (unsigned int) type << " size is " << size
+          << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_MESSAGE
+
+MESSAGE_BEGIN_ENCODE_DATA
+{
+  encodeIntData(encodeBuffer, buffer, MESSAGE_OFFSET,
+                    size, bigEndian, channelCache);
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded " << size - MESSAGE_OFFSET
+          << " bytes of data.\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_DATA
+
+MESSAGE_BEGIN_DECODE_DATA
+{
+  decodeIntData(decodeBuffer, buffer, MESSAGE_OFFSET,
+                    size, bigEndian, channelCache);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded " << size - MESSAGE_OFFSET
+          << " bytes of data.\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_DATA
+
+MESSAGE_BEGIN_PARSE_IDENTITY
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  renderExtension -> data.fill_rectangles.type = *(buffer + 1);
+  renderExtension -> data.fill_rectangles.op   = *(buffer + 4);
+
+  renderExtension -> data.fill_rectangles.dst_id = GetULONG(buffer + 8, bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Parsed identity. Type is "
+          << (unsigned int) renderExtension -> data.fill_rectangles.type << " size is "
+          << renderExtension -> size_ << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_PARSE_IDENTITY
+
+MESSAGE_BEGIN_UNPARSE_IDENTITY
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  *(buffer + 1) = renderExtension -> data.fill_rectangles.type;
+  *(buffer + 4) = renderExtension -> data.fill_rectangles.op;
+
+  PutULONG(renderExtension -> data.fill_rectangles.dst_id, buffer + 8,  bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Unparsed identity. Type is "
+          << (unsigned int) renderExtension -> data.fill_rectangles.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_UNPARSE_IDENTITY
+
+MESSAGE_BEGIN_IDENTITY_CHECKSUM
+{
+  md5_append(md5_state, buffer + 1, 4);
+}
+MESSAGE_END_IDENTITY_CHECKSUM
+
+MESSAGE_BEGIN_ENCODE_UPDATE
+{
+  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
+  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  encodeBuffer.encodeXidValue(renderExtension -> data.fill_rectangles.dst_id,
+                     clientCache -> renderSrcPictureCache);
+
+  cachedRenderExtension -> data.fill_rectangles.dst_id =
+              renderExtension -> data.fill_rectangles.dst_id;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded update. Type is "
+          << (unsigned int) renderExtension -> data.fill_rectangles.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_UPDATE
+
+MESSAGE_BEGIN_DECODE_UPDATE
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  decodeBuffer.decodeXidValue(renderExtension -> data.fill_rectangles.dst_id,
+                     clientCache -> renderSrcPictureCache);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded update. Type is "
+          << (unsigned int) renderExtension -> data.fill_rectangles.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_UPDATE
diff --git a/nxcomp/src/RenderFillRectangles.h b/nxcomp/src/RenderFillRectangles.h
new file mode 100644
index 000000000..9efaeffa8
--- /dev/null
+++ b/nxcomp/src/RenderFillRectangles.h
@@ -0,0 +1,88 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef RenderFillRectangles_H
+#define RenderFillRectangles_H
+
+//
+// Define the characteristics
+// of this message class here.
+//
+
+#undef  MESSAGE_NAME
+#define MESSAGE_NAME          "RenderFillRectangles"
+
+#undef  MESSAGE_STORE
+#define MESSAGE_STORE         RenderFillRectanglesStore
+
+#undef  MESSAGE_CLASS
+#define MESSAGE_CLASS         RenderMinorExtensionStore
+
+#undef  MESSAGE_METHODS
+#define MESSAGE_METHODS       "RenderMinorExtensionMethods.h"
+
+#undef  MESSAGE_HEADERS
+#define MESSAGE_HEADERS       "RenderMinorExtensionHeaders.h"
+
+#undef  MESSAGE_TAGS
+#define MESSAGE_TAGS          "RenderMinorExtensionTags.h"
+
+#undef  MESSAGE_OFFSET
+#define MESSAGE_OFFSET        12
+
+#undef  MESSAGE_HAS_SIZE
+#define MESSAGE_HAS_SIZE      1
+
+#undef  MESSAGE_HAS_DATA
+#define MESSAGE_HAS_DATA      1
+
+#undef  MESSAGE_HAS_FILTER
+#define MESSAGE_HAS_FILTER    0
+
+//
+// Declare the message class.
+//
+
+#include MESSAGE_HEADERS
+
+class MESSAGE_STORE : public MESSAGE_CLASS
+{
+  public:
+
+  virtual const char *name() const
+  {
+    return MESSAGE_NAME;
+  }
+
+  virtual int identitySize(const unsigned char *buffer,
+                               unsigned int size)
+  {
+    return MESSAGE_OFFSET;
+  }
+
+  #include MESSAGE_METHODS
+};
+
+#endif /* RenderFillRectangles_H */
diff --git a/nxcomp/src/RenderFreeGlyphSet.cpp b/nxcomp/src/RenderFreeGlyphSet.cpp
new file mode 100644
index 000000000..88dfb791a
--- /dev/null
+++ b/nxcomp/src/RenderFreeGlyphSet.cpp
@@ -0,0 +1,166 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+//
+// Include the template for
+// this message class.
+//
+
+#include "RenderFreeGlyphSet.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+#include MESSAGE_TAGS
+
+//
+// Message handling methods.
+//
+
+MESSAGE_BEGIN_ENCODE_MESSAGE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  encodeBuffer.encodeFreeXidValue(GetULONG(buffer + 4, bigEndian),
+                     clientCache -> renderFreeGlyphSetCache);
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded message. Type is "
+          << (unsigned int) *(buffer + 1) << " size is "
+          << size << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_MESSAGE
+
+MESSAGE_BEGIN_DECODE_MESSAGE
+{
+  unsigned int value;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  *(buffer + 1) = type;
+
+  decodeBuffer.decodeFreeXidValue(value,
+                     clientCache -> renderFreeGlyphSetCache);
+
+  PutULONG(value, buffer + 4, bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded message. Type is "
+          << (unsigned int) type << " size is " << size
+          << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_MESSAGE
+
+MESSAGE_BEGIN_PARSE_IDENTITY
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  renderExtension -> data.free_set.type = *(buffer + 1);
+
+  renderExtension -> data.free_set.set_id = GetULONG(buffer + 4, bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Parsed identity. Type is "
+          << (unsigned int) renderExtension -> data.free_set.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_PARSE_IDENTITY
+
+MESSAGE_BEGIN_UNPARSE_IDENTITY
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  *(buffer + 1) = renderExtension -> data.free_set.type;
+
+  PutULONG(renderExtension -> data.free_set.set_id, buffer + 4, bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Unparsed identity. Type is "
+          << (unsigned int) renderExtension -> data.free_set.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_UNPARSE_IDENTITY
+
+MESSAGE_BEGIN_IDENTITY_CHECKSUM
+{
+  md5_append(md5_state, buffer + 1, 3);
+}
+MESSAGE_END_IDENTITY_CHECKSUM
+
+MESSAGE_BEGIN_ENCODE_UPDATE
+{
+  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
+  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  encodeBuffer.encodeFreeXidValue(renderExtension -> data.free_set.set_id,
+                     clientCache -> renderFreeGlyphSetCache);
+
+  cachedRenderExtension -> data.free_set.set_id =
+              renderExtension -> data.free_set.set_id;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded update. Type is "
+          << (unsigned int) renderExtension -> data.free_set.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_UPDATE
+
+MESSAGE_BEGIN_DECODE_UPDATE
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  decodeBuffer.decodeFreeXidValue(renderExtension -> data.free_set.set_id,
+                     clientCache -> renderFreeGlyphSetCache);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded update. Type is "
+          << (unsigned int) renderExtension -> data.free_set.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_UPDATE
diff --git a/nxcomp/src/RenderFreeGlyphSet.h b/nxcomp/src/RenderFreeGlyphSet.h
new file mode 100644
index 000000000..8817e8d99
--- /dev/null
+++ b/nxcomp/src/RenderFreeGlyphSet.h
@@ -0,0 +1,88 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef RenderFreeGlyphSet_H
+#define RenderFreeGlyphSet_H
+
+//
+// Define the characteristics
+// of this message class here.
+//
+
+#undef  MESSAGE_NAME
+#define MESSAGE_NAME          "RenderFreeGlyphSet"
+
+#undef  MESSAGE_STORE
+#define MESSAGE_STORE         RenderFreeGlyphSetStore
+
+#undef  MESSAGE_CLASS
+#define MESSAGE_CLASS         RenderMinorExtensionStore
+
+#undef  MESSAGE_METHODS
+#define MESSAGE_METHODS       "RenderMinorExtensionMethods.h"
+
+#undef  MESSAGE_HEADERS
+#define MESSAGE_HEADERS       "RenderMinorExtensionHeaders.h"
+
+#undef  MESSAGE_TAGS
+#define MESSAGE_TAGS          "RenderMinorExtensionTags.h"
+
+#undef  MESSAGE_OFFSET
+#define MESSAGE_OFFSET        8
+
+#undef  MESSAGE_HAS_SIZE
+#define MESSAGE_HAS_SIZE      0
+
+#undef  MESSAGE_HAS_DATA
+#define MESSAGE_HAS_DATA      0
+
+#undef  MESSAGE_HAS_FILTER
+#define MESSAGE_HAS_FILTER    0
+
+//
+// Declare the message class.
+//
+
+#include MESSAGE_HEADERS
+
+class MESSAGE_STORE : public MESSAGE_CLASS
+{
+  public:
+
+  virtual const char *name() const
+  {
+    return MESSAGE_NAME;
+  }
+
+  virtual int identitySize(const unsigned char *buffer,
+                               unsigned int size)
+  {
+    return MESSAGE_OFFSET;
+  }
+
+  #include MESSAGE_METHODS
+};
+
+#endif /* RenderFreeGlyphSet_H */
diff --git a/nxcomp/src/RenderFreePicture.cpp b/nxcomp/src/RenderFreePicture.cpp
new file mode 100644
index 000000000..31662a7e2
--- /dev/null
+++ b/nxcomp/src/RenderFreePicture.cpp
@@ -0,0 +1,166 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+//
+// Include the template for
+// this message class.
+//
+
+#include "RenderFreePicture.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+#include MESSAGE_TAGS
+
+//
+// Message handling methods.
+//
+
+MESSAGE_BEGIN_ENCODE_MESSAGE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  encodeBuffer.encodeFreeXidValue(GetULONG(buffer + 4, bigEndian),
+                     clientCache -> renderFreePictureCache);
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded message. Type is "
+          << (unsigned int) *(buffer + 1) << " size is "
+          << size << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_MESSAGE
+
+MESSAGE_BEGIN_DECODE_MESSAGE
+{
+  unsigned int value;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  *(buffer + 1) = type;
+
+  decodeBuffer.decodeFreeXidValue(value,
+                     clientCache -> renderFreePictureCache);
+
+  PutULONG(value, buffer + 4, bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded message. Type is "
+          << (unsigned int) type << " size is " << size
+          << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_MESSAGE
+
+MESSAGE_BEGIN_PARSE_IDENTITY
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  renderExtension -> data.free_picture.type = *(buffer + 1);
+
+  renderExtension -> data.free_picture.src_id = GetULONG(buffer + 4, bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Parsed identity. Type is "
+          << (unsigned int) renderExtension -> data.free_picture.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_PARSE_IDENTITY
+
+MESSAGE_BEGIN_UNPARSE_IDENTITY
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  *(buffer + 1) = renderExtension -> data.free_picture.type;
+
+  PutULONG(renderExtension -> data.free_picture.src_id, buffer + 4, bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Unparsed identity. Type is "
+          << (unsigned int) renderExtension -> data.free_picture.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_UNPARSE_IDENTITY
+
+MESSAGE_BEGIN_IDENTITY_CHECKSUM
+{
+  md5_append(md5_state, buffer + 1, 3);
+}
+MESSAGE_END_IDENTITY_CHECKSUM
+
+MESSAGE_BEGIN_ENCODE_UPDATE
+{
+  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
+  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  encodeBuffer.encodeFreeXidValue(renderExtension -> data.free_picture.src_id,
+                     clientCache -> renderFreePictureCache);
+
+  cachedRenderExtension -> data.free_picture.src_id =
+              renderExtension -> data.free_picture.src_id;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded update. Type is "
+          << (unsigned int) renderExtension -> data.free_picture.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_UPDATE
+
+MESSAGE_BEGIN_DECODE_UPDATE
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  decodeBuffer.decodeFreeXidValue(renderExtension -> data.free_picture.src_id,
+                     clientCache -> renderFreePictureCache);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded update. Type is "
+          << (unsigned int) renderExtension -> data.free_picture.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_UPDATE
diff --git a/nxcomp/src/RenderFreePicture.h b/nxcomp/src/RenderFreePicture.h
new file mode 100644
index 000000000..b50191a72
--- /dev/null
+++ b/nxcomp/src/RenderFreePicture.h
@@ -0,0 +1,88 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef RenderFreePicture_H
+#define RenderFreePicture_H
+
+//
+// Define the characteristics
+// of this message class here.
+//
+
+#undef  MESSAGE_NAME
+#define MESSAGE_NAME          "RenderFreePicture"
+
+#undef  MESSAGE_STORE
+#define MESSAGE_STORE         RenderFreePictureStore
+
+#undef  MESSAGE_CLASS
+#define MESSAGE_CLASS         RenderMinorExtensionStore
+
+#undef  MESSAGE_METHODS
+#define MESSAGE_METHODS       "RenderMinorExtensionMethods.h"
+
+#undef  MESSAGE_HEADERS
+#define MESSAGE_HEADERS       "RenderMinorExtensionHeaders.h"
+
+#undef  MESSAGE_TAGS
+#define MESSAGE_TAGS          "RenderMinorExtensionTags.h"
+
+#undef  MESSAGE_OFFSET
+#define MESSAGE_OFFSET        8
+
+#undef  MESSAGE_HAS_SIZE
+#define MESSAGE_HAS_SIZE      0
+
+#undef  MESSAGE_HAS_DATA
+#define MESSAGE_HAS_DATA      0
+
+#undef  MESSAGE_HAS_FILTER
+#define MESSAGE_HAS_FILTER    0
+
+//
+// Declare the message class.
+//
+
+#include MESSAGE_HEADERS
+
+class MESSAGE_STORE : public MESSAGE_CLASS
+{
+  public:
+
+  virtual const char *name() const
+  {
+    return MESSAGE_NAME;
+  }
+
+  virtual int identitySize(const unsigned char *buffer,
+                               unsigned int size)
+  {
+    return MESSAGE_OFFSET;
+  }
+
+  #include MESSAGE_METHODS
+};
+
+#endif /* RenderFreePicture_H */
diff --git a/nxcomp/src/RenderGenericRequest.cpp b/nxcomp/src/RenderGenericRequest.cpp
new file mode 100644
index 000000000..cff34e61e
--- /dev/null
+++ b/nxcomp/src/RenderGenericRequest.cpp
@@ -0,0 +1,270 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "NXrender.h"
+
+#include "RenderExtension.h"
+#include "RenderGenericRequest.h"
+
+#include "ClientCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+#include "WriteBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+//
+// Here are the methods to handle the messages' content.
+//
+
+int RenderGenericRequestStore::encodeMessage(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                                                 const unsigned int size, int bigEndian,
+                                                     ChannelCache *channelCache) const
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Encoding full message.\n"
+          << logofs_flush;
+
+  unsigned char type = *(buffer + 1);
+
+  #endif
+
+  encodeBuffer.encodeCachedValue(size >> 2, 16,
+                     clientCache -> renderLengthCache, 5);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Encoding full unhandled message. "
+          << "Type is " << (unsigned int) type << " size is "
+          << size << ".\n" << logofs_flush;
+  #endif
+
+  encodeIntData(encodeBuffer, buffer, 4, size,
+                    bigEndian, clientCache);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Encoded full message.\n"
+          << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int RenderGenericRequestStore::decodeMessage(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
+                                                 unsigned int &size, unsigned char type, int bigEndian,
+                                                     WriteBuffer *writeBuffer, ChannelCache *channelCache) const
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoding full message.\n"
+          << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeCachedValue(size, 16,
+                     clientCache -> renderLengthCache, 5);
+
+  size <<= 2;
+
+  buffer = writeBuffer -> addMessage(size);
+
+  *(buffer + 1) = type;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoding full unhandled message. "
+          << "Type is " << (unsigned int) type << " size is "
+          << size << ".\n" << logofs_flush;
+  #endif
+
+  decodeIntData(decodeBuffer, buffer, 4, size,
+                    bigEndian, clientCache);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded full message.\n"
+          << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void RenderGenericRequestStore::encodeData(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                                               unsigned int size, int bigEndian,
+                                                   ChannelCache *channelCache) const
+{
+}
+
+void RenderGenericRequestStore::decodeData(DecodeBuffer &decodeBuffer, unsigned char *buffer,
+                                               unsigned int size, int bigEndian,
+                                                   ChannelCache *channelCache) const
+{
+}
+
+int RenderGenericRequestStore::parseIdentity(Message *message, const unsigned char *buffer,
+                                                 unsigned int size, int bigEndian) const
+{
+  #ifdef DEBUG
+  *logofs << name() << ": Parsing identity for message at "
+          << this << ".\n" << logofs_flush;
+  #endif
+
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  unsigned char type = *(buffer + 1);
+
+  renderExtension -> data.any.type = type;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsing unhandled identity. "
+          << "Type is " << (unsigned int) renderExtension -> data.any.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+
+  parseIntData(message, buffer, 4, size, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsed identity for message at "
+          << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int RenderGenericRequestStore::unparseIdentity(const Message *message, unsigned char *buffer,
+                                                   unsigned int size, int bigEndian) const
+{
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsing identity for message at "
+          << this << ".\n" << logofs_flush;
+  #endif
+
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  unsigned char type = renderExtension -> data.any.type;
+
+  *(buffer + 1) = type;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsing unhandled identity. "
+          << "Type is " << (unsigned int) renderExtension -> data.any.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+
+  unparseIntData(message, buffer, 4, size, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsed identity for message at "
+          << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void RenderGenericRequestStore::identityChecksum(const Message *message, const unsigned char *buffer,
+                                                     unsigned int size, md5_state_t *md5_state,
+                                                         int bigEndian) const
+{
+  //
+  // Include the minor opcode in the checksum.
+  // Because the data offset can be beyond the
+  // real end of the message, we need to include
+  // the size or we will match any message whose
+  // size is less or equal to the data offset.
+  //
+
+  md5_append(md5_state, buffer + 1, 3);
+}
+
+void RenderGenericRequestStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                                   const Message *cachedMessage,
+                                                       ChannelCache *channelCache) const
+{
+  //
+  // Encode the variant part.
+  //
+
+  #ifdef DEBUG
+  *logofs << name() << ": Updating identity for message at "
+          << this << ".\n" << logofs_flush;
+  #endif
+
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Encoding unhandled update. "
+          << "Type is " << (unsigned int) renderExtension -> data.any.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+
+  updateIntData(encodeBuffer, message, cachedMessage, 4,
+                    renderExtension -> size_, channelCache);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Updated identity for message at "
+          << this << ".\n" << logofs_flush;
+  #endif
+}
+
+void RenderGenericRequestStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                                   ChannelCache *channelCache) const
+{
+  #ifdef DEBUG
+  *logofs << name() << ": Updating identity for message at "
+          << this << ".\n" << logofs_flush;
+  #endif
+
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoding unhandled update. "
+          << "Type is " << (unsigned int) renderExtension -> data.any.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+
+  updateIntData(decodeBuffer, message, 4,
+                    renderExtension -> size_, channelCache);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Updated identity for message at "
+          << this << ".\n" << logofs_flush;
+  #endif
+}
diff --git a/nxcomp/src/RenderGenericRequest.h b/nxcomp/src/RenderGenericRequest.h
new file mode 100644
index 000000000..fdf5ca876
--- /dev/null
+++ b/nxcomp/src/RenderGenericRequest.h
@@ -0,0 +1,89 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef RenderGenericRequest_H
+#define RenderGenericRequest_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+class RenderGenericRequestStore : public RenderMinorExtensionStore
+{
+  public:
+
+  virtual const char *name() const
+  {
+    return "RenderGenericRequest";
+  }
+
+  virtual int identitySize(const unsigned char *buffer, unsigned int size)
+  {
+    return RENDEREXTENSION_DATA_OFFSET;
+  }
+
+  virtual int encodeMessage(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                                const unsigned int size, int bigEndian,
+                                    ChannelCache *channelCache) const;
+
+  virtual int decodeMessage(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
+                                unsigned int &size, unsigned char type, int bigEndian,
+                                    WriteBuffer *writeBuffer, ChannelCache *channelCache) const;
+
+  virtual void encodeData(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                              unsigned int size, int bigEndian,
+                                  ChannelCache *channelCache) const;
+
+  virtual void decodeData(DecodeBuffer &decodeBuffer, unsigned char *buffer,
+                              unsigned int size, int bigEndian,
+                                  ChannelCache *channelCache) const;
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer,
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                  const Message *cachedMessage,
+                                      ChannelCache *channelCache) const;
+
+  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                  ChannelCache *channelCache) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+                                    unsigned int size, md5_state_t *md5_state,
+                                        int bigEndian) const;
+};
+
+#endif /* RenderGenericRequest_H */
diff --git a/nxcomp/src/RenderMinorExtensionHeaders.h b/nxcomp/src/RenderMinorExtensionHeaders.h
new file mode 100644
index 000000000..b7f6efc5a
--- /dev/null
+++ b/nxcomp/src/RenderMinorExtensionHeaders.h
@@ -0,0 +1,42 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef RenderMinorExtensionHeaders_H
+#define RenderMinorExtensionHeaders_H
+
+#include "NXrender.h"
+
+#include "Message.h"
+
+#include "ClientCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+#include "WriteBuffer.h"
+
+#include "RenderExtension.h"
+
+#endif /* RenderMinorExtensionHeaders_H */
diff --git a/nxcomp/src/RenderMinorExtensionMethods.h b/nxcomp/src/RenderMinorExtensionMethods.h
new file mode 100644
index 000000000..d272337e0
--- /dev/null
+++ b/nxcomp/src/RenderMinorExtensionMethods.h
@@ -0,0 +1,81 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+//
+// This file is included multiple times,
+// one for each message inheriting the
+// parent class.
+//
+
+public:
+
+#if MESSAGE_HAS_SIZE
+
+virtual void encodeSize(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                            const unsigned int size, int bigEndian,
+                                ChannelCache *channelCache) const;
+
+virtual void decodeSize(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
+                            unsigned int &size, unsigned char type, int bigEndian,
+                                WriteBuffer *writeBuffer, ChannelCache *channelCache) const;
+
+#endif
+
+#if MESSAGE_HAS_DATA
+
+virtual void encodeData(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                            unsigned int size, int bigEndian,
+                                ChannelCache *channelCache) const;
+
+virtual void decodeData(DecodeBuffer &decodeBuffer, unsigned char *buffer,
+                            unsigned int size, int bigEndian,
+                                ChannelCache *channelCache) const;
+
+#endif
+
+virtual int encodeMessage(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                              const unsigned int size, int bigEndian,
+                                  ChannelCache *channelCache) const;
+
+virtual int decodeMessage(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
+                              unsigned int &size, unsigned char type, int bigEndian,
+                                  WriteBuffer *writeBuffer, ChannelCache *channelCache) const;
+
+virtual int parseIdentity(Message *message, const unsigned char *buffer,
+                              unsigned int size, int bigEndian) const;
+
+virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+                                unsigned int size, int bigEndian) const;
+
+virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                const Message *cachedMessage,
+                                    ChannelCache *channelCache) const;
+
+virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                ChannelCache *channelCache) const;
+
+virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+                                  unsigned int size, md5_state_t *md5_state,
+                                      int bigEndian) const;
diff --git a/nxcomp/src/RenderMinorExtensionTags.h b/nxcomp/src/RenderMinorExtensionTags.h
new file mode 100644
index 000000000..c24a99638
--- /dev/null
+++ b/nxcomp/src/RenderMinorExtensionTags.h
@@ -0,0 +1,194 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef RenderMinorExtensionTags_H
+#define RenderMinorExtensionTags_H
+
+//
+// Set in the message header file.
+//
+
+#if MESSAGE_HAS_SIZE
+
+#define MESSAGE_ENCODE_SIZE  encodeSize(encodeBuffer, buffer, size, bigEndian, channelCache)
+#define MESSAGE_DECODE_SIZE  decodeSize(decodeBuffer, buffer, size, type, bigEndian, writeBuffer, channelCache)
+
+#else
+
+#define MESSAGE_ENCODE_SIZE
+#define MESSAGE_DECODE_SIZE  size = MESSAGE_OFFSET; buffer = writeBuffer -> addMessage(size);
+
+#endif
+
+#if MESSAGE_HAS_DATA
+
+#define MESSAGE_ENCODE_DATA  encodeData(encodeBuffer, buffer, size, bigEndian, channelCache)
+#define MESSAGE_DECODE_DATA  decodeData(decodeBuffer, buffer, size, bigEndian, channelCache)
+
+#else
+
+#define MESSAGE_ENCODE_DATA
+#define MESSAGE_DECODE_DATA
+
+#endif
+
+//
+// Prologue an epilogue of the message
+// handling functions.
+//
+
+#define MESSAGE_BEGIN_ENCODE_SIZE \
+\
+void MESSAGE_STORE::encodeSize(EncodeBuffer &encodeBuffer, const unsigned char *buffer, \
+                                   const unsigned int size, int bigEndian, \
+                                       ChannelCache *channelCache) const \
+{
+
+#define MESSAGE_END_ENCODE_SIZE \
+\
+}
+
+#define MESSAGE_BEGIN_DECODE_SIZE \
+\
+void MESSAGE_STORE::decodeSize(DecodeBuffer &decodeBuffer, unsigned char *&buffer, \
+                                   unsigned int &size, unsigned char type, int bigEndian, \
+                                       WriteBuffer *writeBuffer, ChannelCache *channelCache) const \
+{
+
+#define MESSAGE_END_DECODE_SIZE \
+\
+}
+
+#define MESSAGE_BEGIN_ENCODE_MESSAGE \
+\
+int MESSAGE_STORE::encodeMessage(EncodeBuffer &encodeBuffer, const unsigned char *buffer, \
+                                     const unsigned int size, int bigEndian, \
+                                         ChannelCache *channelCache) const \
+{ \
+  MESSAGE_ENCODE_SIZE;
+
+
+#define MESSAGE_END_ENCODE_MESSAGE \
+\
+  MESSAGE_ENCODE_DATA; \
+\
+  return 1; \
+}
+
+#define MESSAGE_BEGIN_DECODE_MESSAGE \
+\
+int MESSAGE_STORE::decodeMessage(DecodeBuffer &decodeBuffer, unsigned char *&buffer, \
+                                     unsigned int &size, unsigned char type, int bigEndian, \
+                                         WriteBuffer *writeBuffer, ChannelCache *channelCache) const \
+{ \
+  MESSAGE_DECODE_SIZE;
+
+
+#define MESSAGE_END_DECODE_MESSAGE \
+\
+  MESSAGE_DECODE_DATA; \
+\
+  return 1; \
+}
+
+#define MESSAGE_BEGIN_ENCODE_DATA \
+\
+void MESSAGE_STORE::encodeData(EncodeBuffer &encodeBuffer, const unsigned char *buffer, \
+                                   unsigned int size, int bigEndian, \
+                                       ChannelCache *channelCache) const \
+{
+
+#define MESSAGE_END_ENCODE_DATA \
+\
+}
+
+#define MESSAGE_BEGIN_DECODE_DATA \
+\
+void MESSAGE_STORE::decodeData(DecodeBuffer &decodeBuffer, unsigned char *buffer, \
+                                   unsigned int size, int bigEndian, \
+                                       ChannelCache *channelCache) const \
+{
+
+#define MESSAGE_END_DECODE_DATA \
+\
+}
+
+#define MESSAGE_BEGIN_PARSE_IDENTITY \
+\
+int MESSAGE_STORE::parseIdentity(Message *message, const unsigned char *buffer, \
+                                     unsigned int size, int bigEndian) const \
+{
+
+#define MESSAGE_END_PARSE_IDENTITY \
+\
+  return 1; \
+\
+}
+
+#define MESSAGE_BEGIN_UNPARSE_IDENTITY \
+\
+int MESSAGE_STORE::unparseIdentity(const Message *message, unsigned char *buffer, \
+                                       unsigned int size, int bigEndian) const \
+{
+
+#define MESSAGE_END_UNPARSE_IDENTITY \
+\
+  return 1; \
+\
+}
+
+#define MESSAGE_BEGIN_IDENTITY_CHECKSUM \
+\
+void MESSAGE_STORE::identityChecksum(const Message *message, const unsigned char *buffer, \
+                                         unsigned int size, md5_state_t *md5_state, \
+                                             int bigEndian) const \
+{
+
+#define MESSAGE_END_IDENTITY_CHECKSUM \
+\
+}
+
+#define MESSAGE_BEGIN_ENCODE_UPDATE \
+\
+void MESSAGE_STORE::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message, \
+                                       const Message *cachedMessage, \
+                                           ChannelCache *channelCache) const \
+{
+
+#define MESSAGE_END_ENCODE_UPDATE \
+\
+}
+
+#define MESSAGE_BEGIN_DECODE_UPDATE \
+\
+void MESSAGE_STORE::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message, \
+                                       ChannelCache *channelCache) const \
+{
+
+#define MESSAGE_END_DECODE_UPDATE \
+\
+}
+
+#endif /* RenderMinorExtensionTags_H */
diff --git a/nxcomp/src/RenderPictureClip.cpp b/nxcomp/src/RenderPictureClip.cpp
new file mode 100644
index 000000000..0d6b505eb
--- /dev/null
+++ b/nxcomp/src/RenderPictureClip.cpp
@@ -0,0 +1,303 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+//
+// Include the template for
+// this message class.
+//
+
+#include "RenderPictureClip.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+#include MESSAGE_TAGS
+
+//
+// Message handling methods.
+//
+
+MESSAGE_BEGIN_ENCODE_SIZE
+{
+  //
+  // The data is constituted by a number of
+  // rectangles. Each rectangle is in the
+  // format x, y, width, height with 2 bytes
+  // per each field, so each request is at
+  // least 12 + 8 = 20 bytes long.
+  //
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  encodeBuffer.encodeCachedValue((size - MESSAGE_OFFSET) >> 2, 16,
+                     clientCache -> renderLengthCache, 5);
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded size with value "
+          << size << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_SIZE
+
+MESSAGE_BEGIN_DECODE_SIZE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  decodeBuffer.decodeCachedValue(size, 16,
+                     clientCache -> renderLengthCache, 5);
+
+  size = MESSAGE_OFFSET + (size << 2);
+
+  buffer = writeBuffer -> addMessage(size);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded size with value "
+          << size << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_SIZE
+
+MESSAGE_BEGIN_ENCODE_MESSAGE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  encodeBuffer.encodeXidValue(GetULONG(buffer + 4, bigEndian),
+                     clientCache -> renderSrcPictureCache);
+
+  encodeBuffer.encodeDiffCachedValue(GetUINT(buffer + 8, bigEndian),
+                     clientCache -> renderLastX, 16,
+                         clientCache -> renderXCache, 11);
+
+  encodeBuffer.encodeDiffCachedValue(GetUINT(buffer + 10, bigEndian),
+                     clientCache -> renderLastY, 16,
+                         clientCache -> renderYCache, 11);
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded message. Type is "
+          << (unsigned int) *(buffer + 1) << " size is "
+          << size << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_MESSAGE
+
+MESSAGE_BEGIN_DECODE_MESSAGE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  unsigned int value;
+
+  *(buffer + 1) = type;
+
+  decodeBuffer.decodeXidValue(value,
+                     clientCache -> renderSrcPictureCache);
+
+  PutULONG(value, buffer + 4, bigEndian);
+
+  decodeBuffer.decodeDiffCachedValue(value,
+                     clientCache -> renderLastX, 16,
+                         clientCache -> renderXCache, 11);
+
+  PutUINT(clientCache -> renderLastX, buffer + 8, bigEndian);
+
+  decodeBuffer.decodeDiffCachedValue(value,
+                     clientCache -> renderLastY, 16,
+                         clientCache -> renderYCache, 11);
+
+  PutUINT(clientCache -> renderLastY, buffer + 10, bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded message. Type is "
+          << (unsigned int) type << " size is " << size
+          << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_MESSAGE
+
+MESSAGE_BEGIN_ENCODE_DATA
+{
+  encodeIntData(encodeBuffer, buffer, MESSAGE_OFFSET,
+                    size, bigEndian, channelCache);
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded " << size - MESSAGE_OFFSET
+          << " bytes of data.\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_DATA
+
+MESSAGE_BEGIN_DECODE_DATA
+{
+  decodeIntData(decodeBuffer, buffer, MESSAGE_OFFSET,
+                    size, bigEndian, channelCache);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded " << size - MESSAGE_OFFSET
+          << " bytes of data.\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_DATA
+
+MESSAGE_BEGIN_PARSE_IDENTITY
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  renderExtension -> data.picture_clip.type = *(buffer + 1);
+
+  renderExtension -> data.picture_clip.src_id = GetULONG(buffer + 4,  bigEndian);
+
+  renderExtension -> data.picture_clip.src_x = GetUINT(buffer + 8,  bigEndian);
+  renderExtension -> data.picture_clip.src_y = GetUINT(buffer + 10, bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Parsed identity. Type is "
+          << (unsigned int) renderExtension -> data.picture_clip.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_PARSE_IDENTITY
+
+MESSAGE_BEGIN_UNPARSE_IDENTITY
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  *(buffer + 1) = renderExtension -> data.picture_clip.type;
+
+  PutULONG(renderExtension -> data.picture_clip.src_id, buffer + 4,  bigEndian);
+
+  PutUINT(renderExtension -> data.picture_clip.src_x, buffer + 8,  bigEndian);
+  PutUINT(renderExtension -> data.picture_clip.src_y, buffer + 10, bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Unparsed identity. Type is "
+          << (unsigned int) renderExtension -> data.picture_clip.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_UNPARSE_IDENTITY
+
+MESSAGE_BEGIN_IDENTITY_CHECKSUM
+{
+  //
+  // Encode the picture id and the
+  // source x and y differentially.
+  //
+
+  md5_append(md5_state, buffer + 1, 3);
+}
+MESSAGE_END_IDENTITY_CHECKSUM
+
+MESSAGE_BEGIN_ENCODE_UPDATE
+{
+  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
+  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  encodeBuffer.encodeXidValue(renderExtension -> data.picture_clip.src_id,
+                     clientCache -> renderSrcPictureCache);
+
+  cachedRenderExtension -> data.picture_clip.src_id =
+              renderExtension -> data.picture_clip.src_id;
+
+  //
+  // The source x and y coordinates are
+  // encoded as differerences in respect
+  // to the previous cached value.
+  //
+
+  unsigned int value;
+  unsigned int previous;
+
+  value    = renderExtension -> data.picture_clip.src_x;
+  previous = cachedRenderExtension -> data.picture_clip.src_x;
+
+  encodeBuffer.encodeDiffCachedValue(value, previous, 16,
+                     clientCache -> renderXCache, 11);
+
+  cachedRenderExtension -> data.picture_clip.src_x = value;
+
+  value    = renderExtension -> data.picture_clip.src_y;
+  previous = cachedRenderExtension -> data.picture_clip.src_y;
+
+  encodeBuffer.encodeDiffCachedValue(value, previous, 16,
+                     clientCache -> renderYCache, 11);
+
+  cachedRenderExtension -> data.picture_clip.src_y = value;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded update. Type is "
+          << (unsigned int) renderExtension -> data.picture_clip.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_UPDATE
+
+MESSAGE_BEGIN_DECODE_UPDATE
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  decodeBuffer.decodeXidValue(renderExtension -> data.picture_clip.src_id,
+                     clientCache -> renderSrcPictureCache);
+
+  unsigned int value;
+  unsigned int previous;
+
+  previous = renderExtension -> data.picture_clip.src_x;
+
+  decodeBuffer.decodeDiffCachedValue(value, previous, 16,
+                     clientCache -> renderXCache, 11);
+
+  renderExtension -> data.picture_clip.src_x = value;
+
+  previous = renderExtension -> data.picture_clip.src_y;
+
+  decodeBuffer.decodeDiffCachedValue(value, previous, 16,
+                     clientCache -> renderYCache, 11);
+
+  renderExtension -> data.picture_clip.src_y = value;
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded update. Type is "
+          << (unsigned int) renderExtension -> data.picture_clip.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_UPDATE
diff --git a/nxcomp/src/RenderPictureClip.h b/nxcomp/src/RenderPictureClip.h
new file mode 100644
index 000000000..bd811dfcd
--- /dev/null
+++ b/nxcomp/src/RenderPictureClip.h
@@ -0,0 +1,88 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef RenderPictureClip_H
+#define RenderPictureClip_H
+
+//
+// Define the characteristics
+// of this message class here.
+//
+
+#undef  MESSAGE_NAME
+#define MESSAGE_NAME          "RenderPictureClip"
+
+#undef  MESSAGE_STORE
+#define MESSAGE_STORE         RenderPictureClipStore
+
+#undef  MESSAGE_CLASS
+#define MESSAGE_CLASS         RenderMinorExtensionStore
+
+#undef  MESSAGE_METHODS
+#define MESSAGE_METHODS       "RenderMinorExtensionMethods.h"
+
+#undef  MESSAGE_HEADERS
+#define MESSAGE_HEADERS       "RenderMinorExtensionHeaders.h"
+
+#undef  MESSAGE_TAGS
+#define MESSAGE_TAGS          "RenderMinorExtensionTags.h"
+
+#undef  MESSAGE_OFFSET
+#define MESSAGE_OFFSET        12
+
+#undef  MESSAGE_HAS_SIZE
+#define MESSAGE_HAS_SIZE      1
+
+#undef  MESSAGE_HAS_DATA
+#define MESSAGE_HAS_DATA      1
+
+#undef  MESSAGE_HAS_FILTER
+#define MESSAGE_HAS_FILTER    0
+
+//
+// Declare the message class.
+//
+
+#include MESSAGE_HEADERS
+
+class MESSAGE_STORE : public MESSAGE_CLASS
+{
+  public:
+
+  virtual const char *name() const
+  {
+    return MESSAGE_NAME;
+  }
+
+  virtual int identitySize(const unsigned char *buffer,
+                               unsigned int size)
+  {
+    return MESSAGE_OFFSET;
+  }
+
+  #include MESSAGE_METHODS
+};
+
+#endif /* RenderPictureClip_H */
diff --git a/nxcomp/src/RenderPictureFilter.cpp b/nxcomp/src/RenderPictureFilter.cpp
new file mode 100644
index 000000000..ce40e051a
--- /dev/null
+++ b/nxcomp/src/RenderPictureFilter.cpp
@@ -0,0 +1,278 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+//
+// Include the template for
+// this message class.
+//
+
+#include "RenderPictureFilter.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+#include MESSAGE_TAGS
+
+//
+// Message handling methods.
+//
+
+MESSAGE_BEGIN_ENCODE_SIZE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Encoding value "
+          << ((size - MESSAGE_OFFSET) >> 2) << ".\n"
+          << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeCachedValue((size - MESSAGE_OFFSET) >> 2, 16,
+                     clientCache -> renderLengthCache, 5);
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded size with value "
+          << size << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_SIZE
+
+MESSAGE_BEGIN_DECODE_SIZE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  decodeBuffer.decodeCachedValue(size, 16,
+                     clientCache -> renderLengthCache, 5);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << size
+          << ".\n" << logofs_flush;
+  #endif
+
+  size = MESSAGE_OFFSET + (size << 2);
+
+  buffer = writeBuffer -> addMessage(size);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded size with value "
+          << size << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_SIZE
+
+MESSAGE_BEGIN_ENCODE_MESSAGE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  encodeBuffer.encodeXidValue(GetULONG(buffer + 4, bigEndian),
+                     clientCache -> renderSrcPictureCache);
+
+  encodeBuffer.encodeCachedValue(GetUINT(buffer + 8, bigEndian), 16,
+                     clientCache -> renderLengthCache, 5);
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded message. Type is "
+          << (unsigned int) *(buffer + 1) << " size is "
+          << size << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_MESSAGE
+
+MESSAGE_BEGIN_DECODE_MESSAGE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  unsigned int value;
+
+  *(buffer + 1) = type;
+
+  decodeBuffer.decodeXidValue(value,
+                     clientCache -> renderSrcPictureCache);
+
+  PutULONG(value, buffer + 4, bigEndian);
+
+  decodeBuffer.decodeCachedValue(value, 16,
+                     clientCache -> renderLengthCache, 5);
+
+  PutUINT(value, buffer + 8, bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded message. Type is "
+          << (unsigned int) type << " size is " << size
+          << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_MESSAGE
+
+MESSAGE_BEGIN_ENCODE_DATA
+{
+  encodeCharData(encodeBuffer, buffer, MESSAGE_OFFSET,
+                     size, bigEndian, channelCache);
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded " << size - MESSAGE_OFFSET
+          << " bytes of data.\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_DATA
+
+MESSAGE_BEGIN_DECODE_DATA
+{
+  decodeCharData(decodeBuffer, buffer, MESSAGE_OFFSET,
+                     size, bigEndian, channelCache);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded " << size - MESSAGE_OFFSET
+          << " bytes of data.\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_DATA
+
+MESSAGE_BEGIN_PARSE_IDENTITY
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  renderExtension -> data.picture_filter.type = *(buffer + 1);
+
+  renderExtension -> data.picture_filter.src_id = GetULONG(buffer + 4, bigEndian);
+  renderExtension -> data.picture_filter.num_elm = GetUINT(buffer + 8, bigEndian);
+
+  //
+  // Clean the padding bytes. This
+  // should be the purpose of the
+  // filter.
+  //
+
+  #ifdef TEST
+  *logofs << name() << ": Cleaning "
+          << RoundUp4(renderExtension -> data.picture_filter.num_elm) -
+             renderExtension -> data.picture_filter.num_elm << " bytes "
+          << "at offset " << MESSAGE_OFFSET + renderExtension ->
+             data.picture_filter.num_elm << " with " << renderExtension ->
+             data.picture_filter.num_elm << " elements and size "
+          << renderExtension -> size_ << ".\n" << logofs_flush;
+  #endif
+
+  if (size >= MESSAGE_OFFSET + renderExtension ->
+          data.picture_filter.num_elm)
+  {
+    unsigned char *next = (unsigned char *) buffer +
+                              MESSAGE_OFFSET + renderExtension ->
+                                  data.picture_filter.num_elm;
+
+    while (next < buffer + size)
+    {
+      *next++ = '\0';
+    }
+  }
+
+  #ifdef TEST
+  *logofs << name() << ": Parsed identity. Type is "
+          << (unsigned int) renderExtension -> data.picture_filter.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_PARSE_IDENTITY
+
+MESSAGE_BEGIN_UNPARSE_IDENTITY
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  *(buffer + 1) = renderExtension -> data.picture_filter.type;
+
+  PutULONG(renderExtension -> data.picture_filter.src_id, buffer + 4, bigEndian);
+  PutUINT(renderExtension -> data.picture_filter.num_elm, buffer + 8, bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Unparsed identity. Type is "
+          << (unsigned int) renderExtension -> data.picture_filter.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_UNPARSE_IDENTITY
+
+MESSAGE_BEGIN_IDENTITY_CHECKSUM
+{
+  //
+  // Include the length of the filter name
+  // in the checksum.
+  //
+
+  md5_append(md5_state, buffer + 1, 3);
+  md5_append(md5_state, buffer + 8, 2);
+}
+MESSAGE_END_IDENTITY_CHECKSUM
+
+MESSAGE_BEGIN_ENCODE_UPDATE
+{
+  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
+  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  encodeBuffer.encodeXidValue(renderExtension -> data.picture_filter.src_id,
+                     clientCache -> renderSrcPictureCache);
+
+  cachedRenderExtension -> data.picture_filter.src_id =
+              renderExtension -> data.picture_filter.src_id;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded update. Type is "
+          << (unsigned int) renderExtension -> data.picture_filter.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_UPDATE
+
+MESSAGE_BEGIN_DECODE_UPDATE
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  decodeBuffer.decodeXidValue(renderExtension -> data.picture_filter.src_id,
+                     clientCache -> renderSrcPictureCache);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded update. Type is "
+          << (unsigned int) renderExtension -> data.picture_filter.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_UPDATE
diff --git a/nxcomp/src/RenderPictureFilter.h b/nxcomp/src/RenderPictureFilter.h
new file mode 100644
index 000000000..a3e37538b
--- /dev/null
+++ b/nxcomp/src/RenderPictureFilter.h
@@ -0,0 +1,88 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef RenderPictureFilter_H
+#define RenderPictureFilter_H
+
+//
+// Define the characteristics
+// of this message class here.
+//
+
+#undef  MESSAGE_NAME
+#define MESSAGE_NAME          "RenderPictureFilter"
+
+#undef  MESSAGE_STORE
+#define MESSAGE_STORE         RenderPictureFilterStore
+
+#undef  MESSAGE_CLASS
+#define MESSAGE_CLASS         RenderMinorExtensionStore
+
+#undef  MESSAGE_METHODS
+#define MESSAGE_METHODS       "RenderMinorExtensionMethods.h"
+
+#undef  MESSAGE_HEADERS
+#define MESSAGE_HEADERS       "RenderMinorExtensionHeaders.h"
+
+#undef  MESSAGE_TAGS
+#define MESSAGE_TAGS          "RenderMinorExtensionTags.h"
+
+#undef  MESSAGE_OFFSET
+#define MESSAGE_OFFSET        12
+
+#undef  MESSAGE_HAS_SIZE
+#define MESSAGE_HAS_SIZE      1
+
+#undef  MESSAGE_HAS_DATA
+#define MESSAGE_HAS_DATA      1
+
+#undef  MESSAGE_HAS_FILTER
+#define MESSAGE_HAS_FILTER    0
+
+//
+// Declare the message class.
+//
+
+#include MESSAGE_HEADERS
+
+class MESSAGE_STORE : public MESSAGE_CLASS
+{
+  public:
+
+  virtual const char *name() const
+  {
+    return MESSAGE_NAME;
+  }
+
+  virtual int identitySize(const unsigned char *buffer,
+                               unsigned int size)
+  {
+    return MESSAGE_OFFSET;
+  }
+
+  #include MESSAGE_METHODS
+};
+
+#endif /* RenderPictureFilter_H */
diff --git a/nxcomp/src/RenderPictureTransform.cpp b/nxcomp/src/RenderPictureTransform.cpp
new file mode 100644
index 000000000..0048e61f4
--- /dev/null
+++ b/nxcomp/src/RenderPictureTransform.cpp
@@ -0,0 +1,214 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+//
+// Include the template for
+// this message class.
+//
+
+#include "RenderPictureTransform.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+#include MESSAGE_TAGS
+
+//
+// Message handling methods.
+//
+
+MESSAGE_BEGIN_ENCODE_SIZE
+{
+  //
+  // Size is always 44. The identity size
+  // is set to 8, so we encode the 36 bytes
+  // of the transformation matrix as our
+  // data.
+  //
+}
+MESSAGE_END_ENCODE_SIZE
+
+MESSAGE_BEGIN_DECODE_SIZE
+{
+  size = MESSAGE_OFFSET + 36;
+
+  buffer = writeBuffer -> addMessage(size);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded size with value "
+          << size << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_SIZE
+
+MESSAGE_BEGIN_ENCODE_MESSAGE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  encodeBuffer.encodeXidValue(GetULONG(buffer + 4, bigEndian),
+                     clientCache -> renderSrcPictureCache);
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded message. Type is "
+          << (unsigned int) *(buffer + 1) << " size is "
+          << size << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_MESSAGE
+
+MESSAGE_BEGIN_DECODE_MESSAGE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  unsigned int value;
+
+  *(buffer + 1) = type;
+
+  decodeBuffer.decodeXidValue(value,
+                     clientCache -> renderSrcPictureCache);
+
+  PutULONG(value, buffer + 4, bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded message. Type is "
+          << (unsigned int) type << " size is " << size
+          << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_MESSAGE
+
+MESSAGE_BEGIN_ENCODE_DATA
+{
+  encodeLongData(encodeBuffer, buffer, MESSAGE_OFFSET,
+                     size, bigEndian, channelCache);
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded " << size - MESSAGE_OFFSET
+          << " bytes of data.\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_DATA
+
+MESSAGE_BEGIN_DECODE_DATA
+{
+  decodeLongData(decodeBuffer, buffer, MESSAGE_OFFSET,
+                     size, bigEndian, channelCache);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded " << size - MESSAGE_OFFSET
+          << " bytes of data.\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_DATA
+
+MESSAGE_BEGIN_PARSE_IDENTITY
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  renderExtension -> data.picture_transform.type = *(buffer + 1);
+
+  renderExtension -> data.picture_transform.src_id = GetULONG(buffer + 4,  bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Parsed identity. Type is "
+          << (unsigned int) renderExtension -> data.picture_transform.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_PARSE_IDENTITY
+
+MESSAGE_BEGIN_UNPARSE_IDENTITY
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  *(buffer + 1) = renderExtension -> data.picture_transform.type;
+
+  PutULONG(renderExtension -> data.picture_transform.src_id, buffer + 4,  bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Unparsed identity. Type is "
+          << (unsigned int) renderExtension -> data.picture_transform.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_UNPARSE_IDENTITY
+
+MESSAGE_BEGIN_IDENTITY_CHECKSUM
+{
+  md5_append(md5_state, buffer + 1, 3);
+}
+MESSAGE_END_IDENTITY_CHECKSUM
+
+MESSAGE_BEGIN_ENCODE_UPDATE
+{
+  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
+  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  encodeBuffer.encodeXidValue(renderExtension -> data.picture_transform.src_id,
+                     clientCache -> renderSrcPictureCache);
+
+  cachedRenderExtension -> data.picture_transform.src_id =
+              renderExtension -> data.picture_transform.src_id;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded update. Type is "
+          << (unsigned int) renderExtension -> data.picture_transform.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_UPDATE
+
+MESSAGE_BEGIN_DECODE_UPDATE
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  decodeBuffer.decodeXidValue(renderExtension -> data.picture_transform.src_id,
+                     clientCache -> renderSrcPictureCache);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded update. Type is "
+          << (unsigned int) renderExtension -> data.picture_transform.type
+          << " size is " << renderExtension -> size_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_UPDATE
diff --git a/nxcomp/src/RenderPictureTransform.h b/nxcomp/src/RenderPictureTransform.h
new file mode 100644
index 000000000..649cd05d3
--- /dev/null
+++ b/nxcomp/src/RenderPictureTransform.h
@@ -0,0 +1,88 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef RenderPictureTransform_H
+#define RenderPictureTransform_H
+
+//
+// Define the characteristics
+// of this message class here.
+//
+
+#undef  MESSAGE_NAME
+#define MESSAGE_NAME          "RenderPictureTransform"
+
+#undef  MESSAGE_STORE
+#define MESSAGE_STORE         RenderPictureTransformStore
+
+#undef  MESSAGE_CLASS
+#define MESSAGE_CLASS         RenderMinorExtensionStore
+
+#undef  MESSAGE_METHODS
+#define MESSAGE_METHODS       "RenderMinorExtensionMethods.h"
+
+#undef  MESSAGE_HEADERS
+#define MESSAGE_HEADERS       "RenderMinorExtensionHeaders.h"
+
+#undef  MESSAGE_TAGS
+#define MESSAGE_TAGS          "RenderMinorExtensionTags.h"
+
+#undef  MESSAGE_OFFSET
+#define MESSAGE_OFFSET        8
+
+#undef  MESSAGE_HAS_SIZE
+#define MESSAGE_HAS_SIZE      1
+
+#undef  MESSAGE_HAS_DATA
+#define MESSAGE_HAS_DATA      1
+
+#undef  MESSAGE_HAS_FILTER
+#define MESSAGE_HAS_FILTER    0
+
+//
+// Declare the message class.
+//
+
+#include MESSAGE_HEADERS
+
+class MESSAGE_STORE : public MESSAGE_CLASS
+{
+  public:
+
+  virtual const char *name() const
+  {
+    return MESSAGE_NAME;
+  }
+
+  virtual int identitySize(const unsigned char *buffer,
+                               unsigned int size)
+  {
+    return MESSAGE_OFFSET;
+  }
+
+  #include MESSAGE_METHODS
+};
+
+#endif /* RenderPictureTransform_H */
diff --git a/nxcomp/src/RenderTrapezoids.cpp b/nxcomp/src/RenderTrapezoids.cpp
new file mode 100644
index 000000000..bf84509dc
--- /dev/null
+++ b/nxcomp/src/RenderTrapezoids.cpp
@@ -0,0 +1,372 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+//
+// Include the template for
+// this message class.
+//
+
+#include "RenderTrapezoids.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+#include MESSAGE_TAGS
+
+//
+// Message handling methods.
+//
+
+MESSAGE_BEGIN_ENCODE_SIZE
+{
+  //
+  // The trapezoid data is made up of a structure
+  // containing a top and bottom coordinate in 4
+  // bytes format, plus two lines, each represent-
+  // ed as four points in 4 bytes format. Thus
+  // each trapezoid is 4 * 2 + (4 * 4) * 2 = 40
+  // bytes. Bytes are all padded to an long int,
+  // so we don't need to clean the message.
+  //
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Encoding value "
+          << ((size - MESSAGE_OFFSET) >> 2) << ".\n"
+          << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeCachedValue((size - MESSAGE_OFFSET) >> 2, 16,
+                     clientCache -> renderLengthCache, 5);
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded size with value "
+          << size << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_SIZE
+
+MESSAGE_BEGIN_DECODE_SIZE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  decodeBuffer.decodeCachedValue(size, 16,
+                     clientCache -> renderLengthCache, 5);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << size
+          << ".\n" << logofs_flush;
+  #endif
+
+  size = MESSAGE_OFFSET + (size << 2);
+
+  buffer = writeBuffer -> addMessage(size);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded size with value "
+          << size << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_SIZE
+
+MESSAGE_BEGIN_ENCODE_MESSAGE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  encodeBuffer.encodeCachedValue(*(buffer + 4), 8,
+                     clientCache -> renderOpCache);
+
+  encodeBuffer.encodeXidValue(GetULONG(buffer + 8, bigEndian),
+                     clientCache -> renderSrcPictureCache);
+
+  encodeBuffer.encodeXidValue(GetULONG(buffer + 12, bigEndian),
+                     clientCache -> renderDstPictureCache);
+
+  encodeBuffer.encodeCachedValue(GetULONG(buffer + 16, bigEndian), 32,
+                     clientCache -> renderFormatCache);
+
+  encodeBuffer.encodeDiffCachedValue(GetUINT(buffer + 20, bigEndian),
+                     clientCache -> renderLastX, 16,
+                         clientCache -> renderXCache, 11);
+
+  encodeBuffer.encodeDiffCachedValue(GetUINT(buffer + 22, bigEndian),
+                     clientCache -> renderLastY, 16,
+                         clientCache -> renderYCache, 11);
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded message. Type is "
+          << (unsigned int) *(buffer + 1) << " size is "
+          << size << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_MESSAGE
+
+MESSAGE_BEGIN_DECODE_MESSAGE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  unsigned int value;
+
+  *(buffer + 1) = type;
+
+  decodeBuffer.decodeCachedValue(*(buffer + 4), 8,
+                     clientCache -> renderOpCache);
+
+  decodeBuffer.decodeXidValue(value,
+                     clientCache -> renderSrcPictureCache);
+
+  PutULONG(value, buffer + 8, bigEndian);
+
+  decodeBuffer.decodeXidValue(value,
+                     clientCache -> renderDstPictureCache);
+
+  PutULONG(value, buffer + 12, bigEndian);
+
+  decodeBuffer.decodeCachedValue(value, 32,
+                     clientCache -> renderFormatCache);
+
+  PutULONG(value, buffer + 16, bigEndian);
+
+  decodeBuffer.decodeDiffCachedValue(value,
+                     clientCache -> renderLastX, 16,
+                         clientCache -> renderXCache, 11);
+
+  PutUINT(clientCache -> renderLastX, buffer + 20, bigEndian);
+
+  decodeBuffer.decodeDiffCachedValue(value,
+                     clientCache -> renderLastY, 16,
+                         clientCache -> renderYCache, 11);
+
+  PutUINT(clientCache -> renderLastY, buffer + 22, bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded message. Type is "
+          << (unsigned int) type << " size is " << size
+          << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_MESSAGE
+
+MESSAGE_BEGIN_ENCODE_DATA
+{
+  if (size > MESSAGE_OFFSET)
+  {
+    encodeLongData(encodeBuffer, buffer, MESSAGE_OFFSET,
+                       size, bigEndian, channelCache);
+  }
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded " << size - MESSAGE_OFFSET
+          << " bytes of text data.\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_DATA
+
+MESSAGE_BEGIN_DECODE_DATA
+{
+  if (size > MESSAGE_OFFSET)
+  {
+    decodeLongData(decodeBuffer, buffer, MESSAGE_OFFSET,
+                       size, bigEndian, channelCache);
+  }
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded " << size - MESSAGE_OFFSET
+          << " bytes of data.\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_DATA
+
+MESSAGE_BEGIN_PARSE_IDENTITY
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  renderExtension -> data.trapezoids.type = *(buffer + 1);
+  renderExtension -> data.trapezoids.op   = *(buffer + 4);
+
+  renderExtension -> data.trapezoids.src_id = GetULONG(buffer + 8,  bigEndian);
+  renderExtension -> data.trapezoids.dst_id = GetULONG(buffer + 12, bigEndian);
+
+  renderExtension -> data.trapezoids.format = GetULONG(buffer + 16, bigEndian);
+
+  renderExtension -> data.trapezoids.src_x = GetUINT(buffer + 20, bigEndian);
+  renderExtension -> data.trapezoids.src_y = GetUINT(buffer + 22, bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Parsed identity. Type is "
+          << (unsigned int) renderExtension -> data.trapezoids.type
+          << " size is " << renderExtension -> size_ << " identity size "
+          << renderExtension -> i_size_ << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_PARSE_IDENTITY
+
+MESSAGE_BEGIN_UNPARSE_IDENTITY
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  *(buffer + 1) = renderExtension -> data.trapezoids.type;
+  *(buffer + 4) = renderExtension -> data.trapezoids.op;
+
+  PutULONG(renderExtension -> data.trapezoids.src_id, buffer + 8,  bigEndian);
+  PutULONG(renderExtension -> data.trapezoids.dst_id, buffer + 12, bigEndian);
+
+  PutULONG(renderExtension -> data.trapezoids.format, buffer + 16, bigEndian);
+
+  PutUINT(renderExtension -> data.trapezoids.src_x, buffer + 20, bigEndian);
+  PutUINT(renderExtension -> data.trapezoids.src_y, buffer + 22, bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Unparsed identity. Type is "
+          << (unsigned int) renderExtension -> data.trapezoids.type
+          << " size is " << renderExtension -> size_  << " identity size "
+          << renderExtension -> i_size_ <<  ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_UNPARSE_IDENTITY
+
+MESSAGE_BEGIN_IDENTITY_CHECKSUM
+{
+  //
+  // Include minor opcode, size and the
+  // operator in the identity.
+  //
+
+  md5_append(md5_state, buffer + 1, 4);
+
+  //
+  // Also include the format but not the
+  // x and y source.
+  //
+
+  md5_append(md5_state, buffer + 16, 4);
+}
+MESSAGE_END_IDENTITY_CHECKSUM
+
+MESSAGE_BEGIN_ENCODE_UPDATE
+{
+  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
+  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  encodeBuffer.encodeXidValue(renderExtension -> data.trapezoids.src_id,
+                     clientCache -> renderSrcPictureCache);
+
+  cachedRenderExtension -> data.trapezoids.src_id =
+              renderExtension -> data.trapezoids.src_id;
+
+  encodeBuffer.encodeXidValue(renderExtension -> data.trapezoids.dst_id,
+                     clientCache -> renderDstPictureCache);
+
+  cachedRenderExtension -> data.trapezoids.dst_id =
+              renderExtension -> data.trapezoids.dst_id;
+
+  //
+  // The source x and y coordinates are
+  // encoded as differerences in respect
+  // to the previous cached value.
+  //
+
+  unsigned int value;
+  unsigned int previous;
+
+  value    = renderExtension -> data.trapezoids.src_x;
+  previous = cachedRenderExtension -> data.trapezoids.src_x;
+
+  encodeBuffer.encodeDiffCachedValue(value, previous, 16,
+                     clientCache -> renderXCache, 11);
+
+  cachedRenderExtension -> data.trapezoids.src_x = value;
+
+  value    = renderExtension -> data.trapezoids.src_y;
+  previous = cachedRenderExtension -> data.trapezoids.src_y;
+
+  encodeBuffer.encodeDiffCachedValue(value, previous, 16,
+                     clientCache -> renderYCache, 11);
+
+  cachedRenderExtension -> data.trapezoids.src_y = value;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded update. Type is "
+          << (unsigned int) renderExtension -> data.trapezoids.type
+          << " size is " << renderExtension -> size_ << " source x "
+          << renderExtension -> data.trapezoids.src_x << " y "
+          << renderExtension -> data.trapezoids.src_y << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_UPDATE
+
+MESSAGE_BEGIN_DECODE_UPDATE
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  decodeBuffer.decodeXidValue(renderExtension -> data.trapezoids.src_id,
+                     clientCache -> renderSrcPictureCache);
+
+  decodeBuffer.decodeXidValue(renderExtension -> data.trapezoids.dst_id,
+                     clientCache -> renderDstPictureCache);
+
+  unsigned int value;
+  unsigned int previous;
+
+  previous = renderExtension -> data.trapezoids.src_x;
+
+  decodeBuffer.decodeDiffCachedValue(value, previous, 16,
+                     clientCache -> renderXCache, 11);
+
+  renderExtension -> data.trapezoids.src_x = value;
+
+  previous = renderExtension -> data.trapezoids.src_y;
+
+  decodeBuffer.decodeDiffCachedValue(value, previous, 16,
+                     clientCache -> renderYCache, 11);
+
+  renderExtension -> data.trapezoids.src_y = value;
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded update. Type is "
+          << (unsigned int) renderExtension -> data.trapezoids.type
+          << " size is " << renderExtension -> size_ << " source x "
+          << renderExtension -> data.trapezoids.src_x << " y "
+          << renderExtension -> data.trapezoids.src_y << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_UPDATE
diff --git a/nxcomp/src/RenderTrapezoids.h b/nxcomp/src/RenderTrapezoids.h
new file mode 100644
index 000000000..faf524c76
--- /dev/null
+++ b/nxcomp/src/RenderTrapezoids.h
@@ -0,0 +1,88 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef RenderTrapezoids_H
+#define RenderTrapezoids_H
+
+//
+// Define the characteristics
+// of this message class here.
+//
+
+#undef  MESSAGE_NAME
+#define MESSAGE_NAME          "RenderTrapezoids"
+
+#undef  MESSAGE_STORE
+#define MESSAGE_STORE         RenderTrapezoidsStore
+
+#undef  MESSAGE_CLASS
+#define MESSAGE_CLASS         RenderMinorExtensionStore
+
+#undef  MESSAGE_METHODS
+#define MESSAGE_METHODS       "RenderMinorExtensionMethods.h"
+
+#undef  MESSAGE_HEADERS
+#define MESSAGE_HEADERS       "RenderMinorExtensionHeaders.h"
+
+#undef  MESSAGE_TAGS
+#define MESSAGE_TAGS          "RenderMinorExtensionTags.h"
+
+#undef  MESSAGE_OFFSET
+#define MESSAGE_OFFSET        24
+
+#undef  MESSAGE_HAS_SIZE
+#define MESSAGE_HAS_SIZE      1
+
+#undef  MESSAGE_HAS_DATA
+#define MESSAGE_HAS_DATA      1
+
+#undef  MESSAGE_HAS_FILTER
+#define MESSAGE_HAS_FILTER    0
+
+//
+// Declare the message class.
+//
+
+#include MESSAGE_HEADERS
+
+class MESSAGE_STORE : public MESSAGE_CLASS
+{
+  public:
+
+  virtual const char *name() const
+  {
+    return MESSAGE_NAME;
+  }
+
+  virtual int identitySize(const unsigned char *buffer,
+                               unsigned int size)
+  {
+    return (size >= MESSAGE_OFFSET ? MESSAGE_OFFSET : size);
+  }
+
+  #include MESSAGE_METHODS
+};
+
+#endif /* RenderTrapezoids_H */
diff --git a/nxcomp/src/RenderTriangles.cpp b/nxcomp/src/RenderTriangles.cpp
new file mode 100644
index 000000000..a5eb4d83d
--- /dev/null
+++ b/nxcomp/src/RenderTriangles.cpp
@@ -0,0 +1,362 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+//
+// Include the template for
+// this message class.
+//
+
+#include "RenderTriangles.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+#include MESSAGE_TAGS
+
+//
+// Message handling methods.
+//
+
+MESSAGE_BEGIN_ENCODE_SIZE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Encoding value "
+          << ((size - MESSAGE_OFFSET) >> 2) << ".\n"
+          << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeCachedValue((size - MESSAGE_OFFSET) >> 2, 16,
+                     clientCache -> renderLengthCache, 5);
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded size with value "
+          << size << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_SIZE
+
+MESSAGE_BEGIN_DECODE_SIZE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  decodeBuffer.decodeCachedValue(size, 16,
+                     clientCache -> renderLengthCache, 5);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << size
+          << ".\n" << logofs_flush;
+  #endif
+
+  size = MESSAGE_OFFSET + (size << 2);
+
+  buffer = writeBuffer -> addMessage(size);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded size with value "
+          << size << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_SIZE
+
+MESSAGE_BEGIN_ENCODE_MESSAGE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  encodeBuffer.encodeCachedValue(*(buffer + 4), 8,
+                     clientCache -> renderOpCache);
+
+  encodeBuffer.encodeXidValue(GetULONG(buffer + 8, bigEndian),
+                     clientCache -> renderSrcPictureCache);
+
+  encodeBuffer.encodeXidValue(GetULONG(buffer + 12, bigEndian),
+                     clientCache -> renderDstPictureCache);
+
+  encodeBuffer.encodeCachedValue(GetULONG(buffer + 16, bigEndian), 32,
+                     clientCache -> renderFormatCache);
+
+  encodeBuffer.encodeDiffCachedValue(GetUINT(buffer + 20, bigEndian),
+                     clientCache -> renderLastX, 16,
+                         clientCache -> renderXCache, 11);
+
+  encodeBuffer.encodeDiffCachedValue(GetUINT(buffer + 22, bigEndian),
+                     clientCache -> renderLastY, 16,
+                         clientCache -> renderYCache, 11);
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded message. Type is "
+          << (unsigned int) *(buffer + 1) << " size is "
+          << size << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_MESSAGE
+
+MESSAGE_BEGIN_DECODE_MESSAGE
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  unsigned int value;
+
+  *(buffer + 1) = type;
+
+  decodeBuffer.decodeCachedValue(*(buffer + 4), 8,
+                     clientCache -> renderOpCache);
+
+  decodeBuffer.decodeXidValue(value,
+                     clientCache -> renderSrcPictureCache);
+
+  PutULONG(value, buffer + 8, bigEndian);
+
+  decodeBuffer.decodeXidValue(value,
+                     clientCache -> renderDstPictureCache);
+
+  PutULONG(value, buffer + 12, bigEndian);
+
+  decodeBuffer.decodeCachedValue(value, 32,
+                     clientCache -> renderFormatCache);
+
+  PutULONG(value, buffer + 16, bigEndian);
+
+  decodeBuffer.decodeDiffCachedValue(value,
+                     clientCache -> renderLastX, 16,
+                         clientCache -> renderXCache, 11);
+
+  PutUINT(clientCache -> renderLastX, buffer + 20, bigEndian);
+
+  decodeBuffer.decodeDiffCachedValue(value,
+                     clientCache -> renderLastY, 16,
+                         clientCache -> renderYCache, 11);
+
+  PutUINT(clientCache -> renderLastY, buffer + 22, bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded message. Type is "
+          << (unsigned int) type << " size is " << size
+          << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_MESSAGE
+
+MESSAGE_BEGIN_ENCODE_DATA
+{
+  if (size > MESSAGE_OFFSET)
+  {
+    encodeLongData(encodeBuffer, buffer, MESSAGE_OFFSET,
+                       size, bigEndian, channelCache);
+  }
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded " << size - MESSAGE_OFFSET
+          << " bytes of text data.\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_DATA
+
+MESSAGE_BEGIN_DECODE_DATA
+{
+  if (size > MESSAGE_OFFSET)
+  {
+    decodeLongData(decodeBuffer, buffer, MESSAGE_OFFSET,
+                       size, bigEndian, channelCache);
+  }
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded " << size - MESSAGE_OFFSET
+          << " bytes of data.\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_DATA
+
+MESSAGE_BEGIN_PARSE_IDENTITY
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  renderExtension -> data.triangles.type = *(buffer + 1);
+  renderExtension -> data.triangles.op   = *(buffer + 4);
+
+  renderExtension -> data.triangles.src_id = GetULONG(buffer + 8,  bigEndian);
+  renderExtension -> data.triangles.dst_id = GetULONG(buffer + 12, bigEndian);
+
+  renderExtension -> data.triangles.format = GetULONG(buffer + 16, bigEndian);
+
+  renderExtension -> data.triangles.src_x = GetUINT(buffer + 20, bigEndian);
+  renderExtension -> data.triangles.src_y = GetUINT(buffer + 22, bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Parsed identity. Type is "
+          << (unsigned int) renderExtension -> data.triangles.type
+          << " size is " << renderExtension -> size_ << " identity size "
+          << renderExtension -> i_size_ << ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_PARSE_IDENTITY
+
+MESSAGE_BEGIN_UNPARSE_IDENTITY
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  *(buffer + 1) = renderExtension -> data.triangles.type;
+  *(buffer + 4) = renderExtension -> data.triangles.op;
+
+  PutULONG(renderExtension -> data.triangles.src_id, buffer + 8,  bigEndian);
+  PutULONG(renderExtension -> data.triangles.dst_id, buffer + 12, bigEndian);
+
+  PutULONG(renderExtension -> data.triangles.format, buffer + 16, bigEndian);
+
+  PutUINT(renderExtension -> data.triangles.src_x, buffer + 20, bigEndian);
+  PutUINT(renderExtension -> data.triangles.src_y, buffer + 22, bigEndian);
+
+  #ifdef TEST
+  *logofs << name() << ": Unparsed identity. Type is "
+          << (unsigned int) renderExtension -> data.triangles.type
+          << " size is " << renderExtension -> size_  << " identity size "
+          << renderExtension -> i_size_ <<  ".\n" << logofs_flush;
+  #endif
+}
+MESSAGE_END_UNPARSE_IDENTITY
+
+MESSAGE_BEGIN_IDENTITY_CHECKSUM
+{
+  //
+  // Include minor opcode, size and the
+  // operator in the identity.
+  //
+
+  md5_append(md5_state, buffer + 1, 4);
+
+  //
+  // Also include the format but not the
+  // x and y source.
+  //
+
+  md5_append(md5_state, buffer + 16, 4);
+}
+MESSAGE_END_IDENTITY_CHECKSUM
+
+MESSAGE_BEGIN_ENCODE_UPDATE
+{
+  RenderExtensionMessage *renderExtension       = (RenderExtensionMessage *) message;
+  RenderExtensionMessage *cachedRenderExtension = (RenderExtensionMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  encodeBuffer.encodeXidValue(renderExtension -> data.triangles.src_id,
+                     clientCache -> renderSrcPictureCache);
+
+  cachedRenderExtension -> data.triangles.src_id =
+              renderExtension -> data.triangles.src_id;
+
+  encodeBuffer.encodeXidValue(renderExtension -> data.triangles.dst_id,
+                     clientCache -> renderDstPictureCache);
+
+  cachedRenderExtension -> data.triangles.dst_id =
+              renderExtension -> data.triangles.dst_id;
+
+  //
+  // The source x and y coordinates are
+  // encoded as differerences in respect
+  // to the previous cached value.
+  //
+
+  unsigned int value;
+  unsigned int previous;
+
+  value    = renderExtension -> data.triangles.src_x;
+  previous = cachedRenderExtension -> data.triangles.src_x;
+
+  encodeBuffer.encodeDiffCachedValue(value, previous, 16,
+                     clientCache -> renderXCache, 11);
+
+  cachedRenderExtension -> data.triangles.src_x = value;
+
+  value    = renderExtension -> data.triangles.src_y;
+  previous = cachedRenderExtension -> data.triangles.src_y;
+
+  encodeBuffer.encodeDiffCachedValue(value, previous, 16,
+                     clientCache -> renderYCache, 11);
+
+  cachedRenderExtension -> data.triangles.src_y = value;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoded update. Type is "
+          << (unsigned int) renderExtension -> data.triangles.type
+          << " size is " << renderExtension -> size_ << " source x "
+          << renderExtension -> data.triangles.src_x << " y "
+          << renderExtension -> data.triangles.src_y << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_ENCODE_UPDATE
+
+MESSAGE_BEGIN_DECODE_UPDATE
+{
+  RenderExtensionMessage *renderExtension = (RenderExtensionMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  decodeBuffer.decodeXidValue(renderExtension -> data.triangles.src_id,
+                     clientCache -> renderSrcPictureCache);
+
+  decodeBuffer.decodeXidValue(renderExtension -> data.triangles.dst_id,
+                     clientCache -> renderDstPictureCache);
+
+  unsigned int value;
+  unsigned int previous;
+
+  previous = renderExtension -> data.triangles.src_x;
+
+  decodeBuffer.decodeDiffCachedValue(value, previous, 16,
+                     clientCache -> renderXCache, 11);
+
+  renderExtension -> data.triangles.src_x = value;
+
+  previous = renderExtension -> data.triangles.src_y;
+
+  decodeBuffer.decodeDiffCachedValue(value, previous, 16,
+                     clientCache -> renderYCache, 11);
+
+  renderExtension -> data.triangles.src_y = value;
+
+  #ifdef TEST
+  *logofs << name() << ": Decoded update. Type is "
+          << (unsigned int) renderExtension -> data.triangles.type
+          << " size is " << renderExtension -> size_ << " source x "
+          << renderExtension -> data.triangles.src_x << " y "
+          << renderExtension -> data.triangles.src_y << ".\n"
+          << logofs_flush;
+  #endif
+}
+MESSAGE_END_DECODE_UPDATE
diff --git a/nxcomp/src/RenderTriangles.h b/nxcomp/src/RenderTriangles.h
new file mode 100644
index 000000000..d73efb7b8
--- /dev/null
+++ b/nxcomp/src/RenderTriangles.h
@@ -0,0 +1,88 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef RenderTriangles_H
+#define RenderTriangles_H
+
+//
+// Define the characteristics
+// of this message class here.
+//
+
+#undef  MESSAGE_NAME
+#define MESSAGE_NAME          "RenderTriangles"
+
+#undef  MESSAGE_STORE
+#define MESSAGE_STORE         RenderTrianglesStore
+
+#undef  MESSAGE_CLASS
+#define MESSAGE_CLASS         RenderMinorExtensionStore
+
+#undef  MESSAGE_METHODS
+#define MESSAGE_METHODS       "RenderMinorExtensionMethods.h"
+
+#undef  MESSAGE_HEADERS
+#define MESSAGE_HEADERS       "RenderMinorExtensionHeaders.h"
+
+#undef  MESSAGE_TAGS
+#define MESSAGE_TAGS          "RenderMinorExtensionTags.h"
+
+#undef  MESSAGE_OFFSET
+#define MESSAGE_OFFSET        24
+
+#undef  MESSAGE_HAS_SIZE
+#define MESSAGE_HAS_SIZE      1
+
+#undef  MESSAGE_HAS_DATA
+#define MESSAGE_HAS_DATA      1
+
+#undef  MESSAGE_HAS_FILTER
+#define MESSAGE_HAS_FILTER    0
+
+//
+// Declare the message class.
+//
+
+#include MESSAGE_HEADERS
+
+class MESSAGE_STORE : public MESSAGE_CLASS
+{
+  public:
+
+  virtual const char *name() const
+  {
+    return MESSAGE_NAME;
+  }
+
+  virtual int identitySize(const unsigned char *buffer,
+                               unsigned int size)
+  {
+    return (size >= MESSAGE_OFFSET ? MESSAGE_OFFSET : size);
+  }
+
+  #include MESSAGE_METHODS
+};
+
+#endif /* RenderTriangles_H */
diff --git a/nxcomp/src/Rgb.cpp b/nxcomp/src/Rgb.cpp
new file mode 100644
index 000000000..c98fa5147
--- /dev/null
+++ b/nxcomp/src/Rgb.cpp
@@ -0,0 +1,106 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "Misc.h"
+#include "Rgb.h"
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+int UnpackRgb(T_geometry *geometry, unsigned char method, unsigned char *src_data,
+                  int src_size, int dst_bpp, int dst_width, int dst_height,
+                      unsigned char *dst_data, int dst_size)
+{
+  if (*src_data == 0)
+  {
+    if (dst_size != src_size - 1)
+    {
+      #ifdef TEST
+      *logofs << "UnpackRgb: PANIC! Invalid destination size "
+              << dst_size << " with source " << src_size
+              << ".\n" << logofs_flush;
+      #endif
+
+      return -1;
+    }
+
+    #ifdef TEST
+    *logofs << "UnpackRgb: Expanding " << src_size - 1
+            << " bytes of plain RGB data.\n" << logofs_flush;
+    #endif
+
+    memcpy(dst_data, src_data + 1, src_size - 1);
+
+    return 1;
+  }
+
+  unsigned int check_size = dst_size;
+
+  int result = ZDecompress(&unpackStream, dst_data, &check_size,
+                               src_data + 1, src_size - 1);
+
+  if (result != Z_OK)
+  {
+    #ifdef PANIC
+    *logofs << "UnpackRgb: PANIC! Failure decompressing RGB data. "
+            << "Error is '" << zError(result) << "'.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Failure decompressing RGB data. "
+         << "Error is '" << zError(result) << "'.\n";
+
+    return -1;
+  }
+  else if (check_size != (unsigned int) dst_size)
+  {
+    #ifdef PANIC
+    *logofs << "UnpackRgb: PANIC! Size mismatch in RGB data. "
+            << "Resulting size is " << check_size << " with "
+            << "expected size " << dst_size << ".\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Size mismatch in RGB data. "
+         << "Resulting size is " << check_size << " with "
+         << "expected size " << dst_size << ".\n";
+
+    return -1;
+  }
+
+  #ifdef TEST
+  *logofs << "UnpackRgb: Decompressed " << src_size - 1
+          << " bytes to " << dst_size << " bytes of RGB data.\n"
+          << logofs_flush;
+  #endif
+
+  return 1;
+}
diff --git a/nxcomp/src/Rgb.h b/nxcomp/src/Rgb.h
new file mode 100644
index 000000000..ec088dd1b
--- /dev/null
+++ b/nxcomp/src/Rgb.h
@@ -0,0 +1,36 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef Rgb_H
+#define Rgb_H
+
+#include "Unpack.h"
+
+int UnpackRgb(T_geometry *geometry, unsigned char method,
+                  unsigned char *src_data, int src_size, int dst_bpp,
+                      int dst_width, int dst_height, unsigned char *dst_data,
+                          int dst_size);
+
+#endif /* Rgb_H */
diff --git a/nxcomp/src/Rle.cpp b/nxcomp/src/Rle.cpp
new file mode 100644
index 000000000..2a145aa0c
--- /dev/null
+++ b/nxcomp/src/Rle.cpp
@@ -0,0 +1,106 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "Misc.h"
+#include "Rle.h"
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+int UnpackRle(T_geometry *geometry, unsigned char method, unsigned char *src_data,
+                  int src_size, int dst_bpp, int dst_width, int dst_height,
+                      unsigned char *dst_data, int dst_size)
+{
+  if (*src_data == 0)
+  {
+    if (dst_size != src_size - 1)
+    {
+      #ifdef TEST
+      *logofs << "UnpackRle: PANIC! Invalid destination size "
+              << dst_size << " with source " << src_size
+              << ".\n" << logofs_flush;
+      #endif
+
+      return -1;
+    }
+
+    #ifdef TEST
+    *logofs << "UnpackRle: Expanding " << src_size - 1
+            << " bytes of plain RLE data.\n" << logofs_flush;
+    #endif
+
+    memcpy(dst_data, src_data + 1, src_size - 1);
+
+    return 1;
+  }
+
+  unsigned int check_size = dst_size;
+
+  int result = ZDecompress(&unpackStream, dst_data, &check_size,
+                               src_data + 1, src_size - 1);
+
+  if (result != Z_OK)
+  {
+    #ifdef PANIC
+    *logofs << "UnpackRle: PANIC! Failure decompressing RLE data. "
+            << "Error is '" << zError(result) << "'.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Failure decompressing RLE data. "
+         << "Error is '" << zError(result) << "'.\n";
+
+    return -1;
+  }
+  else if (check_size != (unsigned int) dst_size)
+  {
+    #ifdef PANIC
+    *logofs << "UnpackRle: PANIC! Size mismatch in RLE data. "
+            << "Resulting size is " << check_size << " with "
+            << "expected size " << dst_size << ".\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Size mismatch in RLE data. "
+         << "Resulting size is " << check_size << " with "
+         << "expected size " << dst_size << ".\n";
+
+    return -1;
+  }
+
+  #ifdef TEST
+  *logofs << "UnpackRle: Decompressed " << src_size - 1
+          << " bytes to " << dst_size << " bytes of RLE data.\n"
+          << logofs_flush;
+  #endif
+
+  return 1;
+}
diff --git a/nxcomp/src/Rle.h b/nxcomp/src/Rle.h
new file mode 100644
index 000000000..cc5dab0e8
--- /dev/null
+++ b/nxcomp/src/Rle.h
@@ -0,0 +1,36 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef Rle_H
+#define Rle_H
+
+#include "Unpack.h"
+
+int UnpackRle(T_geometry *geometry, unsigned char method,
+                  unsigned char *src_data, int src_size, int dst_bpp,
+                      int dst_width, int dst_height, unsigned char *dst_data,
+                          int dst_size);
+
+#endif /* Rle_H */
diff --git a/nxcomp/src/SendEvent.cpp b/nxcomp/src/SendEvent.cpp
new file mode 100644
index 000000000..8867d0a9e
--- /dev/null
+++ b/nxcomp/src/SendEvent.cpp
@@ -0,0 +1,304 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SendEvent.h"
+
+#include "ClientCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+#include "IntCache.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Here are the methods to handle messages' content.
+//
+
+int SendEventStore::parseIdentity(Message *message, const unsigned char *buffer,
+                                      unsigned int size, int bigEndian) const
+{
+  SendEventMessage *sendEvent = (SendEventMessage *) message;
+
+  //
+  // Here is the fingerprint.
+  //
+
+  sendEvent -> propagate = *(buffer + 1);
+
+  sendEvent -> window = GetULONG(buffer + 4, bigEndian);
+  sendEvent -> mask   = GetULONG(buffer + 8, bigEndian);
+
+  sendEvent -> code      = *(buffer + 12);
+  sendEvent -> byte_data = *(buffer + 13);
+
+  sendEvent -> sequence = GetUINT(buffer + 14, bigEndian);
+
+  sendEvent -> int_data = GetULONG(buffer + 16, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsed Identity for message at "
+           << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int SendEventStore::unparseIdentity(const Message *message, unsigned char *buffer,
+                                        unsigned int size, int bigEndian) const
+{
+  SendEventMessage *sendEvent = (SendEventMessage *) message;
+
+  //
+  // Fill all the message's fields.
+  //
+
+  *(buffer + 1) = sendEvent -> propagate;
+
+  PutULONG(sendEvent -> window, buffer + 4,  bigEndian);
+  PutULONG(sendEvent -> mask,   buffer + 8,  bigEndian);
+
+  *(buffer + 12) = sendEvent -> code;
+  *(buffer + 13) = sendEvent -> byte_data;
+
+  PutUINT(sendEvent -> sequence, buffer + 14, bigEndian);
+
+  PutULONG(sendEvent -> int_data, buffer + 16, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsed identity for message at "
+          << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void SendEventStore::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  SendEventMessage *sendEvent = (SendEventMessage *) message;
+
+  *logofs << name() << ": Identity propagate " << (unsigned int) sendEvent -> propagate 
+          << ", window " << sendEvent -> window << ", mask " << sendEvent -> mask
+          << ", code " << (unsigned int) sendEvent -> code << ", byte_data "
+          << (unsigned int) sendEvent -> byte_data << ", sequence "
+          << sendEvent -> sequence << ", int_data " << sendEvent -> int_data 
+          << ", size " << sendEvent -> size_ << ".\n" << logofs_flush;
+
+  #endif
+}
+
+void SendEventStore::identityChecksum(const Message *message, const unsigned char *buffer,
+                                          unsigned int size, int bigEndian) const
+{
+}
+
+void SendEventStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                        const Message *cachedMessage,
+                                            ChannelCache *channelCache) const
+{
+  SendEventMessage *sendEvent       = (SendEventMessage *) message;
+  SendEventMessage *cachedSendEvent = (SendEventMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << (unsigned int) sendEvent -> propagate
+          << " as propagate field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeBoolValue(sendEvent -> propagate);
+
+  cachedSendEvent -> propagate = sendEvent -> propagate;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << sendEvent -> window
+          << " as window field.\n" << logofs_flush;
+  #endif
+
+  if (sendEvent -> window == 0 || sendEvent -> window == 1)
+  {
+    encodeBuffer.encodeBoolValue(1);
+
+    encodeBuffer.encodeBoolValue(sendEvent -> window);
+  }
+  else
+  {
+    encodeBuffer.encodeBoolValue(0);
+
+    encodeBuffer.encodeXidValue(sendEvent -> window, clientCache -> windowCache);
+  }
+
+  cachedSendEvent -> window = sendEvent -> window;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << sendEvent -> mask
+          << " as mask field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeCachedValue(sendEvent -> mask, 32,
+                     clientCache -> sendEventMaskCache);
+
+  cachedSendEvent -> mask = sendEvent -> mask;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << sendEvent -> code
+          << " as code field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeCachedValue(sendEvent -> code, 8, 
+                     clientCache -> sendEventCodeCache);
+
+  cachedSendEvent -> code = sendEvent -> code;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << sendEvent -> byte_data
+          << " as byte_data field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeCachedValue(sendEvent -> byte_data, 8, 
+                     clientCache -> sendEventByteDataCache);
+
+  cachedSendEvent -> byte_data = sendEvent -> byte_data;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << sendEvent -> sequence
+          << " as sequence field.\n" << logofs_flush;
+  #endif
+
+  unsigned int diffSeq = sendEvent -> sequence -
+                             clientCache -> sendEventLastSequence;
+
+  clientCache -> sendEventLastSequence = sendEvent -> sequence;
+
+  encodeBuffer.encodeValue(diffSeq, 16, 4);
+
+  cachedSendEvent -> sequence = sendEvent -> sequence;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << sendEvent -> int_data
+          << " as int_data field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeCachedValue(sendEvent -> int_data, 32,
+                     clientCache -> sendEventIntDataCache);
+
+  cachedSendEvent -> int_data = sendEvent -> int_data;
+}
+
+void SendEventStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                        ChannelCache *channelCache) const
+{
+  SendEventMessage *sendEvent = (SendEventMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  unsigned int  value;
+
+  decodeBuffer.decodeBoolValue(value);
+
+  sendEvent -> propagate = value;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << (unsigned int) sendEvent -> propagate
+          << " as propagate field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeBoolValue(value);
+
+  if (value)
+  {
+    decodeBuffer.decodeBoolValue(value);
+  }
+  else
+  {
+    decodeBuffer.decodeXidValue(value, clientCache -> windowCache);
+  }
+
+  sendEvent -> window = value;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << sendEvent -> window
+          << " as window field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeCachedValue(sendEvent -> mask, 32,
+                     clientCache -> sendEventMaskCache);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << sendEvent -> mask
+          << " as mask field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeCachedValue(sendEvent -> code, 8,
+                     clientCache -> sendEventCodeCache);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << sendEvent -> code
+          << " as code field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeCachedValue(sendEvent -> byte_data, 8,
+                     clientCache -> sendEventByteDataCache);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << sendEvent -> byte_data
+          << " as byte_data field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeValue(value, 16, 4);
+
+  clientCache -> sendEventLastSequence += value;
+  clientCache -> sendEventLastSequence &= 0xffff;
+
+  sendEvent -> sequence = clientCache -> sendEventLastSequence;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << sendEvent -> sequence
+          << " as sequence field.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeCachedValue(sendEvent -> int_data, 32,
+                     clientCache -> sendEventIntDataCache);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << sendEvent -> int_data
+          << " as int_data field.\n" << logofs_flush;
+  #endif
+}
diff --git a/nxcomp/src/SendEvent.h b/nxcomp/src/SendEvent.h
new file mode 100644
index 000000000..a8841a706
--- /dev/null
+++ b/nxcomp/src/SendEvent.h
@@ -0,0 +1,195 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef SendEvent_H
+#define SendEvent_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+
+#define SENDEVENT_ENABLE_CACHE               1
+#define SENDEVENT_ENABLE_DATA                0
+#define SENDEVENT_ENABLE_SPLIT               0
+#define SENDEVENT_ENABLE_COMPRESS            0
+
+#define SENDEVENT_DATA_LIMIT                 24
+#define SENDEVENT_DATA_OFFSET                20
+
+#define SENDEVENT_CACHE_SLOTS                2000
+#define SENDEVENT_CACHE_THRESHOLD            2
+#define SENDEVENT_CACHE_LOWER_THRESHOLD      1
+
+//
+// The message class.
+//
+
+class SendEventMessage : public Message
+{
+  friend class SendEventStore;
+
+  public:
+
+  SendEventMessage()
+  {
+  }
+
+  ~SendEventMessage()
+  {
+  }
+
+  //
+  // Put here the fields which constitute 
+  // the 'identity' part of the message.
+  //
+
+  private:
+
+  unsigned char  propagate;
+  unsigned int   window;
+  unsigned int   mask;
+
+  //
+  // These are part of the event data.
+  //
+
+  unsigned char  code;
+  unsigned char  byte_data;
+  unsigned short sequence;
+  unsigned int   int_data;
+};
+
+class SendEventStore : public MessageStore
+{
+  //
+  // Constructors and destructors.
+  //
+
+  public:
+
+  SendEventStore() : MessageStore()
+  {
+    enableCache    = SENDEVENT_ENABLE_CACHE;
+    enableData     = SENDEVENT_ENABLE_DATA;
+    enableSplit    = SENDEVENT_ENABLE_SPLIT;
+    enableCompress = SENDEVENT_ENABLE_COMPRESS;
+
+    dataLimit  = SENDEVENT_DATA_LIMIT;
+    dataOffset = SENDEVENT_DATA_OFFSET;
+
+    cacheSlots           = SENDEVENT_CACHE_SLOTS;
+    cacheThreshold       = SENDEVENT_CACHE_THRESHOLD;
+    cacheLowerThreshold  = SENDEVENT_CACHE_LOWER_THRESHOLD;
+
+    messages_ -> resize(cacheSlots);
+
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      *i = NULL;
+    }
+
+    temporary_ = NULL;
+  }
+
+  virtual ~SendEventStore()
+  {
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      destroy(*i);
+    }
+
+    destroy(temporary_);
+  }
+
+  virtual const char *name() const
+  {
+    return "SendEvent";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return X_SendEvent;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(SendEventMessage);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  public:
+
+  virtual Message *create() const
+  {
+    return new SendEventMessage();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new SendEventMessage((const SendEventMessage &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (SendEventMessage *) message;
+  }
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer,
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                  const Message *cachedMessage,
+                                      ChannelCache *channelCache) const;
+
+  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                  ChannelCache *channelCache) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+                                    unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+};
+
+#endif /* SendEvent_H */
diff --git a/nxcomp/src/SequenceQueue.cpp b/nxcomp/src/SequenceQueue.cpp
new file mode 100644
index 000000000..a045875d7
--- /dev/null
+++ b/nxcomp/src/SequenceQueue.cpp
@@ -0,0 +1,174 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SequenceQueue.h"
+
+static const unsigned int INITIAL_SIZE_    = 16;
+static const unsigned int GROWTH_INCREMENT = 16;
+
+SequenceQueue::SequenceQueue()
+
+  : queue_(new RequestSequence[INITIAL_SIZE_]), size_(INITIAL_SIZE_),
+        length_(0), start_(0), end_(0)
+{
+}
+
+SequenceQueue::~SequenceQueue()
+{
+  delete [] queue_;
+}
+
+void SequenceQueue::push(unsigned short int sequence, unsigned char opcode,
+                             unsigned int data1, unsigned int data2,
+                                 unsigned int data3)
+{
+  if (length_ == 0)
+  {
+    start_ = end_ = 0;
+
+    queue_[0].opcode   = opcode;
+    queue_[0].sequence = sequence;
+
+    queue_[0].data1 = data1;
+    queue_[0].data2 = data2;
+    queue_[0].data3 = data3;
+
+    length_ = 1;
+
+    return;
+  }
+
+  if (length_ == size_)
+  {
+    size_ += GROWTH_INCREMENT;
+
+    RequestSequence *newQueue = new RequestSequence[size_];
+
+    for (int i = start_; (unsigned int) i < length_; i++)
+    {
+      newQueue[i - start_] = queue_[i];
+    }
+
+    for (int i1 = 0; (unsigned int) i1 < start_; i1++)
+    {
+      newQueue[i1 + length_ - start_] = queue_[i1];
+    }
+
+    delete [] queue_;
+
+    queue_ = newQueue;
+
+    start_ = 0;
+
+    end_ = length_ - 1;
+  }
+
+  end_++;
+
+  if (end_ == size_)
+  {
+    end_ = 0;
+  }
+
+  queue_[end_].opcode   = opcode;
+  queue_[end_].sequence = sequence;
+
+  queue_[end_].data1 = data1;
+  queue_[end_].data2 = data2;
+  queue_[end_].data3 = data3;
+
+  length_++;
+}
+
+int SequenceQueue::peek(unsigned short int &sequence,
+                            unsigned char &opcode)
+{
+  if (length_ == 0)
+  {
+    return 0;
+  }
+  else
+  {
+    opcode   = queue_[start_].opcode;
+    sequence = queue_[start_].sequence;
+
+    return 1;
+  }
+}
+
+int SequenceQueue::peek(unsigned short int &sequence, unsigned char &opcode,
+                            unsigned int &data1, unsigned int &data2,
+                                unsigned int &data3)
+{
+  if (length_ == 0)
+  {
+    return 0;
+  }
+  else
+  {
+    opcode   = queue_[start_].opcode;
+    sequence = queue_[start_].sequence;
+
+    data1 = queue_[start_].data1;
+    data2 = queue_[start_].data2;
+    data3 = queue_[start_].data3;
+
+    return 1;
+  }
+}
+
+int SequenceQueue::pop(unsigned short int &sequence, unsigned char &opcode, 
+                           unsigned int &data1, unsigned int &data2,
+                               unsigned int &data3)
+{
+  if (length_ == 0)
+  {
+    return 0;
+  }
+  else
+  {
+    opcode   = queue_[start_].opcode;
+    sequence = queue_[start_].sequence;
+
+    data1 = queue_[start_].data1;
+    data2 = queue_[start_].data2;
+    data3 = queue_[start_].data3;
+
+    start_++;
+
+    if (start_ == size_)
+    {
+      start_ = 0;
+    }
+
+    length_--;
+
+    return 1;
+  }
+}
diff --git a/nxcomp/src/SequenceQueue.h b/nxcomp/src/SequenceQueue.h
new file mode 100644
index 000000000..2a72bc3fe
--- /dev/null
+++ b/nxcomp/src/SequenceQueue.h
@@ -0,0 +1,91 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef SequenceQueue_H
+#define SequenceQueue_H
+
+//
+// List of outstanding request messages which
+// are waiting for a reply. This class is used
+// in X client and server channels to correlate
+// the replies sequence numbers to the original
+// request type.
+//
+
+class SequenceQueue
+{
+  public:
+
+  SequenceQueue();
+
+  virtual ~SequenceQueue();
+
+  void push(unsigned short int sequence, unsigned char opcode,
+                unsigned int data1 = 0, unsigned int data2 = 0,
+                    unsigned int data3 = 0);
+
+  int peek(unsigned short int &sequence, unsigned char &opcode);
+
+  int peek(unsigned short int &sequence, unsigned char &opcode,
+               unsigned int &data1, unsigned int &data2,
+                   unsigned int &data3);
+
+  int pop(unsigned short int &sequence, unsigned char &opcode, 
+              unsigned int &data1, unsigned int &data2,
+                  unsigned int &data3);
+
+  int pop(unsigned short int &sequence, unsigned char &opcode)
+  {
+    unsigned int data1, data2, data3;
+
+    return pop(sequence, opcode, data1, data2, data3);
+  }
+
+  int length()
+  {
+    return length_;
+  }
+
+  private:
+
+  struct RequestSequence
+  {
+    unsigned short int sequence;
+    unsigned char      opcode;
+    unsigned int       data1;
+    unsigned int       data2;
+    unsigned int       data3;
+  };
+
+  RequestSequence *queue_;
+
+  unsigned int size_;
+  unsigned int length_;
+
+  unsigned int start_;
+  unsigned int end_;
+};
+
+#endif /* SequenceQueue_H */
diff --git a/nxcomp/src/ServerCache.cpp b/nxcomp/src/ServerCache.cpp
new file mode 100644
index 000000000..c4c088dca
--- /dev/null
+++ b/nxcomp/src/ServerCache.cpp
@@ -0,0 +1,195 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "ServerCache.h"
+
+//
+// Some global caches used to store information
+// common to all X connections.
+//
+
+BlockCache ServerCache::lastInitReply;
+BlockCache ServerCache::lastKeymap;
+unsigned char ServerCache::getKeyboardMappingLastKeysymsPerKeycode = 0;
+BlockCache ServerCache::getKeyboardMappingLastMap;
+BlockCache ServerCache::getModifierMappingLastMap;
+BlockCache ServerCache::xResources;
+BlockCacheSet ServerCache::queryFontFontCache(16);
+
+ServerCache::ServerCache() :
+
+  replySequenceCache(6), eventSequenceCache(6),
+  lastTimestamp(0), visualCache(8), colormapCache(8),
+
+  errorMinorCache(8),
+
+  colormapNotifyWindowCache(8), colormapNotifyColormapCache(8),
+
+  createNotifyWindowCache(8), createNotifyLastWindow(0),
+
+  exposeWindowCache(12),
+
+  focusInWindowCache(8),
+
+  keyPressLastKey(0),
+
+  mapNotifyEventCache(8), mapNotifyWindowCache(8),
+
+  motionNotifyTimestampCache(8), motionNotifyLastRootX(0),
+  motionNotifyLastRootY(0), motionNotifyRootXCache(8),
+  motionNotifyRootYCache(8), motionNotifyEventXCache(8),
+  motionNotifyEventYCache(8), motionNotifyStateCache(8),
+
+  noExposeDrawableCache(8), noExposeMinorCache(8),
+
+  propertyNotifyWindowCache(8), propertyNotifyAtomCache(8),
+
+  reparentNotifyWindowCache(8),
+
+  selectionClearWindowCache(8), selectionClearAtomCache(8),
+
+  visibilityNotifyWindowCache(8),
+
+  getGeometryRootCache(8),
+
+  getInputFocusWindowCache(8),
+
+  getKeyboardMappingKeysymCache(8),
+
+  getPropertyTypeCache(8),
+
+  getSelectionOwnerCache(8),
+
+  getWindowAttributesClassCache(8), getWindowAttributesPlanesCache(8),
+  getWindowAttributesPixelCache(8), getWindowAttributesAllEventsCache(8),
+  getWindowAttributesYourEventsCache(8),
+  getWindowAttributesDontPropagateCache(8),
+
+  queryPointerRootCache(8), queryPointerChildCache(8),
+
+  translateCoordsChildCache(8), translateCoordsXCache(8),
+  translateCoordsYCache(8),
+
+  queryTreeWindowCache(8)
+
+{
+  unsigned int i;
+
+  for (i = 0; i < 3; i++)
+  {
+    configureNotifyWindowCache[i] = new IntCache(8);
+  }
+
+  for (i = 0; i < 5; i++)
+  {
+    configureNotifyGeomCache[i] = new IntCache(8);
+  }
+
+  for (i = 0; i < 5; i++)
+  {
+    exposeGeomCache[i] = new IntCache(8);
+  }
+
+  for (i = 0; i < 3; i++)
+  {
+    motionNotifyWindowCache[i] = new IntCache(8);
+  }
+
+  for (i = 0; i < 5; i++)
+  {
+    getGeometryGeomCache[i] = new IntCache(8);
+  }
+
+  for (i = 0; i < 23; i++)
+  {
+    keyPressCache[i] = 0;
+  }
+
+  for (i = 0; i < 6; i++)
+  {
+    queryFontCharInfoCache[i] = new IntCache(8);
+    queryFontLastCharInfo[i] = 0;
+  }
+
+  for (i = 0; i < 12; i++)
+  {
+    genericReplyIntCache[i] = new IntCache(8);
+  }
+
+  for (i = 0; i < 14; i++)
+  {
+    genericEventIntCache[i] = new IntCache(8);
+  }
+}
+
+
+ServerCache::~ServerCache()
+{
+  unsigned int i;
+
+  for (i = 0; i < 3; i++)
+  {
+    delete configureNotifyWindowCache[i];
+  }
+
+  for (i = 0; i < 5; i++)
+  {
+    delete configureNotifyGeomCache[i];
+  }
+
+  for (i = 0; i < 5; i++)
+  {
+    delete exposeGeomCache[i];
+  }
+
+  for (i = 0; i < 3; i++)
+  {
+    delete motionNotifyWindowCache[i];
+  }
+
+  for (i = 0; i < 5; i++)
+  {
+    delete getGeometryGeomCache[i];
+  }
+
+  for (i = 0; i < 6; i++)
+  {
+    delete queryFontCharInfoCache[i];
+  }
+
+  for (i = 0; i < 12; i++)
+  {
+    delete genericReplyIntCache[i];
+  }
+
+  for (i = 0; i < 14; i++)
+  {
+    delete genericEventIntCache[i];
+  }
+}
diff --git a/nxcomp/src/ServerCache.h b/nxcomp/src/ServerCache.h
new file mode 100644
index 000000000..c6e2b81b6
--- /dev/null
+++ b/nxcomp/src/ServerCache.h
@@ -0,0 +1,303 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef ServerCache_H
+#define ServerCache_H
+
+#include "Misc.h"
+
+#include "IntCache.h"
+#include "CharCache.h"
+#include "OpcodeCache.h"
+#include "BlockCache.h"
+#include "BlockCacheSet.h"
+
+#include "ChannelCache.h"
+
+class ServerCache : public ChannelCache
+{
+  public:
+
+  ServerCache();
+
+  ~ServerCache();
+
+  //
+  // Opcode prediction caches.
+  //
+
+  OpcodeCache opcodeCache;
+
+  //
+  // General-purpose caches.
+  //
+
+  IntCache replySequenceCache;
+  IntCache eventSequenceCache;
+  unsigned int lastTimestamp;
+  CharCache depthCache;
+  IntCache visualCache;
+  IntCache colormapCache;
+  CharCache resourceCache;
+
+  //
+  // X connection startup.
+  //
+
+  static BlockCache lastInitReply;
+
+  //
+  // X errors.
+  //
+
+  CharCache errorCodeCache;
+  IntCache errorMinorCache;
+  CharCache errorMajorCache;
+
+  //
+  // ButtonPress and ButtonRelease events.
+  //
+
+  CharCache buttonCache;
+
+  //
+  // ColormapNotify event.
+  //
+
+  IntCache colormapNotifyWindowCache;
+  IntCache colormapNotifyColormapCache;
+
+  //
+  // ConfigureNotify event.
+  //
+
+  IntCache *configureNotifyWindowCache[3];
+  IntCache *configureNotifyGeomCache[5];
+
+  //
+  // CreateNotify event.
+  //
+
+  IntCache createNotifyWindowCache;
+  unsigned int createNotifyLastWindow;
+
+  //
+  // Expose event.
+  //
+
+  IntCache exposeWindowCache;
+  IntCache *exposeGeomCache[5];
+
+  //
+  // FocusIn event (also used for FocusOut).
+  //
+
+  IntCache focusInWindowCache;
+
+  //
+  // KeymapNotify event.
+  //
+
+  static BlockCache lastKeymap;
+
+  //
+  // KeyPress event.
+  //
+
+  unsigned char keyPressLastKey;
+  unsigned char keyPressCache[23];
+
+  //
+  // MapNotify event (also used for UnmapNotify).
+  //
+
+  IntCache mapNotifyEventCache;
+  IntCache mapNotifyWindowCache;
+
+  //
+  // MotionNotify event (also used for KeyPress, 
+  // KeyRelease, ButtonPress, ButtonRelease,
+  // EnterNotify, and LeaveNotify events and
+  // QueryPointer reply).
+  //
+
+  IntCache motionNotifyTimestampCache;
+  unsigned int motionNotifyLastRootX;
+  unsigned int motionNotifyLastRootY;
+  IntCache motionNotifyRootXCache;
+  IntCache motionNotifyRootYCache;
+  IntCache motionNotifyEventXCache;
+  IntCache motionNotifyEventYCache;
+  IntCache motionNotifyStateCache;
+  IntCache *motionNotifyWindowCache[3];
+
+  //
+  // NoExpose event.
+  //
+
+  IntCache noExposeDrawableCache;
+  IntCache noExposeMinorCache;
+  CharCache noExposeMajorCache;
+
+  //
+  // PropertyNotify event.
+  //
+
+  IntCache propertyNotifyWindowCache;
+  IntCache propertyNotifyAtomCache;
+
+  //
+  // ReparentNotify event.
+  //
+
+  IntCache reparentNotifyWindowCache;
+
+  //
+  // SelectionClear event.
+  //
+
+  IntCache selectionClearWindowCache;
+  IntCache selectionClearAtomCache;
+
+  //
+  // VisibilityNotify event.
+  //
+
+  IntCache visibilityNotifyWindowCache;
+
+  //
+  // GetGeometry reply.
+  //
+
+  IntCache getGeometryRootCache;
+  IntCache *getGeometryGeomCache[5];
+
+  //
+  // GetInputFocus reply.
+  //
+
+  IntCache getInputFocusWindowCache;
+
+  //
+  // GetKeyboardMapping reply.
+  //
+
+  static unsigned char getKeyboardMappingLastKeysymsPerKeycode;
+  static BlockCache getKeyboardMappingLastMap;
+  IntCache getKeyboardMappingKeysymCache;
+  CharCache getKeyboardMappingLastByteCache;
+
+  //
+  // GetModifierMapping reply.
+  //
+
+  static BlockCache getModifierMappingLastMap;
+
+  //
+  // GetProperty reply.
+  //
+
+  CharCache getPropertyFormatCache;
+  IntCache getPropertyTypeCache;
+  static BlockCache xResources;
+
+  //
+  // GetSelection reply.
+  //
+
+  IntCache getSelectionOwnerCache;
+
+  //
+  // GetWindowAttributes reply.
+  //
+
+  IntCache getWindowAttributesClassCache;
+  CharCache getWindowAttributesBitGravityCache;
+  CharCache getWindowAttributesWinGravityCache;
+  IntCache getWindowAttributesPlanesCache;
+  IntCache getWindowAttributesPixelCache;
+  IntCache getWindowAttributesAllEventsCache;
+  IntCache getWindowAttributesYourEventsCache;
+  IntCache getWindowAttributesDontPropagateCache;
+
+  //
+  // QueryColors reply.
+  //
+
+  BlockCache queryColorsLastReply;
+
+  //
+  // QueryFont reply.
+  //
+
+  static BlockCacheSet queryFontFontCache;
+  IntCache *queryFontCharInfoCache[6];
+  unsigned int queryFontLastCharInfo[6];
+
+  //
+  // QueryPointer reply.
+  //
+
+  IntCache queryPointerRootCache;
+  IntCache queryPointerChildCache;
+
+  //
+  // TranslateCoords reply.
+  //
+
+  IntCache translateCoordsChildCache;
+  IntCache translateCoordsXCache;
+  IntCache translateCoordsYCache;
+
+  //
+  // QueryTree reply.
+  //
+
+  IntCache queryTreeWindowCache;
+
+  //
+  // Generic reply. Use short data
+  // in protocol versions >= 3.
+  //
+
+  CharCache genericReplyCharCache;
+  IntCache  *genericReplyIntCache[12];
+
+  //
+  // Generic event. Only in protocol
+  // versions >= 3.
+  //
+
+  CharCache genericEventCharCache;
+  IntCache  *genericEventIntCache[14];
+
+  //
+  // Used in the abort split events.
+  //
+
+  OpcodeCache abortOpcodeCache;
+};
+
+#endif /* ServerCache_H */
diff --git a/nxcomp/src/ServerChannel.cpp b/nxcomp/src/ServerChannel.cpp
new file mode 100644
index 000000000..a560eca6d
--- /dev/null
+++ b/nxcomp/src/ServerChannel.cpp
@@ -0,0 +1,7946 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <string.h>
+#include <sys/types.h>
+#include <sys/ipc.h>
+#ifndef ANDROID
+#include <sys/shm.h>
+#endif
+
+#include <X11/X.h>
+#include <X11/Xatom.h>
+
+#include "NXproto.h"
+#include "NXalert.h"
+#include "NXpack.h"
+#include "NXmitshm.h"
+
+#include "ServerChannel.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+#include "StaticCompressor.h"
+
+#include "Statistics.h"
+#include "Proxy.h"
+
+#include "Auth.h"
+#include "Unpack.h"
+
+//
+// Available unpack methods.
+//
+
+#include "Alpha.h"
+#include "Colormap.h"
+#include "Bitmap.h"
+#include "Jpeg.h"
+#include "Pgn.h"
+#include "Rgb.h"
+#include "Rle.h"
+
+extern Proxy *proxy;
+
+//
+// Set the verbosity level. You also
+// need to define OPCODES in Misc.cpp
+// if you want literals instead of
+// opcodes' numbers.
+//
+
+#define PANIC
+#define WARNING
+#undef  OPCODES
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Log the important tracepoints related
+// to writing packets to the peer proxy.
+//
+
+#undef  FLUSH
+
+//
+// Log the operations related to splits.
+//
+
+#undef  SPLIT
+
+//
+// Define this to log when a channel
+// is created or destroyed.
+//
+
+#undef  REFERENCES
+
+//
+// Define this to exit and suspend the
+// session after a given number of X
+// messages decoded by the proxy.
+//
+
+#undef  SUSPEND
+
+//
+// Define these to hide the server extensions.
+//
+
+#define HIDE_MIT_SHM_EXTENSION
+#define HIDE_BIG_REQUESTS_EXTENSION
+#define HIDE_XFree86_Bigfont_EXTENSION
+#undef  HIDE_SHAPE_EXTENSION
+#undef  HIDE_XKEYBOARD_EXTENSION
+
+//
+// Known reasons of connection failures.
+//
+
+#define INVALID_COOKIE_DATA  "Invalid MIT-MAGIC-COOKIE-1 key"
+#define INVALID_COOKIE_SIZE  ((int) sizeof(INVALID_COOKIE_DATA) - 1)
+
+#define NO_AUTH_PROTO_DATA   "No protocol specified"
+#define NO_AUTH_PROTO_SIZE   ((int) sizeof(NO_AUTH_PROTO_DATA) - 1)
+
+//
+// Here are the static members.
+//
+
+#ifdef REFERENCES
+
+int ServerChannel::references_ = 0;
+
+#endif
+
+ServerChannel::ServerChannel(Transport *transport, StaticCompressor *compressor)
+
+  : Channel(transport, compressor), readBuffer_(transport_, this)
+{
+  //
+  // Sequence number of the next message
+  // being encoded or decoded.
+  //
+
+  clientSequence_ = 0;
+  serverSequence_ = 0;
+
+  //
+  // Save the last motion event and flush
+  // it only when the timeout expires.
+  //
+
+  lastMotion_[0] = '\0';
+
+  //
+  // Clear the queue of sequence numbers
+  // of split commits. Used to mask the
+  // errors.
+  //
+
+  initCommitQueue();
+
+  //
+  // Do we enable or not sending of expose
+  // events to the X client.
+  //
+
+  enableExpose_         = 1;
+  enableGraphicsExpose_ = 1;
+  enableNoExpose_       = 1;
+
+  //
+  // Track data of image currently being
+  // decompressed.
+  //
+
+  imageState_ = NULL;
+
+  //
+  // Track MIT-SHM resources.
+  //
+
+  shmemState_ = NULL;
+
+  //
+  // Store the unpack state for each agent
+  // resource.
+  //
+
+  for (int i = 0; i < CONNECTIONS_LIMIT; i++)
+  {
+    unpackState_[i] = NULL;
+  }
+
+  //
+  // Data about the split parameters requested
+  // by the encoding side.
+  //
+
+  splitState_.resource = nothing;
+  splitState_.current  = 0;
+  splitState_.save     = 1;
+  splitState_.load     = 1;
+  splitState_.commit   = 0;
+
+  //
+  // It will be eventually set by
+  // the server proxy.
+  //
+
+  fontPort_ = -1;
+
+  #ifdef REFERENCES
+  *logofs << "ServerChannel: Created new object at " 
+          << this << " for FD#" << fd_ << " out of "
+          << ++references_ << " allocated channels.\n"
+          << logofs_flush;
+  #endif
+}
+
+ServerChannel::~ServerChannel()
+{
+  #ifdef TEST
+  *logofs << "ServerChannel: Freeing image state information.\n"
+          << logofs_flush;
+  #endif
+
+  handleImageStateRemove();
+
+  #ifdef TEST
+  *logofs << "ServerChannel: Freeing shared memory information.\n"
+          << logofs_flush;
+  #endif
+
+  handleShmemStateRemove();
+
+  #ifdef TEST
+  *logofs << "ServerChannel: Freeing unpack state information.\n"
+          << logofs_flush;
+  #endif
+
+  for (int i = 0; i < CONNECTIONS_LIMIT; i++)
+  {
+    handleUnpackStateRemove(i);
+  }
+
+  #ifdef TEST
+  *logofs << "ServerChannel: Freeing channel caches.\n"
+          << logofs_flush;
+  #endif
+
+  #ifdef REFERENCES
+  *logofs << "ServerChannel: Deleted object at " 
+          << this << " for FD#" << fd_ << " out of "
+          << --references_ << " allocated channels.\n"
+          << logofs_flush;
+  #endif
+}
+
+//
+// Beginning of handleRead().
+//
+
+int ServerChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *message,
+                                  unsigned int length)
+{
+  #ifdef DEBUG
+  *logofs << "handleRead: Called for FD#" << fd_
+          << ".\n" << logofs_flush;
+  #endif
+
+  //
+  // Pointer to located message and
+  // its size in bytes.
+  //
+
+  const unsigned char *inputMessage;
+  unsigned int inputLength;
+
+  //
+  // Set when message is found in
+  // cache.
+  //
+
+  int hit;
+
+  #if defined(TEST) || defined(INFO)
+  *logofs << "handleRead: Trying to read from FD#"
+          << fd_ << " at " << strMsTimestamp() << ".\n"
+          << logofs_flush;
+  #endif
+
+  int result = readBuffer_.readMessage();
+
+  #if defined(DEBUG) || defined(INFO)
+  *logofs << "handleRead: Read result on FD#" << fd_
+          << " is " << result << ".\n"
+          << logofs_flush;
+  #endif
+
+  if (result < 0)
+  {
+    //
+    // Let the proxy close the channel.
+    //
+
+    return -1;
+  }
+  else if (result == 0)
+  {
+    #if defined(TEST) || defined(INFO)
+
+    //
+    // This can happen because we have the descriptor
+    // selected in the read set but we already read
+    // the data asynchronously, while decoding data
+    // read from the proxy.
+    //
+
+    *logofs << "handleRead: WARNING! No data read from FD#"
+            << fd_ << " while encoding messages.\n"
+            << logofs_flush;
+
+    #endif
+
+    return 0;
+  }
+
+  #if defined(TEST) || defined(INFO) || defined(FLUSH)
+  *logofs << "handleRead: Encoding messages for FD#" << fd_
+          << " with " << readBuffer_.getLength() << " bytes "
+          << "in the buffer.\n" << logofs_flush;
+  #endif
+
+  //
+  // Extract any complete message which 
+  // is available in the buffer.
+  //
+
+  if (proxy -> handleAsyncSwitch(fd_) < 0)
+  {
+    return -1;
+  }
+
+  while ((inputMessage = readBuffer_.getMessage(inputLength)) != NULL)
+  {
+    hit = 0;
+
+    if (firstReply_)
+    {
+      //
+      // Handle the X server's authorization reply.
+      //
+
+      if (handleAuthorization(inputMessage, inputLength) < 0)
+      {
+        return -1;
+      }
+
+      imageByteOrder_ = inputMessage[30];
+      bitmapBitOrder_ = inputMessage[31];
+      scanlineUnit_   = inputMessage[32];
+      scanlinePad_    = inputMessage[33];
+
+      encodeBuffer.encodeValue((unsigned int) inputMessage[0], 8);
+      encodeBuffer.encodeValue((unsigned int) inputMessage[1], 8);
+      encodeBuffer.encodeValue(GetUINT(inputMessage + 2, bigEndian_), 16);
+      encodeBuffer.encodeValue(GetUINT(inputMessage + 4, bigEndian_), 16);
+      encodeBuffer.encodeValue(GetUINT(inputMessage + 6, bigEndian_), 16);
+
+      if (ServerCache::lastInitReply.compare(inputLength - 8, inputMessage + 8))
+      {
+        encodeBuffer.encodeBoolValue(1);
+      }
+      else
+      {
+        encodeBuffer.encodeBoolValue(0);
+
+        for (unsigned int i = 8; i < inputLength; i++)
+        {
+          encodeBuffer.encodeValue((unsigned int) inputMessage[i], 8);
+        }
+      }
+
+      firstReply_ = 0;
+
+      #if defined(TEST) || defined(OPCODES)
+
+      int bits = encodeBuffer.diffBits();
+
+      *logofs << "handleRead: Handled first reply. " << inputLength
+              << " bytes in, " << bits << " bits (" << ((float) bits) / 8
+              << " bytes) out.\n" << logofs_flush;
+
+      #endif
+
+      priority_++;
+
+    }
+    else
+    {
+      //
+      // NX client needs this line to consider
+      // the initialization phase successfully
+      // completed.
+      //
+
+      if (firstClient_ == -1)
+      {
+        cerr << "Info" << ": Established X server connection.\n" ;
+
+        firstClient_ = fd_;
+      }
+
+      //
+      // Check if this is a reply.
+      //
+
+      if (*inputMessage == X_Reply)
+      {
+        int bits = 0;
+
+        unsigned char inputOpcode = *inputMessage;
+
+        unsigned short int requestSequenceNum;
+        unsigned char      requestOpcode;
+        unsigned int       requestData[3];
+
+        unsigned int sequenceNum = GetUINT(inputMessage + 2, bigEndian_);
+
+        #ifdef SUSPEND
+
+        if (sequenceNum >= 1000)
+        {
+          cerr << "Warning" << ": Exiting to test the resilience of the agent.\n";
+
+          sleep(2);
+
+          HandleAbort();
+        }
+
+        #endif
+
+        //
+        // We managed all the events and errors caused
+        // by the previous requests. We can now reset
+        // the queue of split commits.
+        //
+
+        clearCommitQueue();
+
+        //
+        // Encode opcode and difference between
+        // current sequence and the last one.
+        //
+
+        encodeBuffer.encodeOpcodeValue(inputOpcode, serverCache_ -> opcodeCache);
+
+        unsigned int sequenceDiff = sequenceNum - serverSequence_;
+
+        serverSequence_ = sequenceNum;
+
+        #ifdef DEBUG
+        *logofs << "handleRead: Last server sequence number for FD#" 
+                << fd_ << " is " << serverSequence_ << " with "
+                << "difference " << sequenceDiff << ".\n"
+                << logofs_flush;
+        #endif
+
+        encodeBuffer.encodeCachedValue(sequenceDiff, 16,
+                           serverCache_ -> replySequenceCache, 7);
+
+        //
+        // Now handle the data part.
+        //
+
+        if (sequenceQueue_.peek(requestSequenceNum, requestOpcode) &&
+                                    requestSequenceNum == sequenceNum)
+        {
+          //
+          // We've found the request that generated this reply.
+          // It is possible to compress the reply based on the
+          // specific request type.
+          //
+
+          sequenceQueue_.pop(requestSequenceNum, requestOpcode,
+                                 requestData[0], requestData[1], requestData[2]);
+
+          //
+          // If differential compression is disabled
+          // then use the most simple encoding.
+          //
+
+          if (control -> LocalDeltaCompression == 0)
+          {
+            int result = handleFastReadReply(encodeBuffer, requestOpcode,
+                                                 inputMessage, inputLength);
+            if (result < 0)
+            {
+              return -1;
+            }
+            else if (result > 0)
+            {
+              continue;
+            }
+          }
+
+          switch (requestOpcode)
+          {
+          case X_AllocColor:
+            {
+              const unsigned char *nextSrc = inputMessage + 8;
+              for (unsigned int i = 0; i < 3; i++)
+              {
+                unsigned int colorValue = GetUINT(nextSrc, bigEndian_);
+                nextSrc += 2;
+                if (colorValue == requestData[i])
+                  encodeBuffer.encodeBoolValue(1);
+                else
+                {
+                  encodeBuffer.encodeBoolValue(0);
+                  encodeBuffer.encodeValue(colorValue - colorValue, 16, 6);
+                }
+              }
+              unsigned int pixel = GetULONG(inputMessage + 16, bigEndian_);
+              encodeBuffer.encodeValue(pixel, 32, 9);
+
+              priority_++;
+            }
+            break;
+          case X_GetAtomName:
+            {
+              unsigned int nameLength = GetUINT(inputMessage + 8, bigEndian_);
+              encodeBuffer.encodeValue(nameLength, 16, 6);
+              const unsigned char *nextSrc = inputMessage + 32;
+
+              // Since ProtoStep7 (#issue 108)
+              encodeBuffer.encodeTextData(nextSrc, nameLength);
+
+              priority_++;
+            }
+            break;
+          case X_GetGeometry:
+            {
+              //
+              // TODO: This obtains a satisfactory 10:1, but
+              // could be cached to leverage the big amount
+              // of such requests issued by QT clients.
+              //
+
+              encodeBuffer.encodeCachedValue(inputMessage[1], 8,
+                                             serverCache_ -> depthCache);
+              encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_),
+                                  29, serverCache_ -> getGeometryRootCache, 9);
+              const unsigned char *nextSrc = inputMessage + 12;
+              for (unsigned int i = 0; i < 5; i++)
+              {
+                encodeBuffer.encodeCachedValue(GetUINT(nextSrc, bigEndian_), 16,
+                                   *serverCache_ -> getGeometryGeomCache[i], 8);
+                nextSrc += 2;
+              }
+
+              priority_++;
+            }
+            break;
+          case X_GetInputFocus:
+            {
+              //
+              // Is it a real X_GetInputFocus or a
+              // masqueraded reply?
+              //
+
+              if (requestData[0] == X_GetInputFocus)
+              {
+                encodeBuffer.encodeValue((unsigned int) inputMessage[1], 2);
+                encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_),
+                                29, serverCache_ -> getInputFocusWindowCache);
+
+                priority_++;
+              }
+              else
+              {
+                //
+                // TODO: We are not setting priority in case
+                // of replies other than real X_GetInputFocus
+                // or X_NXGetUnpackParameters. We should check
+                // once again that this is OK.
+                //
+
+                #ifdef TEST
+                *logofs << "handleRead: Received tainted X_GetInputFocus reply "
+                        << "for request OPCODE#" << requestData[0] << " with "
+                        << "sequence " << sequenceNum << ".\n"
+                        << logofs_flush;
+                #endif
+
+                //
+                // Don't encode any data in case of sync
+                // messages or any other reply for which
+                // opcode is enough.
+                //
+
+                if (requestData[0] == opcodeStore_ -> getUnpackParameters)
+                {
+                  for (int i = 0; i < PACK_METHOD_LIMIT; i++)
+                  {
+                    encodeBuffer.encodeBoolValue(control -> LocalUnpackMethods[i]);
+                  }
+
+                  priority_++;
+                }
+                else if (requestData[0] == opcodeStore_ -> getShmemParameters)
+                {
+                  if (handleShmemReply(encodeBuffer, requestOpcode, requestData[1],
+                                           inputMessage, inputLength) < 0)
+                  {
+                    return -1;
+                  }
+
+                  priority_++;
+                }
+                else if (requestData[0] == opcodeStore_ -> getFontParameters)
+                {
+                  if (handleFontReply(encodeBuffer, requestOpcode,
+                                          inputMessage, inputLength) < 0)
+                  {
+                    return -1;
+                  }
+                }
+
+                //
+                // Account this data to the original opcode.
+                //
+
+                requestOpcode = requestData[0];
+              }
+            }
+            break;
+          case X_GetKeyboardMapping:
+            {
+              unsigned int keysymsPerKeycode = (unsigned int) inputMessage[1];
+              if (ServerCache::getKeyboardMappingLastMap.compare(inputLength - 32,
+                        inputMessage + 32) && (keysymsPerKeycode ==
+                            ServerCache::getKeyboardMappingLastKeysymsPerKeycode))
+              {
+                encodeBuffer.encodeBoolValue(1);
+
+                priority_++;
+
+                break;
+              }
+              ServerCache::getKeyboardMappingLastKeysymsPerKeycode = keysymsPerKeycode;
+              encodeBuffer.encodeBoolValue(0);
+              unsigned int numKeycodes =
+              (((inputLength - 32) / keysymsPerKeycode) >> 2);
+              encodeBuffer.encodeValue(numKeycodes, 8);
+              encodeBuffer.encodeValue(keysymsPerKeycode, 8, 4);
+              const unsigned char *nextSrc = inputMessage + 32;
+              unsigned char previous = 0;
+              for (unsigned int count = numKeycodes * keysymsPerKeycode;
+                   count; --count)
+              {
+                unsigned int keysym = GetULONG(nextSrc, bigEndian_);
+                nextSrc += 4;
+                if (keysym == NoSymbol)
+                  encodeBuffer.encodeBoolValue(1);
+                else
+                {
+                  encodeBuffer.encodeBoolValue(0);
+                  unsigned int first3Bytes = (keysym >> 8);
+                  encodeBuffer.encodeCachedValue(first3Bytes, 24,
+                             serverCache_ -> getKeyboardMappingKeysymCache, 9);
+                  unsigned char lastByte = (unsigned char) (keysym & 0xff);
+                  encodeBuffer.encodeCachedValue(lastByte - previous, 8,
+                           serverCache_ -> getKeyboardMappingLastByteCache, 5);
+                  previous = lastByte;
+                }
+              }
+
+              priority_++;
+            }
+            break;
+          case X_GetModifierMapping:
+            {
+              encodeBuffer.encodeValue((unsigned int) inputMessage[1], 8);
+              const unsigned char *nextDest = inputMessage + 32;
+              if (ServerCache::getModifierMappingLastMap.compare(inputLength - 32,
+                                                nextDest))
+              {
+                encodeBuffer.encodeBoolValue(1);
+
+                priority_++;
+
+                break;
+              }
+              encodeBuffer.encodeBoolValue(0);
+              for (unsigned int count = inputLength - 32; count; count--)
+              {
+                unsigned char next = *nextDest++;
+                if (next == 0)
+                  encodeBuffer.encodeBoolValue(1);
+                else
+                {
+                  encodeBuffer.encodeBoolValue(0);
+                  encodeBuffer.encodeValue(next, 8);
+                }
+              }
+
+              priority_++;
+            }
+            break;
+          case X_GetProperty:
+            {
+              MessageStore *messageStore = serverStore_ ->
+                                   getReplyStore(X_GetProperty);
+
+              hit = handleEncode(encodeBuffer, serverCache_, messageStore,
+                                     requestOpcode, inputMessage, inputLength);
+
+              priority_++;
+            }
+            break;
+          case X_GetSelectionOwner:
+            {
+              encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_),
+                                29, serverCache_ -> getSelectionOwnerCache, 9);
+              priority_++;
+            }
+            break;
+          case X_GetWindowAttributes:
+            {
+              encodeBuffer.encodeValue((unsigned int) inputMessage[1], 2);
+              encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_),
+                                           29, serverCache_ -> visualCache);
+              encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 12, bigEndian_),
+                         16, serverCache_ -> getWindowAttributesClassCache, 3);
+              encodeBuffer.encodeCachedValue(inputMessage[14], 8,
+                           serverCache_ -> getWindowAttributesBitGravityCache);
+              encodeBuffer.encodeCachedValue(inputMessage[15], 8,
+                           serverCache_ -> getWindowAttributesWinGravityCache);
+              encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 16, bigEndian_),
+                        32, serverCache_ -> getWindowAttributesPlanesCache, 9);
+              encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 20, bigEndian_),
+                         32, serverCache_ -> getWindowAttributesPixelCache, 9);
+              encodeBuffer.encodeBoolValue((unsigned int) inputMessage[24]);
+              encodeBuffer.encodeBoolValue((unsigned int) inputMessage[25]);
+              encodeBuffer.encodeValue((unsigned int) inputMessage[26], 2);
+              encodeBuffer.encodeBoolValue((unsigned int) inputMessage[27]);
+              encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 28, bigEndian_),
+                                         29, serverCache_ -> colormapCache, 9);
+              encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 32, bigEndian_),
+                        32, serverCache_ -> getWindowAttributesAllEventsCache);
+              encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 36, bigEndian_),
+                       32, serverCache_ -> getWindowAttributesYourEventsCache);
+              encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 40, bigEndian_),
+                    16, serverCache_ -> getWindowAttributesDontPropagateCache);
+
+              priority_++;
+            }
+            break;
+          case X_GrabKeyboard:
+          case X_GrabPointer:
+            {
+              encodeBuffer.encodeValue((unsigned int) inputMessage[1], 3);
+
+              priority_++;
+            }
+            break;
+          case X_InternAtom:
+            {
+              encodeBuffer.encodeValue(GetULONG(inputMessage + 8, bigEndian_), 29, 9);
+
+              priority_++;
+            }
+            break;
+          case X_ListExtensions:
+            {
+              encodeBuffer.encodeValue(GetULONG(inputMessage + 4, bigEndian_), 32, 8);
+              unsigned int numExtensions = (unsigned int) inputMessage[1];
+              encodeBuffer.encodeValue(numExtensions, 8);
+              const unsigned char *nextSrc = inputMessage + 32;
+
+              for (; numExtensions; numExtensions--)
+              {
+                unsigned int length = (unsigned int) (*nextSrc++);
+
+                encodeBuffer.encodeValue(length, 8);
+
+                #ifdef HIDE_MIT_SHM_EXTENSION
+
+                if (!strncmp((char *) nextSrc, "MIT-SHM", 7))
+                {
+                  #ifdef TEST
+                  *logofs << "handleRead: Hiding MIT-SHM extension in reply.\n"
+                          << logofs_flush;
+                  #endif
+
+                  memcpy((unsigned char *) nextSrc, "NO-MIT-", 7);
+                }
+
+                #endif
+
+                #ifdef HIDE_BIG_REQUESTS_EXTENSION
+
+                if (!strncmp((char *) nextSrc, "BIG-REQUESTS", 12))
+                {
+                  #ifdef TEST
+                  *logofs << "handleRead: Hiding BIG-REQUESTS extension in reply.\n"
+                          << logofs_flush;
+                  #endif
+
+                  memcpy((unsigned char *) nextSrc, "NO-BIG-REQUE", 12);
+                }
+
+                #endif
+
+                #ifdef HIDE_XKEYBOARD_EXTENSION
+
+                if (!strncmp((char *) nextSrc, "XKEYBOARD", 9))
+                {
+                  #ifdef TEST
+                  *logofs << "handleRead: Hiding XKEYBOARD extension in reply.\n"
+                          << logofs_flush;
+                  #endif
+
+                  memcpy((unsigned char *) nextSrc, "NO-XKEYBO", 9);
+                }
+
+                #endif
+
+                #ifdef HIDE_XFree86_Bigfont_EXTENSION
+
+                if (!strncmp((char *) nextSrc, "XFree86-Bigfont", 15))
+                {
+                  #ifdef TEST
+                  *logofs << "handleRead: Hiding XFree86-Bigfont extension in reply.\n"
+                          << logofs_flush;
+                  #endif
+
+                  memcpy((unsigned char *) nextSrc, "NO-XFree86-Bigf", 15);
+                }
+
+                #endif
+
+                #ifdef HIDE_SHAPE_EXTENSION
+
+                if (!strncmp((char *) nextSrc, "SHAPE", 5))
+                {
+                  #ifdef TEST
+                  *logofs << "handleRead: Hiding SHAPE extension in reply.\n"
+                          << logofs_flush;
+                  #endif
+
+                  memcpy((unsigned char *) nextSrc, "NO-SH", 5);
+                }
+
+                #endif
+
+                //
+                // Check if user disabled RENDER extension.
+                //
+
+                if (control -> HideRender == 1 &&
+                        !strncmp((char *) nextSrc, "RENDER", 6))
+                {
+                  #ifdef TEST
+                  *logofs << "handleRead: Hiding RENDER extension in reply.\n"
+                          << logofs_flush;
+                  #endif
+
+                  memcpy((unsigned char *) nextSrc, "NO-REN", 6);
+                }
+
+                for (; length; length--)
+                {
+                  encodeBuffer.encodeValue((unsigned int) (*nextSrc++), 8);
+                }
+              }
+
+              priority_++;
+            }
+            break;
+          case X_ListFonts:
+            {
+              MessageStore *messageStore = serverStore_ ->
+                                   getReplyStore(X_ListFonts);
+
+              if (handleEncodeCached(encodeBuffer, serverCache_, messageStore,
+                                         inputMessage, inputLength))
+              {
+                priority_++;
+
+                hit = 1;
+
+                break;
+              }
+
+              encodeBuffer.encodeValue(GetULONG(inputMessage + 4, bigEndian_), 32, 8);
+              unsigned int numFonts = GetUINT(inputMessage + 8, bigEndian_);
+              encodeBuffer.encodeValue(numFonts, 16, 6);
+
+              // Differential encoding.
+              encodeBuffer.encodeBoolValue(1);
+
+              const unsigned char* nextSrc = inputMessage + 32;
+              for (; numFonts; numFonts--)
+              {
+                unsigned int length = (unsigned int) (*nextSrc++);
+                encodeBuffer.encodeValue(length, 8);
+
+                // Since ProtoStep7 (#issue 108)
+                encodeBuffer.encodeTextData(nextSrc, length);
+
+                nextSrc += length;
+              }
+
+              priority_++;
+            }
+            break;
+          case X_LookupColor:
+          case X_AllocNamedColor:
+            {
+              const unsigned char *nextSrc = inputMessage + 8;
+              if (requestOpcode == X_AllocNamedColor)
+              {
+                encodeBuffer.encodeValue(GetULONG(nextSrc, bigEndian_), 32, 9);
+                nextSrc += 4;
+              }
+              unsigned int count = 3;
+              do
+              {
+                unsigned int exactColor = GetUINT(nextSrc, bigEndian_);
+                encodeBuffer.encodeValue(exactColor, 16, 9);
+                unsigned int visualColor = GetUINT(nextSrc + 6, bigEndian_) -
+                exactColor;
+                encodeBuffer.encodeValue(visualColor, 16, 5);
+                nextSrc += 2;
+              }
+              while (--count);
+
+              priority_++;
+            }
+            break;
+          case X_QueryBestSize:
+            {
+              encodeBuffer.encodeValue(GetUINT(inputMessage + 8, bigEndian_), 16, 8);
+              encodeBuffer.encodeValue(GetUINT(inputMessage + 10, bigEndian_), 16, 8);
+
+              priority_++;
+            }
+            break;
+          case X_QueryColors:
+            {
+              // Differential encoding.
+              encodeBuffer.encodeBoolValue(1);
+
+              unsigned int numColors = ((inputLength - 32) >> 3);
+              const unsigned char *nextSrc = inputMessage + 40;
+              unsigned char *nextDest = (unsigned char *) inputMessage + 38;
+              for (unsigned int c = 1; c < numColors; c++)
+              {
+                for (unsigned int i = 0; i < 6; i++)
+                  *nextDest++ = *nextSrc++;
+                nextSrc += 2;
+              }
+              unsigned int colorsLength = numColors * 6;
+              if (serverCache_ -> queryColorsLastReply.compare(colorsLength,
+                                                                   inputMessage + 32))
+                encodeBuffer.encodeBoolValue(1);
+              else
+              {
+                const unsigned char *nextSrc = inputMessage + 32;
+                encodeBuffer.encodeBoolValue(0);
+                encodeBuffer.encodeValue(numColors, 16, 5);
+                for (numColors *= 3; numColors; numColors--)
+                {
+                  encodeBuffer.encodeValue(GetUINT(nextSrc, bigEndian_), 16);
+                  nextSrc += 2;
+                }
+              }
+
+              priority_++;
+            }
+            break;
+          case X_QueryExtension:
+            {
+              if (requestData[0] == X_QueryExtension)
+              {
+                //
+                // Value in requestData[0] will be nonzero
+                // if the request is for an extension that
+                // we should hide to the X client.
+                //
+
+                if (requestData[1])
+                {
+                  encodeBuffer.encodeBoolValue(0);
+                  encodeBuffer.encodeValue(0, 8);
+                }
+                else
+                {
+                  encodeBuffer.encodeBoolValue((unsigned int) inputMessage[8]);
+                  encodeBuffer.encodeValue((unsigned int) inputMessage[9], 8);
+                }
+
+                encodeBuffer.encodeValue((unsigned int) inputMessage[10], 8);
+                encodeBuffer.encodeValue((unsigned int) inputMessage[11], 8);
+
+                if (requestData[2] == X_NXInternalShapeExtension)
+                {
+                  opcodeStore_ -> shapeExtension = inputMessage[9];
+
+                  #ifdef TEST
+                  *logofs << "handleRead: Shape extension opcode for FD#" << fd_
+                          << " is " << (unsigned int) opcodeStore_ -> shapeExtension
+                          << ".\n" << logofs_flush;
+                  #endif
+                }
+                else if (requestData[2] == X_NXInternalRenderExtension)
+                {
+                  opcodeStore_ -> renderExtension = inputMessage[9];
+
+                  #ifdef TEST
+                  *logofs << "handleRead: Render extension opcode for FD#" << fd_
+                          << " is " << (unsigned int) opcodeStore_ -> renderExtension
+                          << ".\n" << logofs_flush;
+                  #endif
+                }
+
+                priority_++;
+              }
+              else
+              {
+                #ifdef TEST
+                *logofs << "handleRead: Received tainted X_QueryExtension reply "
+                        << "for request OPCODE#" << requestData[0] << " with "
+                        << "sequence " << sequenceNum << ".\n"
+                        << logofs_flush;
+                #endif
+
+                if (requestData[0] == opcodeStore_ -> getShmemParameters)
+                {
+                  if (handleShmemReply(encodeBuffer, requestOpcode, requestData[1],
+                                           inputMessage, inputLength) < 0)
+                  {
+                    return -1;
+                  }
+
+                  priority_++;
+                }
+                //
+                // Account this data to the original opcode.
+                //
+
+                requestOpcode = requestData[0];
+              }
+            }
+            break;
+          case X_QueryFont:
+            {
+              MessageStore *messageStore = serverStore_ ->
+                                   getReplyStore(X_QueryFont);
+
+              if (handleEncodeCached(encodeBuffer, serverCache_, messageStore,
+                                         inputMessage, inputLength))
+              {
+                priority_++;
+
+                hit = 1;
+
+                break;
+              }
+
+              // Differential encoding.
+              encodeBuffer.encodeBoolValue(1);
+
+              unsigned int numProperties = GetUINT(inputMessage + 46, bigEndian_);
+              unsigned int numCharInfos = GetULONG(inputMessage + 56, bigEndian_);
+              encodeBuffer.encodeValue(numProperties, 16, 8);
+              encodeBuffer.encodeValue(numCharInfos, 32, 10);
+              handleEncodeCharInfo(inputMessage + 8, encodeBuffer);
+              handleEncodeCharInfo(inputMessage + 24, encodeBuffer);
+              encodeBuffer.encodeValue(GetUINT(inputMessage + 40, bigEndian_), 16, 9);
+              encodeBuffer.encodeValue(GetUINT(inputMessage + 42, bigEndian_), 16, 9);
+              encodeBuffer.encodeValue(GetUINT(inputMessage + 44, bigEndian_), 16, 9);
+              encodeBuffer.encodeBoolValue((unsigned int) inputMessage[48]);
+              encodeBuffer.encodeValue((unsigned int) inputMessage[49], 8);
+              encodeBuffer.encodeValue((unsigned int) inputMessage[50], 8);
+              encodeBuffer.encodeBoolValue((unsigned int) inputMessage[51]);
+              encodeBuffer.encodeValue(GetUINT(inputMessage + 52, bigEndian_), 16, 9);
+              encodeBuffer.encodeValue(GetUINT(inputMessage + 54, bigEndian_), 16, 9);
+              const unsigned char *nextSrc = inputMessage + 60;
+              unsigned int index;
+
+              int end = 0;
+
+              if (ServerCache::queryFontFontCache.lookup(numProperties * 8 +
+                                        numCharInfos * 12, nextSrc, index))
+              {
+                encodeBuffer.encodeBoolValue(1);
+                encodeBuffer.encodeValue(index, 4);
+
+                end = 1;
+              }
+
+              if (end == 0)
+              {
+                encodeBuffer.encodeBoolValue(0);
+                for (; numProperties; numProperties--)
+                {
+                  encodeBuffer.encodeValue(GetULONG(nextSrc, bigEndian_), 32, 9);
+                  encodeBuffer.encodeValue(GetULONG(nextSrc + 4, bigEndian_), 32, 9);
+                  nextSrc += 8;
+                }
+                for (; numCharInfos; numCharInfos--)
+                {
+                  handleEncodeCharInfo(nextSrc, encodeBuffer);
+
+                  nextSrc += 12;
+                }
+              }
+
+              priority_++;
+            }
+            break;
+          case X_QueryPointer:
+            {
+              encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]);
+              encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_),
+                                 29, serverCache_ -> queryPointerRootCache, 9);
+              encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 12, bigEndian_),
+                                29, serverCache_ -> queryPointerChildCache, 9);
+              unsigned int rootX = GetUINT(inputMessage + 16, bigEndian_);
+              unsigned int rootY = GetUINT(inputMessage + 18, bigEndian_);
+              unsigned int eventX = GetUINT(inputMessage + 20, bigEndian_);
+              unsigned int eventY = GetUINT(inputMessage + 22, bigEndian_);
+              eventX -= rootX;
+              eventY -= rootY;
+              encodeBuffer.encodeCachedValue(
+                             rootX - serverCache_ -> motionNotifyLastRootX, 16,
+                                    serverCache_ -> motionNotifyRootXCache, 8);
+              serverCache_ -> motionNotifyLastRootX = rootX;
+              encodeBuffer.encodeCachedValue(
+                             rootY - serverCache_ -> motionNotifyLastRootY, 16,
+                                    serverCache_ -> motionNotifyRootYCache, 8);
+              serverCache_ -> motionNotifyLastRootY = rootY;
+              encodeBuffer.encodeCachedValue(eventX, 16,
+                                   serverCache_ -> motionNotifyEventXCache, 8);
+              encodeBuffer.encodeCachedValue(eventY, 16,
+                                   serverCache_ -> motionNotifyEventYCache, 8);
+              encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 24, bigEndian_),
+                                   16, serverCache_ -> motionNotifyStateCache);
+              priority_++;
+            }
+            break;
+          case X_QueryTree:
+            {
+              //
+              // This was very inefficient. In practice
+              // it just copied data on the output. Now
+              // it obtains an average 7:1 compression
+              // and could optionally be cached.
+              //
+
+              unsigned int children = GetUINT(inputMessage + 16, bigEndian_);
+
+              encodeBuffer.encodeValue(children, 16, 8);
+
+              encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_), 29,
+                                 serverCache_ -> queryTreeWindowCache);
+
+              encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 12, bigEndian_), 29,
+                                 serverCache_ -> queryTreeWindowCache);
+
+              const unsigned char *next = inputMessage + 32;
+
+              for (unsigned int i = 0; i < children; i++)
+              {
+                encodeBuffer.encodeCachedValue(GetULONG(next + (i * 4), bigEndian_), 29,
+                                   serverCache_ -> queryTreeWindowCache);
+              }
+
+              priority_++;
+            }
+            break;
+          case X_TranslateCoords:
+            {
+              encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]);
+              encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_),
+                             29, serverCache_ -> translateCoordsChildCache, 9);
+              encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 12, bigEndian_),
+                                 16, serverCache_ -> translateCoordsXCache, 8);
+              encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 14, bigEndian_),
+                                 16, serverCache_ -> translateCoordsYCache, 8);
+              priority_++;
+            }
+            break;
+          case X_GetImage:
+            {
+              MessageStore *messageStore = serverStore_ ->
+                                   getReplyStore(X_GetImage);
+
+              if (handleEncodeCached(encodeBuffer, serverCache_, messageStore,
+                                         inputMessage, inputLength))
+              {
+                priority_++;
+
+                hit = 1;
+
+                break;
+              }
+
+              // Depth.
+              encodeBuffer.encodeCachedValue(inputMessage[1], 8,
+                                 serverCache_ -> depthCache);
+              // Reply length.
+              encodeBuffer.encodeValue(GetULONG(inputMessage + 4, bigEndian_), 32, 9);
+
+              // Visual.
+              encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_), 29,
+                                 serverCache_ -> visualCache);
+
+              // Since ProtoStep8 (#issue 108)
+              handleCopy(encodeBuffer, requestOpcode, messageStore ->
+                            dataOffset, inputMessage, inputLength);
+
+              priority_++;
+            }
+            break;
+            case X_GetPointerMapping:
+            {
+              encodeBuffer.encodeValue(inputMessage[1], 8, 4);
+              encodeBuffer.encodeValue(GetULONG(inputMessage + 4, bigEndian_), 32, 4);
+              for (unsigned int i = 32; i < inputLength; i++)
+                encodeBuffer.encodeValue((unsigned int) inputMessage[i], 8, 4);
+
+              priority_++;
+            }
+            break;
+            case X_GetKeyboardControl:
+            {
+              encodeBuffer.encodeValue(inputMessage[1], 8, 2);
+              encodeBuffer.encodeValue(GetULONG(inputMessage + 4, bigEndian_), 32, 8);
+              for (unsigned int i = 8; i < inputLength; i++)
+                encodeBuffer.encodeValue((unsigned int) inputMessage[i], 8, 4);
+
+              priority_++;
+            }
+            break;
+          default:
+            {
+              #ifdef PANIC
+              *logofs << "ServerChannel: PANIC! No matching request with "
+                      << "OPCODE#" << (unsigned int) requestOpcode
+                      << " for reply with sequence number "
+                      << requestSequenceNum << ".\n"
+                      << logofs_flush;
+              #endif
+
+              cerr << "Error" << ": No matching request with OPCODE#"
+                   << (unsigned int) requestOpcode << " for reply with "
+                   << "sequence number " << requestSequenceNum << ".\n";
+
+              return -1;
+            }
+          }
+
+          bits = encodeBuffer.diffBits();
+
+          #if defined(TEST) || defined(OPCODES)
+
+          const char *cacheString = (hit ? "cached " : "");
+
+          *logofs << "handleRead: Handled " << cacheString << "reply to OPCODE#"
+                  << (unsigned int) requestOpcode << " (" << DumpOpcode(requestOpcode)
+                  << ") for FD#" << fd_ << " sequence " << serverSequence_
+                  << ". " << inputLength << " bytes in, " << bits << " bits ("
+                  << ((float) bits) / 8 << " bytes) out.\n" << logofs_flush;
+
+          #endif
+
+        } // End of if (sequenceQueue_.peek(requestSequenceNum, requestOpcode) && ...
+        else
+        {
+          //
+          // We didn't push the request opcode.
+          // Check if fast encoding is required.
+          //
+
+          requestOpcode = X_Reply;
+
+          if (control -> LocalDeltaCompression == 0)
+          {
+            int result = handleFastReadReply(encodeBuffer, requestOpcode,
+                                                 inputMessage, inputLength);
+            if (result < 0)
+            {
+              return -1;
+            }
+            else if (result > 0)
+            {
+              continue;
+            }
+          }
+
+          //
+          // Group all replies whose opcode was not
+          // pushed in sequence number queue under
+          // the category 'generic reply'.
+          //
+
+          #ifdef DEBUG
+          *logofs << "handleRead: Identified generic reply.\n"
+                  << logofs_flush;
+          #endif
+
+          MessageStore *messageStore = serverStore_ ->
+                               getReplyStore(X_NXInternalGenericReply);
+
+          hit = handleEncode(encodeBuffer, serverCache_, messageStore,
+                                 requestOpcode, inputMessage, inputLength);
+
+          priority_++;
+
+          bits = encodeBuffer.diffBits();
+
+          #if defined(TEST) || defined(OPCODES)
+
+          const char *cacheString = (hit ? "cached " : "");
+
+          *logofs << "handleRead: Handled " << cacheString << "generic reply "
+                  << "OPCODE#" << X_NXInternalGenericReply << " for FD#" << fd_
+                  << " sequence " << serverSequence_ << ". " << inputLength
+                  << " bytes in, " << bits << " bits (" << ((float) bits) / 8
+                  << " bytes) out.\n" << logofs_flush;
+
+          #endif
+        }
+
+        if (hit)
+        {
+          statistics -> addCachedReply(requestOpcode);
+        }
+
+        statistics -> addReplyBits(requestOpcode, inputLength << 3, bits);
+
+      } // End of if (inputMessage[0] == 1) ...
+      else
+      {
+        //
+        // Event or error.
+        //
+
+        unsigned char inputOpcode = *inputMessage;
+
+        unsigned int inputSequence = GetUINT(inputMessage + 2, bigEndian_);
+
+        //
+        // Check if this is an event which we can discard.
+        //
+
+        if ((inputOpcode == Expose && enableExpose_ == 0) ||
+                (inputOpcode == GraphicsExpose && enableGraphicsExpose_ == 0) ||
+                    (inputOpcode == NoExpose && enableNoExpose_ == 0))
+        {
+          continue;
+        }
+        else if (shmemState_ != NULL && shmemState_ -> enabled == 1 &&
+                     inputOpcode == shmemState_ -> event &&
+                         checkShmemEvent(inputOpcode, inputSequence,
+                             inputMessage) > 0)
+        {
+          continue;
+        }
+        else if (inputOpcode == MotionNotify)
+        {
+          //
+          // Save the motion event and send when another
+          // event or error is received or the motion ti-
+          // meout is elapsed. If a previous motion event
+          // was already saved, we replace it with the
+          // new one and don't reset the timeout, so we
+          // still have a motion event every given ms.
+          //
+
+          memcpy(lastMotion_, inputMessage, 32);
+
+          #ifdef TEST
+          *logofs << "handleRead: Saved suppressed motion event for FD#"
+                  << fd_ << ".\n" << logofs_flush;
+          #endif
+
+          continue;
+        }
+        else if (inputOpcode == X_Error)
+        {
+          //
+          // Check if this is an error that matches a
+          // sequence number for which we are expecting
+          // a reply.
+          //
+
+          unsigned short int errorSequenceNum;
+          unsigned char errorOpcode;
+
+          if (sequenceQueue_.peek(errorSequenceNum, errorOpcode) &&
+                  ((unsigned int) errorSequenceNum == inputSequence))
+          {
+            sequenceQueue_.pop(errorSequenceNum, errorOpcode);
+          }
+
+          //
+          // Check if error is due to an image commit
+          // generated at the end of a split.
+          //
+
+          if (checkCommitError(*(inputMessage + 1), inputSequence, inputMessage) > 0)
+          {
+            #ifdef TEST
+            *logofs << "handleRead: Skipping error on image commit for FD#"
+                    << fd_ << ".\n" << logofs_flush;
+            #endif
+
+            continue;
+          }
+
+          //
+          // Check if it's an error generated by a request
+          // concerning shared memory support.
+          //
+
+          else if (shmemState_ != NULL && (shmemState_ -> sequence ==
+                        inputSequence || (shmemState_ -> enabled == 1 &&
+                            (shmemState_ -> opcode == *(inputMessage + 10) ||
+                                shmemState_ -> error == *(inputMessage + 1)))) &&
+                                    checkShmemError(*(inputMessage + 1), inputSequence,
+                                        inputMessage) > 0)
+          {
+            #ifdef TEST
+            *logofs << "handleRead: Skipping error on shmem operation for FD#"
+                    << fd_ << ".\n" << logofs_flush;
+            #endif
+
+            continue;
+          }
+        }
+        //
+        // Check if user pressed the CTRL+ALT+SHIFT+ESC key
+        // sequence because was unable to kill the session
+        // through the normal procedure.
+        //
+
+        if (inputOpcode == KeyPress)
+        {
+          if (checkKeyboardEvent(inputOpcode, inputSequence, inputMessage) == 1)
+          {
+            #ifdef TEST
+            *logofs << "handleRead: Removing the key sequence from the "
+                    << "event stream for FD#" << fd_ << ".\n"
+                    << logofs_flush;
+            #endif
+
+            continue;
+          }
+        }
+
+        //
+        // We are going to handle an event or error
+        // that's not a mouse motion. Prepend any
+        // saved motion to it.
+        //
+
+        if (lastMotion_[0] != '\0')
+        {
+          if (handleMotion(encodeBuffer) < 0)
+          {
+            #ifdef PANIC
+            *logofs << "handleRead: PANIC! Can't encode motion event for FD#"
+                    << fd_ << ".\n" << logofs_flush;
+            #endif
+
+            cerr << "Error" << ": Can't encode motion event for FD#"
+                 << fd_ << ".\n";
+
+            return -1;
+          }
+        }
+
+        //
+        // Encode opcode and difference between
+        // current sequence and the last one.
+        //
+
+        encodeBuffer.encodeOpcodeValue(inputOpcode, serverCache_ -> opcodeCache);
+
+        unsigned int sequenceDiff = inputSequence - serverSequence_;
+
+        serverSequence_ = inputSequence;
+
+        #ifdef DEBUG
+        *logofs << "handleRead: Last server sequence number for FD#" 
+                << fd_ << " is " << serverSequence_ << " with "
+                << "difference " << sequenceDiff << ".\n"
+                << logofs_flush;
+        #endif
+
+        encodeBuffer.encodeCachedValue(sequenceDiff, 16,
+                           serverCache_ -> eventSequenceCache, 7);
+
+        //
+        // If differential compression is disabled
+        // then use the most simple encoding.
+        //
+
+        if (control -> LocalDeltaCompression == 0)
+        {
+          int result = handleFastReadEvent(encodeBuffer, inputOpcode,
+                                               inputMessage, inputLength);
+          if (result < 0)
+          {
+            return -1;
+          }
+          else if (result > 0)
+          {
+            continue;
+          }
+        }
+
+        switch (inputOpcode)
+        {
+        case X_Error:
+          {
+            //
+            // Set the priority flag in the case of
+            // a X protocol error. This may restart
+            // the client if it was waiting for the
+            // reply.
+            //
+
+            priority_++;
+
+            unsigned char errorCode = *(inputMessage + 1);
+
+            encodeBuffer.encodeCachedValue(errorCode, 8,
+                               serverCache_ -> errorCodeCache);
+
+            if (errorCode != 11 && errorCode != 8 &&
+                    errorCode != 15 && errorCode != 1)
+            {
+              encodeBuffer.encodeValue(GetULONG(inputMessage + 4, bigEndian_), 32, 16);
+            }
+
+            if (errorCode >= 18)
+            {
+              encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 8, bigEndian_), 16,
+                                 serverCache_ -> errorMinorCache);
+            }
+
+            encodeBuffer.encodeCachedValue(inputMessage[10], 8,
+                               serverCache_ -> errorMajorCache);
+
+            if (errorCode >= 18)
+            {
+              const unsigned char *nextSrc = inputMessage + 11;
+              for (unsigned int i = 11; i < 32; i++)
+                encodeBuffer.encodeValue(*nextSrc++, 8);
+            }
+          }
+          break;
+        case ButtonPress:
+        case ButtonRelease:
+        case KeyPress:
+        case KeyRelease:
+        case MotionNotify:
+        case EnterNotify:
+        case LeaveNotify:
+          {
+            //
+            // Set the priority in the case this is
+            // an event that the remote side may
+            // care to receive as soon as possible.
+            //
+
+            switch (inputOpcode)
+            {
+              case ButtonPress:
+              case ButtonRelease:
+              case KeyPress:
+              case KeyRelease:
+              {
+                priority_++;
+              }
+            }
+
+            unsigned char detail = inputMessage[1];
+            if (*inputMessage == MotionNotify)
+              encodeBuffer.encodeBoolValue((unsigned int) detail);
+            else if ((*inputMessage == EnterNotify) || (*inputMessage == LeaveNotify))
+              encodeBuffer.encodeValue((unsigned int) detail, 3);
+            else if (*inputMessage == KeyRelease)
+            {
+              if (detail == serverCache_ -> keyPressLastKey)
+                encodeBuffer.encodeBoolValue(1);
+              else
+              {
+                encodeBuffer.encodeBoolValue(0);
+                encodeBuffer.encodeValue((unsigned int) detail, 8);
+              }
+            }
+            else if ((*inputMessage == ButtonPress) || (*inputMessage == ButtonRelease))
+              encodeBuffer.encodeCachedValue(detail, 8,
+                                             serverCache_ -> buttonCache);
+            else
+              encodeBuffer.encodeValue((unsigned int) detail, 8);
+            unsigned int timestamp = GetULONG(inputMessage + 4, bigEndian_);
+            unsigned int timestampDiff =
+            timestamp - serverCache_ -> lastTimestamp;
+            serverCache_ -> lastTimestamp = timestamp;
+            encodeBuffer.encodeCachedValue(timestampDiff, 32,
+                                serverCache_ -> motionNotifyTimestampCache, 9);
+            int skipRest = 0;
+            if (*inputMessage == KeyRelease)
+            {
+              skipRest = 1;
+              for (unsigned int i = 8; i < 31; i++)
+              {
+                if (inputMessage[i] != serverCache_ -> keyPressCache[i - 8])
+                {
+                  skipRest = 0;
+                  break;
+                }
+              }
+              encodeBuffer.encodeBoolValue(skipRest);
+            }
+
+            if (!skipRest)
+            {
+              const unsigned char *nextSrc = inputMessage + 8;
+              for (unsigned int i = 0; i < 3; i++)
+              {
+                encodeBuffer.encodeCachedValue(GetULONG(nextSrc, bigEndian_), 29,
+                                   *serverCache_ -> motionNotifyWindowCache[i], 6);
+                nextSrc += 4;
+              }
+              unsigned int rootX  = GetUINT(inputMessage + 20, bigEndian_);
+              unsigned int rootY  = GetUINT(inputMessage + 22, bigEndian_);
+              unsigned int eventX = GetUINT(inputMessage + 24, bigEndian_);
+              unsigned int eventY = GetUINT(inputMessage + 26, bigEndian_);
+              eventX -= rootX;
+              eventY -= rootY;
+              encodeBuffer.encodeCachedValue(rootX -
+                    serverCache_ -> motionNotifyLastRootX, 16,
+                    serverCache_ -> motionNotifyRootXCache, 6);
+              serverCache_ -> motionNotifyLastRootX = rootX;
+              encodeBuffer.encodeCachedValue(rootY -
+                    serverCache_ -> motionNotifyLastRootY, 16,
+                    serverCache_ -> motionNotifyRootYCache, 6);
+              serverCache_ -> motionNotifyLastRootY = rootY;
+              encodeBuffer.encodeCachedValue(eventX, 16,
+                                   serverCache_ -> motionNotifyEventXCache, 6);
+              encodeBuffer.encodeCachedValue(eventY, 16,
+                                   serverCache_ -> motionNotifyEventYCache, 6);
+              encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 28, bigEndian_),
+                                   16, serverCache_ -> motionNotifyStateCache);
+              if ((*inputMessage == EnterNotify) || (*inputMessage == LeaveNotify))
+                encodeBuffer.encodeValue((unsigned int) inputMessage[30], 2);
+              else
+                encodeBuffer.encodeBoolValue((unsigned int) inputMessage[30]);
+              if ((*inputMessage == EnterNotify) || (*inputMessage == LeaveNotify))
+                encodeBuffer.encodeValue((unsigned int) inputMessage[31], 2);
+              else if (*inputMessage == KeyPress)
+              {
+                serverCache_ -> keyPressLastKey = detail;
+                for (unsigned int i = 8; i < 31; i++)
+                {
+                  serverCache_ -> keyPressCache[i - 8] = inputMessage[i];
+                }
+              }
+            }
+          }
+          break;
+        case ColormapNotify:
+          {
+            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_),
+                             29, serverCache_ -> colormapNotifyWindowCache, 8);
+            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_),
+                           29, serverCache_ -> colormapNotifyColormapCache, 8);
+            encodeBuffer.encodeBoolValue((unsigned int) inputMessage[12]);
+            encodeBuffer.encodeBoolValue((unsigned int) inputMessage[13]);
+          }
+          break;
+        case ConfigureNotify:
+          {
+            const unsigned char *nextSrc = inputMessage + 4;
+            for (unsigned int i = 0; i < 3; i++)
+            {
+              encodeBuffer.encodeCachedValue(GetULONG(nextSrc, bigEndian_), 29,
+                                 *serverCache_ -> configureNotifyWindowCache[i], 9);
+              nextSrc += 4;
+            }
+            for (unsigned int j = 0; j < 5; j++)
+            {
+              encodeBuffer.encodeCachedValue(GetUINT(nextSrc, bigEndian_), 16,
+                                 *serverCache_ -> configureNotifyGeomCache[j], 8);
+              nextSrc += 2;
+            }
+            encodeBuffer.encodeBoolValue(*nextSrc);
+          }
+          break;
+        case CreateNotify:
+          {
+            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_),
+                        29, serverCache_ -> createNotifyWindowCache, 9);
+            unsigned int window = GetULONG(inputMessage + 8, bigEndian_);
+            encodeBuffer.encodeValue(window -
+                             serverCache_ -> createNotifyLastWindow, 29, 5);
+            serverCache_ -> createNotifyLastWindow = window;
+            const unsigned char* nextSrc = inputMessage + 12;
+            for (unsigned int i = 0; i < 5; i++)
+            {
+              encodeBuffer.encodeValue(GetUINT(nextSrc, bigEndian_), 16, 9);
+              nextSrc += 2;
+            }
+            encodeBuffer.encodeBoolValue(*nextSrc);
+          }
+          break;
+        case Expose:
+          {
+            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_), 29,
+                               serverCache_ -> exposeWindowCache, 9);
+            const unsigned char *nextSrc = inputMessage + 8;
+            for (unsigned int i = 0; i < 5; i++)
+            {
+              encodeBuffer.encodeCachedValue(GetUINT(nextSrc, bigEndian_), 16,
+                                 *serverCache_ -> exposeGeomCache[i], 6);
+              nextSrc += 2;
+            }
+          }
+          break;
+        case FocusIn:
+        case FocusOut:
+          {
+            encodeBuffer.encodeValue((unsigned int) inputMessage[1], 3);
+            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_),
+                                    29, serverCache_ -> focusInWindowCache, 9);
+            encodeBuffer.encodeValue((unsigned int) inputMessage[8], 2);
+          }
+          break;
+        case KeymapNotify:
+          {
+          if (ServerCache::lastKeymap.compare(31, inputMessage + 1))
+              encodeBuffer.encodeBoolValue(1);
+            else
+            {
+              encodeBuffer.encodeBoolValue(0);
+              const unsigned char *nextSrc = inputMessage + 1;
+              for (unsigned int i = 1; i < 32; i++)
+                encodeBuffer.encodeValue((unsigned int) *nextSrc++, 8);
+            }
+          }
+          break;
+        case MapNotify:
+        case UnmapNotify:
+        case DestroyNotify:
+          {
+            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_),
+                                   29, serverCache_ -> mapNotifyEventCache, 9);
+            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_),
+                                  29, serverCache_ -> mapNotifyWindowCache, 9);
+            if ((*inputMessage == MapNotify) || (*inputMessage == UnmapNotify))
+              encodeBuffer.encodeBoolValue((unsigned int) inputMessage[12]);
+          }
+          break;
+        case NoExpose:
+          {
+            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_),
+                                 29, serverCache_ -> noExposeDrawableCache, 9);
+            encodeBuffer.encodeCachedValue(GetUINT(inputMessage + 8, bigEndian_), 16,
+                                           serverCache_ -> noExposeMinorCache);
+            encodeBuffer.encodeCachedValue(inputMessage[10], 8,
+                                           serverCache_ -> noExposeMajorCache);
+          }
+          break;
+        case PropertyNotify:
+          {
+            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_),
+                             29, serverCache_ -> propertyNotifyWindowCache, 9);
+            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_),
+                               29, serverCache_ -> propertyNotifyAtomCache, 9);
+            unsigned int timestamp = GetULONG(inputMessage + 12, bigEndian_);
+            unsigned int timestampDiff =
+            timestamp - serverCache_ -> lastTimestamp;
+            serverCache_ -> lastTimestamp = timestamp;
+            encodeBuffer.encodeValue(timestampDiff, 32, 9);
+            encodeBuffer.encodeBoolValue((unsigned int) inputMessage[16]);
+          }
+          break;
+        case ReparentNotify:
+          {
+            const unsigned char* nextSrc = inputMessage + 4;
+            for (unsigned int i = 0; i < 3; i++)
+            {
+              encodeBuffer.encodeCachedValue(GetULONG(nextSrc, bigEndian_),
+                     29, serverCache_ -> reparentNotifyWindowCache, 9);
+              nextSrc += 4;
+            }
+            encodeBuffer.encodeValue(GetUINT(nextSrc, bigEndian_), 16, 6);
+            encodeBuffer.encodeValue(GetUINT(nextSrc + 2, bigEndian_), 16, 6);
+            encodeBuffer.encodeBoolValue((unsigned int)inputMessage[20]);
+          }
+          break;
+        case SelectionClear:
+          {
+            unsigned int timestamp = GetULONG(inputMessage + 4, bigEndian_);
+            unsigned int timestampDiff = timestamp - serverCache_ -> lastTimestamp;
+            serverCache_ -> lastTimestamp = timestamp;
+            encodeBuffer.encodeValue(timestampDiff, 32, 9);
+            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_),
+                           29, serverCache_ -> selectionClearWindowCache, 9);
+            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 12, bigEndian_),
+                           29, serverCache_ -> selectionClearAtomCache, 9);
+          }
+          break;
+        case SelectionRequest:
+          {
+            unsigned int timestamp = GetULONG(inputMessage + 4, bigEndian_);
+            unsigned int timestampDiff = timestamp - serverCache_ -> lastTimestamp;
+            serverCache_ -> lastTimestamp = timestamp;
+            encodeBuffer.encodeValue(timestampDiff, 32, 9);
+            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_),
+                           29, serverCache_ -> selectionClearWindowCache, 9);
+            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 12, bigEndian_),
+                           29, serverCache_ -> selectionClearWindowCache, 9);
+            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 16, bigEndian_),
+                           29, serverCache_ -> selectionClearAtomCache, 9);
+            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 20, bigEndian_),
+                           29, serverCache_ -> selectionClearAtomCache, 9);
+            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 24, bigEndian_),
+                           29, serverCache_ -> selectionClearAtomCache, 9);
+          }
+          break;
+        case VisibilityNotify:
+          {
+            encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 4, bigEndian_),
+                           29, serverCache_ -> visibilityNotifyWindowCache, 9);
+            encodeBuffer.encodeValue((unsigned int) inputMessage[8], 2);
+          }
+          break;
+        default:
+          {
+            #ifdef TEST
+            *logofs << "handleRead: Using generic event compression "
+                    << "for OPCODE#" << (unsigned int) inputOpcode
+                    << ".\n" << logofs_flush;
+            #endif
+
+            encodeBuffer.encodeCachedValue(*(inputMessage + 1), 8,
+                         serverCache_ -> genericEventCharCache);
+
+            for (unsigned int i = 0; i < 14; i++)
+            {
+              encodeBuffer.encodeCachedValue(GetUINT(inputMessage + i * 2 + 4, bigEndian_),
+                                 16, *serverCache_ -> genericEventIntCache[i]);
+            }
+          }
+
+        } // switch (inputOpcode)...
+
+        int bits = encodeBuffer.diffBits();
+
+        #if defined(TEST) || defined(OPCODES)
+
+        if (*inputMessage == X_Error)
+        {
+          unsigned char code = *(inputMessage + 1);
+
+          *logofs << "handleRead: Handled error ERR_CODE#"
+                  << (unsigned int) code << " for FD#" << fd_;
+
+          *logofs << " RES_ID#" << GetULONG(inputMessage + 4, bigEndian_);
+
+          *logofs << " MIN_OP#" << GetUINT(inputMessage + 8, bigEndian_);
+
+          *logofs << " MAJ_OP#" << (unsigned int) *(inputMessage + 10);
+
+          *logofs << " sequence " << inputSequence << ". " << inputLength
+                  << " bytes in, " << bits << " bits (" << ((float) bits) / 8
+                  << " bytes) out.\n" << logofs_flush;
+        }
+        else
+        {
+          *logofs << "handleRead: Handled event OPCODE#"
+                  << (unsigned int) *inputMessage << " for FD#" << fd_
+                  << " sequence " << inputSequence << ". " << inputLength
+                  << " bytes in, " << bits << " bits (" << ((float) bits) / 8
+                  << " bytes) out.\n" << logofs_flush;
+        }
+
+        #endif
+
+        statistics -> addEventBits(*inputMessage, inputLength << 3, bits);
+
+      } // End of if (inputMessage[0] == X_Reply) ... else ...
+
+    } // End of if (firstReply_) ... else ...
+
+  } // End of while ((inputMessage = readBuffer_.getMessage(inputLength)) != 0) ...
+
+  //
+  // Check if we need to flush because of
+  // prioritized data.
+  //
+
+  if (priority_ > 0)
+  {
+    #if defined(TEST) || defined(INFO)
+    *logofs << "handleRead: WARNING! Requesting flush "
+            << "because of " << priority_ << " prioritized "
+            << "messages for FD#" << fd_ << ".\n"
+            << logofs_flush;
+    #endif
+
+    if (proxy -> handleAsyncPriority() < 0)
+    {
+      return -1;
+    }
+
+    //
+    // Reset the priority flag.
+    //
+
+    priority_ = 0;
+  }
+
+  //
+  // Flush if we produced enough data.
+  //
+
+  if (proxy -> canAsyncFlush() == 1)
+  {
+    #if defined(TEST) || defined(INFO)
+    *logofs << "handleRead: WARNING! Requesting flush "
+            << "because of token length exceeded.\n"
+            << logofs_flush;
+    #endif
+
+    if (proxy -> handleAsyncFlush() < 0)
+    {
+      return -1;
+    }
+  }
+
+  #if defined(TEST) || defined(INFO)
+
+  if (transport_ -> pending() != 0 ||
+          readBuffer_.checkMessage() != 0)
+  {
+    *logofs << "handleRead: PANIC! Buffer for X descriptor FD#"
+            << fd_ << " has " << transport_ -> pending()
+            << " bytes to read.\n" << logofs_flush;
+
+    HandleCleanup();
+  }
+
+  #endif
+
+  //
+  // Reset the read buffer.
+  //
+
+  readBuffer_.fullReset();
+
+  return 1;
+}
+
+//
+// End of handleRead().
+//
+
+//
+// Beginning of handleWrite().
+//
+
+int ServerChannel::handleWrite(const unsigned char *message, unsigned int length)
+{
+  #ifdef TEST
+  *logofs << "handleWrite: Called for FD#" << fd_
+          << ".\n" << logofs_flush;
+  #endif
+
+  //
+  // Create the buffer from which to 
+  // decode messages.
+  //
+
+  DecodeBuffer decodeBuffer(message, length);
+
+  #if defined(TEST) || defined(INFO) || defined(FLUSH)
+  *logofs << "handleWrite: Decoding messages for FD#" << fd_
+          << " with " << length << " bytes in the buffer.\n"
+          << logofs_flush;
+  #endif
+
+  if (firstRequest_)
+  {
+    //
+    // Need to add the length of the first request
+    // because it was not present in the previous
+    // versions. Length of the first request was
+    // assumed to be the same as the encode buffer
+    // but this may be not the case if a different
+    // encoding is used.
+    //
+
+    // Since ProtoStep7 (#issue 108)
+    decodeBuffer.decodeValue(length, 8);
+
+    unsigned int nextByte;
+    unsigned char *outputMessage = writeBuffer_.addMessage(length);
+    unsigned char *nextDest = outputMessage;
+
+    for (unsigned int i = 0; i < length; i++)
+    {
+      decodeBuffer.decodeValue(nextByte, 8);
+
+      *nextDest++ = (unsigned char) nextByte;
+    }
+
+    if (*outputMessage == 0x42)
+    {
+      setBigEndian(1);
+    }
+    else
+    {
+      setBigEndian(0);
+    }
+
+    #ifdef TEST
+    *logofs << "handleWrite: First request detected.\n" << logofs_flush;
+    #endif
+
+    //
+    // Handle the fake authorization cookie.
+    //
+
+    if (handleAuthorization(outputMessage) < 0)
+    {
+      return -1;
+    }
+
+    firstRequest_ = 0;
+
+  } // End of if (firstRequest_)
+
+  //
+  // This was previously in a 'else' block.
+  // Due to the way the first request was
+  // handled, we could not decode multiple
+  // messages in the first frame.
+  //
+
+  { // Start of the decoding block.
+
+    unsigned char outputOpcode;
+
+    unsigned char *outputMessage;
+    unsigned int outputLength;
+
+    //
+    // Set when message is found in cache.
+    //
+
+    int hit;
+
+    while (decodeBuffer.decodeOpcodeValue(outputOpcode, clientCache_ -> opcodeCache, 1))
+    {
+      hit = 0;
+
+      //
+      // Splits are sent by client proxy outside the
+      // normal read loop. As we 'insert' splits in
+      // the real client-server X protocol, we must
+      // avoid to increment the sequence number or
+      // our clients would get confused.
+      //
+
+      if (outputOpcode != opcodeStore_ -> splitData)
+      {
+        clientSequence_++;
+        clientSequence_ &= 0xffff;
+
+        #ifdef DEBUG
+        *logofs << "handleWrite: Last client sequence number for FD#" 
+                << fd_ << " is " << clientSequence_ << ".\n"
+                << logofs_flush;
+        #endif
+      }
+      else
+      {
+        //
+        // It's a split, not a normal
+        // burst of proxy data.
+        //
+
+        handleSplit(decodeBuffer);
+
+        continue;
+      }
+
+      #ifdef SUSPEND
+
+      if (clientSequence_ == 1000)
+      {
+        cerr << "Warning" << ": Exiting to test the resilience of the agent.\n";
+
+        sleep(2);
+
+        HandleAbort();
+      }
+
+      #endif
+
+      //
+      // Is differential encoding disabled?
+      //
+
+      if (control -> RemoteDeltaCompression == 0)
+      {
+        int result = handleFastWriteRequest(decodeBuffer, outputOpcode,
+                                                outputMessage, outputLength);
+        if (result < 0)
+        {
+          return -1;
+        }
+        else if (result > 0)
+        {
+          continue;
+        }
+      }
+
+      //
+      // General-purpose temp variables for
+      // decoding ints and chars.
+      //
+
+      unsigned int value;
+      unsigned char cValue;
+
+      #ifdef DEBUG
+      *logofs << "handleWrite: Going to handle request OPCODE#"
+              << (unsigned int) outputOpcode << " (" << DumpOpcode(outputOpcode)
+              << ") for FD#" << fd_ << " sequence " << clientSequence_
+              << ".\n" << logofs_flush;
+      #endif
+
+      switch (outputOpcode)
+      {
+      case X_AllocColor:
+        {
+          outputLength = 16;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          decodeBuffer.decodeCachedValue(value, 29,
+                             clientCache_ -> colormapCache);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          unsigned char *nextDest = outputMessage + 8;
+          unsigned int colorData[3];
+
+          for (unsigned int i = 0; i < 3; i++)
+          {
+            decodeBuffer.decodeCachedValue(value, 16,
+                               *(clientCache_ -> allocColorRGBCache[i]), 4);
+            PutUINT(value, nextDest, bigEndian_);
+            colorData[i] = value;
+            nextDest += 2;
+          }
+
+          sequenceQueue_.push(clientSequence_, outputOpcode,
+                                  colorData[0], colorData[1], colorData[2]);
+        }
+        break;
+      case X_ReparentWindow:
+        {
+          outputLength = 16;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> windowCache);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> windowCache);
+          PutULONG(value, outputMessage + 8, bigEndian_);
+          decodeBuffer.decodeValue(value, 16, 11);
+          PutUINT(value, outputMessage + 12, bigEndian_);
+          decodeBuffer.decodeValue(value, 16, 11);
+          PutUINT(value, outputMessage + 14, bigEndian_);
+        }
+        break;
+      case X_ChangeProperty:
+        {
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_ChangeProperty);
+
+          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
+                                     outputMessage, outputLength))
+          {
+            break;
+          }
+
+          unsigned char format;
+          decodeBuffer.decodeCachedValue(format, 8,
+                             clientCache_ -> changePropertyFormatCache);
+          unsigned int dataLength;
+          decodeBuffer.decodeValue(dataLength, 32, 6);
+          outputLength = 24 + RoundUp4(dataLength * (format >> 3));
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          decodeBuffer.decodeValue(value, 2);
+          outputMessage[1] = (unsigned char) value;
+          decodeBuffer.decodeXidValue(value, clientCache_ -> windowCache);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          decodeBuffer.decodeCachedValue(value, 29,
+                             clientCache_ -> changePropertyPropertyCache, 9);
+          PutULONG(value, outputMessage + 8, bigEndian_);
+          decodeBuffer.decodeCachedValue(value, 29,
+                             clientCache_ -> changePropertyTypeCache, 9);
+          PutULONG(value, outputMessage + 12, bigEndian_);
+          outputMessage[16] = format;
+          PutULONG(dataLength, outputMessage + 20, bigEndian_);
+          unsigned char *nextDest = outputMessage + 24;
+
+          if (format == 8)
+          {
+            // Since ProtoStep7 (#issue 108)
+            decodeBuffer.decodeTextData(nextDest, dataLength);
+          }
+          else if (format == 32)
+          {
+            for (unsigned int i = 0; i < dataLength; i++)
+            {
+              decodeBuffer.decodeCachedValue(value, 32,
+                                 clientCache_ -> changePropertyData32Cache);
+
+              PutULONG(value, nextDest, bigEndian_);
+
+              nextDest += 4;
+            }
+          }
+          else
+          {
+            for (unsigned int i = 0; i < dataLength; i++)
+            {
+              decodeBuffer.decodeValue(value, 16);
+
+              PutUINT(value, nextDest, bigEndian_);
+
+              nextDest += 2;
+            }
+          }
+
+          handleSave(messageStore, outputMessage, outputLength);
+        }
+        break;
+      case X_SendEvent:
+        {
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_SendEvent);
+
+          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
+                                     outputMessage, outputLength))
+          {
+            break;
+          }
+
+          outputLength = 44;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          decodeBuffer.decodeBoolValue(value);
+          *(outputMessage + 1) = value;
+          decodeBuffer.decodeBoolValue(value);
+          if (value)
+          {
+            decodeBuffer.decodeBoolValue(value);
+          }
+          else
+          {
+            decodeBuffer.decodeXidValue(value, clientCache_ -> windowCache);
+          }
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          decodeBuffer.decodeCachedValue(value, 32,
+                       clientCache_ -> sendEventMaskCache, 9);
+          PutULONG(value, outputMessage + 8, bigEndian_);
+          decodeBuffer.decodeCachedValue(*(outputMessage + 12), 8,
+                       clientCache_ -> sendEventCodeCache);
+          decodeBuffer.decodeCachedValue(*(outputMessage + 13), 8,
+                       clientCache_ -> sendEventByteDataCache);
+          decodeBuffer.decodeValue(value, 16, 4);
+          clientCache_ -> sendEventLastSequence += value;
+          clientCache_ -> sendEventLastSequence &= 0xffff;
+          PutUINT(clientCache_ -> sendEventLastSequence, outputMessage + 14, bigEndian_);
+          decodeBuffer.decodeCachedValue(value, 32,
+                       clientCache_ -> sendEventIntDataCache);
+          PutULONG(value, outputMessage + 16, bigEndian_);
+
+          for (unsigned int i = 20; i < 44; i++)
+          {
+            decodeBuffer.decodeCachedValue(cValue, 8,
+                               clientCache_ -> sendEventEventCache);
+            *(outputMessage + i) = cValue;
+          }
+
+          handleSave(messageStore, outputMessage, outputLength);
+        }
+        break;
+      case X_ChangeWindowAttributes:
+        {
+          unsigned int numAttrs;
+          decodeBuffer.decodeValue(numAttrs, 4);
+          outputLength = 12 + (numAttrs << 2);
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> windowCache);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          unsigned int bitmask;
+          decodeBuffer.decodeCachedValue(bitmask, 15,
+                                     clientCache_ -> createWindowBitmaskCache);
+          PutULONG(bitmask, outputMessage + 8, bigEndian_);
+          unsigned char *nextDest = outputMessage + 12;
+          unsigned int mask = 0x1;
+          for (unsigned int i = 0; i < 15; i++)
+          {
+            if (bitmask & mask)
+            {
+              decodeBuffer.decodeCachedValue(value, 32,
+                                 *clientCache_ -> createWindowAttrCache[i]);
+              PutULONG(value, nextDest, bigEndian_);
+              nextDest += 4;
+            }
+            mask <<= 1;
+          }
+        }
+        break;
+      case X_ClearArea:
+        {
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_ClearArea);
+
+          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
+                                     outputMessage, outputLength))
+          {
+            break;
+          }
+
+          outputLength = 16;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          decodeBuffer.decodeBoolValue(value);
+          outputMessage[1] = (unsigned char) value;
+          decodeBuffer.decodeXidValue(value, clientCache_ -> windowCache);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          unsigned char *nextDest = outputMessage + 8;
+          for (unsigned int i = 0; i < 4; i++)
+          {
+            decodeBuffer.decodeCachedValue(value, 16,
+                               *clientCache_ -> clearAreaGeomCache[i], 8);
+            PutUINT(value, nextDest, bigEndian_);
+            nextDest += 2;
+          }
+
+          handleSave(messageStore, outputMessage, outputLength);
+        }
+        break;
+      case X_CloseFont:
+        {
+          outputLength = 8;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          decodeBuffer.decodeValue(value, 29, 5);
+          clientCache_ -> lastFont += value;
+          clientCache_ -> lastFont &= 0x1fffffff;
+          PutULONG(clientCache_ -> lastFont, outputMessage + 4, bigEndian_);
+        }
+        break;
+      case X_ConfigureWindow:
+        {
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_ConfigureWindow);
+
+          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
+                                     outputMessage, outputLength))
+          {
+            break;
+          }
+
+          outputLength = 12;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          writeBuffer_.registerPointer(&outputMessage);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> windowCache);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          unsigned int bitmask;
+          decodeBuffer.decodeCachedValue(bitmask, 7,
+                                  clientCache_ -> configureWindowBitmaskCache);
+          PutUINT(bitmask, outputMessage + 8, bigEndian_);
+          unsigned int mask = 0x1;
+          for (unsigned int i = 0; i < 7; i++)
+          {
+            if (bitmask & mask)
+            {
+              unsigned char* nextDest = writeBuffer_.addMessage(4);
+              outputLength += 4;
+              decodeBuffer.decodeCachedValue(value, CONFIGUREWINDOW_FIELD_WIDTH[i],
+                                 *clientCache_ -> configureWindowAttrCache[i], 8);
+              PutULONG(value, nextDest, bigEndian_);
+              nextDest += 4;
+            }
+            mask <<= 1;
+          }
+          writeBuffer_.unregisterPointer();
+
+          handleSave(messageStore, outputMessage, outputLength);
+        }
+        break;
+      case X_ConvertSelection:
+        {
+          outputLength = 24;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          decodeBuffer.decodeCachedValue(value, 29,
+                             clientCache_ -> convertSelectionRequestorCache, 9);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          unsigned char* nextDest = outputMessage + 8;
+          for (unsigned int i = 0; i < 3; i++)
+          {
+            decodeBuffer.decodeCachedValue(value, 29,
+                               *(clientCache_ -> convertSelectionAtomCache[i]), 9);
+            PutULONG(value, nextDest, bigEndian_);
+            nextDest += 4;
+          }
+          decodeBuffer.decodeValue(value, 32, 4);
+          clientCache_ -> convertSelectionLastTimestamp += value;
+          PutULONG(clientCache_ -> convertSelectionLastTimestamp,
+                   nextDest, bigEndian_);
+        }
+        break;
+      case X_CopyArea:
+        {
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_CopyArea);
+
+          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
+                                     outputMessage, outputLength))
+          {
+            break;
+          }
+
+          outputLength = 28;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
+          PutULONG(value, outputMessage + 8, bigEndian_);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
+          PutULONG(value, outputMessage + 12, bigEndian_);
+          unsigned char *nextDest = outputMessage + 16;
+          for (unsigned int i = 0; i < 6; i++)
+          {
+            decodeBuffer.decodeCachedValue(value, 16,
+                               *clientCache_ -> copyAreaGeomCache[i], 8);
+            PutUINT(value, nextDest, bigEndian_);
+            nextDest += 2;
+          }
+
+          handleSave(messageStore, outputMessage, outputLength);
+        }
+        break;
+      case X_CopyGC:
+        {
+          outputLength = 16;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
+          PutULONG(value, outputMessage + 8, bigEndian_);
+          decodeBuffer.decodeCachedValue(value, 23,
+                             clientCache_ -> createGCBitmaskCache);
+          PutULONG(value, outputMessage + 12, bigEndian_);
+        }
+        break;
+      case X_CopyPlane:
+        {
+          outputLength = 32;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
+          PutULONG(value, outputMessage + 8, bigEndian_);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
+          PutULONG(value, outputMessage + 12, bigEndian_);
+          unsigned char *nextDest = outputMessage + 16;
+          for (unsigned int i = 0; i < 6; i++)
+          {
+            decodeBuffer.decodeCachedValue(value, 16,
+                               *clientCache_ -> copyPlaneGeomCache[i], 8);
+            PutUINT(value, nextDest, bigEndian_);
+            nextDest += 2;
+          }
+          decodeBuffer.decodeCachedValue(value, 32,
+                             clientCache_ -> copyPlaneBitPlaneCache, 10);
+          PutULONG(value, outputMessage + 28, bigEndian_);
+        }
+        break;
+      case X_CreateGC:
+        {
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_CreateGC);
+
+          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
+                                     outputMessage, outputLength))
+          {
+            break;
+          }
+
+          outputLength = 16;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          writeBuffer_.registerPointer(&outputMessage);
+
+          // Since ProtoStep7 (#issue 108)
+          decodeBuffer.decodeNewXidValue(value, clientCache_ -> lastId,
+                             clientCache_ -> lastIdCache, clientCache_ -> gcCache,
+                                 clientCache_ -> freeGCCache);
+
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          unsigned int offset = 8;
+          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
+          PutULONG(value, outputMessage + offset, bigEndian_);
+          offset += 4;
+          unsigned int bitmask;
+          decodeBuffer.decodeCachedValue(bitmask, 23,
+                                         clientCache_ -> createGCBitmaskCache);
+          PutULONG(bitmask, outputMessage + offset, bigEndian_);
+          unsigned int mask = 0x1;
+          for (unsigned int i = 0; i < 23; i++)
+          {
+            if (bitmask & mask)
+            {
+              unsigned char* nextDest = writeBuffer_.addMessage(4);
+              outputLength += 4;
+              unsigned int fieldWidth = CREATEGC_FIELD_WIDTH[i];
+              if (fieldWidth <= 4)
+                decodeBuffer.decodeValue(value, fieldWidth);
+              else
+                decodeBuffer.decodeCachedValue(value, fieldWidth,
+                                   *clientCache_ -> createGCAttrCache[i]);
+              PutULONG(value, nextDest, bigEndian_);
+            }
+            mask <<= 1;
+          }
+          writeBuffer_.unregisterPointer();
+
+          handleSave(messageStore, outputMessage, outputLength);
+        }
+        break;
+      case X_ChangeGC:
+        {
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_ChangeGC);
+
+          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
+                                     outputMessage, outputLength))
+          {
+            break;
+          }
+
+          outputLength = 12;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          writeBuffer_.registerPointer(&outputMessage);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          unsigned int offset = 8;
+          unsigned int bitmask;
+          decodeBuffer.decodeCachedValue(bitmask, 23,
+                                         clientCache_ -> createGCBitmaskCache);
+          PutULONG(bitmask, outputMessage + offset, bigEndian_);
+          unsigned int mask = 0x1;
+          for (unsigned int i = 0; i < 23; i++)
+          {
+            if (bitmask & mask)
+            {
+              unsigned char* nextDest = writeBuffer_.addMessage(4);
+              outputLength += 4;
+              unsigned int fieldWidth = CREATEGC_FIELD_WIDTH[i];
+              if (fieldWidth <= 4)
+                decodeBuffer.decodeValue(value, fieldWidth);
+              else
+                decodeBuffer.decodeCachedValue(value, fieldWidth,
+                                   *clientCache_ -> createGCAttrCache[i]);
+              PutULONG(value, nextDest, bigEndian_);
+            }
+            mask <<= 1;
+          }
+          writeBuffer_.unregisterPointer();
+
+          handleSave(messageStore, outputMessage, outputLength);
+        }
+        break;
+      case X_CreatePixmap:
+        {
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_CreatePixmap);
+
+          hit = handleDecode(decodeBuffer, clientCache_, messageStore,
+                                 outputOpcode, outputMessage, outputLength);
+        }
+        break;
+      case X_CreateWindow:
+        {
+          outputLength = 32;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          writeBuffer_.registerPointer(&outputMessage);
+          decodeBuffer.decodeCachedValue(cValue, 8, clientCache_ -> depthCache);
+          outputMessage[1] = cValue;
+          decodeBuffer.decodeXidValue(value, clientCache_ -> windowCache);
+          PutULONG(value, outputMessage + 8, bigEndian_);
+
+          // Since ProtoStep7 (#issue 108)
+          decodeBuffer.decodeNewXidValue(value, clientCache_ -> lastId,
+                             clientCache_ -> lastIdCache, clientCache_ -> windowCache,
+                                 clientCache_ -> freeWindowCache);
+
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          unsigned char *nextDest = outputMessage + 12;
+          unsigned int i;
+          for (i = 0; i < 6; i++)
+          {
+            decodeBuffer.decodeCachedValue(value, 16,
+                               *clientCache_ -> createWindowGeomCache[i], 8);
+            PutUINT(value, nextDest, bigEndian_);
+            nextDest += 2;
+          }
+          decodeBuffer.decodeCachedValue(value, 29, clientCache_ -> visualCache);
+          PutULONG(value, outputMessage + 24, bigEndian_);
+          unsigned int bitmask;
+          decodeBuffer.decodeCachedValue(bitmask, 15,
+                                     clientCache_ -> createWindowBitmaskCache);
+          PutULONG(bitmask, outputMessage + 28, bigEndian_);
+          unsigned int mask = 0x1;
+          for (i = 0; i < 15; i++)
+          {
+            if (bitmask & mask)
+            {
+              nextDest = writeBuffer_.addMessage(4);
+              outputLength += 4;
+              decodeBuffer.decodeCachedValue(value, 32,
+                                 *clientCache_ -> createWindowAttrCache[i]);
+              PutULONG(value, nextDest, bigEndian_);
+            }
+            mask <<= 1;
+          }
+          writeBuffer_.unregisterPointer();
+        }
+        break;
+      case X_DeleteProperty:
+        {
+          outputLength = 12;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> windowCache);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          decodeBuffer.decodeValue(value, 29, 9);
+          PutULONG(value, outputMessage + 8, bigEndian_);
+        }
+        break;
+      case X_FillPoly:
+        {
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_FillPoly);
+
+          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
+                                     outputMessage, outputLength))
+          {
+            break;
+          }
+
+          unsigned int numPoints;
+
+          // Since ProtoStep10 (#issue 108)
+          decodeBuffer.decodeCachedValue(numPoints, 16,
+                             clientCache_ -> fillPolyNumPointsCache, 4);
+
+          outputLength = 16 + (numPoints << 2);
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
+          PutULONG(value, outputMessage + 8, bigEndian_);
+          decodeBuffer.decodeValue(value, 2);
+          outputMessage[12] = (unsigned char) value;
+          unsigned int relativeCoordMode;
+          decodeBuffer.decodeBoolValue(relativeCoordMode);
+          outputMessage[13] = (unsigned char) relativeCoordMode;
+          unsigned char *nextDest = outputMessage + 16;
+          unsigned int pointIndex = 0;
+          for (unsigned int i = 0; i < numPoints; i++)
+          {
+            if (relativeCoordMode)
+            {
+              decodeBuffer.decodeCachedValue(value, 16,
+                                 *clientCache_ -> fillPolyXRelCache[pointIndex], 8);
+              PutUINT(value, nextDest, bigEndian_);
+              nextDest += 2;
+              decodeBuffer.decodeCachedValue(value, 16,
+                                 *clientCache_ -> fillPolyYRelCache[pointIndex], 8);
+              PutUINT(value, nextDest, bigEndian_);
+              nextDest += 2;
+            }
+            else
+            {
+              unsigned int x, y;
+              decodeBuffer.decodeBoolValue(value);
+              if (value)
+              {
+                decodeBuffer.decodeValue(value, 3);
+                x = clientCache_ -> fillPolyRecentX[value];
+                y = clientCache_ -> fillPolyRecentY[value];
+              }
+              else
+              {
+                decodeBuffer.decodeCachedValue(x, 16,
+                                   *clientCache_ -> fillPolyXAbsCache[pointIndex], 8);
+                decodeBuffer.decodeCachedValue(y, 16,
+                                   *clientCache_ -> fillPolyYAbsCache[pointIndex], 8);
+                clientCache_ -> fillPolyRecentX[clientCache_ -> fillPolyIndex] = x;
+                clientCache_ -> fillPolyRecentY[clientCache_ -> fillPolyIndex] = y;
+                clientCache_ -> fillPolyIndex++;
+                if (clientCache_ -> fillPolyIndex == 8)
+                  clientCache_ -> fillPolyIndex = 0;
+              }
+              PutUINT(x, nextDest, bigEndian_);
+              nextDest += 2;
+              PutUINT(y, nextDest, bigEndian_);
+              nextDest += 2;
+            }
+
+            if (++pointIndex == 10) pointIndex = 0;
+          }
+
+          handleSave(messageStore, outputMessage, outputLength);
+        }
+        break;
+      case X_FreeColors:
+        {
+          unsigned int numPixels;
+          decodeBuffer.decodeValue(numPixels, 16, 4);
+          outputLength = 12 + (numPixels << 2);
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          decodeBuffer.decodeCachedValue(value, 29,
+                             clientCache_ -> colormapCache);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          decodeBuffer.decodeValue(value, 32, 4);
+          PutULONG(value, outputMessage + 8, bigEndian_);
+          unsigned char* nextDest = outputMessage + 12;
+          while (numPixels)
+          {
+            decodeBuffer.decodeValue(value, 32, 8);
+            PutULONG(value, nextDest, bigEndian_);
+            nextDest += 4;
+            numPixels--;
+          }
+        }
+        break;
+      case X_FreeCursor:
+        {
+          outputLength = 8;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          decodeBuffer.decodeCachedValue(value, 29, clientCache_ -> cursorCache, 9);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+        }
+        break;
+      case X_FreeGC:
+        {
+          outputLength = 8;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+
+          // Since ProtoStep7 (#issue 108)
+          decodeBuffer.decodeFreeXidValue(value, clientCache_ -> freeGCCache);
+
+          PutULONG(value, outputMessage + 4, bigEndian_);
+        }
+        break;
+      case X_FreePixmap:
+        {
+          outputLength = 8;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+
+          // Since ProtoStep7 (#issue 108)
+          decodeBuffer.decodeFreeXidValue(value, clientCache_ -> freeDrawableCache);
+
+          PutULONG(value, outputMessage + 4, bigEndian_);
+        }
+        break;
+      case X_GetAtomName:
+        {
+          outputLength = 8;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          decodeBuffer.decodeValue(value, 29, 9);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+
+          sequenceQueue_.push(clientSequence_, outputOpcode);
+        }
+        break;
+      case X_GetGeometry:
+        {
+          outputLength = 8;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+
+          sequenceQueue_.push(clientSequence_, outputOpcode);
+        }
+        break;
+      case X_GetInputFocus:
+        {
+          outputLength = 4;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+
+          sequenceQueue_.push(clientSequence_, outputOpcode, outputOpcode);
+        }
+        break;
+      case X_GetModifierMapping:
+        {
+          outputLength = 4;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+
+          sequenceQueue_.push(clientSequence_, outputOpcode);
+        }
+        break;
+      case X_GetKeyboardMapping:
+        {
+          outputLength = 8;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          decodeBuffer.decodeValue(value, 8);
+          outputMessage[4] = value;
+          decodeBuffer.decodeValue(value, 8);
+          outputMessage[5] = value;
+
+          sequenceQueue_.push(clientSequence_, outputOpcode);
+        }
+        break;
+      case X_GetProperty:
+        {
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_GetProperty);
+
+          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
+                                     outputMessage, outputLength))
+          {
+            //
+            // Save a reference to identify the reply.
+            //
+
+            unsigned int property = GetULONG(outputMessage + 8, bigEndian_);
+
+            sequenceQueue_.push(clientSequence_, outputOpcode, property);
+
+            break;
+          }
+
+          outputLength = 24;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          decodeBuffer.decodeBoolValue(value);
+          outputMessage[1] = (unsigned char) value;
+          decodeBuffer.decodeXidValue(value, clientCache_ -> windowCache);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          unsigned int property;
+          decodeBuffer.decodeValue(property, 29, 9);
+          PutULONG(property, outputMessage + 8, bigEndian_);
+          decodeBuffer.decodeValue(value, 29, 9);
+          PutULONG(value, outputMessage + 12, bigEndian_);
+          decodeBuffer.decodeValue(value, 32, 2);
+          PutULONG(value, outputMessage + 16, bigEndian_);
+          decodeBuffer.decodeValue(value, 32, 8);
+          PutULONG(value, outputMessage + 20, bigEndian_);
+
+          sequenceQueue_.push(clientSequence_, outputOpcode, property);
+
+          handleSave(messageStore, outputMessage, outputLength);
+        }
+        break;
+      case X_GetSelectionOwner:
+        {
+          outputLength = 8;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          decodeBuffer.decodeCachedValue(value, 29,
+                           clientCache_ -> getSelectionOwnerSelectionCache, 9);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+
+          sequenceQueue_.push(clientSequence_, outputOpcode);
+        }
+        break;
+      case X_GrabButton:
+      case X_GrabPointer:
+        {
+          outputLength = 24;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          decodeBuffer.decodeBoolValue(value);
+          outputMessage[1] = (unsigned char) value;
+          decodeBuffer.decodeXidValue(value, clientCache_ -> windowCache);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          decodeBuffer.decodeCachedValue(value, 16,
+                             clientCache_ -> grabButtonEventMaskCache);
+          PutUINT(value, outputMessage + 8, bigEndian_);
+          decodeBuffer.decodeBoolValue(value);
+          outputMessage[10] = (unsigned char) value;
+          decodeBuffer.decodeBoolValue(value);
+          outputMessage[11] = (unsigned char) value;
+          decodeBuffer.decodeCachedValue(value, 29,
+                             clientCache_ -> grabButtonConfineCache, 9);
+          PutULONG(value, outputMessage + 12, bigEndian_);
+          decodeBuffer.decodeCachedValue(value, 29,
+                             clientCache_ -> cursorCache, 9);
+          PutULONG(value, outputMessage + 16, bigEndian_);
+          if (outputOpcode == X_GrabButton)
+          {
+            decodeBuffer.decodeCachedValue(cValue, 8,
+                               clientCache_ -> grabButtonButtonCache);
+            outputMessage[20] = cValue;
+            decodeBuffer.decodeCachedValue(value, 16,
+                               clientCache_ -> grabButtonModifierCache);
+            PutUINT(value, outputMessage + 22, bigEndian_);
+          }
+          else
+          {
+            decodeBuffer.decodeValue(value, 32, 4);
+            clientCache_ -> grabKeyboardLastTimestamp += value;
+            PutULONG(clientCache_ -> grabKeyboardLastTimestamp,
+                     outputMessage + 20, bigEndian_);
+
+            sequenceQueue_.push(clientSequence_, outputOpcode);
+          }
+        }
+        break;
+      case X_GrabKeyboard:
+        {
+          outputLength = 16;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          decodeBuffer.decodeBoolValue(value);
+          outputMessage[1] = (unsigned char) value;
+          decodeBuffer.decodeXidValue(value, clientCache_ -> windowCache);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          decodeBuffer.decodeValue(value, 32, 4);
+          clientCache_ -> grabKeyboardLastTimestamp += value;
+          PutULONG(clientCache_ -> grabKeyboardLastTimestamp, outputMessage + 8,
+                   bigEndian_);
+          decodeBuffer.decodeBoolValue(value);
+          outputMessage[12] = (unsigned char) value;
+          decodeBuffer.decodeBoolValue(value);
+          outputMessage[13] = (unsigned char) value;
+
+          sequenceQueue_.push(clientSequence_, outputOpcode);
+        }
+        break;
+      case X_GrabServer:
+      case X_UngrabServer:
+      case X_NoOperation:
+        {
+          #ifdef DEBUG
+          *logofs << "handleWrite: Managing (probably tainted) X_NoOperation request for FD#" 
+                  << fd_ << ".\n" << logofs_flush;
+          #endif
+
+          outputLength = 4;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+        }
+        break;
+      case X_PolyText8:
+        {
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_PolyText8);
+
+          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
+                                     outputMessage, outputLength))
+          {
+            break;
+          }
+
+          outputLength = 16;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
+          PutULONG(value, outputMessage + 8, bigEndian_);
+          decodeBuffer.decodeCachedValue(value, 16,
+                             clientCache_ -> polyTextCacheX);
+          clientCache_ -> polyTextLastX += value;
+          clientCache_ -> polyTextLastX &= 0xffff;
+          PutUINT(clientCache_ -> polyTextLastX, outputMessage + 12, bigEndian_);
+          decodeBuffer.decodeCachedValue(value, 16,
+                             clientCache_ -> polyTextCacheY);
+          clientCache_ -> polyTextLastY += value;
+          clientCache_ -> polyTextLastY &= 0xffff;
+          PutUINT(clientCache_ -> polyTextLastY, outputMessage + 14, bigEndian_);
+          unsigned int addedLength = 0;
+          writeBuffer_.registerPointer(&outputMessage);
+          for (;;)
+          {
+            decodeBuffer.decodeBoolValue(value);
+            if (!value)
+              break;
+            unsigned int textLength;
+            decodeBuffer.decodeValue(textLength, 8);
+            if (textLength == 255)
+            {
+              addedLength += 5;
+              unsigned char *nextSegment = writeBuffer_.addMessage(5);
+              *nextSegment = (unsigned char) textLength;
+              decodeBuffer.decodeCachedValue(value, 29,
+                                 clientCache_ -> polyTextFontCache);
+              PutULONG(value, nextSegment + 1, 1);
+            }
+            else
+            {
+              addedLength += (textLength + 2);
+              unsigned char *nextSegment =
+              writeBuffer_.addMessage(textLength + 2);
+              *nextSegment = (unsigned char) textLength;
+              unsigned char *nextDest = nextSegment + 1;
+              decodeBuffer.decodeCachedValue(cValue, 8,
+                                 clientCache_ -> polyTextDeltaCache);
+              *nextDest++ = cValue;
+
+              // Since ProtoStep7 (#issue 108)
+              decodeBuffer.decodeTextData(nextDest, textLength);
+
+              nextDest += textLength;
+            }
+          }
+          outputLength += addedLength;
+          unsigned int mod4 = (addedLength & 0x3);
+          if (mod4)
+          {
+            unsigned int extra = 4 - mod4;
+            unsigned char *nextDest = writeBuffer_.addMessage(extra);
+            for (unsigned int i = 0; i < extra; i++)
+              *nextDest++ = 0;
+            outputLength += extra;
+          }
+          writeBuffer_.unregisterPointer();
+
+          handleSave(messageStore, outputMessage, outputLength);
+        }
+        break;
+      case X_PolyText16:
+        {
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_PolyText16);
+
+          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
+                                     outputMessage, outputLength))
+          {
+            break;
+          }
+
+          outputLength = 16;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
+          PutULONG(value, outputMessage + 8, bigEndian_);
+          decodeBuffer.decodeCachedValue(value, 16,
+                             clientCache_ -> polyTextCacheX);
+          clientCache_ -> polyTextLastX += value;
+          clientCache_ -> polyTextLastX &= 0xffff;
+          PutUINT(clientCache_ -> polyTextLastX, outputMessage + 12, bigEndian_);
+          decodeBuffer.decodeCachedValue(value, 16,
+                             clientCache_ -> polyTextCacheY);
+          clientCache_ -> polyTextLastY += value;
+          clientCache_ -> polyTextLastY &= 0xffff;
+          PutUINT(clientCache_ -> polyTextLastY, outputMessage + 14, bigEndian_);
+          unsigned int addedLength = 0;
+          writeBuffer_.registerPointer(&outputMessage);
+          for (;;)
+          {
+            decodeBuffer.decodeBoolValue(value);
+            if (!value)
+              break;
+            unsigned int textLength;
+            decodeBuffer.decodeValue(textLength, 8);
+            if (textLength == 255)
+            {
+              addedLength += 5;
+              unsigned char *nextSegment = writeBuffer_.addMessage(5);
+              *nextSegment = (unsigned char) textLength;
+              decodeBuffer.decodeCachedValue(value, 29, clientCache_ -> polyTextFontCache);
+              PutULONG(value, nextSegment + 1, 1);
+            }
+            else
+            {
+              addedLength += (textLength * 2 + 2);
+              unsigned char *nextSegment =
+              writeBuffer_.addMessage(textLength * 2 + 2);
+              *nextSegment = (unsigned char) textLength;
+              unsigned char *nextDest = nextSegment + 1;
+              decodeBuffer.decodeCachedValue(cValue, 8, clientCache_ -> polyTextDeltaCache);
+              *nextDest++ = cValue;
+
+              // Since ProtoStep7 (#issue 108)
+              decodeBuffer.decodeTextData(nextDest, textLength * 2);
+
+              nextDest += textLength * 2;
+            }
+          }
+          outputLength += addedLength;
+
+          unsigned int mod4 = (addedLength & 0x3);
+          if (mod4)
+          {
+            unsigned int extra = 4 - mod4;
+            unsigned char *nextDest = writeBuffer_.addMessage(extra);
+            for (unsigned int i = 0; i < extra; i++)
+              *nextDest++ = 0;
+            outputLength += extra;
+          }
+          writeBuffer_.unregisterPointer();
+
+          handleSave(messageStore, outputMessage, outputLength);
+        }
+        break;
+      case X_ImageText8:
+        {
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_ImageText8);
+
+          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
+                                     outputMessage, outputLength))
+          {
+            break;
+          }
+
+          unsigned int textLength;
+          decodeBuffer.decodeCachedValue(textLength, 8,
+                       clientCache_ -> imageTextLengthCache, 4);
+          outputLength = 16 + RoundUp4(textLength);
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          outputMessage[1] = (unsigned char) textLength;
+          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
+          PutULONG(value, outputMessage + 8, bigEndian_);
+          decodeBuffer.decodeCachedValue(value, 16,
+                       clientCache_ -> imageTextCacheX);
+          clientCache_ -> imageTextLastX += value;
+          clientCache_ -> imageTextLastX &= 0xffff;
+          PutUINT(clientCache_ -> imageTextLastX, outputMessage + 12, bigEndian_);
+          decodeBuffer.decodeCachedValue(value, 16,
+                       clientCache_ -> imageTextCacheY);
+          clientCache_ -> imageTextLastY += value;
+          clientCache_ -> imageTextLastY &= 0xffff;
+          PutUINT(clientCache_ -> imageTextLastY, outputMessage + 14, bigEndian_);
+          unsigned char *nextDest = outputMessage + 16;
+
+          // Since ProtoStep7 (#issue 108)
+          decodeBuffer.decodeTextData(nextDest, textLength);
+
+          handleSave(messageStore, outputMessage, outputLength);
+        }
+        break;
+      case X_ImageText16:
+        {
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_ImageText16);
+
+          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
+                                     outputMessage, outputLength))
+          {
+            break;
+          }
+
+          unsigned int textLength;
+          decodeBuffer.decodeCachedValue(textLength, 8,
+                       clientCache_ -> imageTextLengthCache, 4);
+          outputLength = 16 + RoundUp4(textLength * 2);
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          outputMessage[1] = (unsigned char) textLength;
+          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
+          PutULONG(value, outputMessage + 8, bigEndian_);
+          decodeBuffer.decodeCachedValue(value, 16,
+                       clientCache_ -> imageTextCacheX);
+          clientCache_ -> imageTextLastX += value;
+          clientCache_ -> imageTextLastX &= 0xffff;
+          PutUINT(clientCache_ -> imageTextLastX, outputMessage + 12, bigEndian_);
+          decodeBuffer.decodeCachedValue(value, 16,
+                       clientCache_ -> imageTextCacheY);
+          clientCache_ -> imageTextLastY += value;
+          clientCache_ -> imageTextLastY &= 0xffff;
+          PutUINT(clientCache_ -> imageTextLastY, outputMessage + 14, bigEndian_);
+          unsigned char *nextDest = outputMessage + 16;
+
+          // Since ProtoStep7 (#issue 108)
+          decodeBuffer.decodeTextData(nextDest, textLength * 2);
+
+          handleSave(messageStore, outputMessage, outputLength);
+        }
+        break;
+      case X_InternAtom:
+        {
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_InternAtom);
+
+          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
+                                     outputMessage, outputLength))
+          {
+            sequenceQueue_.push(clientSequence_, outputOpcode);
+
+            break;
+          }
+
+          unsigned int nameLength;
+          decodeBuffer.decodeValue(nameLength, 16, 6);
+          outputLength = RoundUp4(nameLength) + 8;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          PutUINT(nameLength, outputMessage + 4, bigEndian_);
+          decodeBuffer.decodeBoolValue(value);
+          outputMessage[1] = (unsigned char) value;
+          unsigned char *nextDest = outputMessage + 8;
+
+          // Since ProtoStep7 (#issue 108)
+          decodeBuffer.decodeTextData(nextDest, nameLength);
+
+          sequenceQueue_.push(clientSequence_, outputOpcode);
+
+          handleSave(messageStore, outputMessage, outputLength);
+        }
+        break;
+      case X_ListExtensions:
+        {
+          outputLength = 4;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+
+          sequenceQueue_.push(clientSequence_, outputOpcode);
+        }
+        break;
+      case X_ListFonts:
+        {
+          unsigned int textLength;
+          decodeBuffer.decodeValue(textLength, 16, 6);
+          outputLength = 8 + RoundUp4(textLength);
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          PutUINT(textLength, outputMessage + 6, bigEndian_);
+          decodeBuffer.decodeValue(value, 16, 6);
+          PutUINT(value, outputMessage + 4, bigEndian_);
+          unsigned char* nextDest = outputMessage + 8;
+
+          // Since ProtoStep7 (#issue 108)
+          decodeBuffer.decodeTextData(nextDest, textLength);
+
+          sequenceQueue_.push(clientSequence_, outputOpcode);
+        }
+        break;
+      case X_LookupColor:
+      case X_AllocNamedColor:
+        {
+          unsigned int textLength;
+          decodeBuffer.decodeValue(textLength, 16, 6);
+          outputLength = 12 + RoundUp4(textLength);
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          decodeBuffer.decodeCachedValue(value, 29,
+                             clientCache_ -> colormapCache);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          PutUINT(textLength, outputMessage + 8, bigEndian_);
+          unsigned char *nextDest = outputMessage + 12;
+
+          // Since ProtoStep7 (#issue 108)
+          decodeBuffer.decodeTextData(nextDest, textLength);
+
+          sequenceQueue_.push(clientSequence_, outputOpcode);
+        }
+        break;
+      case X_MapWindow:
+      case X_UnmapWindow:
+      case X_MapSubwindows:
+      case X_GetWindowAttributes:
+      case X_DestroyWindow:
+      case X_DestroySubwindows:
+      case X_QueryPointer:
+      case X_QueryTree:
+        {
+          outputLength = 8;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+
+          if (outputOpcode == X_DestroyWindow) // Since ProtoStep7 (#issue 108)
+          {
+            decodeBuffer.decodeFreeXidValue(value, clientCache_ -> freeWindowCache);
+          }
+          else
+          {
+            decodeBuffer.decodeXidValue(value, clientCache_ -> windowCache);
+          }
+
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          if (outputOpcode == X_QueryPointer ||
+                  outputOpcode == X_GetWindowAttributes ||
+                      outputOpcode == X_QueryTree)
+          {
+            sequenceQueue_.push(clientSequence_, outputOpcode);
+          }
+        }
+        break;
+      case X_OpenFont:
+        {
+          unsigned int nameLength;
+          decodeBuffer.decodeValue(nameLength, 16, 7);
+          outputLength = RoundUp4(12 + nameLength);
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          PutUINT(nameLength, outputMessage + 8, bigEndian_);
+          decodeBuffer.decodeValue(value, 29, 5);
+          clientCache_ -> lastFont += value;
+          clientCache_ -> lastFont &= 0x1fffffff;
+          PutULONG(clientCache_ -> lastFont, outputMessage + 4, bigEndian_);
+          unsigned char *nextDest = outputMessage + 12;
+
+          // Since ProtoStep7 (#issue 108)
+          decodeBuffer.decodeTextData(nextDest, nameLength);
+        }
+        break;
+      case X_PolyFillRectangle:
+        {
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_PolyFillRectangle);
+
+          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
+                                     outputMessage, outputLength))
+          {
+            break;
+          }
+
+          outputLength = 12;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          writeBuffer_.registerPointer(&outputMessage);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
+          PutULONG(value, outputMessage + 8, bigEndian_);
+
+          unsigned int index = 0;
+          unsigned int lastX = 0, lastY = 0, lastWidth = 0, lastHeight = 0;
+          unsigned int numRectangles = 0;
+
+          for (;;)
+          {
+            outputLength += 8;
+            writeBuffer_.addMessage(8);
+            unsigned char *nextDest = outputMessage + 12 +
+            (numRectangles << 3);
+            numRectangles++;
+            decodeBuffer.decodeCachedValue(value, 16,
+                         *clientCache_ -> polyFillRectangleCacheX[index], 8);
+            value += lastX;
+            PutUINT(value, nextDest, bigEndian_);
+            lastX = value;
+            nextDest += 2;
+            decodeBuffer.decodeCachedValue(value, 16,
+                         *clientCache_ -> polyFillRectangleCacheY[index], 8);
+            value += lastY;
+            PutUINT(value, nextDest, bigEndian_);
+            lastY = value;
+            nextDest += 2;
+            decodeBuffer.decodeCachedValue(value, 16,
+                         *clientCache_ -> polyFillRectangleCacheWidth[index], 8);
+            value += lastWidth;
+            PutUINT(value, nextDest, bigEndian_);
+            lastWidth = value;
+            nextDest += 2;
+            decodeBuffer.decodeCachedValue(value, 16,
+                         *clientCache_ -> polyFillRectangleCacheHeight[index], 8);
+            value += lastHeight;
+            PutUINT(value, nextDest, bigEndian_);
+            lastHeight = value;
+            nextDest += 2;
+
+            if (++index == 4) index = 0;
+
+            decodeBuffer.decodeBoolValue(value);
+
+            if (!value) break;
+          }
+          writeBuffer_.unregisterPointer();
+
+          handleSave(messageStore, outputMessage, outputLength);
+        }
+        break;
+      case X_PolyFillArc:
+        {
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_PolyFillArc);
+
+          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
+                                     outputMessage, outputLength))
+          {
+            break;
+          }
+
+          outputLength = 12;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          writeBuffer_.registerPointer(&outputMessage);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
+          PutULONG(value, outputMessage + 8, bigEndian_);
+
+          unsigned int index = 0;
+          unsigned int lastX = 0, lastY = 0,
+                       lastWidth = 0, lastHeight = 0,
+                       lastAngle1 = 0, lastAngle2 = 0;
+
+          unsigned int numArcs = 0;
+
+          for (;;)
+          {
+            outputLength += 12;
+            writeBuffer_.addMessage(12);
+
+            unsigned char *nextDest = outputMessage + 12 +
+            (numArcs * 12);
+            numArcs++;
+
+            decodeBuffer.decodeCachedValue(value, 16,
+                         *clientCache_ -> polyFillArcCacheX[index], 8);
+            value += lastX;
+            PutUINT(value, nextDest, bigEndian_);
+            lastX = value;
+            nextDest += 2;
+
+            decodeBuffer.decodeCachedValue(value, 16,
+                         *clientCache_ -> polyFillArcCacheY[index], 8);
+            value += lastY;
+            PutUINT(value, nextDest, bigEndian_);
+            lastY = value;
+            nextDest += 2;
+
+            decodeBuffer.decodeCachedValue(value, 16,
+                         *clientCache_ -> polyFillArcCacheWidth[index], 8);
+            value += lastWidth;
+            PutUINT(value, nextDest, bigEndian_);
+            lastWidth = value;
+            nextDest += 2;
+
+            decodeBuffer.decodeCachedValue(value, 16,
+                         *clientCache_ -> polyFillArcCacheHeight[index], 8);
+            value += lastHeight;
+            PutUINT(value, nextDest, bigEndian_);
+            lastHeight = value;
+            nextDest += 2;
+
+            decodeBuffer.decodeCachedValue(value, 16,
+                         *clientCache_ -> polyFillArcCacheAngle1[index], 8);
+            value += lastAngle1;
+            PutUINT(value, nextDest, bigEndian_);
+            lastAngle1 = value;
+            nextDest += 2;
+
+            decodeBuffer.decodeCachedValue(value, 16,
+                         *clientCache_ -> polyFillArcCacheAngle2[index], 8);
+            value += lastAngle2;
+            PutUINT(value, nextDest, bigEndian_);
+            lastAngle2 = value;
+            nextDest += 2;
+
+            if (++index == 2) index = 0;
+
+            decodeBuffer.decodeBoolValue(value);
+
+            if (!value) break;
+          }
+          writeBuffer_.unregisterPointer();
+
+          handleSave(messageStore, outputMessage, outputLength);
+        }
+        break;
+      case X_PolyArc:
+        {
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_PolyArc);
+
+          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
+                                     outputMessage, outputLength))
+          {
+            break;
+          }
+
+          outputLength = 12;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          writeBuffer_.registerPointer(&outputMessage);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
+          PutULONG(value, outputMessage + 8, bigEndian_);
+
+          unsigned int index = 0;
+          unsigned int lastX = 0, lastY = 0,
+                       lastWidth = 0, lastHeight = 0,
+                       lastAngle1 = 0, lastAngle2 = 0;
+
+          unsigned int numArcs = 0;
+
+          for (;;)
+          {
+            outputLength += 12;
+            writeBuffer_.addMessage(12);
+
+            unsigned char *nextDest = outputMessage + 12 +
+            (numArcs * 12);
+            numArcs++;
+
+            decodeBuffer.decodeCachedValue(value, 16,
+                           *clientCache_ -> polyArcCacheX[index], 8);
+            value += lastX;
+            PutUINT(value, nextDest, bigEndian_);
+            lastX = value;
+            nextDest += 2;
+
+            decodeBuffer.decodeCachedValue(value, 16,
+                         *clientCache_ -> polyArcCacheY[index], 8);
+            value += lastY;
+            PutUINT(value, nextDest, bigEndian_);
+            lastY = value;
+            nextDest += 2;
+
+            decodeBuffer.decodeCachedValue(value, 16,
+                         *clientCache_ -> polyArcCacheWidth[index], 8);
+            value += lastWidth;
+            PutUINT(value, nextDest, bigEndian_);
+            lastWidth = value;
+            nextDest += 2;
+
+            decodeBuffer.decodeCachedValue(value, 16,
+                         *clientCache_ -> polyArcCacheHeight[index], 8);
+            value += lastHeight;
+            PutUINT(value, nextDest, bigEndian_);
+            lastHeight = value;
+            nextDest += 2;
+
+            decodeBuffer.decodeCachedValue(value, 16,
+                         *clientCache_ -> polyArcCacheAngle1[index], 8);
+            value += lastAngle1;
+            PutUINT(value, nextDest, bigEndian_);
+            lastAngle1 = value;
+            nextDest += 2;
+
+            decodeBuffer.decodeCachedValue(value, 16,
+                         *clientCache_ -> polyArcCacheAngle2[index], 8);
+            value += lastAngle2;
+            PutUINT(value, nextDest, bigEndian_);
+            lastAngle2 = value;
+            nextDest += 2;
+
+            if (++index == 2) index = 0;
+
+            decodeBuffer.decodeBoolValue(value);
+
+            if (!value) break;
+          }
+          writeBuffer_.unregisterPointer();
+
+          handleSave(messageStore, outputMessage, outputLength);
+        }
+        break;
+      case X_PolyPoint:
+        {
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_PolyPoint);
+
+          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
+                                     outputMessage, outputLength))
+          {
+            break;
+          }
+
+          unsigned int numPoints;
+          decodeBuffer.decodeValue(numPoints, 16, 4);
+          outputLength = (numPoints << 2) + 12;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          unsigned int relativeCoordMode;
+          decodeBuffer.decodeBoolValue(relativeCoordMode);
+          outputMessage[1] = (unsigned char) relativeCoordMode;
+          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
+          PutULONG(value, outputMessage + 8, bigEndian_);
+          unsigned char *nextDest = outputMessage + 12;
+
+          unsigned int index = 0;
+          unsigned int lastX = 0, lastY = 0;
+
+          for (unsigned int i = 0; i < numPoints; i++)
+          {
+            decodeBuffer.decodeCachedValue(value, 16,
+                               *clientCache_ -> polyPointCacheX[index], 8);
+            lastX += value;
+            PutUINT(lastX, nextDest, bigEndian_);
+            nextDest += 2;
+            decodeBuffer.decodeCachedValue(value, 16,
+                               *clientCache_ -> polyPointCacheY[index], 8);
+            lastY += value;
+            PutUINT(lastY, nextDest, bigEndian_);
+            nextDest += 2;
+
+            if (++index == 2) index = 0;
+          }
+
+          handleSave(messageStore, outputMessage, outputLength);
+        }
+        break;
+      case X_PolyLine:
+        {
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_PolyLine);
+
+          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
+                                     outputMessage, outputLength))
+          {
+            break;
+          }
+
+          unsigned int numPoints;
+          decodeBuffer.decodeValue(numPoints, 16, 4);
+          outputLength = (numPoints << 2) + 12;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          unsigned int relativeCoordMode;
+          decodeBuffer.decodeBoolValue(relativeCoordMode);
+          outputMessage[1] = (unsigned char) relativeCoordMode;
+          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
+          PutULONG(value, outputMessage + 8, bigEndian_);
+          unsigned char *nextDest = outputMessage + 12;
+
+          unsigned int index = 0;
+          unsigned int lastX = 0, lastY = 0;
+
+          for (unsigned int i = 0; i < numPoints; i++)
+          {
+            decodeBuffer.decodeCachedValue(value, 16,
+                               *clientCache_ -> polyLineCacheX[index], 8);
+            lastX += value;
+            PutUINT(lastX, nextDest, bigEndian_);
+            nextDest += 2;
+            decodeBuffer.decodeCachedValue(value, 16,
+                               *clientCache_ -> polyLineCacheY[index], 8);
+            lastY += value;
+            PutUINT(lastY, nextDest, bigEndian_);
+            nextDest += 2;
+
+            if (++index == 2) index = 0;
+          }
+
+          handleSave(messageStore, outputMessage, outputLength);
+        }
+        break;
+      case X_PolyRectangle:
+        {
+          unsigned int numRectangles;
+          decodeBuffer.decodeValue(numRectangles, 16, 3);
+          outputLength = (numRectangles << 3) + 12;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
+          PutULONG(value, outputMessage + 8, bigEndian_);
+          unsigned char *nextDest = outputMessage + 12;
+          for (unsigned int i = 0; i < numRectangles; i++)
+            for (unsigned int k = 0; k < 4; k++)
+            {
+              decodeBuffer.decodeCachedValue(value, 16,
+                                *clientCache_ -> polyRectangleGeomCache[k], 8);
+              PutUINT(value, nextDest, bigEndian_);
+              nextDest += 2;
+            }
+        }
+        break;
+      case X_PolySegment:
+        {
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_PolySegment);
+
+          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
+                                     outputMessage, outputLength))
+          {
+            break;
+          }
+
+          unsigned int numSegments;
+          decodeBuffer.decodeValue(numSegments, 16, 4);
+          outputLength = (numSegments << 3) + 12;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
+          PutULONG(value, outputMessage + 8, bigEndian_);
+          unsigned char *nextDest = outputMessage + 12;
+
+          for (numSegments *= 2; numSegments; numSegments--)
+          {
+            unsigned int index;
+            decodeBuffer.decodeBoolValue(index);
+            unsigned int x;
+            decodeBuffer.decodeCachedValue(x, 16,
+                               clientCache_ -> polySegmentCacheX, 6);
+            x += clientCache_ -> polySegmentLastX[index];
+            PutUINT(x, nextDest, bigEndian_);
+            nextDest += 2;
+
+            unsigned int y;
+            decodeBuffer.decodeCachedValue(y, 16,
+                               clientCache_ -> polySegmentCacheY, 6);
+            y += clientCache_ -> polySegmentLastY[index];
+            PutUINT(y, nextDest, bigEndian_);
+            nextDest += 2;
+
+            clientCache_ -> polySegmentLastX[clientCache_ -> polySegmentCacheIndex] = x;
+            clientCache_ -> polySegmentLastY[clientCache_ -> polySegmentCacheIndex] = y;
+
+            if (clientCache_ -> polySegmentCacheIndex == 1)
+              clientCache_ -> polySegmentCacheIndex = 0;
+            else
+              clientCache_ -> polySegmentCacheIndex = 1;
+          }
+
+          handleSave(messageStore, outputMessage, outputLength);
+        }
+        break;
+      case X_PutImage:
+        {
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_PutImage);
+
+          hit = handleDecode(decodeBuffer, clientCache_, messageStore,
+                                 outputOpcode, outputMessage, outputLength);
+
+          if (outputOpcode == X_PutImage)
+          {
+            handleImage(outputOpcode, outputMessage, outputLength);
+          }
+        }
+        break;
+      case X_QueryBestSize:
+        {
+          outputLength = 12;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          decodeBuffer.decodeValue(value, 2);
+          outputMessage[1] = (unsigned char)value;
+          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          decodeBuffer.decodeValue(value, 16, 8);
+          PutUINT(value, outputMessage + 8, bigEndian_);
+          decodeBuffer.decodeValue(value, 16, 8);
+          PutUINT(value, outputMessage + 10, bigEndian_);
+
+          sequenceQueue_.push(clientSequence_, outputOpcode);
+        }
+        break;
+      case X_QueryColors:
+        {
+          // Differential or plain data compression?
+          decodeBuffer.decodeBoolValue(value);
+
+          if (value)
+          {
+            unsigned int numColors;
+            decodeBuffer.decodeValue(numColors, 16, 5);
+            outputLength = (numColors << 2) + 8;
+            outputMessage = writeBuffer_.addMessage(outputLength);
+            decodeBuffer.decodeCachedValue(value, 29,
+                               clientCache_ -> colormapCache);
+            PutULONG(value, outputMessage + 4, bigEndian_);
+            unsigned char *nextDest = outputMessage + 8;
+            unsigned int predictedPixel = clientCache_ -> queryColorsLastPixel;
+            for (unsigned int i = 0; i < numColors; i++)
+            {
+              unsigned int pixel;
+              decodeBuffer.decodeBoolValue(value);
+              if (value)
+                pixel = predictedPixel;
+              else
+                decodeBuffer.decodeValue(pixel, 32, 9);
+              PutULONG(pixel, nextDest, bigEndian_);
+              if (i == 0)
+                clientCache_ -> queryColorsLastPixel = pixel;
+              predictedPixel = pixel + 1;
+              nextDest += 4;
+            }
+          }
+          else
+          {
+            // Request length.
+            unsigned int requestLength;
+            decodeBuffer.decodeValue(requestLength, 16, 10);
+            outputLength = (requestLength << 2);
+            outputMessage = writeBuffer_.addMessage(outputLength);
+
+            const unsigned char *compressedData = NULL;
+            unsigned int compressedDataSize = 0;
+
+            int decompressed = handleDecompress(decodeBuffer, outputOpcode, 4,
+                                                    outputMessage, outputLength, compressedData,
+                                                        compressedDataSize);
+            if (decompressed < 0)
+            {
+              return -1;
+            }
+          }
+
+          sequenceQueue_.push(clientSequence_, outputOpcode);
+        }
+        break;
+      case X_QueryExtension:
+        {
+          unsigned int nameLength;
+          decodeBuffer.decodeValue(nameLength, 16, 6);
+          outputLength = 8 + RoundUp4(nameLength);
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          PutUINT(nameLength, outputMessage + 4, bigEndian_);
+          unsigned char *nextDest = outputMessage + 8;
+          for (unsigned int i = 0; i < nameLength; i++)
+          {
+            decodeBuffer.decodeValue(value, 8);
+            *nextDest++ = (unsigned char) value;
+          }
+
+          unsigned int hide = 0;
+
+          #ifdef HIDE_MIT_SHM_EXTENSION
+
+          if (!strncmp((char *) outputMessage + 8, "MIT-SHM", 7))
+          {
+            #ifdef TEST
+            *logofs << "handleWrite: Going to hide MIT-SHM extension in reply.\n"
+                    << logofs_flush;
+            #endif
+
+            hide = 1;
+          }
+
+          #endif
+
+          #ifdef HIDE_BIG_REQUESTS_EXTENSION
+
+          if (!strncmp((char *) outputMessage + 8, "BIG-REQUESTS", 12))
+          {
+            #ifdef TEST
+            *logofs << "handleWrite: Going to hide BIG-REQUESTS extension in reply.\n"
+                    << logofs_flush;
+            #endif
+
+            hide = 1;
+          }
+
+          #endif
+
+          #ifdef HIDE_XKEYBOARD_EXTENSION
+
+          else if (!strncmp((char *) outputMessage + 8, "XKEYBOARD", 9))
+          {
+            #ifdef TEST
+            *logofs << "handleWrite: Going to hide XKEYBOARD extension in reply.\n"
+                    << logofs_flush;
+            #endif
+
+            hide = 1;
+          }
+
+          #endif
+
+          #ifdef HIDE_XFree86_Bigfont_EXTENSION
+
+          else if (!strncmp((char *) outputMessage + 8, "XFree86-Bigfont", 15))
+          {
+            #ifdef TEST
+            *logofs << "handleWrite: Going to hide XFree86-Bigfont extension in reply.\n"
+                    << logofs_flush;
+            #endif
+
+            hide = 1;
+          }
+
+          #endif
+
+          //
+          // This is if you want to experiment disabling SHAPE extensions.
+          //
+
+          #ifdef HIDE_SHAPE_EXTENSION
+
+          if (!strncmp((char *) outputMessage + 8, "SHAPE", 5))
+          {
+            #ifdef DEBUG
+            *logofs << "handleWrite: Going to hide SHAPE extension in reply.\n"
+                    << logofs_flush;
+            #endif
+
+            hide = 1;
+          }
+
+          #endif
+
+          //
+          // Check if user disabled RENDER extension.
+          //
+
+          if (control -> HideRender == 1 &&
+                  strncmp((char *) outputMessage + 8, "RENDER", 6) == 0)
+          {
+            #ifdef TEST
+            *logofs << "handleWrite: Going to hide RENDER extension in reply.\n"
+                    << logofs_flush;
+            #endif
+
+            hide = 1;
+          }
+
+          unsigned int extension = 0;
+
+          if (strncmp((char *) outputMessage + 8, "SHAPE", 5) == 0)
+          {
+            extension = X_NXInternalShapeExtension;
+          }
+          else if (strncmp((char *) outputMessage + 8, "RENDER", 6) == 0)
+          {
+            extension = X_NXInternalRenderExtension;
+          }
+
+          sequenceQueue_.push(clientSequence_, outputOpcode,
+                                  outputOpcode, hide, extension);
+        }
+        break;
+      case X_QueryFont:
+        {
+          outputLength = 8;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          decodeBuffer.decodeValue(value, 29, 5);
+          clientCache_ -> lastFont += value;
+          clientCache_ -> lastFont &= 0x1fffffff;
+          PutULONG(clientCache_ -> lastFont, outputMessage + 4, bigEndian_);
+
+          sequenceQueue_.push(clientSequence_, outputOpcode);
+        }
+        break;
+      case X_SetClipRectangles:
+        {
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_SetClipRectangles);
+
+          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
+                                       outputMessage, outputLength))
+          {
+            break;
+          }
+
+          unsigned int numRectangles;
+
+          // Since ProtoStep9 (#issue 108)
+          decodeBuffer.decodeValue(numRectangles, 15, 4);
+
+          outputLength = (numRectangles << 3) + 12;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          decodeBuffer.decodeValue(value, 2);
+          outputMessage[1] = (unsigned char) value;
+          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          decodeBuffer.decodeCachedValue(value, 16,
+                                   clientCache_ -> setClipRectanglesXCache, 8);
+          PutUINT(value, outputMessage + 8, bigEndian_);
+          decodeBuffer.decodeCachedValue(value, 16,
+                                   clientCache_ -> setClipRectanglesYCache, 8);
+          PutUINT(value, outputMessage + 10, bigEndian_);
+          unsigned char *nextDest = outputMessage + 12;
+          for (unsigned int i = 0; i < numRectangles; i++)
+          {
+            for (unsigned int k = 0; k < 4; k++)
+            {
+              decodeBuffer.decodeCachedValue(value, 16,
+                                 *clientCache_ -> setClipRectanglesGeomCache[k], 8);
+              PutUINT(value, nextDest, bigEndian_);
+              nextDest += 2;
+            }
+          }
+
+          handleSave(messageStore, outputMessage, outputLength);
+        }
+        break;
+      case X_SetDashes:
+        {
+          unsigned int numDashes;
+          decodeBuffer.decodeCachedValue(numDashes, 16,
+                                      clientCache_ -> setDashesLengthCache, 5);
+          outputLength = 12 + RoundUp4(numDashes);
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          PutUINT(numDashes, outputMessage + 10, bigEndian_);
+          decodeBuffer.decodeXidValue(value, clientCache_ -> gcCache);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          decodeBuffer.decodeCachedValue(value, 16,
+                                      clientCache_ -> setDashesOffsetCache, 5);
+          PutUINT(value, outputMessage + 8, bigEndian_);
+          unsigned char *nextDest = outputMessage + 12;
+          for (unsigned int i = 0; i < numDashes; i++)
+          {
+            decodeBuffer.decodeCachedValue(cValue, 8,
+                                clientCache_ -> setDashesDashCache_[i & 1], 5);
+            *nextDest++ = cValue;
+          }
+        }
+        break;
+      case X_SetSelectionOwner:
+        {
+          outputLength = 16;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          decodeBuffer.decodeCachedValue(value, 29,
+                                    clientCache_ -> setSelectionOwnerCache, 9);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          decodeBuffer.decodeCachedValue(value, 29,
+                           clientCache_ -> getSelectionOwnerSelectionCache, 9);
+          PutULONG(value, outputMessage + 8, bigEndian_);
+          decodeBuffer.decodeCachedValue(value, 32,
+                           clientCache_ -> setSelectionOwnerTimestampCache, 9);
+          PutULONG(value, outputMessage + 12, bigEndian_);
+        }
+        break;
+      case X_TranslateCoords:
+        {
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_TranslateCoords);
+
+          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
+                                     outputMessage, outputLength))
+          {
+            sequenceQueue_.push(clientSequence_, outputOpcode);
+
+            break;
+          }
+
+          outputLength = 16;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          decodeBuffer.decodeCachedValue(value, 29,
+                                   clientCache_ -> translateCoordsSrcCache, 9);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          decodeBuffer.decodeCachedValue(value, 29,
+                                  clientCache_ -> translateCoordsDstCache, 9);
+          PutULONG(value, outputMessage + 8, bigEndian_);
+          decodeBuffer.decodeCachedValue(value, 16,
+                                     clientCache_ -> translateCoordsXCache, 8);
+          PutUINT(value, outputMessage + 12, bigEndian_);
+          decodeBuffer.decodeCachedValue(value, 16,
+                                     clientCache_ -> translateCoordsYCache, 8);
+          PutUINT(value, outputMessage + 14, bigEndian_);
+
+          sequenceQueue_.push(clientSequence_, outputOpcode);
+
+          handleSave(messageStore, outputMessage, outputLength);
+        }
+        break;
+      case X_GetImage:
+        {
+          MessageStore *messageStore = clientStore_ ->
+                               getRequestStore(X_GetImage);
+
+          if (handleDecodeCached(decodeBuffer, clientCache_, messageStore,
+                                     outputMessage, outputLength))
+          {
+            sequenceQueue_.push(clientSequence_, outputOpcode);
+
+            break;
+          }
+
+          outputLength = 20;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+          // Format.
+          unsigned int format;
+          decodeBuffer.decodeValue(format, 2);
+          outputMessage[1] = (unsigned char) format;
+          // Drawable.
+          decodeBuffer.decodeXidValue(value, clientCache_ -> drawableCache);
+          PutULONG(value, outputMessage + 4, bigEndian_);
+          // X.
+          decodeBuffer.decodeCachedValue(value, 16,
+                             clientCache_ -> putImageXCache, 8);
+          clientCache_ -> putImageLastX += value;
+          clientCache_ -> putImageLastX &= 0xffff;
+          PutUINT(clientCache_ -> putImageLastX, outputMessage + 8, bigEndian_);
+          // Y.
+          decodeBuffer.decodeCachedValue(value, 16,
+                             clientCache_ -> putImageYCache, 8);
+          clientCache_ -> putImageLastY += value;
+          clientCache_ -> putImageLastY &= 0xffff;
+          PutUINT(clientCache_ -> putImageLastY, outputMessage + 10, bigEndian_);
+          // Width.
+          unsigned int width;
+          decodeBuffer.decodeCachedValue(width, 16,
+                             clientCache_ -> putImageWidthCache, 8);
+          PutUINT(width, outputMessage + 12, bigEndian_);
+          // Height.
+          unsigned int height;
+          decodeBuffer.decodeCachedValue(height, 16,
+                             clientCache_ -> putImageHeightCache, 8);
+          PutUINT(height, outputMessage + 14, bigEndian_);
+          // Plane mask.
+          decodeBuffer.decodeCachedValue(value, 32,
+                             clientCache_ -> getImagePlaneMaskCache, 5);
+          PutULONG(value, outputMessage + 16, bigEndian_);
+
+          sequenceQueue_.push(clientSequence_, outputOpcode);
+
+          handleSave(messageStore, outputMessage, outputLength);
+        }
+        break;
+      case X_GetPointerMapping:
+        {
+          outputLength = 4;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+
+          sequenceQueue_.push(clientSequence_, outputOpcode);
+        }
+        break;
+      case X_GetKeyboardControl:
+        {
+          outputLength = 4;
+          outputMessage = writeBuffer_.addMessage(outputLength);
+
+          sequenceQueue_.push(clientSequence_, outputOpcode);
+        }
+        break;
+      default:
+        {
+          if (outputOpcode == opcodeStore_ -> renderExtension)
+          {
+            MessageStore *messageStore = clientStore_ ->
+                                 getRequestStore(X_NXInternalRenderExtension);
+
+            hit = handleDecode(decodeBuffer, clientCache_, messageStore,
+                                   outputOpcode, outputMessage, outputLength);
+          }
+          else if (outputOpcode == opcodeStore_ -> shapeExtension)
+          {
+            MessageStore *messageStore = clientStore_ ->
+                                 getRequestStore(X_NXInternalShapeExtension);
+
+            hit = handleDecode(decodeBuffer, clientCache_, messageStore,
+                                   outputOpcode, outputMessage, outputLength);
+          }
+          else if (outputOpcode == opcodeStore_ -> putPackedImage)
+          {
+            #ifdef DEBUG
+            *logofs << "handleWrite: Decoding packed image request for FD#"
+                    << fd_ << ".\n" << logofs_flush;
+            #endif
+
+            MessageStore *messageStore = clientStore_ ->
+                                 getRequestStore(X_NXPutPackedImage);
+
+            hit = handleDecode(decodeBuffer, clientCache_, messageStore,
+                                   outputOpcode, outputMessage, outputLength);
+
+            if (outputOpcode == opcodeStore_ -> putPackedImage)
+            {
+              handleImage(outputOpcode, outputMessage, outputLength);
+            }
+          }
+          else if (outputOpcode == opcodeStore_ -> setUnpackColormap)
+          {
+            #ifdef DEBUG
+            *logofs << "handleWrite: Decoding set unpack colormap request "
+                    << "for FD#" << fd_ << ".\n" << logofs_flush;
+            #endif
+
+            MessageStore *messageStore = clientStore_ ->
+                                 getRequestStore(X_NXSetUnpackColormap);
+
+            hit = handleDecode(decodeBuffer, clientCache_, messageStore,
+                                   outputOpcode, outputMessage, outputLength);
+            //
+            // Message could have been split.
+            //
+
+            if (outputOpcode == opcodeStore_ -> setUnpackColormap)
+            {
+              handleColormap(outputOpcode, outputMessage, outputLength);
+            }
+          }
+          else if (outputOpcode == opcodeStore_ -> setUnpackAlpha)
+          {
+            #ifdef DEBUG
+            *logofs << "handleWrite: Decoding unpack alpha request for FD#"
+                    << fd_ << ".\n" << logofs_flush;
+            #endif
+
+            MessageStore *messageStore = clientStore_ ->
+                                 getRequestStore(X_NXSetUnpackAlpha);
+
+            hit = handleDecode(decodeBuffer, clientCache_, messageStore,
+                                   outputOpcode, outputMessage, outputLength);
+            //
+            // Message could have been split.
+            //
+
+            if (outputOpcode == opcodeStore_ -> setUnpackAlpha)
+            {
+              handleAlpha(outputOpcode, outputMessage, outputLength);
+            }
+          }
+          else if (outputOpcode == opcodeStore_ -> setUnpackGeometry)
+          {
+            #ifdef DEBUG
+            *logofs << "handleWrite: Decoding set unpack geometry request "
+                    << "for FD#" << fd_ << ".\n" << logofs_flush;
+            #endif
+
+            MessageStore *messageStore = clientStore_ ->
+                                 getRequestStore(X_NXSetUnpackGeometry);
+
+            hit = handleDecode(decodeBuffer, clientCache_, messageStore,
+                                   outputOpcode, outputMessage, outputLength);
+
+            handleGeometry(outputOpcode, outputMessage, outputLength);
+          }
+          else if (outputOpcode == opcodeStore_ -> startSplit)
+          {
+            handleStartSplitRequest(decodeBuffer, outputOpcode,
+                                        outputMessage, outputLength);
+          }
+          else if (outputOpcode == opcodeStore_ -> endSplit)
+          {
+            handleEndSplitRequest(decodeBuffer, outputOpcode,
+                                      outputMessage, outputLength);
+          }
+          else if (outputOpcode == opcodeStore_ -> commitSplit)
+          {
+            int result = handleCommitSplitRequest(decodeBuffer, outputOpcode,
+                                                      outputMessage, outputLength);
+
+            //
+            // Check if message has been successfully
+            // extracted from the split store. In this
+            // case post-process it in the usual way.
+            //
+
+            if (result > 0)
+            {
+              if (outputOpcode == opcodeStore_ -> putPackedImage ||
+                      outputOpcode == X_PutImage)
+              {
+                handleImage(outputOpcode, outputMessage, outputLength);
+              }
+              else if (outputOpcode == opcodeStore_ -> setUnpackColormap)
+              {
+                handleColormap(outputOpcode, outputMessage, outputLength);
+              }
+              else if (outputOpcode == opcodeStore_ -> setUnpackAlpha)
+              {
+                handleAlpha(outputOpcode, outputMessage, outputLength);
+              }
+            }
+            else if (result < 0)
+            {
+              return -1;
+            }
+          }
+          else if (outputOpcode == opcodeStore_ -> abortSplit)
+          {
+            handleAbortSplitRequest(decodeBuffer, outputOpcode,
+                                        outputMessage, outputLength);
+          }
+          else if (outputOpcode == opcodeStore_ -> finishSplit)
+          {
+            #ifdef DEBUG
+            *logofs << "handleWrite: Decoding finish split request "
+                    << "for FD#" << fd_ << ".\n" << logofs_flush;
+            #endif
+
+            decodeBuffer.decodeCachedValue(cValue, 8,
+                         clientCache_ -> resourceCache);
+
+            handleNullRequest(outputOpcode, outputMessage, outputLength);
+          }
+          else if (outputOpcode == opcodeStore_ -> freeSplit)
+          {
+            #ifdef DEBUG
+            *logofs << "handleWrite: Decoding free split request "
+                    << "for FD#" << fd_ << ".\n" << logofs_flush;
+            #endif
+
+            decodeBuffer.decodeCachedValue(cValue, 8,
+                         clientCache_ -> resourceCache);
+
+            handleNullRequest(outputOpcode, outputMessage, outputLength);
+          }
+          else if (outputOpcode == opcodeStore_ -> freeUnpack)
+          {
+            #ifdef DEBUG
+            *logofs << "handleWrite: Decoding free unpack request "
+                    << "for FD#" << fd_ << ".\n" << logofs_flush;
+            #endif
+
+            decodeBuffer.decodeCachedValue(cValue, 8,
+                         clientCache_ -> resourceCache);
+
+            #ifdef DEBUG
+            *logofs << "handleWrite: Freeing unpack state for resource "
+                    << (unsigned int) cValue << ".\n" << logofs_flush;
+            #endif
+
+            handleUnpackStateRemove(cValue);
+
+            handleNullRequest(outputOpcode, outputMessage, outputLength);
+          }
+          else if (outputOpcode == opcodeStore_ -> setExposeParameters)
+          {
+            //
+            // Send expose events according to agent's wish.
+            //
+
+            decodeBuffer.decodeBoolValue(enableExpose_);
+            decodeBuffer.decodeBoolValue(enableGraphicsExpose_);
+            decodeBuffer.decodeBoolValue(enableNoExpose_);
+
+            handleNullRequest(outputOpcode, outputMessage, outputLength);
+          }
+          else if (outputOpcode == opcodeStore_ -> getUnpackParameters)
+          {
+            //
+            // Client proxy needs the list of supported
+            // unpack methods. We would need an encode
+            // buffer, but this is in proxy, not here in
+            // channel.
+            //
+
+            #ifdef TEST
+            *logofs << "handleWrite: Sending X_GetInputFocus request for FD#" 
+                    << fd_ << " due to OPCODE#" << (unsigned int) outputOpcode
+                    << ".\n" << logofs_flush;
+            #endif
+
+            outputOpcode = X_GetInputFocus;
+
+            outputLength  = 4;
+            outputMessage = writeBuffer_.addMessage(outputLength);
+
+            sequenceQueue_.push(clientSequence_, outputOpcode,
+                                    opcodeStore_ -> getUnpackParameters);
+          }
+          else if (outputOpcode == opcodeStore_ -> getControlParameters ||
+                       outputOpcode == opcodeStore_ -> getCleanupParameters ||
+                           outputOpcode == opcodeStore_ -> getImageParameters)
+          {
+            handleNullRequest(outputOpcode, outputMessage, outputLength);
+          }
+          else if (outputOpcode == opcodeStore_ -> getShmemParameters)
+          {
+            if (handleShmemRequest(decodeBuffer, outputOpcode,
+                                       outputMessage, outputLength) < 0)
+            {
+              return -1;
+            }
+          }
+          else if (outputOpcode == opcodeStore_ -> setCacheParameters)
+          {
+            if (handleCacheRequest(decodeBuffer, outputOpcode,
+                                       outputMessage, outputLength) < 0)
+            {
+              return -1;
+            }
+          }
+          else if (outputOpcode == opcodeStore_ -> getFontParameters)
+          {
+            if (handleFontRequest(decodeBuffer, outputOpcode,
+                                      outputMessage, outputLength) < 0)
+            {
+              return -1;
+            }
+          }
+          else
+          {
+            MessageStore *messageStore = clientStore_ ->
+                                 getRequestStore(X_NXInternalGenericRequest);
+
+            hit = handleDecode(decodeBuffer, clientCache_, messageStore,
+                                   outputOpcode, outputMessage, outputLength);
+          }
+        }
+      } // End of switch on opcode.
+
+      //
+      // TODO: at the moment the variable hit was being set
+      // but not used, so to avoid the corresponding warning
+      // this logging block has been added.
+      // This code will probably be optimized away when none
+      // of the defines is set, but if there is no additional
+      // use for the hit variable in the future, then maybe
+      // it could be removed completely.
+      //
+
+      if (hit)
+      {
+        #if defined(TEST) || defined(OPCODES)
+        *logofs << "handleWrite: Cached flag enabled in handled request.\n"
+                << logofs_flush;
+        #endif
+      }
+
+      //
+      // A packed image request can generate more than just
+      // a single X_PutImage. Write buffer is handled inside
+      // handleUnpack(). Cannot simply assume that the final
+      // opcode and size must be put at the buffer offset as
+      // as buffer could have been grown or could have been
+      // replaced by a scratch buffer. The same is true in
+      // the case of a shared memory image.
+      //
+
+      if (outputOpcode != 0)
+      {
+        //
+        // Commit opcode and size to the buffer.
+        //
+
+        *outputMessage = (unsigned char) outputOpcode;
+
+        PutUINT(outputLength >> 2, outputMessage + 2, bigEndian_);
+
+        #if defined(TEST) || defined(OPCODES)
+        *logofs << "handleWrite: Handled request OPCODE#"
+                << (unsigned int) outputOpcode << " ("
+                << DumpOpcode(outputOpcode) << ") for FD#"
+                << fd_ << " sequence " << clientSequence_
+                << ". "  << outputLength << " bytes out.\n"
+                << logofs_flush;
+        #endif
+      }
+      #if defined(TEST) || defined(OPCODES)
+      else
+      {
+        //
+        // In case of shared memory images the log doesn't
+        // reflect the actual opcode of the request that is
+        // going to be written. It would be possible to find
+        // the opcode of the original request received from
+        // the remote proxy in member imageState_ -> opcode,
+        // but we have probably already deleted the struct.
+        //
+
+        *logofs << "handleWrite: Handled image request for FD#"
+                  << fd_ << " new sequence " << clientSequence_
+                  << ". " << outputLength << " bytes out.\n"
+                  << logofs_flush;
+      }
+      #endif
+
+      //
+      // Check if we produced enough data. We need to
+      // decode all the proxy messages or the decode
+      // buffer will be left in an inconsistent state,
+      // so we just update the finish flag in case of
+      // failure.
+      //
+
+      handleFlush(flush_if_needed);
+
+    } // End of while (decodeBuffer.decodeOpcodeValue(outputOpcode, 8, ...
+
+  } // End of the decoding block.
+
+  //
+  // Write any remaining data to the X connection.
+  //
+
+  if (handleFlush(flush_if_any) < 0)
+  {
+    return -1;
+  }
+
+  //
+  // Reset offset at which we read the
+  // last event looking for the shared
+  // memory completion.
+  //
+
+  if (shmemState_ != NULL)
+  {
+    shmemState_ -> checked = 0;
+  }
+
+  return 1;
+}
+
+//
+// End of handleWrite().
+//
+
+//
+// Other members.
+//
+
+int ServerChannel::handleSplit(DecodeBuffer &decodeBuffer, MessageStore *store,
+                                   T_store_action action, int position, unsigned char &opcode,
+                                       unsigned char *&buffer, unsigned int &size)
+{
+  // Since ProtoStep7 (#issue 108)
+  splitState_.current = splitState_.resource;
+
+  handleSplitStoreAlloc(&splitResources_, splitState_.current);
+
+  #if defined(TEST) || defined(SPLIT)
+  *logofs << "handleSplit: SPLIT! Message OPCODE#"
+          << (unsigned int) store -> opcode() << " of size " << size
+          << " [split] with resource " << splitState_.current
+          << " position " << position << " and action ["
+          << DumpAction(action) << "] at " << strMsTimestamp()
+          << ".\n" << logofs_flush;
+  #endif
+
+  //
+  // Get the MD5 of the message being
+  // split.
+  //
+
+  T_checksum checksum = NULL;
+
+  if (action != IS_HIT)
+  {
+    handleSplitChecksum(decodeBuffer, checksum);
+  }
+
+  //
+  // The method must abort the connection
+  // if it can't allocate the split.
+  //
+
+  Split *splitMessage = clientStore_ -> getSplitStore(splitState_.current) ->
+                              add(store, splitState_.current, position,
+                                      action, checksum, buffer, size);
+
+  //
+  // If the encoding side didn't provide
+  // a checksum, then don't send the split
+  // report.
+  //
+
+  if (checksum == NULL)
+  {
+    if (action == IS_HIT)
+    {
+      splitMessage -> setState(split_loaded);
+    }
+    else
+    {
+      splitMessage -> setState(split_missed);
+    }
+
+    #if defined(TEST) || defined(SPLIT)
+
+    *logofs << "handleSplit: SPLIT! There are " << clientStore_ ->
+               getSplitTotalSize() << " messages and " << clientStore_ ->
+               getSplitTotalStorageSize() << " bytes to send in "
+            << "the split stores.\n" << logofs_flush;
+
+    clientStore_ -> dumpSplitStore(splitState_.current);
+
+    #endif
+
+    return 1;
+  }
+
+  delete [] checksum;
+
+  //
+  // Tell the split store if it must use
+  // the disk cache to retrieve and save
+  // the message.
+  //
+
+  splitMessage -> setPolicy(splitState_.load, splitState_.save);
+
+  //
+  // Try to locate the message on disk.
+  //
+
+  if (clientStore_ -> getSplitStore(splitState_.current) ->
+          load(splitMessage) == 1)
+  {
+    #if defined(TEST) || defined(SPLIT)
+    *logofs << "handleSplit: SPLIT! Loaded the message "
+            << "from the image cache.\n" << logofs_flush;
+    #endif
+
+    splitMessage -> setState(split_loaded);
+  }
+  else
+  {
+    #if defined(TEST) || defined(SPLIT)
+    *logofs << "handleSplit: WARNING! SPLIT! Can't find the message "
+            << "in the image cache.\n" << logofs_flush;
+    #endif
+
+    splitMessage -> setState(split_missed);
+  }
+
+  #if defined(TEST) || defined(SPLIT)
+
+  T_timestamp startTs = getTimestamp();
+
+  *logofs << "handleSplit: SPLIT! Encoding abort "
+          << "split events for FD#" << fd_ << " at "
+          << strMsTimestamp() << ".\n" << logofs_flush;
+  #endif
+
+  if (proxy -> handleAsyncSplit(fd_, splitMessage) < 0)
+  {
+    return -1;
+  }
+
+  //
+  // Send the encoded data immediately. We
+  // want the abort split message to reach
+  // the remote proxy as soon as possible.
+  //
+
+  if (proxy -> handleAsyncFlush() < 0)
+  {
+    return -1;
+  }
+
+  #if defined(TEST) || defined(SPLIT)
+
+  *logofs << "handleSplit: SPLIT! Spent "
+          << diffTimestamp(startTs, getTimestamp()) << " Ms "
+          << "handling abort split events for FD#" << fd_
+          << ".\n" << logofs_flush;
+
+  *logofs << "handleSplit: SPLIT! There are " << clientStore_ ->
+             getSplitTotalSize() << " messages and " << clientStore_ ->
+             getSplitTotalStorageSize() << " bytes to send in "
+          << "the split stores.\n" << logofs_flush;
+
+  clientStore_ -> dumpSplitStore(splitState_.current);
+
+  #endif
+
+  return 1;
+}
+
+int ServerChannel::handleSplit(DecodeBuffer &decodeBuffer)
+{
+  #if defined(TEST) || defined(SPLIT)
+  *logofs << "handleSplit: SPLIT! Going to handle splits "
+          << "for FD#" << fd_ << " at " << strMsTimestamp()
+          << ".\n" << logofs_flush;
+  #endif
+
+  unsigned char resource;
+
+  // Since ProtoStep7 (#issue 108)
+  decodeBuffer.decodeCachedValue(resource, 8,
+                     clientCache_ -> resourceCache);
+
+  splitState_.current = resource;
+
+  handleSplitStoreAlloc(&splitResources_, splitState_.current);
+
+  SplitStore *splitStore = clientStore_ -> getSplitStore(splitState_.current);
+
+  #if defined(TEST) || defined(SPLIT)
+  *logofs << "handleSplit: SPLIT! Handling splits for "
+          << "resource [" << splitState_.current << "] with "
+          << splitStore -> getSize() << " elements "
+          << "in the split store.\n" << logofs_flush;
+  #endif
+
+  int result = splitStore -> receive(decodeBuffer);
+
+  if (result < 0)
+  {
+    #ifdef PANIC
+    *logofs << "handleSplit: PANIC! Receive of split for FD#" << fd_
+            << " failed.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Receive of split for FD#" << fd_
+         << " failed.\n";
+
+    return -1;
+  }
+  else if (result == 0)
+  {
+    //
+    // The split is still incomplete. It's time
+    // to check if we need to start the house-
+    // keeping process to take care of the image
+    // cache.
+    //
+
+    if (proxy -> handleAsyncKeeperCallback() < 0)
+    {
+      return -1;
+    }
+  }
+  else
+  {
+    //
+    // Note that we don't need the resource id at the
+    // X server side and, thus, we don't provide it
+    // at the time we add split to the split store.
+    //
+
+    #if defined(TEST) || defined(SPLIT)
+    *logofs << "handleSplit: SPLIT! Remote agent should "
+            << "now commit a new split for resource ["
+            << splitState_.current << "].\n"
+            << logofs_flush;
+
+    clientStore_ -> dumpCommitStore();
+
+    #endif
+
+    if (splitStore -> getSize() == 0)
+    {
+      #if defined(TEST) || defined(SPLIT)
+      *logofs << "handleSplit: SPLIT! Removing split store "
+              << "for resource [" << splitState_.current
+              << "] at " << strMsTimestamp() << ".\n"
+              << logofs_flush;
+      #endif
+
+      handleSplitStoreRemove(&splitResources_, splitState_.current);
+
+      #if defined(TEST) || defined(SPLIT)
+      *logofs << "handleSplit: SPLIT! There are [" << clientStore_ ->
+                 getSplitTotalSize() << "] messages and " << clientStore_ ->
+                 getSplitTotalStorageSize() << " bytes to send in "
+              << "the split stores.\n" << logofs_flush;
+      #endif
+    }
+    else
+    {
+      //
+      // If the next split is discarded, it can be
+      // that, since the beginning of the split, we
+      // have saved the message on the disk, due to
+      // a more recent split operation. This is also
+      // the case when we had to discard the message
+      // because it was locked but, since then, we
+      // completed the transferral of the split.
+      //
+
+      Split *splitMessage = splitStore -> getFirstSplit();
+
+      if (splitMessage -> getAction() == is_discarded &&
+            splitMessage -> getState() == split_missed &&
+                splitStore -> load(splitMessage) == 1)
+      {
+        #if defined(TEST) || defined(SPLIT)
+        *logofs << "handleSplit: WARNING! SPLIT! Asynchronously "
+                << "loaded the message from the image cache.\n"
+                << logofs_flush;
+        #endif
+
+        splitMessage -> setState(split_loaded);
+
+        #if defined(TEST) || defined(SPLIT)
+
+        T_timestamp startTs = getTimestamp();
+
+        *logofs << "handleSplit: WARNING! SPLIT! Asynchronously "
+                << "encoding abort split events for FD#" << fd_
+                << " at " << strMsTimestamp() << ".\n"
+                << logofs_flush;
+        #endif
+
+        if (proxy -> handleAsyncSplit(fd_, splitMessage) < 0)
+        {
+          return -1;
+        }
+
+        //
+        // Send the encoded data immediately. We
+        // want the abort split message to reach
+        // the remote proxy as soon as possible.
+        //
+
+        if (proxy -> handleAsyncFlush() < 0)
+        {
+          return -1;
+        }
+
+        #if defined(TEST) || defined(SPLIT)
+
+        *logofs << "handleSplit: WARNING! SPLIT! Spent "
+                << diffTimestamp(startTs, getTimestamp()) << " Ms "
+                << "handling asynchronous abort split events for "
+                << "FD#" << fd_ << ".\n" << logofs_flush;
+
+        *logofs << "handleSplit: SPLIT! There are " << clientStore_ ->
+                   getSplitTotalSize() << " messages and " << clientStore_ ->
+                   getSplitTotalStorageSize() << " bytes to send in "
+                << "the split stores.\n" << logofs_flush;
+
+        clientStore_ -> dumpSplitStore(splitState_.current);
+
+        #endif
+      }
+    }
+  }
+
+  return 1;
+}
+
+int ServerChannel::handleSplitEvent(EncodeBuffer &encodeBuffer, Split *splitMessage)
+{
+  int resource = splitMessage -> getResource();
+
+  #if defined(TEST) || defined(SPLIT)
+  *logofs << "handleSplitEvent: SPLIT! Going to send a "
+          << "split report for resource " << resource
+          << ".\n" << logofs_flush;
+  #endif
+
+  //
+  // This function is called only after the message
+  // has been searched in the disk cache. We need to
+  // inform the other side if the data transfer can
+  // start or it must be aborted to let the local
+  // side use the copy that was found on the disk.
+  //
+
+  #if defined(TEST) || defined(INFO)
+
+  if (splitMessage -> getState() != split_loaded &&
+          splitMessage -> getState() != split_missed)
+  {
+    *logofs << "handleSplitEvent: PANIC! Can't find the split to be aborted.\n"
+            << logofs_flush;
+
+    HandleCleanup();
+  }
+
+  #endif
+
+  //
+  // We need to send a boolean telling if the split
+  // was found or not, followed by the checksum of
+  // message we are referencing.
+  //
+
+  T_checksum checksum = splitMessage -> getChecksum();
+
+  #if defined(TEST) || defined(SPLIT)
+  *logofs << "handleSplitEvent: SPLIT! Sending split report for "
+          << "checksum [" << DumpChecksum(checksum) << "].\n"
+          << logofs_flush;
+  #endif
+
+  if (proxy -> handleAsyncSwitch(fd_) < 0)
+  {
+    return -1;
+  }
+
+  encodeBuffer.encodeOpcodeValue(opcodeStore_ -> splitEvent,
+                                     serverCache_ -> opcodeCache);
+
+  //
+  // The encoding in older protocol versions
+  // is different but we will never try to
+  // send a split report if the remote does
+  // not support our version.
+  //
+
+  encodeBuffer.encodeCachedValue(resource, 8,
+                     serverCache_ -> resourceCache);
+
+  if (splitMessage -> getState() == split_loaded)
+  {
+    encodeBuffer.encodeBoolValue(1);
+
+    encodeBuffer.encodeOpcodeValue(splitMessage -> getStore() -> opcode(),
+                                       serverCache_ -> abortOpcodeCache);
+
+    encodeBuffer.encodeValue(splitMessage -> compressedSize(), 32, 14);
+  }
+  else
+  {
+    encodeBuffer.encodeBoolValue(0);
+  }
+
+  for (unsigned int i = 0; i < MD5_LENGTH; i++)
+  {
+    encodeBuffer.encodeValue((unsigned int) checksum[i], 8);
+  }
+
+  //
+  // Update statistics for this special opcode.
+  //
+
+  int bits = encodeBuffer.diffBits();
+
+  #if defined(TEST) || defined(OPCODES) || defined(INFO) || defined(SPLIT)
+  *logofs << "handleSplitEvent: SPLIT! Handled event OPCODE#"
+          << (unsigned int) opcodeStore_ -> splitEvent << " ("
+          << DumpOpcode(opcodeStore_ -> splitEvent) << ")" << " for FD#"
+          << fd_ << " sequence none. 0 bytes in, " << bits << " bits ("
+          << ((float) bits) / 8 << " bytes) out.\n" << logofs_flush;
+  #endif
+
+  statistics -> addEventBits(opcodeStore_ -> splitEvent, 0, bits);
+
+  return 1;
+}
+
+int ServerChannel::handleAbortSplitRequest(DecodeBuffer &decodeBuffer, unsigned char &opcode,
+                                               unsigned char *&buffer, unsigned int &size)
+{
+  unsigned char resource;
+
+  decodeBuffer.decodeCachedValue(resource, 8,
+                     clientCache_ -> resourceCache);
+
+  #if defined(TEST) || defined(SPLIT)
+  *logofs << "handleAbortSplitRequest: SPLIT! Handling abort split "
+          << "request for FD#" << fd_ << " and resource "
+          << (unsigned) resource << ".\n"
+          << logofs_flush;
+  #endif
+
+  int splits = 0;
+
+  SplitStore *splitStore = clientStore_ -> getSplitStore(resource);
+
+  if (splitStore != NULL)
+  {
+    //
+    // Discard from the memory cache the messages
+    // that are still incomplete and then get rid
+    // of the splits in the store.
+    //
+
+    #if defined(TEST) || defined(SPLIT)
+
+    clientStore_ -> dumpSplitStore(resource);
+
+    #endif
+
+    Split *splitMessage;
+
+    for (;;)
+    {
+      splitMessage = splitStore -> getFirstSplit();
+
+      if (splitMessage == NULL)
+      {
+        //
+        // Check if we had created the store
+        // but no message was added yet.
+        //
+
+        #ifdef WARNING
+
+        if (splits == 0)
+        {
+          *logofs << "handleAbortSplitRequest: WARNING! SPLIT! The "
+                  << "split store for resource [" << (unsigned int)
+                     resource << "] is unexpectedly empty.\n"
+                  << logofs_flush;
+        }
+
+        #endif
+
+        break;
+      }
+
+      //
+      // Splits already aborted can't be in the
+      // split store.
+      //
+
+      #if defined(TEST) || defined(SPLIT)
+
+      if (splitMessage -> getState() == split_aborted)
+      {
+        *logofs << "handleAbortSplitRequest: PANIC! SPLIT! Found an "
+                << "aborted split in store [" << (unsigned int) resource
+                << "].\n" << logofs_flush;
+
+        HandleCleanup();
+      }
+
+      #endif
+
+      if (splitMessage -> getAction() == IS_HIT)
+      {
+        #if defined(TEST) || defined(SPLIT)
+        *logofs << "handleAbortSplitRequest: SPLIT! Removing the "
+                << "split from the memory cache.\n"
+                << logofs_flush;
+        #endif
+
+        splitMessage -> getStore() -> remove(splitMessage -> getPosition(),
+                                                 discard_checksum, use_data);
+      }
+
+      #if defined(TEST) || defined(SPLIT)
+      *logofs << "handleAbortSplitRequest: SPLIT! Removing the "
+              << "split from the split store.\n"
+              << logofs_flush;
+      #endif
+
+      splitMessage = splitStore -> pop();
+
+      #if defined(TEST) || defined(SPLIT)
+      *logofs << "handleAbortSplitRequest: SPLIT! Freeing up the "
+              << "aborted split.\n" << logofs_flush;
+      #endif
+
+      delete splitMessage;
+
+      splits++;
+    }
+  }
+  #ifdef WARNING
+  else
+  {
+    *logofs << "handleAbortSplitRequest: WARNING! SPLIT! The "
+            << "split store for resource [" << (unsigned int)
+               resource << "] is already empty.\n"
+            << logofs_flush;
+  }
+  #endif
+
+  handleNullRequest(opcode, buffer, size);
+
+  return (splits > 0);
+}
+
+int ServerChannel::handleCommitSplitRequest(DecodeBuffer &decodeBuffer, unsigned char &opcode,
+                                                unsigned char *&buffer, unsigned int &size)
+{
+  //
+  // Get request type and position of the image
+  // to commit.
+  //
+
+  unsigned char request;
+
+  decodeBuffer.decodeOpcodeValue(request, clientCache_ -> opcodeCache);
+
+  unsigned int diffCommit;
+
+  decodeBuffer.decodeValue(diffCommit, 32, 5);
+
+  splitState_.commit += diffCommit;
+
+  unsigned char resource = 0;
+  unsigned int commit = 1;
+
+  //
+  // Send the resource id and the commit flag.
+  // The resource id is ignored at the moment.
+  // The message will be handled based on the
+  // resource id that was sent together with
+  // the original message.
+  //
+
+  decodeBuffer.decodeCachedValue(resource, 8,
+                     clientCache_ -> resourceCache);
+
+  decodeBuffer.decodeBoolValue(commit);
+
+  Split *split = handleSplitCommitRemove(request, resource, splitState_.commit);
+
+  if (split == NULL)
+  {
+    return -1;
+  }
+
+  clientStore_ -> getCommitStore() -> update(split);
+
+  if (commit == 1)
+  {
+    #if defined(TEST) || defined(SPLIT)
+    *logofs << "handleCommitSplitRequest: SPLIT! Handling split commit "
+            << "for FD#" << fd_ << " with commit " << commit
+            << " request " << (unsigned) request << " resource "
+            << (unsigned) resource << " and position "
+            << splitState_.commit << ".\n"
+            << logofs_flush;
+    #endif
+
+    //
+    // Allocate as many bytes in the write
+    // buffer as the final length of the
+    // message in uncompressed form.
+    //
+
+    size = split -> plainSize();
+
+    buffer = writeBuffer_.addMessage(size);
+
+    #if defined(TEST) || defined(SPLIT)
+    *logofs << "handleCommitSplitRequest: SPLIT! Prepared an "
+            << "outgoing buffer of " << size << " bytes.\n"
+            << logofs_flush;
+    #endif
+
+    if (clientStore_ -> getCommitStore() -> expand(split, buffer, size) < 0)
+    {
+      writeBuffer_.removeMessage(size);
+
+      commit = 0;
+    }
+  }
+
+  //
+  // Free the split.
+  //
+
+  #if defined(TEST) || defined(SPLIT)
+  *logofs << "handleCommitSplitRequest: SPLIT! Freeing up the "
+          << "committed split.\n" << logofs_flush;
+  #endif
+
+  delete split;
+
+  //
+  // Discard the operation and send a null
+  // message.
+  //
+
+  if (commit == 0)
+  {
+    handleNullRequest(opcode, buffer, size);
+  }
+  else
+  {
+    //
+    // Save the sequence number to be able
+    // to mask any error generated by the
+    // request.
+    //
+
+    updateCommitQueue(clientSequence_);
+
+    //
+    // Now in the write buffer there is
+    // a copy of this request.
+    //
+
+    opcode = request;
+  }
+
+  return commit;
+}
+
+int ServerChannel::handleGeometry(unsigned char &opcode, unsigned char *&buffer,
+                                      unsigned int &size)
+{
+  //
+  // Replace the old geometry and taint
+  // the message into a X_NoOperation.
+  //
+
+  int resource = *(buffer + 1);
+
+  #ifdef TEST
+  *logofs << "handleGeometry: Setting new unpack geometry "
+          << "for resource " << resource << ".\n"
+          << logofs_flush;
+  #endif
+
+  handleUnpackStateInit(resource);
+
+  handleUnpackAllocGeometry(resource);
+
+  unpackState_[resource] -> geometry -> depth1_bpp  = *(buffer + 4);
+  unpackState_[resource] -> geometry -> depth4_bpp  = *(buffer + 5);
+  unpackState_[resource] -> geometry -> depth8_bpp  = *(buffer + 6);
+  unpackState_[resource] -> geometry -> depth16_bpp = *(buffer + 7);
+  unpackState_[resource] -> geometry -> depth24_bpp = *(buffer + 8);
+  unpackState_[resource] -> geometry -> depth32_bpp = *(buffer + 9);
+
+  unpackState_[resource] -> geometry -> red_mask   = GetULONG(buffer + 12, bigEndian_);
+  unpackState_[resource] -> geometry -> green_mask = GetULONG(buffer + 16, bigEndian_);
+  unpackState_[resource] -> geometry -> blue_mask  = GetULONG(buffer + 20, bigEndian_);
+
+  handleCleanAndNullRequest(opcode, buffer, size);
+
+  return 1;
+}
+
+int ServerChannel::handleColormap(unsigned char &opcode, unsigned char *&buffer,
+                                      unsigned int &size)
+{
+  //
+  // Replace the old colormap and taint
+  // the message into a X_NoOperation.
+  //
+
+  int resource = *(buffer + 1);
+
+  #ifdef TEST
+  *logofs << "handleColormap: Setting new unpack colormap "
+          << "for resource " << resource << ".\n"
+          << logofs_flush;
+  #endif
+
+  handleUnpackStateInit(resource);
+
+  handleUnpackAllocColormap(resource);
+
+  //
+  // New protocol versions send the alpha
+  // data in compressed form.
+  //
+
+  //
+  // Since ProtoStep7 (#issue 108)
+  //
+
+  { // An anonymous block is used here to limit the scope of local variables
+    unsigned int packed   = GetULONG(buffer + 8, bigEndian_);
+    unsigned int unpacked = GetULONG(buffer + 12, bigEndian_);
+
+    validateSize("colormap", packed, unpacked, 16, size);
+
+    if (unpackState_[resource] -> colormap -> entries != unpacked >> 2 &&
+            unpackState_[resource] -> colormap -> data != NULL)
+    {
+      #ifdef TEST
+      *logofs << "handleColormap: Freeing previously allocated "
+              << "unpack colormap data.\n" << logofs_flush;
+      #endif
+
+      delete [] unpackState_[resource] -> colormap -> data;
+
+      unpackState_[resource] -> colormap -> data    = NULL;
+      unpackState_[resource] -> colormap -> entries = 0;
+    }
+
+    #ifdef TEST
+    *logofs << "handleColormap: Setting " << unpacked
+            << " bytes of unpack colormap data for resource "
+            << resource << ".\n" << logofs_flush;
+    #endif
+
+    if (unpackState_[resource] -> colormap -> data == NULL)
+    {
+      unpackState_[resource] -> colormap -> data =
+            (unsigned int *) new unsigned char[unpacked];
+
+      if (unpackState_[resource] -> colormap -> data == NULL)
+      {
+        #ifdef PANIC
+        *logofs << "handleColormap: PANIC! Can't allocate "
+                << unpacked << " entries for unpack colormap data "
+                << "for FD#" << fd_ << ".\n" << logofs_flush;
+        #endif
+
+        goto handleColormapEnd;
+      }
+
+      #ifdef DEBUG
+      *logofs << "handleColormap: Size of new colormap data is "
+              << unpacked << ".\n" << logofs_flush;
+      #endif
+    }
+
+    unsigned int method = *(buffer + 4);
+
+    if (method == PACK_COLORMAP)
+    {
+      if (UnpackColormap(method, buffer + 16, packed,
+                             (unsigned char *) unpackState_[resource] ->
+                                 colormap -> data, unpacked) < 0)
+      {
+        #ifdef PANIC
+        *logofs << "handleColormap: PANIC! Can't unpack " << packed
+                << " bytes to " << unpacked << " entries for FD#"
+                << fd_ << ".\n" << logofs_flush;
+        #endif
+
+        delete [] unpackState_[resource] -> colormap -> data;
+
+        unpackState_[resource] -> colormap -> data    = NULL;
+        unpackState_[resource] -> colormap -> entries = 0;
+
+        goto handleColormapEnd;
+      }
+    }
+    else
+    {
+      memcpy((unsigned char *) unpackState_[resource] ->
+                 colormap -> data, buffer + 16, unpacked);
+    }
+
+    unpackState_[resource] -> colormap -> entries = unpacked >> 2;
+
+    #if defined(DEBUG) && defined(DUMP)
+
+    *logofs << "handleColormap: Dumping colormap entries:\n"
+            << logofs_flush;
+
+    const unsigned char *p = (const unsigned char *) unpackState_[resource] -> colormap -> data;
+
+    for (unsigned int i = 0; i < unpackState_[resource] ->
+             colormap -> entries; i++)
+    {
+      *logofs << "handleColormap: [" << i << "] ["
+              << (void *) ((int) p[i]) << "].\n"
+              << logofs_flush;
+    }
+
+    #endif
+  } // end anonymous block
+
+handleColormapEnd:
+
+  handleCleanAndNullRequest(opcode, buffer, size);
+
+  return 1;
+}
+
+int ServerChannel::handleAlpha(unsigned char &opcode, unsigned char *&buffer,
+                                      unsigned int &size)
+{
+  int resource = *(buffer + 1);
+
+  #ifdef TEST
+  *logofs << "handleAlpha: Setting new unpack alpha "
+          << "for resource " << resource << ".\n"
+          << logofs_flush;
+  #endif
+
+  handleUnpackStateInit(resource);
+
+  handleUnpackAllocAlpha(resource);
+
+  //
+  // New protocol versions send the alpha
+  // data in compressed form.
+  //
+
+  //
+  // Since ProtoStep7 (#issue 108)
+  //
+
+  {  // An anonymous block is used here to limit the scope of local variables
+    unsigned int packed   = GetULONG(buffer + 8, bigEndian_);
+    unsigned int unpacked = GetULONG(buffer + 12, bigEndian_);
+
+    validateSize("alpha", packed, unpacked, 16, size);
+
+    if (unpackState_[resource] -> alpha -> entries != unpacked &&
+            unpackState_[resource] -> alpha -> data != NULL)
+    {
+      #ifdef TEST
+      *logofs << "handleAlpha: Freeing previously allocated "
+              << "unpack alpha data.\n" << logofs_flush;
+      #endif
+
+      delete [] unpackState_[resource] -> alpha -> data;
+
+      unpackState_[resource] -> alpha -> data    = NULL;
+      unpackState_[resource] -> alpha -> entries = 0;
+    }
+
+    #ifdef TEST
+    *logofs << "handleAlpha: Setting " << unpacked
+            << " bytes of unpack alpha data for resource "
+            << resource << ".\n" << logofs_flush;
+    #endif
+
+    if (unpackState_[resource] -> alpha -> data == NULL)
+    {
+      unpackState_[resource] -> alpha -> data = new unsigned char[unpacked];
+
+      if (unpackState_[resource] -> alpha -> data == NULL)
+      {
+        #ifdef PANIC
+        *logofs << "handleAlpha: PANIC! Can't allocate "
+                << unpacked << " entries for unpack alpha data "
+                << "for FD#" << fd_ << ".\n" << logofs_flush;
+        #endif
+
+        goto handleAlphaEnd;
+      }
+
+      #ifdef DEBUG
+      *logofs << "handleAlpha: Size of new alpha data is "
+              << unpacked << ".\n" << logofs_flush;
+      #endif
+    }
+
+    unsigned int method = *(buffer + 4);
+
+    if (method == PACK_ALPHA)
+    {
+      if (UnpackAlpha(method, buffer + 16, packed,
+                          unpackState_[resource] -> alpha ->
+                              data, unpacked) < 0)
+      {
+        #ifdef PANIC
+        *logofs << "handleAlpha: PANIC! Can't unpack " << packed
+                << " bytes to " << unpacked << " entries for FD#"
+                << fd_ << ".\n" << logofs_flush;
+        #endif
+
+        delete [] unpackState_[resource] -> alpha -> data;
+
+        unpackState_[resource] -> alpha -> data    = NULL;
+        unpackState_[resource] -> alpha -> entries = 0;
+
+        goto handleAlphaEnd;
+      }
+    }
+    else
+    {
+      memcpy((unsigned char *) unpackState_[resource] ->
+                 alpha -> data, buffer + 16, unpacked);
+    }
+
+    unpackState_[resource] -> alpha -> entries = unpacked;
+
+    #if defined(DEBUG) && defined(DUMP)
+
+    *logofs << "handleAlpha: Dumping alpha entries:\n"
+            << logofs_flush;
+
+    const unsigned char *p = unpackState_[resource] -> alpha -> data;
+
+    for (unsigned int i = 0; i < unpackState_[resource] ->
+             alpha -> entries; i++)
+    {
+      *logofs << "handleAlpha: [" << i << "] ["
+              << (void *) ((int) p[i]) << "].\n"
+              << logofs_flush;
+    }
+
+    #endif
+  } //end anonymous block
+
+handleAlphaEnd:
+
+  handleCleanAndNullRequest(opcode, buffer, size);
+
+  return 1;
+}
+
+int ServerChannel::handleImage(unsigned char &opcode, unsigned char *&buffer,
+                                   unsigned int &size)
+{
+  int result = 1;
+
+  //
+  // Save the original opcode together with
+  // the image state so we can later find if
+  // this is a plain or a packed image when
+  // moving data to the shared memory area.
+  //
+
+  handleImageStateAlloc(opcode);
+
+  if (opcode == opcodeStore_ -> putPackedImage)
+  {
+    //
+    // Unpack the image and put a X_PutImage in a
+    // new buffer. Save the expected output size,
+    // so, in the case of a decoding error we can
+    // still update the statistics.
+    //
+
+    int length = GetULONG(buffer + 20, bigEndian_);
+
+    #ifdef TEST
+    *logofs << "handleImage: Sending image for FD#" << fd_
+            << " due to OPCODE#" << (unsigned int) opcode << " with "
+            << GetULONG(buffer + 16, bigEndian_) << " bytes packed "
+            << "and " << GetULONG(buffer + 20, bigEndian_)
+            << " bytes unpacked.\n" << logofs_flush;
+    #endif
+
+    statistics -> addPackedBytesIn(size);
+
+    result = handleUnpack(opcode, buffer, size);
+
+    if (result < 0)
+    {
+      //
+      // Recover from the error. Send a X_NoOperation
+      // to keep the sequence counter in sync with
+      // the remote peer.
+      //
+
+      size   = 4;
+      buffer = writeBuffer_.addMessage(size);
+
+      *buffer = X_NoOperation;
+
+      PutUINT(size >> 2, buffer + 2, bigEndian_);
+
+      #ifdef PANIC
+      *logofs << "handleImage: PANIC! Sending X_NoOperation for FD#"
+              << fd_ << " to recover from failed unpack.\n"
+              << logofs_flush;
+      #endif
+
+      //
+      // Set the output length to reflect the amount of
+      // data that would have been produced by unpacking
+      // the image. This is advisable to keep the count-
+      // ers in sync with those at remote proxy. Setting
+      // the size here doesn't have any effect on the
+      // size of data sent to the X server as the actual
+      // size will be taken from the content of the write
+      // buffer.
+      //
+
+      size = length;
+    }
+
+    statistics -> addPackedBytesOut(size);
+
+    //
+    // Refrain the write loop from putting
+    // opcode and size in the output buffer.
+    //
+
+    opcode = 0;
+  }
+
+  //
+  // Now image is unpacked as a X_PutImage
+  // in write buffer. Check if we can send
+  // the image using the MIT-SHM extension.
+  //
+
+  if (result > 0)
+  {
+    result = handleShmem(opcode, buffer, size);
+
+    //
+    // We already put opcode and size in
+    // the resulting buffer.
+    //
+
+    if (result > 0)
+    {
+      opcode = 0;
+    }
+  }
+
+  return 1;
+}
+
+int ServerChannel::handleMotion(EncodeBuffer &encodeBuffer)
+{
+  #if defined(TEST) || defined(INFO)
+
+  if (lastMotion_[0] == '\0')
+  {
+    *logofs << "handleMotion: PANIC! No motion events to send "
+            << "for FD#" << fd_ << ".\n" << logofs_flush;
+
+    HandleCleanup();
+  }
+
+  #endif
+
+  #if defined(TEST) || defined(INFO)
+  *logofs << "handleMotion: Sending motion events for FD#"
+          << fd_ << " at " << strMsTimestamp() << ".\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // Replicate code from read loop. When have
+  // time and wish, try to split everything
+  // in functions.
+  //
+
+  if (proxy -> handleAsyncSwitch(fd_) < 0)
+  {
+    return -1;
+  }
+
+  const unsigned char *buffer = lastMotion_;
+  unsigned char opcode = *lastMotion_;
+  unsigned int size = 32;
+
+  if (GetUINT(buffer + 2, bigEndian_) < serverSequence_)
+  {
+    PutUINT(serverSequence_, (unsigned char *) buffer + 2, bigEndian_);
+  }
+
+  encodeBuffer.encodeOpcodeValue(opcode, serverCache_ -> opcodeCache);
+
+  unsigned int sequenceNum = GetUINT(buffer + 2, bigEndian_);
+
+  unsigned int sequenceDiff = sequenceNum - serverSequence_;
+
+  serverSequence_ = sequenceNum;
+
+  #ifdef DEBUG
+  *logofs << "handleMotion: Last server sequence number for FD#" 
+          << fd_ << " is " << serverSequence_ << " with "
+          << "difference " << sequenceDiff << ".\n"
+          << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeCachedValue(sequenceDiff, 16,
+                     serverCache_ -> eventSequenceCache, 7);
+
+  //
+  // If we fast encoded the message
+  // then skip the rest.
+  //
+
+  if (control -> LocalDeltaCompression == 0)
+  {
+    int result = handleFastReadEvent(encodeBuffer, opcode,
+                                         buffer, size);
+
+    #ifdef DEBUG
+    *logofs << "handleMotion: Sent saved motion event for FD#"
+            << fd_ << ".\n" << logofs_flush;
+    #endif
+
+    lastMotion_[0] = '\0';
+
+    #ifdef DEBUG
+    *logofs << "handleMotion: Reset last motion event for FD#"
+            << fd_ << ".\n" << logofs_flush;
+    #endif
+
+    if (result < 0)
+    {
+      return -1;
+    }
+    else if (result > 0)
+    {
+      return 1;
+    }
+  }
+
+  //
+  // This should be just the part specific
+  // for motion events but is currently a
+  // copy-paste of code from the read loop.
+  //
+
+  unsigned char detail = buffer[1];
+  if (*buffer == MotionNotify)
+    encodeBuffer.encodeBoolValue((unsigned int) detail);
+  else if ((*buffer == EnterNotify) || (*buffer == LeaveNotify))
+    encodeBuffer.encodeValue((unsigned int) detail, 3);
+  else if (*buffer == KeyRelease)
+  {
+    if (detail == serverCache_ -> keyPressLastKey)
+      encodeBuffer.encodeBoolValue(1);
+    else
+    {
+      encodeBuffer.encodeBoolValue(0);
+      encodeBuffer.encodeValue((unsigned int) detail, 8);
+    }
+  }
+  else if ((*buffer == ButtonPress) || (*buffer == ButtonRelease))
+    encodeBuffer.encodeCachedValue(detail, 8,
+                                   serverCache_ -> buttonCache);
+  else
+    encodeBuffer.encodeValue((unsigned int) detail, 8);
+  unsigned int timestamp = GetULONG(buffer + 4, bigEndian_);
+  unsigned int timestampDiff = timestamp - serverCache_ -> lastTimestamp;
+  serverCache_ -> lastTimestamp = timestamp;
+  encodeBuffer.encodeCachedValue(timestampDiff, 32,
+                      serverCache_ -> motionNotifyTimestampCache, 9);
+  int skipRest = 0;
+  if (*buffer == KeyRelease)
+  {
+    skipRest = 1;
+    for (unsigned int i = 8; i < 31; i++)
+    {
+      if (buffer[i] != serverCache_ -> keyPressCache[i - 8])
+      {
+        skipRest = 0;
+        break;
+      }
+    }
+    encodeBuffer.encodeBoolValue(skipRest);
+  }
+  if (!skipRest)
+  {
+    const unsigned char *nextSrc = buffer + 8;
+    for (unsigned int i = 0; i < 3; i++)
+    {
+      encodeBuffer.encodeCachedValue(GetULONG(nextSrc, bigEndian_), 29,
+                         *serverCache_ -> motionNotifyWindowCache[i], 6);
+      nextSrc += 4;
+    }
+    unsigned int rootX = GetUINT(buffer + 20, bigEndian_);
+    unsigned int rootY = GetUINT(buffer + 22, bigEndian_);
+    unsigned int eventX = GetUINT(buffer + 24, bigEndian_);
+    unsigned int eventY = GetUINT(buffer + 26, bigEndian_);
+    eventX -= rootX;
+    eventY -= rootY;
+    encodeBuffer.encodeCachedValue(rootX -
+          serverCache_ -> motionNotifyLastRootX, 16,
+          serverCache_ -> motionNotifyRootXCache, 6);
+    serverCache_ -> motionNotifyLastRootX = rootX;
+    encodeBuffer.encodeCachedValue(rootY -
+          serverCache_ -> motionNotifyLastRootY, 16,
+          serverCache_ -> motionNotifyRootYCache, 6);
+    serverCache_ -> motionNotifyLastRootY = rootY;
+    encodeBuffer.encodeCachedValue(eventX, 16,
+                         serverCache_ -> motionNotifyEventXCache, 6);
+    encodeBuffer.encodeCachedValue(eventY, 16,
+                         serverCache_ -> motionNotifyEventYCache, 6);
+    encodeBuffer.encodeCachedValue(GetUINT(buffer + 28, bigEndian_),
+                         16, serverCache_ -> motionNotifyStateCache);
+    if ((*buffer == EnterNotify) || (*buffer == LeaveNotify))
+      encodeBuffer.encodeValue((unsigned int) buffer[30], 2);
+    else
+      encodeBuffer.encodeBoolValue((unsigned int) buffer[30]);
+    if ((*buffer == EnterNotify) || (*buffer == LeaveNotify))
+      encodeBuffer.encodeValue((unsigned int) buffer[31], 2);
+    else if (*buffer == KeyPress)
+    {
+      serverCache_ -> keyPressLastKey = detail;
+      for (unsigned int i = 8; i < 31; i++)
+      {
+        serverCache_ -> keyPressCache[i - 8] = buffer[i];
+      }
+    }
+  }
+
+  //
+  // Print info about achieved compression
+  // and update the statistics.
+  //
+
+  int bits = encodeBuffer.diffBits();
+
+  #if defined(TEST) || defined(OPCODES)
+  *logofs << "handleMotion: Handled event OPCODE#" << (unsigned int) buffer[0]
+          << " for FD#" << fd_ << " sequence " << sequenceNum << ". "
+          << size << " bytes in, " << bits << " bits (" << ((float) bits) / 8
+          << " bytes) out.\n" << logofs_flush;
+  #endif
+
+  statistics -> addEventBits(*buffer, size << 3, bits);
+
+  #ifdef DEBUG
+  *logofs << "handleMotion: Sent saved motion event for FD#"
+          << fd_ << ".\n" << logofs_flush;
+  #endif
+
+  lastMotion_[0] = '\0';
+
+  #ifdef DEBUG
+  *logofs << "handleMotion: Reset last motion event for FD#"
+          << fd_ << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int ServerChannel::handleConfiguration()
+{
+  #ifdef TEST
+  *logofs << "ServerChannel: Setting new buffer parameters "
+          << "for FD#" << fd_ << ".\n" << logofs_flush;
+  #endif
+
+  readBuffer_.setSize(control -> ServerInitialReadSize,
+                          control -> ServerMaximumBufferSize);
+
+  writeBuffer_.setSize(control -> TransportXBufferSize,
+                           control -> TransportXBufferThreshold,
+                               control -> TransportMaximumBufferSize);
+
+  transport_ -> setSize(control -> TransportXBufferSize,
+                            control -> TransportXBufferThreshold,
+                                control -> TransportMaximumBufferSize);
+  return 1;
+}
+
+int ServerChannel::handleFinish()
+{
+  #ifdef TEST
+  *logofs << "ServerChannel: Finishing connection for FD#"
+          << fd_ << ".\n" << logofs_flush;
+  #endif
+
+  congestion_ = 0;
+  priority_   = 0;
+
+  finish_ = 1;
+
+  //
+  // Reset the motion event.
+  //
+
+  lastMotion_[0] = '\0';
+
+  transport_ -> fullReset();
+
+  return 1;
+}
+
+int ServerChannel::handleAsyncEvents()
+{
+  //
+  // Encode more events while decoding the
+  // proxy messages.
+  //
+
+  if (transport_ -> readable() > 0)
+  {
+    #if defined(TEST) || defined(INFO)
+    *logofs << "handleAsyncEvents: WARNING! Encoding events "
+            << "for FD#" << fd_ << " at " << strMsTimestamp()
+            << ".\n" << logofs_flush;
+    #endif
+
+    #if defined(TEST) || defined(INFO)
+
+    T_timestamp startTs = getTimestamp();
+
+    #endif
+
+    if (proxy -> handleAsyncRead(fd_) < 0)
+    {
+      return -1;
+    }
+
+    #if defined(TEST) || defined(INFO)
+    *logofs << "handleAsyncEvents: Spent " << diffTimestamp(startTs,
+               getTimestamp()) << " Ms handling events for FD#"
+            << fd_ << ".\n" << logofs_flush;
+    #endif
+
+    return 1;
+  }
+
+  return 0;
+}
+
+int ServerChannel::handleUnpack(unsigned char &opcode, unsigned char *&buffer,
+                                    unsigned int &size)
+{
+  int resource = *(buffer + 1);
+
+  #ifdef DEBUG
+  *logofs << "handleUnpack: Unpacking image for resource " << resource
+          << " with method " << (unsigned int) *(buffer + 12)
+          << ".\n" << logofs_flush;
+  #endif
+
+  handleUnpackStateInit(resource);
+
+  T_geometry *geometryState = unpackState_[resource] -> geometry;
+  T_colormap *colormapState = unpackState_[resource] -> colormap;
+  T_alpha    *alphaState    = unpackState_[resource] -> alpha;
+
+  if (geometryState == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "handleUnpack: PANIC! Missing geometry unpacking "
+            << "image for resource " << resource << ".\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Missing geometry unpacking "
+         << "image for resource " << resource << ".\n";
+
+    return -1;
+  }
+
+  //
+  // Get the image data from the buffer.
+  //
+
+  imageState_ -> drawable  = GetULONG(buffer + 4,  bigEndian_);
+  imageState_ -> gcontext  = GetULONG(buffer + 8,  bigEndian_);
+
+  imageState_ -> method    = *(buffer + 12);
+
+  imageState_ -> format    = *(buffer + 13);
+  imageState_ -> srcDepth  = *(buffer + 14);
+  imageState_ -> dstDepth  = *(buffer + 15);
+
+  imageState_ -> srcLength = GetULONG(buffer + 16,  bigEndian_);
+  imageState_ -> dstLength = GetULONG(buffer + 20,  bigEndian_);
+
+  imageState_ -> srcX      = GetUINT(buffer + 24, bigEndian_);
+  imageState_ -> srcY      = GetUINT(buffer + 26, bigEndian_);
+  imageState_ -> srcWidth  = GetUINT(buffer + 28, bigEndian_);
+  imageState_ -> srcHeight = GetUINT(buffer + 30, bigEndian_);
+
+  imageState_ -> dstX      = GetUINT(buffer + 32, bigEndian_);
+  imageState_ -> dstY      = GetUINT(buffer + 34, bigEndian_);
+  imageState_ -> dstWidth  = GetUINT(buffer + 36, bigEndian_);
+  imageState_ -> dstHeight = GetUINT(buffer + 38, bigEndian_);
+
+  #ifdef TEST
+  *logofs << "handleUnpack: Source X is " << imageState_ -> srcX
+          << " Y is " << imageState_ -> srcY << " width is "
+          << imageState_ -> srcWidth << " height is "
+          << imageState_ -> srcHeight << ".\n"
+          << logofs_flush;
+  #endif
+
+  #ifdef TEST
+  *logofs << "handleUnpack: Destination X is " << imageState_ -> dstX
+          << " Y is " << imageState_ -> dstY << " width is "
+          << imageState_ -> dstWidth << " height is "
+          << imageState_ -> dstHeight << ".\n"
+          << logofs_flush;
+  #endif
+
+  if (imageState_ -> srcX != 0 || imageState_ -> srcY != 0)
+  {
+    #ifdef PANIC
+    *logofs << "handleUnpack: PANIC! Unsupported source coordinates "
+            << "in unpack request.\n" << logofs_flush;
+    #endif
+
+    return -1;
+  }
+  else if (imageState_ -> method == PACK_COLORMAP_256_COLORS &&
+               (colormapState == NULL || colormapState -> data == NULL))
+  {
+    #ifdef PANIC
+    *logofs << "handleUnpack: PANIC! Cannot find any unpack colormap.\n"
+            << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  //
+  // Field srcLength carries size of image data in
+  // packed format. Field dstLength is size of the
+  // image in the original X bitmap format.
+  //
+
+  unsigned int srcDataOffset = 40;
+
+  unsigned int srcSize = imageState_ -> srcLength;
+
+  unsigned int removeSize = size;
+
+  unsigned char *srcData = buffer + srcDataOffset;
+
+  //
+  // Get source and destination bits per pixel.
+  //
+
+  int srcBitsPerPixel = MethodBitsPerPixel(imageState_ -> method);
+
+  if (srcBitsPerPixel <= 0)
+  {
+    #ifdef PANIC
+    *logofs << "handleUnpack: PANIC! Can't identify source "
+            << "bits per pixel for method " << (unsigned int)
+               imageState_ -> method << ".\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Can't identify source bits "
+         << "per pixel for method " << (unsigned int)
+            imageState_ -> method << ".\n";
+
+    writeBuffer_.removeMessage(removeSize);
+
+    return -1;
+  }
+
+  #ifdef TEST
+  *logofs << "handleUnpack: Source bits per pixel are "
+          << srcBitsPerPixel << " source data size is "
+          << srcSize << ".\n" << logofs_flush;
+  #endif
+
+  int dstBitsPerPixel = UnpackBitsPerPixel(geometryState, imageState_ -> dstDepth);
+
+  if (dstBitsPerPixel <= 0)
+  {
+    #ifdef PANIC
+    *logofs << "handleUnpack: PANIC! Can't identify "
+            << "destination bits per pixel for depth "
+            << (unsigned int) imageState_ -> dstDepth
+            << ".\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Can't identify "
+         << "destination bits per pixel for depth "
+         << (unsigned int) imageState_ -> dstDepth
+         << ".\n";
+
+    writeBuffer_.removeMessage(removeSize);
+
+    return -1;
+  }
+
+  //
+  // Destination is a PutImage request.
+  //
+
+  unsigned int dstDataOffset = 24;
+
+  //
+  // Output buffer size must match the number of input
+  // pixels multiplied by the number of bytes per pixel
+  // of current geometry.
+  //
+
+  size = (RoundUp4(imageState_ -> dstWidth * dstBitsPerPixel / 8) *
+                       imageState_ -> dstHeight) + dstDataOffset;
+
+  #ifdef TEST
+  *logofs << "handleUnpack: Destination bits per pixel are "
+          << dstBitsPerPixel << " destination data size is "
+          << size - dstDataOffset << ".\n" << logofs_flush;
+  #endif
+
+  unsigned int dstSize = size - dstDataOffset;
+
+  imageState_ -> dstLines = imageState_ -> dstHeight;
+
+  unsigned char *dstData;
+
+  //
+  // Size of the final output buffer had to be stored
+  // in the offset field of XImage/NXPackedImage.
+  //
+
+  #ifdef WARNING
+
+  if (dstSize != imageState_ -> dstLength)
+  {
+    *logofs << "handleUnpack: WARNING! Destination size mismatch "
+            << "with reported " << imageState_ -> dstLength
+            << " and actual " << dstSize << ".\n"
+            << logofs_flush;
+  }
+
+  #endif
+
+  //
+  // The decoding algorithm has put the packed image
+  // in the plain write buffer. Let's use the scratch
+  // buffer to uncompress the image.
+  //
+
+  buffer = writeBuffer_.addScratchMessage(size);
+
+  dstData = buffer + dstDataOffset;
+
+  //
+  // Unpack image into the buffer.
+  //
+
+  *buffer = (unsigned char) X_PutImage;
+
+  *(buffer + 1) = imageState_ -> format;
+
+  PutUINT(size >> 2, buffer + 2, bigEndian_);
+
+  PutULONG(imageState_ -> drawable, buffer + 4,  bigEndian_);
+  PutULONG(imageState_ -> gcontext, buffer + 8,  bigEndian_);
+
+  PutUINT(imageState_ -> dstWidth, buffer + 12, bigEndian_);
+  PutUINT(imageState_ -> dstLines, buffer + 14, bigEndian_);
+
+  PutUINT(imageState_ -> dstX, buffer + 16, bigEndian_);
+  PutUINT(imageState_ -> dstY, buffer + 18, bigEndian_);
+
+  *(buffer + 20) = 0;
+  *(buffer + 21) = imageState_ -> dstDepth;
+
+  #ifdef TEST
+  *logofs << "handleUnpack: Write buffer size is "
+          << writeBuffer_.getLength() << " scratch size is "
+          << writeBuffer_.getScratchLength() << ".\n"
+          << logofs_flush;
+  #endif
+
+  int result = 0;
+
+  switch (imageState_ -> method)
+  {
+    case PACK_JPEG_8_COLORS:
+    case PACK_JPEG_64_COLORS:
+    case PACK_JPEG_256_COLORS:
+    case PACK_JPEG_512_COLORS:
+    case PACK_JPEG_4K_COLORS:
+    case PACK_JPEG_32K_COLORS:
+    case PACK_JPEG_64K_COLORS:
+    case PACK_JPEG_256K_COLORS:
+    case PACK_JPEG_2M_COLORS:
+    case PACK_JPEG_16M_COLORS:
+    {
+      result = UnpackJpeg(geometryState, imageState_ -> method, srcData,
+                              srcSize, dstBitsPerPixel, imageState_ -> dstWidth,
+                                  imageState_ -> dstHeight, dstData, dstSize);
+      break;
+    }
+    case PACK_PNG_8_COLORS:
+    case PACK_PNG_64_COLORS:
+    case PACK_PNG_256_COLORS:
+    case PACK_PNG_512_COLORS:
+    case PACK_PNG_4K_COLORS:
+    case PACK_PNG_32K_COLORS:
+    case PACK_PNG_64K_COLORS:
+    case PACK_PNG_256K_COLORS:
+    case PACK_PNG_2M_COLORS:
+    case PACK_PNG_16M_COLORS:
+    {
+      result = UnpackPng(geometryState, imageState_ -> method, srcData,
+                             srcSize, dstBitsPerPixel, imageState_ -> dstWidth,
+                                 imageState_ -> dstHeight, dstData, dstSize);
+      break;
+    }
+    case PACK_RGB_16M_COLORS:
+    {
+      result = UnpackRgb(geometryState, imageState_ -> method, srcData,
+                             srcSize, dstBitsPerPixel, imageState_ -> dstWidth,
+                                 imageState_ -> dstHeight, dstData, dstSize);
+      break;
+    }
+    case PACK_RLE_16M_COLORS:
+    {
+      result = UnpackRle(geometryState, imageState_ -> method, srcData,
+                             srcSize, dstBitsPerPixel, imageState_ -> dstWidth,
+                                 imageState_ -> dstHeight, dstData, dstSize);
+      break;
+    }
+    case PACK_BITMAP_16M_COLORS:
+    {
+      result = UnpackBitmap(geometryState, imageState_ -> method, srcData,
+                                srcSize, dstBitsPerPixel, imageState_ -> dstWidth,
+                                    imageState_ -> dstHeight, dstData, dstSize);
+      break;
+    }
+    case PACK_COLORMAP_256_COLORS:
+    {
+      result = Unpack8(geometryState, colormapState, srcBitsPerPixel,
+                           imageState_ -> srcWidth, imageState_ -> srcHeight, srcData,
+                               srcSize, dstBitsPerPixel, imageState_ -> dstWidth,
+                                   imageState_ -> dstHeight, dstData, dstSize);
+
+      break;
+    }
+    default:
+    {
+      const T_colormask *colorMask = MethodColorMask(imageState_ -> method);
+
+      switch (imageState_ -> method)
+      {
+        case PACK_MASKED_8_COLORS:
+        case PACK_MASKED_64_COLORS:
+        case PACK_MASKED_256_COLORS:
+        {
+          result = Unpack8(geometryState, colorMask, imageState_ -> srcDepth,
+                               imageState_ -> srcWidth, imageState_ -> srcHeight,
+                                   srcData, srcSize, imageState_ -> dstDepth,
+                                       imageState_ -> dstWidth, imageState_ -> dstHeight,
+                                           dstData, dstSize);
+          break;
+        }
+        case PACK_MASKED_512_COLORS:
+        case PACK_MASKED_4K_COLORS:
+        case PACK_MASKED_32K_COLORS:
+        case PACK_MASKED_64K_COLORS:
+        {
+          result = Unpack16(geometryState, colorMask, imageState_ -> srcDepth,
+                                imageState_ -> srcWidth, imageState_ -> srcHeight,
+                                    srcData, srcSize, imageState_ -> dstDepth,
+                                        imageState_ -> dstWidth, imageState_ -> dstHeight,
+                                            dstData, dstSize);
+          break;
+        }
+        case PACK_MASKED_256K_COLORS:
+        case PACK_MASKED_2M_COLORS:
+        case PACK_MASKED_16M_COLORS:
+        {
+          result = Unpack24(geometryState, colorMask, imageState_ -> srcDepth,
+                                imageState_ -> srcWidth, imageState_ -> srcHeight,
+                                    srcData, srcSize, imageState_ -> dstDepth,
+                                        imageState_ -> dstWidth, imageState_ -> dstHeight,
+                                            dstData, dstSize);
+          break;
+        }
+        default:
+        {
+          break;
+        }
+      }
+    }
+  }
+
+  writeBuffer_.removeMessage(removeSize);
+
+  if (result <= 0)
+  {
+    #ifdef PANIC
+    *logofs << "handleUnpack: PANIC! Failed to unpack image "
+            << "with method '" << (unsigned int) imageState_ -> method
+            << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Warning" << ": Failed to unpack image "
+         << "with method '" << (unsigned int) imageState_ -> method
+         << "'.\n";
+
+    //
+    // TODO: We should mark the image somehow,
+    // and force the remote to remove it from
+    // the cache.
+    //
+
+    writeBuffer_.removeScratchMessage();
+
+    return -1;
+  }
+
+  //
+  // Alpha channel is used only on some 32 bits pixmaps
+  // and only if render extension is in use. Presently
+  // we don't have an efficient way to know in advance
+  // if mask must be applied or not to the image. If an
+  // alpha channel is set, the function will check if
+  // the size of the alpha data matches the size of the
+  // image. In the worst case we'll create an useless
+  // alpha plane for a pixmap that doesn't need it.
+  //
+
+  if (alphaState != NULL && alphaState -> data != NULL &&
+          imageState_ -> dstDepth == 32)
+  {
+    UnpackAlpha(alphaState, dstData, dstSize, imageByteOrder_);
+  }
+
+  return 1;
+}
+
+int ServerChannel::handleAuthorization(unsigned char *buffer)
+{
+  //
+  // At the present moment we don't support more than
+  // a single display for each proxy, so authorization
+  // data is shared among all the channels.
+  //
+  // Use the following code to simulate authentication
+  // failures on a LSB machine:
+  // 
+  // memcpy(buffer + 12 + (((buffer[6] + 256 *
+  //            buffer[7]) + 3) & ~3), "1234567890123456", 16);
+  //
+
+  if (auth == NULL)
+  {
+    #if defined(TEST) || defined(INFO)
+    *logofs << "handleAuthorization: Forwarding the real cookie "
+            << "for FD#" << fd_ << ".\n" << logofs_flush;
+    #endif
+
+    return 0;
+  }
+  else if (auth -> checkCookie(buffer) == 1)
+  {
+    #if defined(TEST) || defined(INFO)
+    *logofs << "handleAuthorization: Matched the fake cookie "
+            << "for FD#" << fd_ << ".\n" << logofs_flush;
+    #endif
+
+    return 1;
+  }
+  else
+  {
+    #if defined(TEST) || defined(INFO)
+    *logofs << "handleAuthorization: WARNING! Failed to match "
+            << "the fake cookie for FD#" << fd_ << ".\n"
+            << logofs_flush;
+    #endif
+
+    return -1;
+  }
+}
+
+int ServerChannel::handleAuthorization(const unsigned char *buffer, int size)
+{
+  //
+  // Check the X server's response and, in the case of
+  // an error, print the textual information reported
+  // by the server.
+  //
+
+  if (*buffer != 1)
+  {
+    const char *reason = NULL;
+
+    //
+    // At the moment we don't take into account the end-
+    // ianess of the reply. This should work in any case
+    // because we simply try to match a few well-known
+    // error strings.
+    //
+
+    if (size >= INVALID_COOKIE_SIZE + 8 &&
+            memcmp(buffer + 8, INVALID_COOKIE_DATA,
+                       INVALID_COOKIE_SIZE) == 0)
+    {
+      reason = INVALID_COOKIE_DATA;
+    }
+    else if (size >= NO_AUTH_PROTO_SIZE + 8 &&
+                 memcmp(buffer + 8, NO_AUTH_PROTO_DATA,
+                            NO_AUTH_PROTO_SIZE) == 0)
+    {
+      reason = NO_AUTH_PROTO_DATA;
+    }
+    else
+    {
+      reason = "Unknown";
+    }
+
+    #ifdef WARNING
+    *logofs << "handleAuthorization: WARNING! X connection failed "
+            << "with error '" << reason << "' on FD#" << fd_
+            << ".\n" << logofs_flush;
+    #endif
+
+    cerr << "Warning" << ": X connection failed "
+         << "with error '" << reason << "'.\n";
+  }
+  #if defined(TEST) || defined(INFO)
+  else
+  {
+    *logofs << "handleAuthorization: X connection successful "
+            << "on FD#" << fd_ << ".\n" << logofs_flush;
+  }
+  #endif
+
+  return 1;
+}
+
+//
+// Use a simple encoding. Need to handle the image
+// requests in the usual way and the X_ListExtensions
+// and X_QueryExtension to hide MIT-SHM and RENDER
+// in the reply.
+//
+
+int ServerChannel::handleFastWriteRequest(DecodeBuffer &decodeBuffer, unsigned char &opcode,
+                                              unsigned char *&buffer, unsigned int &size)
+{
+  //
+  // All the NX requests are handled in the
+  // main message loop.
+  //
+
+  //
+  // Since ProtoStep7 (#issue 108)
+  //
+  // The X_PutImage can be handled here only
+  // if a split was not requested.
+  //
+
+  if ((opcode >= X_NXFirstOpcode && opcode <= X_NXLastOpcode) ||
+          (opcode == X_PutImage && splitState_.resource != nothing) ||
+              opcode == X_ListExtensions ||
+                  opcode == X_QueryExtension)
+  {
+    return 0;
+  }
+
+  #ifdef DEBUG
+  *logofs << "handleFastWriteRequest: Decoding raw request OPCODE#"
+          << (unsigned int) opcode << " for FD#" << fd_
+          << ".\n" << logofs_flush;
+  #endif
+
+  buffer = writeBuffer_.addMessage(4);
+
+  #ifndef __sun
+
+  unsigned int *next = (unsigned int *) decodeBuffer.decodeMemory(4);
+
+  *((unsigned int *) buffer) = *next;
+
+  #else /* #ifndef __sun */
+
+  memcpy(buffer, decodeBuffer.decodeMemory(4), 4);
+
+  #endif /* #ifndef __sun */
+
+  size = GetUINT(buffer + 2, bigEndian_) << 2;
+
+  if (size < 4)
+  {
+    #ifdef WARNING
+    *logofs << "handleFastWriteRequest: WARNING! Assuming size 4 "
+            << "for suspicious message of size " << size
+            << ".\n" << logofs_flush;
+    #endif
+
+    size = 4;
+  }
+
+  writeBuffer_.registerPointer(&buffer);
+
+  if (writeBuffer_.getAvailable() < size - 4 ||
+          (int) size >= control -> TransportFlushBufferSize)
+  {
+    #ifdef DEBUG
+    *logofs << "handleFastWriteRequest: Using scratch buffer for OPCODE#"
+            << (unsigned int) opcode << " with size " << size << " and "
+            << writeBuffer_.getLength() << " bytes in buffer.\n"
+            << logofs_flush;
+    #endif
+
+    //
+    // The procedure moving data to shared memory
+    // assumes that the full message is stored in
+    // the scratch buffer. We can safely let the
+    // scratch buffer inherit the decode buffer
+    // at the next offset.
+    //
+
+    writeBuffer_.removeMessage(4);
+
+    buffer = writeBuffer_.addScratchMessage(((unsigned char *)
+                             decodeBuffer.decodeMemory(size - 4)) - 4, size);
+  }
+  else
+  {
+    writeBuffer_.addMessage(size - 4);
+
+    #ifndef __sun
+
+    if (size <= 32)
+    {
+      next = (unsigned int *) decodeBuffer.decodeMemory(size - 4);
+
+      for (unsigned int i = 4; i < size; i += sizeof(unsigned int))
+      {
+        *((unsigned int *) (buffer + i)) = *next++;
+      }
+    }
+    else
+    {
+      memcpy(buffer + 4, decodeBuffer.decodeMemory(size - 4), size - 4);
+    }
+
+    #else /* #ifndef __sun */
+
+    memcpy(buffer + 4, decodeBuffer.decodeMemory(size - 4), size - 4);
+
+    #endif /* #ifndef __sun */
+  }
+
+  //
+  // Opcode could have been tainted by the client
+  // proxy. Replace the original opcode with the
+  // one sent in the decode buffer.
+  //
+
+  *buffer = opcode;
+
+  writeBuffer_.unregisterPointer();
+
+  if (opcode == X_PutImage)
+  {
+    handleImage(opcode, buffer, size);
+  }
+
+  #if defined(TEST) || defined(OPCODES)
+
+  if (opcode != 0)
+  {
+    *logofs << "handleFastWriteRequest: Handled request "
+            << "OPCODE#" << (unsigned int) opcode << " ("
+            << DumpOpcode(opcode) << ") for FD#" << fd_
+            << " sequence " << clientSequence_ << ". "
+            << size << " bytes out.\n" << logofs_flush;
+  }
+  else
+  {
+    *logofs << "handleFastWriteRequest: Handled image or "
+            << "other request for FD#" << fd_
+            << " sequence " << clientSequence_ << ". "
+            << size << " bytes out.\n" << logofs_flush;
+  }
+
+  #endif
+
+  handleFlush(flush_if_needed);
+
+  return 1;
+}
+
+//
+// Use the simplest encoding except for replies that
+// need to be managed some way.
+//
+
+int ServerChannel::handleFastReadReply(EncodeBuffer &encodeBuffer, const unsigned char &opcode,
+                                           const unsigned char *&buffer, const unsigned int &size)
+{
+  //
+  // If we pushed a X_GetInputFocus in the sequence
+  // queue this means that the original message was
+  // a NX request for which we have to provide a NX
+  // reply.
+  //
+
+  if ((opcode >= X_NXFirstOpcode &&
+           opcode <= X_NXLastOpcode) ||
+               opcode == X_QueryExtension ||
+                   opcode == X_ListExtensions ||
+                       opcode == X_GetInputFocus)
+  {
+    return 0;
+  }
+
+  #ifdef DEBUG
+  *logofs << "handleFastReadReply: Encoding raw reply OPCODE#"
+          << (unsigned int) opcode << " for FD#" << fd_
+          << " with size " << size << ".\n"
+          << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeMemory(buffer, size);
+
+  //
+  // Send back the reply as soon
+  // as possible.
+  //
+
+  priority_++;
+
+  int bits = encodeBuffer.diffBits();
+
+  #if defined(TEST) || defined(OPCODES)
+  *logofs << "handleFastReadReply: Handled raw reply OPCODE#"
+          << (unsigned int) opcode << " for FD#" << fd_ << " sequence "
+          << serverSequence_ << ". " << size << " bytes in, "
+          << bits << " bits (" << ((float) bits) / 8
+          << " bytes) out.\n" << logofs_flush;
+  #endif
+
+  statistics -> addReplyBits(opcode, size << 3, bits);
+
+  return 1;
+}
+
+int ServerChannel::handleFastReadEvent(EncodeBuffer &encodeBuffer, const unsigned char &opcode,
+                                           const unsigned char *&buffer, const unsigned int &size)
+{
+  #ifdef DEBUG
+  *logofs << "handleFastReadEvent: Encoding raw "
+          << (opcode == X_Error ? "error" : "event") << " OPCODE#"
+          << (unsigned int) opcode << " for FD#" << fd_
+          << " with size " << size << ".\n"
+          << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeMemory(buffer, size);
+
+  switch (opcode)
+  {
+    case X_Error:
+    case ButtonPress:
+    case ButtonRelease:
+    case KeyPress:
+    case KeyRelease:
+    {
+      priority_++;
+    }
+  }
+
+  int bits = encodeBuffer.diffBits();
+
+  #if defined(TEST) || defined(OPCODES)
+
+  if (opcode == X_Error)
+  {
+    unsigned char code = *(buffer + 1);
+
+    *logofs << "handleFastReadEvent: Handled error ERR_CODE#"
+            << (unsigned int) code << " for FD#" << fd_;
+
+    *logofs << " RES_ID#" << GetULONG(buffer + 4, bigEndian_);
+
+    *logofs << " MIN_OP#" << GetUINT(buffer + 8, bigEndian_);
+
+    *logofs << " MAJ_OP#" << (unsigned int) *(buffer + 10);
+
+    *logofs << " sequence " << serverSequence_ << ". " << size
+            << " bytes in, " << bits << " bits (" << ((float) bits) / 8
+            << " bytes) out.\n" << logofs_flush;
+  }
+  else
+  {
+    *logofs << "handleFastReadEvent: Handled event OPCODE#"
+            << (unsigned int) *buffer << " for FD#" << fd_
+            << " sequence " << serverSequence_ << ". " << size
+            << " bytes in, " << bits << " bits (" << ((float) bits) / 8
+            << " bytes) out.\n" << logofs_flush;
+  }
+
+  #endif
+
+  statistics -> addEventBits(opcode, size << 3, bits);
+
+  return 1;
+}
+
+void ServerChannel::initCommitQueue()
+{
+  #ifdef TEST
+  *logofs << "initCommitQueue: Resetting the queue of split commits "
+          << "for FD#" << fd_ << ".\n" << logofs_flush;
+  #endif
+
+  for (int i = 0; i < MAX_COMMIT_SEQUENCE_QUEUE; i++)
+  {
+    commitSequenceQueue_[i] = 0;
+  }
+}
+
+void ServerChannel::updateCommitQueue(unsigned short sequence)
+{
+  for (int i = 0; i < MAX_COMMIT_SEQUENCE_QUEUE - 1; i++)
+  {
+    commitSequenceQueue_[i + 1] = commitSequenceQueue_[i];
+  }
+
+  #ifdef TEST
+  *logofs << "updateCommitQueue: Saved " << sequence
+          << " as last sequence number of image to commit.\n"
+          << logofs_flush;
+  #endif
+
+  commitSequenceQueue_[0] = sequence;
+}
+
+int ServerChannel::checkCommitError(unsigned char error, unsigned short sequence,
+                                        const unsigned char *buffer)
+{
+  //
+  // Check if error is due to an image commit
+  // generated at the end of a split.
+  //
+  // TODO: It should zero the head of the list
+  // when an event comes with a sequence number
+  // greater than the value of the last element
+  // added.
+  //
+
+  for (int i = 0; i < MAX_COMMIT_SEQUENCE_QUEUE &&
+           commitSequenceQueue_[i] != 0; i++)
+  {
+    #ifdef TEST
+    *logofs << "checkCommitError: Checking committed image's "
+            << "sequence number " << commitSequenceQueue_[i]
+            << " with input sequence " << sequence << ".\n"
+            << logofs_flush;
+    #endif
+
+    if (commitSequenceQueue_[i] == sequence)
+    {
+      #ifdef WARNING
+
+      *logofs << "checkCommitError: WARNING! Failed operation for "
+              << "FD#" << fd_ << " with ERR_CODE#"
+              << (unsigned int) *(buffer + 1);
+
+      *logofs << " RES_ID#" << GetULONG(buffer + 4, bigEndian_);
+
+      *logofs << " MIN_OP#" << GetUINT(buffer + 8, bigEndian_);
+
+      *logofs << " MAJ_OP#" << (unsigned int) *(buffer + 10);
+
+      *logofs << " sequence " << sequence << ".\n";
+
+      *logofs << logofs_flush;
+
+      #endif
+
+      cerr << "Warning" << ": Failed commit operation "
+           << "with ERR_CODE#" << (unsigned int) error;
+
+      cerr << " RES_ID#" << GetULONG(buffer + 4, bigEndian_);
+
+      cerr << " MIN_OP#" << GetUINT(buffer + 8, bigEndian_);
+
+      cerr << " MAJ_OP#" << (unsigned int) *(buffer + 10);
+
+      cerr << ".\n";
+
+      #ifdef WARNING
+      *logofs << "checkCommitError: WARNING! Suppressing error on "
+              << "OPCODE#" << (unsigned int) opcodeStore_ -> commitSplit
+              << " for FD#" << fd_ << " with sequence " << sequence
+              << " at position " << i << ".\n" << logofs_flush;
+      #endif
+
+      return 0;
+    }
+  }
+
+  return 0;
+}
+
+//
+// Check if the user pressed the CTRL+ALT+SHIFT+ESC
+// keystroke. At the present moment it uses different
+// keycodes based on the client OS. This  should be
+// implemented in a way that is platform independent
+// (that's not an easy task, considered that we don't
+// have access to the higher level X libraries).
+//
+
+int ServerChannel::checkKeyboardEvent(unsigned char event, unsigned short sequence,
+                                          const unsigned char *buffer)
+{
+  #ifdef TEST
+  *logofs << "checkKeyboardEvent: Checking escape sequence with byte [1] "
+          << (void *) ((unsigned) *(buffer + 1)) << " and bytes [28-29] "
+          << (void *) ((unsigned) GetUINT(buffer + 28, bigEndian_))
+          << " for FD#" << fd_ << ".\n" << logofs_flush;
+  #endif
+
+  #ifdef __APPLE__
+
+  int alert = (*(buffer + 1) == 0x3d &&
+                   GetUINT(buffer + 28, bigEndian_) == 0x2005);
+
+  #else
+
+  int alert = (*(buffer + 1) == 0x09 &&
+                   ((GetUINT(buffer + 28, bigEndian_) &
+                        0x0d) == 0x0d));
+
+  #endif
+
+  if (alert == 1)
+  {
+    #ifdef PANIC
+    *logofs << "checkKeyboardEvent: PANIC! Received sequence "
+            << "CTRL+ALT+SHIFT+ESC " << "for FD#"<< fd_
+            << ". Showing the abort dialog.\n" << logofs_flush;
+    #endif
+
+    cerr << "Warning" << ": Received sequence CTRL+ALT+SHIFT+ESC. "
+         << "Showing the abort dialog.\n";
+
+    HandleAlert(CLOSE_UNRESPONSIVE_X_SERVER_ALERT, 1);
+  }
+
+  return alert;
+}
+
+//
+// Handle the MIT-SHM initialization
+// messages exchanged with the remote
+// proxy. 
+//
+
+int ServerChannel::handleShmemReply(EncodeBuffer &encodeBuffer, const unsigned char opcode,
+                                        const unsigned int stage, const unsigned char *buffer,
+                                            const unsigned int size)
+{
+  #ifdef TEST
+  *logofs << "handleShmemReply: Returning shmem reply for "
+          << "stage " << stage << ".\n" << logofs_flush;
+  #endif
+
+  if (opcode == X_QueryExtension)
+  {
+    encodeBuffer.encodeValue(stage, 2);
+
+#ifndef ANDROID
+    shmemState_ -> present = *(buffer + 8);
+#else
+    shmemState_ -> present = 0;
+    cerr << "Info: handleShmemReply: In android no shared memory. Setting present to 0 hardcoded\n";
+#endif
+    shmemState_ -> opcode  = *(buffer + 9);
+    shmemState_ -> event   = *(buffer + 10);
+    shmemState_ -> error   = *(buffer + 11);
+
+    #ifdef TEST
+    *logofs << "handleShmemReply: Extension present is "
+            << shmemState_ -> present << " with base OPCODE#"
+            << (unsigned int) shmemState_ -> opcode << " base event "
+            << (unsigned int) shmemState_ -> event << " base error "
+            << (unsigned int) shmemState_ -> error << ".\n"
+            << logofs_flush;
+    #endif
+  }
+  else if (opcode == X_GetInputFocus)
+  {
+    encodeBuffer.encodeValue(stage, 2);
+
+    encodeBuffer.encodeBoolValue(0);
+
+    if (shmemState_ -> present == 1 &&
+            shmemState_ -> address != NULL &&
+                shmemState_ -> segment > 0 &&
+                    shmemState_ -> id > 0)
+    {
+      cerr << "Info" << ": Using shared memory parameters 1/"
+           << (shmemState_ -> size / 1024) << "K.\n";
+
+#ifndef ANDROID
+      shmemState_ -> enabled = 1;
+#else
+      cerr << "Info: handleShmemReply: In android no shared memory. Setting enabled to -1. This should not be displayed\n";
+      shmemState_ -> enabled = -1;
+#endif
+
+      encodeBuffer.encodeBoolValue(1);
+    }
+    else
+    {
+      #ifdef TEST
+      *logofs << "handleShmemReply: WARNING! Not using shared memory "
+              << "support in X server for FD#" << fd_ << ".\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Info" << ": Using shared memory parameters 0/0K.\n";
+
+      handleShmemStateRemove();
+
+      encodeBuffer.encodeBoolValue(0);
+    }
+  }
+  else
+  {
+    #ifdef PANIC
+    *logofs << "handleShmemReply: PANIC! Conversation error "
+            << "handling shared memory support for FD#"
+            << fd_ << ".\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Conversation error handling "
+         << "shared memory support.\n";
+
+    return -1;
+  }
+
+  return 1;
+}
+
+int ServerChannel::handleShmemRequest(DecodeBuffer &decodeBuffer, unsigned char &opcode,
+                                          unsigned char *&buffer, unsigned int &size)
+{
+  //
+  // We need to query and initialize MIT-SHM on
+  // the real X server. To do this we'll need 3
+  // requests. At the end we'll have to encode
+  // the final reply for the X client side.
+  //
+
+  handleShmemStateAlloc();
+
+  unsigned int stage;
+
+  decodeBuffer.decodeValue(stage, 2);
+
+  unsigned int expected = shmemState_ -> stage + 1;
+
+  if (stage != expected || stage > 2)
+  {
+    #ifdef PANIC
+    *logofs << "handleShmemRequest: PANIC! Unexpected stage "
+            << stage << " in handling shared memory "
+            << "support for FD#" << fd_ << ".\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Unexpected stage "
+         << stage << " in handling shared memory "
+         << "support for FD#" << fd_ << ".\n";
+
+    return -1;
+  }
+
+  switch (stage)
+  {
+    case 0:
+    {
+      unsigned int enableClient;
+      unsigned int enableServer;
+
+      decodeBuffer.decodeBoolValue(enableClient);
+      decodeBuffer.decodeBoolValue(enableServer);
+
+      unsigned int clientSegment;
+      unsigned int serverSegment;
+
+      decodeBuffer.decodeValue(clientSegment, 29, 9);
+      decodeBuffer.decodeValue(serverSegment, 29, 9);
+
+      shmemState_ -> segment = serverSegment;
+
+      #ifdef TEST
+      *logofs << "handleShmemRequest: Size of the shared memory "
+              << "segment will be " << control -> ShmemServerSize
+              << ".\n" << logofs_flush;
+      #endif
+
+      #ifdef TEST
+      *logofs << "handleShmemRequest: Sending X_QueryExtension request "
+              << "for FD#" << fd_ << " due to OPCODE#" << (unsigned int)
+                 opcodeStore_ -> getShmemParameters << " in stage "
+              << stage << ".\n" << logofs_flush;
+      #endif
+
+      opcode = X_QueryExtension;
+
+      size   = 16;
+      buffer = writeBuffer_.addMessage(size);
+
+      PutUINT(7, buffer + 4, bigEndian_);
+
+      //
+      // Simply make the query fail if shared
+      // memory support is disabled by the
+      // user.
+      //
+#ifndef ANDROID
+      if (control -> ShmemServer == 1 &&
+              control -> ShmemServerSize > 0 &&
+                  enableServer == 1)
+      {
+        memcpy(buffer + 8, "MIT-SHM", 7);
+      }
+      else
+      {
+        memcpy(buffer + 8, "NO-MIT-", 7);
+      }
+#else
+      cerr << "Info: handleShmemRequest: In android no shared memory. Returning NO-MIT- answer\n";
+
+        memcpy(buffer + 8, "NO-MIT-", 7);
+#endif
+     sequenceQueue_.push(clientSequence_, opcode,
+                              opcodeStore_ -> getShmemParameters, stage);
+
+      //
+      // Save the sequence number so we can
+      // later identify any matching X error
+      // received from server.
+      //
+
+      shmemState_ -> sequence = clientSequence_;
+
+      break;
+    }
+    case 1:
+    {
+      if (shmemState_ -> present == 1)
+      {
+        //
+        // Make the segment read-write for everybody on
+        // Cygwin (to avoid any lack of support or any
+        // performance issue) and on MacOS/X (where the
+        // 0600 mask doesn't seem to work).
+        //
+
+        #if defined(__CYGWIN32__) || defined(__APPLE__)
+
+        int permissions = 0777;
+
+        #else
+
+        int permissions = 0600;
+
+        #endif
+
+        shmemState_ -> size = control -> ShmemServerSize;
+
+#ifndef ANDROID
+        shmemState_ -> id = shmget(IPC_PRIVATE, shmemState_ -> size,
+                                       IPC_CREAT | permissions);
+#else
+	cerr << "Info: handleShmemReqyest: In android no shared memory (shmget). This message should not be displayed present should never be 1 in android\n";
+	shmemState_ -> id = -1;
+#endif
+        if (shmemState_ -> id >= 0)
+        {
+          #if defined(TEST) || defined(INFO)
+          *logofs << "handleShmemRequest: Allocated shared memory "
+                  << "segment of " << shmemState_ -> size
+                  << " bytes with id " << shmemState_ -> id
+                  << ".\n" << logofs_flush;
+          #endif
+
+
+#ifndef ANDROID
+          shmemState_ -> address = shmat(shmemState_ -> id, 0, 0);
+#else
+	  cerr << "Info: handleShmemReqyest: In android no shared memory (shmat). This message should not be displayed. present should never be 1 in android\n";
+	  shmemState_ -> address = NULL;
+#endif
+          if (shmemState_ -> address != NULL)
+          {
+            #ifdef TEST
+            *logofs << "handleShmemRequest: Sending X_ShmAttach request "
+                    << "for FD#" << fd_ << " due to OPCODE#" << (unsigned int)
+                       opcodeStore_ -> getShmemParameters << " in stage "
+                    << stage << ".\n" << logofs_flush;
+            #endif
+
+            opcode = shmemState_ -> opcode;
+
+            size   = 16;
+            buffer = writeBuffer_.addMessage(size);
+
+            *(buffer + 1) = X_ShmAttach;
+
+            PutULONG(shmemState_ -> segment, buffer + 4, bigEndian_);
+            PutULONG(shmemState_ -> id, buffer + 8, bigEndian_);
+
+            *(buffer + 12) = 1;
+
+            shmemState_ -> sequence = clientSequence_;
+
+            break;
+          }
+          else
+          {
+            #ifdef WARNING
+            *logofs << "handleShmemRequest: WARNING! Can't attach the shared "
+                    << "memory segment. Error is " << EGET() << " '"
+                    << ESTR() << "'.\n" << logofs_flush;
+            #endif
+
+            cerr << "Warning" << ": Can't attach the shared memory "
+                 << "segment. Error is " << EGET() << " '"
+                 << ESTR() << "'.\n";
+          }
+        }
+        else
+        {
+          #ifndef __CYGWIN32__
+
+          #ifdef WARNING
+          *logofs << "handleShmemRequest: WARNING! Can't create the shared "
+                  << "memory segment. Error is " << EGET() << " '"
+                  << ESTR() << "'.\n" << logofs_flush;
+          #endif
+
+          cerr << "Warning" << ": Can't create the shared memory "
+               << "segment. Error is " << EGET() << " '"
+               << ESTR() << "'.\n";
+
+          #else
+
+          #ifdef TEST
+          *logofs << "handleShmemRequest: WARNING! Can't create the shared "
+                  << "memory segment. Error is " << EGET() << " '"
+                  << ESTR() << "'.\n" << logofs_flush;
+          #endif
+
+          #endif
+        }
+      }
+
+      if (shmemState_ -> present != 0)
+      {
+        #ifdef TEST
+        *logofs << "handleShmemRequest: Resetting shared memory "
+                << "presence flag for FD#" << fd_ << ".\n"
+                << logofs_flush;
+        #endif
+
+        shmemState_ -> present = 0;
+      }
+
+      handleNullRequest(opcode, buffer, size);
+
+      break;
+    }
+    default:
+    {
+      #ifdef TEST
+      *logofs << "handleShmemRequest: Sending X_GetInputFocus request "
+              << "for FD#" << fd_ << " due to OPCODE#" << (unsigned int)
+                 opcodeStore_ -> getShmemParameters << " in stage "
+              << stage << ".\n" << logofs_flush;
+      #endif
+
+      opcode = X_GetInputFocus;
+
+      size   = 4;
+      buffer = writeBuffer_.addMessage(size);
+
+      sequenceQueue_.push(clientSequence_, opcode,
+                              opcodeStore_ -> getShmemParameters, stage);
+      break;
+    }
+  }
+
+  shmemState_ -> stage += 1;
+
+  return 1;
+}
+
+//
+// Handling of MIT-SHM extension has been plugged late in
+// the design, so we have to make some assumptions. Image
+// is a X_PutImage request contained either in the scratch
+// buffer or in the normal write buffer. We need to move
+// the image data to the shared memory segment and replace
+// the X_PutImage request with a X_ShmPutImage.
+//
+
+int ServerChannel::handleShmem(unsigned char &opcode, unsigned char *&buffer,
+                                   unsigned int &size)
+{
+  if (shmemState_ == NULL || shmemState_ -> enabled != 1)
+  {
+    #ifdef TEST
+
+    if (shmemState_ != NULL)
+    {
+      *logofs << "handleShmem: PANIC! Shared memory "
+              << "state found but support is not enabled "
+              << "for FD#" << fd_ << " in stage "
+              << shmemState_ -> stage << ".\n"
+              << logofs_flush;
+    }
+
+    #endif
+
+    return 0;
+  }
+#ifdef ANDROID
+  cerr << "Info: handleShmem: In android no shared memory.  enabled should never be 1. This should not be displayed\n";
+  return 0;
+#endif
+
+  //
+  // Ignore null requests and requests that will not result
+  // in a single X_PutImage. To conform with the other func-
+  // tions, we get the opcode passed as a parameter. It can
+  // be zero if we don't want the write loop to put opcode
+  // and length in the resulting buffer. Anyway we are only
+  // interested in the original opcode of the request, that
+  // is stored in the image state.
+  //
+
+  unsigned char *dstData    = buffer + 24;
+  unsigned int  dstDataSize = size   - 24;
+
+  if (dstDataSize == 0 || dstDataSize >
+          (unsigned int) control -> MaximumRequestSize)
+  {
+    #ifdef TEST
+    *logofs << "handleShmem: Ignoring image with opcode "
+            << (unsigned int) imageState_ -> opcode
+            << " and size " << size << " for FD#" << fd_
+            << ".\n" << logofs_flush;
+    #endif
+
+    return 0;
+  }
+
+  #ifdef TEST
+  *logofs << "handleShmem: Handling image with opcode "
+          << (unsigned int) imageState_ -> opcode
+          << " and size " << size << " for FD#" << fd_
+          << ".\n" << logofs_flush;
+  #endif
+
+  //
+  // Get image data from buffer.
+  //
+
+  if (imageState_ -> opcode == X_PutImage)
+  {
+    //
+    // We still need to get the image's data.
+    //
+
+    imageState_ -> format    = *(buffer + 1);
+
+    imageState_ -> drawable  = GetULONG(buffer + 4,  bigEndian_);
+    imageState_ -> gcontext  = GetULONG(buffer + 8,  bigEndian_);
+
+    imageState_ -> dstWidth  = GetUINT(buffer + 12, bigEndian_);
+    imageState_ -> dstHeight = GetUINT(buffer + 14, bigEndian_);
+
+    imageState_ -> srcX      = 0;
+    imageState_ -> srcY      = 0;
+
+    imageState_ -> srcWidth  = imageState_ -> dstWidth;
+    imageState_ -> srcHeight = imageState_ -> dstHeight;
+
+    imageState_ -> dstX      = GetUINT(buffer + 16, bigEndian_);
+    imageState_ -> dstY      = GetUINT(buffer + 18, bigEndian_);
+
+    imageState_ -> leftPad   = *(buffer + 20);
+    imageState_ -> dstDepth  = *(buffer + 21);
+
+    imageState_ -> dstLines  = imageState_ -> dstHeight;
+
+    imageState_ -> dstLength = size - 24;
+  }
+
+  //
+  // Skip the MIT-SHM operation if the image
+  // is 1 bits-per-plane.
+  //
+
+  if (imageState_ -> dstDepth == 1)
+  {
+    #if defined(TEST) || defined(INFO)
+    *logofs << "handleShmem: Ignoring image with opcode "
+            << (unsigned int) imageState_ -> opcode << " depth "
+            << (unsigned int) imageState_ -> dstDepth << " and "
+            << "size " << size << " for FD#" << fd_
+            << ".\n" << logofs_flush;
+    #endif
+
+    return 0;
+  }
+
+  //
+  // If the image can't fit in the available
+  // space, check if the completion event is
+  // arrived.
+  //
+
+  #if defined(TEST) || defined(INFO)
+
+  if (isTimestamp(shmemState_ -> last) == 0 &&
+          shmemState_ -> offset != 0)
+  {
+    *logofs << "handleShmem: PANIC! No timestamp for sequence "
+            << shmemState_ -> sequence << " with offset "
+            << shmemState_ -> offset << ".\n"
+            << logofs_flush;
+  }
+
+  #endif
+
+  if (shmemState_ -> offset + imageState_ -> dstLength >
+          shmemState_ -> size)
+  {
+    if (imageState_ -> dstLength > shmemState_ -> size)
+    {
+      #if defined(TEST) || defined(INFO)
+      *logofs << "handleShmem: WARNING! Can't fit the image "
+              << "in the available memory segment for FD#"
+              << fd_ << ".\n" << logofs_flush;
+      #endif
+
+      return 0;
+    }
+    else if (handleShmemEvent() <= 0)
+    {
+      #if defined(TEST) || defined(INFO)
+      *logofs << "handleShmem: WARNING! Missing completion "
+              << "after " << diffTimestamp(shmemState_ -> last,
+                 getTimestamp()) << " Ms for shared memory "
+              << "for FD#" << fd_ << ".\n" << logofs_flush;
+      #endif
+
+      return 0;
+    }
+  }
+
+  //
+  // Let image start at current offset
+  // in the shared segment.
+  //
+
+  #ifdef TEST
+  *logofs << "handleShmem: Copying " << dstDataSize
+          << " bytes to shared memory at offset "
+          << shmemState_ -> offset << " for FD#"
+          << fd_ << ".\n" << logofs_flush;
+  #endif
+
+  memcpy((unsigned char *) shmemState_ -> address +
+             shmemState_ -> offset, dstData, dstDataSize);
+
+  //
+  // Get rid of the original X_PutImage
+  // request.
+  //
+
+  if (writeBuffer_.getScratchData() != NULL)
+  {
+    writeBuffer_.removeScratchMessage();
+  }
+  else
+  {
+    writeBuffer_.removeMessage(size);
+  }
+
+  //
+  // Add a X_ShmPutImage request to the
+  // write buffer.
+  //
+
+  buffer = writeBuffer_.addMessage(40);
+
+  *buffer = shmemState_ -> opcode;
+
+  *(buffer + 1) = X_ShmPutImage;
+
+  PutUINT(40 >> 2, buffer + 2, bigEndian_);
+
+  PutULONG(imageState_ -> drawable, buffer + 4,  bigEndian_);
+  PutULONG(imageState_ -> gcontext, buffer + 8,  bigEndian_);
+
+  PutUINT(imageState_ -> dstWidth, buffer + 12, bigEndian_);
+  PutUINT(imageState_ -> dstLines, buffer + 14, bigEndian_);
+
+  PutUINT(imageState_ -> srcX, buffer + 16, bigEndian_);
+  PutUINT(imageState_ -> srcY, buffer + 18, bigEndian_);
+
+  PutUINT(imageState_ -> dstWidth,  buffer + 20, bigEndian_);
+  PutUINT(imageState_ -> dstLines,  buffer + 22, bigEndian_);
+
+  PutUINT(imageState_ -> dstX, buffer + 24, bigEndian_);
+  PutUINT(imageState_ -> dstY, buffer + 26, bigEndian_);
+
+  *(buffer + 28) = imageState_ -> dstDepth;
+  *(buffer + 29) = imageState_ -> format;
+  *(buffer + 30) = 1;
+
+  PutULONG(shmemState_ -> segment, buffer + 32, bigEndian_);
+  PutULONG(shmemState_ -> offset,  buffer + 36, bigEndian_);
+
+  shmemState_ -> offset += dstDataSize;
+
+  shmemState_ -> sequence = clientSequence_;
+  shmemState_ -> last     = getTimestamp();
+
+  #ifdef TEST
+  *logofs << "handleShmem: Saved shared memory sequence "
+          << shmemState_ -> sequence << " for FD#" << fd_
+          << " with offset " << shmemState_ -> offset
+          << " at " << strMsTimestamp() << ".\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // Make the X server read immediately
+  // from the shared memory buffer and
+  // produce the completion event.
+  //
+
+  handleFlush(flush_if_any);
+
+  return 1;
+}
+
+//
+// Try to read more events from the socket in the
+// attempt to get the completion event required
+// to reset the MIT-SHM segment.
+//
+
+int ServerChannel::handleShmemEvent()
+{
+  #if defined(TEST) || defined(INFO)
+  *logofs << "handleShmemEvent: Waiting for shared memory "
+          << "sequence " << shmemState_ -> sequence
+          << " for X server FD#" << fd_ << ".\n"
+          << logofs_flush;
+
+  T_timestamp startTs = getTimestamp();
+
+  #endif
+
+  while (isTimestamp(shmemState_ -> last) != 0)
+  {
+    if (handleWait(control -> ShmemTimeout) <= 0)
+    {
+      break;
+    }
+    #if defined(TEST) || defined(INFO)
+    else
+    {
+      *logofs << "handleShmemEvent: WARNING! Encoded events "
+              << "for FD#" << fd_ << " at " << strMsTimestamp()
+              << ".\n" << logofs_flush;
+    }
+    #endif
+  }
+
+  if (isTimestamp(shmemState_ -> last) == 0)
+  {
+    #if defined(TEST) || defined(INFO)
+    *logofs << "handleShmemEvent: Spent "
+            << diffTimestamp(startTs, getTimestamp()) << " Ms "
+            << "waiting for shared memory sequence for FD#"
+            << fd_ << ".\n" << logofs_flush;
+    #endif
+
+    return 1;
+  }
+
+  #if defined(TEST) || defined(INFO)
+  *logofs << "handleShmemEvent: WARNING! Can't reset shared "
+          << "memory sequence for FD#" << fd_ << " after "
+          << diffTimestamp(shmemState_ -> last, getTimestamp())
+          << " Ms.\n" << logofs_flush;
+  #endif
+
+  return 0;
+}
+
+int ServerChannel::checkShmemEvent(unsigned char event, unsigned short sequence,
+                                       const unsigned char *buffer)
+{
+  if (isTimestamp(shmemState_ -> last) == 1 &&
+          sequence == shmemState_ -> sequence)
+  {
+    #ifdef TEST
+    *logofs << "checkShmemEvent: Reset shared memory sequence "
+            << shmemState_ -> sequence << " for FD#" << fd_
+            << " after " << diffTimestamp(shmemState_ -> last,
+               getTimestamp()) << " Ms.\n" << logofs_flush;
+    #endif
+
+    shmemState_ -> sequence = 0;
+    shmemState_ -> offset   = 0;
+    shmemState_ -> last     = nullTimestamp();
+  }
+  #ifdef TEST
+  else
+  {
+    *logofs << "checkShmemEvent: Skipping past shared memory "
+            << "image sequence " << sequence << " for FD#"
+            << fd_ << ".\n" << logofs_flush;
+  }
+  #endif
+
+  return 1;
+}
+
+int ServerChannel::checkShmemError(unsigned char error, unsigned short sequence,
+                                       const unsigned char *buffer)
+{
+  #ifdef TEST
+
+  *logofs << "checkShmemError: WARNING! Failed operation for "
+          << "FD#" << fd_ << " in stage " << shmemState_ -> stage
+          << " with ERR_CODE#" << (unsigned int) *(buffer + 1);
+
+  *logofs << " RES_ID#" << GetULONG(buffer + 4, bigEndian_);
+
+  *logofs << " MIN_OP#" << GetUINT(buffer + 8, bigEndian_);
+
+  *logofs << " MAJ_OP#" << (unsigned int) *(buffer + 10);
+
+  *logofs << " sequence " << sequence << ".\n";
+
+  *logofs << logofs_flush;
+
+  #endif
+
+  //
+  // If enabled flag is <= 0 we are still
+  // in the inizialization phase. In this
+  // case force presence to false.
+  //
+
+  if (shmemState_ -> enabled != 1)
+  {
+    if (shmemState_ -> present != 0)
+    {
+      #ifdef TEST
+      *logofs << "checkShmemError: Resetting shared memory "
+              << "presence flag for FD#" << fd_ << ".\n"
+              << logofs_flush;
+      #endif
+
+      shmemState_ -> present = 0;
+    }
+
+    return 0;
+  }
+
+  if (shmemState_ -> sequence == sequence)
+  {
+    //
+    // Reset the sequence and timestamp.
+    //
+
+    shmemState_ -> sequence = 0;
+    shmemState_ -> offset   = 0;
+    shmemState_ -> last     = nullTimestamp();
+  }
+
+  return 1;
+}
+
+int ServerChannel::handleFontRequest(DecodeBuffer &decodeBuffer, unsigned char &opcode,
+                                         unsigned char *&buffer, unsigned int &size)
+{
+  //
+  // Send a synchronization request and use
+  // the reply to return the requested font
+  // path.
+  //
+
+  #ifdef TEST
+  *logofs << "handleFontRequest: Sending X_GetInputFocus request "
+          << "for FD#" << fd_ << " due to OPCODE#" << (unsigned int)
+             opcodeStore_ -> getFontParameters << ".\n"
+          << logofs_flush;
+  #endif
+
+  opcode = X_GetInputFocus;
+
+  size   = 4;
+  buffer = writeBuffer_.addMessage(size);
+
+  sequenceQueue_.push(clientSequence_, X_GetInputFocus,
+                          opcodeStore_ -> getFontParameters);
+
+  return 1;
+}
+
+int ServerChannel::handleFontReply(EncodeBuffer &encodeBuffer, const unsigned char opcode,
+                                       const unsigned char *buffer, const unsigned int size)
+{
+  #ifdef TEST
+  *logofs << "handleFontReply: Encoding font operation "
+          << "reply with size " << size << ".\n"
+          << logofs_flush;
+  #endif
+
+  char data[256];
+
+  if (fontPort_ != -1)
+  {
+    sprintf(data + 1, "tcp/localhost:%d", fontPort_);
+  }
+  else
+  {
+    *(data + 1) = '\0';
+  }
+
+  *data = strlen(data + 1);
+
+  unsigned char *next = (unsigned char *) data;
+
+  unsigned int length = (unsigned int) (*next++);
+
+  encodeBuffer.encodeValue(length, 8);
+
+  encodeBuffer.encodeTextData(next, length);
+
+  return 1;
+}
+
+int ServerChannel::handleCacheRequest(DecodeBuffer &decodeBuffer, unsigned char &opcode,
+                                          unsigned char *&buffer, unsigned int &size)
+{
+  unsigned int mask;
+
+  decodeBuffer.decodeCachedValue(mask, 32, clientCache_ ->
+                     setCacheParametersCache);
+
+  splitState_.save = (mask >> 8) & 0xff;
+  splitState_.load = mask & 0xff;
+
+  #ifdef TEST
+  *logofs << "handleCacheRequest: Set cache parameters to "
+          << "save " << splitState_.save << " load "
+          << splitState_.load << ".\n" << logofs_flush;
+  #endif
+
+  handleNullRequest(opcode, buffer, size);
+
+  return 1;
+}
+
+int ServerChannel::handleStartSplitRequest(DecodeBuffer &decodeBuffer, unsigned char &opcode,
+                                               unsigned char *&buffer, unsigned int &size)
+{
+  //
+  // Prepare for the split for the selected
+  // resource. Old proxy versions only used
+  // the split store at position 0.
+  //
+
+  // Since ProtoStep7 (#issue 108)
+  unsigned char resource;
+
+  decodeBuffer.decodeCachedValue(resource, 8,
+                     clientCache_ -> resourceCache);
+
+  splitState_.resource = resource;
+
+  splitState_.current = splitState_.resource;
+
+  #if defined(TEST) || defined(SPLIT)
+  *logofs << "handleStartSplitRequest: SPLIT! Registered id "
+          << splitState_.resource << " as resource "
+          << "waiting for a split.\n" << logofs_flush;
+  #endif
+
+  handleNullRequest(opcode, buffer, size);
+
+  return 1;
+}
+
+int ServerChannel::handleEndSplitRequest(DecodeBuffer &decodeBuffer, unsigned char &opcode,
+                                             unsigned char *&buffer, unsigned int &size)
+{
+  //
+  // Verify that the agent resource matches.
+  //
+
+  // Since ProtoStep7 (#issue 108)
+  unsigned char resource;
+
+  decodeBuffer.decodeCachedValue(resource, 8,
+                     clientCache_ -> resourceCache);
+
+  #ifdef TEST
+
+  if (splitState_.resource == nothing)
+  {
+    #ifdef PANIC
+    *logofs << "handleEndSplitRequest: PANIC! SPLIT! Received an end of "
+            << "split for resource id " << (unsigned int) *(buffer + 1)
+            << " without a previous start.\n"
+            << logofs_flush;
+    #endif
+
+    HandleCleanup();
+  }
+  else if (resource != splitState_.resource)
+  {
+    #ifdef PANIC
+    *logofs << "handleEndSplitRequest: PANIC! SPLIT! Invalid resource id "
+            << resource << " received while waiting for resource id "
+            << splitState_.resource << ".\n" << logofs_flush;
+    #endif
+
+    HandleCleanup();
+  }
+
+  #endif
+
+  #if defined(TEST) || defined(SPLIT)
+  *logofs << "handleEndSplitRequest: SPLIT! Reset id "
+          << splitState_.resource << " as resource "
+          << "selected for splits.\n" << logofs_flush;
+  #endif
+
+  splitState_.resource = nothing;
+
+  handleNullRequest(opcode, buffer, size);
+
+  return 1;
+}
+
+int ServerChannel::handleSplitChecksum(DecodeBuffer &decodeBuffer, T_checksum &checksum)
+{
+  unsigned int receive;
+
+  // Since ProtoStep7 (#issue 108)
+  decodeBuffer.decodeBoolValue(receive);
+
+  if (receive == 1)
+  {
+    checksum = new md5_byte_t[MD5_LENGTH];
+
+    for (unsigned int i = 0; i < MD5_LENGTH; i++)
+    {
+      decodeBuffer.decodeValue(receive, 8);
+
+      if (checksum != NULL)
+      {
+        checksum[i] = (unsigned char) receive;
+      }
+    }
+
+    #if defined(TEST) || defined(SPLIT)
+    *logofs << "handleSplitChecksum: SPLIT! Received checksum "
+            <<  "[" << DumpChecksum(checksum) << "].\n"
+            << logofs_flush;
+    #endif
+
+    return 1;
+  }
+
+  return 0;
+}
+
+void ServerChannel::handleShmemStateAlloc()
+{
+  if (shmemState_ == NULL)
+  {
+    shmemState_ = new T_shmem_state();
+
+    shmemState_ -> stage   = -1;
+    shmemState_ -> present = -1;
+    shmemState_ -> enabled = -1;
+
+    shmemState_ -> segment = -1;
+    shmemState_ -> id      = -1;
+    shmemState_ -> address = NULL;
+    shmemState_ -> size    = 0;
+
+    shmemState_ -> opcode = 0xff;
+    shmemState_ -> event  = 0xff;
+    shmemState_ -> error  = 0xff;
+
+    shmemState_ -> sequence = 0;
+    shmemState_ -> offset   = 0;
+    shmemState_ -> last     = nullTimestamp();
+
+    shmemState_ -> checked  = 0;
+  }
+}
+
+void ServerChannel::handleShmemStateRemove()
+{
+  if (shmemState_ != NULL)
+  {
+   if (shmemState_ -> address != NULL)
+    {
+#ifndef ANDROID
+       shmdt((char *) shmemState_ -> address);
+#else
+    cerr << "Info: handleShmemStateRemove: In android no shared memory. This should not be displayed. address should always be NULL\n";
+#endif
+    }
+
+    if (shmemState_ -> id > 0)
+    {
+#ifndef ANDROID
+      shmctl(shmemState_ -> id, IPC_RMID, 0);
+#else
+      cerr << "Info: handleShmemStateRemove: In android no shared memory. This should not be displayed. id should always be 0\n";
+#endif
+    }
+
+    delete shmemState_;
+
+    shmemState_ = NULL;
+  }
+}
+
+void ServerChannel::handleUnpackStateInit(int resource)
+{
+  if (unpackState_[resource] == NULL)
+  {
+    unpackState_[resource] = new T_unpack_state();
+
+    if (unpackState_[resource] == NULL)
+    {
+      #ifdef PANIC
+      *logofs << "handleUnpackStateInit: PANIC! Can't allocate "
+              << "memory for unpack state in context [A].\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Can't allocate memory for "
+           << "unpack state in context [A].\n";
+
+      HandleAbort();
+    }
+
+    unpackState_[resource] -> geometry = NULL;
+    unpackState_[resource] -> colormap = NULL;
+    unpackState_[resource] -> alpha    = NULL;
+  }
+}
+
+void ServerChannel::handleUnpackAllocGeometry(int resource)
+{
+  if (unpackState_[resource] -> geometry == NULL)
+  {
+    unpackState_[resource] -> geometry = new T_geometry();
+
+    if (unpackState_[resource] -> geometry == NULL)
+    {
+      #ifdef PANIC
+      *logofs << "handleUnpackAllocGeometry: PANIC! Can't allocate "
+              << "memory for unpack state in context [B].\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Can't allocate memory for "
+           << "unpack state in context [B].\n";
+
+      HandleAbort();
+    }
+
+    unpackState_[resource] -> geometry -> depth1_bpp  = 4;
+    unpackState_[resource] -> geometry -> depth4_bpp  = 4;
+    unpackState_[resource] -> geometry -> depth8_bpp  = 8;
+    unpackState_[resource] -> geometry -> depth16_bpp = 16;
+    unpackState_[resource] -> geometry -> depth24_bpp = 32;
+    unpackState_[resource] -> geometry -> depth32_bpp = 32;
+
+    unpackState_[resource] -> geometry -> red_mask   = 0xff0000;
+    unpackState_[resource] -> geometry -> green_mask = 0x00ff00;
+    unpackState_[resource] -> geometry -> blue_mask  = 0x0000ff;
+
+    unpackState_[resource] -> geometry -> image_byte_order = imageByteOrder_;
+    unpackState_[resource] -> geometry -> bitmap_bit_order = bitmapBitOrder_;
+    unpackState_[resource] -> geometry -> scanline_unit    = scanlineUnit_;
+    unpackState_[resource] -> geometry -> scanline_pad     = scanlinePad_;
+  }
+}
+
+void ServerChannel::handleUnpackAllocColormap(int resource)
+{
+  if (unpackState_[resource] -> colormap == NULL)
+  {
+    unpackState_[resource] -> colormap = new T_colormap();
+
+    if (unpackState_[resource] -> colormap == NULL)
+    {
+      #ifdef PANIC
+      *logofs << "handleUnpackAllocColormap: PANIC! Can't allocate "
+              << "memory for unpack state in context [C].\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Can't allocate memory for "
+           << "unpack state in context [C].\n";
+
+      HandleAbort();
+    }
+
+    unpackState_[resource] -> colormap -> entries = 0;
+    unpackState_[resource] -> colormap -> data    = NULL;
+  }
+}
+
+void ServerChannel::handleUnpackAllocAlpha(int resource)
+{
+  if (unpackState_[resource] -> alpha == NULL)
+  {
+    unpackState_[resource] -> alpha = new T_alpha();
+
+    if (unpackState_[resource] -> alpha == NULL)
+    {
+      #ifdef PANIC
+      *logofs << "handleUnpackAllocAlpha: PANIC! Can't allocate "
+              << "memory for unpack state in context [D].\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Can't allocate memory for "
+           << "unpack state in context [D].\n";
+
+      HandleAbort();
+    }
+
+    unpackState_[resource] -> alpha -> entries = 0;
+    unpackState_[resource] -> alpha -> data    = NULL;
+  }
+}
+
+void ServerChannel::handleUnpackStateRemove(int resource)
+{
+  if (unpackState_[resource] != NULL)
+  {
+    delete unpackState_[resource] -> geometry;
+
+    if (unpackState_[resource] -> colormap != NULL)
+    {
+      delete [] unpackState_[resource] -> colormap -> data;
+    }
+
+    delete unpackState_[resource] -> colormap;
+
+    if (unpackState_[resource] -> alpha != NULL)
+    {
+      delete [] unpackState_[resource] -> alpha -> data;
+    }
+
+    delete unpackState_[resource] -> alpha;
+
+    delete unpackState_[resource];
+
+    unpackState_[resource] = NULL;
+  }
+}
+
+void ServerChannel::handleEncodeCharInfo(const unsigned char *nextSrc, EncodeBuffer &encodeBuffer)
+{
+  unsigned int value = GetUINT(nextSrc, bigEndian_) |
+                           (GetUINT(nextSrc + 10, bigEndian_) << 16);
+
+  encodeBuffer.encodeCachedValue(value, 32,
+                     *serverCache_ -> queryFontCharInfoCache[0], 6);
+
+  nextSrc += 2;
+
+  for (unsigned int i = 1; i < 5; i++)
+  {
+    unsigned int value = GetUINT(nextSrc, bigEndian_);
+
+    nextSrc += 2;
+
+    encodeBuffer.encodeCachedValue(value, 16,
+                       *serverCache_ -> queryFontCharInfoCache[i], 6);
+  }
+}
+
+int ServerChannel::setBigEndian(int flag)
+{
+  bigEndian_ = flag;
+
+  readBuffer_.setBigEndian(flag);
+
+  return 1;
+}
+
+int ServerChannel::setReferences()
+{
+  #ifdef TEST
+  *logofs << "ServerChannel: Initializing the static "
+          << "members for the server channels.\n"
+          << logofs_flush;
+  #endif
+
+  #ifdef REFERENCES
+
+  references_ = 0;
+
+  #endif
+
+  return 1;
+}
diff --git a/nxcomp/src/ServerChannel.h b/nxcomp/src/ServerChannel.h
new file mode 100644
index 000000000..374e52896
--- /dev/null
+++ b/nxcomp/src/ServerChannel.h
@@ -0,0 +1,529 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef ServerChannel_H
+#define ServerChannel_H
+
+#include "List.h"
+#include "Channel.h"
+
+#include "SequenceQueue.h"
+
+#include "ServerReadBuffer.h"
+
+#include "Unpack.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+//
+// How many sequence numbers of split commit
+// requests we are going to save in order to
+// mask errors.
+//
+
+#define MAX_COMMIT_SEQUENCE_QUEUE         16
+
+//
+// Define this to know when a channel
+// is created or destroyed.
+//
+
+#undef  REFERENCES
+
+//
+// This class implements the X server
+// side compression of X protocol.
+//
+
+class ServerChannel : public Channel
+{
+  public:
+
+  ServerChannel(Transport *transport, StaticCompressor *compressor);
+
+  virtual ~ServerChannel();
+
+  virtual int handleRead(EncodeBuffer &encodeBuffer, const unsigned char *message,
+                             unsigned int length);
+
+  virtual int handleWrite(const unsigned char *message, unsigned int length);
+
+  virtual int handleSplit(EncodeBuffer &encodeBuffer, MessageStore *store,
+                              T_store_action action, int position, const unsigned char opcode,
+                                  const unsigned char *buffer, const unsigned int size)
+  {
+    return 0;
+  }
+
+  virtual int handleSplit(DecodeBuffer &decodeBuffer, MessageStore *store,
+                                T_store_action action, int position, unsigned char &opcode,
+                                    unsigned char *&buffer, unsigned int &size);
+
+  virtual int handleSplit(EncodeBuffer &encodeBuffer)
+  {
+    return 0;
+  }
+
+  virtual int handleSplit(DecodeBuffer &decodeBuffer);
+
+  virtual int handleSplitEvent(EncodeBuffer &encodeBuffer, Split *split);
+
+  virtual int handleSplitEvent(DecodeBuffer &decodeBuffer)
+  {
+    return 0;
+  }
+
+  //
+  // Send the last motion notify event
+  // received from the X server to the
+  // remote proxy.
+  //
+
+  virtual int handleMotion(EncodeBuffer &encodeBuffer);
+
+  virtual int handleCompletion(EncodeBuffer &encodeBuffer)
+  {
+    return 0;
+  }
+
+  virtual int handleConfiguration();
+
+  virtual int handleFinish();
+
+  virtual int handleAsyncEvents();
+
+  virtual int needSplit() const
+  {
+    return 0;
+  }
+
+  virtual int needMotion() const
+  {
+    return (lastMotion_[0] != '\0');
+  }
+
+  virtual T_channel_type getType() const
+  {
+    return channel_x11;
+  }
+
+  int setBigEndian(int flag);
+
+  //
+  // Initialize the static members.
+  //
+
+  static int setReferences();
+
+  private:
+
+  int handleFastReadReply(EncodeBuffer &encodeBuffer, const unsigned char &opcode,
+                              const unsigned char *&buffer, const unsigned int &size);
+
+  int handleFastReadEvent(EncodeBuffer &encodeBuffer, const unsigned char &opcode,
+                              const unsigned char *&buffer, const unsigned int &size);
+
+  int handleFastWriteRequest(DecodeBuffer &decodeBuffer, unsigned char &opcode,
+                                 unsigned char *&buffer, unsigned int &size);
+
+  //
+  // Handle the fake authorization cookie
+  // and the X server's reply.
+  //
+
+  int handleAuthorization(unsigned char *buffer);
+  int handleAuthorization(const unsigned char *buffer, int size);
+
+  //
+  // Set the unpack colormap and the alpha
+  // blending data to be used to unpack
+  // images.
+  //
+
+  int handleGeometry(unsigned char &opcode, unsigned char *&buffer,
+                         unsigned int &size);
+
+  int handleColormap(unsigned char &opcode, unsigned char *&buffer,
+                         unsigned int &size);
+
+  int handleAlpha(unsigned char &opcode, unsigned char *&buffer,
+                      unsigned int &size);
+
+  //
+  // Manage the decoded buffer to unpack
+  // the image and move the data to the
+  // shared memory segment.
+  //
+
+  int handleImage(unsigned char &opcode, unsigned char *&buffer,
+                      unsigned int &size);
+
+  //
+  // Uncompress a packed image in one
+  // or more graphic X requests.
+  //
+
+  int handleUnpack(unsigned char &opcode, unsigned char *&buffer,
+                       unsigned int &size);
+
+  //
+  // Move the image to the shared
+  // memory buffer.
+  //
+
+  int handleShmem(unsigned char &opcode, unsigned char *&buffer,
+                      unsigned int &size);
+
+  //
+  // Handle suppression of error on
+  // commit of image splits.
+  //
+
+  void initCommitQueue();
+
+  void updateCommitQueue(unsigned short sequence);
+
+  int checkCommitError(unsigned char error, unsigned short sequence,
+                           const unsigned char *buffer);
+
+  void clearCommitQueue()
+  {
+    if (commitSequenceQueue_[0] != 0)
+    {
+      initCommitQueue();
+    }
+  }
+
+  //
+  // Check if the user pressed the
+  // CTRL+ALT+SHIFT+ESC keystroke.
+  //
+
+  int checkKeyboardEvent(unsigned char event, unsigned short sequence,
+                             const unsigned char *buffer);
+
+  //
+  // Other utilities.
+  //
+
+  void handleEncodeCharInfo(const unsigned char *nextSrc, EncodeBuffer &encodeBuffer);
+
+  //
+  // Handle the MIT-SHM initialization
+  // messages exchanged with the remote
+  // proxy.
+  //
+
+  int handleShmemRequest(DecodeBuffer &decodeBuffer, unsigned char &opcode,
+                             unsigned char *&buffer, unsigned int &size);
+
+
+  int handleShmemReply(EncodeBuffer &encodeBuffer, const unsigned char opcode,
+                           const unsigned int stage, const unsigned char *buffer,
+                               const unsigned int size);
+
+  //
+  // Try to read more events in the attempt to
+  // get the MIT-SHM image completion event
+  // from the X server.
+  //
+
+  int handleShmemEvent();
+
+  //
+  // Handle the MIT-SHM events as they are read
+  // from the socket.
+  //
+
+  int checkShmemEvent(unsigned char event, unsigned short sequence,
+                          const unsigned char *buffer);
+
+  int checkShmemError(unsigned char error, unsigned short sequence,
+                          const unsigned char *buffer);
+
+  //
+  // Query the port used to tunnel
+  // the font server connections.
+  //
+
+  int handleFontRequest(DecodeBuffer &decodeBuffer, unsigned char &opcode,
+                            unsigned char *&buffer, unsigned int &size);
+
+  int handleFontReply(EncodeBuffer &encodeBuffer, const unsigned char opcode,
+                          const unsigned char *buffer, const unsigned int size);
+
+  //
+  // Set the cache policy for image
+  // requests.
+  //
+
+  int handleCacheRequest(DecodeBuffer &decodeBuffer, unsigned char &opcode,
+                             unsigned char *&buffer, unsigned int &size);
+
+  //
+  // Decode the start and end split
+  // requests.
+  //
+
+  int handleStartSplitRequest(DecodeBuffer &decodeBuffer, unsigned char &opcode,
+                                  unsigned char *&buffer, unsigned int &size);
+
+  int handleEndSplitRequest(DecodeBuffer &decodeBuffer, unsigned char &opcode,
+                                unsigned char *&buffer, unsigned int &size);
+
+  //
+  // Remove the split store and the
+  // incomplete messages from the
+  // memory cache.
+  //
+
+  int handleAbortSplitRequest(DecodeBuffer &decodeBuffer, unsigned char &opcode,
+                                  unsigned char *&buffer, unsigned int &size);
+
+  //
+  // Send the split requests to the
+  // X server once they have been
+  // recomposed.
+  //
+
+  int handleCommitSplitRequest(DecodeBuffer &decodeBuffer, unsigned char &opcode,
+                                   unsigned char *&buffer, unsigned int &size);
+
+  int handleSplitChecksum(DecodeBuffer &decodeBuffer, T_checksum &checksum);
+
+  //
+  // Allocate and free the shared memory
+  // support resources.
+  //
+
+  void handleShmemStateAlloc();
+  void handleShmemStateRemove();
+
+  //
+  // Temporary storage for the image info.
+  //
+
+  void handleImageStateAlloc(unsigned char opcode)
+  {
+    if (imageState_ == NULL)
+    {
+      imageState_ = new T_image_state();
+    }
+
+    imageState_ -> opcode = opcode;
+  }
+
+  void handleImageStateRemove()
+  {
+    if (imageState_ != NULL)
+    {
+      delete imageState_;
+
+      imageState_ = NULL;
+    }
+  }
+
+  //
+  // Store the information needed to unpack
+  // images per each known agent's client.
+  //
+
+  void handleUnpackStateInit(int resource);
+
+  void handleUnpackAllocGeometry(int resource);
+  void handleUnpackAllocColormap(int resource);
+  void handleUnpackAllocAlpha(int resource);
+
+  void handleUnpackStateRemove(int resource);
+
+  typedef struct
+  {
+    T_geometry *geometry;
+    T_colormap *colormap;
+    T_alpha    *alpha;
+
+  } T_unpack_state;
+
+  T_unpack_state *unpackState_[256];
+
+  //
+  // Own read buffer. It is able to identify
+  // full messages read from X descriptor.
+  //
+
+  ServerReadBuffer readBuffer_;
+
+  //
+  // Sequence number of last request coming
+  // from X client or X server.
+  //
+
+  unsigned int clientSequence_;
+  unsigned int serverSequence_;
+
+  //
+  // Used to identify replies based on sequence
+  // number of original request.
+  //
+
+  SequenceQueue sequenceQueue_;
+
+  //
+  // Last motion notify read from the X server.
+  //
+
+  unsigned char lastMotion_[32];
+
+  //
+  // Sequence numbers of last auto-generated
+  // put image requests. Needed to intercept
+  // and suppress errors generated by such
+  // requests.
+  //
+
+  unsigned int commitSequenceQueue_[MAX_COMMIT_SEQUENCE_QUEUE];
+
+  //
+  // Let agent select which expose
+  // events is going to receive.
+  //
+
+  unsigned int enableExpose_;
+  unsigned int enableGraphicsExpose_;
+  unsigned int enableNoExpose_;
+
+  //
+  // Used in initialization and handling
+  // of MIT-SHM shared memory put images.
+  //
+
+  typedef struct
+  {
+    int           stage;
+    int           present;
+    int           enabled;
+    int           segment;
+    int           id;
+    void          *address;
+    unsigned int  size;
+
+    unsigned char opcode;
+    unsigned char event;
+    unsigned char error;
+
+    unsigned int  sequence;
+    unsigned int  offset;
+    T_timestamp   last;
+
+    unsigned int  checked;
+
+  } T_shmem_state;
+
+  T_shmem_state *shmemState_;
+
+  //
+  // Used to pass current image data between
+  // the different decompression stages.
+  //
+
+  typedef struct
+  {
+    unsigned char  opcode;
+
+    unsigned int   drawable;
+    unsigned int   gcontext;
+
+    unsigned char  method;
+
+    unsigned char  format;
+    unsigned char  srcDepth;
+    unsigned char  dstDepth;
+
+    unsigned int   srcLength;
+    unsigned int   dstLength;
+    unsigned int   dstLines;
+
+    short int      srcX;
+    short int      srcY;
+    unsigned short srcWidth;
+    unsigned short srcHeight;
+
+    short int      dstX;
+    short int      dstY;
+    unsigned short dstWidth;
+    unsigned short dstHeight;
+
+    unsigned char  leftPad;
+
+  } T_image_state;
+
+  T_image_state *imageState_;
+
+  //
+  // The flags is set according to the
+  // split load and save policy set by
+  // the encoding side.
+  //
+
+  typedef struct
+  {
+    int resource;
+    int current;
+    int load;
+    int save;
+    int commit;
+
+  } T_split_state;
+
+  T_split_state splitState_;
+
+  //
+  // List of agent resources.
+  //
+
+  List splitResources_;
+
+  //
+  // Keep track of object creation and
+  // deletion.
+  //
+
+  private:
+
+  #ifdef REFERENCES
+
+  static int references_;
+
+  #endif
+};
+
+#endif /* ServerChannel_H */
diff --git a/nxcomp/src/ServerProxy.cpp b/nxcomp/src/ServerProxy.cpp
new file mode 100644
index 000000000..28f94842a
--- /dev/null
+++ b/nxcomp/src/ServerProxy.cpp
@@ -0,0 +1,621 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <unistd.h>
+
+#include "NXalert.h"
+
+#include "Socket.h"
+
+#include "ServerProxy.h"
+
+#include "ServerChannel.h"
+#include "GenericChannel.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+//
+// Log the operations related to sending
+// and receiving the control tokens.
+//
+
+#undef  TOKEN
+
+ServerProxy::ServerProxy(int proxyFd) : Proxy(proxyFd)
+
+{
+  xServerAddrFamily_ = -1;
+  xServerAddrLength_ = 0;
+
+  xServerAddr_    = NULL;
+  xServerDisplay_ = NULL;
+
+  cupsServerPort_  = NULL;
+  smbServerPort_   = NULL;
+  mediaServerPort_ = NULL;
+  httpServerPort_  = NULL;
+
+  fontServerPort_ = NULL;
+
+  #ifdef DEBUG
+  *logofs << "ServerProxy: Created new object at " << this
+          << ".\n" << logofs_flush;
+  #endif
+}
+
+ServerProxy::~ServerProxy()
+{
+  delete xServerAddr_;
+
+  delete [] xServerDisplay_;
+
+  delete [] fontServerPort_;
+
+  #ifdef DEBUG
+  *logofs << "ServerProxy: Deleted object at " << this
+          << ".\n" << logofs_flush;
+  #endif
+}
+
+void ServerProxy::handleDisplayConfiguration(const char *xServerDisplay, int xServerAddrFamily,
+                                                 sockaddr *xServerAddr, unsigned int xServerAddrLength)
+{
+  delete xServerAddr_;
+
+  xServerAddr_ = xServerAddr;
+
+  xServerAddrFamily_ = xServerAddrFamily;
+  xServerAddrLength_ = xServerAddrLength;
+
+  delete [] xServerDisplay_;
+
+  xServerDisplay_ = new char[strlen(xServerDisplay) + 1];
+
+  strcpy(xServerDisplay_, xServerDisplay);
+
+  #ifdef DEBUG
+  *logofs << "ServerProxy: Set display configuration to display '"
+          << xServerDisplay_ << "'.\n"
+          << logofs_flush;
+  #endif
+}
+
+void ServerProxy::handlePortConfiguration(ChannelEndPoint &cupsServerPort,
+                                          ChannelEndPoint &smbServerPort,
+                                          ChannelEndPoint &mediaServerPort,
+                                          ChannelEndPoint &httpServerPort,
+                                          const char *fontServerPort)
+{
+  cupsServerPort_  = cupsServerPort;
+  smbServerPort_   = smbServerPort;
+  mediaServerPort_ = mediaServerPort;
+  httpServerPort_  = httpServerPort;
+
+  delete [] fontServerPort_;
+
+  fontServerPort_ = new char[strlen(fontServerPort) + 1];
+
+  strcpy(fontServerPort_, fontServerPort);
+
+  #ifdef DEBUG
+  *logofs << "ServerProxy: Set port configuration to CUPS "
+          << cupsServerPort_ << ", SMB " << smbServerPort_
+          << ", media " << mediaServerPort_ << ", HTTP "
+          << httpServerPort_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+
+int ServerProxy::handleNewConnection(T_channel_type type, int clientFd)
+{
+  switch (type)
+  {
+    case channel_font:
+    {
+      return handleNewGenericConnection(clientFd, channel_font, "font");
+    }
+    case channel_slave:
+    {
+      return handleNewSlaveConnection(clientFd);
+    }
+    default:
+    {
+      #ifdef PANIC
+      *logofs << "ServerProxy: PANIC! Unsupported channel with type '"
+              << getTypeName(type) << "'.\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Unsupported channel with type '"
+           << getTypeName(type) << "'.\n";
+
+      return -1;
+    }
+  }
+}
+
+int ServerProxy::handleNewConnectionFromProxy(T_channel_type type, int channelId)
+{
+  switch (type)
+  {
+    case channel_x11:
+    {
+      return handleNewXConnectionFromProxy(channelId);
+    }
+    case channel_cups:
+    {
+      return handleNewGenericConnectionFromProxy(channelId, channel_cups,
+                                                     cupsServerPort_, "CUPS");
+    }
+    case channel_smb:
+    {
+      smbServerPort_.setDefaultTCPInterface(1);
+      return handleNewGenericConnectionFromProxy(channelId, channel_smb,
+                                                     smbServerPort_, "SMB");
+    }
+    case channel_media:
+    {
+      return handleNewGenericConnectionFromProxy(channelId, channel_media,
+                                                     mediaServerPort_, "media");
+    }
+    case channel_http:
+    {
+      return handleNewGenericConnectionFromProxy(channelId, channel_http,
+                                                     httpServerPort_, "HTTP");
+    }
+    case channel_slave:
+    {
+      return handleNewSlaveConnectionFromProxy(channelId);
+    }
+    default:
+    {
+      #ifdef PANIC
+      *logofs << "ServerProxy: PANIC! Unsupported channel with type '"
+              << getTypeName(type) << "'.\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Unsupported channel with type '"
+           << getTypeName(type) << "'.\n";
+
+      return -1;
+    }
+  }
+}
+
+int ServerProxy::handleNewAgentConnection(Agent *agent)
+{
+  #ifdef PANIC
+  *logofs << "ServerProxy: PANIC! Can't create an agent "
+          << "connection at this side.\n"
+          << logofs_flush;
+  #endif
+
+  cerr << "Error" << ": Can't create an agent "
+       << "connection at this side.\n";
+
+  return -1;
+}
+
+int ServerProxy::handleNewXConnection(int clientFd)
+{
+  #ifdef PANIC
+  *logofs << "ServerProxy: PANIC! Can't create a new X channel "
+          << "with FD#" << clientFd << " at this side.\n"
+          << logofs_flush;
+  #endif
+
+  cerr << "Error" << ": Can't create a new X channel "
+       << "with FD#" << clientFd << " at this side.\n";
+
+  return -1;
+}
+
+int ServerProxy::handleNewXConnectionFromProxy(int channelId)
+{
+  //
+  // Connect to the real X server.
+  //
+
+  int retryConnect = control -> OptionServerRetryConnect;
+
+  int xServerFd;
+
+  for (;;)
+  {
+    xServerFd = socket(xServerAddrFamily_, SOCK_STREAM, PF_UNSPEC);
+
+    if (xServerFd < 0)
+    {
+      #ifdef PANIC
+      *logofs << "ServerProxy: PANIC! Call to socket failed. "
+              << "Error is " << EGET() << " '" << ESTR()
+              << "'.\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Call to socket failed. "
+           << "Error is " << EGET() << " '" << ESTR()
+           << "'.\n";
+
+      return -1;
+    }
+
+    #ifdef TEST
+    *logofs << "ServerProxy: Trying to connect to X server '"
+            << xServerDisplay_ << "'.\n" << logofs_flush;
+    #endif
+
+    int result = connect(xServerFd, xServerAddr_, xServerAddrLength_);
+
+    getNewTimestamp();
+
+    if (result < 0)
+    {
+      #ifdef WARNING
+      *logofs << "ServerProxy: WARNING! Connection to '"
+              << xServerDisplay_ << "' failed with error '"
+              << ESTR() << "'. Retrying.\n" << logofs_flush;
+      #endif
+
+      close(xServerFd);
+
+      if (--retryConnect == 0)
+      {
+        #ifdef PANIC
+        *logofs << "ServerProxy: PANIC! Connection to '"
+                << xServerDisplay_ << "' for channel ID#"
+                << channelId << " failed. Error is "
+                << EGET() << " '" << ESTR() << "'.\n"
+                << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Connection to '"
+             << xServerDisplay_ << "' failed. Error is "
+             << EGET() << " '" << ESTR() << "'.\n";
+
+        close(xServerFd);
+
+        return -1;
+      }
+
+      if (activeChannels_.getSize() == 0)
+      {
+        sleep(2);
+      }
+      else
+      {
+        sleep(1);
+      }
+    }
+    else
+    {
+      break;
+    }
+  }
+
+  assignChannelMap(channelId, xServerFd);
+
+  #ifdef TEST
+  *logofs << "ServerProxy: X server descriptor FD#" << xServerFd 
+          << " mapped to channel ID#" << channelId << ".\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // Turn queuing off for path proxy-to-X-server.
+  //
+
+  if (control -> OptionServerNoDelay == 1)
+  {
+    SetNoDelay(xServerFd, control -> OptionServerNoDelay);
+  }
+
+  //
+  // If requested, set the size of the TCP send
+  // and receive buffers.
+  //
+
+  if (control -> OptionServerSendBuffer != -1)
+  {
+    SetSendBuffer(xServerFd, control -> OptionServerSendBuffer);
+  }
+
+  if (control -> OptionServerReceiveBuffer != -1)
+  {
+    SetReceiveBuffer(xServerFd, control -> OptionServerReceiveBuffer);
+  }
+
+  if (allocateTransport(xServerFd, channelId) < 0)
+  {
+    return -1;
+  }
+
+  //
+  // Starting from protocol level 3 client and server
+  // caches are created in proxy and shared between all
+  // channels. If remote proxy has older protocol level
+  // pointers are NULL and channels must create their
+  // own instances.
+  //
+
+  channels_[channelId] = new ServerChannel(transports_[channelId], compressor_);
+
+  if (channels_[channelId] == NULL)
+  {
+    deallocateTransport(channelId);
+
+    return -1;
+  }
+
+  increaseChannels(channelId);
+
+  //
+  // Propagate channel stores and caches to the new
+  // channel.
+  //
+
+  channels_[channelId] -> setOpcodes(opcodeStore_);
+
+  channels_[channelId] -> setStores(clientStore_, serverStore_);
+
+  channels_[channelId] -> setCaches(clientCache_, serverCache_);
+
+  int port = atoi(fontServerPort_);
+
+  if (port > 0)
+  {
+    channels_[channelId] -> setPorts(port);
+  }
+
+  //
+  // Let channel configure itself according
+  // to control parameters.
+  //
+
+  channels_[channelId] -> handleConfiguration();
+
+  //
+  // Check if we have successfully loaded the
+  // selected cache and, if not, remove it
+  // from disk.
+  //
+
+  handleCheckLoad();
+
+  return 1;
+}
+
+//
+// Check if we still need to drop a channel. We need
+// to check this explicitly at the time we receive a
+// request to load or save the cache because we could
+// receive the control message before having entered
+// the function handling the channel events.
+//
+
+int ServerProxy::handleCheckDrop()
+{
+  T_list channelList = activeChannels_.copyList();
+
+  for (T_list::iterator j = channelList.begin();
+           j != channelList.end(); j++)
+  {
+    int channelId = *j;
+
+    if (channels_[channelId] != NULL &&
+            (channels_[channelId] -> getDrop() == 1 ||
+                channels_[channelId] -> getClosing() == 1))
+    {
+      #ifdef TEST
+      *logofs << "ServerProxy: Dropping the descriptor FD#"
+              << getFd(channelId) << " channel ID#"
+              << channelId << ".\n" << logofs_flush;
+      #endif
+
+      handleDrop(channelId);
+    }
+  }
+
+  return 1;
+}
+
+int ServerProxy::handleCheckLoad()
+{
+  //
+  // Check if we just created the first X channel
+  // but the client side didn't tell us to load
+  // the cache selected at the session negotiation.
+  // This is very likely because the load operation
+  // failed at the remote side, for example because
+  // the cache was invalid or corrupted.
+  //
+
+  int channelCount = getChannels(channel_x11);
+
+  if (channelCount != 1)
+  {
+    return 0;
+  }
+
+  if (control -> PersistentCacheEnableLoad == 1 &&
+          control -> PersistentCachePath != NULL &&
+              control -> PersistentCacheName != NULL &&
+                  isTimestamp(timeouts_.loadTs) == 0)
+  {
+    #ifdef WARNING
+    *logofs << "ServerProxy: WARNING! Cache file '" << control -> PersistentCachePath
+            << "/" << control -> PersistentCacheName << "' not loaded.\n"
+            << logofs_flush;
+    #endif
+
+    //
+    // Remove the cache file.
+    //
+
+    #ifdef WARNING
+    *logofs << "ServerProxy: WARNING! Removing supposedly "
+            << "incompatible cache '" << control -> PersistentCachePath
+            << "/" << control -> PersistentCacheName
+            << "'.\n" << logofs_flush;
+    #endif
+
+    handleResetPersistentCache();
+  }
+
+  return 1;
+}
+
+int ServerProxy::handleLoadFromProxy()
+{
+  //
+  // Be sure we drop any confirmed channel.
+  //
+
+  handleCheckDrop();
+
+  //
+  // Check that either no X channel is
+  // remaining or we are inside a reset.
+  //
+
+  int channelCount = getChannels(channel_x11);
+
+  if (channelCount > 0)
+  {
+    #ifdef PANIC
+    *logofs << "ServerProxy: PANIC! Protocol violation "
+            << "in command load with " << channelCount
+            << " channels.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Protocol violation "
+         << "in command load from proxy.\n";
+
+    return -1;
+  } 
+  else if (handleLoadStores() < 0)
+  {
+    #ifdef WARNING
+    *logofs << "ServerProxy: WARNING! Failed to load content "
+            << "of persistent cache.\n" << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  return 1;
+}
+
+int ServerProxy::handleSaveFromProxy()
+{
+  //
+  // Be sure we drop any confirmed channel.
+  //
+
+  handleCheckDrop();
+
+  //
+  // Now verify that all channels are gone.
+  //
+
+  int channelCount = getChannels(channel_x11);
+
+  if (channelCount > 0)
+  {
+    #ifdef PANIC
+    *logofs << "ServerProxy: PANIC! Protocol violation "
+            << "in command save with " << channelCount
+            << " channels.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Protocol violation "
+         << "in command save from proxy.\n";
+
+    return -1;
+  }
+  else if (handleSaveStores() < 0)
+  {
+    #ifdef PANIC
+    *logofs << "ServerProxy: PANIC! Failed to save stores "
+            << "to persistent cache.\n" << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  return 1;
+}
+
+int ServerProxy::handleSaveAllStores(ostream *cachefs, md5_state_t *md5StateStream,
+                                         md5_state_t *md5StateClient) const
+{
+  if (clientStore_ -> saveRequestStores(cachefs, md5StateStream, md5StateClient,
+                                            discard_checksum, use_data) < 0)
+  {
+    return -1;
+  }
+  else if (serverStore_ -> saveReplyStores(cachefs, md5StateStream, md5StateClient,
+                                               use_checksum, discard_data) < 0)
+  {
+    return -1;
+  }
+  else if (serverStore_ -> saveEventStores(cachefs, md5StateStream, md5StateClient,
+                                               use_checksum, discard_data) < 0)
+  {
+    return -1;
+  }
+
+  return 1;
+}
+
+int ServerProxy::handleLoadAllStores(istream *cachefs, md5_state_t *md5StateStream) const
+{
+  if (clientStore_ -> loadRequestStores(cachefs, md5StateStream,
+                                            discard_checksum, use_data) < 0)
+  {
+    return -1;
+  }
+  else if (serverStore_ -> loadReplyStores(cachefs, md5StateStream,
+                                               use_checksum, discard_data) < 0)
+  {
+    return -1;
+  }
+  else if (serverStore_ -> loadEventStores(cachefs, md5StateStream,
+                                               use_checksum, discard_data) < 0)
+  {
+    return -1;
+  }
+
+  return 1;
+}
diff --git a/nxcomp/src/ServerProxy.h b/nxcomp/src/ServerProxy.h
new file mode 100644
index 000000000..e169c4aec
--- /dev/null
+++ b/nxcomp/src/ServerProxy.h
@@ -0,0 +1,154 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef ServerProxy_H
+#define ServerProxy_H
+
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include "Proxy.h"
+
+#include "Misc.h"
+#include "ChannelEndPoint.h"
+
+//
+// Set the verbosity level.
+//
+
+#undef  TEST
+#undef  DEBUG
+
+class ServerProxy : public Proxy
+{
+  public:
+
+  ServerProxy(int proxyFd);
+
+  virtual ~ServerProxy();
+
+  virtual void handleDisplayConfiguration(const char *xServerDisplay, int xServerAddrFamily,
+                                              sockaddr *xServerAddr, unsigned int xServerAddrLength);
+
+  virtual void handlePortConfiguration(ChannelEndPoint &cupsServerPort,
+                                       ChannelEndPoint &smbServerPort,
+                                       ChannelEndPoint &mediaServerPort,
+                                       ChannelEndPoint &httpServerPort,
+                                       const char *fontServerPort);
+
+  protected:
+
+  //
+  // Create a new channel.
+  //
+
+  virtual int handleNewConnection(T_channel_type type, int clientFd);
+
+  virtual int handleNewConnectionFromProxy(T_channel_type type, int channelId);
+
+  virtual int handleNewAgentConnection(Agent *agent);
+
+  virtual int handleNewXConnection(int clientFd);
+
+  virtual int handleNewXConnectionFromProxy(int channelId);
+
+  //
+  // Implement persistence according
+  // to our proxy mode.
+  //
+
+  virtual int handleLoad(T_load_type type)
+  {
+    return 0;
+  }
+
+  virtual int handleSave()
+  {
+    return 0;
+  }
+
+  virtual int handleAsyncEvents()
+  {
+    return 0;
+  }
+
+  virtual int handleLoadFromProxy();
+  virtual int handleSaveFromProxy();
+
+  virtual int handleSaveAllStores(ostream *cachefs, md5_state_t *md5StateStream,
+                                      md5_state_t *md5StateClient) const;
+
+  virtual int handleLoadAllStores(istream *cachefs, md5_state_t *md5StateStream) const;
+
+  int handleCheckDrop();
+  int handleCheckLoad();
+
+  //
+  // Utility function used to realize
+  // a new connection.
+  //
+
+  protected:
+
+  virtual int checkLocalChannelMap(int channelId)
+  {
+    // Since ProtoStep7 (#issue 108)
+    return ((channelId & control -> ChannelMask) == 0);
+  }
+
+  private:
+
+  // FIXME: Use a ChannelEndPoint object also for the X server!
+  int xServerAddrFamily_;
+  sockaddr *xServerAddr_;
+  unsigned int xServerAddrLength_;
+
+  //
+  // This is the name of the X display where
+  // we are going to forward connections.
+  //
+
+  char *xServerDisplay_;
+
+  //
+  // Ports where to forward extended services'
+  // TCP connections.
+  //
+
+  ChannelEndPoint cupsServerPort_;
+  ChannelEndPoint smbServerPort_;
+  ChannelEndPoint mediaServerPort_;
+  ChannelEndPoint httpServerPort_;
+
+  //
+  // It will have to be passed to the channel
+  // so that it can set the port where the
+  // font server connections are tunneled.
+  //
+
+  char *fontServerPort_;
+};
+
+#endif /* ServerProxy_H */
diff --git a/nxcomp/src/ServerReadBuffer.cpp b/nxcomp/src/ServerReadBuffer.cpp
new file mode 100644
index 000000000..277b85216
--- /dev/null
+++ b/nxcomp/src/ServerReadBuffer.cpp
@@ -0,0 +1,247 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "ServerReadBuffer.h"
+#include "ServerChannel.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+unsigned int ServerReadBuffer::suggestedLength(unsigned int pendingLength)
+{
+  //
+  // Always read all the data that
+  // is available.
+  //
+
+  int readable = transport_ -> readable();
+
+  unsigned int readLength = (readable == -1 ? 0 : (unsigned int) readable);
+
+  if (readLength < pendingLength)
+  {
+    readLength = pendingLength;
+  }
+
+  //
+  // Even if the readable data is not
+  // enough to make a complete message,
+  // resize the buffer to accommodate
+  // it all.
+  //
+
+  if (pendingLength < remaining_)
+  {
+    readLength = remaining_;
+  }
+
+  return readLength;
+}  
+
+int ServerReadBuffer::locateMessage(const unsigned char *start,
+                                        const unsigned char *end,
+                                            unsigned int &controlLength,
+                                                unsigned int &dataLength,
+                                                    unsigned int &trailerLength)
+{
+  unsigned int size = end - start;
+
+  #ifdef TEST
+  *logofs << "ServerReadBuffer: Locating message for FD#"
+          << transport_ -> fd() << " with " << size
+          << " bytes.\n" << logofs_flush;
+  #endif
+
+  if (firstMessage_)
+  {
+    if (size < 8)
+    {
+      remaining_ = 8 - size;
+
+      #ifdef TEST
+      *logofs << "ServerReadBuffer: No message was located "
+              << "with remaining " << remaining_ << ".\n"
+              << logofs_flush;
+      #endif
+
+      return 0;
+    }
+
+    dataLength = 8 + (GetUINT(start + 6, bigEndian_) << 2);
+  }
+  else
+  {
+    if (size < 32)
+    {
+      remaining_ = 32 - size;
+
+      #ifdef TEST
+      *logofs << "ServerReadBuffer: No message was located "
+              << "with remaining " << remaining_ << ".\n"
+              << logofs_flush;
+      #endif
+
+      return 0;
+    }
+
+    if (*start == 1)
+    {
+      dataLength = 32 + (GetULONG(start + 4, bigEndian_) << 2);
+    }
+    else
+    {
+      dataLength = 32;
+    }
+
+    if (dataLength < 32)
+    {
+      #ifdef TEST
+      *logofs << "ServerReadBuffer: WARNING! Assuming length 32 "
+              << "for suspicious message of length " << dataLength
+              << ".\n" << logofs_flush;
+      #endif
+
+      dataLength = 32;
+    }
+  }
+
+  #ifdef TEST
+  *logofs << "ServerReadBuffer: Length of the next message is "
+          << dataLength << ".\n" << logofs_flush;
+  #endif
+
+  if (size < dataLength)
+  {
+    remaining_ = dataLength - size;
+
+    #ifdef TEST
+    *logofs << "ServerReadBuffer: No message was located "
+            << "with remaining " << remaining_ << ".\n"
+            << logofs_flush;
+    #endif
+
+    return 0;
+  }
+
+  firstMessage_ = 0;
+
+  controlLength = 0;
+  trailerLength = 0;
+
+  remaining_ = 0;
+
+  #ifdef TEST
+  *logofs << "ServerReadBuffer: Located message with "
+          << "remaining " << remaining_ << ".\n"
+          << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+//
+// Check if the data already read contains a
+// message matching the opcode and sequence,
+// starting at the given offset.
+//
+
+unsigned char *ServerReadBuffer::peekMessage(unsigned int &offset, unsigned char opcode,
+                                                 unsigned short sequence)
+{
+  #ifdef TEST
+  *logofs << "ServerReadBuffer: Peeking message "
+          << "for FD#" << transport_ -> fd() << " with size "
+          << length_ << " offset " << offset << " opcode "
+          << (unsigned int) opcode << " and sequence "
+          << sequence << ".\n" << logofs_flush;
+  #endif
+
+  if (firstMessage_)
+  {
+    return NULL;
+  }
+
+  unsigned char *next = buffer_ + start_ + offset;
+  unsigned char *end  = buffer_ + start_ + length_;
+
+  int found = 0;
+
+  while (end - next >= 32)
+  {
+    #ifdef DEBUG
+    *logofs << "ServerReadBuffer: Checking opcode "
+            << (unsigned int) *next << " sequence "
+            << GetUINT(next + 2, bigEndian_)
+            << " at " << next - buffer_ + start_
+            << ".\n" << logofs_flush;
+    #endif
+
+    if (*next == opcode && GetUINT(next + 2, bigEndian_) == sequence)
+    {
+      found = 1;
+
+      break;
+    }
+    else if (*next == 1)
+    {
+      next += (32 + (GetULONG(next + 4, bigEndian_) << 2));
+    }
+    else
+    {
+      next += 32;
+    }
+  }
+
+  offset = next - buffer_ + start_;
+
+  if (found == 1)
+  {
+    #ifdef TEST
+    *logofs << "ServerReadBuffer: Found message at "
+            << "offset " << next - buffer_ + start_
+            << ".\n" << logofs_flush;
+    #endif
+
+    return next;
+  }
+
+  #ifdef TEST
+  *logofs << "ServerReadBuffer: Quitting loop at "
+          << "offset " << next - buffer_ + start_
+          << ".\n" << logofs_flush;
+  #endif
+
+  return NULL;
+}
diff --git a/nxcomp/src/ServerReadBuffer.h b/nxcomp/src/ServerReadBuffer.h
new file mode 100644
index 000000000..d6c207ead
--- /dev/null
+++ b/nxcomp/src/ServerReadBuffer.h
@@ -0,0 +1,73 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef ServerReadBuffer_H
+#define ServerReadBuffer_H
+
+#include "ReadBuffer.h"
+#include "Control.h"
+
+class ServerChannel;
+
+class ServerReadBuffer : public ReadBuffer
+{
+  public:
+
+  ServerReadBuffer(Transport *transport, ServerChannel *channel)
+
+    : ReadBuffer(transport), firstMessage_(1), channel_(channel)
+  {
+  }
+
+  virtual ~ServerReadBuffer()
+  {
+  }
+
+  void setBigEndian(int flag)
+  {
+    bigEndian_ = flag;
+  }
+
+  unsigned char *peekMessage(unsigned int &offset, unsigned char opcode,
+                                 unsigned short sequence);
+
+  protected:
+
+  virtual unsigned int suggestedLength(unsigned int pendingLength);
+
+  virtual int locateMessage(const unsigned char *start,
+                                const unsigned char *end,
+                                    unsigned int &controlLength,
+                                        unsigned int &dataLength,
+                                            unsigned int &trailerLength);
+
+  int bigEndian_;
+
+  int firstMessage_;
+
+  ServerChannel *channel_;
+};
+
+#endif /* ServerReadBuffer_H */
diff --git a/nxcomp/src/ServerStore.cpp b/nxcomp/src/ServerStore.cpp
new file mode 100644
index 000000000..8123b6de0
--- /dev/null
+++ b/nxcomp/src/ServerStore.cpp
@@ -0,0 +1,183 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "ServerStore.h"
+
+//
+// Cached reply classes.
+//
+
+#include "GetImageReply.h"
+#include "ListFontsReply.h"
+#include "QueryFontReply.h"
+#include "GetPropertyReply.h"
+#include "GenericReply.h"
+
+//
+// Set the verbosity level.
+//
+
+#define WARNING
+#define PANIC
+#undef  TEST
+
+ServerStore::ServerStore(StaticCompressor *compressor)
+{
+  if (logofs == NULL)
+  {
+    logofs = &cout;
+  }
+
+  for (int i = 0; i < CHANNEL_STORE_OPCODE_LIMIT; i++)
+  {
+    replies_[i] = NULL;
+    events_[i]  = NULL;
+  }
+
+  replies_[X_ListFonts]   = new ListFontsReplyStore(compressor);
+  replies_[X_QueryFont]   = new QueryFontReplyStore(compressor);
+  replies_[X_GetImage]    = new GetImageReplyStore(compressor);
+  replies_[X_GetProperty] = new GetPropertyReplyStore(compressor);
+
+  replies_[X_NXInternalGenericReply] = new GenericReplyStore(compressor);
+}
+
+ServerStore::~ServerStore()
+{
+  if (logofs == NULL)
+  {
+    logofs = &cout;
+  }
+
+  for (int i = 0; i < CHANNEL_STORE_OPCODE_LIMIT; i++)
+  {
+    delete replies_[i];
+    delete events_[i];
+  }
+}
+
+int ServerStore::saveReplyStores(ostream *cachefs, md5_state_t *md5StateStream,
+                                     md5_state_t *md5StateClient, T_checksum_action checksumAction,
+                                         T_data_action dataAction) const
+{
+  for (int i = 0; i < CHANNEL_STORE_OPCODE_LIMIT; i++)
+  {
+    if (replies_[i] != NULL &&
+            replies_[i] -> saveStore(cachefs, md5StateStream, md5StateClient,
+                                         checksumAction, dataAction,
+                                             storeBigEndian()) < 0)
+    {
+      #ifdef PANIC
+      *logofs << "ServerStore: PANIC! Error saving reply store "
+              << "for OPCODE#" << (unsigned int) i << ".\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Error saving reply store "
+           << "for opcode '" << (unsigned int) i << "'.\n";
+
+      return -1;
+    }
+  }
+
+  return 1;
+}
+
+int ServerStore::saveEventStores(ostream *cachefs, md5_state_t *md5StateStream,
+                                     md5_state_t *md5StateClient, T_checksum_action checksumAction,
+                                         T_data_action dataAction) const
+{
+  for (int i = 0; i < CHANNEL_STORE_OPCODE_LIMIT; i++)
+  {
+    if (events_[i] != NULL &&
+            events_[i] -> saveStore(cachefs, md5StateStream, md5StateClient,
+                                        checksumAction, dataAction,
+                                            storeBigEndian()) < 0)
+    {
+      #ifdef PANIC
+      *logofs << "ServerStore: PANIC! Error saving event store "
+              << "for OPCODE#" << (unsigned int) i << ".\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Error saving event store "
+           << "for opcode '" << (unsigned int) i << "'.\n";
+
+      return -1;
+    }
+  }
+
+  return 1;
+}
+
+int ServerStore::loadReplyStores(istream *cachefs, md5_state_t *md5StateStream,
+                                     T_checksum_action checksumAction, T_data_action dataAction) const
+{
+  for (int i = 0; i < CHANNEL_STORE_OPCODE_LIMIT; i++)
+  {
+    if (replies_[i] != NULL &&
+            replies_[i] -> loadStore(cachefs, md5StateStream,
+                                         checksumAction, dataAction,
+                                             storeBigEndian()) < 0)
+    {
+      #ifdef PANIC
+      *logofs << "ServerStore: PANIC! Error loading reply store "
+              << "for OPCODE#" << (unsigned int) i << ".\n"
+              << logofs_flush;
+      #endif
+
+      return -1;
+    }
+  }
+
+  return 1;
+}
+
+int ServerStore::loadEventStores(istream *cachefs, md5_state_t *md5StateStream,
+                                     T_checksum_action checksumAction, T_data_action dataAction) const
+{
+  for (int i = 0; i < CHANNEL_STORE_OPCODE_LIMIT; i++)
+  {
+    if (events_[i] != NULL &&
+            events_[i] -> loadStore(cachefs, md5StateStream,
+                                        checksumAction, dataAction,
+                                            storeBigEndian()) < 0)
+    {
+      #ifdef PANIC
+      *logofs << "ServerStore: PANIC! Error loading event store "
+              << "for OPCODE#" << (unsigned int) i << ".\n"
+              << logofs_flush;
+      #endif
+
+      return -1;
+    }
+  }
+
+  return 1;
+}
diff --git a/nxcomp/src/ServerStore.h b/nxcomp/src/ServerStore.h
new file mode 100644
index 000000000..dbbb968e5
--- /dev/null
+++ b/nxcomp/src/ServerStore.h
@@ -0,0 +1,83 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef ServerStore_H
+#define ServerStore_H
+
+#include "Message.h"
+
+#include "ChannelStore.h"
+
+class StaticCompressor;
+
+class ServerStore : public ChannelStore
+{
+  public:
+
+  ServerStore(StaticCompressor *compressor);
+
+  virtual ~ServerStore();
+
+  MessageStore *getReplyStore(unsigned char opcode) const
+  {
+    return replies_[opcode];
+  }
+
+  MessageStore *getEventStore(unsigned char opcode) const
+  {
+    return events_[opcode];
+  }
+
+  //
+  // Actually save the message store
+  // to disk according to proxy mode.
+  //
+
+  int saveReplyStores(ostream *cachefs, md5_state_t *md5StateStream,
+                          md5_state_t *md5StateClient, T_checksum_action checksumAction,
+                              T_data_action dataAction) const;
+
+  int saveEventStores(ostream *cachefs, md5_state_t *md5StateStream,
+                          md5_state_t *md5StateClient, T_checksum_action checksumAction,
+                              T_data_action dataAction) const;
+
+
+  int loadReplyStores(istream *cachefs, md5_state_t *md5StateStream,
+                          T_checksum_action checksumAction, T_data_action dataAction) const;
+
+  int loadEventStores(istream *cachefs, md5_state_t *md5StateStream,
+                          T_checksum_action checksumAction, T_data_action dataAction) const;
+
+  private:
+
+  //
+  // A server store contains replies and events.
+  //
+
+  MessageStore *replies_[CHANNEL_STORE_OPCODE_LIMIT];
+  MessageStore *events_[CHANNEL_STORE_OPCODE_LIMIT];
+};
+
+#endif /* ServerStore_H */
diff --git a/nxcomp/src/SetClipRectangles.cpp b/nxcomp/src/SetClipRectangles.cpp
new file mode 100644
index 000000000..b43cea938
--- /dev/null
+++ b/nxcomp/src/SetClipRectangles.cpp
@@ -0,0 +1,154 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SetClipRectangles.h"
+
+#include "ClientCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Here are the methods to handle messages' content.
+//
+
+int SetClipRectanglesStore::parseIdentity(Message *message, const unsigned char *buffer,
+                                              unsigned int size, int bigEndian) const
+{
+  SetClipRectanglesMessage *setClipRectangles = (SetClipRectanglesMessage *) message;
+
+  //
+  // Here is the fingerprint.
+  //
+
+  setClipRectangles -> ordering = *(buffer + 1);
+
+  setClipRectangles -> gcontext = GetULONG(buffer + 4, bigEndian);
+
+  setClipRectangles -> x_origin = GetUINT(buffer + 8, bigEndian);
+  setClipRectangles -> y_origin = GetUINT(buffer + 10, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsed Identity for message at " << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int SetClipRectanglesStore::unparseIdentity(const Message *message, unsigned char *buffer,
+                                                unsigned int size, int bigEndian) const
+{
+  SetClipRectanglesMessage *setClipRectangles = (SetClipRectanglesMessage *) message;
+
+  //
+  // Fill all the message's fields.
+  //
+
+  *(buffer + 1) = setClipRectangles -> ordering;
+
+  PutULONG(setClipRectangles -> gcontext, buffer + 4, bigEndian);
+
+  PutUINT(setClipRectangles -> x_origin, buffer + 8, bigEndian);
+  PutUINT(setClipRectangles -> y_origin, buffer + 10, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsed identity for message at " << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void SetClipRectanglesStore::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  SetClipRectanglesMessage *setClipRectangles = (SetClipRectanglesMessage *) message;
+
+  *logofs << name() << ": Identity ordering " << (unsigned int) setClipRectangles -> ordering
+                    << ", gcontext " << setClipRectangles -> gcontext << ", x_origin " 
+                    << setClipRectangles -> x_origin << ", y_origin " 
+                    << setClipRectangles -> y_origin << ", size " 
+                    << setClipRectangles -> size_ << ".\n" << logofs_flush;
+  #endif
+}
+
+void SetClipRectanglesStore::identityChecksum(const Message *message, const unsigned char *buffer,
+                                                  unsigned int size, int bigEndian) const
+{
+  md5_append(md5_state_, buffer + 1, 1);
+  md5_append(md5_state_, buffer + 8, 4);
+}
+
+void SetClipRectanglesStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                                const Message *cachedMessage,
+                                                    ChannelCache *channelCache) const
+{
+  SetClipRectanglesMessage *setClipRectangles       = (SetClipRectanglesMessage *) message;
+  SetClipRectanglesMessage *cachedSetClipRectangles = (SetClipRectanglesMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value " << setClipRectangles -> gcontext
+          << " as gcontext field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeXidValue(setClipRectangles -> gcontext, clientCache -> gcCache);
+
+  cachedSetClipRectangles -> gcontext = setClipRectangles -> gcontext;
+}
+
+void SetClipRectanglesStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                                ChannelCache *channelCache) const
+{
+  SetClipRectanglesMessage *setClipRectangles = (SetClipRectanglesMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  unsigned int value;
+
+  decodeBuffer.decodeXidValue(value, clientCache -> gcCache);
+
+  setClipRectangles -> gcontext = value;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value " << setClipRectangles -> gcontext
+          << " as gcontext field.\n" << logofs_flush;
+  #endif
+}
diff --git a/nxcomp/src/SetClipRectangles.h b/nxcomp/src/SetClipRectangles.h
new file mode 100644
index 000000000..a2245360c
--- /dev/null
+++ b/nxcomp/src/SetClipRectangles.h
@@ -0,0 +1,187 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef SetClipRectangles_H
+#define SetClipRectangles_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+
+#define SETCLIPRECTANGLES_ENABLE_CACHE               1
+#define SETCLIPRECTANGLES_ENABLE_DATA                0
+#define SETCLIPRECTANGLES_ENABLE_SPLIT               0
+#define SETCLIPRECTANGLES_ENABLE_COMPRESS            0
+
+#define SETCLIPRECTANGLES_DATA_LIMIT                 2048
+#define SETCLIPRECTANGLES_DATA_OFFSET                12
+
+#define SETCLIPRECTANGLES_CACHE_SLOTS                3000
+#define SETCLIPRECTANGLES_CACHE_THRESHOLD            3
+#define SETCLIPRECTANGLES_CACHE_LOWER_THRESHOLD      1
+
+//
+// The message class.
+//
+
+class SetClipRectanglesMessage : public Message
+{
+  friend class SetClipRectanglesStore;
+
+  public:
+
+  SetClipRectanglesMessage()
+  {
+  }
+
+  ~SetClipRectanglesMessage()
+  {
+  }
+
+  //
+  // Put here the fields which constitute 
+  // the 'identity' part of the message.
+  //
+
+  private:
+
+  unsigned char  ordering;
+  unsigned int   gcontext;
+  unsigned short x_origin;
+  unsigned short y_origin;
+};
+
+class SetClipRectanglesStore : public MessageStore
+{
+  //
+  // Constructors and destructors.
+  //
+
+  public:
+
+  SetClipRectanglesStore() : MessageStore()
+  {
+    enableCache    = SETCLIPRECTANGLES_ENABLE_CACHE;
+    enableData     = SETCLIPRECTANGLES_ENABLE_DATA;
+    enableSplit    = SETCLIPRECTANGLES_ENABLE_SPLIT;
+    enableCompress = SETCLIPRECTANGLES_ENABLE_COMPRESS;
+
+    dataLimit  = SETCLIPRECTANGLES_DATA_LIMIT;
+    dataOffset = SETCLIPRECTANGLES_DATA_OFFSET;
+
+    cacheSlots          = SETCLIPRECTANGLES_CACHE_SLOTS;
+    cacheThreshold      = SETCLIPRECTANGLES_CACHE_THRESHOLD;
+    cacheLowerThreshold = SETCLIPRECTANGLES_CACHE_LOWER_THRESHOLD;
+
+    messages_ -> resize(cacheSlots);
+
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      *i = NULL;
+    }
+
+    temporary_ = NULL;
+  }
+
+  virtual ~SetClipRectanglesStore()
+  {
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      destroy(*i);
+    }
+
+    destroy(temporary_);
+  }
+
+  virtual const char *name() const
+  {
+    return "SetClipRectangles";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return X_SetClipRectangles;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(SetClipRectanglesMessage);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  public:
+
+  virtual Message *create() const
+  {
+    return new SetClipRectanglesMessage();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new SetClipRectanglesMessage((const SetClipRectanglesMessage &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (SetClipRectanglesMessage *) message;
+  }
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer,
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                  const Message *cachedMessage,
+                                      ChannelCache *channelCache) const;
+
+  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                  ChannelCache *channelCache) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+                                    unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+};
+
+#endif /* SetClipRectangles_H */
diff --git a/nxcomp/src/SetUnpackAlpha.cpp b/nxcomp/src/SetUnpackAlpha.cpp
new file mode 100644
index 000000000..5a352d26a
--- /dev/null
+++ b/nxcomp/src/SetUnpackAlpha.cpp
@@ -0,0 +1,266 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SetUnpackAlpha.h"
+
+#include "ClientCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+#include "WriteBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Constructors and destructors.
+//
+
+SetUnpackAlphaStore::SetUnpackAlphaStore(StaticCompressor *compressor)
+
+  : MessageStore(compressor)
+{
+  enableCache    = SETUNPACKALPHA_ENABLE_CACHE;
+  enableData     = SETUNPACKALPHA_ENABLE_DATA;
+  enableCompress = SETUNPACKALPHA_ENABLE_COMPRESS_IF_PROTO_STEP_7;
+
+  dataLimit  = SETUNPACKALPHA_DATA_LIMIT;
+  dataOffset = SETUNPACKALPHA_DATA_OFFSET_IF_PROTO_STEP_7;
+
+  cacheSlots          = SETUNPACKALPHA_CACHE_SLOTS;
+  cacheThreshold      = SETUNPACKALPHA_CACHE_THRESHOLD;
+  cacheLowerThreshold = SETUNPACKALPHA_CACHE_LOWER_THRESHOLD;
+
+  // Since ProtoStep8 (#issue 108)
+  enableSplit    = SETUNPACKALPHA_ENABLE_SPLIT_IF_PROTO_STEP_8;
+
+  messages_ -> resize(cacheSlots);
+
+  for (T_messages::iterator i = messages_ -> begin();
+           i < messages_ -> end(); i++)
+  {
+    *i = NULL;
+  }
+
+  temporary_ = NULL;
+}
+
+SetUnpackAlphaStore::~SetUnpackAlphaStore()
+{
+  for (T_messages::iterator i = messages_ -> begin();
+           i < messages_ -> end(); i++)
+  {
+    destroy(*i);
+  }
+
+  destroy(temporary_);
+}
+
+//
+// Here are the methods to handle messages' content.
+//
+
+int SetUnpackAlphaStore::encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                                            const unsigned int size, int bigEndian,
+                                                ChannelCache *channelCache) const
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Encoding full message identity.\n" << logofs_flush;
+  #endif
+
+  //
+  // Encode the source length first because
+  // we need it to determine the size of
+  // the output buffer.
+  //
+
+  // SrcLength.
+  encodeBuffer.encodeValue(GetULONG(buffer + 8, bigEndian), 32, 9);
+
+  // Client.
+  encodeBuffer.encodeCachedValue(*(buffer + 1), 8,
+                     clientCache -> resourceCache);
+  // Method.
+  encodeBuffer.encodeCachedValue(*(buffer + 4), 8,
+                     clientCache -> methodCache);
+  // DstLength.
+  encodeBuffer.encodeValue(GetULONG(buffer + 12, bigEndian), 32, 9);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Encoded full message identity.\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int SetUnpackAlphaStore::decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
+                                            unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
+                                                ChannelCache *channelCache) const
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoding full message identity.\n" << logofs_flush;
+  #endif
+
+  unsigned int  value;
+  unsigned char cValue;
+
+  // SrcLength.
+  decodeBuffer.decodeValue(value, 32, 9);
+
+  size = RoundUp4(value) + 16;
+
+  buffer = writeBuffer -> addMessage(size);
+
+  PutULONG(value, buffer + 8, bigEndian);
+
+  // Client.
+  decodeBuffer.decodeCachedValue(cValue, 8,
+                     clientCache -> resourceCache);
+
+  *(buffer + 1) = cValue;
+
+  // Method.
+  decodeBuffer.decodeCachedValue(cValue, 8,
+                     clientCache -> methodCache);
+
+  *(buffer + 4) = cValue;
+
+  // DstLength.
+  decodeBuffer.decodeValue(value, 32, 9);
+
+  PutULONG(value, buffer + 12, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded full message identity.\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int SetUnpackAlphaStore::parseIdentity(Message *message, const unsigned char *buffer,
+                                           unsigned int size, int bigEndian) const
+{
+  SetUnpackAlphaMessage *setUnpackAlpha = (SetUnpackAlphaMessage *) message;
+
+  setUnpackAlpha -> client = *(buffer + 1);
+  setUnpackAlpha -> method = *(buffer + 4);
+
+  setUnpackAlpha -> src_length = GetULONG(buffer + 8, bigEndian);
+  setUnpackAlpha -> dst_length = GetULONG(buffer + 12, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsed identity for message at " << message << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int SetUnpackAlphaStore::unparseIdentity(const Message *message, unsigned char *buffer,
+                                             unsigned int size, int bigEndian) const
+{
+  SetUnpackAlphaMessage *setUnpackAlpha = (SetUnpackAlphaMessage *) message;
+
+  *(buffer + 1) = setUnpackAlpha -> client;
+  *(buffer + 4) = setUnpackAlpha -> method;
+
+  PutULONG(setUnpackAlpha -> src_length, buffer + 8,  bigEndian);
+  PutULONG(setUnpackAlpha -> dst_length, buffer + 12, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsed identity for message at " << message << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void SetUnpackAlphaStore::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  SetUnpackAlphaMessage *setUnpackAlpha = (SetUnpackAlphaMessage *) message;
+
+  *logofs << name() << ": Identity client "
+          << (unsigned int) setUnpackAlpha -> client << " method "
+          << (unsigned int) setUnpackAlpha -> method << " source length "
+          << setUnpackAlpha -> src_length << " destination length "
+          << setUnpackAlpha -> dst_length << " size "
+          << setUnpackAlpha -> size_ << ".\n";
+
+  #endif
+}
+
+void SetUnpackAlphaStore::identityChecksum(const Message *message, const unsigned char *buffer,
+                                               unsigned int size, int bigEndian) const
+{
+  //
+  // Include the pack method and the source
+  // and destination length.
+  //
+
+  md5_append(md5_state_, buffer + 4, 1);
+  md5_append(md5_state_, buffer + 8, 8);
+}
+
+void SetUnpackAlphaStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                             const Message *cachedMessage,
+                                                 ChannelCache *channelCache) const
+{
+  SetUnpackAlphaMessage *setUnpackAlpha       = (SetUnpackAlphaMessage *) message;
+  SetUnpackAlphaMessage *cachedSetUnpackAlpha = (SetUnpackAlphaMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  encodeBuffer.encodeCachedValue(setUnpackAlpha -> client, 8,
+                     clientCache -> resourceCache);
+
+  cachedSetUnpackAlpha -> client = setUnpackAlpha -> client;
+}
+
+void SetUnpackAlphaStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                             ChannelCache *channelCache) const
+{
+  SetUnpackAlphaMessage *setUnpackAlpha = (SetUnpackAlphaMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  decodeBuffer.decodeCachedValue(setUnpackAlpha -> client, 8,
+                     clientCache -> resourceCache);
+}
diff --git a/nxcomp/src/SetUnpackAlpha.h b/nxcomp/src/SetUnpackAlpha.h
new file mode 100644
index 000000000..54714efaa
--- /dev/null
+++ b/nxcomp/src/SetUnpackAlpha.h
@@ -0,0 +1,162 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef SetUnpackAlpha_H
+#define SetUnpackAlpha_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+
+#define SETUNPACKALPHA_ENABLE_CACHE                       1
+#define SETUNPACKALPHA_ENABLE_DATA                        1
+
+#define SETUNPACKALPHA_DATA_LIMIT                         16384
+
+#define SETUNPACKALPHA_CACHE_SLOTS                        2000
+#define SETUNPACKALPHA_CACHE_THRESHOLD                    10
+#define SETUNPACKALPHA_CACHE_LOWER_THRESHOLD              5
+
+#define SETUNPACKALPHA_DATA_OFFSET_IF_PROTO_STEP_7        16
+#define SETUNPACKALPHA_ENABLE_COMPRESS_IF_PROTO_STEP_7    0
+
+#define SETUNPACKALPHA_ENABLE_SPLIT_IF_PROTO_STEP_8       0
+
+//
+// The message class.
+//
+
+class SetUnpackAlphaMessage : public Message
+{
+  friend class SetUnpackAlphaStore;
+
+  public:
+
+  SetUnpackAlphaMessage()
+  {
+  }
+
+  ~SetUnpackAlphaMessage()
+  {
+  }
+
+  //
+  // Put here the fields which constitute 
+  // the 'identity' part of the message.
+  //
+
+  private:
+
+  unsigned char client;
+  unsigned char method;
+
+  unsigned int src_length;
+  unsigned int dst_length;
+};
+
+class SetUnpackAlphaStore : public MessageStore
+{
+  public:
+
+  SetUnpackAlphaStore(StaticCompressor *compressor);
+
+  virtual ~SetUnpackAlphaStore();
+
+  virtual const char *name() const
+  {
+    return "SetUnpackAlpha";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return X_NXSetUnpackAlpha;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(SetUnpackAlphaMessage);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  protected:
+
+  virtual Message *create() const
+  {
+    return new SetUnpackAlphaMessage();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new SetUnpackAlphaMessage((const SetUnpackAlphaMessage &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (SetUnpackAlphaMessage *) message;
+  }
+
+  virtual int encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                                 const unsigned int size, int bigEndian,
+                                     ChannelCache *channelCache) const;
+
+  virtual int decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
+                                 unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
+                                     ChannelCache *channelCache) const;
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer,
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                  const Message *cachedMessage,
+                                      ChannelCache *channelCache) const;
+
+  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                  ChannelCache *channelCache) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+                                    unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+};
+
+#endif /* SetUnpackAlpha_H */
diff --git a/nxcomp/src/SetUnpackColormap.cpp b/nxcomp/src/SetUnpackColormap.cpp
new file mode 100644
index 000000000..2c9bba1bd
--- /dev/null
+++ b/nxcomp/src/SetUnpackColormap.cpp
@@ -0,0 +1,266 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SetUnpackColormap.h"
+
+#include "ClientCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+#include "WriteBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Constructors and destructors.
+//
+
+SetUnpackColormapStore::SetUnpackColormapStore(StaticCompressor *compressor)
+
+  : MessageStore(compressor)
+{
+  enableCache    = SETUNPACKCOLORMAP_ENABLE_CACHE;
+  enableData     = SETUNPACKCOLORMAP_ENABLE_DATA;
+  enableCompress = SETUNPACKCOLORMAP_ENABLE_COMPRESS_IF_PROTO_STEP_7;
+
+  dataLimit  = SETUNPACKCOLORMAP_DATA_LIMIT;
+  dataOffset = SETUNPACKCOLORMAP_DATA_OFFSET_IF_PROTO_STEP_7;
+
+  cacheSlots          = SETUNPACKCOLORMAP_CACHE_SLOTS;
+  cacheThreshold      = SETUNPACKCOLORMAP_CACHE_THRESHOLD;
+  cacheLowerThreshold = SETUNPACKCOLORMAP_CACHE_LOWER_THRESHOLD;
+
+  // Since ProtoStep8 (#issue 108)
+  enableSplit = SETUNPACKCOLORMAP_ENABLE_SPLIT_IF_PROTO_STEP_8;
+
+  messages_ -> resize(cacheSlots);
+
+  for (T_messages::iterator i = messages_ -> begin();
+           i < messages_ -> end(); i++)
+  {
+    *i = NULL;
+  }
+
+  temporary_ = NULL;
+}
+
+SetUnpackColormapStore::~SetUnpackColormapStore()
+{
+  for (T_messages::iterator i = messages_ -> begin();
+           i < messages_ -> end(); i++)
+  {
+    destroy(*i);
+  }
+
+  destroy(temporary_);
+}
+
+//
+// Here are the methods to handle messages' content.
+//
+
+int SetUnpackColormapStore::encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                                               const unsigned int size, int bigEndian,
+                                                   ChannelCache *channelCache) const
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Encoding full message identity.\n" << logofs_flush;
+  #endif
+
+  //
+  // Encode the source length first because
+  // we need it to determine the size of
+  // the output buffer.
+  //
+
+  // SrcLength.
+  encodeBuffer.encodeValue(GetULONG(buffer + 8, bigEndian), 32, 9);
+
+  // Client.
+  encodeBuffer.encodeCachedValue(*(buffer + 1), 8,
+                     clientCache -> resourceCache);
+  // Method.
+  encodeBuffer.encodeCachedValue(*(buffer + 4), 8,
+                     clientCache -> methodCache);
+  // DstLength.
+  encodeBuffer.encodeValue(GetULONG(buffer + 12, bigEndian), 32, 9);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Encoded full message identity.\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int SetUnpackColormapStore::decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
+                                               unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
+                                                   ChannelCache *channelCache) const
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoding full message identity.\n" << logofs_flush;
+  #endif
+
+  unsigned int  value;
+  unsigned char cValue;
+
+  // SrcLength.
+  decodeBuffer.decodeValue(value, 32, 9);
+
+  size = RoundUp4(value) + 16;
+
+  buffer = writeBuffer -> addMessage(size);
+
+  PutULONG(value, buffer + 8, bigEndian);
+
+  // Client.
+  decodeBuffer.decodeCachedValue(cValue, 8,
+                     clientCache -> resourceCache);
+
+  *(buffer + 1) = cValue;
+
+  // Method.
+  decodeBuffer.decodeCachedValue(cValue, 8,
+                     clientCache -> methodCache);
+
+  *(buffer + 4) = cValue;
+
+  // DstLength.
+  decodeBuffer.decodeValue(value, 32, 9);
+
+  PutULONG(value, buffer + 12, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded full message identity.\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int SetUnpackColormapStore::parseIdentity(Message *message, const unsigned char *buffer,
+                                              unsigned int size, int bigEndian) const
+{
+  SetUnpackColormapMessage *setUnpackColormap = (SetUnpackColormapMessage *) message;
+
+  setUnpackColormap -> client = *(buffer + 1);
+  setUnpackColormap -> method = *(buffer + 4);
+
+  setUnpackColormap -> src_length = GetULONG(buffer + 8, bigEndian);
+  setUnpackColormap -> dst_length = GetULONG(buffer + 12, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsed identity for message at " << message << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int SetUnpackColormapStore::unparseIdentity(const Message *message, unsigned char *buffer,
+                                                unsigned int size, int bigEndian) const
+{
+  SetUnpackColormapMessage *setUnpackColormap = (SetUnpackColormapMessage *) message;
+
+  *(buffer + 1) = setUnpackColormap -> client;
+  *(buffer + 4) = setUnpackColormap -> method;
+
+  PutULONG(setUnpackColormap -> src_length, buffer + 8,  bigEndian);
+  PutULONG(setUnpackColormap -> dst_length, buffer + 12, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsed identity for message at " << message << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void SetUnpackColormapStore::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  SetUnpackColormapMessage *setUnpackColormap = (SetUnpackColormapMessage *) message;
+
+  *logofs << name() << ": Identity client "
+          << (unsigned int) setUnpackColormap -> client << " method "
+          << (unsigned int) setUnpackColormap -> method << " source length "
+          << setUnpackColormap -> src_length << " destination length "
+          << setUnpackColormap -> dst_length << " size "
+          << setUnpackColormap -> size_ << ".\n";
+
+  #endif
+}
+
+void SetUnpackColormapStore::identityChecksum(const Message *message, const unsigned char *buffer,
+                                                  unsigned int size, int bigEndian) const
+{
+  //
+  // Include the pack method and the source
+  // and destination length.
+  //
+
+  md5_append(md5_state_, buffer + 4, 1);
+  md5_append(md5_state_, buffer + 8, 8);
+}
+
+void SetUnpackColormapStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                                const Message *cachedMessage,
+                                                    ChannelCache *channelCache) const
+{
+  SetUnpackColormapMessage *setUnpackColormap       = (SetUnpackColormapMessage *) message;
+  SetUnpackColormapMessage *cachedSetUnpackColormap = (SetUnpackColormapMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  encodeBuffer.encodeCachedValue(setUnpackColormap -> client, 8,
+                     clientCache -> resourceCache);
+
+  cachedSetUnpackColormap -> client = setUnpackColormap -> client;
+}
+
+void SetUnpackColormapStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                                ChannelCache *channelCache) const
+{
+  SetUnpackColormapMessage *setUnpackColormap = (SetUnpackColormapMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  decodeBuffer.decodeCachedValue(setUnpackColormap -> client, 8,
+                     clientCache -> resourceCache);
+}
diff --git a/nxcomp/src/SetUnpackColormap.h b/nxcomp/src/SetUnpackColormap.h
new file mode 100644
index 000000000..779366531
--- /dev/null
+++ b/nxcomp/src/SetUnpackColormap.h
@@ -0,0 +1,162 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef SetUnpackColormap_H
+#define SetUnpackColormap_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+
+#define SETUNPACKCOLORMAP_ENABLE_CACHE                       1
+#define SETUNPACKCOLORMAP_ENABLE_DATA                        1
+
+#define SETUNPACKCOLORMAP_DATA_LIMIT                         4096
+
+#define SETUNPACKCOLORMAP_CACHE_SLOTS                        2000
+#define SETUNPACKCOLORMAP_CACHE_THRESHOLD                    5
+#define SETUNPACKCOLORMAP_CACHE_LOWER_THRESHOLD              0
+
+#define SETUNPACKCOLORMAP_DATA_OFFSET_IF_PROTO_STEP_7        16
+#define SETUNPACKCOLORMAP_ENABLE_COMPRESS_IF_PROTO_STEP_7    0
+
+#define SETUNPACKCOLORMAP_ENABLE_SPLIT_IF_PROTO_STEP_8       0
+
+//
+// The message class.
+//
+
+class SetUnpackColormapMessage : public Message
+{
+  friend class SetUnpackColormapStore;
+
+  public:
+
+  SetUnpackColormapMessage()
+  {
+  }
+
+  ~SetUnpackColormapMessage()
+  {
+  }
+
+  //
+  // Put here the fields which constitute 
+  // the 'identity' part of the message.
+  //
+
+  private:
+
+  unsigned char client;
+  unsigned char method;
+
+  unsigned int src_length;
+  unsigned int dst_length;
+};
+
+class SetUnpackColormapStore : public MessageStore
+{
+  public:
+
+  SetUnpackColormapStore(StaticCompressor *compressor);
+
+  virtual ~SetUnpackColormapStore();
+
+  virtual const char *name() const
+  {
+    return "SetUnpackColormap";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return X_NXSetUnpackColormap;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(SetUnpackColormapMessage);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  protected:
+
+  virtual Message *create() const
+  {
+    return new SetUnpackColormapMessage();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new SetUnpackColormapMessage((const SetUnpackColormapMessage &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (SetUnpackColormapMessage *) message;
+  }
+
+  virtual int encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                                 const unsigned int size, int bigEndian,
+                                     ChannelCache *channelCache) const;
+
+  virtual int decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
+                                 unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
+                                     ChannelCache *channelCache) const;
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer,
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                  const Message *cachedMessage,
+                                      ChannelCache *channelCache) const;
+
+  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                  ChannelCache *channelCache) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+                                    unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+};
+
+#endif /* SetUnpackColormap_H */
diff --git a/nxcomp/src/SetUnpackGeometry.cpp b/nxcomp/src/SetUnpackGeometry.cpp
new file mode 100644
index 000000000..edff6a544
--- /dev/null
+++ b/nxcomp/src/SetUnpackGeometry.cpp
@@ -0,0 +1,305 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SetUnpackGeometry.h"
+
+#include "ClientCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+#include "WriteBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Constructors and destructors.
+//
+
+SetUnpackGeometryStore::SetUnpackGeometryStore(StaticCompressor *compressor)
+
+  : MessageStore(compressor)
+{
+  enableCache    = SETUNPACKGEOMETRY_ENABLE_CACHE;
+  enableData     = SETUNPACKGEOMETRY_ENABLE_DATA;
+  enableSplit    = SETUNPACKGEOMETRY_ENABLE_SPLIT;
+  enableCompress = SETUNPACKGEOMETRY_ENABLE_COMPRESS;
+
+  dataLimit  = SETUNPACKGEOMETRY_DATA_LIMIT;
+  dataOffset = SETUNPACKGEOMETRY_DATA_OFFSET;
+
+  cacheSlots          = SETUNPACKGEOMETRY_CACHE_SLOTS;
+  cacheThreshold      = SETUNPACKGEOMETRY_CACHE_THRESHOLD;
+  cacheLowerThreshold = SETUNPACKGEOMETRY_CACHE_LOWER_THRESHOLD;
+
+  messages_ -> resize(cacheSlots);
+
+  for (T_messages::iterator i = messages_ -> begin();
+           i < messages_ -> end(); i++)
+  {
+    *i = NULL;
+  }
+
+  temporary_ = NULL;
+}
+
+SetUnpackGeometryStore::~SetUnpackGeometryStore()
+{
+  for (T_messages::iterator i = messages_ -> begin();
+           i < messages_ -> end(); i++)
+  {
+    destroy(*i);
+  }
+
+  destroy(temporary_);
+}
+
+//
+// Here are the methods to handle messages' content.
+//
+
+int SetUnpackGeometryStore::encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                                            const unsigned int size, int bigEndian,
+                                                ChannelCache *channelCache) const
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Encoding full message identity.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeCachedValue(*(buffer + 1), 8,
+                     clientCache -> resourceCache);
+
+  const unsigned char *nextChar = buffer + 4;
+
+  for (int i = 0; i < 6; i++)
+  {
+    encodeBuffer.encodeCachedValue(*nextChar++, 8,
+                       clientCache -> depthCache);
+  }
+
+  encodeBuffer.encodeValue(GetULONG(buffer + 12, bigEndian), 32);
+  encodeBuffer.encodeValue(GetULONG(buffer + 16, bigEndian), 32);
+  encodeBuffer.encodeValue(GetULONG(buffer + 20, bigEndian), 32);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Encoded full message identity.\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int SetUnpackGeometryStore::decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
+                                            unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
+                                                ChannelCache *channelCache) const
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoding full message identity.\n" << logofs_flush;
+  #endif
+
+  size   = 24;
+  buffer = writeBuffer -> addMessage(size);
+
+  unsigned char cValue;
+
+  decodeBuffer.decodeCachedValue(cValue, 8,
+                     clientCache -> resourceCache);
+  *(buffer + 1) = cValue;
+
+  decodeBuffer.decodeCachedValue(cValue, 8,
+                     clientCache -> depthCache);
+  *(buffer + 4) = cValue;
+
+  decodeBuffer.decodeCachedValue(cValue, 8,
+                     clientCache -> depthCache);
+  *(buffer + 5) = cValue;
+
+  decodeBuffer.decodeCachedValue(cValue, 8,
+                     clientCache -> depthCache);
+  *(buffer + 6) = cValue;
+
+  decodeBuffer.decodeCachedValue(cValue, 8,
+                     clientCache -> depthCache);
+  *(buffer + 7) = cValue;
+
+  decodeBuffer.decodeCachedValue(cValue, 8,
+                     clientCache -> depthCache);
+  *(buffer + 8) = cValue;
+
+  decodeBuffer.decodeCachedValue(cValue, 8,
+                     clientCache -> depthCache);
+  *(buffer + 9) = cValue;
+
+  unsigned int value;
+
+  decodeBuffer.decodeValue(value, 32);
+  PutULONG(value, buffer + 12, bigEndian);
+
+  decodeBuffer.decodeValue(value, 32);
+  PutULONG(value, buffer + 16, bigEndian);
+
+  decodeBuffer.decodeValue(value, 32);
+  PutULONG(value, buffer + 20, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded full message identity.\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int SetUnpackGeometryStore::parseIdentity(Message *message, const unsigned char *buffer,
+                                           unsigned int size, int bigEndian) const
+{
+  SetUnpackGeometryMessage *setUnpackGeometry = (SetUnpackGeometryMessage *) message;
+
+  setUnpackGeometry -> client = *(buffer + 1);
+
+  setUnpackGeometry -> depth_1_bpp  = *(buffer + 4);
+  setUnpackGeometry -> depth_4_bpp  = *(buffer + 5);
+  setUnpackGeometry -> depth_8_bpp  = *(buffer + 6);
+  setUnpackGeometry -> depth_16_bpp = *(buffer + 7);
+  setUnpackGeometry -> depth_24_bpp = *(buffer + 8);
+  setUnpackGeometry -> depth_32_bpp = *(buffer + 9);
+
+  setUnpackGeometry -> red_mask   = GetULONG(buffer + 12, bigEndian);
+  setUnpackGeometry -> green_mask = GetULONG(buffer + 16, bigEndian);
+  setUnpackGeometry -> blue_mask  = GetULONG(buffer + 20, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsed identity for message at " << message << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int SetUnpackGeometryStore::unparseIdentity(const Message *message, unsigned char *buffer,
+                                             unsigned int size, int bigEndian) const
+{
+  SetUnpackGeometryMessage *setUnpackGeometry = (SetUnpackGeometryMessage *) message;
+
+  *(buffer + 1) = setUnpackGeometry -> client;
+
+  *(buffer + 4) = setUnpackGeometry -> depth_1_bpp;
+  *(buffer + 5) = setUnpackGeometry -> depth_4_bpp;
+  *(buffer + 6) = setUnpackGeometry -> depth_8_bpp;
+  *(buffer + 7) = setUnpackGeometry -> depth_16_bpp;
+  *(buffer + 8) = setUnpackGeometry -> depth_24_bpp;
+  *(buffer + 9) = setUnpackGeometry -> depth_32_bpp;
+
+  PutULONG(setUnpackGeometry -> red_mask,   buffer + 12, bigEndian);
+  PutULONG(setUnpackGeometry -> green_mask, buffer + 16, bigEndian);
+  PutULONG(setUnpackGeometry -> blue_mask,  buffer + 20, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsed identity for message at " << message << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void SetUnpackGeometryStore::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  SetUnpackGeometryMessage *setUnpackGeometry = (SetUnpackGeometryMessage *) message;
+
+  *logofs << name() << ": Identity client "
+          << (unsigned) setUnpackGeometry -> client << " depth_1_bpp "
+          << (unsigned) setUnpackGeometry -> depth_1_bpp << " depth_4_bpp "
+          << (unsigned int) setUnpackGeometry -> depth_4_bpp << " depth_8_bpp "
+          << (unsigned int) setUnpackGeometry -> depth_8_bpp << " depth_16_bpp "
+          << (unsigned int) setUnpackGeometry -> depth_16_bpp << " depth_24_bpp "
+          << (unsigned int) setUnpackGeometry -> depth_24_bpp << " depth_32_bpp "
+          << (unsigned int) setUnpackGeometry -> depth_32_bpp
+
+          << " red_mask " << setUnpackGeometry -> red_mask
+          << " green_mask " << setUnpackGeometry -> green_mask
+          << " blue_mask " << setUnpackGeometry -> blue_mask
+
+          << " size " << setUnpackGeometry -> size_ << ".\n";
+
+  #endif
+}
+
+void SetUnpackGeometryStore::identityChecksum(const Message *message, const unsigned char *buffer,
+                                               unsigned int size, int bigEndian) const
+{
+  md5_append(md5_state_, buffer + 4,  6);
+  md5_append(md5_state_, buffer + 12, 12);
+}
+
+void SetUnpackGeometryStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                             const Message *cachedMessage,
+                                                 ChannelCache *channelCache) const
+{
+  SetUnpackGeometryMessage *setUnpackGeometry       = (SetUnpackGeometryMessage *) message;
+  SetUnpackGeometryMessage *cachedSetUnpackGeometry = (SetUnpackGeometryMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef TEST
+  *logofs << name() << ": Encoding value "
+          << (unsigned int) setUnpackGeometry -> client
+          << " as client field.\n" << logofs_flush;
+  #endif
+
+  encodeBuffer.encodeCachedValue(setUnpackGeometry -> client, 8,
+                     clientCache -> resourceCache);
+
+  cachedSetUnpackGeometry -> client = setUnpackGeometry -> client;
+}
+
+void SetUnpackGeometryStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                             ChannelCache *channelCache) const
+{
+  SetUnpackGeometryMessage *setUnpackGeometry = (SetUnpackGeometryMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  decodeBuffer.decodeCachedValue(setUnpackGeometry -> client, 8,
+                     clientCache -> resourceCache);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded value "
+          << (unsigned int) setUnpackGeometry -> client
+          << " as client field.\n" << logofs_flush;
+  #endif
+}
diff --git a/nxcomp/src/SetUnpackGeometry.h b/nxcomp/src/SetUnpackGeometry.h
new file mode 100644
index 000000000..96104f57f
--- /dev/null
+++ b/nxcomp/src/SetUnpackGeometry.h
@@ -0,0 +1,167 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef SetUnpackGeometry_H
+#define SetUnpackGeometry_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+
+#define SETUNPACKGEOMETRY_ENABLE_CACHE               1
+#define SETUNPACKGEOMETRY_ENABLE_DATA                0
+#define SETUNPACKGEOMETRY_ENABLE_SPLIT               0
+#define SETUNPACKGEOMETRY_ENABLE_COMPRESS            0
+
+#define SETUNPACKGEOMETRY_DATA_LIMIT                 24
+#define SETUNPACKGEOMETRY_DATA_OFFSET                24
+
+#define SETUNPACKGEOMETRY_CACHE_SLOTS                20
+#define SETUNPACKGEOMETRY_CACHE_THRESHOLD            1
+#define SETUNPACKGEOMETRY_CACHE_LOWER_THRESHOLD      0
+
+//
+// The message class.
+//
+
+class SetUnpackGeometryMessage : public Message
+{
+  friend class SetUnpackGeometryStore;
+
+  public:
+
+  SetUnpackGeometryMessage()
+  {
+  }
+
+  ~SetUnpackGeometryMessage()
+  {
+  }
+
+  //
+  // Put here the fields which constitute 
+  // the 'identity' part of the message.
+  //
+
+  private:
+
+  unsigned char client;
+
+  unsigned char depth_1_bpp;
+  unsigned char depth_4_bpp;
+  unsigned char depth_8_bpp;
+  unsigned char depth_16_bpp;
+  unsigned char depth_24_bpp;
+  unsigned char depth_32_bpp;
+
+  unsigned int red_mask;
+  unsigned int green_mask;
+  unsigned int blue_mask;
+};
+
+class SetUnpackGeometryStore : public MessageStore
+{
+  public:
+
+  SetUnpackGeometryStore(StaticCompressor *compressor);
+
+  virtual ~SetUnpackGeometryStore();
+
+  virtual const char *name() const
+  {
+    return "SetUnpackGeometry";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return X_NXSetUnpackGeometry;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(SetUnpackGeometryMessage);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  protected:
+
+  virtual Message *create() const
+  {
+    return new SetUnpackGeometryMessage();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new SetUnpackGeometryMessage((const SetUnpackGeometryMessage &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (SetUnpackGeometryMessage *) message;
+  }
+
+  virtual int encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                                 const unsigned int size, int bigEndian,
+                                     ChannelCache *channelCache) const;
+
+  virtual int decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
+                                 unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
+                                     ChannelCache *channelCache) const;
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer,
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                  const Message *cachedMessage,
+                                      ChannelCache *channelCache) const;
+
+  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                  ChannelCache *channelCache) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+                                    unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+};
+
+#endif /* SetUnpackGeometry_H */
diff --git a/nxcomp/src/ShapeExtension.cpp b/nxcomp/src/ShapeExtension.cpp
new file mode 100644
index 000000000..2ee2b67db
--- /dev/null
+++ b/nxcomp/src/ShapeExtension.cpp
@@ -0,0 +1,305 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "ShapeExtension.h"
+
+#include "ClientCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+#include "WriteBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Constructors and destructors.
+//
+
+ShapeExtensionStore::ShapeExtensionStore(StaticCompressor *compressor)
+
+  : MessageStore(compressor)
+{
+  enableCache    = SHAPEEXTENSION_ENABLE_CACHE;
+  enableData     = SHAPEEXTENSION_ENABLE_DATA;
+  enableSplit    = SHAPEEXTENSION_ENABLE_SPLIT;
+
+  // Since ProtoStep7 (#issue 108)
+  enableCompress = SHAPEEXTENSION_ENABLE_COMPRESS_IF_PROTO_STEP_7;
+
+  dataLimit  = SHAPEEXTENSION_DATA_LIMIT;
+  dataOffset = SHAPEEXTENSION_DATA_OFFSET;
+
+  cacheSlots          = SHAPEEXTENSION_CACHE_SLOTS;
+  cacheThreshold      = SHAPEEXTENSION_CACHE_THRESHOLD;
+  cacheLowerThreshold = SHAPEEXTENSION_CACHE_LOWER_THRESHOLD;
+
+  opcode_ = X_NXInternalShapeExtension;
+
+  messages_ -> resize(cacheSlots);
+
+  for (T_messages::iterator i = messages_ -> begin();
+           i < messages_ -> end(); i++)
+  {
+    *i = NULL;
+  }
+
+  temporary_ = NULL;
+}
+
+ShapeExtensionStore::~ShapeExtensionStore()
+{
+  for (T_messages::iterator i = messages_ -> begin();
+           i < messages_ -> end(); i++)
+  {
+    destroy(*i);
+  }
+
+  destroy(temporary_);
+}
+
+//
+// Here are the methods to handle messages' content.
+//
+
+int ShapeExtensionStore::encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                                            const unsigned int size, int bigEndian,
+                                                ChannelCache *channelCache) const
+{
+  //
+  // Handle this extension in a way similar to shape.
+  //
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Encoding full message identity.\n" << logofs_flush;
+  #endif
+
+  //
+  // We handle all possible requests of this extension
+  // using the same opcode. We give to message a data
+  // offset of 4 (or 16 if proto is >= 3) and handle
+  // the first 16 bytes through an array of caches.
+  //
+
+  encodeBuffer.encodeValue(size >> 2, 16, 10);
+
+  encodeBuffer.encodeCachedValue(*(buffer + 1), 8,
+                     clientCache -> shapeOpcodeCache);
+
+  for (unsigned int i = 0; i < 8 && (i * 2 + 4) < size; i++)
+  {
+    encodeBuffer.encodeCachedValue(GetUINT(buffer + (i * 2) + 4, bigEndian), 16,
+                       *clientCache -> shapeDataCache[i]);
+  }
+
+  #ifdef DEBUG
+  *logofs << name() << ": Encoded full message identity.\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int ShapeExtensionStore::decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
+                                            unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
+                                                ChannelCache *channelCache) const
+{
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoding full message identity.\n" << logofs_flush;
+  #endif
+
+  decodeBuffer.decodeValue(size, 16, 10);
+
+  size <<= 2;
+
+  buffer = writeBuffer -> addMessage(size);
+
+  decodeBuffer.decodeCachedValue(*(buffer + 1), 8,
+                     clientCache -> shapeOpcodeCache);
+
+  unsigned int value;
+
+  for (unsigned int i = 0; i < 8 && (i * 2 + 4) < size; i++)
+  {
+    decodeBuffer.decodeCachedValue(value, 16,
+                       *clientCache -> shapeDataCache[i]);
+
+    PutUINT(value, buffer + 4 + (i * 2), bigEndian);
+  }
+
+  #ifdef DEBUG
+  *logofs << name() << ": Decoded full message identity.\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int ShapeExtensionStore::parseIdentity(Message *message, const unsigned char *buffer,
+                                           unsigned int size, int bigEndian) const
+{
+  ShapeExtensionMessage *shapeExtension = (ShapeExtensionMessage *) message;
+
+  shapeExtension -> opcode = *(buffer + 1);
+
+  for (unsigned int i = 0; i < 8; i++)
+  {
+    if ((i * 2 + 4) < size)
+    {
+      shapeExtension -> data[i] = GetUINT(buffer + i * 2 + 4, bigEndian); 
+
+      #ifdef DEBUG
+      *logofs << name() << ": Parsed data[" << i << "].\n"
+              << logofs_flush;
+      #endif
+    }
+    else
+    {
+      shapeExtension -> data[i] = 0;
+    }
+  }
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsed identity for message at "
+          << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int ShapeExtensionStore::unparseIdentity(const Message *message, unsigned char *buffer,
+                                             unsigned int size, int bigEndian) const
+{
+  ShapeExtensionMessage *shapeExtension = (ShapeExtensionMessage *) message;
+
+  *(buffer + 1) = shapeExtension -> opcode;
+
+  for (unsigned int i = 0; i < 8 && (i * 2 + 4) < size; i++)
+  {
+    PutUINT(shapeExtension -> data[i], buffer + i * 2 + 4, bigEndian);
+  }
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsed identity for message at "
+          << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void ShapeExtensionStore::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  ShapeExtensionMessage *shapeExtension = (ShapeExtensionMessage *) message;
+
+  *logofs << name() << ": Identity opcode " << (unsigned) shapeExtension -> opcode;
+
+  for (int i = 0; i < 8; i++)
+  {
+    *logofs << ", data[" << i << "] " << shapeExtension -> data[i];
+  }
+
+  *logofs << ", size " << shapeExtension -> size_ << ".\n" << logofs_flush;
+
+  #endif
+}
+
+void ShapeExtensionStore::identityChecksum(const Message *message, const unsigned char *buffer,
+                                               unsigned int size, int bigEndian) const
+{
+  //
+  // Include minor opcode in the checksum. As data
+  // offset can be beyond the real end of message,
+  // we need to include size or we will match any
+  // message of size less or equal to data offset.
+  //
+
+  md5_append(md5_state_, buffer + 1,  3);
+}
+
+void ShapeExtensionStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                             const Message *cachedMessage,
+                                                 ChannelCache *channelCache) const
+{
+  //
+  // Encode the variant part.
+  //
+
+  ShapeExtensionMessage *shapeExtension       = (ShapeExtensionMessage *) message;
+  ShapeExtensionMessage *cachedShapeExtension = (ShapeExtensionMessage *) cachedMessage;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  for (int i = 0; i < 8 && (i * 2 + 4) < shapeExtension -> size_; i++)
+  {
+    #ifdef TEST
+    *logofs << name() << ": Encoding value " << shapeExtension -> data[i]
+            << " as data[" << i << "] field.\n" << logofs_flush;
+    #endif
+
+    encodeBuffer.encodeCachedValue((unsigned int) shapeExtension -> data[i], 16,
+                 *clientCache -> shapeDataCache[i]);
+
+    cachedShapeExtension -> data[i] = shapeExtension -> data[i];
+  }
+}
+
+void ShapeExtensionStore::updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                             ChannelCache *channelCache) const
+{
+  ShapeExtensionMessage *shapeExtension = (ShapeExtensionMessage *) message;
+
+  ClientCache *clientCache = (ClientCache *) channelCache;
+
+  unsigned int value;
+
+  for (int i = 0; i < 8 && (i * 2 + 4) < shapeExtension -> size_; i++)
+  {
+    decodeBuffer.decodeCachedValue(value, 16,
+                 *clientCache -> shapeDataCache[i]);
+
+    shapeExtension -> data[i] = (unsigned short) value;
+
+    #ifdef TEST
+    *logofs << name() << ": Decoded value " << shapeExtension -> data[i]
+            << " as data[" << i << "] field.\n" << logofs_flush;
+    #endif
+  }
+}
diff --git a/nxcomp/src/ShapeExtension.h b/nxcomp/src/ShapeExtension.h
new file mode 100644
index 000000000..4dd636847
--- /dev/null
+++ b/nxcomp/src/ShapeExtension.h
@@ -0,0 +1,164 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef ShapeExtension_H
+#define ShapeExtension_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+
+#define SHAPEEXTENSION_ENABLE_CACHE                       1
+#define SHAPEEXTENSION_ENABLE_DATA                        1
+#define SHAPEEXTENSION_ENABLE_SPLIT                       0
+
+#define SHAPEEXTENSION_DATA_LIMIT                         3200
+#define SHAPEEXTENSION_DATA_OFFSET                        20
+
+#define SHAPEEXTENSION_CACHE_SLOTS                        3000
+#define SHAPEEXTENSION_CACHE_THRESHOLD                    10
+#define SHAPEEXTENSION_CACHE_LOWER_THRESHOLD              5
+
+#define SHAPEEXTENSION_ENABLE_COMPRESS_IF_PROTO_STEP_7    0
+
+//
+// The message class.
+//
+
+class ShapeExtensionMessage : public Message
+{
+  friend class ShapeExtensionStore;
+
+  public:
+
+  ShapeExtensionMessage()
+  {
+  }
+
+  ~ShapeExtensionMessage()
+  {
+  }
+
+  //
+  // Note for encoding in protocol level 1: we consider
+  // for this message a data offset of 4. Bytes from 5
+  // to 20, if present, are taken as part of identity
+  // and encoded through an array of int caches.
+  //
+
+  private:
+
+  unsigned char  opcode;
+  unsigned short data[8];
+};
+
+class ShapeExtensionStore : public MessageStore
+{
+  public:
+
+  ShapeExtensionStore(StaticCompressor *compressor);
+
+  virtual ~ShapeExtensionStore();
+
+  virtual const char *name() const
+  {
+    return "ShapeExtension";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return opcode_;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(ShapeExtensionMessage);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  public:
+
+  virtual Message *create() const
+  {
+    return new ShapeExtensionMessage();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new ShapeExtensionMessage((const ShapeExtensionMessage &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (ShapeExtensionMessage *) message;
+  }
+
+  virtual int encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                                 const unsigned int size, int bigEndian,
+                                     ChannelCache *channelCache) const;
+
+  virtual int decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
+                                 unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
+                                     ChannelCache *channelCache) const;
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer,
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                  const Message *cachedMessage,
+                                      ChannelCache *channelCache) const;
+
+  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                  ChannelCache *channelCache) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+                                    unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+
+  private:
+
+  unsigned char opcode_;
+};
+
+#endif /* ShapeExtension_H */
diff --git a/nxcomp/src/Socket.cpp b/nxcomp/src/Socket.cpp
new file mode 100644
index 000000000..8be04d76d
--- /dev/null
+++ b/nxcomp/src/Socket.cpp
@@ -0,0 +1,757 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <sys/types.h>
+#include <sys/utsname.h>
+
+#if defined(__CYGWIN32__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__sun)
+#include <netinet/in_systm.h>
+#endif
+
+#ifdef __sun
+#include <unistd.h>
+#include <sys/termios.h>
+#endif
+
+#include <netinet/in.h>
+#include <netinet/ip.h>
+#include <netinet/tcp.h>
+#include <arpa/inet.h>
+
+#include <netdb.h>
+#include <fcntl.h>
+
+//
+// System specific defines.
+//
+
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__sun)
+#define SOL_IP  IPPROTO_IP
+#endif
+
+#ifdef __sun
+#define INADDR_NONE  ((unsigned int) -1)
+#endif
+
+//
+// The TIOCOUTQ ioctl is not implemented on Cygwin.
+// Note also that TIOCOUTQ and IPTOS_LOWDELAY are
+// disabled when running on MacOS/X.
+//
+
+#ifdef __CYGWIN32__
+#define TIOCOUTQ  ((unsigned int) -1)
+#endif
+
+//
+// NX includes.
+//
+
+#include "Misc.h"
+#include "Socket.h"
+
+//
+// Set verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+//
+// Set this only once by querying OS details.
+//
+
+static int _kernelStep = -1;
+
+int GetKernelStep()
+{
+  if (_kernelStep < 0)
+  {
+    //
+    // At the moment only NX clients run on Win32
+    // and MacOS/X so we are not really interested
+    // in the relevant OS dependent functions.
+    //
+
+    #if defined(__CYGWIN32__) || defined(__APPLE__)
+
+    _kernelStep = 0;
+
+    #else
+
+    struct utsname buffer;
+
+    if (uname(&buffer) < 0)
+    {
+      #ifdef WARNING
+      *logofs << "Socket: WARNING! Failed to get system info. Error is "
+              << EGET() << " '" << ESTR() << "'.\n" << logofs_flush;
+
+      *logofs << "Socket: WARNING! Assuming lowest system support.\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Warning" << ": Failed to get system info. Error is "
+           << EGET() << " '" << ESTR() << "'.\n";
+
+      cerr << "Warning" << ": Assuming lowest system support.\n";
+
+      _kernelStep = 0;
+    }
+    else
+    {
+      #ifdef TEST
+      *logofs << "Socket: System is '" << buffer.sysname
+              << "' nodename '" << buffer.nodename << "' release '"
+              << buffer.release << "'.\n" << logofs_flush;
+
+      *logofs << "Socket: Version is '" << buffer.version << "' machine '"
+              << buffer.machine << "'.\n" << logofs_flush;
+      #endif
+
+      //
+      // Should test support on other operating systems.
+      //
+
+      if (strcmp(buffer.sysname, "Linux") == 0)
+      {
+        if (strncmp(buffer.release, "2.0.", 4) == 0 ||
+                strncmp(buffer.release, "2.2.", 4) == 0)
+        {
+          #ifdef TEST
+          *logofs << "Socket: Assuming level 2 system support.\n"
+                  << logofs_flush;
+          #endif
+
+          _kernelStep = 2;
+        }
+        else
+        {
+          #ifdef TEST
+          *logofs << "Socket: Assuming level 3 system support.\n"
+                  << logofs_flush;
+          #endif
+
+          _kernelStep = 3;
+        }
+      }
+      else if (strcmp(buffer.sysname, "SunOS") == 0)
+      {
+        #ifdef TEST
+        *logofs << "Socket: Assuming level 1 system support.\n"
+                << logofs_flush;
+        #endif
+
+        _kernelStep = 1;
+      }
+      else
+      {
+        #ifdef TEST
+        *logofs << "Socket: Assuming level 0 system support.\n"
+                << logofs_flush;
+        #endif
+
+        _kernelStep = 0;
+      }
+    }
+
+    #endif /* #if defined(__CYGWIN32__) || defined(__APPLE__) */
+  }
+
+  return _kernelStep;
+}
+  
+int SetReuseAddress(int fd)
+{
+  int flag = 1;
+
+  if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR,
+                     (char *) &flag, sizeof(flag)) < 0)
+  {
+    #ifdef PANIC
+    *logofs << "Socket: PANIC! Failed to set SO_REUSEADDR flag on FD#"
+            << fd << ". Error is " << EGET() << " '" << ESTR() << "'.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Failed to set SO_REUSEADDR flag on FD#"
+            << fd << ". Error is " << EGET() << " '" << ESTR()
+            << "'.\n";
+
+    return -1;
+  }
+  #ifdef TEST
+  else
+  {
+    *logofs << "Socket: Set SO_REUSEADDR flag on FD#"
+            << fd << ".\n" << logofs_flush;
+  }
+  #endif
+
+  return 1;
+}
+
+int SetNonBlocking(int fd, int value)
+{
+  int flags = fcntl(fd, F_GETFL);
+
+  if (flags >= 0)
+  {
+    if (value == 0)
+    {
+      flags &= ~O_NONBLOCK;
+    }
+    else
+    {
+      flags |= O_NONBLOCK;
+    }
+  }
+
+  if (flags < 0 || fcntl(fd, F_SETFL, flags) < 0)
+  {
+    #ifdef PANIC
+    *logofs << "Socket: PANIC! Failed to set O_NONBLOCK flag on FD#"
+            << fd << " to " << value << ". Error is " << EGET()
+            << " '" << ESTR() << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Failed to set O_NONBLOCK flag on FD#"
+         << fd << " to " << value << ". Error is " << EGET()
+         << " '" << ESTR() << "'.\n";
+
+    return -1;
+  }
+  #ifdef TEST
+  else
+  {
+    *logofs << "Socket: Set O_NONBLOCK flag on FD#"
+            << fd << " to " << value << ".\n"
+            << logofs_flush;
+  }
+  #endif
+
+  return 1;
+}
+
+int SetLingerTimeout(int fd, int timeout)
+{
+  struct linger linger_value;
+
+  if (timeout > 0)
+  {
+    linger_value.l_onoff  = 1;
+    linger_value.l_linger = timeout;
+  }
+  else
+  {
+    linger_value.l_onoff  = 0;
+    linger_value.l_linger = 0;
+  }
+
+  if (setsockopt(fd, SOL_SOCKET, SO_LINGER, &linger_value, sizeof(linger_value)) < 0)
+  {
+    #ifdef PANIC
+    *logofs << "Socket: PANIC! Failed to set SO_LINGER values to "
+            << linger_value.l_onoff << " and " << linger_value.l_linger
+            << " on FD#" << fd << ". Error is " << EGET() << " '"
+            << ESTR() << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Failed to set SO_LINGER values to "
+         << linger_value.l_onoff << " and " << linger_value.l_linger
+         << " on FD#" << fd << ". Error is " << EGET() << " '"
+         << ESTR() << "'.\n";
+
+    return -1;
+  }
+  #ifdef TEST
+  else
+  {
+    *logofs << "Socket: Set SO_LINGER values to "
+            << linger_value.l_onoff << " and " << linger_value.l_linger
+            << " on FD#" << fd << ".\n" << logofs_flush;
+  }
+  #endif
+
+  return 1;
+}
+
+int SetSendBuffer(int fd, int size)
+{
+  if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &size, sizeof(size)) < 0)
+  {
+    #ifdef PANIC
+    *logofs << "Socket: PANIC! Failed to set SO_SNDBUF size to "
+            << size << " on FD#" << fd << ". Error is "
+            << EGET() << " '" << ESTR() << "'.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Failed to set SO_SNDBUF size to "
+         << size << " on FD#" << fd << ". Error is "
+         << EGET() << " '" << ESTR() << "'.\n";
+
+    return -1;
+  }
+  #ifdef TEST
+  else
+  {
+    *logofs << "Socket: Set SO_SNDBUF on FD#" << fd
+            << " to " << size << " bytes.\n"
+            << logofs_flush;
+  }
+  #endif
+
+  return 1;
+}
+
+int SetReceiveBuffer(int fd, int size)
+{
+  if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &size, sizeof(size)) < 0)
+  {
+    #ifdef PANIC
+    *logofs << "Socket: PANIC! Failed to set SO_RCVBUF size to "
+            << size << " on FD#" << fd << ". Error is "
+            << EGET() << " '" << ESTR() << "'.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Failed to set SO_RCVBUF size to "
+         << size << " on FD#" << fd << ". Error is "
+         << EGET() << " '" << ESTR() << "'.\n";
+
+    return -1;
+  }
+  #ifdef TEST
+  else
+  {
+    *logofs << "Socket: Set SO_RCVBUF on FD#" << fd
+            << " to " << size << " bytes.\n"
+            << logofs_flush;
+  }
+  #endif
+
+  return 1;
+}
+
+int SetNoDelay(int fd, int value)
+{
+  int result = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &value, sizeof(value));
+
+  if (result == 0)
+  {
+    result = 1;
+  }
+  else if (result < 0)
+  {
+    //
+    // Is it become a different error on
+    // Mac OSX 10.4?
+    //
+
+    #if defined(__APPLE__)
+
+    result = 0;
+
+    #endif
+
+    #if defined(__sun)
+
+    if (EGET() == ENOPROTOOPT)
+    {
+      result = 0;
+    }
+
+    #endif
+
+    #if !defined(__APPLE__) && !defined(__sun)
+
+    if (EGET() == EOPNOTSUPP)
+    {
+      result = 0;
+    }
+
+    #endif
+  }
+
+  if (result < 0)
+  {
+    #ifdef PANIC
+    *logofs << "Socket: PANIC! Failed to set TCP_NODELAY flag on "
+            << "FD#" << fd << " to " << value << ". Error is "
+            << EGET() << " '" << ESTR() << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Failed to set TCP_NODELAY flag on "
+         << "FD#" << fd << " to " << value << ". Error is "
+         << EGET() << " '" << ESTR() << "'.\n";
+  }
+  #ifdef TEST
+  else if (result == 0)
+  {
+    #ifdef TEST
+    *logofs << "Socket: Option TCP_NODELAY not supported "
+            << "on FD#" << fd << ".\n" << logofs_flush;
+    #endif
+  }
+  else
+  {
+    *logofs << "Socket: Set TCP_NODELAY flag on FD#"
+            << fd << " to " << value << ".\n"
+            << logofs_flush;
+  }
+  #endif
+
+  return result;
+}
+
+int SetKeepAlive(int fd)
+{
+  int flag = 1;
+
+  if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &flag, sizeof(flag)) < 0)
+  {
+    #ifdef PANIC
+    *logofs << "Socket: PANIC! Failed to set SO_KEEPALIVE flag on "
+            << "FD#" << fd << ". Error is " << EGET() << " '"
+            << ESTR() << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Failed to set SO_KEEPALIVE flag on "
+         << "FD#" << fd << ". Error is " << EGET() << " '"
+         << ESTR() << "'.\n";
+
+    return -1;
+  }
+  #ifdef TEST
+  else
+  {
+    *logofs << "Socket: Set SO_KEEPALIVE flag on FD#"
+            << fd << ".\n" << logofs_flush;
+  }
+  #endif
+
+  return 1;
+}
+
+int SetLowDelay(int fd)
+{
+  if (_kernelStep < 0)
+  {
+    GetKernelStep();
+  }
+
+  switch (_kernelStep)
+  {
+    case 3:
+    case 2:
+    case 1:
+    {
+      int flag = IPTOS_LOWDELAY;
+
+      if (setsockopt(fd, SOL_IP, IP_TOS, &flag, sizeof(flag)) < 0)
+      {
+        if (EGET() == EOPNOTSUPP)
+        {
+          #ifdef TEST
+          *logofs << "Socket: Option IPTOS_LOWDELAY not supported "
+                  << "on FD#" << fd << ".\n" << logofs_flush;
+          #endif
+
+          return 0;
+        }
+        else
+        {
+          #ifdef WARNING
+          *logofs << "Socket: WARNING! Failed to set IPTOS_LOWDELAY flag on "
+                  << "FD#" << fd << ". Error is " << EGET() << " '" << ESTR()
+                  << "'.\n" << logofs_flush;
+          #endif
+
+          cerr << "Warning" << ": Failed to set IPTOS_LOWDELAY flag on "
+               << "FD#" << fd << ". Error is " << EGET() << " '" << ESTR()
+               << "'.\n";
+
+          return -1;
+        }
+      }
+      #ifdef TEST
+      else
+      {
+        *logofs << "Socket: Set IPTOS_LOWDELAY flag on FD#"
+                << fd << ".\n" << logofs_flush;
+      }
+      #endif
+
+      return 1;
+    }
+    default:
+    {
+      #ifdef TEST
+      *logofs << "Socket: Option IPTOS_LOWDELAY not "
+              << "supported on FD#" << fd << ".\n"
+              << logofs_flush;
+      #endif
+
+      return 0;
+    }
+  }
+}
+
+int SetCloseOnExec(int fd)
+{
+  if (fcntl(fd, F_SETFD, 1) != 0)
+  {
+    #ifdef TEST
+    *logofs << "NXClient: PANIC! Cannot set close-on-exec "
+            << "on FD#" << fd << ". Error is " << EGET()
+            << " '" << ESTR() << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Cannot set close-on-exec on FD#"
+         << fd << ". Error is " << EGET() << " '" << ESTR()
+         << "'.\n";
+
+    return -1;
+  }
+
+  return 1;
+}
+
+int GetBytesReadable(int fd)
+{
+  long readable = 0;
+
+  //
+  // It may fail, for example at session
+  // shutdown.
+  //
+
+  if (ioctl(fd, FIONREAD, &readable) < 0)
+  {
+    #ifdef TEST
+    *logofs << "Socket: PANIC! Failed to get bytes readable "
+            << "from FD#" << fd << ". Error is " << EGET()
+            << " '" << ESTR() << "'.\n" << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  #ifdef TEST
+  *logofs << "Socket: Returning " << (int) readable
+          << " bytes readable on FD#" << fd << ".\n"
+           << logofs_flush;
+  #endif
+
+  return (int) readable;
+}
+
+int GetBytesWritable(int fd)
+{
+  if (_kernelStep < 0)
+  {
+    GetKernelStep();
+  }
+
+  long writable;
+
+  switch (_kernelStep)
+  {
+    case 3:
+    {
+      //
+      // TODO: Should query the real size
+      // of the TCP write buffer.
+      //
+
+      writable = 16384 - GetBytesQueued(fd);
+
+      if (writable < 0)
+      {
+        writable = 0;
+      }
+
+      break;
+    }
+    case 2:
+    {
+      if (ioctl(fd, TIOCOUTQ, (void *) &writable) < 0)
+      {
+        #ifdef PANIC
+        *logofs << "Socket: PANIC! Failed to get bytes writable "
+                << "on FD#" << fd << ". Error is " << EGET()
+                << " '" << ESTR() << "'.\n" << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Failed to get bytes writable "
+             << "on FD#" << fd << ". Error is " << EGET()
+             << " '" << ESTR() << "'.\n";
+
+        return -1;
+      }
+
+      break;
+    }
+    default:
+    {
+      #ifdef TEST
+      *logofs << "Socket: Option TIOCOUTQ not supported "
+              << "on FD#" << fd << ",\n" << logofs_flush;
+      #endif
+
+      //
+      // TODO: Should query the real size
+      // of the TCP write buffer.
+      //
+
+      writable = 16384;
+
+      break;
+    }
+  }
+
+  #ifdef TEST
+  *logofs << "Socket: Returning " << writable
+          << " bytes writable on FD#" << fd
+          << ".\n" << logofs_flush;
+  #endif
+
+  return (int) writable;
+}
+
+int GetBytesQueued(int fd)
+{
+  //
+  // The TIOCOUTQ ioctl is not implemented on Cygwin
+  // and returns the space available on Linux Kernels
+  // 2.0 and 2.2 (like current MIPS for PS/2).
+  //
+
+  if (_kernelStep < 0)
+  {
+    GetKernelStep();
+  }
+
+  long queued;
+
+  switch (_kernelStep)
+  {
+    case 3:
+    {
+      if (ioctl(fd, TIOCOUTQ, (void *) &queued) < 0)
+      {
+        #ifdef PANIC
+        *logofs << "Socket: PANIC! Failed to get bytes queued "
+                << "on FD#" << fd << ". Error is " << EGET()
+                << " '" << ESTR() << "'.\n" << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Failed to get bytes queued "
+             << "on FD#" << fd << ". Error is " << EGET()
+             << " '" << ESTR() << "'.\n";
+
+        return -1;
+      }
+
+      break;
+    }
+    case 2:
+    {
+      //
+      // TODO: Should query the real size
+      // of the TCP write buffer.
+      //
+
+      queued = 16384 - GetBytesWritable(fd);
+
+      if (queued < 0)
+      {
+        queued = 0;
+      }
+
+      break;
+    }
+    default:
+    {
+      #ifdef TEST
+      *logofs << "Socket: Option TIOCOUTQ not supported "
+              << "on FD#" << fd << ",\n" << logofs_flush;
+      #endif
+
+      queued = 0;
+
+      break;
+    }
+  }
+
+  #ifdef TEST
+  *logofs << "Socket: Returning " << queued
+          << " bytes queued on FD#" << fd
+          << ".\n" << logofs_flush;
+  #endif
+
+  return (int) queued;
+}
+
+int GetHostAddress(const char *name)
+{
+  hostent *host = gethostbyname(name);
+
+  if (host == NULL)
+  {
+    //
+    // On some Unices gethostbyname() doesn't
+    // accept IP addresses, so try inet_addr.
+    //
+
+    IN_ADDR_T address = inet_addr(name);
+
+    if (address == INADDR_NONE)
+    {
+      #ifdef PANIC
+      *logofs << "Socket: PANIC! Failed to resolve address of '"
+              << name << "'.\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Failed to resolve address of '"
+           << name << "'.\n";
+
+      return 0;
+    }
+
+    return (int) address;
+  }
+  else
+  {
+    return (*((int *) host -> h_addr_list[0]));
+  }
+}
diff --git a/nxcomp/src/Socket.h b/nxcomp/src/Socket.h
new file mode 100644
index 000000000..5e7e47705
--- /dev/null
+++ b/nxcomp/src/Socket.h
@@ -0,0 +1,96 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef Socket_H
+#define Socket_H
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+
+#ifdef __sun
+#include <stropts.h>
+#include <sys/filio.h>
+#endif
+
+//
+// Set socket options.
+//
+
+int SetReuseAddress(int fd);
+int SetNonBlocking(int fd, int value);
+int SetLingerTimeout(int fd, int timeout);
+int SetSendBuffer(int fd, int size);
+int SetReceiveBuffer(int fd, int size);
+int SetNoDelay(int fd, int value);
+int SetKeepAlive(int fd);
+int SetLowDelay(int fd);
+int SetCloseOnExec(int fd);
+
+//
+// Get kernel support level.
+//
+
+int GetKernelStep();
+
+//
+// Get socket info.
+//
+
+int GetBytesReadable(int fd);
+int GetBytesWritable(int fd);
+int GetBytesQueued(int fd);
+
+//
+// Inline version, providing direct access
+// to the interface.
+//
+
+#include "Misc.h"
+
+inline int GetBytesReadable(int fd, int *readable)
+{
+  long t;
+
+  int result = ioctl(fd, FIONREAD, &t);
+
+  #ifdef DEBUG
+  *logofs << "Socket: Bytes readable from FD#"
+          << fd << " are " << t << " with result "
+          << result << ".\n" << logofs_flush;
+  #endif
+
+  *readable = (int) t;
+
+  return result;
+}
+
+//
+// Query Internet address.
+//
+
+int GetHostAddress(const char *name);
+
+#endif /* Socket_H */
diff --git a/nxcomp/src/Split.cpp b/nxcomp/src/Split.cpp
new file mode 100644
index 000000000..e2fea97cc
--- /dev/null
+++ b/nxcomp/src/Split.cpp
@@ -0,0 +1,1839 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <unistd.h>
+#include <cstring>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <utime.h>
+
+#include "Misc.h"
+
+#include "Split.h"
+
+#include "Control.h"
+#include "Statistics.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+#include "StaticCompressor.h"
+
+#include "Unpack.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Define this to trace elements
+// allocated and deallocated.
+//
+
+#undef  REFERENCES
+
+//
+// Counters used for store control.
+//
+
+int SplitStore::totalSplitSize_;
+int SplitStore::totalSplitStorageSize_;
+
+//
+// This is used for reference count.
+//
+
+#ifdef REFERENCES
+
+int Split::references_ = 0;
+
+#endif
+
+Split::Split()
+{
+  resource_ = nothing;
+  position_ = nothing;
+
+  store_ = NULL;
+
+  d_size_ = 0;
+  i_size_ = 0;
+  c_size_ = 0;
+  r_size_ = 0;
+
+  next_ = 0;
+  load_ = 0;
+  save_ = 0;
+
+  checksum_ = NULL;
+  state_    = split_undefined;
+  mode_     = split_none;
+  action_   = is_discarded;
+
+  #ifdef REFERENCES
+
+  references_++;
+
+  *logofs << "Split: Created new Split at " 
+          << this << " out of " << references_ 
+          << " allocated references.\n" << logofs_flush;
+  #endif
+}
+
+Split::~Split()
+{
+  delete [] checksum_;
+
+  #ifdef REFERENCES
+
+  references_--;
+
+  *logofs << "Split: Deleted Split at " 
+          << this << " out of " << references_ 
+          << " allocated references.\n" << logofs_flush;
+  #endif
+}
+
+SplitStore::SplitStore(StaticCompressor *compressor, CommitStore *commits, int resource)
+
+  : compressor_(compressor), commits_(commits), resource_(resource)
+{
+  splits_ = new T_splits();
+
+  current_ = splits_ -> end();
+
+  splitStorageSize_ = 0;
+
+  #ifdef TEST
+  *logofs << "SplitStore: Created new store [";
+
+  if (resource_ != nothing)
+  {
+    *logofs << resource_;
+  }
+  else
+  {
+    *logofs << "commit";
+  }
+  
+  *logofs << "].\n" << logofs_flush;
+
+  *logofs << "SplitStore: Total messages in stores are "
+          << totalSplitSize_ << " with total storage size "
+          << totalSplitStorageSize_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+
+SplitStore::~SplitStore()
+{
+  totalSplitSize_ -= splits_ -> size();
+
+  totalSplitStorageSize_ -= splitStorageSize_;
+
+  for (T_splits::iterator i = splits_ -> begin();
+           i != splits_ -> end(); i++)
+  {
+    delete *i;
+  }
+
+  delete splits_;
+
+  #ifdef TEST
+  *logofs << "SplitStore: Deleted store [";
+
+  if (resource_ != nothing)
+  {
+    *logofs << resource_;
+  }
+  else
+  {
+    *logofs << "commit";
+  }
+  
+  *logofs << "] with storage size " << splitStorageSize_
+          << ".\n" << logofs_flush;
+
+  *logofs << "SplitStore: Total messages in stores are "
+          << totalSplitSize_ << " with total storage size "
+          << totalSplitStorageSize_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+
+//
+// This is called at the encoding side.
+//
+
+Split *SplitStore::add(MessageStore *store, int resource, T_split_mode mode,
+                           int position, T_store_action action, T_checksum checksum,
+                               const unsigned char *buffer, const int size)
+{
+  #ifdef TEST
+  *logofs << "SplitStore: Adding message [" << (unsigned int) store ->
+             opcode() << "] resource " << resource << " mode " << mode
+          << " position " << position << " action [" << DumpAction(action)
+          << "] and checksum [" << DumpChecksum(checksum) << "]"
+          << ".\n" << logofs_flush;
+  #endif
+
+  Split *split = new Split();
+
+  if (split == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "SplitStore: PANIC! Can't allocate "
+            << "memory for the split.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Can't allocate memory "
+         << "for the split.\n";
+
+    HandleAbort();
+  }
+
+  split -> store_    = store;
+  split -> resource_ = resource;
+  split -> mode_     = mode;
+  split -> position_ = position;
+  split -> action_   = action;
+
+  split -> store_ -> validateSize(size);
+
+  //
+  // The checksum is not provided if the
+  // message is cached.
+  //
+
+  if (checksum != NULL)
+  {
+    split -> checksum_ = new md5_byte_t[MD5_LENGTH];
+
+    memcpy(split -> checksum_, checksum, MD5_LENGTH);
+  }
+
+  //
+  // We don't need the identity data at the
+  // encoding side. This qualifies the split
+  // as a split generated at the encoding
+  // side.
+  //
+
+  split -> i_size_ = store -> identitySize(buffer, size);
+
+  split -> d_size_ = size - split -> i_size_;
+
+  if (action == IS_ADDED || action == is_discarded)
+  {
+    //
+    // If the message was added to message
+    // store or discarded we need to save
+    // the real data so we can transfer it
+    // at later time.
+    //
+
+    split -> data_.resize(split -> d_size_);
+
+    memcpy(split -> data_.begin(), buffer + split -> i_size_, split -> d_size_);
+
+    //
+    // If the message was added, lock it so
+    // it will not be used by the encoding
+    // side until it is recomposed.
+    //
+
+    if (action == IS_ADDED)
+    {
+      split -> store_ -> lock(split -> position_);
+
+      #ifdef TEST
+
+      commits_ -> validate(split);
+
+      #endif
+    }
+  }
+  #ifdef WARNING
+  else
+  {
+    *logofs << "SplitStore: WARNING! Not copying data for the cached message.\n"
+            << logofs_flush;
+  }
+  #endif
+
+  push(split);
+
+  return split;
+}
+
+//
+// This is called at decoding side. If checksum
+// is provided, the message can be searched on
+// disk, then, if message is found, an event is
+// sent to abort the data transfer.
+//
+
+Split *SplitStore::add(MessageStore *store, int resource, int position,
+                           T_store_action action, T_checksum checksum,
+                               unsigned char *buffer, const int size)
+{
+  #ifdef TEST
+  *logofs << "SplitStore: Adding message ["
+          << (unsigned int) store -> opcode() << "] resource "
+          << resource << " position " << position << " action ["
+          << DumpAction(action) << "] and checksum ["
+          << DumpChecksum(checksum) << "].\n" << logofs_flush;
+  #endif
+
+  Split *split = new Split();
+
+  if (split == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "SplitStore: PANIC! Can't allocate "
+            << "memory for the split.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Can't allocate memory "
+         << "for the split.\n";
+
+    HandleAbort();
+  }
+
+  split -> store_    = store;
+  split -> resource_ = resource;
+  split -> position_ = position;
+  split -> action_   = action;
+
+  split -> store_ -> validateSize(size);
+
+  //
+  // Check if the checksum was provided
+  // by the remote.
+  //
+
+  if (checksum != NULL)
+  {
+    split -> checksum_ = new md5_byte_t[MD5_LENGTH];
+
+    memcpy(split -> checksum_, checksum, MD5_LENGTH);
+  }
+
+  split -> i_size_ = store -> identitySize(buffer, size);
+
+  //
+  // Copy the identity so we can expand the
+  // message when it is committed.
+  //
+
+  split -> identity_.resize(split -> i_size_);
+
+  memcpy(split -> identity_.begin(), buffer, split -> i_size_);
+
+  split -> d_size_ = size - split -> i_size_;
+
+  if (action == IS_ADDED || action == is_discarded)
+  {
+    //
+    // The unpack procedure will check if the
+    // first 2 bytes of the buffer contain the
+    // pattern and will not try to expand the
+    // image.
+    //
+
+    split -> data_.resize(2);
+
+    unsigned char *data = split -> data_.begin();
+
+    data[0] = SPLIT_PATTERN;
+    data[1] = SPLIT_PATTERN;
+
+    //
+    // If the message was added to the store,
+    // we don't have the data part, yet, so
+    // we need to lock the message until it
+    // is recomposed.
+    //
+
+    if (action == IS_ADDED)
+    {
+      split -> store_ -> lock(split -> position_);
+
+      #ifdef TEST
+
+      commits_ -> validate(split);
+
+      #endif
+    }
+  }
+  else
+  {
+    #ifdef WARNING
+    *logofs << "SplitStore: WARNING! Copying data for the cached message.\n"
+            << logofs_flush;
+    #endif
+
+    //
+    // We may optionally take the data from the
+    // message store in compressed form, but,
+    // as the data has been decompressed in the
+    // buffer, we save a further decompression.
+    //
+
+    split -> data_.resize(split -> d_size_);
+
+    memcpy(split -> data_.begin(), buffer + split -> i_size_, split -> d_size_);
+  }
+
+  push(split);
+
+  return split;
+}
+
+void SplitStore::push(Split *split)
+{
+  splits_ -> push_back(split);
+
+  splitStorageSize_ += getNodeSize(split);
+
+  totalSplitSize_++;
+
+  totalSplitStorageSize_ += getNodeSize(split);
+
+  statistics -> addSplit();
+
+  #ifdef TEST
+  *logofs << "SplitStore: There are " << splits_ -> size()
+          << " messages in store [" << resource_ << "] with "
+          << "storage size " << splitStorageSize_ << ".\n"
+          << logofs_flush;
+
+  *logofs << "SplitStore: Total messages in stores are "
+          << totalSplitSize_ << " with total storage size "
+          << totalSplitStorageSize_ << ".\n"
+          << logofs_flush;
+  #endif
+
+  split -> state_ = split_added;
+}
+
+void SplitStore::dump()
+{
+  #ifdef DUMP
+
+  int n;
+
+  Split *split;
+
+  *logofs << "SplitStore: DUMP! Dumping content of ";
+
+  if (commits_ == NULL)
+  {
+    *logofs << "[commits]";
+  }
+  else
+  {
+    *logofs << "[splits] for store [" << resource_ << "]";
+  }
+
+  *logofs << " with [" << getSize() << "] elements "
+          << "in the store.\n" << logofs_flush;
+
+  n = 0;
+
+  for (T_splits::iterator i = splits_ -> begin(); i != splits_ -> end(); i++, n++)
+  {
+    split = *i;
+
+    *logofs << "SplitStore: DUMP! Split [" << n << "] has action ["
+            << DumpAction(split -> action_) << "] state ["
+            << DumpState(split -> state_) << "] ";
+
+    if (split -> resource_ >= 0)
+    {
+      *logofs << "resource " << split -> resource_;
+    }
+
+    *logofs << " request " << (unsigned) split -> store_ -> opcode()
+            << " position " << split -> position_ << " size is "
+            << split -> data_.size() << " (" << split -> d_size_
+            << "/" << split -> c_size_ << "/" << split -> r_size_
+            << ") with " << split -> data_.size() - split -> next_
+            << "] bytes to go.\n" << logofs_flush;
+  }
+
+  #endif
+}
+
+int SplitStore::send(EncodeBuffer &encodeBuffer, int packetSize)
+{
+  if (splits_ -> size() == 0)
+  {
+    #ifdef PANIC
+    *logofs << "SplitStore: PANIC! Function send called with no splits available.\n" 
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Function send called with no splits available.\n";
+
+    HandleAbort();
+  }
+
+  //
+  // A start operation must always be executed on
+  // the split, even in the case the split will be
+  // later aborted.
+  // 
+
+  if (current_ == splits_ -> end())
+  {
+    start(encodeBuffer);
+  }
+
+  //
+  // If we have matched the checksum received from
+  // the remote side then we must abort the current
+  // split, else we can send another block of data
+  // to the remote peer.
+  //
+
+  Split *split = *current_;
+
+  unsigned int abort = 0;
+
+  if (split -> state_ == split_loaded)
+  {
+    abort = 1;
+  }
+
+  encodeBuffer.encodeBoolValue(abort);
+
+  if (abort == 1)
+  {
+    #ifdef TEST
+    *logofs << "SplitStore: Aborting split for checksum ["
+            << DumpChecksum(split -> checksum_) << "] position "
+            << split -> position_ << " with " << (split ->
+               data_.size() - split -> next_) << " bytes to go "
+            << "out of " << split -> data_.size()
+            << ".\n" << logofs_flush;
+    #endif
+
+    statistics -> addSplitAborted();
+
+    statistics -> addSplitAbortedBytesOut(split -> data_.size() - split -> next_);
+
+    split -> next_ = split -> data_.size();
+
+    split -> state_ = split_aborted;
+  }
+  else
+  {
+    int count = (packetSize <= 0 || split -> next_ +
+                     packetSize > (int) split -> data_.size() ?
+                         split -> data_.size() - split -> next_ : packetSize);
+
+    #ifdef TEST
+    *logofs << "SplitStore: Sending split for checksum ["
+            << DumpChecksum(split -> checksum_) << "] count "
+            << count << " position " << split -> position_
+            << ". Data size is " << split -> data_.size() << " ("
+            << split -> d_size_ << "/" << split -> c_size_ << "), "
+            << split -> data_.size() - (split -> next_ + count)
+            << " to go.\n" << logofs_flush;
+    #endif
+
+    encodeBuffer.encodeValue(count, 32, 10);
+
+    encodeBuffer.encodeMemory(split -> data_.begin() + split -> next_, count);
+
+    split -> next_ += count;
+  }
+
+  //
+  // Was data completely transferred? We are the
+  // sending side. We must update the message in
+  // store, even if split was aborted.
+  //
+
+  if (split -> next_ != ((int) split -> data_.size()))
+  {
+    return 0;
+  }
+
+  //
+  // Move the split at the head of the
+  // list to the commits.
+  //
+
+  remove(split);
+
+  //
+  // Reset current position to the
+  // end of repository.
+  //
+
+  current_ = splits_ -> end();
+
+  #ifdef TEST
+  *logofs << "SplitStore: Removed split at head of the list. "
+          << "Resource is " << split -> resource_ << " request "
+          << (unsigned) split -> store_ -> opcode() << " position "
+          << split -> position_ << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int SplitStore::start(EncodeBuffer &encodeBuffer)
+{
+  //
+  // Get the element at the top of the
+  // list.
+  //
+
+  current_ = splits_ -> begin();
+
+  Split *split = *current_;
+
+  #ifdef TEST
+  *logofs << "SplitStore: Starting split for checksum ["
+          << DumpChecksum(split -> checksum_) << "] position "
+          << split -> position_ << " with " << (split ->
+             data_.size() - split -> next_) << " bytes to go "
+          << "out of " << split -> data_.size()
+          << ".\n" << logofs_flush;
+  #endif
+
+  //
+  // See if compression of the data part is
+  // enabled.
+  //
+
+  if (split -> store_ -> enableCompress)
+  {
+    //
+    // If the split is going to be aborted don't
+    // compress the data and go straight to the
+    // send. The new data size will be assumed
+    // from the disk cache.
+    //
+
+    if (split -> state_ != split_loaded)
+    {
+      unsigned int compressedSize = 0;
+      unsigned char *compressedData = NULL;
+
+      if (control -> LocalDataCompression &&
+              (compressor_ -> compressBuffer(split -> data_.begin(), split -> d_size_,
+                                                 compressedData, compressedSize)))
+      {
+        //
+        // Replace the data with the one in
+        // compressed form.
+        //
+
+        #ifdef TEST
+        *logofs << "SplitStore: Split data of size " << split -> d_size_
+                << " has been compressed to " << compressedSize 
+                << " bytes.\n" << logofs_flush;
+        #endif
+
+        split -> data_.clear();
+
+        split -> data_.resize(compressedSize);
+
+        memcpy(split -> data_.begin(), compressedData, compressedSize);
+
+        split -> c_size_ = compressedSize;
+
+        //
+        // Inform our peer that the data is
+        // compressed and send the new size.
+        //
+
+        encodeBuffer.encodeBoolValue(1);
+
+        encodeBuffer.encodeValue(compressedSize, 32, 14);
+
+        #ifdef TEST
+        *logofs << "SplitStore: Signaled " << split -> c_size_
+                << " bytes of compressed data for this message.\n"
+                << logofs_flush;
+        #endif
+
+        return 1;
+      }
+    }
+    #ifdef TEST
+    else
+    {
+      *logofs << "SplitStore: Not trying to compress the "
+              << "loaded message.\n" << logofs_flush;
+    }
+    #endif
+
+    //
+    // Tell to the remote that data will
+    // follow uncompressed.
+    //
+
+    encodeBuffer.encodeBoolValue(0);
+  }
+
+  return 1;
+}
+
+int SplitStore::start(DecodeBuffer &decodeBuffer)
+{
+  #ifdef TEST
+  *logofs << "SplitStore: Going to receive a new split from the remote side.\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // Get the element at the head
+  // of the list.
+  //
+
+  current_ = splits_ -> begin();
+
+  Split *split = *current_;
+
+  unsigned int compressedSize = 0;
+
+  //
+  // Save the data size known by the remote.
+  // This information will be needed if the
+  // remote will not have a chance to abort
+  // the split.
+  //
+
+  split -> r_size_ = split -> d_size_;
+
+  //
+  // Find out if data was compressed by the
+  // remote.
+  //
+
+  if (split -> store_ -> enableCompress)
+  {
+    decodeBuffer.decodeBoolValue(compressedSize);
+
+    if (compressedSize == 1)
+    {
+      //
+      // Get the compressed size.
+      //
+
+      // Since ProtoStep7 (#issue 108)
+      decodeBuffer.decodeValue(compressedSize, 32, 14);
+
+      split -> store_ -> validateSize(split -> d_size_, compressedSize);
+
+      split -> r_size_ = compressedSize;
+    }
+  }
+
+  //
+  // Update the size if the split
+  // was not already loaded.
+  //
+
+  if (split -> state_ != split_loaded)
+  {
+    split -> data_.clear();
+
+    if (compressedSize > 0)
+    {
+      split -> c_size_ = compressedSize;
+
+      #ifdef TEST
+      *logofs << "SplitStore: Split data of size "
+              << split -> d_size_ << " was compressed to "
+              << split -> c_size_ << " bytes.\n"
+              << logofs_flush;
+      #endif
+
+      split -> data_.resize(split -> c_size_);
+    }
+    else
+    {
+      split -> data_.resize(split -> d_size_);
+    }
+
+    unsigned char *data = split -> data_.begin();
+
+    data[0] = SPLIT_PATTERN;
+    data[1] = SPLIT_PATTERN;
+  }
+  #ifdef TEST
+  else
+  {
+    //
+    // The message had been already
+    // loaded from disk.
+    //
+
+    if (compressedSize > 0)
+    {
+      if ((int) compressedSize != split -> c_size_)
+      {
+        *logofs << "SplitStore: WARNING! Compressed data size is "
+                << "different than the loaded compressed size.\n"
+                << logofs_flush;
+      }
+
+      *logofs << "SplitStore: Ignoring the new size with "
+              << "loaded compressed size " << split -> c_size_
+              << ".\n" << logofs_flush;
+    }
+  }
+  #endif
+
+  return 1;
+}
+
+int SplitStore::receive(DecodeBuffer &decodeBuffer)
+{
+  if (splits_ -> size() == 0)
+  {
+    #ifdef PANIC
+    *logofs << "SplitStore: PANIC! Function receive called with no splits available.\n" 
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Function receive called with no splits available.\n";
+
+    HandleAbort();
+  }
+
+  if (current_ == splits_ -> end())
+  {
+    start(decodeBuffer);
+  }
+
+  //
+  // Check first if split was aborted, else add
+  // any new data to message being recomposed.
+  //
+
+  Split *split = *current_;
+
+  unsigned int abort = 0;
+
+  decodeBuffer.decodeBoolValue(abort);
+
+  if (abort == 1)
+  {
+    #ifdef TEST
+    *logofs << "SplitStore: Aborting split for checksum ["
+            << DumpChecksum(split -> checksum_) << "] position "
+            << split -> position_ << " with " << (split ->
+               data_.size() - split -> next_) << " bytes to go "
+            << "out of " << split -> data_.size()
+            << ".\n" << logofs_flush;
+    #endif
+
+    statistics -> addSplitAborted();
+
+    statistics -> addSplitAbortedBytesOut(split -> r_size_ - split -> next_);
+
+    split -> next_ = split -> r_size_;
+
+    split -> state_ = split_aborted;
+  }
+  else
+  {
+    //
+    // Get the size of the packet.
+    //
+
+    unsigned int count;
+
+    decodeBuffer.decodeValue(count, 32, 10);
+
+    //
+    // If the split was not already loaded from
+    // disk, decode the packet and update our
+    // copy of the data. The encoding side may
+    // have not received the abort event, yet,
+    // and may be unaware that the message is
+    // stored in compressed form at our side.
+    //
+
+    #ifdef TEST
+    *logofs << "SplitStore: Receiving split for checksum ["
+            << DumpChecksum(split -> checksum_) << "] count "
+            << count << " position " << split -> position_
+            << ". Data size is " << split -> data_.size() << " ("
+            << split -> d_size_ << "/" << split -> c_size_ << "/"
+            << split -> r_size_ << "), " << split -> r_size_ -
+               (split -> next_ + count) << " to go.\n"
+            << logofs_flush;
+    #endif
+
+    if (split -> next_ + count > (unsigned) split -> r_size_)
+    {
+      #ifdef PANIC
+      *logofs << "SplitStore: PANIC! Invalid data count "
+              << count << "provided in the split.\n"
+              << logofs_flush;
+
+      *logofs << "SplitStore: PANIC! While receiving split for "
+              << "checksum [" << DumpChecksum(split -> checksum_)
+              << "] with count " << count << " action ["
+              << DumpAction(split -> action_) << "] state ["
+              << DumpState(split -> state_) << "]. Data size is "
+              << split -> data_.size() << " (" << split -> d_size_
+              << "/" << split -> c_size_ << "), " << split ->
+                 data_.size() - (split -> next_ + count)
+              << " to go.\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Invalid data count "
+           << count << "provided in the split.\n";
+
+      HandleAbort();
+    }
+
+    if (split -> state_ != split_loaded)
+    {
+      #ifdef TEST
+
+      if (split -> next_ + count > split -> data_.size())
+      {
+        #ifdef PANIC
+        *logofs << "SplitStore: PANIC! Inconsistent split data size "
+                << split -> data_.size() << " with expected size "
+                << split -> r_size_ << ".\n"
+               << logofs_flush;
+        #endif
+
+        HandleAbort();
+      }
+
+      #endif
+
+      memcpy(split -> data_.begin() + split -> next_, 
+                 decodeBuffer.decodeMemory(count), count);
+    }
+    else
+    {
+      #ifdef TEST
+      *logofs << "SplitStore: WARNING! Data discarded with split "
+              << "loaded from disk.\n" << logofs_flush;
+      #endif
+
+      decodeBuffer.decodeMemory(count);
+    }
+
+    split -> next_ += count;
+  }
+
+  //
+  // Is unsplit complete?
+  //
+
+  if (split -> next_ != split -> r_size_)
+  {
+    return 0;
+  }
+
+  //
+  // If the persistent cache is enabled,
+  // we have a valid checksum and the
+  // split was not originally retrieved
+  // from disk, save the message on disk.
+  //
+
+  if (split -> state_ != split_loaded &&
+          split -> state_ != split_aborted)
+  {
+    save(split);
+  }
+
+  //
+  // Move the split at the head of the
+  // list to the commits.
+  //
+
+  remove(split);
+
+  //
+  // Reset the current position to the
+  // end of the repository.
+  //
+
+  current_ = splits_ -> end();
+
+  #ifdef TEST
+  *logofs << "SplitStore: Removed split at head of the list. "
+          << "Resource is " << split -> resource_ << " request "
+          << (unsigned) split -> store_ -> opcode() << " position "
+          << split -> position_ << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+Split *SplitStore::pop()
+{
+  if (splits_ -> size() == 0)
+  {
+    #ifdef TEST
+    *logofs << "SplitStore: The split store is empty.\n"
+            << logofs_flush;
+    #endif
+
+    return NULL;
+  }
+
+  //
+  // Move the pointer at the end of the list.
+  // The next send operation will eventually
+  // start a new split.
+  // 
+
+  current_ = splits_ -> end();
+
+  Split *split = *(splits_ -> begin());
+
+  splits_ -> pop_front();
+
+  #ifdef TEST
+  *logofs << "SplitStore: Removed split at the head of the "
+          << "list with resource " << split -> resource_
+          << " request " << (unsigned) split -> store_ ->
+             opcode() << " position " << split -> position_
+          << ".\n" << logofs_flush;
+  #endif
+
+  splitStorageSize_ -= getNodeSize(split);
+
+  totalSplitSize_--;
+
+  totalSplitStorageSize_ -= getNodeSize(split);
+
+  #ifdef TEST
+  *logofs << "SplitStore: There are " << splits_ -> size()
+          << " messages in store [" << resource_ << "] with "
+          << "storage size " << splitStorageSize_ << ".\n"
+          << logofs_flush;
+
+  *logofs << "SplitStore: Total messages in stores are "
+          << totalSplitSize_ << " with total storage size "
+          << totalSplitStorageSize_ << ".\n"
+          << logofs_flush;
+  #endif
+
+  return split;
+}
+
+void SplitStore::remove(Split *split)
+{
+  #ifdef TEST
+  *logofs << "SplitStore: Going to remove the split from the list.\n"
+          << logofs_flush;
+  #endif
+
+  #ifdef TEST
+
+  if (split != getFirstSplit())
+  {
+    #ifdef PANIC
+    *logofs << "SplitStore: PANIC! Trying to remove a split "
+            << "not at the head of the list.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Trying to remove a split "
+         << "not at the head of the list.\n";
+
+    HandleAbort();
+  }
+
+  #endif
+
+  //
+  // Move the split to the commit store.
+  //
+
+  splits_ -> pop_front();
+
+  commits_ -> splits_ -> push_back(split);
+
+  splitStorageSize_ -= getNodeSize(split);
+
+  totalSplitSize_--;
+
+  totalSplitStorageSize_ -= getNodeSize(split);
+
+  #ifdef TEST
+  *logofs << "SplitStore: There are " << splits_ -> size()
+          << " messages in store [" << resource_ << "] with "
+          << "storage size " << splitStorageSize_ << ".\n"
+          << logofs_flush;
+
+  *logofs << "SplitStore: Total messages in stores are "
+          << totalSplitSize_ << " with total storage size "
+          << totalSplitStorageSize_ << ".\n"
+          << logofs_flush;
+  #endif
+
+  #ifdef TEST
+
+  if (splits_ -> size() == 0)
+  {
+    if (splitStorageSize_ != 0)
+    {
+      #ifdef PANIC
+      *logofs << "SplitStore: PANIC! Internal error calculating "
+              << "split data size. It is " << splitStorageSize_ 
+              << " while should be 0.\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Internal error calculating "
+           << "split data size. It is " << splitStorageSize_
+           << " while should be 0.\n";
+
+      HandleAbort();
+    }
+  }
+
+  #endif
+}
+
+const char *SplitStore::name(const T_checksum checksum)
+{
+  if (checksum == NULL)
+  {
+    return NULL;
+  }
+
+  char *pathName = control -> ImageCachePath;
+
+  if (pathName == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "SplitStore: PANIC! Cannot determine directory of "
+            << "NX image files.\n" << logofs_flush;
+    #endif
+
+    return NULL;
+  }
+
+  int pathSize = strlen(pathName);
+
+  //
+  // File name is "[path][/I-c/I-][checksum][\0]",
+  // where c is the first hex digit of checksum.
+  //
+
+  int nameSize = pathSize + 7 + MD5_LENGTH * 2 + 1;
+
+  char *fileName = new char[nameSize];
+
+  if (fileName == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "SplitStore: PANIC! Cannot allocate space for "
+            << "NX image file name.\n" << logofs_flush;
+    #endif
+
+    return NULL;
+  }
+
+  strcpy(fileName, pathName);
+
+  sprintf(fileName + pathSize, "/I-%1X/I-",
+              *((unsigned char *) checksum) >> 4);
+
+  for (unsigned int i = 0; i < MD5_LENGTH; i++)
+  {
+    sprintf(fileName + pathSize + 7 + (i * 2), "%02X",
+                ((unsigned char *) checksum)[i]);
+  }
+
+  return fileName;
+}
+
+int SplitStore::save(Split *split)
+{
+  //
+  // Check if saving the message on the
+  // persistent cache is enabled.
+  //
+
+  if (split -> save_ == 0)
+  {
+    return 0;
+  }
+
+  T_checksum checksum = split -> checksum_;
+
+  const char *fileName = name(checksum);
+
+  if (fileName == NULL)
+  {
+    return 0;
+  }
+
+  unsigned int splitSize;
+
+  ostream *fileStream = NULL;
+
+  unsigned char *fileHeader = NULL;
+
+  //
+  // Get the other data from the split.
+  //
+
+  unsigned char opcode = split -> store_ -> opcode();
+
+  unsigned char *data = split -> data_.begin();
+
+  int dataSize = split -> d_size_;
+  int compressedSize = split -> c_size_;
+
+  #ifdef DEBUG
+  *logofs << "SplitStore: Going to save split OPCODE#"
+          << (unsigned int) opcode << " to file '" << fileName
+          << "' with size " << dataSize << " and compressed size "
+          << compressedSize << ".\n" << logofs_flush;
+  #endif
+
+  DisableSignals();
+
+  //
+  // Change the mask to make the file only
+  // readable by the user, then restore the
+  // old mask.
+  //
+
+  mode_t fileMode;
+
+  //
+  // Check if the file already exists. We try to
+  // load the message when the split is started
+  // and save it only if it is not found. Still
+  // the remote side may send the same image mul-
+  // tiple time and we may not have the time to
+  // notify the abort.
+  //
+
+  struct stat fileStat;
+
+  if (stat(fileName, &fileStat) == 0)
+  {
+    #ifdef TEST
+    *logofs << "SplitStore: Image file '" << fileName
+            << "' already present on disk.\n"
+            << logofs_flush;
+    #endif
+
+    goto SplitStoreSaveError;
+  }
+
+  fileMode = umask(0077);
+
+  fileStream = new ofstream(fileName, ios::out | ios::binary);
+
+  umask(fileMode);
+
+  if (CheckData(fileStream) < 0)
+  {
+    #ifdef PANIC
+    *logofs << "SplitStore: PANIC! Cannot open file '" << fileName
+            << "' for output.\n" << logofs_flush;
+    #endif
+
+    goto SplitStoreSaveError;
+  }
+
+  fileHeader = new unsigned char[SPLIT_HEADER_SIZE];
+
+  if (fileHeader == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "SplitStore: PANIC! Cannot allocate space for "
+            << "NX image header.\n" << logofs_flush;
+    #endif
+
+    goto SplitStoreSaveError;
+  }
+
+  //
+  // Leave 3 bytes for future use. Please note
+  // that, on some CPUs, we can't use PutULONG()
+  // to write integers that are not aligned to
+  // the word boundary.
+  //
+
+  *fileHeader = opcode;
+
+  *(fileHeader + 1) = 0;
+  *(fileHeader + 2) = 0;
+  *(fileHeader + 3) = 0;
+
+  PutULONG(dataSize, fileHeader + 4, false);
+  PutULONG(compressedSize, fileHeader + 8, false);
+
+  splitSize = (compressedSize > 0 ? compressedSize : dataSize);
+
+  if (PutData(fileStream, fileHeader, SPLIT_HEADER_SIZE) < 0 ||
+          PutData(fileStream, data, splitSize) < 0)
+  {
+    #ifdef PANIC
+    *logofs << "SplitStore: PANIC! Cannot write to NX "
+            << "image file '" << fileName << "'.\n"
+            << logofs_flush;
+    #endif
+
+    goto SplitStoreSaveError;
+  }
+
+  //
+  // Check if all the data was written on the
+  // disk and, if not, remove the faulty copy.
+  //
+
+  FlushData(fileStream);
+
+  if (CheckData(fileStream) < 0)
+  {
+    #ifdef PANIC
+    *logofs << "SplitStore: PANIC! Failed to write NX "
+            << "image file '" << fileName << "'.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Warning" << ": Failed to write NX "
+         << "image file '" << fileName << "'.\n";
+
+    goto SplitStoreSaveError;
+  }
+
+  #ifdef TEST
+  *logofs << "SplitStore: Saved split to file '" << fileName
+          << "' with data size " << dataSize << " and "
+          << "compressed data size " << compressedSize
+          << ".\n" << logofs_flush;
+  #endif
+
+  delete fileStream;
+
+  delete [] fileName;
+  delete [] fileHeader;
+
+  EnableSignals();
+
+  //
+  // Update the timestamp as the operation
+  // may have taken some time.
+  //
+
+  getNewTimestamp();
+
+  return 1;
+
+SplitStoreSaveError:
+
+  delete fileStream;
+
+  if (fileName != NULL)
+  {
+    unlink(fileName);
+  }
+
+  delete [] fileName;
+  delete [] fileHeader;
+
+  EnableSignals();
+
+  return -1;
+}
+
+int SplitStore::find(Split *split)
+{
+  const char *fileName = name(split -> checksum_);
+
+  if (fileName == NULL)
+  {
+    return 0;
+  }
+
+  #ifdef DEBUG
+  *logofs << "SplitStore: Going to find split OPCODE#"
+          << (unsigned) split -> store_ -> opcode()
+          << " in file '" << fileName << "'.\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // Check if the file exists and, at the
+  // same time, update the modification
+  // time to prevent its deletion.
+  //
+
+  if (utime(fileName, NULL) == 0)
+  {
+    #ifdef TEST
+    *logofs << "SplitStore: Found split OPCODE#"
+            << (unsigned) split -> store_ -> opcode()
+            << " in file '" << fileName << "'.\n"
+            << logofs_flush;
+    #endif
+
+    delete [] fileName;
+
+    return 1;
+  }
+
+  #ifdef TEST
+  *logofs << "SplitStore: WARNING! Can't find split "
+          << "OPCODE#" << (unsigned) split -> store_ ->
+             opcode() << " in file '" << fileName
+          << "'.\n" << logofs_flush;
+  #endif
+
+  delete [] fileName;
+
+  return 0;
+}
+
+int SplitStore::load(Split *split)
+{
+  //
+  // Check if loading the image is enabled.
+  //
+
+  if (split -> load_ == 0)
+  {
+    return 0;
+  }
+
+  const char *fileName = name(split -> checksum_);
+
+  if (fileName == NULL)
+  {
+    return 0;
+  }
+
+  unsigned char fileOpcode;
+
+  int fileSize;
+  int fileCSize;
+
+  istream *fileStream = NULL;
+
+  unsigned char *fileHeader = NULL;
+
+  DisableSignals();
+
+  #ifdef DEBUG
+  *logofs << "SplitStore: Going to load split OPCODE#"
+          << (unsigned int) split -> store_ -> opcode()
+          << " from file '" << fileName << "'.\n"
+          << logofs_flush;
+  #endif
+
+  fileStream = new ifstream(fileName, ios::in | ios::binary);
+
+  if (CheckData(fileStream) < 0)
+  {
+    #ifdef TEST
+    *logofs << "SplitStore: WARNING! Can't open image file '"
+            << fileName  << "' on disk.\n" << logofs_flush;
+    #endif
+
+    goto SplitStoreLoadError;
+  }
+
+  fileHeader = new unsigned char[SPLIT_HEADER_SIZE];
+
+  if (fileHeader == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "SplitStore: PANIC! Cannot allocate space for "
+            << "NX image header.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Cannot allocate space for "
+         << "NX image header.\n";
+
+    goto SplitStoreLoadError;
+  }
+
+  if (GetData(fileStream, fileHeader, SPLIT_HEADER_SIZE) < 0)
+  {
+    #ifdef PANIC
+    *logofs << "SplitStore: PANIC! Cannot read header from "
+            << "NX image file '" << fileName << "'.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Warning" << ": Cannot read header from "
+         << "NX image file '" << fileName << "'.\n";
+
+    goto SplitStoreLoadError;
+  }
+
+  fileOpcode = *fileHeader;
+
+  fileSize  = GetULONG(fileHeader + 4, false);
+  fileCSize = GetULONG(fileHeader + 8, false);
+
+  //
+  // Don't complain if we find that data was saved
+  // in compressed form even if we were not aware
+  // of the compressed data size. The remote side
+  // compresses the data only at the time it starts
+  // the transferral of the split. We replace our
+  // copy of the data with whatever we find on the
+  // disk.
+  //
+
+  if (fileOpcode != split -> store_ -> opcode() ||
+          fileSize != split -> d_size_ ||
+              fileSize > control -> MaximumRequestSize ||
+                  fileCSize > control -> MaximumRequestSize)
+
+  {
+    #ifdef TEST
+    *logofs << "SplitStore: PANIC! Corrupted image file '" << fileName
+            << "'. Expected " << (unsigned int) split -> store_ -> opcode()
+            << "/" << split -> d_size_ << "/" << split -> c_size_ << " found "
+            << (unsigned int) fileOpcode << "/" << fileSize << "/"
+            << fileCSize << ".\n" << logofs_flush;
+    #endif
+
+    cerr << "Warning" << ": Corrupted image file '" << fileName
+         << "'. Expected " << (unsigned int) split -> store_ -> opcode()
+         << "/" << split -> d_size_ << "/" << split -> c_size_ << " found "
+         << (unsigned int) fileOpcode << "/" << fileSize << "/"
+         << fileCSize << ".\n";
+
+    goto SplitStoreLoadError;
+  }
+
+  //
+  // Update the data size with the size
+  // we got from the disk record.
+  //
+
+  split -> d_size_ = fileSize;
+  split -> c_size_ = fileCSize;
+
+  unsigned int splitSize;
+
+  if (fileCSize > 0)
+  {
+    splitSize = fileCSize;
+  }
+  else
+  {
+    splitSize = fileSize;
+  }
+
+  //
+  // Allocate a new buffer if we didn't
+  // do that already or if the size is
+  // different.
+  //
+
+  if (split -> data_.size() != splitSize)
+  {
+    split -> data_.clear();
+
+    split -> data_.resize(splitSize);
+  }
+
+  if (GetData(fileStream, split -> data_.begin(), splitSize) < 0)
+  {
+    #ifdef PANIC
+    *logofs << "SplitStore: PANIC! Cannot read data from "
+            << "NX image file '" << fileName << "'.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Warning" << ": Cannot read data from "
+         << "NX image file '" << fileName << "'.\n";
+
+    goto SplitStoreLoadError;
+  }
+
+  delete fileStream;
+
+  delete [] fileHeader;
+  delete [] fileName;
+
+  EnableSignals();
+
+  //
+  // Update the timestamp as the operation
+  // may have taken some time.
+  //
+
+  getNewTimestamp();
+
+  return 1;
+
+SplitStoreLoadError:
+
+  delete fileStream;
+
+  unlink(fileName);
+
+  delete [] fileName;
+  delete [] fileHeader;
+
+  EnableSignals();
+
+  return -1;
+}
+
+Split *CommitStore::pop()
+{
+  if (splits_ -> size() == 0)
+  {
+    #ifdef TEST
+    *logofs << "CommitStore: The commit store is empty.\n"
+            << logofs_flush;
+    #endif
+
+    return NULL;
+  }
+
+  Split *split = *(splits_ -> begin());
+
+  splits_ -> pop_front();
+
+  #ifdef TEST
+  *logofs << "CommitStore: Removed commit split at the head "
+          << "of the list with resource " << split -> resource_
+          << " request " << (unsigned) split -> store_ ->
+             opcode() << " position " << split -> position_
+          << ".\n" << logofs_flush;
+  #endif
+
+  return split;
+}
+
+int CommitStore::expand(Split *split, unsigned char *buffer, const int size)
+{
+  #ifdef TEST
+  *logofs << "CommitStore: Expanding split data with "
+          << size << " bytes to write.\n"
+          << logofs_flush;
+  #endif
+
+  #ifdef TEST
+
+  if (size < split -> i_size_ + split -> d_size_)
+  {
+    #ifdef PANIC
+    *logofs << "CommitStore: PANIC! Wrong size of the provided "
+            << "buffer. It should be " << split -> i_size_ +
+               split -> d_size_ << " instead of " << size
+            << ".\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Wrong size of the provided "
+         << "buffer. It should be " << split -> i_size_ +
+            split -> d_size_ << " instead of " << size
+         << ".\n";
+
+    HandleAbort();
+  }
+
+  #endif
+
+  #ifdef DEBUG
+  *logofs << "CommitStore: Copying " << split -> i_size_
+          << " bytes of identity.\n" << logofs_flush;
+  #endif
+
+  memcpy(buffer, split -> identity_.begin(), split -> i_size_);
+
+  //
+  // Copy data, if any, to the buffer.
+  //
+
+  if (size > split -> i_size_)
+  {
+    //
+    // Check if message has been stored
+    // in compressed format.
+    //
+
+    if (split -> c_size_ == 0)
+    {
+      #ifdef DEBUG
+      *logofs << "CommitStore: Copying " << split -> d_size_
+              << " bytes of plain data.\n" << logofs_flush;
+      #endif
+
+      memcpy(buffer + split -> i_size_, split -> data_.begin(), split -> d_size_);
+    }
+    else
+    {
+      #ifdef DEBUG
+      *logofs << "CommitStore: Decompressing " << split -> c_size_
+              << " bytes and copying " << split -> d_size_
+              << " bytes of data.\n" << logofs_flush;
+      #endif
+
+      if (compressor_ ->
+              decompressBuffer(buffer + split -> i_size_,
+                                   split -> d_size_, split -> data_.begin(),
+                                       split -> c_size_) < 0)
+      {
+        #ifdef PANIC
+        *logofs << "CommitStore: PANIC! Split data decompression failed.\n"
+                << logofs_flush;
+        #endif
+
+        cerr << "Error" << ": Split data decompression failed.\n";
+
+        return -1;
+      }
+    }
+  }
+
+  return 1;
+}
+
+int CommitStore::update(Split *split)
+{
+  if (split -> action_ != IS_ADDED)
+  {
+    return 0;
+  }
+
+  //
+  // We don't need the identity data at
+  // the encoding side.
+  //
+
+  if (split -> identity_.size() == 0)
+  {
+    #ifdef TEST
+    *logofs << "SplitStore: Going to update the size "
+            << "for object at position " << split -> position_
+            << " with data size " << split -> d_size_
+            << " and compressed data size " << split ->
+               c_size_ << ".\n" << logofs_flush;
+    #endif
+
+    split -> store_ -> updateData(split -> position_, split -> d_size_,
+                                      split -> c_size_);
+  }
+  else
+  {
+    #ifdef TEST
+    *logofs << "SplitStore: Going to update data and size "
+            << "for object at position " << split -> position_
+            << " with data size " << split -> d_size_
+            << " and compressed data size " << split ->
+               c_size_ << ".\n" << logofs_flush;
+    #endif
+
+    split -> store_ -> updateData(split -> position_, split -> data_.begin(), 
+                                      split -> d_size_, split -> c_size_);
+  }
+
+  //
+  // Unlock message so that we can remove
+  // or save it on disk at shutdown.
+  //
+
+  if (split -> action_ == IS_ADDED)
+  {
+    split -> store_ -> unlock(split -> position_);
+
+    #ifdef TEST
+
+    validate(split);
+
+    #endif
+  }
+
+  return 1;
+}
+
+int CommitStore::validate(Split *split)
+{
+  MessageStore *store = split -> store_;
+
+  int p, n, s;
+
+  s = store -> cacheSlots;
+
+  for (p = 0, n = 0; p < s; p++)
+  {
+    if (store -> getLocks(p) == 1)
+    {
+      n++;
+    }
+    else if (store -> getLocks(p) != 0)
+    {
+      #ifdef PANIC
+      *logofs << "CommitStore: PANIC! Repository for OPCODE#"
+              << (unsigned int) store -> opcode() << " has "
+              << store -> getLocks(p) << " locks for message "
+              << "at position " << p << ".\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Repository for OPCODE#"
+           << (unsigned int) store -> opcode() << " has "
+           << store -> getLocks(p) << " locks for message "
+           << "at position " << p << ".\n";
+
+      HandleAbort();
+    }
+  }
+
+  #ifdef TEST
+  *logofs << "CommitStore: Repository for OPCODE#"
+          << (unsigned int) store -> opcode()
+          << " has " << n << " locked messages.\n"
+          << logofs_flush;
+  #endif
+
+  return 1;
+}
diff --git a/nxcomp/src/Split.h b/nxcomp/src/Split.h
new file mode 100644
index 000000000..ee5eae7fe
--- /dev/null
+++ b/nxcomp/src/Split.h
@@ -0,0 +1,543 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef Split_H
+#define Split_H
+
+#include "Types.h"
+#include "Timestamp.h"
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+//
+// Define this to know how many splits
+// are allocated and deallocated.
+//
+
+#undef  REFERENCES
+
+//
+// Size of header of messages saved on
+// disk.
+//
+
+#define SPLIT_HEADER_SIZE            12
+
+//
+// This class is used to divide big messages
+// in smaller chunks and send them at idle
+// time.
+//
+
+class EncodeBuffer;
+class DecodeBuffer;
+
+class SplitStore;
+class CommitStore;
+
+//
+// Preferred message streaming policy.
+//
+
+typedef enum
+{
+  split_none = -1,
+  split_async = 1,
+  split_sync
+
+} T_split_mode;
+
+//
+// Current state of the split. Used to
+// implement the state machine.
+//
+
+typedef enum
+{
+  split_undefined = -1,
+  split_added,
+  split_missed,
+  split_loaded,
+  split_aborted,
+  split_notified
+
+} T_split_state;
+
+class Split
+{
+  friend class SplitStore;
+  friend class CommitStore;
+
+  public:
+
+  Split();
+
+  ~Split();
+
+  //
+  // Note that, differently from the message
+  // store, the split store doesn't account
+  // for the data offset when dealing with
+  // the data. This means that both the size_
+  // and c_size members represent the actual
+  // size of the data part.
+  //
+
+  void compressedSize(int size)
+  {
+    c_size_ = size;
+
+    store_ -> validateSize(d_size_, c_size_);
+  }
+
+  int compressedSize()
+  {
+    return c_size_;
+  }
+
+  int plainSize()
+  {
+    return i_size_ + d_size_;
+  }
+
+  T_checksum getChecksum()
+  {
+    return checksum_;
+  }
+
+  MessageStore *getStore()
+  {
+    return store_;
+  }
+  
+  T_split_state getState()
+  {
+    return state_;
+  }
+
+  T_store_action getAction()
+  {
+    return action_;
+  }
+
+  //
+  // We may need to find the resource
+  // associated to the split message
+  // because old protocol version use
+  // a single store for all splits.
+  //
+
+  int getResource()
+  {
+    return resource_;
+  }
+
+  int getRequest()
+  {
+    return store_ -> opcode();
+  }
+
+  int getPosition()
+  {
+    return position_;
+  }
+
+  T_split_mode getMode()
+  {
+    return mode_;
+  }
+
+  void setPolicy(int load, int save)
+  {
+    load_ = load;
+    save_ = save;
+  }
+
+  void setState(T_split_state state)
+  {
+    state_ = state;
+  }
+
+  private:
+
+  //
+  // The agent's resource which is splitting
+  // the message.
+  //
+
+  int resource_;
+
+  //
+  // Where to find the message in the message
+  // store or the X sequence number of the
+  // original request, in recent versions.
+  //
+
+  int position_;
+
+  //
+  // Which store is involved.
+  //
+
+  MessageStore *store_;
+
+  //
+  // Identity size of the message.
+  //
+
+  int i_size_;
+
+  //
+  // This is the uncompressed data size of the
+  // original message.
+  //
+
+  int d_size_;
+
+  //
+  // This is the size of the compressed data,
+  // if the data is stored in this form.
+  //
+
+  int c_size_;
+
+  //
+  // Size of the data buffer, as known by the
+  // encoding side. This field is only used at
+  // the decoding side. The remote size can be
+  // different from the actual data size, if
+  // the encoding side did not confirm that it
+  // received the abort split event.
+  //
+
+  int r_size_;
+  
+  //
+  // Position in the data buffer that will be
+  // the target of the next send or receive
+  // operation while streaming the message.
+  //
+
+  int next_;
+
+  //
+  // Load or save the split to disk.
+  //
+
+  int load_;
+  int save_;
+
+  //
+  // Checksum of the original message.
+  //
+
+  T_checksum checksum_;
+
+  //
+  // Was this split confirmed or aborted?
+  //
+
+  T_split_state state_;
+
+  //
+  // What's the policy for sending this split?
+  //
+
+  T_split_mode mode_;
+
+  //
+  // Operation that had been performed on the
+  // store at the time the split was added.
+  //
+
+  T_store_action action_;
+
+  //
+  // Container for the identity and data part
+  // of the X message.
+  //
+
+  T_data identity_;
+  T_data data_;
+
+  #ifdef REFERENCES
+
+  static int references_;
+
+  #endif
+};
+
+class SplitStore
+{
+  public:
+
+  SplitStore(StaticCompressor *compressor, CommitStore *commits, int resource);
+
+  ~SplitStore();
+
+  Split *getFirstSplit() const
+  {
+    if (splits_ -> size() > 0)
+    {
+      return (*(splits_ -> begin()));
+    }
+
+    return NULL;
+  }
+
+  Split *getLastSplit() const
+  {
+    if (splits_ -> size() > 0)
+    {
+      return (*(--(splits_ -> end())));
+    }
+
+    return NULL;
+  }
+
+  int getNodeSize(const Split *split) const
+  {
+    //
+    // Take in account 64 bytes of overhead
+    // for each node.
+    //
+
+    return (sizeof(class Split) + 64 +
+                split -> i_size_ + split -> d_size_);
+  }
+
+  int getStorageSize()
+  {
+    return splitStorageSize_;
+  }
+
+  static int getTotalSize()
+  {
+    return totalSplitSize_;
+  }
+
+  static int getTotalStorageSize()
+  {
+    return totalSplitStorageSize_;
+  }
+
+  int getResource()
+  {
+    return resource_;
+  }
+
+  int getSize()
+  {
+    return splits_ -> size();
+  }
+
+  T_splits *getSplits()
+  {
+    return splits_;
+  }
+
+  //
+  // Used, respectively, at the encoding
+  // and decoding side.
+  //
+
+  Split *add(MessageStore *store, int resource, T_split_mode mode,
+                 int position, T_store_action action, T_checksum checksum,
+                     const unsigned char *buffer, const int size);
+
+  Split *add(MessageStore *store, int resource, int position,
+                T_store_action action, T_checksum checksum,
+                     unsigned char *buffer, const int size);
+
+  //
+  // Handle the streaming of the message data.
+  //
+
+  int send(EncodeBuffer &encodeBuffer, int packetSize);
+
+  int receive(DecodeBuffer &decodeBuffer);
+
+  //
+  // Remove the top element of the split store
+  // and update the storage size.
+  //
+
+  void remove(Split *split);
+
+  //
+  // Load the message from disk and replace the
+  // message in the store with the new copy.
+  //
+
+  int load(Split *split);
+
+  //
+  // Save the data to disk after the message has
+  // been recomposed at the local side.
+  //
+
+  int save(Split *split);
+
+  //
+  // Find the message on disk and update the last
+  // modification time. This is currently unused.
+  //
+
+  int find(Split *split);
+
+  //
+  // Remove the element on top of the queue and
+  // discard any split data that still needs to
+  // be transferred.
+  //
+
+  Split *pop();
+
+  //
+  // Dump the content of the store.
+  //
+
+  void dump();
+
+  protected:
+
+  //
+  // Repository where to add the splits.
+  //
+
+  T_splits *splits_;
+
+  //
+  // Compress and decompress the data payload.
+  //
+
+  StaticCompressor *compressor_;
+
+  private:
+
+  int start(EncodeBuffer &encodeBuffer);
+
+  int start(DecodeBuffer &decodeBuffer);
+
+  void push(Split *split);
+
+  //
+  // Determine the name of the file object based
+  // on the checksum.
+  //
+
+  const char *name(const T_checksum checksum);
+
+  //
+  // The number of elements and data bytes
+  // in the repository.
+  //
+
+  int splitStorageSize_;
+
+  static int totalSplitSize_;
+  static int totalSplitStorageSize_;
+
+  //
+  // Current element being transferred.
+  //
+
+  T_splits::iterator current_;
+
+  //
+  // Repository where to move the splits
+  // after they are completely recomposed.
+  //
+
+  CommitStore *commits_;
+
+  //
+  // Index in the client store or none,
+  // if this is a commit store.
+  //
+
+  int resource_;
+
+  #ifdef REFERENCES
+
+  static int references_;
+
+  #endif
+};
+
+class CommitStore : public SplitStore
+{
+  //
+  // This is just a split store.
+  //
+
+  public:
+
+  CommitStore(StaticCompressor *compressor)
+
+    : SplitStore(compressor, NULL, nothing)
+  {
+  }
+
+  //
+  // Move identity and data of the split to the
+  // provided buffer, uncompressing the message,
+  // if needed.
+  //
+
+  int expand(Split *split, unsigned char *buffer, const int size);
+
+  //
+  // We recomposed the data part. If the message
+  // was originally added to the message store,
+  // replace the data and/or update the size.
+  //
+
+  int update(Split *split);
+
+  //
+  // Remove the split from the commit queue.
+  //
+
+  Split *pop();
+
+  //
+  // This is just used for debug. It checks
+  // if any message in the message store has
+  // an invalid number of locks.
+  //
+
+  int validate(Split *split);
+};
+
+#endif /* Split_H */
diff --git a/nxcomp/src/StaticCompressor.cpp b/nxcomp/src/StaticCompressor.cpp
new file mode 100644
index 000000000..b47193354
--- /dev/null
+++ b/nxcomp/src/StaticCompressor.cpp
@@ -0,0 +1,432 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "Z.h"
+#include "Misc.h"
+#include "Control.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+#include "StaticCompressor.h"
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+StaticCompressor::StaticCompressor(int compressionLevel,
+                                       int compressionThreshold)
+{
+  buffer_     = NULL;
+  bufferSize_ = 0;
+
+  compressionStream_.zalloc = (alloc_func) 0;
+  compressionStream_.zfree  = (free_func) 0;
+  compressionStream_.opaque = (voidpf) 0;
+
+  decompressionStream_.zalloc = (alloc_func) 0;
+  decompressionStream_.zfree  = (free_func) 0;
+  decompressionStream_.opaque = (void *) 0;
+
+  decompressionStream_.next_in = (Bytef *) 0;
+  decompressionStream_.avail_in = 0;
+
+  #ifdef TEST
+  *logofs << "StaticCompressor: Compression level is "
+          << compressionLevel << ".\n" << logofs_flush;
+  #endif
+
+  int result = deflateInit2(&compressionStream_, compressionLevel, Z_DEFLATED,
+                                15, 9, Z_DEFAULT_STRATEGY);
+
+  if (result != Z_OK)
+  {
+    #ifdef PANIC
+    *logofs << "StaticCompressor: PANIC! Cannot initialize the "
+            << "compression stream. Error is '" << zError(result)
+            << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Cannot initialize the compression "
+         << "stream. Error is '" << zError(result) << "'.\n";
+
+    HandleAbort();
+  }
+
+  result = inflateInit2(&decompressionStream_, 15);
+
+  if (result != Z_OK)
+  {
+    #ifdef PANIC
+    *logofs << "StaticCompressor: PANIC! Cannot initialize the "
+            << "decompression stream. Error is '" << zError(result)
+            << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Cannot initialize the decompression "
+         << "stream. Error is '" << zError(result) << "'.\n";
+
+    HandleAbort();
+  }
+
+  #ifdef TEST
+  *logofs << "StaticCompressor: Compression threshold is "
+          << compressionThreshold << ".\n" << logofs_flush;
+  #endif
+
+  threshold_ = compressionThreshold;
+}
+
+StaticCompressor::~StaticCompressor()
+{
+  int result = deflateEnd(&compressionStream_);
+
+  if (result != Z_OK)
+  {
+    #ifdef PANIC
+    *logofs << "StaticCompressor: PANIC! Cannot deinitialize the "
+            << "compression stream. Error is '" << zError(result)
+            << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Cannot deinitialize the compression "
+         << "stream. Error is '" << zError(result) << "'.\n";
+  }
+
+  result = inflateEnd(&decompressionStream_);
+
+  if (result != Z_OK)
+  {
+    #ifdef PANIC
+    *logofs << "StaticCompressor: PANIC! Cannot deinitialize the "
+            << "decompression stream. Error is '" << zError(result)
+            << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Cannot deinitialize the decompression "
+         << "stream. Error is '" << zError(result) << "'.\n";
+  }
+
+  delete [] buffer_;
+}
+
+//
+// This function compresses and encodes the compressed
+// buffer. It returns a pointer to the internal buffer
+// where data was compressed.
+//
+
+int StaticCompressor::compressBuffer(const unsigned char *plainBuffer,
+                                         const unsigned int plainSize,
+                                             unsigned char *&compressedBuffer,
+                                                 unsigned int &compressedSize,
+                                                     EncodeBuffer &encodeBuffer)
+{
+  if (control -> LocalDataCompression == 0 ||
+          compressBuffer(plainBuffer, plainSize, 
+                             compressedBuffer, compressedSize) <= 0)
+  {
+    encodeBuffer.encodeBoolValue(0);
+
+    encodeBuffer.encodeMemory(plainBuffer, plainSize);
+
+    return 0;
+  }
+  else
+  {
+    encodeBuffer.encodeBoolValue(1);
+
+    encodeBuffer.encodeValue(compressedSize, 32, 14);
+    encodeBuffer.encodeValue(plainSize, 32, 14);
+
+    encodeBuffer.encodeMemory(compressedBuffer, compressedSize);
+
+    return 1;
+  }
+}
+
+//
+// This function compresses data into a dynamically
+// allocated buffer and returns a pointer to it, so
+// application must copy data before the next call.
+//
+
+int StaticCompressor::compressBuffer(const unsigned char *plainBuffer,
+                                         const unsigned int plainSize,
+                                             unsigned char *&compressedBuffer,
+                                                 unsigned int &compressedSize)
+{
+  #ifdef DEBUG
+  *logofs << "StaticCompressor: Called for buffer at "
+          << (void *) plainBuffer << ".\n"
+          << logofs_flush;
+  #endif
+
+  compressedSize = plainSize;
+
+  if (plainSize < (unsigned int) threshold_)
+  {
+    #ifdef TEST
+    *logofs << "StaticCompressor: Leaving buffer unchanged. "
+            << "Plain size is " << plainSize << " with threshold "
+            << (unsigned int) threshold_ << ".\n" << logofs_flush;
+    #endif
+
+    return 0;
+  }
+
+  //
+  // Determine the size of the temporary
+  // buffer. 
+  //
+
+  unsigned int newSize = plainSize + (plainSize / 1000) + 12;
+
+  //
+  // Allocate a new buffer if it grows
+  // beyond 64K.
+  //
+
+  if (buffer_ == NULL || (bufferSize_ > 65536 &&
+          newSize < bufferSize_ / 2) || newSize > bufferSize_)
+  {
+    delete [] buffer_;
+
+    buffer_ = new unsigned char[newSize];
+
+    if (buffer_ == NULL)
+    {
+      #ifdef PANIC
+      *logofs << "StaticCompressor: PANIC! Can't allocate compression "
+              << "buffer of " << newSize << " bytes. Error is " << EGET()
+              << " ' " << ESTR() << "'.\n" << logofs_flush;
+      #endif
+
+      cerr << "Warning" << ": Can't allocate compression buffer of "
+           << newSize << " bytes. Error is " << EGET()
+           << " '" << ESTR() << "'.\n";
+
+      bufferSize_ = 0;
+
+      return 0;
+    }
+
+    bufferSize_ = newSize;
+  }
+
+  unsigned int resultingSize = newSize; 
+
+  int result = ZCompress(&compressionStream_, buffer_, &resultingSize,
+                             plainBuffer, plainSize);
+
+  if (result == Z_OK)
+  {
+    if (resultingSize > newSize)
+    {
+      #ifdef PANIC
+      *logofs << "StaticCompressor: PANIC! Overflow in compression "
+              << "buffer size. " << "Expected size was " << newSize
+              << " while it is " << resultingSize << ".\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Overflow in compress buffer size. "
+           << "Expected size was " << newSize << " while it is "
+           << resultingSize << ".\n";
+
+      return -1;
+    }
+    else if (resultingSize >= plainSize)
+    {
+      #ifdef TEST
+      *logofs << "StaticCompressor: Leaving buffer unchanged. "
+              << "Plain size is " << plainSize << " compressed "
+              << "size is " << resultingSize << ".\n"
+              << logofs_flush;
+      #endif
+
+      return 0;
+    }
+
+    compressedBuffer = buffer_;
+    compressedSize   = resultingSize;
+
+    #ifdef TEST
+    *logofs << "StaticCompressor: Compressed buffer from "
+            << plainSize << " to " << resultingSize
+            << " bytes.\n" << logofs_flush;
+    #endif
+
+    return 1;
+  }
+
+  #ifdef PANIC
+  *logofs << "StaticCompressor: PANIC! Failed compression of buffer. "
+          << "Error is '" << zError(result) << "'.\n"
+          << logofs_flush;
+  #endif
+
+  cerr << "Error" << ": Failed compression of buffer. "
+       << "Error is '" << zError(result) << "'.\n";
+
+  return -1;
+}
+
+int StaticCompressor::decompressBuffer(unsigned char *plainBuffer,
+                                           unsigned int plainSize,
+                                               const unsigned char *&compressedBuffer,
+                                                   unsigned int &compressedSize,
+                                                       DecodeBuffer &decodeBuffer)
+{
+  #ifdef DEBUG
+  *logofs << "StaticCompressor: Called for buffer at "
+          << (void *) plainBuffer << ".\n"
+          << logofs_flush;
+  #endif
+
+  unsigned int value;
+
+  decodeBuffer.decodeBoolValue(value);
+
+  if (value == 0)
+  {
+    memcpy(plainBuffer,
+               decodeBuffer.decodeMemory(plainSize),
+                   plainSize);
+
+    return 0;
+  }
+
+  unsigned int checkSize = plainSize;
+
+  decodeBuffer.decodeValue(value, 32, 14);
+  compressedSize = value;
+
+  decodeBuffer.decodeValue(value, 32, 14);
+  checkSize = value;
+
+  //
+  // If caller needs the original compressed
+  // data it must copy this to its own buffer
+  // before using any further decode function.
+  //
+
+  compressedBuffer = decodeBuffer.decodeMemory(compressedSize);
+
+  int result = ZDecompress(&decompressionStream_, plainBuffer, &checkSize,
+                               compressedBuffer, compressedSize);
+
+  if (result != Z_OK)
+  {
+    #ifdef PANIC
+    *logofs << "StaticCompressor: PANIC! Failure decompressing buffer. "
+            << "Error is '" << zError(result) << "'.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Failure decompressing buffer. "
+         << "Error is '" << zError(result) << "'.\n";
+
+    return -1;
+  }
+  else if (plainSize != checkSize)
+  {
+    #ifdef PANIC
+    *logofs << "StaticCompressor: PANIC! Expected decompressed size was "
+            << plainSize << " while it is " << checkSize 
+            << ".\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Expected decompressed size was "
+         << plainSize << " while it is " << checkSize
+         << ".\n";
+
+    return -1;
+  }
+
+  return 1;
+}
+
+//
+// This is used to uncompress on-the-fly
+// messages whose data has been stored
+// in compressed format.
+//
+
+int StaticCompressor::decompressBuffer(unsigned char *plainBuffer,
+                                           const unsigned int plainSize,
+                                               const unsigned char *compressedBuffer,
+                                                   const unsigned int compressedSize)
+{
+  #ifdef TEST
+  *logofs << "StaticCompressor: Called for buffer at "
+          << (void *) plainBuffer << ".\n"
+          << logofs_flush;
+  #endif
+
+  unsigned int checkSize = plainSize;
+
+  int result = ZDecompress(&decompressionStream_, plainBuffer, &checkSize,
+                               compressedBuffer, compressedSize);
+
+  if (result != Z_OK)
+  {
+    #ifdef PANIC
+    *logofs << "StaticCompressor: PANIC! Failure decompressing buffer. "
+            << "Error is '" << zError(result) << "'.\n"
+            << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  if (plainSize != checkSize)
+  {
+    #ifdef PANIC
+    *logofs << "StaticCompressor: PANIC! Expected decompressed size was "
+            << plainSize << " while it is " << checkSize 
+            << ".\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Expected decompressed size was "
+         << plainSize << " while it is " << checkSize
+         << ".\n";
+
+    return -1;
+  }
+
+  #ifdef TEST
+  *logofs << "StaticCompressor: Decompressed buffer from "
+          << compressedSize << " to " << plainSize
+          << " bytes.\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
diff --git a/nxcomp/src/StaticCompressor.h b/nxcomp/src/StaticCompressor.h
new file mode 100644
index 000000000..e0b81a527
--- /dev/null
+++ b/nxcomp/src/StaticCompressor.h
@@ -0,0 +1,80 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef StaticCompressor_H
+#define StaticCompressor_H
+
+#include "Z.h"
+
+class EncodeBuffer;
+class DecodeBuffer;
+
+class StaticCompressor
+{
+  public:
+
+  StaticCompressor(int compressionLevel, int compressionThreshold);
+
+  ~StaticCompressor();
+
+  int compressBuffer(const unsigned char *plainBuffer, const unsigned int plainSize,
+                         unsigned char *&compressedBuffer, unsigned int &compressedSize,
+                             EncodeBuffer &encodeBuffer);
+
+  int compressBuffer(const unsigned char *plainBuffer, const unsigned int plainSize,
+                         unsigned char *&compressedBuffer, unsigned int &compressedSize);
+
+  int decompressBuffer(unsigned char *plainBuffer, unsigned int plainSize,
+                           const unsigned char *&compressedBuffer, unsigned int &compressedSize,
+                               DecodeBuffer &decodeBuffer);
+
+  int decompressBuffer(unsigned char *plainBuffer, const unsigned int plainSize,
+                           const unsigned char *compressedBuffer, const unsigned compressedSize);
+
+  static int isCompressionLevel(int compressionLevel)
+  {
+    return (compressionLevel == Z_DEFAULT_COMPRESSION ||
+                (compressionLevel >= Z_NO_COMPRESSION &&
+                     compressionLevel <= Z_BEST_COMPRESSION));
+  }
+
+  int fullReset()
+  {
+    return (deflateReset(&compressionStream_) == Z_OK &&
+                inflateReset(&decompressionStream_) == Z_OK);
+  }
+
+  private:
+
+  z_stream compressionStream_;
+  z_stream decompressionStream_;
+
+  unsigned char *buffer_;
+  unsigned int  bufferSize_;
+
+  int threshold_;
+};
+
+#endif
diff --git a/nxcomp/src/Statistics.cpp b/nxcomp/src/Statistics.cpp
new file mode 100644
index 000000000..ab8fd74dc
--- /dev/null
+++ b/nxcomp/src/Statistics.cpp
@@ -0,0 +1,2007 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+
+#include "Statistics.h"
+
+#include "Control.h"
+
+#include "Proxy.h"
+
+#include "ClientStore.h"
+#include "ServerStore.h"
+
+//
+// Length of temporary buffer
+// used to format output.
+//
+
+#define FORMAT_LENGTH          1024
+
+//
+// Log level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+//
+// Note that when presenting statistics we invert the
+// correct semantics of X client and server entities.
+// This is questionable, but matches the user's pers-
+// pective of running remote X applications on its
+// local client.
+//
+
+Statistics::Statistics(Proxy *proxy) : proxy_(proxy)
+{
+  transportPartial_.idleTime_             = 0;
+  transportPartial_.readTime_             = 0;
+  transportPartial_.writeTime_            = 0;
+  transportPartial_.proxyBytesIn_         = 0;
+  transportPartial_.proxyBytesOut_        = 0;
+  transportPartial_.proxyFramesIn_        = 0;
+  transportPartial_.proxyFramesOut_       = 0;
+  transportPartial_.proxyWritesOut_       = 0;
+  transportPartial_.compressedBytesIn_    = 0;
+  transportPartial_.compressedBytesOut_   = 0;
+  transportPartial_.decompressedBytesIn_  = 0;
+  transportPartial_.decompressedBytesOut_ = 0;
+  transportPartial_.framingBitsOut_       = 0;
+
+  transportTotal_.idleTime_             = 0;
+  transportTotal_.readTime_             = 0;
+  transportTotal_.writeTime_            = 0;
+  transportTotal_.proxyBytesIn_         = 0;
+  transportTotal_.proxyBytesOut_        = 0;
+  transportTotal_.proxyFramesIn_        = 0;
+  transportTotal_.proxyFramesOut_       = 0;
+  transportTotal_.proxyWritesOut_       = 0;
+  transportTotal_.compressedBytesIn_    = 0;
+  transportTotal_.compressedBytesOut_   = 0;
+  transportTotal_.decompressedBytesIn_  = 0;
+  transportTotal_.decompressedBytesOut_ = 0;
+  transportTotal_.framingBitsOut_       = 0;
+
+  for (int i = 0; i < STATISTICS_OPCODE_MAX; i++)
+  {
+    protocolPartial_.requestCached_[i]  = 0;
+    protocolPartial_.requestReplied_[i] = 0;
+    protocolPartial_.requestCount_[i]   = 0;
+    protocolPartial_.requestBitsIn_[i]  = 0;
+    protocolPartial_.requestBitsOut_[i] = 0;
+
+    protocolPartial_.renderRequestCached_[i]  = 0;
+    protocolPartial_.renderRequestCount_[i]   = 0;
+    protocolPartial_.renderRequestBitsIn_[i]  = 0;
+    protocolPartial_.renderRequestBitsOut_[i] = 0;
+
+    protocolPartial_.replyCached_[i]  = 0;
+    protocolPartial_.replyCount_[i]   = 0;
+    protocolPartial_.replyBitsIn_[i]  = 0;
+    protocolPartial_.replyBitsOut_[i] = 0;
+
+    protocolPartial_.eventCached_[i]  = 0;
+    protocolPartial_.eventCount_[i]   = 0;
+    protocolPartial_.eventBitsIn_[i]  = 0;
+    protocolPartial_.eventBitsOut_[i] = 0;
+
+    protocolTotal_.requestCached_[i]  = 0;
+    protocolTotal_.requestReplied_[i] = 0;
+    protocolTotal_.requestCount_[i]   = 0;
+    protocolTotal_.requestBitsIn_[i]  = 0;
+    protocolTotal_.requestBitsOut_[i] = 0;
+
+    protocolTotal_.renderRequestCached_[i]  = 0;
+    protocolTotal_.renderRequestCount_[i]   = 0;
+    protocolTotal_.renderRequestBitsIn_[i]  = 0;
+    protocolTotal_.renderRequestBitsOut_[i] = 0;
+
+    protocolTotal_.replyCached_[i]  = 0;
+    protocolTotal_.replyCount_[i]   = 0;
+    protocolTotal_.replyBitsIn_[i]  = 0;
+    protocolTotal_.replyBitsOut_[i] = 0;
+
+    protocolTotal_.eventCached_[i]  = 0;
+    protocolTotal_.eventCount_[i]   = 0;
+    protocolTotal_.eventBitsIn_[i]  = 0;
+    protocolTotal_.eventBitsOut_[i] = 0;
+  }
+
+  protocolPartial_.cupsCount_    = 0;
+  protocolPartial_.cupsBitsIn_   = 0;
+  protocolPartial_.cupsBitsOut_  = 0;
+
+  protocolPartial_.smbCount_     = 0;
+  protocolPartial_.smbBitsIn_    = 0;
+  protocolPartial_.smbBitsOut_   = 0;
+
+  protocolPartial_.mediaCount_   = 0;
+  protocolPartial_.mediaBitsIn_  = 0;
+  protocolPartial_.mediaBitsOut_ = 0;
+
+  protocolPartial_.httpCount_    = 0;
+  protocolPartial_.httpBitsIn_   = 0;
+  protocolPartial_.httpBitsOut_  = 0;
+
+  protocolPartial_.fontCount_    = 0;
+  protocolPartial_.fontBitsIn_   = 0;
+  protocolPartial_.fontBitsOut_  = 0;
+
+  protocolPartial_.slaveCount_   = 0;
+  protocolPartial_.slaveBitsIn_  = 0;
+  protocolPartial_.slaveBitsOut_ = 0;
+
+  protocolTotal_.cupsCount_    = 0;
+  protocolTotal_.cupsBitsIn_   = 0;
+  protocolTotal_.cupsBitsOut_  = 0;
+
+  protocolTotal_.smbCount_     = 0;
+  protocolTotal_.smbBitsIn_    = 0;
+  protocolTotal_.smbBitsOut_   = 0;
+
+  protocolTotal_.mediaCount_   = 0;
+  protocolTotal_.mediaBitsIn_  = 0;
+  protocolTotal_.mediaBitsOut_ = 0;
+
+  protocolTotal_.httpCount_    = 0;
+  protocolTotal_.httpBitsIn_   = 0;
+  protocolTotal_.httpBitsOut_  = 0;
+
+  protocolTotal_.fontCount_    = 0;
+  protocolTotal_.fontBitsIn_   = 0;
+  protocolTotal_.fontBitsOut_  = 0;
+
+  protocolTotal_.slaveCount_   = 0;
+  protocolTotal_.slaveBitsIn_  = 0;
+  protocolTotal_.slaveBitsOut_ = 0;
+
+  packedPartial_.packedBytesIn_  = 0;
+  packedPartial_.packedBytesOut_ = 0;
+
+  packedTotal_.packedBytesIn_    = 0;
+  packedTotal_.packedBytesOut_   = 0;
+
+  splitPartial_.splitCount_           = 0;
+  splitPartial_.splitAborted_         = 0;
+  splitPartial_.splitAbortedBytesOut_ = 0;
+
+  splitTotal_.splitCount_             = 0;
+  splitTotal_.splitAborted_           = 0;
+  splitTotal_.splitAbortedBytesOut_   = 0;
+
+  overallPartial_.overallBytesIn_  = 0;
+  overallPartial_.overallBytesOut_ = 0;
+
+  overallTotal_.overallBytesIn_    = 0;
+  overallTotal_.overallBytesOut_   = 0;
+
+  proxyData_.protocolCount_ = 0;
+  proxyData_.controlCount_  = 0;
+  proxyData_.splitCount_    = 0;
+  proxyData_.dataCount_     = 0;
+
+  proxyData_.streamRatio_ = 1;
+
+  startShortFrameTs_ = getTimestamp();
+  startLongFrameTs_  = getTimestamp();
+  startFrameTs_      = getTimestamp();
+
+  bytesInShortFrame_ = 0;
+  bytesInLongFrame_  = 0;
+
+  bitrateInShortFrame_ = 0;
+  bitrateInLongFrame_  = 0;
+
+  topBitrate_ = 0;
+
+  congestionInFrame_ = 0;
+}
+
+Statistics::~Statistics()
+{
+}
+
+int Statistics::resetPartialStats()
+{
+  transportPartial_.idleTime_             = 0;
+  transportPartial_.readTime_             = 0;
+  transportPartial_.writeTime_            = 0;
+  transportPartial_.proxyBytesIn_         = 0;
+  transportPartial_.proxyBytesOut_        = 0;
+  transportPartial_.proxyFramesIn_        = 0;
+  transportPartial_.proxyFramesOut_       = 0;
+  transportPartial_.proxyWritesOut_       = 0;
+  transportPartial_.compressedBytesIn_    = 0;
+  transportPartial_.compressedBytesOut_   = 0;
+  transportPartial_.decompressedBytesIn_  = 0;
+  transportPartial_.decompressedBytesOut_ = 0;
+  transportPartial_.framingBitsOut_       = 0;
+
+  for (int i = 0; i < STATISTICS_OPCODE_MAX; i++)
+  {
+    protocolPartial_.requestCached_[i]  = 0;
+    protocolPartial_.requestReplied_[i] = 0;
+    protocolPartial_.requestCount_[i]   = 0;
+    protocolPartial_.requestBitsIn_[i]  = 0;
+    protocolPartial_.requestBitsOut_[i] = 0;
+
+    protocolPartial_.renderRequestCached_[i]  = 0;
+    protocolPartial_.renderRequestCount_[i]   = 0;
+    protocolPartial_.renderRequestBitsIn_[i]  = 0;
+    protocolPartial_.renderRequestBitsOut_[i] = 0;
+
+    protocolPartial_.replyCached_[i]  = 0;
+    protocolPartial_.replyCount_[i]   = 0;
+    protocolPartial_.replyBitsIn_[i]  = 0;
+    protocolPartial_.replyBitsOut_[i] = 0;
+
+    protocolPartial_.eventCached_[i]  = 0;
+    protocolPartial_.eventCount_[i]   = 0;
+    protocolPartial_.eventBitsIn_[i]  = 0;
+    protocolPartial_.eventBitsOut_[i] = 0;
+  }
+
+  protocolPartial_.cupsCount_    = 0;
+  protocolPartial_.cupsBitsIn_   = 0;
+  protocolPartial_.cupsBitsOut_  = 0;
+
+  protocolPartial_.smbCount_     = 0;
+  protocolPartial_.smbBitsIn_    = 0;
+  protocolPartial_.smbBitsOut_   = 0;
+
+  protocolPartial_.mediaCount_   = 0;
+  protocolPartial_.mediaBitsIn_  = 0;
+  protocolPartial_.mediaBitsOut_ = 0;
+
+  protocolPartial_.httpCount_    = 0;
+  protocolPartial_.httpBitsIn_   = 0;
+  protocolPartial_.httpBitsOut_  = 0;
+
+  protocolPartial_.fontCount_    = 0;
+  protocolPartial_.fontBitsIn_   = 0;
+  protocolPartial_.fontBitsOut_  = 0;
+
+  protocolPartial_.slaveCount_   = 0;
+  protocolPartial_.slaveBitsIn_  = 0;
+  protocolPartial_.slaveBitsOut_ = 0;
+
+  packedPartial_.packedBytesIn_  = 0;
+  packedPartial_.packedBytesOut_ = 0;
+
+  splitPartial_.splitCount_           = 0;
+  splitPartial_.splitAborted_         = 0;
+  splitPartial_.splitAbortedBytesOut_ = 0;
+
+  overallPartial_.overallBytesIn_  = 0;
+  overallPartial_.overallBytesOut_ = 0;
+
+  return 1;
+}
+
+void Statistics::addCompressedBytes(unsigned int bytesIn, unsigned int bytesOut)
+{
+  transportPartial_.compressedBytesIn_ += bytesIn;
+  transportTotal_.compressedBytesIn_ += bytesIn;
+
+  transportPartial_.compressedBytesOut_ += bytesOut;
+  transportTotal_.compressedBytesOut_ += bytesOut;
+
+  double ratio = bytesIn / bytesOut;
+
+  if (ratio < 1)
+  {
+    ratio = 1;
+  }
+
+  #if defined(TEST) || defined(TOKEN)
+  *logofs << "Statistics: TOKEN! Old ratio was "
+          << proxyData_.streamRatio_ << " current is "
+          << (double) ratio << " new ratio is " << (double)
+             ((proxyData_.streamRatio_ * 2) + ratio) / 3 << ".\n"
+          << logofs_flush;
+  #endif
+
+  proxyData_.streamRatio_ = ((proxyData_.streamRatio_ * 2) + ratio) / 3;
+
+  #if defined(TEST) || defined(TOKEN)
+  *logofs << "Statistics: TOKEN! Updated compressed bytes "
+          << "with " << bytesIn << " in " << bytesOut << " out "
+          << "and ratio " << (double) proxyData_.streamRatio_
+          << ".\n" << logofs_flush;
+  #endif
+}
+
+//
+// Recalculate the current bitrate. The bytes written
+// are accounted at the time the transport actually
+// writes the data to the network, not at the time it
+// receives the data from the upper layers. The reason
+// is that data can be compressed by the stream com-
+// pressor, so we can become aware of the new bitrate
+// only afer having flushed the ZLIB stream. This also
+// means that, to have a reliable estimate, we need to
+// flush the link often.
+//
+
+void Statistics::updateBitrate(int bytes)
+{
+  T_timestamp thisFrameTs = getNewTimestamp();
+
+  int diffFramesInMs = diffTimestamp(startFrameTs_, thisFrameTs);
+
+  #ifdef DEBUG
+  *logofs << "Statistics: Difference since previous timestamp is "
+          << diffFramesInMs << " Ms.\n" << logofs_flush;
+  #endif
+
+  if (diffFramesInMs > 0)
+  {
+    #ifdef DEBUG
+    *logofs << "Statistics: Removing " << diffFramesInMs
+            << " Ms in short and long time frame.\n"
+            << logofs_flush;
+    #endif
+
+    int shortBytesToRemove = (int) (((double) bytesInShortFrame_ * (double) diffFramesInMs) /
+                                       (double) control -> ShortBitrateTimeFrame);
+
+    int longBytesToRemove = (int) (((double) bytesInLongFrame_ * (double) diffFramesInMs) /
+                                      (double) control -> LongBitrateTimeFrame);
+
+    #ifdef DEBUG
+    *logofs << "Statistics: Removing " << shortBytesToRemove
+            << " bytes from " << bytesInShortFrame_
+            << " in the short frame.\n" << logofs_flush;
+    #endif
+
+    bytesInShortFrame_ -= shortBytesToRemove;
+
+    if (bytesInShortFrame_ < 0)
+    {
+      #ifdef TEST
+      *logofs << "Statistics: Bytes in short frame are "
+              << bytesInShortFrame_ << ". Set to 0.\n"
+              << logofs_flush;
+      #endif
+
+      bytesInShortFrame_ = 0;
+    }
+
+    #ifdef DEBUG
+    *logofs << "Statistics: Removing " << longBytesToRemove
+            << " bytes from " << bytesInLongFrame_
+            << " in the long frame.\n" << logofs_flush;
+    #endif
+
+    bytesInLongFrame_ -= longBytesToRemove;
+
+    if (bytesInLongFrame_ < 0)
+    {
+      #ifdef TEST
+      *logofs << "Statistics: Bytes in long frame are "
+              << bytesInLongFrame_ << ". Set to 0.\n"
+              << logofs_flush;
+      #endif
+
+      bytesInLongFrame_ = 0;
+    }
+
+    int diffStartInMs;
+
+    diffStartInMs = diffTimestamp(thisFrameTs, startShortFrameTs_);
+
+    if (diffStartInMs > control -> ShortBitrateTimeFrame)
+    {
+      addMsTimestamp(startShortFrameTs_, diffStartInMs);
+    }
+
+    diffStartInMs = diffTimestamp(thisFrameTs, startLongFrameTs_);
+
+    if (diffStartInMs > control -> LongBitrateTimeFrame)
+    {
+      addMsTimestamp(startLongFrameTs_, diffStartInMs);
+    }
+
+    startFrameTs_ = thisFrameTs;
+  }
+
+  #ifdef DEBUG
+  *logofs << "Statistics: Adding " << bytes << " bytes to "
+          << bytesInShortFrame_ << " in the short frame.\n"
+          << logofs_flush;
+  #endif
+
+  bytesInShortFrame_ = bytesInShortFrame_ + bytes;
+
+  #ifdef DEBUG
+  *logofs << "Statistics: Adding " << bytes << " bytes to "
+          << bytesInLongFrame_ << " in the long frame.\n"
+          << logofs_flush;
+  #endif
+
+  bytesInLongFrame_ = bytesInLongFrame_ + bytes;
+
+  bitrateInShortFrame_ = (int) ((double) bytesInShortFrame_ /
+                                   ((double) control -> ShortBitrateTimeFrame / 1000));
+
+  bitrateInLongFrame_ = (int) ((double) bytesInLongFrame_ /
+                                   ((double) control -> LongBitrateTimeFrame / 1000));
+
+  if (bitrateInShortFrame_ > topBitrate_)
+  {
+    topBitrate_ = bitrateInShortFrame_;
+  }
+
+  #ifdef TEST
+  *logofs << "Statistics: Current bitrate is short " << bitrateInShortFrame_
+          << " long " << bitrateInLongFrame_ << " top " << topBitrate_
+          << ".\n" << logofs_flush;
+  #endif
+}
+
+void Statistics::updateCongestion(int remaining, int limit)
+{
+  #ifdef TEST
+  *logofs << "Statistics: Updating the congestion "
+          << "counters at " << strMsTimestamp()
+          << ".\n" << logofs_flush;
+  #endif
+
+  double current = remaining;
+
+  if (current < 0)
+  {
+    current = 0;
+  }
+
+  current = 9 * (limit - current) / limit;
+
+  #ifdef TEST
+  *logofs << "Statistics: Current congestion is "
+          << current << " with " << limit << " tokens "
+          << "and " << remaining << " remaining.\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // If the current congestion counter is greater
+  // than the previous, take the current value,
+  // otherwise ramp down the value by calculating
+  // the average of the last 8 updates.
+  //
+
+  #ifdef TEST
+  *logofs << "Statistics: Old congestion was "
+          << congestionInFrame_;
+  #endif
+
+  if (current >= congestionInFrame_)
+  {
+    congestionInFrame_ = current;
+  }
+  else
+  {
+    congestionInFrame_ = ((congestionInFrame_ * 7) + current) / 8;
+  }
+
+  #ifdef TEST
+  *logofs << " new congestion is "
+          << ((congestionInFrame_ * 7) + current) / 8
+          << ".\n" << logofs_flush;
+  #endif
+
+  //
+  // Call the function with 0 bytes flushed
+  // so the agent can update its congestion
+  // counter.
+  //
+
+  FlushCallback(0);
+}
+
+int Statistics::getClientCacheStats(int type, char *&buffer)
+{
+  if (type != PARTIAL_STATS && type != TOTAL_STATS)
+  {
+    #ifdef PANIC
+    *logofs << "Statistics: PANIC! Cannot produce statistics "
+            << "with qualifier '" << type << "'.\n"
+            << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  //
+  // Print message cache data according
+  // to local and remote view.
+  //
+
+  MessageStore *currentStore = NULL;
+  MessageStore *anyStore     = NULL;
+
+  char format[FORMAT_LENGTH];
+
+  strcat(buffer, "\nNX Cache Statistics\n");
+  strcat(buffer, "-------------------\n\n");
+
+  for (int m = proxy_client; m <= proxy_server; m++)
+  {
+    if (m == proxy_client)
+    {
+      strcat(buffer, "Request\tCached\tSize at Server\t\tSize at Client\t\tCache limit\n");
+      strcat(buffer, "-------\t------\t--------------\t\t--------------\t\t-----------\n");
+    }
+    else
+    {
+      strcat(buffer, "\nReply\tCached\tSize at Server\t\tSize at Client\t\tCache limit\n");
+      strcat(buffer, "-----\t------\t--------------\t\t--------------\t\t-----------\n");
+    }
+
+    for (int i = 0; i < CHANNEL_STORE_OPCODE_LIMIT; i++)
+    {
+      if (m == proxy_client)
+      {
+        currentStore = proxy_ -> getClientStore() -> getRequestStore(i);
+      }
+      else
+      {
+        currentStore = proxy_ -> getServerStore() -> getReplyStore(i);
+      }
+
+      if (currentStore != NULL &&
+              (currentStore -> getLocalStorageSize() ||
+                   currentStore -> getRemoteStorageSize()))
+      {
+        anyStore = currentStore;
+
+        sprintf(format, "#%d\t%d\t", i, currentStore -> getSize());
+
+        strcat(buffer, format);
+
+        sprintf(format, "%d (%.0f KB)\t\t", currentStore -> getLocalStorageSize(),
+                    ((double) currentStore -> getLocalStorageSize()) / 1024);
+
+        strcat(buffer, format);
+
+        sprintf(format, "%d (%.0f KB)\t\t", currentStore -> getRemoteStorageSize(),
+                    ((double) currentStore -> getRemoteStorageSize()) / 1024);
+
+        strcat(buffer, format);
+
+        sprintf(format, "%d/%.0f KB\n", currentStore -> cacheSlots,
+                    ((double) control -> getUpperStorageSize() / 100 *
+                          currentStore -> cacheThreshold) / 1024);
+
+        strcat(buffer, format);
+      }
+    }
+
+    if (anyStore == NULL)
+    {
+      strcat(buffer, "N/A\n");
+    }
+  }
+
+  if (anyStore != NULL)
+  {
+    sprintf(format, "\ncache: %d bytes (%d KB) available at server.\n",
+                control -> ClientTotalStorageSize,
+                    control -> ClientTotalStorageSize / 1024);
+
+    strcat(buffer, format);
+
+    sprintf(format, "       %d bytes (%d KB) available at client.\n\n",
+                control -> ServerTotalStorageSize,
+                    control -> ServerTotalStorageSize / 1024);
+
+    strcat(buffer, format);
+
+    sprintf(format, "       %d bytes (%d KB) allocated at server.\n",
+                anyStore -> getLocalTotalStorageSize(),
+                    anyStore -> getLocalTotalStorageSize() / 1024);
+
+    strcat(buffer, format);
+
+    sprintf(format, "       %d bytes (%d KB) allocated at client.\n\n\n",
+                anyStore -> getRemoteTotalStorageSize(),
+                    anyStore -> getRemoteTotalStorageSize() / 1024);
+
+    strcat(buffer, format);
+  }
+  else
+  {
+    strcat(buffer, "\ncache: N/A\n\n");
+  }
+
+  return 1;
+}
+
+int Statistics::getClientProtocolStats(int type, char *&buffer)
+{
+  if (type != PARTIAL_STATS && type != TOTAL_STATS)
+  {
+    #ifdef PANIC
+    *logofs << "Statistics: PANIC! Cannot produce statistics "
+            << "with qualifier '" << type << "'.\n"
+            << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  struct T_transportData *transportData;
+  struct T_protocolData  *protocolData;
+  struct T_overallData   *overallData;
+
+  if (type == PARTIAL_STATS)
+  {
+    transportData = &transportPartial_;
+    protocolData = &protocolPartial_;
+    overallData = &overallPartial_;
+  }
+  else
+  {
+    transportData = &transportTotal_;
+    protocolData = &protocolTotal_;
+    overallData = &overallTotal_;
+  }
+
+  char format[FORMAT_LENGTH];
+
+  double countRequestIn        = 0;
+  double countCachedRequestIn  = 0;
+  double countRepliedRequestIn = 0;
+
+  double countRequestBitsIn  = 0;
+  double countRequestBitsOut = 0;
+
+  double countAnyIn   = 0;
+  double countBitsIn  = 0;
+  double countBitsOut = 0;
+
+  //
+  // Print request data.
+  //
+
+  strcat(buffer, "NX Server Side Protocol Statistics\n");
+  strcat(buffer, "----------------------------------\n\n");
+
+  //
+  // Print render data.
+  //
+
+  strcat(buffer, "Render  Total\tCached\tBits In\t\tBits Out\tBits/Request\t\tRatio\n");
+  strcat(buffer, "------- -----\t------\t-------\t\t--------\t------------\t\t-----\n");
+
+  for (int i = 0; i < STATISTICS_OPCODE_MAX; i++)
+  {
+    if (protocolData -> renderRequestCount_[i])
+    {
+      sprintf(format, "#%d ", i);
+
+      while (strlen(format) < 8)
+      {
+        strcat(format, " ");
+      }
+
+      strcat(buffer, format);
+
+      if (protocolData -> renderRequestCached_[i] > 0)
+      {
+        sprintf(format, "%.0f\t%.0f", protocolData -> renderRequestCount_[i],
+                    protocolData -> renderRequestCached_[i]);
+      }
+      else
+      {
+        sprintf(format, "%.0f\t", protocolData -> renderRequestCount_[i]);
+      }
+
+      strcat(buffer, format);
+
+      sprintf(format, "\t%.0f (%.0f KB)\t%.0f (%.0f KB)\t%.0f/1 -> %.0f/1     \t",
+                  protocolData -> renderRequestBitsIn_[i], protocolData -> renderRequestBitsIn_[i] / 8192,
+                      protocolData -> renderRequestBitsOut_[i], protocolData -> renderRequestBitsOut_[i] / 8192,
+                          protocolData -> renderRequestBitsIn_[i] / protocolData -> renderRequestCount_[i],
+                              protocolData -> renderRequestBitsOut_[i] / protocolData -> renderRequestCount_[i]);
+
+      strcat(buffer, format);
+
+      if (protocolData -> renderRequestBitsOut_[i] > 0)
+      {
+        sprintf(format, "%5.3f:1\n", protocolData -> renderRequestBitsIn_[i] /
+                                         protocolData -> renderRequestBitsOut_[i]);
+
+        strcat(buffer, format);
+      }
+      else
+      {
+        strcat(buffer, "1:1\n");
+      }
+    }
+
+    countRequestIn        += protocolData -> renderRequestCount_[i];
+    countCachedRequestIn  += protocolData -> renderRequestCached_[i];
+
+    countRequestBitsIn  += protocolData -> renderRequestBitsIn_[i];
+    countRequestBitsOut += protocolData -> renderRequestBitsOut_[i];
+
+    countAnyIn   += protocolData -> renderRequestCount_[i];
+    countBitsIn  += protocolData -> renderRequestBitsIn_[i];
+    countBitsOut += protocolData -> renderRequestBitsOut_[i];
+  }
+
+  if (countRequestIn > 0)
+  {
+    if (countCachedRequestIn > 0)
+    {
+      sprintf(format, "\ntotal:  %.0f\t%.0f", countRequestIn, countCachedRequestIn);
+    }
+    else
+    {
+      sprintf(format, "\ntotal:  %.0f\t", countRequestIn);
+    }
+
+    strcat(buffer, format);
+
+    sprintf(format, "\t%.0f (%.0f KB)\t%.0f (%.0f KB)\t%.0f/1 -> %.0f/1     \t",
+                countRequestBitsIn, countRequestBitsIn / 8192, countRequestBitsOut,
+                    countRequestBitsOut / 8192, countRequestBitsIn / countRequestIn,
+                        countRequestBitsOut / countRequestIn);
+
+    strcat(buffer, format);
+
+    if (countRequestBitsOut > 0)
+    {
+      sprintf(format, "%5.3f:1\n", countRequestBitsIn / countRequestBitsOut);
+    }
+    else
+    {
+      sprintf(format, "1:1\n");
+    }
+
+    strcat(buffer, format);
+  }
+  else
+  {
+    strcat(buffer, "N/A\n\n");
+  }
+
+  countRequestIn        = 0;
+  countCachedRequestIn  = 0;
+
+  countRequestBitsIn  = 0;
+  countRequestBitsOut = 0;
+
+  countAnyIn   = 0;
+  countBitsIn  = 0;
+  countBitsOut = 0;
+
+  //
+  // Print other requests' data.
+  //
+
+  strcat(buffer, "\nRequest Total\tCached\tBits In\t\tBits Out\tBits/Request\t\tRatio\n");
+  strcat(buffer, "------- -----\t------\t-------\t\t--------\t------------\t\t-----\n");
+
+  for (int i = 0; i < STATISTICS_OPCODE_MAX; i++)
+  {
+    if (protocolData -> requestCount_[i])
+    {
+      sprintf(format, "#%d ", i);
+
+      while (strlen(format) < 5)
+      {
+        strcat(format, " ");
+      }
+
+      //
+      // Mark NX agent-related requests, those
+      // having a reply and finally those that
+      // have been probably tainted by client
+      // side.
+      //
+
+      if (i >= X_NXFirstOpcode && i <= X_NXLastOpcode)
+      {
+        strcat(format, "A");
+      }
+
+      if (i != X_NXInternalGenericReply && protocolData -> requestReplied_[i] > 0)
+      {
+        strcat(format, "R");
+      }
+
+      if (i == X_NoOperation && control -> TaintReplies)
+      {
+        strcat(format, "T");
+      }
+
+      while (strlen(format) < 8)
+      {
+        strcat(format, " ");
+      }
+
+      strcat(buffer, format);
+
+      if (protocolData -> requestCached_[i] > 0)
+      {
+        sprintf(format, "%.0f\t%.0f", protocolData -> requestCount_[i],
+                    protocolData -> requestCached_[i]);
+      }
+      else
+      {
+        sprintf(format, "%.0f\t", protocolData -> requestCount_[i]);
+      }
+
+      strcat(buffer, format);
+
+      sprintf(format, "\t%.0f (%.0f KB)\t%.0f (%.0f KB)\t%.0f/1 -> %.0f/1     \t",
+                  protocolData -> requestBitsIn_[i], protocolData -> requestBitsIn_[i] / 8192,
+                      protocolData -> requestBitsOut_[i], protocolData -> requestBitsOut_[i] / 8192,
+                          protocolData -> requestBitsIn_[i] / protocolData -> requestCount_[i],
+                              protocolData -> requestBitsOut_[i] / protocolData -> requestCount_[i]);
+
+      strcat(buffer, format);
+
+      if (protocolData -> requestBitsOut_[i] > 0)
+      {
+        sprintf(format, "%5.3f:1\n", protocolData -> requestBitsIn_[i] /
+                                         protocolData -> requestBitsOut_[i]);
+
+        strcat(buffer, format);
+      }
+      else
+      {
+        strcat(buffer, "1:1\n");
+      }
+    }
+
+    countRequestIn        += protocolData -> requestCount_[i];
+    countCachedRequestIn  += protocolData -> requestCached_[i];
+    countRepliedRequestIn += protocolData -> requestReplied_[i];
+
+    countRequestBitsIn  += protocolData -> requestBitsIn_[i];
+    countRequestBitsOut += protocolData -> requestBitsOut_[i];
+
+    countAnyIn   += protocolData -> requestCount_[i];
+    countBitsIn  += protocolData -> requestBitsIn_[i];
+    countBitsOut += protocolData -> requestBitsOut_[i];
+  }
+
+  if (countRequestIn > 0)
+  {
+    if (countCachedRequestIn > 0)
+    {
+      sprintf(format, "\ntotal:  %.0f\t%.0f", countRequestIn, countCachedRequestIn);
+    }
+    else
+    {
+      sprintf(format, "\ntotal:  %.0f\t", countRequestIn);
+    }
+
+    strcat(buffer, format);
+
+    sprintf(format, "\t%.0f (%.0f KB)\t%.0f (%.0f KB)\t%.0f/1 -> %.0f/1     \t",
+                countRequestBitsIn, countRequestBitsIn / 8192, countRequestBitsOut,
+                    countRequestBitsOut / 8192, countRequestBitsIn / countRequestIn,
+                        countRequestBitsOut / countRequestIn);
+
+    strcat(buffer, format);
+
+    if (countRequestBitsOut > 0)
+    {
+      sprintf(format, "%5.3f:1\n", countRequestBitsIn / countRequestBitsOut);
+    }
+    else
+    {
+      sprintf(format, "1:1\n");
+    }
+
+    strcat(buffer, format);
+  }
+  else
+  {
+    strcat(buffer, "N/A\n\n");
+  }
+
+  //
+  // Print transport data.
+  //
+
+  getTimeStats(type, buffer);
+
+  countAnyIn   += protocolData -> cupsCount_;
+  countBitsIn  += protocolData -> cupsBitsIn_;
+  countBitsOut += protocolData -> cupsBitsOut_;
+
+  countAnyIn   += protocolData -> smbCount_;
+  countBitsIn  += protocolData -> smbBitsIn_;
+  countBitsOut += protocolData -> smbBitsOut_;
+
+  countAnyIn   += protocolData -> mediaCount_;
+  countBitsIn  += protocolData -> mediaBitsIn_;
+  countBitsOut += protocolData -> mediaBitsOut_;
+
+  countAnyIn   += protocolData -> httpCount_;
+  countBitsIn  += protocolData -> httpBitsIn_;
+  countBitsOut += protocolData -> httpBitsOut_;
+
+  countAnyIn   += protocolData -> fontCount_;
+  countBitsIn  += protocolData -> fontBitsIn_;
+  countBitsOut += protocolData -> fontBitsOut_;
+
+  countAnyIn   += protocolData -> slaveCount_;
+  countBitsIn  += protocolData -> slaveBitsIn_;
+  countBitsOut += protocolData -> slaveBitsOut_;
+
+  //
+  // Save the overall amount of bytes
+  // coming from X clients.
+  //
+
+  overallData -> overallBytesIn_ = countBitsIn / 8;
+
+  //
+  // Print performance data.
+  //
+
+  if (transportData -> readTime_ > 0)
+  {
+    sprintf(format, "      %.0f messages (%.0f KB) encoded per second.\n\n",
+                countAnyIn / (transportData -> readTime_ / 1000),
+                    (countBitsIn + transportData -> framingBitsOut_) / 8192 /
+                         (transportData -> readTime_ / 1000));
+  }
+  else
+  {
+    sprintf(format, "      %.0f messages (%.0f KB) encoded per second.\n\n",
+                countAnyIn, (countBitsIn + transportData ->
+                    framingBitsOut_) / 8192);
+  }
+
+  strcat(buffer, format);
+
+  strcat(buffer, "link: ");
+
+  //
+  // ZLIB compression stats.
+  //
+
+  getStreamStats(type, buffer);
+
+  //
+  // Save the overall amount of bytes
+  // sent on NX proxy link.
+  //
+
+  if (transportData -> compressedBytesOut_ > 0)
+  {
+    overallData -> overallBytesOut_ = transportData -> compressedBytesOut_;
+  }
+  else
+  {
+    overallData -> overallBytesOut_ = countBitsOut / 8;
+  }
+
+  //
+  // Print info on multiplexing overhead.
+  //
+
+  getFramingStats(type, buffer);
+
+  //
+  // Print stats about additional channels.
+  //
+
+  getServicesStats(type, buffer);
+
+  //
+  // Compression summary.
+  //
+
+  double ratio = 1;
+
+  if (transportData -> compressedBytesOut_ / 1024 > 0)
+  {
+    ratio = ((countBitsIn + transportData -> framingBitsOut_) / 8192) /
+                  (transportData -> compressedBytesOut_ / 1024);
+
+  }
+  else if (countBitsOut > 0)
+  {
+    ratio = (countBitsIn + transportData -> framingBitsOut_) /
+                 countBitsOut;
+  }
+
+  sprintf(format, "      Protocol compression ratio is %5.3f:1.\n\n",
+              ratio);
+
+  strcat(buffer, format);
+
+  getBitrateStats(type, buffer);
+
+  getSplitStats(type, buffer);
+
+  sprintf(format, "      %.0f total handled replies (%.0f unmatched).\n\n\n",
+              countRepliedRequestIn, protocolData -> requestReplied_[X_NXInternalGenericReply]);
+
+  strcat(buffer, format);
+
+  return 1;
+}
+
+int Statistics::getClientOverallStats(int type, char *&buffer)
+{
+  if (type != PARTIAL_STATS && type != TOTAL_STATS)
+  {
+    #ifdef PANIC
+    *logofs << "Statistics: PANIC! Cannot produce statistics "
+            << "with qualifier '" << type << "'.\n"
+            << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  struct T_overallData *overallData;
+  struct T_packedData  *packedData;
+
+  if (type == PARTIAL_STATS)
+  {
+    overallData = &overallPartial_;
+    packedData  = &packedPartial_;
+  }
+  else
+  {
+    overallData = &overallTotal_;
+    packedData = &packedTotal_;
+  }
+
+  char format[FORMAT_LENGTH];
+
+  //
+  // Print header including link type,
+  // followed by info on packed images.
+  //
+
+  strcat(buffer, "NX Compression Summary\n");
+  strcat(buffer, "----------------------\n\n");
+
+  char label[FORMAT_LENGTH];
+
+  switch (control -> LinkMode)
+  {
+    case LINK_TYPE_NONE:
+    {
+      strcpy(label, "NONE");
+
+      break;
+    }
+    case LINK_TYPE_MODEM:
+    {
+      strcpy(label, "MODEM");
+
+      break;
+    }
+    case LINK_TYPE_ISDN:
+    {
+      strcpy(label, "ISDN");
+
+      break;
+    }
+    case LINK_TYPE_ADSL:
+    {
+      strcpy(label, "ADSL");
+
+      break;
+    }
+    case LINK_TYPE_WAN:
+    {
+      strcpy(label, "WAN");
+
+      break;
+    }
+    case LINK_TYPE_LAN:
+    {
+      strcpy(label, "LAN");
+
+      break;
+    }
+    default:
+    {
+      strcpy(label, "Unknown");
+
+      break;
+    }
+  }
+
+  sprintf(format, "link:    %s", label);
+
+  if (control -> LocalDeltaCompression == 1)
+  {
+    strcat(format, " with protocol compression enabled.");
+  }
+  else
+  {
+    strcat(format, " with protocol compression disabled.");
+  }
+
+  strcat(format, "\n\n");
+
+  strcat(buffer, format);
+
+  if (packedData -> packedBytesIn_ > 0)
+  {
+    sprintf(format, "images:  %.0f bytes (%.0f KB) packed to %.0f (%.0f KB).\n\n",
+                packedData -> packedBytesOut_, packedData -> packedBytesOut_ / 1024,
+                    packedData -> packedBytesIn_, packedData -> packedBytesIn_ / 1024);
+
+    strcat(buffer, format);
+
+    sprintf(format, "         Images compression ratio is %5.3f:1.\n\n",
+                packedData -> packedBytesOut_ / packedData -> packedBytesIn_);
+
+    strcat(buffer, format);
+  }
+
+  double overallIn = overallData -> overallBytesIn_ - packedData -> packedBytesIn_ +
+                         packedData -> packedBytesOut_;
+
+  double overallOut = overallData -> overallBytesOut_;
+
+  sprintf(format, "overall: %.0f bytes (%.0f KB) in, %.0f bytes (%.0f KB) out.\n\n",
+              overallIn, overallIn / 1024, overallOut, overallOut / 1024);
+
+  strcat(buffer, format);
+
+  if (overallData -> overallBytesOut_ > 0)
+  {
+    sprintf(format, "         Overall NX server compression ratio is %5.3f:1.\n\n\n",
+                overallIn / overallOut);
+  }
+  else
+  {
+    sprintf(format, "         Overall NX server compression ratio is 1:1.\n\n\n");
+  }
+
+  strcat(buffer, format);
+
+  return 1;
+}
+
+int Statistics::getServerCacheStats(int type, char *&buffer)
+{
+  if (type != PARTIAL_STATS && type != TOTAL_STATS)
+  {
+    #ifdef PANIC
+    *logofs << "Statistics: PANIC! Cannot produce statistics "
+            << "with qualifier '" << type << "'.\n"
+            << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  //
+  // Print message cache data according
+  // to local and remote view.
+  //
+
+  MessageStore *currentStore = NULL;
+  MessageStore *anyStore     = NULL;
+
+  char format[FORMAT_LENGTH];
+
+  strcat(buffer, "\nNX Cache Statistics\n");
+  strcat(buffer, "-------------------\n\n");
+
+  for (int m = proxy_client; m <= proxy_server; m++)
+  {
+    if (m == proxy_client)
+    {
+      strcat(buffer, "Request\tCached\tSize at Server\t\tSize at Client\t\tCache limit\n");
+      strcat(buffer, "-------\t------\t--------------\t\t--------------\t\t-----------\n");
+    }
+    else
+    {
+      strcat(buffer, "\nReply\tCached\tSize at Server\t\tSize at Client\t\tCache limit\n");
+      strcat(buffer, "-----\t------\t--------------\t\t--------------\t\t-----------\n");
+    }
+
+    for (int i = 0; i < CHANNEL_STORE_OPCODE_LIMIT; i++)
+    {
+      if (m == proxy_client)
+      {
+        currentStore = proxy_ -> getClientStore() -> getRequestStore(i);
+      }
+      else
+      {
+        currentStore = proxy_ -> getServerStore() -> getReplyStore(i);
+      }
+
+      if (currentStore != NULL &&
+              (currentStore -> getLocalStorageSize() ||
+                   currentStore -> getRemoteStorageSize()))
+      {
+        anyStore = currentStore;
+
+        sprintf(format, "#%d\t%d\t", i, currentStore -> getSize());
+
+        strcat(buffer, format);
+
+        sprintf(format, "%d (%.0f KB)\t\t", currentStore -> getRemoteStorageSize(),
+                    ((double) currentStore -> getRemoteStorageSize()) / 1024);
+
+        strcat(buffer, format);
+
+        sprintf(format, "%d (%.0f KB)\t\t", currentStore -> getLocalStorageSize(),
+                    ((double) currentStore -> getLocalStorageSize()) / 1024);
+
+        strcat(buffer, format);
+
+        sprintf(format, "%d/%.0f KB\n", currentStore -> cacheSlots,
+                    ((double) control -> getUpperStorageSize() / 100 *
+                          currentStore -> cacheThreshold) / 1024);
+
+        strcat(buffer, format);
+      }
+    }
+
+    if (anyStore == NULL)
+    {
+      strcat(buffer, "N/A\n");
+    }
+  }
+
+  if (anyStore != NULL)
+  {
+    sprintf(format, "\ncache: %d bytes (%d KB) available at server.\n",
+                control -> ClientTotalStorageSize,
+                    control -> ClientTotalStorageSize / 1024);
+
+    strcat(buffer, format);
+
+    sprintf(format, "       %d bytes (%d KB) available at client.\n\n",
+                control -> ServerTotalStorageSize,
+                    control -> ServerTotalStorageSize / 1024);
+
+    strcat(buffer, format);
+
+    sprintf(format, "       %d bytes (%d KB) allocated at server.\n",
+                anyStore -> getRemoteTotalStorageSize(),
+                    anyStore -> getRemoteTotalStorageSize() / 1024);
+
+    strcat(buffer, format);
+
+    sprintf(format, "       %d bytes (%d KB) allocated at client.\n\n\n",
+                anyStore -> getLocalTotalStorageSize(),
+                    anyStore -> getLocalTotalStorageSize() / 1024);
+
+    strcat(buffer, format);
+  }
+  else
+  {
+    strcat(buffer, "\ncache: N/A\n\n");
+  }
+
+  return 1;
+}
+
+int Statistics::getServerProtocolStats(int type, char *&buffer)
+{
+  if (type != PARTIAL_STATS && type != TOTAL_STATS)
+  {
+    #ifdef PANIC
+    *logofs << "Statistics: PANIC! Cannot produce statistics "
+            << "with qualifier '" << type << "'.\n"
+            << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  struct T_transportData *transportData;
+  struct T_protocolData  *protocolData;
+  struct T_overallData   *overallData;
+
+  if (type == PARTIAL_STATS)
+  {
+    transportData = &transportPartial_;
+    protocolData = &protocolPartial_;
+    overallData = &overallPartial_;
+  }
+  else
+  {
+    transportData = &transportTotal_;
+    protocolData = &protocolTotal_;
+    overallData = &overallTotal_;
+  }
+
+  char format[FORMAT_LENGTH];
+
+  double countReplyBitsIn  = 0;
+  double countReplyBitsOut = 0;
+
+  double countReplyIn        = 0;
+  double countCachedReplyIn  = 0;
+
+  double countEventBitsIn  = 0;
+  double countEventBitsOut = 0;
+
+  double countEventIn        = 0;
+  double countCachedEventIn  = 0;
+
+  double countAnyIn   = 0;
+  double countBitsIn  = 0;
+  double countBitsOut = 0;
+
+  //
+  // Print reply data.
+  //
+
+  strcat(buffer, "NX Client Side Protocol Statistics\n");
+  strcat(buffer, "----------------------------------\n\n");
+
+  strcat(buffer, "Reply   Total\tCached\tBits In\t\tBits Out\tBits/Reply\t\tRatio\n");
+  strcat(buffer, "------- -----\t------\t-------\t\t--------\t----------\t\t-----\n");
+
+  for (int i = 0; i < STATISTICS_OPCODE_MAX; i++)
+  {
+    if (protocolData -> replyCount_[i])
+    {
+      sprintf(format, "#%d ", i);
+
+      while (strlen(format) < 5)
+      {
+        strcat(format, " ");
+      }
+
+      //
+      // Mark replies originated
+      // by NX agent requests.
+      //
+
+      if (i >= X_NXFirstOpcode && i <= X_NXLastOpcode)
+      {
+        strcat(format, "A");
+      }
+
+      //
+      // Mark replies that we didn't
+      // match against a request.
+      //
+
+      if (i == 1)
+      {
+        strcat(format, "U");
+      }
+
+      while (strlen(format) < 8)
+      {
+        strcat(format, " ");
+      }
+
+      strcat(buffer, format);
+
+      if (protocolData -> replyCached_[i] > 0)
+      {
+        sprintf(format, "%.0f\t%.0f", protocolData -> replyCount_[i],
+                    protocolData -> replyCached_[i]);
+      }
+      else
+      {
+        sprintf(format, "%.0f\t", protocolData -> replyCount_[i]);
+      }
+
+      strcat(buffer, format);
+
+      sprintf(format, "\t%.0f (%.0f KB)\t%.0f (%.0f KB)\t%.0f/1 -> %.0f/1     \t",
+                  protocolData -> replyBitsIn_[i], protocolData -> replyBitsIn_[i] / 8192,
+                      protocolData -> replyBitsOut_[i], protocolData -> replyBitsOut_[i] / 8192,
+                          protocolData -> replyBitsIn_[i] / protocolData -> replyCount_[i],
+                              protocolData -> replyBitsOut_[i] / protocolData -> replyCount_[i]);
+
+      strcat(buffer, format);
+
+      if (protocolData -> replyBitsOut_[i] > 0)
+      {
+        sprintf(format, "%5.3f:1\n", protocolData -> replyBitsIn_[i] /
+                                         protocolData -> replyBitsOut_[i]);
+      }
+      else
+      {
+        sprintf(format, "1:1\n");
+      }
+
+      strcat(buffer, format);
+    }
+
+    countReplyIn       += protocolData -> replyCount_[i];
+    countCachedReplyIn += protocolData -> replyCached_[i];
+
+    countReplyBitsIn  += protocolData -> replyBitsIn_[i];
+    countReplyBitsOut += protocolData -> replyBitsOut_[i];
+
+    countAnyIn   += protocolData -> replyCount_[i];
+    countBitsIn  += protocolData -> replyBitsIn_[i];
+    countBitsOut += protocolData -> replyBitsOut_[i];
+  }
+
+  if (countReplyIn > 0)
+  {
+    if (countCachedReplyIn > 0)
+    {
+      sprintf(format, "\ntotal:  %.0f\t%.0f", countReplyIn, countCachedReplyIn);
+    }
+    else
+    {
+      sprintf(format, "\ntotal:  %.0f\t", countReplyIn);
+    }
+
+    strcat(buffer, format);
+
+    sprintf(format, "\t%.0f (%.0f KB)\t%.0f (%.0f KB)\t%.0f/1 -> %.0f/1     \t",
+                countReplyBitsIn, countReplyBitsIn / 8192, countReplyBitsOut,
+                    countReplyBitsOut / 8192, countReplyBitsIn / countReplyIn,
+                        countReplyBitsOut / countReplyIn);
+
+    strcat(buffer, format);
+
+    if (countReplyBitsOut > 0)
+    {
+      sprintf(format, "%5.3f:1\n", countReplyBitsIn / countReplyBitsOut);
+    }
+    else
+    {
+      sprintf(format, "1:1\n");
+    }
+
+    strcat(buffer, format);
+  }
+  else
+  {
+    strcat(buffer, "N/A\n");
+  }
+
+  strcat(buffer, "\n");
+
+  //
+  // Print event and error data.
+  //
+
+  strcat(buffer, "Event   Total\tCached\tBits In\t\tBits Out\tBits/Event\t\tRatio\n");
+  strcat(buffer, "------- -----\t------\t-------\t\t--------\t----------\t\t-----\n");
+
+  for (int i = 0; i < STATISTICS_OPCODE_MAX; i++)
+  {
+    if (protocolData -> eventCount_[i])
+    {
+      sprintf(format, "#%d ", i);
+
+      while (strlen(format) < 8)
+      {
+        strcat(format, " ");
+      }
+
+      strcat(buffer, format);
+
+      if (protocolData -> eventCached_[i] > 0)
+      {
+        sprintf(format, "%.0f\t%.0f", protocolData -> eventCount_[i],
+                    protocolData -> eventCached_[i]);
+      }
+      else
+      {
+        sprintf(format, "%.0f\t", protocolData -> eventCount_[i]);
+      }
+
+      strcat(buffer, format);
+
+      sprintf(format, "\t%.0f (%.0f KB)\t%.0f (%.0f KB)\t%.0f/1 -> %.0f/1     \t",
+                  protocolData -> eventBitsIn_[i], protocolData -> eventBitsIn_[i] / 8192,
+                      protocolData -> eventBitsOut_[i], protocolData -> eventBitsOut_[i] / 8192,
+                          protocolData -> eventBitsIn_[i] / protocolData -> eventCount_[i],
+                              protocolData -> eventBitsOut_[i] / protocolData -> eventCount_[i]);
+
+      strcat(buffer, format);
+
+      if (protocolData -> eventBitsOut_[i] > 0)
+      {
+        sprintf(format, "%5.3f:1\n", protocolData -> eventBitsIn_[i] /
+                                         protocolData -> eventBitsOut_[i]);
+      }
+      else
+      {
+        sprintf(format, "1:1\n");
+      }
+
+      strcat(buffer, format);
+    }
+
+    countEventIn       += protocolData -> eventCount_[i];
+    countCachedEventIn += protocolData -> eventCached_[i];
+
+    countEventBitsIn  += protocolData -> eventBitsIn_[i];
+    countEventBitsOut += protocolData -> eventBitsOut_[i];
+
+    countAnyIn   += protocolData -> eventCount_[i];
+    countBitsIn  += protocolData -> eventBitsIn_[i];
+    countBitsOut += protocolData -> eventBitsOut_[i];
+  }
+
+  if (countEventIn > 0)
+  {
+    if (countCachedEventIn > 0)
+    {
+      sprintf(format, "\ntotal:  %.0f\t%.0f", countEventIn, countCachedEventIn);
+    }
+    else
+    {
+      sprintf(format, "\ntotal:  %.0f\t", countEventIn);
+    }
+
+    strcat(buffer, format);
+
+    sprintf(format, "\t%.0f (%.0f KB)\t%.0f (%.0f KB)\t%.0f/1 -> %.0f/1     \t",
+                countEventBitsIn, countEventBitsIn / 8192, countEventBitsOut,
+                    countEventBitsOut / 8192, countEventBitsIn / countEventIn,
+                        countEventBitsOut / countEventIn);
+
+    strcat(buffer, format);
+
+    if (countEventBitsOut > 0)
+    {
+      sprintf(format, "%5.3f:1\n", countEventBitsIn / countEventBitsOut);
+    }
+    else
+    {
+      sprintf(format, "1:1\n");
+    }
+
+    strcat(buffer, format);
+  }
+  else
+  {
+    strcat(buffer, "N/A\n\n");
+  }
+
+  //
+  // Print transport data.
+  //
+
+  getTimeStats(type, buffer);
+
+  countAnyIn   += protocolData -> cupsCount_;
+  countBitsIn  += protocolData -> cupsBitsIn_;
+  countBitsOut += protocolData -> cupsBitsOut_;
+
+  countAnyIn   += protocolData -> smbCount_;
+  countBitsIn  += protocolData -> smbBitsIn_;
+  countBitsOut += protocolData -> smbBitsOut_;
+
+  countAnyIn   += protocolData -> mediaCount_;
+  countBitsIn  += protocolData -> mediaBitsIn_;
+  countBitsOut += protocolData -> mediaBitsOut_;
+
+  countAnyIn   += protocolData -> httpCount_;
+  countBitsIn  += protocolData -> httpBitsIn_;
+  countBitsOut += protocolData -> httpBitsOut_;
+
+  countAnyIn   += protocolData -> fontCount_;
+  countBitsIn  += protocolData -> fontBitsIn_;
+  countBitsOut += protocolData -> fontBitsOut_;
+
+  countAnyIn   += protocolData -> slaveCount_;
+  countBitsIn  += protocolData -> slaveBitsIn_;
+  countBitsOut += protocolData -> slaveBitsOut_;
+
+  //
+  // Save the overall amount of bytes
+  // coming from X clients.
+  //
+
+  overallData -> overallBytesIn_ = countBitsIn / 8;
+
+  //
+  // Print performance data.
+  //
+
+  if (transportData -> readTime_ > 0)
+  {
+    sprintf(format, "      %.0f messages (%.0f KB) encoded per second.\n\n",
+                countAnyIn / (transportData -> readTime_ / 1000),
+                    (countBitsIn + transportData -> framingBitsOut_) / 8192 /
+                         (transportData -> readTime_ / 1000));
+  }
+  else
+  {
+    sprintf(format, "      %.0f messages (%.0f KB) encoded per second.\n\n",
+                countAnyIn, (countBitsIn + transportData ->
+                    framingBitsOut_) / 8192);
+  }
+
+  strcat(buffer, format);
+
+  strcat(buffer, "link: ");
+
+  //
+  // ZLIB compression stats.
+  //
+
+  getStreamStats(type, buffer);
+
+  //
+  // Save the overall amount of bytes
+  // sent on NX proxy link.
+  //
+
+  if (transportData -> compressedBytesOut_ > 0)
+  {
+    overallData -> overallBytesOut_ = transportData -> compressedBytesOut_;
+  }
+  else
+  {
+    overallData -> overallBytesOut_ = countBitsOut / 8;
+  }
+
+  //
+  // Print info on multiplexing overhead.
+  //
+
+  getFramingStats(type, buffer);
+
+  //
+  // Print stats about additional channels.
+  //
+
+  getServicesStats(type, buffer);
+
+  //
+  // Compression summary.
+  //
+
+  double ratio = 1;
+
+  if (transportData -> compressedBytesOut_ / 1024 > 0)
+  {
+    ratio = ((countBitsIn + transportData -> framingBitsOut_) / 8192) /
+                  (transportData -> compressedBytesOut_ / 1024);
+
+  }
+  else if (countBitsOut > 0)
+  {
+    ratio = (countBitsIn + transportData -> framingBitsOut_) /
+                 countBitsOut;
+  }
+
+  sprintf(format, "      Protocol compression ratio is %5.3f:1.\n\n",
+              ratio);
+
+  strcat(buffer, format);
+
+  getBitrateStats(type, buffer);
+
+  //
+  // These are not included in output.
+  //
+  // getSplitStats(type, buffer);
+  //
+
+  strcat(buffer, "\n");
+
+  //
+  // These statistics are not included in output.
+  // You can check it anyway to get the effective
+  // amount of bytes produced by unpack procedure.
+  //
+  // getClientOverallStats(type, buffer);
+  //
+
+  return 1;
+}
+
+int Statistics::getServerOverallStats(int type, char *&buffer)
+{
+  return 1;
+}
+
+int Statistics::getTimeStats(int type, char *&buffer)
+{
+  struct T_transportData *transportData;
+
+  if (type == PARTIAL_STATS)
+  {
+    transportData = &transportPartial_;
+  }
+  else
+  {
+    transportData = &transportTotal_;
+  }
+
+  char format[FORMAT_LENGTH];
+
+  sprintf(format, "\ntime: %.0f Ms idle, %.0f Ms (%.0f Ms in read, %.0f Ms in write) running.\n\n",
+              transportData -> idleTime_, transportData -> readTime_,
+                  transportData -> readTime_ - transportData -> writeTime_,
+                      transportData -> writeTime_);
+
+  strcat(buffer, format);
+
+  return 1;
+}
+
+int Statistics::getStreamStats(int type, char *&buffer)
+{
+  struct T_transportData *transportData;
+
+  if (type == PARTIAL_STATS)
+  {
+    transportData = &transportPartial_;
+  }
+  else
+  {
+    transportData = &transportTotal_;
+  }
+
+  char format[FORMAT_LENGTH];
+
+  if (transportData -> compressedBytesOut_ > 0)
+  {
+    sprintf(format, "%.0f bytes (%.0f KB) compressed to %.0f (%.0f KB).\n",
+                transportData -> compressedBytesIn_, transportData -> compressedBytesIn_ / 1024,
+                    transportData -> compressedBytesOut_, transportData -> compressedBytesOut_ / 1024);
+
+    strcat(buffer, format);
+
+    sprintf(format, "      %5.3f:1 stream compression ratio.\n\n",
+                transportData -> compressedBytesIn_ / transportData -> compressedBytesOut_);
+
+    strcat(buffer, format);
+  }
+
+  if (transportData -> decompressedBytesOut_ > 0)
+  {
+    if (transportData -> compressedBytesOut_ > 0)
+    {
+      strcat(buffer, "      ");
+    }
+
+    sprintf(format, "%.0f bytes (%.0f KB) decompressed to %.0f (%.0f KB).\n",
+                transportData -> decompressedBytesIn_, transportData -> decompressedBytesIn_ / 1024,
+                    transportData -> decompressedBytesOut_, transportData -> decompressedBytesOut_ / 1024);
+
+    strcat(buffer, format);
+
+    sprintf(format, "      %5.3f:1 stream compression ratio.\n\n",
+                transportData -> decompressedBytesOut_ / transportData -> decompressedBytesIn_);
+
+    strcat(buffer, format);
+  }
+
+  if (transportData -> compressedBytesOut_ > 0 ||
+          transportData -> decompressedBytesOut_ > 0)
+  {
+    strcat(buffer, "      ");
+  }
+
+  return 1;
+}
+
+int Statistics::getServicesStats(int type, char *&buffer)
+{
+  struct T_protocolData *protocolData;
+
+  if (type == PARTIAL_STATS)
+  {
+    protocolData = &protocolPartial_;
+  }
+  else
+  {
+    protocolData = &protocolTotal_;
+  }
+
+  char format[FORMAT_LENGTH];
+
+  if (protocolData -> cupsBitsOut_ > 0)
+  {
+    sprintf(format, "      %.0f CUPS messages, %.0f bytes (%.0f KB) in, %.0f bytes (%.0f KB) out.\n\n",
+                protocolData -> cupsCount_ , protocolData -> cupsBitsIn_ / 8,
+                    protocolData -> cupsBitsIn_ / 8192, protocolData -> cupsBitsOut_ / 8,
+                        protocolData -> cupsBitsOut_ / 8192);
+
+    strcat(buffer, format);
+  }
+
+  if (protocolData -> smbBitsOut_ > 0)
+  {
+    sprintf(format, "      %.0f SMB messages, %.0f bytes (%.0f KB) in, %.0f bytes (%.0f KB) out.\n\n",
+                protocolData -> smbCount_ , protocolData -> smbBitsIn_ / 8,
+                    protocolData -> smbBitsIn_ / 8192, protocolData -> smbBitsOut_ / 8,
+                        protocolData -> smbBitsOut_ / 8192);
+
+    strcat(buffer, format);
+  }
+
+  if (protocolData -> mediaBitsOut_ > 0)
+  {
+    sprintf(format, "      %.0f multimedia messages, %.0f bytes (%.0f KB) in, %.0f bytes (%.0f KB) out.\n\n",
+                protocolData -> mediaCount_ , protocolData -> mediaBitsIn_ / 8,
+                    protocolData -> mediaBitsIn_ / 8192, protocolData -> mediaBitsOut_ / 8,
+                        protocolData -> mediaBitsOut_ / 8192);
+
+    strcat(buffer, format);
+  }
+
+  if (protocolData -> httpBitsOut_ > 0)
+  {
+    sprintf(format, "      %.0f HTTP messages, %.0f bytes (%.0f KB) in, %.0f bytes (%.0f KB) out.\n\n",
+                protocolData -> httpCount_ , protocolData -> httpBitsIn_ / 8,
+                    protocolData -> httpBitsIn_ / 8192, protocolData -> httpBitsOut_ / 8,
+                        protocolData -> httpBitsOut_ / 8192);
+
+    strcat(buffer, format);
+  }
+
+  if (protocolData -> fontBitsOut_ > 0)
+  {
+    sprintf(format, "      %.0f font server messages, %.0f bytes (%.0f KB) in, %.0f bytes (%.0f KB) out.\n\n",
+                protocolData -> fontCount_ , protocolData -> fontBitsIn_ / 8,
+                    protocolData -> fontBitsIn_ / 8192, protocolData -> fontBitsOut_ / 8,
+                        protocolData -> fontBitsOut_ / 8192);
+
+    strcat(buffer, format);
+  }
+
+  if (protocolData -> slaveBitsOut_ > 0)
+  {
+    sprintf(format, "      %.0f slave messages, %.0f bytes (%.0f KB) in, %.0f bytes (%.0f KB) out.\n\n",
+                protocolData -> slaveCount_ , protocolData -> slaveBitsIn_ / 8,
+                    protocolData -> slaveBitsIn_ / 8192, protocolData -> slaveBitsOut_ / 8,
+                        protocolData -> slaveBitsOut_ / 8192);
+
+    strcat(buffer, format);
+  }
+
+  return 1;
+}
+
+int Statistics::getFramingStats(int type, char *&buffer)
+{
+  struct T_transportData *transportData;
+
+  if (type == PARTIAL_STATS)
+  {
+    transportData = &transportPartial_;
+  }
+  else
+  {
+    transportData = &transportTotal_;
+  }
+
+  char format[FORMAT_LENGTH];
+
+  //
+  // Print info on multiplexing overhead.
+  //
+
+  sprintf(format, "%.0f frames in, %.0f frames out, %.0f writes out.\n\n",
+              transportData -> proxyFramesIn_, transportData -> proxyFramesOut_,
+                  transportData -> proxyWritesOut_);
+
+  strcat(buffer, format);
+
+  sprintf(format, "      %.0f bytes (%.0f KB) used for framing and multiplexing.\n\n",
+              transportData -> framingBitsOut_ / 8, transportData -> framingBitsOut_ / 8192);
+
+  strcat(buffer, format);
+
+  return 1;
+}
+
+int Statistics::getBitrateStats(int type, char *&buffer)
+{
+  struct T_transportData *transportData;
+  struct T_overallData   *overallData;
+
+  if (type == PARTIAL_STATS)
+  {
+    transportData = &transportPartial_;
+    overallData = &overallPartial_;
+  }
+  else
+  {
+    transportData = &transportTotal_;
+    overallData = &overallTotal_;
+  }
+
+  double total = 0;
+
+  if (transportData -> idleTime_ + transportData -> readTime_ > 0)
+  {
+    total = overallData -> overallBytesOut_ /
+                ((transportData -> idleTime_ + transportData -> readTime_) / 1000);
+  }
+
+  char format[FORMAT_LENGTH];
+
+  sprintf(format, "      %.0f B/s average, %d B/s %ds, %d B/s %ds, %d B/s maximum.\n\n",
+              total, getBitrateInShortFrame(), control -> ShortBitrateTimeFrame / 1000,
+                  getBitrateInLongFrame(), control -> LongBitrateTimeFrame / 1000,
+                      getTopBitrate());
+
+  strcat(buffer, format);
+
+  resetTopBitrate();
+
+  return 1;
+}
+
+int Statistics::getSplitStats(int type, char *&buffer)
+{
+  //
+  // Don't print these statistics if persistent
+  // cache of images is disabled.
+  //
+
+  if (control -> ImageCacheEnableLoad == 0 &&
+          control -> ImageCacheEnableSave == 0)
+  {
+    return 0;
+  }
+
+  struct T_splitData *splitData;
+
+  if (type == PARTIAL_STATS)
+  {
+    splitData = &splitPartial_;
+  }
+  else
+  {
+    splitData = &splitTotal_;
+  }
+
+  char format[FORMAT_LENGTH];
+
+  //
+  // Print info on split messages restored from disk.
+  //
+
+  sprintf(format, "      %.0f images streamed, %.0f restored, %.0f bytes (%.0f KB) cached.\n\n",
+              splitData -> splitCount_, splitData -> splitAborted_, splitData -> splitAbortedBytesOut_,
+                  splitData -> splitAbortedBytesOut_ / 1024);
+
+  strcat(buffer, format);
+
+  return 1;
+}
diff --git a/nxcomp/src/Statistics.h b/nxcomp/src/Statistics.h
new file mode 100644
index 000000000..1ffb6b5d6
--- /dev/null
+++ b/nxcomp/src/Statistics.h
@@ -0,0 +1,745 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef Statistics_H
+#define Statistics_H
+
+#include "NXproto.h"
+
+#include "Misc.h"
+#include "Timestamp.h"
+
+class Proxy;
+
+//
+// Opcode 255 is for generic requests, 1 is for
+// generic replies (those which haven't a speci-
+// fic differential encoding), opcode 0 is for
+// generic messages from the auxiliary channels.
+//
+
+#define STATISTICS_OPCODE_MAX       256
+
+//
+// Maximum length of the buffer allocated for
+// the statistics output.
+//
+
+#define STATISTICS_LENGTH           16384
+
+//
+// Query type.
+//
+
+#define TOTAL_STATS                 1
+#define PARTIAL_STATS               2
+#define NO_STATS                    3
+
+//
+// Log level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+//
+// Log the operations related to updating
+// the control tokens.
+//
+
+#undef  TOKEN
+
+class Statistics
+{
+  public:
+
+  //
+  // Use the proxy class to get access
+  // to the message stores.
+  //
+
+  Statistics(Proxy *proxy);
+
+  ~Statistics();
+
+  void addIdleTime(unsigned int numMs)
+  {
+    transportPartial_.idleTime_ += numMs;
+    transportTotal_.idleTime_ += numMs;
+  }
+
+  void subIdleTime(unsigned int numMs)
+  {
+    transportPartial_.idleTime_ -= numMs;
+    transportTotal_.idleTime_ -= numMs;
+  }
+
+  void addReadTime(unsigned int numMs)
+  {
+    transportPartial_.readTime_ += numMs;
+    transportTotal_.readTime_ += numMs;
+  }
+
+  void subReadTime(unsigned int numMs)
+  {
+    transportPartial_.readTime_ -= numMs;
+    transportTotal_.readTime_ -= numMs;
+  }
+
+  void addWriteTime(unsigned int numMs)
+  {
+    transportPartial_.writeTime_ += numMs;
+    transportTotal_.writeTime_ += numMs;
+  }
+
+  void subWriteTime(unsigned int numMs)
+  {
+    transportPartial_.writeTime_ -= numMs;
+    transportTotal_.writeTime_ -= numMs;
+  }
+
+  void addBytesIn(unsigned int numBytes)
+  {
+    transportPartial_.proxyBytesIn_ += numBytes;
+    transportTotal_.proxyBytesIn_ += numBytes;
+  }
+
+  double getBytesIn()
+  {
+    return transportTotal_.proxyBytesIn_;
+  }
+
+  void addBytesOut(unsigned int numBytes)
+  {
+    transportPartial_.proxyBytesOut_ += numBytes;
+    transportTotal_.proxyBytesOut_ += numBytes;
+  }
+
+  double getBytesOut()
+  {
+    return transportTotal_.proxyBytesOut_;
+  }
+
+  void addFrameIn()
+  {
+    transportPartial_.proxyFramesIn_++;
+    transportTotal_.proxyFramesIn_++;
+
+    #ifdef TEST
+    *logofs << "Statistics: Updated total proxy frames in to "
+            << transportTotal_.proxyFramesIn_ << " at "
+            << strMsTimestamp() << ".\n" << logofs_flush;
+    #endif
+  }
+
+  void addFrameOut()
+  {
+    transportPartial_.proxyFramesOut_++;
+    transportTotal_.proxyFramesOut_++;
+
+    #ifdef TEST
+    *logofs << "Statistics: Updated total proxy frames out to "
+            << transportTotal_.proxyFramesOut_ << " at "
+            << strMsTimestamp() << ".\n"
+            << logofs_flush;
+    #endif
+  }
+
+  void addWriteOut()
+  {
+    transportPartial_.proxyWritesOut_++;
+    transportTotal_.proxyWritesOut_++;
+
+    #ifdef TEST
+    *logofs << "Statistics: Updated total proxy writes out to "
+            << transportTotal_.proxyWritesOut_ << " at "
+            << strMsTimestamp() << ".\n" << logofs_flush;
+    #endif
+  }
+
+  void addCompressedBytes(unsigned int bytesIn, unsigned int bytesOut);
+
+  void addDecompressedBytes(unsigned int bytesIn, unsigned int bytesOut)
+  {
+    transportPartial_.decompressedBytesIn_ += bytesIn;
+    transportTotal_.decompressedBytesIn_ += bytesIn;
+
+    transportPartial_.decompressedBytesOut_ += bytesOut;
+    transportTotal_.decompressedBytesOut_ += bytesOut;
+  }
+
+  void addFramingBits(unsigned int bitsOut)
+  {
+    transportPartial_.framingBitsOut_ += bitsOut;
+    transportTotal_.framingBitsOut_ += bitsOut;
+
+    proxyData_.protocolCount_ += bitsOut;
+  }
+
+  void addCachedRequest(unsigned int opcode)
+  {
+    protocolPartial_.requestCached_[opcode]++;
+    protocolTotal_.requestCached_[opcode]++;
+  }
+
+  void addRenderCachedRequest(unsigned int opcode)
+  {
+    protocolPartial_.renderRequestCached_[opcode]++;
+    protocolTotal_.renderRequestCached_[opcode]++;
+  }
+
+  void addRepliedRequest(unsigned int opcode)
+  {
+    protocolPartial_.requestReplied_[opcode]++;
+    protocolTotal_.requestReplied_[opcode]++;
+  }
+
+  void addCachedReply(unsigned int opcode)
+  {
+    protocolPartial_.replyCached_[opcode]++;
+    protocolTotal_.replyCached_[opcode]++;
+  }
+
+  void addRequestBits(unsigned int opcode, unsigned int bitsIn, unsigned int bitsOut)
+  {
+    #ifdef DEBUG
+    *logofs << "Statistcs: Added " << bitsIn << " bits in and "
+            << bitsOut << " bits out to opcode " << opcode
+            << ".\n" << logofs_flush;
+    #endif
+
+    protocolPartial_.requestCount_[opcode]++;
+    protocolTotal_.requestCount_[opcode]++;
+
+    protocolPartial_.requestBitsIn_[opcode] += bitsIn;
+    protocolTotal_.requestBitsIn_[opcode] += bitsIn;
+
+    protocolPartial_.requestBitsOut_[opcode] += bitsOut;
+    protocolTotal_.requestBitsOut_[opcode] += bitsOut;
+
+    //
+    // Don't account the split bits
+    // to the control token.
+    //
+
+    if (opcode != X_NXSplitData && opcode != X_NXSplitEvent)
+    {
+      proxyData_.protocolCount_ += bitsOut;
+    }
+  }
+
+  void addRenderRequestBits(unsigned int opcode, unsigned int bitsIn, unsigned int bitsOut)
+  {
+    #ifdef DEBUG
+    *logofs << "Statistcs: Added " << bitsIn << " bits in and "
+            << bitsOut << " bits out to render opcode " << opcode
+            << ".\n" << logofs_flush;
+    #endif
+
+    protocolPartial_.renderRequestCount_[opcode]++;
+    protocolTotal_.renderRequestCount_[opcode]++;
+
+    protocolPartial_.renderRequestBitsIn_[opcode] += bitsIn;
+    protocolTotal_.renderRequestBitsIn_[opcode] += bitsIn;
+
+    protocolPartial_.renderRequestBitsOut_[opcode] += bitsOut;
+    protocolTotal_.renderRequestBitsOut_[opcode] += bitsOut;
+  }
+
+  void addReplyBits(unsigned int opcode, unsigned int bitsIn, unsigned int bitsOut)
+  {
+    protocolPartial_.replyCount_[opcode]++;
+    protocolTotal_.replyCount_[opcode]++;
+
+    protocolPartial_.replyBitsIn_[opcode] += bitsIn;
+    protocolTotal_.replyBitsIn_[opcode] += bitsIn;
+
+    protocolPartial_.replyBitsOut_[opcode] += bitsOut;
+    protocolTotal_.replyBitsOut_[opcode] += bitsOut;
+
+    proxyData_.protocolCount_ += bitsOut;
+  }
+
+  void addEventBits(unsigned int opcode, unsigned int bitsIn, unsigned int bitsOut)
+  {
+    protocolPartial_.eventCount_[opcode]++;
+    protocolTotal_.eventCount_[opcode]++;
+
+    protocolPartial_.eventBitsIn_[opcode] += bitsIn;
+    protocolTotal_.eventBitsIn_[opcode] += bitsIn;
+
+    protocolPartial_.eventBitsOut_[opcode] += bitsOut;
+    protocolTotal_.eventBitsOut_[opcode] += bitsOut;
+
+    proxyData_.protocolCount_ += bitsOut;
+  }
+
+  void addCupsBits(unsigned int bitsIn, unsigned int bitsOut)
+  {
+    protocolPartial_.cupsCount_++;
+    protocolTotal_.cupsCount_++;
+
+    protocolPartial_.cupsBitsIn_ += bitsIn;
+    protocolTotal_.cupsBitsIn_ += bitsIn;
+
+    protocolPartial_.cupsBitsOut_ += bitsOut;
+    protocolTotal_.cupsBitsOut_ += bitsOut;
+  }
+
+  void addSmbBits(unsigned int bitsIn, unsigned int bitsOut)
+  {
+    protocolPartial_.smbCount_++;
+    protocolTotal_.smbCount_++;
+
+    protocolPartial_.smbBitsIn_ += bitsIn;
+    protocolTotal_.smbBitsIn_ += bitsIn;
+
+    protocolPartial_.smbBitsOut_ += bitsOut;
+    protocolTotal_.smbBitsOut_ += bitsOut;
+  }
+
+  void addMediaBits(unsigned int bitsIn, unsigned int bitsOut)
+  {
+    protocolPartial_.mediaCount_++;
+    protocolTotal_.mediaCount_++;
+
+    protocolPartial_.mediaBitsIn_ += bitsIn;
+    protocolTotal_.mediaBitsIn_ += bitsIn;
+
+    protocolPartial_.mediaBitsOut_ += bitsOut;
+    protocolTotal_.mediaBitsOut_ += bitsOut;
+  }
+
+  void addHttpBits(unsigned int bitsIn, unsigned int bitsOut)
+  {
+    protocolPartial_.httpCount_++;
+    protocolTotal_.httpCount_++;
+
+    protocolPartial_.httpBitsIn_ += bitsIn;
+    protocolTotal_.httpBitsIn_ += bitsIn;
+
+    protocolPartial_.httpBitsOut_ += bitsOut;
+    protocolTotal_.httpBitsOut_ += bitsOut;
+  }
+
+  void addFontBits(unsigned int bitsIn, unsigned int bitsOut)
+  {
+    protocolPartial_.fontCount_++;
+    protocolTotal_.fontCount_++;
+
+    protocolPartial_.fontBitsIn_ += bitsIn;
+    protocolTotal_.fontBitsIn_ += bitsIn;
+
+    protocolPartial_.fontBitsOut_ += bitsOut;
+    protocolTotal_.fontBitsOut_ += bitsOut;
+  }
+
+  void addSlaveBits(unsigned int bitsIn, unsigned int bitsOut)
+  {
+    protocolPartial_.slaveCount_++;
+    protocolTotal_.slaveCount_++;
+
+    protocolPartial_.slaveBitsIn_ += bitsIn;
+    protocolTotal_.slaveBitsIn_ += bitsIn;
+
+    protocolPartial_.slaveBitsOut_ += bitsOut;
+    protocolTotal_.slaveBitsOut_ += bitsOut;
+  }
+
+  void addPackedBytesIn(unsigned int numBytes)
+  {
+    packedPartial_.packedBytesIn_ += numBytes;
+    packedTotal_.packedBytesIn_ += numBytes;
+  }
+
+  void addPackedBytesOut(unsigned int numBytes)
+  {
+    packedPartial_.packedBytesOut_ += numBytes;
+    packedTotal_.packedBytesOut_ += numBytes;
+  }
+
+  void addSplit()
+  {
+    splitPartial_.splitCount_++;
+    splitTotal_.splitCount_++;
+  }
+
+  void addSplitAborted()
+  {
+    splitPartial_.splitAborted_++;
+    splitTotal_.splitAborted_++;
+  }
+
+  void addSplitAbortedBytesOut(unsigned int numBytes)
+  {
+    splitPartial_.splitAbortedBytesOut_ += numBytes;
+    splitTotal_.splitAbortedBytesOut_ += numBytes;
+  }
+
+  //
+  // Add the recorded protocol data to the proxy
+  // token counters. We want to send bpth the token
+  // request message and the data payload using a
+  // single system write, so we must guess how many
+  // output bytes we will generate.
+  //
+
+  void updateControlToken(int &count)
+  {
+    //
+    // Total is the total number of protocol bytes
+    // generated so far. We have saved the number
+    // of bytes generated the last time the function
+    // was called so we can calculate the difference.
+    //
+    // The number of protocol bits is updated as soon
+    // as new bits are accumulated, to avoid summing
+    // up all the opcodes in this routine. We add a
+    // byte to the control bytes difference to account
+    // for the framing bits that are very likely to
+    // be added to the payload.
+    //
+
+    double total = proxyData_.protocolCount_ / 8;
+
+    double diff = total - proxyData_.controlCount_ + 1;
+
+    #if defined(TEST) || defined(TOKEN)
+    *logofs << "Statistics: TOKEN! Protocol bytes are "
+            << total  << " control bytes are "
+            << proxyData_.controlCount_ << " difference is "
+            << diff << ".\n" << logofs_flush;
+    #endif
+
+    count += (int) (diff / proxyData_.streamRatio_);
+
+    #if defined(TEST) || defined(TOKEN)
+    *logofs << "Statistics: TOKEN! Adding "
+            << (int) (diff / proxyData_.streamRatio_)
+            << " bytes to the control token with ratio "
+            << proxyData_.streamRatio_ << ".\n"
+            << logofs_flush;
+    #endif
+
+    proxyData_.controlCount_ = total;
+
+    #if defined(TEST) || defined(TOKEN)
+    *logofs << "Statistics: TOKEN! New control token has "
+            << count << " bytes with total control bytes "
+            << proxyData_.controlCount_ << ".\n"
+            << logofs_flush;
+    #endif
+  }
+
+  void updateSplitToken(int &count)
+  {
+    double total = (protocolTotal_.requestBitsOut_[X_NXSplitData] +
+                        protocolTotal_.eventBitsOut_[X_NXSplitEvent]) / 8;
+
+    double diff = total - proxyData_.splitCount_;
+
+    #if defined(TEST) || defined(TOKEN)
+    *logofs << "Statistics: TOKEN! Protocol bytes are "
+            << total  << " split bytes are "
+            << proxyData_.splitCount_ << " difference is "
+            << diff << ".\n" << logofs_flush;
+    #endif
+
+    count += (int) (diff / proxyData_.streamRatio_);
+
+    #if defined(TEST) || defined(TOKEN)
+    *logofs << "Statistics: TOKEN! Adding "
+            << (int) (diff / proxyData_.streamRatio_)
+            << " bytes to the split token with ratio "
+            << proxyData_.streamRatio_ << ".\n"
+            << logofs_flush;
+    #endif
+
+    proxyData_.splitCount_ = total;
+
+    #if defined(TEST) || defined(TOKEN)
+    *logofs << "Statistics: TOKEN! New split token has "
+            << count << " bytes with total split bytes "
+            << proxyData_.splitCount_ << ".\n"
+            << logofs_flush;
+    #endif
+  }
+
+  void updateDataToken(int &count)
+  {
+    double total = (protocolTotal_.cupsBitsOut_ +
+                        protocolTotal_.smbBitsOut_ +
+                            protocolTotal_.mediaBitsOut_ +
+                                protocolTotal_.httpBitsOut_ +
+                                    protocolTotal_.fontBitsOut_ +
+                                        protocolTotal_.slaveBitsOut_) / 8;
+
+    double diff = total - proxyData_.dataCount_;
+
+    #if defined(TEST) || defined(TOKEN)
+    *logofs << "Statistics: TOKEN! Protocol bytes are "
+            << total  << " data bytes are "
+            << proxyData_.dataCount_ << " difference is "
+            << diff << ".\n" << logofs_flush;
+    #endif
+
+    count += (int) (diff / proxyData_.streamRatio_);
+
+    #if defined(TEST) || defined(TOKEN)
+    *logofs << "Statistics: TOKEN! Adding "
+            << (int) (diff / proxyData_.streamRatio_)
+            << " bytes to the data token with ratio "
+            << proxyData_.streamRatio_ << ".\n"
+            << logofs_flush;
+    #endif
+
+    proxyData_.dataCount_ = total;
+
+    #if defined(TEST) || defined(TOKEN)
+    *logofs << "Statistics: TOKEN! New data token has "
+            << count << " bytes with total data bytes "
+            << proxyData_.dataCount_ << ".\n"
+            << logofs_flush;
+    #endif
+  }
+
+  //
+  // Update the current bitrate.
+  //
+
+  void updateBitrate(int bytes);
+
+  //
+  // Return the current bitrate.
+  //
+
+  int getBitrateInShortFrame()
+  {
+    return bitrateInShortFrame_;
+  }
+
+  int getBitrateInLongFrame()
+  {
+    return bitrateInLongFrame_;
+  }
+
+  int getTopBitrate()
+  {
+    return topBitrate_;
+  }
+
+  void resetTopBitrate()
+  {
+    topBitrate_ = 0;
+  }
+
+  double getStreamRatio()
+  {
+    return proxyData_.streamRatio_;
+  }
+
+  //
+  // Manage the congestion level.
+  //
+
+  void updateCongestion(int remaining, int limit);
+
+  double getCongestionInFrame()
+  {
+    return congestionInFrame_;
+  }
+
+  //
+  // Produce a dump of the statistics on
+  // the provided buffer.
+  //
+
+  int getClientCacheStats(int type, char *&buffer);
+  int getClientProtocolStats(int type, char *&buffer);
+  int getClientOverallStats(int type, char *&buffer);
+
+  int getServerCacheStats(int type, char *&buffer);
+  int getServerProtocolStats(int type, char *&buffer);
+  int getServerOverallStats(int type, char *&buffer);
+
+  int resetPartialStats();
+
+  private:
+
+  int getTimeStats(int type, char *&buffer);
+  int getServicesStats(int type, char *&buffer);
+  int getFramingStats(int type, char *&buffer);
+  int getBitrateStats(int type, char *&buffer);
+  int getStreamStats(int type, char *&buffer);
+  int getSplitStats(int type, char *&buffer);
+
+  struct T_protocolData
+  {
+    double requestCached_[STATISTICS_OPCODE_MAX];
+    double requestReplied_[STATISTICS_OPCODE_MAX];
+    double requestCount_[STATISTICS_OPCODE_MAX];
+    double requestBitsIn_[STATISTICS_OPCODE_MAX];
+    double requestBitsOut_[STATISTICS_OPCODE_MAX];
+
+    double renderRequestCached_[STATISTICS_OPCODE_MAX];
+    double renderRequestCount_[STATISTICS_OPCODE_MAX];
+    double renderRequestBitsIn_[STATISTICS_OPCODE_MAX];
+    double renderRequestBitsOut_[STATISTICS_OPCODE_MAX];
+
+    double replyCached_[STATISTICS_OPCODE_MAX];
+    double replyCount_[STATISTICS_OPCODE_MAX];
+    double replyBitsIn_[STATISTICS_OPCODE_MAX];
+    double replyBitsOut_[STATISTICS_OPCODE_MAX];
+
+    double eventCached_[STATISTICS_OPCODE_MAX];
+    double eventCount_[STATISTICS_OPCODE_MAX];
+    double eventBitsIn_[STATISTICS_OPCODE_MAX];
+    double eventBitsOut_[STATISTICS_OPCODE_MAX];
+
+    double cupsCount_;
+    double cupsBitsIn_;
+    double cupsBitsOut_;
+
+    double smbCount_;
+    double smbBitsIn_;
+    double smbBitsOut_;
+
+    double mediaCount_;
+    double mediaBitsIn_;
+    double mediaBitsOut_;
+
+    double httpCount_;
+    double httpBitsIn_;
+    double httpBitsOut_;
+
+    double fontCount_;
+    double fontBitsIn_;
+    double fontBitsOut_;
+
+    double slaveCount_;
+    double slaveBitsIn_;
+    double slaveBitsOut_;
+  };
+
+  struct T_transportData
+  {
+    double idleTime_;
+    double readTime_;
+    double writeTime_;
+
+    double proxyBytesIn_;
+    double proxyBytesOut_;
+
+    double proxyFramesIn_;
+    double proxyFramesOut_;
+    double proxyWritesOut_;
+
+    double compressedBytesIn_;
+    double compressedBytesOut_;
+
+    double decompressedBytesIn_;
+    double decompressedBytesOut_;
+
+    double framingBitsOut_;
+  };
+
+  struct T_packedData
+  {
+    double packedBytesIn_;
+    double packedBytesOut_;
+  };
+
+  struct T_splitData
+  {
+    double splitCount_;
+    double splitAborted_;
+    double splitAbortedBytesOut_;
+  };
+
+  struct T_overallData
+  {
+    double overallBytesIn_;
+    double overallBytesOut_;
+  };
+
+  struct T_proxyData
+  {
+    double protocolCount_;
+    double controlCount_;
+    double splitCount_;
+    double dataCount_;
+
+    double streamRatio_;
+  };
+
+  T_protocolData protocolPartial_;
+  T_protocolData protocolTotal_;
+
+  T_transportData transportPartial_;
+  T_transportData transportTotal_;
+
+  T_packedData packedPartial_;
+  T_packedData packedTotal_;
+
+  T_splitData splitPartial_;
+  T_splitData splitTotal_;
+
+  T_overallData overallPartial_;
+  T_overallData overallTotal_;
+
+  T_proxyData proxyData_;
+
+  //
+  // Used to calculate the bandwidth usage
+  // of the proxy link.
+  //
+
+  T_timestamp startShortFrameTs_;
+  T_timestamp startLongFrameTs_;
+  T_timestamp startFrameTs_;
+
+  int bytesInShortFrame_;
+  int bytesInLongFrame_;
+
+  int bitrateInShortFrame_;
+  int bitrateInLongFrame_;
+
+  int topBitrate_;
+
+  double congestionInFrame_;
+
+  //
+  // Need the proxy pointer to print the
+  // statistics related to the client and
+  // server stores and to add the protocol
+  // data to the proxy token accumulators.
+  //
+
+  Proxy *proxy_;
+};
+
+#endif /* Statistics_H */
diff --git a/nxcomp/src/Timestamp.cpp b/nxcomp/src/Timestamp.cpp
new file mode 100644
index 000000000..e7e0c494a
--- /dev/null
+++ b/nxcomp/src/Timestamp.cpp
@@ -0,0 +1,77 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "Timestamp.h"
+
+//
+// Log level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+//
+// Last timestamp taken from the system.
+//
+
+T_timestamp timestamp;
+
+//
+// The following functions all use the ctime
+// static buffer from the C library.
+//
+
+char *strTimestamp(const T_timestamp &ts)
+{
+  char *ctime_now = ctime((time_t *) &ts.tv_sec);
+
+  ctime_now[24] = '\0';
+
+  return ctime_now;
+}
+
+//
+// This is especially dirty. 
+//
+
+char *strMsTimestamp(const T_timestamp &ts)
+{
+  char *ctime_now = ctime((time_t *) &ts.tv_sec);
+
+  char ctime_new[25];
+
+  sprintf(ctime_new, "%.8s:%3.3f", ctime_now + 11,
+              (float) ts.tv_usec / 1000);
+
+  strncpy(ctime_now, ctime_new, 24);
+
+  return ctime_now;
+}
diff --git a/nxcomp/src/Timestamp.h b/nxcomp/src/Timestamp.h
new file mode 100644
index 000000000..604f5a3bc
--- /dev/null
+++ b/nxcomp/src/Timestamp.h
@@ -0,0 +1,307 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef Timestamp_H
+#define Timestamp_H
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <time.h>
+#include <sys/time.h>
+
+#include "Misc.h"
+
+//
+// Log level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+//
+// If not defined, always query the system time.
+//
+
+#undef  CACHE_TIMESTAMP
+
+//
+// Log a warning if the time difference since
+// the last update exceeds the given number
+// of milliseconds.
+//
+
+#define DRIFT_TIMESTAMP  1
+
+//
+// Type used for timeout manipulation.
+//
+
+typedef struct timeval T_timestamp;
+
+//
+// Last timestamp taken from the system. If the
+// timestamp is cached, we need to explicitly
+// get a new timestamp after any operation that
+// may have required a relevant amount of time.
+//
+
+extern T_timestamp timestamp;
+
+//
+// Get a timestamp instance with values set
+// at the given amount of milliseconds.
+//
+
+inline T_timestamp getTimestamp(long ms)
+{
+  struct timeval ts;
+
+  ts.tv_sec  = ms / 1000;
+  ts.tv_usec = (ms % 1000) * 1000;
+
+  return ts;
+}
+
+//
+// Return the difference in milliseconds
+// between the two timestamps.
+//
+
+inline long diffTimestamp(const T_timestamp &ts1, const T_timestamp &ts2)
+{
+  //
+  // Add 500 microseconds to round up
+  // to the nearest millisecond.
+  //
+
+  return ((ts2.tv_sec * 1000 + (ts2.tv_usec + 500) / 1000) -
+             (ts1.tv_sec * 1000 + (ts1.tv_usec + 500) / 1000));
+}
+
+//
+// The same in microseconds. It doesn't
+// round the value.
+//
+
+inline long diffUsTimestamp(const T_timestamp &ts1, const T_timestamp &ts2)
+{
+  return ((ts2.tv_sec * 1000000 + ts2.tv_usec) -
+             (ts1.tv_sec * 1000000 + ts1.tv_usec));
+}
+
+//
+// Return the last timestamp taken from the
+// system. It doesn't update the timestamp.
+//
+
+inline T_timestamp getTimestamp()
+{
+  #ifdef CACHE_TIMESTAMP
+
+  #ifdef TEST
+
+  T_timestamp ts;
+
+  gettimeofday(&ts, NULL);
+
+  long diffTs = diffTimestamp(timestamp, ts);
+
+  if (diffTs > DRIFT_TIMESTAMP)
+  {
+    *logofs << "Timestamp: WARNING! Time difference since the "
+            << "current timestamp is " << diffTs << " Ms.\n"
+            << logofs_flush;
+  }
+
+  #endif
+
+  return timestamp;
+
+  #else
+
+  gettimeofday(&timestamp, NULL);
+
+  return timestamp;
+
+  #endif
+}
+
+inline T_timestamp &setTimestamp(T_timestamp &ts, long ms)
+{
+  ts.tv_sec  = ms / 1000;
+  ts.tv_usec = (ms % 1000) * 1000;
+
+  return ts;
+}
+
+//
+// Return the smaller between two timestamps.
+//
+
+inline T_timestamp &setMinTimestamp(T_timestamp &ts, long ms)
+{
+  if ((ts.tv_sec * 1000 + ts.tv_usec / 1000) > ms)
+  {
+    ts.tv_sec  = ms / 1000;
+    ts.tv_usec = (ms % 1000) * 1000;
+  }
+
+  return ts;
+}
+
+inline T_timestamp &setMinTimestamp(T_timestamp &ts1, T_timestamp &ts2)
+{
+  if ((ts1.tv_sec * 1000000 + ts1.tv_usec) >
+           (ts2.tv_sec * 1000000 + ts2.tv_usec))
+  {
+    ts1.tv_sec  = ts2.tv_sec;
+    ts1.tv_usec = ts2.tv_usec;
+  }
+
+  return ts1;
+}
+
+//
+// Convert a timestamp in the total number
+// of milliseconds.
+//
+
+inline long getMsTimestamp(const T_timestamp &ts)
+{
+  return ts.tv_sec * 1000 + ts.tv_usec / 1000;
+}
+
+//
+// A 0 value on both seconds and microseconds
+// fields means that timestamp is invalid or
+// not set.
+//
+
+inline T_timestamp nullTimestamp()
+{
+  struct timeval ts;
+
+  ts.tv_sec  = 0;
+  ts.tv_usec = 0;
+
+  return ts;
+}
+
+inline bool isTimestamp(const T_timestamp &ts)
+{
+  if (ts.tv_sec == 0 && ts.tv_usec == 0)
+  {
+     return 0;
+  }
+
+  return 1;
+}
+
+inline void subMsTimestamp(T_timestamp &ts, long ms)
+{
+  ts.tv_sec  -= ms / 1000;
+  ts.tv_usec -= (ms % 1000) * 1000;
+}
+
+inline void addMsTimestamp(T_timestamp &ts, long ms)
+{
+  ts.tv_sec  += ms / 1000;
+  ts.tv_usec += (ms % 1000) * 1000;
+}
+
+//
+// Check the difference between timestamps.
+// Return 0 if the system time went backward
+// compared to the second timestamp, or the
+// difference between the timestamps exceeds
+// the given number of milliseconds.
+//
+
+inline int checkDiffTimestamp(const T_timestamp &ts1, const T_timestamp &ts2,
+                                  long ms = 30000)
+{
+  long diffTs = diffTimestamp(ts1, ts2);
+
+  if (diffTs < 0 || diffTs > ms)
+  {
+    return 0;
+  }
+
+  return 1;
+}
+
+//
+// Return a string representing the timestamp.
+//
+
+char *strTimestamp(const T_timestamp &ts);
+char *strMsTimestamp(const T_timestamp &ts);
+
+inline char *strTimestamp()
+{
+  return strTimestamp(getTimestamp());
+}
+
+inline char *strMsTimestamp()
+{
+  return strMsTimestamp(getTimestamp());
+}
+
+//
+// Update the current timestamp.
+//
+
+inline T_timestamp getNewTimestamp()
+{
+  #ifdef TEST
+
+  T_timestamp ts;
+
+  gettimeofday(&ts, NULL);
+
+  *logofs << "Timestamp: Updating the current timestamp at "
+          << strMsTimestamp(ts) << ".\n" << logofs_flush;
+
+  long diffTs = diffTimestamp(timestamp, ts);
+
+  if (diffTs > DRIFT_TIMESTAMP)
+  {
+    *logofs << "Timestamp: WARNING! Time difference since the "
+            << "old timestamp is " << diffTs << " Ms.\n"
+            << logofs_flush;
+  }
+
+  #endif
+
+  gettimeofday(&timestamp, NULL);
+
+  return timestamp;
+}
+
+#endif /* Timestamp_H */
diff --git a/nxcomp/src/TranslateCoords.cpp b/nxcomp/src/TranslateCoords.cpp
new file mode 100644
index 000000000..f61caea47
--- /dev/null
+++ b/nxcomp/src/TranslateCoords.cpp
@@ -0,0 +1,115 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "TranslateCoords.h"
+
+#include "ClientCache.h"
+
+#include "EncodeBuffer.h"
+#include "DecodeBuffer.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Here are the methods to handle messages' content.
+//
+
+int TranslateCoordsStore::parseIdentity(Message *message, const unsigned char *buffer,
+                                            unsigned int size, int bigEndian) const
+{
+  TranslateCoordsMessage *translateCoords = (TranslateCoordsMessage *) message;
+
+  //
+  // Here is the fingerprint.
+  //
+
+  translateCoords -> src_window = GetULONG(buffer + 4, bigEndian);
+  translateCoords -> dst_window = GetULONG(buffer + 8, bigEndian);
+
+  translateCoords -> src_x = GetUINT(buffer + 12, bigEndian);
+  translateCoords -> src_y = GetUINT(buffer + 14, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Parsed Identity for message at " << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+int TranslateCoordsStore::unparseIdentity(const Message *message, unsigned char *buffer,
+                                              unsigned int size, int bigEndian) const
+{
+  TranslateCoordsMessage *translateCoords = (TranslateCoordsMessage *) message;
+
+  //
+  // Fill all the message's fields.
+  //
+
+  PutULONG(translateCoords -> src_window, buffer + 4,  bigEndian);
+  PutULONG(translateCoords -> dst_window, buffer + 8,  bigEndian);
+
+  PutUINT(translateCoords -> src_x, buffer + 12, bigEndian);
+  PutUINT(translateCoords -> src_y, buffer + 14, bigEndian);
+
+  #ifdef DEBUG
+  *logofs << name() << ": Unparsed identity for message at " << this << ".\n" << logofs_flush;
+  #endif
+
+  return 1;
+}
+
+void TranslateCoordsStore::dumpIdentity(const Message *message) const
+{
+  #ifdef DUMP
+
+  TranslateCoordsMessage *translateCoords = (TranslateCoordsMessage *) message;
+
+  *logofs << name() << ": Identity src_window " << translateCoords -> src_window << ", dst_window " 
+          << translateCoords -> dst_window << ", src_x " << translateCoords -> src_x << ", src_y " 
+          << translateCoords -> src_y << ", size " << translateCoords -> size_ << ".\n" << logofs_flush;
+
+  #endif
+}
+
+void TranslateCoordsStore::identityChecksum(const Message *message, const unsigned char *buffer,
+                                                unsigned int size, int bigEndian) const
+{
+  md5_append(md5_state_, buffer + 4,  4);
+  md5_append(md5_state_, buffer + 8,  4);
+  md5_append(md5_state_, buffer + 12, 2);
+  md5_append(md5_state_, buffer + 14, 2);
+}
diff --git a/nxcomp/src/TranslateCoords.h b/nxcomp/src/TranslateCoords.h
new file mode 100644
index 000000000..997d079e1
--- /dev/null
+++ b/nxcomp/src/TranslateCoords.h
@@ -0,0 +1,185 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef TranslateCoords_H
+#define TranslateCoords_H
+
+#include "Message.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  DUMP
+
+//
+// Set default values.
+//
+
+#define TRANSLATECOORDS_ENABLE_CACHE               1
+#define TRANSLATECOORDS_ENABLE_DATA                0
+#define TRANSLATECOORDS_ENABLE_SPLIT               0
+#define TRANSLATECOORDS_ENABLE_COMPRESS            0
+
+#define TRANSLATECOORDS_DATA_LIMIT                 0
+#define TRANSLATECOORDS_DATA_OFFSET                16
+
+#define TRANSLATECOORDS_CACHE_SLOTS                3000
+#define TRANSLATECOORDS_CACHE_THRESHOLD            3
+#define TRANSLATECOORDS_CACHE_LOWER_THRESHOLD      1
+
+//
+// The message class.
+//
+
+class TranslateCoordsMessage : public Message
+{
+  friend class TranslateCoordsStore;
+
+  public:
+
+  TranslateCoordsMessage()
+  {
+  }
+
+  ~TranslateCoordsMessage()
+  {
+  }
+
+  //
+  // Put here the fields which constitute 
+  // the 'identity' part of the message.
+  //
+
+  private:
+
+  unsigned int  src_window;
+  unsigned int  dst_window;
+  unsigned int  src_x;
+  unsigned int  src_y;
+
+  unsigned char r_same_screen;
+  unsigned int  r_child_window;
+  unsigned int  r_dst_x;
+  unsigned int  r_dst_y;
+};
+
+class TranslateCoordsStore : public MessageStore
+{
+  //
+  // Constructors and destructors.
+  //
+
+  public:
+
+  TranslateCoordsStore() : MessageStore()
+  {
+    enableCache    = TRANSLATECOORDS_ENABLE_CACHE;
+    enableData     = TRANSLATECOORDS_ENABLE_DATA;
+    enableSplit    = TRANSLATECOORDS_ENABLE_SPLIT;
+    enableCompress = TRANSLATECOORDS_ENABLE_COMPRESS;
+
+    dataLimit  = TRANSLATECOORDS_DATA_LIMIT;
+    dataOffset = TRANSLATECOORDS_DATA_OFFSET;
+
+    cacheSlots          = TRANSLATECOORDS_CACHE_SLOTS;
+    cacheThreshold      = TRANSLATECOORDS_CACHE_THRESHOLD;
+    cacheLowerThreshold = TRANSLATECOORDS_CACHE_LOWER_THRESHOLD;
+
+    messages_ -> resize(cacheSlots);
+
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      *i = NULL;
+    }
+
+    temporary_ = NULL;
+  }
+
+  virtual ~TranslateCoordsStore()
+  {
+    for (T_messages::iterator i = messages_ -> begin();
+             i < messages_ -> end(); i++)
+    {
+      destroy(*i);
+    }
+
+    destroy(temporary_);
+  }
+
+  virtual const char *name() const
+  {
+    return "TranslateCoords";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return X_TranslateCoords;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(TranslateCoordsMessage);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  public:
+
+  virtual Message *create() const
+  {
+    return new TranslateCoordsMessage();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new TranslateCoordsMessage((const TranslateCoordsMessage &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (TranslateCoordsMessage *) message;
+  }
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer,
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+                                    unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+};
+
+#endif /* TranslateCoords_H */
diff --git a/nxcomp/src/Transport.cpp b/nxcomp/src/Transport.cpp
new file mode 100644
index 000000000..e34544994
--- /dev/null
+++ b/nxcomp/src/Transport.cpp
@@ -0,0 +1,3068 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <signal.h>
+#include <sys/socket.h>
+
+#include "Transport.h"
+
+#include "Statistics.h"
+
+//
+// Set the verbosity level. You also
+// need to define DUMP in Misc.cpp
+// if DUMP is defined here.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+#undef  INSPECT
+#undef  DUMP
+
+//
+// Used to lock and unlock the transport
+// buffers before they are accessed by
+// different threads.
+//
+
+#undef  THREADS
+
+//
+// Define this to get logging all the
+// operations performed by the parent
+// thread, the one that enqueues and
+// dequeues data.
+//
+
+#define PARENT
+
+//
+// Define this to know when a channel
+// is created or destroyed.
+//
+
+#undef  REFERENCES
+
+//
+// Reference count for allocated buffers.
+//
+
+#ifdef REFERENCES
+
+int Transport::references_;
+int ProxyTransport::references_;
+int InternalTransport::references_;
+
+#endif
+
+//
+// This is the base class providing methods for read
+// and write buffering.
+//
+
+Transport::Transport(int fd) : fd_(fd)
+{
+  #ifdef TEST
+  *logofs << "Transport: Going to create base transport "
+          << "for FD#" << fd_ << ".\n" << logofs_flush;
+  #endif
+
+  type_ = transport_base;
+
+  //
+  // Set up the write buffer.
+  //
+
+  w_buffer_.length_ = 0;
+  w_buffer_.start_  = 0;
+
+  initialSize_   = TRANSPORT_BUFFER_DEFAULT_SIZE;
+  thresholdSize_ = TRANSPORT_BUFFER_DEFAULT_SIZE << 1;
+  maximumSize_   = TRANSPORT_BUFFER_DEFAULT_SIZE << 4;
+
+  w_buffer_.data_.resize(initialSize_);
+
+  //
+  // Set non-blocking IO on socket.
+  //
+
+  SetNonBlocking(fd_, 1);
+
+  blocked_ = 0;
+  finish_  = 0;
+
+  #ifdef REFERENCES
+  *logofs << "Transport: Created new object at " 
+          << this << " out of " << ++references_ 
+          << " allocated references.\n" << logofs_flush;
+  #endif
+}
+
+Transport::~Transport()
+{
+  #ifdef TEST
+  *logofs << "Transport: Going to destroy base class "
+          << "for FD#" << fd_ << ".\n" << logofs_flush;
+  #endif
+
+  ::close(fd_);
+
+  #ifdef REFERENCES
+  *logofs << "Transport: Deleted object at " 
+          << this << " out of " << --references_ 
+          << " allocated references.\n" << logofs_flush;
+  #endif
+}
+
+//
+// Read data from its file descriptor.
+//
+
+int Transport::read(unsigned char *data, unsigned int size)
+{
+  #ifdef DEBUG
+  *logofs << "Transport: Going to read " << size << " bytes from " 
+          << "FD#" << fd_ << ".\n" << logofs_flush;
+  #endif
+
+  //
+  // Read the available data from the socket.
+  //
+
+  int result = ::read(fd_, data, size);
+
+  //
+  // Update the current timestamp as the read
+  // can have scheduled some other process.
+  //
+
+  getNewTimestamp();
+
+  if (result < 0)
+  {
+    if (EGET() == EAGAIN)
+    {
+      #ifdef TEST
+      *logofs << "Transport: WARNING! Read of " << size << " bytes from "
+              << "FD#" << fd_ << " would block.\n" << logofs_flush;
+      #endif
+
+      return 0;
+    }
+    else if (EGET() == EINTR)
+    {
+      #ifdef TEST
+      *logofs << "Transport: Read of " << size << " bytes from "
+              << "FD#" << fd_ << " was interrupted.\n"
+              << logofs_flush;
+      #endif
+
+      return 0;
+    }
+    else
+    {
+      #ifdef TEST
+      *logofs << "Transport: Error reading from " 
+              << "FD#" << fd_ << ".\n" << logofs_flush;
+      #endif
+
+      finish();
+
+      return -1;
+    }
+  }
+  else if (result == 0)
+  {
+    #ifdef TEST
+    *logofs << "Transport: No data read from " 
+            << "FD#" << fd_ << ".\n" << logofs_flush;
+    #endif
+
+    finish();
+
+    return -1;
+  }
+
+  #ifdef TEST
+  *logofs << "Transport: Read " << result << " bytes out of "
+          << size << " from FD#" << fd_ << ".\n" << logofs_flush;
+  #endif
+
+  #ifdef DUMP
+
+  *logofs << "Transport: Dumping content of read data.\n"
+          << logofs_flush;
+
+  DumpData(data, result);
+
+  #endif
+
+  return result;
+}
+
+//
+// Write as many bytes as possible to socket. 
+// Append the remaining data bytes to the end 
+// of the buffer and update length to reflect
+// changes.
+//
+
+int Transport::write(T_write type, const unsigned char *data, const unsigned int size)
+{
+  //
+  // If an immediate write was requested then
+  // flush the enqueued data first.
+  //
+  // Alternatively may try to write only if
+  // the socket is not blocked.
+  //
+  // if (w_buffer_.length_ > 0 && blocked_ == 0 &&
+  //         type == write_immediate)
+  // {
+  //   ...
+  // }
+  //
+
+  if (w_buffer_.length_ > 0 && type == write_immediate)
+
+  {
+    #ifdef TEST
+    *logofs << "Transport: Writing " << w_buffer_.length_
+            << " bytes of previous data to FD#" << fd_ << ".\n"
+            << logofs_flush;
+    #endif
+
+    int result = Transport::flush();
+
+    if (result < 0)
+    {
+      return -1;
+    }
+  }
+
+  //
+  // If nothing is remained, write immediately
+  // to the socket.
+  //
+
+  unsigned int written = 0;
+
+  if (w_buffer_.length_ == 0 && blocked_ == 0 &&
+          type == write_immediate)
+  {
+    //
+    // Limit the amount of data sent.
+    //
+
+    unsigned int toWrite = size;
+
+    #ifdef DUMP
+
+    *logofs << "Transport: Going to write " << toWrite
+            << " bytes to FD#" << fd_ << " with checksum ";
+
+    DumpChecksum(data, size);
+
+    *logofs << ".\n" << logofs_flush;
+
+    #endif
+
+    T_timestamp writeTs;
+
+    int diffTs;
+
+    while (written < toWrite)
+    {
+      //
+      // Trace system time spent writing data.
+      //
+
+      writeTs = getTimestamp();
+
+      int result = ::write(fd_, data + written, toWrite - written);
+
+      diffTs = diffTimestamp(writeTs, getNewTimestamp());
+
+      statistics -> addWriteTime(diffTs);
+
+      if (result <= 0)
+      {
+        if (EGET() == EAGAIN)
+        {
+          #ifdef TEST
+          *logofs << "Transport: Write of " << toWrite - written
+                  << " bytes on FD#" << fd_ << " would block.\n"
+                  << logofs_flush;
+          #endif
+
+          blocked_ = 1;
+
+          break;
+        }
+        else if (EGET() == EINTR)
+        {
+          #ifdef TEST
+          *logofs << "Transport: Write of " << toWrite - written
+                  << " bytes on FD#" << fd_ << " was interrupted.\n"
+                  << logofs_flush;
+          #endif
+
+          continue;
+        }
+        else
+        {
+          #ifdef TEST
+          *logofs << "Transport: Write to " << "FD#" 
+                  << fd_ << " failed.\n" << logofs_flush;
+          #endif
+
+          finish();
+
+          return -1;
+        }
+      }
+      else
+      {
+        #ifdef TEST
+        *logofs << "Transport: Immediately written " << result
+                << " bytes on " << "FD#" << fd_ << ".\n"
+                << logofs_flush;
+        #endif
+
+        written += result;
+      }
+    }
+
+    #ifdef DUMP
+
+    if (written > 0)
+    {
+      *logofs << "Transport: Dumping content of immediately written data.\n"
+              << logofs_flush;
+
+      DumpData(data, written);
+    }
+
+    #endif
+  }
+
+  if (written == size)
+  {
+    //
+    // We will not affect the write buffer.
+    //
+
+    return written;
+  }
+
+  #ifdef DEBUG
+  *logofs << "Transport: Going to append " << size - written
+          << " bytes to write buffer for " << "FD#" << fd_
+          << ".\n" << logofs_flush;
+  #endif
+
+  if (resize(w_buffer_, size - written) < 0)
+  {
+    return -1;
+  }
+
+  memmove(w_buffer_.data_.begin() + w_buffer_.start_ + w_buffer_.length_,
+              data + written, size - written);
+
+  w_buffer_.length_ += size - written;
+
+  #ifdef TEST
+  *logofs << "Transport: Write buffer for FD#" << fd_
+          << " has data for " << w_buffer_.length_ << " bytes.\n"
+          << logofs_flush;
+
+  *logofs << "Transport: Start is " << w_buffer_.start_ 
+          << " length is " << w_buffer_.length_ << " size is "
+          << w_buffer_.data_.size() << " capacity is "
+          << w_buffer_.data_.capacity() << ".\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // Note that this function always returns the whole
+  // size of buffer that was provided, either if not
+  // all the data could be actually written.
+  //
+
+  return size;
+}
+
+//
+// Write pending data to its file descriptor.
+//
+
+int Transport::flush()
+{
+  if (w_buffer_.length_ == 0)
+  {
+    #ifdef TEST
+    *logofs << "Transport: No data to flush on "
+            << "FD#" << fd_ << ".\n" << logofs_flush;
+    #endif
+
+    #ifdef WARNING
+    if (blocked_ != 0)
+    {
+      *logofs << "Transport: Blocked flag is " << blocked_
+              << " with no data to flush on FD#" << fd_
+              << ".\n" << logofs_flush;
+    }
+    #endif
+
+    return 0;
+  }
+
+  //
+  // It's time to move data from the 
+  // write buffer to the real link. 
+  //
+
+  int written = 0;
+
+  int toWrite = w_buffer_.length_;
+
+  //
+  // We will do our best to write any available
+  // data to the socket, so let's say we start
+  // from a clean state.
+  //
+
+  blocked_ = 0;
+
+  #ifdef TEST
+  *logofs << "Transport: Going to flush " << toWrite
+          << " bytes on FD#" << fd_ << ".\n"
+          << logofs_flush;
+  #endif
+
+  T_timestamp writeTs;
+
+  int diffTs;
+
+  while (written < toWrite)
+  {
+    writeTs = getTimestamp();
+
+    int result = ::write(fd_, w_buffer_.data_.begin() + w_buffer_.start_ +
+                             written, toWrite - written);
+
+    diffTs = diffTimestamp(writeTs, getNewTimestamp());
+
+    statistics -> addWriteTime(diffTs);
+
+    if (result <= 0)
+    {
+      if (EGET() == EAGAIN)
+      {
+        #ifdef TEST
+        *logofs << "Transport: Write of " << toWrite - written
+                << " bytes on FD#" << fd_ << " would block.\n"
+                << logofs_flush;
+        #endif
+
+        blocked_ = 1;
+
+        break;
+      }
+      else if (EGET() == EINTR)
+      {
+        #ifdef TEST
+        *logofs << "Transport: Write of " << toWrite - written
+                << " bytes on FD#" << fd_ << " was interrupted.\n"
+                << logofs_flush;
+        #endif
+
+        continue;
+      }
+      else
+      {
+        #ifdef TEST
+        *logofs << "Transport: Write to " << "FD#" 
+                << fd_ << " failed.\n" << logofs_flush;
+        #endif
+
+        finish();
+
+        return -1;
+      }
+    }
+    else
+    {
+      #ifdef TEST
+      *logofs << "Transport: Flushed " << result << " bytes on " 
+              << "FD#" << fd_ << ".\n" << logofs_flush;
+      #endif
+
+      written += result;
+    }
+  }
+
+  if (written > 0)
+  {
+    #ifdef DUMP
+
+    *logofs << "Transport: Dumping content of flushed data.\n"
+            << logofs_flush;
+
+    DumpData(w_buffer_.data_.begin() + w_buffer_.start_, written);
+
+    #endif
+
+    //
+    // Update the buffer status.
+    //
+
+    w_buffer_.length_ -= written;
+
+    if (w_buffer_.length_ == 0)
+    {
+      w_buffer_.start_ = 0;
+    }
+    else
+    {
+      w_buffer_.start_ += written;
+    }
+  }
+
+  //
+  // It can be that we wrote less bytes than
+  // available because of the write limit.
+  //
+
+  if (w_buffer_.length_ > 0)
+  {
+    #ifdef TEST
+    *logofs << "Transport: There are still " << w_buffer_.length_ 
+            << " bytes in write buffer for " << "FD#" 
+            << fd_ << ".\n" << logofs_flush;
+    #endif
+
+    blocked_ = 1;
+  }
+
+  #ifdef TEST
+  *logofs << "Transport: Write buffer for FD#" << fd_
+          << " has data for " << w_buffer_.length_ << " bytes.\n"
+          << logofs_flush;
+
+  *logofs << "Transport: Start is " << w_buffer_.start_ 
+          << " length is " << w_buffer_.length_ << " size is "
+          << w_buffer_.data_.size() << " capacity is "
+          << w_buffer_.data_.capacity() << ".\n"
+          << logofs_flush;
+  #endif
+
+  //
+  // No new data was produced for the link except
+  // any outstanding data from previous writes.
+  //
+
+  return 0;
+}
+
+int Transport::drain(int limit, int timeout)
+{
+  if (w_buffer_.length_ <= limit)
+  {
+    return 1;
+  }
+
+  //
+  // Write the data accumulated in the write
+  // buffer until it is below the limit or
+  // the timeout is elapsed.
+  //
+
+  int toWrite = w_buffer_.length_;
+
+  int written = 0;
+
+  #ifdef TEST
+  *logofs << "Transport: Draining " << toWrite - limit
+          << " bytes on FD#" << fd_ << " with limit set to "
+          << limit << ".\n" << logofs_flush;
+  #endif
+
+  T_timestamp startTs = getNewTimestamp();
+
+  T_timestamp selectTs;
+  T_timestamp writeTs;
+  T_timestamp idleTs;
+
+  T_timestamp nowTs = startTs;
+
+  int diffTs;
+
+  fd_set writeSet;
+  fd_set readSet;
+
+  FD_ZERO(&writeSet);
+  FD_ZERO(&readSet);
+
+  int result;
+  int ready;
+
+  while (w_buffer_.length_ - written > limit)
+  {
+    nowTs = getNewTimestamp();
+
+    //
+    // Wait for descriptor to become
+    // readable or writable.
+    //
+
+    FD_SET(fd_, &writeSet);
+    FD_SET(fd_, &readSet);
+
+    setTimestamp(selectTs, timeout / 2);
+
+    idleTs = nowTs;
+
+    result = select(fd_ + 1, &readSet, &writeSet, NULL, &selectTs);
+
+    nowTs = getNewTimestamp();
+
+    diffTs = diffTimestamp(idleTs, nowTs);
+
+    statistics -> addIdleTime(diffTs);
+
+    statistics -> subReadTime(diffTs);
+
+    if (result < 0)
+    {
+      if (EGET() == EINTR)
+      {
+        #ifdef TEST
+        *logofs << "Transport: Select on FD#" << fd_
+                << " was interrupted.\n" << logofs_flush;
+        #endif
+
+        continue;
+      }
+      else
+      {
+        #ifdef TEST
+        *logofs << "Transport: Select on FD#" << fd_
+                << " failed.\n" << logofs_flush;
+        #endif
+
+        finish();
+
+        return -1;
+      }
+    }
+    else if (result > 0)
+    {
+      ready = result;
+
+      if (FD_ISSET(fd_, &writeSet))
+      {
+        writeTs = getNewTimestamp();
+
+        result = ::write(fd_, w_buffer_.data_.begin() + w_buffer_.start_ +
+                             written, toWrite - written);
+
+        nowTs = getNewTimestamp();
+
+        diffTs = diffTimestamp(writeTs, nowTs);
+
+        statistics -> addWriteTime(diffTs);
+
+        if (result > 0)
+        {
+          #ifdef TEST
+          *logofs << "Transport: Forced flush of " << result
+                  << " bytes on " << "FD#" << fd_ << ".\n"
+                  << logofs_flush;
+          #endif
+
+          written += result;
+        }
+        else if (result < 0 && EGET() == EINTR)
+        {
+          #ifdef TEST
+          *logofs << "Transport: Write to FD#" << fd_
+                  << " was interrupted.\n" << logofs_flush;
+          #endif
+
+          continue;
+        }
+        else
+        {
+          #ifdef TEST
+          *logofs << "Transport: Write to FD#" << fd_
+                  << " failed.\n" << logofs_flush;
+          #endif
+
+          finish();
+
+          return -1;
+        }
+
+        ready--;
+      }
+
+      if (ready > 0)
+      {
+        if (FD_ISSET(fd_, &readSet))
+        {
+          #ifdef TEST
+          *logofs << "Transport: Not draining further "
+                  << "due to data readable on FD#" << fd_
+                  << ".\n" << logofs_flush;
+          #endif
+
+          break;
+        }
+      }
+    }
+    #ifdef TEST
+    else
+    {
+      *logofs << "Transport: Timeout encountered "
+              << "waiting for FD#" << fd_ << ".\n"
+              << logofs_flush;
+    }
+    #endif
+
+    nowTs = getNewTimestamp();
+
+    diffTs = diffTimestamp(startTs, nowTs);
+
+    if (diffTs >= timeout)
+    {
+      #ifdef TEST
+      *logofs << "Transport: Not draining further "
+              << "due to the timeout on FD#" << fd_
+              << ".\n" << logofs_flush;
+      #endif
+
+      break;
+    }
+  }
+
+  if (written > 0)
+  {
+    #ifdef DUMP
+
+    *logofs << "Transport: Dumping content of flushed data.\n"
+            << logofs_flush;
+
+    DumpData(w_buffer_.data_.begin() + w_buffer_.start_, written);
+
+    #endif
+
+    //
+    // Update the buffer status.
+    //
+
+    w_buffer_.length_ -= written;
+
+    if (w_buffer_.length_ == 0)
+    {
+      w_buffer_.start_ = 0;
+
+      blocked_ = 0;
+    }
+    else
+    {
+      w_buffer_.start_ += written;
+
+      #ifdef TEST
+      *logofs << "Transport: There are still " << w_buffer_.length_ 
+              << " bytes in write buffer for " << "FD#" 
+              << fd_ << ".\n" << logofs_flush;
+      #endif
+
+      blocked_ = 1;
+    }
+  }
+  #ifdef TEST
+  else
+  {
+    *logofs << "Transport: WARNING! No data written to FD#" << fd_
+            << " with " << toWrite  << " bytes to drain and limit "
+            << "set to " << limit << ".\n" << logofs_flush;
+  }
+  #endif
+
+  #ifdef TEST
+  *logofs << "Transport: Write buffer for FD#" << fd_
+          << " has data for " << w_buffer_.length_ << " bytes.\n"
+          << logofs_flush;
+
+  *logofs << "Transport: Start is " << w_buffer_.start_ 
+          << " length is " << w_buffer_.length_ << " size is "
+          << w_buffer_.data_.size() << " capacity is "
+          << w_buffer_.data_.capacity() << ".\n"
+          << logofs_flush;
+  #endif
+
+  return (w_buffer_.length_ <= limit);
+}
+
+int Transport::wait(int timeout) const
+{
+  T_timestamp startTs = getNewTimestamp();
+
+  T_timestamp idleTs;
+  T_timestamp selectTs;
+
+  T_timestamp nowTs = startTs;
+
+  long available = 0;
+  int  result    = 0;
+
+  int diffTs;
+
+  fd_set readSet;
+
+  FD_ZERO(&readSet);
+  FD_SET(fd_, &readSet);
+
+  for (;;)
+  {
+    available = readable();
+
+    diffTs = diffTimestamp(startTs, nowTs);
+
+    if (available != 0 || timeout == 0 ||
+            (diffTs + (timeout / 10)) >= timeout)
+    {
+      #ifdef TEST
+      *logofs << "Transport: There are " << available
+              << " bytes on FD#" << fd_ << " after "
+              << diffTs << " Ms.\n" << logofs_flush;
+      #endif
+
+      return available;
+    }
+    else if (available == 0 && result > 0)
+    {
+      #ifdef TEST
+      *logofs << "Transport: Read on " << "FD#" 
+              << fd_ << " failed.\n" << logofs_flush;
+      #endif
+
+      return -1;
+    }
+
+    //
+    // TODO: Should subtract the time
+    // already spent in select.
+    //
+
+    selectTs.tv_sec  = 0;
+    selectTs.tv_usec = timeout * 1000;
+
+    idleTs = nowTs;
+
+    //
+    // Wait for descriptor to become readable.
+    //
+
+    result = select(fd_ + 1, &readSet, NULL, NULL, &selectTs);
+
+    nowTs = getNewTimestamp();
+
+    diffTs = diffTimestamp(idleTs, nowTs);
+
+    statistics -> addIdleTime(diffTs);
+
+    statistics -> subReadTime(diffTs);
+
+    if (result < 0)
+    {
+      if (EGET() == EINTR)
+      {
+        #ifdef TEST
+        *logofs << "Transport: Select on FD#" << fd_
+                << " was interrupted.\n" << logofs_flush;
+        #endif
+
+        continue;
+      }
+      else
+      {
+        #ifdef TEST
+        *logofs << "Transport: Select on " << "FD#" 
+                << fd_ << " failed.\n" << logofs_flush;
+        #endif
+
+        return -1;
+      }
+    }
+    #ifdef TEST
+    else if (result == 0)
+    {
+      *logofs << "Transport: No data available on FD#" << fd_
+              << " after " << diffTimestamp(startTs, nowTs)
+              << " Ms.\n" << logofs_flush;
+    }
+    else
+    {
+      *logofs << "Transport: Data became available on FD#" << fd_
+              << " after " << diffTimestamp(startTs, nowTs)
+              << " Ms.\n" << logofs_flush;
+    }
+    #endif
+  }
+}
+
+void Transport::setSize(unsigned int initialSize, unsigned int thresholdSize,
+                            unsigned int maximumSize)
+{
+  initialSize_   = initialSize;
+  thresholdSize_ = thresholdSize;
+  maximumSize_   = maximumSize;
+
+  #ifdef TEST
+  *logofs << "Transport: Set buffer sizes for FD#" << fd_
+          << " to " << initialSize_ << "/" << thresholdSize_
+          << "/" << maximumSize_ << ".\n" << logofs_flush;
+  #endif
+}
+
+void Transport::fullReset()
+{
+  blocked_ = 0;
+  finish_  = 0;
+
+  fullReset(w_buffer_);
+}
+
+int Transport::resize(T_buffer &buffer, const int &size)
+{
+  if ((int) buffer.data_.size() >= (buffer.length_ + size) &&
+          (buffer.start_ + buffer.length_ + size) >
+               (int) buffer.data_.size())
+  {
+    if (buffer.length_ > 0)
+    {
+      //
+      // There is enough space in buffer but we need
+      // to move existing data at the beginning.
+      //
+
+      #ifdef TEST
+      *logofs << "Transport: Moving " << buffer.length_
+              << " bytes of data for " << "FD#" << fd_
+              << " to make room in the buffer.\n"
+              << logofs_flush;
+      #endif
+
+      memmove(buffer.data_.begin(), buffer.data_.begin() +
+                  buffer.start_, buffer.length_);
+    }
+
+    buffer.start_ = 0;
+
+    #ifdef DEBUG
+    *logofs << "Transport: Made room for " 
+            << buffer.data_.size() - buffer.start_
+            << " bytes in buffer for " << "FD#" 
+            << fd_ << ".\n" << logofs_flush;
+    #endif
+  }
+  else if ((buffer.length_ + size) > (int) buffer.data_.size())
+  {
+    //
+    // Not enough space, so increase
+    // the size of the buffer.
+    //
+
+    if (buffer.start_ != 0 && buffer.length_ > 0)
+    {
+      #ifdef TEST
+      *logofs << "Transport: Moving " << buffer.length_
+              << " bytes of data for " << "FD#" << fd_
+              << " to resize the buffer.\n"
+              << logofs_flush;
+      #endif
+
+      memmove(buffer.data_.begin(), buffer.data_.begin() +
+                  buffer.start_, buffer.length_);
+    }
+
+    buffer.start_ = 0;
+
+    unsigned int newSize = thresholdSize_;
+
+    while (newSize < (unsigned int) buffer.length_ + size)
+    {
+      newSize <<= 1;
+
+      if (newSize >= maximumSize_)
+      {
+        newSize = buffer.length_ + size + initialSize_;
+      }
+    }
+
+    #ifdef DEBUG
+    *logofs << "Transport: Buffer for " << "FD#" << fd_
+            << " will be enlarged from " << buffer.data_.size()
+            << " to at least " << buffer.length_ + size
+            << " bytes.\n" << logofs_flush;
+    #endif
+
+    buffer.data_.resize(newSize);
+
+    #ifdef TEST
+    if (newSize >= maximumSize_)
+    {
+      *logofs << "Transport: WARNING! Buffer for FD#" << fd_
+              << " grown to reach size of " << newSize
+              << " bytes.\n" << logofs_flush;
+    }
+    #endif
+
+    #ifdef TEST
+    *logofs << "Transport: Data buffer for " << "FD#" 
+            << fd_ << " has now size " << buffer.data_.size() 
+            << " and capacity " << buffer.data_.capacity()
+            << ".\n" << logofs_flush;
+    #endif
+  }
+
+  return (buffer.length_ + size);
+}
+
+void Transport::fullReset(T_buffer &buffer)
+{
+  //
+  // Force deallocation and allocation
+  // of the initial size.
+  //
+
+  #ifdef TEST
+  *logofs << "Transport: Resetting buffer for " << "FD#"
+          << fd_ << " with size " << buffer.data_.size()
+          << " and capacity " << buffer.data_.capacity()
+          << ".\n" << logofs_flush;
+  #endif
+
+  buffer.start_  = 0;
+  buffer.length_ = 0;
+
+  if (buffer.data_.size() > (unsigned int) initialSize_ &&
+          buffer.data_.capacity() > (unsigned int) initialSize_)
+  {
+    buffer.data_.clear();
+
+    buffer.data_.resize(initialSize_);
+
+    #ifdef TEST
+    *logofs << "Transport: Data buffer for " << "FD#"
+            << fd_ << " shrunk to size " << buffer.data_.size()
+            << " and capacity " << buffer.data_.capacity()
+            << ".\n" << logofs_flush;
+    #endif
+  }
+}
+
+ProxyTransport::ProxyTransport(int fd) : Transport(fd)
+{
+  #ifdef TEST
+  *logofs << "ProxyTransport: Going to create proxy transport "
+          << "for FD#" << fd_ << ".\n" << logofs_flush;
+  #endif
+
+  type_ = transport_proxy;
+
+  //
+  // Set up the read buffer.
+  //
+
+  r_buffer_.length_ = 0;
+  r_buffer_.start_  = 0;
+
+  r_buffer_.data_.resize(initialSize_);
+
+  //
+  // For now we own the buffer.
+  //
+
+  owner_ = 1;
+
+  //
+  // Set up ZLIB compression.
+  //
+
+  int result;
+
+  r_stream_.zalloc = NULL;
+  r_stream_.zfree  = NULL;
+  r_stream_.opaque = NULL;
+
+  r_stream_.next_in  = NULL;
+  r_stream_.avail_in = 0;
+
+  if ((result = inflateInit2(&r_stream_, 15)) != Z_OK)
+  {
+    #ifdef PANIC
+    *logofs << "ProxyTransport: PANIC! Failed initialization of ZLIB read stream. "
+            << "Error is '" << zError(result) << "'.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Failed initialization of ZLIB read stream. "
+         << "Error is '" << zError(result) << "'.\n";
+
+    HandleCleanup();
+  }
+
+  if (control -> LocalStreamCompression)
+  {
+    w_stream_.zalloc = NULL;
+    w_stream_.zfree  = NULL;
+    w_stream_.opaque = NULL;
+
+    if ((result = deflateInit2(&w_stream_, control -> LocalStreamCompressionLevel, Z_DEFLATED,
+                                   15, 9, Z_DEFAULT_STRATEGY)) != Z_OK)
+    {
+      #ifdef PANIC
+      *logofs << "ProxyTransport: PANIC! Failed initialization of ZLIB write stream. "
+              << "Error is '" << zError(result) << "'.\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Failed initialization of ZLIB write stream. "
+           << "Error is '" << zError(result) << "'.\n";
+
+      HandleCleanup();
+    }
+  }
+
+  //
+  // No ZLIB stream to flush yet.
+  //
+
+  flush_ = 0;
+
+  #ifdef REFERENCES
+  *logofs << "ProxyTransport: Created new object at " 
+          << this << " out of " << ++references_ 
+          << " allocated references.\n" << logofs_flush;
+  #endif
+}
+
+ProxyTransport::~ProxyTransport()
+{
+  #ifdef TEST
+  *logofs << "ProxyTransport: Going to destroy derived class "
+          << "for FD#" << fd_ << ".\n" << logofs_flush;
+  #endif
+
+  //
+  // Deallocate the ZLIB stream state.
+  //
+
+  inflateEnd(&r_stream_);
+
+  if (control -> LocalStreamCompression)
+  {
+    deflateEnd(&w_stream_);
+  }
+
+  #ifdef REFERENCES
+  *logofs << "ProxyTransport: Deleted object at " 
+          << this << " out of " << --references_ 
+          << " allocated references.\n" << logofs_flush;
+  #endif
+}
+
+//
+// Read data from its file descriptor.
+//
+
+int ProxyTransport::read(unsigned char *data, unsigned int size)
+{
+  //
+  // If the remote peer is not compressing
+  // the stream then just return any byte
+  // read from the socket.
+  //
+
+  if (control -> RemoteStreamCompression == 0)
+  {
+    int result = Transport::read(data, size);
+
+    if (result <= 0)
+    {
+      return result;
+    }
+
+    statistics -> addBytesIn(result);
+
+    return result;
+  }
+
+  //
+  // Return any pending data first.
+  //
+
+  if (r_buffer_.length_ > 0)
+  {
+    //
+    // If the size of the buffer doesn't
+    // match the amount of data pending,
+    // force the caller to retry.
+    //
+
+    if ((int) size < r_buffer_.length_)
+    {
+      #ifdef TEST
+      *logofs << "ProxyTransport: WARNING! Forcing a retry with "
+              << r_buffer_.length_ << " bytes pending and "
+              << size << " in the buffer.\n"
+              << logofs_flush;
+      #endif
+
+      ESET(EAGAIN);
+
+      return -1;
+    }
+
+    int copied = (r_buffer_.length_ > ((int) size) ?
+                      ((int) size) : r_buffer_.length_);
+
+    memcpy(data, r_buffer_.data_.begin() + r_buffer_.start_, copied);
+
+    //
+    // Update the buffer status.
+    //
+
+    #ifdef DEBUG
+    *logofs << "ProxyTransport: Going to immediately return " << copied
+            << " bytes from proxy FD#" << fd_ << ".\n"
+            << logofs_flush;
+    #endif
+
+    r_buffer_.length_ -= copied;
+
+    if (r_buffer_.length_ == 0)
+    {
+      r_buffer_.start_ = 0;
+    }
+    else
+    {
+      r_buffer_.start_ += copied;
+
+      #ifdef TEST
+      *logofs << "ProxyTransport: There are still " << r_buffer_.length_ 
+              << " bytes in read buffer for proxy " << "FD#" 
+              << fd_ << ".\n" << logofs_flush;
+        #endif
+    }
+
+    return copied;
+  }
+
+  //
+  // Read data in the user buffer.
+  //
+
+  int result = Transport::read(data, size);
+
+  if (result <= 0)
+  {
+    return result;
+  }
+
+  statistics -> addBytesIn(result);
+
+  //
+  // Decompress the data into the read
+  // buffer.
+  //
+
+  #ifdef DEBUG
+  *logofs << "ProxyTransport: Going to decompress data for " 
+          << "proxy FD#" << fd_ << ".\n" << logofs_flush;
+  #endif
+
+  int saveTotalIn  = r_stream_.total_in;
+  int saveTotalOut = r_stream_.total_out;
+
+  int oldTotalIn  = saveTotalIn;
+  int oldTotalOut = saveTotalOut;
+
+  int diffTotalIn;
+  int diffTotalOut;
+
+  #ifdef INSPECT
+  *logofs << "ProxyTransport: oldTotalIn = " << oldTotalIn
+          << ".\n" << logofs_flush;
+  #endif
+
+  #ifdef INSPECT
+  *logofs << "ProxyTransport: oldTotalOut = " << oldTotalOut
+          << ".\n" << logofs_flush;
+  #endif
+
+  r_stream_.next_in  = (Bytef *) data;
+  r_stream_.avail_in = result;
+
+  //
+  // Let ZLIB use all the space already
+  // available in the buffer.
+  //
+
+  unsigned int newAvailOut = r_buffer_.data_.size() - r_buffer_.start_ -
+                                 r_buffer_.length_;
+
+  #ifdef TEST
+  *logofs << "ProxyTransport: Initial decompress buffer is "
+          << newAvailOut << " bytes.\n" << logofs_flush;
+  #endif
+
+  for (;;)
+  {
+    #ifdef INSPECT
+    *logofs << "\nProxyTransport: Running the decompress loop.\n"
+            << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: r_buffer_.length_ = " << r_buffer_.length_
+            << ".\n" << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: r_buffer_.data_.size() = " << r_buffer_.data_.size()
+            << ".\n" << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: newAvailOut = " << newAvailOut
+            << ".\n" << logofs_flush;
+    #endif
+
+    if (resize(r_buffer_, newAvailOut) < 0)
+    {
+      return -1;
+    }
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: r_buffer_.data_.size() = "
+            << r_buffer_.data_.size() << ".\n"
+            << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: r_stream_.next_in = "
+            << (void *) r_stream_.next_in << ".\n"
+            << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: r_stream_.avail_in = "
+            << r_stream_.avail_in << ".\n"
+            << logofs_flush;
+    #endif
+
+    r_stream_.next_out  = r_buffer_.data_.begin() + r_buffer_.start_ +
+                              r_buffer_.length_;
+
+    r_stream_.avail_out = newAvailOut;
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: r_stream_.next_out = "
+            << (void *) r_stream_.next_out << ".\n"
+            << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: r_stream_.avail_out = "
+            << r_stream_.avail_out << ".\n"
+            << logofs_flush;
+    #endif
+
+    int result = inflate(&r_stream_, Z_SYNC_FLUSH);
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: Called inflate() result is "
+            << result << ".\n" << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: r_stream_.avail_in = "
+            << r_stream_.avail_in << ".\n"
+            << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: r_stream_.avail_out = "
+            << r_stream_.avail_out << ".\n"
+            << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: r_stream_.total_in = "
+            << r_stream_.total_in << ".\n"
+            << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: r_stream_.total_out = "
+            << r_stream_.total_out << ".\n"
+            << logofs_flush;
+    #endif
+
+    diffTotalIn  = r_stream_.total_in  - oldTotalIn;
+    diffTotalOut = r_stream_.total_out - oldTotalOut;
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: diffTotalIn = "
+            << diffTotalIn << ".\n"
+            << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: diffTotalOut = "
+            << diffTotalOut << ".\n"
+            << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: r_buffer_.length_ = "
+            << r_buffer_.length_ << ".\n"
+            << logofs_flush;
+    #endif
+
+    r_buffer_.length_ += diffTotalOut;
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: r_buffer_.length_ = "
+            << r_buffer_.length_ << ".\n"
+            << logofs_flush;
+    #endif
+
+    oldTotalIn  = r_stream_.total_in;
+    oldTotalOut = r_stream_.total_out;
+
+    if (result == Z_OK)
+    {
+      if (r_stream_.avail_in == 0 && r_stream_.avail_out > 0)
+      {
+        break;
+      }
+    }
+    else if (result == Z_BUF_ERROR && r_stream_.avail_out > 0 &&
+                 r_stream_.avail_in == 0)
+    {
+      #ifdef TEST
+      *logofs << "ProxyTransport: WARNING! Raised Z_BUF_ERROR decompressing data.\n"
+              << logofs_flush;
+      #endif
+
+      break;
+    }
+    else
+    {
+      #ifdef PANIC
+      *logofs << "ProxyTransport: PANIC! Decompression of data failed. "
+              << "Error is '" << zError(result) << "'.\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Decompression of data failed. Error is '"
+           << zError(result) << "'.\n";
+
+      finish();
+
+      return -1;
+    }
+
+    //
+    // Add more bytes to the buffer.
+    //
+
+    if (newAvailOut < thresholdSize_)
+    {
+      newAvailOut = thresholdSize_;
+    }
+
+    #ifdef TEST
+    *logofs << "ProxyTransport: Need to add " << newAvailOut
+            << " bytes to the decompress buffer in read.\n"
+            << logofs_flush;
+    #endif
+  }
+
+  diffTotalIn  = r_stream_.total_in  - saveTotalIn;
+  diffTotalOut = r_stream_.total_out - saveTotalOut;
+
+  #ifdef DEBUG
+  *logofs << "ProxyTransport: Decompressed data from "
+          << diffTotalIn << " to " << diffTotalOut
+          << " bytes.\n" << logofs_flush;
+  #endif
+
+  statistics -> addDecompressedBytes(diffTotalIn, diffTotalOut);
+
+  //
+  // Check if the size of the buffer
+  // matches the produced data.
+  //
+
+  if ((int) size < r_buffer_.length_)
+  {
+    #ifdef TEST
+    *logofs << "ProxyTransport: WARNING! Forcing a retry with "
+            << r_buffer_.length_ << " bytes pending and "
+            << size << " in the buffer.\n"
+            << logofs_flush;
+    #endif
+
+    ESET(EAGAIN);
+
+    return -1;
+  }
+
+  //
+  // Copy the decompressed data to the
+  // provided buffer.
+  //
+
+  int copied = (r_buffer_.length_ > ((int) size) ?
+                    ((int) size) : r_buffer_.length_);
+
+  #ifdef DEBUG
+  *logofs << "ProxyTransport: Going to return " << copied
+          << " bytes from proxy FD#" << fd_ << ".\n"
+          << logofs_flush;
+  #endif
+
+  memcpy(data, r_buffer_.data_.begin() + r_buffer_.start_, copied);
+
+  //
+  // Update the buffer status.
+  //
+
+  r_buffer_.length_ -= copied;
+
+  if (r_buffer_.length_ == 0)
+  {
+    r_buffer_.start_ = 0;
+  }
+  else
+  {
+    r_buffer_.start_ += copied;
+
+    #ifdef TEST
+    *logofs << "ProxyTransport: There are still " << r_buffer_.length_ 
+            << " bytes in read buffer for proxy FD#" << fd_
+            << ".\n" << logofs_flush;
+    #endif
+  }
+
+  return copied;
+}
+
+//
+// If required compress data, else write it to socket.
+//
+
+int ProxyTransport::write(T_write type, const unsigned char *data, const unsigned int size)
+{
+  #ifdef TEST
+  if (size == 0)
+  {
+    *logofs << "ProxyTransport: WARNING! Write called for FD#" 
+            << fd_ << " without any data to write.\n"
+            << logofs_flush;
+
+    return 0;
+  }
+  #endif
+
+  //
+  // If there is no compression revert to
+  // plain socket management.
+  //
+
+  if (control -> LocalStreamCompression == 0)
+  {
+    int result = Transport::write(type, data, size);
+
+    if (result <= 0)
+    {
+      return result;
+    }
+
+    statistics -> addBytesOut(result);
+
+    statistics -> updateBitrate(result);
+
+    FlushCallback(result);
+
+    return result;
+  }
+
+  #ifdef DEBUG
+  *logofs << "ProxyTransport: Going to compress " << size 
+          << " bytes to write buffer for proxy FD#" << fd_
+          << ".\n" << logofs_flush;
+  #endif
+
+  //
+  // Compress data into the write buffer.
+  //
+
+  int saveTotalIn  = w_stream_.total_in;
+  int saveTotalOut = w_stream_.total_out;
+
+  int oldTotalIn  = saveTotalIn;
+  int oldTotalOut = saveTotalOut;
+
+  int diffTotalIn;
+  int diffTotalOut;
+
+  #ifdef INSPECT
+  *logofs << "ProxyTransport: oldTotalIn = " << oldTotalIn
+          << ".\n" << logofs_flush;
+  #endif
+
+  #ifdef INSPECT
+  *logofs << "ProxyTransport: oldTotalOut = " << oldTotalOut
+          << ".\n" << logofs_flush;
+  #endif
+
+  w_stream_.next_in  = (Bytef *) data;
+  w_stream_.avail_in = size;
+
+  //
+  // Let ZLIB use all the space already
+  // available in the buffer.
+  //
+
+  unsigned int newAvailOut = w_buffer_.data_.size() - w_buffer_.start_ -
+                                 w_buffer_.length_;
+
+  #ifdef TEST
+  *logofs << "ProxyTransport: Initial compress buffer is "
+          << newAvailOut << " bytes.\n" << logofs_flush;
+  #endif
+
+  for (;;)
+  {
+    #ifdef INSPECT
+    *logofs << "\nProxyTransport: Running the compress loop.\n"
+            << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: w_buffer_.length_ = "
+            << w_buffer_.length_ << ".\n"
+            << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: w_buffer_.data_.size() = "
+            << w_buffer_.data_.size() << ".\n"
+            << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: newAvailOut = "
+            << newAvailOut << ".\n"
+            << logofs_flush;
+    #endif
+
+    if (resize(w_buffer_, newAvailOut) < 0)
+    {
+      return -1;
+    }
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: w_buffer_.data_.size() = "
+            << w_buffer_.data_.size() << ".\n"
+            << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: w_stream_.next_in = "
+            << (void *) w_stream_.next_in << ".\n"
+            << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: w_stream_.avail_in = "
+            << w_stream_.avail_in << ".\n"
+            << logofs_flush;
+    #endif
+
+    w_stream_.next_out  = w_buffer_.data_.begin() + w_buffer_.start_ +
+                              w_buffer_.length_;
+
+    w_stream_.avail_out = newAvailOut;
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: w_stream_.next_out = "
+            << (void *) w_stream_.next_out << ".\n"
+            << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: w_stream_.avail_out = "
+            << w_stream_.avail_out << ".\n"
+            << logofs_flush;
+    #endif
+
+    int result = deflate(&w_stream_, (type == write_delayed ?
+                             Z_NO_FLUSH : Z_SYNC_FLUSH));
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: Called deflate() result is "
+            << result << ".\n" << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: w_stream_.avail_in = "
+            << w_stream_.avail_in << ".\n"
+            << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: w_stream_.avail_out = "
+            << w_stream_.avail_out << ".\n"
+            << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: w_stream_.total_in = "
+            << w_stream_.total_in << ".\n"
+            << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: w_stream_.total_out = "
+            << w_stream_.total_out << ".\n"
+            << logofs_flush;
+    #endif
+
+    diffTotalOut = w_stream_.total_out - oldTotalOut;
+    diffTotalIn  = w_stream_.total_in  - oldTotalIn;
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: diffTotalIn = "
+            << diffTotalIn << ".\n"
+            << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: diffTotalOut = "
+            << diffTotalOut << ".\n"
+            << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: w_buffer_.length_ = "
+            << w_buffer_.length_ << ".\n"
+            << logofs_flush;
+    #endif
+
+    w_buffer_.length_ += diffTotalOut;
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: w_buffer_.length_ = "
+            << w_buffer_.length_ << ".\n"
+            << logofs_flush;
+    #endif
+
+    oldTotalOut = w_stream_.total_out;
+    oldTotalIn  = w_stream_.total_in;
+
+    if (result == Z_OK)
+    {
+      if (w_stream_.avail_in == 0 && w_stream_.avail_out > 0)
+      {
+        break;
+      }
+    }
+    else if (result == Z_BUF_ERROR && w_stream_.avail_out > 0 &&
+                 w_stream_.avail_in == 0)
+    {
+      #ifdef TEST
+      *logofs << "ProxyTransport: WARNING! Raised Z_BUF_ERROR compressing data.\n"
+              << logofs_flush;
+      #endif
+
+      break;
+    }
+    else
+    {
+      #ifdef PANIC
+      *logofs << "ProxyTransport: PANIC! Compression of data failed. "
+              << "Error is '" << zError(result) << "'.\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Compression of data failed. Error is '"
+           << zError(result) << "'.\n";
+
+      finish();
+
+      return -1;
+    }
+
+    //
+    // Add more bytes to the buffer.
+    //
+
+    if (newAvailOut < thresholdSize_)
+    {
+      newAvailOut = thresholdSize_;
+    }
+
+    #ifdef TEST
+    *logofs << "ProxyTransport: Need to add " << newAvailOut
+            << " bytes to the compress buffer in write.\n"
+            << logofs_flush;
+    #endif
+  }
+
+  diffTotalIn  = w_stream_.total_in  - saveTotalIn;
+  diffTotalOut = w_stream_.total_out - saveTotalOut;
+
+  #ifdef TEST
+
+  *logofs << "ProxyTransport: Compressed data from "
+          << diffTotalIn << " to " << diffTotalOut
+          << " bytes.\n" << logofs_flush;
+
+  if (diffTotalIn != (int) size)
+  {
+    #ifdef PANIC
+    *logofs << "ProxyTransport: PANIC! Bytes provided to ZLIB stream "
+            << "should be " << size << " but they look to be "
+            << diffTotalIn << ".\n" << logofs_flush;
+    #endif
+  }
+
+  #endif
+
+  //
+  // Find out what we have to do with the
+  // produced data.
+  //
+
+  if (type == write_immediate)
+  {
+    //
+    // If user requested an immediate write we
+    // flushed the ZLIB buffer. We can now reset
+    // the counter and write data to socket.
+    //
+
+    flush_ = 0;
+
+    #ifdef TEST
+    *logofs << "ProxyTransport: Write buffer for proxy FD#" << fd_
+            << " has data for " << w_buffer_.length_ << " bytes.\n"
+            << logofs_flush;
+
+    *logofs << "ProxyTransport: Start is " << w_buffer_.start_ 
+            << " length is " << w_buffer_.length_ << " flush is "
+            << flush_ << " size is " << w_buffer_.data_.size()
+            << " capacity is " << w_buffer_.data_.capacity()
+            << ".\n" << logofs_flush;
+    #endif
+
+    //
+    // Alternatively may try to write only if
+    // the socket is not blocked.
+    //
+    // if (w_buffer_.length_ > 0 && blocked_ == 0)
+    // {
+    //   ...
+    // }
+    //
+
+    if (w_buffer_.length_ > 0)
+
+    {
+      #ifdef TEST
+      *logofs << "ProxyTransport: Writing " << w_buffer_.length_
+              << " bytes of produced data to FD#" << fd_ << ".\n"
+              << logofs_flush;
+      #endif
+
+      int result = Transport::flush();
+
+      if (result < 0)
+      {
+        return -1;
+      }
+    }
+  }
+  else
+  {
+    //
+    // We haven't flushed the ZLIB compression
+    // buffer, so user will have to call proxy
+    // transport's flush explicitly.
+    //
+
+    flush_ += diffTotalIn;
+  }
+
+  //
+  // We either wrote the data or added it to the
+  // write buffer. It's convenient to update the
+  // counters at this stage to get the current
+  // bitrate earlier.
+  //
+
+  statistics -> addCompressedBytes(diffTotalIn, diffTotalOut);
+
+  statistics -> addBytesOut(diffTotalOut);
+
+  statistics -> updateBitrate(diffTotalOut);
+
+  FlushCallback(diffTotalOut);
+
+  #ifdef TEST
+  *logofs << "ProxyTransport: Write buffer for proxy FD#" << fd_
+          << " has data for " << w_buffer_.length_ << " bytes.\n"
+          << logofs_flush;
+
+  *logofs << "ProxyTransport: Start is " << w_buffer_.start_ 
+          << " length is " << w_buffer_.length_ << " flush is "
+          << flush_ << " size is " << w_buffer_.data_.size()
+          << " capacity is " << w_buffer_.data_.capacity()
+          << ".\n" << logofs_flush;
+  #endif
+
+  return size;
+}
+
+//
+// Write data to its file descriptor.
+//
+
+int ProxyTransport::flush()
+{
+  //
+  // If there is no compression or we already compressed
+  // outgoing data and just need to write it to socket
+  // because of previous incomplete writes then revert
+  // to plain socket management.
+  //
+
+  if (flush_ == 0 || control -> LocalStreamCompression == 0)
+  {
+    int result = Transport::flush();
+
+    if (result < 0)
+    {
+      return -1;
+    }
+
+    return result;
+  }
+
+  #ifdef DEBUG
+  *logofs << "ProxyTransport: Going to flush compression on "
+          << "proxy FD#" << fd_ << ".\n" << logofs_flush;
+  #endif
+
+  #ifdef TEST
+  *logofs << "ProxyTransport: Flush counter for proxy FD#" << fd_
+          << " is " << flush_ << " bytes.\n" << logofs_flush;
+  #endif
+
+  //
+  // Flush ZLIB stream into the write buffer.
+  //
+
+  int saveTotalIn  = w_stream_.total_in;
+  int saveTotalOut = w_stream_.total_out;
+
+  int oldTotalIn  = saveTotalIn;
+  int oldTotalOut = saveTotalOut;
+
+  int diffTotalOut;
+  int diffTotalIn;
+
+  #ifdef INSPECT
+  *logofs << "ProxyTransport: oldTotalIn = " << oldTotalIn
+          << ".\n" << logofs_flush;
+  #endif
+
+  #ifdef INSPECT
+  *logofs << "ProxyTransport: oldTotalOut = " << oldTotalOut
+          << ".\n" << logofs_flush;
+  #endif
+
+  w_stream_.next_in  = w_buffer_.data_.begin() + w_buffer_.start_ + w_buffer_.length_;
+  w_stream_.avail_in = 0;
+
+  //
+  // Let ZLIB use all the space already
+  // available in the buffer.
+  //
+
+  unsigned int newAvailOut = w_buffer_.data_.size() - w_buffer_.start_ -
+                                 w_buffer_.length_;
+
+  #ifdef DEBUG
+  *logofs << "ProxyTransport: Initial flush buffer is "
+          << newAvailOut << " bytes.\n" << logofs_flush;
+  #endif
+
+  for (;;)
+  {
+    #ifdef INSPECT
+    *logofs << "\nProxyTransport: Running the flush loop.\n"
+            << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: w_buffer_.length_ = "
+            << w_buffer_.length_ << ".\n"
+            << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: w_buffer_.data_.size() = "
+            << w_buffer_.data_.size() << ".\n"
+            << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: newAvailOut = "
+            << newAvailOut << ".\n"
+            << logofs_flush;
+    #endif
+
+    if (resize(w_buffer_, newAvailOut) < 0)
+    {
+      return -1;
+    }
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: w_buffer_.data_.size() = "
+            << w_buffer_.data_.size() << ".\n"
+            << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: w_stream_.next_in = "
+            << (void *) w_stream_.next_in << ".\n"
+            << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: w_stream_.avail_in = "
+            << w_stream_.avail_in << ".\n"
+            << logofs_flush;
+    #endif
+
+    w_stream_.next_out  = w_buffer_.data_.begin() + w_buffer_.start_ +
+                              w_buffer_.length_;
+
+    w_stream_.avail_out = newAvailOut;
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: w_stream_.next_out = "
+            << (void *) w_stream_.next_out << ".\n"
+            << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: w_stream_.avail_out = "
+            << w_stream_.avail_out << ".\n"
+            << logofs_flush;
+    #endif
+
+    int result = deflate(&w_stream_, Z_SYNC_FLUSH);
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: Called deflate() result is "
+            << result << ".\n" << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: w_stream_.avail_in = "
+            << w_stream_.avail_in << ".\n"
+            << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: w_stream_.avail_out = "
+            << w_stream_.avail_out << ".\n"
+            << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: w_stream_.total_in = "
+            << w_stream_.total_in << ".\n"
+            << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: w_stream_.total_out = "
+            << w_stream_.total_out << ".\n"
+            << logofs_flush;
+    #endif
+
+    diffTotalOut = w_stream_.total_out - oldTotalOut;
+    diffTotalIn  = w_stream_.total_in  - oldTotalIn;
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: diffTotalIn = "
+            << diffTotalIn << ".\n"
+            << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: diffTotalOut = "
+            << diffTotalOut << ".\n"
+            << logofs_flush;
+    #endif
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: w_buffer_.length_ = "
+            << w_buffer_.length_ << ".\n"
+            << logofs_flush;
+    #endif
+
+    w_buffer_.length_ += diffTotalOut;
+
+    #ifdef INSPECT
+    *logofs << "ProxyTransport: w_buffer_.length_ = "
+            << w_buffer_.length_ << ".\n"
+            << logofs_flush;
+    #endif
+
+    oldTotalOut = w_stream_.total_out;
+    oldTotalIn  = w_stream_.total_in;
+
+    if (result == Z_OK)
+    {
+      if (w_stream_.avail_in == 0 && w_stream_.avail_out > 0)
+      {
+        break;
+      }
+    }
+    else if (result == Z_BUF_ERROR && w_stream_.avail_out > 0 &&
+                 w_stream_.avail_in == 0)
+    {
+      #ifdef TEST
+      *logofs << "ProxyTransport: WARNING! Raised Z_BUF_ERROR flushing data.\n"
+              << logofs_flush;
+      #endif
+
+      break;
+    }
+    else
+    {
+      #ifdef PANIC
+      *logofs << "ProxyTransport: PANIC! Flush of compressed data failed. "
+              << "Error is '" << zError(result) << "'.\n"
+              << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Flush of compressed data failed. Error is '"
+           << zError(result) << "'.\n";
+
+      finish();
+
+      return -1;
+    }
+
+    //
+    // Add more bytes to the buffer.
+    //
+
+    if (newAvailOut < thresholdSize_)
+    {
+      newAvailOut = thresholdSize_;
+    }
+
+    #ifdef TEST
+    *logofs << "ProxyTransport: Need to add " << newAvailOut
+            << " bytes to the compress buffer in flush.\n"
+            << logofs_flush;
+    #endif
+  }
+
+  diffTotalIn  = w_stream_.total_in  - saveTotalIn;
+  diffTotalOut = w_stream_.total_out - saveTotalOut;
+
+  #ifdef TEST
+  *logofs << "ProxyTransport: Compressed flush data from "
+          << diffTotalIn << " to " << diffTotalOut
+          << " bytes.\n" << logofs_flush;
+  #endif
+
+  //
+  // Time to move data from the write
+  // buffer to the real link. 
+  //
+
+  #ifdef DEBUG
+  *logofs << "ProxyTransport: Reset flush counter for proxy FD#"
+          << fd_ << ".\n" << logofs_flush;
+  #endif
+
+  flush_ = 0;
+
+  #ifdef TEST
+  *logofs << "ProxyTransport: Write buffer for proxy FD#" << fd_
+          << " has data for " << w_buffer_.length_ << " bytes.\n"
+          << logofs_flush;
+
+  *logofs << "ProxyTransport: Start is " << w_buffer_.start_ 
+          << " length is " << w_buffer_.length_ << " flush is "
+          << flush_ << " size is " << w_buffer_.data_.size()
+          << " capacity is " << w_buffer_.data_.capacity()
+          << ".\n" << logofs_flush;
+  #endif
+
+  int result = Transport::flush();
+
+  if (result < 0)
+  {
+    return -1;
+  }
+
+  //
+  // Update all the counters.
+  //
+
+  statistics -> addCompressedBytes(diffTotalIn, diffTotalOut);
+
+  statistics -> addBytesOut(diffTotalOut);
+
+  statistics -> updateBitrate(diffTotalOut);
+
+  FlushCallback(diffTotalOut);
+
+  return result;
+}
+
+unsigned int ProxyTransport::getPending(unsigned char *&data)
+{
+  //
+  // Return a pointer to the data in the
+  // read buffer. It is up to the caller
+  // to ensure that the data is consumed
+  // before the read buffer is reused.
+  //
+
+  if (r_buffer_.length_ > 0)
+  {
+    unsigned int size = r_buffer_.length_;
+
+    data = r_buffer_.data_.begin() + r_buffer_.start_;
+
+    #ifdef DEBUG
+    *logofs << "ProxyTransport: Returning " << size
+            << " pending bytes from proxy FD#" << fd_
+            << ".\n" << logofs_flush;
+    #endif
+
+    r_buffer_.length_ = 0;
+    r_buffer_.start_  = 0;
+
+    //
+    // Prevent the deletion of the buffer.
+    //
+
+    owner_ = 0;
+
+    return size;
+  }
+
+  #ifdef TEST
+  *logofs << "ProxyTransport: WARNING! No pending data "
+          << "for proxy FD#" << fd_ << ".\n"
+          << logofs_flush;
+  #endif
+
+  data = NULL;
+
+  return 0;
+}
+
+void ProxyTransport::fullReset()
+{
+  blocked_ = 0;
+  finish_  = 0;
+  flush_   = 0;
+
+  if (control -> RemoteStreamCompression)
+  {
+    inflateReset(&r_stream_);
+  }
+
+  if (control -> LocalStreamCompression)
+  {
+    deflateReset(&w_stream_);
+  }
+
+  if (owner_ == 1)
+  {
+    Transport::fullReset(r_buffer_);
+  }
+
+  Transport::fullReset(w_buffer_);
+}
+
+AgentTransport::AgentTransport(int fd) : Transport(fd)
+{
+  #ifdef TEST
+  *logofs << "AgentTransport: Going to create agent transport "
+          << "for FD#" << fd_ << ".\n" << logofs_flush;
+  #endif
+
+  type_ = transport_agent;
+
+  //
+  // Set up the read buffer.
+  //
+
+  r_buffer_.length_ = 0;
+  r_buffer_.start_  = 0;
+
+  r_buffer_.data_.resize(initialSize_);
+
+  //
+  // For now we own the buffer.
+  //
+
+  owner_ = 1;
+
+  //
+  // Set up the mutexes.
+  //
+
+  #ifdef THREADS
+
+  pthread_mutexattr_t m_attributes;
+
+  pthread_mutexattr_init(&m_attributes);
+
+  //
+  // Interfaces in pthread to handle mutex
+  // type do not work in current version. 
+  //
+
+  m_attributes.__mutexkind = PTHREAD_MUTEX_ERRORCHECK_NP;
+
+  if (pthread_mutex_init(&m_read_, &m_attributes) != 0)
+  {
+    #ifdef TEST
+    *logofs << "AgentTransport: Child: Creation of read mutex failed. "
+            << "Error is " << EGET() << " '" << ESTR()
+            << "'.\n" << logofs_flush;
+    #endif
+  }
+
+  if (pthread_mutex_init(&m_write_, &m_attributes) != 0)
+  {
+    #ifdef TEST
+    *logofs << "AgentTransport: Child: Creation of write mutex failed. "
+            << "Error is " << EGET() << " '" << ESTR()
+            << "'.\n" << logofs_flush;
+    #endif
+  }
+
+  #endif
+
+  #ifdef REFERENCES
+  *logofs << "AgentTransport: Child: Created new object at " 
+          << this << " out of " << ++references_ 
+          << " allocated references.\n" << logofs_flush;
+  #endif
+}
+
+AgentTransport::~AgentTransport()
+{
+  #ifdef TEST
+  *logofs << "AgentTransport: Going to destroy derived class "
+          << "for FD#" << fd_ << ".\n" << logofs_flush;
+  #endif
+
+  //
+  // Unlock and free all mutexes.
+  //
+
+  #ifdef THREADS
+
+  pthread_mutex_unlock(&m_read_);
+  pthread_mutex_unlock(&m_write_);
+
+  pthread_mutex_destroy(&m_read_);
+  pthread_mutex_destroy(&m_write_);
+
+  #endif
+
+  #ifdef REFERENCES
+  *logofs << "AgentTransport: Child: Deleted object at " 
+          << this << " out of " << --references_ 
+          << " allocated references.\n" << logofs_flush;
+  #endif
+}
+
+//
+// Read data enqueued by the other thread.
+//
+
+int AgentTransport::read(unsigned char *data, unsigned int size)
+{
+  #ifdef THREADS
+
+  lockRead();
+
+  #endif
+
+  #ifdef DEBUG
+  *logofs << "AgentTransport: Child: Going to read " << size
+          << " bytes from " << "FD#" << fd_ << ".\n"
+          << logofs_flush;
+  #endif
+
+  int copied = -1;
+
+  if (r_buffer_.length_ > 0)
+  {
+    if ((int) size < r_buffer_.length_)
+    {
+      #ifdef TEST
+      *logofs << "AgentTransport: WARNING! Forcing a retry with "
+              << r_buffer_.length_ << " bytes pending and "
+              << size << " in the buffer.\n"
+              << logofs_flush;
+      #endif
+
+      ESET(EAGAIN);
+    }
+    else
+    {
+      copied = (r_buffer_.length_ > ((int) size) ?
+                    ((int) size) : r_buffer_.length_);
+
+      memcpy(data, r_buffer_.data_.begin() + r_buffer_.start_, copied);
+
+      //
+      // Update the buffer status.
+      //
+
+      #ifdef TEST
+      *logofs << "AgentTransport: Child: Going to immediately return "
+              << copied << " bytes from FD#" << fd_ << ".\n"
+              << logofs_flush;
+      #endif
+
+      #ifdef DUMP
+
+      *logofs << "AgentTransport: Child: Dumping content of read data.\n"
+              << logofs_flush;
+
+      DumpData(data, copied);
+
+      #endif
+
+      r_buffer_.length_ -= copied;
+
+      if (r_buffer_.length_ == 0)
+      {
+        r_buffer_.start_ = 0;
+      }
+      else
+      {
+        r_buffer_.start_ += copied;
+
+        #ifdef TEST
+        *logofs << "AgentTransport: Child: There are still "
+                << r_buffer_.length_  << " bytes in read buffer for "
+                << "FD#" << fd_ << ".\n" << logofs_flush;
+        #endif
+      }
+    }
+  }
+  else
+  {
+    #ifdef DEBUG
+    *logofs << "AgentTransport: Child: No data can be got "
+            << "from read buffer for FD#" << fd_ << ".\n"
+            << logofs_flush;
+    #endif
+
+    ESET(EAGAIN);
+  }
+
+  #ifdef THREADS
+
+  unlockRead();
+
+  #endif
+
+  return copied;
+}
+
+//
+// Write data to buffer so that the other
+// thread can get it.
+//
+
+int AgentTransport::write(T_write type, const unsigned char *data, const unsigned int size)
+{
+  #ifdef THREADS
+
+  lockWrite();
+
+  #endif
+
+  //
+  // Just append data to socket's write buffer.
+  // Note that we don't care if buffer exceeds
+  // the size limits set for this type of
+  // transport.
+  //
+
+  #ifdef TEST
+  *logofs << "AgentTransport: Child: Going to append " << size
+          << " bytes to write buffer for " << "FD#" << fd_
+          << ".\n" << logofs_flush;
+  #endif
+
+  int copied = -1;
+
+  if (resize(w_buffer_, size) < 0)
+  {
+    finish();
+
+    ESET(EPIPE);
+  }
+  else
+  {
+    memmove(w_buffer_.data_.begin() + w_buffer_.start_ + w_buffer_.length_, data, size);
+
+    w_buffer_.length_ += size;
+
+    #ifdef DUMP
+
+    *logofs << "AgentTransport: Child: Dumping content of written data.\n"
+            << logofs_flush;
+
+    DumpData(data, size);
+
+    #endif
+
+    #ifdef TEST
+    *logofs << "AgentTransport: Child: Write buffer for FD#" << fd_
+            << " has data for " << w_buffer_.length_ << " bytes.\n"
+            << logofs_flush;
+
+    *logofs << "AgentTransport: Child: Start is " << w_buffer_.start_ 
+            << " length is " << w_buffer_.length_ << " size is "
+            << w_buffer_.data_.size() << " capacity is "
+            << w_buffer_.data_.capacity() << ".\n"
+            << logofs_flush;
+    #endif
+
+    copied = size;
+  }
+
+  //
+  // Let child access again the read buffer.
+  //
+
+  #ifdef THREADS
+
+  unlockWrite();
+
+  #endif
+
+  return copied;
+}
+
+int AgentTransport::flush()
+{
+  //
+  // In case of memory-to-memory transport
+  // this function should never be called.
+  //
+
+  #ifdef PANIC
+  *logofs << "AgentTransport: Child: PANIC! Called flush() for "
+          << "memory to memory transport on " << "FD#"
+          << fd_ << ".\n" << logofs_flush;
+  #endif
+
+  cerr << "Error" << ": Called flush() for "
+       << "memory to memory transport on " << "FD#"
+       << fd_ << ".\n";
+
+  HandleAbort();
+}
+
+int AgentTransport::drain(int limit, int timeout)
+{
+  //
+  // We can't drain the channel in the case
+  // of the memory-to-memory transport. Data
+  // is enqueued for the agent to read but
+  // the agent could require multiple loops
+  // to read it all.
+  //
+
+  //
+  // In case of memory-to-memory transport
+  // this function should never be called.
+  //
+
+  #ifdef PANIC
+  *logofs << "AgentTransport: Child: PANIC! Called drain() for "
+          << "memory to memory transport on " << "FD#"
+          << fd_ << ".\n" << logofs_flush;
+  #endif
+
+  cerr << "Error" << ": Called drain() for "
+       << "memory to memory transport on " << "FD#"
+       << fd_ << ".\n";
+
+  HandleAbort();
+}
+
+unsigned int AgentTransport::getPending(unsigned char *&data)
+{
+  #ifdef THREADS
+
+  lockRead();
+
+  #endif
+
+  if (r_buffer_.length_ > 0)
+  {
+    unsigned int size = r_buffer_.length_;
+
+    data = r_buffer_.data_.begin() + r_buffer_.start_;
+
+    #ifdef DEBUG
+    *logofs << "AgentTransport: Child: Returning " << size
+            << " pending bytes from FD#" << fd_
+            << ".\n" << logofs_flush;
+    #endif
+
+    r_buffer_.length_ = 0;
+    r_buffer_.start_  = 0;
+
+    #ifdef THREADS
+
+    unlockRead();
+
+    #endif
+
+    //
+    // Prevent the deletion of the buffer.
+    //
+
+    owner_ = 0;
+
+    return size;
+  }
+
+  #ifdef TEST
+  *logofs << "AgentTransport: WARNING! No pending data "
+          << "for FD#" << fd_ << ".\n" << logofs_flush;
+  #endif
+
+  #ifdef THREADS
+
+  unlockRead();
+
+  #endif
+
+  data = NULL;
+
+  return 0;
+}
+
+void AgentTransport::fullReset()
+{
+  #ifdef THREADS
+
+  lockRead();
+  lockWrite();
+
+  #endif
+
+  #ifdef TEST
+  *logofs << "AgentTransport: Child: Resetting transport "
+          << "for FD#" << fd_ << ".\n" << logofs_flush;
+  #endif
+
+  blocked_ = 0;
+  finish_  = 0;
+
+  if (owner_ == 1)
+  {
+    Transport::fullReset(r_buffer_);
+  }
+
+  Transport::fullReset(w_buffer_);
+}
+
+int AgentTransport::enqueue(const char *data, const int size)
+{
+  #ifdef THREADS
+
+  lockRead();
+
+  #endif
+
+  if (finish_ == 1)
+  {
+    #if defined(PARENT) && defined(TEST)
+    *logofs << "AgentTransport: Parent: Returning EPIPE in "
+            << "write for finishing FD#" << fd_ << ".\n"
+           << logofs_flush;
+    #endif
+
+    ESET(EPIPE);
+
+    return -1;
+  }
+
+  //
+  // Always allow the agent to write
+  // all its data.
+  //
+
+  int toPut = size;
+
+  #if defined(PARENT) && defined(TEST)
+  *logofs << "AgentTransport: Parent: Going to put " << toPut
+          << " bytes into read buffer for FD#" << fd_
+          << ". Buffer length is " << r_buffer_.length_
+          << ".\n" << logofs_flush;
+  #endif
+
+  if (resize(r_buffer_, toPut) < 0)
+  {
+    finish();
+
+    #ifdef THREADS
+
+    unlockRead();
+
+    #endif
+
+    return -1;
+  }
+
+  memcpy(r_buffer_.data_.begin() + r_buffer_.start_ + r_buffer_.length_, data, toPut);
+
+  r_buffer_.length_ += toPut;
+
+  #if defined(DUMP) && defined(PARENT)
+
+  *logofs << "AgentTransport: Parent: Dumping content of enqueued data.\n"
+          << logofs_flush;
+
+  DumpData((const unsigned char *) data, toPut);
+
+  #endif
+
+  #if defined(PARENT) && defined(TEST)
+  *logofs << "AgentTransport: Parent: Read buffer for FD#" << fd_
+          << " has now data for " << r_buffer_.length_
+          << " bytes.\n" << logofs_flush;
+
+  *logofs << "AgentTransport: Parent: Start is " << r_buffer_.start_ 
+          << " length is " << r_buffer_.length_ << " size is "
+          << r_buffer_.data_.size() << " capacity is "
+          << r_buffer_.data_.capacity() << ".\n"
+          << logofs_flush;
+  #endif
+
+  #ifdef THREADS
+
+  unlockRead();
+
+  #endif
+
+  return toPut;
+}
+
+int AgentTransport::dequeue(char *data, int size)
+{
+  #ifdef THREADS
+
+  lockWrite();
+
+  #endif
+
+  if (w_buffer_.length_ == 0)
+  {
+    if (finish_ == 1)
+    {
+      #if defined(PARENT) && defined(TEST)
+      *logofs << "AgentTransport: Parent: Returning 0 in read "
+              << "for finishing FD#" << fd_ << ".\n"
+              << logofs_flush;
+      #endif
+
+      return 0;
+    }
+
+    #if defined(PARENT) && defined(TEST)
+    *logofs << "AgentTransport: Parent: No data can be read "
+            << "from write buffer for FD#" << fd_ << ".\n"
+            << logofs_flush;
+    #endif
+
+    ESET(EAGAIN);
+
+    #ifdef THREADS
+
+    unlockWrite();
+
+    #endif
+
+    return -1;
+  }
+
+  //
+  // Return as many bytes as possible.
+  //
+
+  int toGet = ((int) size > w_buffer_.length_ ? w_buffer_.length_ : size);
+
+  #if defined(PARENT) && defined(TEST)
+  *logofs << "AgentTransport: Parent: Going to get " << toGet
+          << " bytes from write buffer for FD#" << fd_ << ".\n"
+          << logofs_flush;
+  #endif
+
+  memcpy(data, w_buffer_.data_.begin() + w_buffer_.start_, toGet);
+
+  w_buffer_.start_  += toGet;
+  w_buffer_.length_ -= toGet;
+
+  #if defined(DUMP) && defined(PARENT)
+
+  *logofs << "AgentTransport: Parent: Dumping content of dequeued data.\n"
+          << logofs_flush;
+
+  DumpData((const unsigned char *) data, toGet);
+
+  #endif
+
+  #if defined(PARENT) && defined(TEST)
+  *logofs << "AgentTransport: Parent: Write buffer for FD#" << fd_
+          << " has now data for " << length() << " bytes.\n"
+          << logofs_flush;
+
+  *logofs << "AgentTransport: Parent: Start is " << w_buffer_.start_ 
+          << " length is " << w_buffer_.length_ << " size is "
+          << w_buffer_.data_.size() << " capacity is "
+          << w_buffer_.data_.capacity() << ".\n"
+          << logofs_flush;
+  #endif
+
+  #ifdef THREADS
+
+  unlockWrite();
+
+  #endif
+
+  return toGet;
+}
+
+int AgentTransport::dequeuable()
+{
+  if (finish_ == 1)
+  {
+    #if defined(PARENT) && defined(TEST)
+    *logofs << "AgentTransport: Parent: Returning EPIPE in "
+            << "readable for finishing FD#" << fd_
+            << ".\n" << logofs_flush;
+    #endif
+
+    ESET(EPIPE);
+
+    return -1;
+  }
+
+  #if defined(PARENT) && defined(TEST)
+  *logofs << "AgentTransport: Parent: Returning "
+          << w_buffer_.length_ << " as data readable "
+          << "from read buffer for FD#" << fd_ << ".\n"
+          << logofs_flush;
+  #endif
+
+  return w_buffer_.length_;
+}
+
+#ifdef THREADS
+
+int AgentTransport::lockRead()
+{
+  for (;;)
+  {
+    int result = pthread_mutex_lock(&m_read_);
+
+    if (result == 0)
+    {
+      #ifdef DEBUG
+      *logofs << "AgentTransport: Read mutex locked by thread id "
+              << pthread_self() << ".\n" << logofs_flush;
+      #endif
+
+      return 0;
+    }
+    else if (EGET() == EINTR)
+    {
+      continue;
+    }
+    else
+    {
+      #ifdef WARNING
+      *logofs << "AgentTransport: WARNING! Locking of read mutex by thread id "
+              << pthread_self() << " returned " << result << ". Error is '"
+              << ESTR() << "'.\n" << logofs_flush;
+      #endif
+
+      return result;
+    }
+  }
+}
+
+int AgentTransport::lockWrite()
+{
+  for (;;)
+  {
+    int result = pthread_mutex_lock(&m_write_);
+
+    if (result == 0)
+    {
+      #ifdef DEBUG
+      *logofs << "AgentTransport: Write mutex locked by thread id "
+              << pthread_self() << ".\n" << logofs_flush;
+      #endif
+
+      return 0;
+    }
+    else if (EGET() == EINTR)
+    {
+      continue;
+    }
+    else
+    {
+      #ifdef WARNING
+      *logofs << "AgentTransport: WARNING! Locking of write mutex by thread id "
+              << pthread_self() << " returned " << result << ". Error is '"
+              << ESTR() << "'.\n" << logofs_flush;
+      #endif
+
+      return result;
+    }
+  }
+}
+
+int AgentTransport::unlockRead()
+{
+  for (;;)
+  {
+    int result = pthread_mutex_unlock(&m_read_);
+
+    if (result == 0)
+    {
+      #ifdef DEBUG
+      *logofs << "AgentTransport: Read mutex unlocked by thread id "
+              << pthread_self() << ".\n" << logofs_flush;
+      #endif
+
+      return 0;
+    }
+    else if (EGET() == EINTR)
+    {
+      continue;
+    }
+    else
+    {
+      #ifdef WARNING
+      *logofs << "AgentTransport: WARNING! Unlocking of read mutex by thread id "
+              << pthread_self() << " returned " << result << ". Error is '"
+              << ESTR() << "'.\n" << logofs_flush;
+      #endif
+
+      return result;
+    }
+  }
+}
+
+int AgentTransport::unlockWrite()
+{
+  for (;;)
+  {
+    int result = pthread_mutex_unlock(&m_write_);
+
+    if (result == 0)
+    {
+      #ifdef DEBUG
+      *logofs << "AgentTransport: Write mutex unlocked by thread id "
+              << pthread_self() << ".\n" << logofs_flush;
+      #endif
+
+      return 0;
+    }
+    else if (EGET() == EINTR)
+    {
+      continue;
+    }
+    else
+    {
+      #ifdef WARNING
+      *logofs << "AgentTransport: WARNING! Unlocking of write mutex by thread id "
+              << pthread_self() << " returned " << result << ". Error is '"
+              << ESTR() << "'.\n" << logofs_flush;
+      #endif
+
+      return result;
+    }
+  }
+}
+
+#endif
diff --git a/nxcomp/src/Transport.h b/nxcomp/src/Transport.h
new file mode 100644
index 000000000..047396af6
--- /dev/null
+++ b/nxcomp/src/Transport.h
@@ -0,0 +1,577 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef Transport_H
+#define Transport_H
+
+#include <zlib.h>
+#include <errno.h>
+
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include "Misc.h"
+#include "Control.h"
+
+#include "Types.h"
+#include "Timestamp.h"
+#include "Socket.h"
+
+//
+// Set the verbosity level.
+//
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+//
+// Define this to lock and unlock the
+// memory-to-memory transport buffers
+// before they are accessed. The code
+// is outdated and doesn't work with
+// the current pthread library.
+//
+
+#undef  THREADS
+
+//
+// Define this to know when a socket
+// is created or destroyed.
+//
+
+#undef  REFERENCES
+
+//
+// Size of buffer if not set by user.
+//
+
+#define TRANSPORT_BUFFER_DEFAULT_SIZE         16384
+
+//
+// Type of transport.
+//
+
+typedef enum
+{
+  transport_base,
+  transport_proxy,
+  transport_agent,
+  transport_last_tag
+
+} T_transport_type;
+
+//
+// This class handles the buffered I/O on
+// the network sockets.
+//
+
+//
+// TODO: This class is useful but adds a lot of
+// overhead. There are many improvements we can
+// make here:
+//
+// - There should be a generic Buffer class, ac-
+//   comodating a list of memory buffers. This
+//   would enable the use of the readv() and
+//   writev() functions to perform the I/O on
+//   the socket.
+//
+// - The buffering should be moved to the Write-
+//   Buffer and ReadBuffer classes. By performing
+//   the buffering here and there, we are dupli-
+//   cating a lot of code and are adding a lot
+//   of useless memory copies.
+//
+// - Stream compression should be removed. The
+//   proxy should compress the frames based on
+//   the type and should include the length of
+//   the decompressed data in the header of the
+//   packet. Besides avoiding the compression
+//   of packets that cannot be reduced in size,
+//   we would also save the additional memory
+//   allocations due to the fact that we don't
+//   know the size of the decode buffer at the
+//   time we read the packet from the network.
+//
+// - The other utilities implemented here, like
+//   the functions forcing a write on the socket
+//   or waiting for more data to become available
+//   should be moved to the Proxy or the Channel
+//   classes.
+//
+
+class Transport
+{
+  public:
+
+  //
+  // Member functions.
+  //
+
+  Transport(int fd);
+
+  virtual ~Transport();
+
+  int fd() const
+  {
+    return fd_;
+  }
+
+  T_transport_type getType()
+  {
+    return type_;
+  }
+
+  //
+  // Virtual members redefined by proxy
+  // and 'memory-to-memory' I/O layers.
+  //
+
+  virtual int read(unsigned char *data, unsigned int size);
+
+  virtual int write(T_write type, const unsigned char *data, const unsigned int size);
+
+  virtual int flush();
+
+  virtual int drain(int limit, int timeout);
+
+  virtual void finish()
+  {
+    fullReset();
+
+    finish_ = 1;
+  }
+
+  virtual int length() const
+  {
+    return w_buffer_.length_;
+  }
+
+  virtual int pending() const
+  {
+    return 0;
+  }
+
+  virtual int readable() const
+  {
+    return GetBytesReadable(fd_);
+  }
+
+  virtual int writable() const
+  {
+    return GetBytesWritable(fd_);
+  }
+
+  virtual int queued() const
+  {
+    return GetBytesQueued(fd_);
+  }
+
+  virtual int flushable() const
+  {
+    return 0;
+  }
+
+  virtual int wait(int timeout) const;
+
+  void setSize(unsigned int initialSize,
+                   unsigned int thresholdSize,
+                       unsigned int maximumSize);
+
+  //
+  // Return a pointer to the data
+  // in the read buffer.
+  //
+
+  virtual unsigned int getPending(unsigned char *&data)
+  {
+    data = NULL;
+
+    return 0;
+  }
+
+  virtual void pendingReset()
+  {
+  }
+
+  virtual void partialReset()
+  {
+    partialReset(w_buffer_);
+  }
+
+  virtual void fullReset();
+
+  int blocked() const
+  {
+    return blocked_;
+  }
+
+  protected:
+
+  //
+  // Make room in the buffer to accommodate
+  // at least size bytes.
+  //
+
+  int resize(T_buffer &buffer, const int &size);
+
+  void partialReset(T_buffer &buffer)
+  {
+    if (buffer.length_ == 0 &&
+            (buffer.data_.size() > initialSize_ ||
+                 buffer.data_.capacity() > initialSize_))
+    {
+      fullReset(buffer);
+    }
+  }
+
+  void fullReset(T_buffer &buffer);
+
+  //
+  // Data members.
+  //
+
+  int fd_;
+
+  int blocked_;
+  int finish_;
+
+  T_buffer w_buffer_;
+
+  unsigned int initialSize_;
+  unsigned int thresholdSize_;
+  unsigned int maximumSize_;
+
+  T_transport_type type_;
+
+  private:
+
+  #ifdef REFERENCES
+
+  static int references_;
+
+  #endif
+};
+
+//
+// This class handles buffered I/O and 
+// compression of the proxy stream.
+//
+
+class ProxyTransport : public Transport
+{
+  public:
+
+  ProxyTransport(int fd);
+
+  virtual ~ProxyTransport();
+
+  virtual int read(unsigned char *data, unsigned int size);
+
+  virtual int write(T_write type, const unsigned char *data, const unsigned int size);
+
+  virtual int flush();
+
+  //
+  // Same as in the base class.
+  //
+  // virtual int drain(int limit, int timeout);
+  //
+  // virtual void finish();
+  //
+
+  //
+  // Same as in the base class.
+  //
+  // virtual int length() const
+  //
+
+  virtual int pending() const
+  {
+    return r_buffer_.length_;
+  }
+
+  //
+  // Same as in the base class.
+  //
+  // virtual int readable() const;
+  //
+  // virtual int writable() const;
+  //
+  // virtual int queued() const;
+  //
+
+  virtual int flushable() const
+  {
+    return flush_;
+  }
+
+  //
+  // Same as in the base class, but
+  // should not be called.
+  //
+  // int drained() const;
+  //
+  // Same as in the base class.
+  //
+  // virtual int wait(int timeout) const;
+  //
+  // Same as in the base class.
+  //
+  // void setSize(unsigned int initialSize,
+  //                  unsigned int thresholdSize,
+  //                      unsigned int maximumSize);
+  //
+
+  virtual unsigned int getPending(unsigned char *&data);
+
+  virtual void pendingReset()
+  {
+    owner_ = 1;
+  }
+
+  virtual void partialReset()
+  {
+    if (owner_ == 1)
+    {
+      Transport::partialReset(r_buffer_);
+    }
+
+    Transport::partialReset(w_buffer_);
+  }
+
+  virtual void fullReset();
+
+  //
+  // Same as in the base class.
+  //
+  // int blocked() const;
+  //
+
+  protected:
+
+  int flush_;
+  int owner_;
+
+  T_buffer r_buffer_;
+
+  z_stream r_stream_;
+  z_stream w_stream_;
+
+  private:
+
+  #ifdef REFERENCES
+
+  static int references_;
+
+  #endif
+};
+
+//
+// Handle memory-to-memory data transfers between
+// an agent and the proxy.
+//
+
+class AgentTransport : public Transport
+{
+  public:
+
+  AgentTransport(int fd);
+
+  virtual ~AgentTransport();
+
+  virtual int read(unsigned char *data, unsigned int size);
+
+  virtual int write(T_write type, const unsigned char *data, const unsigned int size);
+
+  //
+  // These two should never be called.
+  //
+
+  virtual int flush();
+
+  virtual int drain(int limit, int timeout);
+
+  //
+  // Same as in the base class.
+  //
+  // virtual void finish();
+  //
+
+  //
+  // Same as in the base class.
+  //
+  // virtual int length() const
+  //
+
+  virtual int pending() const
+  {
+    return r_buffer_.length_;
+  }
+
+  //
+  // These are intended to operate only
+  // on the internal buffers.
+  //
+
+  virtual int readable() const
+  {
+    return r_buffer_.length_;
+  }
+
+  virtual int writable() const
+  {
+    return control -> TransportMaximumBufferSize;
+  }
+
+  virtual int queued() const
+  {
+    return 0;
+  }
+
+  //
+  // Same as in the base class.
+  //
+  // virtual int flushable() const;
+  //
+  // Same as in the base class, but
+  // should not be called.
+  //
+  // int drained() const;
+  //
+
+  //
+  // Return immediately or will
+  // block until the timeout.
+  //
+
+  virtual int wait(int timeout) const
+  {
+    return 0;
+  }
+
+  //
+  // Same as in the base class.
+  //
+  // void setSize(unsigned int initialSize,
+  //                  unsigned int thresholdSize,
+  //                      unsigned int maximumSize);
+  //
+
+  virtual unsigned int getPending(unsigned char *&data);
+
+  virtual void pendingReset()
+  {
+    owner_ = 1;
+  }
+
+  virtual void partialReset()
+  {
+    if (owner_ == 1)
+    {
+      Transport::partialReset(r_buffer_);
+    }
+
+    Transport::partialReset(w_buffer_);
+  }
+
+  virtual void fullReset();
+
+  //
+  // Same as in the base class.
+  //
+  // int blocked() const;
+  //
+
+  //
+  // The following are specific of the
+  // memory-to-memory transport.
+  //
+
+  int enqueue(const char *data, const int size);
+
+  int dequeue(char *data, int size);
+
+  int queuable()
+  {
+    //
+    // Always allow the agent to enqueue
+    // more data.
+    //
+
+    return control -> TransportMaximumBufferSize;
+  }
+
+  int dequeuable();
+
+  protected:
+
+  //
+  // Lock the buffer to handle reads and
+  // writes safely.
+  //
+
+  #ifdef THREADS
+
+  int lockRead();
+  int lockWrite();
+
+  int unlockRead();
+  int unlockWrite();
+
+  #endif
+
+  //
+  // Data members.
+  //
+
+  int owner_;
+
+  T_buffer r_buffer_;
+
+  //
+  // Mutexes for safe read and write.
+  //
+
+  #ifdef THREADS
+
+  pthread_mutex_t m_read_;
+  pthread_mutex_t m_write_;
+
+  #endif
+
+  private:
+
+  #ifdef REFERENCES
+
+  static int references_;
+
+  #endif
+};
+
+#endif /* Transport_H */
diff --git a/nxcomp/src/Types.h b/nxcomp/src/Types.h
new file mode 100644
index 000000000..e82664c81
--- /dev/null
+++ b/nxcomp/src/Types.h
@@ -0,0 +1,271 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef Types_H
+#define Types_H
+
+using namespace std;
+
+#include <vector>
+#include <list>
+#include <map>
+#include <set>
+
+#include "MD5.h"
+
+//
+// This is MD5 length.
+//
+
+#define MD5_LENGTH          16
+
+//
+// Types of repositories. Replace the original 
+// clear() methods from STL in order to actually 
+// free the unused memory.
+//
+
+class Message;
+
+class T_data : public vector < unsigned char >
+{
+  public:
+
+  unsigned char *begin()
+  {
+    return &*(vector < unsigned char >::begin());
+  }
+
+  const unsigned char *begin() const
+  {
+    return &*(vector < unsigned char >::begin());
+  }
+
+  // Avoid overriding clear() when using libc++. Fiddling with STL internals
+  // doesn't really seem like a good idea to me anyway.
+  #ifndef _LIBCPP_VECTOR
+  void clear()
+  {
+    #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H)
+
+    #if defined(__GLIBCPP_INTERNAL_VECTOR_H)
+
+    _Destroy(_M_start, _M_finish);
+
+    #else /* #if defined(__GLIBCPP_INTERNAL_VECTOR_H) */
+
+    destroy(_M_start, _M_finish);
+
+    #endif /* #if defined(__GLIBCPP_INTERNAL_VECTOR_H) */
+
+    _M_deallocate(_M_start, _M_end_of_storage - _M_start);
+
+    _M_start = _M_finish = _M_end_of_storage = 0;
+
+    #else /* #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) */
+
+    #if defined(_GLIBCXX_VECTOR)
+
+    _Destroy(this->_M_impl._M_start, this->_M_impl._M_finish);
+
+    _M_deallocate(this->_M_impl._M_start, this->_M_impl._M_end_of_storage - this->_M_impl._M_start);
+
+    this->_M_impl._M_start = this->_M_impl._M_finish = this->_M_impl._M_end_of_storage = 0;
+
+    #else /* #if defined(_GLIBCXX_VECTOR) */
+
+    destroy(start, finish);
+
+    deallocate();
+
+    start = finish = end_of_storage = 0;
+
+    #endif /* #if defined(_GLIBCXX_VECTOR) */
+
+    #endif  /* #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) */
+  }
+  #endif /* #ifdef _LIBCPP_VECTOR */
+};
+
+class T_messages : public vector < Message * >
+{
+  public:
+
+  // Avoid overriding clear() when using libc++. Fiddling with STL internals
+  // doesn't really seem like a good idea to me anyway.
+  #ifndef _LIBCPP_VECTOR
+  void clear()
+  {
+    #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H)
+
+    #if defined(__GLIBCPP_INTERNAL_VECTOR_H)
+
+    _Destroy(_M_start, _M_finish);
+
+    #else /* #if defined(__GLIBCPP_INTERNAL_VECTOR_H) */
+
+    destroy(_M_start, _M_finish);
+
+    #endif /* #if defined(__GLIBCPP_INTERNAL_VECTOR_H) */
+
+    _M_deallocate(_M_start, _M_end_of_storage - _M_start);
+
+    _M_start = _M_finish = _M_end_of_storage = 0;
+
+    #else /* #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) */
+
+    #if defined(_GLIBCXX_VECTOR)
+
+    _Destroy(this->_M_impl._M_start, this->_M_impl._M_finish);
+
+    _M_deallocate(this->_M_impl._M_start, this->_M_impl._M_end_of_storage - this->_M_impl._M_start);
+
+    this->_M_impl._M_start = this->_M_impl._M_finish = this->_M_impl._M_end_of_storage = 0;
+
+    #else /* #if defined(_GLIBCXX_VECTOR) */
+
+    destroy(start, finish);
+
+    deallocate();
+
+    start = finish = end_of_storage = 0;
+
+    #endif /* #if defined(_GLIBCXX_VECTOR) */
+
+    #endif /* #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) */
+  }
+  #endif /* #ifndef _LIBCPP_VECTOR */
+};
+
+typedef md5_byte_t * T_checksum;
+
+struct T_less
+{
+  bool operator()(T_checksum a, T_checksum b) const
+  {
+    return (memcmp(a, b, MD5_LENGTH) < 0);
+  }
+};
+
+typedef map < T_checksum, int, T_less > T_checksums;
+
+class Split;
+
+typedef list < Split * > T_splits;
+
+class File;
+
+struct T_older
+{
+  bool operator()(File *a, File *b) const;
+};
+
+typedef set < File *, T_older > T_files;
+
+typedef list < int > T_list;
+
+//
+// Used to accommodate data to be read and
+// written to a socket.
+//
+
+typedef struct
+{
+  T_data data_;
+  int    length_;
+  int    start_;
+}
+T_buffer;
+
+//
+// The message store operation that was
+// executed for the message. The channels
+// use these values to determine how to
+// handle the message after it has been
+// received at the decoding side.
+//
+
+// Since ProtoStep8 (#issue 108)
+enum T_store_action
+{
+  is_hit,
+  is_added,
+  is_discarded,
+  is_removed
+};
+
+// Since ProtoStep8 (#issue 108)
+#define IS_HIT is_hit
+#define IS_ADDED is_added
+
+enum T_checksum_action
+{
+  use_checksum,
+  discard_checksum
+};
+
+enum T_data_action
+{
+  use_data,
+  discard_data
+};
+
+//
+// Message is going to be weighted for
+// deletion at insert or cleanup time?
+//
+
+enum T_rating
+{
+  rating_for_insert,
+  rating_for_clean
+};
+
+//
+// How to handle the writes to the X
+// and proxy connections.
+//
+
+enum T_write
+{
+  write_immediate,
+  write_delayed
+};
+
+enum T_flush
+{
+  flush_if_needed,
+  flush_if_any
+};
+
+//
+// This is the value to indicate an
+// invalid position in the message
+// store.
+//
+
+static const int nothing = -1;
+
+#endif /* Types_H */
diff --git a/nxcomp/src/Unpack.cpp b/nxcomp/src/Unpack.cpp
new file mode 100644
index 000000000..e63e836f0
--- /dev/null
+++ b/nxcomp/src/Unpack.cpp
@@ -0,0 +1,1514 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "Misc.h"
+#include "Unpack.h"
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+//
+// Used for the ZLIB decompression
+// of RGB, alpha and colormap data.
+//
+
+z_stream unpackStream;
+
+static int unpackInitialized;
+
+int Unpack8To8(const T_colormask *colormask, const unsigned char *data,
+                   unsigned char *out, unsigned char *end);
+
+int Unpack8To8(T_colormap *colormap, const unsigned char *data,
+                   unsigned char *out, unsigned char *end);
+
+int Unpack8To16(const T_colormask *colormask, const unsigned char *data,
+                    unsigned char *out, unsigned char *end);
+
+int Unpack8To16(T_colormap *colormap, const unsigned char *data,
+                    unsigned char *out, unsigned char *end);
+
+int Unpack8To24(const T_colormask *colormask, const unsigned char *data,
+                    unsigned char *out, unsigned char *end);
+
+int Unpack8To24(T_colormap *colormap, const unsigned char *data,
+                    unsigned char *out, unsigned char *end);
+
+int Unpack8To32(const T_colormask *colormask, const unsigned char *data,
+                    unsigned char *out, unsigned char *end);
+
+int Unpack8To32(T_colormap *colormap, const unsigned char *data,
+                    unsigned char *out, unsigned char *end);
+
+int Unpack15To16(const unsigned char *data, unsigned char *out,
+                     unsigned char *end);
+
+int Unpack15To24(const unsigned char *data, unsigned char *out,
+                     unsigned char *end);
+
+int Unpack15To32(const unsigned char *data, unsigned char *out,
+                     unsigned char *end);
+
+int Unpack16To16(const T_colormask *colormask, const unsigned char *data,
+                     unsigned char *out, unsigned char *end);
+
+int Unpack16To16(const unsigned char *data, unsigned char *out,
+                     unsigned char *end, int imageByteOrder);
+
+int Unpack16To24(const T_colormask *colormask, const unsigned char *data,
+                     unsigned char *out, unsigned char *end);
+
+int Unpack16To24(const unsigned char *data, unsigned char *out,
+                     unsigned char *end, int imageByteOrder);
+
+int Unpack16To32(const T_colormask *colormask, const unsigned char *data,
+                     unsigned char *out, unsigned char *end);
+
+int Unpack16To32(const unsigned char *data, unsigned char *out,
+                     unsigned char *end, int imageByteOrder);
+
+int Unpack24To24(const T_colormask *colormask, const unsigned char *data,
+                     unsigned char *out, unsigned char *end);
+
+int Unpack24To24(const unsigned char *data, unsigned char *out,
+                     unsigned char *end);
+
+int Unpack24To32(const T_colormask *colormask, const unsigned char *data,
+                     unsigned char *out, unsigned char *end);
+
+int Unpack24To32(const unsigned char *data, unsigned char *out, unsigned char *end);
+
+int Unpack32To32(const T_colormask *colormask, const unsigned int *data,
+                            unsigned int *out, unsigned int *end);
+
+
+void UnpackInit()
+{
+  if (unpackInitialized == 0)
+  {
+    unpackStream.zalloc = (alloc_func) 0;
+    unpackStream.zfree  = (free_func) 0;
+    unpackStream.opaque = (voidpf) 0;
+
+    unpackStream.next_in = (Bytef *) 0;
+    unpackStream.avail_in = 0;
+
+    int result = inflateInit2(&unpackStream, 15);
+
+    if (result != Z_OK)
+    {
+      #ifdef PANIC
+      *logofs << "UnpackInit: PANIC! Cannot initialize the Z stream "
+              << "for decompression. Error is '" << zError(result)
+              << "'.\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Cannot initialize the Z stream for "
+           << "decompression. Error is '" << zError(result)
+           << "'.\n";
+    }
+    else
+    {
+      unpackInitialized = 1;
+    }
+  }
+}
+
+void UnpackDestroy()
+{
+  if (unpackInitialized == 1)
+  {
+    inflateEnd(&unpackStream);
+
+    unpackInitialized = 0;
+  }
+}
+
+//
+// Get bits per pixel set by client
+// according to display geometry.
+//
+
+int UnpackBitsPerPixel(T_geometry *geometry, unsigned int depth)
+{
+  switch (depth)
+  {
+    case 1:
+    {
+      return geometry -> depth1_bpp;
+    }
+    case 4:
+    {
+      return geometry -> depth4_bpp;
+    }
+    case 8:
+    {
+      return geometry -> depth8_bpp;
+    }
+    case 15:
+    case 16:
+    {
+      return geometry -> depth16_bpp;
+    }
+    case 24:
+    {
+      return geometry -> depth24_bpp;
+    }
+    case 32:
+    {
+      return geometry -> depth32_bpp;
+    }
+    default:
+    {
+      return 0;
+    }
+  }
+}
+
+int Unpack8To8(const T_colormask *colormask, const unsigned char *data,
+                    unsigned char *out, unsigned char *end)
+{
+  #ifdef TEST
+  *logofs << "Unpack8To8: Unpacking " << end - out
+          << " bytes of data.\n" << logofs_flush;
+  #endif
+
+  memcpy(out, data, end - out);
+
+  return 1;
+}
+
+int Unpack8To16(const T_colormask *colormask, const unsigned char *data,
+                    unsigned char *out, unsigned char *end)
+{
+  #ifdef TEST
+  *logofs << "Unpack8To16: Unpacking " << end - out
+          << " bytes of data.\n" << logofs_flush;
+  #endif
+
+  unsigned short *out16 = (unsigned short *) out;
+  unsigned short *end16 = (unsigned short *) end;
+  
+  while (out16 < end16)
+  {
+    if (*data == 0)
+    {
+      *out16 = 0x0;
+    }
+    else if (*data == 0xff)
+    {
+      *out16 = 0xffff;
+    }
+    else
+    {
+      //
+      // Pixel layout:
+      //
+      // 8bits 00RRGGBB -> 16bits RR000GG0 000BB000.
+      //
+
+      *out16 = (((((*data & 0x30) << 2) | colormask -> correction_mask) << 8) & 0xf800) |
+                   (((((*data & 0xc) << 4) | colormask -> correction_mask) << 3) & 0x7e0) |
+                       (((((*data & 0x3) << 6) | colormask -> correction_mask) >> 3) & 0x1f);
+    }
+
+    out16++;
+    data++;
+  }
+
+  return 1;
+}
+
+int Unpack8To24(const T_colormask *colormask, const unsigned char *data,
+                    unsigned char *out, unsigned char *end)
+{
+  #ifdef TEST
+  *logofs << "Unpack8To24: Unpacking " << end - out
+          << " bytes of data.\n" << logofs_flush;
+  #endif
+
+  while (out < (end - 2))
+  {
+    if (*data == 0x00)
+    {
+      out[0] = out[1] = out[2] = 0x00;
+    }
+    else if (*data == 0xff)
+    {
+      out[0] = out[1] = out[2] = 0xff;
+    }
+    else
+    {
+      //
+      // Pixel layout:
+      //
+      // 8bits 00RRGGBB -> 24bits RR000000 GG00000 BB000000.
+      //
+
+      out[0] = (((*data & 0x30) << 2) | colormask -> correction_mask);
+      out[1] = (((*data & 0x0c) << 4) | colormask -> correction_mask);
+      out[2] = (((*data & 0x03) << 6) | colormask -> correction_mask);
+    }
+
+    out  += 3;
+    data += 1;
+  }
+
+  return 1;
+}
+
+int Unpack8To32(const T_colormask *colormask, const unsigned char *data,
+                    unsigned char *out, unsigned char *end)
+{
+  #ifdef TEST
+  *logofs << "Unpack8To32: Unpacking " << end - out
+          << " bytes of data.\n" << logofs_flush;
+  #endif
+
+  unsigned int *out32 = (unsigned int *) out;
+  unsigned int *end32 = (unsigned int *) end;
+
+  while (out32 < end32)
+  {
+    if (*data == 0)
+    {
+      *out32 = 0x0;
+    }
+    else if (*data == 0xff)
+    {
+      *out32 = 0xffffff;
+    }
+    else
+    {
+      *out32 = ((((*data & 0x30) << 2) | colormask -> correction_mask) << 16) |
+                   ((((*data & 0xc) << 4) | colormask -> correction_mask) << 8) |
+                       (((*data & 0x3) << 6) | colormask -> correction_mask);
+    }
+
+    out32++;
+    data++;
+  }
+
+  return 1;
+}
+
+int Unpack8(T_geometry *geometry, const T_colormask *colormask, int src_depth, int src_width,
+                int src_height, unsigned char *src_data, int src_size, int dst_depth,
+                    int dst_width, int dst_height, unsigned char *dst_data, int dst_size)
+{
+  int dst_bpp = UnpackBitsPerPixel(geometry, dst_depth);
+
+  int (*unpack)(const T_colormask *colormask, const unsigned char *data,
+                    unsigned char *out, unsigned char *end);
+
+  switch (dst_bpp)
+  {
+    case 8:
+    {
+      unpack = Unpack8To8;
+
+      break;
+    }
+    case 16:
+    {
+      unpack = Unpack8To16;
+
+      break;
+    }
+    case 24:
+    {
+      unpack = Unpack8To24;
+
+      break;
+    }
+    case 32:
+    {
+      unpack = Unpack8To32;
+
+      break;
+    }
+    default:
+    {
+      #ifdef PANIC
+      *logofs << "Unpack8: PANIC! Bad destination bits per pixel "
+              << dst_bpp << ". Only 16/24/32 are supported.\n"
+              << logofs_flush;
+      #endif
+
+      return -1;
+    }
+  }
+
+  if (dst_bpp == 24)
+  {
+    unsigned char *dst_end = dst_data;
+
+    #ifdef TEST
+    *logofs  << "Unpack8: Handling 24 bits with dst_size "
+             << dst_size << ".\n" << logofs_flush;
+    #endif
+
+    for (int y = 0; y < dst_height; y++)
+    {
+      dst_data = dst_end;
+
+      dst_end += RoundUp4(dst_width * 3);
+
+      (*unpack)(colormask, src_data, dst_data, dst_end);
+
+      src_data += src_width;
+    }
+  }
+  else
+  {
+    unsigned char *dst_end = dst_data + dst_size;
+
+    (*unpack)(colormask, src_data, dst_data, dst_end);
+  }
+
+  return 1;
+}
+
+int Unpack16To16(const T_colormask *colormask, const unsigned char *data,
+                     unsigned char *out, unsigned char *end)
+{
+  #ifdef TEST
+  *logofs << "Unpack16To16: Unpacking " << end - out
+          << " bytes of data.\n" << logofs_flush;
+  #endif
+
+  if (colormask -> correction_mask)
+  {
+    unsigned short *data16 = (unsigned short *) data;
+
+    unsigned short *out16 = (unsigned short *) out;
+    unsigned short *end16 = (unsigned short *) end;
+
+    while (out16 < end16)
+    {
+      if (*data16 == 0x0000)
+      {
+        *out16 = 0x0000;
+      }
+      else if (*data16 == 0xffff)
+      {
+        *out16 = 0xffff;
+      }
+      else
+      {
+        //
+        // Pixel layout:
+        //
+        // 16bit RRRRRGGG GG0BBBBB  -> RRRRRGGG GGGBBBBB.
+        //
+
+        *out16 = (((((*data16 & 0xf100) >> 8) | colormask -> correction_mask) << 8) & 0xf800) |
+                     (((((*data16 & 0x7c0) >> 3) | colormask -> correction_mask) << 3) & 0x7e0) |
+                         (((((*data16 & 0x1f) << 3) | colormask -> correction_mask) >> 3) & 0x1f);
+      }
+
+      out16++;
+      data16++;
+    }
+  }
+  else
+  {
+    #ifdef TEST
+    *logofs << "Unpack16To16: Using bitwise copy due to null correction mask.\n"
+            << logofs_flush;
+    #endif
+
+    memcpy((unsigned char *) out, (unsigned char *) data, end - out);
+  }
+
+  return 1;
+}
+
+int Unpack16To24(const T_colormask *colormask, const unsigned char *data,
+                     unsigned char *out, unsigned char *end)
+{
+  #ifdef TEST
+  *logofs << "Unpack16To24: Unpacking " << end - out
+          << " bytes of data.\n" << logofs_flush;
+  #endif
+
+  unsigned short *data16 = (unsigned short *) data;
+
+
+  while (out < end - 2)
+  {
+    if (*data16 == 0x0)
+    {
+      out[0] = 0x00;
+      out[1] = 0x00;
+      out[2] = 0x00;
+    }
+    else if (*data16 == 0xffff)
+    {
+      out[0] = 0xff;
+      out[1] = 0xff;
+      out[2] = 0xff;
+    }
+    else
+    {
+      #ifdef TEST
+      *logofs << "Unpack16To24: Pixel [" << *data16 << "]\n"
+              << logofs_flush;
+      #endif
+
+      //
+      // Pixel layout:
+      //
+      //  16bit 0RRRRRGG GGGBBBBB  -> 24 bit RRRRR000 GGGGG000 BBBBB000
+      //
+
+      out[0] = (((*data16 & 0x7c00) >> 7) | colormask -> correction_mask);
+      out[1] = (((*data16 & 0x03e0) >> 2) | colormask -> correction_mask);
+      out[2] = (((*data16 & 0x001f) << 3) | colormask -> correction_mask);
+    }
+
+    out    += 3;
+    data16 += 1;
+  }
+
+  return 1;
+}
+
+int Unpack16To32(const T_colormask *colormask, const unsigned char *data,
+                     unsigned char *out, unsigned char *end)
+{
+  #ifdef TEST
+  *logofs << "Unpack16To32: Unpacking " << end - out
+          << " bytes of data.\n" << logofs_flush;
+  #endif
+
+  unsigned short *data16 = (unsigned short *) data;
+
+  unsigned int *out32 = (unsigned int *) out;
+  unsigned int *end32 = (unsigned int *) end;
+
+  while (out32 < end32)
+  {
+    if (*data16 == 0x0)
+    {
+      *out32 = 0x0;
+    }
+    else if (*data16 == 0xffff)
+    {
+      *out32 = 0xffffff;
+    }
+    else
+    {
+      *out32 = ((((*data16 & 0x7c00) >> 7) | colormask -> correction_mask) << 16) |
+                   ((((*data16 & 0x3e0) >> 2) | colormask -> correction_mask) << 8) |
+                       (((*data16 & 0x1f) << 3) | colormask -> correction_mask);
+    }
+
+    out32++;
+    data16++;
+  }
+
+  return 1;
+}
+
+int Unpack16(T_geometry *geometry, const T_colormask *colormask, int src_depth, int src_width,
+                 int src_height, unsigned char *src_data, int src_size, int dst_depth,
+                     int dst_width, int dst_height, unsigned char *dst_data, int dst_size)
+{
+  int dst_bpp = UnpackBitsPerPixel(geometry, dst_depth);
+
+  int (*unpack)(const T_colormask *colormask, const unsigned char *data,
+                    unsigned char *out, unsigned char *end);
+
+  switch (dst_bpp)
+  {
+    case 16:
+    {
+      unpack = Unpack16To16;
+
+      break;
+    }
+    case 24:
+    {
+      unpack = Unpack16To24;
+
+      break;
+    }
+    case 32:
+    {
+      unpack = Unpack16To32;
+
+      break;
+    }
+    default:
+    {
+      #ifdef PANIC
+      *logofs << "Unpack16: PANIC! Bad destination bits per pixel "
+              << dst_bpp << ". Only 24/32 are supported.\n"
+              << logofs_flush;
+      #endif
+
+      return -1;
+    }
+  }
+
+  if (dst_bpp == 24)
+  {
+    unsigned char *dst_end = dst_data;
+
+    for (int y = 0; y < dst_height; y++)
+    {
+      dst_data = dst_end;
+
+      dst_end += RoundUp4(dst_width * 3);
+
+      (*unpack)(colormask, src_data, dst_data, dst_end);
+
+      src_data += (src_width * 2);
+    }
+
+  }
+  else
+  {
+    unsigned char *dst_end = dst_data + dst_size;
+
+    (*unpack)(colormask, src_data, dst_data, dst_end);
+  }
+  
+  return 1;
+}
+
+int Unpack24To24(const T_colormask *colormask, const unsigned char *data,
+                     unsigned char *out, unsigned char *end)
+{
+  #ifdef TEST
+  *logofs << "Unpack24To24: Unpacking " << end - out
+          << " bytes of data.\n" << logofs_flush;
+  #endif
+
+  if (colormask -> correction_mask)
+  {
+    while (out < end)
+    {
+      if (data[0] == 0x00 &&
+              data[1] == 0x00 &&
+                  data[2] == 0x00)
+      {
+        out[0] = out[1] = out[2] = 0x00;
+      }
+      else if (data[0] == 0xff &&
+                   data[1] == 0xff &&
+                       data[2] == 0xff)
+      {
+        out[0] = out[1] = out[2] = 0xff;
+      }
+      else
+      {
+        out[0] = (data[0] | colormask -> correction_mask);
+        out[1] = (data[1] | colormask -> correction_mask);
+        out[2] = (data[2] | colormask -> correction_mask);
+      }
+
+      out  += 3;
+      data += 3;
+    }
+  }
+  else
+  {
+    #ifdef TEST
+    *logofs << "Unpack24To24: Using bitwise copy due to null correction mask.\n"
+            << logofs_flush;
+    #endif
+
+    memcpy((unsigned char *) out, (unsigned char *) data, end - out);
+  }
+
+  return 1;
+}
+
+int Unpack24To32(const T_colormask *colormask, const unsigned char *data,
+                     unsigned char *out, unsigned char *end)
+{
+  #ifdef TEST
+  *logofs << "Unpack24To32: Unpacking " << end - out
+          << " bytes of data.\n" << logofs_flush;
+  #endif
+
+  unsigned int *out32 = (unsigned int *) out;
+  unsigned int *end32 = (unsigned int *) end;
+
+  while (out32 < end32)
+  {
+    if (colormask -> color_mask == 0xff)
+    {
+      *out32 = (data[0] << 16) | (data[1] << 8) | data[2];
+    }
+    else
+    {
+      if (data[0] == 0x0 && data[1] == 0x0 && data[2] == 0x0)
+      {
+        *out32 = 0x0;
+      }
+      else if (data[0] == 0xff && data[1] == 0xff && data[2] == 0xff)
+      {
+        *out32 = 0xffffff;
+      }
+      else
+      {
+        *out32 = (((unsigned int) data[0] | colormask -> correction_mask) << 16) |
+                   (((unsigned int) data[1] | colormask -> correction_mask) << 8) |
+                       ((unsigned int) data[2] | colormask -> correction_mask);
+      }
+    }
+
+    out32 += 1;
+    data  += 3;
+  }
+
+  return 1;
+}
+
+int Unpack24(T_geometry *geometry, const T_colormask *colormask, int src_depth, int src_width,
+                 int src_height, unsigned char *src_data, int src_size, int dst_depth,
+                     int dst_width, int dst_height, unsigned char *dst_data, int dst_size)
+{
+  int dst_bpp = UnpackBitsPerPixel(geometry, dst_depth);
+
+  int (*unpack)(const T_colormask *colormask, const unsigned char *data,
+                    unsigned char *out, unsigned char *end);
+
+  switch (dst_bpp)
+  {
+    case 24:
+    {
+      unpack = Unpack24To24;
+
+      break;
+    }
+    case 32:
+    {
+      unpack = Unpack24To32;
+
+      break;
+    }
+    default:
+    {
+      #ifdef PANIC
+      *logofs << "Unpack24: PANIC! Bad destination bits per pixel "
+              << dst_bpp << ". Only 32 is supported.\n"
+              << logofs_flush;
+      #endif
+
+      return -1;
+    }
+  }
+
+  if (dst_bpp == 24)
+  {
+    unsigned char *dst_end;
+    unsigned long scanline_size = RoundUp4(dst_width * dst_bpp / 8);
+
+    dst_end = dst_data;
+
+    #ifdef TEST
+    *logofs  << "Unpack24: Handling 24 bits with dst_height "
+             << dst_height << " scanline_size " << scanline_size
+             << " dst_size " << dst_size << ".\n" << logofs_flush;
+    #endif
+
+    for (int y = 0; y < dst_height; y++)
+    {
+      dst_data = dst_end;
+
+      dst_end += scanline_size;
+
+      (*unpack)(colormask, src_data, dst_data, dst_end);
+
+      src_data += scanline_size;
+    }
+  }
+  else
+  {
+    unsigned char *dst_end = dst_data + dst_size;
+
+    (*unpack)(colormask, src_data, dst_data, dst_end);
+  }
+
+  return 1;
+}
+
+int Unpack8To8(T_colormap *colormap, const unsigned char *data,
+                   unsigned char *out, unsigned char *end)
+{
+  #ifdef TEST
+  *logofs << "Unpack8To8: Unpacking " << end - out
+          << " bytes of colormapped data.\n"
+          << logofs_flush;
+  #endif
+
+  while (out < end)
+  {
+    *(out++) = (unsigned char) colormap -> data[*(data++)];
+  }
+
+  return 1;
+}
+
+int Unpack8To16(T_colormap *colormap, const unsigned char *data,
+                    unsigned char *out, unsigned char *end)
+{
+  #ifdef TEST
+  *logofs << "Unpack8To16: Unpacking " << end - out
+          << " bytes of colormapped data.\n"
+          << logofs_flush;
+  #endif
+
+  unsigned short *out16 = (unsigned short *) out;
+  unsigned short *end16 = (unsigned short *) end;
+
+  while (out16 < end16)
+  {
+    *(out16++) = (unsigned short) colormap -> data[*(data++)];
+  }
+
+  return 1;
+}
+
+int Unpack8To24(T_colormap *colormap, const unsigned char *data,
+                    unsigned char *out, unsigned char *end)
+{
+  #ifdef TEST
+  *logofs << "Unpack8To24: Unpacking " << end - out
+          << " bytes of colormapped data.\n"
+          << logofs_flush;
+  #endif
+
+  unsigned int value;
+
+  while (out < end)
+  {
+    value = colormap -> data[*(data++)];
+
+    *(out++) = value;
+    *(out++) = value >> 8;
+    *(out++) = value >> 16;
+  }
+
+  return 1;
+}
+
+int Unpack8To32(T_colormap *colormap, const unsigned char *data,
+                    unsigned char *out, unsigned char *end)
+{
+  #ifdef TEST
+  *logofs << "Unpack8To32: Unpacking " << end - out
+          << " bytes of colormapped data.\n"
+          << logofs_flush;
+  #endif
+
+  unsigned int *out32 = (unsigned int *) out;
+  unsigned int *end32 = (unsigned int *) end;
+
+  while (out32 < end32)
+  {
+    *(out32++) = colormap -> data[*(data++)];
+  }
+
+  return 1;
+}
+
+int Unpack8(T_geometry *geometry, T_colormap *colormap, int src_depth, int src_width, int src_height,
+                 unsigned char *src_data, int src_size, int dst_depth, int dst_width,
+                     int dst_height, unsigned char *dst_data, int dst_size)
+{
+  if (src_depth != 8)
+  {
+    #ifdef PANIC
+    *logofs << "Unpack8: PANIC! Cannot unpack colormapped image of source depth "
+            << src_depth << ".\n" << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  int (*unpack)(T_colormap *colormap, const unsigned char *data,
+                    unsigned char *out, unsigned char *end);
+
+  int dst_bpp = UnpackBitsPerPixel(geometry, dst_depth);
+
+  switch (dst_bpp)
+  {
+    case 8:
+    {
+      unpack = Unpack8To8;
+
+      break;
+    }
+    case 16:
+    {
+      unpack = Unpack8To16;
+
+      break;
+    }
+    case 24:
+    {
+      unpack = Unpack8To24;
+
+      break;
+    }
+    case 32:
+    {
+      unpack = Unpack8To32;
+
+      break;
+    }
+    default:
+    {
+      #ifdef PANIC
+      *logofs << "Unpack8: PANIC! Bad destination bits per pixel "
+              << dst_bpp << ". Only 8/16/24/32 are supported.\n"
+              << logofs_flush;
+      #endif
+
+      return -1;
+    }
+  }
+
+  if (src_width == dst_width &&
+          src_height == dst_height)
+  {
+    unsigned char *dst_end = dst_data + dst_size;
+
+    (*unpack)(colormap, src_data, dst_data, dst_end);
+  }
+  else if (src_width >= dst_width &&
+             src_height >= dst_height)
+  {
+    unsigned char *dst_end = dst_data;
+
+    for (int y = 0; y < dst_height; y++)
+    {
+      dst_data = dst_end;
+
+      dst_end += RoundUp4(dst_width * dst_bpp / 8);
+
+      (*unpack)(colormap, src_data, dst_data, dst_end);
+
+      src_data += src_width;
+    }
+  }
+  else
+  {
+    #ifdef PANIC
+    *logofs << "Unpack8: PANIC! Cannot unpack image. "
+            << "Destination area " << dst_width << "x"
+            << dst_height << " is not fully contained in "
+            << src_width << "x" << src_height << " source.\n"
+            << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  return 1;
+}
+
+int Unpack15To16(const unsigned char *data, unsigned char *out, unsigned char *end)
+{
+  #ifdef TEST
+  *logofs << "Unpack15To16: Unpacking " << end - out
+          << " bytes of colormapped data.\n"
+          << logofs_flush;
+  #endif
+  
+  unsigned short *data16 = (unsigned short *) data;
+  unsigned short *out16 = (unsigned short *) out;
+  unsigned short *end16 = (unsigned short *) end;
+
+  while (out16 < end16)
+  {
+    if (*data16 == 0x0)
+    {
+      *out16 = 0x0;
+    }
+    else if (*data16 == 0x7fff)
+    {
+      *out16 = 0xffff;
+    }
+    else
+    {
+      #ifdef TEST
+      *logofs << "Unpack15To16: Pixel [" << *data16 << "]\n"
+              << logofs_flush;
+      #endif
+      
+     *out16 = ((*data16 & 0x7ff0) << 1) |
+               (*data16 & 0x001f);
+    }
+
+    out16  += 1;
+    data16 += 1;
+  }
+  
+  return 1;
+}
+
+int Unpack15To24(const unsigned char *data, unsigned char *out, unsigned char *end)
+
+{
+  #ifdef TEST
+  *logofs << "Unpack15To24: Unpacking " << end - out
+          << " bytes of data.\n" << logofs_flush;
+  #endif
+
+  unsigned short *data16 = (unsigned short *) data;
+
+  while (out < end - 2)
+  {
+    if (*data16 == 0x0)
+    {
+      out[0] = 0x00;
+      out[1] = 0x00;
+      out[2] = 0x00;
+    }
+    else if (*data16 == 0x7fff)
+    {
+      out[0] = 0xff;
+      out[1] = 0xff;
+      out[2] = 0xff;
+    }
+    else
+    {
+      #ifdef TEST
+      *logofs << "Unpack15To24: Pixel [" << *data16 << "]\n"
+              << logofs_flush;
+      #endif
+
+      out[0] = ((*data16 >> 7) & 0xf8) | ((*data16 >> 12) & 0x07);
+      out[1] = ((*data16 >> 2) & 0xf8) | ((*data16 >> 8) & 0x07);
+      out[2] = ((*data16 << 3) & 0xf8) | ((*data16 >> 2) & 0x07);
+    }
+
+    out    += 3;
+    data16 += 1;
+  }
+
+  return 1;
+}
+
+int Unpack15To32(const unsigned char *data, unsigned char *out, unsigned char *end)
+{
+  #ifdef TEST
+  *logofs << "Unpack15To32: Unpacking " << end - out
+          << " bytes of data.\n"
+          << logofs_flush;
+  #endif
+
+  unsigned short *data16 = (unsigned short *) data;
+  unsigned int *out32 = (unsigned int *) out;
+  unsigned int *end32 = (unsigned int *) end;
+
+  while (out32 < end32)
+  {
+    if (*data16 == 0x0)
+    {
+      *out32 = 0x0;
+    }
+    else if (*data16 == 0xffff)
+    {
+      *out32 = 0xffffff;
+    }
+    else
+    {
+        *out32 = ((((*data16 >> 7) & 0xf8) | ((*data16 >> 12) & 0x07)) << 16) | 
+                 ((((*data16 >> 2) & 0xf8) | ((*data16 >> 8) & 0x07)) << 8) | 
+                  (((*data16 << 3) & 0xf8) | ((*data16 >> 2) & 0x07));
+    }
+
+    out32++;
+    data16++;
+  }
+
+  return 1;
+}
+
+int Unpack15(T_geometry *geometry, int src_depth, int src_width, int src_height,
+                 unsigned char *src_data, int src_size, int dst_depth, int dst_width,
+                     int dst_height, unsigned char *dst_data, int dst_size)
+{
+  if (src_depth != 16)
+  {
+    #ifdef PANIC
+    *logofs << "Unpack15: PANIC! Cannot unpack colormapped image of source depth "
+            << src_depth << ".\n" << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  int (*unpack)(const unsigned char *data, unsigned char *out, unsigned char *end);
+
+  int dst_bpp = UnpackBitsPerPixel(geometry, dst_depth);
+
+  switch (dst_bpp)
+  {
+    case 16:
+    {
+      unpack = Unpack15To16;
+
+      break;
+    }
+    case 24:
+    {
+      unpack = Unpack15To24;
+
+      break;
+    }
+    case 32:
+    {
+      unpack = Unpack15To32;
+
+      break;
+    }
+    default:
+    {
+      #ifdef PANIC
+      *logofs << "Unpack15: PANIC! Bad destination bits per pixel "
+              << dst_bpp << ". Only 16/24/32 are supported.\n"
+              << logofs_flush;
+      #endif
+
+      return -1;
+    }
+  }
+
+  if (src_width == dst_width && src_height == dst_height)
+  {
+    unsigned char *dst_end = dst_data + dst_size;
+
+    (*unpack)(src_data, dst_data, dst_end);
+  }
+  else if (src_width >= dst_width && src_height >= dst_height)
+  {
+    unsigned char *dst_end = dst_data;
+
+    for (int y = 0; y < dst_height; y++)
+    {
+      dst_data = dst_end;
+      dst_end += RoundUp4(dst_width * dst_bpp / 8);
+
+      (*unpack)(src_data, dst_data, dst_end);
+
+      src_data += src_width * 2;
+    }
+  }
+  else
+  {
+    #ifdef PANIC
+    *logofs << "Unpack15: PANIC! Cannot unpack image. "
+            << "Destination area " << dst_width << "x"
+            << dst_height << " is not fully contained in "
+            << src_width << "x" << src_height << " source.\n"
+            << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  return 1;
+}
+
+int Unpack16To16(const unsigned char *data, unsigned char *out,
+                    unsigned char *end, int imageByteOrder)
+{
+  #ifdef TEST
+  *logofs << "Unpack16To16: Unpacking " << end - out
+          << " bytes of colormapped data.\n"
+          << logofs_flush;
+  #endif
+  
+  memcpy((unsigned char *) out, (unsigned char *) data, end - out);
+
+  return 1;
+}
+
+int Unpack16To24(const unsigned char *data, unsigned char *out, 
+                    unsigned char *end, int imageByteOrder)
+
+{
+  #ifdef TEST
+  *logofs << "Unpack16To24: Unpacking " << end - out
+          << " bytes of data.\n" << logofs_flush;
+  #endif
+
+  unsigned short *data16 = (unsigned short *) data;
+
+  while (out < end - 2)
+  {
+    if (*data16 == 0x0)
+    {
+      out[0] = 0x00;
+      out[1] = 0x00;
+      out[2] = 0x00;
+    }
+    else if (*data16 == 0xffff)
+    {
+      out[0] = 0xff;
+      out[1] = 0xff;
+      out[2] = 0xff;
+    }
+    else
+    {
+      #ifdef TEST
+      *logofs << "Unpack16To24: Pixel [" << *data16 << "]\n"
+              << logofs_flush;
+      #endif
+
+      out[0] = ((*data16 >> 8) & 0xf8) | ((*data16 >> 13) & 0x07);
+      out[1] = ((*data16 >> 3) & 0xfc) | ((*data16 >> 9) & 0x03);
+      out[2] = ((*data16 << 3) & 0xf8) | ((*data16 >> 2) & 0x07);
+    }
+
+    out    += 3;
+    data16 += 1;
+  }
+
+  return 1;
+}
+
+
+int Unpack16To32(const unsigned char *data, unsigned char *out, 
+                    unsigned char *end, int imageByteOrder)
+{
+  #ifdef TEST
+  *logofs << "Unpack16To32: Unpacking " << end - out
+          << " bytes of data.\n"
+          << logofs_flush;
+  #endif
+
+  unsigned short *data16 = (unsigned short *) data;
+  unsigned int *out32 = (unsigned int *) out;
+  unsigned int *end32 = (unsigned int *) end;
+
+  unsigned short pixel16;
+  unsigned int pixel32;
+
+  while (out32 < end32)
+  {
+
+    pixel16 = GetUINT((unsigned char *)data16, 0);
+
+    if (pixel16 == 0x0)
+    {
+      PutULONG(0x0, (unsigned char *) out32, imageByteOrder); 
+    }
+    else if (pixel16 == 0xffff)
+    {
+      PutULONG(0xffffff, (unsigned char *) out32, imageByteOrder);
+    }
+    else
+    {
+      pixel32 = ((((pixel16 >> 8) & 0xf8) | ((pixel16 >> 13) & 0x07)) << 16) | 
+               ((((pixel16 >> 3) & 0xfc) | ((pixel16 >> 9) & 0x03)) << 8) | 
+               (((pixel16 << 3) & 0xf8) | ((pixel16 >> 2) & 0x07));
+ 
+      PutULONG(pixel32, (unsigned char *) out32, imageByteOrder); 
+    }
+
+    out32++;
+    data16++;
+  }
+  return 1;
+}
+
+int Unpack16(T_geometry *geometry, int src_depth, int src_width, int src_height,
+                 unsigned char *src_data, int src_size, int dst_depth, int dst_width,
+                     int dst_height, unsigned char *dst_data, int dst_size)
+{
+  int imageByteOrder = geometry -> image_byte_order;
+
+  if (src_depth != 16)
+  {
+    #ifdef PANIC
+    *logofs << "Unpack16: PANIC! Cannot unpack colormapped image of source depth "
+            << src_depth << ".\n" << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  int (*unpack)(const unsigned char *data, unsigned char *out, 
+                    unsigned char *end, int imageByteOrder);
+
+  int dst_bpp = UnpackBitsPerPixel(geometry, dst_depth);
+  
+  switch (dst_bpp)
+  {
+    case 16:
+    {
+      unpack = Unpack16To16;
+
+      break;
+    }
+    case 24:
+    {
+      unpack = Unpack16To24;
+
+      break;
+    }
+    case 32:
+    {
+      unpack = Unpack16To32;
+
+      break;
+    }
+    default:
+    {
+      #ifdef PANIC
+      *logofs << "Unpack16: PANIC! Bad destination bits per pixel "
+              << dst_bpp << ". Only 16/24/32 are supported.\n"
+              << logofs_flush;
+      #endif
+
+      return -1;
+    }
+  }
+
+  if (src_width == dst_width && src_height == dst_height)
+  {
+    unsigned char *dst_end = dst_data + dst_size;
+
+    (*unpack)(src_data, dst_data, dst_end, imageByteOrder);
+  }
+  else if (src_width >= dst_width && src_height >= dst_height)
+  {
+    unsigned char *dst_end = dst_data;
+
+    for (int y = 0; y < dst_height; y++)
+    {
+      dst_data = dst_end;
+      dst_end += RoundUp4(dst_width * dst_bpp / 8);
+
+      (*unpack)(src_data, dst_data, dst_end, imageByteOrder);
+
+      src_data += src_width * 2;
+    }
+  }
+  else
+  {
+    #ifdef PANIC
+    *logofs << "Unpack16: PANIC! Cannot unpack image. "
+            << "Destination area " << dst_width << "x"
+            << dst_height << " is not fully contained in "
+            << src_width << "x" << src_height << " source.\n"
+            << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  return 1;
+}
+
+int Unpack24To24(const unsigned char *data,
+                    unsigned char *out, unsigned char *end)
+{
+  #ifdef TEST
+  *logofs << "Unpack124To24: Unpacking " << end - out
+          << " bytes of colormapped data.\n"
+          << logofs_flush;
+  #endif
+
+  while (out < end)
+  {
+    *(out++) = *(data++);
+  }
+
+  return 1;
+}
+
+int Unpack24To32(const unsigned char *data, unsigned char *out, unsigned char *end)
+{
+  #ifdef TEST
+  *logofs << "Unpack24To32: Unpacking " << end - out
+          << " bytes of colormapped data.\n"
+          << logofs_flush;
+  #endif
+
+  unsigned int *out32 = (unsigned int *) out;
+  unsigned int *end32 = (unsigned int *) end;
+
+  while (out32 < end32)
+  {
+    if (data[0] == 0x0 && data[1] == 0x0 && data[2] == 0x0)
+    {
+      *out32 = 0x0;
+    }
+    else if (data[0] == 0xff && data[1] == 0xff && data[2] == 0xff)
+    {
+      *out32 = 0xffffff;
+    }
+    else
+    {
+      *out32 = (data[2] << 16) | (data[1] << 8) | data[0];  
+    }
+
+    out32 += 1;
+    data  += 3;
+  }
+
+  return 1;
+}
+
+int Unpack24(T_geometry *geometry, int src_depth, int src_width, int src_height,
+                 unsigned char *src_data, int src_size, int dst_depth, int dst_width,
+                     int dst_height, unsigned char *dst_data, int dst_size)
+                     
+{
+  if (src_depth != 24)
+  {
+    #ifdef PANIC
+    *logofs << "Unpack24: PANIC! Cannot unpack colormapped image of source depth "
+            << src_depth << ".\n" << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  int (*unpack)(const unsigned char *data, unsigned char *out, unsigned char *end);
+
+  int dst_bpp = UnpackBitsPerPixel(geometry, dst_depth);
+
+  switch (dst_bpp)
+  {
+    case 24:
+    {
+      unpack = Unpack24To24;
+
+      break;
+    }
+    case 32:
+    {
+      unpack = Unpack24To32;
+
+      break;
+    }
+    default:
+    {
+      #ifdef PANIC
+      *logofs << "Unpack24: PANIC! Bad destination bits per pixel "
+              << dst_bpp << ". Only 24/32 are supported.\n"
+              << logofs_flush;
+      #endif
+
+      return -1;
+    }
+  }
+
+  if (src_width == dst_width && src_height == dst_height)
+  {
+    unsigned char *dst_end = dst_data + dst_size;
+
+    (*unpack)(src_data, dst_data, dst_end);
+  }
+  else if (src_width >= dst_width && src_height >= dst_height)
+  {
+    unsigned char *dst_end = dst_data;
+
+    for (int y = 0; y < dst_height; y++)
+    {
+      dst_data = dst_end;
+      dst_end += RoundUp4(dst_width * dst_bpp / 8);
+
+      (*unpack)(src_data, dst_data, dst_end);
+
+      src_data += src_width * 3;
+    }
+  }
+  else
+  {
+    #ifdef PANIC
+    *logofs << "Unpack24: PANIC! Cannot unpack image. "
+            << "Destination area " << dst_width << "x"
+            << dst_height << " is not fully contained in "
+            << src_width << "x" << src_height << " source.\n"
+            << logofs_flush;
+    #endif
+
+    return -1;
+  }
+
+  return 1;
+}
+
+int Unpack32To32(const T_colormask *colormask, const unsigned int *data,
+                     unsigned int *out, unsigned int *end)
+{
+  #ifdef TEST
+  *logofs << "Unpack32To32: Unpacking " << end - out
+          << " bytes of data.\n" << logofs_flush;
+  #endif
+
+  if (colormask -> correction_mask)
+  {
+    while (out < end)
+    {
+      if (*data == 0x00000000)
+      {
+        *out = 0x00000000;
+      }
+      else if (*data == 0xFFFFFFFF)
+      {
+        *out = 0xFFFFFFFF;
+      }
+      else
+      {
+        *out = *data | ((colormask -> correction_mask << 16) |
+                            (colormask -> correction_mask << 8) |
+                                colormask -> correction_mask);
+      }
+
+      out  += 1;
+      data += 1;
+    }
+  }
+  else
+  {
+    #ifdef TEST
+    *logofs << "Unpack32To32: Using bitwise copy due to null correction mask.\n"
+            << logofs_flush;
+    #endif
+
+    memcpy((unsigned char *) out, (unsigned char *) data, end - out);
+  }
+
+  return 1;
+}
diff --git a/nxcomp/src/Unpack.h b/nxcomp/src/Unpack.h
new file mode 100644
index 000000000..faaa41d82
--- /dev/null
+++ b/nxcomp/src/Unpack.h
@@ -0,0 +1,149 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef Unpack_H
+#define Unpack_H
+
+#include "NXpack.h"
+
+#include "Z.h"
+
+#define LSBFirst  0
+#define MSBFirst  1
+
+#define SPLIT_PATTERN  0x88
+
+typedef ColorMask T_colormask;
+
+//
+// Pixel geometry of channel's display.
+//
+
+typedef struct
+{
+  unsigned int depth1_bpp;
+  unsigned int depth4_bpp;
+  unsigned int depth8_bpp;
+  unsigned int depth16_bpp;
+  unsigned int depth24_bpp;
+  unsigned int depth32_bpp;
+
+  unsigned int red_mask;
+  unsigned int green_mask;
+  unsigned int blue_mask;
+
+  unsigned int image_byte_order;
+  unsigned int bitmap_bit_order;
+  unsigned int scanline_unit;
+  unsigned int scanline_pad;
+
+} T_geometry;
+
+//
+// Colormap is used to remap colors
+// from source to destination depth.
+//
+ 
+typedef struct
+{
+  unsigned int entries;
+  unsigned int *data;
+
+} T_colormap;
+
+//
+// Alpha channel data is added to 32
+// bits images at the time they are
+// unpacked.
+//
+ 
+typedef struct
+{
+  unsigned int entries;
+  unsigned char *data;
+
+} T_alpha;
+
+//
+// The ZLIB stream structure used for
+// the decompression.
+//
+
+extern z_stream unpackStream;
+
+//
+// Initialize the ZLIB stream used for
+// decompression.
+//
+
+void UnpackInit();
+
+//
+// Free the ZLIB stream.
+//
+
+void UnpackDestroy();
+
+//
+// Get the destination bits per pixel
+// based on the drawable depth.
+//
+
+int UnpackBitsPerPixel(T_geometry *geometry, unsigned int depth);
+
+//
+// Unpack the source data into the X
+// bitmap.
+//
+
+int Unpack8(T_geometry *geometry, const T_colormask *colormask, int src_depth, int src_width,
+                int src_height, unsigned char *src_data, int src_size, int dst_depth,
+                    int dst_width, int dst_height, unsigned char *dst_data, int dst_size);
+
+int Unpack16(T_geometry *geometry, const T_colormask *colormask, int src_depth, int src_width,
+                 int src_height, unsigned char *src_data, int src_size, int dst_depth,
+                     int dst_width, int dst_height, unsigned char *dst_data, int dst_size);
+
+int Unpack24(T_geometry *geometry, const T_colormask *colormask, int src_depth, int src_width,
+                 int src_height, unsigned char *src_data, int src_size, int dst_depth,
+                     int dst_width, int dst_height, unsigned char *dst_data, int dst_size);
+
+int Unpack8(T_geometry *geometry, T_colormap *colormap, int src_depth, int src_width,
+                int src_height, unsigned char *src_data, int src_size, int dst_depth,
+                    int dst_width, int dst_height, unsigned char *dst_data, int dst_size);
+
+int Unpack15(T_geometry *geometry, int src_depth, int src_width,
+                int src_height, unsigned char *src_data, int src_size, int dst_depth,
+                    int dst_width, int dst_height, unsigned char *dst_data, int dst_size);
+
+int Unpack16(T_geometry *geometry, int src_depth, int src_width,
+                int src_height, unsigned char *src_data, int src_size, int dst_depth,
+                    int dst_width, int dst_height, unsigned char *dst_data, int dst_size);
+
+int Unpack24(T_geometry *geometry, int src_depth, int src_width,
+                int src_height, unsigned char *src_data, int src_size, int dst_depth,
+                    int dst_width, int dst_height, unsigned char *dst_data, int dst_size);
+
+#endif /* Unpack_H */
diff --git a/nxcomp/src/Vars.c b/nxcomp/src/Vars.c
new file mode 100644
index 000000000..685969677
--- /dev/null
+++ b/nxcomp/src/Vars.c
@@ -0,0 +1,54 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdlib.h>
+
+#include "NXvars.h"
+
+/*
+ * Allocate here instances of variables and
+ * pointers declared in NXvars.h.
+ */
+ 
+int _NXHandleDisplayError = 0;
+
+NXDisplayErrorPredicate _NXDisplayErrorFunction = NULL;
+
+int _NXUnsetLibraryPath = 0;
+
+NXLostSequenceHandler _NXLostSequenceFunction = NULL;
+
+NXDisplayBlockHandler _NXDisplayBlockFunction = NULL;
+NXDisplayWriteHandler _NXDisplayWriteFunction = NULL;
+NXDisplayFlushHandler _NXDisplayFlushFunction = NULL;
+NXDisplayStatisticsHandler _NXDisplayStatisticsFunction = NULL;
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/nxcomp/src/Version.c b/nxcomp/src/Version.c
new file mode 100644
index 000000000..509bd8344
--- /dev/null
+++ b/nxcomp/src/Version.c
@@ -0,0 +1,101 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2015 Qindel Formacion y Servicios SL.                    */
+/*                                                                        */
+/* This program is free software; you can redistribute it and/or modify   */
+/* it under the terms of the GNU General Public License Version 2, as     */
+/* published by the Free Software Foundation.                             */
+/*                                                                        */
+/* This program is distributed in the hope that it will be useful, but    */
+/* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTA-  */
+/* BILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General       */
+/* Public License for more details.                                       */
+/*                                                                        */
+/* You should have received a copy of the GNU General Public License      */
+/* along with this program; if not, you can request a copy from Qindel    */
+/* or write to the Free Software Foundation, Inc., 51 Franklin Street,    */
+/* Fifth Floor, Boston, MA 02110-1301 USA.                                */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "NX.h"
+
+
+static int _NXVersionMajor = -1;
+static int _NXVersionMinor = -1;
+static int _NXVersionPatch = -1;
+static int _NXVersionMaintenancePatch = -1;
+
+
+const char* NXVersion() {
+  const char *version = VERSION;
+  return version;
+}
+
+void _parseNXVersion() {
+  char version[32];
+  int i;
+  strcpy(version, VERSION);
+
+  char *value;
+  /* Reset values to 0 if undefined */
+  _NXVersionMajor = _NXVersionMinor = _NXVersionPatch = _NXVersionMaintenancePatch = 0;
+
+
+#define NXVERSIONSEPARATOR "."
+  value = strtok(version, NXVERSIONSEPARATOR);
+
+  for (i = 0; value != NULL && i < 4; i++)
+  {
+    switch (i)
+    {
+      case 0:
+        _NXVersionMajor = atoi(value);
+        break;
+
+      case 1:
+        _NXVersionMinor = atoi(value);
+        break;
+
+      case 2:
+        _NXVersionPatch = atoi(value);
+        break;
+
+      case 3:
+        _NXVersionMaintenancePatch = atoi(value);
+        break;
+    }
+
+    value = strtok(NULL, NXVERSIONSEPARATOR);
+  }
+}
+
+int NXMajorVersion() {
+  if (_NXVersionMajor == -1)
+    _parseNXVersion();
+  return _NXVersionMajor;
+}
+int NXMinorVersion() {
+  if (_NXVersionMinor == -1)
+    _parseNXVersion();
+  return _NXVersionMinor;
+}
+int NXPatchVersion() {
+  if (_NXVersionPatch == -1)
+    _parseNXVersion();
+  return _NXVersionPatch;
+}
+int NXMaintenancePatchVersion() {
+  if (_NXVersionMaintenancePatch == -1)
+    _parseNXVersion();
+  return _NXVersionMaintenancePatch;
+}
diff --git a/nxcomp/src/WriteBuffer.cpp b/nxcomp/src/WriteBuffer.cpp
new file mode 100644
index 000000000..70b4e3b53
--- /dev/null
+++ b/nxcomp/src/WriteBuffer.cpp
@@ -0,0 +1,500 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stddef.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include "Misc.h"
+#include "Control.h"
+
+#include "WriteBuffer.h"
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+WriteBuffer::WriteBuffer()
+{
+  size_   = WRITE_BUFFER_DEFAULT_SIZE;
+  buffer_ = new unsigned char[size_];
+  length_ = 0;
+  index_  = NULL;
+
+  scratchLength_ = 0;
+  scratchBuffer_ = NULL;
+  scratchOwner_  = 1;
+
+  initialSize_   = WRITE_BUFFER_DEFAULT_SIZE;
+  thresholdSize_ = WRITE_BUFFER_DEFAULT_SIZE << 1;
+  maximumSize_   = WRITE_BUFFER_DEFAULT_SIZE << 4;
+
+  #ifdef VALGRIND
+
+  memset(buffer_, '\0', size_);
+
+  #endif
+}
+
+WriteBuffer::~WriteBuffer()
+{
+  if (scratchOwner_ == 1 &&
+          scratchBuffer_ != NULL)
+  {
+    delete [] scratchBuffer_;
+  }
+
+  delete [] buffer_;
+}
+
+void WriteBuffer::setSize(unsigned int initialSize, unsigned int thresholdSize,
+                              unsigned int maximumSize)
+{
+  initialSize_   = initialSize;
+  thresholdSize_ = thresholdSize;
+  maximumSize_   = maximumSize;
+
+  #ifdef TEST
+  *logofs << "WriteBuffer: Set buffer sizes to "
+          << initialSize_ << "/" << thresholdSize_
+          << "/" << maximumSize_ << ".\n"
+          << logofs_flush;
+  #endif
+}
+
+void WriteBuffer::partialReset()
+{
+  if (scratchBuffer_ != NULL)
+  {
+    if (scratchOwner_)
+    {
+      #ifdef DEBUG
+      *logofs << "WriteBuffer: Going to delete "
+              << scratchLength_ << " bytes from the "
+              << "scratch buffer.\n" << logofs_flush;
+      #endif
+
+      delete [] scratchBuffer_;
+    }
+
+    scratchLength_ = 0;
+    scratchBuffer_ = NULL;
+    scratchOwner_  = 1;
+  }
+
+  length_ = 0;
+  index_  = NULL;
+
+  #ifdef DEBUG
+  *logofs << "WriteBuffer: Performed partial reset with "
+          << size_ << " bytes in buffer.\n"
+          << logofs_flush;
+  #endif
+}
+
+void WriteBuffer::fullReset()
+{
+  if (scratchBuffer_ != NULL)
+  {
+    if (scratchOwner_ == 1)
+    {
+      #ifdef DEBUG
+      *logofs << "WriteBuffer: Going to delete "
+              << scratchLength_ << " bytes from the "
+              << "scratch buffer.\n" << logofs_flush;
+      #endif
+
+      delete [] scratchBuffer_;
+    }
+
+    scratchLength_ = 0;
+    scratchBuffer_ = NULL;
+    scratchOwner_  = 1;
+  }
+
+  length_ = 0;
+  index_  = NULL;
+
+  if (size_ > initialSize_)
+  {
+    #ifdef TEST
+    *logofs << "WriteBuffer: Reallocating a new buffer of "
+            << initialSize_ << " bytes.\n" << logofs_flush;
+    #endif
+
+    delete [] buffer_;
+
+    size_ = initialSize_;
+
+    buffer_ = new unsigned char[size_];
+
+    if (buffer_ == NULL)
+    {
+      #ifdef PANIC
+      *logofs << "WriteBuffer: PANIC! Can't allocate memory for "
+              << "X messages in context [A].\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Can't allocate memory for "
+           << "X messages in context [A].\n";
+
+      HandleAbort();
+    }
+
+    #ifdef VALGRIND
+
+    memset(buffer_, '\0', size_);
+
+    #endif
+  }
+
+  #ifdef DEBUG
+  *logofs << "WriteBuffer: Performed full reset with "
+          << size_ << " bytes in buffer.\n"
+          << logofs_flush;
+  #endif
+}
+
+unsigned char *WriteBuffer::addMessage(unsigned int numBytes)
+{
+  #ifdef DEBUG
+  *logofs << "WriteBuffer: Adding " << numBytes << " bytes to "
+          << length_ << " bytes already in buffer.\n"
+          << logofs_flush;
+  #endif
+
+  if (numBytes > WRITE_BUFFER_OVERFLOW_SIZE)
+  {
+    #ifdef PANIC
+    *logofs << "WriteBuffer: PANIC! Can't add a message of "
+            << numBytes << " bytes.\n" << logofs_flush;
+
+    *logofs << "WriteBuffer: PANIC! Assuming error handling "
+            << "data in context [B].\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Can't add a message of "
+         << numBytes << " bytes to write buffer.\n";
+
+    cerr << "Error" << ": Assuming error handling "
+         << "data in context [B].\n";
+
+    HandleAbort();
+  }
+  else if (length_ + numBytes > size_)
+  {
+    unsigned int newSize = thresholdSize_;
+
+    while (newSize < length_ + numBytes)
+    {
+      newSize <<= 1;
+
+      if (newSize > maximumSize_)
+      {
+        newSize = length_ + numBytes + initialSize_;
+      }
+    }
+
+    #ifdef TEST
+    *logofs << "WriteBuffer: Growing buffer from "
+            << size_ << " to " << newSize << " bytes.\n"
+            << logofs_flush;
+    #endif
+
+    unsigned int indexOffset = 0;
+
+    if (index_ && *index_)
+    {
+      indexOffset = *index_ - buffer_;
+    }
+
+    size_ = newSize;
+
+    unsigned char *newBuffer = new unsigned char[size_];
+
+    if (newBuffer == NULL)
+    {
+      #ifdef PANIC
+      *logofs << "WriteBuffer: PANIC! Can't allocate memory for "
+              << "X messages in context [C].\n" << logofs_flush;
+      #endif
+
+      cerr << "Error" << ": Can't allocate memory for "
+           << "X messages in context [C].\n";
+
+      HandleAbort();
+    }
+
+    #ifdef TEST
+    if (newSize >= maximumSize_)
+    {
+      *logofs << "WriteBuffer: WARNING! Buffer grown to reach "
+              << "size of " << newSize << " bytes.\n"
+              << logofs_flush;
+    }
+    #endif
+
+    #ifdef VALGRIND
+
+    memset(newBuffer, '\0', size_);
+
+    #endif
+
+    memcpy(newBuffer, buffer_, length_);
+
+    #ifdef DEBUG
+    *logofs << "WriteBuffer: Going to delete the "
+            << "old buffer with new size " << size_
+            << ".\n" << logofs_flush;
+    #endif
+
+    delete [] buffer_;
+
+    buffer_ = newBuffer;
+
+    if (index_ && *index_)
+    {
+      *index_ = buffer_ + indexOffset;
+    }
+  }
+
+  unsigned char *result = buffer_ + length_;
+
+  length_ += numBytes;
+
+  #ifdef DEBUG
+  *logofs << "WriteBuffer: Bytes in buffer are "
+          << length_ << " while size is " << size_
+          << ".\n" << logofs_flush;
+  #endif
+
+  return result;
+}
+
+unsigned char *WriteBuffer::removeMessage(unsigned int numBytes)
+{
+  #ifdef TEST
+  *logofs << "WriteBuffer: Removing " << numBytes
+          << " bytes from buffer.\n" << logofs_flush;
+  #endif
+
+  if (numBytes > length_)
+  {
+    #ifdef PANIC
+    *logofs << "WriteBuffer: PANIC! Can't remove "
+            << numBytes << " bytes with only " << length_
+            << " bytes in buffer.\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Buffer underflow handling "
+         << "write buffer in context [D].\n";
+
+    HandleAbort();
+  }
+
+  length_ -= numBytes;
+
+  #ifdef TEST
+  *logofs << "WriteBuffer: Bytes in buffer are now "
+          << length_ << " while size is "
+          << size_ << ".\n" << logofs_flush;
+  #endif
+
+  return (buffer_ + length_);
+}
+
+unsigned char *WriteBuffer::addScratchMessage(unsigned int numBytes)
+{
+  if (numBytes > WRITE_BUFFER_OVERFLOW_SIZE)
+  {
+    #ifdef PANIC
+    *logofs << "WriteBuffer: PANIC! Can't add a message of "
+            << numBytes << " bytes.\n" << logofs_flush;
+
+    *logofs << "WriteBuffer: PANIC! Assuming error handling "
+            << "data in context [E].\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Can't add a message of "
+         << numBytes << " bytes to write buffer.\n";
+
+    cerr << "Error" << ": Assuming error handling "
+         << "data in context [E].\n";
+
+    HandleAbort();
+  }
+  else if (scratchBuffer_ != NULL)
+  {
+    #ifdef PANIC
+    *logofs << "WriteBuffer: PANIC! Can't add a message of "
+            << numBytes << " bytes with " << scratchLength_
+            << " bytes already in scratch buffer.\n"
+            << logofs_flush;
+
+    *logofs << "WriteBuffer: PANIC! Assuming error handling "
+            << "data in context [F].\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Can't add a message of "
+         << numBytes << " bytes with " << scratchLength_
+         << " bytes already in scratch buffer.\n";
+
+    cerr << "Error" << ": Assuming error handling "
+         << "data in context [F].\n";
+
+    HandleAbort();
+  }
+
+  #ifdef DEBUG
+  *logofs << "WriteBuffer: Adding " << numBytes << " bytes "
+          << "to scratch buffer.\n" << logofs_flush;
+  #endif
+
+  unsigned char *newBuffer = new unsigned char[numBytes];
+
+  if (newBuffer == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "WriteBuffer: PANIC! Can't allocate memory for "
+            << "X messages in context [G].\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Can't allocate memory for "
+         << "X messages in context [G].\n";
+
+    HandleAbort();
+  }
+
+  #ifdef VALGRIND
+
+  memset(newBuffer, '\0', numBytes);
+
+  #endif
+
+  scratchBuffer_ = newBuffer;
+  scratchOwner_  = 1;
+  scratchLength_ = numBytes;
+
+  return newBuffer;
+}
+
+unsigned char *WriteBuffer::addScratchMessage(unsigned char *newBuffer, unsigned int numBytes)
+{
+  if (numBytes > WRITE_BUFFER_OVERFLOW_SIZE)
+  {
+    #ifdef PANIC
+    *logofs << "WriteBuffer: PANIC! Can't add a message of "
+            << numBytes << " bytes.\n" << logofs_flush;
+
+    *logofs << "WriteBuffer: PANIC! Assuming error handling "
+            << "data in context [H].\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Can't add a message of "
+         << numBytes << " bytes to write buffer.\n";
+
+    cerr << "Error" << ": Assuming error handling "
+         << "data in context [H].\n";
+
+    HandleAbort();
+  }
+  else if (scratchBuffer_ != NULL)
+  {
+    #ifdef PANIC
+    *logofs << "WriteBuffer: PANIC! Can't add a foreign "
+            << "message of " << numBytes << " bytes with "
+            << scratchLength_ << " bytes already in "
+            << "scratch buffer.\n" << logofs_flush;
+
+    *logofs << "WriteBuffer: PANIC! Assuming error handling "
+            << "data in context [I].\n" << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Can't add a foreign message of "
+         << numBytes << " bytes with " << scratchLength_
+         << " bytes already in scratch buffer.\n";
+
+    cerr << "Error" << ": Assuming error handling "
+         << "data in context [I].\n";
+
+    HandleAbort();
+  }
+
+  #ifdef DEBUG
+  *logofs << "WriteBuffer: Adding " << numBytes << " bytes "
+          << "from a foreign message to scratch buffer.\n"
+          << logofs_flush;
+  #endif
+
+  scratchBuffer_ = newBuffer;
+  scratchLength_ = numBytes;
+  scratchOwner_  = 0;
+
+  return newBuffer;
+}
+
+void WriteBuffer::removeScratchMessage()
+{
+  #ifdef TEST
+
+  if (scratchLength_ == 0 || scratchBuffer_ == NULL)
+  {
+    #ifdef PANIC
+    *logofs << "WriteBuffer: PANIC! Can't remove non existent scratch message.\n"
+            << logofs_flush;
+    #endif
+
+    cerr << "Error" << ": Can't remove non existent scratch message.\n";
+
+    HandleAbort();
+  }
+
+  *logofs << "WriteBuffer: Removing " << scratchLength_
+          << " bytes from scratch buffer.\n"
+          << logofs_flush;
+
+  #endif
+
+  if (scratchOwner_ == 1)
+  {
+    #ifdef DEBUG
+    *logofs << "WriteBuffer: Going to delete "
+           << scratchLength_ << " bytes from the "
+            << "scratch buffer.\n" << logofs_flush;
+    #endif
+
+    delete [] scratchBuffer_;
+  }
+
+  scratchLength_ = 0;
+  scratchBuffer_ = NULL;
+  scratchOwner_  = 1;
+}
diff --git a/nxcomp/src/WriteBuffer.h b/nxcomp/src/WriteBuffer.h
new file mode 100644
index 000000000..ce408e210
--- /dev/null
+++ b/nxcomp/src/WriteBuffer.h
@@ -0,0 +1,134 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef WriteBuffer_H
+#define WriteBuffer_H
+
+#include "Misc.h"
+
+#define PANIC
+#define WARNING
+#undef  TEST
+#undef  DEBUG
+
+#define WRITE_BUFFER_DEFAULT_SIZE         16384
+
+//
+// Adjust for the biggest reply that we could receive.
+// This is likely to be a reply to a X_ListFonts where
+// user has a large amount of installed fonts.
+//
+
+#define WRITE_BUFFER_OVERFLOW_SIZE        4194304
+
+class WriteBuffer
+{
+  public:
+
+  WriteBuffer();
+
+  ~WriteBuffer();
+
+  void setSize(unsigned int initialSize, unsigned int thresholdSize,
+                   unsigned int maximumSize);
+
+  unsigned char *addMessage(unsigned int numBytes);
+
+  unsigned char *removeMessage(unsigned int numBytes);
+
+  unsigned char *addScratchMessage(unsigned int numBytes);
+
+  //
+  // This form allows user to provide its own
+  // buffer as write buffer's scratch area.
+  //
+
+  unsigned char *addScratchMessage(unsigned char *newBuffer, unsigned int numBytes);
+
+  void removeScratchMessage();
+
+  void partialReset();
+
+  void fullReset();
+
+  unsigned char *getData() const
+  {
+    return buffer_;
+  }
+
+  unsigned int getLength() const
+  {
+    return length_;
+  }
+
+  unsigned int getAvailable() const
+  {
+    return (size_ - length_);
+  }
+
+  unsigned char *getScratchData() const
+  {
+    return scratchBuffer_;
+  }
+
+  unsigned int getScratchLength() const
+  {
+    return scratchLength_;
+  }
+
+  unsigned int getTotalLength() const
+  {
+    return (length_ + scratchLength_);
+  }
+
+  void registerPointer(unsigned char **pointer)
+  {
+    index_ = pointer;
+  }
+
+  void unregisterPointer()
+  {
+    index_ = 0;
+  }
+
+  private:
+
+  unsigned int size_;
+  unsigned int length_;
+
+  unsigned char *buffer_;
+  unsigned char **index_;
+
+  unsigned int  scratchLength_;
+  unsigned char *scratchBuffer_;
+
+  int scratchOwner_;
+
+  unsigned int initialSize_;
+  unsigned int thresholdSize_;
+  unsigned int maximumSize_;
+};
+
+#endif /* WriteBuffer_H */
diff --git a/nxcomp/src/XidCache.cpp b/nxcomp/src/XidCache.cpp
new file mode 100644
index 000000000..ab6574cc9
--- /dev/null
+++ b/nxcomp/src/XidCache.cpp
@@ -0,0 +1,51 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "Control.h"
+
+#include "XidCache.h"
+
+XidCache::XidCache()
+{
+  for (int i = 0; i < 256; i++)
+  {
+    base_[i] = new IntCache(8);
+  }
+
+  slot_ = 0;
+  last_ = 0;
+}
+
+XidCache::~XidCache()
+{
+  for (int i = 0; i < 256; i++)
+  {
+    delete base_[i];
+  }
+}
diff --git a/nxcomp/src/XidCache.h b/nxcomp/src/XidCache.h
new file mode 100644
index 000000000..8a09ef9b1
--- /dev/null
+++ b/nxcomp/src/XidCache.h
@@ -0,0 +1,49 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef XidCache_H
+#define XidCache_H
+
+#include "IntCache.h"
+
+class XidCache
+{
+  friend class EncodeBuffer;
+  friend class DecodeBuffer;
+  
+  public:
+
+  XidCache();
+  ~XidCache();
+
+  private:
+
+  IntCache *base_[256];
+
+  unsigned int slot_;
+  unsigned int last_;
+};
+
+#endif /* XidCache_H */
diff --git a/nxcomp/src/Z.cpp b/nxcomp/src/Z.cpp
new file mode 100644
index 000000000..af3b380f2
--- /dev/null
+++ b/nxcomp/src/Z.cpp
@@ -0,0 +1,146 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "Z.h"
+#include "Misc.h"
+
+int ZCompress(z_stream *stream, unsigned char *dest, unsigned int *destLen,
+                  const unsigned char *source, unsigned int sourceLen)
+{
+  //
+  // Deal with the possible overflow.
+  //
+
+  if (stream -> total_out & 0x80000000)
+  {
+    #ifdef TEST
+    *logofs << "ZCompress: Reset stream counters with "
+            << "total in " << stream -> total_in
+            << " and total out " << stream -> total_out
+            << ".\n" << logofs_flush;
+    #endif
+
+    stream -> total_in  = 0;
+    stream -> total_out = 0;
+  }
+
+  unsigned int saveOut = stream -> total_out;
+
+  stream -> next_in  = (Bytef *) source;
+  stream -> avail_in = sourceLen;
+
+  //
+  // Check if the source is bigger than
+  // 64K on 16-bit machine.
+  //
+
+  #ifdef MAXSEG_64K
+
+  if ((uLong) stream -> avail_in != sourceLen) return Z_BUF_ERROR;
+
+  #endif
+
+  stream -> next_out  = dest;
+  stream -> avail_out = *destLen;
+
+  #ifdef MAXSEG_64K
+
+  if ((uLong) stream -> avail_out != *destLen) return Z_BUF_ERROR;
+
+  #endif
+
+  int result = deflate(stream, Z_FINISH);
+
+  if (result != Z_STREAM_END)
+  {
+    deflateReset(stream);
+
+    return (result == Z_OK ? Z_BUF_ERROR : result);
+  }
+
+  *destLen = stream -> total_out - saveOut;
+
+  result = deflateReset(stream);
+
+  return result;
+}
+
+int ZDecompress(z_stream *stream, unsigned char *dest, unsigned int *destLen,
+                    const unsigned char *source, unsigned int sourceLen)
+{
+  stream -> next_in  = (Bytef *) source;
+  stream -> avail_in = sourceLen;
+
+  //
+  // Deal with the possible overflow.
+  //
+
+  if (stream -> total_out & 0x80000000)
+  {
+    #ifdef TEST
+    *logofs << "ZDecompress: Reset stream counters with "
+            << "total in " << stream -> total_in
+            << " and total out " << stream -> total_out
+            << ".\n" << logofs_flush;
+    #endif
+
+    stream -> total_in  = 0;
+    stream -> total_out = 0;
+  }
+
+  unsigned int saveOut = stream -> total_out;
+
+  if (stream -> avail_in != sourceLen)
+  {
+    return Z_BUF_ERROR;
+  }
+
+  stream -> next_out  = dest;
+  stream -> avail_out = *destLen;
+
+  if (stream -> avail_out != *destLen)
+  {
+    return Z_BUF_ERROR;
+  }
+
+  int result = inflate(stream, Z_FINISH);
+
+  if (result != Z_STREAM_END)
+  {
+    inflateReset(stream);
+
+    return (result == Z_OK ? Z_BUF_ERROR : result);
+  }
+
+  *destLen = stream -> total_out - saveOut;
+
+  result = inflateReset(stream);
+
+  return result;
+}
diff --git a/nxcomp/src/Z.h b/nxcomp/src/Z.h
new file mode 100644
index 000000000..3a6d684c2
--- /dev/null
+++ b/nxcomp/src/Z.h
@@ -0,0 +1,37 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+#ifndef Z_H
+#define Z_H
+
+#include <zlib.h>
+
+int ZCompress(z_stream *stream, unsigned char *dest, unsigned int *destLen,
+                  const unsigned char *source, unsigned int sourceLen);
+
+int ZDecompress(z_stream *stream, unsigned char *dest, unsigned int *destLen,
+                    const unsigned char *source, unsigned int sourceLen);
+
+#endif /* Z_H */
diff --git a/nxproxy/src/Makefile.am b/nxproxy/src/Makefile.am
index 5ec1f9401..60ace92ce 100644
--- a/nxproxy/src/Makefile.am
+++ b/nxproxy/src/Makefile.am
@@ -9,9 +9,9 @@ nxproxy_SOURCES =					\
     $(NULL)
 
 nxproxy_LDADD =						\
-    -L$(top_srcdir)/../nxcomp/ -lXcomp			\
+    -L$(top_srcdir)/../nxcomp/src/.libs -lXcomp		\
     $(NULL)
 
 AM_CPPFLAGS =						\
-    -I$(top_srcdir)/../nxcomp/				\
+    -I$(top_srcdir)/../nxcomp/include/			\
     $(NULL)
-- 
cgit v1.2.3


From 9fa0a6b954e3893f81aff1851c8e363eb0ccb98b Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Fri, 14 Jul 2017 11:43:05 +0200
Subject: nxcomp/configure.ac: Re-add previously available configure options
 --with-valgrind and --with-info as renamed options --enable-valgrind and
 --enable-debug.

---
 nxcomp/configure.ac | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'nxcomp')

diff --git a/nxcomp/configure.ac b/nxcomp/configure.ac
index 87087f32d..9d44a6991 100644
--- a/nxcomp/configure.ac
+++ b/nxcomp/configure.ac
@@ -74,6 +74,20 @@ else
   CPPFLAGS="$CPPFLAGS -DIN_ADDR_T=in_addr_t"
 fi
 
+AC_ARG_ENABLE(info,
+              [AS_HELP_STRING([--enable-debug], [enable to get info session log output (disabled by default)])],
+              [if test x$enableval = xyes; then
+                 AC_DEFINE(INFO, 1, [Define this to get info session log output.])
+                 info_messages=yes
+               fi])
+
+AC_ARG_ENABLE(valgrind,
+              [AS_HELP_STRING([--enable-valgrind], [enable for extra valgrind hacks (disabled by default)])],
+              [if test x$enableval = xyes; then
+                 AC_DEFINE(VALGRIND, 1, [Define this for extra valgrind hacks.])
+                 valgrind_hacks=yes
+               fi])
+
 AC_CONFIG_FILES([
 Makefile
 src/Makefile
-- 
cgit v1.2.3


From 9c8e3f13985cc6f61a1c140612b3be524af868f6 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 24 Jul 2017 12:32:18 +0200
Subject: nxcomp/configure.ac,m4/nx-macros.m4,nxcomp/src/Socket.h: Use
 AC_CHECK_TYPES to detect if type 'in_addr_t' is available.

---
 m4/nx-macros.m4     |  9 ---------
 nxcomp/configure.ac | 10 +---------
 nxcomp/src/Socket.h | 10 ++++++++++
 3 files changed, 11 insertions(+), 18 deletions(-)

(limited to 'nxcomp')

diff --git a/m4/nx-macros.m4 b/m4/nx-macros.m4
index a878602e7..816bf4003 100644
--- a/m4/nx-macros.m4
+++ b/m4/nx-macros.m4
@@ -303,12 +303,3 @@ rm -f conftest*])
 FreeBSD=
 test "$nxconf_cv_freebsd" = yes && FreeBSD=yes
 ]) # NX_BUILD_ON_FreeBSD
-
-AC_DEFUN([NX_HAS_INADDRT],
-[AC_CACHE_CHECK(for in_addr_t, nx_cv_inaddrt,
-[AC_TRY_COMPILE([#include <netinet/in.h>],[in_addr_t t; t = 1; return t;],
-nx_cv_inaddrt=yes, nx_cv_inaddrt=no)
-rm -f conftest*])
-INADDRT=
-test "$nx_cv_inaddrt" = yes && INADDRT=yes
-]) # NX_HAS_INADDRT
diff --git a/nxcomp/configure.ac b/nxcomp/configure.ac
index 9d44a6991..42407c6fd 100644
--- a/nxcomp/configure.ac
+++ b/nxcomp/configure.ac
@@ -63,16 +63,8 @@ if test "$FreeBSD" = yes; then
   CPPFLAGS="$CPPFLAGS -I/usr/local/include"
 fi
 
-NX_HAS_INADDRT
-
 # If in_addr_t is not defined use unsigned int.
-
-if test "$INADDRT" != yes ; then
-  echo -e "using unsigned int for type in_addr_t"
-  CPPFLAGS="$CPPFLAGS -DIN_ADDR_T=unsigned"
-else
-  CPPFLAGS="$CPPFLAGS -DIN_ADDR_T=in_addr_t"
-fi
+AC_CHECK_TYPES([in_addr_t], [], [], [[#include <netinet/in.h>]])
 
 AC_ARG_ENABLE(info,
               [AS_HELP_STRING([--enable-debug], [enable to get info session log output (disabled by default)])],
diff --git a/nxcomp/src/Socket.h b/nxcomp/src/Socket.h
index 5e7e47705..77837a115 100644
--- a/nxcomp/src/Socket.h
+++ b/nxcomp/src/Socket.h
@@ -26,6 +26,10 @@
 #ifndef Socket_H
 #define Socket_H
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
@@ -35,6 +39,12 @@
 #include <sys/filio.h>
 #endif
 
+#ifdef HAVE_IN_ADDR_T
+#define IN_ADDR_T in_addr_t
+#else
+#define IN_ADDR_T unsigned
+#endif
+
 //
 // Set socket options.
 //
-- 
cgit v1.2.3


From 5a7b589bb3a32d49d2a196fe277a0d51f6afa541 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 12 Jul 2017 21:32:14 +0200
Subject: nxcomp: Trivially fix local variables shadowing variables of same
 name from higher scope.

---
 nxcomp/src/ClientChannel.cpp | 52 +++++++++++++++---------------
 nxcomp/src/Loop.cpp          |  6 ++--
 nxcomp/src/Proxy.cpp         | 20 ++++++------
 nxcomp/src/ServerChannel.cpp | 76 ++++++++++++++++++++++----------------------
 4 files changed, 77 insertions(+), 77 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/ClientChannel.cpp b/nxcomp/src/ClientChannel.cpp
index 2a182e49f..f01ad6d7b 100644
--- a/nxcomp/src/ClientChannel.cpp
+++ b/nxcomp/src/ClientChannel.cpp
@@ -697,10 +697,10 @@ int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
                                *(clientCache_ -> convertSelectionAtomCache[i]), 9);
             nextSrc += 4;
           }
-          unsigned int timestamp = GetULONG(nextSrc, bigEndian_);
-          encodeBuffer.encodeValue(timestamp -
+          unsigned int _timestamp = GetULONG(nextSrc, bigEndian_);
+          encodeBuffer.encodeValue(_timestamp -
                              clientCache_ -> convertSelectionLastTimestamp, 32, 4);
-          clientCache_ -> convertSelectionLastTimestamp = timestamp;
+          clientCache_ -> convertSelectionLastTimestamp = _timestamp;
         }
         break;
       case X_CopyArea:
@@ -1372,10 +1372,10 @@ int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
           encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 16,
                            bigEndian_), 29, clientCache_ -> cursorCache, 9);
 
-          unsigned int timestamp = GetULONG(inputMessage + 20, bigEndian_);
-          encodeBuffer.encodeValue(timestamp -
+          unsigned int _timestamp = GetULONG(inputMessage + 20, bigEndian_);
+          encodeBuffer.encodeValue(_timestamp -
                            clientCache_ -> grabKeyboardLastTimestamp, 32, 4);
-          clientCache_ -> grabKeyboardLastTimestamp = timestamp;
+          clientCache_ -> grabKeyboardLastTimestamp = _timestamp;
 
           sequenceQueue_.push(clientSequence_, inputOpcode);
 
@@ -1387,10 +1387,10 @@ int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
           encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]);
           encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
                              clientCache_ -> windowCache);
-          unsigned int timestamp = GetULONG(inputMessage + 8, bigEndian_);
-          encodeBuffer.encodeValue(timestamp -
+          unsigned int _timestamp = GetULONG(inputMessage + 8, bigEndian_);
+          encodeBuffer.encodeValue(_timestamp -
                              clientCache_ -> grabKeyboardLastTimestamp, 32, 4);
-          clientCache_ -> grabKeyboardLastTimestamp = timestamp;
+          clientCache_ -> grabKeyboardLastTimestamp = _timestamp;
           encodeBuffer.encodeBoolValue((unsigned int) inputMessage[12]);
           encodeBuffer.encodeBoolValue((unsigned int) inputMessage[13]);
 
@@ -3607,10 +3607,10 @@ int ClientChannel::handleWrite(const unsigned char *message, unsigned int length
               unsigned char *nextDest = outputMessage + 32;
               for (; numExtensions; numExtensions--)
               {
-                unsigned int length;
-                decodeBuffer.decodeValue(length, 8);
-                *nextDest++ = (unsigned char) length;
-                for (; length; length--)
+                unsigned int _length;
+                decodeBuffer.decodeValue(_length, 8);
+                *nextDest++ = (unsigned char) _length;
+                for (; _length; _length--)
                 {
                   decodeBuffer.decodeValue(value, 8);
                   *nextDest++ = value;
@@ -3655,13 +3655,13 @@ int ClientChannel::handleWrite(const unsigned char *message, unsigned int length
                 unsigned char* nextDest = outputMessage + 32;
                 for (; numFonts; numFonts--)
                 {
-                  unsigned int length;
-                  decodeBuffer.decodeValue(length, 8);
-                  *nextDest++ = (unsigned char)length;
+                  unsigned int _length;
+                  decodeBuffer.decodeValue(_length, 8);
+                  *nextDest++ = (unsigned char)_length;
 
                   // Since ProtoStep7 (#issue 108)
-                  decodeBuffer.decodeTextData(nextDest, length);
-                  nextDest += length;
+                  decodeBuffer.decodeTextData(nextDest, _length);
+                  nextDest += _length;
                 }
 
                 handleSave(messageStore, outputMessage, outputLength);
@@ -3904,10 +3904,10 @@ int ClientChannel::handleWrite(const unsigned char *message, unsigned int length
                 {
                   unsigned int index;
                   decodeBuffer.decodeValue(index, 4);
-                  unsigned int length;
+                  unsigned int _length;
                   const unsigned char *data;
-                  ServerCache::queryFontFontCache.get(index, length, data);
-                  memcpy(nextDest, data, length);
+                  ServerCache::queryFontFontCache.get(index, _length, data);
+                  memcpy(nextDest, data, _length);
 
                   end = 1;
                 }
@@ -3915,7 +3915,7 @@ int ClientChannel::handleWrite(const unsigned char *message, unsigned int length
                 if (end == 0)
                 {
                   unsigned char *saveDest = nextDest;
-                  unsigned int length = numProperties * 8 + numCharInfos * 12;
+                  unsigned int _length = numProperties * 8 + numCharInfos * 12;
                   for (; numProperties; numProperties--)
                   {
                     decodeBuffer.decodeValue(value, 32, 9);
@@ -3930,7 +3930,7 @@ int ClientChannel::handleWrite(const unsigned char *message, unsigned int length
 
                     nextDest += 12;
                   }
-                  ServerCache::queryFontFontCache.set(length, saveDest);
+                  ServerCache::queryFontFontCache.set(_length, saveDest);
                 }
 
                 handleSave(messageStore, outputMessage, outputLength);
@@ -7845,12 +7845,12 @@ void ClientChannel::handleDecodeCharInfo(DecodeBuffer &decodeBuffer, unsigned ch
 
   for (unsigned int i = 1; i < 5; i++)
   {
-    unsigned int value;
+    unsigned int _value;
 
-    decodeBuffer.decodeCachedValue(value, 16,
+    decodeBuffer.decodeCachedValue(_value, 16,
                        *serverCache_ -> queryFontCharInfoCache[i], 6);
 
-    PutUINT(value, nextDest, bigEndian_);
+    PutUINT(_value, nextDest, bigEndian_);
 
     nextDest += 2;
   }
diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index 238e503b7..f29fae530 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -6687,10 +6687,10 @@ int WaitForRemote(ChannelEndPoint &socketAddress)
       strcpy(hostLabel, "any host");
     }
 
-    long bindPort;
-    if (socketAddress.getTCPHostAndPort(NULL, &bindPort))
+    long _bindPort;
+    if (socketAddress.getTCPHostAndPort(NULL, &_bindPort))
     {
-      socketAddress.setSpec(loopbackBind ? "localhost" : "*", bindPort);
+      socketAddress.setSpec(loopbackBind ? "localhost" : "*", _bindPort);
     }
     else
     {
diff --git a/nxcomp/src/Proxy.cpp b/nxcomp/src/Proxy.cpp
index 72b2cee21..32c32795c 100644
--- a/nxcomp/src/Proxy.cpp
+++ b/nxcomp/src/Proxy.cpp
@@ -1138,9 +1138,9 @@ int Proxy::handleRead()
           // the failure is detected.
           //
 
-          int result = channels_[channelId] -> handleWrite(message, dataLength);
+          int _result = channels_[channelId] -> handleWrite(message, dataLength);
 
-          if (result < 0 && finish == 0)
+          if (_result < 0 && finish == 0)
           {
             #ifdef TEST
             *logofs << "Proxy: Failed to write proxy data to FD#"
@@ -5793,14 +5793,14 @@ void Proxy::setSplitTimeout(int channelId)
       for (T_list::iterator j = channelList.begin();
                j != channelList.end(); j++)
       {
-        int channelId = *j;
+        int _channelId = *j;
 
-        if (channels_[channelId] != NULL &&
-                channels_[channelId] -> needSplit() == 1)
+        if (channels_[_channelId] != NULL &&
+                channels_[_channelId] -> needSplit() == 1)
         {
           #ifdef TEST
           *logofs << "Proxy: SPLIT! Channel for FD#"
-                  << getFd(channelId) << " still needs splits.\n"
+                  << getFd(_channelId) << " still needs splits.\n"
                   << logofs_flush;
           #endif
 
@@ -5840,14 +5840,14 @@ void Proxy::setMotionTimeout(int channelId)
       for (T_list::iterator j = channelList.begin();
                j != channelList.end(); j++)
       {
-        int channelId = *j;
+        int _channelId = *j;
 
-        if (channels_[channelId] != NULL &&
-                channels_[channelId] -> needMotion() == 1)
+        if (channels_[_channelId] != NULL &&
+                channels_[_channelId] -> needMotion() == 1)
         {
           #ifdef TEST
           *logofs << "Proxy: SPLIT! Channel for FD#"
-                  << getFd(channelId) << " still needs motions.\n"
+                  << getFd(_channelId) << " still needs motions.\n"
                   << logofs_flush;
           #endif
 
diff --git a/nxcomp/src/ServerChannel.cpp b/nxcomp/src/ServerChannel.cpp
index a560eca6d..830985295 100644
--- a/nxcomp/src/ServerChannel.cpp
+++ b/nxcomp/src/ServerChannel.cpp
@@ -501,13 +501,13 @@ int ServerChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
 
           if (control -> LocalDeltaCompression == 0)
           {
-            int result = handleFastReadReply(encodeBuffer, requestOpcode,
+            int _result = handleFastReadReply(encodeBuffer, requestOpcode,
                                                  inputMessage, inputLength);
-            if (result < 0)
+            if (_result < 0)
             {
               return -1;
             }
-            else if (result > 0)
+            else if (_result > 0)
             {
               continue;
             }
@@ -790,9 +790,9 @@ int ServerChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
 
               for (; numExtensions; numExtensions--)
               {
-                unsigned int length = (unsigned int) (*nextSrc++);
+                unsigned int _length = (unsigned int) (*nextSrc++);
 
-                encodeBuffer.encodeValue(length, 8);
+                encodeBuffer.encodeValue(_length, 8);
 
                 #ifdef HIDE_MIT_SHM_EXTENSION
 
@@ -913,13 +913,13 @@ int ServerChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
               const unsigned char* nextSrc = inputMessage + 32;
               for (; numFonts; numFonts--)
               {
-                unsigned int length = (unsigned int) (*nextSrc++);
-                encodeBuffer.encodeValue(length, 8);
+                unsigned int _length = (unsigned int) (*nextSrc++);
+                encodeBuffer.encodeValue(_length, 8);
 
                 // Since ProtoStep7 (#issue 108)
-                encodeBuffer.encodeTextData(nextSrc, length);
+                encodeBuffer.encodeTextData(nextSrc, _length);
 
-                nextSrc += length;
+                nextSrc += _length;
               }
 
               priority_++;
@@ -963,13 +963,13 @@ int ServerChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
               encodeBuffer.encodeBoolValue(1);
 
               unsigned int numColors = ((inputLength - 32) >> 3);
-              const unsigned char *nextSrc = inputMessage + 40;
+              const unsigned char *nextSrc1 = inputMessage + 40;
               unsigned char *nextDest = (unsigned char *) inputMessage + 38;
               for (unsigned int c = 1; c < numColors; c++)
               {
                 for (unsigned int i = 0; i < 6; i++)
-                  *nextDest++ = *nextSrc++;
-                nextSrc += 2;
+                  *nextDest++ = *nextSrc1++;
+                nextSrc1 += 2;
               }
               unsigned int colorsLength = numColors * 6;
               if (serverCache_ -> queryColorsLastReply.compare(colorsLength,
@@ -977,13 +977,13 @@ int ServerChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
                 encodeBuffer.encodeBoolValue(1);
               else
               {
-                const unsigned char *nextSrc = inputMessage + 32;
+                const unsigned char *nextSrc2 = inputMessage + 32;
                 encodeBuffer.encodeBoolValue(0);
                 encodeBuffer.encodeValue(numColors, 16, 5);
                 for (numColors *= 3; numColors; numColors--)
                 {
-                  encodeBuffer.encodeValue(GetUINT(nextSrc, bigEndian_), 16);
-                  nextSrc += 2;
+                  encodeBuffer.encodeValue(GetUINT(nextSrc2, bigEndian_), 16);
+                  nextSrc2 += 2;
                 }
               }
 
@@ -1299,13 +1299,13 @@ int ServerChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
 
           if (control -> LocalDeltaCompression == 0)
           {
-            int result = handleFastReadReply(encodeBuffer, requestOpcode,
+            int _result = handleFastReadReply(encodeBuffer, requestOpcode,
                                                  inputMessage, inputLength);
-            if (result < 0)
+            if (_result < 0)
             {
               return -1;
             }
-            else if (result > 0)
+            else if (_result > 0)
             {
               continue;
             }
@@ -1522,13 +1522,13 @@ int ServerChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
 
         if (control -> LocalDeltaCompression == 0)
         {
-          int result = handleFastReadEvent(encodeBuffer, inputOpcode,
+          int _result = handleFastReadEvent(encodeBuffer, inputOpcode,
                                                inputMessage, inputLength);
-          if (result < 0)
+          if (_result < 0)
           {
             return -1;
           }
-          else if (result > 0)
+          else if (_result > 0)
           {
             continue;
           }
@@ -1620,10 +1620,10 @@ int ServerChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
                                              serverCache_ -> buttonCache);
             else
               encodeBuffer.encodeValue((unsigned int) detail, 8);
-            unsigned int timestamp = GetULONG(inputMessage + 4, bigEndian_);
+            unsigned int _timestamp = GetULONG(inputMessage + 4, bigEndian_);
             unsigned int timestampDiff =
-            timestamp - serverCache_ -> lastTimestamp;
-            serverCache_ -> lastTimestamp = timestamp;
+            _timestamp - serverCache_ -> lastTimestamp;
+            serverCache_ -> lastTimestamp = _timestamp;
             encodeBuffer.encodeCachedValue(timestampDiff, 32,
                                 serverCache_ -> motionNotifyTimestampCache, 9);
             int skipRest = 0;
@@ -1795,10 +1795,10 @@ int ServerChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
                              29, serverCache_ -> propertyNotifyWindowCache, 9);
             encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_),
                                29, serverCache_ -> propertyNotifyAtomCache, 9);
-            unsigned int timestamp = GetULONG(inputMessage + 12, bigEndian_);
+            unsigned int _timestamp = GetULONG(inputMessage + 12, bigEndian_);
             unsigned int timestampDiff =
-            timestamp - serverCache_ -> lastTimestamp;
-            serverCache_ -> lastTimestamp = timestamp;
+            _timestamp - serverCache_ -> lastTimestamp;
+            serverCache_ -> lastTimestamp = _timestamp;
             encodeBuffer.encodeValue(timestampDiff, 32, 9);
             encodeBuffer.encodeBoolValue((unsigned int) inputMessage[16]);
           }
@@ -1819,9 +1819,9 @@ int ServerChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
           break;
         case SelectionClear:
           {
-            unsigned int timestamp = GetULONG(inputMessage + 4, bigEndian_);
-            unsigned int timestampDiff = timestamp - serverCache_ -> lastTimestamp;
-            serverCache_ -> lastTimestamp = timestamp;
+            unsigned int _timestamp = GetULONG(inputMessage + 4, bigEndian_);
+            unsigned int timestampDiff = _timestamp - serverCache_ -> lastTimestamp;
+            serverCache_ -> lastTimestamp = _timestamp;
             encodeBuffer.encodeValue(timestampDiff, 32, 9);
             encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_),
                            29, serverCache_ -> selectionClearWindowCache, 9);
@@ -1831,9 +1831,9 @@ int ServerChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
           break;
         case SelectionRequest:
           {
-            unsigned int timestamp = GetULONG(inputMessage + 4, bigEndian_);
-            unsigned int timestampDiff = timestamp - serverCache_ -> lastTimestamp;
-            serverCache_ -> lastTimestamp = timestamp;
+            unsigned int _timestamp = GetULONG(inputMessage + 4, bigEndian_);
+            unsigned int timestampDiff = _timestamp - serverCache_ -> lastTimestamp;
+            serverCache_ -> lastTimestamp = _timestamp;
             encodeBuffer.encodeValue(timestampDiff, 32, 9);
             encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_),
                            29, serverCache_ -> selectionClearWindowCache, 9);
@@ -5669,9 +5669,9 @@ int ServerChannel::handleMotion(EncodeBuffer &encodeBuffer)
                                    serverCache_ -> buttonCache);
   else
     encodeBuffer.encodeValue((unsigned int) detail, 8);
-  unsigned int timestamp = GetULONG(buffer + 4, bigEndian_);
-  unsigned int timestampDiff = timestamp - serverCache_ -> lastTimestamp;
-  serverCache_ -> lastTimestamp = timestamp;
+  unsigned int _timestamp = GetULONG(buffer + 4, bigEndian_);
+  unsigned int timestampDiff = _timestamp - serverCache_ -> lastTimestamp;
+  serverCache_ -> lastTimestamp = _timestamp;
   encodeBuffer.encodeCachedValue(timestampDiff, 32,
                       serverCache_ -> motionNotifyTimestampCache, 9);
   int skipRest = 0;
@@ -7910,11 +7910,11 @@ void ServerChannel::handleEncodeCharInfo(const unsigned char *nextSrc, EncodeBuf
 
   for (unsigned int i = 1; i < 5; i++)
   {
-    unsigned int value = GetUINT(nextSrc, bigEndian_);
+    unsigned int _value = GetUINT(nextSrc, bigEndian_);
 
     nextSrc += 2;
 
-    encodeBuffer.encodeCachedValue(value, 16,
+    encodeBuffer.encodeCachedValue(_value, 16,
                        *serverCache_ -> queryFontCharInfoCache[i], 6);
   }
 }
-- 
cgit v1.2.3


From 4c3872279336b182fefa926c7e3e38152eb5fff4 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 12 Jul 2017 21:36:11 +0200
Subject: nxcomp/src/Loop.cpp: Avoid duplicate usage of proxyFD (global
 variable) and *proxyFD (function parameter).

---
 nxcomp/src/Loop.cpp | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index f29fae530..907ad04df 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -450,8 +450,8 @@ static int AcceptConnection(int fd, int domain, const char *label);
 // Other convenience functions.
 //
 
-static int PrepareProxyConnectionTCP(char** hostName, long int* portNum, int* timeout, int* proxyFD, int* reason);
-static int PrepareProxyConnectionUnix(char** path, int* timeout, int* proxyFD, int* reason);
+static int PrepareProxyConnectionTCP(char** hostName, long int* portNum, int* timeout, int* proxyFileDescriptor, int* reason);
+static int PrepareProxyConnectionUnix(char** path, int* timeout, int* proxyFileDescriptor, int* reason);
 
 static int WaitForRemote(ChannelEndPoint &socketAddress);
 static int ConnectToRemote(ChannelEndPoint &socketAddress);
@@ -6914,18 +6914,18 @@ WaitForRemoteError:
   HandleCleanup();
 }
 
-int PrepareProxyConnectionTCP(char** hostName, long int* portNum, int* timeout, int* proxyFD, int* reason)
+int PrepareProxyConnectionTCP(char** hostName, long int* portNum, int* timeout, int* proxyFileDescriptor, int* reason)
 {
 
-  if (!proxyFD)
+  if (!proxyFileDescriptor)
   {
     #ifdef PANIC
     *logofs << "Loop: PANIC! Implementation error (PrepareProxyConnectionTCP). "
-            << "'proxyFD' must not be a NULL pointer.\n" << logofs_flush;
+            << "'proxyFileDescriptor' must not be a NULL pointer.\n" << logofs_flush;
     #endif
 
     cerr << "Error" << ":  Implementation error (PrepareProxyConnectionTCP). "
-            << "'proxyFD' must not be a NULL pointer.\n";
+            << "'proxyFileDescriptor' must not be a NULL pointer.\n";
 
     return -1;
   }
@@ -6966,7 +6966,7 @@ int PrepareProxyConnectionTCP(char** hostName, long int* portNum, int* timeout,
        << *hostName << ":" << *portNum << "'.\n"
        << logofs_flush;
 
-  *proxyFD = -1;
+  *proxyFileDescriptor = -1;
   *reason = -1;
 
   sockaddr_in addr;
@@ -6974,10 +6974,10 @@ int PrepareProxyConnectionTCP(char** hostName, long int* portNum, int* timeout,
   addr.sin_port = htons(*portNum);
   addr.sin_addr.s_addr = remoteIPAddr;
 
-  *proxyFD = socket(AF_INET, SOCK_STREAM, PF_UNSPEC);
+  *proxyFileDescriptor = socket(AF_INET, SOCK_STREAM, PF_UNSPEC);
   *reason = EGET();
 
-  if (*proxyFD == -1)
+  if (*proxyFileDescriptor == -1)
   {
     #ifdef PANIC
     *logofs << "Loop: PANIC! Call to socket failed. "
@@ -6991,7 +6991,7 @@ int PrepareProxyConnectionTCP(char** hostName, long int* portNum, int* timeout,
     return -1;
 
   }
-  else if (SetReuseAddress(*proxyFD) < 0)
+  else if (SetReuseAddress(*proxyFileDescriptor) < 0)
   {
     return -1;
   }
@@ -7006,7 +7006,7 @@ int PrepareProxyConnectionTCP(char** hostName, long int* portNum, int* timeout,
   else
     SetTimer(20000);
 
-  int result = connect(*proxyFD, (sockaddr *) &addr, sizeof(sockaddr_in));
+  int result = connect(*proxyFileDescriptor, (sockaddr *) &addr, sizeof(sockaddr_in));
 
   *reason = EGET();
 
@@ -7016,18 +7016,18 @@ int PrepareProxyConnectionTCP(char** hostName, long int* portNum, int* timeout,
 
 }
 
-int PrepareProxyConnectionUnix(char** path, int* timeout, int* proxyFD, int* reason)
+int PrepareProxyConnectionUnix(char** path, int* timeout, int* proxyFileDescriptor, int* reason)
 {
 
-  if (!proxyFD)
+  if (!proxyFileDescriptor)
   {
     #ifdef PANIC
     *logofs << "Loop: PANIC! Implementation error (PrepareProxyConnectionUnix). "
-            << "proxyFD must not be a NULL pointer.\n" << logofs_flush;
+            << "proxyFileDescriptor must not be a NULL pointer.\n" << logofs_flush;
     #endif
 
     cerr << "Error" << ":  Implementation error (PrepareProxyConnectionUnix). "
-            << "proxyFD must not be a NULL pointer.\n";
+            << "proxyFileDescriptor must not be a NULL pointer.\n";
 
     return -1;
   }
@@ -7047,17 +7047,17 @@ int PrepareProxyConnectionUnix(char** path, int* timeout, int* proxyFD, int* rea
 
   /* FIXME: Add socket file existence and permission checks */
 
-  *proxyFD = -1;
+  *proxyFileDescriptor = -1;
   *reason = -1;
 
   sockaddr_un addr;
   addr.sun_family = AF_UNIX;
   strncpy(addr.sun_path, *path, 108 - 1);
 
-  *proxyFD = socket(AF_UNIX, SOCK_STREAM, PF_UNSPEC);
+  *proxyFileDescriptor = socket(AF_UNIX, SOCK_STREAM, PF_UNSPEC);
   *reason = EGET();
 
-  if (*proxyFD == -1)
+  if (*proxyFileDescriptor == -1)
   {
     #ifdef PANIC
     *logofs << "Loop: PANIC! Call to socket failed. "
@@ -7082,7 +7082,7 @@ int PrepareProxyConnectionUnix(char** path, int* timeout, int* proxyFD, int* rea
   else
     SetTimer(20000);
 
-  int result = connect(*proxyFD, (sockaddr *) &addr, sizeof(sockaddr_un));
+  int result = connect(*proxyFileDescriptor, (sockaddr *) &addr, sizeof(sockaddr_un));
 
   *reason = EGET();
 
-- 
cgit v1.2.3


From 1894e04df791c0592993de3100e4fc682ec2ebe7 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 12 Jul 2017 21:39:32 +0200
Subject: nxcomp/src/Proxy.cpp: Fix index usage of nested loops.

---
 nxcomp/src/Proxy.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Proxy.cpp b/nxcomp/src/Proxy.cpp
index 32c32795c..5529de021 100644
--- a/nxcomp/src/Proxy.cpp
+++ b/nxcomp/src/Proxy.cpp
@@ -5530,7 +5530,7 @@ const char *Proxy::handleLoadAllStores(const char *loadPath, const char *loadNam
   md5_append(md5StateStream, (const md5_byte_t *) loadName, strlen(loadName));
   md5_finish(md5StateStream, md5DigestStream);
 
-  for (int i = 0; i < MD5_LENGTH; i++)
+  for (unsigned int i = 0; i < MD5_LENGTH; i++)
   {
     if (md5DigestStream[i] != md5FromFile[i])
     {
@@ -5539,17 +5539,17 @@ const char *Proxy::handleLoadAllStores(const char *loadPath, const char *loadNam
       *logofs << "Proxy: PANIC! Bad checksum for cache file '"
               << cacheName << "'.\n" << logofs_flush;
 
-      for (unsigned int i = 0; i < MD5_LENGTH; i++)
+      for (unsigned int j = 0; j < MD5_LENGTH; j++)
       {
-        sprintf(md5String + (i * 2), "%02X", md5FromFile[i]);
+        sprintf(md5String + (j * 2), "%02X", md5FromFile[j]);
       }
 
       *logofs << "Proxy: PANIC! Saved checksum is '"
               << md5String << "'.\n" << logofs_flush;
 
-      for (unsigned int i = 0; i < MD5_LENGTH; i++)
+      for (unsigned int j = 0; j < MD5_LENGTH; j++)
       {
-        sprintf(md5String + (i * 2),"%02X", md5DigestStream[i]);
+        sprintf(md5String + (j * 2),"%02X", md5DigestStream[i]);
       }
 
       *logofs << "Proxy: PANIC! Calculated checksum is '"
-- 
cgit v1.2.3


From 1e15760a3e59cff09f9ccc0780bca544a90a1b6b Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 12 Jul 2017 21:41:21 +0200
Subject: nxcomp/src/Loop.cpp: Drop duplicate prototypes (which already exist
 in Misc.h).

---
 nxcomp/src/Loop.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index 907ad04df..6adb2453e 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -334,11 +334,9 @@ Keeper *keeper = NULL;
 int (*handler)(int) = NULL;
 
 //
-// Signal handling functions.
+// Signal handling functions (that are not already mentioned in Misc.h).
 //
 
-void DisableSignals();
-void EnableSignals();
 void InstallSignals();
 
 static void RestoreSignals();
@@ -364,12 +362,9 @@ void RegisterChild(int child);
 static int CheckAbort();
 
 //
-// Timer handling utilities.
+// Timer handling utilities (that are not already mentioned in Misc.h).
 //
 
-void SetTimer(int timeout);
-void ResetTimer();
-
 static void HandleTimer(int signal);
 
 //
-- 
cgit v1.2.3


From ca7db4fcb09695b4fe1616e520ca417a4e2455fc Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 12 Jul 2017 21:42:46 +0200
Subject: nxcomp/src/Loop.cpp: Rename local variable 'handler' to
 'signalHandler'.

---
 nxcomp/src/Children.cpp | 4 ++--
 nxcomp/src/Loop.cpp     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Children.cpp b/nxcomp/src/Children.cpp
index 49ab13352..e77d1defd 100644
--- a/nxcomp/src/Children.cpp
+++ b/nxcomp/src/Children.cpp
@@ -64,7 +64,7 @@
 
 extern Keeper *keeper;
 
-extern int (*handler)(int);
+extern int (*signalHandler)(int);
 
 extern int useUnixSocket;
 
@@ -792,7 +792,7 @@ int NXTransKeeper(int caches, int images, const char *root)
 
   keeper = new Keeper(caches, images, root, 100, parent);
 
-  handler = NXTransKeeperHandler;
+  signalHandler = NXTransKeeperHandler;
 
   if (keeper == NULL)
   {
diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index 6adb2453e..3dc6f4ec5 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -331,7 +331,7 @@ Keeper *keeper = NULL;
 // to be notified about signals.
 //
 
-int (*handler)(int) = NULL;
+int (*signalHandler)(int) = NULL;
 
 //
 // Signal handling functions (that are not already mentioned in Misc.h).
@@ -5999,7 +5999,7 @@ void HandleSignal(int signal)
 
   #endif
 
-  if (getpid() != lastProxy && handler != NULL)
+  if (getpid() != lastProxy && signalHandler != NULL)
   {
     #if defined(UNSAFE) && (defined(TEST) || defined(INFO))
     *logofs << "Loop: Calling slave handler in process "
@@ -6007,7 +6007,7 @@ void HandleSignal(int signal)
             << logofs_flush;
     #endif
 
-    if ((*handler)(signal) == 0)
+    if ((*signalHandler)(signal) == 0)
     {
       return;
     }
-- 
cgit v1.2.3


From 54e7b9aa250259855fc820f68e9b1946cb1510d2 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 12 Jul 2017 21:46:09 +0200
Subject: nxcomp/src/Loop.cpp: Don't reuse global variable names as function
 parameters in SetupDisplaySocket().

---
 nxcomp/src/Loop.cpp | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index 3dc6f4ec5..6dadf5e9c 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -427,8 +427,8 @@ static int SetupAgentInstance();
 static int SetupTcpSocket();
 static int SetupUnixSocket();
 static int SetupServiceSockets();
-static int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
-                                  unsigned int &xServerAddrLength);
+static int SetupDisplaySocket(int &addr_family, sockaddr *&addr,
+                                  unsigned int &addr_length);
 
 //
 // Setup a listening socket and accept
@@ -4025,12 +4025,12 @@ int SetupUnixSocket()
 // implementation.
 //
 
-int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
-                           unsigned int &xServerAddrLength)
+int SetupDisplaySocket(int &addr_family, sockaddr *&addr,
+                           unsigned int &addr_length)
 {
-  xServerAddrFamily = AF_INET;
-  xServerAddr = NULL;
-  xServerAddrLength = 0;
+  addr_family = AF_INET;
+  addr = NULL;
+  addr_length = 0;
 
   char *display;
 
@@ -4167,7 +4167,7 @@ int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
 
     sockaddr_un *xServerAddrUNIX = new sockaddr_un;
 
-    xServerAddrFamily = AF_UNIX;
+    addr_family = AF_UNIX;
     xServerAddrUNIX -> sun_family = AF_UNIX;
 
     //
@@ -4189,25 +4189,25 @@ int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
 
     #ifdef __linux__
     int testSocketFD;
-    testSocketFD = socket(xServerAddrFamily, SOCK_STREAM, PF_UNSPEC);
+    testSocketFD = socket(addr_family, SOCK_STREAM, PF_UNSPEC);
 
     int len = sprintf(unixSocketName + 1, "/tmp/.X11-unix/X%d", xPort);
     unixSocketName[0] = '\0';
 
     sockaddr_un *xServerAddrABSTRACT = new sockaddr_un;
-    memset(xServerAddrABSTRACT, 0, xServerAddrLength);
+    memset(xServerAddrABSTRACT, 0, addr_length);
     xServerAddrABSTRACT -> sun_family = AF_UNIX;
     memcpy(xServerAddrABSTRACT -> sun_path, unixSocketName, len+1);
-    xServerAddrLength = len +3;
+    addr_length = len +3;
 
-    int ret = connect(testSocketFD, (struct sockaddr *) xServerAddrABSTRACT, xServerAddrLength);
+    int ret = connect(testSocketFD, (struct sockaddr *) xServerAddrABSTRACT, addr_length);
     if (ret == 0) {
 
         cerr << "Info" << ": Using abstract X11 socket in kernel namespace "
              << "for accessing DISPLAY=:" << xPort << ".\n";
 
         close(testSocketFD);
-        xServerAddr = (sockaddr *) xServerAddrABSTRACT;
+        addr = (sockaddr *) xServerAddrABSTRACT;
         return 1;
 
     } else {
@@ -4287,8 +4287,8 @@ int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
 
     strcpy(xServerAddrUNIX -> sun_path, unixSocketName);
 
-    xServerAddr = (sockaddr *) xServerAddrUNIX;
-    xServerAddrLength = sizeof(sockaddr_un);
+    addr = (sockaddr *) xServerAddrUNIX;
+    addr_length = sizeof(sockaddr_un);
 
     #ifdef __linux__
 
@@ -4306,7 +4306,7 @@ int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
             << logofs_flush;
     #endif
 
-    xServerAddrFamily = AF_INET;
+    addr_family = AF_INET;
 
     int xServerIPAddr = GetHostAddress(display);
 
@@ -4329,8 +4329,8 @@ int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
     xServerAddrTCP -> sin_port = htons(X_TCP_PORT + xPort);
     xServerAddrTCP -> sin_addr.s_addr = xServerIPAddr;
 
-    xServerAddr = (sockaddr *) xServerAddrTCP;
-    xServerAddrLength = sizeof(sockaddr_in);
+    addr = (sockaddr *) xServerAddrTCP;
+    addr_length = sizeof(sockaddr_in);
   }
 
   delete [] display;
-- 
cgit v1.2.3


From 04e09f27723e8477c6ea2c23545d38510fae3d40 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Fri, 14 Jul 2017 11:21:34 +0200
Subject: nxcomp/src/Transport.cpp: Don't redeclare local variable if it can be
 reused.

---
 nxcomp/src/Transport.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Transport.cpp b/nxcomp/src/Transport.cpp
index e34544994..897bf32f1 100644
--- a/nxcomp/src/Transport.cpp
+++ b/nxcomp/src/Transport.cpp
@@ -1412,7 +1412,7 @@ int ProxyTransport::read(unsigned char *data, unsigned int size)
             << logofs_flush;
     #endif
 
-    int result = inflate(&r_stream_, Z_SYNC_FLUSH);
+    result = inflate(&r_stream_, Z_SYNC_FLUSH);
 
     #ifdef INSPECT
     *logofs << "ProxyTransport: Called inflate() result is "
-- 
cgit v1.2.3


From e47995370e0e3353c7b1f0b5d870935614c59ad9 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Fri, 14 Jul 2017 11:22:20 +0200
Subject: nxcomp/src/Loop.cpp: Drop global variable diffTs, declare it in every
 funtion where it is needed.

---
 nxcomp/src/Loop.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index 6dadf5e9c..6c1ba2c40 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -1023,8 +1023,6 @@ T_timestamp startTs;
 T_timestamp logsTs;
 T_timestamp nowTs;
 
-int diffTs;
-
 //
 // This is set to the main proxy process id.
 // 
@@ -2767,7 +2765,7 @@ int NXTransPrepare(int *setFDs, fd_set *readSet,
 
   nowTs = getNewTimestamp();
 
-  diffTs = diffTimestamp(startTs, nowTs);
+  int diffTs = diffTimestamp(startTs, nowTs);
 
   #ifdef TEST
   *logofs << "Loop: Mark - 0 - at " << strMsTimestamp()
@@ -2807,6 +2805,7 @@ int NXTransPrepare(int *setFDs, fd_set *readSet,
 int NXTransSelect(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
                       fd_set *writeSet, struct timeval *selectTs)
 {
+  int diffTs;
   #ifdef TIME
 
   static T_timestamp lastTs;
@@ -5520,8 +5519,6 @@ void CleanupLocal()
   logsTs  = nullTimestamp();
   nowTs   = nullTimestamp();
 
-  diffTs = 0;
-
   lastProxy    = 0;
   lastDialog   = 0;
   lastWatchdog = 0;
-- 
cgit v1.2.3


From 82c2182887ed3be9ff6b59f368597b65e5ef13df Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 12 Jul 2017 21:49:28 +0200
Subject: nxcomp/src/Loop.cpp: Don't use global variables as function paramters
 in handleLogReopenInLoop().

---
 nxcomp/src/Loop.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index 6c1ba2c40..8538036e2 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -711,7 +711,7 @@ static inline void handleTerminatedInLoop();
 // Monitor the size of the log file.
 //
 
-static void handleLogReopenInLoop(T_timestamp &logsTs, T_timestamp &nowTs);
+static void handleLogReopenInLoop(T_timestamp &lTs, T_timestamp &nTs);
 
 //
 // Directory where the NX binaries and libraries reside.
@@ -16482,7 +16482,7 @@ static inline void handleEventsInLoop()
   }
 }
 
-static void handleLogReopenInLoop(T_timestamp &logsTs, T_timestamp &nowTs)
+static void handleLogReopenInLoop(T_timestamp &lTs, T_timestamp &nTs)
 {
   //
   // If need to limit the size of the
@@ -16492,7 +16492,7 @@ static void handleLogReopenInLoop(T_timestamp &logsTs, T_timestamp &nowTs)
 
   #ifndef QUOTA
 
-  if (diffTimestamp(logsTs, nowTs) > control -> FileSizeCheckTimeout)
+  if (diffTimestamp(lTs, nTs) > control -> FileSizeCheckTimeout)
 
   #endif
   {
@@ -16514,7 +16514,7 @@ static void handleLogReopenInLoop(T_timestamp &logsTs, T_timestamp &nowTs)
     // Reset to current timestamp.
     //
 
-    logsTs = nowTs;
+    lTs = nTs;
   }
 }
 
-- 
cgit v1.2.3


From b3a3382ad8e162b0a63bc71ebb2238b14875cdc5 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 12 Jul 2017 21:51:40 +0200
Subject: nxcomp/src/Loop.cpp: Don't mix using global proxyFD and a local
 p(roxy)FD variable (in WaitForRemote() and ConnectToRemote()). Rename local
 variable name.

---
 nxcomp/src/Loop.cpp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index 8538036e2..b6c82a2b4 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -6644,7 +6644,7 @@ int WaitForRemote(ChannelEndPoint &socketAddress)
 
   int retryAccept  = -1;
 
-  int proxyFD = -1;
+  int pFD = -1;
   int newFD   = -1;
 
   int acceptIPAddr = 0;
@@ -6696,7 +6696,7 @@ int WaitForRemote(ChannelEndPoint &socketAddress)
     strcpy(hostLabel, "unknown origin (something went wrong!!!)");
 
 
-  proxyFD = ListenConnection(socketAddress, "NX");
+  pFD = ListenConnection(socketAddress, "NX");
 
   socketAddress.getSpec(&socketUri);
   #ifdef TEST
@@ -6726,14 +6726,14 @@ int WaitForRemote(ChannelEndPoint &socketAddress)
     fd_set readSet;
 
     FD_ZERO(&readSet);
-    FD_SET(proxyFD, &readSet);
+    FD_SET(pFD, &readSet);
 
     T_timestamp selectTs;
 
     selectTs.tv_sec  = 20;
     selectTs.tv_usec = 0;
 
-    int result = select(proxyFD + 1, &readSet, NULL, NULL, &selectTs);
+    int result = select(pFD + 1, &readSet, NULL, NULL, &selectTs);
 
     getNewTimestamp();
 
@@ -6760,7 +6760,7 @@ int WaitForRemote(ChannelEndPoint &socketAddress)
 
       goto WaitForRemoteError;
     }
-    else if (result > 0 && FD_ISSET(proxyFD, &readSet))
+    else if (result > 0 && FD_ISSET(pFD, &readSet))
     {
 
       sockaddr_in newAddrINET;
@@ -6768,12 +6768,12 @@ int WaitForRemote(ChannelEndPoint &socketAddress)
       if (socketAddress.isUnixSocket())
       {
         socklen_t addrLen = sizeof(sockaddr_un);
-        newFD = accept(proxyFD, NULL, &addrLen);
+        newFD = accept(pFD, NULL, &addrLen);
       }
       else if (socketAddress.isTCPSocket())
       {
         socklen_t addrLen = sizeof(sockaddr_in);
-        newFD = accept(proxyFD, (sockaddr *) &newAddrINET, &addrLen);
+        newFD = accept(pFD, (sockaddr *) &newAddrINET, &addrLen);
       }
       if (newFD == -1)
       {
@@ -6895,13 +6895,13 @@ int WaitForRemote(ChannelEndPoint &socketAddress)
     }
   }
 
-  close(proxyFD);
+  close(pFD);
 
   return newFD;
 
 WaitForRemoteError:
 
-  close(proxyFD);
+  close(pFD);
 
   HandleCleanup();
 }
@@ -7113,7 +7113,7 @@ int ConnectToRemote(ChannelEndPoint &socketAddress)
 
   int result = -1;
   int reason = -1;
-  int proxyFD = -1;
+  int pFD = -1;
 
   char *hostName = NULL;
   long int portNum = -1;
@@ -7130,13 +7130,13 @@ int ConnectToRemote(ChannelEndPoint &socketAddress)
     #endif
 
     if (socketAddress.getUnixPath(&unixPath))
-      result = PrepareProxyConnectionUnix(&unixPath, &connectTimeout, &proxyFD, &reason);
+      result = PrepareProxyConnectionUnix(&unixPath, &connectTimeout, &pFD, &reason);
     else if (socketAddress.getTCPHostAndPort(&hostName, &portNum))
-      result = PrepareProxyConnectionTCP(&hostName, &portNum, &connectTimeout, &proxyFD, &reason);
+      result = PrepareProxyConnectionTCP(&hostName, &portNum, &connectTimeout, &pFD, &reason);
 
     if (result < 0)
     {
-      close(proxyFD);
+      close(pFD);
 
       if (CheckAbort() != 0)
       {
@@ -7274,13 +7274,13 @@ int ConnectToRemote(ChannelEndPoint &socketAddress)
     }
   }
 
-  return proxyFD;
+  return pFD;
 
 ConnectToRemoteError:
 
-  if (proxyFD != -1)
+  if (pFD != -1)
   {
-    close(proxyFD);
+    close(pFD);
   }
 
   HandleCleanup();
-- 
cgit v1.2.3


From 4afc641fdd8c03bd708f50e0c3691b5de7ea1dba Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 12 Jul 2017 13:35:57 +0200
Subject: nxcomp: Add __attribute__((noreturn)) to more functions where
 appropriate.

---
 nxcomp/src/Channel.h   | 2 +-
 nxcomp/src/Jpeg.cpp    | 2 +-
 nxcomp/src/Transport.h | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Channel.h b/nxcomp/src/Channel.h
index 93b022630..7e432416a 100644
--- a/nxcomp/src/Channel.h
+++ b/nxcomp/src/Channel.h
@@ -519,7 +519,7 @@ class Channel
   // Set up the split stores.
   //
 
-  void handleSplitStoreError(int resource);
+  void handleSplitStoreError(int resource) __attribute__((noreturn));
 
   void handleSplitStoreAlloc(List *list, int resource);
   void handleSplitStoreRemove(List *list, int resource);
diff --git a/nxcomp/src/Jpeg.cpp b/nxcomp/src/Jpeg.cpp
index 64a537497..2e8044049 100644
--- a/nxcomp/src/Jpeg.cpp
+++ b/nxcomp/src/Jpeg.cpp
@@ -106,7 +106,7 @@ static int DecompressJpeg24(unsigned char *compressedData, int compressedLen,
 static int DecompressJpeg32(unsigned char *compressedData, int compressedLen,
                                 unsigned int w, unsigned int h, unsigned char *dstBuf, int byteOrder);
 
-void UnpackJpegErrorHandler(j_common_ptr cinfo);
+void UnpackJpegErrorHandler(j_common_ptr cinfo) __attribute__((noreturn));
 
 //
 // Colormap stuff.
diff --git a/nxcomp/src/Transport.h b/nxcomp/src/Transport.h
index 047396af6..4ae0e3c25 100644
--- a/nxcomp/src/Transport.h
+++ b/nxcomp/src/Transport.h
@@ -413,9 +413,9 @@ class AgentTransport : public Transport
   // These two should never be called.
   //
 
-  virtual int flush();
+  virtual int flush() __attribute__((noreturn));
 
-  virtual int drain(int limit, int timeout);
+  virtual int drain(int limit, int timeout) __attribute((noreturn));
 
   //
   // Same as in the base class.
-- 
cgit v1.2.3


From 4fd038dba6f9b4d87c0e14fa5ff59abbcd46e794 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Thu, 3 Aug 2017 10:22:55 -0400
Subject: nxcomp/configure.ac: Don't rely on pkg-config alone when it comes to
 testing for presence of libjpeg shared lib and header files.

 Especially systems still using the IJG libjpeg implementation
 are likely to lack the libjpeg.pc file.
 .
 So this adds some alternative way of detecting if all libjpeg related
 build-dependencies are in place.
---
 m4/nx-macros.m4     | 18 ++++++++++++++++++
 nxcomp/configure.ac |  8 ++++----
 2 files changed, 22 insertions(+), 4 deletions(-)

(limited to 'nxcomp')

diff --git a/m4/nx-macros.m4 b/m4/nx-macros.m4
index 816bf4003..06217f075 100644
--- a/m4/nx-macros.m4
+++ b/m4/nx-macros.m4
@@ -303,3 +303,21 @@ rm -f conftest*])
 FreeBSD=
 test "$nxconf_cv_freebsd" = yes && FreeBSD=yes
 ]) # NX_BUILD_ON_FreeBSD
+
+AC_DEFUN([LIBJPEG_FALLBACK_CHECK],[
+AC_MSG_CHECKING([for libjpeg shared libary file and headers])
+AC_CHECK_LIB([jpeg], [jpeg_destroy_compress],
+    [have_jpeg_lib=yes], [have_jpeg_lib=no])
+AC_CHECK_HEADERS([jpeglib.h],
+    [have_jpeg_headers=yes], [have_jpeg_headers=no])
+
+if test x"$have_jpeg_lib" = "xyes" && test x"$have_jpeg_headers" = "xyes"; then
+    AC_MSG_RESULT([yes])
+    JPEG_CFLAGS=""
+    JPEG_LIBS="-ljpeg"
+else
+    AC_MSG_RESULT([no])
+    AC_MSG_FAILURE([Could not find libjpeg on your system, make sure
+the JPEG shared library and header files are installed.])
+fi
+]) # LIBJPEG_FALLBACK_CHECK
diff --git a/nxcomp/configure.ac b/nxcomp/configure.ac
index 42407c6fd..4f2831c04 100644
--- a/nxcomp/configure.ac
+++ b/nxcomp/configure.ac
@@ -25,10 +25,6 @@ AC_SUBST([COMP_VERSION])
 LT_COMP_VERSION=[`echo $COMP_VERSION | sed -r -e 's/^([0-9]+\.[0-9]+\.[0-9]+).*$/\1/' -e 's/\./:/g'`] 
 AC_SUBST([LT_COMP_VERSION])
 
-PKG_CHECK_MODULES(JPEG, libjpeg)
-PKG_CHECK_MODULES(PNG, libpng)
-PKG_CHECK_MODULES(Z, zlib)
-
 # Upstream's pkg.m4 (since 0.27) offers this now, but define our own
 # compatible version in case the local version of pkgconfig isn't new enough.
 # https://bugs.freedesktop.org/show_bug.cgi?id=48743
@@ -39,6 +35,10 @@ m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR],
                        [],[with_pkgconfigdir='$(libdir)/pkgconfig'])
           AC_SUBST([pkgconfigdir], [${with_pkgconfigdir}])])
 
+PKG_CHECK_MODULES([JPEG], [libjpeg], [], [LIBJPEG_FALLBACK_CHECK])
+PKG_CHECK_MODULES([PNG], [libpng], [], [])
+PKG_CHECK_MODULES([Z], [zlib], [], [])
+
 AC_LANG([C++])
 NX_COMPILER_BRAND
 NX_COMPILER_FLAGS
-- 
cgit v1.2.3


From 8b88289eea2d9325465fd4517e08118d2affcb7d Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Wed, 9 Aug 2017 06:44:49 +0200
Subject: nxcomp/configure.ac: we don't need to specify empty optional
 parameters.

---
 nxcomp/configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/configure.ac b/nxcomp/configure.ac
index 4f2831c04..86f899255 100644
--- a/nxcomp/configure.ac
+++ b/nxcomp/configure.ac
@@ -36,8 +36,8 @@ m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR],
           AC_SUBST([pkgconfigdir], [${with_pkgconfigdir}])])
 
 PKG_CHECK_MODULES([JPEG], [libjpeg], [], [LIBJPEG_FALLBACK_CHECK])
-PKG_CHECK_MODULES([PNG], [libpng], [], [])
-PKG_CHECK_MODULES([Z], [zlib], [], [])
+PKG_CHECK_MODULES([PNG], [libpng])
+PKG_CHECK_MODULES([Z], [zlib])
 
 AC_LANG([C++])
 NX_COMPILER_BRAND
-- 
cgit v1.2.3


From 8235925a2c3599a8980ce789e0a79369118727fe Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Wed, 9 Aug 2017 06:46:30 +0200
Subject: nxcomp/configure.ac: fix copy-and-paste typo (nxcompshad.pc.)

---
 nxcomp/configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nxcomp')

diff --git a/nxcomp/configure.ac b/nxcomp/configure.ac
index 86f899255..19328677a 100644
--- a/nxcomp/configure.ac
+++ b/nxcomp/configure.ac
@@ -31,7 +31,7 @@ AC_SUBST([LT_COMP_VERSION])
 m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR],
          [AC_ARG_WITH([pkgconfigdir],
                       [AS_HELP_STRING([--with-pkgconfigdir],
-                      [install directory for nxcompshad.pc pkg-config file])],
+                      [install directory for nxcomp.pc pkg-config file])],
                        [],[with_pkgconfigdir='$(libdir)/pkgconfig'])
           AC_SUBST([pkgconfigdir], [${with_pkgconfigdir}])])
 
-- 
cgit v1.2.3


From 55c4e407043a627b9d7b96e2b7231612a9d9dab7 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 12 Jul 2017 12:53:10 +0200
Subject: nx*/configure.ac: Use newly introduced macro NX_DEFAULT_OPTIONS
 instead of NX_COMPILER_FLAGS.

---
 nxcomp/configure.ac     | 2 +-
 nxcompshad/configure.ac | 2 +-
 nxproxy/configure.ac    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/configure.ac b/nxcomp/configure.ac
index 19328677a..efe245162 100644
--- a/nxcomp/configure.ac
+++ b/nxcomp/configure.ac
@@ -41,7 +41,7 @@ PKG_CHECK_MODULES([Z], [zlib])
 
 AC_LANG([C++])
 NX_COMPILER_BRAND
-NX_COMPILER_FLAGS
+NX_DEFAULT_OPTIONS
 
 NX_BUILD_ON_CYGWIN32
 NX_BUILD_ON_AMD64
diff --git a/nxcompshad/configure.ac b/nxcompshad/configure.ac
index b3abf0efb..34b1c053c 100644
--- a/nxcompshad/configure.ac
+++ b/nxcompshad/configure.ac
@@ -42,7 +42,7 @@ m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR],
 
 AC_LANG([C++])
 NX_COMPILER_BRAND
-NX_COMPILER_FLAGS
+NX_DEFAULT_OPTIONS
 
 AC_CONFIG_FILES([
 Makefile
diff --git a/nxproxy/configure.ac b/nxproxy/configure.ac
index 0a23f13d7..9663fb4a8 100644
--- a/nxproxy/configure.ac
+++ b/nxproxy/configure.ac
@@ -21,7 +21,7 @@ AC_SUBST([PROXY_VERSION])
 
 AC_LANG([C])
 NX_COMPILER_BRAND
-NX_COMPILER_FLAGS
+NX_DEFAULT_OPTIONS
 
 AC_CONFIG_FILES([
 Makefile
-- 
cgit v1.2.3


From 96ba6190d6743b7ac4449938b287547124cce926 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Thu, 31 Aug 2017 18:17:31 +0200
Subject: nxcomp/src/{Loop,Proxy}.cpp: On Debian/kFreeBSD (and other *BSD
 variants) the sockaddr_un.sun_path property is 104 chars long, not 108.
 Hard-coding Unix domain sockets in nxcomp the string length 104.

 Fixes ArcticaProject/nx-libs#507.
---
 nxcomp/src/Loop.cpp  | 8 ++++++++
 nxcomp/src/Proxy.cpp | 8 ++++++++
 2 files changed, 16 insertions(+)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index b6c82a2b4..f86ee2a4f 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -3810,7 +3810,15 @@ int SetupAuthInstance()
 
         launchdAddrUnix.sun_family = AF_UNIX;
 
+        #ifdef __linux__
         const int launchdAddrNameLength = 108;
+        #else
+        /* POSIX/SUS does not specify a length.
+         * BSD derivatives generally support 104 bytes, other systems may be more constrained.
+         * If you happen to run into such systems, extend this section with the appropriate limit.
+         */
+        const int launchdAddrNameLength = 104;
+        #endif
 
         int success = -1;
 
diff --git a/nxcomp/src/Proxy.cpp b/nxcomp/src/Proxy.cpp
index 5529de021..dabf7532e 100644
--- a/nxcomp/src/Proxy.cpp
+++ b/nxcomp/src/Proxy.cpp
@@ -6294,7 +6294,15 @@ int Proxy::handleNewGenericConnectionFromProxyUnix(int channelId, T_channel_type
 
   serverAddrUnix.sun_family = AF_UNIX;
 
+  #ifdef __linux__
   const int serverAddrNameLength = 108;
+  #else
+  /* POSIX/SUS does not specify a length.
+   * BSD derivatives generally support 104 bytes, other systems may be more constrained.
+   * If you happen to run into such systems, extend this section with the appropriate limit.
+   */
+  const int serverAddrNameLength = 104;
+  #endif
 
   strncpy(serverAddrUnix.sun_path, path, serverAddrNameLength);
 
-- 
cgit v1.2.3


From 5f1eb0dc3eb89e84a3b146975e147b995fb7673f Mon Sep 17 00:00:00 2001
From: Vadim Troshchinskiy <vtroshchinskiy@qindel.com>
Date: Thu, 28 Sep 2017 16:42:41 +0200
Subject: Fix nxagent argument parsing logic

This makes it so that slave=1 works again as it should.

The changes introduced earlier resulted in the unintentional requirement
to specify the actual port number, breaking backwards compatibility.

Fixes: ArcticaProject/nx-libs#518
---
 nxcomp/src/ChannelEndPoint.cpp |   3 ++
 nxcomp/src/Loop.cpp            | 105 +++++++++++++++++++----------------------
 2 files changed, 51 insertions(+), 57 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/ChannelEndPoint.cpp b/nxcomp/src/ChannelEndPoint.cpp
index 921615bae..78902399c 100644
--- a/nxcomp/src/ChannelEndPoint.cpp
+++ b/nxcomp/src/ChannelEndPoint.cpp
@@ -150,6 +150,7 @@ ChannelEndPoint::getSpec(char **socketUri) const {
 void
 ChannelEndPoint::setDefaultTCPPort(long port) {
   defaultTCPPort_ = port;
+  isTCP_ = getTCPHostAndPort();
 }
 
 void
@@ -165,6 +166,8 @@ ChannelEndPoint::setDefaultUnixPath(char *path) {
     defaultUnixPath_ = strdup(path);
   else
     defaultUnixPath_ = NULL;
+
+  isUnix_ = getUnixPath();
 }
 
 void
diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index f86ee2a4f..f3670db81 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -11688,43 +11688,43 @@ int SetPorts()
   // ing, causing a loop.
   //
 
-  useCupsSocket = 0;
-  if (cupsPort.enabled()) {
-    if (control -> ProxyMode == proxy_client) {
-      cupsPort.setDefaultTCPPort(DEFAULT_NX_CUPS_PORT_OFFSET + proxyPort);
-      useCupsSocket = 1;
-    }
-    else
-      cupsPort.setDefaultTCPPort(631);
+  if (control -> ProxyMode == proxy_client) {
+    // ChannelEndPoint::enabled() implements the logic described above,
+    // and takes the default port into consideration. If cups=1, and
+    // there is a default port, then enabled() will return true.
+    //
+    // Therefore, we must set the default port before calling this
+    // function.
+    cupsPort.setDefaultTCPPort(DEFAULT_NX_CUPS_PORT_OFFSET + proxyPort);
+    useCupsSocket = cupsPort.enabled();
+  } else {
+    cupsPort.setDefaultTCPPort(631);
   }
 
+
+
 #ifdef TEST
   *logofs << "Loop: cups port: " << cupsPort << "\n"
             << logofs_flush;
 #endif
 
-  useAuxSocket = 0;
-  if (auxPort.enabled()) {
-    if (control -> ProxyMode == proxy_client) {
-      auxPort.setDefaultTCPPort(DEFAULT_NX_AUX_PORT_OFFSET + proxyPort);
-      useAuxSocket = 1;
-    }
-    else {
-      auxPort.setDefaultTCPPort(1);
-
-      if (auxPort.getTCPPort() != 1) {
+  if (control -> ProxyMode == proxy_client) {
+    auxPort.setDefaultTCPPort(DEFAULT_NX_AUX_PORT_OFFSET + proxyPort);
+    useAuxSocket = auxPort.enabled();
+  } else {
+    auxPort.setDefaultTCPPort(1);
 
-#ifdef WARNING
-        *logofs << "Loop: WARNING! Overriding auxiliary X11 "
-                << "port with new value '" << 1 << "'.\n"
-                << logofs_flush;
-#endif
+    if ( auxPort.getTCPPort() != 1 ) {
+      #ifdef WARNING
+      *logofs << "Loop: WARNING! Overriding auxiliary X11 "
+              << "port with new value '" << 1 << "'.\n"
+              << logofs_flush;
+      #endif
 
-        cerr << "Warning" << ": Overriding auxiliary X11 "
-             << "port with new value '" << 1 << "'.\n";
+      cerr << "Warning" << ": Overriding auxiliary X11 "
+           << "port with new value '" << 1 << "'.\n";
 
-	auxPort.setSpec("1");
-      }
+      auxPort.setSpec("1");
     }
   }
 
@@ -11733,14 +11733,11 @@ int SetPorts()
 	  << logofs_flush;
 #endif
 
-  useSmbSocket = 0;
-  if (smbPort.enabled()) {
-    if (control -> ProxyMode == proxy_client) {
-      auxPort.setDefaultTCPPort(DEFAULT_NX_SMB_PORT_OFFSET + proxyPort);
-      useAuxSocket = 1;
-    }
-    else
-      auxPort.setDefaultTCPPort(139);
+  if (control -> ProxyMode == proxy_client) {
+    smbPort.setDefaultTCPPort(DEFAULT_NX_SMB_PORT_OFFSET + proxyPort);
+    useSmbSocket = smbPort.enabled();
+  } else {
+    smbPort.setDefaultTCPPort(139);
   }
 
 
@@ -11749,17 +11746,16 @@ int SetPorts()
 	  << logofs_flush;
 #endif
 
-  useMediaSocket = 0;
-  if (mediaPort.enabled()) {
-    if (control -> ProxyMode == proxy_client) {
-      mediaPort.setDefaultTCPPort(DEFAULT_NX_MEDIA_PORT_OFFSET + proxyPort);
-      useMediaSocket = 1;
-    }
-    else if (mediaPort.getTCPPort() == 1) {
-#ifdef PANIC
+  if (control -> ProxyMode == proxy_client) {
+    mediaPort.setDefaultTCPPort(DEFAULT_NX_MEDIA_PORT_OFFSET + proxyPort);
+    useMediaSocket = mediaPort.enabled();
+  } else {
+
+    if ( !mediaPort.enabled() ) {
+      #ifdef PANIC
       *logofs << "Loop: PANIC! No port specified for multimedia connections.\n"
               << logofs_flush;
-#endif
+      #endif
 
       cerr << "Error" << ": No port specified for multimedia connections.\n";
 
@@ -11772,13 +11768,10 @@ int SetPorts()
 	  << "'.\n" << logofs_flush;
 #endif
 
-  useHttpSocket = 0;
-  if (httpPort.enabled()) {
-    if (control -> ProxyMode == proxy_client) {
+  if (control -> ProxyMode == proxy_client) {
       httpPort.setDefaultTCPPort(DEFAULT_NX_HTTP_PORT_OFFSET + proxyPort);
-      useHttpSocket = 1;
-    }
-    else
+      useHttpSocket = httpPort.enabled();
+  } else {
       httpPort.setDefaultTCPPort(80);
   }
 
@@ -11822,13 +11815,11 @@ int SetPorts()
     #endif
   }
 
-  useSlaveSocket = 0;
-  if (slavePort.enabled()) {
-    useSlaveSocket = 1;
-    if (control -> ProxyMode == proxy_client)
-      slavePort.setDefaultTCPPort(DEFAULT_NX_SLAVE_PORT_CLIENT_OFFSET + proxyPort);
-    else
-      slavePort.setDefaultTCPPort(DEFAULT_NX_SLAVE_PORT_SERVER_OFFSET + proxyPort);
+  if (control -> ProxyMode == proxy_client) {
+    slavePort.setDefaultTCPPort(DEFAULT_NX_SLAVE_PORT_CLIENT_OFFSET + proxyPort);
+    useSlaveSocket = slavePort.enabled();
+  } else {
+    slavePort.setDefaultTCPPort(DEFAULT_NX_SLAVE_PORT_SERVER_OFFSET + proxyPort);
   }
 
 #ifdef TEST
-- 
cgit v1.2.3


From b5c714690e9c13c85bdd9b2f4b21dd8f86164e4e Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Fri, 29 Sep 2017 17:58:28 +0200
Subject: nxcomp/configure.ac: prettify AC_ARG_ENABLE() calls, use more quotes
 and AS_IF() where appropriate.

---
 nxcomp/configure.ac | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/configure.ac b/nxcomp/configure.ac
index efe245162..40dced209 100644
--- a/nxcomp/configure.ac
+++ b/nxcomp/configure.ac
@@ -66,19 +66,19 @@ fi
 # If in_addr_t is not defined use unsigned int.
 AC_CHECK_TYPES([in_addr_t], [], [], [[#include <netinet/in.h>]])
 
-AC_ARG_ENABLE(info,
-              [AS_HELP_STRING([--enable-debug], [enable to get info session log output (disabled by default)])],
-              [if test x$enableval = xyes; then
-                 AC_DEFINE(INFO, 1, [Define this to get info session log output.])
-                 info_messages=yes
-               fi])
-
-AC_ARG_ENABLE(valgrind,
-              [AS_HELP_STRING([--enable-valgrind], [enable for extra valgrind hacks (disabled by default)])],
-              [if test x$enableval = xyes; then
-                 AC_DEFINE(VALGRIND, 1, [Define this for extra valgrind hacks.])
-                 valgrind_hacks=yes
-               fi])
+AC_ARG_ENABLE([info],
+              [AS_HELP_STRING([--enable-debug],
+                              [enable to get info session log output (disabled by default)])],
+              [AS_IF([test x$enableval = xyes],
+                     [AC_DEFINE(INFO, 1, [Define this to get info session log output.])
+                      info_messages=yes])])
+
+AC_ARG_ENABLE([valgrind],
+              [AS_HELP_STRING([--enable-valgrind],
+                              [enable for extra valgrind hacks (disabled by default)])],
+              [AS_IF([test x$enableval = xyes],
+                     [AC_DEFINE(VALGRIND, 1, [Define this for extra valgrind hacks.])
+                      valgrind_hacks=yes])])
 
 AC_CONFIG_FILES([
 Makefile
-- 
cgit v1.2.3


From 371c7127680d69ed2ad5376a53bbb77ca2ea49cd Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Fri, 29 Sep 2017 20:55:36 +0200
Subject: nxcomp/src/Loop.cpp: whitespace fixes only.

---
 nxcomp/src/Loop.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index f3670db81..9db757bba 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -1153,7 +1153,7 @@ int NXTransProxy(int fd, int mode, const char* options)
     *logofs << "NXTransProxy: Out of the long jump with pid '"
             << lastProxy << "'.\n" << logofs_flush;
     #endif
-    
+
     return -1;
   }
 
@@ -5124,7 +5124,7 @@ void CleanupChildren()
     #endif
 
     KillProcess(control -> KillDaemonOnShutdown[i], "daemon", SIGTERM, 0);
-  }    
+  }
 }
 
 void CleanupGlobal()
@@ -8315,7 +8315,7 @@ int ParseEnvironmentOptions(const char *env, int force)
             << "the environment options.\n"
             << logofs_flush;
     #endif
-    
+
     return -1;
   }
 
@@ -9209,7 +9209,7 @@ int ParseCommandLineOptions(int argc, const char **argv)
             << "the command line options.\n"
             << logofs_flush;
     #endif
-    
+
     return -1;
   }
 
@@ -10754,7 +10754,7 @@ char *GetRootPath()
 
       strcpy(rootDir, rootEnv);
     }
-        
+
     #ifdef TEST
     *logofs << "Loop: Assuming NX root directory '"
             << rootDir << "'.\n" << logofs_flush;
@@ -14587,7 +14587,7 @@ static void handleCheckSessionInLoop()
     *logofs << "Loop: Shutting down the NX transport.\n"
             << logofs_flush;
     #endif
- 
+
     HandleCleanup();
   }
   else if (proxy -> handlePing() < 0)
-- 
cgit v1.2.3


From 27c14b4eb3e42e1da2a3954393507b1ea4614462 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 9 Oct 2017 12:52:01 +0200
Subject: .gitignore: Improve all .gitignore files, adapt to autotools
 build-flow and its build cruft.

---
 .gitignore                |  7 +++++++
 nx-X11/lib/.gitignore     | 11 +++++++++++
 nx-X11/lib/src/.gitignore |  4 +++-
 nxcomp/.gitignore         |  2 --
 nxcompshad/.gitignore     |  2 --
 nxproxy/.gitignore        |  3 +--
 6 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100644 nx-X11/lib/.gitignore

(limited to 'nxcomp')

diff --git a/.gitignore b/.gitignore
index 3012b55cf..e86e4b5f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 *.o
+*.lo
+*.la
 *.so.*
 *.so
 *.a
@@ -10,3 +12,8 @@ configure
 depend.status
 *~
 [#]*
+stamp-h*
+.libs
+.deps
+bin/nxagent
+bin/nxproxy
diff --git a/nx-X11/lib/.gitignore b/nx-X11/lib/.gitignore
new file mode 100644
index 000000000..dec1c61a6
--- /dev/null
+++ b/nx-X11/lib/.gitignore
@@ -0,0 +1,11 @@
+aclocal.m4
+config.log
+config.status
+configure
+libtool
+Makefile
+Makefile.in
+nx-x11.pc
+m4/libtool.m4
+m4/lt*.m4
+build-aux/
diff --git a/nx-X11/lib/src/.gitignore b/nx-X11/lib/src/.gitignore
index 8215e21de..f78453e57 100644
--- a/nx-X11/lib/src/.gitignore
+++ b/nx-X11/lib/src/.gitignore
@@ -1 +1,3 @@
-ks_tables.h
\ No newline at end of file
+ks_tables.h
+config.h*
+util/makekeys
diff --git a/nxcomp/.gitignore b/nxcomp/.gitignore
index a148dfa93..019202342 100644
--- a/nxcomp/.gitignore
+++ b/nxcomp/.gitignore
@@ -17,7 +17,5 @@ m4/ltsugar.m4
 m4/ltversion.m4
 m4/lt~obsolete.m4
 nxcomp.pc
-src/.deps/
 src/Makefile
 src/Makefile.in
-stamp-h1
diff --git a/nxcompshad/.gitignore b/nxcompshad/.gitignore
index 1eefcb7bf..5eafb1add 100644
--- a/nxcompshad/.gitignore
+++ b/nxcompshad/.gitignore
@@ -17,7 +17,5 @@ m4/ltsugar.m4
 m4/ltversion.m4
 m4/lt~obsolete.m4
 nxcompshad.pc
-src/.deps/
 src/Makefile
 src/Makefile.in
-stamp-h1
diff --git a/nxproxy/.gitignore b/nxproxy/.gitignore
index 6b771262b..35c4c4dfd 100644
--- a/nxproxy/.gitignore
+++ b/nxproxy/.gitignore
@@ -16,7 +16,6 @@ m4/ltoptions.m4
 m4/ltsugar.m4
 m4/ltversion.m4
 m4/lt~obsolete.m4
-src/.deps/
 src/Makefile
 src/Makefile.in
-stamp-h1
+src/nxproxy
-- 
cgit v1.2.3


From 418db3b5ce28bcc5b1d00d7444041ea2d6592706 Mon Sep 17 00:00:00 2001
From: Simon Matter <simon.matter@invoca.ch>
Date: Mon, 9 Oct 2017 11:30:02 +0200
Subject: nxcomp/src/Loop.cpp: Reduce control->TokenSize slightly again in
 order to fix fragmentation of packages when on VPN (or otherwise
 encapsulated) connections.

---
 nxcomp/src/Loop.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index 9db757bba..f76c22dea 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -12937,7 +12937,7 @@ int SetLinkAdsl()
 
   control -> LinkMode = LINK_TYPE_ADSL;
 
-  control -> TokenSize  = 1536;
+  control -> TokenSize  = 1408;
   control -> TokenLimit = 24;
 
   control -> SplitMode             = 1;
@@ -12967,7 +12967,7 @@ int SetLinkWan()
 
   control -> LinkMode = LINK_TYPE_WAN;
 
-  control -> TokenSize  = 1536;
+  control -> TokenSize  = 1408;
   control -> TokenLimit = 24;
 
   control -> SplitMode             = 1;
-- 
cgit v1.2.3


From f2c73bd845c2f07c4194f438ef4ce8bbe249bf40 Mon Sep 17 00:00:00 2001
From: Vadim Troshchinskiy <vtroshchinskiy@qindel.com>
Date: Tue, 10 Oct 2017 13:04:08 +0200
Subject: Fix bug #525: PANIC! No port specified for multimedia connections

Commit 5f1eb0dc3eb89e84a3b146975e147b995fb7673f introduced a regression
that made the use of the multimedia port mandatory.

Fixes ArcticaProject/nx-libs#525
---
 nxcomp/src/ChannelEndPoint.cpp |  5 +++++
 nxcomp/src/ChannelEndPoint.h   |  1 +
 nxcomp/src/Loop.cpp            | 24 +++++++++++++-----------
 3 files changed, 19 insertions(+), 11 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/ChannelEndPoint.cpp b/nxcomp/src/ChannelEndPoint.cpp
index 78902399c..4fdf0fad4 100644
--- a/nxcomp/src/ChannelEndPoint.cpp
+++ b/nxcomp/src/ChannelEndPoint.cpp
@@ -311,6 +311,11 @@ ChannelEndPoint::enabled() const {
   return (isUnixSocket() || isTCPSocket());
 }
 
+bool
+ChannelEndPoint::configured() const {
+  return ( spec_ && ( strcmp(spec_, "0") != 0) );
+}
+
 bool
 ChannelEndPoint::validateSpec() {
   isTCP_ = getTCPHostAndPort();
diff --git a/nxcomp/src/ChannelEndPoint.h b/nxcomp/src/ChannelEndPoint.h
index 4c0c728f3..652492485 100644
--- a/nxcomp/src/ChannelEndPoint.h
+++ b/nxcomp/src/ChannelEndPoint.h
@@ -46,6 +46,7 @@ class ChannelEndPoint
   ~ChannelEndPoint();
   ChannelEndPoint &operator=(const ChannelEndPoint &other);
 
+  bool configured() const;
   bool enabled() const;
   bool disabled() { return !enabled(); }
   void disable();
diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index f76c22dea..4292e7b9a 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -11746,20 +11746,22 @@ int SetPorts()
 	  << logofs_flush;
 #endif
 
-  if (control -> ProxyMode == proxy_client) {
-    mediaPort.setDefaultTCPPort(DEFAULT_NX_MEDIA_PORT_OFFSET + proxyPort);
-    useMediaSocket = mediaPort.enabled();
-  } else {
+  if ( mediaPort.configured() ) {
+    if (control -> ProxyMode == proxy_client) {
+      mediaPort.setDefaultTCPPort(DEFAULT_NX_MEDIA_PORT_OFFSET + proxyPort);
+      useMediaSocket = mediaPort.enabled();
+    } else {
 
-    if ( !mediaPort.enabled() ) {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! No port specified for multimedia connections.\n"
-              << logofs_flush;
-      #endif
+      if ( mediaPort.getTCPPort() < 0 ) {
+        #ifdef PANIC
+        *logofs << "Loop: PANIC! No port specified for multimedia connections.\n"
+                << logofs_flush;
+        #endif
 
-      cerr << "Error" << ": No port specified for multimedia connections.\n";
+        cerr << "Error" << ": No port specified for multimedia connections.\n";
 
-      HandleCleanup();
+        HandleCleanup();
+      }
     }
   }
 
-- 
cgit v1.2.3


From 39ee56f5dbe968cddebf6e7891667a2cf8b5af76 Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Fri, 27 Oct 2017 08:42:17 +0200
Subject: nxcomp/configure.ac: rename --{en,dis}able-info to
 --{en,dis}able-debug, as originally planned.

---
 nxcomp/configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nxcomp')

diff --git a/nxcomp/configure.ac b/nxcomp/configure.ac
index 40dced209..0b30915c2 100644
--- a/nxcomp/configure.ac
+++ b/nxcomp/configure.ac
@@ -66,7 +66,7 @@ fi
 # If in_addr_t is not defined use unsigned int.
 AC_CHECK_TYPES([in_addr_t], [], [], [[#include <netinet/in.h>]])
 
-AC_ARG_ENABLE([info],
+AC_ARG_ENABLE([debug],
               [AS_HELP_STRING([--enable-debug],
                               [enable to get info session log output (disabled by default)])],
               [AS_IF([test x$enableval = xyes],
-- 
cgit v1.2.3


From 1f717c6fdfa478f1c422bff51bc8574360dbe127 Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Fri, 29 Sep 2017 17:19:06 +0200
Subject: nx{comp{,shad},proxy}: add configure flag --enable-cxx11 to enable
 and setup optional C++11 support.

Use AX_CXX_COMPILE_STDCXX(_11) from autotools archive.

Note: should only be used in tandem. Make sure that each component
either uses the C++11 ABI or none uses it. Mixing and matching libraries
and binaries with different C++ ABIs might lead to weird errors.
---
 m4/ax_cxx_compile_stdcxx.m4               | 982 ++++++++++++++++++++++++++++++
 m4/ax_cxx_compile_stdcxx_11.m4            |  39 ++
 nxcomp/configure.ac                       |   6 +
 nxcomp/m4/ax_cxx_compile_stdcxx.m4        |   1 +
 nxcomp/m4/ax_cxx_compile_stdcxx_11.m4     |   1 +
 nxcompshad/configure.ac                   |   6 +
 nxcompshad/m4/ax_cxx_compile_stdcxx.m4    |   1 +
 nxcompshad/m4/ax_cxx_compile_stdcxx_11.m4 |   1 +
 nxproxy/configure.ac                      |   6 +
 nxproxy/m4/ax_cxx_compile_stdcxx.m4       |   1 +
 nxproxy/m4/ax_cxx_compile_stdcxx_11.m4    |   1 +
 11 files changed, 1045 insertions(+)
 create mode 100644 m4/ax_cxx_compile_stdcxx.m4
 create mode 100644 m4/ax_cxx_compile_stdcxx_11.m4
 create mode 120000 nxcomp/m4/ax_cxx_compile_stdcxx.m4
 create mode 120000 nxcomp/m4/ax_cxx_compile_stdcxx_11.m4
 create mode 120000 nxcompshad/m4/ax_cxx_compile_stdcxx.m4
 create mode 120000 nxcompshad/m4/ax_cxx_compile_stdcxx_11.m4
 create mode 120000 nxproxy/m4/ax_cxx_compile_stdcxx.m4
 create mode 120000 nxproxy/m4/ax_cxx_compile_stdcxx_11.m4

(limited to 'nxcomp')

diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4
new file mode 100644
index 000000000..5032bba80
--- /dev/null
+++ b/m4/ax_cxx_compile_stdcxx.m4
@@ -0,0 +1,982 @@
+# ===========================================================================
+#  https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional])
+#
+# DESCRIPTION
+#
+#   Check for baseline language coverage in the compiler for the specified
+#   version of the C++ standard.  If necessary, add switches to CXX and
+#   CXXCPP to enable support.  VERSION may be '11' (for the C++11 standard)
+#   or '14' (for the C++14 standard).
+#
+#   The second argument, if specified, indicates whether you insist on an
+#   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
+#   -std=c++11).  If neither is specified, you get whatever works, with
+#   preference for an extended mode.
+#
+#   The third argument, if specified 'mandatory' or if left unspecified,
+#   indicates that baseline support for the specified C++ standard is
+#   required and that the macro should error out if no mode with that
+#   support is found.  If specified 'optional', then configuration proceeds
+#   regardless, after defining HAVE_CXX${VERSION} if and only if a
+#   supporting mode is found.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
+#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
+#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
+#   Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com>
+#   Copyright (c) 2015 Paul Norman <penorman@mac.com>
+#   Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
+#   Copyright (c) 2016 Krzesimir Nowak <qdlacz@gmail.com>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved.  This file is offered as-is, without any
+#   warranty.
+
+#serial 7
+
+dnl  This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
+dnl  (serial version number 13).
+
+AX_REQUIRE_DEFINED([AC_MSG_WARN])
+AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
+  m4_if([$1], [11], [ax_cxx_compile_alternatives="11 0x"],
+        [$1], [14], [ax_cxx_compile_alternatives="14 1y"],
+        [$1], [17], [ax_cxx_compile_alternatives="17 1z"],
+        [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl
+  m4_if([$2], [], [],
+        [$2], [ext], [],
+        [$2], [noext], [],
+        [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX])])dnl
+  m4_if([$3], [], [ax_cxx_compile_cxx$1_required=true],
+        [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true],
+        [$3], [optional], [ax_cxx_compile_cxx$1_required=false],
+        [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])])
+  AC_LANG_PUSH([C++])dnl
+  ac_success=no
+  AC_CACHE_CHECK(whether $CXX supports C++$1 features by default,
+  ax_cv_cxx_compile_cxx$1,
+  [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
+    [ax_cv_cxx_compile_cxx$1=yes],
+    [ax_cv_cxx_compile_cxx$1=no])])
+  if test x$ax_cv_cxx_compile_cxx$1 = xyes; then
+    ac_success=yes
+  fi
+
+  m4_if([$2], [noext], [], [dnl
+  if test x$ac_success = xno; then
+    for alternative in ${ax_cxx_compile_alternatives}; do
+      switch="-std=gnu++${alternative}"
+      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
+      AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
+                     $cachevar,
+        [ac_save_CXX="$CXX"
+         CXX="$CXX $switch"
+         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
+          [eval $cachevar=yes],
+          [eval $cachevar=no])
+         CXX="$ac_save_CXX"])
+      if eval test x\$$cachevar = xyes; then
+        CXX="$CXX $switch"
+        if test -n "$CXXCPP" ; then
+          CXXCPP="$CXXCPP $switch"
+        fi
+        ac_success=yes
+        break
+      fi
+    done
+  fi])
+
+  m4_if([$2], [ext], [], [dnl
+  if test x$ac_success = xno; then
+    dnl HP's aCC needs +std=c++11 according to:
+    dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf
+    dnl Cray's crayCC needs "-h std=c++11"
+    for alternative in ${ax_cxx_compile_alternatives}; do
+      for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do
+        cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
+        AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
+                       $cachevar,
+          [ac_save_CXX="$CXX"
+           CXX="$CXX $switch"
+           AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
+            [eval $cachevar=yes],
+            [eval $cachevar=no])
+           CXX="$ac_save_CXX"])
+        if eval test x\$$cachevar = xyes; then
+          CXX="$CXX $switch"
+          if test -n "$CXXCPP" ; then
+            CXXCPP="$CXXCPP $switch"
+          fi
+          ac_success=yes
+          break
+        fi
+      done
+      if test x$ac_success = xyes; then
+        break
+      fi
+    done
+  fi])
+  AC_LANG_POP([C++])
+  if test x$ax_cxx_compile_cxx$1_required = xtrue; then
+    if test x$ac_success = xno; then
+      AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.])
+    fi
+  fi
+  if test x$ac_success = xno; then
+    HAVE_CXX$1=0
+    AC_MSG_NOTICE([No compiler with C++$1 support was found])
+  else
+    HAVE_CXX$1=1
+    AC_DEFINE(HAVE_CXX$1,1,
+              [define if the compiler supports basic C++$1 syntax])
+  fi
+  AC_SUBST(HAVE_CXX$1)
+  m4_if([$1], [17], [AC_MSG_WARN([C++17 is not yet standardized, so the checks may change in incompatible ways anytime])])
+])
+
+
+dnl  Test body for checking C++11 support
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11],
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
+)
+
+
+dnl  Test body for checking C++14 support
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14],
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
+)
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_17],
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_17
+)
+
+dnl  Tests for new features in C++11
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[
+
+// If the compiler admits that it is not ready for C++11, why torture it?
+// Hopefully, this will speed up the test.
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif __cplusplus < 201103L
+
+#error "This is not a C++11 compiler"
+
+#else
+
+namespace cxx11
+{
+
+  namespace test_static_assert
+  {
+
+    template <typename T>
+    struct check
+    {
+      static_assert(sizeof(int) <= sizeof(T), "not big enough");
+    };
+
+  }
+
+  namespace test_final_override
+  {
+
+    struct Base
+    {
+      virtual void f() {}
+    };
+
+    struct Derived : public Base
+    {
+      virtual void f() override {}
+    };
+
+  }
+
+  namespace test_double_right_angle_brackets
+  {
+
+    template < typename T >
+    struct check {};
+
+    typedef check<void> single_type;
+    typedef check<check<void>> double_type;
+    typedef check<check<check<void>>> triple_type;
+    typedef check<check<check<check<void>>>> quadruple_type;
+
+  }
+
+  namespace test_decltype
+  {
+
+    int
+    f()
+    {
+      int a = 1;
+      decltype(a) b = 2;
+      return a + b;
+    }
+
+  }
+
+  namespace test_type_deduction
+  {
+
+    template < typename T1, typename T2 >
+    struct is_same
+    {
+      static const bool value = false;
+    };
+
+    template < typename T >
+    struct is_same<T, T>
+    {
+      static const bool value = true;
+    };
+
+    template < typename T1, typename T2 >
+    auto
+    add(T1 a1, T2 a2) -> decltype(a1 + a2)
+    {
+      return a1 + a2;
+    }
+
+    int
+    test(const int c, volatile int v)
+    {
+      static_assert(is_same<int, decltype(0)>::value == true, "");
+      static_assert(is_same<int, decltype(c)>::value == false, "");
+      static_assert(is_same<int, decltype(v)>::value == false, "");
+      auto ac = c;
+      auto av = v;
+      auto sumi = ac + av + 'x';
+      auto sumf = ac + av + 1.0;
+      static_assert(is_same<int, decltype(ac)>::value == true, "");
+      static_assert(is_same<int, decltype(av)>::value == true, "");
+      static_assert(is_same<int, decltype(sumi)>::value == true, "");
+      static_assert(is_same<int, decltype(sumf)>::value == false, "");
+      static_assert(is_same<int, decltype(add(c, v))>::value == true, "");
+      return (sumf > 0.0) ? sumi : add(c, v);
+    }
+
+  }
+
+  namespace test_noexcept
+  {
+
+    int f() { return 0; }
+    int g() noexcept { return 0; }
+
+    static_assert(noexcept(f()) == false, "");
+    static_assert(noexcept(g()) == true, "");
+
+  }
+
+  namespace test_constexpr
+  {
+
+    template < typename CharT >
+    unsigned long constexpr
+    strlen_c_r(const CharT *const s, const unsigned long acc) noexcept
+    {
+      return *s ? strlen_c_r(s + 1, acc + 1) : acc;
+    }
+
+    template < typename CharT >
+    unsigned long constexpr
+    strlen_c(const CharT *const s) noexcept
+    {
+      return strlen_c_r(s, 0UL);
+    }
+
+    static_assert(strlen_c("") == 0UL, "");
+    static_assert(strlen_c("1") == 1UL, "");
+    static_assert(strlen_c("example") == 7UL, "");
+    static_assert(strlen_c("another\0example") == 7UL, "");
+
+  }
+
+  namespace test_rvalue_references
+  {
+
+    template < int N >
+    struct answer
+    {
+      static constexpr int value = N;
+    };
+
+    answer<1> f(int&)       { return answer<1>(); }
+    answer<2> f(const int&) { return answer<2>(); }
+    answer<3> f(int&&)      { return answer<3>(); }
+
+    void
+    test()
+    {
+      int i = 0;
+      const int c = 0;
+      static_assert(decltype(f(i))::value == 1, "");
+      static_assert(decltype(f(c))::value == 2, "");
+      static_assert(decltype(f(0))::value == 3, "");
+    }
+
+  }
+
+  namespace test_uniform_initialization
+  {
+
+    struct test
+    {
+      static const int zero {};
+      static const int one {1};
+    };
+
+    static_assert(test::zero == 0, "");
+    static_assert(test::one == 1, "");
+
+  }
+
+  namespace test_lambdas
+  {
+
+    void
+    test1()
+    {
+      auto lambda1 = [](){};
+      auto lambda2 = lambda1;
+      lambda1();
+      lambda2();
+    }
+
+    int
+    test2()
+    {
+      auto a = [](int i, int j){ return i + j; }(1, 2);
+      auto b = []() -> int { return '0'; }();
+      auto c = [=](){ return a + b; }();
+      auto d = [&](){ return c; }();
+      auto e = [a, &b](int x) mutable {
+        const auto identity = [](int y){ return y; };
+        for (auto i = 0; i < a; ++i)
+          a += b--;
+        return x + identity(a + b);
+      }(0);
+      return a + b + c + d + e;
+    }
+
+    int
+    test3()
+    {
+      const auto nullary = [](){ return 0; };
+      const auto unary = [](int x){ return x; };
+      using nullary_t = decltype(nullary);
+      using unary_t = decltype(unary);
+      const auto higher1st = [](nullary_t f){ return f(); };
+      const auto higher2nd = [unary](nullary_t f1){
+        return [unary, f1](unary_t f2){ return f2(unary(f1())); };
+      };
+      return higher1st(nullary) + higher2nd(nullary)(unary);
+    }
+
+  }
+
+  namespace test_variadic_templates
+  {
+
+    template <int...>
+    struct sum;
+
+    template <int N0, int... N1toN>
+    struct sum<N0, N1toN...>
+    {
+      static constexpr auto value = N0 + sum<N1toN...>::value;
+    };
+
+    template <>
+    struct sum<>
+    {
+      static constexpr auto value = 0;
+    };
+
+    static_assert(sum<>::value == 0, "");
+    static_assert(sum<1>::value == 1, "");
+    static_assert(sum<23>::value == 23, "");
+    static_assert(sum<1, 2>::value == 3, "");
+    static_assert(sum<5, 5, 11>::value == 21, "");
+    static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, "");
+
+  }
+
+  // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae
+  // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function
+  // because of this.
+  namespace test_template_alias_sfinae
+  {
+
+    struct foo {};
+
+    template<typename T>
+    using member = typename T::member_type;
+
+    template<typename T>
+    void func(...) {}
+
+    template<typename T>
+    void func(member<T>*) {}
+
+    void test();
+
+    void test() { func<foo>(0); }
+
+  }
+
+}  // namespace cxx11
+
+#endif  // __cplusplus >= 201103L
+
+]])
+
+
+dnl  Tests for new features in C++14
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[
+
+// If the compiler admits that it is not ready for C++14, why torture it?
+// Hopefully, this will speed up the test.
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif __cplusplus < 201402L
+
+#error "This is not a C++14 compiler"
+
+#else
+
+namespace cxx14
+{
+
+  namespace test_polymorphic_lambdas
+  {
+
+    int
+    test()
+    {
+      const auto lambda = [](auto&&... args){
+        const auto istiny = [](auto x){
+          return (sizeof(x) == 1UL) ? 1 : 0;
+        };
+        const int aretiny[] = { istiny(args)... };
+        return aretiny[0];
+      };
+      return lambda(1, 1L, 1.0f, '1');
+    }
+
+  }
+
+  namespace test_binary_literals
+  {
+
+    constexpr auto ivii = 0b0000000000101010;
+    static_assert(ivii == 42, "wrong value");
+
+  }
+
+  namespace test_generalized_constexpr
+  {
+
+    template < typename CharT >
+    constexpr unsigned long
+    strlen_c(const CharT *const s) noexcept
+    {
+      auto length = 0UL;
+      for (auto p = s; *p; ++p)
+        ++length;
+      return length;
+    }
+
+    static_assert(strlen_c("") == 0UL, "");
+    static_assert(strlen_c("x") == 1UL, "");
+    static_assert(strlen_c("test") == 4UL, "");
+    static_assert(strlen_c("another\0test") == 7UL, "");
+
+  }
+
+  namespace test_lambda_init_capture
+  {
+
+    int
+    test()
+    {
+      auto x = 0;
+      const auto lambda1 = [a = x](int b){ return a + b; };
+      const auto lambda2 = [a = lambda1(x)](){ return a; };
+      return lambda2();
+    }
+
+  }
+
+  namespace test_digit_separators
+  {
+
+    constexpr auto ten_million = 100'000'000;
+    static_assert(ten_million == 100000000, "");
+
+  }
+
+  namespace test_return_type_deduction
+  {
+
+    auto f(int& x) { return x; }
+    decltype(auto) g(int& x) { return x; }
+
+    template < typename T1, typename T2 >
+    struct is_same
+    {
+      static constexpr auto value = false;
+    };
+
+    template < typename T >
+    struct is_same<T, T>
+    {
+      static constexpr auto value = true;
+    };
+
+    int
+    test()
+    {
+      auto x = 0;
+      static_assert(is_same<int, decltype(f(x))>::value, "");
+      static_assert(is_same<int&, decltype(g(x))>::value, "");
+      return x;
+    }
+
+  }
+
+}  // namespace cxx14
+
+#endif  // __cplusplus >= 201402L
+
+]])
+
+
+dnl  Tests for new features in C++17
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_17], [[
+
+// If the compiler admits that it is not ready for C++17, why torture it?
+// Hopefully, this will speed up the test.
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif __cplusplus <= 201402L
+
+#error "This is not a C++17 compiler"
+
+#else
+
+#if defined(__clang__)
+  #define REALLY_CLANG
+#else
+  #if defined(__GNUC__)
+    #define REALLY_GCC
+  #endif
+#endif
+
+#include <initializer_list>
+#include <utility>
+#include <type_traits>
+
+namespace cxx17
+{
+
+#if !defined(REALLY_CLANG)
+  namespace test_constexpr_lambdas
+  {
+
+    // TODO: test it with clang++ from git
+
+    constexpr int foo = [](){return 42;}();
+
+  }
+#endif // !defined(REALLY_CLANG)
+
+  namespace test::nested_namespace::definitions
+  {
+
+  }
+
+  namespace test_fold_expression
+  {
+
+    template<typename... Args>
+    int multiply(Args... args)
+    {
+      return (args * ... * 1);
+    }
+
+    template<typename... Args>
+    bool all(Args... args)
+    {
+      return (args && ...);
+    }
+
+  }
+
+  namespace test_extended_static_assert
+  {
+
+    static_assert (true);
+
+  }
+
+  namespace test_auto_brace_init_list
+  {
+
+    auto foo = {5};
+    auto bar {5};
+
+    static_assert(std::is_same<std::initializer_list<int>, decltype(foo)>::value);
+    static_assert(std::is_same<int, decltype(bar)>::value);
+  }
+
+  namespace test_typename_in_template_template_parameter
+  {
+
+    template<template<typename> typename X> struct D;
+
+  }
+
+  namespace test_fallthrough_nodiscard_maybe_unused_attributes
+  {
+
+    int f1()
+    {
+      return 42;
+    }
+
+    [[nodiscard]] int f2()
+    {
+      [[maybe_unused]] auto unused = f1();
+
+      switch (f1())
+      {
+      case 17:
+        f1();
+        [[fallthrough]];
+      case 42:
+        f1();
+      }
+      return f1();
+    }
+
+  }
+
+  namespace test_extended_aggregate_initialization
+  {
+
+    struct base1
+    {
+      int b1, b2 = 42;
+    };
+
+    struct base2
+    {
+      base2() {
+        b3 = 42;
+      }
+      int b3;
+    };
+
+    struct derived : base1, base2
+    {
+        int d;
+    };
+
+    derived d1 {{1, 2}, {}, 4};  // full initialization
+    derived d2 {{}, {}, 4};      // value-initialized bases
+
+  }
+
+  namespace test_general_range_based_for_loop
+  {
+
+    struct iter
+    {
+      int i;
+
+      int& operator* ()
+      {
+        return i;
+      }
+
+      const int& operator* () const
+      {
+        return i;
+      }
+
+      iter& operator++()
+      {
+        ++i;
+        return *this;
+      }
+    };
+
+    struct sentinel
+    {
+      int i;
+    };
+
+    bool operator== (const iter& i, const sentinel& s)
+    {
+      return i.i == s.i;
+    }
+
+    bool operator!= (const iter& i, const sentinel& s)
+    {
+      return !(i == s);
+    }
+
+    struct range
+    {
+      iter begin() const
+      {
+        return {0};
+      }
+
+      sentinel end() const
+      {
+        return {5};
+      }
+    };
+
+    void f()
+    {
+      range r {};
+
+      for (auto i : r)
+      {
+        [[maybe_unused]] auto v = i;
+      }
+    }
+
+  }
+
+  namespace test_lambda_capture_asterisk_this_by_value
+  {
+
+    struct t
+    {
+      int i;
+      int foo()
+      {
+        return [*this]()
+        {
+          return i;
+        }();
+      }
+    };
+
+  }
+
+  namespace test_enum_class_construction
+  {
+
+    enum class byte : unsigned char
+    {};
+
+    byte foo {42};
+
+  }
+
+  namespace test_constexpr_if
+  {
+
+    template <bool cond>
+    int f ()
+    {
+      if constexpr(cond)
+      {
+        return 13;
+      }
+      else
+      {
+        return 42;
+      }
+    }
+
+  }
+
+  namespace test_selection_statement_with_initializer
+  {
+
+    int f()
+    {
+      return 13;
+    }
+
+    int f2()
+    {
+      if (auto i = f(); i > 0)
+      {
+        return 3;
+      }
+
+      switch (auto i = f(); i + 4)
+      {
+      case 17:
+        return 2;
+
+      default:
+        return 1;
+      }
+    }
+
+  }
+
+#if !defined(REALLY_CLANG)
+  namespace test_template_argument_deduction_for_class_templates
+  {
+
+    // TODO: test it with clang++ from git
+
+    template <typename T1, typename T2>
+    struct pair
+    {
+      pair (T1 p1, T2 p2)
+        : m1 {p1},
+          m2 {p2}
+      {}
+
+      T1 m1;
+      T2 m2;
+    };
+
+    void f()
+    {
+      [[maybe_unused]] auto p = pair{13, 42u};
+    }
+
+  }
+#endif // !defined(REALLY_CLANG)
+
+  namespace test_non_type_auto_template_parameters
+  {
+
+    template <auto n>
+    struct B
+    {};
+
+    B<5> b1;
+    B<'a'> b2;
+
+  }
+
+#if !defined(REALLY_CLANG)
+  namespace test_structured_bindings
+  {
+
+    // TODO: test it with clang++ from git
+
+    int arr[2] = { 1, 2 };
+    std::pair<int, int> pr = { 1, 2 };
+
+    auto f1() -> int(&)[2]
+    {
+      return arr;
+    }
+
+    auto f2() -> std::pair<int, int>&
+    {
+      return pr;
+    }
+
+    struct S
+    {
+      int x1 : 2;
+      volatile double y1;
+    };
+
+    S f3()
+    {
+      return {};
+    }
+
+    auto [ x1, y1 ] = f1();
+    auto& [ xr1, yr1 ] = f1();
+    auto [ x2, y2 ] = f2();
+    auto& [ xr2, yr2 ] = f2();
+    const auto [ x3, y3 ] = f3();
+
+  }
+#endif // !defined(REALLY_CLANG)
+
+#if !defined(REALLY_CLANG)
+  namespace test_exception_spec_type_system
+  {
+
+    // TODO: test it with clang++ from git
+
+    struct Good {};
+    struct Bad {};
+
+    void g1() noexcept;
+    void g2();
+
+    template<typename T>
+    Bad
+    f(T*, T*);
+
+    template<typename T1, typename T2>
+    Good
+    f(T1*, T2*);
+
+    static_assert (std::is_same_v<Good, decltype(f(g1, g2))>);
+
+  }
+#endif // !defined(REALLY_CLANG)
+
+  namespace test_inline_variables
+  {
+
+    template<class T> void f(T)
+    {}
+
+    template<class T> inline T g(T)
+    {
+      return T{};
+    }
+
+    template<> inline void f<>(int)
+    {}
+
+    template<> int g<>(int)
+    {
+      return 5;
+    }
+
+  }
+
+}  // namespace cxx17
+
+#endif  // __cplusplus <= 201402L
+
+]])
diff --git a/m4/ax_cxx_compile_stdcxx_11.m4 b/m4/ax_cxx_compile_stdcxx_11.m4
new file mode 100644
index 000000000..1733fd85f
--- /dev/null
+++ b/m4/ax_cxx_compile_stdcxx_11.m4
@@ -0,0 +1,39 @@
+# =============================================================================
+#  https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html
+# =============================================================================
+#
+# SYNOPSIS
+#
+#   AX_CXX_COMPILE_STDCXX_11([ext|noext], [mandatory|optional])
+#
+# DESCRIPTION
+#
+#   Check for baseline language coverage in the compiler for the C++11
+#   standard; if necessary, add switches to CXX and CXXCPP to enable
+#   support.
+#
+#   This macro is a convenience alias for calling the AX_CXX_COMPILE_STDCXX
+#   macro with the version set to C++11.  The two optional arguments are
+#   forwarded literally as the second and third argument respectively.
+#   Please see the documentation for the AX_CXX_COMPILE_STDCXX macro for
+#   more information.  If you want to use this macro, you also need to
+#   download the ax_cxx_compile_stdcxx.m4 file.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
+#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
+#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
+#   Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com>
+#   Copyright (c) 2015 Paul Norman <penorman@mac.com>
+#   Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 18
+
+AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX])
+AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [AX_CXX_COMPILE_STDCXX([11], [$1], [$2])])
diff --git a/nxcomp/configure.ac b/nxcomp/configure.ac
index 0b30915c2..89081cbb6 100644
--- a/nxcomp/configure.ac
+++ b/nxcomp/configure.ac
@@ -66,6 +66,12 @@ fi
 # If in_addr_t is not defined use unsigned int.
 AC_CHECK_TYPES([in_addr_t], [], [], [[#include <netinet/in.h>]])
 
+AC_ARG_ENABLE([cxx11],
+              [AS_HELP_STRING([--enable-cxx11],
+                              [enable optional features requiring C++11 support (disabled by default)])],
+              [AS_IF([test x$enableval = xyes],
+                    [AX_CXX_COMPILE_STDCXX_11([], [mandatory])])])
+
 AC_ARG_ENABLE([debug],
               [AS_HELP_STRING([--enable-debug],
                               [enable to get info session log output (disabled by default)])],
diff --git a/nxcomp/m4/ax_cxx_compile_stdcxx.m4 b/nxcomp/m4/ax_cxx_compile_stdcxx.m4
new file mode 120000
index 000000000..28ebfd1a6
--- /dev/null
+++ b/nxcomp/m4/ax_cxx_compile_stdcxx.m4
@@ -0,0 +1 @@
+../../m4/ax_cxx_compile_stdcxx.m4
\ No newline at end of file
diff --git a/nxcomp/m4/ax_cxx_compile_stdcxx_11.m4 b/nxcomp/m4/ax_cxx_compile_stdcxx_11.m4
new file mode 120000
index 000000000..5fbe8790d
--- /dev/null
+++ b/nxcomp/m4/ax_cxx_compile_stdcxx_11.m4
@@ -0,0 +1 @@
+../../m4/ax_cxx_compile_stdcxx_11.m4
\ No newline at end of file
diff --git a/nxcompshad/configure.ac b/nxcompshad/configure.ac
index 34b1c053c..966add584 100644
--- a/nxcompshad/configure.ac
+++ b/nxcompshad/configure.ac
@@ -44,6 +44,12 @@ AC_LANG([C++])
 NX_COMPILER_BRAND
 NX_DEFAULT_OPTIONS
 
+AC_ARG_ENABLE([cxx11],
+              [AS_HELP_STRING([--enable-cxx11],
+                              [enable optional features requiring C++11 support (disabled by default)])],
+              [AS_IF([test x$enableval = xyes],
+                     [AX_CXX_COMPILE_STDCXX_11([], [mandatory])])])
+
 AC_CONFIG_FILES([
 Makefile
 src/Makefile
diff --git a/nxcompshad/m4/ax_cxx_compile_stdcxx.m4 b/nxcompshad/m4/ax_cxx_compile_stdcxx.m4
new file mode 120000
index 000000000..28ebfd1a6
--- /dev/null
+++ b/nxcompshad/m4/ax_cxx_compile_stdcxx.m4
@@ -0,0 +1 @@
+../../m4/ax_cxx_compile_stdcxx.m4
\ No newline at end of file
diff --git a/nxcompshad/m4/ax_cxx_compile_stdcxx_11.m4 b/nxcompshad/m4/ax_cxx_compile_stdcxx_11.m4
new file mode 120000
index 000000000..5fbe8790d
--- /dev/null
+++ b/nxcompshad/m4/ax_cxx_compile_stdcxx_11.m4
@@ -0,0 +1 @@
+../../m4/ax_cxx_compile_stdcxx_11.m4
\ No newline at end of file
diff --git a/nxproxy/configure.ac b/nxproxy/configure.ac
index 9663fb4a8..cc8e898fc 100644
--- a/nxproxy/configure.ac
+++ b/nxproxy/configure.ac
@@ -23,6 +23,12 @@ AC_LANG([C])
 NX_COMPILER_BRAND
 NX_DEFAULT_OPTIONS
 
+AC_ARG_ENABLE([cxx11],
+              [AS_HELP_STRING([--enable-cxx11],
+                              [enable optional features requiring C++11 support (disabled by default)])],
+              [AS_IF([test x$enableval = xyes],
+                     [AX_CXX_COMPILE_STDCXX_11([], [mandatory])])])
+
 AC_CONFIG_FILES([
 Makefile
 man/Makefile
diff --git a/nxproxy/m4/ax_cxx_compile_stdcxx.m4 b/nxproxy/m4/ax_cxx_compile_stdcxx.m4
new file mode 120000
index 000000000..28ebfd1a6
--- /dev/null
+++ b/nxproxy/m4/ax_cxx_compile_stdcxx.m4
@@ -0,0 +1 @@
+../../m4/ax_cxx_compile_stdcxx.m4
\ No newline at end of file
diff --git a/nxproxy/m4/ax_cxx_compile_stdcxx_11.m4 b/nxproxy/m4/ax_cxx_compile_stdcxx_11.m4
new file mode 120000
index 000000000..5fbe8790d
--- /dev/null
+++ b/nxproxy/m4/ax_cxx_compile_stdcxx_11.m4
@@ -0,0 +1 @@
+../../m4/ax_cxx_compile_stdcxx_11.m4
\ No newline at end of file
-- 
cgit v1.2.3


From 381c39b868360be4393c8cfcaf6609a743b626b0 Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Thu, 13 Jul 2017 01:10:02 +0200
Subject: nxcomp: add AX_PTHREAD code from autoconf-archive and check for
 pthread support.

---
 nxcomp/configure.ac     |   2 +
 nxcomp/m4/ax_pthread.m4 | 485 ++++++++++++++++++++++++++++++++++++++++++++++++
 nxcomp/src/Makefile.am  |   8 +-
 3 files changed, 494 insertions(+), 1 deletion(-)
 create mode 100644 nxcomp/m4/ax_pthread.m4

(limited to 'nxcomp')

diff --git a/nxcomp/configure.ac b/nxcomp/configure.ac
index 89081cbb6..454ee6a80 100644
--- a/nxcomp/configure.ac
+++ b/nxcomp/configure.ac
@@ -63,6 +63,8 @@ if test "$FreeBSD" = yes; then
   CPPFLAGS="$CPPFLAGS -I/usr/local/include"
 fi
 
+AX_PTHREAD([], AC_MSG_ERROR([no POSIX threads support detected]))
+
 # If in_addr_t is not defined use unsigned int.
 AC_CHECK_TYPES([in_addr_t], [], [], [[#include <netinet/in.h>]])
 
diff --git a/nxcomp/m4/ax_pthread.m4 b/nxcomp/m4/ax_pthread.m4
new file mode 100644
index 000000000..5fbf9fe0d
--- /dev/null
+++ b/nxcomp/m4/ax_pthread.m4
@@ -0,0 +1,485 @@
+# ===========================================================================
+#        https://www.gnu.org/software/autoconf-archive/ax_pthread.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+#
+# DESCRIPTION
+#
+#   This macro figures out how to build C programs using POSIX threads. It
+#   sets the PTHREAD_LIBS output variable to the threads library and linker
+#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
+#   flags that are needed. (The user can also force certain compiler
+#   flags/libs to be tested by setting these environment variables.)
+#
+#   Also sets PTHREAD_CC to any special C compiler that is needed for
+#   multi-threaded programs (defaults to the value of CC otherwise). (This
+#   is necessary on AIX to use the special cc_r compiler alias.)
+#
+#   NOTE: You are assumed to not only compile your program with these flags,
+#   but also to link with them as well. For example, you might link with
+#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
+#
+#   If you are only building threaded programs, you may wish to use these
+#   variables in your default LIBS, CFLAGS, and CC:
+#
+#     LIBS="$PTHREAD_LIBS $LIBS"
+#     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+#     CC="$PTHREAD_CC"
+#
+#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
+#   has a nonstandard name, this macro defines PTHREAD_CREATE_JOINABLE to
+#   that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
+#
+#   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
+#   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
+#   PTHREAD_CFLAGS.
+#
+#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
+#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
+#   is not found. If ACTION-IF-FOUND is not specified, the default action
+#   will define HAVE_PTHREAD.
+#
+#   Please let the authors know if this macro fails on any platform, or if
+#   you have any other suggestions or comments. This macro was based on work
+#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
+#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
+#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
+#   grateful for the helpful feedback of numerous users.
+#
+#   Updated for Autoconf 2.68 by Daniel Richard G.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
+#   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
+#
+#   This program is free software: you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <https://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 24
+
+AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
+AC_DEFUN([AX_PTHREAD], [
+AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([AC_PROG_CC])
+AC_REQUIRE([AC_PROG_SED])
+AC_LANG_PUSH([C])
+ax_pthread_ok=no
+
+# We used to check for pthread.h first, but this fails if pthread.h
+# requires special compiler flags (e.g. on Tru64 or Sequent).
+# It gets checked for in the link test anyway.
+
+# First of all, check if the user has set any of the PTHREAD_LIBS,
+# etcetera environment variables, and if threads linking works using
+# them:
+if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then
+        ax_pthread_save_CC="$CC"
+        ax_pthread_save_CFLAGS="$CFLAGS"
+        ax_pthread_save_LIBS="$LIBS"
+        AS_IF([test "x$PTHREAD_CC" != "x"], [CC="$PTHREAD_CC"])
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        AC_MSG_CHECKING([for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS])
+        AC_LINK_IFELSE([AC_LANG_CALL([], [pthread_join])], [ax_pthread_ok=yes])
+        AC_MSG_RESULT([$ax_pthread_ok])
+        if test "x$ax_pthread_ok" = "xno"; then
+                PTHREAD_LIBS=""
+                PTHREAD_CFLAGS=""
+        fi
+        CC="$ax_pthread_save_CC"
+        CFLAGS="$ax_pthread_save_CFLAGS"
+        LIBS="$ax_pthread_save_LIBS"
+fi
+
+# We must check for the threads library under a number of different
+# names; the ordering is very important because some systems
+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
+# libraries is broken (non-POSIX).
+
+# Create a list of thread flags to try.  Items starting with a "-" are
+# C compiler flags, and other items are library names, except for "none"
+# which indicates that we try without any flags at all, and "pthread-config"
+# which is a program returning the flags for the Pth emulation library.
+
+ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
+
+# The ordering *is* (sometimes) important.  Some notes on the
+# individual items follow:
+
+# pthreads: AIX (must check this before -lpthread)
+# none: in case threads are in libc; should be tried before -Kthread and
+#       other compiler flags to prevent continual compiler warnings
+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads), Tru64
+#           (Note: HP C rejects this with "bad form for `-t' option")
+# -pthreads: Solaris/gcc (Note: HP C also rejects)
+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
+#      doesn't hurt to check since this sometimes defines pthreads and
+#      -D_REENTRANT too), HP C (must be checked before -lpthread, which
+#      is present but should not be used directly; and before -mthreads,
+#      because the compiler interprets this as "-mt" + "-hreads")
+# -mthreads: Mingw32/gcc, Lynx/gcc
+# pthread: Linux, etcetera
+# --thread-safe: KAI C++
+# pthread-config: use pthread-config program (for GNU Pth library)
+
+case $host_os in
+
+        freebsd*)
+
+        # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+        # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+
+        ax_pthread_flags="-kthread lthread $ax_pthread_flags"
+        ;;
+
+        hpux*)
+
+        # From the cc(1) man page: "[-mt] Sets various -D flags to enable
+        # multi-threading and also sets -lpthread."
+
+        ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags"
+        ;;
+
+        openedition*)
+
+        # IBM z/OS requires a feature-test macro to be defined in order to
+        # enable POSIX threads at all, so give the user a hint if this is
+        # not set. (We don't define these ourselves, as they can affect
+        # other portions of the system API in unpredictable ways.)
+
+        AC_EGREP_CPP([AX_PTHREAD_ZOS_MISSING],
+            [
+#            if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS)
+             AX_PTHREAD_ZOS_MISSING
+#            endif
+            ],
+            [AC_MSG_WARN([IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support.])])
+        ;;
+
+        solaris*)
+
+        # On Solaris (at least, for some versions), libc contains stubbed
+        # (non-functional) versions of the pthreads routines, so link-based
+        # tests will erroneously succeed. (N.B.: The stubs are missing
+        # pthread_cleanup_push, or rather a function called by this macro,
+        # so we could check for that, but who knows whether they'll stub
+        # that too in a future libc.)  So we'll check first for the
+        # standard Solaris way of linking pthreads (-mt -lpthread).
+
+        ax_pthread_flags="-mt,pthread pthread $ax_pthread_flags"
+        ;;
+esac
+
+# GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC)
+
+AS_IF([test "x$GCC" = "xyes"],
+      [ax_pthread_flags="-pthread -pthreads $ax_pthread_flags"])
+
+# The presence of a feature test macro requesting re-entrant function
+# definitions is, on some systems, a strong hint that pthreads support is
+# correctly enabled
+
+case $host_os in
+        darwin* | hpux* | linux* | osf* | solaris*)
+        ax_pthread_check_macro="_REENTRANT"
+        ;;
+
+        aix*)
+        ax_pthread_check_macro="_THREAD_SAFE"
+        ;;
+
+        *)
+        ax_pthread_check_macro="--"
+        ;;
+esac
+AS_IF([test "x$ax_pthread_check_macro" = "x--"],
+      [ax_pthread_check_cond=0],
+      [ax_pthread_check_cond="!defined($ax_pthread_check_macro)"])
+
+# Are we compiling with Clang?
+
+AC_CACHE_CHECK([whether $CC is Clang],
+    [ax_cv_PTHREAD_CLANG],
+    [ax_cv_PTHREAD_CLANG=no
+     # Note that Autoconf sets GCC=yes for Clang as well as GCC
+     if test "x$GCC" = "xyes"; then
+        AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG],
+            [/* Note: Clang 2.7 lacks __clang_[a-z]+__ */
+#            if defined(__clang__) && defined(__llvm__)
+             AX_PTHREAD_CC_IS_CLANG
+#            endif
+            ],
+            [ax_cv_PTHREAD_CLANG=yes])
+     fi
+    ])
+ax_pthread_clang="$ax_cv_PTHREAD_CLANG"
+
+ax_pthread_clang_warning=no
+
+# Clang needs special handling, because older versions handle the -pthread
+# option in a rather... idiosyncratic way
+
+if test "x$ax_pthread_clang" = "xyes"; then
+
+        # Clang takes -pthread; it has never supported any other flag
+
+        # (Note 1: This will need to be revisited if a system that Clang
+        # supports has POSIX threads in a separate library.  This tends not
+        # to be the way of modern systems, but it's conceivable.)
+
+        # (Note 2: On some systems, notably Darwin, -pthread is not needed
+        # to get POSIX threads support; the API is always present and
+        # active.  We could reasonably leave PTHREAD_CFLAGS empty.  But
+        # -pthread does define _REENTRANT, and while the Darwin headers
+        # ignore this macro, third-party headers might not.)
+
+        PTHREAD_CFLAGS="-pthread"
+        PTHREAD_LIBS=
+
+        ax_pthread_ok=yes
+
+        # However, older versions of Clang make a point of warning the user
+        # that, in an invocation where only linking and no compilation is
+        # taking place, the -pthread option has no effect ("argument unused
+        # during compilation").  They expect -pthread to be passed in only
+        # when source code is being compiled.
+        #
+        # Problem is, this is at odds with the way Automake and most other
+        # C build frameworks function, which is that the same flags used in
+        # compilation (CFLAGS) are also used in linking.  Many systems
+        # supported by AX_PTHREAD require exactly this for POSIX threads
+        # support, and in fact it is often not straightforward to specify a
+        # flag that is used only in the compilation phase and not in
+        # linking.  Such a scenario is extremely rare in practice.
+        #
+        # Even though use of the -pthread flag in linking would only print
+        # a warning, this can be a nuisance for well-run software projects
+        # that build with -Werror.  So if the active version of Clang has
+        # this misfeature, we search for an option to squash it.
+
+        AC_CACHE_CHECK([whether Clang needs flag to prevent "argument unused" warning when linking with -pthread],
+            [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG],
+            [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown
+             # Create an alternate version of $ac_link that compiles and
+             # links in two steps (.c -> .o, .o -> exe) instead of one
+             # (.c -> exe), because the warning occurs only in the second
+             # step
+             ax_pthread_save_ac_link="$ac_link"
+             ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g'
+             ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"`
+             ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)"
+             ax_pthread_save_CFLAGS="$CFLAGS"
+             for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do
+                AS_IF([test "x$ax_pthread_try" = "xunknown"], [break])
+                CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS"
+                ac_link="$ax_pthread_save_ac_link"
+                AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
+                    [ac_link="$ax_pthread_2step_ac_link"
+                     AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
+                         [break])
+                    ])
+             done
+             ac_link="$ax_pthread_save_ac_link"
+             CFLAGS="$ax_pthread_save_CFLAGS"
+             AS_IF([test "x$ax_pthread_try" = "x"], [ax_pthread_try=no])
+             ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try"
+            ])
+
+        case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in
+                no | unknown) ;;
+                *) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;;
+        esac
+
+fi # $ax_pthread_clang = yes
+
+if test "x$ax_pthread_ok" = "xno"; then
+for ax_pthread_try_flag in $ax_pthread_flags; do
+
+        case $ax_pthread_try_flag in
+                none)
+                AC_MSG_CHECKING([whether pthreads work without any flags])
+                ;;
+
+                -mt,pthread)
+                AC_MSG_CHECKING([whether pthreads work with -mt -lpthread])
+                PTHREAD_CFLAGS="-mt"
+                PTHREAD_LIBS="-lpthread"
+                ;;
+
+                -*)
+                AC_MSG_CHECKING([whether pthreads work with $ax_pthread_try_flag])
+                PTHREAD_CFLAGS="$ax_pthread_try_flag"
+                ;;
+
+                pthread-config)
+                AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
+                AS_IF([test "x$ax_pthread_config" = "xno"], [continue])
+                PTHREAD_CFLAGS="`pthread-config --cflags`"
+                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
+                ;;
+
+                *)
+                AC_MSG_CHECKING([for the pthreads library -l$ax_pthread_try_flag])
+                PTHREAD_LIBS="-l$ax_pthread_try_flag"
+                ;;
+        esac
+
+        ax_pthread_save_CFLAGS="$CFLAGS"
+        ax_pthread_save_LIBS="$LIBS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+
+        # Check for various functions.  We must include pthread.h,
+        # since some functions may be macros.  (On the Sequent, we
+        # need a special flag -Kthread to make this header compile.)
+        # We check for pthread_join because it is in -lpthread on IRIX
+        # while pthread_create is in libc.  We check for pthread_attr_init
+        # due to DEC craziness with -lpthreads.  We check for
+        # pthread_cleanup_push because it is one of the few pthread
+        # functions on Solaris that doesn't have a non-functional libc stub.
+        # We try pthread_create on general principles.
+
+        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
+#                       if $ax_pthread_check_cond
+#                        error "$ax_pthread_check_macro must be defined"
+#                       endif
+                        static void routine(void *a) { a = 0; }
+                        static void *start_routine(void *a) { return a; }],
+                       [pthread_t th; pthread_attr_t attr;
+                        pthread_create(&th, 0, start_routine, 0);
+                        pthread_join(th, 0);
+                        pthread_attr_init(&attr);
+                        pthread_cleanup_push(routine, 0);
+                        pthread_cleanup_pop(0) /* ; */])],
+            [ax_pthread_ok=yes],
+            [])
+
+        CFLAGS="$ax_pthread_save_CFLAGS"
+        LIBS="$ax_pthread_save_LIBS"
+
+        AC_MSG_RESULT([$ax_pthread_ok])
+        AS_IF([test "x$ax_pthread_ok" = "xyes"], [break])
+
+        PTHREAD_LIBS=""
+        PTHREAD_CFLAGS=""
+done
+fi
+
+# Various other checks:
+if test "x$ax_pthread_ok" = "xyes"; then
+        ax_pthread_save_CFLAGS="$CFLAGS"
+        ax_pthread_save_LIBS="$LIBS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+
+        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
+        AC_CACHE_CHECK([for joinable pthread attribute],
+            [ax_cv_PTHREAD_JOINABLE_ATTR],
+            [ax_cv_PTHREAD_JOINABLE_ATTR=unknown
+             for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
+                 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
+                                                 [int attr = $ax_pthread_attr; return attr /* ; */])],
+                                [ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break],
+                                [])
+             done
+            ])
+        AS_IF([test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \
+               test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \
+               test "x$ax_pthread_joinable_attr_defined" != "xyes"],
+              [AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE],
+                                  [$ax_cv_PTHREAD_JOINABLE_ATTR],
+                                  [Define to necessary symbol if this constant
+                                   uses a non-standard name on your system.])
+               ax_pthread_joinable_attr_defined=yes
+              ])
+
+        AC_CACHE_CHECK([whether more special flags are required for pthreads],
+            [ax_cv_PTHREAD_SPECIAL_FLAGS],
+            [ax_cv_PTHREAD_SPECIAL_FLAGS=no
+             case $host_os in
+             solaris*)
+             ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS"
+             ;;
+             esac
+            ])
+        AS_IF([test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \
+               test "x$ax_pthread_special_flags_added" != "xyes"],
+              [PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS"
+               ax_pthread_special_flags_added=yes])
+
+        AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
+            [ax_cv_PTHREAD_PRIO_INHERIT],
+            [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
+                                             [[int i = PTHREAD_PRIO_INHERIT;]])],
+                            [ax_cv_PTHREAD_PRIO_INHERIT=yes],
+                            [ax_cv_PTHREAD_PRIO_INHERIT=no])
+            ])
+        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \
+               test "x$ax_pthread_prio_inherit_defined" != "xyes"],
+              [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])
+               ax_pthread_prio_inherit_defined=yes
+              ])
+
+        CFLAGS="$ax_pthread_save_CFLAGS"
+        LIBS="$ax_pthread_save_LIBS"
+
+        # More AIX lossage: compile with *_r variant
+        if test "x$GCC" != "xyes"; then
+            case $host_os in
+                aix*)
+                AS_CASE(["x/$CC"],
+                    [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
+                    [#handle absolute path differently from PATH based program lookup
+                     AS_CASE(["x$CC"],
+                         [x/*],
+                         [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
+                         [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
+                ;;
+            esac
+        fi
+fi
+
+test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
+
+AC_SUBST([PTHREAD_LIBS])
+AC_SUBST([PTHREAD_CFLAGS])
+AC_SUBST([PTHREAD_CC])
+
+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+if test "x$ax_pthread_ok" = "xyes"; then
+        ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
+        :
+else
+        ax_pthread_ok=no
+        $2
+fi
+AC_LANG_POP
+])dnl AX_PTHREAD
diff --git a/nxcomp/src/Makefile.am b/nxcomp/src/Makefile.am
index 2264cb347..ad05a6cbf 100644
--- a/nxcomp/src/Makefile.am
+++ b/nxcomp/src/Makefile.am
@@ -120,6 +120,7 @@ libXcomp_la_LIBADD =					\
     @JPEG_LIBS@						\
     @PNG_LIBS@						\
     @Z_LIBS@						\
+    @PTHREAD_LIBS@					\
     $(NULL)
 
 AM_CXXFLAGS = 						\
@@ -127,13 +128,18 @@ AM_CXXFLAGS = 						\
     $(JPEG_CFLAGS)					\
     $(PNG_CFLAGS)					\
     $(Z_CFLAGS)						\
+    $(PTHREAD_CFLAGS)					\
     $(NULL)
 
 AM_CPPFLAGS =						\
     -I$(top_srcdir)/include				\
     $(NULL)
 
-libXcomp_la_LDFLAGS = -version-number @LT_COMP_VERSION@ -no-undefined
+libXcomp_la_LDFLAGS =					\
+    -version-number @LT_COMP_VERSION@			\
+    -no-undefined					\
+    $(PTHREAD_LDFLAGS)					\
+    $(NULL)
 
 libXcompincludedir = $(includedir)/nx
 libXcompinclude_HEADERS =				\
-- 
cgit v1.2.3


From b0521e8165389515b6f8290a652d7db241f84af8 Mon Sep 17 00:00:00 2001
From: Vadim Troshchinskiy <vtroshchinskiy@qindel.com>
Date: Thu, 22 Dec 2016 09:57:47 +0100
Subject: New logging implementation

Features:
	* Works without ifdefs
	* Configurable with commandline arguments
	* Log level configurable per file
	* Thread safe
---
 nxcomp/src/Log.cpp     | 121 ++++++++++++
 nxcomp/src/Log.h       | 500 +++++++++++++++++++++++++++++++++++++++++++++++++
 nxcomp/src/Loop.cpp    |  97 ++++++++++
 nxcomp/src/Makefile.am |   1 +
 4 files changed, 719 insertions(+)
 create mode 100644 nxcomp/src/Log.cpp
 create mode 100644 nxcomp/src/Log.h

(limited to 'nxcomp')

diff --git a/nxcomp/src/Log.cpp b/nxcomp/src/Log.cpp
new file mode 100644
index 000000000..3ff47aea8
--- /dev/null
+++ b/nxcomp/src/Log.cpp
@@ -0,0 +1,121 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+
+#include <stdio.h>
+#include <iostream>
+#include <fstream>
+#include <sstream>
+#include <iomanip>
+
+#include "Log.h"
+
+NXLog nx_log;
+
+
+bool NXLog::will_log() const
+{
+    std::map<std::string, NXLogLevel>::const_iterator item = per_file_levels_.find(current_file());
+
+    if ( item != per_file_levels_.end() )
+    {
+        return current_level() <= item->second;
+    }
+    else
+    {
+        return current_level() <= level();
+    }
+}
+
+
+std::string NXLog::stamp_to_string(const NXLogStamp& stamp) const
+{
+    std::ostringstream oss;
+
+    static const char* level_names[] = {
+        "FATAL",
+        "ERROR",
+        "WARN ",
+        "INFO ",
+        "DEBUG"
+    };
+
+    if ( log_level() )
+        oss << ((stamp.level() >=0 && stamp.level() < NXLOG_LEVEL_COUNT ) ? level_names[stamp.level()] : "???") << " ";
+
+    if ( log_time() )
+    {
+        struct timeval timestamp = stamp.timestamp();
+        struct tm timeinfo;
+
+        localtime_r(&timestamp.tv_sec, &timeinfo);
+
+        if ( log_unix_time() )
+        {
+            oss << timestamp.tv_sec;
+        }
+        else
+        {
+            #if __cplusplus >= 201103L && (!defined(__GNUC__) || __GNUC__ >= 5)
+            oss << " " << std::put_time(&timeinfo, "%Y/%m/%d %H:%M:%S");
+            #else
+            oss << timestamp.tv_sec;
+            #endif
+        }
+
+        oss << "." << std::setw(3) << std::setfill('0') << (int)(timestamp.tv_usec / 1000) << " ";
+    }
+
+    if ( log_location() )
+        oss << stamp.file() << "/" << stamp.function() << ":" << stamp.line()  << " ";
+
+    if ( log_thread_id() )
+    {
+        if ( thread_name().empty() )
+            oss << pthread_self() << " ";
+        else
+            oss << "[" << thread_name() << "] ";
+    }
+
+    return oss.str();
+}
+
+NXLog& operator<< (NXLog& out, const NXLogStamp& value)
+{
+    out.current_level( value.level() );
+    out.current_file( value.file() );
+
+    // Writing an NXLogStamp to the stream indicates the start of a new entry.
+    // If there's any content in the buffer, we flush it to finalize the previous
+    // log entry.
+    if ( out.synchronized() )
+        out.flush();
+
+
+    out << out.stamp_to_string(value);
+
+    return out;
+}
+
diff --git a/nxcomp/src/Log.h b/nxcomp/src/Log.h
new file mode 100644
index 000000000..f4ee66e1f
--- /dev/null
+++ b/nxcomp/src/Log.h
@@ -0,0 +1,500 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXCOMP, NX protocol compression and NX extensions to this software     */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE.nxcomp which comes in the       */
+/* source distribution.                                                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/* NOTE: This software has received contributions from various other      */
+/* contributors, only the core maintainers and supporters are listed as   */
+/* copyright holders. Please contact us, if you feel you should be listed */
+/* as copyright holder, as well.                                          */
+/*                                                                        */
+/**************************************************************************/
+
+
+#ifndef NXLog_H
+#define NXLog_H
+
+#include <iostream>
+#include <fstream>
+#include <sstream>
+#include <sys/time.h>
+
+#include <map>
+#include <stdlib.h>
+#include <string.h>
+
+/** Log severity level */
+enum NXLogLevel
+{
+    NXFATAL,
+    NXERROR,
+    NXWARNING,
+    NXINFO,
+    NXDEBUG,
+    NXLOG_LEVEL_COUNT
+};
+
+
+/**
+ * Log timestamp class
+ *
+ * Stores the timestamp, file, function, line number and log level.
+ * Acts as a manipulator on the NXLog class, telling it a new log
+ * severity level. For instance:
+ *
+ *     nx_log << NXLogStamp(...,NXINFO)
+ *
+ * Tells nx_log that now NXINFO type messages are being logged. This
+ * will be applied until a new NXLogStamp with a different level
+ * is sent to the NXLog.
+ */
+class NXLogStamp
+{
+    private:
+    std::string file_;
+    std::string function_;
+    size_t line_;
+    NXLogLevel level_;
+    struct timeval timestamp_;
+
+    public:
+    /** File where the event occurred */
+    std::string file() const
+    {
+        return file_;
+    }
+
+    /** Function where the event occurred */
+    std::string function() const
+    {
+        return function_;
+    }
+
+    /** Line where the event occurred */
+    size_t line() const
+    {
+        return line_;
+    }
+
+    /** Severity level of the event */
+    NXLogLevel level() const
+    {
+        return level_;
+    }
+
+    /** Time of the event */
+    struct timeval timestamp() const
+    {
+        return timestamp_;
+    }
+
+
+    NXLogStamp(const char *file, const char *function, int line, NXLogLevel level)
+    {
+        file_      = std::string(file);
+        function_  = std::string(function);
+        line_      = line;
+        level_     = level;
+        gettimeofday(&timestamp_, NULL);
+    }
+
+};
+
+
+/**
+ * Log class
+ *
+ * Logs events to a stream, filters by file/level
+ */
+class NXLog
+{
+    NXLogLevel level_;
+
+    std::ostream *stream_;
+    std::map< std::string, NXLogLevel > per_file_levels_;
+    bool synchronized_;
+    size_t  thread_buffer_size_;
+    pthread_mutex_t output_lock_;
+    pthread_key_t tls_key_;
+
+    bool log_level_;
+    bool log_time_;
+    bool log_unix_time_;
+    bool log_location_;
+    bool log_thread_id_;
+
+    typedef struct per_thread_data_s
+    {
+        NXLogLevel          current_level;
+        std::string*        current_file;
+        std::string*        thread_name;
+        std::stringstream*  buffer;
+        NXLog*              log_obj;
+    } per_thread_data;
+
+
+    static void free_thread_data(void* arg)
+    {
+        per_thread_data *pdt = (per_thread_data*)arg;
+
+        if ( !pdt )
+            return;
+
+        if ( pdt->log_obj ) {
+            // Ensure the buffer is flushed before thread deletion
+            pdt->log_obj->flush(pdt);
+        }
+
+        delete pdt->current_file;
+        delete pdt->thread_name;
+        delete pdt->buffer;
+        delete pdt;
+    }
+
+    per_thread_data* get_data_int() const
+    {
+        per_thread_data *ret = NULL;
+
+        if ( (ret = (per_thread_data*)pthread_getspecific(tls_key_)) == NULL )
+        {
+            ret = new per_thread_data;
+            ret->current_level = NXDEBUG;
+            ret->buffer = new std::stringstream();
+            ret->current_file = new std::string();
+            ret->thread_name = new std::string();
+            ret->log_obj = const_cast<NXLog*>(this);
+            pthread_setspecific(tls_key_, ret);
+        }
+
+        return ret;
+    }
+
+    per_thread_data* get_data()
+    {
+        return get_data_int();
+    }
+
+    const per_thread_data* get_data() const
+    {
+        return get_data_int();
+    }
+
+    /** Convert NXLogStamp to string according to the current configuration */
+    std::string stamp_to_string(const NXLogStamp& stamp) const;
+
+    /**
+     * Internal flush function
+     *
+     * When a thread is being terminated and free_thread_data gets called,
+     * the TLS key gets set to NULL before the call to free_thread_data,
+     * and the destructor function gets the old value.
+     *
+     * This means that get_data() stops working correctly, and we need
+     * to be able to pass the old pointer.
+     */
+    void flush(per_thread_data *pdt)
+    {
+        const std::string str = pdt->buffer->str();
+
+        if (!str.empty())
+        {
+            pthread_mutex_lock(&output_lock_);
+            (*stream()) << str;
+            pthread_mutex_unlock(&output_lock_);
+            pdt->buffer->str("");
+        }
+    }
+
+
+    public:
+    NXLog()
+    {
+        stream_             = &std::cerr;
+        level_              = NXDEBUG;
+        synchronized_       = true;
+        thread_buffer_size_ = 1024;
+        log_level_          = false;
+        log_time_           = false;
+        log_unix_time_      = false;
+        log_location_       = false;
+        log_thread_id_      = false;
+
+        if ( pthread_key_create(&tls_key_, free_thread_data) != 0 )
+        {
+            std::cerr << "pthread_key_create failed" << std::endl;
+            abort();
+        }
+
+    }
+
+    ~NXLog()
+    {
+        per_thread_data *pdt = get_data();
+
+        // Flush any remaining output and delete TLS data
+        free_thread_data(pdt);
+
+        pthread_key_delete(tls_key_);
+    }
+
+    /** Minimum severity level to output */
+    NXLogLevel level() const
+    {
+        return level_;
+    }
+
+    void level(NXLogLevel level)
+    {
+        level_ = level;
+    }
+
+
+    /** Current severity level */
+    NXLogLevel current_level() const
+    {
+        return get_data()->current_level;
+    }
+
+    void current_level(NXLogLevel level)
+    {
+        get_data()->current_level = level;
+    }
+
+    /** Source file from which messages are currently originating */
+    std::string current_file() const
+    {
+        return *get_data()->current_file;
+    }
+
+    void current_file(std::string val)
+    {
+        *get_data()->current_file = val;
+    }
+
+    std::ostream* stream() const
+    {
+        return stream_;
+    }
+
+    void stream(std::ostream *stream)
+    {
+        flush();
+        stream_ = stream;
+    }
+
+    bool synchronized() const {
+        return synchronized_;
+    }
+
+    void synchronized(bool val) {
+        synchronized_ = val;
+    }
+
+    bool log_level() const
+    {
+        return log_level_;
+    }
+
+    void log_level(bool val)
+    {
+        log_level_ = val;
+    }
+
+    bool log_time() const
+    {
+        return log_time_;
+    }
+
+    void log_time(bool val)
+    {
+        log_time_ = val;
+    }
+
+    bool log_unix_time() const
+    {
+        return log_unix_time_;
+    }
+
+    void log_unix_time(bool val)
+    {
+        log_unix_time_ = val;
+    }
+
+    bool log_location() const
+    {
+        return log_location_;
+    }
+
+    void log_location(bool val)
+    {
+        log_location_ = val;
+    }
+
+    bool log_thread_id() const
+    {
+        return log_thread_id_;
+    }
+
+    void log_thread_id(bool val)
+    {
+        log_thread_id_ = val;
+    }
+
+
+    void flush()
+    {
+        per_thread_data *pdt = get_data();
+        flush(pdt);
+    }
+
+    std::string thread_name() const
+    {
+        return *get_data()->thread_name;
+    }
+
+    void thread_name(std::string str)
+    {
+        *get_data()->thread_name = str;
+    }
+
+    void thread_name(const char *str)
+    {
+        *get_data()->thread_name = str;
+    }
+
+    /**
+     * True if a message sent to the NXLog object will be sent to the output
+     *
+     * This considers two things:
+     *
+     * If there's a per-file log level, then it is used
+     * Otherwise the global log level is used.
+     *
+     * If the log level permits the current message to be output, then the
+     * return value is true.
+     */
+    bool will_log() const;
+
+
+    /**
+     * This catches std::flush
+     */
+    NXLog&  operator<<(std::ostream& (*F)(std::ostream&))
+    {
+        if ( will_log() )
+        {
+            if ( synchronized() )
+            {
+                per_thread_data *pdt = get_data();
+                (*pdt->buffer) << F;
+                flush();
+            }
+            else
+            {
+                *(stream()) << F;
+            }
+        }
+
+        return *this;
+    }
+
+    template<typename T>
+    friend NXLog& operator<<(NXLog& out, const T& value);
+
+    friend NXLog& operator<< (NXLog& out, const NXLogStamp& value);
+};
+
+
+extern NXLog nx_log;
+
+
+#define nxstamp(l) NXLogStamp(__FILE__, __func__, __LINE__, l)
+
+
+#define nxdbg    nx_log << nxstamp(NXDEBUG)
+#define nxinfo   nx_log << nxstamp(NXINFO)
+#define nxwarn   nx_log << nxstamp(NXWARNING)
+#define nxerr    nx_log << nxstamp(NXERROR)
+#define nxfatal  nx_log << nxstamp(NXFATAL)
+
+
+NXLog& operator<< (NXLog& out, const NXLogStamp& value);
+
+
+template <typename T>
+bool has_newline(T value)
+{
+    return false;
+}
+
+template <char*>
+static bool has_newline(char *value)
+{
+    return strstr(value, "\n") != NULL;
+}
+
+template <char>
+static bool has_newline(char value)
+{
+    return value == '\n';
+}
+
+template <std::string&>
+static bool has_newline(std::string &value)
+{
+    return value.find_first_of("\n") != std::string::npos;
+}
+
+static size_t ss_length(std::stringstream *ss)
+{
+    size_t pos = ss->tellg();
+    size_t ret = 0;
+    ss->seekg(0, std::ios::end);
+    ret = ss->tellg();
+    ss->seekg(pos, std::ios::beg);
+    return ret;
+}
+
+template <typename T>
+NXLog& operator<<(NXLog& out, const T& value)
+{
+    if ( out.will_log() )
+    {
+        if ( out.synchronized() )
+        {
+            // In synchronized mode, we buffer data until a newline, std::flush, or the buffer
+            // gets full. Then we dump the whole thing at once to the output stream, synchronizing
+            // with a mutex.
+            NXLog::per_thread_data *pdt = out.get_data();
+            (*pdt->buffer) << value;
+
+            if ( ss_length(pdt->buffer) >= out.thread_buffer_size_ || has_newline(value) )
+                out.flush();
+
+        }
+        else
+        {
+            // In async mode we just dump data on the output stream as-is.
+            // Multithreaded code will have ugly output.
+            *(out.stream()) << value;
+        }
+
+    }
+
+    return out;
+}
+
+#endif
diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index 4292e7b9a..681a5a1ef 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -101,6 +101,7 @@ typedef int socklen_t;
 
 #include "Message.h"
 #include "ChannelEndPoint.h"
+#include "Log.h"
 
 //
 // System specific defines.
@@ -9339,6 +9340,102 @@ int ParseCommandLineOptions(int argc, const char **argv)
 
           return -1;
         }
+        case 'd':
+        {
+          if ( argi+1 >= argc )
+          {
+            PrintUsageInfo(nextArg, 0);
+            return -1;
+          }
+
+          int level = 0;
+          errno = 0;
+          level = strtol(argv[argi+1], NULL, 10);
+
+          if ( errno && (level == 0) )
+          {
+            cerr << "Warning: Failed to parse log level. Ignoring option." << std::endl;
+          }
+          if ( level < 0 )
+          {
+            cerr << "Warning: Log level must be a positive integer. Ignoring option." << std::endl;
+            level = nx_log.level();
+          }
+          else if ( level >= NXLOG_LEVEL_COUNT )
+          {
+            cerr << "Warning: Log level is greater than the maximum " << NXLOG_LEVEL_COUNT-1 << ". Setting to the maximum." << std::endl;
+            level = NXLOG_LEVEL_COUNT-1;
+          }
+
+          nx_log.level( (NXLogLevel)level );
+
+          argi++;
+          break;
+
+        }
+        case 'o':
+        {
+          if ( argi + 1 >= argc )
+          {
+            PrintUsageInfo(nextArg, 0);
+            return -1;
+          }
+
+          std::ofstream *logfile = new std::ofstream();
+
+          // Unbuffered output
+          logfile->rdbuf()->pubsetbuf(0, 0);
+          logfile->open(argv[argi+1], std::ofstream::app);
+
+          if ( logfile->is_open() )
+          {
+            nx_log.stream(logfile);
+          }
+          else
+          {
+            cerr << "Failed to open log file " << argv[argi+1] << endl;
+            return -1;
+          }
+
+          argi++;
+          break;
+        }
+        case 'f':
+        {
+          if ( argi + 1 >= argc )
+          {
+            PrintUsageInfo(nextArg, 0);
+            return -1;
+          }
+
+          const char *format = argv[argi+1];
+          size_t pos = 0;
+
+          nx_log.log_level(false);
+          nx_log.log_time(false);
+          nx_log.log_unix_time(false);
+          nx_log.log_location(false);
+          nx_log.log_thread_id(false);
+
+          for(pos =0;pos<strlen(format);pos++)
+          {
+            switch(format[pos])
+            {
+              case '0': break;
+              case 't': nx_log.log_time(true); break;
+              case 'u': nx_log.log_time(true); nx_log.log_unix_time(true); break;
+              case 'l': nx_log.log_level(true); break;
+              case 'T': nx_log.log_thread_id(true); break;
+              case 'L': nx_log.log_location(true); break;
+              default : cerr << "Unrecognized format specifier: " << format[pos] << endl; break;
+            }
+          }
+
+          argi++;
+          break;
+        }
+
+
         default:
         {
           PrintUsageInfo(nextArg, 1);
diff --git a/nxcomp/src/Makefile.am b/nxcomp/src/Makefile.am
index ad05a6cbf..682ddbaca 100644
--- a/nxcomp/src/Makefile.am
+++ b/nxcomp/src/Makefile.am
@@ -114,6 +114,7 @@ libXcomp_la_SOURCES =					\
     WriteBuffer.cpp					\
     XidCache.cpp					\
     Z.cpp						\
+    Log.cpp						\
     $(NULL)
 
 libXcomp_la_LIBADD =					\
-- 
cgit v1.2.3


From d960ec2cb0a6f9e0d35cd034d27a5fdd88a4307e Mon Sep 17 00:00:00 2001
From: Vadim Troshchinskiy <vtroshchinskiy@qindel.com>
Date: Thu, 22 Dec 2016 12:40:43 +0100
Subject: Set default log level to WARNING

This is to ensure the log output is the same as previous releases,
which didn't have INFO defined by default.
---
 nxcomp/src/Log.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Log.h b/nxcomp/src/Log.h
index f4ee66e1f..c3ddd9568 100644
--- a/nxcomp/src/Log.h
+++ b/nxcomp/src/Log.h
@@ -223,7 +223,7 @@ class NXLog
     NXLog()
     {
         stream_             = &std::cerr;
-        level_              = NXDEBUG;
+        level_              = NXWARNING;
         synchronized_       = true;
         thread_buffer_size_ = 1024;
         log_level_          = false;
-- 
cgit v1.2.3


From ca08512cff4b3d3340a55036ee151fac8f145255 Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Fri, 30 Jun 2017 22:37:13 +0200
Subject: nxcomp/Log.h: also clear the buffer after setting it to an empty
 string.

---
 nxcomp/src/Log.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Log.h b/nxcomp/src/Log.h
index c3ddd9568..32779bcaa 100644
--- a/nxcomp/src/Log.h
+++ b/nxcomp/src/Log.h
@@ -214,7 +214,8 @@ class NXLog
             pthread_mutex_lock(&output_lock_);
             (*stream()) << str;
             pthread_mutex_unlock(&output_lock_);
-            pdt->buffer->str("");
+            pdt->buffer->str(std::string());
+            pdt->buffer->clear();
         }
     }
 
-- 
cgit v1.2.3


From 67b0a17faa5240ee924cd90f496a412339d00356 Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Fri, 30 Jun 2017 22:42:25 +0200
Subject: nxcomp/Log.h: delete stream_ member before class object destruction.

---
 nxcomp/src/Log.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Log.h b/nxcomp/src/Log.h
index 32779bcaa..44c43a47b 100644
--- a/nxcomp/src/Log.h
+++ b/nxcomp/src/Log.h
@@ -249,6 +249,10 @@ class NXLog
         free_thread_data(pdt);
 
         pthread_key_delete(tls_key_);
+
+        if ((stream_) && (stream_ != &std::cerr)) {
+            delete stream_;
+        }
     }
 
     /** Minimum severity level to output */
-- 
cgit v1.2.3


From fc4a18d3398ec360b28802dff990e2c1c8d368b5 Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Fri, 30 Jun 2017 23:32:45 +0200
Subject: nxcomp/{configure.ac,Log.cpp}: implement configure-time std::put_time
 check and use macro value in Log.cpp.

---
 nxcomp/configure.ac | 17 +++++++++++++++++
 nxcomp/src/Log.cpp  |  3 ++-
 2 files changed, 19 insertions(+), 1 deletion(-)

(limited to 'nxcomp')

diff --git a/nxcomp/configure.ac b/nxcomp/configure.ac
index 454ee6a80..a61db32c1 100644
--- a/nxcomp/configure.ac
+++ b/nxcomp/configure.ac
@@ -74,6 +74,23 @@ AC_ARG_ENABLE([cxx11],
               [AS_IF([test x$enableval = xyes],
                     [AX_CXX_COMPILE_STDCXX_11([], [mandatory])])])
 
+# Check if std::put_time is available.
+AC_MSG_CHECKING([if std::put_time is available])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+[[
+#include <iomanip>
+#include <ctime>
+]],
+[[
+std::time_t t = std::time(NULL);
+std::tm tm = *std::localtime(&t);
+(void) std::put_time(&tm, "%c");
+]])],
+                  [AC_MSG_RESULT([yes])
+                   AC_DEFINE(HAVE_STD_PUT_TIME, [1],
+                             [Use std::put_time to format times, must be made available by the compiler if turned on.])],
+                  [AC_MSG_RESULT([no])])
+
 AC_ARG_ENABLE([debug],
               [AS_HELP_STRING([--enable-debug],
                               [enable to get info session log output (disabled by default)])],
diff --git a/nxcomp/src/Log.cpp b/nxcomp/src/Log.cpp
index 3ff47aea8..66ae1bd78 100644
--- a/nxcomp/src/Log.cpp
+++ b/nxcomp/src/Log.cpp
@@ -31,6 +31,7 @@
 #include <iomanip>
 
 #include "Log.h"
+#include "config.h"
 
 NXLog nx_log;
 
@@ -78,7 +79,7 @@ std::string NXLog::stamp_to_string(const NXLogStamp& stamp) const
         }
         else
         {
-            #if __cplusplus >= 201103L && (!defined(__GNUC__) || __GNUC__ >= 5)
+            #if HAVE_STD_PUT_TIME
             oss << " " << std::put_time(&timeinfo, "%Y/%m/%d %H:%M:%S");
             #else
             oss << timestamp.tv_sec;
-- 
cgit v1.2.3


From 09586d760833dac680ba8837b0b695ed3900c96d Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Sat, 30 Sep 2017 15:30:53 +0200
Subject: nxcomp/src/Log.{cpp,h}: port to std::stack as internal buffer
 structure.

This has one drawback: after flushing log data to its underlying output,
a new NXLogStamp object MUST be written to the NXLog object in order to
create a new entry within the stack.

This can be changed if necessary. For now I'd like to keep it as-is.
---
 nxcomp/src/Log.cpp |  8 +++-----
 nxcomp/src/Log.h   | 52 ++++++++++++++++++++++++++++++++++------------------
 2 files changed, 37 insertions(+), 23 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Log.cpp b/nxcomp/src/Log.cpp
index 66ae1bd78..83e11b98a 100644
--- a/nxcomp/src/Log.cpp
+++ b/nxcomp/src/Log.cpp
@@ -109,14 +109,12 @@ NXLog& operator<< (NXLog& out, const NXLogStamp& value)
     out.current_file( value.file() );
 
     // Writing an NXLogStamp to the stream indicates the start of a new entry.
-    // If there's any content in the buffer, we flush it to finalize the previous
-    // log entry.
+    // If there's any content in the buffer, create a new entry in the output
+    // queue.
     if ( out.synchronized() )
-        out.flush();
-
+        out.new_stack_entry();
 
     out << out.stamp_to_string(value);
 
     return out;
 }
-
diff --git a/nxcomp/src/Log.h b/nxcomp/src/Log.h
index 44c43a47b..ecc6ea9ed 100644
--- a/nxcomp/src/Log.h
+++ b/nxcomp/src/Log.h
@@ -35,6 +35,8 @@
 #include <map>
 #include <stdlib.h>
 #include <string.h>
+#include <assert.h>
+#include <stack>
 
 /** Log severity level */
 enum NXLogLevel
@@ -138,11 +140,11 @@ class NXLog
 
     typedef struct per_thread_data_s
     {
-        NXLogLevel          current_level;
-        std::string*        current_file;
-        std::string*        thread_name;
-        std::stringstream*  buffer;
-        NXLog*              log_obj;
+        NXLogLevel                      current_level;
+        std::string*                    current_file;
+        std::string*                    thread_name;
+        std::stack<std::stringstream*>  buffer;
+        NXLog*                          log_obj;
     } per_thread_data;
 
 
@@ -160,7 +162,11 @@ class NXLog
 
         delete pdt->current_file;
         delete pdt->thread_name;
-        delete pdt->buffer;
+
+        while (!pdt->buffer.empty()) {
+            (void) pdt->buffer.pop ();
+        }
+
         delete pdt;
     }
 
@@ -172,7 +178,6 @@ class NXLog
         {
             ret = new per_thread_data;
             ret->current_level = NXDEBUG;
-            ret->buffer = new std::stringstream();
             ret->current_file = new std::string();
             ret->thread_name = new std::string();
             ret->log_obj = const_cast<NXLog*>(this);
@@ -195,6 +200,12 @@ class NXLog
     /** Convert NXLogStamp to string according to the current configuration */
     std::string stamp_to_string(const NXLogStamp& stamp) const;
 
+    void new_stack_entry()
+    {
+        per_thread_data *pdt = get_data();
+        pdt->buffer.push(new std::stringstream());
+    }
+
     /**
      * Internal flush function
      *
@@ -207,15 +218,18 @@ class NXLog
      */
     void flush(per_thread_data *pdt)
     {
-        const std::string str = pdt->buffer->str();
+        if (!pdt->buffer.empty ()) {
+            const std::string str = pdt->buffer.top()->str();
 
-        if (!str.empty())
-        {
-            pthread_mutex_lock(&output_lock_);
-            (*stream()) << str;
-            pthread_mutex_unlock(&output_lock_);
-            pdt->buffer->str(std::string());
-            pdt->buffer->clear();
+            if (!str.empty())
+            {
+                pthread_mutex_lock(&output_lock_);
+                (*stream()) << str;
+                pthread_mutex_unlock(&output_lock_);
+            }
+
+            /* Remove from stack. */
+            pdt->buffer.pop();
         }
     }
 
@@ -404,7 +418,8 @@ class NXLog
             if ( synchronized() )
             {
                 per_thread_data *pdt = get_data();
-                (*pdt->buffer) << F;
+                assert (!pdt->buffer.empty ());
+                (*pdt->buffer.top()) << F;
                 flush();
             }
             else
@@ -484,9 +499,10 @@ NXLog& operator<<(NXLog& out, const T& value)
             // gets full. Then we dump the whole thing at once to the output stream, synchronizing
             // with a mutex.
             NXLog::per_thread_data *pdt = out.get_data();
-            (*pdt->buffer) << value;
+            assert (!pdt->buffer.empty ());
+            (*pdt->buffer.top()) << value;
 
-            if ( ss_length(pdt->buffer) >= out.thread_buffer_size_ || has_newline(value) )
+            if ( ss_length(pdt->buffer.top()) >= out.thread_buffer_size_ || has_newline(value) )
                 out.flush();
 
         }
-- 
cgit v1.2.3


From 1829a35cd0413a752bad082967508ffd8b1c7d01 Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Sat, 30 Sep 2017 15:32:33 +0200
Subject: nxcomp/src/Log.h: block signals while writing out data.

Prevents race conditions caused by signal handlers while flushing out
our log queue.
---
 nxcomp/src/Log.h | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Log.h b/nxcomp/src/Log.h
index ecc6ea9ed..e3b1397d2 100644
--- a/nxcomp/src/Log.h
+++ b/nxcomp/src/Log.h
@@ -35,6 +35,7 @@
 #include <map>
 #include <stdlib.h>
 #include <string.h>
+#include <signal.h>
 #include <assert.h>
 #include <stack>
 
@@ -218,6 +219,22 @@ class NXLog
      */
     void flush(per_thread_data *pdt)
     {
+         /*
+          * Block all signals until we are dong printing data.
+          * Ensures that a signal handler won't interrupt us
+          * and overwrite the buffer data mid-print, leading
+          * to confusing output.
+          */
+        sigset_t orig_signal_mask,
+                 tmp_signal_mask;
+        sigemptyset(&orig_signal_mask);
+
+        /* Set up new mask to block all signals. */
+        sigfillset(&tmp_signal_mask);
+
+        /* Block all signals. */
+        pthread_sigmask(SIG_BLOCK, &tmp_signal_mask, &orig_signal_mask);
+
         if (!pdt->buffer.empty ()) {
             const std::string str = pdt->buffer.top()->str();
 
@@ -231,6 +248,9 @@ class NXLog
             /* Remove from stack. */
             pdt->buffer.pop();
         }
+
+        /* Restore old signal mask. */
+        pthread_sigmask(SIG_SETMASK, &orig_signal_mask, NULL);
     }
 
 
-- 
cgit v1.2.3


From 6c3cf54ba84e9e31a5be62ab58391106d35eaff6 Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Fri, 27 Oct 2017 08:32:14 +0200
Subject: nxcomp/src/Log.cpp: add PID to thread ID output if requested.

The default function we use (if a thread name is not specified
explicitly) is pthread_self(). This function returns a number that is
guaranteed to be unique for each thread within a process, but this
assertion doesn't hold globally. Hence only using the thread ID is
ambiguous when logging from multiple processes.
---
 nxcomp/src/Log.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Log.cpp b/nxcomp/src/Log.cpp
index 83e11b98a..951c10a04 100644
--- a/nxcomp/src/Log.cpp
+++ b/nxcomp/src/Log.cpp
@@ -29,6 +29,7 @@
 #include <fstream>
 #include <sstream>
 #include <iomanip>
+#include <unistd.h>
 
 #include "Log.h"
 #include "config.h"
@@ -95,7 +96,7 @@ std::string NXLog::stamp_to_string(const NXLogStamp& stamp) const
     if ( log_thread_id() )
     {
         if ( thread_name().empty() )
-            oss << pthread_self() << " ";
+            oss << getpid() << "/" << pthread_self() << " ";
         else
             oss << "[" << thread_name() << "] ";
     }
-- 
cgit v1.2.3


From 5efcd39fc05b804ede122e4a930de3db5d041014 Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Sat, 30 Sep 2017 16:53:48 +0200
Subject: nxcomp/src/Log.h: prepare for logger testing application.

DO NOT USE!
---
 nxcomp/src/Log.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Log.h b/nxcomp/src/Log.h
index e3b1397d2..aed929b31 100644
--- a/nxcomp/src/Log.h
+++ b/nxcomp/src/Log.h
@@ -124,6 +124,9 @@ class NXLogStamp
  */
 class NXLog
 {
+#ifdef INTERNAL_LOGGING_TEST
+    protected:
+#endif
     NXLogLevel level_;
 
     std::ostream *stream_;
@@ -217,6 +220,7 @@ class NXLog
      * This means that get_data() stops working correctly, and we need
      * to be able to pass the old pointer.
      */
+    virtual /* Note: this function needs to be virtual for the logging test application. Don't remove. */
     void flush(per_thread_data *pdt)
     {
          /*
-- 
cgit v1.2.3


From ceac077637d147b54abeeb4f0154bf152ba13138 Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Sat, 30 Sep 2017 16:58:16 +0200
Subject: nxcomp: add basic logging_test utility in test subdirectory.

Needs more sophisticated features to actually test stuff correctly.
---
 nxcomp/.gitignore            |   4 +
 nxcomp/Makefile.am           |   2 +-
 nxcomp/configure.ac          |   1 +
 nxcomp/test/Makefile.am      |  22 +++++
 nxcomp/test/logging_test.cpp | 224 +++++++++++++++++++++++++++++++++++++++++++
 nxcomp/test/logging_test.h   | 121 +++++++++++++++++++++++
 6 files changed, 373 insertions(+), 1 deletion(-)
 create mode 100644 nxcomp/test/Makefile.am
 create mode 100644 nxcomp/test/logging_test.cpp
 create mode 100644 nxcomp/test/logging_test.h

(limited to 'nxcomp')

diff --git a/nxcomp/.gitignore b/nxcomp/.gitignore
index 019202342..1d00b755b 100644
--- a/nxcomp/.gitignore
+++ b/nxcomp/.gitignore
@@ -19,3 +19,7 @@ m4/lt~obsolete.m4
 nxcomp.pc
 src/Makefile
 src/Makefile.in
+test/.deps/
+test/Makefile
+test/Makefile.in
+test/logging_test
diff --git a/nxcomp/Makefile.am b/nxcomp/Makefile.am
index ae5991c3d..c1f6226bc 100644
--- a/nxcomp/Makefile.am
+++ b/nxcomp/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src
+SUBDIRS = src test
 
 pkgconfig_DATA = nxcomp.pc
 
diff --git a/nxcomp/configure.ac b/nxcomp/configure.ac
index a61db32c1..3ae81f0d1 100644
--- a/nxcomp/configure.ac
+++ b/nxcomp/configure.ac
@@ -108,6 +108,7 @@ AC_ARG_ENABLE([valgrind],
 AC_CONFIG_FILES([
 Makefile
 src/Makefile
+test/Makefile
 nxcomp.pc
 ])
 
diff --git a/nxcomp/test/Makefile.am b/nxcomp/test/Makefile.am
new file mode 100644
index 000000000..412b8ea94
--- /dev/null
+++ b/nxcomp/test/Makefile.am
@@ -0,0 +1,22 @@
+NULL =
+
+noinst_PROGRAMS = logging_test
+EXTRA_DIST = logging_test
+
+AM_CPPFLAGS = -I$(top_srcdir)/src
+AM_CXXFLAGS =		\
+  @PTHREAD_CFLAGS@	\
+  $(NULL)
+
+logging_test_SOURCES = logging_test.cpp
+logging_test_LDADD =			\
+    $(top_srcdir)/src/.libs/libXcomp.a	\
+    @PTHREAD_LIBS@			\
+    $(NULL)
+
+logging_test_LDFLAGS =	\
+    $(PTHREAD_LDFLAGS)	\
+    $(NULL)
+
+check: all
+	./logging_test
diff --git a/nxcomp/test/logging_test.cpp b/nxcomp/test/logging_test.cpp
new file mode 100644
index 000000000..7e2d7d213
--- /dev/null
+++ b/nxcomp/test/logging_test.cpp
@@ -0,0 +1,224 @@
+#include <cstddef>
+#include <pthread.h>
+#include <signal.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <cstdlib>
+#include <ctime>
+#include <climits>
+#include <vector>
+#include <cstring>
+
+#include "logging_test.h"
+
+Faulty_Logger faulty_logger;
+NXLog good_logger;
+
+void print_sigmask () {
+  sigset_t orig_mask;
+  sigemptyset (&orig_mask);
+
+  pthread_sigmask (SIG_SETMASK, NULL, &orig_mask);
+
+  bool empty = true;
+  for (std::size_t i = 0; i < NSIG; ++i) {
+    if (sigismember (&orig_mask, i)) {
+      nxdbg_good << "Signal i (" << i << ") in signal mask." << std::endl;
+      empty = false;
+    }
+  }
+
+  if (empty) {
+    nxdbg_good << "Signal mask empty.";
+  }
+}
+
+void* log_task (void* /* unused */) {
+  /* print_sigmask (); */
+
+  for (std::size_t i = 0; i < 10; ++i) {
+    nxinfo << "Log message " << i << std::endl;
+  }
+}
+
+void sig_handler (int signo) {
+  nxinfo << "Received signal " << signo << std::endl;
+}
+
+void setup_faulty_logger () {
+  faulty_logger.log_level (true);
+  faulty_logger.log_unix_time (false);
+  faulty_logger.log_time (true);
+  faulty_logger.log_location (true);
+  faulty_logger.log_thread_id (true);
+  faulty_logger.level (NXDEBUG);
+}
+
+void setup_good_logger () {
+  good_logger.log_level (true);
+  good_logger.log_unix_time (false);
+  good_logger.log_time (true);
+  good_logger.log_location (true);
+  good_logger.log_thread_id (true);
+  good_logger.level (NXDEBUG);
+}
+
+pthread_t spawn_thread () {
+  pthread_t thread_id;
+  int pthread_ret;
+
+  sigset_t block_mask, orig_mask;
+  sigemptyset (&orig_mask);
+  sigfillset (&block_mask);
+
+  pthread_sigmask (SIG_BLOCK, &block_mask, &orig_mask);
+
+  pthread_ret = pthread_create (&thread_id, NULL, log_task, NULL);
+
+  pthread_sigmask (SIG_SETMASK, &orig_mask, NULL);
+
+  return (thread_id);
+}
+
+void install_signal_handler () {
+  struct sigaction sa;
+  sa.sa_handler = sig_handler;
+  sigemptyset (&sa.sa_mask);
+  sa.sa_flags = SA_RESTART;
+
+  if (-1 == sigaction (SIGUSR1, &sa, NULL)) {
+    nxerr_good << "Unable to install signal handler!" << std::endl;
+  }
+  else {
+    nxdbg_good << "Signal handler registered successfully for SIGUSR1." << std::endl;
+  }
+}
+
+void killing_process_work (pid_t parent_pid) {
+  /* Seed PRNG. */
+  std::srand (std::time (0));
+
+  for (std::size_t i = 0; i < 25; ++i) {
+    /* Sleep for 4 seconds + some random number up to a second. */
+    std::size_t rand_add = (std::rand () % 1000000);
+    usleep (4000000 + rand_add);
+
+    /* Send SIGUSR1 to parent process. */
+    nxdbg_good << "Sending SIGUSR1 (" << SIGUSR1 << ") to parent_pid (" << parent_pid << ")" << std::endl;
+
+    if (kill (parent_pid, SIGUSR1)) {
+      int saved_errno = errno;
+      nxerr_good << "Failed to deliver signal to parent, aborting." << std::endl;
+      nxerr_good << "Error " << saved_errno << ": " << strerror (saved_errno) << std::endl;
+      exit (EXIT_FAILURE);
+    }
+  }
+
+  exit (EXIT_SUCCESS);
+}
+
+void killing_process_init (int argc, char **argv) {
+  /* We're in the "killing process". */
+  pid_t parent_pid = getppid ();
+
+  setup_good_logger ();
+
+  for (std::size_t i = 0; i < argc; ++i) {
+    nxdbg_good << "argv[" << i << "]: " << argv[i] << std::endl;
+  }
+
+  char *end = NULL;
+
+  errno = 0;
+  long parent_pid_check = std::strtol (argv[1], &end, 0);
+
+  if ((errno == ERANGE) && (parent_pid_check == LONG_MAX)) {
+    /* Overflow, handle gracefully. */
+    parent_pid_check = 1;
+  }
+
+  if ((errno == ERANGE) && (parent_pid_check == LONG_MIN)) {
+    /* Underflow, handle gracefully. */
+    parent_pid_check = 1;
+  }
+
+  if (*end) {
+    /* Conversion error (for inputs like "<number>X", end will point to X.) */
+    parent_pid_check = 1;
+  }
+
+  if (parent_pid != parent_pid_check) {
+    nxinfo_good << "Parent PID verification via first argument failed, trusting getppid ()." << std::endl;
+  }
+
+  killing_process_work (parent_pid);
+}
+
+int main (int argc, char **argv) {
+  if (argc > 1) {
+    killing_process_init (argc, argv);
+  }
+  else {
+    /* That's the main process. */
+
+    /* First, fork and create the "killing process". */
+    pid_t pid = fork ();
+
+    if (0 == pid) {
+      /* Child process. */
+      pid_t parent_pid = getppid ();
+
+      /* Prepare to pass-through parent PID. */
+      std::stringstream ss;
+      ss << parent_pid;
+
+      std::vector<std::string> new_argv;
+      new_argv.push_back (std::string (argv[0]));
+      new_argv.push_back (ss.str ());
+
+      std::vector<char *> new_argv_c_str;
+      for (std::vector<std::string>::iterator it = new_argv.begin (); it != new_argv.end (); ++it) {
+        const char *elem = (*it).c_str ();
+        new_argv_c_str.push_back (strndup (elem, std::strlen (elem)));
+      }
+
+      /* Add null pointer as last element. */
+      new_argv_c_str.push_back (0);
+
+      /* Relaunch, with argv[1] containing the ppid. */
+      if (0 != execvp (new_argv_c_str.front (), &(new_argv_c_str.front ()))) {
+        const int saved_errno = errno;
+        std::cerr << "Failed to start \"killing process\"! Panic!" << std::endl;
+        std::cerr << "System error: " << std::strerror (saved_errno) << std::endl;
+        exit (EXIT_FAILURE);
+      }
+    }
+    else if (0 > pid) {
+      const int saved_errno = errno;
+      std::cerr << "Error while forking main process! Panic!" << std::endl;
+      std::cerr << "System error: " << std::strerror (saved_errno) << std::endl;
+      exit (EXIT_FAILURE);
+    }
+    else {
+      /* Main process. */
+      /* Falls through to general code below. */
+    }
+  }
+
+  setup_faulty_logger ();
+
+  pthread_t thread_id = spawn_thread ();
+
+  setup_good_logger ();
+
+  install_signal_handler ();
+
+  /* print_sigmask (); */
+
+  log_task (NULL);
+
+  pthread_join (thread_id, NULL);
+
+  exit (EXIT_SUCCESS);
+}
diff --git a/nxcomp/test/logging_test.h b/nxcomp/test/logging_test.h
new file mode 100644
index 000000000..239fbfe2b
--- /dev/null
+++ b/nxcomp/test/logging_test.h
@@ -0,0 +1,121 @@
+#ifndef LOGGING_TEST_H
+#define LOGGING_TEST_H
+
+#include <unistd.h>
+
+#define INTERNAL_LOGGING_TEST
+#include "Log.h"
+
+class Faulty_Logger : public NXLog {
+    /* Copied from base class, inserted "fault" within critical section. */
+    using NXLog::flush;
+    void flush(per_thread_data *pdt)
+    {
+        sigset_t orig_signal_mask,
+                 tmp_signal_mask;
+        sigemptyset(&orig_signal_mask);
+
+        sigfillset(&tmp_signal_mask);
+
+        pthread_sigmask(SIG_BLOCK, &tmp_signal_mask, &orig_signal_mask);
+
+        if (!pdt->buffer.empty ()) {
+            const std::string str = pdt->buffer.top()->str();
+
+            if (!str.empty())
+            {
+                pthread_mutex_lock(&output_lock_);
+                usleep (3000000);
+                (*stream()) << str;
+                pthread_mutex_unlock(&output_lock_);
+            }
+
+            pdt->buffer.pop();
+        }
+
+        pthread_sigmask(SIG_SETMASK, &orig_signal_mask, NULL);
+    }
+
+    template<typename T>
+    friend Faulty_Logger& operator<<(Faulty_Logger& out, const T& value);
+
+    friend Faulty_Logger& operator<< (Faulty_Logger& out, const NXLogStamp& value);
+};
+
+template <typename T>
+Faulty_Logger& operator<<(Faulty_Logger& out, const T& value) {
+  if ( out.will_log() ) {
+    if ( out.synchronized() ) {
+      // In synchronized mode, we buffer data until a newline, std::flush, or the buffer
+      // gets full. Then we dump the whole thing at once to the output stream, synchronizing
+      // with a mutex.
+      Faulty_Logger::per_thread_data *pdt = out.get_data();
+      assert (!pdt->buffer.empty ());
+      usleep (1000000);
+      (*pdt->buffer.top()) << value;
+
+      if ( ss_length(pdt->buffer.top()) >= out.thread_buffer_size_ || has_newline(value) )
+          out.flush();
+    }
+    else {
+        // In async mode we just dump data on the output stream as-is.
+        // Multithreaded code will have ugly output.
+        *(out.stream()) << value;
+    }
+  }
+
+  return out;
+}
+
+Faulty_Logger& operator<< (Faulty_Logger& out, const NXLogStamp& value)
+{
+    out.current_level( value.level() );
+    out.current_file( value.file() );
+
+    // Writing an NXLogStamp to the stream indicates the start of a new entry.
+    // If there's any content in the buffer, create a new entry in the output
+    // queue.
+    if ( out.synchronized() )
+        out.new_stack_entry();
+
+    out << out.stamp_to_string(value);
+
+    return out;
+}
+
+#undef nxdbg
+#undef nxinfo
+#undef nxwarn
+#undef nxerr
+#undef nxfatal
+
+#define nxdbg    faulty_logger << nxstamp(NXDEBUG)
+#define nxinfo   faulty_logger << nxstamp(NXINFO)
+#define nxwarn   faulty_logger << nxstamp(NXWARNING)
+#define nxerr    faulty_logger << nxstamp(NXERROR)
+#define nxfatal  faulty_logger << nxstamp(NXFATAL)
+
+#define nxdbg_good    good_logger << nxstamp(NXDEBUG)
+#define nxinfo_good   good_logger << nxstamp(NXINFO)
+#define nxwarn_good   good_logger << nxstamp(NXWARNING)
+#define nxerr_good    good_logger << nxstamp(NXERROR)
+#define nxfatal_good  good_logger << nxstamp(NXFATAL)
+
+/* Helper functions used by all component. */
+void print_sigmask ();
+void setup_faulty_logger ();
+void setup_good_logger ();
+
+/* Functions used by both main and auxiliary threads. */
+void* log_task (void* /* unused */);
+
+/* Functions used in main thread only. */
+pthread_t spawn_thread ();
+void install_signal_handler ();
+void sig_handler (int signo);
+
+/* Functions used by "killing" process. */
+void killing_process_init (int argc, char **argv);
+void killing_process_work (pid_t parent_pid);
+
+#endif /* !defined (LOGGING_TEST_H) */
-- 
cgit v1.2.3


From 1cf6aa8f28b971853e77125b92894d286cc0b203 Mon Sep 17 00:00:00 2001
From: Vadim Troshchinskiy <vtroshchinskiy@qindel.com>
Date: Thu, 22 Dec 2016 12:39:40 +0100
Subject: Conversion of Loop.cpp to the new log system

---
 nxcomp/src/Loop.cpp | 3845 +++++++++++++++++----------------------------------
 1 file changed, 1285 insertions(+), 2560 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index 681a5a1ef..38d411232 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -660,15 +660,11 @@ static int ReopenLogFile(char *name, ostream *&stream, int limit);
 static void handleCheckSessionInLoop();
 static void handleCheckBitrateInLoop();
 
-#if defined(TEST) || defined(INFO)
 static void handleCheckSelectInLoop(int &setFDs, fd_set &readSet,
-                                        fd_set &writeSet, T_timestamp selectTs);
-static void handleCheckResultInLoop(int &resultFDs, int &errorFDs, int &setFDs, fd_set &readSet,
+                                        fd_set &writeSet, T_timestamp selectTs);static void handleCheckResultInLoop(int &resultFDs, int &errorFDs, int &setFDs, fd_set &readSet,
                                         fd_set &writeSet, struct timeval &selectTs,
                                             struct timeval &startTs);
-static void handleCheckStateInLoop(int &setFDs);
-#endif
-
+	static void handleCheckStateInLoop(int &setFDs);
 static void handleCheckSessionInConnect();
 
 static inline void handleSetReadInLoop(fd_set &readSet, int &setFDs, struct timeval &selectTs);
@@ -1150,10 +1146,8 @@ int NXTransProxy(int fd, int mode, const char* options)
 
   if (setjmp(context) == 1)
   {
-    #ifdef TEST
-    *logofs << "NXTransProxy: Out of the long jump with pid '"
-            << lastProxy << "'.\n" << logofs_flush;
-    #endif
+    nxinfo << "NXTransProxy: Out of the long jump with pid '"
+            << lastProxy << "'.\n" << std::flush;
 
     return -1;
   }
@@ -1172,10 +1166,8 @@ int NXTransProxy(int fd, int mode, const char* options)
 
   lastProxy = getpid();
 
-  #ifdef TEST
-  *logofs << "NXTransProxy: Main process started with pid '"
-          << lastProxy << "'.\n" << logofs_flush;
-  #endif
+  nxinfo << "NXTransProxy: Main process started with pid '"
+          << lastProxy << "'.\n" << std::flush;
 
   SetMode(mode);
 
@@ -1183,15 +1175,13 @@ int NXTransProxy(int fd, int mode, const char* options)
   {
     if (fd != NX_FD_ANY)
     {
-      #ifdef TEST
 
-      *logofs << "NXTransProxy: Agent descriptor for X client connections is FD#"
-              << fd << ".\n" << logofs_flush;
+      nxinfo << "NXTransProxy: Agent descriptor for X client connections is FD#"
+              << fd << ".\n" << std::flush;
 
-      *logofs << "NXTransProxy: Disabling listening on further X client connections.\n"
-              << logofs_flush;
+      nxinfo << "NXTransProxy: Disabling listening on further X client connections.\n"
+              << std::flush;
 
-      #endif
 
       useTcpSocket   = 0;
       useUnixSocket  = 0;
@@ -1204,10 +1194,8 @@ int NXTransProxy(int fd, int mode, const char* options)
   {
     if (fd != NX_FD_ANY)
     {
-      #ifdef TEST
-      *logofs << "NXTransProxy: PANIC! Agent descriptor for X server connections "
-              << "not supported yet.\n" << logofs_flush;
-      #endif
+      nxinfo << "NXTransProxy: PANIC! Agent descriptor for X server connections "
+              << "not supported yet.\n" << std::flush;
 
       cerr << "Error" << ": Agent descriptor for X server connections "
            << "not supported yet.\n";
@@ -1237,10 +1225,8 @@ int NXTransProxy(int fd, int mode, const char* options)
 
   SetLogs();
 
-  #ifdef TEST
-  *logofs << "NXTransProxy: Going to run the NX transport loop.\n"
-          << logofs_flush;
-  #endif
+  nxinfo << "NXTransProxy: Going to run the NX transport loop.\n"
+          << std::flush;
 
   WaitCleanup();
 
@@ -1262,20 +1248,16 @@ void NXTransExit(int code)
 
   if (++recurse > 1)
   {
-    #ifdef TEST
-    *logofs << "NXTransExit: Aborting process with pid '"
+    nxinfo << "NXTransExit: Aborting process with pid '"
             << getpid() << "' due to recursion through "
-            << "exit.\n" << logofs_flush;
-    #endif
+            << "exit.\n" << std::flush;
 
     abort();
   }
 
-  #ifdef TEST
-  *logofs << "NXTransExit: Process with pid '"
+  nxinfo << "NXTransExit: Process with pid '"
           << getpid() << "' called exit with code '"
-          << code << "'.\n" << logofs_flush;
-  #endif
+          << code << "'.\n" << std::flush;
 
   if (control != NULL)
   {
@@ -1346,10 +1328,8 @@ int NXTransCreate(int fd, int mode, const char* options)
 
   if (control != NULL)
   {
-    #ifdef PANIC
-    *logofs << "NXTransCreate: PANIC! The NX transport seems "
-            << "to be already running.\n" << logofs_flush;
-    #endif
+    nxfatal << "NXTransCreate: PANIC! The NX transport seems "
+            << "to be already running.\n" << std::flush;
 
     cerr << "Error" << ": The NX transport seems "
          << "to be already running.\n";
@@ -1361,10 +1341,8 @@ int NXTransCreate(int fd, int mode, const char* options)
 
   if (control == NULL)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Error creating the NX transport.\n"
-            << logofs_flush;
-    #endif
+    nxfatal << "Loop: PANIC! Error creating the NX transport.\n"
+            << std::flush;
 
     cerr << "Error" << ": Error creating the NX transport.\n";
 
@@ -1373,10 +1351,8 @@ int NXTransCreate(int fd, int mode, const char* options)
 
   lastProxy = getpid();
 
-  #ifdef TEST
-  *logofs << "NXTransCreate: Caller process running with pid '"
-          << lastProxy << "'.\n" << logofs_flush;
-  #endif
+  nxinfo << "NXTransCreate: Caller process running with pid '"
+          << lastProxy << "'.\n" << std::flush;
 
   //
   // Set the local proxy mode an parse the
@@ -1412,15 +1388,11 @@ int NXTransCreate(int fd, int mode, const char* options)
 
   proxyFD = fd;
 
-  #ifdef TEST
-  *logofs << "NXTransCreate: Called with NX proxy descriptor '"
-          << proxyFD << "'.\n" << logofs_flush;
-  #endif
+  nxinfo << "NXTransCreate: Called with NX proxy descriptor '"
+          << proxyFD << "'.\n" << std::flush;
 
-  #ifdef TEST
-  *logofs << "NXTransCreate: Creation of the NX transport completed.\n"
-          << logofs_flush;
-  #endif
+  nxinfo << "NXTransCreate: Creation of the NX transport completed.\n"
+          << std::flush;
 
   return 1;
 }
@@ -1458,10 +1430,8 @@ int NXTransAgent(int fd[2])
   }
   else if (control -> ProxyMode != proxy_client)
   {
-    #ifdef PANIC
-    *logofs << "NXTransAgent: Invalid mode while setting the NX agent.\n"
-            << logofs_flush;
-    #endif
+    nxfatal << "NXTransAgent: Invalid mode while setting the NX agent.\n"
+            << std::flush;
 
     cerr << "Error" << ": Invalid mode while setting the NX agent.\n\n";
 
@@ -1475,35 +1445,29 @@ int NXTransAgent(int fd[2])
   agentFD[0] = fd[0];
   agentFD[1] = fd[1];
 
-  #ifdef TEST
 
-  *logofs << "NXTransAgent: Internal descriptors for agent are FD#"
+  nxinfo << "NXTransAgent: Internal descriptors for agent are FD#"
           << agentFD[0] << " and FD#" << agentFD[1] << ".\n"
-          << logofs_flush;
+          << std::flush;
 
-  *logofs << "NXTransAgent: Disabling listening for further X client "
-          << "connections.\n" << logofs_flush;
+  nxinfo << "NXTransAgent: Disabling listening for further X client "
+          << "connections.\n" << std::flush;
 
-  #endif
 
   agent = new Agent(agentFD);
 
   if (agent == NULL || agent -> isValid() != 1)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Error creating the NX memory transport .\n"
-            << logofs_flush;
-    #endif
+    nxfatal << "Loop: PANIC! Error creating the NX memory transport .\n"
+            << std::flush;
 
     cerr << "Error" << ": Error creating the NX memory transport.\n";
 
     HandleCleanup();
   }
 
-  #ifdef TEST
-  *logofs << "NXTransAgent: Enabling memory-to-memory transport.\n"
-          << logofs_flush;
-  #endif
+  nxinfo << "NXTransAgent: Enabling memory-to-memory transport.\n"
+          << std::flush;
 
   return 1;
 }
@@ -1527,21 +1491,17 @@ int NXTransClose(int fd)
   {
     if (proxy != NULL)
     {
-      #ifdef TEST
-      *logofs << "NXTransClose: Closing down all the X connections.\n"
-              << logofs_flush;
-      #endif
+      nxinfo << "NXTransClose: Closing down all the X connections.\n"
+              << std::flush;
 
       CleanupConnections();
     }
   }
-  #ifdef TEST
   else
   {
-    *logofs << "NXTransClose: The NX transport is not running.\n"
-            << logofs_flush;
+    nxinfo << "NXTransClose: The NX transport is not running.\n"
+            << std::flush;
   }
-  #endif
 
   return 1;
 }
@@ -1569,30 +1529,24 @@ int NXTransDestroy(int fd)
 
     if (proxy != NULL)
     {
-      #ifdef TEST
-      *logofs << "NXTransDestroy: Closing down all the X connections.\n"
-              << logofs_flush;
-      #endif
+      nxinfo << "NXTransDestroy: Closing down all the X connections.\n"
+              << std::flush;
 
       CleanupConnections();
     }
 
-    #ifdef TEST
-    *logofs << "NXTransDestroy: Waiting for the NX transport to terminate.\n"
-            << logofs_flush;
-    #endif
+    nxinfo << "NXTransDestroy: Waiting for the NX transport to terminate.\n"
+            << std::flush;
 
     lastDestroy = 1;
 
     WaitCleanup();
   }
-  #ifdef TEST
   else
   {
-    *logofs << "NXTransDestroy: The NX transport is not running.\n"
-            << logofs_flush;
+    nxinfo << "NXTransDestroy: The NX transport is not running.\n"
+            << std::flush;
   }
-  #endif
 
   return 1;
 }
@@ -1674,10 +1628,8 @@ int NXTransSignal(int signal, int action)
 
   if (action == NX_SIGNAL_RAISE)
   {
-    #ifdef TEST
-    *logofs << "NXTransSignal: Raising signal '" << DumpSignal(signal)
-            << "' in the proxy handler.\n" << logofs_flush;
-    #endif
+    nxinfo << "NXTransSignal: Raising signal '" << DumpSignal(signal)
+            << "' in the proxy handler.\n" << std::flush;
 
     HandleSignal(signal);
 
@@ -1685,10 +1637,8 @@ int NXTransSignal(int signal, int action)
   }
   else if (signal == NX_SIGNAL_ANY)
   {
-    #ifdef TEST
-    *logofs << "NXTransSignal: Setting action of all signals to '"
-            << action << "'.\n" << logofs_flush;
-    #endif
+    nxinfo << "NXTransSignal: Setting action of all signals to '"
+            << action << "'.\n" << std::flush;
 
     for (int i = 0; i < 32; i++)
     {
@@ -1702,11 +1652,9 @@ int NXTransSignal(int signal, int action)
   }
   else if (CheckSignal(signal) == 1)
   {
-    #ifdef TEST
-    *logofs << "NXTransSignal: Setting action of signal '"
+    nxinfo << "NXTransSignal: Setting action of signal '"
             << DumpSignal(signal) << "' to '" << action
-            << "'.\n" << logofs_flush;
-    #endif
+            << "'.\n" << std::flush;
 
     if (action == NX_SIGNAL_ENABLE ||
             action == NX_SIGNAL_FORWARD)
@@ -1723,11 +1671,9 @@ int NXTransSignal(int signal, int action)
     }
   }
 
-  #ifdef WARNING
-  *logofs << "NXTransSignal: WARNING! Unable to perform action '"
+  nxwarn << "NXTransSignal: WARNING! Unable to perform action '"
           << action << "' on signal '" << DumpSignal(signal)
-          << "'.\n" << logofs_flush;
-  #endif
+          << "'.\n" << std::flush;
 
   cerr << "Warning" << ": Unable to perform action '" << action
        << "' on signal '" << DumpSignal(signal)
@@ -1740,17 +1686,13 @@ int NXTransCongestion(int fd)
 {
   if (control != NULL && proxy != NULL)
   {
-    #ifdef DUMP
 
     int congestion = proxy -> getCongestion(proxyFD);
-
-    *logofs << "NXTransCongestion: Returning " << congestion
-            << " as current congestion level.\n" << logofs_flush;
+    nxdbg << "NXTransCongestion: Returning " << congestion
+            << " as current congestion level.\n" << std::flush;
 
     return congestion;
 
-    #endif
-
     return (proxy -> getCongestion(proxyFD));
   }
 
@@ -1788,23 +1730,19 @@ int NXTransHandler(int fd, int type, void (*handler)(void *parameter,
     }
     default:
     {
-      #ifdef TEST
-      *logofs << "NXTransHandler: WARNING! Failed to set "
+      nxinfo << "NXTransHandler: WARNING! Failed to set "
               << "the NX callback for event '" << type << "' to '"
               << (void *) handler << "' and parameter '"
-              << parameter << "'.\n" << logofs_flush;
-      #endif
+              << parameter << "'.\n" << std::flush;
 
       return 0;
     }
   }
 
-  #ifdef TEST
-  *logofs << "NXTransHandler: Set the NX "
+  nxinfo << "NXTransHandler: Set the NX "
           << "callback for event '" << type << "' to '"
           << (void *) handler << "' and parameter '"
-          << parameter << "'.\n" << logofs_flush;
-  #endif
+          << parameter << "'.\n" << std::flush;
 
   return 1;
 }
@@ -1819,36 +1757,30 @@ int NXTransRead(int fd, char *data, int size)
   if (control != NULL && agent != NULL &&
           fd == agentFD[0])
   {
-    #ifdef DUMP
-    *logofs << "NXTransRead: Dequeuing " << size << " bytes "
-            << "from FD#" << agentFD[0] << ".\n" << logofs_flush;
-    #endif
+    nxdbg << "NXTransRead: Dequeuing " << size << " bytes "
+            << "from FD#" << agentFD[0] << ".\n" << std::flush;
 
     int result = agent -> dequeueData(data, size);
 
-    #ifdef DUMP
 
     if (result < 0 && EGET() == EAGAIN)
     {
-      *logofs << "NXTransRead: WARNING! Dequeuing from FD#"
-              << agentFD[0] << " would block.\n" << logofs_flush;
+      nxdbg << "NXTransRead: WARNING! Dequeuing from FD#"
+              << agentFD[0] << " would block.\n" << std::flush;
     }
     else
     {
-      *logofs << "NXTransRead: Dequeued " << result << " bytes "
-              << "to FD#" << agentFD[0] << ".\n" << logofs_flush;
+      nxdbg << "NXTransRead: Dequeued " << result << " bytes "
+              << "to FD#" << agentFD[0] << ".\n" << std::flush;
     }
 
-    #endif
 
     return result;
   }
   else
   {
-    #ifdef DUMP
-    *logofs << "NXTransRead: Reading " << size << " bytes "
-            << "from FD#" << fd << ".\n" << logofs_flush;
-    #endif
+    nxdbg << "NXTransRead: Reading " << size << " bytes "
+            << "from FD#" << fd << ".\n" << std::flush;
 
     return read(fd, data, size);
   }
@@ -1864,16 +1796,14 @@ int NXTransReadVector(int fd, struct iovec *iovdata, int iovsize)
   if (control != NULL && agent != NULL &&
           fd == agentFD[0])
   {
-    #if defined(DUMP)
 
     if (control -> ProxyStage >= stage_operational &&
             agent -> localReadable() > 0)
     {
-      *logofs << "NXTransReadVector: WARNING! Agent has data readable.\n"
-              << logofs_flush;
+      nxdbg << "NXTransReadVector: WARNING! Agent has data readable.\n"
+              << std::flush;
     }
 
-    #endif
 
     char *base;
 
@@ -1895,29 +1825,25 @@ int NXTransReadVector(int fd, struct iovec *iovdata, int iovsize)
 
       while (length > 0)
       {
-        #ifdef DUMP
-        *logofs << "NXTransReadVector: Dequeuing " << length
+        nxdbg << "NXTransReadVector: Dequeuing " << length
                 << " bytes " << "from FD#" << agentFD[0] << ".\n"
-                << logofs_flush;
-        #endif
+                << std::flush;
 
         result = agent -> dequeueData(base, length);
 
-        #ifdef DUMP
 
         if (result < 0 && EGET() == EAGAIN)
         {
-          *logofs << "NXTransReadVector: WARNING! Dequeuing from FD#"
-                  << agentFD[0] << " would block.\n" << logofs_flush;
+          nxdbg << "NXTransReadVector: WARNING! Dequeuing from FD#"
+                  << agentFD[0] << " would block.\n" << std::flush;
         }
         else
         {
-          *logofs << "NXTransReadVector: Dequeued " << result
+          nxdbg << "NXTransReadVector: Dequeued " << result
                   << " bytes " << "from FD#" << agentFD[0] << ".\n"
-                  << logofs_flush;
+                  << std::flush;
         }
 
-        #endif
 
         if (result < 0 && total == 0)
         {
@@ -1940,11 +1866,9 @@ int NXTransReadVector(int fd, struct iovec *iovdata, int iovsize)
   }
   else
   {
-    #ifdef DUMP
-    *logofs << "NXTransReadVector: Reading vector with "
+    nxdbg << "NXTransReadVector: Reading vector with "
             << iovsize << " elements from FD#" << fd << ".\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     return readv(fd, iovdata, iovsize);
   }
@@ -1960,29 +1884,21 @@ int NXTransReadable(int fd, int *readable)
   if (control == NULL || agent == NULL ||
           fd != agentFD[0])
   {
-    #ifdef DUMP
 
     int result = GetBytesReadable(fd, readable);
-
     if (result == -1)
     {
-      *logofs << "NXTransReadable: Error detected on FD#"
-              << fd << ".\n" << logofs_flush;
+      nxdbg << "NXTransReadable: Error detected on FD#"
+              << fd << ".\n" << std::flush;
     }
     else
     {
-      *logofs << "NXTransReadable: Returning " << *readable
+      nxdbg << "NXTransReadable: Returning " << *readable
               << " bytes as readable from FD#" << fd
-              << ".\n" << logofs_flush;
+              << ".\n" << std::flush;
     }
 
     return result;
-
-    #else
-
-    return GetBytesReadable(fd, readable);
-
-    #endif
   }
 
   int result = agent -> dequeuableData();
@@ -2002,11 +1918,9 @@ int NXTransReadable(int fd, int *readable)
 
       if (proxy != NULL && proxy -> canRead() == 1)
       {
-        #if defined(TEST) || defined(INFO)
-        *logofs << "NXTransReadable: WARNING! Trying to "
+        nxinfo << "NXTransReadable: WARNING! Trying to "
                 << "read to generate new agent data.\n"
-                << logofs_flush;
-        #endif
+                << std::flush;
 
         //
         // Set the context as the function
@@ -2020,11 +1934,9 @@ int NXTransReadable(int fd, int *readable)
 
         if (proxy -> handleRead() < 0)
         {
-          #if defined(TEST) || defined(INFO)
-          *logofs << "NXTransReadable: Failure reading "
+          nxinfo << "NXTransReadable: Failure reading "
                   << "messages from proxy FD#" << proxyFD
-                  << ".\n" << logofs_flush;
-          #endif
+                  << ".\n" << std::flush;
 
           HandleShutdown();
         }
@@ -2038,11 +1950,9 @@ int NXTransReadable(int fd, int *readable)
         return NXTransReadable(fd, readable);
       }
 
-      #ifdef DUMP
-      *logofs << "NXTransReadable: Returning " << 0
+      nxdbg << "NXTransReadable: Returning " << 0
               << " bytes as readable from FD#" << fd
-              << " with result 0.\n" << logofs_flush;
-      #endif
+              << " with result 0.\n" << std::flush;
 
       *readable = 0;
 
@@ -2050,11 +1960,9 @@ int NXTransReadable(int fd, int *readable)
     }
     case -1:
     {
-      #ifdef DUMP
-      *logofs << "NXTransReadable: Returning " << 0
+      nxdbg << "NXTransReadable: Returning " << 0
               << " bytes as readable from FD#" << fd
-              << " with result -1.\n" << logofs_flush;
-      #endif
+              << " with result -1.\n" << std::flush;
 
       *readable = 0;
 
@@ -2062,11 +1970,9 @@ int NXTransReadable(int fd, int *readable)
     }
     default:
     {
-      #ifdef DUMP
-      *logofs << "NXTransReadable: Returning " << result
+      nxdbg << "NXTransReadable: Returning " << result
               << " bytes as readable from FD#" << fd
-              << " with result 0.\n" << logofs_flush;
-      #endif
+              << " with result 0.\n" << std::flush;
 
       *readable = result;
 
@@ -2095,11 +2001,9 @@ int NXTransWrite(int fd, char *data, int size)
     {
       if (proxy -> canRead(agentFD[1]) == 0)
       {
-        #if defined(DUMP) || defined(TEST)
-        *logofs << "NXTransWrite: WARNING! Delayed enqueuing to FD#"
+        nxdbg << "NXTransWrite: WARNING! Delayed enqueuing to FD#"
                 << agentFD[0] << " with proxy unable to read.\n"
-                << logofs_flush;
-        #endif
+                << std::flush;
 
         ESET(EAGAIN);
 
@@ -2121,11 +2025,9 @@ int NXTransWrite(int fd, char *data, int size)
       // but let the channel borrow the buffer.
       //
 
-      #ifdef DUMP
-      *logofs << "NXTransWrite: Letting the channel borrow "
+      nxdbg << "NXTransWrite: Letting the channel borrow "
               << size << " bytes from FD#" << agentFD[0]
-              << ".\n" << logofs_flush;
-      #endif
+              << ".\n" << std::flush;
 
       result = proxy -> handleRead(agentFD[1], data, size);
 
@@ -2154,46 +2056,40 @@ int NXTransWrite(int fd, char *data, int size)
       // Enqueue the data to the agent transport.
       //
 
-      #ifdef DUMP
-      *logofs << "NXTransWrite: Enqueuing " << size << " bytes "
-              << "to FD#" << agentFD[0] << ".\n" << logofs_flush;
-      #endif
+      nxdbg << "NXTransWrite: Enqueuing " << size << " bytes "
+              << "to FD#" << agentFD[0] << ".\n" << std::flush;
 
       result = agent -> enqueueData(data, size);
     }
 
-    #ifdef DUMP
 
     if (result < 0)
     {
       if (EGET() == EAGAIN)
       {
-        *logofs << "NXTransWrite: WARNING! Enqueuing to FD#"
+        nxdbg << "NXTransWrite: WARNING! Enqueuing to FD#"
                 << agentFD[0] << " would block.\n"
-                << logofs_flush;
+                << std::flush;
       }
       else
       {
-        *logofs << "NXTransWrite: WARNING! Error enqueuing to FD#"
-                << agentFD[0] << ".\n" << logofs_flush;
+        nxdbg << "NXTransWrite: WARNING! Error enqueuing to FD#"
+                << agentFD[0] << ".\n" << std::flush;
       }
     }
     else
     {
-      *logofs << "NXTransWrite: Enqueued " << result << " bytes "
-              << "to FD#" << agentFD[0] << ".\n" << logofs_flush;
+      nxdbg << "NXTransWrite: Enqueued " << result << " bytes "
+              << "to FD#" << agentFD[0] << ".\n" << std::flush;
     }
 
-    #endif
 
     return result;
   }
   else
   {
-    #ifdef DUMP
-    *logofs << "NXTransWrite: Writing " << size << " bytes "
-            << "to FD#" << fd << ".\n" << logofs_flush;
-    #endif
+    nxdbg << "NXTransWrite: Writing " << size << " bytes "
+            << "to FD#" << fd << ".\n" << std::flush;
 
     return write(fd, data, size);
   }
@@ -2225,11 +2121,9 @@ int NXTransWriteVector(int fd, struct iovec *iovdata, int iovsize)
     {
       if (proxy -> canRead(agentFD[1]) == 0)
       {
-        #if defined(DUMP) || defined(TEST)
-        *logofs << "NXTransWriteVector: WARNING! Delayed enqueuing to FD#"
+        nxdbg << "NXTransWriteVector: WARNING! Delayed enqueuing to FD#"
                 << agentFD[0] << " with proxy unable to read.\n"
-                << logofs_flush;
-        #endif
+                << std::flush;
 
         ESET(EAGAIN);
 
@@ -2273,11 +2167,9 @@ int NXTransWriteVector(int fd, struct iovec *iovdata, int iovsize)
           // but let the channel borrow the buffer.
           //
 
-          #ifdef DUMP
-          *logofs << "NXTransWriteVector: Letting the channel borrow "
+          nxdbg << "NXTransWriteVector: Letting the channel borrow "
                   << length << " bytes from FD#" << agentFD[0]
-                  << ".\n" << logofs_flush;
-          #endif
+                  << ".\n" << std::flush;
 
           result = proxy -> handleRead(agentFD[1], base, length);
 
@@ -2306,39 +2198,35 @@ int NXTransWriteVector(int fd, struct iovec *iovdata, int iovsize)
           // Enqueue the data to the agent transport.
           //
 
-          #ifdef DUMP
-          *logofs << "NXTransWriteVector: Enqueuing " << length
+          nxdbg << "NXTransWriteVector: Enqueuing " << length
                   << " bytes " << "to FD#" << agentFD[0] << ".\n"
-                  << logofs_flush;
-          #endif
+                  << std::flush;
 
           result = agent -> enqueueData(base, length);
         }
 
-        #ifdef DUMP
 
         if (result < 0)
         {
           if (EGET() == EAGAIN)
           {
-            *logofs << "NXTransWriteVector: WARNING! Enqueuing to FD#"
+            nxdbg << "NXTransWriteVector: WARNING! Enqueuing to FD#"
                     << agentFD[0] << " would block.\n"
-                    << logofs_flush;
+                    << std::flush;
           }
           else
           {
-            *logofs << "NXTransWriteVector: WARNING! Error enqueuing to FD#"
-                    << agentFD[0] << ".\n" << logofs_flush;
+            nxdbg << "NXTransWriteVector: WARNING! Error enqueuing to FD#"
+                    << agentFD[0] << ".\n" << std::flush;
           }
         }
         else
         {
-          *logofs << "NXTransWriteVector: Enqueued " << result
+          nxdbg << "NXTransWriteVector: Enqueued " << result
                   << " bytes " << "to FD#" << agentFD[0] << ".\n"
-                  << logofs_flush;
+                  << std::flush;
         }
 
-        #endif
 
         if (result < 0 && total == 0)
         {
@@ -2361,11 +2249,9 @@ int NXTransWriteVector(int fd, struct iovec *iovdata, int iovsize)
   }
   else
   {
-    #ifdef DUMP
-    *logofs << "NXTransWriteVector: Writing vector with "
+    nxdbg << "NXTransWriteVector: Writing vector with "
             << iovsize << " elements to FD#" << fd << ".\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     return writev(fd, iovdata, iovsize);
   }
@@ -2377,13 +2263,11 @@ int NXTransPolicy(int fd, int type)
   {
     if (usePolicy == -1)
     {
-      #if defined(TEST) || defined(INFO)
-      *logofs << "NXTransPolicy: Setting flush policy on "
+      nxinfo << "NXTransPolicy: Setting flush policy on "
               << "proxy FD#" << proxyFD << " to '"
               << DumpPolicy(type == NX_POLICY_DEFERRED ?
                      policy_deferred : policy_immediate)
-              << "'.\n" << logofs_flush;
-      #endif
+              << "'.\n" << std::flush;
 
       control -> FlushPolicy = (type == NX_POLICY_DEFERRED ?
                                     policy_deferred : policy_immediate);
@@ -2397,12 +2281,10 @@ int NXTransPolicy(int fd, int type)
     }
     else
     {
-      #if defined(TEST) || defined(INFO)
-      *logofs << "NXTransPolicy: Ignoring the agent "
+      nxinfo << "NXTransPolicy: Ignoring the agent "
               << "setting with user policy set to '"
               << DumpPolicy(control -> FlushPolicy)
-              << "'.\n" << logofs_flush;
-      #endif
+              << "'.\n" << std::flush;
 
       return 0;
     }
@@ -2416,22 +2298,18 @@ int NXTransFlushable(int fd)
   if (proxy == NULL || agent == NULL ||
           fd != agentFD[0])
   {
-    #ifdef DUMP
-    *logofs << "NXTransFlushable: Returning 0 bytes as "
+    nxdbg << "NXTransFlushable: Returning 0 bytes as "
             << "flushable for unrecognized FD#" << fd
-            << ".\n" << logofs_flush;
-    #endif
+            << ".\n" << std::flush;
 
     return 0;
   }
   else
   {
-    #if defined(DUMP) || defined(INFO)
-    *logofs << "NXTransFlushable: Returning " << proxy ->
+    nxdbg << "NXTransFlushable: Returning " << proxy ->
                getFlushable(proxyFD) << " as bytes flushable on "
             << "proxy FD#" << proxyFD << ".\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     return proxy -> getFlushable(proxyFD);
   }
@@ -2441,11 +2319,9 @@ int NXTransFlush(int fd)
 {
   if (proxy != NULL)
   {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "NXTransFlush: Requesting an immediate flush of "
+    nxinfo << "NXTransFlush: Requesting an immediate flush of "
             << "proxy FD#" << proxyFD << ".\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     return proxy -> handleFlush();
   }
@@ -2467,11 +2343,9 @@ int NXTransChannel(int fd, int channelFd, int type)
       return -1;
     }
 
-    #if defined(TEST) || defined(INFO)
-    *logofs << "NXTransChannel: Going to create a new channel "
+    nxinfo << "NXTransChannel: Going to create a new channel "
             << "with type '" << type << "' on FD#" << channelFd
-            << ".\n" << logofs_flush;
-    #endif
+            << ".\n" << std::flush;
 
     int result = -1;
 
@@ -2543,25 +2417,21 @@ int NXTransChannel(int fd, int channelFd, int type)
       }
       default:
       {
-        #ifdef WARNING
-        *logofs << "NXTransChannel: WARNING! Unrecognized channel "
-                << "type '" << type << "'.\n" << logofs_flush;
-        #endif
+        nxwarn << "NXTransChannel: WARNING! Unrecognized channel "
+                << "type '" << type << "'.\n" << std::flush;
 
         break;
       }
     }
 
-    #ifdef WARNING
 
     if (result != 1)
     {
-      *logofs << "NXTransChannel: WARNING! Could not create the "
+      nxwarn << "NXTransChannel: WARNING! Could not create the "
                 << "new channel with type '" << type << "' on FD#"
-                << channelFd << ".\n" << logofs_flush;
+                << channelFd << ".\n" << std::flush;
     }
 
-    #endif
 
     return result;
   }
@@ -2626,11 +2496,9 @@ int NXTransAlert(int code, int local)
 {
   if (proxy != NULL)
   {
-    #if defined(DUMP) || defined(INFO)
-    *logofs << "NXTransAlert: Requesting a NX dialog with code "
+    nxdbg << "NXTransAlert: Requesting a NX dialog with code "
             << code << " and local " << local << ".\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     if (local == 0)
     {
@@ -2657,18 +2525,15 @@ int NXTransAlert(int code, int local)
 
     return 1;
   }
-  #if defined(DUMP) || defined(INFO)
   else
   {
     if (logofs == NULL)
     {
-      logofs = &cerr;
-    }
+      logofs = &cerr;    }
 
-    *logofs << "NXTransAlert: Can't request an alert without "
-            << "a valid NX transport.\n" << logofs_flush;
+    nxdbg << "NXTransAlert: Can't request an alert without "
+            << "a valid NX transport.\n" << std::flush;
   }
-  #endif
 
   return 0;
 }
@@ -2698,10 +2563,8 @@ int NXTransPrepare(int *setFDs, fd_set *readSet,
     return 0;
   }
 
-  #if defined(TEST) || defined(INFO)
-  *logofs << "\nNXTransPrepare: Going to prepare the NX transport.\n"
-          << logofs_flush;
-  #endif
+  nxinfo << "\nNXTransPrepare: Going to prepare the NX transport.\n"
+          << std::flush;
 
   if (control -> ProxyStage < stage_operational)
   {
@@ -2709,24 +2572,22 @@ int NXTransPrepare(int *setFDs, fd_set *readSet,
   }
   else
   {
-    #if defined(TEST) || defined(INFO)
 
     if (isTimestamp(*selectTs) == 0)
     {
-      *logofs << "Loop: WARNING! Preparing the select with requested "
+      nxinfo << "Loop: WARNING! Preparing the select with requested "
               << "timeout of " << selectTs -> tv_sec << " S and "
               << (double) selectTs -> tv_usec / 1000 << " Ms.\n"
-              << logofs_flush;
+              << std::flush;
     }
     else
     {
-      *logofs << "Loop: Preparing the select with requested "
+      nxinfo << "Loop: Preparing the select with requested "
               << "timeout of " << selectTs -> tv_sec << " S and "
               << (double) selectTs -> tv_usec / 1000 << " Ms.\n"
-              << logofs_flush;
+              << std::flush;
     }
 
-    #endif
 
     //
     // Set descriptors of listening sockets.
@@ -2768,11 +2629,9 @@ int NXTransPrepare(int *setFDs, fd_set *readSet,
 
   int diffTs = diffTimestamp(startTs, nowTs);
 
-  #ifdef TEST
-  *logofs << "Loop: Mark - 0 - at " << strMsTimestamp()
+  nxinfo << "Loop: Mark - 0 - at " << strMsTimestamp()
           << " with " << diffTs << " Ms elapsed.\n"
-          << logofs_flush;
-  #endif
+          << std::flush;
 
   //
   // TODO: Should add the read time in two
@@ -2788,10 +2647,8 @@ int NXTransPrepare(int *setFDs, fd_set *readSet,
 
   startTs = nowTs;
 
-  #ifdef DEBUG
-  *logofs << "Loop: New timestamp is " << strMsTimestamp(startTs)
-          << ".\n" << logofs_flush;
-  #endif
+  nxdbg << "Loop: New timestamp is " << strMsTimestamp(startTs)
+          << ".\n" << std::flush;
 
   return 1;
 }
@@ -2811,8 +2668,6 @@ int NXTransSelect(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
 
   static T_timestamp lastTs;
 
-  #endif
-
   if (logofs == NULL)
   {
     logofs = &cerr;
@@ -2834,52 +2689,41 @@ int NXTransSelect(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
     return 0;
   }
 
-  #if defined(TEST) || defined(INFO)
-  *logofs << "\nNXTransSelect: Going to select the NX descriptors.\n"
-          << logofs_flush;
-  #endif
+  nxinfo << "\nNXTransSelect: Going to select the NX descriptors.\n"
+          << std::flush;
 
-  #if defined(TEST) || defined(INFO)
 
   handleCheckSelectInLoop(*setFDs, *readSet, *writeSet, *selectTs);
 
-  #endif
-
-  #ifdef TIME
 
   diffTs = diffTimestamp(lastTs, getNewTimestamp());
-
   if (diffTs > 20)
   {
-    *logofs << "Loop: TIME! Spent " << diffTs
+    nxdbg << "Loop: TIME! Spent " << diffTs
             << " Ms handling messages for proxy FD#"
-            << proxyFD << ".\n" << logofs_flush;
+            << proxyFD << ".\n" << std::flush;
   }
 
   lastTs = getNewTimestamp();
 
-  #endif
-
-  #if defined(TEST) || defined(INFO)
 
   if (isTimestamp(*selectTs) == 0)
   {
-    *logofs << "Loop: WARNING! Executing the select with requested "
+    nxinfo << "Loop: WARNING! Executing the select with requested "
             << "timeout of " << selectTs -> tv_sec << " S and "
             << (double) selectTs -> tv_usec / 1000 << " Ms.\n"
-            << logofs_flush;
+            << std::flush;
   }
   else if (proxy != NULL && proxy -> getFlushable(proxyFD) > 0)
   {
-    *logofs << "Loop: WARNING! Proxy FD#" << proxyFD
+    nxinfo << "Loop: WARNING! Proxy FD#" << proxyFD
             << " has " << proxy -> getFlushable(proxyFD)
             << " bytes to write but timeout is "
             << selectTs -> tv_sec << " S and "
             << selectTs -> tv_usec / 1000 << " Ms.\n"
-            << logofs_flush;
+            << std::flush;
   }
 
-  #endif
 
   //
   // Wait for the selected sockets
@@ -2892,31 +2736,24 @@ int NXTransSelect(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
 
   *errorFDs = EGET();
 
-  #ifdef TIME
 
   diffTs = diffTimestamp(lastTs, getNewTimestamp());
-
   if (diffTs > 100)
   {
-    *logofs << "Loop: TIME! Spent " << diffTs
+    nxdbg << "Loop: TIME! Spent " << diffTs
             << " Ms waiting for new data for proxy FD#"
-            << proxyFD << ".\n" << logofs_flush;
+            << proxyFD << ".\n" << std::flush;
   }
 
   lastTs = getNewTimestamp();
 
-  #endif
-
   //
   // Check the result of the select.
   //
 
-  #if defined(TEST) || defined(INFO)
 
   handleCheckResultInLoop(*resultFDs, *errorFDs, *setFDs, *readSet, *writeSet, *selectTs, startTs);
 
-  #endif
-
   //
   // Get time spent in select. The accouting is done
   // in milliseconds. This is a real problem on fast
@@ -2929,18 +2766,14 @@ int NXTransSelect(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
 
   diffTs = diffTimestamp(startTs, nowTs);
 
-  #ifdef TEST
-  *logofs << "Loop: Out of select after " << diffTs << " Ms "
+  nxinfo << "Loop: Out of select after " << diffTs << " Ms "
           << "at " << strMsTimestamp(nowTs) << " with result "
-          << *resultFDs << ".\n" << logofs_flush;
-  #endif
+          << *resultFDs << ".\n" << std::flush;
 
   startTs = nowTs;
 
-  #ifdef DEBUG
-  *logofs << "Loop: New timestamp is " << strMsTimestamp(startTs)
-          << ".\n" << logofs_flush;
-  #endif
+  nxdbg << "Loop: New timestamp is " << strMsTimestamp(startTs)
+          << ".\n" << std::flush;
 
   if (control -> ProxyStage >= stage_operational)
   {
@@ -2968,29 +2801,25 @@ int NXTransSelect(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
     #endif
 
     {
-      #ifdef TEST
 
       if (*errorFDs == EINTR)
       {
-        *logofs << "Loop: Select failed due to EINTR error.\n"
-                << logofs_flush;
+        nxinfo << "Loop: Select failed due to EINTR error.\n"
+                << std::flush;
       }
       else
       {
-        *logofs << "Loop: WARNING! Call to select failed. Error is "
+        nxinfo << "Loop: WARNING! Call to select failed. Error is "
                 << EGET() << " '" << ESTR() << "'.\n"
-                << logofs_flush;
+                << std::flush;
       }
 
-      #endif
     }
     else
     {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Call to select failed. Error is "
+      nxfatal << "Loop: PANIC! Call to select failed. Error is "
               << EGET() << " '" << ESTR() << "'.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       cerr << "Error" << ": Call to select failed. Error is "
            << EGET() << " '" << ESTR() << "'.\n";
@@ -3027,10 +2856,8 @@ int NXTransExecute(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
     return 0;
   }
 
-  #if defined(TEST) || defined(INFO)
-  *logofs << "\nNXTransExecute: Going to execute I/O on the NX descriptors.\n"
-          << logofs_flush;
-  #endif
+  nxinfo << "\nNXTransExecute: Going to execute I/O on the NX descriptors.\n"
+          << std::flush;
 
   if (control -> ProxyStage >= stage_operational)
   {
@@ -3044,11 +2871,9 @@ int NXTransExecute(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
       handleAgentInLoop(*resultFDs, *errorFDs, *setFDs, *readSet, *writeSet, *selectTs);
     }
 
-    #ifdef TEST
-    *logofs << "Loop: Mark - 1 - at " << strMsTimestamp()
+    nxinfo << "Loop: Mark - 1 - at " << strMsTimestamp()
             << " with " << diffTimestamp(startTs, getTimestamp())
-            << " Ms elapsed.\n" << logofs_flush;
-    #endif
+            << " Ms elapsed.\n" << std::flush;
 
     //
     // Rotate the channel that will be handled
@@ -3063,11 +2888,9 @@ int NXTransExecute(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
 
     handleWritableInLoop(*resultFDs, *writeSet);
 
-    #ifdef TEST
-    *logofs << "Loop: Mark - 2 - at " << strMsTimestamp()
+    nxinfo << "Loop: Mark - 2 - at " << strMsTimestamp()
             << " with " << diffTimestamp(startTs, getTimestamp())
-            << " Ms elapsed.\n" << logofs_flush;
-    #endif
+            << " Ms elapsed.\n" << std::flush;
 
     //
     // Check if any socket has become readable.
@@ -3075,11 +2898,9 @@ int NXTransExecute(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
 
     handleReadableInLoop(*resultFDs, *readSet);
 
-    #ifdef TEST
-    *logofs << "Loop: Mark - 3 - at " << strMsTimestamp()
+    nxinfo << "Loop: Mark - 3 - at " << strMsTimestamp()
             << " with " << diffTimestamp(startTs, getTimestamp())
-            << " Ms elapsed.\n" << logofs_flush;
-    #endif
+            << " Ms elapsed.\n" << std::flush;
 
     //
     // Handle the scheduled events on channels.
@@ -3099,11 +2920,9 @@ int NXTransExecute(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
 
     handleEventsInLoop();
 
-    #ifdef TEST
-    *logofs << "Loop: Mark - 4 - at " << strMsTimestamp()
+    nxinfo << "Loop: Mark - 4 - at " << strMsTimestamp()
             << " with " << diffTimestamp(startTs, getTimestamp())
-            << " Ms elapsed.\n" << logofs_flush;
-    #endif
+            << " Ms elapsed.\n" << std::flush;
 
     //
     // Check if user sent a signal to produce
@@ -3124,11 +2943,9 @@ int NXTransExecute(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
       handleAgentLateInLoop(*resultFDs, *errorFDs, *setFDs, *readSet, *writeSet, *selectTs);
     }
 
-    #ifdef TEST
-    *logofs << "Loop: Mark - 5 - at " << strMsTimestamp()
+    nxinfo << "Loop: Mark - 5 - at " << strMsTimestamp()
             << " with " << diffTimestamp(startTs, getTimestamp())
-            << " Ms elapsed.\n" << logofs_flush;
-    #endif
+            << " Ms elapsed.\n" << std::flush;
 
     //
     // Check if there is any data to flush.
@@ -3138,11 +2955,9 @@ int NXTransExecute(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
 
     handleFlushInLoop();
 
-    #ifdef TEST
-    *logofs << "Loop: Mark - 6 - at " << strMsTimestamp()
+    nxinfo << "Loop: Mark - 6 - at " << strMsTimestamp()
             << " with " << diffTimestamp(startTs, getTimestamp())
-            << " Ms elapsed.\n" << logofs_flush;
-    #endif
+            << " Ms elapsed.\n" << std::flush;
   }
 
   //
@@ -3170,17 +2985,12 @@ int NXTransExecute(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
     // Check coherency of internal state.
     //
 
-    #if defined(TEST) || defined(INFO)
 
     handleCheckStateInLoop(*setFDs);
 
-    #endif
-
-    #ifdef TEST
-    *logofs << "Loop: Mark - 7 - at " << strMsTimestamp()
+    nxinfo << "Loop: Mark - 7 - at " << strMsTimestamp()
             << " with " << diffTimestamp(startTs, getTimestamp())
-            << " Ms elapsed.\n" << logofs_flush;
-    #endif
+            << " Ms elapsed.\n" << std::flush;
   }
 
   //
@@ -3221,11 +3031,9 @@ int InitBeforeNegotiation()
   startTs = nowTs;
   initTs  = nowTs;
 
-  #ifdef TEST
-  *logofs << "Loop: INIT! Taking mark for initialization at "
+  nxinfo << "Loop: INIT! Taking mark for initialization at "
           << strMsTimestamp(initTs) << ".\n"
-          << logofs_flush;
-  #endif
+          << std::flush;
 
   //
   // If not explicitly specified, determine if local
@@ -3248,30 +3056,24 @@ int InitBeforeNegotiation()
 
   if (control -> ProxyMode == proxy_client)
   {
-    #ifdef TEST
-    *logofs << "Loop: Starting watchdog process with timeout of "
+    nxinfo << "Loop: Starting watchdog process with timeout of "
             << control -> InitTimeout / 1000 << " seconds.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     lastWatchdog = NXTransWatchdog(control -> InitTimeout);
 
     if (IsFailed(lastWatchdog))
     {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Can't start the NX watchdog process.\n"
-              << logofs_flush;
-      #endif
+      nxfatal << "Loop: PANIC! Can't start the NX watchdog process.\n"
+              << std::flush;
 
       SetNotRunning(lastWatchdog);
     }
-    #ifdef TEST
     else
     {
-      *logofs << "Loop: Watchdog started with pid '"
-              << lastWatchdog << "'.\n" << logofs_flush;
+      nxinfo << "Loop: Watchdog started with pid '"
+              << lastWatchdog << "'.\n" << std::flush;
     }
-    #endif
   }
 
   //
@@ -3302,11 +3104,9 @@ int InitBeforeNegotiation()
 
   setHostBigEndian(*((unsigned char *) (&test)) == 0);
 
-  #ifdef TEST
-  *logofs << "Loop: Local host is "
+  nxinfo << "Loop: Local host is "
           << (hostBigEndian() ? "big endian" : "little endian")
-          << ".\n" << logofs_flush;
-  #endif
+          << ".\n" << std::flush;
 
   if (control -> ProxyMode == proxy_client)
   {
@@ -3378,33 +3178,27 @@ int SetupProxyConnection()
       SetAndValidateChannelEndPointArg("local", "listen", listenPortValue, listenSocket);
     }
 
-    #ifdef TEST
     connectSocket.getSpec(&socketUri);
-    *logofs << "Loop: connectSocket is "<< ( connectSocket.enabled() ? "enabled" : "disabled") << ". "
-            << "The socket URI is '"<< ( socketUri != NULL ? socketUri : "<unset>") << "'.\n" << logofs_flush;
+    nxinfo << "Loop: connectSocket is "<< ( connectSocket.enabled() ? "enabled" : "disabled") << ". "
+           << "The socket URI is '"<< ( socketUri != NULL ? socketUri : "<unset>") << "'.\n" << std::flush;
+
     listenSocket.getSpec(&socketUri);
-    *logofs << "Loop: listenSocket is "<< ( listenSocket.enabled() ? "enabled" : "disabled") << ". "
-            << "The socket URI is '"<< ( socketUri != NULL ? socketUri : "<unset>") << "'.\n" << logofs_flush;
-    free(socketUri);
-    socketUri = NULL;
-    #endif
+    nxinfo << "Loop: listenSocket is "<< ( listenSocket.enabled() ? "enabled" : "disabled") << ". "
+           << "The socket URI is '"<< ( socketUri != NULL ? socketUri : "<unset>") << "'.\n" << std::flush;
 
+    free(socketUri);    socketUri = NULL;
     if (WE_INITIATE_CONNECTION)
     {
       if (connectSocket.getSpec(&socketUri))
       {
-        #ifdef TEST
-        *logofs << "Loop: Going to connect to '" << socketUri
-                << "'.\n" << logofs_flush;
-        #endif
+        nxinfo << "Loop: Going to connect to '" << socketUri
+                << "'.\n" << std::flush;
         free(socketUri);
 
         proxyFD = ConnectToRemote(connectSocket);
 
-        #ifdef TEST
-        *logofs << "Loop: Connected to remote proxy on FD#"
-                << proxyFD << ".\n" << logofs_flush;
-        #endif
+        nxinfo << "Loop: Connected to remote proxy on FD#"
+                << proxyFD << ".\n" << std::flush;
 
         cerr << "Info" << ": Connected to remote proxy on FD#"
              << proxyFD << ".\n";
@@ -3420,37 +3214,31 @@ int SetupProxyConnection()
 
       if (listenSocket.getSpec(&socketUri))
       {
-        #ifdef TEST
-        *logofs << "Loop: Going to wait for connection at '"
-                << socketUri << "'.\n" << logofs_flush;
-        #endif
+        nxinfo << "Loop: Going to wait for connection at '"
+                << socketUri << "'.\n" << std::flush;
         free(socketUri);
 
         proxyFD = WaitForRemote(listenSocket);
 
-        #ifdef TEST
         if (WE_LISTEN_FORWARDER)
         {
-          *logofs << "Loop: Connected to remote forwarder on FD#"
-                  << proxyFD << ".\n" << logofs_flush;
+          nxinfo << "Loop: Connected to remote forwarder on FD#"
+                  << proxyFD << ".\n" << std::flush;
         }
         else
         {
-          *logofs << "Loop: Connected to remote proxy on FD#"
-                  << proxyFD << ".\n" << logofs_flush;
+          nxinfo << "Loop: Connected to remote proxy on FD#"
+                  << proxyFD << ".\n" << std::flush;
         }
-        #endif
 
       }
     }
   }
-  #ifdef TEST
   else
   {
-    *logofs << "Loop: Using the inherited connection on FD#"
-            << proxyFD << ".\n" << logofs_flush;
+    nxinfo << "Loop: Using the inherited connection on FD#"
+            << proxyFD << ".\n" << std::flush;
   }
-  #endif
 
   //
   // Set TCP_NODELAY on proxy descriptor
@@ -3480,10 +3268,8 @@ int SetupProxyConnection()
 
 int InitAfterNegotiation()
 {
-  #ifdef TEST
-  *logofs << "Loop: Connection with remote proxy completed.\n"
-          << logofs_flush;
-  #endif
+  nxinfo << "Loop: Connection with remote proxy completed.\n"
+          << std::flush;
 
   cerr << "Info" << ": Connection with remote proxy completed.\n"
         << logofs_flush;
@@ -3569,12 +3355,10 @@ int InitAfterNegotiation()
   // rated by the proxy.
   //
 
-  #ifdef TEST
-  *logofs << "Loop: INIT! Completed initialization at "
+  nxinfo << "Loop: INIT! Completed initialization at "
           << strMsTimestamp(nowTs) << " with "
           << diffTimestamp(initTs, nowTs) << " Ms "
-          << "since the init mark.\n" << logofs_flush;
-  #endif
+          << "since the init mark.\n" << std::flush;
 
   initTs = getNewTimestamp();
 
@@ -3602,21 +3386,17 @@ int SetMode(int mode)
   {
     if (mode == NX_MODE_CLIENT)
     {
-      #ifdef TEST
-      *logofs << "Loop: INIT! Initializing with mode "
+      nxinfo << "Loop: INIT! Initializing with mode "
               << "NX_MODE_CLIENT at " << strMsTimestamp()
-              << ".\n" << logofs_flush;
-      #endif
+              << ".\n" << std::flush;
 
       control -> ProxyMode = proxy_client;
     }
     else if (mode == NX_MODE_SERVER)
     {
-      #ifdef TEST
-      *logofs << "Loop: INIT! Initializing with mode "
+      nxinfo << "Loop: INIT! Initializing with mode "
               << "NX_MODE_SERVER at " << strMsTimestamp()
-              << ".\n" << logofs_flush;
-      #endif
+              << ".\n" << std::flush;
 
       control -> ProxyMode = proxy_server;
     }
@@ -3645,10 +3425,8 @@ int SetupProxyInstance()
 
   if (proxy == NULL)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Error creating the NX proxy.\n"
-            << logofs_flush;
-    #endif
+    nxfatal << "Loop: PANIC! Error creating the NX proxy.\n"
+            << std::flush;
 
     cerr << "Error" << ": Error creating the NX proxy.\n";
 
@@ -3663,10 +3441,8 @@ int SetupProxyInstance()
 
   if (statistics == NULL)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Error creating the NX statistics.\n"
-            << logofs_flush;
-    #endif
+    nxfatal << "Loop: PANIC! Error creating the NX statistics.\n"
+            << std::flush;
 
     cerr << "Error" << ": Error creating the NX statistics.\n";
 
@@ -3718,10 +3494,8 @@ int SetupProxyInstance()
           proxy -> handleLinkConfiguration() < 0 ||
               proxy -> handleCacheConfiguration() < 0)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Error configuring the NX transport.\n"
-            << logofs_flush;
-    #endif
+    nxfatal << "Loop: PANIC! Error configuring the NX transport.\n"
+            << std::flush;
 
     cerr << "Error" << ": Error configuring the NX transport.\n";
 
@@ -3768,16 +3542,14 @@ int SetupProxyInstance()
 
   proxy -> handleFlush();
 
-  #if defined(TEST) || defined(INFO)
 
   if (proxy -> getFlushable(proxyFD) > 0)
   {
-    *logofs << "Loop: WARNING! Proxy FD#" << proxyFD << " has data "
+    nxinfo << "Loop: WARNING! Proxy FD#" << proxyFD << " has data "
             << "to flush after setup of the NX transport.\n"
-            << logofs_flush;
+            << std::flush;
   }
 
-  #endif
 
   return 1;
 }
@@ -3827,29 +3599,23 @@ int SetupAuthInstance()
 
         *(launchdAddrUnix.sun_path + launchdAddrNameLength - 1) = '\0';
 
-        #ifdef TEST
-        *logofs << "Loop: Connecting to launchd service "
-                << "on Unix port '" << displayHost << "'.\n" << logofs_flush;
-        #endif
+        nxinfo << "Loop: Connecting to launchd service "
+                << "on Unix port '" << displayHost << "'.\n" << std::flush;
 
         int launchdFd = socket(launchdAddrFamily, SOCK_STREAM, PF_UNSPEC);
 
         if (launchdFd < 0)
         {
-          #ifdef PANIC
-          *logofs << "Loop: PANIC! Call to socket failed. "
+          nxfatal << "Loop: PANIC! Call to socket failed. "
                   << "Error is " << EGET() << " '" << ESTR()
-                  << "'.\n" << logofs_flush;
-          #endif
+                  << "'.\n" << std::flush;
         }
         else if ((success = connect(launchdFd, (sockaddr *) &launchdAddrUnix, launchdAddrLength)) < 0)
         {
-          #ifdef WARNING
-          *logofs << "Loop: WARNING! Connection to launchd service "
+          nxwarn << "Loop: WARNING! Connection to launchd service "
                   << "on Unix port '" << displayHost << "' failed "
                   << "with error " << EGET() << ", '" << ESTR() << "'.\n"
-                  << logofs_flush;
-          #endif
+                  << std::flush;
         }
 
         if (launchdFd >= 0)
@@ -3889,10 +3655,8 @@ int SetupAuthInstance()
 
       if (auth == NULL || auth -> isValid() != 1)
       {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Error creating the X authorization.\n"
-                << logofs_flush;
-        #endif
+        nxfatal << "Loop: PANIC! Error creating the X authorization.\n"
+                << std::flush;
 
         cerr << "Error" << ": Error creating the X authorization.\n";
 
@@ -3900,11 +3664,9 @@ int SetupAuthInstance()
       }
       else if (auth -> isFake() == 1)
       {
-        #ifdef WARNING
-        *logofs << "Loop: WARNING! Could not retrieve the X server "
+        nxwarn << "Loop: WARNING! Could not retrieve the X server "
                 << "authentication cookie.\n"
-                << logofs_flush;
-        #endif
+                << std::flush;
 
         cerr << "Warning" << ": Failed to read data from the X "
              << "auth command.\n";
@@ -3915,18 +3677,14 @@ int SetupAuthInstance()
     }
     else
     {
-      #ifdef TEST
-      *logofs << "Loop: No proxy cookie was provided for "
-              << "authentication.\n" << logofs_flush;
-      #endif
+      nxinfo << "Loop: No proxy cookie was provided for "
+              << "authentication.\n" << std::flush;
 
       cerr << "Info" << ": No proxy cookie was provided for "
            << "authentication.\n";
 
-      #ifdef TEST
-      *logofs << "Loop: Forwarding the real X authorization "
-              << "cookie.\n" << logofs_flush;
-      #endif
+      nxinfo << "Loop: Forwarding the real X authorization "
+              << "cookie.\n" << std::flush;
 
       cerr << "Info" << ": Forwarding the real X authorization "
            << "cookie.\n";
@@ -3962,10 +3720,8 @@ int SetupAgentInstance()
 
     if (result < 0)
     {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Error creating the NX agent connection.\n"
-              << logofs_flush;
-      #endif
+      nxfatal << "Loop: PANIC! Error creating the NX agent connection.\n"
+              << std::flush;
 
       cerr << "Error" << ": Error creating the NX agent connection.\n";
 
@@ -3992,9 +3748,7 @@ int SetupUnixSocket()
   //
 
   if (!control->TempPath) {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Temporal path is null.\n" << logofs_flush;
-    #endif
+    nxfatal << "Loop: PANIC! Temporal path is null.\n" << std::flush;
 
     cerr << "Error" << ": Temporal path is null.\n";
     HandleCleanup();
@@ -4019,9 +3773,7 @@ int SetupUnixSocket()
 
   unixSocketName[0] = '\0'; // Just in case!
 
-  #ifdef PANIC
-  *logofs << "Loop: PANIC! path for unix socket is too long.\n" << logofs_flush;
-  #endif
+  nxfatal << "Loop: PANIC! path for unix socket is too long.\n" << std::flush;
 
   cerr << "Error" << ": path for Unix socket is too long.\n";
   HandleCleanup();
@@ -4055,10 +3807,8 @@ int SetupDisplaySocket(int &addr_family, sockaddr *&addr,
 
     if (display == NULL || *display == '\0')
     {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Host X server DISPLAY is not set.\n"
-              << logofs_flush;
-      #endif
+      nxfatal << "Loop: PANIC! Host X server DISPLAY is not set.\n"
+              << std::flush;
 
       cerr << "Error" << ": Host X server DISPLAY is not set.\n";
 
@@ -4069,10 +3819,8 @@ int SetupDisplaySocket(int &addr_family, sockaddr *&addr,
                      strncasecmp(display, "nx/nx:", 6) == 0 ||
                          strncasecmp(display, "nx:", 3) == 0)
     {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! NX transport on host X server '"
-              << display << "' not supported.\n" << logofs_flush;
-      #endif
+      nxfatal << "Loop: PANIC! NX transport on host X server '"
+              << display << "' not supported.\n" << std::flush;
 
       cerr << "Error" << ": NX transport on host X server '"
            << display << "' not supported.\n";
@@ -4084,11 +3832,9 @@ int SetupDisplaySocket(int &addr_family, sockaddr *&addr,
     }
     else if (strlen(display) >= DEFAULT_STRING_LENGTH)
     {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Host X server DISPLAY cannot exceed "
+      nxfatal << "Loop: PANIC! Host X server DISPLAY cannot exceed "
               << DEFAULT_STRING_LENGTH << " characters.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       cerr << "Error" << ": Host X server DISPLAY cannot exceed "
            << DEFAULT_STRING_LENGTH << " characters.\n";
@@ -4103,10 +3849,8 @@ int SetupDisplaySocket(int &addr_family, sockaddr *&addr,
 
   if (display == NULL)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Out of memory handling DISPLAY variable.\n"
-            << logofs_flush;
-    #endif
+    nxfatal << "Loop: PANIC! Out of memory handling DISPLAY variable.\n"
+            << std::flush;
 
     cerr << "Error" << ": Out of memory handling DISPLAY variable.\n";
 
@@ -4119,10 +3863,8 @@ int SetupDisplaySocket(int &addr_family, sockaddr *&addr,
 
   if ((strncasecmp(display, "/tmp/launch", 11) == 0) || (strncasecmp(display, "/private/tmp/com.apple.launchd", 30) == 0))
   {
-    #ifdef TEST
-    *logofs << "Loop: Using launchd service on socket '"
-            << display << "'.\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: Using launchd service on socket '"
+            << display << "'.\n" << std::flush;
 
     useLaunchdSocket = 1;
   }
@@ -4133,10 +3875,8 @@ int SetupDisplaySocket(int &addr_family, sockaddr *&addr,
 
   if ((separator == NULL) || !isdigit(*(separator + 1)))
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Invalid display '" << display << "'.\n"
-            << logofs_flush;
-    #endif
+    nxfatal << "Loop: PANIC! Invalid display '" << display << "'.\n"
+            << std::flush;
 
     cerr << "Error" << ": Invalid display '" << display << "'.\n";
 
@@ -4147,11 +3887,9 @@ int SetupDisplaySocket(int &addr_family, sockaddr *&addr,
 
   xPort = atoi(separator + 1);
 
-  #ifdef TEST
-  *logofs << "Loop: Using local X display '" << displayHost
+  nxinfo << "Loop: Using local X display '" << displayHost
           << "' with host '" << display << "' and port '"
-          << xPort << "'.\n" << logofs_flush;
-  #endif
+          << xPort << "'.\n" << std::flush;
 
   #ifdef __APPLE__
 
@@ -4168,10 +3906,8 @@ int SetupDisplaySocket(int &addr_family, sockaddr *&addr,
     // UNIX domain port.
     //
 
-    #ifdef TEST
-    *logofs << "Loop: Using real X server on UNIX domain socket.\n"
-            << logofs_flush;
-    #endif
+    nxinfo << "Loop: Using real X server on UNIX domain socket.\n"
+            << std::flush;
 
     sockaddr_un *xServerAddrUNIX = new sockaddr_un;
 
@@ -4250,26 +3986,20 @@ int SetupDisplaySocket(int &addr_family, sockaddr *&addr,
 
     *(unixSocketDir + DEFAULT_STRING_LENGTH - 1) = '\0';
 
-    #ifdef TEST
-    *logofs << "Loop: Assuming X socket in directory '"
-            << unixSocketDir << "'.\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: Assuming X socket in directory '"
+            << unixSocketDir << "'.\n" << std::flush;
 
     if (stat(unixSocketDir, &statInfo) < 0)
     {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Can't determine the location of "
-              << "the X display socket.\n" << logofs_flush;
-      #endif
+      nxfatal << "Loop: PANIC! Can't determine the location of "
+              << "the X display socket.\n" << std::flush;
 
       cerr << "Error" << ": Can't determine the location of "
            << "the X display socket.\n";
 
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Error " << EGET() << " '" << ESTR()
+      nxfatal << "Loop: PANIC! Error " << EGET() << " '" << ESTR()
               << "' checking '" << unixSocketDir << "'.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       cerr << "Error" << ": Error " << EGET() << " '" << ESTR()
            << "' checking '" << unixSocketDir << "'.\n";
@@ -4288,10 +4018,8 @@ int SetupDisplaySocket(int &addr_family, sockaddr *&addr,
 
     #endif
 
-    #ifdef TEST
-    *logofs << "Loop: Assuming X socket name '" << unixSocketName
-            << "'.\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: Assuming X socket name '" << unixSocketName
+            << "'.\n" << std::flush;
 
     strcpy(xServerAddrUNIX -> sun_path, unixSocketName);
 
@@ -4309,10 +4037,8 @@ int SetupDisplaySocket(int &addr_family, sockaddr *&addr,
     // TCP port.
     //
 
-    #ifdef TEST
-    *logofs << "Loop: Using real X server on TCP port.\n"
-            << logofs_flush;
-    #endif
+    nxinfo << "Loop: Using real X server on TCP port.\n"
+            << std::flush;
 
     addr_family = AF_INET;
 
@@ -4320,10 +4046,8 @@ int SetupDisplaySocket(int &addr_family, sockaddr *&addr,
 
     if (xServerIPAddr == 0)
     {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Unknown display host '" << display
-              << "'.\n" << logofs_flush;
-      #endif
+      nxfatal << "Loop: PANIC! Unknown display host '" << display
+              << "'.\n" << std::flush;
 
       cerr << "Error" << ": Unknown display host '" << display
            << "'.\n";
@@ -4439,11 +4163,9 @@ int ListenConnectionAny(sockaddr *addr, socklen_t addrlen, const char *label)
 
   if (newFD == -1)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Call to socket failed for " << label
+    nxfatal << "Loop: PANIC! Call to socket failed for " << label
             << " socket. Error is " << EGET() << " '"
-            << ESTR() << "'.\n" << logofs_flush;
-    #endif
+            << ESTR() << "'.\n" << std::flush;
 
     cerr << "Error" << ": Call to socket failed for " << label
          << " socket. Error is " << EGET() << " '"
@@ -4461,11 +4183,9 @@ int ListenConnectionAny(sockaddr *addr, socklen_t addrlen, const char *label)
 
   if (bind(newFD, addr, addrlen) == -1)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Call to bind failed for " << label
+    nxfatal << "Loop: PANIC! Call to bind failed for " << label
             << ". Error is " << EGET()
-            << " '" << ESTR() << "'.\n" << logofs_flush;
-    #endif
+            << " '" << ESTR() << "'.\n" << std::flush;
 
     cerr << "Error" << ": Call to bind failed for " << label
          << ". Error is " << EGET()
@@ -4475,11 +4195,9 @@ int ListenConnectionAny(sockaddr *addr, socklen_t addrlen, const char *label)
 
   if (listen(newFD, 8) == -1)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Call to listen failed for " << label
+    nxfatal << "Loop: PANIC! Call to listen failed for " << label
             << ". Error is " << EGET()
-            << " '" << ESTR() << "'.\n" << logofs_flush;
-    #endif
+            << " '" << ESTR() << "'.\n" << std::flush;
 
     cerr << "Error" << ": Call to listen failed for " << label
          << ". Error is " << EGET()
@@ -4520,10 +4238,8 @@ int ListenConnectionUnix(const char *path, const char *label)
   if (strlen(path) >= sizeof(unixAddr.sun_path))
 #endif
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Socket path \"" << path << "\" for "
-            << label << " is too long.\n" << logofs_flush;
-    #endif
+    nxfatal << "Loop: PANIC! Socket path \"" << path << "\" for "
+            << label << " is too long.\n" << std::flush;
 
     cerr << "Error" << ": Socket path \"" << path << "\" for "
          << label << " is too long.\n";
@@ -4555,10 +4271,8 @@ int ListenConnectionTCP(const char *host, long port, const char *label)
     int ip = tcpAddr.sin_addr.s_addr = GetHostAddress(host);
     if (ip == 0)
     {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Unknown " << label << " host '" << host
-              << "'.\n" << logofs_flush;
-      #endif
+      nxfatal << "Loop: PANIC! Unknown " << label << " host '" << host
+              << "'.\n" << std::flush;
 
       cerr << "Error" << ": Unknown " << label << " host '" << host
            << "'.\n";
@@ -4590,32 +4304,28 @@ static int AcceptConnection(int fd, int domain, const char *label)
 
   socklen_t addrLen = sizeof(newAddr);
 
-  #ifdef TEST
 
   if (domain == AF_UNIX)
   {
-    *logofs << "Loop: Going to accept new Unix " << label
+    nxinfo << "Loop: Going to accept new Unix " << label
             << " connection on FD#" << fd << ".\n"
-            << logofs_flush;
+            << std::flush;
   }
   else
   {
-    *logofs << "Loop: Going to accept new TCP " << label
+    nxinfo << "Loop: Going to accept new TCP " << label
             << " connection on FD#" << fd << ".\n"
-            << logofs_flush;
+            << std::flush;
   }
 
-  #endif
 
   int newFD = accept(fd, &newAddr, &addrLen);
 
   if (newFD < 0)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Call to accept failed for "
+    nxfatal << "Loop: PANIC! Call to accept failed for "
             << label << " connection. Error is " << EGET()
-            << " '" << ESTR() << "'.\n" << logofs_flush;
-    #endif
+            << " '" << ESTR() << "'.\n" << std::flush;
 
     cerr << "Error" << ": Call to accept failed for "
          << label << " connection. Error is " << EGET()
@@ -4629,11 +4339,9 @@ void HandleShutdown()
 {
   if (proxy -> getShutdown() == 0)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! No shutdown of proxy link "
+    nxfatal << "Loop: PANIC! No shutdown of proxy link "
             << "performed by remote proxy.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     //
     // Close the socket before showing the alert.
@@ -4650,11 +4358,9 @@ void HandleShutdown()
 
     cerr << "Error" << ": Connection with remote peer broken.\n";
 
-    #ifdef TEST
-    *logofs << "Loop: Bytes received so far are "
+    nxinfo << "Loop: Bytes received so far are "
             << (unsigned long long) statistics -> getBytesIn()
-            << ".\n" << logofs_flush;
-    #endif
+            << ".\n" << std::flush;
 
     cerr << "Error" << ": Please check the state of your "
          << "network and retry.\n";
@@ -4663,23 +4369,19 @@ void HandleShutdown()
 
     if (control -> ProxyMode == proxy_server)
     {
-      #ifdef TEST
-      *logofs << "Loop: Showing the proxy abort dialog.\n"
-              << logofs_flush;
-      #endif
+      nxinfo << "Loop: Showing the proxy abort dialog.\n"
+              << std::flush;
 
       HandleAlert(ABORT_PROXY_CONNECTION_ALERT, 1);
 
       handleAlertInLoop();
     }
   }
-  #ifdef TEST
   else
   {
-    *logofs << "Loop: Finalized the remote proxy shutdown.\n"
-            << logofs_flush;
+    nxinfo << "Loop: Finalized the remote proxy shutdown.\n"
+            << std::flush;
   }
-  #endif
 
   HandleCleanup();
 }
@@ -4701,22 +4403,18 @@ int KillProcess(int pid, const char *label, int signal, int wait)
 {
   if (pid > 0)
   {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Killing the " << label << " process '"
+    nxinfo << "Loop: Killing the " << label << " process '"
             << pid << "' from process with pid '" << getpid()
             << "' with signal '" << DumpSignal(signal)
-            << "'.\n" << logofs_flush;
-    #endif
+            << "'.\n" << std::flush;
 
     signal = (signal == 0 ? SIGTERM : signal);
 
     if (kill(pid, signal) < 0 && EGET() != ESRCH)
     {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Couldn't kill the " << label
+      nxfatal << "Loop: PANIC! Couldn't kill the " << label
               << " process with pid '" << pid << "'.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       cerr << "Error" << ": Couldn't kill the " << label
            << " process with pid '" << pid << "'.\n";
@@ -4731,11 +4429,9 @@ int KillProcess(int pid, const char *label, int signal, int wait)
   }
   else
   {
-    #ifdef TEST
-    *logofs << "Loop: No " << label << " process "
+    nxinfo << "Loop: No " << label << " process "
             << "to kill with pid '" << pid
-            << "'.\n" << logofs_flush;
-    #endif
+            << "'.\n" << std::flush;
 
     return 0;
   }
@@ -4743,19 +4439,15 @@ int KillProcess(int pid, const char *label, int signal, int wait)
 
 int CheckProcess(int pid, const char *label)
 {
-  #if defined(TEST) || defined(INFO)
-  *logofs << "Loop: Checking the " << label << " process '"
+  nxinfo << "Loop: Checking the " << label << " process '"
           << pid << "' from process with pid '" << getpid()
-          << "'.\n" << logofs_flush;
-  #endif
+          << "'.\n" << std::flush;
 
   if (kill(pid, SIGCONT) < 0 && EGET() == ESRCH)
   {
-    #ifdef WARNING
-    *logofs << "Loop: WARNING! The " << label << " process "
+    nxwarn << "Loop: WARNING! The " << label << " process "
             << "with pid '" << pid << "' has exited.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     cerr << "Warning" << ": The " << label << " process "
          << "with pid '" << pid << "' has exited.\n";
@@ -4768,21 +4460,17 @@ int CheckProcess(int pid, const char *label)
 
 int StartKeeper()
 {
-  #if defined(TEST) || defined(INFO)
 
   if (IsRunning(lastKeeper) == 1 ||
           IsRestarting(lastKeeper) == 1)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! The house-keeping process is "
+    nxfatal << "Loop: PANIC! The house-keeping process is "
             << "alreay running with pid '" << lastKeeper
-            << "'.\n" << logofs_flush;
-    #endif
+            << "'.\n" << std::flush;
 
     HandleCleanup();
   }
 
-  #endif
 
   //
   // Don't care harvesting the persistent caches if
@@ -4800,53 +4488,43 @@ int StartKeeper()
 
   if (control -> LocalTotalStorageSize > 0)
   {
-    #ifdef TEST
-    *logofs << "Loop: Starting the house-keeping process with "
+    nxinfo << "Loop: Starting the house-keeping process with "
             << "storage size " << control -> PersistentCacheDiskLimit
-            << ".\n" << logofs_flush;
-    #endif
+            << ".\n" << std::flush;
 
     lastKeeper = NXTransKeeper(control -> PersistentCacheDiskLimit,
                                    0, control -> RootPath);
 
     if (IsFailed(lastKeeper))
     {
-      #ifdef WARNING
-      *logofs << "Loop: WARNING! Failed to start the NX keeper process.\n"
-              << logofs_flush;
-      #endif
+      nxwarn << "Loop: WARNING! Failed to start the NX keeper process.\n"
+              << std::flush;
 
       cerr << "Warning" << ": Failed to start the NX keeper process.\n";
 
       SetNotRunning(lastKeeper);
     }
-    #ifdef TEST
     else
     {
-      *logofs << "Loop: Keeper started with pid '"
-              << lastKeeper << "'.\n" << logofs_flush;
+      nxinfo << "Loop: Keeper started with pid '"
+              << lastKeeper << "'.\n" << std::flush;
     }
-    #endif
   }
-  #ifdef TEST
   else
   {
-    *logofs << "Loop: Nothing to do for the keeper process "
+    nxinfo << "Loop: Nothing to do for the keeper process "
             << "with persistent cache not enabled.\n"
-            << logofs_flush;
+            << std::flush;
   }
-  #endif
 
   return 1;
 }
 
 void HandleCleanupForReconnect()
 {
-  #ifdef TEST
-  *logofs << "Loop: Going to clean up system resources for Reconnect "
+  nxinfo << "Loop: Going to clean up system resources for Reconnect "
           << "in process '" << getpid() << "'.\n"
-          << logofs_flush;
-  #endif
+          << std::flush;
   handleTerminatedInLoop();
   DisableSignals();
   if (control)
@@ -4864,11 +4542,9 @@ void HandleCleanupForReconnect()
 }
 void HandleCleanup(int code)
 {
-  #ifdef TEST
-  *logofs << "Loop: Going to clean up system resources "
+  nxinfo << "Loop: Going to clean up system resources "
           << "in process '" << getpid() << "'.\n"
-          << logofs_flush;
-  #endif
+          << std::flush;
 
   handleTerminatedInLoop();
 
@@ -4920,22 +4596,20 @@ void HandleCleanup(int code)
   // safely exit.
   //
 
-  #ifdef TEST
 
   if (getpid() == lastProxy)
   {
-    *logofs << "Loop: Reverting to loop context in process with "
+    nxinfo << "Loop: Reverting to loop context in process with "
             << "pid '" << getpid() << "' at " << strMsTimestamp()
-            << ".\n" << logofs_flush;
+            << ".\n" << std::flush;
   }
   else
   {
-    *logofs << "Loop: Exiting from child process with pid '"
+    nxinfo << "Loop: Exiting from child process with pid '"
             << getpid() << "' at " << strMsTimestamp()
-            << ".\n" << logofs_flush;
+            << ".\n" << std::flush;
   }
 
-  #endif
 
   if (getpid() == lastProxy)
   {
@@ -4968,11 +4642,9 @@ void CleanupKeeper()
 {
   if (keeper != NULL)
   {
-    #ifdef TEST
-    *logofs << "Loop: Freeing up keeper in process "
+    nxinfo << "Loop: Freeing up keeper in process "
             << "with pid '" << getpid() << "'.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     delete keeper;
 
@@ -4991,11 +4663,9 @@ void CleanupStreams()
 
   #ifndef __CYGWIN32__
 
-  #ifdef TEST
-  *logofs << "Loop: Freeing up streams in process "
+  nxinfo << "Loop: Freeing up streams in process "
           << "with pid '" << getpid() << "'.\n"
-          << logofs_flush;
-  #endif
+          << std::flush;
 
   if (logofs != NULL && logofs != &cerr &&
           *errorsFileName != '\0')
@@ -5091,12 +4761,10 @@ void CleanupChildren()
 
   if (IsRunning(lastDialog))
   {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: WARNING! Leaving the dialog process '"
+    nxinfo << "Loop: WARNING! Leaving the dialog process '"
             << lastDialog << "' running in process "
             << "with pid '" << getpid() << "'.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     SetNotRunning(lastDialog);
   }
@@ -5107,22 +4775,18 @@ void CleanupChildren()
 
   if (control -> EnableRestartOnShutdown == 1)
   {
-    #ifdef WARNING
-    *logofs << "Loop: WARNING! Respawning the NX client "
+    nxwarn << "Loop: WARNING! Respawning the NX client "
             << "on display '" << displayHost << "'.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     NXTransClient(displayHost);
   }
 
   for (int i = 0; i < control -> KillDaemonOnShutdownNumber; i++)
   {
-    #ifdef WARNING
-    *logofs << "Loop: WARNING! Killing the NX daemon with "
+    nxwarn << "Loop: WARNING! Killing the NX daemon with "
             << "pid '" << control -> KillDaemonOnShutdown[i]
-            << "'.\n" << logofs_flush;
-    #endif
+            << "'.\n" << std::flush;
 
     KillProcess(control -> KillDaemonOnShutdown[i], "daemon", SIGTERM, 0);
   }
@@ -5132,11 +4796,9 @@ void CleanupGlobal()
 {
   if (proxy != NULL)
   {
-    #ifdef TEST
-    *logofs << "Loop: Freeing up proxy in process "
+    nxinfo << "Loop: Freeing up proxy in process "
             << "with pid '" << getpid() << "'.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     delete proxy;
 
@@ -5145,11 +4807,9 @@ void CleanupGlobal()
 
   if (agent != NULL)
   {
-    #ifdef TEST
-    *logofs << "Loop: Freeing up agent in process "
+    nxinfo << "Loop: Freeing up agent in process "
             << "with pid '" << getpid() << "'.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     delete agent;
 
@@ -5158,11 +4818,9 @@ void CleanupGlobal()
 
   if (auth != NULL)
   {
-    #ifdef TEST
-    *logofs << "Loop: Freeing up auth data in process "
+    nxinfo << "Loop: Freeing up auth data in process "
             << "with pid '" << getpid() << "'.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     delete auth;
 
@@ -5171,11 +4829,9 @@ void CleanupGlobal()
 
   if (statistics != NULL)
   {
-    #ifdef TEST
-    *logofs << "Loop: Freeing up statistics in process "
+    nxinfo << "Loop: Freeing up statistics in process "
             << "with pid '" << getpid() << "'.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     delete statistics;
 
@@ -5184,11 +4840,9 @@ void CleanupGlobal()
 
   if (control != NULL)
   {
-    #ifdef TEST
-    *logofs << "Loop: Freeing up control in process "
+    nxinfo << "Loop: Freeing up control in process "
             << "with pid '" << getpid() << "'.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     delete control;
 
@@ -5200,17 +4854,13 @@ void CleanupConnections()
 {
   if (proxy -> getChannels(channel_x11) != 0)
   {
-    #ifdef TEST
-    *logofs << "Loop: Closing any remaining X connections.\n"
-            << logofs_flush;
-    #endif
+    nxinfo << "Loop: Closing any remaining X connections.\n"
+            << std::flush;
 
     proxy -> handleCloseAllXConnections();
 
-    #ifdef TEST
-    *logofs << "Loop: Closing any remaining listener.\n"
-            << logofs_flush;
-    #endif
+    nxinfo << "Loop: Closing any remaining listener.\n"
+            << std::flush;
 
     proxy -> handleCloseAllListeners();
   }
@@ -5224,11 +4874,9 @@ void CleanupListeners()
   {
     if (tcpFD != -1)
     {
-      #ifdef TEST
-      *logofs << "Loop: Closing TCP listener in process "
+      nxinfo << "Loop: Closing TCP listener in process "
               << "with pid '" << getpid() << "'.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       close(tcpFD);
 
@@ -5242,11 +4890,9 @@ void CleanupListeners()
   {
     if (unixFD != -1)
     {
-      #ifdef TEST
-      *logofs << "Loop: Closing UNIX listener in process "
+      nxinfo << "Loop: Closing UNIX listener in process "
               << "with pid '" << getpid() << "'.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       close(unixFD);
 
@@ -5255,11 +4901,9 @@ void CleanupListeners()
 
     if (*unixSocketName != '\0')
     {
-      #ifdef TEST
-      *logofs << "Loop: Going to remove the Unix domain socket '"
+      nxinfo << "Loop: Going to remove the Unix domain socket '"
               << unixSocketName << "' in process " << "with pid '"
-              << getpid() << "'.\n" << logofs_flush;
-      #endif
+              << getpid() << "'.\n" << std::flush;
 
       unlink(unixSocketName);
     }
@@ -5281,11 +4925,9 @@ void CleanupListeners()
   {
     if (cupsFD != -1)
     {
-      #ifdef TEST
-      *logofs << "Loop: Closing CUPS listener in process "
+      nxinfo << "Loop: Closing CUPS listener in process "
               << "with pid '" << getpid() << "'.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       close(cupsFD);
 
@@ -5299,11 +4941,9 @@ void CleanupListeners()
   {
     if (auxFD != -1)
     {
-      #ifdef TEST
-      *logofs << "Loop: Closing auxiliary X11 listener "
+      nxinfo << "Loop: Closing auxiliary X11 listener "
               << "in process " << "with pid '" << getpid()
-              << "'.\n" << logofs_flush;
-      #endif
+              << "'.\n" << std::flush;
 
       close(auxFD);
 
@@ -5317,11 +4957,9 @@ void CleanupListeners()
   {
     if (smbFD != -1)
     {
-      #ifdef TEST
-      *logofs << "Loop: Closing SMB listener in process "
+      nxinfo << "Loop: Closing SMB listener in process "
               << "with pid '" << getpid() << "'.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       close(smbFD);
 
@@ -5335,11 +4973,9 @@ void CleanupListeners()
   {
     if (mediaFD != -1)
     {
-      #ifdef TEST
-      *logofs << "Loop: Closing multimedia listener in process "
+      nxinfo << "Loop: Closing multimedia listener in process "
               << "with pid '" << getpid() << "'.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       close(mediaFD);
 
@@ -5353,11 +4989,9 @@ void CleanupListeners()
   {
     if (httpFD != -1)
     {
-      #ifdef TEST
-      *logofs << "Loop: Closing http listener in process "
+      nxinfo << "Loop: Closing http listener in process "
               << "with pid '" << getpid() << "'.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       close(httpFD);
 
@@ -5371,11 +5005,9 @@ void CleanupListeners()
   {
     if (fontFD != -1)
     {
-      #ifdef TEST
-      *logofs << "Loop: Closing font server listener in process "
+      nxinfo << "Loop: Closing font server listener in process "
               << "with pid '" << getpid() << "'.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       close(fontFD);
 
@@ -5389,11 +5021,9 @@ void CleanupListeners()
   {
     if (slaveFD != -1)
     {
-      #ifdef TEST
-      *logofs << "Loop: Closing slave listener in process "
+      nxinfo << "Loop: Closing slave listener in process "
               << "with pid '" << getpid() << "'.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       close(slaveFD);
 
@@ -5408,11 +5038,9 @@ void CleanupSockets()
 {
   if (proxyFD != -1)
   {
-    #ifdef TEST
-    *logofs << "Loop: Closing proxy FD in process "
+    nxinfo << "Loop: Closing proxy FD in process "
             << "with pid '" << getpid() << "'.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     close(proxyFD);
 
@@ -5421,11 +5049,9 @@ void CleanupSockets()
 
   if (agentFD[1] != -1)
   {
-    #ifdef TEST
-    *logofs << "Loop: Closing agent FD in process "
+    nxinfo << "Loop: Closing agent FD in process "
             << "with pid '" << getpid() << "'.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     close(agentFD[1]);
 
@@ -5567,11 +5193,9 @@ int CheckAbort()
 {
   if (lastSignal != 0)
   {
-    #ifdef TEST
-    *logofs << "Loop: Aborting the procedure due to signal '"
+    nxinfo << "Loop: Aborting the procedure due to signal '"
             << lastSignal << "', '" << DumpSignal(lastSignal)
-            << "'.\n" << logofs_flush;
-    #endif
+            << "'.\n" << std::flush;
 
     cerr << "Info" << ": Aborting the procedure due to signal '"
          << lastSignal << "'.\n";
@@ -5627,10 +5251,8 @@ void HandleAbort()
     raise(SIGABRT);
   }
 
-  #ifdef TEST
-  *logofs << "Loop: Showing the proxy abort dialog.\n"
-          << logofs_flush;
-  #endif
+  nxinfo << "Loop: Showing the proxy abort dialog.\n"
+          << std::flush;
 
   if (control -> ProxyMode == proxy_server)
   {
@@ -5662,23 +5284,19 @@ void HandleAlert(int code, int local)
 {
   if (lastAlert.code == 0)
   {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Requesting an alert dialog with code "
+    nxinfo << "Loop: Requesting an alert dialog with code "
             << code << " and local " << local << ".\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     lastAlert.code  = code;
     lastAlert.local = local;
   }
-  #if defined(TEST) || defined(INFO)
   else
   {
-    *logofs << "Loop: WARNING! Alert dialog already requested "
+    nxinfo << "Loop: WARNING! Alert dialog already requested "
             << "with code " << lastAlert.code << ".\n"
-            << logofs_flush;
+            << std::flush;
   }
-  #endif
 
   return;
 }
@@ -5687,22 +5305,18 @@ void FlushCallback(int length)
 {
   if (flushCallback != NULL)
   {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Reporting a flush request at "
+    nxinfo << "Loop: Reporting a flush request at "
             << strMsTimestamp() << " with " << length
-            << " bytes written.\n" << logofs_flush;
-    #endif
+            << " bytes written.\n" << std::flush;
 
     (*flushCallback)(flushParameter, length);
   }
-  #if defined(TEST) || defined(INFO)
   else if (control -> ProxyMode == proxy_client)
   {
-    *logofs << "Loop: WARNING! Can't find a flush "
+    nxinfo << "Loop: WARNING! Can't find a flush "
             << "callback in process with pid '" << getpid()
-            << "'.\n" << logofs_flush;
+            << "'.\n" << std::flush;
   }
-  #endif
 }
 
 void KeeperCallback()
@@ -5717,56 +5331,44 @@ void KeeperCallback()
     if (control -> ImageCacheEnableLoad == 1 ||
             control -> ImageCacheEnableSave == 1)
     {
-      #ifdef TEST
-      *logofs << "Loop: Starting the house-keeping process with "
+      nxinfo << "Loop: Starting the house-keeping process with "
               << "image storage size " << control -> ImageCacheDiskLimit
-              << ".\n" << logofs_flush;
-      #endif
+              << ".\n" << std::flush;
 
       lastKeeper = NXTransKeeper(0, control -> ImageCacheDiskLimit,
                                      control -> RootPath);
 
       if (IsFailed(lastKeeper))
       {
-        #ifdef WARNING
-        *logofs << "Loop: WARNING! Can't start the NX keeper process.\n"
-                << logofs_flush;
-        #endif
+        nxwarn << "Loop: WARNING! Can't start the NX keeper process.\n"
+                << std::flush;
 
         SetNotRunning(lastKeeper);
       }
-      #ifdef TEST
       else
       {
-        *logofs << "Loop: Keeper started with pid '"
-                << lastKeeper << "'.\n" << logofs_flush;
+        nxinfo << "Loop: Keeper started with pid '"
+                << lastKeeper << "'.\n" << std::flush;
       }
-      #endif
     }
-    #ifdef TEST
     else
     {
-      *logofs << "Loop: Nothing to do for the keeper process "
+      nxinfo << "Loop: Nothing to do for the keeper process "
               << "with image cache not enabled.\n"
-              << logofs_flush;
+              << std::flush;
     }
-    #endif
   }
-  #ifdef TEST
   else
   {
-    *logofs << "Loop: Nothing to do with the keeper process "
-            << "already running.\n" << logofs_flush;
+    nxinfo << "Loop: Nothing to do with the keeper process "
+            << "already running.\n" << std::flush;
   }
-  #endif
 }
 
 void InstallSignals()
 {
-  #ifdef TEST
-  *logofs << "Loop: Installing signals in process with pid '"
-          << getpid() << "'.\n" << logofs_flush;
-  #endif
+  nxinfo << "Loop: Installing signals in process with pid '"
+          << getpid() << "'.\n" << std::flush;
 
   for (int i = 0; i < 32; i++)
   {
@@ -5782,10 +5384,8 @@ void InstallSignals()
 
 void RestoreSignals()
 {
-  #ifdef TEST
-  *logofs << "Loop: Restoring signals in process with pid '"
-          << getpid() << "'.\n" << logofs_flush;
-  #endif
+  nxinfo << "Loop: Restoring signals in process with pid '"
+          << getpid() << "'.\n" << std::flush;
 
   if (lastMasks.installed == 1)
   {
@@ -5828,11 +5428,9 @@ void DisableSignals()
     {
       if (CheckSignal(i) > 0)
       {
-        #ifdef DUMP
-        *logofs << "Loop: Disabling signal " << i << " '"
+        nxdbg << "Loop: Disabling signal " << i << " '"
                 << DumpSignal(i) << "' in process with pid '"
-                << getpid() << "'.\n" << logofs_flush;
-        #endif
+                << getpid() << "'.\n" << std::flush;
 
         sigaddset(&newMask, i);
       }
@@ -5842,24 +5440,20 @@ void DisableSignals()
 
     lastMasks.blocked++;
   }
-  #ifdef TEST
   else
   {
-    *logofs << "Loop: WARNING! Signals were already blocked in "
+    nxinfo << "Loop: WARNING! Signals were already blocked in "
             << "process with pid '" << getpid() << "'.\n"
-            << logofs_flush;
+            << std::flush;
   }
-  #endif
 }
 
 void EnableSignals()
 {
   if (lastMasks.blocked == 1)
   {
-    #ifdef TEST
-    *logofs << "Loop: Enabling signals in process with pid '"
-            << getpid() << "'.\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: Enabling signals in process with pid '"
+            << getpid() << "'.\n" << std::flush;
 
     sigprocmask(SIG_SETMASK, &lastMasks.saved, NULL);
 
@@ -5867,11 +5461,9 @@ void EnableSignals()
   }
   else
   {
-    #ifdef WARNING
-    *logofs << "Loop: WARNING! Signals were not blocked in "
+    nxwarn << "Loop: WARNING! Signals were not blocked in "
             << "process with pid '" << getpid() << "'.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     cerr << "Warning" << ": Signals were not blocked in "
          << "process with pid '" << getpid() << "'.\n";
@@ -5884,36 +5476,30 @@ void InstallSignal(int signal, int action)
   {
     if (action == NX_SIGNAL_FORWARD)
     {
-      #ifdef TEST
-      *logofs << "Loop: Forwarding handler for signal " << signal
+      nxinfo << "Loop: Forwarding handler for signal " << signal
               << " '" << DumpSignal(signal) << "' in process "
               << "with pid '" << getpid() << "'.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       lastMasks.forward[signal] = 1;
 
       return;
     }
-    #ifdef TEST
     else
     {
-      *logofs << "Loop: Reinstalling handler for signal " << signal
+      nxinfo << "Loop: Reinstalling handler for signal " << signal
               << " '" << DumpSignal(signal) << "' in process "
               << "with pid '" << getpid() << "'.\n"
-              << logofs_flush;
+              << std::flush;
     }
-    #endif
   }
-  #ifdef TEST
   else
   {
-    *logofs << "Loop: Installing handler for signal " << signal
+    nxinfo << "Loop: Installing handler for signal " << signal
             << " '" << DumpSignal(signal) << "' in process "
             << "with pid '" << getpid() << "'.\n"
-            << logofs_flush;
+            << std::flush;
   }
-  #endif
 
   if (signal == SIGALRM && isTimestamp(lastTimer.start))
   {
@@ -5951,11 +5537,9 @@ void RestoreSignal(int signal)
 {
   if (lastMasks.enabled[signal] == 0)
   {
-    #ifdef WARNING
-    *logofs << "Loop: WARNING! Signal '" << DumpSignal(signal)
+    nxwarn << "Loop: WARNING! Signal '" << DumpSignal(signal)
             << " not installed in process with pid '"
-            << getpid() << "'.\n" << logofs_flush;
-    #endif
+            << getpid() << "'.\n" << std::flush;
 
     cerr << "Warning" << ": Signal '" << DumpSignal(signal)
          << " not installed in process with pid '"
@@ -5964,12 +5548,10 @@ void RestoreSignal(int signal)
     return;
   }
 
-  #ifdef TEST
-  *logofs << "Loop: Restoring handler for signal " << signal
+  nxinfo << "Loop: Restoring handler for signal " << signal
           << " '" << DumpSignal(signal) << "' in process "
           << "with pid '" << getpid() << "'.\n"
-          << logofs_flush;
-  #endif
+          << std::flush;
 
   if (signal == SIGALRM && isTimestamp(lastTimer.start))
   {
@@ -5989,29 +5571,25 @@ void HandleSignal(int signal)
     logofs = &cerr;
   }
 
-  #if defined(UNSAFE) && (defined(TEST) || defined(INFO))
 
   if (lastSignal != 0)
   {
-    *logofs << "Loop: WARNING! Last signal is '" << lastSignal
+    nxinfo << "Loop: WARNING! Last signal is '" << lastSignal
             << "', '" << DumpSignal(signal) << "' and not zero "
             << "in process with pid '" << getpid() << "'.\n"
-            << logofs_flush;
+            << std::flush;
   }
 
-  *logofs << "Loop: Signal '" << signal << "', '"
+  nxinfo << "Loop: Signal '" << signal << "', '"
           << DumpSignal(signal) << "' received in process "
-          << "with pid '" << getpid() << "'.\n" << logofs_flush;
+          << "with pid '" << getpid() << "'.\n" << std::flush;
 
-  #endif
 
   if (getpid() != lastProxy && signalHandler != NULL)
   {
-    #if defined(UNSAFE) && (defined(TEST) || defined(INFO))
-    *logofs << "Loop: Calling slave handler in process "
+    nxinfo << "Loop: Calling slave handler in process "
             << "with pid '" << getpid() << "'.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     if ((*signalHandler)(signal) == 0)
     {
@@ -6096,15 +5674,13 @@ void HandleSignal(int signal)
       // memory function if the daemon is not running.
       //
 
-      #ifdef TEST
-      *logofs << "Loop: WARNING! Received signal '12' in "
+      nxinfo << "Loop: WARNING! Received signal '12' in "
               << "process with pid '" << getpid() << "'.\n"
-              << logofs_flush;
+              << std::flush;
 
-      *logofs << "Loop: WARNING! Please check that the "
+      nxinfo << "Loop: WARNING! Please check that the "
               << "cygserver daemon is running.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       break;
     }
@@ -6121,12 +5697,10 @@ void HandleSignal(int signal)
 
       if (getpid() == lastProxy)
       {
-        #if defined(UNSAFE) && defined(TEST)
-        *logofs << "Loop: Registering end of session request "
+        nxinfo << "Loop: Registering end of session request "
                 << "due to signal '" << signal << "', '"
                 << DumpSignal(signal) << "'.\n"
-                << logofs_flush;
-        #endif
+                << std::flush;
 
         lastSignal = signal;
       }
@@ -6146,22 +5720,18 @@ void HandleSignal(int signal)
     if (lastMasks.action[signal].sa_handler != NULL &&
             lastMasks.action[signal].sa_handler != HandleSignal)
     {
-      #if defined(UNSAFE) && defined(TEST)
-      *logofs << "Loop: Forwarding signal '" << signal << "', '"
+      nxinfo << "Loop: Forwarding signal '" << signal << "', '"
               << DumpSignal(signal) << "' to previous handler.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       lastMasks.action[signal].sa_handler(signal);
     }
-    #ifdef WARNING
     else if (lastMasks.action[signal].sa_handler == NULL)
     {
-      *logofs << "Loop: WARNING! Parent requested to forward "
+      nxwarn << "Loop: WARNING! Parent requested to forward "
               << "signal '" << signal << "', '" << DumpSignal(signal)
-              << "' but didn't set a handler.\n" << logofs_flush;
+              << "' but didn't set a handler.\n" << std::flush;
     }
-    #endif
   }
 }
 
@@ -6175,10 +5745,8 @@ int HandleChildren()
 
   if (IsRunning(lastDialog) && HandleChild(lastDialog) == 1)
   {
-    #if defined(UNSAFE) && defined(TEST)
-    *logofs << "Loop: Resetting pid of last dialog process "
-            << "in handler.\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: Resetting pid of last dialog process "
+            << "in handler.\n" << std::flush;
 
     SetNotRunning(lastDialog);
 
@@ -6192,17 +5760,13 @@ int HandleChildren()
 
   if (IsRunning(lastWatchdog) && HandleChild(lastWatchdog) == 1)
   {
-    #if defined(UNSAFE) && defined(TEST)
-    *logofs << "Loop: Watchdog is gone. Setting the last "
-            << "signal to SIGHUP.\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: Watchdog is gone. Setting the last "
+            << "signal to SIGHUP.\n" << std::flush;
 
     lastSignal = SIGHUP;
 
-    #if defined(UNSAFE) && defined(TEST)
-    *logofs << "Loop: Resetting pid of last watchdog process "
-            << "in handler.\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: Resetting pid of last watchdog process "
+            << "in handler.\n" << std::flush;
 
     SetNotRunning(lastWatchdog);
 
@@ -6219,10 +5783,8 @@ int HandleChildren()
 
   if (IsRunning(lastKeeper) && HandleChild(lastKeeper) == 1)
   {
-    #if defined(UNSAFE) && defined(TEST)
-    *logofs << "Loop: Resetting pid of last house-keeping "
-            << "process in handler.\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: Resetting pid of last house-keeping "
+            << "process in handler.\n" << std::flush;
 
     SetNotRunning(lastKeeper);
 
@@ -6236,10 +5798,8 @@ int HandleChildren()
 
   if (IsRunning(lastChild))
   {
-    #if defined(UNSAFE) && defined(TEST)
-    *logofs << "Loop: Resetting pid of last child process "
-            << "in handler.\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: Resetting pid of last child process "
+            << "in handler.\n" << std::flush;
 
     SetNotRunning(lastChild);
 
@@ -6255,10 +5815,8 @@ int HandleChildren()
   // of our parent.
   //
 
-  #if defined(UNSAFE) && (defined(TEST) || defined(INFO))
-  *logofs << "Loop: Ignoring signal received for the "
-          << "unregistered child.\n" << logofs_flush;
-  #endif
+  nxinfo << "Loop: Ignoring signal received for the "
+          << "unregistered child.\n" << std::flush;
 
   return 0;
 }
@@ -6285,11 +5843,9 @@ int WaitChild(int child, const char* label, int force)
 
   for (;;)
   {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Waiting for the " << label
+    nxinfo << "Loop: Waiting for the " << label
             << " process '" << child << "' to die.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     pid = waitpid(child, &status, options);
 
@@ -6300,12 +5856,10 @@ int WaitChild(int child, const char* label, int force)
         return 0;
       }
 
-      #ifdef WARNING
-      *logofs << "Loop: WARNING! Ignoring signal while "
+      nxwarn << "Loop: WARNING! Ignoring signal while "
               << "waiting for the " << label << " process '"
               << child << "' to die.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       continue;
     }
@@ -6324,11 +5878,9 @@ int CheckChild(int pid, int status)
   {
     if (WIFSTOPPED(status))
     {
-      #if defined(UNSAFE) && defined(TEST)
-      *logofs << "Loop: Child process '" << pid << "' was stopped "
+      nxinfo << "Loop: Child process '" << pid << "' was stopped "
               << "with signal " << (WSTOPSIG(status)) << ".\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       return 0;
     }
@@ -6336,11 +5888,9 @@ int CheckChild(int pid, int status)
     {
       if (WIFEXITED(status))
       {
-        #if defined(UNSAFE) && defined(TEST)
-        *logofs << "Loop: Child process '" << pid << "' exited "
+        nxinfo << "Loop: Child process '" << pid << "' exited "
                 << "with status '" << (WEXITSTATUS(status))
-                << "'.\n" << logofs_flush;
-        #endif
+                << "'.\n" << std::flush;
 
         lastStatus = WEXITSTATUS(status);
       }
@@ -6348,26 +5898,22 @@ int CheckChild(int pid, int status)
       {
         if (CheckSignal(WTERMSIG(status)) != 1)
         {
-          #ifdef WARNING
-          *logofs << "Loop: WARNING! Child process '" << pid
+          nxwarn << "Loop: WARNING! Child process '" << pid
                   << "' died because of signal " << (WTERMSIG(status))
                   << ", '" << DumpSignal(WTERMSIG(status)) << "'.\n"
-                  << logofs_flush;
-          #endif
+                  << std::flush;
 
           cerr << "Warning" << ": Child process '" << pid
                << "' died because of signal " << (WTERMSIG(status))
                << ", '" << DumpSignal(WTERMSIG(status)) << "'.\n";
         }
-        #if defined(UNSAFE) && defined(TEST)
         else
         {
-          *logofs << "Loop: Child process '" << pid
+          nxinfo << "Loop: Child process '" << pid
                   << "' died because of signal " << (WTERMSIG(status))
                   << ", '" << DumpSignal(WTERMSIG(status)) << "'.\n"
-                  << logofs_flush;
+                  << std::flush;
         }
-        #endif
 
         lastStatus = 1;
       }
@@ -6379,11 +5925,9 @@ int CheckChild(int pid, int status)
   {
     if (EGET() != ECHILD)
     {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Call to waitpid failed. "
+      nxfatal << "Loop: PANIC! Call to waitpid failed. "
               << "Error is " << EGET() << " '" << ESTR()
-              << "'.\n" << logofs_flush;
-      #endif
+              << "'.\n" << std::flush;
 
       cerr << "Error" << ": Call to waitpid failed. "
            << "Error is " << EGET() << " '" << ESTR()
@@ -6398,10 +5942,8 @@ int CheckChild(int pid, int status)
     // within the call.
     //
 
-    #ifdef TEST
-    *logofs << "Loop: No more children processes running.\n"
-            << logofs_flush;
-    #endif
+    nxinfo << "Loop: No more children processes running.\n"
+            << std::flush;
 
     return 1;
   }
@@ -6411,23 +5953,21 @@ int CheckChild(int pid, int status)
 
 void RegisterChild(int child)
 {
-  #if defined(TEST) || defined(INFO)
 
   if (IsNotRunning(lastChild))
   {
-    *logofs << "Loop: Registering child process '" << child
+    nxinfo << "Loop: Registering child process '" << child
             << "' in process with pid '" << getpid()
-            << "'.\n" << logofs_flush;
+            << "'.\n" << std::flush;
   }
   else
   {
-    *logofs << "Loop: WARNING! Overriding registered child '"
+    nxinfo << "Loop: WARNING! Overriding registered child '"
             << lastChild << "' with new child '" << child
             << "' in process with pid '" << getpid()
-            << "'.\n" << logofs_flush;
+            << "'.\n" << std::flush;
   }
 
-  #endif
 
   lastChild = child;
 }
@@ -6436,11 +5976,9 @@ int CheckParent(const char *name, const char *type, int parent)
 {
   if (parent != getppid() || parent == 1)
   {
-    #ifdef WARNING
-    *logofs << name << ": WARNING! Parent process appears "
+    nxwarn << name << ": WARNING! Parent process appears "
             << "to be dead. Exiting " << type << ".\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     cerr << "Warning" << ": Parent process appears "
          << "to be dead. Exiting " << type << ".\n";
@@ -6457,11 +5995,9 @@ void HandleTimer(int signal)
   {
     if (isTimestamp(lastTimer.start))
     {
-      #if defined(UNSAFE) && defined(TEST)
-      *logofs << "Loop: Timer expired at " << strMsTimestamp()
+      nxinfo << "Loop: Timer expired at " << strMsTimestamp()
               << " in process with pid '" << getpid() << "'.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       if (proxy != NULL)
       {
@@ -6472,11 +6008,9 @@ void HandleTimer(int signal)
     }
     else
     {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Inconsistent timer state "
+      nxfatal << "Loop: PANIC! Inconsistent timer state "
               << " in process with pid '" << getpid() << "'.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       cerr << "Error" << ": Inconsistent timer state "
            << " in process with pid '" << getpid() << "'.\n";
@@ -6484,12 +6018,10 @@ void HandleTimer(int signal)
   }
   else
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Inconsistent signal '"
+    nxfatal << "Loop: PANIC! Inconsistent signal '"
             << signal << "', '" << DumpSignal(signal)
             << "' received in process with pid '"
-            << getpid() << "'.\n" << logofs_flush;
-    #endif
+            << getpid() << "'.\n" << std::flush;
 
     cerr << "Error" << ": Inconsistent signal '"
          << signal << "', '" << DumpSignal(signal)
@@ -6508,11 +6040,9 @@ void SetTimer(int value)
 
     if (diffTs > lastTimer.next.tv_usec / 1000 * 2)
     {
-      #ifdef WARNING
-      *logofs << "Loop: WARNING! Timer missed to expire at "
+      nxwarn << "Loop: WARNING! Timer missed to expire at "
               << strMsTimestamp() << " in process with pid '"
-              << getpid() << "'.\n" << logofs_flush;
-      #endif
+              << getpid() << "'.\n" << std::flush;
 
       cerr << "Warning" << ": Timer missed to expire at "
            << strMsTimestamp() << " in process with pid '"
@@ -6522,11 +6052,9 @@ void SetTimer(int value)
     }
     else
     {
-      #ifdef TEST
-      *logofs << "Loop: Timer already running at "
+      nxinfo << "Loop: Timer already running at "
               << strMsTimestamp() << " in process with pid '"
-              << getpid() << "'.\n" << logofs_flush;
-      #endif
+              << getpid() << "'.\n" << std::flush;
 
       return;
     }
@@ -6559,21 +6087,17 @@ void SetTimer(int value)
   timer.it_interval = lastTimer.next;
   timer.it_value    = lastTimer.next;
 
-  #ifdef TEST
-  *logofs << "Loop: Timer set to " << lastTimer.next.tv_sec
+  nxinfo << "Loop: Timer set to " << lastTimer.next.tv_sec
           << " S and " << lastTimer.next.tv_usec / 1000
           << " Ms at " << strMsTimestamp() << " in process "
           << "with pid '" << getpid() << "'.\n"
-          << logofs_flush;
-  #endif
+          << std::flush;
 
   if (setitimer(ITIMER_REAL, &timer, &lastTimer.value) < 0)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Call to setitimer failed. "
+    nxfatal << "Loop: PANIC! Call to setitimer failed. "
             << "Error is " << EGET() << " '" << ESTR()
-            << "'.\n" << logofs_flush;
-    #endif
+            << "'.\n" << std::flush;
 
     cerr << "Error" << ": Call to setitimer failed. "
          << "Error is " << EGET() << " '" << ESTR()
@@ -6591,20 +6115,16 @@ void ResetTimer()
 {
   if (isTimestamp(lastTimer.start) == 0)
   {
-    #if defined(UNSAFE) && defined(TEST)
-    *logofs << "Loop: Timer not running in process "
+    nxinfo << "Loop: Timer not running in process "
             << "with pid '" << getpid() << "'.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     return;
   }
 
-  #if defined(UNSAFE) && defined(TEST)
-  *logofs << "Loop: Timer reset at " << strMsTimestamp()
+  nxinfo << "Loop: Timer reset at " << strMsTimestamp()
           << " in process with pid '" << getpid()
-          << "'.\n" << logofs_flush;
-  #endif
+          << "'.\n" << std::flush;
 
   //
   // Restore the old signal mask and timer.
@@ -6612,11 +6132,9 @@ void ResetTimer()
 
   if (setitimer(ITIMER_REAL, &lastTimer.value, NULL) < 0)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Call to setitimer failed. "
+    nxfatal << "Loop: PANIC! Call to setitimer failed. "
             << "Error is " << EGET() << " '" << ESTR()
-            << "'.\n" << logofs_flush;
-    #endif
+            << "'.\n" << std::flush;
 
     cerr << "Error" << ": Call to setitimer failed. "
          << "Error is " << EGET() << " '" << ESTR()
@@ -6625,11 +6143,9 @@ void ResetTimer()
 
   if (sigaction(SIGALRM, &lastTimer.action, NULL) < 0)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Call to sigaction failed. "
+    nxfatal << "Loop: PANIC! Call to sigaction failed. "
             << "Error is " << EGET() << " '" << ESTR()
-            << "'.\n" << logofs_flush;
-    #endif
+            << "'.\n" << std::flush;
 
     cerr << "Error" << ": Call to sigaction failed. "
          << "Error is " << EGET() << " '" << ESTR()
@@ -6671,10 +6187,8 @@ int WaitForRemote(ChannelEndPoint &socketAddress)
 
       if (acceptIPAddr == 0)
       {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Cannot accept connections from unknown host '"
-                << acceptHost << "'.\n" << logofs_flush;
-        #endif
+        nxfatal << "Loop: PANIC! Cannot accept connections from unknown host '"
+                << acceptHost << "'.\n" << std::flush;
 
         cerr << "Error" << ": Cannot accept connections from unknown host '"
              << acceptHost << "'.\n";
@@ -6708,11 +6222,9 @@ int WaitForRemote(ChannelEndPoint &socketAddress)
   pFD = ListenConnection(socketAddress, "NX");
 
   socketAddress.getSpec(&socketUri);
-  #ifdef TEST
-  *logofs << "Loop: Waiting for connection from "
+  nxinfo << "Loop: Waiting for connection from "
           << hostLabel  << " on socket '" << socketUri
-          << "'.\n" << logofs_flush;
-  #endif
+          << "'.\n" << std::flush;
   cerr << "Info" << ": Waiting for connection from "
        << hostLabel << " on socket '" << socketUri
        << "'.\n";
@@ -6758,11 +6270,9 @@ int WaitForRemote(ChannelEndPoint &socketAddress)
         continue;
       }
  
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Call to select failed. Error is "
+      nxfatal << "Loop: PANIC! Call to select failed. Error is "
               << EGET() << " '" << ESTR() << "'.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       cerr << "Error" << ": Call to select failed. Error is "
            << EGET() << " '" << ESTR() << "'.\n";
@@ -6786,11 +6296,9 @@ int WaitForRemote(ChannelEndPoint &socketAddress)
       }
       if (newFD == -1)
       {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Call to accept failed. Error is "
+        nxfatal << "Loop: PANIC! Call to accept failed. Error is "
                 << EGET() << " '" << ESTR() << "'.\n"
-                << logofs_flush;
-        #endif
+                << std::flush;
 
         cerr << "Error" << ": Call to accept failed. Error is "
              << EGET() << " '" << ESTR() << "'.\n";
@@ -6803,11 +6311,9 @@ int WaitForRemote(ChannelEndPoint &socketAddress)
 
         char * unixPath = NULL;
         socketAddress.getUnixPath(&unixPath);
-        #ifdef TEST
-        *logofs << "Loop: Accepted connection from this host on Unix file socket '"
+        nxinfo << "Loop: Accepted connection from this host on Unix file socket '"
                 << unixPath << "'.\n"
-                << logofs_flush;
-        #endif
+                << std::flush;
 
         cerr << "Info" << ": Accepted connection from this host on Unix file socket '"
              << unixPath << "'.\n";
@@ -6823,14 +6329,11 @@ int WaitForRemote(ChannelEndPoint &socketAddress)
         if (*acceptHost == '\0' || (int) newAddrINET.sin_addr.s_addr == acceptIPAddr)
         {
 
-          #ifdef TEST
 
           unsigned int connectedPort = ntohs(newAddrINET.sin_port);
-
-          *logofs << "Loop: Accepted connection from '" << connectedHost
+          nxinfo << "Loop: Accepted connection from '" << connectedHost
                   << "' with port '" << connectedPort << "'.\n"
-                  << logofs_flush;
-          #endif
+                  << std::flush;
 
           cerr << "Info" << ": Accepted connection from '"
                << connectedHost << "'.\n";
@@ -6839,10 +6342,8 @@ int WaitForRemote(ChannelEndPoint &socketAddress)
         }
         else
         {
-          #ifdef PANIC
-          *logofs << "Loop: WARNING! Refusing connection from '" << connectedHost
-                  << "' on port '" << socketAddress.getTCPPort() << "'.\n" << logofs_flush;
-          #endif
+          nxfatal << "Loop: WARNING! Refusing connection from '" << connectedHost
+                  << "' on port '" << socketAddress.getTCPPort() << "'.\n" << std::flush;
 
           cerr << "Warning" << ": Refusing connection from '"
                << connectedHost << "'.\n";
@@ -6864,33 +6365,27 @@ int WaitForRemote(ChannelEndPoint &socketAddress)
     {
       if (socketAddress.isUnixSocket())
       {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Connection via Unix file socket from this host "
+        nxfatal << "Loop: PANIC! Connection via Unix file socket from this host "
                 << "could not be established.\n"
-                << logofs_flush;
-        #endif
+                << std::flush;
 
         cerr << "Error" << ": Connection via Unix file socket from this host "
              << "could not be established.\n";
       }
       else if (*acceptHost == '\0')
       {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Connection with remote host "
+        nxfatal << "Loop: PANIC! Connection with remote host "
                 << "could not be established.\n"
-                << logofs_flush;
-        #endif
+                << std::flush;
 
         cerr << "Error" << ": Connection with remote host "
              << "could not be established.\n";
       }
       else
       {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Connection with remote host '"
+        nxfatal << "Loop: PANIC! Connection with remote host '"
                 << acceptHost << "' could not be established.\n"
-                << logofs_flush;
-        #endif
+                << std::flush;
 
         cerr << "Error" << ": Connection with remote host '"
              << acceptHost << "' could not be established.\n";
@@ -6920,10 +6415,8 @@ int PrepareProxyConnectionTCP(char** hostName, long int* portNum, int* timeout,
 
   if (!proxyFileDescriptor)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Implementation error (PrepareProxyConnectionTCP). "
-            << "'proxyFileDescriptor' must not be a NULL pointer.\n" << logofs_flush;
-    #endif
+    nxfatal << "Loop: PANIC! Implementation error (PrepareProxyConnectionTCP). "
+            << "'proxyFileDescriptor' must not be a NULL pointer.\n" << std::flush;
 
     cerr << "Error" << ":  Implementation error (PrepareProxyConnectionTCP). "
             << "'proxyFileDescriptor' must not be a NULL pointer.\n";
@@ -6933,10 +6426,8 @@ int PrepareProxyConnectionTCP(char** hostName, long int* portNum, int* timeout,
 
   if (!reason)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Implementation error (PrepareProxyConnectionTCP). "
-            << "'reason' must not be a NULL pointer.\n" << logofs_flush;
-    #endif
+    nxfatal << "Loop: PANIC! Implementation error (PrepareProxyConnectionTCP). "
+            << "'reason' must not be a NULL pointer.\n" << std::flush;
 
     cerr << "Error" << ":  Implementation error (PrepareProxyConnectionTCP). "
             << "'reason' must not be a NULL pointer.\n";
@@ -6947,21 +6438,17 @@ int PrepareProxyConnectionTCP(char** hostName, long int* portNum, int* timeout,
   int remoteIPAddr = GetHostAddress(*hostName);
   if (remoteIPAddr == 0)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Unknown remote host '"
-            << *hostName << "'.\n" << logofs_flush;
-    #endif
+    nxfatal << "Loop: PANIC! Unknown remote host '"
+            << *hostName << "'.\n" << std::flush;
         cerr << "Error" << ": Unknown remote host '"
          << *hostName << "'.\n";
 
     HandleCleanup();
   }
 
-  #ifdef TEST
-  *logofs << "Loop: Connecting to remote host '" 
+  nxinfo << "Loop: Connecting to remote host '" 
           << *hostName << ":" << *portNum << "'.\n"
-          << logofs_flush;
-  #endif
+          << std::flush;
 
   cerr << "Info" << ": Connecting to remote host '"
        << *hostName << ":" << *portNum << "'.\n"
@@ -6980,11 +6467,9 @@ int PrepareProxyConnectionTCP(char** hostName, long int* portNum, int* timeout,
 
   if (*proxyFileDescriptor == -1)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Call to socket failed. "
+    nxfatal << "Loop: PANIC! Call to socket failed. "
             << "Error is " << *reason << " '" << ESTR()
-            << "'.\n" << logofs_flush;
-    #endif
+            << "'.\n" << std::flush;
 
     cerr << "Error" << ": Call to socket failed. "
          << "Error is " << *reason << " '" << ESTR()
@@ -7022,10 +6507,8 @@ int PrepareProxyConnectionUnix(char** path, int* timeout, int* proxyFileDescript
 
   if (!proxyFileDescriptor)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Implementation error (PrepareProxyConnectionUnix). "
-            << "proxyFileDescriptor must not be a NULL pointer.\n" << logofs_flush;
-    #endif
+    nxfatal << "Loop: PANIC! Implementation error (PrepareProxyConnectionUnix). "
+            << "proxyFileDescriptor must not be a NULL pointer.\n" << std::flush;
 
     cerr << "Error" << ":  Implementation error (PrepareProxyConnectionUnix). "
             << "proxyFileDescriptor must not be a NULL pointer.\n";
@@ -7035,10 +6518,8 @@ int PrepareProxyConnectionUnix(char** path, int* timeout, int* proxyFileDescript
 
   if (!reason)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Implementation error (PrepareProxyConnectionUnix). "
-            << "'reason' must not be a NULL pointer.\n" << logofs_flush;
-    #endif
+    nxfatal << "Loop: PANIC! Implementation error (PrepareProxyConnectionUnix). "
+            << "'reason' must not be a NULL pointer.\n" << std::flush;
 
     cerr << "Error" << ":  Implementation error (PrepareProxyConnectionUnix). "
             << "'reason' must not be a NULL pointer.\n";
@@ -7060,11 +6541,9 @@ int PrepareProxyConnectionUnix(char** path, int* timeout, int* proxyFileDescript
 
   if (*proxyFileDescriptor == -1)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Call to socket failed. "
+    nxfatal << "Loop: PANIC! Call to socket failed. "
             << "Error is " << *reason << " '" << ESTR()
-            << "'.\n" << logofs_flush;
-    #endif
+            << "'.\n" << std::flush;
 
     cerr << "Error" << ": Call to socket failed. "
          << "Error is " << *reason << " '" << ESTR()
@@ -7131,12 +6610,10 @@ int ConnectToRemote(ChannelEndPoint &socketAddress)
   for (;;)
   {
 
-    #ifdef DEBUG
-    *logofs << "Loop: Timer set to " << connectTimeout / 1000
+    nxdbg << "Loop: Timer set to " << connectTimeout / 1000
             << " S " << "with retry set to " << retryConnect
             << " in process with pid '" << getpid()
-            << "'.\n" << logofs_flush;
-    #endif
+            << "'.\n" << std::flush;
 
     if (socketAddress.getUnixPath(&unixPath))
       result = PrepareProxyConnectionUnix(&unixPath, &connectTimeout, &pFD, &reason);
@@ -7157,12 +6634,10 @@ int ConnectToRemote(ChannelEndPoint &socketAddress)
 
         if (socketAddress.isUnixSocket())
         {
-          #ifdef PANIC
-          *logofs << "Loop: PANIC! Connection to Unix file socket '"
+          nxfatal << "Loop: PANIC! Connection to Unix file socket '"
                   << unixPath << "' failed. Error is "
                   << EGET() << " '" << ESTR() << "'.\n"
-                  << logofs_flush;
-          #endif
+                  << std::flush;
 
           cerr << "Error" << ": Connection to Unix file socket '"
                   << unixPath << "' failed. Error is "
@@ -7171,12 +6646,10 @@ int ConnectToRemote(ChannelEndPoint &socketAddress)
         else
         {
 
-          #ifdef PANIC
-          *logofs << "Loop: PANIC! Connection to '" << hostName
+          nxfatal << "Loop: PANIC! Connection to '" << hostName
                   << ":" << portNum << "' failed. Error is "
                   << EGET() << " '" << ESTR() << "'.\n"
-                  << logofs_flush;
-          #endif
+                  << std::flush;
 
           cerr << "Error" << ": Connection to '" << hostName
                << ":" << portNum << "' failed. Error is "
@@ -7186,11 +6659,9 @@ int ConnectToRemote(ChannelEndPoint &socketAddress)
       }
       else
       {
-        #ifdef TEST
-        *logofs << "Loop: Sleeping " << retryTimeout
+        nxinfo << "Loop: Sleeping " << retryTimeout
                 << " ms before retrying.\n"
-                << logofs_flush;
-        #endif
+                << std::flush;
 
         usleep(retryTimeout * 1000);
 
@@ -7246,32 +6717,28 @@ int ConnectToRemote(ChannelEndPoint &socketAddress)
           lastRetry = getTimestamp();
         }
       }
-      #ifdef TEST
       {
-        *logofs << "Loop: Not showing the dialog with "
+        nxinfo << "Loop: Not showing the dialog with "
                 << (diffTimestamp(lastRetry, getTimestamp()) / 1000)
-                << " seconds elapsed.\n" << logofs_flush;
+                << " seconds elapsed.\n" << std::flush;
       }
-      #endif
 
       ESET(reason);
 
-      #ifdef TEST
       if (unixPath && unixPath[0] != '\0' )
       {
-        *logofs << "Loop: Connection to Unix socket file '"
+        nxinfo << "Loop: Connection to Unix socket file '"
                 << unixPath << "' failed with error '"
                 << ESTR() << "'. Retrying.\n"
-                << logofs_flush;
+                << std::flush;
       }
       else
       {
-        *logofs << "Loop: Connection to '" << hostName
+        nxinfo << "Loop: Connection to '" << hostName
                 << ":" << portNum << "' failed with error '"
                 << ESTR() << "'. Retrying.\n"
-                << logofs_flush;
+                << std::flush;
       }
-      #endif
     }
     else
     {
@@ -7451,20 +6918,16 @@ int SendProxyOptions(int fd)
     }
   }
 
-  #ifdef TEST
-  *logofs << "Loop: Sending remote options '"
-          << options << "'.\n" << logofs_flush;
-  #endif
+  nxinfo << "Loop: Sending remote options '"
+          << options << "'.\n" << std::flush;
 
   return WriteLocalData(fd, options, strlen(options));
 }
 
 int ReadProxyVersion(int fd)
 {
-  #ifdef TEST
-  *logofs << "Loop: Going to read the remote proxy version "
-          << "from FD#" << fd << ".\n" << logofs_flush;
-  #endif
+  nxinfo << "Loop: Going to read the remote proxy version "
+          << "from FD#" << fd << ".\n" << std::flush;
 
   //
   // Read until the first space in string.
@@ -7490,18 +6953,14 @@ int ReadProxyVersion(int fd)
     return result;
   }
 
-  #ifdef TEST
-  *logofs << "Loop: Received remote version string '"
+  nxinfo << "Loop: Received remote version string '"
           << options << "' from FD#" << fd << ".\n"
-          << logofs_flush;
-  #endif
+          << std::flush;
 
   if (strncmp(options, "NXPROXY-", strlen("NXPROXY-")) != 0)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Parse error in remote options string '"
-            << options << "'.\n" << logofs_flush;
-    #endif
+    nxfatal << "Loop: PANIC! Parse error in remote options string '"
+            << options << "'.\n" << std::flush;
 
     cerr << "Error" << ": Parse error in remote options string '"
          << options << "'.\n";
@@ -7528,11 +6987,9 @@ int ReadProxyVersion(int fd)
               control -> RemoteVersionPatch == 2 &&
                   major != -1 && minor != -1 && patch != -1)
   {
-    #ifdef TEST
-    *logofs << "Loop: Read trailing remote version '" << major
+    nxinfo << "Loop: Read trailing remote version '" << major
             << "." << minor << "." << patch << "'.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     control -> CompatVersionMajor = major;
     control -> CompatVersionMinor = minor;
@@ -7585,10 +7042,8 @@ int ReadProxyVersion(int fd)
 
 int ReadProxyOptions(int fd)
 {
-  #ifdef TEST
-  *logofs << "Loop: Going to read the remote proxy options "
-          << "from FD#" << fd << ".\n" << logofs_flush;
-  #endif
+  nxinfo << "Loop: Going to read the remote proxy options "
+          << "from FD#" << fd << ".\n" << std::flush;
 
   char options[DEFAULT_REMOTE_OPTIONS_LENGTH];
 
@@ -7599,11 +7054,9 @@ int ReadProxyOptions(int fd)
     return result;
   }
 
-  #ifdef TEST
-  *logofs << "Loop: Received remote options string '"
+  nxinfo << "Loop: Received remote options string '"
           << options << "' from FD#" << fd << ".\n"
-          << logofs_flush;
-  #endif
+          << std::flush;
 
   //
   // Get the remote options, delimited by a space character.
@@ -7613,11 +7066,9 @@ int ReadProxyOptions(int fd)
 
   if (ParseRemoteOptions(options) < 0)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Couldn't negotiate a valid "
+    nxfatal << "Loop: PANIC! Couldn't negotiate a valid "
             << "session with remote NX proxy.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     cerr << "Error" << ": Couldn't negotiate a valid "
          << "session with remote NX proxy.\n";
@@ -7630,10 +7081,8 @@ int ReadProxyOptions(int fd)
 
 int SendProxyCaches(int fd)
 {
-  #ifdef TEST
-  *logofs << "Loop: Synchronizing local and remote caches.\n"
-          << logofs_flush;
-  #endif
+  nxinfo << "Loop: Synchronizing local and remote caches.\n"
+          << std::flush;
 
   if (control -> ProxyMode == proxy_client)
   {
@@ -7642,10 +7091,8 @@ int SendProxyCaches(int fd)
     // session type and send it to the remote.
     //
 
-    #ifdef TEST
-    *logofs << "Loop: Going to send the list of local caches.\n"
-            << logofs_flush;
-    #endif
+    nxinfo << "Loop: Going to send the list of local caches.\n"
+            << std::flush;
 
     SetCaches();
 
@@ -7656,20 +7103,16 @@ int SendProxyCaches(int fd)
     if (control -> LocalDeltaCompression == 0 ||
             control -> PersistentCacheEnableLoad == 0)
     {
-      #ifdef TEST
-      *logofs << "Loop: Writing an empty list to FD#" << fd
-              << ".\n" << logofs_flush;
-      #endif
+      nxinfo << "Loop: Writing an empty list to FD#" << fd
+              << ".\n" << std::flush;
 
       return WriteLocalData(fd, "cachelist=none ", strlen("cachelist=none "));
     }
 
     int count = 0;
 
-    #ifdef TEST
-    *logofs << "Loop: Looking for cache files in directory '"
-            << control -> PersistentCachePath << "'.\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: Looking for cache files in directory '"
+            << control -> PersistentCachePath << "'.\n" << std::flush;
 
     DIR *cacheDir = opendir(control -> PersistentCachePath);
 
@@ -7695,11 +7138,9 @@ int SendProxyCaches(int fd)
             WriteLocalData(fd, ",", strlen(","));
           }
 
-          #ifdef TEST
-          *logofs << "Loop: Writing entry '" << control -> PersistentCachePath
+          nxinfo << "Loop: Writing entry '" << control -> PersistentCachePath
                   << "/" << dirEntry -> d_name << "' to FD#" << fd
-                  << ".\n" << logofs_flush;
-          #endif
+                  << ".\n" << std::flush;
 
           //
           // Write cache file name to the socket,
@@ -7717,10 +7158,8 @@ int SendProxyCaches(int fd)
 
     if (count == 0)
     {
-      #ifdef TEST
-      *logofs << "Loop: Writing an empty list to FD#" << fd
-              << ".\n" << logofs_flush;
-      #endif
+      nxinfo << "Loop: Writing an empty list to FD#" << fd
+              << ".\n" << std::flush;
 
       return WriteLocalData(fd, "cachelist=none ", strlen("cachelist=none "));
     }
@@ -7735,20 +7174,16 @@ int SendProxyCaches(int fd)
     // Send back the selected cache name.
     //
 
-    #ifdef TEST
-    *logofs << "Loop: Going to send the selected cache.\n"
-            << logofs_flush;
-    #endif
+    nxinfo << "Loop: Going to send the selected cache.\n"
+            << std::flush;
 
     char buffer[DEFAULT_STRING_LENGTH];
 
     if (control -> PersistentCacheName != NULL)
     {
-      #ifdef TEST
-      *logofs << "Loop: Name of selected cache file is '"
+      nxinfo << "Loop: Name of selected cache file is '"
               << control -> PersistentCacheName << "'.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       sprintf(buffer, "cachefile=%s%s ",
                   *(control -> PersistentCacheName) == 'C' ? "S-" : "C-",
@@ -7756,19 +7191,15 @@ int SendProxyCaches(int fd)
     }
     else
     {
-      #ifdef TEST
-      *logofs << "Loop: No valid cache file was selected.\n"
-              << logofs_flush;
-      #endif
+      nxinfo << "Loop: No valid cache file was selected.\n"
+              << std::flush;
 
       sprintf(buffer, "cachefile=none ");
     }
 
-    #ifdef TEST
-    *logofs << "Loop: Sending string '" << buffer
+    nxinfo << "Loop: Sending string '" << buffer
             << "' as selected cache file.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     return WriteLocalData(fd, buffer, strlen(buffer));
   }
@@ -7778,10 +7209,8 @@ int ReadProxyCaches(int fd)
 {
   if (control -> ProxyMode == proxy_client)
   {
-    #ifdef TEST
-    *logofs << "Loop: Going to receive the selected proxy cache.\n"
-            << logofs_flush;
-    #endif
+    nxinfo << "Loop: Going to receive the selected proxy cache.\n"
+            << std::flush;
 
     //
     // We will read the name of cache plus the stop character.
@@ -7804,11 +7233,9 @@ int ReadProxyCaches(int fd)
 
     if (cacheName == NULL)
     {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Invalid cache file option '"
+      nxfatal << "Loop: PANIC! Invalid cache file option '"
               << buffer << "' provided by remote proxy.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       cerr << "Error" << ": Invalid cache file option '"
            << buffer << "' provided by remote proxy.\n";
@@ -7827,19 +7254,15 @@ int ReadProxyCaches(int fd)
 
     if (strncasecmp(cacheName, "none", strlen("none")) == 0)
     {
-      #ifdef TEST
-      *logofs << "Loop: No cache file selected by remote proxy.\n"
-              << logofs_flush;
-      #endif
+      nxinfo << "Loop: No cache file selected by remote proxy.\n"
+              << std::flush;
     }
     else if (strlen(cacheName) != MD5_LENGTH * 2 + 3 ||
                  *(cacheName + MD5_LENGTH * 2 + 2) != ' ')
     {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Invalid cache file name '"
+      nxfatal << "Loop: PANIC! Invalid cache file name '"
               << cacheName << "' provided by remote proxy.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       cerr << "Error" << ": Invalid cache file name '"
            << cacheName << "' provided by remote proxy.\n";
@@ -7858,18 +7281,14 @@ int ReadProxyCaches(int fd)
 
       strcpy(control -> PersistentCacheName, cacheName);
 
-      #ifdef TEST
-      *logofs << "Loop: Cache file '" << control -> PersistentCacheName
-              << "' selected by remote proxy.\n" << logofs_flush;
-      #endif
+      nxinfo << "Loop: Cache file '" << control -> PersistentCacheName
+              << "' selected by remote proxy.\n" << std::flush;
     }
   }
   else
   {
-    #ifdef TEST
-    *logofs << "Loop: Going to receive the list of remote caches.\n"
-            << logofs_flush;
-    #endif
+    nxinfo << "Loop: Going to receive the list of remote caches.\n"
+            << std::flush;
 
     SetCaches();
 
@@ -7887,10 +7306,8 @@ int ReadProxyCaches(int fd)
       return result;
     }
 
-    #ifdef TEST
-    *logofs << "Loop: Read list of caches from remote side as '"
-            << buffer << "'.\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: Read list of caches from remote side as '"
+            << buffer << "'.\n" << std::flush;
 
     //
     // Prepare the buffer. What we want is a list
@@ -7902,10 +7319,8 @@ int ReadProxyCaches(int fd)
 
     if (strncasecmp(buffer, "cachelist=", strlen("cachelist=")) != 0)
     {
-      #ifdef PANIC
-      *logofs << "Loop: Wrong format for list of cache files "
-              << "read from FD#" << fd << ".\n" << logofs_flush;
-      #endif
+      nxfatal << "Loop: Wrong format for list of cache files "
+              << "read from FD#" << fd << ".\n" << std::flush;
 
       cerr << "Error" << ": Wrong format for list of cache files.\n";
 
@@ -7928,10 +7343,8 @@ int ReadProxyCaches(int fd)
 
 int ReadForwarderVersion(int fd)
 {
-  #ifdef TEST
-  *logofs << "Loop: Going to negotiate the forwarder version.\n"
-          << logofs_flush;
-  #endif
+  nxinfo << "Loop: Going to negotiate the forwarder version.\n"
+          << std::flush;
 
   //
   // Check if we actually expect the session cookie.
@@ -7939,10 +7352,8 @@ int ReadForwarderVersion(int fd)
 
   if (*authCookie == '\0')
   {
-    #ifdef TEST
-    *logofs << "Loop: No authentication cookie required "
-            << "from FD#" << fd << ".\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: No authentication cookie required "
+            << "from FD#" << fd << ".\n" << std::flush;
 
     return 1;
   }
@@ -7956,17 +7367,13 @@ int ReadForwarderVersion(int fd)
     return result;
   }
 
-  #ifdef TEST
-  *logofs << "Loop: Received forwarder version string '" << options
-          << "' from FD#" << fd << ".\n" << logofs_flush;
-  #endif
+  nxinfo << "Loop: Received forwarder version string '" << options
+          << "' from FD#" << fd << ".\n" << std::flush;
 
   if (strncmp(options, "NXSSH-", strlen("NXSSH-")) != 0)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Parse error in forwarder options string '"
-            << options << "'.\n" << logofs_flush;
-    #endif
+    nxfatal << "Loop: PANIC! Parse error in forwarder options string '"
+            << options << "'.\n" << std::flush;
 
     cerr << "Error" << ": Parse error in forwarder options string '"
          << options << "'.\n";
@@ -7981,11 +7388,9 @@ int ReadForwarderVersion(int fd)
   sscanf(options, "NXSSH-%i.%i.%i", &(control -> RemoteVersionMajor),
              &(control -> RemoteVersionMinor), &(control -> RemoteVersionPatch));
 
-  #ifdef TEST
-  *logofs << "Loop: Read forwarder version '" << control -> RemoteVersionMajor
+  nxinfo << "Loop: Read forwarder version '" << control -> RemoteVersionMajor
           << "." << control -> RemoteVersionMinor << "." << control -> RemoteVersionPatch
-          << "'.\n" << logofs_flush;
-  #endif
+          << "'.\n" << std::flush;
 
   return 1;
 }
@@ -7998,10 +7403,8 @@ int ReadForwarderOptions(int fd)
 
   if (*authCookie == '\0')
   {
-    #ifdef TEST
-    *logofs << "Loop: No authentication cookie required "
-            << "from FD#" << fd << ".\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: No authentication cookie required "
+            << "from FD#" << fd << ".\n" << std::flush;
 
     return 1;
   }
@@ -8015,19 +7418,15 @@ int ReadForwarderOptions(int fd)
     return result;
   }
 
-  #ifdef TEST
-  *logofs << "Loop: Received forwarder options string '"
+  nxinfo << "Loop: Received forwarder options string '"
           << options << "' from FD#" << fd << ".\n"
-          << logofs_flush;
-  #endif
+          << std::flush;
 
   if (ParseForwarderOptions(options) < 0)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Couldn't negotiate a valid "
+    nxfatal << "Loop: PANIC! Couldn't negotiate a valid "
             << "cookie with the NX forwarder.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     cerr << "Error" << ": Couldn't negotiate a valid "
          << "cookie with the NX forwarder.\n";
@@ -8040,17 +7439,13 @@ int ReadForwarderOptions(int fd)
 
 int ReadRemoteData(int fd, char *buffer, int size, char stop)
 {
-  #ifdef TEST
-  *logofs << "Loop: Going to read remote data from FD#"
-          << fd << ".\n" << logofs_flush;
-  #endif
+  nxinfo << "Loop: Going to read remote data from FD#"
+          << fd << ".\n" << std::flush;
 
   if (size >= MAXIMUM_REMOTE_OPTIONS_LENGTH)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Maximum remote options buffer "
-            << "limit exceeded.\n" << logofs_flush;
-    #endif
+    nxfatal << "Loop: PANIC! Maximum remote options buffer "
+            << "limit exceeded.\n" << std::flush;
 
     cerr << "Error" << ": Maximum remote options buffer "
          << "limit exceeded.\n";
@@ -8070,10 +7465,8 @@ int ReadRemoteData(int fd, char *buffer, int size, char stop)
       {
         if (EGET() == EAGAIN)
         {
-          #ifdef TEST
-          *logofs << "Loop: Reading data from FD#" << fd
-                  << " would block.\n" << logofs_flush;
-          #endif
+          nxinfo << "Loop: Reading data from FD#" << fd
+                  << " would block.\n" << std::flush;
 
           return 0;
         }
@@ -8088,10 +7481,8 @@ int ReadRemoteData(int fd, char *buffer, int size, char stop)
         }
       }
 
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! The remote NX proxy closed "
-              << "the connection.\n" << logofs_flush;
-      #endif
+      nxfatal << "Loop: PANIC! The remote NX proxy closed "
+              << "the connection.\n" << std::flush;
 
       cerr << "Error" << ": The remote NX proxy closed "
            << "the connection.\n";
@@ -8100,10 +7491,8 @@ int ReadRemoteData(int fd, char *buffer, int size, char stop)
     }
     else if (*(remoteData + remotePosition) == stop)
     {
-      #ifdef TEST
-      *logofs << "Loop: Read stop character from FD#"
-              << fd << ".\n" << logofs_flush;
-      #endif
+      nxinfo << "Loop: Read stop character from FD#"
+              << fd << ".\n" << std::flush;
 
       remotePosition++;
 
@@ -8116,11 +7505,9 @@ int ReadRemoteData(int fd, char *buffer, int size, char stop)
 
       memcpy(buffer, remoteData, remotePosition + 1);
 
-      #ifdef TEST
-      *logofs << "Loop: Remote string '" << remoteData
+      nxinfo << "Loop: Remote string '" << remoteData
               << "' read from FD#" << fd << ".\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       int t = remotePosition;
 
@@ -8137,12 +7524,10 @@ int ReadRemoteData(int fd, char *buffer, int size, char stop)
 
       if (isgraph(*(remoteData + remotePosition)) == 0)
       {
-        #ifdef WARNING
-        *logofs << "Loop: WARNING! Non printable character decimal '"
+        nxwarn << "Loop: WARNING! Non printable character decimal '"
                 << (unsigned int) *(remoteData + remotePosition)
                 << "' received in remote data from FD#"
-                << fd << ".\n" << logofs_flush;
-        #endif
+                << fd << ".\n" << std::flush;
 
         cerr << "Warning" << ": Non printable character decimal '"
                 << (unsigned int) *(remoteData + remotePosition)
@@ -8152,11 +7537,9 @@ int ReadRemoteData(int fd, char *buffer, int size, char stop)
         *(remoteData + remotePosition) = ' ';
       }
 
-      #ifdef DEBUG
-      *logofs << "Loop: Read a further character "
+      nxdbg << "Loop: Read a further character "
               << "from FD#" << fd << ".\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       remotePosition++;
     }
@@ -8164,12 +7547,10 @@ int ReadRemoteData(int fd, char *buffer, int size, char stop)
 
   *(remoteData + remotePosition) = '\0';
 
-  #ifdef PANIC
-  *logofs << "Loop: PANIC! Stop character missing "
+  nxfatal << "Loop: PANIC! Stop character missing "
           << "from FD#" << fd << " after " << remotePosition 
           << " characters read in string '" << remoteData
-          << "'.\n" << logofs_flush;
-  #endif
+          << "'.\n" << std::flush;
 
   cerr << "Error" << ": Stop character missing "
        << "from FD#" << fd << " after " << remotePosition 
@@ -8234,10 +7615,8 @@ int WriteLocalData(int fd, const char *buffer, int size)
 
     ret = select(fd+1, NULL, &writeSet, NULL, &selectTs);
 
-    #ifdef DEBUG
-    *logofs << "Loop: WriteLocalData: select() returned with a code of " << ret << " and remaining timeout of "
-            << selectTs.tv_sec << " sec, " << selectTs.tv_usec << "usec\n" << logofs_flush;
-    #endif
+    nxdbg << "Loop: WriteLocalData: select() returned with a code of " << ret << " and remaining timeout of "
+            << selectTs.tv_sec << " sec, " << selectTs.tv_usec << "usec\n" << std::flush;
 
     if ( ret < 0 )
     {
@@ -8265,10 +7644,8 @@ int WriteLocalData(int fd, const char *buffer, int size)
         continue;
       }
 
-      #ifdef TEST
-      *logofs << "Loop: Error writing data to FD#"
-              << fd << ".\n" << logofs_flush;
-      #endif
+      nxinfo << "Loop: Error writing data to FD#"
+              << fd << ".\n" << std::flush;
 
       return -1;
     }
@@ -8311,42 +7688,34 @@ int ParseEnvironmentOptions(const char *env, int force)
 
   if (setjmp(context) == 1)
   {
-    #ifdef TEST
-    *logofs << "Loop: Out of the long jump while parsing "
+    nxinfo << "Loop: Out of the long jump while parsing "
             << "the environment options.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     return -1;
   }
 
   if (force == 0 && parsedOptions == 1)
   {
-    #ifdef TEST
-    *logofs << "Loop: Skipping a further parse of environment "
+    nxinfo << "Loop: Skipping a further parse of environment "
             << "options string '" << (env != NULL ? env : "")
-            << "'.\n" << logofs_flush;
-    #endif
+            << "'.\n" << std::flush;
 
     return 1;
   }
 
   if (env == NULL || *env == '\0')
   {
-    #ifdef TEST
-    *logofs << "Loop: Nothing to do with empty environment "
+    nxinfo << "Loop: Nothing to do with empty environment "
             << "options string '" << (env != NULL ? env : "")
-            << "'.\n" << logofs_flush;
-    #endif
+            << "'.\n" << std::flush;
 
     return 0;
   }
 
-  #ifdef TEST
-  *logofs << "Loop: Going to parse the environment options "
+  nxinfo << "Loop: Going to parse the environment options "
           << "string '" << env << "'.\n"
-          << logofs_flush;
-  #endif
+          << std::flush;
 
   parsedOptions = 1;
 
@@ -8365,11 +7734,9 @@ int ParseEnvironmentOptions(const char *env, int force)
 
   if (strlen(env) >= DEFAULT_DISPLAY_OPTIONS_LENGTH)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Environment options string '" << env
+    nxfatal << "Loop: PANIC! Environment options string '" << env
             << "' exceeds length of " << DEFAULT_DISPLAY_OPTIONS_LENGTH
-            << " characters.\n" << logofs_flush;
-    #endif
+            << " characters.\n" << std::flush;
 
     cerr << "Error" << ": Environment options string '" << env
          << "' exceeds length of " << DEFAULT_DISPLAY_OPTIONS_LENGTH
@@ -8391,10 +7758,8 @@ int ParseEnvironmentOptions(const char *env, int force)
   if (strncasecmp(opts, "nx/nx,:", 7) == 0 ||
           strncasecmp(opts, "nx,:", 4) == 0)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Parse error in options string '"
-            << opts << "' at 'nx,:'.\n" << logofs_flush;
-    #endif
+    nxfatal << "Loop: PANIC! Parse error in options string '"
+            << opts << "' at 'nx,:'.\n" << std::flush;
 
     cerr << "Error" << ": Parse error in options string '"
          << opts << "' at 'nx,:'.\n";
@@ -8415,10 +7780,8 @@ int ParseEnvironmentOptions(const char *env, int force)
   }
   else if (force == 0)
   {
-    #ifdef TEST
-    *logofs << "Loop: Ignoring host X server display string '"
-            << opts << "'.\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: Ignoring host X server display string '"
+            << opts << "'.\n" << std::flush;
 
     return 0;
   }
@@ -8448,10 +7811,8 @@ int ParseEnvironmentOptions(const char *env, int force)
 
     if (*check == '\0' || isdigit(*check) == 0)
     {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Can't identify NX port in string '"
-              << value << "'.\n" << logofs_flush;
-      #endif
+      nxfatal << "Loop: PANIC! Can't identify NX port in string '"
+              << value << "'.\n" << std::flush;
 
       cerr << "Error" << ": Can't identify NX port in string '"
            << value << "'.\n";
@@ -8474,10 +7835,8 @@ int ParseEnvironmentOptions(const char *env, int force)
     // the port on the command line.
     //
 
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Can't identify NX port in string '"
-            << opts << "'.\n" << logofs_flush;
-    #endif
+    nxfatal << "Loop: PANIC! Can't identify NX port in string '"
+            << opts << "'.\n" << std::flush;
 
     cerr << "Error" << ": Can't identify NX port in string '"
          << opts << "'.\n";
@@ -8485,10 +7844,8 @@ int ParseEnvironmentOptions(const char *env, int force)
     return -1;
   }
 
-  #ifdef TEST
-  *logofs << "Loop: Parsing options string '"
-          << nextOpts << "'.\n" << logofs_flush;
-  #endif
+  nxinfo << "Loop: Parsing options string '"
+          << nextOpts << "'.\n" << std::flush;
 
   //
   // Now all the other optional parameters.
@@ -8526,10 +7883,8 @@ int ParseEnvironmentOptions(const char *env, int force)
       }
       else if (ParseLinkOption(value) < 0)
       {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Can't identify 'link' option in string '"
-                << value << "'.\n" << logofs_flush;
-        #endif
+        nxfatal << "Loop: PANIC! Can't identify 'link' option in string '"
+                << value << "'.\n" << std::flush;
 
         cerr << "Error" << ": Can't identify 'link' option in string '"
              << value << "'.\n";
@@ -8545,10 +7900,8 @@ int ParseEnvironmentOptions(const char *env, int force)
       }
       else if (ParseBitrateOption(value) < 0)
       {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Can't identify option 'limit' in string '"
-                << value << "'.\n" << logofs_flush;
-        #endif
+        nxfatal << "Loop: PANIC! Can't identify option 'limit' in string '"
+                << value << "'.\n" << std::flush;
 
         cerr << "Error" << ": Can't identify option 'limit' in string '"
              << value << "'.\n";
@@ -8584,13 +7937,11 @@ int ParseEnvironmentOptions(const char *env, int force)
       char *socketUri = NULL;
       if (connectSocket.getSpec(&socketUri))
       {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Can't handle 'listen' and 'connect' parameters "
-                << "at the same time.\n" << logofs_flush;
+        nxfatal << "Loop: PANIC! Can't handle 'listen' and 'connect' parameters "
+                << "at the same time.\n" << std::flush;
 
-        *logofs << "Loop: PANIC! Refusing 'listen' parameter with 'connect' being '"
-                << socketUri << "'.\n" << logofs_flush;
-        #endif
+        nxfatal << "Loop: PANIC! Refusing 'listen' parameter with 'connect' being '"
+                << socketUri << "'.\n" << std::flush;
 
         cerr << "Error" << ": Can't handle 'listen' and 'connect' parameters "
              << "at the same time.\n";
@@ -8614,13 +7965,11 @@ int ParseEnvironmentOptions(const char *env, int force)
       char *socketUri = NULL;
       if (connectSocket.getSpec(&socketUri))
       {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Can't handle 'accept' and 'connect' parameters "
-                << "at the same time.\n" << logofs_flush;
+        nxfatal << "Loop: PANIC! Can't handle 'accept' and 'connect' parameters "
+                << "at the same time.\n" << std::flush;
 
-        *logofs << "Loop: PANIC! Refusing 'accept' parameter with 'connect' being '"
-                << socketUri << "'.\n" << logofs_flush;
-        #endif
+        nxfatal << "Loop: PANIC! Refusing 'accept' parameter with 'connect' being '"
+                << socketUri << "'.\n" << std::flush;
 
         cerr << "Error" << ": Can't handle 'accept' and 'connect' parameters "
              << "at the same time.\n";
@@ -8638,13 +7987,11 @@ int ParseEnvironmentOptions(const char *env, int force)
     {
       if (*acceptHost != '\0')
       {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Can't handle 'connect' and 'accept' parameters "
-                << "at the same time.\n" << logofs_flush;
+        nxfatal << "Loop: PANIC! Can't handle 'connect' and 'accept' parameters "
+                << "at the same time.\n" << std::flush;
 
-        *logofs << "Loop: PANIC! Refusing 'connect' parameter with 'accept' being '"
-                << acceptHost << "'.\n" << logofs_flush;
-        #endif
+        nxfatal << "Loop: PANIC! Refusing 'connect' parameter with 'accept' being '"
+                << acceptHost << "'.\n" << std::flush;
 
         cerr << "Error" << ": Can't handle 'connect' and 'accept' parameters "
              << "at the same time.\n";
@@ -8791,10 +8138,8 @@ int ParseEnvironmentOptions(const char *env, int force)
       }
       else if (ParseCacheOption(value) < 0)
       {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Can't identify cache size for string '"
-                << value << "'.\n" << logofs_flush;
-        #endif
+        nxfatal << "Loop: PANIC! Can't identify cache size for string '"
+                << value << "'.\n" << std::flush;
 
         cerr << "Error" << ": Can't identify cache size for string '"
              << value << "'.\n";
@@ -8810,10 +8155,8 @@ int ParseEnvironmentOptions(const char *env, int force)
       }
       else if (ParseImagesOption(value) < 0)
       {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Can't identify images cache size for string '"
-                << value << "'.\n" << logofs_flush;
-        #endif
+        nxfatal << "Loop: PANIC! Can't identify images cache size for string '"
+                << value << "'.\n" << std::flush;
 
         cerr << "Error" << ": Can't identify images cache size for string '"
              << value << "'.\n";
@@ -8838,11 +8181,9 @@ int ParseEnvironmentOptions(const char *env, int force)
       }
       else if (ParseShmemOption(value) < 0)
       {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Can't identify size of shared memory "
+        nxfatal << "Loop: PANIC! Can't identify size of shared memory "
                 << "segment in string '" << value << "'.\n"
-                << logofs_flush;
-        #endif
+                << std::flush;
 
         cerr << "Error" << ": Can't identify size of shared memory "
              << "segment in string '" << value << "'.\n";
@@ -8910,10 +8251,8 @@ int ParseEnvironmentOptions(const char *env, int force)
     }
     else if (strcasecmp(name, "sync") == 0)
     {
-      #ifdef WARNING
-      *logofs << "Loop: WARNING! No 'sync' channel in current version. "
-              << "Assuming 'cups' channel.\n" << logofs_flush;
-      #endif
+      nxwarn << "Loop: WARNING! No 'sync' channel in current version. "
+              << "Assuming 'cups' channel.\n" << std::flush;
 
       cerr << "Warning" << ": No 'sync' channel in current version. "
            << "Assuming 'cups' channel.\n";
@@ -8956,10 +8295,8 @@ int ParseEnvironmentOptions(const char *env, int force)
 
       if (timeout == 0)
       {
-        #ifdef TEST
-        *logofs << "Loop: Disabling timeout on broken "
-                << "proxy connection.\n" << logofs_flush;
-        #endif
+        nxinfo << "Loop: Disabling timeout on broken "
+                << "proxy connection.\n" << std::flush;
 
         control -> ProxyTimeout = 0;
       }
@@ -8974,10 +8311,8 @@ int ParseEnvironmentOptions(const char *env, int force)
 
       if (cleanup == 0)
       {
-        #ifdef TEST
-        *logofs << "Loop: Disabling grace timeout on "
-                << "proxy shutdown.\n" << logofs_flush;
-        #endif
+        nxinfo << "Loop: Disabling grace timeout on "
+                << "proxy shutdown.\n" << std::flush;
 
         control -> CleanupTimeout = 0;
       }
@@ -8994,10 +8329,8 @@ int ParseEnvironmentOptions(const char *env, int force)
       }
       else if (ParsePackOption(value) < 0)
       {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Can't identify pack method for string '"
-                << value << "'.\n" << logofs_flush;
-        #endif
+        nxfatal << "Loop: PANIC! Can't identify pack method for string '"
+                << value << "'.\n" << std::flush;
 
         cerr << "Error" << ": Can't identify pack method for string '"
              << value << "'.\n";
@@ -9014,12 +8347,10 @@ int ParseEnvironmentOptions(const char *env, int force)
       if (control -> KillDaemonOnShutdownNumber <
               control -> KillDaemonOnShutdownLimit)
       {
-        #ifdef TEST
-        *logofs << "Loop: WARNING! Adding process with pid '"
+        nxinfo << "Loop: WARNING! Adding process with pid '"
                 << ValidateArg("local", name, value) << " to the "
                 << "daemons to kill at shutdown.\n"
-                << logofs_flush;
-        #endif
+                << std::flush;
 
         control -> KillDaemonOnShutdown[control ->
                        KillDaemonOnShutdownNumber] =
@@ -9029,10 +8360,8 @@ int ParseEnvironmentOptions(const char *env, int force)
       }
       else
       {
-        #ifdef WARNING
-        *logofs << "Loop: WARNING! Number of daemons to kill "
-                << "at shutdown exceeded.\n" << logofs_flush;
-        #endif
+        nxwarn << "Loop: WARNING! Number of daemons to kill "
+                << "at shutdown exceeded.\n" << std::flush;
 
         cerr << "Warning" << ": Number of daemons to kill "
              << "at shutdown exceeded.\n";
@@ -9068,11 +8397,9 @@ int ParseEnvironmentOptions(const char *env, int force)
                                              strcasecmp(name, "sleep") == 0 ||
                                                  strcasecmp(name, "tolerancechecks") == 0)
     {
-      #ifdef DEBUG
-      *logofs << "Loop: Ignoring agent option '" << name
+      nxdbg << "Loop: Ignoring agent option '" << name
               << "' with value '" << value << "'.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
     }
     else if (strcasecmp(name, "composite") == 0 ||
                  strcasecmp(name, "shmem") == 0 ||
@@ -9085,30 +8412,24 @@ int ParseEnvironmentOptions(const char *env, int force)
                                              strcasecmp(name, "clients") == 0 ||
                                                  strcasecmp(name, "xinerama") == 0)
     {
-      #ifdef DEBUG
-      *logofs << "Loop: Ignoring agent option '" << name
+      nxdbg << "Loop: Ignoring agent option '" << name
               << "' with value '" << value << "'.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
     }
     else if (strcasecmp(name, "defer") == 0 ||
                  strcasecmp(name, "tile") == 0 ||
                      strcasecmp(name, "menu") == 0 ||
                         strcasecmp(name, "state") == 0 )
     {
-      #ifdef DEBUG
-      *logofs << "Loop: Ignoring agent option '" << name
+      nxdbg << "Loop: Ignoring agent option '" << name
               << "' with value '" << value << "'.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
     }
     else
     {
-      #ifdef WARNING
-      *logofs << "Loop: WARNING! Ignoring unknown option '"
+      nxwarn << "Loop: WARNING! Ignoring unknown option '"
               << name << "' with value '" << value << "'.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       cerr << "Warning" << ": Ignoring unknown option '"
            << name << "' with value '" << value << "'.\n";
@@ -9129,43 +8450,35 @@ int ParseEnvironmentOptions(const char *env, int force)
     SetAndValidateChannelEndPointArg("local", name, tcpHostAndPort, connectSocket);
   }
 
-  #ifdef TEST
-  *logofs << "Loop: Completed parsing of string '"
-          << env << "'.\n" << logofs_flush;
-  #endif
+  nxinfo << "Loop: Completed parsing of string '"
+          << env << "'.\n" << std::flush;
 
   if ((*fileOptions != '\0') && (strncmp(fileOptions, "/dev/", 5) != 0) && (strncmp(fileOptions, "/proc/", 6) != 0) && (strncmp(fileOptions, "/sys/", 5) != 0))
   {
     if (strcmp(fileOptions, optionsFileName) != 0)
     {
-      #ifdef TEST
-      *logofs << "Loop: Reading options from '" << fileOptions
-              << "'.\n" << logofs_flush;
-      #endif
+      nxinfo << "Loop: Reading options from '" << fileOptions
+              << "'.\n" << std::flush;
 
       if (ParseFileOptions(fileOptions) < 0)
       {
         return -1;
       }
     }
-    #ifdef WARNING
     else
     {
-      *logofs << "Loop: WARNING! Name of the options file "
+      nxwarn << "Loop: WARNING! Name of the options file "
               << "specified multiple times. Not parsing "
-              << "again.\n" << logofs_flush;
+              << "again.\n" << std::flush;
     }
-    #endif
 
     if (*optionsFileName == '\0')
     {
       strncpy(optionsFileName, value, DEFAULT_STRING_LENGTH - 1);
 
-      #ifdef TEST
-      *logofs << "Loop: Assuming name of options file '"
+      nxinfo << "Loop: Assuming name of options file '"
               << optionsFileName << "'.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
     }
   }
 
@@ -9205,11 +8518,9 @@ int ParseCommandLineOptions(int argc, const char **argv)
 
   if (setjmp(context) == 1)
   {
-    #ifdef TEST
-    *logofs << "Loop: Out of the long jump while parsing "
+    nxinfo << "Loop: Out of the long jump while parsing "
             << "the command line options.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     return -1;
   }
@@ -9225,18 +8536,14 @@ int ParseCommandLineOptions(int argc, const char **argv)
 
   if (parsedCommand == 1)
   {
-    #ifdef TEST
-    *logofs << "Loop: Skipping a further parse of command line options.\n"
-            << logofs_flush;
-    #endif
+    nxinfo << "Loop: Skipping a further parse of command line options.\n"
+            << std::flush;
 
     return 1;
   }
 
-  #ifdef TEST
-  *logofs << "Loop: Going to parse the command line options.\n"
-          << logofs_flush;
-  #endif
+  nxinfo << "Loop: Going to parse the command line options.\n"
+          << std::flush;
 
   parsedCommand = 1;
 
@@ -9244,17 +8551,15 @@ int ParseCommandLineOptions(int argc, const char **argv)
   // Print out arguments.
   //
 
-  #ifdef TEST
 
-  *logofs << "Loop: Argc is " << argc << ".\n" << logofs_flush;
+  nxinfo << "Loop: Argc is " << argc << ".\n" << std::flush;
 
   for (int argi = 0; argi < argc; argi++)
-  {
-    *logofs << "Loop: Argv[" << argi << "] is " << argv[argi]
-            << ".\n" << logofs_flush;
+  {    
+    nxinfo << "Loop: Argv[" << argi << "] is " << argv[argi]
+           << ".\n" << std::flush;
   }
 
-  #endif
 
   //
   // Shall use getopt here.
@@ -9282,19 +8587,15 @@ int ParseCommandLineOptions(int argc, const char **argv)
 
           if (WE_SET_PROXY_MODE == 0)
           {
-            #ifdef TEST
-            *logofs << "Loop: Setting local proxy mode to proxy_client.\n"
-                    << logofs_flush;
-            #endif
+            nxinfo << "Loop: Setting local proxy mode to proxy_client.\n"
+                    << std::flush;
 
             control -> ProxyMode = proxy_client;
           }
           else if (control -> ProxyMode != proxy_client)
           {
-            #ifdef PANIC
-            *logofs << "Loop: PANIC! Can't redefine local proxy to "
-                    << "client mode.\n" << logofs_flush;
-            #endif
+            nxfatal << "Loop: PANIC! Can't redefine local proxy to "
+                    << "client mode.\n" << std::flush;
 
             cerr << "Error" << ": Can't redefine local proxy to "
                  << "client mode.\n";
@@ -9312,19 +8613,15 @@ int ParseCommandLineOptions(int argc, const char **argv)
 
           if (WE_SET_PROXY_MODE == 0)
           {
-            #ifdef TEST
-            *logofs << "Loop: Setting local proxy mode to proxy_server.\n"
-                    << logofs_flush;
-            #endif
+            nxinfo << "Loop: Setting local proxy mode to proxy_server.\n"
+                    << std::flush;
 
             control -> ProxyMode = proxy_server;
           }
           else if (control -> ProxyMode != proxy_server)
           {
-            #ifdef PANIC
-            *logofs << "Loop: PANIC! Can't redefine local proxy to "
-                    << "server mode.\n" << logofs_flush;
-            #endif
+            nxfatal << "Loop: PANIC! Can't redefine local proxy to "
+                    << "server mode.\n" << std::flush;
 
             cerr << "Error" << ": Can't redefine local proxy to "
                  << "server mode.\n";
@@ -9548,20 +8845,16 @@ int ParseFileOptions(const char *file)
     strcpy(fileName, file);
   }
 
-  #ifdef TEST
-  *logofs << "Loop: Going to read options from file '"
-          << fileName << "'.\n" << logofs_flush;
-  #endif
+  nxinfo << "Loop: Going to read options from file '"
+          << fileName << "'.\n" << std::flush;
 
   FILE *filePtr = fopen(fileName, "r");
 
   if (filePtr == NULL)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Can't open options file '" << fileName
+    nxfatal << "Loop: PANIC! Can't open options file '" << fileName
             << "'. Error is " << EGET() << " '" << ESTR() << "'.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     cerr << "Error" << ": Can't open options file '" << fileName
          << "'. Error is " << EGET() << " '" << ESTR() << "'.\n";
@@ -9581,11 +8874,9 @@ int ParseFileOptions(const char *file)
 
   if (fgets(options, DEFAULT_DISPLAY_OPTIONS_LENGTH, filePtr) == NULL)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Can't read options from file '" << fileName
+    nxfatal << "Loop: PANIC! Can't read options from file '" << fileName
             << "'. Error is " << EGET() << " '" << ESTR() << "'.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     cerr << "Error" << ": Can't read options from file '" << fileName
          << "'. Error is " << EGET() << " '" << ESTR() << "'.\n";
@@ -9616,10 +8907,8 @@ int ParseFileOptions(const char *file)
     next++;
   }
 
-  #ifdef TEST
-  *logofs << "Loop: Read options '" << options << "' from file '"
-          << fileName << "'.\n" << logofs_flush;
-  #endif
+  nxinfo << "Loop: Read options '" << options << "' from file '"
+          << fileName << "'.\n" << std::flush;
 
   if (ParseEnvironmentOptions(options, 1) < 0)
   {
@@ -9640,11 +8929,9 @@ int ParseFileOptions(const char *file)
 
 int ParseRemoteOptions(char *opts)
 {
-  #ifdef TEST
-  *logofs << "Loop: Going to parse the remote options "
+  nxinfo << "Loop: Going to parse the remote options "
           << "string '" << opts << "'.\n"
-          << logofs_flush;
-  #endif
+          << std::flush;
 
   char *name;
   char *value;
@@ -9689,11 +8976,9 @@ int ParseRemoteOptions(char *opts)
     {
       if (WE_PROVIDE_CREDENTIALS)
       {
-        #ifdef WARNING
-        *logofs << "Loop: WARNING! Ignoring remote option 'cookie' "
+        nxwarn << "Loop: WARNING! Ignoring remote option 'cookie' "
                 << "with value '" << value << "' when initiating "
-                << "connection.\n" << logofs_flush;
-        #endif
+                << "connection.\n" << std::flush;
 
         cerr << "Warning" << ": Ignoring remote option 'cookie' "
              << "with value '" << value << "' when initiating "
@@ -9701,11 +8986,9 @@ int ParseRemoteOptions(char *opts)
       }
       else if (strncasecmp(authCookie, value, strlen(authCookie)) != 0)
       {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Authentication cookie '" << value
+        nxfatal << "Loop: PANIC! Authentication cookie '" << value
                 << "' doesn't match '" << authCookie << "'.\n"
-                << logofs_flush;
-        #endif
+                << std::flush;
 
         cerr << "Error" << ": Authentication cookie '" << value
              << "' doesn't match '" << authCookie << "'.\n";
@@ -9725,11 +9008,9 @@ int ParseRemoteOptions(char *opts)
       {
         if (*linkSpeedName != '\0' && strcasecmp(linkSpeedName, value) != 0)
         {
-          #ifdef WARNING
-          *logofs << "Loop: WARNING! Overriding option 'link' "
+          nxwarn << "Loop: WARNING! Overriding option 'link' "
                   << "with new value '" << value << "'.\n"
-                  << logofs_flush;
-          #endif
+                  << std::flush;
 
           cerr << "Warning" << ": Overriding option 'link' "
                << "with new value '" << value << "'.\n";
@@ -9737,11 +9018,9 @@ int ParseRemoteOptions(char *opts)
 
         if (ParseLinkOption(value) < 0)
         {
-          #ifdef PANIC
-          *logofs << "Loop: PANIC! Can't identify remote 'link' "
+          nxfatal << "Loop: PANIC! Can't identify remote 'link' "
                   << "option in string '" << value << "'.\n"
-                  << logofs_flush;
-          #endif
+                  << std::flush;
 
           cerr << "Error" << ": Can't identify remote 'link' "
                << "option in string '" << value << "'.\n";
@@ -9762,11 +9041,9 @@ int ParseRemoteOptions(char *opts)
       {
         if (*packMethodName != '\0' && strcasecmp(packMethodName, value) != 0)
         {
-          #ifdef WARNING
-          *logofs << "Loop: WARNING! Overriding option 'pack' "
+          nxwarn << "Loop: WARNING! Overriding option 'pack' "
                   << "with remote value '" << value << "'.\n"
-                  << logofs_flush;
-          #endif
+                  << std::flush;
 
           cerr << "Warning" << ": Overriding option 'pack' "
                << "with remote value '" << value << "'.\n";
@@ -9774,11 +9051,9 @@ int ParseRemoteOptions(char *opts)
 
         if (ParsePackOption(value) < 0)
         {
-          #ifdef PANIC
-          *logofs << "Loop: PANIC! Invalid pack option '"
+          nxfatal << "Loop: PANIC! Invalid pack option '"
                   << value << "' requested by remote.\n"
-                  << logofs_flush;
-          #endif
+                  << std::flush;
 
           cerr << "Error" << ": Invalid pack option '"
                << value << "' requested by remote.\n";
@@ -9806,11 +9081,9 @@ int ParseRemoteOptions(char *opts)
 
         if (ParseCacheOption(value) < 0)
         {
-          #ifdef PANIC
-          *logofs << "Loop: PANIC! Can't identify remote 'cache' "
+          nxfatal << "Loop: PANIC! Can't identify remote 'cache' "
                   << "option in string '" << value << "'.\n"
-                  << logofs_flush;
-          #endif
+                  << std::flush;
 
           cerr << "Error" << ": Can't identify remote 'cache' "
                << "option in string '" << value << "'.\n";
@@ -9837,11 +9110,9 @@ int ParseRemoteOptions(char *opts)
 
         if (ParseImagesOption(value) < 0)
         {
-          #ifdef PANIC
-          *logofs << "Loop: PANIC! Can't identify remote 'images' "
+          nxfatal << "Loop: PANIC! Can't identify remote 'images' "
                   << "option in string '" << value << "'.\n"
-                  << logofs_flush;
-          #endif
+                  << std::flush;
 
           cerr << "Error" << ": Can't identify remote 'images' "
                << "option in string '" << value << "'.\n";
@@ -9863,11 +9134,9 @@ int ParseRemoteOptions(char *opts)
         if (*bitrateLimitName != '\0' &&
                 strcasecmp(bitrateLimitName, value) != 0)
         {
-          #ifdef WARNING
-          *logofs << "Loop: WARNING! Overriding option 'limit' "
+          nxwarn << "Loop: WARNING! Overriding option 'limit' "
                   << "with new value '" << value << "'.\n"
-                  << logofs_flush;
-          #endif
+                  << std::flush;
 
           cerr << "Warning" << ": Overriding option 'limit' "
                << "with new value '" << value << "'.\n";
@@ -9875,11 +9144,9 @@ int ParseRemoteOptions(char *opts)
 
         if (ParseBitrateOption(value) < 0)
         {
-          #ifdef PANIC
-          *logofs << "Loop: PANIC! Can't identify 'limit' "
+          nxfatal << "Loop: PANIC! Can't identify 'limit' "
                   << "option in string '" << value << "'.\n"
-                  << logofs_flush;
-          #endif
+                  << std::flush;
 
           cerr << "Error" << ": Can't identify 'limit' "
                << "option in string '" << value << "'.\n";
@@ -9953,11 +9220,9 @@ int ParseRemoteOptions(char *opts)
       }
       else if (ParseShmemOption(value) < 0)
       {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Can't identify size of shared memory "
+        nxfatal << "Loop: PANIC! Can't identify size of shared memory "
                 << "segment in string '" << value << "'.\n"
-               << logofs_flush;
-        #endif
+               << std::flush;
 
         cerr << "Error" << ": Can't identify size of shared memory "
              << "segment in string '" << value << "'.\n";
@@ -10087,19 +9352,15 @@ int ParseRemoteOptions(char *opts)
       // versions.
       //
 
-      #ifdef DEBUG
-      *logofs << "Loop: Ignoring obsolete remote option '"
+      nxdbg << "Loop: Ignoring obsolete remote option '"
               << name << "' with value '" << value
-              << "'.\n" << logofs_flush;
-      #endif
+              << "'.\n" << std::flush;
     }
     else
     {
-      #ifdef WARNING
-      *logofs << "Loop: WARNING! Ignoring unknown remote option '"
+      nxwarn << "Loop: WARNING! Ignoring unknown remote option '"
               << name << "' with value '" << value << "'.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       cerr << "Warning" << ": Ignoring unknown remote option '"
            << name << "' with value '" << value << "'.\n";
@@ -10188,10 +9449,8 @@ int ParseRemoteOptions(char *opts)
 
   if (*missing != '\0')
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! The remote peer didn't specify the option '"
-            << missing << "'.\n" << logofs_flush;
-    #endif
+    nxfatal << "Loop: PANIC! The remote peer didn't specify the option '"
+            << missing << "'.\n" << std::flush;
 
     cerr << "Error" << ": The remote peer didn't specify the option '"
          << missing << "'.\n";
@@ -10209,11 +9468,9 @@ int ParseRemoteOptions(char *opts)
 
 int ParseForwarderOptions(char *opts)
 {
-  #ifdef TEST
-  *logofs << "Loop: Going to parse the forwarder options "
+  nxinfo << "Loop: Going to parse the forwarder options "
           << "string '" << opts << "'.\n"
-          << logofs_flush;
-  #endif
+          << std::flush;
 
   char *name;
   char *value;
@@ -10244,11 +9501,9 @@ int ParseForwarderOptions(char *opts)
     {
       if (strncasecmp(authCookie, value, strlen(authCookie)) != 0)
       {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! The NX forwarder cookie '" << value
+        nxfatal << "Loop: PANIC! The NX forwarder cookie '" << value
                 << "' doesn't match '" << authCookie << "'.\n"
-                << logofs_flush;
-        #endif
+                << std::flush;
 
         cerr << "Error" << ": The NX forwarder cookie '" << value
              << "' doesn't match '" << authCookie << "'.\n";
@@ -10260,11 +9515,9 @@ int ParseForwarderOptions(char *opts)
     }
     else
     {
-      #ifdef WARNING
-      *logofs << "Loop: WARNING! Ignoring unknown forwarder option '"
+      nxwarn << "Loop: WARNING! Ignoring unknown forwarder option '"
               << name << "' with value '" << value << "'.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       cerr << "Warning" << ": Ignoring unknown forwarder option '"
            << name << "' with value '" << value << "'.\n";
@@ -10276,10 +9529,8 @@ int ParseForwarderOptions(char *opts)
 
   if (hasCookie == 0)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! The NX forwarder didn't provide "
-            << "the authentication cookie.\n" << logofs_flush;
-    #endif
+    nxfatal << "Loop: PANIC! The NX forwarder didn't provide "
+            << "the authentication cookie.\n" << std::flush;
 
     cerr << "Error" << ": The NX forwarder didn't provide "
          << "the authentication cookie.\n";
@@ -10298,10 +9549,8 @@ int SetCore()
 
   if (getrlimit(RLIMIT_CORE, &rlim))
   {
-    #ifdef TEST
-    *logofs << "Loop: Cannot read RLIMIT_CORE. Error is '"
-            << ESTR() << "'.\n" << logofs_flush;
-    #endif
+    nxinfo << "Cannot read RLIMIT_CORE. Error is '"
+            << ESTR() << "'.\n" << std::flush;
 
     return -1;
   }
@@ -10312,19 +9561,15 @@ int SetCore()
 
     if (setrlimit(RLIMIT_CORE, &rlim))
     {
-      #ifdef TEST
-      *logofs << "Loop: Cannot set RLIMIT_CORE. Error is '"
-              << ESTR() << "'.\n" << logofs_flush;
-      #endif
+      nxinfo << "Loop: Cannot read RLIMIT_CORE. Error is '"
+              << ESTR() << "'.\n" << std::flush;
 
       return -2;
     }
   }
 
-  #ifdef TEST
-  *logofs << "Loop: RLIMIT_CORE is "<< rlim.rlim_max
-          << ".\n" << logofs_flush;
-  #endif
+  nxinfo << "Loop: Set RLIMIT_CORE to "<< rlim.rlim_max
+          << ".\n" << std::flush;
 
   #endif // #ifdef COREDUMPS
 
@@ -10336,11 +9581,9 @@ char *GetLastCache(char *listBuffer, const char *searchPath)
   if (listBuffer == NULL || searchPath == NULL ||
           strncmp(listBuffer, "cachelist=", strlen("cachelist=")) != 0)
   {
-    #ifdef TEST
-    *logofs << "Loop: Invalid parameters '" << listBuffer << "' and '"
+    nxinfo << "Loop: Invalid parameters '" << listBuffer << "' and '"
             << (searchPath != NULL ? searchPath : "")
-            << "'. Can't select any cache.\n" << logofs_flush;
-    #endif
+            << "'. Can't select any cache.\n" << std::flush;
 
     return NULL;
   }
@@ -10387,10 +9630,8 @@ char *GetLastCache(char *listBuffer, const char *searchPath)
   {
     if (strncmp(fileName, "none", strlen("none")) == 0)
     {
-      #ifdef TEST
-      *logofs << "Loop: No cache files seem to be available.\n"
-              << logofs_flush;
-      #endif
+      nxinfo << "Loop: No cache files seem to be available.\n"
+              << std::flush;
 
       delete [] selectedName;
 
@@ -10399,10 +9640,8 @@ char *GetLastCache(char *listBuffer, const char *searchPath)
     else if (strlen(fileName) != MD5_LENGTH * 2 + 2 ||
                  strncmp(fileName, remotePrefix, 2) != 0)
     {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Bad cache file name '"
-               << fileName << "'.\n" << logofs_flush;
-      #endif
+      nxfatal << "Loop: PANIC! Bad cache file name '"
+               << fileName << "'.\n" << std::flush;
 
       cerr << "Error" << ": Bad cache file name '"
            << fileName << "'.\n";
@@ -10412,10 +9651,8 @@ char *GetLastCache(char *listBuffer, const char *searchPath)
       HandleCleanup();
     }
 
-    #ifdef TEST
-    *logofs << "Loop: Parsing remote cache name '"
-            << fileName << "'.\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: Parsing remote cache name '"
+            << fileName << "'.\n" << std::flush;
 
     //
     // Prefix, received as "S-", becomes
@@ -10430,10 +9667,8 @@ char *GetLastCache(char *listBuffer, const char *searchPath)
 
     if (stat(fullPath, &fileStat) == 0)
     {
-      #ifdef TEST
-      *logofs << "Loop: Found a matching cache '"
-              << fullPath << "'.\n" << logofs_flush;
-      #endif
+      nxinfo << "Loop: Found a matching cache '"
+              << std::string(fullPath) << "'.\n" << std::flush;
 
       if (fileStat.st_mtime >= selectedTime)
       {
@@ -10442,13 +9677,11 @@ char *GetLastCache(char *listBuffer, const char *searchPath)
         selectedTime = fileStat.st_mtime;
       }
     }
-    #ifdef TEST
     else
     {
-      *logofs << "Loop: Can't get stats of file '"
-              << fullPath << "'.\n" << logofs_flush;
+      nxinfo << "Loop: Can't get stats of file '"
+              << std::string(fullPath) << "'.\n" << std::flush;
     }
-    #endif
 
     fileName = strtok(NULL, ",");
   }
@@ -10478,19 +9711,15 @@ char *GetTempPath()
 
     if (tempEnv == NULL || *tempEnv == '\0')
     {
-      #ifdef TEST
-      *logofs << "Loop: WARNING! No environment for NX_TEMP.\n"
-              << logofs_flush;
-      #endif
+      nxinfo << "Loop: WARNING! No environment for NX_TEMP.\n"
+              << std::flush;
 
       tempEnv = getenv("TEMP");
 
       if (tempEnv == NULL || *tempEnv == '\0')
       {
-        #ifdef TEST
-        *logofs << "Loop: WARNING! No environment for TEMP.\n"
-                << logofs_flush;
-        #endif
+        nxinfo << "Loop: WARNING! No environment for TEMP.\n"
+                << std::flush;
 
         tempEnv = "/tmp";
       }
@@ -10498,11 +9727,9 @@ char *GetTempPath()
 
     if (strlen(tempEnv) > DEFAULT_STRING_LENGTH - 1)
     {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Invalid value for the NX "
+      nxfatal << "Loop: PANIC! Invalid value for the NX "
               << "temporary directory '" << tempEnv
-              << "'.\n" << logofs_flush;
-      #endif
+              << "'.\n" << std::flush;
 
       cerr << "Error" << ": Invalid value for the NX "
            << "temporary directory '" << tempEnv
@@ -10513,20 +9740,16 @@ char *GetTempPath()
 
     strcpy(tempDir, tempEnv);
 
-    #ifdef TEST
-    *logofs << "Loop: Assuming temporary NX directory '"
-            << tempDir << "'.\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: Assuming temporary NX directory '"
+            << tempDir << "'.\n" << std::flush;
   }
 
   char *tempPath = new char[strlen(tempDir) + 1];
 
   if (tempPath == NULL)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Can't allocate memory "
-            << "for the temp path.\n" << logofs_flush;
-    #endif
+    nxfatal << "Loop: PANIC! Can't allocate memory "
+            << "for the temp path.\n" << std::flush;
 
     cerr << "Error" << ": Can't allocate memory "
          << "for the temp path.\n";
@@ -10551,10 +9774,8 @@ char *GetClientPath()
 
     if (clientEnv == NULL || *clientEnv == '\0')
     {
-      #ifdef TEST
-      *logofs << "Loop: WARNING! No environment for NX_CLIENT.\n"
-              << logofs_flush;
-      #endif
+      nxinfo << "Loop: WARNING! No environment for NX_CLIENT.\n"
+              << std::flush;
 
       //
       // Try to guess the location of the client.
@@ -10577,11 +9798,9 @@ char *GetClientPath()
 
     if (strlen(clientEnv) > DEFAULT_STRING_LENGTH - 1)
     {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Invalid value for the NX "
+      nxfatal << "Loop: PANIC! Invalid value for the NX "
               << "client directory '" << clientEnv
-              << "'.\n" << logofs_flush;
-      #endif
+              << "'.\n" << std::flush;
 
       cerr << "Error" << ": Invalid value for the NX "
            << "client directory '" << clientEnv
@@ -10592,20 +9811,16 @@ char *GetClientPath()
 
     strcpy(clientDir, clientEnv);
 
-    #ifdef TEST
-    *logofs << "Loop: Assuming NX client location '"
-            << clientDir << "'.\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: Assuming NX client location '"
+            << clientDir << "'.\n" << std::flush;
   }
 
   char *clientPath = new char[strlen(clientDir) + 1];
 
   if (clientPath == NULL)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Can't allocate memory "
-            << "for the client path.\n" << logofs_flush;
-    #endif
+    nxfatal << "Loop: PANIC! Can't allocate memory "
+            << "for the client path.\n" << std::flush;
 
     cerr << "Error" << ": Can't allocate memory "
          << "for the client path.\n";
@@ -10630,21 +9845,17 @@ char *GetSystemPath()
 
     if (systemEnv == NULL || *systemEnv == '\0')
     {
-      #ifdef TEST
-      *logofs << "Loop: WARNING! No environment for NX_SYSTEM.\n"
-              << logofs_flush;
-      #endif
+      nxinfo << "Loop: WARNING! No environment for NX_SYSTEM.\n"
+              << std::flush;
 
       systemEnv = "/usr/NX";
     }
 
     if (strlen(systemEnv) > DEFAULT_STRING_LENGTH - 1)
     {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Invalid value for the NX "
+      nxfatal << "Loop: PANIC! Invalid value for the NX "
               << "system directory '" << systemEnv
-              << "'.\n" << logofs_flush;
-      #endif
+              << "'.\n" << std::flush;
 
       cerr << "Error" << ": Invalid value for the NX "
            << "system directory '" << systemEnv
@@ -10655,20 +9866,16 @@ char *GetSystemPath()
 
     strcpy(systemDir, systemEnv);
 
-    #ifdef TEST
-    *logofs << "Loop: Assuming system NX directory '"
-            << systemDir << "'.\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: Assuming system NX directory '"
+            << systemDir << "'.\n" << std::flush;
   }
 
   char *systemPath = new char[strlen(systemDir) + 1];
 
   if (systemPath == NULL)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Can't allocate memory "
-            << "for the system path.\n" << logofs_flush;
-    #endif
+    nxfatal << "Loop: PANIC! Can't allocate memory "
+            << "for the system path.\n" << std::flush;
 
     cerr << "Error" << ": Can't allocate memory "
          << "for the system path.\n";
@@ -10693,19 +9900,15 @@ char *GetHomePath()
 
     if (homeEnv == NULL || *homeEnv == '\0')
     {
-      #ifdef TEST
-      *logofs << "Loop: WARNING! No environment for NX_HOME.\n"
-              << logofs_flush;
-      #endif
+      nxinfo << "Loop: WARNING! No environment for NX_HOME.\n"
+              << std::flush;
 
       homeEnv = getenv("HOME");
 
       if (homeEnv == NULL || *homeEnv == '\0')
       {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! No environment for HOME.\n"
-                << logofs_flush;
-        #endif
+        nxfatal << "Loop: PANIC! No environment for HOME.\n"
+                << std::flush;
 
         cerr << "Error" << ": No environment for HOME.\n";
 
@@ -10715,11 +9918,9 @@ char *GetHomePath()
 
     if (strlen(homeEnv) > DEFAULT_STRING_LENGTH - 1)
     {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Invalid value for the NX "
+      nxfatal << "Loop: PANIC! Invalid value for the NX "
               << "home directory '" << homeEnv
-              << "'.\n" << logofs_flush;
-      #endif
+              << "'.\n" << std::flush;
 
       cerr << "Error" << ": Invalid value for the NX "
            << "home directory '" << homeEnv
@@ -10730,20 +9931,16 @@ char *GetHomePath()
 
     strcpy(homeDir, homeEnv);
 
-    #ifdef TEST
-    *logofs << "Loop: Assuming NX user's home directory '"
-            << homeDir << "'.\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: Assuming NX user's home directory '"
+            << homeDir << "'.\n" << std::flush;
   }
 
   char *homePath = new char[strlen(homeDir) + 1];
 
   if (homePath == NULL)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Can't allocate memory "
-            << "for the home path.\n" << logofs_flush;
-    #endif
+    nxfatal << "Loop: PANIC! Can't allocate memory "
+            << "for the home path.\n" << std::flush;
 
     cerr << "Error" << ": Can't allocate memory "
          << "for the home path.\n";
@@ -10768,10 +9965,8 @@ char *GetRootPath()
 
     if (rootEnv == NULL || *rootEnv == '\0')
     {
-      #ifdef TEST
-      *logofs << "Loop: WARNING! No environment for NX_ROOT.\n"
-              << logofs_flush;
-      #endif
+      nxinfo << "Loop: WARNING! No environment for NX_ROOT.\n"
+              << std::flush;
 
       //
       // We will determine the root NX directory
@@ -10784,11 +9979,9 @@ char *GetRootPath()
       if (strlen(homeEnv) > DEFAULT_STRING_LENGTH -
               strlen("/.nx") - 1)
       {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Invalid value for the NX "
+        nxfatal << "Loop: PANIC! Invalid value for the NX "
                 << "home directory '" << homeEnv
-                << "'.\n" << logofs_flush;
-        #endif
+                << "'.\n" << std::flush;
 
         cerr << "Error" << ": Invalid value for the NX "
              << "home directory '" << homeEnv
@@ -10797,11 +9990,9 @@ char *GetRootPath()
         HandleCleanup();
       }
 
-      #ifdef TEST
-      *logofs << "Loop: Assuming NX root directory in "
+      nxinfo << "Loop: Assuming NX root directory in "
               << "the user's home '" << homeEnv
-              << "'.\n" << logofs_flush;
-      #endif
+              << "'.\n" << std::flush;
 
       strcpy(rootDir, homeEnv);
       strcat(rootDir, "/.nx");
@@ -10818,11 +10009,9 @@ char *GetRootPath()
       {
         if (mkdir(rootDir, 0700) < 0 && (EGET() != EEXIST))
         {
-          #ifdef PANIC
-          *logofs << "Loop: PANIC! Can't create directory '"
+          nxfatal << "Loop: PANIC! Can't create directory '"
                   << rootDir << ". Error is " << EGET() << " '"
-                  << ESTR() << "'.\n" << logofs_flush;
-          #endif
+                  << ESTR() << "'.\n" << std::flush;
 
           cerr << "Error" << ": Can't create directory '"
                << rootDir << ". Error is " << EGET() << " '"
@@ -10836,11 +10025,9 @@ char *GetRootPath()
     {
       if (strlen(rootEnv) > DEFAULT_STRING_LENGTH - 1)
       {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Invalid value for the NX "
+        nxfatal << "Loop: PANIC! Invalid value for the NX "
                 << "root directory '" << rootEnv
-                << "'.\n" << logofs_flush;
-        #endif
+                << "'.\n" << std::flush;
 
         cerr << "Error" << ": Invalid value for the NX "
              << "root directory '" << rootEnv
@@ -10852,20 +10039,16 @@ char *GetRootPath()
       strcpy(rootDir, rootEnv);
     }
 
-    #ifdef TEST
-    *logofs << "Loop: Assuming NX root directory '"
-            << rootDir << "'.\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: Assuming NX root directory '"
+            << rootDir << "'.\n" << std::flush;
   }
 
   char *rootPath = new char[strlen(rootDir) + 1];
 
   if (rootPath == NULL)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Can't allocate memory "
-            << "for the root path.\n" << logofs_flush;
-    #endif
+    nxfatal << "Loop: PANIC! Can't allocate memory "
+            << "for the root path.\n" << std::flush;
 
     cerr << "Error" << ": Can't allocate memory "
          << "for the root path.\n";
@@ -10917,11 +10100,9 @@ char *GetCachePath()
   {
     if (mkdir(cachePath, 0700) < 0 && (EGET() != EEXIST))
     {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Can't create directory '" << cachePath
+      nxfatal << "Loop: PANIC! Can't create directory '" << cachePath
               << ". Error is " << EGET() << " '" << ESTR() << "'.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       cerr << "Error" << ": Can't create directory '" << cachePath
            << ". Error is " << EGET() << " '" << ESTR() << "'.\n";
@@ -10958,11 +10139,9 @@ char *GetImagesPath()
   {
     if (mkdir(imagesPath, 0700) < 0 && (EGET() != EEXIST))
     {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Can't create directory '" << imagesPath
+      nxfatal << "Loop: PANIC! Can't create directory '" << imagesPath
               << ". Error is " << EGET() << " '" << ESTR() << "'.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       cerr << "Error" << ": Can't create directory '" << imagesPath
            << ". Error is " << EGET() << " '" << ESTR() << "'.\n";
@@ -10997,11 +10176,9 @@ char *GetImagesPath()
     {
       if (mkdir(digitPath, 0700) < 0 && (EGET() != EEXIST))
       {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Can't create directory '" << digitPath
+        nxfatal << "Loop: PANIC! Can't create directory '" << digitPath
                 << ". Error is " << EGET() << " '" << ESTR() << "'.\n"
-                << logofs_flush;
-        #endif
+                << std::flush;
 
         cerr << "Error" << ": Can't create directory '" << digitPath
              << ". Error is " << EGET() << " '" << ESTR() << "'.\n";
@@ -11055,11 +10232,9 @@ char *GetSessionPath()
     {
       if (mkdir(sessionDir, 0700) < 0 && (EGET() != EEXIST))
       {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Can't create directory '" << sessionDir
+        nxfatal << "Loop: PANIC! Can't create directory '" << sessionDir
                 << ". Error is " << EGET() << " '" << ESTR() << "'.\n"
-                << logofs_flush;
-        #endif
+                << std::flush;
 
         cerr << "Error" << ": Can't create directory '" << sessionDir
              << ". Error is " << EGET() << " '" << ESTR() << "'.\n";
@@ -11070,10 +10245,8 @@ char *GetSessionPath()
       }
     }
 
-    #ifdef TEST
-    *logofs << "Loop: Root of NX session is '" << sessionDir
-            << "'.\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: Root of NX session is '" << sessionDir
+            << "'.\n" << std::flush;
 
     delete [] rootPath;
   }
@@ -11143,16 +10316,12 @@ int ParseLinkOption(const char *opt)
 
 int ParsePackOption(const char *opt)
 {
-  #ifdef DEBUG
-  *logofs << "Loop: Pack method is " << packMethod
+  nxdbg << "Loop: Pack method is " << packMethod
           << " quality is " << packQuality << ".\n"
-          << logofs_flush;
-  #endif
+          << std::flush;
 
-  #ifdef DEBUG
-  *logofs << "Loop: Parsing pack method '" << opt
-          << "'.\n" << logofs_flush;
-  #endif
+  nxdbg << "Loop: Parsing pack method '" << opt
+          << "'.\n" << std::flush;
 
   if (strcasecmp(opt, "0") == 0 ||
           strcasecmp(opt, "none") == 0 ||
@@ -11340,10 +10509,8 @@ int ParsePackOption(const char *opt)
     {
       packQuality = atoi(dash + 1);
 
-      #ifdef DEBUG
-      *logofs << "Loop: Using pack quality '"
-              << packQuality << "'.\n" << logofs_flush;
-      #endif
+      nxdbg << "Loop: Using pack quality '"
+              << packQuality << "'.\n" << std::flush;
     }
   }
   else
@@ -11646,18 +10813,14 @@ int SetLogs()
   {
     strcpy(statsFileName, "stats");
 
-    #ifdef TEST
-    *logofs << "Loop: Assuming default statistics file '"
-            << statsFileName << "'.\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: Assuming default statistics file '"
+            << statsFileName << "'.\n" << std::flush;
   }
-  #ifdef TEST
   else
   {
-    *logofs << "Loop: Name selected for statistics is '"
-            << statsFileName << "'.\n" << logofs_flush;
+    nxinfo << "Loop: Name selected for statistics is '"
+            << statsFileName << "'.\n" << std::flush;
   }
-  #endif
 
   if (OpenLogFile(statsFileName, statofs) < 0)
   {
@@ -11670,18 +10833,14 @@ int SetLogs()
   {
     strcpy(errorsFileName, "errors");
 
-    #ifdef TEST
-    *logofs << "Loop: Assuming default log file name '"
-            << errorsFileName << "'.\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: Assuming default log file name '"
+            << errorsFileName << "'.\n" << std::flush;
   }
-  #ifdef TEST
   else
   {
-    *logofs << "Loop: Name selected for log file is '"
-            << errorsFileName << "'.\n" << logofs_flush;
+    nxinfo << "Loop: Name selected for log file is '"
+            << errorsFileName << "'.\n" << std::flush;
   }
-  #endif
 
   //
   // Share the bebug output with the nxssh binder
@@ -11719,27 +10878,21 @@ int SetLogs()
 
   if (*sessionFileName != '\0')
   {
-    #ifdef TEST
-    *logofs << "Loop: Name selected for session file is '"
-            << sessionFileName << "'.\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: Name selected for session file is '"
+            << sessionFileName << "'.\n" << std::flush;
 
     if (errofs != NULL)
     {
-      #ifdef WARNING
-      *logofs << "Loop: WARNING! Unexpected value for stream errofs.\n"
-              << logofs_flush;
-      #endif
+      nxwarn << "Loop: WARNING! Unexpected value for stream errofs.\n"
+              << std::flush;
 
       cerr << "Warning" << ": Unexpected value for stream errofs.\n";
     }
 
     if (errsbuf != NULL)
     {
-      #ifdef WARNING
-      *logofs << "Loop: WARNING! Unexpected value for buffer errsbuf.\n"
-              << logofs_flush;
-      #endif
+      nxwarn << "Loop: WARNING! Unexpected value for buffer errsbuf.\n"
+              << std::flush;
 
       cerr << "Warning" << ": Unexpected value for buffer errsbuf.\n";
     }
@@ -11800,10 +10953,8 @@ int SetPorts()
 
 
 
-#ifdef TEST
-  *logofs << "Loop: cups port: " << cupsPort << "\n"
-            << logofs_flush;
-#endif
+  nxinfo << "Loop: cups port: " << cupsPort << "\n"
+            << std::flush;
 
   if (control -> ProxyMode == proxy_client) {
     auxPort.setDefaultTCPPort(DEFAULT_NX_AUX_PORT_OFFSET + proxyPort);
@@ -11812,11 +10963,9 @@ int SetPorts()
     auxPort.setDefaultTCPPort(1);
 
     if ( auxPort.getTCPPort() != 1 ) {
-      #ifdef WARNING
-      *logofs << "Loop: WARNING! Overriding auxiliary X11 "
-              << "port with new value '" << 1 << "'.\n"
-              << logofs_flush;
-      #endif
+        nxwarn << "Loop: WARNING! Overriding auxiliary X11 "
+                << "port with new value '" << 1 << "'.\n"
+                << std::flush;
 
       cerr << "Warning" << ": Overriding auxiliary X11 "
            << "port with new value '" << 1 << "'.\n";
@@ -11825,10 +10974,8 @@ int SetPorts()
     }
   }
 
-#ifdef TEST
-  *logofs << "Loop: aux port: " << auxPort << "\n"
-	  << logofs_flush;
-#endif
+  nxinfo << "Loop: aux port: " << auxPort << "\n"
+	  << std::flush;
 
   if (control -> ProxyMode == proxy_client) {
     smbPort.setDefaultTCPPort(DEFAULT_NX_SMB_PORT_OFFSET + proxyPort);
@@ -11838,10 +10985,8 @@ int SetPorts()
   }
 
 
-#ifdef TEST
-  *logofs << "Loop: smb port: " << smbPort << "\n"
-	  << logofs_flush;
-#endif
+  nxinfo << "Loop: smb port: " << smbPort << "\n"
+	  << std::flush;
 
   if ( mediaPort.configured() ) {
     if (control -> ProxyMode == proxy_client) {
@@ -11850,10 +10995,8 @@ int SetPorts()
     } else {
 
       if ( mediaPort.getTCPPort() < 0 ) {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! No port specified for multimedia connections.\n"
-                << logofs_flush;
-        #endif
+        nxfatal << "Loop: PANIC! No port specified for multimedia connections.\n"
+                << std::flush;
 
         cerr << "Error" << ": No port specified for multimedia connections.\n";
 
@@ -11862,10 +11005,8 @@ int SetPorts()
     }
   }
 
-#ifdef TEST
-  *logofs << "Loop: Using multimedia port '" << mediaPort
-	  << "'.\n" << logofs_flush;
-#endif
+  nxinfo << "Loop: Using multimedia port '" << mediaPort
+	  << "'.\n" << std::flush;
 
   if (control -> ProxyMode == proxy_client) {
       httpPort.setDefaultTCPPort(DEFAULT_NX_HTTP_PORT_OFFSET + proxyPort);
@@ -11874,17 +11015,13 @@ int SetPorts()
       httpPort.setDefaultTCPPort(80);
   }
 
-#ifdef TEST
-  *logofs << "Loop: Using HTTP port '" << httpPort
-	  << "'.\n" << logofs_flush;
-#endif
+  nxinfo << "Loop: Using HTTP port '" << httpPort
+	  << "'.\n" << std::flush;
 
   if (ParseFontPath(fontPort) <= 0)
   {
-    #ifdef TEST
-    *logofs << "Loop: Disabling font server connections.\n"
-            << logofs_flush;
-    #endif
+    nxinfo << "Loop: Disabling font server connections.\n"
+            << std::flush;
 
     *fontPort = '\0';
 
@@ -11908,10 +11045,8 @@ int SetPorts()
       useFontSocket = 0;
     }
 
-    #ifdef TEST
-    *logofs << "Loop: Using font server port '" << fontPort
-            << "'.\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: Using font server port '" << fontPort
+            << "'.\n" << std::flush;
   }
 
   if (control -> ProxyMode == proxy_client) {
@@ -11921,10 +11056,8 @@ int SetPorts()
     slavePort.setDefaultTCPPort(DEFAULT_NX_SLAVE_PORT_SERVER_OFFSET + proxyPort);
   }
 
-#ifdef TEST
-  *logofs << "Loop: Using slave port '" << slavePort
-	  << "'.\n" << logofs_flush;
-#endif
+  nxinfo << "Loop: Using slave port '" << slavePort
+	  << "'.\n" << std::flush;
 
   return 1;
 }
@@ -11982,10 +11115,8 @@ int SetDescriptors()
 
   if (limit == 0)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Cannot determine number of available "
-            << "file descriptors.\n" << logofs_flush;
-    #endif
+    nxfatal << "Loop: PANIC! Cannot determine number of available "
+            << "file descriptors.\n" << std::flush;
 
     cerr << "Error" << ": Cannot determine number of available "
          << "file descriptors.\n";
@@ -12005,20 +11136,16 @@ int SetCaches()
 {
   if ((control -> PersistentCachePath = GetCachePath()) == NULL)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Error getting or creating the cache path.\n"
-            << logofs_flush;
-    #endif
+    nxfatal << "Loop: PANIC! Error getting or creating the cache path.\n"
+            << std::flush;
 
     cerr << "Error" << ": Error getting or creating the cache path.\n";
 
     HandleCleanup();
   }
 
-  #ifdef TEST
-  *logofs << "Loop: Path of cache files is '" << control -> PersistentCachePath
-          << "'.\n" << logofs_flush;
-  #endif
+  nxinfo << "Loop: Path of cache files is '" << control -> PersistentCachePath
+          << "'.\n" << std::flush;
 
   return 1;
 }
@@ -12141,11 +11268,9 @@ int SetSession()
 
     if (*sessionType != '\0')
     {
-      #ifdef WARNING
-      *logofs << "Loop: WARNING! Unrecognized session type '"
+      nxwarn << "Loop: WARNING! Unrecognized session type '"
               << sessionType << "'. Assuming agent session.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       cerr << "Warning" << ": Unrecognized session type '"
            << sessionType << "'. Assuming agent session.\n";
@@ -12154,12 +11279,10 @@ int SetSession()
     control -> SessionMode = session_agent;
   }
 
-  #if defined(TEST) || defined(INFO)
-  *logofs << "Loop: Assuming session type '"
+  nxinfo << "Loop: Assuming session type '"
           << DumpSession(control -> SessionMode) << "' with "
           << "string '" << sessionType << "'.\n"
-          << logofs_flush;
-  #endif
+          << std::flush;
 
   //
   // By default the policy is immediate. Agents
@@ -12179,21 +11302,17 @@ int SetSession()
       control -> FlushPolicy = policy_immediate;
     }
 
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: WARNING! Forcing flush policy to '"
+    nxinfo << "Loop: WARNING! Forcing flush policy to '"
             << DumpPolicy(control -> FlushPolicy)
-            << ".\n" << logofs_flush;
-    #endif
+            << ".\n" << std::flush;
   }
   else
   {
     control -> FlushPolicy = policy_immediate;
 
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Setting initial flush policy to '"
+    nxinfo << "Loop: Setting initial flush policy to '"
             << DumpPolicy(control -> FlushPolicy)
-            << "'.\n" << logofs_flush;
-    #endif
+            << "'.\n" << std::flush;
   }
 
   //
@@ -12216,19 +11335,15 @@ int SetSession()
 
   if (control -> LinkEncrypted == 1)
   {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Proxy running as part of an "
+    nxinfo << "Loop: Proxy running as part of an "
             << "encrypting client.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
   }
   else
   {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Assuming proxy running as a "
+    nxinfo << "Loop: Assuming proxy running as a "
             << "standalone program.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
   }
 
   //
@@ -12250,10 +11365,8 @@ int SetSession()
 
     if (stat(fileName, &fileStat) == 0)
     {
-      #ifdef TEST
-      *logofs << "Loop: Enabling respawn of client at session shutdown.\n"
-              << logofs_flush;
-      #endif
+      nxinfo << "Loop: Enabling respawn of client at session shutdown.\n"
+              << std::flush;
 
       control -> EnableRestartOnShutdown = 1;
     }
@@ -12307,22 +11420,18 @@ int SetStorage()
         control -> ClientTotalStorageSize;
   }
 
-  #ifdef DEBUG
-  *logofs << "Loop: Storage size limit is "
+  nxdbg << "Loop: Storage size limit is "
           << control -> ClientTotalStorageSize
           << " at client and "
           << control -> ServerTotalStorageSize
           << " at server.\n"
-          << logofs_flush;
-  #endif
+          << std::flush;
 
-  #ifdef DEBUG
-  *logofs << "Loop: Storage local limit set to "
+  nxdbg << "Loop: Storage local limit set to "
           << control -> LocalTotalStorageSize
           << " remote limit set to "
           << control -> RemoteTotalStorageSize
-          << ".\n" << logofs_flush;
-  #endif
+          << ".\n" << std::flush;
 
   //
   // Never reserve for split store more than
@@ -12332,11 +11441,9 @@ int SetStorage()
   if (size > 0 && control ->
           SplitTotalStorageSize > size / 2)
   {
-    #ifdef TEST
-    *logofs << "Loop: Reducing size of split store to "
+    nxinfo << "Loop: Reducing size of split store to "
             << size / 2 << " bytes.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     control -> SplitTotalStorageSize = size / 2;
   }
@@ -12349,11 +11456,9 @@ int SetStorage()
 
   if (control -> HideRender == 1)
   {
-    #ifdef TEST
-    *logofs << "Loop: Not loading render extension "
+    nxinfo << "Loop: Not loading render extension "
             << "from persistent cache.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     control -> PersistentCacheLoadRender = 0;
   }
@@ -12422,18 +11527,14 @@ int SetShmem()
   {
     control -> ShmemServer = 1;
 
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Set initial shared memory size "
+    nxinfo << "Loop: Set initial shared memory size "
             << "to " << control -> ShmemServerSize
-            << " bytes.\n" << logofs_flush;
-    #endif
+            << " bytes.\n" << std::flush;
   }
   else
   {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Disabled use of the shared memory "
-            << "extension.\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: Disabled use of the shared memory "
+            << "extension.\n" << std::flush;
 
     control -> ShmemServer = 0;
   }
@@ -12452,11 +11553,9 @@ int SetShmem()
 
 int SetPack()
 {
-  #ifdef TEST
-  *logofs << "Loop: Setting pack with initial method "
+  nxinfo << "Loop: Setting pack with initial method "
           << packMethod << " and quality " << packQuality
-          << ".\n" << logofs_flush;
-  #endif
+          << ".\n" << std::flush;
 
   //
   // Check if this is a proxy session and, in
@@ -12467,10 +11566,8 @@ int SetPack()
 
   if (control -> SessionMode == session_proxy)
   {
-    #ifdef TEST
-    *logofs << "Loop: WARNING! Disabling pack with proxy session.\n"
-            << logofs_flush;
-    #endif
+    nxinfo << "Loop: WARNING! Disabling pack with proxy session.\n"
+            << std::flush;
 
     packMethod = PACK_NONE;
   }
@@ -12491,11 +11588,9 @@ int SetPack()
   {
     control -> PersistentCacheLoadPacked = 0;
 
-    #ifdef TEST
-    *logofs << "Loop: Not loading packed images "
+    nxinfo << "Loop: Not loading packed images "
             << "from persistent cache.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
   }
 
   return 1;
@@ -12515,11 +11610,9 @@ int SetImages()
 
   if (control -> SessionMode == session_proxy)
   {
-    #ifdef TEST
-    *logofs << "Loop: Disabling image cache with "
+    nxinfo << "Loop: Disabling image cache with "
             << "session '" << DumpSession(control ->
-               SessionMode) << "'.\n" << logofs_flush;
-    #endif
+               SessionMode) << "'.\n" << std::flush;
 
     sprintf(imagesSizeName, "0");
 
@@ -12549,28 +11642,22 @@ int SetImages()
     {
       if ((control -> ImageCachePath = GetImagesPath()) == NULL)
       {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Error getting or creating image cache path.\n"
-                << logofs_flush;
-        #endif
+        nxfatal << "Loop: PANIC! Error getting or creating image cache path.\n"
+                << std::flush;
 
         cerr << "Error" << ": Error getting or creating image cache path.\n";
 
         HandleCleanup();
       }
 
-      #ifdef TEST
-      *logofs << "Loop: Path of image cache files is '" << control -> ImageCachePath
-              << "'.\n" << logofs_flush;
-      #endif
+      nxinfo << "Loop: Path of image cache files is '" << control -> ImageCachePath
+              << "'.\n" << std::flush;
     }
   }
   else
   {
-    #ifdef TEST
-    *logofs << "Loop: Disabling the persistent image cache.\n"
-            << logofs_flush;
-    #endif
+    nxinfo << "Loop: Disabling the persistent image cache.\n"
+            << std::flush;
 
     control -> ImageCacheEnableLoad = 0;
     control -> ImageCacheEnableSave = 0;
@@ -12610,11 +11697,9 @@ int SetVersion()
     minor = control -> CompatVersionMinor;
     patch = control -> CompatVersionPatch;
 
-    #ifdef TEST
-    *logofs << "Loop: Using compatibility version '"
+    nxinfo << "Loop: Using compatibility version '"
             << major << "." << minor << "." << patch
-            << "'.\n" << logofs_flush;
-    #endif
+            << "'.\n" << std::flush;
   }
   else if (control -> LocalVersionMajor >
                control -> RemoteVersionMajor)
@@ -12629,11 +11714,9 @@ int SetVersion()
     minor = control -> RemoteVersionMinor;
     patch = control -> RemoteVersionPatch;
 
-    #ifdef TEST
-    *logofs << "Loop: Using remote version '"
+    nxinfo << "Loop: Using remote version '"
             << major << "." << minor << "." << patch
-            << "'.\n" << logofs_flush;
-    #endif
+            << "'.\n" << std::flush;
   }
   else
   {
@@ -12651,11 +11734,9 @@ int SetVersion()
       minor = control -> RemoteVersionMinor;
       patch = control -> RemoteVersionPatch;
 
-      #ifdef TEST
-      *logofs << "Loop: Using remote version '"
+      nxinfo << "Loop: Using remote version '"
               << major << "." << minor << "." << patch
-              << "'.\n" << logofs_flush;
-      #endif
+              << "'.\n" << std::flush;
     }
     else
     {
@@ -12663,11 +11744,9 @@ int SetVersion()
       minor = control -> LocalVersionMinor;
       patch = control -> LocalVersionPatch;
 
-      #ifdef TEST
-      *logofs << "Loop: Using local version '"
+      nxinfo << "Loop: Using local version '"
               << major << "." << minor << "." << patch
-              << "'.\n" << logofs_flush;
-      #endif
+              << "'.\n" << std::flush;
     }
   }
 
@@ -12692,23 +11771,19 @@ int SetVersion()
 
   if (step == 0)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Unable to set the protocol step value from "
+    nxfatal << "Loop: PANIC! Unable to set the protocol step value from "
          << "the negotiated protocol version " << major << "." << minor
-         << "." << patch << ".\n" << logofs_flush;
-    #endif
+         << "." << patch << ".\n" << std::flush;
 
     cerr << "Error" << ": Unable to set the protocol step value from "
          << "the negotiated protocol version " << major << "." << minor
          << "." << patch << ".\n";
 
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Incompatible remote version "
+    nxfatal << "Loop: PANIC! Incompatible remote version "
             << control -> RemoteVersionMajor << "." << control -> RemoteVersionMinor
             << "." << control -> RemoteVersionPatch << " with local version "
             << control -> LocalVersionMajor << "." << control -> LocalVersionMinor
-            << "." << control -> LocalVersionPatch << ".\n" << logofs_flush;
-    #endif
+            << "." << control -> LocalVersionPatch << ".\n" << std::flush;
 
     cerr << "Error" << ": Incompatible remote version "
          << control -> RemoteVersionMajor << "." << control -> RemoteVersionMinor
@@ -12719,10 +11794,8 @@ int SetVersion()
     return -1;
   }
 
-  #ifdef TEST
-  *logofs << "Loop: Using NX protocol step "
-          << step << ".\n" << logofs_flush;
-  #endif
+  nxinfo << "Loop: Using NX protocol step "
+          << step << ".\n" << std::flush;
 
   control -> setProtoStep(step);
 
@@ -12738,13 +11811,11 @@ int SetVersion()
 
   if (local != remote)
   {
-    #ifdef WARNING
-    *logofs << "Loop: WARNING! Connected to remote version "
+    nxwarn << "Loop: WARNING! Connected to remote version "
             << control -> RemoteVersionMajor << "." << control -> RemoteVersionMinor
             << "." << control -> RemoteVersionPatch << " with local version "
             << control -> LocalVersionMajor << "." << control -> LocalVersionMinor
-            << "." << control -> LocalVersionPatch << ".\n" << logofs_flush;
-    #endif
+            << "." << control -> LocalVersionPatch << ".\n" << std::flush;
 
     cerr << "Warning" << ": Connected to remote version "
          << control -> RemoteVersionMajor << "." << control -> RemoteVersionMinor
@@ -12755,7 +11826,7 @@ int SetVersion()
 
   if (local < remote)
   {
-    cerr << "Warning" << ": Consider checking https://github.com/ArcticaProject/nx-libs/releases for updates.\n";
+    nxerr << "Warning" << ": Consider checking https://github.com/ArcticaProject/nx-libs/releases for updates.\n";
   }
 
   //
@@ -12774,13 +11845,11 @@ int SetVersion()
     // method
     //
 
-    #ifdef TEST
-    *logofs << __FILE__ << " : " << __LINE__ << " - "
+    nxinfo << __FILE__ << " : " << __LINE__ << " - "
             << "step = " << control -> getProtoStep()
             << " packMethod = " << packMethod
             << " packQuality = " << packQuality
-            << ".\n"  << logofs_flush;
-    #endif
+            << ".\n"  << std::flush;
 
     //
     // Update the pack method name.
@@ -12807,11 +11876,9 @@ int SetVersion()
   //
 
   // Since ProtoStep8 (#issue 108)
-  #ifdef TEST
-  *logofs << "Loop: Disabling image cache with protocol "
+  nxinfo << "Loop: Disabling image cache with protocol "
           << "step '" << control -> getProtoStep()
-          << "'.\n"  << logofs_flush;
-  #endif
+          << "'.\n"  << std::flush;
 
   sprintf(imagesSizeName, "0");
 
@@ -12829,20 +11896,16 @@ int SetVersion()
 
 int SetLink()
 {
-  #ifdef TEST
-  *logofs << "Loop: Setting link with initial value "
-          << linkSpeedName << ".\n" << logofs_flush;
-  #endif
+  nxinfo << "Loop: Setting link with initial value "
+          << linkSpeedName << ".\n" << std::flush;
 
   if (*linkSpeedName == '\0')
   {
     strcpy(linkSpeedName, "lan");
   }
   
-  #ifdef TEST
-  *logofs << "Loop: Link speed is " << linkSpeedName
-          << ".\n" << logofs_flush;
-  #endif
+  nxinfo << "Loop: Link speed is " << linkSpeedName
+          << ".\n" << std::flush;
 
   if (strcasecmp(linkSpeedName, "modem") == 0)
   {
@@ -12896,11 +11959,9 @@ int SetLink()
 
   if (ParsePackMethod(packMethod, packQuality) < 0)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Unrecognized pack method id "
+    nxfatal << "Loop: PANIC! Unrecognized pack method id "
             << packMethod << " with quality " << packQuality
-            << ".\n" << logofs_flush;
-    #endif
+            << ".\n" << std::flush;
 
     cerr << "Error" << ": Unrecognized pack method id "
          << packMethod << " with quality " << packQuality
@@ -12923,11 +11984,9 @@ int SetLink()
     }
     else
     {
-      #ifdef WARNING
-      *logofs << "Loop: WARNING! Forcing taint of replies "
+      nxwarn << "Loop: WARNING! Forcing taint of replies "
               << "with a proxy session.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       control -> TaintReplies = 1;
     }
@@ -12951,11 +12010,9 @@ int SetLink()
 
   if (control -> SessionMode == session_proxy)
   {
-    #ifdef WARNING
-    *logofs << "Loop: WARNING! Forcing flush on priority "
+    nxwarn << "Loop: WARNING! Forcing flush on priority "
             << "with a proxy session.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     control -> FlushPriority = 1;
   }
@@ -12969,10 +12026,8 @@ int SetLink()
 
 int SetLinkModem()
 {
-  #ifdef TEST
-  *logofs << "Loop: Setting parameters for MODEM.\n"
-          << logofs_flush;
-  #endif
+  nxinfo << "Loop: Setting parameters for MODEM.\n"
+          << std::flush;
 
   control -> LinkMode = LINK_TYPE_MODEM;
 
@@ -12999,10 +12054,8 @@ int SetLinkModem()
 
 int SetLinkIsdn()
 {
-  #ifdef TEST
-  *logofs << "Loop: Setting parameters for ISDN.\n"
-          << logofs_flush;
-  #endif
+  nxinfo << "Loop: Setting parameters for ISDN.\n"
+          << std::flush;
 
   control -> LinkMode = LINK_TYPE_ISDN;
 
@@ -13029,10 +12082,8 @@ int SetLinkIsdn()
 
 int SetLinkAdsl()
 {
-  #ifdef TEST
-  *logofs << "Loop: Setting parameters for ADSL.\n"
-          << logofs_flush;
-  #endif
+  nxinfo << "Loop: Setting parameters for ADSL.\n"
+          << std::flush;
 
   control -> LinkMode = LINK_TYPE_ADSL;
 
@@ -13059,10 +12110,8 @@ int SetLinkAdsl()
 
 int SetLinkWan()
 {
-  #ifdef TEST
-  *logofs << "Loop: Setting parameters for WAN.\n"
-          << logofs_flush;
-  #endif
+  nxinfo << "Loop: Setting parameters for WAN.\n"
+          << std::flush;
 
   control -> LinkMode = LINK_TYPE_WAN;
 
@@ -13089,10 +12138,8 @@ int SetLinkWan()
 
 int SetLinkLan()
 {
-  #ifdef TEST
-  *logofs << "Loop: Setting parameters for LAN.\n"
-          << logofs_flush;
-  #endif
+  nxinfo << "Loop: Setting parameters for LAN.\n"
+          << std::flush;
 
   control -> LinkMode = LINK_TYPE_LAN;
 
@@ -13349,12 +12396,10 @@ int SetLimits()
 
   if (useStrict == 1)
   {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: LIMIT! Decreasing the token limit "
+    nxinfo << "Loop: LIMIT! Decreasing the token limit "
             << "to " << control -> TokenLimit / 2
             << " with option 'strict'.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     control -> TokenLimit /= 2;
   }
@@ -13363,12 +12408,10 @@ int SetLimits()
 
   control -> TokenLimit = 1;
 
-  #if defined(TEST) || defined(INFO)
-  *logofs << "Loop: WARNING! LIMIT! Setting the token limit "
+  nxinfo << "Loop: WARNING! LIMIT! Setting the token limit "
           << "to " << control -> TokenLimit
           << " to simulate the proxy congestion.\n"
-          << logofs_flush;
-  #endif
+          << std::flush;
 
   #endif
 
@@ -13400,14 +12443,12 @@ int SetLimits()
     }
   }
 
-  #if defined(TEST) || defined(INFO)
-  *logofs << "Loop: LIMIT! Setting client bitrate limit "
+  nxinfo << "Loop: LIMIT! Setting client bitrate limit "
           << "to " << control -> ClientBitrateLimit
           << " server bitrate limit to " << control ->
              ServerBitrateLimit << " with local limit "
           << control -> LocalBitrateLimit << ".\n"
-          << logofs_flush;
-  #endif
+          << std::flush;
 
   return 1;
 }
@@ -13424,11 +12465,9 @@ int ParseCacheOption(const char *opt)
 
   if (size < 0)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Invalid value '"
+    nxfatal << "Loop: PANIC! Invalid value '"
             << opt << "' for option 'cache'.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     cerr << "Error" << ": Invalid value '"
          << opt << "' for option 'cache'.\n";
@@ -13436,10 +12475,8 @@ int ParseCacheOption(const char *opt)
     return -1;
   }
 
-  #ifdef TEST
-  *logofs << "Loop: Setting size of cache to "
-          << size << " bytes.\n" << logofs_flush;
-  #endif
+  nxinfo << "Loop: Setting size of cache to "
+          << size << " bytes.\n" << std::flush;
 
   control -> ClientTotalStorageSize = size;
   control -> ServerTotalStorageSize = size;
@@ -13448,17 +12485,13 @@ int ParseCacheOption(const char *opt)
 
   if (size == 0)
   {
-    #ifdef WARNING
-    *logofs << "Loop: WARNING! Disabling NX delta compression.\n"
-            << logofs_flush;
-    #endif
+    nxwarn << "Loop: WARNING! Disabling NX delta compression.\n"
+            << std::flush;
 
     control -> LocalDeltaCompression = 0;
 
-    #ifdef WARNING
-    *logofs << "Loop: WARNING! Disabling use of NX persistent cache.\n"
-            << logofs_flush;
-    #endif
+    nxwarn << "Loop: WARNING! Disabling use of NX persistent cache.\n"
+            << std::flush;
 
     control -> PersistentCacheEnableLoad = 0;
     control -> PersistentCacheEnableSave = 0;
@@ -13473,11 +12506,9 @@ int ParseImagesOption(const char *opt)
 
   if (size < 0)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Invalid value '"
+    nxfatal << "Loop: PANIC! Invalid value '"
             << opt << "' for option 'images'.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     cerr << "Error" << ": Invalid value '"
          << opt << "' for option 'images'.\n";
@@ -13485,10 +12516,8 @@ int ParseImagesOption(const char *opt)
     return -1;
   }
 
-  #ifdef TEST
-  *logofs << "Loop: Setting size of images cache to "
-          << size << " bytes.\n" << logofs_flush;
-  #endif
+  nxinfo << "Loop: Setting size of images cache to "
+          << size << " bytes.\n" << std::flush;
 
   control -> ImageCacheDiskLimit = size;
 
@@ -13503,11 +12532,9 @@ int ParseShmemOption(const char *opt)
 
   if (size < 0)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Invalid value '"
+    nxfatal << "Loop: PANIC! Invalid value '"
             << opt << "' for option 'shseg'.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     cerr << "Error" << ": Invalid value '"
          << opt << "' for option 'shseg'.\n";
@@ -13518,11 +12545,9 @@ int ParseShmemOption(const char *opt)
   control -> ShmemClientSize = size;
   control -> ShmemServerSize = size;
 
-  #if defined(TEST) || defined(INFO)
-  *logofs << "Loop: Set shared memory size to "
+  nxinfo << "Loop: Set shared memory size to "
           << control -> ShmemServerSize << " bytes.\n"
-          << logofs_flush;
-  #endif
+          << std::flush;
 
   strcpy(shsegSizeName, opt);
 
@@ -13535,11 +12560,9 @@ int ParseBitrateOption(const char *opt)
 
   if (bitrate < 0)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Invalid value '"
+    nxfatal << "Loop: PANIC! Invalid value '"
             << opt << "' for option 'limit'.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     cerr << "Error" << ": Invalid value '"
          << opt << "' for option 'limit'.\n";
@@ -13551,19 +12574,15 @@ int ParseBitrateOption(const char *opt)
 
   if (bitrate == 0)
   {
-    #ifdef TEST
-    *logofs << "Loop: Disabling bitrate limit on proxy link.\n"
-            << logofs_flush;
-    #endif
+    nxinfo << "Loop: Disabling bitrate limit on proxy link.\n"
+            << std::flush;
 
     control -> LocalBitrateLimit = 0;
   }
   else
   {
-    #ifdef TEST
-    *logofs << "Loop: Setting bitrate to " << bitrate
-            << " bits per second.\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: Setting bitrate to " << bitrate
+            << " bits per second.\n" << std::flush;
 
     //
     // Internal representation is in bytes
@@ -13578,27 +12597,21 @@ int ParseBitrateOption(const char *opt)
 
 int ParseHostOption(const char *opt, char *host, long &port)
 {
-  #ifdef TEST
-  *logofs << "Loop: Trying to parse options string '" << opt
-          << "' as a remote NX host.\n" << logofs_flush;
-  #endif
+  nxinfo << "Loop: Trying to parse options string '" << opt
+          << "' as a remote NX host.\n" << std::flush;
 
   if (opt == NULL || *opt == '\0')
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! No host parameter provided.\n"
-            << logofs_flush;
-    #endif
+    nxfatal << "Loop: PANIC! No host parameter provided.\n"
+            << std::flush;
 
     return 0;
   }
   else if (strlen(opt) >= DEFAULT_STRING_LENGTH)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Host parameter exceeds length of "
+    nxfatal << "Loop: PANIC! Host parameter exceeds length of "
             << DEFAULT_STRING_LENGTH << " characters.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     return 0;
   }
@@ -13626,10 +12639,8 @@ int ParseHostOption(const char *opt, char *host, long &port)
 
     if (newPort < 0 || *check != '\0')
     {
-      #ifdef TEST
-      *logofs << "Loop: Can't identify remote NX port in string '"
-              << separator << "'.\n" << logofs_flush;
-      #endif
+      nxinfo << "Loop: Can't identify remote NX port in string '"
+              << separator << "'.\n" << std::flush;
 
       return 0;
     }
@@ -13641,10 +12652,8 @@ int ParseHostOption(const char *opt, char *host, long &port)
     // by other means.
     //
 
-    #ifdef TEST
-    *logofs << "Loop: Can't identify remote NX port in string '"
-            << opt << "'.\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: Can't identify remote NX port in string '"
+            << opt << "'.\n" << std::flush;
 
     return 0;
   }
@@ -13669,22 +12678,18 @@ int ParseHostOption(const char *opt, char *host, long &port)
 
   if (*check != '\0')
   {
-    #ifdef TEST
-    *logofs << "Loop: Can't identify remote NX host in string '"
-            << newHost << "'.\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: Can't identify remote NX host in string '"
+            << newHost << "'.\n" << std::flush;
 
     return 0;
   }
   else if (*acceptHost != '\0')
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Can't manage to connect and accept connections "
-            << "at the same time.\n" << logofs_flush;
+    nxfatal << "Loop: PANIC! Can't manage to connect and accept connections "
+            << "at the same time.\n" << std::flush;
 
-    *logofs << "Loop: PANIC! Refusing remote NX host with string '"
-            << opt << "'.\n" << logofs_flush;
-    #endif
+    nxfatal << "Loop: PANIC! Refusing remote NX host with string '"
+            << opt << "'.\n" << std::flush;
 
     cerr << "Error" << ": Can't manage to connect and accept connections "
          << "at the same time.\n";
@@ -13697,29 +12702,23 @@ int ParseHostOption(const char *opt, char *host, long &port)
 
   if (*host != '\0' && strcmp(host, newHost) != 0)
   {
-    #ifdef WARNING
-    *logofs << "Loop: WARNING! Overriding remote NX host '"
+    nxwarn << "Loop: WARNING! Overriding remote NX host '"
             << host << "' with new value '" << newHost
-            << "'.\n" << logofs_flush;
-    #endif
+            << "'.\n" << std::flush;
   }
 
   strcpy(host, newHost);
 
   if (port != -1 && port != newPort)
   {
-    #ifdef WARNING
-    *logofs << "Loop: WARNING! Overriding remote NX port '"
+    nxwarn << "Loop: WARNING! Overriding remote NX port '"
             << port << "' with new value '" << newPort
-            << "'.\n" << logofs_flush;
-    #endif
+            << "'.\n" << std::flush;
   }
 
-  #ifdef TEST
-  *logofs << "Loop: Parsed options string '" << opt
+  nxinfo << "Loop: Parsed options string '" << opt
           << "' with host '" << newHost << "' and port '"
-          << newPort << "'.\n" << logofs_flush;
-  #endif
+          << newPort << "'.\n" << std::flush;
 
   port = newPort;
 
@@ -13737,10 +12736,8 @@ int ParseFontPath(char *path)
     return 0;
   }
 
-  #ifdef TEST
-  *logofs << "Loop: Parsing font server option '" << path
-          << "'.\n" << logofs_flush;
-  #endif
+  nxinfo << "Loop: Parsing font server option '" << path
+          << "'.\n" << std::flush;
 
   //
   // Convert the value to our default port.
@@ -13770,10 +12767,8 @@ int ParseFontPath(char *path)
 
   if (atoi(path) > 0)
   {
-    #ifdef TEST
-    *logofs << "Loop: Assuming numeric TCP port '" << atoi(path)
-            << "' for font server.\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: Assuming numeric TCP port '" << atoi(path)
+            << "' for font server.\n" << std::flush;
 
     return 1;
   }
@@ -13791,10 +12786,8 @@ int ParseFontPath(char *path)
 
     *(path + DEFAULT_STRING_LENGTH - 1) = '\0';
 
-    #ifdef TEST
-    *logofs << "Loop: Assuming Unix socket '" << path
-            << "' for font server.\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: Assuming Unix socket '" << path
+            << "' for font server.\n" << std::flush;
   }
   else if (strncmp("tcp/:", path, 5) == 0)
   {
@@ -13807,10 +12800,8 @@ int ParseFontPath(char *path)
       goto ParseFontPathError;
     }
 
-    #ifdef TEST
-    *logofs << "Loop: Assuming TCP port '" << atoi(path)
-            << "' for font server.\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: Assuming TCP port '" << atoi(path)
+            << "' for font server.\n" << std::flush;
   }
   else
   {
@@ -13824,21 +12815,17 @@ int ParseFontPath(char *path)
       goto ParseFontPathError;
     }
 
-    #ifdef TEST
-    *logofs << "Loop: Assuming Unix socket '" << path
-            << "' for font server.\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: Assuming Unix socket '" << path
+            << "' for font server.\n" << std::flush;
   }
 
   return 1;
 
 ParseFontPathError:
 
-  #ifdef TEST
-  *logofs << "Loop: Unable to determine the font server "
+  nxinfo << "Loop: Unable to determine the font server "
           << "port in string '" << path << "'.\n"
-          << logofs_flush;
-  #endif
+          << std::flush;
 
   return -1;
 }
@@ -13847,10 +12834,8 @@ int OpenLogFile(char *name, ostream *&stream)
 {
   if (name == NULL || *name == '\0')
   {
-    #ifdef TEST
-    *logofs << "Loop: WARNING! No name provided for output. Using standard error.\n"
-            << logofs_flush;
-    #endif
+    nxinfo << "Loop: WARNING! No name provided for output. Using standard error.\n"
+            << std::flush;
 
     if (stream == NULL)
     {
@@ -13868,10 +12853,8 @@ int OpenLogFile(char *name, ostream *&stream)
 
       if (filePath == NULL)
       {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Cannot determine directory of NX session file.\n"
-                << logofs_flush;
-        #endif
+        nxfatal << "Loop: PANIC! Cannot determine directory of NX session file.\n"
+                << std::flush;
 
         cerr << "Error" << ": Cannot determine directory of NX session file.\n";
 
@@ -13881,11 +12864,9 @@ int OpenLogFile(char *name, ostream *&stream)
       if (strlen(filePath) + strlen("/") +
               strlen(name) + 1 > DEFAULT_STRING_LENGTH)
       {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Full name of NX file '" << name
+        nxfatal << "Loop: PANIC! Full name of NX file '" << name
                 << " would exceed length of " << DEFAULT_STRING_LENGTH
-                << " characters.\n" << logofs_flush;
-        #endif
+                << " characters.\n" << std::flush;
 
         cerr << "Error" << ": Full name of NX file '" << name
              << " would exceed length of " << DEFAULT_STRING_LENGTH
@@ -13927,10 +12908,8 @@ int OpenLogFile(char *name, ostream *&stream)
   }
   else
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Bad stream provided for output.\n"
-            << logofs_flush;
-    #endif
+    nxfatal << "Loop: PANIC! Bad stream provided for output.\n"
+            << std::flush;
 
     cerr << "Error" << ": Bad stream provided for output.\n";
 
@@ -13955,11 +12934,9 @@ int ReopenLogFile(char *name, ostream *&stream, int limit)
 
       if (stat(name, &fileStat) != 0)
       {
-        #ifdef WARNING
-        *logofs << "Loop: WARNING! Can't get stats of file '"
+        nxwarn << "Loop: WARNING! Can't get stats of file '"
                 << name  << "'. Error is " << EGET() 
-                << " '" << ESTR() << "'.\n" << logofs_flush;
-        #endif
+                << " '" << ESTR() << "'.\n" << std::flush;
 
         return 0;
       }
@@ -13969,11 +12946,9 @@ int ReopenLogFile(char *name, ostream *&stream, int limit)
       }
     }
 
-    #ifdef TEST
-    *logofs << "Loop: Deleting file '" << name
+    nxinfo << "Loop: Deleting file '" << name
             << "' with size " << fileStat.st_size
-            << ".\n" << logofs_flush;
-    #endif
+            << ".\n" << std::flush;
 
     //
     // Create a new stream over the previous
@@ -13999,10 +12974,8 @@ int ReopenLogFile(char *name, ostream *&stream, int limit)
 
     umask(fileMode);
 
-    #ifdef TEST
-    *logofs << "Loop: Reopened file '" << name
-            << "'.\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: Reopened file '" << name
+            << "'.\n" << std::flush;
   }
 
   return 1;
@@ -14043,19 +13016,15 @@ void PrintProcessInfo()
          << strTimestamp() << "'.\n";
   }
 
-  #ifdef TEST
 
   if (*errorsFileName != '\0')
   {
-    cerr << "Info" << ": Using errors file '" << errorsFileName << "'.\n";
-  }
+    cerr << "Info" << ": Using errors file '" << errorsFileName << "'.\n";  }
 
   if (*statsFileName != '\0')
   {
-    cerr << "Info" << ": Using stats file '" << statsFileName << "'.\n";
-  }
+    cerr << "Info" << ": Using stats file '" << statsFileName << "'.\n";  }
 
-  #endif
 }
 
 void PrintConnectionInfo()
@@ -14308,12 +13277,10 @@ void PrintOptionIgnored(const char *type, const char *name, const char *value)
 {
   if (control -> ProxyMode == proxy_server)
   {
-    #ifdef WARNING
-    *logofs << "Loop: WARNING! Ignoring " << type
+    nxwarn << "Loop: WARNING! Ignoring " << type
             << " option '" << name << "' with value '"
             << value << "' at " << "NX client side.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     cerr << "Warning" << ": Ignoring " << type
          << " option '" << name << "' with value '"
@@ -14321,12 +13288,10 @@ void PrintOptionIgnored(const char *type, const char *name, const char *value)
   }
   else
   {
-    #ifdef WARNING
-    *logofs << "Loop: WARNING! Ignoring " << type
+    nxwarn << "Loop: WARNING! Ignoring " << type
             << " option '" << name << "' with value '"
             << value << "' at " << "NX server side.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     cerr << "Warning" << ": Ignoring " << type
          << " option '" << name << "' with value '"
@@ -14342,11 +13307,9 @@ const char *GetOptions(const char *options)
             strncasecmp(options, "nx,", 3) != 0 &&
                 strncasecmp(options, "nx:", 3) != 0)
     {
-      #ifdef TEST
-      *logofs << "Loop: PANIC! Display options string '" << options
+      nxinfo << "Loop: PANIC! Display options string '" << options
               << "' must start with 'nx' or 'nx/nx' prefix.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       cerr << "Error" << ": Display options string '" << options
            << "' must start with 'nx' or 'nx/nx' prefix.\n";
@@ -14391,19 +13354,15 @@ const char *GetArg(int &argi, int argc, const char **argv)
 
 int CheckArg(const char *type, const char *name, const char *value)
 {
-  #ifdef TEST
-  *logofs << "Loop: Parsing " << type << " option '" << name
+  nxinfo << "Loop: Parsing " << type << " option '" << name
           << "' with value '" << (value ? value : "(null)")
-          << "'.\n" << logofs_flush;
-  #endif
+          << "'.\n" << std::flush;
 
   if (value == NULL || strstr(value, "=") != NULL)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Error in " << type << " option '"
+    nxfatal << "Loop: PANIC! Error in " << type << " option '"
             << name << "'. No value found.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     cerr << "Error" << ": Error in " << type << " option '"
          << name << "'. No value found.\n";
@@ -14412,10 +13371,8 @@ int CheckArg(const char *type, const char *name, const char *value)
   }
   else if (strstr(name, ",") != NULL)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Parse error at " << type << " option '"
-            << name << "'.\n" << logofs_flush;
-    #endif
+    nxfatal << "Loop: PANIC! Parse error at " << type << " option '"
+            << name << "'.\n" << std::flush;
 
     cerr << "Error" << ": Parse error at " << type << " option '"
          << name << "'.\n";
@@ -14424,12 +13381,10 @@ int CheckArg(const char *type, const char *name, const char *value)
   }
   else if (strlen(value) >= DEFAULT_STRING_LENGTH)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Value '" << value << "' of "
+    nxfatal << "Loop: PANIC! Value '" << value << "' of "
             << type << " option '" << name << "' exceeds length of "
             << DEFAULT_STRING_LENGTH << " characters.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     cerr << "Error" << ": Value '" << value << "' of "
          << type << " option '" << name << "' exceeds length of "
@@ -14483,25 +13438,23 @@ int ParseArg(const char *type, const char *name, const char *value)
 
   *(string + (strlen(value) - 1)) = '\0';
 
-  #ifdef TEST
 
-  *logofs << "Loop: Parsing integer option '" << name
-          << "' from string '" << string << "' with base set to ";
+  nxinfo << "Loop: Parsing integer option '" << name
+         << "' from string '" << string << "' with base set to ";
 
   switch (tolower(*id))
   {
     case 'k':
     case 'm':
     case 'g':
-    {
-      *logofs << (char) toupper(*id);
+    {      
+      nxinfo << (char) toupper(*id);
+      break;
     }
-    break;
   }
 
-  *logofs << ".\n" << logofs_flush;
+  nxinfo << ".\n" << std::flush;
 
-  #endif
 
   double result = atof(string) * base;
 
@@ -14514,10 +13467,8 @@ int ParseArg(const char *type, const char *name, const char *value)
 
   delete [] string;
 
-  #ifdef TEST
-  *logofs << "Loop: Integer option parsed to '"
-          << (int) result << "'.\n" << logofs_flush;
-  #endif
+  nxinfo << "Loop: Integer option parsed to '"
+          << (int) result << "'.\n" << std::flush;
 
   return (int) result;
 }
@@ -14526,11 +13477,9 @@ void SetAndValidateChannelEndPointArg(const char *type, const char *name, const
                                       ChannelEndPoint &endPoint) {
   endPoint.setSpec(value);
   if (!endPoint.validateSpec()) {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Invalid " << type
+    nxfatal << "Loop: PANIC! Invalid " << type
             << " option '" << name << "' with value '"
-            << value << "'.\n" << logofs_flush;
-    #endif
+            << value << "'.\n" << std::flush;
 
     cerr << "Error" << ": Invalid " << type
          << " option '" << name << "' with value '"
@@ -14547,11 +13496,9 @@ int ValidateArg(const char *type, const char *name, const char *value)
 
   if (number < 0)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Invalid " << type
+    nxfatal << "Loop: PANIC! Invalid " << type
             << " option '" << name << "' with value '"
-            << value << "'.\n" << logofs_flush;
-    #endif
+            << value << "'.\n" << std::flush;
 
     cerr << "Error" << ": Invalid " << type
          << " option '" << name << "' with value '"
@@ -14656,20 +13603,16 @@ static void handleCheckSessionInLoop()
 
   if (proxy -> getShutdown() > 0)
   {
-    #ifdef TEST
-    *logofs << "Loop: End of NX transport requested "
-            << "by remote.\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: End of NX transport requested "
+            << "by remote.\n" << std::flush;
 
     handleTerminatingInLoop();
 
     if (control -> ProxyMode == proxy_server)
     {
-      #ifdef TEST
-      *logofs << "Loop: Bytes received so far are "
+      nxinfo << "Loop: Bytes received so far are "
               << (unsigned long long) statistics -> getBytesIn()
-              << ".\n" << logofs_flush;
-      #endif
+              << ".\n" << std::flush;
 
       if (statistics -> getBytesIn() < 1024)
       {
@@ -14682,20 +13625,16 @@ static void handleCheckSessionInLoop()
       }
     }
 
-    #ifdef TEST
-    *logofs << "Loop: Shutting down the NX transport.\n"
-            << logofs_flush;
-    #endif
+    nxinfo << "Loop: Shutting down the NX transport.\n"
+            << std::flush;
 
     HandleCleanup();
   }
   else if (proxy -> handlePing() < 0)
   {
-    #ifdef TEST
-    *logofs << "Loop: Failure handling the ping for "
+    nxinfo << "Loop: Failure handling the ping for "
             << "proxy FD#" << proxyFD << ".\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     HandleShutdown();
   }
@@ -14708,18 +13647,14 @@ static void handleCheckSessionInLoop()
 
   if (IsRunning(lastWatchdog) && CheckProcess(lastWatchdog, "watchdog") == 0)
   {
-    #ifdef WARNING
-    *logofs << "Loop: WARNING! Watchdog is gone unnoticed. "
+    nxwarn << "Loop: WARNING! Watchdog is gone unnoticed. "
             << "Setting the last signal to SIGTERM.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     lastSignal = SIGTERM;
 
-    #ifdef WARNING
-    *logofs << "Loop: WARNING! Resetting pid of last "
-            << "watchdog process.\n" << logofs_flush;
-    #endif
+    nxwarn << "Loop: WARNING! Resetting pid of last "
+            << "watchdog process.\n" << std::flush;
 
     SetNotRunning(lastWatchdog);
   }
@@ -14737,16 +13672,12 @@ static void handleCheckSessionInLoop()
           agent != NULL && proxy -> getType(agentFD[1]) ==
               channel_none && lastKill == 0 && lastDestroy == 1)
   {
-    #ifdef TEST
-    *logofs << "Loop: End of NX transport requested "
-            << "by agent.\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: End of NX transport requested "
+            << "by agent.\n" << std::flush;
 
-    #ifdef TEST
-    *logofs << "Loop: Bytes sent so far are "
+    nxinfo << "Loop: Bytes sent so far are "
             << (unsigned long long) statistics -> getBytesOut()
-            << ".\n" << logofs_flush;
-    #endif
+            << ".\n" << std::flush;
 
     if (statistics -> getBytesOut() < 1024)
     {
@@ -14811,11 +13742,9 @@ static void handleCheckSessionInLoop()
 
       if (signal != 0)
       {
-        #ifdef TEST
-        *logofs << "Loop: End of NX transport requested by signal '"
+        nxinfo << "Loop: End of NX transport requested by signal '"
                 << signal << "' '" << DumpSignal(signal)
-                << "'.\n" << logofs_flush;
-        #endif
+                << "'.\n" << std::flush;
 
         handleTerminatingInLoop();
       }
@@ -14844,10 +13773,8 @@ static void handleCheckSessionInLoop()
     }
     else if (lastKill == 2)
     {
-      #ifdef TEST
-      *logofs << "Loop: Shutting down the NX transport.\n"
-              << logofs_flush;
-      #endif
+      nxinfo << "Loop: Shutting down the NX transport.\n"
+              << std::flush;
 
       proxy -> handleShutdown();
 
@@ -14880,49 +13807,39 @@ static void handleCheckSessionInLoop()
           timeout = 500;
         }
 
-        #ifdef TEST
-        *logofs << "Loop: Starting watchdog process with timeout "
+        nxinfo << "Loop: Starting watchdog process with timeout "
                 << "of " << timeout << " Ms.\n"
-                << logofs_flush;
-        #endif
+                << std::flush;
       }
-      #ifdef TEST
       else
       {
-        *logofs << "Loop: Starting watchdog process without "
-                << "a timeout.\n" << logofs_flush;
+        nxinfo << "Loop: Starting watchdog process without "
+                << "a timeout.\n" << std::flush;
       }
-      #endif
 
       lastWatchdog = NXTransWatchdog(timeout);
 
       if (IsFailed(lastWatchdog))
       {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Can't start the NX watchdog "
-                << "process in shutdown.\n" << logofs_flush;
-        #endif
+        nxfatal << "Loop: PANIC! Can't start the NX watchdog "
+                << "process in shutdown.\n" << std::flush;
 
         cerr << "Error" << ": Can't start the NX watchdog "
              << "process in shutdown.\n";
 
         HandleCleanup();
       }
-      #ifdef TEST
       else
       {
-        *logofs << "Loop: Watchdog started with pid '"
-                << lastWatchdog << "'.\n" << logofs_flush;
+        nxinfo << "Loop: Watchdog started with pid '"
+                << lastWatchdog << "'.\n" << std::flush;
       }
-      #endif
     }
     else
     {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Previous watchdog detected "
+      nxfatal << "Loop: PANIC! Previous watchdog detected "
               << "in shutdown with pid '" << lastWatchdog
-              << "'.\n" << logofs_flush;
-      #endif
+              << "'.\n" << std::flush;
 
       cerr << "Error" << ": Previous watchdog detected "
            << "in shutdown with pid '" << lastWatchdog
@@ -14933,10 +13850,8 @@ static void handleCheckSessionInLoop()
 
     if (control -> CleanupTimeout > 0)
     {
-      #ifdef TEST
-      *logofs << "Loop: Waiting the cleanup timeout to complete.\n"
-              << logofs_flush;
-      #endif
+      nxinfo << "Loop: Waiting the cleanup timeout to complete.\n"
+              << std::flush;
 
       cerr << "Info" << ": Waiting the cleanup timeout to complete.\n";
     }
@@ -14951,10 +13866,8 @@ static void handleCheckSessionInLoop()
       cerr << "Info" << ": Watchdog running with pid '" << lastWatchdog
            << "'.\n";
 
-      #ifdef TEST
-      *logofs << "Loop: Waiting the watchdog process to complete.\n"
-              << logofs_flush;
-      #endif
+      nxinfo << "Loop: Waiting the watchdog process to complete.\n"
+              << std::flush;
 
       cerr << "Info" << ": Waiting the watchdog process to complete.\n";
     }
@@ -14967,13 +13880,11 @@ static void handleCheckBitrateInLoop()
 {
   static long int slept = 0;
 
-  #ifdef TEST
-  *logofs << "Loop: Bitrate is " << statistics -> getBitrateInShortFrame()
+  nxinfo << "Loop: Bitrate is " << statistics -> getBitrateInShortFrame()
           << " B/s and " << statistics -> getBitrateInLongFrame()
           << " B/s in " << control -> ShortBitrateTimeFrame / 1000
           << "/" << control -> LongBitrateTimeFrame / 1000
-          << " seconds timeframes.\n" << logofs_flush;
-  #endif
+          << " seconds timeframes.\n" << std::flush;
 
   //
   // This can be improved. We may not jump out
@@ -14983,11 +13894,9 @@ static void handleCheckBitrateInLoop()
 
   if (control -> LocalBitrateLimit > 0)
   {
-    #ifdef TEST
-    *logofs << "Loop: Calculating bandwidth usage with limit "
+    nxinfo << "Loop: Calculating bandwidth usage with limit "
             << control -> LocalBitrateLimit << ".\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     int reference = (statistics -> getBitrateInLongFrame() +
                          statistics -> getBitrateInShortFrame()) / 2;
@@ -15006,11 +13915,9 @@ static void handleCheckBitrateInLoop()
 
       if (slept > 2000)
       {
-        #ifdef WARNING
-        *logofs << "Loop: WARNING! Sleeping due to "
+        nxwarn << "Loop: WARNING! Sleeping due to "
                 << "reference bitrate of " << reference
-                << " B/s.\n" << logofs_flush;
-        #endif
+                << " B/s.\n" << std::flush;
 
         cerr << "Warning" << ": Sleeping due to "
              << "reference bitrate of " << reference
@@ -15032,27 +13939,20 @@ static void handleCheckBitrateInLoop()
   }
 }
 
-#if defined(TEST) || defined(INFO)
 
 static void handleCheckStateInLoop(int &setFDs)
-{
-  int fdLength;
-  int fdPending;
-  int fdSplits;
-
+{  
+  int fdLength;  int fdPending;  int fdSplits;
   for (int j = 0; j < setFDs; j++)
   {
     if (j != proxyFD)
     {
       fdPending = proxy -> getPending(j);
-
       if (fdPending > 0)
       {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Buffer for descriptor FD#"
+        nxfatal << "Loop: PANIC! Buffer for descriptor FD#"
                 << j << " has pending bytes to read.\n"
-                << logofs_flush;
-        #endif
+                << std::flush;
 
         HandleCleanup();
       }
@@ -15061,11 +13961,9 @@ static void handleCheckStateInLoop(int &setFDs)
 
       if (fdLength > 0)
       {
-        #ifdef TEST
-        *logofs << "Loop: WARNING! Buffer for descriptor FD#"
+        nxinfo << "Loop: WARNING! Buffer for descriptor FD#"
                 << j << " has " << fdLength << " bytes to write.\n"
-                << logofs_flush;
-        #endif
+                << std::flush;
       }
     }
   }
@@ -15074,11 +13972,9 @@ static void handleCheckStateInLoop(int &setFDs)
 
   if (fdPending > 0)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Buffer for proxy descriptor FD#"
+    nxfatal << "Loop: PANIC! Buffer for proxy descriptor FD#"
             << proxyFD << " has pending bytes to read.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     HandleCleanup();
   }
@@ -15090,22 +13986,18 @@ static void handleCheckStateInLoop(int &setFDs)
     if (control -> FlushPolicy == policy_immediate &&
             proxy -> getBlocked(proxyFD) == 0)
     {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! Buffer for proxy descriptor FD#"
+      nxfatal << "Loop: PANIC! Buffer for proxy descriptor FD#"
               << proxyFD << " has " << fdLength << " bytes "
               << "to write with policy 'immediate'.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       HandleCleanup();
     }
     else
     {
-      #ifdef TEST
-      *logofs << "Loop: WARNING! Buffer for proxy descriptor FD#"
+      nxinfo << "Loop: WARNING! Buffer for proxy descriptor FD#"
               << proxyFD << " has " << fdLength << " bytes "
-              << "to write.\n" << logofs_flush;
-      #endif
+              << "to write.\n" << std::flush;
     }
   }
 
@@ -15113,22 +14005,18 @@ static void handleCheckStateInLoop(int &setFDs)
 
   if (fdSplits > 0)
   {
-    #ifdef WARNING
-    *logofs << "Loop: WARNING! Proxy descriptor FD#" << proxyFD
+    nxwarn << "Loop: WARNING! Proxy descriptor FD#" << proxyFD
             << " has " << fdSplits << " splits to send.\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
   }
 }
 
 static void handleCheckSelectInLoop(int &setFDs, fd_set &readSet,
                                         fd_set &writeSet, T_timestamp selectTs)
 {
-  #if defined(TEST) || defined(INFO)
-  *logofs << "Loop: Maximum descriptors is ["
+  nxinfo << "Loop: Maximum descriptors is ["
           << setFDs << "] at " << strMsTimestamp()
-          << ".\n" << logofs_flush;
-  #endif
+          << ".\n" << std::flush;
 
   int i;
 
@@ -15136,17 +14024,13 @@ static void handleCheckSelectInLoop(int &setFDs, fd_set &readSet,
   {
     i = 0;
 
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Selected for read are ";
-    #endif
+    nxinfo << "Loop: Selected for read are ";
 
     for (int j = 0; j < setFDs; j++)
     {
       if (FD_ISSET(j, &readSet))
       {
-        #if defined(TEST) || defined(INFO)
-        *logofs << "[" << j << "]" << logofs_flush;
-        #endif
+        nxinfo << "[" << j << "]" << std::flush;
 
         i++;
       }
@@ -15154,30 +14038,22 @@ static void handleCheckSelectInLoop(int &setFDs, fd_set &readSet,
 
     if (i > 0)
     {
-      #if defined(TEST) || defined(INFO)
-      *logofs << ".\n" << logofs_flush;
-      #endif
+      nxinfo << ".\n" << std::flush;
     }
     else
     {
-      #if defined(TEST) || defined(INFO)
-      *logofs << "[none].\n" << logofs_flush;
-      #endif
+      nxinfo << "[none].\n" << std::flush;
     }
 
     i = 0;
 
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Selected for write are ";
-    #endif
+    nxinfo << "Loop: Selected for write are ";
 
     for (int j = 0; j < setFDs; j++)
     {
       if (FD_ISSET(j, &writeSet))
       {
-        #if defined(TEST) || defined(INFO)
-        *logofs << "[" << j << "]" << logofs_flush;
-        #endif
+        nxinfo << "[" << j << "]" << std::flush;
 
         i++;
       }
@@ -15185,24 +14061,18 @@ static void handleCheckSelectInLoop(int &setFDs, fd_set &readSet,
 
     if (i > 0)
     {
-      #if defined(TEST) || defined(INFO)
-      *logofs << ".\n" << logofs_flush;
-      #endif
+      nxinfo << ".\n" << std::flush;
     }
     else
     {
-      #if defined(TEST) || defined(INFO)
-      *logofs << "[none].\n" << logofs_flush;
-      #endif
+      nxinfo << "[none].\n" << std::flush;
     }
   }
 
-  #if defined(TEST) || defined(INFO)
-  *logofs << "Loop: Select timeout is "
+  nxinfo << "Loop: Select timeout is "
           << selectTs.tv_sec << " S and "
           << (double) selectTs.tv_usec / 1000
-          << " Ms.\n" << logofs_flush;
-  #endif
+          << " Ms.\n" << std::flush;
 }
 
 static void handleCheckResultInLoop(int &resultFDs, int &errorFDs, int &setFDs, fd_set &readSet,
@@ -15211,25 +14081,23 @@ static void handleCheckResultInLoop(int &resultFDs, int &errorFDs, int &setFDs,
 {
   int diffTs = diffTimestamp(startTs, getNewTimestamp());
 
-  #if defined(TEST) || defined(INFO)
 
   if (diffTs >= (control -> PingTimeout -
                      (control -> LatencyTimeout * 4)))
   {
-    *logofs << "Loop: Select result is [" << resultFDs
+    nxinfo << "Loop: Select result is [" << resultFDs
             << "] at " << strMsTimestamp() << " with no "
             << "communication within " << diffTs
-            << " Ms.\n" << logofs_flush;
+            << " Ms.\n" << std::flush;
   }
   else
   {
-    *logofs << "Loop: Select result is [" << resultFDs
+    nxinfo << "Loop: Select result is [" << resultFDs
             << "] error is [" << errorFDs << "] at "
             << strMsTimestamp() << " after " << diffTs
-            << " Ms.\n" << logofs_flush;
+            << " Ms.\n" << std::flush;
   }
 
-  #endif
 
   int i;
 
@@ -15237,17 +14105,13 @@ static void handleCheckResultInLoop(int &resultFDs, int &errorFDs, int &setFDs,
   {
     i = 0;
 
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Selected for read are ";
-    #endif
+    nxinfo << "Loop: Selected for read are ";
 
     for (int j = 0; j < setFDs; j++)
     {
       if (FD_ISSET(j, &readSet))
       {
-        #if defined(TEST) || defined(INFO)
-        *logofs << "[" << j << "]" << logofs_flush;
-        #endif
+        nxinfo << "[" << j << "]" << std::flush;
 
         i++;
       }
@@ -15255,30 +14119,22 @@ static void handleCheckResultInLoop(int &resultFDs, int &errorFDs, int &setFDs,
 
     if (i > 0)
     {
-      #if defined(TEST) || defined(INFO)
-      *logofs << ".\n" << logofs_flush;
-      #endif
+      nxinfo << ".\n" << std::flush;
     }
     else
     {
-      #if defined(TEST) || defined(INFO)
-      *logofs << "[none].\n" << logofs_flush;
-      #endif
+      nxinfo << "[none].\n" << std::flush;
     }
 
     i = 0;
 
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Selected for write are ";
-    #endif
+    nxinfo << "Loop: Selected for write are ";
 
     for (int j = 0; j < setFDs; j++)
     {
       if (FD_ISSET(j, &writeSet))
       {
-        #if defined(TEST) || defined(INFO)
-        *logofs << "[" << j << "]" << logofs_flush;
-        #endif
+        nxinfo << "[" << j << "]" << std::flush;
 
         i++;
       }
@@ -15286,27 +14142,20 @@ static void handleCheckResultInLoop(int &resultFDs, int &errorFDs, int &setFDs,
 
     if (i > 0)
     {
-      #if defined(TEST) || defined(INFO)
-      *logofs << ".\n" << logofs_flush;
-      #endif
+      nxinfo << ".\n" << std::flush;
     }
     else
     {
-      #if defined(TEST) || defined(INFO)
-      *logofs << "[none].\n" << logofs_flush;
-      #endif
+      nxinfo << "[none].\n" << std::flush;
     }
   }
 }
 
-#endif
 
 static void handleCheckSessionInConnect()
 {
-  #ifdef TEST
-  *logofs << "Loop: Going to check session in connect.\n"
-          << logofs_flush;
-  #endif
+  nxinfo << "Loop: Going to check session in connect.\n"
+          << std::flush;
 
   if (control -> ProxyMode == proxy_client)
   {
@@ -15350,11 +14199,9 @@ static void handleStatisticsInLoop()
 
     if (mode == TOTAL_STATS || mode == PARTIAL_STATS)
     {
-      #ifdef TEST
-      *logofs << "Loop: Going to request proxy statistics "
+      nxinfo << "Loop: Going to request proxy statistics "
               << "with signal '" << DumpSignal(lastSignal)
-              << "'.\n" << logofs_flush;
-      #endif
+              << "'.\n" << std::flush;
 
       if (proxy != NULL)
       {
@@ -15376,22 +14223,18 @@ static void handleNegotiationInLoop(int &setFDs, fd_set &readSet,
 
   while (yield == 0)
   {
-    #ifdef TEST
-    *logofs << "Loop: Going to run a new negotiation loop "
+    nxinfo << "Loop: Going to run a new negotiation loop "
             << "with stage " << control -> ProxyStage
             << " at " << strMsTimestamp() << ".\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     switch (control -> ProxyStage)
     {
       case stage_undefined:
       {
-        #ifdef TEST
-        *logofs << "Loop: Handling negotiation with '"
+        nxinfo << "Loop: Handling negotiation with '"
                 << "stage_undefined" << "'.\n"
-                << logofs_flush;
-        #endif
+                << std::flush;
 
         control -> ProxyStage = stage_initializing;
 
@@ -15399,11 +14242,9 @@ static void handleNegotiationInLoop(int &setFDs, fd_set &readSet,
       }
       case stage_initializing:
       {
-        #ifdef TEST
-        *logofs << "Loop: Handling negotiation with '"
+        nxinfo << "Loop: Handling negotiation with '"
                 << "stage_initializing" << "'.\n"
-                << logofs_flush;
-        #endif
+                << std::flush;
 
         InitBeforeNegotiation();
 
@@ -15413,11 +14254,9 @@ static void handleNegotiationInLoop(int &setFDs, fd_set &readSet,
       }
       case stage_connecting:
       {
-        #ifdef TEST
-        *logofs << "Loop: Handling negotiation with '"
+        nxinfo << "Loop: Handling negotiation with '"
                 << "stage_connecting" << "'.\n"
-                << logofs_flush;
-        #endif
+                << std::flush;
 
         SetupProxyConnection();
 
@@ -15427,11 +14266,9 @@ static void handleNegotiationInLoop(int &setFDs, fd_set &readSet,
       }
       case stage_connected:
       {
-        #ifdef TEST
-        *logofs << "Loop: Handling negotiation with '"
+        nxinfo << "Loop: Handling negotiation with '"
                 << "stage_connected" << "'.\n"
-                << logofs_flush;
-        #endif
+                << std::flush;
 
         //
         // Server side proxy must always be the one that
@@ -15472,11 +14309,9 @@ static void handleNegotiationInLoop(int &setFDs, fd_set &readSet,
       }
       case stage_sending_proxy_options:
       {
-        #ifdef TEST
-        *logofs << "Loop: Handling negotiation with '"
+        nxinfo << "Loop: Handling negotiation with '"
                 << "stage_sending_proxy_options" << "'.\n"
-                << logofs_flush;
-        #endif
+                << std::flush;
 
         if (SendProxyOptions(proxyFD) < 0)
         {
@@ -15496,11 +14331,9 @@ static void handleNegotiationInLoop(int &setFDs, fd_set &readSet,
       }
       case stage_waiting_forwarder_version:
       {
-        #ifdef TEST
-        *logofs << "Loop: Handling negotiation with '"
+        nxinfo << "Loop: Handling negotiation with '"
                 << "stage_waiting_forwarder_version" << "'.\n"
-                << logofs_flush;
-        #endif
+                << std::flush;
 
         int result = ReadForwarderVersion(proxyFD);
 
@@ -15521,11 +14354,9 @@ static void handleNegotiationInLoop(int &setFDs, fd_set &readSet,
       }
       case stage_waiting_forwarder_options:
       {
-        #ifdef TEST
-        *logofs << "Loop: Handling negotiation with '"
+        nxinfo << "Loop: Handling negotiation with '"
                 << "stage_waiting_forwarder_options" << "'.\n"
-                << logofs_flush;
-        #endif
+                << std::flush;
 
         int result = ReadForwarderOptions(proxyFD);
 
@@ -15546,11 +14377,9 @@ static void handleNegotiationInLoop(int &setFDs, fd_set &readSet,
       }
       case stage_waiting_proxy_version:
       {
-        #ifdef TEST
-        *logofs << "Loop: Handling negotiation with '"
+        nxinfo << "Loop: Handling negotiation with '"
                 << "stage_waiting_proxy_version" << "'.\n"
-                << logofs_flush;
-        #endif
+                << std::flush;
 
         int result = ReadProxyVersion(proxyFD);
 
@@ -15571,11 +14400,9 @@ static void handleNegotiationInLoop(int &setFDs, fd_set &readSet,
       }
       case stage_waiting_proxy_options:
       {
-        #ifdef TEST
-        *logofs << "Loop: Handling negotiation with '"
+        nxinfo << "Loop: Handling negotiation with '"
                 << "stage_waiting_proxy_options" << "'.\n"
-                << logofs_flush;
-        #endif
+                << std::flush;
 
         int result = ReadProxyOptions(proxyFD);
 
@@ -15603,11 +14430,9 @@ static void handleNegotiationInLoop(int &setFDs, fd_set &readSet,
       }
       case stage_sending_proxy_caches:
       {
-        #ifdef TEST
-        *logofs << "Loop: Handling negotiation with '"
+        nxinfo << "Loop: Handling negotiation with '"
                 << "stage_sending_proxy_caches" << "'.\n"
-                << logofs_flush;
-        #endif
+                << std::flush;
 
         if (SendProxyCaches(proxyFD) < 0)
         {
@@ -15627,11 +14452,9 @@ static void handleNegotiationInLoop(int &setFDs, fd_set &readSet,
       }
       case stage_waiting_proxy_caches:
       {
-        #ifdef TEST
-        *logofs << "Loop: Handling negotiation with '"
+        nxinfo << "Loop: Handling negotiation with '"
                 << "stage_waiting_proxy_caches" << "'.\n"
-                << logofs_flush;
-        #endif
+                << std::flush;
 
         int result = ReadProxyCaches(proxyFD);
 
@@ -15659,11 +14482,9 @@ static void handleNegotiationInLoop(int &setFDs, fd_set &readSet,
       }
       case stage_operational:
       {
-        #ifdef TEST
-        *logofs << "Loop: Handling negotiation with '"
+        nxinfo << "Loop: Handling negotiation with '"
                 << "stage_operational" << "'.\n"
-                << logofs_flush;
-        #endif
+                << std::flush;
 
         InitAfterNegotiation();
 
@@ -15673,10 +14494,8 @@ static void handleNegotiationInLoop(int &setFDs, fd_set &readSet,
       }
       default:
       {
-        #ifdef PANIC
-        *logofs << "Loop: PANIC! Unmanaged case '" << control -> ProxyStage
-                << "' while handling negotiation.\n" << logofs_flush;
-        #endif
+        nxfatal << "Loop: PANIC! Unmanaged case '" << control -> ProxyStage
+                << "' while handling negotiation.\n" << std::flush;
 
         cerr << "Error" << ": Unmanaged case '" << control -> ProxyStage
              << "' while handling negotiation.\n";
@@ -15710,20 +14529,16 @@ static void handleNegotiationInLoop(int &setFDs, fd_set &readSet,
 
   setMinTimestamp(selectTs, control -> PingTimeout);
 
-  #ifdef TEST
-  *logofs << "Loop: Selected proxy FD#" << proxyFD << " in negotiation "
+  nxinfo << "Loop: Selected proxy FD#" << proxyFD << " in negotiation "
           << "phase with timeout of " << selectTs.tv_sec << " S and "
-          << selectTs.tv_usec << " Ms.\n" << logofs_flush;
-  #endif
+          << selectTs.tv_usec << " Ms.\n" << std::flush;
 
   return;
 
 handleNegotiationInLoopError:
 
-  #ifdef PANIC
-  *logofs << "Loop: PANIC! Failure negotiating the session in stage '"
-          << control -> ProxyStage << "'.\n" << logofs_flush;
-  #endif
+  nxfatal << "Loop: PANIC! Failure negotiating the session in stage '"
+          << control -> ProxyStage << "'.\n" << std::flush;
 
   cerr << "Error" << ": Failure negotiating the session in stage '"
        << control -> ProxyStage << "'.\n";
@@ -15732,10 +14547,8 @@ handleNegotiationInLoopError:
   if (control -> ProxyMode == proxy_server &&
           control -> ProxyStage == stage_waiting_proxy_version)
   {
-    #ifdef PANIC
-    *logofs << "Loop: PANIC! Wrong version or invalid session "
-            << "authentication cookie.\n" << logofs_flush;
-    #endif
+    nxfatal << "Loop: PANIC! Wrong version or invalid session "
+            << "authentication cookie.\n" << std::flush;
 
     cerr << "Error" << ": Wrong version or invalid session "
          << "authentication cookie.\n";
@@ -15798,10 +14611,8 @@ static void handleAlertInLoop()
   {
     if (proxy != NULL)
     {
-      #if defined(TEST) || defined(INFO)
-      *logofs << "Loop: Requesting a remote alert with code '"
-              << lastAlert.code << "'.\n" << logofs_flush;
-      #endif
+      nxinfo << "Loop: Requesting a remote alert with code '"
+              << lastAlert.code << "'.\n" << std::flush;
 
       if (proxy -> handleAlert(lastAlert.code) < 0)
       {
@@ -15811,10 +14622,8 @@ static void handleAlertInLoop()
   }
   else
   {
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Handling a local alert with code '"
-            << lastAlert.code << "'.\n" << logofs_flush;
-    #endif
+    nxinfo << "Loop: Handling a local alert with code '"
+            << lastAlert.code << "'.\n" << std::flush;
 
     if (control -> ProxyMode == proxy_client)
     {
@@ -16048,22 +14857,18 @@ static void handleAlertInLoop()
         {
           if (lastAlert.code > LAST_PROTO_STEP_7_ALERT)
           {
-            #ifdef WARNING
-            *logofs << "Loop: WARNING! An unrecognized alert type '"
+            nxwarn << "Loop: WARNING! An unrecognized alert type '"
                     << lastAlert.code << "' was requested.\n"
-                    << logofs_flush;
-            #endif
+                    << std::flush;
 
             cerr << "Warning" << ": An unrecognized alert type '"
                  << lastAlert.code << "' was requested.\n";
           }
-          #ifdef WARNING
           else
           {
-            *logofs << "Loop: WARNING! Ignoring obsolete alert type '"
-                    << lastAlert.code << "'.\n" << logofs_flush;
+            nxwarn << "Loop: WARNING! Ignoring obsolete alert type '"
+                    << lastAlert.code << "'.\n" << std::flush;
           }
-          #endif
 
           message = NULL;
           type    = NULL;
@@ -16076,10 +14881,8 @@ static void handleAlertInLoop()
 
       if (replace == 1 && IsRunning(lastDialog))
       {
-        #if defined(TEST) || defined(INFO)
-        *logofs << "Loop: Killing the previous dialog with pid '"
-                << lastDialog << "'.\n" << logofs_flush;
-        #endif
+        nxinfo << "Loop: Killing the previous dialog with pid '"
+                << lastDialog << "'.\n" << std::flush;
 
         //
         // The client ignores the TERM signal
@@ -16110,28 +14913,22 @@ static void handleAlertInLoop()
 
         if (IsFailed(lastDialog))
         {
-          #ifdef PANIC
-          *logofs << "Loop: PANIC! Can't start the NX dialog process.\n"
-                  << logofs_flush;
-          #endif
+          nxfatal << "Loop: PANIC! Can't start the NX dialog process.\n"
+                  << std::flush;
 
           SetNotRunning(lastDialog);
         }
-        #if defined(TEST) || defined(INFO)
         else
         {
-          *logofs << "Loop: Dialog started with pid '"
-                  << lastDialog << "'.\n" << logofs_flush;
+          nxinfo << "Loop: Dialog started with pid '"
+                  << lastDialog << "'.\n" << std::flush;
         }
-        #endif
       }
-      #if defined(TEST) || defined(INFO)
       else
       {
-        *logofs << "Loop: No new dialog required for code '"
-                << lastAlert.code << "'.\n" << logofs_flush;
+        nxinfo << "Loop: No new dialog required for code '"
+                << lastAlert.code << "'.\n" << std::flush;
       }
-      #endif
     }
   }
 
@@ -16146,10 +14943,8 @@ static void handleAlertInLoop()
 static inline void handleSetAgentInLoop(int &setFDs, fd_set &readSet,
                                             fd_set &writeSet, struct timeval &selectTs)
 {
-  #ifdef TEST
-  *logofs << "Loop: Preparing the masks for the agent descriptors.\n"
-          << logofs_flush;
-  #endif
+  nxinfo << "Loop: Preparing the masks for the agent descriptors.\n"
+          << std::flush;
 
   agent -> saveChannelState();
 
@@ -16163,10 +14958,8 @@ static inline void handleSetAgentInLoop(int &setFDs, fd_set &readSet,
                 agent -> localCanRead() ||
                     agent -> proxyCanRead())
     {
-      #ifdef TEST
-      *logofs << "Loop: Setting a null timeout with agent descriptors ready.\n"
-              << logofs_flush;
-      #endif
+      nxinfo << "Loop: Setting a null timeout with agent descriptors ready.\n"
+              << std::flush;
 
       //
       // Force a null timeout so we'll bail out
@@ -16179,10 +14972,8 @@ static inline void handleSetAgentInLoop(int &setFDs, fd_set &readSet,
     }
   }
 
-  #ifdef TEST
-  *logofs << "Loop: Clearing the read and write agent descriptors.\n"
-          << logofs_flush;
-  #endif
+  nxinfo << "Loop: Clearing the read and write agent descriptors.\n"
+          << std::flush;
 
   agent -> clearReadMask(&readSet);
   agent -> clearWriteMask(&writeSet);
@@ -16191,10 +14982,8 @@ static inline void handleSetAgentInLoop(int &setFDs, fd_set &readSet,
 static inline void handleAgentInLoop(int &resultFDs, int &errorFDs, int &setFDs, fd_set &readSet,
                                          fd_set &writeSet, struct timeval &selectTs)
 {
-  #if defined(TEST) || defined(INFO)
-  *logofs << "Loop: Setting proxy and local agent descriptors.\n"
-          << logofs_flush;
-  #endif
+  nxinfo << "Loop: Setting proxy and local agent descriptors.\n"
+          << std::flush;
 
   //
   // Check if I/O is possible on the local
@@ -16210,57 +14999,47 @@ static inline void handleAgentInLoop(int &resultFDs, int &errorFDs, int &setFDs,
 
     agent -> saveChannelState();
 
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Values were resultFDs " << resultFDs
+    nxinfo << "Loop: Values were resultFDs " << resultFDs
             << " errorFDs " << errorFDs << " setFDs "
-            << setFDs << ".\n" << logofs_flush;
-    #endif
+            << setFDs << ".\n" << std::flush;
 
     if (agent -> localCanRead() == 1)
     {
-      #if defined(TEST) || defined(INFO)
-      *logofs << "Loop: Setting agent descriptor FD#" << agent ->
+      nxinfo << "Loop: Setting agent descriptor FD#" << agent ->
                  getLocalFd() << " as ready to read.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       agent -> setLocalRead(&readSet, &resultFDs);
     }
 
-    #if defined(TEST) || defined(INFO)
 
     if (agent -> proxyCanRead(&readSet) == 0 &&
             agent -> proxyCanRead() == 1)
     {
-      *logofs << "Loop: WARNING! Can read from proxy FD#"
+      nxinfo << "Loop: WARNING! Can read from proxy FD#"
               << proxyFD << " but the descriptor "
-              << "is not selected.\n" << logofs_flush;
+              << "is not selected.\n" << std::flush;
     }
 
     if (agent -> proxyCanRead(&readSet) == 1)
     {
-      *logofs << "Loop: Setting proxy descriptor FD#" << agent ->
+      nxinfo << "Loop: Setting proxy descriptor FD#" << agent ->
                  getProxyFd() << " as ready to read.\n"
-              << logofs_flush;
+              << std::flush;
     }
 
-    #endif
 
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Values are now resultFDs " << resultFDs
+    nxinfo << "Loop: Values are now resultFDs " << resultFDs
             << " errorFDs " << errorFDs << " setFDs "
-            << setFDs << ".\n" << logofs_flush;
-    #endif
+            << setFDs << ".\n" << std::flush;
   }
 }
 
 static inline void handleAgentLateInLoop(int &resultFDs, int &errorFDs, int &setFDs, fd_set &readSet,
                                              fd_set &writeSet, struct timeval &selectTs)
 {
-  #if defined(TEST) || defined(INFO)
-  *logofs << "Loop: Setting remote agent descriptors.\n"
-          << logofs_flush;
-  #endif
+  nxinfo << "Loop: Setting remote agent descriptors.\n"
+          << std::flush;
 
   //
   // We reset the masks before calling our select.
@@ -16281,20 +15060,16 @@ static inline void handleAgentLateInLoop(int &resultFDs, int &errorFDs, int &set
 
     agent -> saveChannelState();
 
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Values were resultFDs " << resultFDs
+    nxinfo << "Loop: Values were resultFDs " << resultFDs
             << " errorFDs " << errorFDs << " setFDs "
-            << setFDs << ".\n" << logofs_flush;
-    #endif
+            << setFDs << ".\n" << std::flush;
 
     if (agent -> remoteCanRead(agent ->
             getSavedReadMask()) == 1)
     {
-      #if defined(TEST) || defined(INFO)
-      *logofs << "Loop: Setting agent descriptor FD#" << agent ->
+      nxinfo << "Loop: Setting agent descriptor FD#" << agent ->
                  getRemoteFd() << " as ready to read.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       agent -> setRemoteRead(&readSet, &resultFDs);
     }
@@ -16302,20 +15077,16 @@ static inline void handleAgentLateInLoop(int &resultFDs, int &errorFDs, int &set
     if (agent -> remoteCanWrite(agent ->
             getSavedWriteMask()) == 1)
     {
-      #if defined(TEST) || defined(INFO)
-      *logofs << "Loop: Setting agent descriptor FD#" << agent ->
+      nxinfo << "Loop: Setting agent descriptor FD#" << agent ->
                  getRemoteFd() << " as ready to write.\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
 
       agent -> setRemoteWrite(&writeSet, &resultFDs);
     }
 
-    #if defined(TEST) || defined(INFO)
-    *logofs << "Loop: Values are now resultFDs " << resultFDs
+    nxinfo << "Loop: Values are now resultFDs " << resultFDs
             << " errorFDs " << errorFDs << " setFDs "
-            << setFDs << ".\n" << logofs_flush;
-    #endif
+            << setFDs << ".\n" << std::flush;
   }
 }
 
@@ -16435,10 +15206,8 @@ static inline void handleReadableInLoop(int &resultFDs, fd_set &readSet)
       {
         if (proxy -> handleNewConnection(type, newFD) < 0)
         {
-          #ifdef PANIC
-          *logofs << "Loop: PANIC! Error creating new " << label
-                  << " connection.\n" << logofs_flush;
-          #endif
+          nxfatal << "Loop: PANIC! Error creating new " << label
+                  << " connection.\n" << std::flush;
 
           cerr << "Error" << ": Error creating new " << label
                << " connection.\n";
@@ -16458,40 +15227,32 @@ static inline void handleReadableInLoop(int &resultFDs, fd_set &readSet)
           // to read immediately.
           //
 
-          #ifdef TEST
-          *logofs << "Loop: Trying to read immediately "
+          nxinfo << "Loop: Trying to read immediately "
                   << "from descriptor FD#" << newFD
-                  << ".\n" << logofs_flush;
-          #endif
+                  << ".\n" << std::flush;
 
           FD_SET(newFD, &readSet);
 
           resultFDs++;
         }
-        #ifdef TEST
         else
         {
-          *logofs << "Loop: Nothing to read immediately "
+          nxinfo << "Loop: Nothing to read immediately "
                   << "from descriptor FD#" << newFD
-                  << ".\n" << logofs_flush;
+                  << ".\n" << std::flush;
         }
-        #endif
       }
     }
   }
 
-  #ifdef DEBUG
-  *logofs << "Loop: Going to check the readable descriptors.\n"
-          << logofs_flush;
-  #endif
+  nxdbg << "Loop: Going to check the readable descriptors.\n"
+          << std::flush;
 
   if (proxy -> handleRead(resultFDs, readSet) < 0)
   {
-    #ifdef TEST
-    *logofs << "Loop: Failure reading from descriptors "
+    nxinfo << "Loop: Failure reading from descriptors "
             << "for proxy FD#" << proxyFD << ".\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     HandleShutdown();
   }
@@ -16499,18 +15260,14 @@ static inline void handleReadableInLoop(int &resultFDs, fd_set &readSet)
 
 static inline void handleWritableInLoop(int &resultFDs, fd_set &writeSet)
 {
-  #ifdef DEBUG
-  *logofs << "Loop: Going to check the writable descriptors.\n"
-          << logofs_flush;
-  #endif
+  nxdbg << "Loop: Going to check the writable descriptors.\n"
+          << std::flush;
 
   if (resultFDs > 0 && proxy -> handleFlush(resultFDs, writeSet) < 0)
   {
-    #ifdef TEST
-    *logofs << "Loop: Failure writing to descriptors "
+    nxinfo << "Loop: Failure writing to descriptors "
             << "for proxy FD#" << proxyFD << ".\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     HandleShutdown();
   }
@@ -16518,31 +15275,25 @@ static inline void handleWritableInLoop(int &resultFDs, fd_set &writeSet)
 
 static inline void handleFlushInLoop()
 {
-  #ifdef DEBUG
-  *logofs << "Loop: Going to flush any data to the proxy.\n"
-          << logofs_flush;
-  #endif
+  nxdbg << "Loop: Going to flush any data to the proxy.\n"
+          << std::flush;
 
   if (agent == NULL || control ->
           FlushPolicy == policy_immediate)
   {
-    #if defined(TEST) || defined(INFO)
 
     if (usePolicy == -1 && control ->
             ProxyMode == proxy_client)
     {
-      *logofs << "Loop: WARNING! Flushing the proxy link "
-              << "on behalf of the agent.\n" << logofs_flush;
+      nxinfo << "Loop: WARNING! Flushing the proxy link "
+              << "on behalf of the agent.\n" << std::flush;
     }
 
-    #endif
 
     if (proxy -> handleFlush() < 0)
     {
-      #ifdef TEST
-      *logofs << "Loop: Failure flushing the proxy FD#"
-              << proxyFD << ".\n" << logofs_flush;
-      #endif
+      nxinfo << "Loop: Failure flushing the proxy FD#"
+              << proxyFD << ".\n" << std::flush;
 
       HandleShutdown();
     }
@@ -16551,30 +15302,24 @@ static inline void handleFlushInLoop()
 
 static inline void handleRotateInLoop()
 {
-  #ifdef DEBUG
-  *logofs << "Loop: Going to rotate channels "
+  nxdbg << "Loop: Going to rotate channels "
           << "for proxy FD#" << proxyFD << ".\n"
-          << logofs_flush;
-  #endif
+          << std::flush;
 
   proxy -> handleRotate();
 }
 
 static inline void handleEventsInLoop()
 {
-  #ifdef DEBUG
-  *logofs << "Loop: Going to check channel events "
+  nxdbg << "Loop: Going to check channel events "
           << "for proxy FD#" << proxyFD << ".\n"
-          << logofs_flush;
-  #endif
+          << std::flush;
 
   if (proxy -> handleEvents() < 0)
   {
-    #ifdef TEST
-    *logofs << "Loop: Failure handling channel events "
+    nxinfo << "Loop: Failure handling channel events "
             << "for proxy FD#" << proxyFD << ".\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
 
     HandleShutdown();
   }
@@ -16594,10 +15339,8 @@ static void handleLogReopenInLoop(T_timestamp &lTs, T_timestamp &nTs)
 
   #endif
   {
-    #ifdef DEBUG
-    *logofs << "Loop: Checking size of log file '"
-            << errorsFileName << "'.\n" << logofs_flush;
-    #endif
+    nxdbg << "Loop: Checking size of log file '"
+            << errorsFileName << "'.\n" << std::flush;
 
     #ifndef MIXED
 
@@ -16643,11 +15386,9 @@ static void handleSetListenersInLoop(fd_set &readSet, int &setFDs)
         setFDs = tcpFD + 1;
       }
 
-      #ifdef DEBUG
-      *logofs << "Loop: Selected listener tcpFD " << tcpFD
+      nxdbg << "Loop: Selected listener tcpFD " << tcpFD
               << " with setFDs " << setFDs << ".\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
     }
 
     if (useUnixSocket == 1)
@@ -16659,11 +15400,9 @@ static void handleSetListenersInLoop(fd_set &readSet, int &setFDs)
         setFDs = unixFD + 1;
       }
 
-      #ifdef DEBUG
-      *logofs << "Loop: Selected listener unixFD " << unixFD
+      nxdbg << "Loop: Selected listener unixFD " << unixFD
               << " with setFDs " << setFDs << ".\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
     }
 
     if (useCupsSocket == 1)
@@ -16675,11 +15414,9 @@ static void handleSetListenersInLoop(fd_set &readSet, int &setFDs)
         setFDs = cupsFD + 1;
       }
 
-      #ifdef DEBUG
-      *logofs << "Loop: Selected listener cupsFD " << cupsFD
+      nxdbg << "Loop: Selected listener cupsFD " << cupsFD
               << " with setFDs " << setFDs << ".\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
     }
 
     if (useAuxSocket == 1)
@@ -16691,11 +15428,9 @@ static void handleSetListenersInLoop(fd_set &readSet, int &setFDs)
         setFDs = auxFD + 1;
       }
 
-      #ifdef DEBUG
-      *logofs << "Loop: Selected listener auxFD " << auxFD
+      nxdbg << "Loop: Selected listener auxFD " << auxFD
               << " with setFDs " << setFDs << ".\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
     }
 
     if (useSmbSocket == 1)
@@ -16707,11 +15442,9 @@ static void handleSetListenersInLoop(fd_set &readSet, int &setFDs)
         setFDs = smbFD + 1;
       }
 
-      #ifdef DEBUG
-      *logofs << "Loop: Selected listener smbFD " << smbFD
+      nxdbg << "Loop: Selected listener smbFD " << smbFD
               << " with setFDs " << setFDs << ".\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
     }
 
     if (useMediaSocket == 1)
@@ -16723,11 +15456,9 @@ static void handleSetListenersInLoop(fd_set &readSet, int &setFDs)
         setFDs = mediaFD + 1;
       }
 
-      #ifdef DEBUG
-      *logofs << "Loop: Selected listener mediaFD " << mediaFD
+      nxdbg << "Loop: Selected listener mediaFD " << mediaFD
               << " with setFDs " << setFDs << ".\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
     }
 
     if (useHttpSocket == 1)
@@ -16739,11 +15470,9 @@ static void handleSetListenersInLoop(fd_set &readSet, int &setFDs)
         setFDs = httpFD + 1;
       }
 
-      #ifdef DEBUG
-      *logofs << "Loop: Selected listener httpFD " << httpFD
+      nxdbg << "Loop: Selected listener httpFD " << httpFD
               << " with setFDs " << setFDs << ".\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
     }
   }
   else
@@ -16757,11 +15486,9 @@ static void handleSetListenersInLoop(fd_set &readSet, int &setFDs)
         setFDs = fontFD + 1;
       }
 
-      #ifdef DEBUG
-      *logofs << "Loop: Selected listener fontFD " << fontFD
+      nxdbg << "Loop: Selected listener fontFD " << fontFD
               << " with setFDs " << setFDs << ".\n"
-              << logofs_flush;
-      #endif
+              << std::flush;
     }
   }
 
@@ -16774,10 +15501,8 @@ static void handleSetListenersInLoop(fd_set &readSet, int &setFDs)
       setFDs = slaveFD + 1;
     }
 
-    #ifdef DEBUG
-    *logofs << "Loop: Selected listener slaveFD " << slaveFD
+    nxdbg << "Loop: Selected listener slaveFD " << slaveFD
             << " with setFDs " << setFDs << ".\n"
-            << logofs_flush;
-    #endif
+            << std::flush;
   }
 }
-- 
cgit v1.2.3


From f855b3b614cd9de8e55699141798e6038db36fd6 Mon Sep 17 00:00:00 2001
From: Vadim Troshchinskiy <vtroshchinskiy@qindel.com>
Date: Thu, 16 Mar 2017 12:55:18 +0100
Subject: Fix whitespace and line splitting issues reported by ionic

---
 nxcomp/src/Loop.cpp | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index 38d411232..114bf9709 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -661,10 +661,11 @@ static void handleCheckSessionInLoop();
 static void handleCheckBitrateInLoop();
 
 static void handleCheckSelectInLoop(int &setFDs, fd_set &readSet,
-                                        fd_set &writeSet, T_timestamp selectTs);static void handleCheckResultInLoop(int &resultFDs, int &errorFDs, int &setFDs, fd_set &readSet,
+                                        fd_set &writeSet, T_timestamp selectTs);
+static void handleCheckResultInLoop(int &resultFDs, int &errorFDs, int &setFDs, fd_set &readSet,
                                         fd_set &writeSet, struct timeval &selectTs,
                                             struct timeval &startTs);
-	static void handleCheckStateInLoop(int &setFDs);
+static void handleCheckStateInLoop(int &setFDs);
 static void handleCheckSessionInConnect();
 
 static inline void handleSetReadInLoop(fd_set &readSet, int &setFDs, struct timeval &selectTs);
@@ -2529,7 +2530,8 @@ int NXTransAlert(int code, int local)
   {
     if (logofs == NULL)
     {
-      logofs = &cerr;    }
+      logofs = &cerr;
+    }
 
     nxdbg << "NXTransAlert: Can't request an alert without "
             << "a valid NX transport.\n" << std::flush;
@@ -3186,7 +3188,9 @@ int SetupProxyConnection()
     nxinfo << "Loop: listenSocket is "<< ( listenSocket.enabled() ? "enabled" : "disabled") << ". "
            << "The socket URI is '"<< ( socketUri != NULL ? socketUri : "<unset>") << "'.\n" << std::flush;
 
-    free(socketUri);    socketUri = NULL;
+    free(socketUri);
+    socketUri = NULL;
+
     if (WE_INITIATE_CONNECTION)
     {
       if (connectSocket.getSpec(&socketUri))
@@ -8555,7 +8559,7 @@ int ParseCommandLineOptions(int argc, const char **argv)
   nxinfo << "Loop: Argc is " << argc << ".\n" << std::flush;
 
   for (int argi = 0; argi < argc; argi++)
-  {    
+  {
     nxinfo << "Loop: Argv[" << argi << "] is " << argv[argi]
            << ".\n" << std::flush;
   }
@@ -13019,11 +13023,13 @@ void PrintProcessInfo()
 
   if (*errorsFileName != '\0')
   {
-    cerr << "Info" << ": Using errors file '" << errorsFileName << "'.\n";  }
+    cerr << "Info" << ": Using errors file '" << errorsFileName << "'.\n";
+  }
 
   if (*statsFileName != '\0')
   {
-    cerr << "Info" << ": Using stats file '" << statsFileName << "'.\n";  }
+    cerr << "Info" << ": Using stats file '" << statsFileName << "'.\n";
+  }
 
 }
 
@@ -13447,7 +13453,7 @@ int ParseArg(const char *type, const char *name, const char *value)
     case 'k':
     case 'm':
     case 'g':
-    {      
+    {
       nxinfo << (char) toupper(*id);
       break;
     }
@@ -13941,8 +13947,11 @@ static void handleCheckBitrateInLoop()
 
 
 static void handleCheckStateInLoop(int &setFDs)
-{  
-  int fdLength;  int fdPending;  int fdSplits;
+{
+  int fdLength;
+  int fdPending;
+  int fdSplits;
+
   for (int j = 0; j < setFDs; j++)
   {
     if (j != proxyFD)
-- 
cgit v1.2.3


From d202b052e29fe78208bbb99b64f631ad80c828ff Mon Sep 17 00:00:00 2001
From: Vadim Troshchinskiy <vtroshchinskiy@qindel.com>
Date: Wed, 22 Mar 2017 16:33:58 +0100
Subject: Remove leading \n in NXTrans* logging

---
 nxcomp/src/Loop.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index 114bf9709..78b0b55d9 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -2565,7 +2565,7 @@ int NXTransPrepare(int *setFDs, fd_set *readSet,
     return 0;
   }
 
-  nxinfo << "\nNXTransPrepare: Going to prepare the NX transport.\n"
+  nxinfo << "NXTransPrepare: Going to prepare the NX transport.\n"
           << std::flush;
 
   if (control -> ProxyStage < stage_operational)
@@ -2691,7 +2691,7 @@ int NXTransSelect(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
     return 0;
   }
 
-  nxinfo << "\nNXTransSelect: Going to select the NX descriptors.\n"
+  nxinfo << "NXTransSelect: Going to select the NX descriptors.\n"
           << std::flush;
 
 
@@ -2858,7 +2858,7 @@ int NXTransExecute(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
     return 0;
   }
 
-  nxinfo << "\nNXTransExecute: Going to execute I/O on the NX descriptors.\n"
+  nxinfo << "NXTransExecute: Going to execute I/O on the NX descriptors.\n"
           << std::flush;
 
   if (control -> ProxyStage >= stage_operational)
-- 
cgit v1.2.3


From ab0c4f842fd6ec5bbda9cc22065354a367ea3fb7 Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Fri, 29 Sep 2017 21:05:04 +0200
Subject: nxcomp/src/Loop.cpp: fix whitespace errors on continued lines.

---
 nxcomp/src/Loop.cpp | 1620 +++++++++++++++++++++++++--------------------------
 1 file changed, 810 insertions(+), 810 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index 78b0b55d9..e6c6805b2 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -1148,7 +1148,7 @@ int NXTransProxy(int fd, int mode, const char* options)
   if (setjmp(context) == 1)
   {
     nxinfo << "NXTransProxy: Out of the long jump with pid '"
-            << lastProxy << "'.\n" << std::flush;
+           << lastProxy << "'.\n" << std::flush;
 
     return -1;
   }
@@ -1168,7 +1168,7 @@ int NXTransProxy(int fd, int mode, const char* options)
   lastProxy = getpid();
 
   nxinfo << "NXTransProxy: Main process started with pid '"
-          << lastProxy << "'.\n" << std::flush;
+         << lastProxy << "'.\n" << std::flush;
 
   SetMode(mode);
 
@@ -1178,10 +1178,10 @@ int NXTransProxy(int fd, int mode, const char* options)
     {
 
       nxinfo << "NXTransProxy: Agent descriptor for X client connections is FD#"
-              << fd << ".\n" << std::flush;
+             << fd << ".\n" << std::flush;
 
       nxinfo << "NXTransProxy: Disabling listening on further X client connections.\n"
-              << std::flush;
+             << std::flush;
 
 
       useTcpSocket   = 0;
@@ -1196,7 +1196,7 @@ int NXTransProxy(int fd, int mode, const char* options)
     if (fd != NX_FD_ANY)
     {
       nxinfo << "NXTransProxy: PANIC! Agent descriptor for X server connections "
-              << "not supported yet.\n" << std::flush;
+             << "not supported yet.\n" << std::flush;
 
       cerr << "Error" << ": Agent descriptor for X server connections "
            << "not supported yet.\n";
@@ -1227,7 +1227,7 @@ int NXTransProxy(int fd, int mode, const char* options)
   SetLogs();
 
   nxinfo << "NXTransProxy: Going to run the NX transport loop.\n"
-          << std::flush;
+         << std::flush;
 
   WaitCleanup();
 
@@ -1250,15 +1250,15 @@ void NXTransExit(int code)
   if (++recurse > 1)
   {
     nxinfo << "NXTransExit: Aborting process with pid '"
-            << getpid() << "' due to recursion through "
-            << "exit.\n" << std::flush;
+           << getpid() << "' due to recursion through "
+           << "exit.\n" << std::flush;
 
     abort();
   }
 
   nxinfo << "NXTransExit: Process with pid '"
-          << getpid() << "' called exit with code '"
-          << code << "'.\n" << std::flush;
+         << getpid() << "' called exit with code '"
+         << code << "'.\n" << std::flush;
 
   if (control != NULL)
   {
@@ -1353,7 +1353,7 @@ int NXTransCreate(int fd, int mode, const char* options)
   lastProxy = getpid();
 
   nxinfo << "NXTransCreate: Caller process running with pid '"
-          << lastProxy << "'.\n" << std::flush;
+         << lastProxy << "'.\n" << std::flush;
 
   //
   // Set the local proxy mode an parse the
@@ -1390,10 +1390,10 @@ int NXTransCreate(int fd, int mode, const char* options)
   proxyFD = fd;
 
   nxinfo << "NXTransCreate: Called with NX proxy descriptor '"
-          << proxyFD << "'.\n" << std::flush;
+         << proxyFD << "'.\n" << std::flush;
 
   nxinfo << "NXTransCreate: Creation of the NX transport completed.\n"
-          << std::flush;
+         << std::flush;
 
   return 1;
 }
@@ -1448,11 +1448,11 @@ int NXTransAgent(int fd[2])
 
 
   nxinfo << "NXTransAgent: Internal descriptors for agent are FD#"
-          << agentFD[0] << " and FD#" << agentFD[1] << ".\n"
-          << std::flush;
+         << agentFD[0] << " and FD#" << agentFD[1] << ".\n"
+         << std::flush;
 
   nxinfo << "NXTransAgent: Disabling listening for further X client "
-          << "connections.\n" << std::flush;
+         << "connections.\n" << std::flush;
 
 
   agent = new Agent(agentFD);
@@ -1468,7 +1468,7 @@ int NXTransAgent(int fd[2])
   }
 
   nxinfo << "NXTransAgent: Enabling memory-to-memory transport.\n"
-          << std::flush;
+         << std::flush;
 
   return 1;
 }
@@ -1493,7 +1493,7 @@ int NXTransClose(int fd)
     if (proxy != NULL)
     {
       nxinfo << "NXTransClose: Closing down all the X connections.\n"
-              << std::flush;
+             << std::flush;
 
       CleanupConnections();
     }
@@ -1501,7 +1501,7 @@ int NXTransClose(int fd)
   else
   {
     nxinfo << "NXTransClose: The NX transport is not running.\n"
-            << std::flush;
+           << std::flush;
   }
 
   return 1;
@@ -1531,13 +1531,13 @@ int NXTransDestroy(int fd)
     if (proxy != NULL)
     {
       nxinfo << "NXTransDestroy: Closing down all the X connections.\n"
-              << std::flush;
+             << std::flush;
 
       CleanupConnections();
     }
 
     nxinfo << "NXTransDestroy: Waiting for the NX transport to terminate.\n"
-            << std::flush;
+           << std::flush;
 
     lastDestroy = 1;
 
@@ -1546,7 +1546,7 @@ int NXTransDestroy(int fd)
   else
   {
     nxinfo << "NXTransDestroy: The NX transport is not running.\n"
-            << std::flush;
+           << std::flush;
   }
 
   return 1;
@@ -1630,7 +1630,7 @@ int NXTransSignal(int signal, int action)
   if (action == NX_SIGNAL_RAISE)
   {
     nxinfo << "NXTransSignal: Raising signal '" << DumpSignal(signal)
-            << "' in the proxy handler.\n" << std::flush;
+           << "' in the proxy handler.\n" << std::flush;
 
     HandleSignal(signal);
 
@@ -1639,7 +1639,7 @@ int NXTransSignal(int signal, int action)
   else if (signal == NX_SIGNAL_ANY)
   {
     nxinfo << "NXTransSignal: Setting action of all signals to '"
-            << action << "'.\n" << std::flush;
+           << action << "'.\n" << std::flush;
 
     for (int i = 0; i < 32; i++)
     {
@@ -1654,8 +1654,8 @@ int NXTransSignal(int signal, int action)
   else if (CheckSignal(signal) == 1)
   {
     nxinfo << "NXTransSignal: Setting action of signal '"
-            << DumpSignal(signal) << "' to '" << action
-            << "'.\n" << std::flush;
+           << DumpSignal(signal) << "' to '" << action
+           << "'.\n" << std::flush;
 
     if (action == NX_SIGNAL_ENABLE ||
             action == NX_SIGNAL_FORWARD)
@@ -1673,8 +1673,8 @@ int NXTransSignal(int signal, int action)
   }
 
   nxwarn << "NXTransSignal: WARNING! Unable to perform action '"
-          << action << "' on signal '" << DumpSignal(signal)
-          << "'.\n" << std::flush;
+         << action << "' on signal '" << DumpSignal(signal)
+         << "'.\n" << std::flush;
 
   cerr << "Warning" << ": Unable to perform action '" << action
        << "' on signal '" << DumpSignal(signal)
@@ -1690,7 +1690,7 @@ int NXTransCongestion(int fd)
 
     int congestion = proxy -> getCongestion(proxyFD);
     nxdbg << "NXTransCongestion: Returning " << congestion
-            << " as current congestion level.\n" << std::flush;
+          << " as current congestion level.\n" << std::flush;
 
     return congestion;
 
@@ -1732,18 +1732,18 @@ int NXTransHandler(int fd, int type, void (*handler)(void *parameter,
     default:
     {
       nxinfo << "NXTransHandler: WARNING! Failed to set "
-              << "the NX callback for event '" << type << "' to '"
-              << (void *) handler << "' and parameter '"
-              << parameter << "'.\n" << std::flush;
+             << "the NX callback for event '" << type << "' to '"
+             << (void *) handler << "' and parameter '"
+             << parameter << "'.\n" << std::flush;
 
       return 0;
     }
   }
 
   nxinfo << "NXTransHandler: Set the NX "
-          << "callback for event '" << type << "' to '"
-          << (void *) handler << "' and parameter '"
-          << parameter << "'.\n" << std::flush;
+         << "callback for event '" << type << "' to '"
+         << (void *) handler << "' and parameter '"
+         << parameter << "'.\n" << std::flush;
 
   return 1;
 }
@@ -1759,7 +1759,7 @@ int NXTransRead(int fd, char *data, int size)
           fd == agentFD[0])
   {
     nxdbg << "NXTransRead: Dequeuing " << size << " bytes "
-            << "from FD#" << agentFD[0] << ".\n" << std::flush;
+          << "from FD#" << agentFD[0] << ".\n" << std::flush;
 
     int result = agent -> dequeueData(data, size);
 
@@ -1767,12 +1767,12 @@ int NXTransRead(int fd, char *data, int size)
     if (result < 0 && EGET() == EAGAIN)
     {
       nxdbg << "NXTransRead: WARNING! Dequeuing from FD#"
-              << agentFD[0] << " would block.\n" << std::flush;
+            << agentFD[0] << " would block.\n" << std::flush;
     }
     else
     {
       nxdbg << "NXTransRead: Dequeued " << result << " bytes "
-              << "to FD#" << agentFD[0] << ".\n" << std::flush;
+            << "to FD#" << agentFD[0] << ".\n" << std::flush;
     }
 
 
@@ -1781,7 +1781,7 @@ int NXTransRead(int fd, char *data, int size)
   else
   {
     nxdbg << "NXTransRead: Reading " << size << " bytes "
-            << "from FD#" << fd << ".\n" << std::flush;
+          << "from FD#" << fd << ".\n" << std::flush;
 
     return read(fd, data, size);
   }
@@ -1802,7 +1802,7 @@ int NXTransReadVector(int fd, struct iovec *iovdata, int iovsize)
             agent -> localReadable() > 0)
     {
       nxdbg << "NXTransReadVector: WARNING! Agent has data readable.\n"
-              << std::flush;
+            << std::flush;
     }
 
 
@@ -1827,8 +1827,8 @@ int NXTransReadVector(int fd, struct iovec *iovdata, int iovsize)
       while (length > 0)
       {
         nxdbg << "NXTransReadVector: Dequeuing " << length
-                << " bytes " << "from FD#" << agentFD[0] << ".\n"
-                << std::flush;
+              << " bytes " << "from FD#" << agentFD[0] << ".\n"
+              << std::flush;
 
         result = agent -> dequeueData(base, length);
 
@@ -1836,13 +1836,13 @@ int NXTransReadVector(int fd, struct iovec *iovdata, int iovsize)
         if (result < 0 && EGET() == EAGAIN)
         {
           nxdbg << "NXTransReadVector: WARNING! Dequeuing from FD#"
-                  << agentFD[0] << " would block.\n" << std::flush;
+                << agentFD[0] << " would block.\n" << std::flush;
         }
         else
         {
           nxdbg << "NXTransReadVector: Dequeued " << result
-                  << " bytes " << "from FD#" << agentFD[0] << ".\n"
-                  << std::flush;
+                << " bytes " << "from FD#" << agentFD[0] << ".\n"
+                << std::flush;
         }
 
 
@@ -1868,8 +1868,8 @@ int NXTransReadVector(int fd, struct iovec *iovdata, int iovsize)
   else
   {
     nxdbg << "NXTransReadVector: Reading vector with "
-            << iovsize << " elements from FD#" << fd << ".\n"
-            << std::flush;
+          << iovsize << " elements from FD#" << fd << ".\n"
+          << std::flush;
 
     return readv(fd, iovdata, iovsize);
   }
@@ -1890,13 +1890,13 @@ int NXTransReadable(int fd, int *readable)
     if (result == -1)
     {
       nxdbg << "NXTransReadable: Error detected on FD#"
-              << fd << ".\n" << std::flush;
+            << fd << ".\n" << std::flush;
     }
     else
     {
       nxdbg << "NXTransReadable: Returning " << *readable
-              << " bytes as readable from FD#" << fd
-              << ".\n" << std::flush;
+            << " bytes as readable from FD#" << fd
+            << ".\n" << std::flush;
     }
 
     return result;
@@ -1920,8 +1920,8 @@ int NXTransReadable(int fd, int *readable)
       if (proxy != NULL && proxy -> canRead() == 1)
       {
         nxinfo << "NXTransReadable: WARNING! Trying to "
-                << "read to generate new agent data.\n"
-                << std::flush;
+               << "read to generate new agent data.\n"
+               << std::flush;
 
         //
         // Set the context as the function
@@ -1936,8 +1936,8 @@ int NXTransReadable(int fd, int *readable)
         if (proxy -> handleRead() < 0)
         {
           nxinfo << "NXTransReadable: Failure reading "
-                  << "messages from proxy FD#" << proxyFD
-                  << ".\n" << std::flush;
+                 << "messages from proxy FD#" << proxyFD
+                 << ".\n" << std::flush;
 
           HandleShutdown();
         }
@@ -1952,8 +1952,8 @@ int NXTransReadable(int fd, int *readable)
       }
 
       nxdbg << "NXTransReadable: Returning " << 0
-              << " bytes as readable from FD#" << fd
-              << " with result 0.\n" << std::flush;
+            << " bytes as readable from FD#" << fd
+            << " with result 0.\n" << std::flush;
 
       *readable = 0;
 
@@ -1962,8 +1962,8 @@ int NXTransReadable(int fd, int *readable)
     case -1:
     {
       nxdbg << "NXTransReadable: Returning " << 0
-              << " bytes as readable from FD#" << fd
-              << " with result -1.\n" << std::flush;
+            << " bytes as readable from FD#" << fd
+            << " with result -1.\n" << std::flush;
 
       *readable = 0;
 
@@ -1972,8 +1972,8 @@ int NXTransReadable(int fd, int *readable)
     default:
     {
       nxdbg << "NXTransReadable: Returning " << result
-              << " bytes as readable from FD#" << fd
-              << " with result 0.\n" << std::flush;
+            << " bytes as readable from FD#" << fd
+            << " with result 0.\n" << std::flush;
 
       *readable = result;
 
@@ -2003,8 +2003,8 @@ int NXTransWrite(int fd, char *data, int size)
       if (proxy -> canRead(agentFD[1]) == 0)
       {
         nxdbg << "NXTransWrite: WARNING! Delayed enqueuing to FD#"
-                << agentFD[0] << " with proxy unable to read.\n"
-                << std::flush;
+              << agentFD[0] << " with proxy unable to read.\n"
+              << std::flush;
 
         ESET(EAGAIN);
 
@@ -2027,8 +2027,8 @@ int NXTransWrite(int fd, char *data, int size)
       //
 
       nxdbg << "NXTransWrite: Letting the channel borrow "
-              << size << " bytes from FD#" << agentFD[0]
-              << ".\n" << std::flush;
+            << size << " bytes from FD#" << agentFD[0]
+            << ".\n" << std::flush;
 
       result = proxy -> handleRead(agentFD[1], data, size);
 
@@ -2058,7 +2058,7 @@ int NXTransWrite(int fd, char *data, int size)
       //
 
       nxdbg << "NXTransWrite: Enqueuing " << size << " bytes "
-              << "to FD#" << agentFD[0] << ".\n" << std::flush;
+            << "to FD#" << agentFD[0] << ".\n" << std::flush;
 
       result = agent -> enqueueData(data, size);
     }
@@ -2069,19 +2069,19 @@ int NXTransWrite(int fd, char *data, int size)
       if (EGET() == EAGAIN)
       {
         nxdbg << "NXTransWrite: WARNING! Enqueuing to FD#"
-                << agentFD[0] << " would block.\n"
-                << std::flush;
+              << agentFD[0] << " would block.\n"
+              << std::flush;
       }
       else
       {
         nxdbg << "NXTransWrite: WARNING! Error enqueuing to FD#"
-                << agentFD[0] << ".\n" << std::flush;
+              << agentFD[0] << ".\n" << std::flush;
       }
     }
     else
     {
       nxdbg << "NXTransWrite: Enqueued " << result << " bytes "
-              << "to FD#" << agentFD[0] << ".\n" << std::flush;
+            << "to FD#" << agentFD[0] << ".\n" << std::flush;
     }
 
 
@@ -2090,7 +2090,7 @@ int NXTransWrite(int fd, char *data, int size)
   else
   {
     nxdbg << "NXTransWrite: Writing " << size << " bytes "
-            << "to FD#" << fd << ".\n" << std::flush;
+          << "to FD#" << fd << ".\n" << std::flush;
 
     return write(fd, data, size);
   }
@@ -2123,8 +2123,8 @@ int NXTransWriteVector(int fd, struct iovec *iovdata, int iovsize)
       if (proxy -> canRead(agentFD[1]) == 0)
       {
         nxdbg << "NXTransWriteVector: WARNING! Delayed enqueuing to FD#"
-                << agentFD[0] << " with proxy unable to read.\n"
-                << std::flush;
+              << agentFD[0] << " with proxy unable to read.\n"
+              << std::flush;
 
         ESET(EAGAIN);
 
@@ -2169,8 +2169,8 @@ int NXTransWriteVector(int fd, struct iovec *iovdata, int iovsize)
           //
 
           nxdbg << "NXTransWriteVector: Letting the channel borrow "
-                  << length << " bytes from FD#" << agentFD[0]
-                  << ".\n" << std::flush;
+                << length << " bytes from FD#" << agentFD[0]
+                << ".\n" << std::flush;
 
           result = proxy -> handleRead(agentFD[1], base, length);
 
@@ -2200,8 +2200,8 @@ int NXTransWriteVector(int fd, struct iovec *iovdata, int iovsize)
           //
 
           nxdbg << "NXTransWriteVector: Enqueuing " << length
-                  << " bytes " << "to FD#" << agentFD[0] << ".\n"
-                  << std::flush;
+                << " bytes " << "to FD#" << agentFD[0] << ".\n"
+                << std::flush;
 
           result = agent -> enqueueData(base, length);
         }
@@ -2212,20 +2212,20 @@ int NXTransWriteVector(int fd, struct iovec *iovdata, int iovsize)
           if (EGET() == EAGAIN)
           {
             nxdbg << "NXTransWriteVector: WARNING! Enqueuing to FD#"
-                    << agentFD[0] << " would block.\n"
-                    << std::flush;
+                  << agentFD[0] << " would block.\n"
+                  << std::flush;
           }
           else
           {
             nxdbg << "NXTransWriteVector: WARNING! Error enqueuing to FD#"
-                    << agentFD[0] << ".\n" << std::flush;
+                  << agentFD[0] << ".\n" << std::flush;
           }
         }
         else
         {
           nxdbg << "NXTransWriteVector: Enqueued " << result
-                  << " bytes " << "to FD#" << agentFD[0] << ".\n"
-                  << std::flush;
+                << " bytes " << "to FD#" << agentFD[0] << ".\n"
+                << std::flush;
         }
 
 
@@ -2251,8 +2251,8 @@ int NXTransWriteVector(int fd, struct iovec *iovdata, int iovsize)
   else
   {
     nxdbg << "NXTransWriteVector: Writing vector with "
-            << iovsize << " elements to FD#" << fd << ".\n"
-            << std::flush;
+          << iovsize << " elements to FD#" << fd << ".\n"
+          << std::flush;
 
     return writev(fd, iovdata, iovsize);
   }
@@ -2265,10 +2265,10 @@ int NXTransPolicy(int fd, int type)
     if (usePolicy == -1)
     {
       nxinfo << "NXTransPolicy: Setting flush policy on "
-              << "proxy FD#" << proxyFD << " to '"
-              << DumpPolicy(type == NX_POLICY_DEFERRED ?
-                     policy_deferred : policy_immediate)
-              << "'.\n" << std::flush;
+             << "proxy FD#" << proxyFD << " to '"
+             << DumpPolicy(type == NX_POLICY_DEFERRED ?
+                           policy_deferred : policy_immediate)
+             << "'.\n" << std::flush;
 
       control -> FlushPolicy = (type == NX_POLICY_DEFERRED ?
                                     policy_deferred : policy_immediate);
@@ -2283,9 +2283,9 @@ int NXTransPolicy(int fd, int type)
     else
     {
       nxinfo << "NXTransPolicy: Ignoring the agent "
-              << "setting with user policy set to '"
-              << DumpPolicy(control -> FlushPolicy)
-              << "'.\n" << std::flush;
+             << "setting with user policy set to '"
+             << DumpPolicy(control -> FlushPolicy)
+             << "'.\n" << std::flush;
 
       return 0;
     }
@@ -2300,17 +2300,17 @@ int NXTransFlushable(int fd)
           fd != agentFD[0])
   {
     nxdbg << "NXTransFlushable: Returning 0 bytes as "
-            << "flushable for unrecognized FD#" << fd
-            << ".\n" << std::flush;
+          << "flushable for unrecognized FD#" << fd
+          << ".\n" << std::flush;
 
     return 0;
   }
   else
   {
     nxdbg << "NXTransFlushable: Returning " << proxy ->
-               getFlushable(proxyFD) << " as bytes flushable on "
-            << "proxy FD#" << proxyFD << ".\n"
-            << std::flush;
+             getFlushable(proxyFD) << " as bytes flushable on "
+          << "proxy FD#" << proxyFD << ".\n"
+          << std::flush;
 
     return proxy -> getFlushable(proxyFD);
   }
@@ -2321,8 +2321,8 @@ int NXTransFlush(int fd)
   if (proxy != NULL)
   {
     nxinfo << "NXTransFlush: Requesting an immediate flush of "
-            << "proxy FD#" << proxyFD << ".\n"
-            << std::flush;
+           << "proxy FD#" << proxyFD << ".\n"
+           << std::flush;
 
     return proxy -> handleFlush();
   }
@@ -2345,8 +2345,8 @@ int NXTransChannel(int fd, int channelFd, int type)
     }
 
     nxinfo << "NXTransChannel: Going to create a new channel "
-            << "with type '" << type << "' on FD#" << channelFd
-            << ".\n" << std::flush;
+           << "with type '" << type << "' on FD#" << channelFd
+           << ".\n" << std::flush;
 
     int result = -1;
 
@@ -2419,7 +2419,7 @@ int NXTransChannel(int fd, int channelFd, int type)
       default:
       {
         nxwarn << "NXTransChannel: WARNING! Unrecognized channel "
-                << "type '" << type << "'.\n" << std::flush;
+               << "type '" << type << "'.\n" << std::flush;
 
         break;
       }
@@ -2429,8 +2429,8 @@ int NXTransChannel(int fd, int channelFd, int type)
     if (result != 1)
     {
       nxwarn << "NXTransChannel: WARNING! Could not create the "
-                << "new channel with type '" << type << "' on FD#"
-                << channelFd << ".\n" << std::flush;
+             << "new channel with type '" << type << "' on FD#"
+             << channelFd << ".\n" << std::flush;
     }
 
 
@@ -2498,8 +2498,8 @@ int NXTransAlert(int code, int local)
   if (proxy != NULL)
   {
     nxdbg << "NXTransAlert: Requesting a NX dialog with code "
-            << code << " and local " << local << ".\n"
-            << std::flush;
+          << code << " and local " << local << ".\n"
+          << std::flush;
 
     if (local == 0)
     {
@@ -2534,7 +2534,7 @@ int NXTransAlert(int code, int local)
     }
 
     nxdbg << "NXTransAlert: Can't request an alert without "
-            << "a valid NX transport.\n" << std::flush;
+          << "a valid NX transport.\n" << std::flush;
   }
 
   return 0;
@@ -2566,7 +2566,7 @@ int NXTransPrepare(int *setFDs, fd_set *readSet,
   }
 
   nxinfo << "NXTransPrepare: Going to prepare the NX transport.\n"
-          << std::flush;
+         << std::flush;
 
   if (control -> ProxyStage < stage_operational)
   {
@@ -2578,16 +2578,16 @@ int NXTransPrepare(int *setFDs, fd_set *readSet,
     if (isTimestamp(*selectTs) == 0)
     {
       nxinfo << "Loop: WARNING! Preparing the select with requested "
-              << "timeout of " << selectTs -> tv_sec << " S and "
-              << (double) selectTs -> tv_usec / 1000 << " Ms.\n"
-              << std::flush;
+             << "timeout of " << selectTs -> tv_sec << " S and "
+             << (double) selectTs -> tv_usec / 1000 << " Ms.\n"
+             << std::flush;
     }
     else
     {
       nxinfo << "Loop: Preparing the select with requested "
-              << "timeout of " << selectTs -> tv_sec << " S and "
-              << (double) selectTs -> tv_usec / 1000 << " Ms.\n"
-              << std::flush;
+             << "timeout of " << selectTs -> tv_sec << " S and "
+             << (double) selectTs -> tv_usec / 1000 << " Ms.\n"
+             << std::flush;
     }
 
 
@@ -2632,8 +2632,8 @@ int NXTransPrepare(int *setFDs, fd_set *readSet,
   int diffTs = diffTimestamp(startTs, nowTs);
 
   nxinfo << "Loop: Mark - 0 - at " << strMsTimestamp()
-          << " with " << diffTs << " Ms elapsed.\n"
-          << std::flush;
+         << " with " << diffTs << " Ms elapsed.\n"
+         << std::flush;
 
   //
   // TODO: Should add the read time in two
@@ -2650,7 +2650,7 @@ int NXTransPrepare(int *setFDs, fd_set *readSet,
   startTs = nowTs;
 
   nxdbg << "Loop: New timestamp is " << strMsTimestamp(startTs)
-          << ".\n" << std::flush;
+        << ".\n" << std::flush;
 
   return 1;
 }
@@ -2692,7 +2692,7 @@ int NXTransSelect(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
   }
 
   nxinfo << "NXTransSelect: Going to select the NX descriptors.\n"
-          << std::flush;
+         << std::flush;
 
 
   handleCheckSelectInLoop(*setFDs, *readSet, *writeSet, *selectTs);
@@ -2702,8 +2702,8 @@ int NXTransSelect(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
   if (diffTs > 20)
   {
     nxdbg << "Loop: TIME! Spent " << diffTs
-            << " Ms handling messages for proxy FD#"
-            << proxyFD << ".\n" << std::flush;
+          << " Ms handling messages for proxy FD#"
+          << proxyFD << ".\n" << std::flush;
   }
 
   lastTs = getNewTimestamp();
@@ -2712,18 +2712,18 @@ int NXTransSelect(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
   if (isTimestamp(*selectTs) == 0)
   {
     nxinfo << "Loop: WARNING! Executing the select with requested "
-            << "timeout of " << selectTs -> tv_sec << " S and "
-            << (double) selectTs -> tv_usec / 1000 << " Ms.\n"
-            << std::flush;
+           << "timeout of " << selectTs -> tv_sec << " S and "
+           << (double) selectTs -> tv_usec / 1000 << " Ms.\n"
+           << std::flush;
   }
   else if (proxy != NULL && proxy -> getFlushable(proxyFD) > 0)
   {
     nxinfo << "Loop: WARNING! Proxy FD#" << proxyFD
-            << " has " << proxy -> getFlushable(proxyFD)
-            << " bytes to write but timeout is "
-            << selectTs -> tv_sec << " S and "
-            << selectTs -> tv_usec / 1000 << " Ms.\n"
-            << std::flush;
+           << " has " << proxy -> getFlushable(proxyFD)
+           << " bytes to write but timeout is "
+           << selectTs -> tv_sec << " S and "
+           << selectTs -> tv_usec / 1000 << " Ms.\n"
+           << std::flush;
   }
 
 
@@ -2743,8 +2743,8 @@ int NXTransSelect(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
   if (diffTs > 100)
   {
     nxdbg << "Loop: TIME! Spent " << diffTs
-            << " Ms waiting for new data for proxy FD#"
-            << proxyFD << ".\n" << std::flush;
+          << " Ms waiting for new data for proxy FD#"
+          << proxyFD << ".\n" << std::flush;
   }
 
   lastTs = getNewTimestamp();
@@ -2769,13 +2769,13 @@ int NXTransSelect(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
   diffTs = diffTimestamp(startTs, nowTs);
 
   nxinfo << "Loop: Out of select after " << diffTs << " Ms "
-          << "at " << strMsTimestamp(nowTs) << " with result "
-          << *resultFDs << ".\n" << std::flush;
+         << "at " << strMsTimestamp(nowTs) << " with result "
+         << *resultFDs << ".\n" << std::flush;
 
   startTs = nowTs;
 
   nxdbg << "Loop: New timestamp is " << strMsTimestamp(startTs)
-          << ".\n" << std::flush;
+        << ".\n" << std::flush;
 
   if (control -> ProxyStage >= stage_operational)
   {
@@ -2807,13 +2807,13 @@ int NXTransSelect(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
       if (*errorFDs == EINTR)
       {
         nxinfo << "Loop: Select failed due to EINTR error.\n"
-                << std::flush;
+               << std::flush;
       }
       else
       {
         nxinfo << "Loop: WARNING! Call to select failed. Error is "
-                << EGET() << " '" << ESTR() << "'.\n"
-                << std::flush;
+               << EGET() << " '" << ESTR() << "'.\n"
+               << std::flush;
       }
 
     }
@@ -2859,7 +2859,7 @@ int NXTransExecute(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
   }
 
   nxinfo << "NXTransExecute: Going to execute I/O on the NX descriptors.\n"
-          << std::flush;
+         << std::flush;
 
   if (control -> ProxyStage >= stage_operational)
   {
@@ -2874,8 +2874,8 @@ int NXTransExecute(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
     }
 
     nxinfo << "Loop: Mark - 1 - at " << strMsTimestamp()
-            << " with " << diffTimestamp(startTs, getTimestamp())
-            << " Ms elapsed.\n" << std::flush;
+           << " with " << diffTimestamp(startTs, getTimestamp())
+           << " Ms elapsed.\n" << std::flush;
 
     //
     // Rotate the channel that will be handled
@@ -2891,8 +2891,8 @@ int NXTransExecute(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
     handleWritableInLoop(*resultFDs, *writeSet);
 
     nxinfo << "Loop: Mark - 2 - at " << strMsTimestamp()
-            << " with " << diffTimestamp(startTs, getTimestamp())
-            << " Ms elapsed.\n" << std::flush;
+           << " with " << diffTimestamp(startTs, getTimestamp())
+           << " Ms elapsed.\n" << std::flush;
 
     //
     // Check if any socket has become readable.
@@ -2901,8 +2901,8 @@ int NXTransExecute(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
     handleReadableInLoop(*resultFDs, *readSet);
 
     nxinfo << "Loop: Mark - 3 - at " << strMsTimestamp()
-            << " with " << diffTimestamp(startTs, getTimestamp())
-            << " Ms elapsed.\n" << std::flush;
+           << " with " << diffTimestamp(startTs, getTimestamp())
+           << " Ms elapsed.\n" << std::flush;
 
     //
     // Handle the scheduled events on channels.
@@ -2923,8 +2923,8 @@ int NXTransExecute(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
     handleEventsInLoop();
 
     nxinfo << "Loop: Mark - 4 - at " << strMsTimestamp()
-            << " with " << diffTimestamp(startTs, getTimestamp())
-            << " Ms elapsed.\n" << std::flush;
+           << " with " << diffTimestamp(startTs, getTimestamp())
+           << " Ms elapsed.\n" << std::flush;
 
     //
     // Check if user sent a signal to produce
@@ -2946,8 +2946,8 @@ int NXTransExecute(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
     }
 
     nxinfo << "Loop: Mark - 5 - at " << strMsTimestamp()
-            << " with " << diffTimestamp(startTs, getTimestamp())
-            << " Ms elapsed.\n" << std::flush;
+           << " with " << diffTimestamp(startTs, getTimestamp())
+           << " Ms elapsed.\n" << std::flush;
 
     //
     // Check if there is any data to flush.
@@ -2958,8 +2958,8 @@ int NXTransExecute(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
     handleFlushInLoop();
 
     nxinfo << "Loop: Mark - 6 - at " << strMsTimestamp()
-            << " with " << diffTimestamp(startTs, getTimestamp())
-            << " Ms elapsed.\n" << std::flush;
+           << " with " << diffTimestamp(startTs, getTimestamp())
+           << " Ms elapsed.\n" << std::flush;
   }
 
   //
@@ -2991,8 +2991,8 @@ int NXTransExecute(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
     handleCheckStateInLoop(*setFDs);
 
     nxinfo << "Loop: Mark - 7 - at " << strMsTimestamp()
-            << " with " << diffTimestamp(startTs, getTimestamp())
-            << " Ms elapsed.\n" << std::flush;
+           << " with " << diffTimestamp(startTs, getTimestamp())
+           << " Ms elapsed.\n" << std::flush;
   }
 
   //
@@ -3034,8 +3034,8 @@ int InitBeforeNegotiation()
   initTs  = nowTs;
 
   nxinfo << "Loop: INIT! Taking mark for initialization at "
-          << strMsTimestamp(initTs) << ".\n"
-          << std::flush;
+         << strMsTimestamp(initTs) << ".\n"
+         << std::flush;
 
   //
   // If not explicitly specified, determine if local
@@ -3059,8 +3059,8 @@ int InitBeforeNegotiation()
   if (control -> ProxyMode == proxy_client)
   {
     nxinfo << "Loop: Starting watchdog process with timeout of "
-            << control -> InitTimeout / 1000 << " seconds.\n"
-            << std::flush;
+           << control -> InitTimeout / 1000 << " seconds.\n"
+           << std::flush;
 
     lastWatchdog = NXTransWatchdog(control -> InitTimeout);
 
@@ -3074,7 +3074,7 @@ int InitBeforeNegotiation()
     else
     {
       nxinfo << "Loop: Watchdog started with pid '"
-              << lastWatchdog << "'.\n" << std::flush;
+             << lastWatchdog << "'.\n" << std::flush;
     }
   }
 
@@ -3107,8 +3107,8 @@ int InitBeforeNegotiation()
   setHostBigEndian(*((unsigned char *) (&test)) == 0);
 
   nxinfo << "Loop: Local host is "
-          << (hostBigEndian() ? "big endian" : "little endian")
-          << ".\n" << std::flush;
+         << (hostBigEndian() ? "big endian" : "little endian")
+         << ".\n" << std::flush;
 
   if (control -> ProxyMode == proxy_client)
   {
@@ -3196,13 +3196,13 @@ int SetupProxyConnection()
       if (connectSocket.getSpec(&socketUri))
       {
         nxinfo << "Loop: Going to connect to '" << socketUri
-                << "'.\n" << std::flush;
+               << "'.\n" << std::flush;
         free(socketUri);
 
         proxyFD = ConnectToRemote(connectSocket);
 
         nxinfo << "Loop: Connected to remote proxy on FD#"
-                << proxyFD << ".\n" << std::flush;
+               << proxyFD << ".\n" << std::flush;
 
         cerr << "Info" << ": Connected to remote proxy on FD#"
              << proxyFD << ".\n";
@@ -3219,7 +3219,7 @@ int SetupProxyConnection()
       if (listenSocket.getSpec(&socketUri))
       {
         nxinfo << "Loop: Going to wait for connection at '"
-                << socketUri << "'.\n" << std::flush;
+               << socketUri << "'.\n" << std::flush;
         free(socketUri);
 
         proxyFD = WaitForRemote(listenSocket);
@@ -3227,12 +3227,12 @@ int SetupProxyConnection()
         if (WE_LISTEN_FORWARDER)
         {
           nxinfo << "Loop: Connected to remote forwarder on FD#"
-                  << proxyFD << ".\n" << std::flush;
+                 << proxyFD << ".\n" << std::flush;
         }
         else
         {
           nxinfo << "Loop: Connected to remote proxy on FD#"
-                  << proxyFD << ".\n" << std::flush;
+                 << proxyFD << ".\n" << std::flush;
         }
 
       }
@@ -3241,7 +3241,7 @@ int SetupProxyConnection()
   else
   {
     nxinfo << "Loop: Using the inherited connection on FD#"
-            << proxyFD << ".\n" << std::flush;
+           << proxyFD << ".\n" << std::flush;
   }
 
   //
@@ -3273,7 +3273,7 @@ int SetupProxyConnection()
 int InitAfterNegotiation()
 {
   nxinfo << "Loop: Connection with remote proxy completed.\n"
-          << std::flush;
+         << std::flush;
 
   cerr << "Info" << ": Connection with remote proxy completed.\n"
         << logofs_flush;
@@ -3360,9 +3360,9 @@ int InitAfterNegotiation()
   //
 
   nxinfo << "Loop: INIT! Completed initialization at "
-          << strMsTimestamp(nowTs) << " with "
-          << diffTimestamp(initTs, nowTs) << " Ms "
-          << "since the init mark.\n" << std::flush;
+         << strMsTimestamp(nowTs) << " with "
+         << diffTimestamp(initTs, nowTs) << " Ms "
+         << "since the init mark.\n" << std::flush;
 
   initTs = getNewTimestamp();
 
@@ -3391,16 +3391,16 @@ int SetMode(int mode)
     if (mode == NX_MODE_CLIENT)
     {
       nxinfo << "Loop: INIT! Initializing with mode "
-              << "NX_MODE_CLIENT at " << strMsTimestamp()
-              << ".\n" << std::flush;
+             << "NX_MODE_CLIENT at " << strMsTimestamp()
+             << ".\n" << std::flush;
 
       control -> ProxyMode = proxy_client;
     }
     else if (mode == NX_MODE_SERVER)
     {
       nxinfo << "Loop: INIT! Initializing with mode "
-              << "NX_MODE_SERVER at " << strMsTimestamp()
-              << ".\n" << std::flush;
+             << "NX_MODE_SERVER at " << strMsTimestamp()
+             << ".\n" << std::flush;
 
       control -> ProxyMode = proxy_server;
     }
@@ -3550,8 +3550,8 @@ int SetupProxyInstance()
   if (proxy -> getFlushable(proxyFD) > 0)
   {
     nxinfo << "Loop: WARNING! Proxy FD#" << proxyFD << " has data "
-            << "to flush after setup of the NX transport.\n"
-            << std::flush;
+           << "to flush after setup of the NX transport.\n"
+           << std::flush;
   }
 
 
@@ -3604,7 +3604,7 @@ int SetupAuthInstance()
         *(launchdAddrUnix.sun_path + launchdAddrNameLength - 1) = '\0';
 
         nxinfo << "Loop: Connecting to launchd service "
-                << "on Unix port '" << displayHost << "'.\n" << std::flush;
+               << "on Unix port '" << displayHost << "'.\n" << std::flush;
 
         int launchdFd = socket(launchdAddrFamily, SOCK_STREAM, PF_UNSPEC);
 
@@ -3617,9 +3617,9 @@ int SetupAuthInstance()
         else if ((success = connect(launchdFd, (sockaddr *) &launchdAddrUnix, launchdAddrLength)) < 0)
         {
           nxwarn << "Loop: WARNING! Connection to launchd service "
-                  << "on Unix port '" << displayHost << "' failed "
-                  << "with error " << EGET() << ", '" << ESTR() << "'.\n"
-                  << std::flush;
+                 << "on Unix port '" << displayHost << "' failed "
+                 << "with error " << EGET() << ", '" << ESTR() << "'.\n"
+                 << std::flush;
         }
 
         if (launchdFd >= 0)
@@ -3669,8 +3669,8 @@ int SetupAuthInstance()
       else if (auth -> isFake() == 1)
       {
         nxwarn << "Loop: WARNING! Could not retrieve the X server "
-                << "authentication cookie.\n"
-                << std::flush;
+               << "authentication cookie.\n"
+               << std::flush;
 
         cerr << "Warning" << ": Failed to read data from the X "
              << "auth command.\n";
@@ -3682,13 +3682,13 @@ int SetupAuthInstance()
     else
     {
       nxinfo << "Loop: No proxy cookie was provided for "
-              << "authentication.\n" << std::flush;
+             << "authentication.\n" << std::flush;
 
       cerr << "Info" << ": No proxy cookie was provided for "
            << "authentication.\n";
 
       nxinfo << "Loop: Forwarding the real X authorization "
-              << "cookie.\n" << std::flush;
+             << "cookie.\n" << std::flush;
 
       cerr << "Info" << ": Forwarding the real X authorization "
            << "cookie.\n";
@@ -3868,7 +3868,7 @@ int SetupDisplaySocket(int &addr_family, sockaddr *&addr,
   if ((strncasecmp(display, "/tmp/launch", 11) == 0) || (strncasecmp(display, "/private/tmp/com.apple.launchd", 30) == 0))
   {
     nxinfo << "Loop: Using launchd service on socket '"
-            << display << "'.\n" << std::flush;
+           << display << "'.\n" << std::flush;
 
     useLaunchdSocket = 1;
   }
@@ -3892,8 +3892,8 @@ int SetupDisplaySocket(int &addr_family, sockaddr *&addr,
   xPort = atoi(separator + 1);
 
   nxinfo << "Loop: Using local X display '" << displayHost
-          << "' with host '" << display << "' and port '"
-          << xPort << "'.\n" << std::flush;
+         << "' with host '" << display << "' and port '"
+         << xPort << "'.\n" << std::flush;
 
   #ifdef __APPLE__
 
@@ -3911,7 +3911,7 @@ int SetupDisplaySocket(int &addr_family, sockaddr *&addr,
     //
 
     nxinfo << "Loop: Using real X server on UNIX domain socket.\n"
-            << std::flush;
+           << std::flush;
 
     sockaddr_un *xServerAddrUNIX = new sockaddr_un;
 
@@ -3991,7 +3991,7 @@ int SetupDisplaySocket(int &addr_family, sockaddr *&addr,
     *(unixSocketDir + DEFAULT_STRING_LENGTH - 1) = '\0';
 
     nxinfo << "Loop: Assuming X socket in directory '"
-            << unixSocketDir << "'.\n" << std::flush;
+           << unixSocketDir << "'.\n" << std::flush;
 
     if (stat(unixSocketDir, &statInfo) < 0)
     {
@@ -4023,7 +4023,7 @@ int SetupDisplaySocket(int &addr_family, sockaddr *&addr,
     #endif
 
     nxinfo << "Loop: Assuming X socket name '" << unixSocketName
-            << "'.\n" << std::flush;
+           << "'.\n" << std::flush;
 
     strcpy(xServerAddrUNIX -> sun_path, unixSocketName);
 
@@ -4042,7 +4042,7 @@ int SetupDisplaySocket(int &addr_family, sockaddr *&addr,
     //
 
     nxinfo << "Loop: Using real X server on TCP port.\n"
-            << std::flush;
+           << std::flush;
 
     addr_family = AF_INET;
 
@@ -4312,14 +4312,14 @@ static int AcceptConnection(int fd, int domain, const char *label)
   if (domain == AF_UNIX)
   {
     nxinfo << "Loop: Going to accept new Unix " << label
-            << " connection on FD#" << fd << ".\n"
-            << std::flush;
+           << " connection on FD#" << fd << ".\n"
+           << std::flush;
   }
   else
   {
     nxinfo << "Loop: Going to accept new TCP " << label
-            << " connection on FD#" << fd << ".\n"
-            << std::flush;
+           << " connection on FD#" << fd << ".\n"
+           << std::flush;
   }
 
 
@@ -4363,8 +4363,8 @@ void HandleShutdown()
     cerr << "Error" << ": Connection with remote peer broken.\n";
 
     nxinfo << "Loop: Bytes received so far are "
-            << (unsigned long long) statistics -> getBytesIn()
-            << ".\n" << std::flush;
+           << (unsigned long long) statistics -> getBytesIn()
+           << ".\n" << std::flush;
 
     cerr << "Error" << ": Please check the state of your "
          << "network and retry.\n";
@@ -4374,7 +4374,7 @@ void HandleShutdown()
     if (control -> ProxyMode == proxy_server)
     {
       nxinfo << "Loop: Showing the proxy abort dialog.\n"
-              << std::flush;
+             << std::flush;
 
       HandleAlert(ABORT_PROXY_CONNECTION_ALERT, 1);
 
@@ -4384,7 +4384,7 @@ void HandleShutdown()
   else
   {
     nxinfo << "Loop: Finalized the remote proxy shutdown.\n"
-            << std::flush;
+           << std::flush;
   }
 
   HandleCleanup();
@@ -4408,9 +4408,9 @@ int KillProcess(int pid, const char *label, int signal, int wait)
   if (pid > 0)
   {
     nxinfo << "Loop: Killing the " << label << " process '"
-            << pid << "' from process with pid '" << getpid()
-            << "' with signal '" << DumpSignal(signal)
-            << "'.\n" << std::flush;
+           << pid << "' from process with pid '" << getpid()
+           << "' with signal '" << DumpSignal(signal)
+           << "'.\n" << std::flush;
 
     signal = (signal == 0 ? SIGTERM : signal);
 
@@ -4434,8 +4434,8 @@ int KillProcess(int pid, const char *label, int signal, int wait)
   else
   {
     nxinfo << "Loop: No " << label << " process "
-            << "to kill with pid '" << pid
-            << "'.\n" << std::flush;
+           << "to kill with pid '" << pid
+           << "'.\n" << std::flush;
 
     return 0;
   }
@@ -4444,14 +4444,14 @@ int KillProcess(int pid, const char *label, int signal, int wait)
 int CheckProcess(int pid, const char *label)
 {
   nxinfo << "Loop: Checking the " << label << " process '"
-          << pid << "' from process with pid '" << getpid()
-          << "'.\n" << std::flush;
+         << pid << "' from process with pid '" << getpid()
+         << "'.\n" << std::flush;
 
   if (kill(pid, SIGCONT) < 0 && EGET() == ESRCH)
   {
     nxwarn << "Loop: WARNING! The " << label << " process "
-            << "with pid '" << pid << "' has exited.\n"
-            << std::flush;
+           << "with pid '" << pid << "' has exited.\n"
+           << std::flush;
 
     cerr << "Warning" << ": The " << label << " process "
          << "with pid '" << pid << "' has exited.\n";
@@ -4493,8 +4493,8 @@ int StartKeeper()
   if (control -> LocalTotalStorageSize > 0)
   {
     nxinfo << "Loop: Starting the house-keeping process with "
-            << "storage size " << control -> PersistentCacheDiskLimit
-            << ".\n" << std::flush;
+           << "storage size " << control -> PersistentCacheDiskLimit
+           << ".\n" << std::flush;
 
     lastKeeper = NXTransKeeper(control -> PersistentCacheDiskLimit,
                                    0, control -> RootPath);
@@ -4502,7 +4502,7 @@ int StartKeeper()
     if (IsFailed(lastKeeper))
     {
       nxwarn << "Loop: WARNING! Failed to start the NX keeper process.\n"
-              << std::flush;
+             << std::flush;
 
       cerr << "Warning" << ": Failed to start the NX keeper process.\n";
 
@@ -4511,14 +4511,14 @@ int StartKeeper()
     else
     {
       nxinfo << "Loop: Keeper started with pid '"
-              << lastKeeper << "'.\n" << std::flush;
+             << lastKeeper << "'.\n" << std::flush;
     }
   }
   else
   {
     nxinfo << "Loop: Nothing to do for the keeper process "
-            << "with persistent cache not enabled.\n"
-            << std::flush;
+           << "with persistent cache not enabled.\n"
+           << std::flush;
   }
 
   return 1;
@@ -4527,8 +4527,8 @@ int StartKeeper()
 void HandleCleanupForReconnect()
 {
   nxinfo << "Loop: Going to clean up system resources for Reconnect "
-          << "in process '" << getpid() << "'.\n"
-          << std::flush;
+         << "in process '" << getpid() << "'.\n"
+         << std::flush;
   handleTerminatedInLoop();
   DisableSignals();
   if (control)
@@ -4547,8 +4547,8 @@ void HandleCleanupForReconnect()
 void HandleCleanup(int code)
 {
   nxinfo << "Loop: Going to clean up system resources "
-          << "in process '" << getpid() << "'.\n"
-          << std::flush;
+         << "in process '" << getpid() << "'.\n"
+         << std::flush;
 
   handleTerminatedInLoop();
 
@@ -4604,14 +4604,14 @@ void HandleCleanup(int code)
   if (getpid() == lastProxy)
   {
     nxinfo << "Loop: Reverting to loop context in process with "
-            << "pid '" << getpid() << "' at " << strMsTimestamp()
-            << ".\n" << std::flush;
+           << "pid '" << getpid() << "' at " << strMsTimestamp()
+           << ".\n" << std::flush;
   }
   else
   {
     nxinfo << "Loop: Exiting from child process with pid '"
-            << getpid() << "' at " << strMsTimestamp()
-            << ".\n" << std::flush;
+           << getpid() << "' at " << strMsTimestamp()
+           << ".\n" << std::flush;
   }
 
 
@@ -4647,8 +4647,8 @@ void CleanupKeeper()
   if (keeper != NULL)
   {
     nxinfo << "Loop: Freeing up keeper in process "
-            << "with pid '" << getpid() << "'.\n"
-            << std::flush;
+           << "with pid '" << getpid() << "'.\n"
+           << std::flush;
 
     delete keeper;
 
@@ -4668,8 +4668,8 @@ void CleanupStreams()
   #ifndef __CYGWIN32__
 
   nxinfo << "Loop: Freeing up streams in process "
-          << "with pid '" << getpid() << "'.\n"
-          << std::flush;
+         << "with pid '" << getpid() << "'.\n"
+         << std::flush;
 
   if (logofs != NULL && logofs != &cerr &&
           *errorsFileName != '\0')
@@ -4766,9 +4766,9 @@ void CleanupChildren()
   if (IsRunning(lastDialog))
   {
     nxinfo << "Loop: WARNING! Leaving the dialog process '"
-            << lastDialog << "' running in process "
-            << "with pid '" << getpid() << "'.\n"
-            << std::flush;
+           << lastDialog << "' running in process "
+           << "with pid '" << getpid() << "'.\n"
+           << std::flush;
 
     SetNotRunning(lastDialog);
   }
@@ -4780,8 +4780,8 @@ void CleanupChildren()
   if (control -> EnableRestartOnShutdown == 1)
   {
     nxwarn << "Loop: WARNING! Respawning the NX client "
-            << "on display '" << displayHost << "'.\n"
-            << std::flush;
+           << "on display '" << displayHost << "'.\n"
+           << std::flush;
 
     NXTransClient(displayHost);
   }
@@ -4789,8 +4789,8 @@ void CleanupChildren()
   for (int i = 0; i < control -> KillDaemonOnShutdownNumber; i++)
   {
     nxwarn << "Loop: WARNING! Killing the NX daemon with "
-            << "pid '" << control -> KillDaemonOnShutdown[i]
-            << "'.\n" << std::flush;
+           << "pid '" << control -> KillDaemonOnShutdown[i]
+           << "'.\n" << std::flush;
 
     KillProcess(control -> KillDaemonOnShutdown[i], "daemon", SIGTERM, 0);
   }
@@ -4801,8 +4801,8 @@ void CleanupGlobal()
   if (proxy != NULL)
   {
     nxinfo << "Loop: Freeing up proxy in process "
-            << "with pid '" << getpid() << "'.\n"
-            << std::flush;
+           << "with pid '" << getpid() << "'.\n"
+           << std::flush;
 
     delete proxy;
 
@@ -4812,8 +4812,8 @@ void CleanupGlobal()
   if (agent != NULL)
   {
     nxinfo << "Loop: Freeing up agent in process "
-            << "with pid '" << getpid() << "'.\n"
-            << std::flush;
+           << "with pid '" << getpid() << "'.\n"
+           << std::flush;
 
     delete agent;
 
@@ -4823,8 +4823,8 @@ void CleanupGlobal()
   if (auth != NULL)
   {
     nxinfo << "Loop: Freeing up auth data in process "
-            << "with pid '" << getpid() << "'.\n"
-            << std::flush;
+           << "with pid '" << getpid() << "'.\n"
+           << std::flush;
 
     delete auth;
 
@@ -4834,8 +4834,8 @@ void CleanupGlobal()
   if (statistics != NULL)
   {
     nxinfo << "Loop: Freeing up statistics in process "
-            << "with pid '" << getpid() << "'.\n"
-            << std::flush;
+           << "with pid '" << getpid() << "'.\n"
+           << std::flush;
 
     delete statistics;
 
@@ -4845,8 +4845,8 @@ void CleanupGlobal()
   if (control != NULL)
   {
     nxinfo << "Loop: Freeing up control in process "
-            << "with pid '" << getpid() << "'.\n"
-            << std::flush;
+           << "with pid '" << getpid() << "'.\n"
+           << std::flush;
 
     delete control;
 
@@ -4859,12 +4859,12 @@ void CleanupConnections()
   if (proxy -> getChannels(channel_x11) != 0)
   {
     nxinfo << "Loop: Closing any remaining X connections.\n"
-            << std::flush;
+           << std::flush;
 
     proxy -> handleCloseAllXConnections();
 
     nxinfo << "Loop: Closing any remaining listener.\n"
-            << std::flush;
+           << std::flush;
 
     proxy -> handleCloseAllListeners();
   }
@@ -4879,8 +4879,8 @@ void CleanupListeners()
     if (tcpFD != -1)
     {
       nxinfo << "Loop: Closing TCP listener in process "
-              << "with pid '" << getpid() << "'.\n"
-              << std::flush;
+             << "with pid '" << getpid() << "'.\n"
+             << std::flush;
 
       close(tcpFD);
 
@@ -4895,8 +4895,8 @@ void CleanupListeners()
     if (unixFD != -1)
     {
       nxinfo << "Loop: Closing UNIX listener in process "
-              << "with pid '" << getpid() << "'.\n"
-              << std::flush;
+             << "with pid '" << getpid() << "'.\n"
+             << std::flush;
 
       close(unixFD);
 
@@ -4906,8 +4906,8 @@ void CleanupListeners()
     if (*unixSocketName != '\0')
     {
       nxinfo << "Loop: Going to remove the Unix domain socket '"
-              << unixSocketName << "' in process " << "with pid '"
-              << getpid() << "'.\n" << std::flush;
+             << unixSocketName << "' in process " << "with pid '"
+             << getpid() << "'.\n" << std::flush;
 
       unlink(unixSocketName);
     }
@@ -4930,8 +4930,8 @@ void CleanupListeners()
     if (cupsFD != -1)
     {
       nxinfo << "Loop: Closing CUPS listener in process "
-              << "with pid '" << getpid() << "'.\n"
-              << std::flush;
+             << "with pid '" << getpid() << "'.\n"
+             << std::flush;
 
       close(cupsFD);
 
@@ -4946,8 +4946,8 @@ void CleanupListeners()
     if (auxFD != -1)
     {
       nxinfo << "Loop: Closing auxiliary X11 listener "
-              << "in process " << "with pid '" << getpid()
-              << "'.\n" << std::flush;
+             << "in process " << "with pid '" << getpid()
+             << "'.\n" << std::flush;
 
       close(auxFD);
 
@@ -4962,8 +4962,8 @@ void CleanupListeners()
     if (smbFD != -1)
     {
       nxinfo << "Loop: Closing SMB listener in process "
-              << "with pid '" << getpid() << "'.\n"
-              << std::flush;
+             << "with pid '" << getpid() << "'.\n"
+             << std::flush;
 
       close(smbFD);
 
@@ -4978,8 +4978,8 @@ void CleanupListeners()
     if (mediaFD != -1)
     {
       nxinfo << "Loop: Closing multimedia listener in process "
-              << "with pid '" << getpid() << "'.\n"
-              << std::flush;
+             << "with pid '" << getpid() << "'.\n"
+             << std::flush;
 
       close(mediaFD);
 
@@ -4994,8 +4994,8 @@ void CleanupListeners()
     if (httpFD != -1)
     {
       nxinfo << "Loop: Closing http listener in process "
-              << "with pid '" << getpid() << "'.\n"
-              << std::flush;
+             << "with pid '" << getpid() << "'.\n"
+             << std::flush;
 
       close(httpFD);
 
@@ -5010,8 +5010,8 @@ void CleanupListeners()
     if (fontFD != -1)
     {
       nxinfo << "Loop: Closing font server listener in process "
-              << "with pid '" << getpid() << "'.\n"
-              << std::flush;
+             << "with pid '" << getpid() << "'.\n"
+             << std::flush;
 
       close(fontFD);
 
@@ -5026,8 +5026,8 @@ void CleanupListeners()
     if (slaveFD != -1)
     {
       nxinfo << "Loop: Closing slave listener in process "
-              << "with pid '" << getpid() << "'.\n"
-              << std::flush;
+             << "with pid '" << getpid() << "'.\n"
+             << std::flush;
 
       close(slaveFD);
 
@@ -5043,8 +5043,8 @@ void CleanupSockets()
   if (proxyFD != -1)
   {
     nxinfo << "Loop: Closing proxy FD in process "
-            << "with pid '" << getpid() << "'.\n"
-            << std::flush;
+           << "with pid '" << getpid() << "'.\n"
+           << std::flush;
 
     close(proxyFD);
 
@@ -5054,8 +5054,8 @@ void CleanupSockets()
   if (agentFD[1] != -1)
   {
     nxinfo << "Loop: Closing agent FD in process "
-            << "with pid '" << getpid() << "'.\n"
-            << std::flush;
+           << "with pid '" << getpid() << "'.\n"
+           << std::flush;
 
     close(agentFD[1]);
 
@@ -5198,8 +5198,8 @@ int CheckAbort()
   if (lastSignal != 0)
   {
     nxinfo << "Loop: Aborting the procedure due to signal '"
-            << lastSignal << "', '" << DumpSignal(lastSignal)
-            << "'.\n" << std::flush;
+           << lastSignal << "', '" << DumpSignal(lastSignal)
+           << "'.\n" << std::flush;
 
     cerr << "Info" << ": Aborting the procedure due to signal '"
          << lastSignal << "'.\n";
@@ -5256,7 +5256,7 @@ void HandleAbort()
   }
 
   nxinfo << "Loop: Showing the proxy abort dialog.\n"
-          << std::flush;
+         << std::flush;
 
   if (control -> ProxyMode == proxy_server)
   {
@@ -5289,8 +5289,8 @@ void HandleAlert(int code, int local)
   if (lastAlert.code == 0)
   {
     nxinfo << "Loop: Requesting an alert dialog with code "
-            << code << " and local " << local << ".\n"
-            << std::flush;
+           << code << " and local " << local << ".\n"
+           << std::flush;
 
     lastAlert.code  = code;
     lastAlert.local = local;
@@ -5298,8 +5298,8 @@ void HandleAlert(int code, int local)
   else
   {
     nxinfo << "Loop: WARNING! Alert dialog already requested "
-            << "with code " << lastAlert.code << ".\n"
-            << std::flush;
+           << "with code " << lastAlert.code << ".\n"
+           << std::flush;
   }
 
   return;
@@ -5310,16 +5310,16 @@ void FlushCallback(int length)
   if (flushCallback != NULL)
   {
     nxinfo << "Loop: Reporting a flush request at "
-            << strMsTimestamp() << " with " << length
-            << " bytes written.\n" << std::flush;
+           << strMsTimestamp() << " with " << length
+           << " bytes written.\n" << std::flush;
 
     (*flushCallback)(flushParameter, length);
   }
   else if (control -> ProxyMode == proxy_client)
   {
     nxinfo << "Loop: WARNING! Can't find a flush "
-            << "callback in process with pid '" << getpid()
-            << "'.\n" << std::flush;
+           << "callback in process with pid '" << getpid()
+           << "'.\n" << std::flush;
   }
 }
 
@@ -5336,8 +5336,8 @@ void KeeperCallback()
             control -> ImageCacheEnableSave == 1)
     {
       nxinfo << "Loop: Starting the house-keeping process with "
-              << "image storage size " << control -> ImageCacheDiskLimit
-              << ".\n" << std::flush;
+             << "image storage size " << control -> ImageCacheDiskLimit
+             << ".\n" << std::flush;
 
       lastKeeper = NXTransKeeper(0, control -> ImageCacheDiskLimit,
                                      control -> RootPath);
@@ -5345,34 +5345,34 @@ void KeeperCallback()
       if (IsFailed(lastKeeper))
       {
         nxwarn << "Loop: WARNING! Can't start the NX keeper process.\n"
-                << std::flush;
+               << std::flush;
 
         SetNotRunning(lastKeeper);
       }
       else
       {
         nxinfo << "Loop: Keeper started with pid '"
-                << lastKeeper << "'.\n" << std::flush;
+               << lastKeeper << "'.\n" << std::flush;
       }
     }
     else
     {
       nxinfo << "Loop: Nothing to do for the keeper process "
-              << "with image cache not enabled.\n"
-              << std::flush;
+             << "with image cache not enabled.\n"
+             << std::flush;
     }
   }
   else
   {
     nxinfo << "Loop: Nothing to do with the keeper process "
-            << "already running.\n" << std::flush;
+           << "already running.\n" << std::flush;
   }
 }
 
 void InstallSignals()
 {
   nxinfo << "Loop: Installing signals in process with pid '"
-          << getpid() << "'.\n" << std::flush;
+         << getpid() << "'.\n" << std::flush;
 
   for (int i = 0; i < 32; i++)
   {
@@ -5389,7 +5389,7 @@ void InstallSignals()
 void RestoreSignals()
 {
   nxinfo << "Loop: Restoring signals in process with pid '"
-          << getpid() << "'.\n" << std::flush;
+         << getpid() << "'.\n" << std::flush;
 
   if (lastMasks.installed == 1)
   {
@@ -5433,8 +5433,8 @@ void DisableSignals()
       if (CheckSignal(i) > 0)
       {
         nxdbg << "Loop: Disabling signal " << i << " '"
-                << DumpSignal(i) << "' in process with pid '"
-                << getpid() << "'.\n" << std::flush;
+              << DumpSignal(i) << "' in process with pid '"
+              << getpid() << "'.\n" << std::flush;
 
         sigaddset(&newMask, i);
       }
@@ -5447,8 +5447,8 @@ void DisableSignals()
   else
   {
     nxinfo << "Loop: WARNING! Signals were already blocked in "
-            << "process with pid '" << getpid() << "'.\n"
-            << std::flush;
+           << "process with pid '" << getpid() << "'.\n"
+           << std::flush;
   }
 }
 
@@ -5457,7 +5457,7 @@ void EnableSignals()
   if (lastMasks.blocked == 1)
   {
     nxinfo << "Loop: Enabling signals in process with pid '"
-            << getpid() << "'.\n" << std::flush;
+           << getpid() << "'.\n" << std::flush;
 
     sigprocmask(SIG_SETMASK, &lastMasks.saved, NULL);
 
@@ -5466,8 +5466,8 @@ void EnableSignals()
   else
   {
     nxwarn << "Loop: WARNING! Signals were not blocked in "
-            << "process with pid '" << getpid() << "'.\n"
-            << std::flush;
+           << "process with pid '" << getpid() << "'.\n"
+           << std::flush;
 
     cerr << "Warning" << ": Signals were not blocked in "
          << "process with pid '" << getpid() << "'.\n";
@@ -5481,9 +5481,9 @@ void InstallSignal(int signal, int action)
     if (action == NX_SIGNAL_FORWARD)
     {
       nxinfo << "Loop: Forwarding handler for signal " << signal
-              << " '" << DumpSignal(signal) << "' in process "
-              << "with pid '" << getpid() << "'.\n"
-              << std::flush;
+             << " '" << DumpSignal(signal) << "' in process "
+             << "with pid '" << getpid() << "'.\n"
+             << std::flush;
 
       lastMasks.forward[signal] = 1;
 
@@ -5492,17 +5492,17 @@ void InstallSignal(int signal, int action)
     else
     {
       nxinfo << "Loop: Reinstalling handler for signal " << signal
-              << " '" << DumpSignal(signal) << "' in process "
-              << "with pid '" << getpid() << "'.\n"
-              << std::flush;
+             << " '" << DumpSignal(signal) << "' in process "
+             << "with pid '" << getpid() << "'.\n"
+             << std::flush;
     }
   }
   else
   {
     nxinfo << "Loop: Installing handler for signal " << signal
-            << " '" << DumpSignal(signal) << "' in process "
-            << "with pid '" << getpid() << "'.\n"
-            << std::flush;
+           << " '" << DumpSignal(signal) << "' in process "
+           << "with pid '" << getpid() << "'.\n"
+           << std::flush;
   }
 
   if (signal == SIGALRM && isTimestamp(lastTimer.start))
@@ -5542,8 +5542,8 @@ void RestoreSignal(int signal)
   if (lastMasks.enabled[signal] == 0)
   {
     nxwarn << "Loop: WARNING! Signal '" << DumpSignal(signal)
-            << " not installed in process with pid '"
-            << getpid() << "'.\n" << std::flush;
+           << " not installed in process with pid '"
+           << getpid() << "'.\n" << std::flush;
 
     cerr << "Warning" << ": Signal '" << DumpSignal(signal)
          << " not installed in process with pid '"
@@ -5553,9 +5553,9 @@ void RestoreSignal(int signal)
   }
 
   nxinfo << "Loop: Restoring handler for signal " << signal
-          << " '" << DumpSignal(signal) << "' in process "
-          << "with pid '" << getpid() << "'.\n"
-          << std::flush;
+         << " '" << DumpSignal(signal) << "' in process "
+         << "with pid '" << getpid() << "'.\n"
+         << std::flush;
 
   if (signal == SIGALRM && isTimestamp(lastTimer.start))
   {
@@ -5579,21 +5579,21 @@ void HandleSignal(int signal)
   if (lastSignal != 0)
   {
     nxinfo << "Loop: WARNING! Last signal is '" << lastSignal
-            << "', '" << DumpSignal(signal) << "' and not zero "
-            << "in process with pid '" << getpid() << "'.\n"
-            << std::flush;
+           << "', '" << DumpSignal(signal) << "' and not zero "
+           << "in process with pid '" << getpid() << "'.\n"
+           << std::flush;
   }
 
   nxinfo << "Loop: Signal '" << signal << "', '"
-          << DumpSignal(signal) << "' received in process "
-          << "with pid '" << getpid() << "'.\n" << std::flush;
+         << DumpSignal(signal) << "' received in process "
+         << "with pid '" << getpid() << "'.\n" << std::flush;
 
 
   if (getpid() != lastProxy && signalHandler != NULL)
   {
     nxinfo << "Loop: Calling slave handler in process "
-            << "with pid '" << getpid() << "'.\n"
-            << std::flush;
+           << "with pid '" << getpid() << "'.\n"
+           << std::flush;
 
     if ((*signalHandler)(signal) == 0)
     {
@@ -5679,12 +5679,12 @@ void HandleSignal(int signal)
       //
 
       nxinfo << "Loop: WARNING! Received signal '12' in "
-              << "process with pid '" << getpid() << "'.\n"
-              << std::flush;
+             << "process with pid '" << getpid() << "'.\n"
+             << std::flush;
 
       nxinfo << "Loop: WARNING! Please check that the "
-              << "cygserver daemon is running.\n"
-              << std::flush;
+             << "cygserver daemon is running.\n"
+             << std::flush;
 
       break;
     }
@@ -5702,9 +5702,9 @@ void HandleSignal(int signal)
       if (getpid() == lastProxy)
       {
         nxinfo << "Loop: Registering end of session request "
-                << "due to signal '" << signal << "', '"
-                << DumpSignal(signal) << "'.\n"
-                << std::flush;
+               << "due to signal '" << signal << "', '"
+               << DumpSignal(signal) << "'.\n"
+               << std::flush;
 
         lastSignal = signal;
       }
@@ -5725,16 +5725,16 @@ void HandleSignal(int signal)
             lastMasks.action[signal].sa_handler != HandleSignal)
     {
       nxinfo << "Loop: Forwarding signal '" << signal << "', '"
-              << DumpSignal(signal) << "' to previous handler.\n"
-              << std::flush;
+             << DumpSignal(signal) << "' to previous handler.\n"
+             << std::flush;
 
       lastMasks.action[signal].sa_handler(signal);
     }
     else if (lastMasks.action[signal].sa_handler == NULL)
     {
       nxwarn << "Loop: WARNING! Parent requested to forward "
-              << "signal '" << signal << "', '" << DumpSignal(signal)
-              << "' but didn't set a handler.\n" << std::flush;
+             << "signal '" << signal << "', '" << DumpSignal(signal)
+             << "' but didn't set a handler.\n" << std::flush;
     }
   }
 }
@@ -5750,7 +5750,7 @@ int HandleChildren()
   if (IsRunning(lastDialog) && HandleChild(lastDialog) == 1)
   {
     nxinfo << "Loop: Resetting pid of last dialog process "
-            << "in handler.\n" << std::flush;
+           << "in handler.\n" << std::flush;
 
     SetNotRunning(lastDialog);
 
@@ -5765,12 +5765,12 @@ int HandleChildren()
   if (IsRunning(lastWatchdog) && HandleChild(lastWatchdog) == 1)
   {
     nxinfo << "Loop: Watchdog is gone. Setting the last "
-            << "signal to SIGHUP.\n" << std::flush;
+           << "signal to SIGHUP.\n" << std::flush;
 
     lastSignal = SIGHUP;
 
     nxinfo << "Loop: Resetting pid of last watchdog process "
-            << "in handler.\n" << std::flush;
+           << "in handler.\n" << std::flush;
 
     SetNotRunning(lastWatchdog);
 
@@ -5788,7 +5788,7 @@ int HandleChildren()
   if (IsRunning(lastKeeper) && HandleChild(lastKeeper) == 1)
   {
     nxinfo << "Loop: Resetting pid of last house-keeping "
-            << "process in handler.\n" << std::flush;
+           << "process in handler.\n" << std::flush;
 
     SetNotRunning(lastKeeper);
 
@@ -5803,7 +5803,7 @@ int HandleChildren()
   if (IsRunning(lastChild))
   {
     nxinfo << "Loop: Resetting pid of last child process "
-            << "in handler.\n" << std::flush;
+           << "in handler.\n" << std::flush;
 
     SetNotRunning(lastChild);
 
@@ -5820,7 +5820,7 @@ int HandleChildren()
   //
 
   nxinfo << "Loop: Ignoring signal received for the "
-          << "unregistered child.\n" << std::flush;
+         << "unregistered child.\n" << std::flush;
 
   return 0;
 }
@@ -5848,8 +5848,8 @@ int WaitChild(int child, const char* label, int force)
   for (;;)
   {
     nxinfo << "Loop: Waiting for the " << label
-            << " process '" << child << "' to die.\n"
-            << std::flush;
+           << " process '" << child << "' to die.\n"
+           << std::flush;
 
     pid = waitpid(child, &status, options);
 
@@ -5861,9 +5861,9 @@ int WaitChild(int child, const char* label, int force)
       }
 
       nxwarn << "Loop: WARNING! Ignoring signal while "
-              << "waiting for the " << label << " process '"
-              << child << "' to die.\n"
-              << std::flush;
+             << "waiting for the " << label << " process '"
+             << child << "' to die.\n"
+             << std::flush;
 
       continue;
     }
@@ -5883,8 +5883,8 @@ int CheckChild(int pid, int status)
     if (WIFSTOPPED(status))
     {
       nxinfo << "Loop: Child process '" << pid << "' was stopped "
-              << "with signal " << (WSTOPSIG(status)) << ".\n"
-              << std::flush;
+             << "with signal " << (WSTOPSIG(status)) << ".\n"
+             << std::flush;
 
       return 0;
     }
@@ -5893,8 +5893,8 @@ int CheckChild(int pid, int status)
       if (WIFEXITED(status))
       {
         nxinfo << "Loop: Child process '" << pid << "' exited "
-                << "with status '" << (WEXITSTATUS(status))
-                << "'.\n" << std::flush;
+               << "with status '" << (WEXITSTATUS(status))
+               << "'.\n" << std::flush;
 
         lastStatus = WEXITSTATUS(status);
       }
@@ -5903,9 +5903,9 @@ int CheckChild(int pid, int status)
         if (CheckSignal(WTERMSIG(status)) != 1)
         {
           nxwarn << "Loop: WARNING! Child process '" << pid
-                  << "' died because of signal " << (WTERMSIG(status))
-                  << ", '" << DumpSignal(WTERMSIG(status)) << "'.\n"
-                  << std::flush;
+                 << "' died because of signal " << (WTERMSIG(status))
+                 << ", '" << DumpSignal(WTERMSIG(status)) << "'.\n"
+                 << std::flush;
 
           cerr << "Warning" << ": Child process '" << pid
                << "' died because of signal " << (WTERMSIG(status))
@@ -5914,9 +5914,9 @@ int CheckChild(int pid, int status)
         else
         {
           nxinfo << "Loop: Child process '" << pid
-                  << "' died because of signal " << (WTERMSIG(status))
-                  << ", '" << DumpSignal(WTERMSIG(status)) << "'.\n"
-                  << std::flush;
+                 << "' died because of signal " << (WTERMSIG(status))
+                 << ", '" << DumpSignal(WTERMSIG(status)) << "'.\n"
+                 << std::flush;
         }
 
         lastStatus = 1;
@@ -5947,7 +5947,7 @@ int CheckChild(int pid, int status)
     //
 
     nxinfo << "Loop: No more children processes running.\n"
-            << std::flush;
+           << std::flush;
 
     return 1;
   }
@@ -5961,15 +5961,15 @@ void RegisterChild(int child)
   if (IsNotRunning(lastChild))
   {
     nxinfo << "Loop: Registering child process '" << child
-            << "' in process with pid '" << getpid()
-            << "'.\n" << std::flush;
+           << "' in process with pid '" << getpid()
+           << "'.\n" << std::flush;
   }
   else
   {
     nxinfo << "Loop: WARNING! Overriding registered child '"
-            << lastChild << "' with new child '" << child
-            << "' in process with pid '" << getpid()
-            << "'.\n" << std::flush;
+           << lastChild << "' with new child '" << child
+           << "' in process with pid '" << getpid()
+           << "'.\n" << std::flush;
   }
 
 
@@ -5981,8 +5981,8 @@ int CheckParent(const char *name, const char *type, int parent)
   if (parent != getppid() || parent == 1)
   {
     nxwarn << name << ": WARNING! Parent process appears "
-            << "to be dead. Exiting " << type << ".\n"
-            << std::flush;
+           << "to be dead. Exiting " << type << ".\n"
+           << std::flush;
 
     cerr << "Warning" << ": Parent process appears "
          << "to be dead. Exiting " << type << ".\n";
@@ -6000,8 +6000,8 @@ void HandleTimer(int signal)
     if (isTimestamp(lastTimer.start))
     {
       nxinfo << "Loop: Timer expired at " << strMsTimestamp()
-              << " in process with pid '" << getpid() << "'.\n"
-              << std::flush;
+             << " in process with pid '" << getpid() << "'.\n"
+             << std::flush;
 
       if (proxy != NULL)
       {
@@ -6045,8 +6045,8 @@ void SetTimer(int value)
     if (diffTs > lastTimer.next.tv_usec / 1000 * 2)
     {
       nxwarn << "Loop: WARNING! Timer missed to expire at "
-              << strMsTimestamp() << " in process with pid '"
-              << getpid() << "'.\n" << std::flush;
+             << strMsTimestamp() << " in process with pid '"
+             << getpid() << "'.\n" << std::flush;
 
       cerr << "Warning" << ": Timer missed to expire at "
            << strMsTimestamp() << " in process with pid '"
@@ -6057,8 +6057,8 @@ void SetTimer(int value)
     else
     {
       nxinfo << "Loop: Timer already running at "
-              << strMsTimestamp() << " in process with pid '"
-              << getpid() << "'.\n" << std::flush;
+             << strMsTimestamp() << " in process with pid '"
+             << getpid() << "'.\n" << std::flush;
 
       return;
     }
@@ -6092,10 +6092,10 @@ void SetTimer(int value)
   timer.it_value    = lastTimer.next;
 
   nxinfo << "Loop: Timer set to " << lastTimer.next.tv_sec
-          << " S and " << lastTimer.next.tv_usec / 1000
-          << " Ms at " << strMsTimestamp() << " in process "
-          << "with pid '" << getpid() << "'.\n"
-          << std::flush;
+         << " S and " << lastTimer.next.tv_usec / 1000
+         << " Ms at " << strMsTimestamp() << " in process "
+         << "with pid '" << getpid() << "'.\n"
+         << std::flush;
 
   if (setitimer(ITIMER_REAL, &timer, &lastTimer.value) < 0)
   {
@@ -6120,15 +6120,15 @@ void ResetTimer()
   if (isTimestamp(lastTimer.start) == 0)
   {
     nxinfo << "Loop: Timer not running in process "
-            << "with pid '" << getpid() << "'.\n"
-            << std::flush;
+           << "with pid '" << getpid() << "'.\n"
+           << std::flush;
 
     return;
   }
 
   nxinfo << "Loop: Timer reset at " << strMsTimestamp()
-          << " in process with pid '" << getpid()
-          << "'.\n" << std::flush;
+         << " in process with pid '" << getpid()
+         << "'.\n" << std::flush;
 
   //
   // Restore the old signal mask and timer.
@@ -6227,8 +6227,8 @@ int WaitForRemote(ChannelEndPoint &socketAddress)
 
   socketAddress.getSpec(&socketUri);
   nxinfo << "Loop: Waiting for connection from "
-          << hostLabel  << " on socket '" << socketUri
-          << "'.\n" << std::flush;
+         << hostLabel  << " on socket '" << socketUri
+         << "'.\n" << std::flush;
   cerr << "Info" << ": Waiting for connection from "
        << hostLabel << " on socket '" << socketUri
        << "'.\n";
@@ -6316,8 +6316,8 @@ int WaitForRemote(ChannelEndPoint &socketAddress)
         char * unixPath = NULL;
         socketAddress.getUnixPath(&unixPath);
         nxinfo << "Loop: Accepted connection from this host on Unix file socket '"
-                << unixPath << "'.\n"
-                << std::flush;
+               << unixPath << "'.\n"
+               << std::flush;
 
         cerr << "Info" << ": Accepted connection from this host on Unix file socket '"
              << unixPath << "'.\n";
@@ -6336,8 +6336,8 @@ int WaitForRemote(ChannelEndPoint &socketAddress)
 
           unsigned int connectedPort = ntohs(newAddrINET.sin_port);
           nxinfo << "Loop: Accepted connection from '" << connectedHost
-                  << "' with port '" << connectedPort << "'.\n"
-                  << std::flush;
+                 << "' with port '" << connectedPort << "'.\n"
+                 << std::flush;
 
           cerr << "Info" << ": Accepted connection from '"
                << connectedHost << "'.\n";
@@ -6450,9 +6450,9 @@ int PrepareProxyConnectionTCP(char** hostName, long int* portNum, int* timeout,
     HandleCleanup();
   }
 
-  nxinfo << "Loop: Connecting to remote host '" 
-          << *hostName << ":" << *portNum << "'.\n"
-          << std::flush;
+  nxinfo << "Loop: Connecting to remote host '"
+         << *hostName << ":" << *portNum << "'.\n"
+         << std::flush;
 
   cerr << "Info" << ": Connecting to remote host '"
        << *hostName << ":" << *portNum << "'.\n"
@@ -6615,9 +6615,9 @@ int ConnectToRemote(ChannelEndPoint &socketAddress)
   {
 
     nxdbg << "Loop: Timer set to " << connectTimeout / 1000
-            << " S " << "with retry set to " << retryConnect
-            << " in process with pid '" << getpid()
-            << "'.\n" << std::flush;
+          << " S " << "with retry set to " << retryConnect
+          << " in process with pid '" << getpid()
+          << "'.\n" << std::flush;
 
     if (socketAddress.getUnixPath(&unixPath))
       result = PrepareProxyConnectionUnix(&unixPath, &connectTimeout, &pFD, &reason);
@@ -6664,8 +6664,8 @@ int ConnectToRemote(ChannelEndPoint &socketAddress)
       else
       {
         nxinfo << "Loop: Sleeping " << retryTimeout
-                << " ms before retrying.\n"
-                << std::flush;
+               << " ms before retrying.\n"
+               << std::flush;
 
         usleep(retryTimeout * 1000);
 
@@ -6723,8 +6723,8 @@ int ConnectToRemote(ChannelEndPoint &socketAddress)
       }
       {
         nxinfo << "Loop: Not showing the dialog with "
-                << (diffTimestamp(lastRetry, getTimestamp()) / 1000)
-                << " seconds elapsed.\n" << std::flush;
+               << (diffTimestamp(lastRetry, getTimestamp()) / 1000)
+               << " seconds elapsed.\n" << std::flush;
       }
 
       ESET(reason);
@@ -6732,16 +6732,16 @@ int ConnectToRemote(ChannelEndPoint &socketAddress)
       if (unixPath && unixPath[0] != '\0' )
       {
         nxinfo << "Loop: Connection to Unix socket file '"
-                << unixPath << "' failed with error '"
-                << ESTR() << "'. Retrying.\n"
-                << std::flush;
+               << unixPath << "' failed with error '"
+               << ESTR() << "'. Retrying.\n"
+               << std::flush;
       }
       else
       {
         nxinfo << "Loop: Connection to '" << hostName
-                << ":" << portNum << "' failed with error '"
-                << ESTR() << "'. Retrying.\n"
-                << std::flush;
+               << ":" << portNum << "' failed with error '"
+               << ESTR() << "'. Retrying.\n"
+               << std::flush;
       }
     }
     else
@@ -6923,7 +6923,7 @@ int SendProxyOptions(int fd)
   }
 
   nxinfo << "Loop: Sending remote options '"
-          << options << "'.\n" << std::flush;
+         << options << "'.\n" << std::flush;
 
   return WriteLocalData(fd, options, strlen(options));
 }
@@ -6931,7 +6931,7 @@ int SendProxyOptions(int fd)
 int ReadProxyVersion(int fd)
 {
   nxinfo << "Loop: Going to read the remote proxy version "
-          << "from FD#" << fd << ".\n" << std::flush;
+         << "from FD#" << fd << ".\n" << std::flush;
 
   //
   // Read until the first space in string.
@@ -6958,8 +6958,8 @@ int ReadProxyVersion(int fd)
   }
 
   nxinfo << "Loop: Received remote version string '"
-          << options << "' from FD#" << fd << ".\n"
-          << std::flush;
+         << options << "' from FD#" << fd << ".\n"
+         << std::flush;
 
   if (strncmp(options, "NXPROXY-", strlen("NXPROXY-")) != 0)
   {
@@ -6992,8 +6992,8 @@ int ReadProxyVersion(int fd)
                   major != -1 && minor != -1 && patch != -1)
   {
     nxinfo << "Loop: Read trailing remote version '" << major
-            << "." << minor << "." << patch << "'.\n"
-            << std::flush;
+           << "." << minor << "." << patch << "'.\n"
+           << std::flush;
 
     control -> CompatVersionMajor = major;
     control -> CompatVersionMinor = minor;
@@ -7047,7 +7047,7 @@ int ReadProxyVersion(int fd)
 int ReadProxyOptions(int fd)
 {
   nxinfo << "Loop: Going to read the remote proxy options "
-          << "from FD#" << fd << ".\n" << std::flush;
+         << "from FD#" << fd << ".\n" << std::flush;
 
   char options[DEFAULT_REMOTE_OPTIONS_LENGTH];
 
@@ -7059,8 +7059,8 @@ int ReadProxyOptions(int fd)
   }
 
   nxinfo << "Loop: Received remote options string '"
-          << options << "' from FD#" << fd << ".\n"
-          << std::flush;
+         << options << "' from FD#" << fd << ".\n"
+         << std::flush;
 
   //
   // Get the remote options, delimited by a space character.
@@ -7086,7 +7086,7 @@ int ReadProxyOptions(int fd)
 int SendProxyCaches(int fd)
 {
   nxinfo << "Loop: Synchronizing local and remote caches.\n"
-          << std::flush;
+         << std::flush;
 
   if (control -> ProxyMode == proxy_client)
   {
@@ -7096,7 +7096,7 @@ int SendProxyCaches(int fd)
     //
 
     nxinfo << "Loop: Going to send the list of local caches.\n"
-            << std::flush;
+           << std::flush;
 
     SetCaches();
 
@@ -7108,7 +7108,7 @@ int SendProxyCaches(int fd)
             control -> PersistentCacheEnableLoad == 0)
     {
       nxinfo << "Loop: Writing an empty list to FD#" << fd
-              << ".\n" << std::flush;
+             << ".\n" << std::flush;
 
       return WriteLocalData(fd, "cachelist=none ", strlen("cachelist=none "));
     }
@@ -7116,7 +7116,7 @@ int SendProxyCaches(int fd)
     int count = 0;
 
     nxinfo << "Loop: Looking for cache files in directory '"
-            << control -> PersistentCachePath << "'.\n" << std::flush;
+           << control -> PersistentCachePath << "'.\n" << std::flush;
 
     DIR *cacheDir = opendir(control -> PersistentCachePath);
 
@@ -7143,8 +7143,8 @@ int SendProxyCaches(int fd)
           }
 
           nxinfo << "Loop: Writing entry '" << control -> PersistentCachePath
-                  << "/" << dirEntry -> d_name << "' to FD#" << fd
-                  << ".\n" << std::flush;
+                 << "/" << dirEntry -> d_name << "' to FD#" << fd
+                 << ".\n" << std::flush;
 
           //
           // Write cache file name to the socket,
@@ -7163,7 +7163,7 @@ int SendProxyCaches(int fd)
     if (count == 0)
     {
       nxinfo << "Loop: Writing an empty list to FD#" << fd
-              << ".\n" << std::flush;
+             << ".\n" << std::flush;
 
       return WriteLocalData(fd, "cachelist=none ", strlen("cachelist=none "));
     }
@@ -7179,15 +7179,15 @@ int SendProxyCaches(int fd)
     //
 
     nxinfo << "Loop: Going to send the selected cache.\n"
-            << std::flush;
+           << std::flush;
 
     char buffer[DEFAULT_STRING_LENGTH];
 
     if (control -> PersistentCacheName != NULL)
     {
       nxinfo << "Loop: Name of selected cache file is '"
-              << control -> PersistentCacheName << "'.\n"
-              << std::flush;
+             << control -> PersistentCacheName << "'.\n"
+             << std::flush;
 
       sprintf(buffer, "cachefile=%s%s ",
                   *(control -> PersistentCacheName) == 'C' ? "S-" : "C-",
@@ -7196,14 +7196,14 @@ int SendProxyCaches(int fd)
     else
     {
       nxinfo << "Loop: No valid cache file was selected.\n"
-              << std::flush;
+             << std::flush;
 
       sprintf(buffer, "cachefile=none ");
     }
 
     nxinfo << "Loop: Sending string '" << buffer
-            << "' as selected cache file.\n"
-            << std::flush;
+           << "' as selected cache file.\n"
+           << std::flush;
 
     return WriteLocalData(fd, buffer, strlen(buffer));
   }
@@ -7214,7 +7214,7 @@ int ReadProxyCaches(int fd)
   if (control -> ProxyMode == proxy_client)
   {
     nxinfo << "Loop: Going to receive the selected proxy cache.\n"
-            << std::flush;
+           << std::flush;
 
     //
     // We will read the name of cache plus the stop character.
@@ -7259,7 +7259,7 @@ int ReadProxyCaches(int fd)
     if (strncasecmp(cacheName, "none", strlen("none")) == 0)
     {
       nxinfo << "Loop: No cache file selected by remote proxy.\n"
-              << std::flush;
+             << std::flush;
     }
     else if (strlen(cacheName) != MD5_LENGTH * 2 + 3 ||
                  *(cacheName + MD5_LENGTH * 2 + 2) != ' ')
@@ -7286,13 +7286,13 @@ int ReadProxyCaches(int fd)
       strcpy(control -> PersistentCacheName, cacheName);
 
       nxinfo << "Loop: Cache file '" << control -> PersistentCacheName
-              << "' selected by remote proxy.\n" << std::flush;
+             << "' selected by remote proxy.\n" << std::flush;
     }
   }
   else
   {
     nxinfo << "Loop: Going to receive the list of remote caches.\n"
-            << std::flush;
+           << std::flush;
 
     SetCaches();
 
@@ -7311,7 +7311,7 @@ int ReadProxyCaches(int fd)
     }
 
     nxinfo << "Loop: Read list of caches from remote side as '"
-            << buffer << "'.\n" << std::flush;
+           << buffer << "'.\n" << std::flush;
 
     //
     // Prepare the buffer. What we want is a list
@@ -7348,7 +7348,7 @@ int ReadProxyCaches(int fd)
 int ReadForwarderVersion(int fd)
 {
   nxinfo << "Loop: Going to negotiate the forwarder version.\n"
-          << std::flush;
+         << std::flush;
 
   //
   // Check if we actually expect the session cookie.
@@ -7357,7 +7357,7 @@ int ReadForwarderVersion(int fd)
   if (*authCookie == '\0')
   {
     nxinfo << "Loop: No authentication cookie required "
-            << "from FD#" << fd << ".\n" << std::flush;
+           << "from FD#" << fd << ".\n" << std::flush;
 
     return 1;
   }
@@ -7372,7 +7372,7 @@ int ReadForwarderVersion(int fd)
   }
 
   nxinfo << "Loop: Received forwarder version string '" << options
-          << "' from FD#" << fd << ".\n" << std::flush;
+         << "' from FD#" << fd << ".\n" << std::flush;
 
   if (strncmp(options, "NXSSH-", strlen("NXSSH-")) != 0)
   {
@@ -7393,8 +7393,8 @@ int ReadForwarderVersion(int fd)
              &(control -> RemoteVersionMinor), &(control -> RemoteVersionPatch));
 
   nxinfo << "Loop: Read forwarder version '" << control -> RemoteVersionMajor
-          << "." << control -> RemoteVersionMinor << "." << control -> RemoteVersionPatch
-          << "'.\n" << std::flush;
+         << "." << control -> RemoteVersionMinor << "." << control -> RemoteVersionPatch
+         << "'.\n" << std::flush;
 
   return 1;
 }
@@ -7408,7 +7408,7 @@ int ReadForwarderOptions(int fd)
   if (*authCookie == '\0')
   {
     nxinfo << "Loop: No authentication cookie required "
-            << "from FD#" << fd << ".\n" << std::flush;
+           << "from FD#" << fd << ".\n" << std::flush;
 
     return 1;
   }
@@ -7423,8 +7423,8 @@ int ReadForwarderOptions(int fd)
   }
 
   nxinfo << "Loop: Received forwarder options string '"
-          << options << "' from FD#" << fd << ".\n"
-          << std::flush;
+         << options << "' from FD#" << fd << ".\n"
+         << std::flush;
 
   if (ParseForwarderOptions(options) < 0)
   {
@@ -7444,7 +7444,7 @@ int ReadForwarderOptions(int fd)
 int ReadRemoteData(int fd, char *buffer, int size, char stop)
 {
   nxinfo << "Loop: Going to read remote data from FD#"
-          << fd << ".\n" << std::flush;
+         << fd << ".\n" << std::flush;
 
   if (size >= MAXIMUM_REMOTE_OPTIONS_LENGTH)
   {
@@ -7470,7 +7470,7 @@ int ReadRemoteData(int fd, char *buffer, int size, char stop)
         if (EGET() == EAGAIN)
         {
           nxinfo << "Loop: Reading data from FD#" << fd
-                  << " would block.\n" << std::flush;
+                 << " would block.\n" << std::flush;
 
           return 0;
         }
@@ -7496,7 +7496,7 @@ int ReadRemoteData(int fd, char *buffer, int size, char stop)
     else if (*(remoteData + remotePosition) == stop)
     {
       nxinfo << "Loop: Read stop character from FD#"
-              << fd << ".\n" << std::flush;
+             << fd << ".\n" << std::flush;
 
       remotePosition++;
 
@@ -7510,8 +7510,8 @@ int ReadRemoteData(int fd, char *buffer, int size, char stop)
       memcpy(buffer, remoteData, remotePosition + 1);
 
       nxinfo << "Loop: Remote string '" << remoteData
-              << "' read from FD#" << fd << ".\n"
-              << std::flush;
+             << "' read from FD#" << fd << ".\n"
+             << std::flush;
 
       int t = remotePosition;
 
@@ -7529,9 +7529,9 @@ int ReadRemoteData(int fd, char *buffer, int size, char stop)
       if (isgraph(*(remoteData + remotePosition)) == 0)
       {
         nxwarn << "Loop: WARNING! Non printable character decimal '"
-                << (unsigned int) *(remoteData + remotePosition)
-                << "' received in remote data from FD#"
-                << fd << ".\n" << std::flush;
+               << (unsigned int) *(remoteData + remotePosition)
+               << "' received in remote data from FD#"
+               << fd << ".\n" << std::flush;
 
         cerr << "Warning" << ": Non printable character decimal '"
                 << (unsigned int) *(remoteData + remotePosition)
@@ -7542,8 +7542,8 @@ int ReadRemoteData(int fd, char *buffer, int size, char stop)
       }
 
       nxdbg << "Loop: Read a further character "
-              << "from FD#" << fd << ".\n"
-              << std::flush;
+            << "from FD#" << fd << ".\n"
+            << std::flush;
 
       remotePosition++;
     }
@@ -7620,7 +7620,7 @@ int WriteLocalData(int fd, const char *buffer, int size)
     ret = select(fd+1, NULL, &writeSet, NULL, &selectTs);
 
     nxdbg << "Loop: WriteLocalData: select() returned with a code of " << ret << " and remaining timeout of "
-            << selectTs.tv_sec << " sec, " << selectTs.tv_usec << "usec\n" << std::flush;
+          << selectTs.tv_sec << " sec, " << selectTs.tv_usec << "usec\n" << std::flush;
 
     if ( ret < 0 )
     {
@@ -7649,7 +7649,7 @@ int WriteLocalData(int fd, const char *buffer, int size)
       }
 
       nxinfo << "Loop: Error writing data to FD#"
-              << fd << ".\n" << std::flush;
+             << fd << ".\n" << std::flush;
 
       return -1;
     }
@@ -7693,8 +7693,8 @@ int ParseEnvironmentOptions(const char *env, int force)
   if (setjmp(context) == 1)
   {
     nxinfo << "Loop: Out of the long jump while parsing "
-            << "the environment options.\n"
-            << std::flush;
+           << "the environment options.\n"
+           << std::flush;
 
     return -1;
   }
@@ -7702,8 +7702,8 @@ int ParseEnvironmentOptions(const char *env, int force)
   if (force == 0 && parsedOptions == 1)
   {
     nxinfo << "Loop: Skipping a further parse of environment "
-            << "options string '" << (env != NULL ? env : "")
-            << "'.\n" << std::flush;
+           << "options string '" << (env != NULL ? env : "")
+           << "'.\n" << std::flush;
 
     return 1;
   }
@@ -7711,15 +7711,15 @@ int ParseEnvironmentOptions(const char *env, int force)
   if (env == NULL || *env == '\0')
   {
     nxinfo << "Loop: Nothing to do with empty environment "
-            << "options string '" << (env != NULL ? env : "")
-            << "'.\n" << std::flush;
+           << "options string '" << (env != NULL ? env : "")
+           << "'.\n" << std::flush;
 
     return 0;
   }
 
   nxinfo << "Loop: Going to parse the environment options "
-          << "string '" << env << "'.\n"
-          << std::flush;
+         << "string '" << env << "'.\n"
+         << std::flush;
 
   parsedOptions = 1;
 
@@ -7785,7 +7785,7 @@ int ParseEnvironmentOptions(const char *env, int force)
   else if (force == 0)
   {
     nxinfo << "Loop: Ignoring host X server display string '"
-            << opts << "'.\n" << std::flush;
+           << opts << "'.\n" << std::flush;
 
     return 0;
   }
@@ -7849,7 +7849,7 @@ int ParseEnvironmentOptions(const char *env, int force)
   }
 
   nxinfo << "Loop: Parsing options string '"
-          << nextOpts << "'.\n" << std::flush;
+         << nextOpts << "'.\n" << std::flush;
 
   //
   // Now all the other optional parameters.
@@ -8256,7 +8256,7 @@ int ParseEnvironmentOptions(const char *env, int force)
     else if (strcasecmp(name, "sync") == 0)
     {
       nxwarn << "Loop: WARNING! No 'sync' channel in current version. "
-              << "Assuming 'cups' channel.\n" << std::flush;
+             << "Assuming 'cups' channel.\n" << std::flush;
 
       cerr << "Warning" << ": No 'sync' channel in current version. "
            << "Assuming 'cups' channel.\n";
@@ -8300,7 +8300,7 @@ int ParseEnvironmentOptions(const char *env, int force)
       if (timeout == 0)
       {
         nxinfo << "Loop: Disabling timeout on broken "
-                << "proxy connection.\n" << std::flush;
+               << "proxy connection.\n" << std::flush;
 
         control -> ProxyTimeout = 0;
       }
@@ -8316,7 +8316,7 @@ int ParseEnvironmentOptions(const char *env, int force)
       if (cleanup == 0)
       {
         nxinfo << "Loop: Disabling grace timeout on "
-                << "proxy shutdown.\n" << std::flush;
+               << "proxy shutdown.\n" << std::flush;
 
         control -> CleanupTimeout = 0;
       }
@@ -8352,9 +8352,9 @@ int ParseEnvironmentOptions(const char *env, int force)
               control -> KillDaemonOnShutdownLimit)
       {
         nxinfo << "Loop: WARNING! Adding process with pid '"
-                << ValidateArg("local", name, value) << " to the "
-                << "daemons to kill at shutdown.\n"
-                << std::flush;
+               << ValidateArg("local", name, value) << " to the "
+               << "daemons to kill at shutdown.\n"
+               << std::flush;
 
         control -> KillDaemonOnShutdown[control ->
                        KillDaemonOnShutdownNumber] =
@@ -8365,7 +8365,7 @@ int ParseEnvironmentOptions(const char *env, int force)
       else
       {
         nxwarn << "Loop: WARNING! Number of daemons to kill "
-                << "at shutdown exceeded.\n" << std::flush;
+               << "at shutdown exceeded.\n" << std::flush;
 
         cerr << "Warning" << ": Number of daemons to kill "
              << "at shutdown exceeded.\n";
@@ -8402,8 +8402,8 @@ int ParseEnvironmentOptions(const char *env, int force)
                                                  strcasecmp(name, "tolerancechecks") == 0)
     {
       nxdbg << "Loop: Ignoring agent option '" << name
-              << "' with value '" << value << "'.\n"
-              << std::flush;
+            << "' with value '" << value << "'.\n"
+            << std::flush;
     }
     else if (strcasecmp(name, "composite") == 0 ||
                  strcasecmp(name, "shmem") == 0 ||
@@ -8417,8 +8417,8 @@ int ParseEnvironmentOptions(const char *env, int force)
                                                  strcasecmp(name, "xinerama") == 0)
     {
       nxdbg << "Loop: Ignoring agent option '" << name
-              << "' with value '" << value << "'.\n"
-              << std::flush;
+            << "' with value '" << value << "'.\n"
+            << std::flush;
     }
     else if (strcasecmp(name, "defer") == 0 ||
                  strcasecmp(name, "tile") == 0 ||
@@ -8426,14 +8426,14 @@ int ParseEnvironmentOptions(const char *env, int force)
                         strcasecmp(name, "state") == 0 )
     {
       nxdbg << "Loop: Ignoring agent option '" << name
-              << "' with value '" << value << "'.\n"
-              << std::flush;
+            << "' with value '" << value << "'.\n"
+            << std::flush;
     }
     else
     {
       nxwarn << "Loop: WARNING! Ignoring unknown option '"
-              << name << "' with value '" << value << "'.\n"
-              << std::flush;
+             << name << "' with value '" << value << "'.\n"
+             << std::flush;
 
       cerr << "Warning" << ": Ignoring unknown option '"
            << name << "' with value '" << value << "'.\n";
@@ -8455,14 +8455,14 @@ int ParseEnvironmentOptions(const char *env, int force)
   }
 
   nxinfo << "Loop: Completed parsing of string '"
-          << env << "'.\n" << std::flush;
+         << env << "'.\n" << std::flush;
 
   if ((*fileOptions != '\0') && (strncmp(fileOptions, "/dev/", 5) != 0) && (strncmp(fileOptions, "/proc/", 6) != 0) && (strncmp(fileOptions, "/sys/", 5) != 0))
   {
     if (strcmp(fileOptions, optionsFileName) != 0)
     {
       nxinfo << "Loop: Reading options from '" << fileOptions
-              << "'.\n" << std::flush;
+             << "'.\n" << std::flush;
 
       if (ParseFileOptions(fileOptions) < 0)
       {
@@ -8472,8 +8472,8 @@ int ParseEnvironmentOptions(const char *env, int force)
     else
     {
       nxwarn << "Loop: WARNING! Name of the options file "
-              << "specified multiple times. Not parsing "
-              << "again.\n" << std::flush;
+             << "specified multiple times. Not parsing "
+             << "again.\n" << std::flush;
     }
 
     if (*optionsFileName == '\0')
@@ -8481,8 +8481,8 @@ int ParseEnvironmentOptions(const char *env, int force)
       strncpy(optionsFileName, value, DEFAULT_STRING_LENGTH - 1);
 
       nxinfo << "Loop: Assuming name of options file '"
-              << optionsFileName << "'.\n"
-              << std::flush;
+             << optionsFileName << "'.\n"
+             << std::flush;
     }
   }
 
@@ -8523,8 +8523,8 @@ int ParseCommandLineOptions(int argc, const char **argv)
   if (setjmp(context) == 1)
   {
     nxinfo << "Loop: Out of the long jump while parsing "
-            << "the command line options.\n"
-            << std::flush;
+           << "the command line options.\n"
+           << std::flush;
 
     return -1;
   }
@@ -8541,13 +8541,13 @@ int ParseCommandLineOptions(int argc, const char **argv)
   if (parsedCommand == 1)
   {
     nxinfo << "Loop: Skipping a further parse of command line options.\n"
-            << std::flush;
+           << std::flush;
 
     return 1;
   }
 
   nxinfo << "Loop: Going to parse the command line options.\n"
-          << std::flush;
+         << std::flush;
 
   parsedCommand = 1;
 
@@ -8592,7 +8592,7 @@ int ParseCommandLineOptions(int argc, const char **argv)
           if (WE_SET_PROXY_MODE == 0)
           {
             nxinfo << "Loop: Setting local proxy mode to proxy_client.\n"
-                    << std::flush;
+                   << std::flush;
 
             control -> ProxyMode = proxy_client;
           }
@@ -8618,7 +8618,7 @@ int ParseCommandLineOptions(int argc, const char **argv)
           if (WE_SET_PROXY_MODE == 0)
           {
             nxinfo << "Loop: Setting local proxy mode to proxy_server.\n"
-                    << std::flush;
+                   << std::flush;
 
             control -> ProxyMode = proxy_server;
           }
@@ -8850,7 +8850,7 @@ int ParseFileOptions(const char *file)
   }
 
   nxinfo << "Loop: Going to read options from file '"
-          << fileName << "'.\n" << std::flush;
+         << fileName << "'.\n" << std::flush;
 
   FILE *filePtr = fopen(fileName, "r");
 
@@ -8912,7 +8912,7 @@ int ParseFileOptions(const char *file)
   }
 
   nxinfo << "Loop: Read options '" << options << "' from file '"
-          << fileName << "'.\n" << std::flush;
+         << fileName << "'.\n" << std::flush;
 
   if (ParseEnvironmentOptions(options, 1) < 0)
   {
@@ -8934,8 +8934,8 @@ int ParseFileOptions(const char *file)
 int ParseRemoteOptions(char *opts)
 {
   nxinfo << "Loop: Going to parse the remote options "
-          << "string '" << opts << "'.\n"
-          << std::flush;
+         << "string '" << opts << "'.\n"
+         << std::flush;
 
   char *name;
   char *value;
@@ -8981,8 +8981,8 @@ int ParseRemoteOptions(char *opts)
       if (WE_PROVIDE_CREDENTIALS)
       {
         nxwarn << "Loop: WARNING! Ignoring remote option 'cookie' "
-                << "with value '" << value << "' when initiating "
-                << "connection.\n" << std::flush;
+               << "with value '" << value << "' when initiating "
+               << "connection.\n" << std::flush;
 
         cerr << "Warning" << ": Ignoring remote option 'cookie' "
              << "with value '" << value << "' when initiating "
@@ -9013,8 +9013,8 @@ int ParseRemoteOptions(char *opts)
         if (*linkSpeedName != '\0' && strcasecmp(linkSpeedName, value) != 0)
         {
           nxwarn << "Loop: WARNING! Overriding option 'link' "
-                  << "with new value '" << value << "'.\n"
-                  << std::flush;
+                 << "with new value '" << value << "'.\n"
+                 << std::flush;
 
           cerr << "Warning" << ": Overriding option 'link' "
                << "with new value '" << value << "'.\n";
@@ -9046,8 +9046,8 @@ int ParseRemoteOptions(char *opts)
         if (*packMethodName != '\0' && strcasecmp(packMethodName, value) != 0)
         {
           nxwarn << "Loop: WARNING! Overriding option 'pack' "
-                  << "with remote value '" << value << "'.\n"
-                  << std::flush;
+                 << "with remote value '" << value << "'.\n"
+                 << std::flush;
 
           cerr << "Warning" << ": Overriding option 'pack' "
                << "with remote value '" << value << "'.\n";
@@ -9139,8 +9139,8 @@ int ParseRemoteOptions(char *opts)
                 strcasecmp(bitrateLimitName, value) != 0)
         {
           nxwarn << "Loop: WARNING! Overriding option 'limit' "
-                  << "with new value '" << value << "'.\n"
-                  << std::flush;
+                 << "with new value '" << value << "'.\n"
+                 << std::flush;
 
           cerr << "Warning" << ": Overriding option 'limit' "
                << "with new value '" << value << "'.\n";
@@ -9226,7 +9226,7 @@ int ParseRemoteOptions(char *opts)
       {
         nxfatal << "Loop: PANIC! Can't identify size of shared memory "
                 << "segment in string '" << value << "'.\n"
-               << std::flush;
+                << std::flush;
 
         cerr << "Error" << ": Can't identify size of shared memory "
              << "segment in string '" << value << "'.\n";
@@ -9357,14 +9357,14 @@ int ParseRemoteOptions(char *opts)
       //
 
       nxdbg << "Loop: Ignoring obsolete remote option '"
-              << name << "' with value '" << value
-              << "'.\n" << std::flush;
+            << name << "' with value '" << value
+            << "'.\n" << std::flush;
     }
     else
     {
       nxwarn << "Loop: WARNING! Ignoring unknown remote option '"
-              << name << "' with value '" << value << "'.\n"
-              << std::flush;
+             << name << "' with value '" << value << "'.\n"
+             << std::flush;
 
       cerr << "Warning" << ": Ignoring unknown remote option '"
            << name << "' with value '" << value << "'.\n";
@@ -9473,8 +9473,8 @@ int ParseRemoteOptions(char *opts)
 int ParseForwarderOptions(char *opts)
 {
   nxinfo << "Loop: Going to parse the forwarder options "
-          << "string '" << opts << "'.\n"
-          << std::flush;
+         << "string '" << opts << "'.\n"
+         << std::flush;
 
   char *name;
   char *value;
@@ -9520,8 +9520,8 @@ int ParseForwarderOptions(char *opts)
     else
     {
       nxwarn << "Loop: WARNING! Ignoring unknown forwarder option '"
-              << name << "' with value '" << value << "'.\n"
-              << std::flush;
+             << name << "' with value '" << value << "'.\n"
+             << std::flush;
 
       cerr << "Warning" << ": Ignoring unknown forwarder option '"
            << name << "' with value '" << value << "'.\n";
@@ -9554,7 +9554,7 @@ int SetCore()
   if (getrlimit(RLIMIT_CORE, &rlim))
   {
     nxinfo << "Cannot read RLIMIT_CORE. Error is '"
-            << ESTR() << "'.\n" << std::flush;
+           << ESTR() << "'.\n" << std::flush;
 
     return -1;
   }
@@ -9566,14 +9566,14 @@ int SetCore()
     if (setrlimit(RLIMIT_CORE, &rlim))
     {
       nxinfo << "Loop: Cannot read RLIMIT_CORE. Error is '"
-              << ESTR() << "'.\n" << std::flush;
+             << ESTR() << "'.\n" << std::flush;
 
       return -2;
     }
   }
 
   nxinfo << "Loop: Set RLIMIT_CORE to "<< rlim.rlim_max
-          << ".\n" << std::flush;
+         << ".\n" << std::flush;
 
   #endif // #ifdef COREDUMPS
 
@@ -9586,8 +9586,8 @@ char *GetLastCache(char *listBuffer, const char *searchPath)
           strncmp(listBuffer, "cachelist=", strlen("cachelist=")) != 0)
   {
     nxinfo << "Loop: Invalid parameters '" << listBuffer << "' and '"
-            << (searchPath != NULL ? searchPath : "")
-            << "'. Can't select any cache.\n" << std::flush;
+           << (searchPath != NULL ? searchPath : "")
+           << "'. Can't select any cache.\n" << std::flush;
 
     return NULL;
   }
@@ -9635,7 +9635,7 @@ char *GetLastCache(char *listBuffer, const char *searchPath)
     if (strncmp(fileName, "none", strlen("none")) == 0)
     {
       nxinfo << "Loop: No cache files seem to be available.\n"
-              << std::flush;
+             << std::flush;
 
       delete [] selectedName;
 
@@ -9645,7 +9645,7 @@ char *GetLastCache(char *listBuffer, const char *searchPath)
                  strncmp(fileName, remotePrefix, 2) != 0)
     {
       nxfatal << "Loop: PANIC! Bad cache file name '"
-               << fileName << "'.\n" << std::flush;
+              << fileName << "'.\n" << std::flush;
 
       cerr << "Error" << ": Bad cache file name '"
            << fileName << "'.\n";
@@ -9656,7 +9656,7 @@ char *GetLastCache(char *listBuffer, const char *searchPath)
     }
 
     nxinfo << "Loop: Parsing remote cache name '"
-            << fileName << "'.\n" << std::flush;
+           << fileName << "'.\n" << std::flush;
 
     //
     // Prefix, received as "S-", becomes
@@ -9672,7 +9672,7 @@ char *GetLastCache(char *listBuffer, const char *searchPath)
     if (stat(fullPath, &fileStat) == 0)
     {
       nxinfo << "Loop: Found a matching cache '"
-              << std::string(fullPath) << "'.\n" << std::flush;
+             << std::string(fullPath) << "'.\n" << std::flush;
 
       if (fileStat.st_mtime >= selectedTime)
       {
@@ -9684,7 +9684,7 @@ char *GetLastCache(char *listBuffer, const char *searchPath)
     else
     {
       nxinfo << "Loop: Can't get stats of file '"
-              << std::string(fullPath) << "'.\n" << std::flush;
+             << std::string(fullPath) << "'.\n" << std::flush;
     }
 
     fileName = strtok(NULL, ",");
@@ -9716,14 +9716,14 @@ char *GetTempPath()
     if (tempEnv == NULL || *tempEnv == '\0')
     {
       nxinfo << "Loop: WARNING! No environment for NX_TEMP.\n"
-              << std::flush;
+             << std::flush;
 
       tempEnv = getenv("TEMP");
 
       if (tempEnv == NULL || *tempEnv == '\0')
       {
         nxinfo << "Loop: WARNING! No environment for TEMP.\n"
-                << std::flush;
+               << std::flush;
 
         tempEnv = "/tmp";
       }
@@ -9745,7 +9745,7 @@ char *GetTempPath()
     strcpy(tempDir, tempEnv);
 
     nxinfo << "Loop: Assuming temporary NX directory '"
-            << tempDir << "'.\n" << std::flush;
+           << tempDir << "'.\n" << std::flush;
   }
 
   char *tempPath = new char[strlen(tempDir) + 1];
@@ -9779,7 +9779,7 @@ char *GetClientPath()
     if (clientEnv == NULL || *clientEnv == '\0')
     {
       nxinfo << "Loop: WARNING! No environment for NX_CLIENT.\n"
-              << std::flush;
+             << std::flush;
 
       //
       // Try to guess the location of the client.
@@ -9816,7 +9816,7 @@ char *GetClientPath()
     strcpy(clientDir, clientEnv);
 
     nxinfo << "Loop: Assuming NX client location '"
-            << clientDir << "'.\n" << std::flush;
+           << clientDir << "'.\n" << std::flush;
   }
 
   char *clientPath = new char[strlen(clientDir) + 1];
@@ -9850,7 +9850,7 @@ char *GetSystemPath()
     if (systemEnv == NULL || *systemEnv == '\0')
     {
       nxinfo << "Loop: WARNING! No environment for NX_SYSTEM.\n"
-              << std::flush;
+             << std::flush;
 
       systemEnv = "/usr/NX";
     }
@@ -9871,7 +9871,7 @@ char *GetSystemPath()
     strcpy(systemDir, systemEnv);
 
     nxinfo << "Loop: Assuming system NX directory '"
-            << systemDir << "'.\n" << std::flush;
+           << systemDir << "'.\n" << std::flush;
   }
 
   char *systemPath = new char[strlen(systemDir) + 1];
@@ -9905,7 +9905,7 @@ char *GetHomePath()
     if (homeEnv == NULL || *homeEnv == '\0')
     {
       nxinfo << "Loop: WARNING! No environment for NX_HOME.\n"
-              << std::flush;
+             << std::flush;
 
       homeEnv = getenv("HOME");
 
@@ -9936,7 +9936,7 @@ char *GetHomePath()
     strcpy(homeDir, homeEnv);
 
     nxinfo << "Loop: Assuming NX user's home directory '"
-            << homeDir << "'.\n" << std::flush;
+           << homeDir << "'.\n" << std::flush;
   }
 
   char *homePath = new char[strlen(homeDir) + 1];
@@ -9970,7 +9970,7 @@ char *GetRootPath()
     if (rootEnv == NULL || *rootEnv == '\0')
     {
       nxinfo << "Loop: WARNING! No environment for NX_ROOT.\n"
-              << std::flush;
+             << std::flush;
 
       //
       // We will determine the root NX directory
@@ -9995,7 +9995,7 @@ char *GetRootPath()
       }
 
       nxinfo << "Loop: Assuming NX root directory in "
-              << "the user's home '" << homeEnv
+             << "the user's home '" << homeEnv
               << "'.\n" << std::flush;
 
       strcpy(rootDir, homeEnv);
@@ -10044,7 +10044,7 @@ char *GetRootPath()
     }
 
     nxinfo << "Loop: Assuming NX root directory '"
-            << rootDir << "'.\n" << std::flush;
+           << rootDir << "'.\n" << std::flush;
   }
 
   char *rootPath = new char[strlen(rootDir) + 1];
@@ -10250,7 +10250,7 @@ char *GetSessionPath()
     }
 
     nxinfo << "Loop: Root of NX session is '" << sessionDir
-            << "'.\n" << std::flush;
+           << "'.\n" << std::flush;
 
     delete [] rootPath;
   }
@@ -10321,11 +10321,11 @@ int ParseLinkOption(const char *opt)
 int ParsePackOption(const char *opt)
 {
   nxdbg << "Loop: Pack method is " << packMethod
-          << " quality is " << packQuality << ".\n"
-          << std::flush;
+        << " quality is " << packQuality << ".\n"
+        << std::flush;
 
   nxdbg << "Loop: Parsing pack method '" << opt
-          << "'.\n" << std::flush;
+        << "'.\n" << std::flush;
 
   if (strcasecmp(opt, "0") == 0 ||
           strcasecmp(opt, "none") == 0 ||
@@ -10514,7 +10514,7 @@ int ParsePackOption(const char *opt)
       packQuality = atoi(dash + 1);
 
       nxdbg << "Loop: Using pack quality '"
-              << packQuality << "'.\n" << std::flush;
+            << packQuality << "'.\n" << std::flush;
     }
   }
   else
@@ -10818,12 +10818,12 @@ int SetLogs()
     strcpy(statsFileName, "stats");
 
     nxinfo << "Loop: Assuming default statistics file '"
-            << statsFileName << "'.\n" << std::flush;
+           << statsFileName << "'.\n" << std::flush;
   }
   else
   {
     nxinfo << "Loop: Name selected for statistics is '"
-            << statsFileName << "'.\n" << std::flush;
+           << statsFileName << "'.\n" << std::flush;
   }
 
   if (OpenLogFile(statsFileName, statofs) < 0)
@@ -10838,12 +10838,12 @@ int SetLogs()
     strcpy(errorsFileName, "errors");
 
     nxinfo << "Loop: Assuming default log file name '"
-            << errorsFileName << "'.\n" << std::flush;
+           << errorsFileName << "'.\n" << std::flush;
   }
   else
   {
     nxinfo << "Loop: Name selected for log file is '"
-            << errorsFileName << "'.\n" << std::flush;
+           << errorsFileName << "'.\n" << std::flush;
   }
 
   //
@@ -10883,12 +10883,12 @@ int SetLogs()
   if (*sessionFileName != '\0')
   {
     nxinfo << "Loop: Name selected for session file is '"
-            << sessionFileName << "'.\n" << std::flush;
+           << sessionFileName << "'.\n" << std::flush;
 
     if (errofs != NULL)
     {
       nxwarn << "Loop: WARNING! Unexpected value for stream errofs.\n"
-              << std::flush;
+             << std::flush;
 
       cerr << "Warning" << ": Unexpected value for stream errofs.\n";
     }
@@ -10896,7 +10896,7 @@ int SetLogs()
     if (errsbuf != NULL)
     {
       nxwarn << "Loop: WARNING! Unexpected value for buffer errsbuf.\n"
-              << std::flush;
+             << std::flush;
 
       cerr << "Warning" << ": Unexpected value for buffer errsbuf.\n";
     }
@@ -10958,7 +10958,7 @@ int SetPorts()
 
 
   nxinfo << "Loop: cups port: " << cupsPort << "\n"
-            << std::flush;
+         << std::flush;
 
   if (control -> ProxyMode == proxy_client) {
     auxPort.setDefaultTCPPort(DEFAULT_NX_AUX_PORT_OFFSET + proxyPort);
@@ -10968,8 +10968,8 @@ int SetPorts()
 
     if ( auxPort.getTCPPort() != 1 ) {
         nxwarn << "Loop: WARNING! Overriding auxiliary X11 "
-                << "port with new value '" << 1 << "'.\n"
-                << std::flush;
+               << "port with new value '" << 1 << "'.\n"
+               << std::flush;
 
       cerr << "Warning" << ": Overriding auxiliary X11 "
            << "port with new value '" << 1 << "'.\n";
@@ -10979,7 +10979,7 @@ int SetPorts()
   }
 
   nxinfo << "Loop: aux port: " << auxPort << "\n"
-	  << std::flush;
+         << std::flush;
 
   if (control -> ProxyMode == proxy_client) {
     smbPort.setDefaultTCPPort(DEFAULT_NX_SMB_PORT_OFFSET + proxyPort);
@@ -10990,7 +10990,7 @@ int SetPorts()
 
 
   nxinfo << "Loop: smb port: " << smbPort << "\n"
-	  << std::flush;
+         << std::flush;
 
   if ( mediaPort.configured() ) {
     if (control -> ProxyMode == proxy_client) {
@@ -11010,7 +11010,7 @@ int SetPorts()
   }
 
   nxinfo << "Loop: Using multimedia port '" << mediaPort
-	  << "'.\n" << std::flush;
+         << "'.\n" << std::flush;
 
   if (control -> ProxyMode == proxy_client) {
       httpPort.setDefaultTCPPort(DEFAULT_NX_HTTP_PORT_OFFSET + proxyPort);
@@ -11020,12 +11020,12 @@ int SetPorts()
   }
 
   nxinfo << "Loop: Using HTTP port '" << httpPort
-	  << "'.\n" << std::flush;
+         << "'.\n" << std::flush;
 
   if (ParseFontPath(fontPort) <= 0)
   {
     nxinfo << "Loop: Disabling font server connections.\n"
-            << std::flush;
+           << std::flush;
 
     *fontPort = '\0';
 
@@ -11050,7 +11050,7 @@ int SetPorts()
     }
 
     nxinfo << "Loop: Using font server port '" << fontPort
-            << "'.\n" << std::flush;
+           << "'.\n" << std::flush;
   }
 
   if (control -> ProxyMode == proxy_client) {
@@ -11061,7 +11061,7 @@ int SetPorts()
   }
 
   nxinfo << "Loop: Using slave port '" << slavePort
-	  << "'.\n" << std::flush;
+         << "'.\n" << std::flush;
 
   return 1;
 }
@@ -11149,7 +11149,7 @@ int SetCaches()
   }
 
   nxinfo << "Loop: Path of cache files is '" << control -> PersistentCachePath
-          << "'.\n" << std::flush;
+         << "'.\n" << std::flush;
 
   return 1;
 }
@@ -11273,8 +11273,8 @@ int SetSession()
     if (*sessionType != '\0')
     {
       nxwarn << "Loop: WARNING! Unrecognized session type '"
-              << sessionType << "'. Assuming agent session.\n"
-              << std::flush;
+             << sessionType << "'. Assuming agent session.\n"
+             << std::flush;
 
       cerr << "Warning" << ": Unrecognized session type '"
            << sessionType << "'. Assuming agent session.\n";
@@ -11284,9 +11284,9 @@ int SetSession()
   }
 
   nxinfo << "Loop: Assuming session type '"
-          << DumpSession(control -> SessionMode) << "' with "
-          << "string '" << sessionType << "'.\n"
-          << std::flush;
+         << DumpSession(control -> SessionMode) << "' with "
+         << "string '" << sessionType << "'.\n"
+         << std::flush;
 
   //
   // By default the policy is immediate. Agents
@@ -11307,16 +11307,16 @@ int SetSession()
     }
 
     nxinfo << "Loop: WARNING! Forcing flush policy to '"
-            << DumpPolicy(control -> FlushPolicy)
-            << ".\n" << std::flush;
+           << DumpPolicy(control -> FlushPolicy)
+           << ".\n" << std::flush;
   }
   else
   {
     control -> FlushPolicy = policy_immediate;
 
     nxinfo << "Loop: Setting initial flush policy to '"
-            << DumpPolicy(control -> FlushPolicy)
-            << "'.\n" << std::flush;
+           << DumpPolicy(control -> FlushPolicy)
+           << "'.\n" << std::flush;
   }
 
   //
@@ -11340,14 +11340,14 @@ int SetSession()
   if (control -> LinkEncrypted == 1)
   {
     nxinfo << "Loop: Proxy running as part of an "
-            << "encrypting client.\n"
-            << std::flush;
+           << "encrypting client.\n"
+           << std::flush;
   }
   else
   {
     nxinfo << "Loop: Assuming proxy running as a "
-            << "standalone program.\n"
-            << std::flush;
+           << "standalone program.\n"
+           << std::flush;
   }
 
   //
@@ -11370,7 +11370,7 @@ int SetSession()
     if (stat(fileName, &fileStat) == 0)
     {
       nxinfo << "Loop: Enabling respawn of client at session shutdown.\n"
-              << std::flush;
+             << std::flush;
 
       control -> EnableRestartOnShutdown = 1;
     }
@@ -11425,17 +11425,17 @@ int SetStorage()
   }
 
   nxdbg << "Loop: Storage size limit is "
-          << control -> ClientTotalStorageSize
-          << " at client and "
-          << control -> ServerTotalStorageSize
-          << " at server.\n"
-          << std::flush;
+        << control -> ClientTotalStorageSize
+        << " at client and "
+        << control -> ServerTotalStorageSize
+        << " at server.\n"
+        << std::flush;
 
   nxdbg << "Loop: Storage local limit set to "
-          << control -> LocalTotalStorageSize
-          << " remote limit set to "
-          << control -> RemoteTotalStorageSize
-          << ".\n" << std::flush;
+        << control -> LocalTotalStorageSize
+        << " remote limit set to "
+        << control -> RemoteTotalStorageSize
+        << ".\n" << std::flush;
 
   //
   // Never reserve for split store more than
@@ -11446,8 +11446,8 @@ int SetStorage()
           SplitTotalStorageSize > size / 2)
   {
     nxinfo << "Loop: Reducing size of split store to "
-            << size / 2 << " bytes.\n"
-            << std::flush;
+           << size / 2 << " bytes.\n"
+           << std::flush;
 
     control -> SplitTotalStorageSize = size / 2;
   }
@@ -11461,8 +11461,8 @@ int SetStorage()
   if (control -> HideRender == 1)
   {
     nxinfo << "Loop: Not loading render extension "
-            << "from persistent cache.\n"
-            << std::flush;
+           << "from persistent cache.\n"
+           << std::flush;
 
     control -> PersistentCacheLoadRender = 0;
   }
@@ -11532,13 +11532,13 @@ int SetShmem()
     control -> ShmemServer = 1;
 
     nxinfo << "Loop: Set initial shared memory size "
-            << "to " << control -> ShmemServerSize
-            << " bytes.\n" << std::flush;
+           << "to " << control -> ShmemServerSize
+           << " bytes.\n" << std::flush;
   }
   else
   {
     nxinfo << "Loop: Disabled use of the shared memory "
-            << "extension.\n" << std::flush;
+           << "extension.\n" << std::flush;
 
     control -> ShmemServer = 0;
   }
@@ -11558,8 +11558,8 @@ int SetShmem()
 int SetPack()
 {
   nxinfo << "Loop: Setting pack with initial method "
-          << packMethod << " and quality " << packQuality
-          << ".\n" << std::flush;
+         << packMethod << " and quality " << packQuality
+         << ".\n" << std::flush;
 
   //
   // Check if this is a proxy session and, in
@@ -11571,7 +11571,7 @@ int SetPack()
   if (control -> SessionMode == session_proxy)
   {
     nxinfo << "Loop: WARNING! Disabling pack with proxy session.\n"
-            << std::flush;
+           << std::flush;
 
     packMethod = PACK_NONE;
   }
@@ -11593,8 +11593,8 @@ int SetPack()
     control -> PersistentCacheLoadPacked = 0;
 
     nxinfo << "Loop: Not loading packed images "
-            << "from persistent cache.\n"
-            << std::flush;
+           << "from persistent cache.\n"
+           << std::flush;
   }
 
   return 1;
@@ -11615,8 +11615,8 @@ int SetImages()
   if (control -> SessionMode == session_proxy)
   {
     nxinfo << "Loop: Disabling image cache with "
-            << "session '" << DumpSession(control ->
-               SessionMode) << "'.\n" << std::flush;
+           << "session '" << DumpSession(control ->
+              SessionMode) << "'.\n" << std::flush;
 
     sprintf(imagesSizeName, "0");
 
@@ -11655,13 +11655,13 @@ int SetImages()
       }
 
       nxinfo << "Loop: Path of image cache files is '" << control -> ImageCachePath
-              << "'.\n" << std::flush;
+             << "'.\n" << std::flush;
     }
   }
   else
   {
     nxinfo << "Loop: Disabling the persistent image cache.\n"
-            << std::flush;
+           << std::flush;
 
     control -> ImageCacheEnableLoad = 0;
     control -> ImageCacheEnableSave = 0;
@@ -11702,8 +11702,8 @@ int SetVersion()
     patch = control -> CompatVersionPatch;
 
     nxinfo << "Loop: Using compatibility version '"
-            << major << "." << minor << "." << patch
-            << "'.\n" << std::flush;
+           << major << "." << minor << "." << patch
+           << "'.\n" << std::flush;
   }
   else if (control -> LocalVersionMajor >
                control -> RemoteVersionMajor)
@@ -11719,8 +11719,8 @@ int SetVersion()
     patch = control -> RemoteVersionPatch;
 
     nxinfo << "Loop: Using remote version '"
-            << major << "." << minor << "." << patch
-            << "'.\n" << std::flush;
+           << major << "." << minor << "." << patch
+           << "'.\n" << std::flush;
   }
   else
   {
@@ -11739,8 +11739,8 @@ int SetVersion()
       patch = control -> RemoteVersionPatch;
 
       nxinfo << "Loop: Using remote version '"
-              << major << "." << minor << "." << patch
-              << "'.\n" << std::flush;
+             << major << "." << minor << "." << patch
+             << "'.\n" << std::flush;
     }
     else
     {
@@ -11749,8 +11749,8 @@ int SetVersion()
       patch = control -> LocalVersionPatch;
 
       nxinfo << "Loop: Using local version '"
-              << major << "." << minor << "." << patch
-              << "'.\n" << std::flush;
+             << major << "." << minor << "." << patch
+             << "'.\n" << std::flush;
     }
   }
 
@@ -11776,8 +11776,8 @@ int SetVersion()
   if (step == 0)
   {
     nxfatal << "Loop: PANIC! Unable to set the protocol step value from "
-         << "the negotiated protocol version " << major << "." << minor
-         << "." << patch << ".\n" << std::flush;
+            << "the negotiated protocol version " << major << "." << minor
+            << "." << patch << ".\n" << std::flush;
 
     cerr << "Error" << ": Unable to set the protocol step value from "
          << "the negotiated protocol version " << major << "." << minor
@@ -11799,7 +11799,7 @@ int SetVersion()
   }
 
   nxinfo << "Loop: Using NX protocol step "
-          << step << ".\n" << std::flush;
+         << step << ".\n" << std::flush;
 
   control -> setProtoStep(step);
 
@@ -11816,10 +11816,10 @@ int SetVersion()
   if (local != remote)
   {
     nxwarn << "Loop: WARNING! Connected to remote version "
-            << control -> RemoteVersionMajor << "." << control -> RemoteVersionMinor
-            << "." << control -> RemoteVersionPatch << " with local version "
-            << control -> LocalVersionMajor << "." << control -> LocalVersionMinor
-            << "." << control -> LocalVersionPatch << ".\n" << std::flush;
+           << control -> RemoteVersionMajor << "." << control -> RemoteVersionMinor
+           << "." << control -> RemoteVersionPatch << " with local version "
+           << control -> LocalVersionMajor << "." << control -> LocalVersionMinor
+           << "." << control -> LocalVersionPatch << ".\n" << std::flush;
 
     cerr << "Warning" << ": Connected to remote version "
          << control -> RemoteVersionMajor << "." << control -> RemoteVersionMinor
@@ -11850,10 +11850,10 @@ int SetVersion()
     //
 
     nxinfo << __FILE__ << " : " << __LINE__ << " - "
-            << "step = " << control -> getProtoStep()
-            << " packMethod = " << packMethod
-            << " packQuality = " << packQuality
-            << ".\n"  << std::flush;
+           << "step = " << control -> getProtoStep()
+           << " packMethod = " << packMethod
+           << " packQuality = " << packQuality
+           << ".\n"  << std::flush;
 
     //
     // Update the pack method name.
@@ -11881,8 +11881,8 @@ int SetVersion()
 
   // Since ProtoStep8 (#issue 108)
   nxinfo << "Loop: Disabling image cache with protocol "
-          << "step '" << control -> getProtoStep()
-          << "'.\n"  << std::flush;
+         << "step '" << control -> getProtoStep()
+         << "'.\n"  << std::flush;
 
   sprintf(imagesSizeName, "0");
 
@@ -11901,7 +11901,7 @@ int SetVersion()
 int SetLink()
 {
   nxinfo << "Loop: Setting link with initial value "
-          << linkSpeedName << ".\n" << std::flush;
+         << linkSpeedName << ".\n" << std::flush;
 
   if (*linkSpeedName == '\0')
   {
@@ -11909,7 +11909,7 @@ int SetLink()
   }
   
   nxinfo << "Loop: Link speed is " << linkSpeedName
-          << ".\n" << std::flush;
+         << ".\n" << std::flush;
 
   if (strcasecmp(linkSpeedName, "modem") == 0)
   {
@@ -11989,8 +11989,8 @@ int SetLink()
     else
     {
       nxwarn << "Loop: WARNING! Forcing taint of replies "
-              << "with a proxy session.\n"
-              << std::flush;
+             << "with a proxy session.\n"
+             << std::flush;
 
       control -> TaintReplies = 1;
     }
@@ -12015,8 +12015,8 @@ int SetLink()
   if (control -> SessionMode == session_proxy)
   {
     nxwarn << "Loop: WARNING! Forcing flush on priority "
-            << "with a proxy session.\n"
-            << std::flush;
+           << "with a proxy session.\n"
+           << std::flush;
 
     control -> FlushPriority = 1;
   }
@@ -12031,7 +12031,7 @@ int SetLink()
 int SetLinkModem()
 {
   nxinfo << "Loop: Setting parameters for MODEM.\n"
-          << std::flush;
+         << std::flush;
 
   control -> LinkMode = LINK_TYPE_MODEM;
 
@@ -12059,7 +12059,7 @@ int SetLinkModem()
 int SetLinkIsdn()
 {
   nxinfo << "Loop: Setting parameters for ISDN.\n"
-          << std::flush;
+         << std::flush;
 
   control -> LinkMode = LINK_TYPE_ISDN;
 
@@ -12087,7 +12087,7 @@ int SetLinkIsdn()
 int SetLinkAdsl()
 {
   nxinfo << "Loop: Setting parameters for ADSL.\n"
-          << std::flush;
+         << std::flush;
 
   control -> LinkMode = LINK_TYPE_ADSL;
 
@@ -12115,7 +12115,7 @@ int SetLinkAdsl()
 int SetLinkWan()
 {
   nxinfo << "Loop: Setting parameters for WAN.\n"
-          << std::flush;
+         << std::flush;
 
   control -> LinkMode = LINK_TYPE_WAN;
 
@@ -12143,7 +12143,7 @@ int SetLinkWan()
 int SetLinkLan()
 {
   nxinfo << "Loop: Setting parameters for LAN.\n"
-          << std::flush;
+         << std::flush;
 
   control -> LinkMode = LINK_TYPE_LAN;
 
@@ -12401,9 +12401,9 @@ int SetLimits()
   if (useStrict == 1)
   {
     nxinfo << "Loop: LIMIT! Decreasing the token limit "
-            << "to " << control -> TokenLimit / 2
-            << " with option 'strict'.\n"
-            << std::flush;
+           << "to " << control -> TokenLimit / 2
+           << " with option 'strict'.\n"
+           << std::flush;
 
     control -> TokenLimit /= 2;
   }
@@ -12413,9 +12413,9 @@ int SetLimits()
   control -> TokenLimit = 1;
 
   nxinfo << "Loop: WARNING! LIMIT! Setting the token limit "
-          << "to " << control -> TokenLimit
-          << " to simulate the proxy congestion.\n"
-          << std::flush;
+         << "to " << control -> TokenLimit
+         << " to simulate the proxy congestion.\n"
+         << std::flush;
 
   #endif
 
@@ -12448,11 +12448,11 @@ int SetLimits()
   }
 
   nxinfo << "Loop: LIMIT! Setting client bitrate limit "
-          << "to " << control -> ClientBitrateLimit
-          << " server bitrate limit to " << control ->
-             ServerBitrateLimit << " with local limit "
-          << control -> LocalBitrateLimit << ".\n"
-          << std::flush;
+         << "to " << control -> ClientBitrateLimit
+         << " server bitrate limit to " << control ->
+            ServerBitrateLimit << " with local limit "
+         << control -> LocalBitrateLimit << ".\n"
+         << std::flush;
 
   return 1;
 }
@@ -12480,7 +12480,7 @@ int ParseCacheOption(const char *opt)
   }
 
   nxinfo << "Loop: Setting size of cache to "
-          << size << " bytes.\n" << std::flush;
+         << size << " bytes.\n" << std::flush;
 
   control -> ClientTotalStorageSize = size;
   control -> ServerTotalStorageSize = size;
@@ -12490,12 +12490,12 @@ int ParseCacheOption(const char *opt)
   if (size == 0)
   {
     nxwarn << "Loop: WARNING! Disabling NX delta compression.\n"
-            << std::flush;
+           << std::flush;
 
     control -> LocalDeltaCompression = 0;
 
     nxwarn << "Loop: WARNING! Disabling use of NX persistent cache.\n"
-            << std::flush;
+           << std::flush;
 
     control -> PersistentCacheEnableLoad = 0;
     control -> PersistentCacheEnableSave = 0;
@@ -12521,7 +12521,7 @@ int ParseImagesOption(const char *opt)
   }
 
   nxinfo << "Loop: Setting size of images cache to "
-          << size << " bytes.\n" << std::flush;
+         << size << " bytes.\n" << std::flush;
 
   control -> ImageCacheDiskLimit = size;
 
@@ -12550,8 +12550,8 @@ int ParseShmemOption(const char *opt)
   control -> ShmemServerSize = size;
 
   nxinfo << "Loop: Set shared memory size to "
-          << control -> ShmemServerSize << " bytes.\n"
-          << std::flush;
+         << control -> ShmemServerSize << " bytes.\n"
+         << std::flush;
 
   strcpy(shsegSizeName, opt);
 
@@ -12579,14 +12579,14 @@ int ParseBitrateOption(const char *opt)
   if (bitrate == 0)
   {
     nxinfo << "Loop: Disabling bitrate limit on proxy link.\n"
-            << std::flush;
+           << std::flush;
 
     control -> LocalBitrateLimit = 0;
   }
   else
   {
     nxinfo << "Loop: Setting bitrate to " << bitrate
-            << " bits per second.\n" << std::flush;
+           << " bits per second.\n" << std::flush;
 
     //
     // Internal representation is in bytes
@@ -12602,7 +12602,7 @@ int ParseBitrateOption(const char *opt)
 int ParseHostOption(const char *opt, char *host, long &port)
 {
   nxinfo << "Loop: Trying to parse options string '" << opt
-          << "' as a remote NX host.\n" << std::flush;
+         << "' as a remote NX host.\n" << std::flush;
 
   if (opt == NULL || *opt == '\0')
   {
@@ -12644,7 +12644,7 @@ int ParseHostOption(const char *opt, char *host, long &port)
     if (newPort < 0 || *check != '\0')
     {
       nxinfo << "Loop: Can't identify remote NX port in string '"
-              << separator << "'.\n" << std::flush;
+             << separator << "'.\n" << std::flush;
 
       return 0;
     }
@@ -12657,7 +12657,7 @@ int ParseHostOption(const char *opt, char *host, long &port)
     //
 
     nxinfo << "Loop: Can't identify remote NX port in string '"
-            << opt << "'.\n" << std::flush;
+           << opt << "'.\n" << std::flush;
 
     return 0;
   }
@@ -12683,7 +12683,7 @@ int ParseHostOption(const char *opt, char *host, long &port)
   if (*check != '\0')
   {
     nxinfo << "Loop: Can't identify remote NX host in string '"
-            << newHost << "'.\n" << std::flush;
+           << newHost << "'.\n" << std::flush;
 
     return 0;
   }
@@ -12707,8 +12707,8 @@ int ParseHostOption(const char *opt, char *host, long &port)
   if (*host != '\0' && strcmp(host, newHost) != 0)
   {
     nxwarn << "Loop: WARNING! Overriding remote NX host '"
-            << host << "' with new value '" << newHost
-            << "'.\n" << std::flush;
+           << host << "' with new value '" << newHost
+           << "'.\n" << std::flush;
   }
 
   strcpy(host, newHost);
@@ -12716,13 +12716,13 @@ int ParseHostOption(const char *opt, char *host, long &port)
   if (port != -1 && port != newPort)
   {
     nxwarn << "Loop: WARNING! Overriding remote NX port '"
-            << port << "' with new value '" << newPort
-            << "'.\n" << std::flush;
+           << port << "' with new value '" << newPort
+           << "'.\n" << std::flush;
   }
 
   nxinfo << "Loop: Parsed options string '" << opt
-          << "' with host '" << newHost << "' and port '"
-          << newPort << "'.\n" << std::flush;
+         << "' with host '" << newHost << "' and port '"
+         << newPort << "'.\n" << std::flush;
 
   port = newPort;
 
@@ -12741,7 +12741,7 @@ int ParseFontPath(char *path)
   }
 
   nxinfo << "Loop: Parsing font server option '" << path
-          << "'.\n" << std::flush;
+         << "'.\n" << std::flush;
 
   //
   // Convert the value to our default port.
@@ -12772,7 +12772,7 @@ int ParseFontPath(char *path)
   if (atoi(path) > 0)
   {
     nxinfo << "Loop: Assuming numeric TCP port '" << atoi(path)
-            << "' for font server.\n" << std::flush;
+           << "' for font server.\n" << std::flush;
 
     return 1;
   }
@@ -12791,7 +12791,7 @@ int ParseFontPath(char *path)
     *(path + DEFAULT_STRING_LENGTH - 1) = '\0';
 
     nxinfo << "Loop: Assuming Unix socket '" << path
-            << "' for font server.\n" << std::flush;
+           << "' for font server.\n" << std::flush;
   }
   else if (strncmp("tcp/:", path, 5) == 0)
   {
@@ -12805,7 +12805,7 @@ int ParseFontPath(char *path)
     }
 
     nxinfo << "Loop: Assuming TCP port '" << atoi(path)
-            << "' for font server.\n" << std::flush;
+           << "' for font server.\n" << std::flush;
   }
   else
   {
@@ -12820,7 +12820,7 @@ int ParseFontPath(char *path)
     }
 
     nxinfo << "Loop: Assuming Unix socket '" << path
-            << "' for font server.\n" << std::flush;
+           << "' for font server.\n" << std::flush;
   }
 
   return 1;
@@ -12828,8 +12828,8 @@ int ParseFontPath(char *path)
 ParseFontPathError:
 
   nxinfo << "Loop: Unable to determine the font server "
-          << "port in string '" << path << "'.\n"
-          << std::flush;
+         << "port in string '" << path << "'.\n"
+         << std::flush;
 
   return -1;
 }
@@ -12839,7 +12839,7 @@ int OpenLogFile(char *name, ostream *&stream)
   if (name == NULL || *name == '\0')
   {
     nxinfo << "Loop: WARNING! No name provided for output. Using standard error.\n"
-            << std::flush;
+           << std::flush;
 
     if (stream == NULL)
     {
@@ -12939,8 +12939,8 @@ int ReopenLogFile(char *name, ostream *&stream, int limit)
       if (stat(name, &fileStat) != 0)
       {
         nxwarn << "Loop: WARNING! Can't get stats of file '"
-                << name  << "'. Error is " << EGET() 
-                << " '" << ESTR() << "'.\n" << std::flush;
+               << name  << "'. Error is " << EGET()
+               << " '" << ESTR() << "'.\n" << std::flush;
 
         return 0;
       }
@@ -12951,8 +12951,8 @@ int ReopenLogFile(char *name, ostream *&stream, int limit)
     }
 
     nxinfo << "Loop: Deleting file '" << name
-            << "' with size " << fileStat.st_size
-            << ".\n" << std::flush;
+           << "' with size " << fileStat.st_size
+           << ".\n" << std::flush;
 
     //
     // Create a new stream over the previous
@@ -12979,7 +12979,7 @@ int ReopenLogFile(char *name, ostream *&stream, int limit)
     umask(fileMode);
 
     nxinfo << "Loop: Reopened file '" << name
-            << "'.\n" << std::flush;
+           << "'.\n" << std::flush;
   }
 
   return 1;
@@ -13284,9 +13284,9 @@ void PrintOptionIgnored(const char *type, const char *name, const char *value)
   if (control -> ProxyMode == proxy_server)
   {
     nxwarn << "Loop: WARNING! Ignoring " << type
-            << " option '" << name << "' with value '"
-            << value << "' at " << "NX client side.\n"
-            << std::flush;
+           << " option '" << name << "' with value '"
+           << value << "' at " << "NX client side.\n"
+           << std::flush;
 
     cerr << "Warning" << ": Ignoring " << type
          << " option '" << name << "' with value '"
@@ -13295,9 +13295,9 @@ void PrintOptionIgnored(const char *type, const char *name, const char *value)
   else
   {
     nxwarn << "Loop: WARNING! Ignoring " << type
-            << " option '" << name << "' with value '"
-            << value << "' at " << "NX server side.\n"
-            << std::flush;
+           << " option '" << name << "' with value '"
+           << value << "' at " << "NX server side.\n"
+           << std::flush;
 
     cerr << "Warning" << ": Ignoring " << type
          << " option '" << name << "' with value '"
@@ -13314,8 +13314,8 @@ const char *GetOptions(const char *options)
                 strncasecmp(options, "nx:", 3) != 0)
     {
       nxinfo << "Loop: PANIC! Display options string '" << options
-              << "' must start with 'nx' or 'nx/nx' prefix.\n"
-              << std::flush;
+             << "' must start with 'nx' or 'nx/nx' prefix.\n"
+             << std::flush;
 
       cerr << "Error" << ": Display options string '" << options
            << "' must start with 'nx' or 'nx/nx' prefix.\n";
@@ -13361,8 +13361,8 @@ const char *GetArg(int &argi, int argc, const char **argv)
 int CheckArg(const char *type, const char *name, const char *value)
 {
   nxinfo << "Loop: Parsing " << type << " option '" << name
-          << "' with value '" << (value ? value : "(null)")
-          << "'.\n" << std::flush;
+         << "' with value '" << (value ? value : "(null)")
+         << "'.\n" << std::flush;
 
   if (value == NULL || strstr(value, "=") != NULL)
   {
@@ -13474,7 +13474,7 @@ int ParseArg(const char *type, const char *name, const char *value)
   delete [] string;
 
   nxinfo << "Loop: Integer option parsed to '"
-          << (int) result << "'.\n" << std::flush;
+         << (int) result << "'.\n" << std::flush;
 
   return (int) result;
 }
@@ -13610,15 +13610,15 @@ static void handleCheckSessionInLoop()
   if (proxy -> getShutdown() > 0)
   {
     nxinfo << "Loop: End of NX transport requested "
-            << "by remote.\n" << std::flush;
+           << "by remote.\n" << std::flush;
 
     handleTerminatingInLoop();
 
     if (control -> ProxyMode == proxy_server)
     {
       nxinfo << "Loop: Bytes received so far are "
-              << (unsigned long long) statistics -> getBytesIn()
-              << ".\n" << std::flush;
+             << (unsigned long long) statistics -> getBytesIn()
+             << ".\n" << std::flush;
 
       if (statistics -> getBytesIn() < 1024)
       {
@@ -13632,15 +13632,15 @@ static void handleCheckSessionInLoop()
     }
 
     nxinfo << "Loop: Shutting down the NX transport.\n"
-            << std::flush;
+           << std::flush;
 
     HandleCleanup();
   }
   else if (proxy -> handlePing() < 0)
   {
     nxinfo << "Loop: Failure handling the ping for "
-            << "proxy FD#" << proxyFD << ".\n"
-            << std::flush;
+           << "proxy FD#" << proxyFD << ".\n"
+           << std::flush;
 
     HandleShutdown();
   }
@@ -13654,13 +13654,13 @@ static void handleCheckSessionInLoop()
   if (IsRunning(lastWatchdog) && CheckProcess(lastWatchdog, "watchdog") == 0)
   {
     nxwarn << "Loop: WARNING! Watchdog is gone unnoticed. "
-            << "Setting the last signal to SIGTERM.\n"
-            << std::flush;
+           << "Setting the last signal to SIGTERM.\n"
+           << std::flush;
 
     lastSignal = SIGTERM;
 
     nxwarn << "Loop: WARNING! Resetting pid of last "
-            << "watchdog process.\n" << std::flush;
+           << "watchdog process.\n" << std::flush;
 
     SetNotRunning(lastWatchdog);
   }
@@ -13679,11 +13679,11 @@ static void handleCheckSessionInLoop()
               channel_none && lastKill == 0 && lastDestroy == 1)
   {
     nxinfo << "Loop: End of NX transport requested "
-            << "by agent.\n" << std::flush;
+           << "by agent.\n" << std::flush;
 
     nxinfo << "Loop: Bytes sent so far are "
-            << (unsigned long long) statistics -> getBytesOut()
-            << ".\n" << std::flush;
+           << (unsigned long long) statistics -> getBytesOut()
+           << ".\n" << std::flush;
 
     if (statistics -> getBytesOut() < 1024)
     {
@@ -13749,8 +13749,8 @@ static void handleCheckSessionInLoop()
       if (signal != 0)
       {
         nxinfo << "Loop: End of NX transport requested by signal '"
-                << signal << "' '" << DumpSignal(signal)
-                << "'.\n" << std::flush;
+               << signal << "' '" << DumpSignal(signal)
+               << "'.\n" << std::flush;
 
         handleTerminatingInLoop();
       }
@@ -13780,7 +13780,7 @@ static void handleCheckSessionInLoop()
     else if (lastKill == 2)
     {
       nxinfo << "Loop: Shutting down the NX transport.\n"
-              << std::flush;
+             << std::flush;
 
       proxy -> handleShutdown();
 
@@ -13814,13 +13814,13 @@ static void handleCheckSessionInLoop()
         }
 
         nxinfo << "Loop: Starting watchdog process with timeout "
-                << "of " << timeout << " Ms.\n"
-                << std::flush;
+               << "of " << timeout << " Ms.\n"
+               << std::flush;
       }
       else
       {
         nxinfo << "Loop: Starting watchdog process without "
-                << "a timeout.\n" << std::flush;
+               << "a timeout.\n" << std::flush;
       }
 
       lastWatchdog = NXTransWatchdog(timeout);
@@ -13838,7 +13838,7 @@ static void handleCheckSessionInLoop()
       else
       {
         nxinfo << "Loop: Watchdog started with pid '"
-                << lastWatchdog << "'.\n" << std::flush;
+               << lastWatchdog << "'.\n" << std::flush;
       }
     }
     else
@@ -13857,7 +13857,7 @@ static void handleCheckSessionInLoop()
     if (control -> CleanupTimeout > 0)
     {
       nxinfo << "Loop: Waiting the cleanup timeout to complete.\n"
-              << std::flush;
+             << std::flush;
 
       cerr << "Info" << ": Waiting the cleanup timeout to complete.\n";
     }
@@ -13873,7 +13873,7 @@ static void handleCheckSessionInLoop()
            << "'.\n";
 
       nxinfo << "Loop: Waiting the watchdog process to complete.\n"
-              << std::flush;
+             << std::flush;
 
       cerr << "Info" << ": Waiting the watchdog process to complete.\n";
     }
@@ -13887,10 +13887,10 @@ static void handleCheckBitrateInLoop()
   static long int slept = 0;
 
   nxinfo << "Loop: Bitrate is " << statistics -> getBitrateInShortFrame()
-          << " B/s and " << statistics -> getBitrateInLongFrame()
-          << " B/s in " << control -> ShortBitrateTimeFrame / 1000
-          << "/" << control -> LongBitrateTimeFrame / 1000
-          << " seconds timeframes.\n" << std::flush;
+         << " B/s and " << statistics -> getBitrateInLongFrame()
+         << " B/s in " << control -> ShortBitrateTimeFrame / 1000
+         << "/" << control -> LongBitrateTimeFrame / 1000
+         << " seconds timeframes.\n" << std::flush;
 
   //
   // This can be improved. We may not jump out
@@ -13901,8 +13901,8 @@ static void handleCheckBitrateInLoop()
   if (control -> LocalBitrateLimit > 0)
   {
     nxinfo << "Loop: Calculating bandwidth usage with limit "
-            << control -> LocalBitrateLimit << ".\n"
-            << std::flush;
+           << control -> LocalBitrateLimit << ".\n"
+           << std::flush;
 
     int reference = (statistics -> getBitrateInLongFrame() +
                          statistics -> getBitrateInShortFrame()) / 2;
@@ -13922,8 +13922,8 @@ static void handleCheckBitrateInLoop()
       if (slept > 2000)
       {
         nxwarn << "Loop: WARNING! Sleeping due to "
-                << "reference bitrate of " << reference
-                << " B/s.\n" << std::flush;
+               << "reference bitrate of " << reference
+               << " B/s.\n" << std::flush;
 
         cerr << "Warning" << ": Sleeping due to "
              << "reference bitrate of " << reference
@@ -13971,8 +13971,8 @@ static void handleCheckStateInLoop(int &setFDs)
       if (fdLength > 0)
       {
         nxinfo << "Loop: WARNING! Buffer for descriptor FD#"
-                << j << " has " << fdLength << " bytes to write.\n"
-                << std::flush;
+               << j << " has " << fdLength << " bytes to write.\n"
+               << std::flush;
       }
     }
   }
@@ -14005,8 +14005,8 @@ static void handleCheckStateInLoop(int &setFDs)
     else
     {
       nxinfo << "Loop: WARNING! Buffer for proxy descriptor FD#"
-              << proxyFD << " has " << fdLength << " bytes "
-              << "to write.\n" << std::flush;
+             << proxyFD << " has " << fdLength << " bytes "
+             << "to write.\n" << std::flush;
     }
   }
 
@@ -14015,8 +14015,8 @@ static void handleCheckStateInLoop(int &setFDs)
   if (fdSplits > 0)
   {
     nxwarn << "Loop: WARNING! Proxy descriptor FD#" << proxyFD
-            << " has " << fdSplits << " splits to send.\n"
-            << std::flush;
+           << " has " << fdSplits << " splits to send.\n"
+           << std::flush;
   }
 }
 
@@ -14024,8 +14024,8 @@ static void handleCheckSelectInLoop(int &setFDs, fd_set &readSet,
                                         fd_set &writeSet, T_timestamp selectTs)
 {
   nxinfo << "Loop: Maximum descriptors is ["
-          << setFDs << "] at " << strMsTimestamp()
-          << ".\n" << std::flush;
+         << setFDs << "] at " << strMsTimestamp()
+         << ".\n" << std::flush;
 
   int i;
 
@@ -14079,9 +14079,9 @@ static void handleCheckSelectInLoop(int &setFDs, fd_set &readSet,
   }
 
   nxinfo << "Loop: Select timeout is "
-          << selectTs.tv_sec << " S and "
-          << (double) selectTs.tv_usec / 1000
-          << " Ms.\n" << std::flush;
+         << selectTs.tv_sec << " S and "
+         << (double) selectTs.tv_usec / 1000
+         << " Ms.\n" << std::flush;
 }
 
 static void handleCheckResultInLoop(int &resultFDs, int &errorFDs, int &setFDs, fd_set &readSet,
@@ -14095,16 +14095,16 @@ static void handleCheckResultInLoop(int &resultFDs, int &errorFDs, int &setFDs,
                      (control -> LatencyTimeout * 4)))
   {
     nxinfo << "Loop: Select result is [" << resultFDs
-            << "] at " << strMsTimestamp() << " with no "
-            << "communication within " << diffTs
-            << " Ms.\n" << std::flush;
+           << "] at " << strMsTimestamp() << " with no "
+           << "communication within " << diffTs
+           << " Ms.\n" << std::flush;
   }
   else
   {
     nxinfo << "Loop: Select result is [" << resultFDs
-            << "] error is [" << errorFDs << "] at "
-            << strMsTimestamp() << " after " << diffTs
-            << " Ms.\n" << std::flush;
+           << "] error is [" << errorFDs << "] at "
+           << strMsTimestamp() << " after " << diffTs
+           << " Ms.\n" << std::flush;
   }
 
 
@@ -14164,7 +14164,7 @@ static void handleCheckResultInLoop(int &resultFDs, int &errorFDs, int &setFDs,
 static void handleCheckSessionInConnect()
 {
   nxinfo << "Loop: Going to check session in connect.\n"
-          << std::flush;
+         << std::flush;
 
   if (control -> ProxyMode == proxy_client)
   {
@@ -14209,8 +14209,8 @@ static void handleStatisticsInLoop()
     if (mode == TOTAL_STATS || mode == PARTIAL_STATS)
     {
       nxinfo << "Loop: Going to request proxy statistics "
-              << "with signal '" << DumpSignal(lastSignal)
-              << "'.\n" << std::flush;
+             << "with signal '" << DumpSignal(lastSignal)
+             << "'.\n" << std::flush;
 
       if (proxy != NULL)
       {
@@ -14233,17 +14233,17 @@ static void handleNegotiationInLoop(int &setFDs, fd_set &readSet,
   while (yield == 0)
   {
     nxinfo << "Loop: Going to run a new negotiation loop "
-            << "with stage " << control -> ProxyStage
-            << " at " << strMsTimestamp() << ".\n"
-            << std::flush;
+           << "with stage " << control -> ProxyStage
+           << " at " << strMsTimestamp() << ".\n"
+           << std::flush;
 
     switch (control -> ProxyStage)
     {
       case stage_undefined:
       {
         nxinfo << "Loop: Handling negotiation with '"
-                << "stage_undefined" << "'.\n"
-                << std::flush;
+               << "stage_undefined" << "'.\n"
+               << std::flush;
 
         control -> ProxyStage = stage_initializing;
 
@@ -14252,8 +14252,8 @@ static void handleNegotiationInLoop(int &setFDs, fd_set &readSet,
       case stage_initializing:
       {
         nxinfo << "Loop: Handling negotiation with '"
-                << "stage_initializing" << "'.\n"
-                << std::flush;
+               << "stage_initializing" << "'.\n"
+               << std::flush;
 
         InitBeforeNegotiation();
 
@@ -14264,8 +14264,8 @@ static void handleNegotiationInLoop(int &setFDs, fd_set &readSet,
       case stage_connecting:
       {
         nxinfo << "Loop: Handling negotiation with '"
-                << "stage_connecting" << "'.\n"
-                << std::flush;
+               << "stage_connecting" << "'.\n"
+               << std::flush;
 
         SetupProxyConnection();
 
@@ -14276,8 +14276,8 @@ static void handleNegotiationInLoop(int &setFDs, fd_set &readSet,
       case stage_connected:
       {
         nxinfo << "Loop: Handling negotiation with '"
-                << "stage_connected" << "'.\n"
-                << std::flush;
+               << "stage_connected" << "'.\n"
+               << std::flush;
 
         //
         // Server side proxy must always be the one that
@@ -14319,8 +14319,8 @@ static void handleNegotiationInLoop(int &setFDs, fd_set &readSet,
       case stage_sending_proxy_options:
       {
         nxinfo << "Loop: Handling negotiation with '"
-                << "stage_sending_proxy_options" << "'.\n"
-                << std::flush;
+               << "stage_sending_proxy_options" << "'.\n"
+               << std::flush;
 
         if (SendProxyOptions(proxyFD) < 0)
         {
@@ -14341,8 +14341,8 @@ static void handleNegotiationInLoop(int &setFDs, fd_set &readSet,
       case stage_waiting_forwarder_version:
       {
         nxinfo << "Loop: Handling negotiation with '"
-                << "stage_waiting_forwarder_version" << "'.\n"
-                << std::flush;
+               << "stage_waiting_forwarder_version" << "'.\n"
+               << std::flush;
 
         int result = ReadForwarderVersion(proxyFD);
 
@@ -14364,8 +14364,8 @@ static void handleNegotiationInLoop(int &setFDs, fd_set &readSet,
       case stage_waiting_forwarder_options:
       {
         nxinfo << "Loop: Handling negotiation with '"
-                << "stage_waiting_forwarder_options" << "'.\n"
-                << std::flush;
+               << "stage_waiting_forwarder_options" << "'.\n"
+               << std::flush;
 
         int result = ReadForwarderOptions(proxyFD);
 
@@ -14387,8 +14387,8 @@ static void handleNegotiationInLoop(int &setFDs, fd_set &readSet,
       case stage_waiting_proxy_version:
       {
         nxinfo << "Loop: Handling negotiation with '"
-                << "stage_waiting_proxy_version" << "'.\n"
-                << std::flush;
+               << "stage_waiting_proxy_version" << "'.\n"
+               << std::flush;
 
         int result = ReadProxyVersion(proxyFD);
 
@@ -14410,8 +14410,8 @@ static void handleNegotiationInLoop(int &setFDs, fd_set &readSet,
       case stage_waiting_proxy_options:
       {
         nxinfo << "Loop: Handling negotiation with '"
-                << "stage_waiting_proxy_options" << "'.\n"
-                << std::flush;
+               << "stage_waiting_proxy_options" << "'.\n"
+               << std::flush;
 
         int result = ReadProxyOptions(proxyFD);
 
@@ -14440,8 +14440,8 @@ static void handleNegotiationInLoop(int &setFDs, fd_set &readSet,
       case stage_sending_proxy_caches:
       {
         nxinfo << "Loop: Handling negotiation with '"
-                << "stage_sending_proxy_caches" << "'.\n"
-                << std::flush;
+               << "stage_sending_proxy_caches" << "'.\n"
+               << std::flush;
 
         if (SendProxyCaches(proxyFD) < 0)
         {
@@ -14462,8 +14462,8 @@ static void handleNegotiationInLoop(int &setFDs, fd_set &readSet,
       case stage_waiting_proxy_caches:
       {
         nxinfo << "Loop: Handling negotiation with '"
-                << "stage_waiting_proxy_caches" << "'.\n"
-                << std::flush;
+               << "stage_waiting_proxy_caches" << "'.\n"
+               << std::flush;
 
         int result = ReadProxyCaches(proxyFD);
 
@@ -14492,8 +14492,8 @@ static void handleNegotiationInLoop(int &setFDs, fd_set &readSet,
       case stage_operational:
       {
         nxinfo << "Loop: Handling negotiation with '"
-                << "stage_operational" << "'.\n"
-                << std::flush;
+               << "stage_operational" << "'.\n"
+               << std::flush;
 
         InitAfterNegotiation();
 
@@ -14539,8 +14539,8 @@ static void handleNegotiationInLoop(int &setFDs, fd_set &readSet,
   setMinTimestamp(selectTs, control -> PingTimeout);
 
   nxinfo << "Loop: Selected proxy FD#" << proxyFD << " in negotiation "
-          << "phase with timeout of " << selectTs.tv_sec << " S and "
-          << selectTs.tv_usec << " Ms.\n" << std::flush;
+         << "phase with timeout of " << selectTs.tv_sec << " S and "
+         << selectTs.tv_usec << " Ms.\n" << std::flush;
 
   return;
 
@@ -14621,7 +14621,7 @@ static void handleAlertInLoop()
     if (proxy != NULL)
     {
       nxinfo << "Loop: Requesting a remote alert with code '"
-              << lastAlert.code << "'.\n" << std::flush;
+             << lastAlert.code << "'.\n" << std::flush;
 
       if (proxy -> handleAlert(lastAlert.code) < 0)
       {
@@ -14632,7 +14632,7 @@ static void handleAlertInLoop()
   else
   {
     nxinfo << "Loop: Handling a local alert with code '"
-            << lastAlert.code << "'.\n" << std::flush;
+           << lastAlert.code << "'.\n" << std::flush;
 
     if (control -> ProxyMode == proxy_client)
     {
@@ -14867,8 +14867,8 @@ static void handleAlertInLoop()
           if (lastAlert.code > LAST_PROTO_STEP_7_ALERT)
           {
             nxwarn << "Loop: WARNING! An unrecognized alert type '"
-                    << lastAlert.code << "' was requested.\n"
-                    << std::flush;
+                   << lastAlert.code << "' was requested.\n"
+                   << std::flush;
 
             cerr << "Warning" << ": An unrecognized alert type '"
                  << lastAlert.code << "' was requested.\n";
@@ -14876,7 +14876,7 @@ static void handleAlertInLoop()
           else
           {
             nxwarn << "Loop: WARNING! Ignoring obsolete alert type '"
-                    << lastAlert.code << "'.\n" << std::flush;
+                   << lastAlert.code << "'.\n" << std::flush;
           }
 
           message = NULL;
@@ -14891,7 +14891,7 @@ static void handleAlertInLoop()
       if (replace == 1 && IsRunning(lastDialog))
       {
         nxinfo << "Loop: Killing the previous dialog with pid '"
-                << lastDialog << "'.\n" << std::flush;
+               << lastDialog << "'.\n" << std::flush;
 
         //
         // The client ignores the TERM signal
@@ -14930,13 +14930,13 @@ static void handleAlertInLoop()
         else
         {
           nxinfo << "Loop: Dialog started with pid '"
-                  << lastDialog << "'.\n" << std::flush;
+                 << lastDialog << "'.\n" << std::flush;
         }
       }
       else
       {
         nxinfo << "Loop: No new dialog required for code '"
-                << lastAlert.code << "'.\n" << std::flush;
+               << lastAlert.code << "'.\n" << std::flush;
       }
     }
   }
@@ -14953,7 +14953,7 @@ static inline void handleSetAgentInLoop(int &setFDs, fd_set &readSet,
                                             fd_set &writeSet, struct timeval &selectTs)
 {
   nxinfo << "Loop: Preparing the masks for the agent descriptors.\n"
-          << std::flush;
+         << std::flush;
 
   agent -> saveChannelState();
 
@@ -14968,7 +14968,7 @@ static inline void handleSetAgentInLoop(int &setFDs, fd_set &readSet,
                     agent -> proxyCanRead())
     {
       nxinfo << "Loop: Setting a null timeout with agent descriptors ready.\n"
-              << std::flush;
+             << std::flush;
 
       //
       // Force a null timeout so we'll bail out
@@ -14982,7 +14982,7 @@ static inline void handleSetAgentInLoop(int &setFDs, fd_set &readSet,
   }
 
   nxinfo << "Loop: Clearing the read and write agent descriptors.\n"
-          << std::flush;
+         << std::flush;
 
   agent -> clearReadMask(&readSet);
   agent -> clearWriteMask(&writeSet);
@@ -14992,7 +14992,7 @@ static inline void handleAgentInLoop(int &resultFDs, int &errorFDs, int &setFDs,
                                          fd_set &writeSet, struct timeval &selectTs)
 {
   nxinfo << "Loop: Setting proxy and local agent descriptors.\n"
-          << std::flush;
+         << std::flush;
 
   //
   // Check if I/O is possible on the local
@@ -15009,14 +15009,14 @@ static inline void handleAgentInLoop(int &resultFDs, int &errorFDs, int &setFDs,
     agent -> saveChannelState();
 
     nxinfo << "Loop: Values were resultFDs " << resultFDs
-            << " errorFDs " << errorFDs << " setFDs "
-            << setFDs << ".\n" << std::flush;
+           << " errorFDs " << errorFDs << " setFDs "
+           << setFDs << ".\n" << std::flush;
 
     if (agent -> localCanRead() == 1)
     {
       nxinfo << "Loop: Setting agent descriptor FD#" << agent ->
-                 getLocalFd() << " as ready to read.\n"
-              << std::flush;
+                getLocalFd() << " as ready to read.\n"
+             << std::flush;
 
       agent -> setLocalRead(&readSet, &resultFDs);
     }
@@ -15026,21 +15026,21 @@ static inline void handleAgentInLoop(int &resultFDs, int &errorFDs, int &setFDs,
             agent -> proxyCanRead() == 1)
     {
       nxinfo << "Loop: WARNING! Can read from proxy FD#"
-              << proxyFD << " but the descriptor "
-              << "is not selected.\n" << std::flush;
+             << proxyFD << " but the descriptor "
+             << "is not selected.\n" << std::flush;
     }
 
     if (agent -> proxyCanRead(&readSet) == 1)
     {
       nxinfo << "Loop: Setting proxy descriptor FD#" << agent ->
-                 getProxyFd() << " as ready to read.\n"
-              << std::flush;
+                getProxyFd() << " as ready to read.\n"
+             << std::flush;
     }
 
 
     nxinfo << "Loop: Values are now resultFDs " << resultFDs
-            << " errorFDs " << errorFDs << " setFDs "
-            << setFDs << ".\n" << std::flush;
+           << " errorFDs " << errorFDs << " setFDs "
+           << setFDs << ".\n" << std::flush;
   }
 }
 
@@ -15048,7 +15048,7 @@ static inline void handleAgentLateInLoop(int &resultFDs, int &errorFDs, int &set
                                              fd_set &writeSet, struct timeval &selectTs)
 {
   nxinfo << "Loop: Setting remote agent descriptors.\n"
-          << std::flush;
+         << std::flush;
 
   //
   // We reset the masks before calling our select.
@@ -15070,15 +15070,15 @@ static inline void handleAgentLateInLoop(int &resultFDs, int &errorFDs, int &set
     agent -> saveChannelState();
 
     nxinfo << "Loop: Values were resultFDs " << resultFDs
-            << " errorFDs " << errorFDs << " setFDs "
-            << setFDs << ".\n" << std::flush;
+           << " errorFDs " << errorFDs << " setFDs "
+           << setFDs << ".\n" << std::flush;
 
     if (agent -> remoteCanRead(agent ->
             getSavedReadMask()) == 1)
     {
       nxinfo << "Loop: Setting agent descriptor FD#" << agent ->
-                 getRemoteFd() << " as ready to read.\n"
-              << std::flush;
+                getRemoteFd() << " as ready to read.\n"
+             << std::flush;
 
       agent -> setRemoteRead(&readSet, &resultFDs);
     }
@@ -15087,15 +15087,15 @@ static inline void handleAgentLateInLoop(int &resultFDs, int &errorFDs, int &set
             getSavedWriteMask()) == 1)
     {
       nxinfo << "Loop: Setting agent descriptor FD#" << agent ->
-                 getRemoteFd() << " as ready to write.\n"
-              << std::flush;
+                getRemoteFd() << " as ready to write.\n"
+             << std::flush;
 
       agent -> setRemoteWrite(&writeSet, &resultFDs);
     }
 
     nxinfo << "Loop: Values are now resultFDs " << resultFDs
-            << " errorFDs " << errorFDs << " setFDs "
-            << setFDs << ".\n" << std::flush;
+           << " errorFDs " << errorFDs << " setFDs "
+           << setFDs << ".\n" << std::flush;
   }
 }
 
@@ -15237,8 +15237,8 @@ static inline void handleReadableInLoop(int &resultFDs, fd_set &readSet)
           //
 
           nxinfo << "Loop: Trying to read immediately "
-                  << "from descriptor FD#" << newFD
-                  << ".\n" << std::flush;
+                 << "from descriptor FD#" << newFD
+                 << ".\n" << std::flush;
 
           FD_SET(newFD, &readSet);
 
@@ -15247,21 +15247,21 @@ static inline void handleReadableInLoop(int &resultFDs, fd_set &readSet)
         else
         {
           nxinfo << "Loop: Nothing to read immediately "
-                  << "from descriptor FD#" << newFD
-                  << ".\n" << std::flush;
+                 << "from descriptor FD#" << newFD
+                 << ".\n" << std::flush;
         }
       }
     }
   }
 
   nxdbg << "Loop: Going to check the readable descriptors.\n"
-          << std::flush;
+        << std::flush;
 
   if (proxy -> handleRead(resultFDs, readSet) < 0)
   {
     nxinfo << "Loop: Failure reading from descriptors "
-            << "for proxy FD#" << proxyFD << ".\n"
-            << std::flush;
+           << "for proxy FD#" << proxyFD << ".\n"
+           << std::flush;
 
     HandleShutdown();
   }
@@ -15270,13 +15270,13 @@ static inline void handleReadableInLoop(int &resultFDs, fd_set &readSet)
 static inline void handleWritableInLoop(int &resultFDs, fd_set &writeSet)
 {
   nxdbg << "Loop: Going to check the writable descriptors.\n"
-          << std::flush;
+        << std::flush;
 
   if (resultFDs > 0 && proxy -> handleFlush(resultFDs, writeSet) < 0)
   {
     nxinfo << "Loop: Failure writing to descriptors "
-            << "for proxy FD#" << proxyFD << ".\n"
-            << std::flush;
+           << "for proxy FD#" << proxyFD << ".\n"
+           << std::flush;
 
     HandleShutdown();
   }
@@ -15285,7 +15285,7 @@ static inline void handleWritableInLoop(int &resultFDs, fd_set &writeSet)
 static inline void handleFlushInLoop()
 {
   nxdbg << "Loop: Going to flush any data to the proxy.\n"
-          << std::flush;
+        << std::flush;
 
   if (agent == NULL || control ->
           FlushPolicy == policy_immediate)
@@ -15295,14 +15295,14 @@ static inline void handleFlushInLoop()
             ProxyMode == proxy_client)
     {
       nxinfo << "Loop: WARNING! Flushing the proxy link "
-              << "on behalf of the agent.\n" << std::flush;
+             << "on behalf of the agent.\n" << std::flush;
     }
 
 
     if (proxy -> handleFlush() < 0)
     {
       nxinfo << "Loop: Failure flushing the proxy FD#"
-              << proxyFD << ".\n" << std::flush;
+             << proxyFD << ".\n" << std::flush;
 
       HandleShutdown();
     }
@@ -15312,8 +15312,8 @@ static inline void handleFlushInLoop()
 static inline void handleRotateInLoop()
 {
   nxdbg << "Loop: Going to rotate channels "
-          << "for proxy FD#" << proxyFD << ".\n"
-          << std::flush;
+        << "for proxy FD#" << proxyFD << ".\n"
+        << std::flush;
 
   proxy -> handleRotate();
 }
@@ -15321,14 +15321,14 @@ static inline void handleRotateInLoop()
 static inline void handleEventsInLoop()
 {
   nxdbg << "Loop: Going to check channel events "
-          << "for proxy FD#" << proxyFD << ".\n"
-          << std::flush;
+        << "for proxy FD#" << proxyFD << ".\n"
+        << std::flush;
 
   if (proxy -> handleEvents() < 0)
   {
     nxinfo << "Loop: Failure handling channel events "
-            << "for proxy FD#" << proxyFD << ".\n"
-            << std::flush;
+           << "for proxy FD#" << proxyFD << ".\n"
+           << std::flush;
 
     HandleShutdown();
   }
@@ -15349,7 +15349,7 @@ static void handleLogReopenInLoop(T_timestamp &lTs, T_timestamp &nTs)
   #endif
   {
     nxdbg << "Loop: Checking size of log file '"
-            << errorsFileName << "'.\n" << std::flush;
+          << errorsFileName << "'.\n" << std::flush;
 
     #ifndef MIXED
 
@@ -15396,8 +15396,8 @@ static void handleSetListenersInLoop(fd_set &readSet, int &setFDs)
       }
 
       nxdbg << "Loop: Selected listener tcpFD " << tcpFD
-              << " with setFDs " << setFDs << ".\n"
-              << std::flush;
+            << " with setFDs " << setFDs << ".\n"
+            << std::flush;
     }
 
     if (useUnixSocket == 1)
@@ -15410,8 +15410,8 @@ static void handleSetListenersInLoop(fd_set &readSet, int &setFDs)
       }
 
       nxdbg << "Loop: Selected listener unixFD " << unixFD
-              << " with setFDs " << setFDs << ".\n"
-              << std::flush;
+            << " with setFDs " << setFDs << ".\n"
+            << std::flush;
     }
 
     if (useCupsSocket == 1)
@@ -15424,8 +15424,8 @@ static void handleSetListenersInLoop(fd_set &readSet, int &setFDs)
       }
 
       nxdbg << "Loop: Selected listener cupsFD " << cupsFD
-              << " with setFDs " << setFDs << ".\n"
-              << std::flush;
+            << " with setFDs " << setFDs << ".\n"
+            << std::flush;
     }
 
     if (useAuxSocket == 1)
@@ -15438,8 +15438,8 @@ static void handleSetListenersInLoop(fd_set &readSet, int &setFDs)
       }
 
       nxdbg << "Loop: Selected listener auxFD " << auxFD
-              << " with setFDs " << setFDs << ".\n"
-              << std::flush;
+            << " with setFDs " << setFDs << ".\n"
+            << std::flush;
     }
 
     if (useSmbSocket == 1)
@@ -15452,8 +15452,8 @@ static void handleSetListenersInLoop(fd_set &readSet, int &setFDs)
       }
 
       nxdbg << "Loop: Selected listener smbFD " << smbFD
-              << " with setFDs " << setFDs << ".\n"
-              << std::flush;
+            << " with setFDs " << setFDs << ".\n"
+            << std::flush;
     }
 
     if (useMediaSocket == 1)
@@ -15466,8 +15466,8 @@ static void handleSetListenersInLoop(fd_set &readSet, int &setFDs)
       }
 
       nxdbg << "Loop: Selected listener mediaFD " << mediaFD
-              << " with setFDs " << setFDs << ".\n"
-              << std::flush;
+            << " with setFDs " << setFDs << ".\n"
+            << std::flush;
     }
 
     if (useHttpSocket == 1)
@@ -15480,8 +15480,8 @@ static void handleSetListenersInLoop(fd_set &readSet, int &setFDs)
       }
 
       nxdbg << "Loop: Selected listener httpFD " << httpFD
-              << " with setFDs " << setFDs << ".\n"
-              << std::flush;
+            << " with setFDs " << setFDs << ".\n"
+            << std::flush;
     }
   }
   else
@@ -15496,8 +15496,8 @@ static void handleSetListenersInLoop(fd_set &readSet, int &setFDs)
       }
 
       nxdbg << "Loop: Selected listener fontFD " << fontFD
-              << " with setFDs " << setFDs << ".\n"
-              << std::flush;
+            << " with setFDs " << setFDs << ".\n"
+            << std::flush;
     }
   }
 
@@ -15511,7 +15511,7 @@ static void handleSetListenersInLoop(fd_set &readSet, int &setFDs)
     }
 
     nxdbg << "Loop: Selected listener slaveFD " << slaveFD
-            << " with setFDs " << setFDs << ".\n"
-            << std::flush;
+          << " with setFDs " << setFDs << ".\n"
+          << std::flush;
   }
 }
-- 
cgit v1.2.3


From 06a6c5829116d97fe9ab54801488d2945643fe0d Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Fri, 27 Oct 2017 11:55:45 +0200
Subject: Regression fix for f855b3b6. Caused FTBFS with Loop.cpp:2669:0:
 error: unterminated #ifdef (#ifdef TIME).

---
 nxcomp/src/Loop.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index e6c6805b2..72e46f773 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -2666,7 +2666,6 @@ int NXTransSelect(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
                       fd_set *writeSet, struct timeval *selectTs)
 {
   int diffTs;
-  #ifdef TIME
 
   static T_timestamp lastTs;
 
-- 
cgit v1.2.3


From 22bb128dc47b50dfd7b38d9a18188eb0b314ec4d Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Fri, 27 Oct 2017 14:13:26 +0200
Subject: nxcomp/m4/ax_pthread.m4: move to top-level m4/ directory, use
 symlink.

---
 m4/ax_pthread.m4        | 485 +++++++++++++++++++++++++++++++++++++++++++++++
 nxcomp/m4/ax_pthread.m4 | 486 +-----------------------------------------------
 2 files changed, 486 insertions(+), 485 deletions(-)
 create mode 100644 m4/ax_pthread.m4
 mode change 100644 => 120000 nxcomp/m4/ax_pthread.m4

(limited to 'nxcomp')

diff --git a/m4/ax_pthread.m4 b/m4/ax_pthread.m4
new file mode 100644
index 000000000..5fbf9fe0d
--- /dev/null
+++ b/m4/ax_pthread.m4
@@ -0,0 +1,485 @@
+# ===========================================================================
+#        https://www.gnu.org/software/autoconf-archive/ax_pthread.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+#
+# DESCRIPTION
+#
+#   This macro figures out how to build C programs using POSIX threads. It
+#   sets the PTHREAD_LIBS output variable to the threads library and linker
+#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
+#   flags that are needed. (The user can also force certain compiler
+#   flags/libs to be tested by setting these environment variables.)
+#
+#   Also sets PTHREAD_CC to any special C compiler that is needed for
+#   multi-threaded programs (defaults to the value of CC otherwise). (This
+#   is necessary on AIX to use the special cc_r compiler alias.)
+#
+#   NOTE: You are assumed to not only compile your program with these flags,
+#   but also to link with them as well. For example, you might link with
+#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
+#
+#   If you are only building threaded programs, you may wish to use these
+#   variables in your default LIBS, CFLAGS, and CC:
+#
+#     LIBS="$PTHREAD_LIBS $LIBS"
+#     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+#     CC="$PTHREAD_CC"
+#
+#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
+#   has a nonstandard name, this macro defines PTHREAD_CREATE_JOINABLE to
+#   that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
+#
+#   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
+#   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
+#   PTHREAD_CFLAGS.
+#
+#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
+#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
+#   is not found. If ACTION-IF-FOUND is not specified, the default action
+#   will define HAVE_PTHREAD.
+#
+#   Please let the authors know if this macro fails on any platform, or if
+#   you have any other suggestions or comments. This macro was based on work
+#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
+#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
+#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
+#   grateful for the helpful feedback of numerous users.
+#
+#   Updated for Autoconf 2.68 by Daniel Richard G.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
+#   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
+#
+#   This program is free software: you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <https://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 24
+
+AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
+AC_DEFUN([AX_PTHREAD], [
+AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([AC_PROG_CC])
+AC_REQUIRE([AC_PROG_SED])
+AC_LANG_PUSH([C])
+ax_pthread_ok=no
+
+# We used to check for pthread.h first, but this fails if pthread.h
+# requires special compiler flags (e.g. on Tru64 or Sequent).
+# It gets checked for in the link test anyway.
+
+# First of all, check if the user has set any of the PTHREAD_LIBS,
+# etcetera environment variables, and if threads linking works using
+# them:
+if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then
+        ax_pthread_save_CC="$CC"
+        ax_pthread_save_CFLAGS="$CFLAGS"
+        ax_pthread_save_LIBS="$LIBS"
+        AS_IF([test "x$PTHREAD_CC" != "x"], [CC="$PTHREAD_CC"])
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        AC_MSG_CHECKING([for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS])
+        AC_LINK_IFELSE([AC_LANG_CALL([], [pthread_join])], [ax_pthread_ok=yes])
+        AC_MSG_RESULT([$ax_pthread_ok])
+        if test "x$ax_pthread_ok" = "xno"; then
+                PTHREAD_LIBS=""
+                PTHREAD_CFLAGS=""
+        fi
+        CC="$ax_pthread_save_CC"
+        CFLAGS="$ax_pthread_save_CFLAGS"
+        LIBS="$ax_pthread_save_LIBS"
+fi
+
+# We must check for the threads library under a number of different
+# names; the ordering is very important because some systems
+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
+# libraries is broken (non-POSIX).
+
+# Create a list of thread flags to try.  Items starting with a "-" are
+# C compiler flags, and other items are library names, except for "none"
+# which indicates that we try without any flags at all, and "pthread-config"
+# which is a program returning the flags for the Pth emulation library.
+
+ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
+
+# The ordering *is* (sometimes) important.  Some notes on the
+# individual items follow:
+
+# pthreads: AIX (must check this before -lpthread)
+# none: in case threads are in libc; should be tried before -Kthread and
+#       other compiler flags to prevent continual compiler warnings
+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads), Tru64
+#           (Note: HP C rejects this with "bad form for `-t' option")
+# -pthreads: Solaris/gcc (Note: HP C also rejects)
+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
+#      doesn't hurt to check since this sometimes defines pthreads and
+#      -D_REENTRANT too), HP C (must be checked before -lpthread, which
+#      is present but should not be used directly; and before -mthreads,
+#      because the compiler interprets this as "-mt" + "-hreads")
+# -mthreads: Mingw32/gcc, Lynx/gcc
+# pthread: Linux, etcetera
+# --thread-safe: KAI C++
+# pthread-config: use pthread-config program (for GNU Pth library)
+
+case $host_os in
+
+        freebsd*)
+
+        # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+        # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+
+        ax_pthread_flags="-kthread lthread $ax_pthread_flags"
+        ;;
+
+        hpux*)
+
+        # From the cc(1) man page: "[-mt] Sets various -D flags to enable
+        # multi-threading and also sets -lpthread."
+
+        ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags"
+        ;;
+
+        openedition*)
+
+        # IBM z/OS requires a feature-test macro to be defined in order to
+        # enable POSIX threads at all, so give the user a hint if this is
+        # not set. (We don't define these ourselves, as they can affect
+        # other portions of the system API in unpredictable ways.)
+
+        AC_EGREP_CPP([AX_PTHREAD_ZOS_MISSING],
+            [
+#            if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS)
+             AX_PTHREAD_ZOS_MISSING
+#            endif
+            ],
+            [AC_MSG_WARN([IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support.])])
+        ;;
+
+        solaris*)
+
+        # On Solaris (at least, for some versions), libc contains stubbed
+        # (non-functional) versions of the pthreads routines, so link-based
+        # tests will erroneously succeed. (N.B.: The stubs are missing
+        # pthread_cleanup_push, or rather a function called by this macro,
+        # so we could check for that, but who knows whether they'll stub
+        # that too in a future libc.)  So we'll check first for the
+        # standard Solaris way of linking pthreads (-mt -lpthread).
+
+        ax_pthread_flags="-mt,pthread pthread $ax_pthread_flags"
+        ;;
+esac
+
+# GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC)
+
+AS_IF([test "x$GCC" = "xyes"],
+      [ax_pthread_flags="-pthread -pthreads $ax_pthread_flags"])
+
+# The presence of a feature test macro requesting re-entrant function
+# definitions is, on some systems, a strong hint that pthreads support is
+# correctly enabled
+
+case $host_os in
+        darwin* | hpux* | linux* | osf* | solaris*)
+        ax_pthread_check_macro="_REENTRANT"
+        ;;
+
+        aix*)
+        ax_pthread_check_macro="_THREAD_SAFE"
+        ;;
+
+        *)
+        ax_pthread_check_macro="--"
+        ;;
+esac
+AS_IF([test "x$ax_pthread_check_macro" = "x--"],
+      [ax_pthread_check_cond=0],
+      [ax_pthread_check_cond="!defined($ax_pthread_check_macro)"])
+
+# Are we compiling with Clang?
+
+AC_CACHE_CHECK([whether $CC is Clang],
+    [ax_cv_PTHREAD_CLANG],
+    [ax_cv_PTHREAD_CLANG=no
+     # Note that Autoconf sets GCC=yes for Clang as well as GCC
+     if test "x$GCC" = "xyes"; then
+        AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG],
+            [/* Note: Clang 2.7 lacks __clang_[a-z]+__ */
+#            if defined(__clang__) && defined(__llvm__)
+             AX_PTHREAD_CC_IS_CLANG
+#            endif
+            ],
+            [ax_cv_PTHREAD_CLANG=yes])
+     fi
+    ])
+ax_pthread_clang="$ax_cv_PTHREAD_CLANG"
+
+ax_pthread_clang_warning=no
+
+# Clang needs special handling, because older versions handle the -pthread
+# option in a rather... idiosyncratic way
+
+if test "x$ax_pthread_clang" = "xyes"; then
+
+        # Clang takes -pthread; it has never supported any other flag
+
+        # (Note 1: This will need to be revisited if a system that Clang
+        # supports has POSIX threads in a separate library.  This tends not
+        # to be the way of modern systems, but it's conceivable.)
+
+        # (Note 2: On some systems, notably Darwin, -pthread is not needed
+        # to get POSIX threads support; the API is always present and
+        # active.  We could reasonably leave PTHREAD_CFLAGS empty.  But
+        # -pthread does define _REENTRANT, and while the Darwin headers
+        # ignore this macro, third-party headers might not.)
+
+        PTHREAD_CFLAGS="-pthread"
+        PTHREAD_LIBS=
+
+        ax_pthread_ok=yes
+
+        # However, older versions of Clang make a point of warning the user
+        # that, in an invocation where only linking and no compilation is
+        # taking place, the -pthread option has no effect ("argument unused
+        # during compilation").  They expect -pthread to be passed in only
+        # when source code is being compiled.
+        #
+        # Problem is, this is at odds with the way Automake and most other
+        # C build frameworks function, which is that the same flags used in
+        # compilation (CFLAGS) are also used in linking.  Many systems
+        # supported by AX_PTHREAD require exactly this for POSIX threads
+        # support, and in fact it is often not straightforward to specify a
+        # flag that is used only in the compilation phase and not in
+        # linking.  Such a scenario is extremely rare in practice.
+        #
+        # Even though use of the -pthread flag in linking would only print
+        # a warning, this can be a nuisance for well-run software projects
+        # that build with -Werror.  So if the active version of Clang has
+        # this misfeature, we search for an option to squash it.
+
+        AC_CACHE_CHECK([whether Clang needs flag to prevent "argument unused" warning when linking with -pthread],
+            [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG],
+            [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown
+             # Create an alternate version of $ac_link that compiles and
+             # links in two steps (.c -> .o, .o -> exe) instead of one
+             # (.c -> exe), because the warning occurs only in the second
+             # step
+             ax_pthread_save_ac_link="$ac_link"
+             ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g'
+             ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"`
+             ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)"
+             ax_pthread_save_CFLAGS="$CFLAGS"
+             for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do
+                AS_IF([test "x$ax_pthread_try" = "xunknown"], [break])
+                CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS"
+                ac_link="$ax_pthread_save_ac_link"
+                AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
+                    [ac_link="$ax_pthread_2step_ac_link"
+                     AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
+                         [break])
+                    ])
+             done
+             ac_link="$ax_pthread_save_ac_link"
+             CFLAGS="$ax_pthread_save_CFLAGS"
+             AS_IF([test "x$ax_pthread_try" = "x"], [ax_pthread_try=no])
+             ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try"
+            ])
+
+        case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in
+                no | unknown) ;;
+                *) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;;
+        esac
+
+fi # $ax_pthread_clang = yes
+
+if test "x$ax_pthread_ok" = "xno"; then
+for ax_pthread_try_flag in $ax_pthread_flags; do
+
+        case $ax_pthread_try_flag in
+                none)
+                AC_MSG_CHECKING([whether pthreads work without any flags])
+                ;;
+
+                -mt,pthread)
+                AC_MSG_CHECKING([whether pthreads work with -mt -lpthread])
+                PTHREAD_CFLAGS="-mt"
+                PTHREAD_LIBS="-lpthread"
+                ;;
+
+                -*)
+                AC_MSG_CHECKING([whether pthreads work with $ax_pthread_try_flag])
+                PTHREAD_CFLAGS="$ax_pthread_try_flag"
+                ;;
+
+                pthread-config)
+                AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
+                AS_IF([test "x$ax_pthread_config" = "xno"], [continue])
+                PTHREAD_CFLAGS="`pthread-config --cflags`"
+                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
+                ;;
+
+                *)
+                AC_MSG_CHECKING([for the pthreads library -l$ax_pthread_try_flag])
+                PTHREAD_LIBS="-l$ax_pthread_try_flag"
+                ;;
+        esac
+
+        ax_pthread_save_CFLAGS="$CFLAGS"
+        ax_pthread_save_LIBS="$LIBS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+
+        # Check for various functions.  We must include pthread.h,
+        # since some functions may be macros.  (On the Sequent, we
+        # need a special flag -Kthread to make this header compile.)
+        # We check for pthread_join because it is in -lpthread on IRIX
+        # while pthread_create is in libc.  We check for pthread_attr_init
+        # due to DEC craziness with -lpthreads.  We check for
+        # pthread_cleanup_push because it is one of the few pthread
+        # functions on Solaris that doesn't have a non-functional libc stub.
+        # We try pthread_create on general principles.
+
+        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
+#                       if $ax_pthread_check_cond
+#                        error "$ax_pthread_check_macro must be defined"
+#                       endif
+                        static void routine(void *a) { a = 0; }
+                        static void *start_routine(void *a) { return a; }],
+                       [pthread_t th; pthread_attr_t attr;
+                        pthread_create(&th, 0, start_routine, 0);
+                        pthread_join(th, 0);
+                        pthread_attr_init(&attr);
+                        pthread_cleanup_push(routine, 0);
+                        pthread_cleanup_pop(0) /* ; */])],
+            [ax_pthread_ok=yes],
+            [])
+
+        CFLAGS="$ax_pthread_save_CFLAGS"
+        LIBS="$ax_pthread_save_LIBS"
+
+        AC_MSG_RESULT([$ax_pthread_ok])
+        AS_IF([test "x$ax_pthread_ok" = "xyes"], [break])
+
+        PTHREAD_LIBS=""
+        PTHREAD_CFLAGS=""
+done
+fi
+
+# Various other checks:
+if test "x$ax_pthread_ok" = "xyes"; then
+        ax_pthread_save_CFLAGS="$CFLAGS"
+        ax_pthread_save_LIBS="$LIBS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+
+        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
+        AC_CACHE_CHECK([for joinable pthread attribute],
+            [ax_cv_PTHREAD_JOINABLE_ATTR],
+            [ax_cv_PTHREAD_JOINABLE_ATTR=unknown
+             for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
+                 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
+                                                 [int attr = $ax_pthread_attr; return attr /* ; */])],
+                                [ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break],
+                                [])
+             done
+            ])
+        AS_IF([test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \
+               test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \
+               test "x$ax_pthread_joinable_attr_defined" != "xyes"],
+              [AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE],
+                                  [$ax_cv_PTHREAD_JOINABLE_ATTR],
+                                  [Define to necessary symbol if this constant
+                                   uses a non-standard name on your system.])
+               ax_pthread_joinable_attr_defined=yes
+              ])
+
+        AC_CACHE_CHECK([whether more special flags are required for pthreads],
+            [ax_cv_PTHREAD_SPECIAL_FLAGS],
+            [ax_cv_PTHREAD_SPECIAL_FLAGS=no
+             case $host_os in
+             solaris*)
+             ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS"
+             ;;
+             esac
+            ])
+        AS_IF([test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \
+               test "x$ax_pthread_special_flags_added" != "xyes"],
+              [PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS"
+               ax_pthread_special_flags_added=yes])
+
+        AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
+            [ax_cv_PTHREAD_PRIO_INHERIT],
+            [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
+                                             [[int i = PTHREAD_PRIO_INHERIT;]])],
+                            [ax_cv_PTHREAD_PRIO_INHERIT=yes],
+                            [ax_cv_PTHREAD_PRIO_INHERIT=no])
+            ])
+        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \
+               test "x$ax_pthread_prio_inherit_defined" != "xyes"],
+              [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])
+               ax_pthread_prio_inherit_defined=yes
+              ])
+
+        CFLAGS="$ax_pthread_save_CFLAGS"
+        LIBS="$ax_pthread_save_LIBS"
+
+        # More AIX lossage: compile with *_r variant
+        if test "x$GCC" != "xyes"; then
+            case $host_os in
+                aix*)
+                AS_CASE(["x/$CC"],
+                    [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
+                    [#handle absolute path differently from PATH based program lookup
+                     AS_CASE(["x$CC"],
+                         [x/*],
+                         [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
+                         [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
+                ;;
+            esac
+        fi
+fi
+
+test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
+
+AC_SUBST([PTHREAD_LIBS])
+AC_SUBST([PTHREAD_CFLAGS])
+AC_SUBST([PTHREAD_CC])
+
+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+if test "x$ax_pthread_ok" = "xyes"; then
+        ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
+        :
+else
+        ax_pthread_ok=no
+        $2
+fi
+AC_LANG_POP
+])dnl AX_PTHREAD
diff --git a/nxcomp/m4/ax_pthread.m4 b/nxcomp/m4/ax_pthread.m4
deleted file mode 100644
index 5fbf9fe0d..000000000
--- a/nxcomp/m4/ax_pthread.m4
+++ /dev/null
@@ -1,485 +0,0 @@
-# ===========================================================================
-#        https://www.gnu.org/software/autoconf-archive/ax_pthread.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-#
-# DESCRIPTION
-#
-#   This macro figures out how to build C programs using POSIX threads. It
-#   sets the PTHREAD_LIBS output variable to the threads library and linker
-#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
-#   flags that are needed. (The user can also force certain compiler
-#   flags/libs to be tested by setting these environment variables.)
-#
-#   Also sets PTHREAD_CC to any special C compiler that is needed for
-#   multi-threaded programs (defaults to the value of CC otherwise). (This
-#   is necessary on AIX to use the special cc_r compiler alias.)
-#
-#   NOTE: You are assumed to not only compile your program with these flags,
-#   but also to link with them as well. For example, you might link with
-#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
-#
-#   If you are only building threaded programs, you may wish to use these
-#   variables in your default LIBS, CFLAGS, and CC:
-#
-#     LIBS="$PTHREAD_LIBS $LIBS"
-#     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-#     CC="$PTHREAD_CC"
-#
-#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
-#   has a nonstandard name, this macro defines PTHREAD_CREATE_JOINABLE to
-#   that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
-#
-#   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
-#   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
-#   PTHREAD_CFLAGS.
-#
-#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
-#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
-#   is not found. If ACTION-IF-FOUND is not specified, the default action
-#   will define HAVE_PTHREAD.
-#
-#   Please let the authors know if this macro fails on any platform, or if
-#   you have any other suggestions or comments. This macro was based on work
-#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
-#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
-#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
-#   grateful for the helpful feedback of numerous users.
-#
-#   Updated for Autoconf 2.68 by Daniel Richard G.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
-#   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <https://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 24
-
-AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
-AC_DEFUN([AX_PTHREAD], [
-AC_REQUIRE([AC_CANONICAL_HOST])
-AC_REQUIRE([AC_PROG_CC])
-AC_REQUIRE([AC_PROG_SED])
-AC_LANG_PUSH([C])
-ax_pthread_ok=no
-
-# We used to check for pthread.h first, but this fails if pthread.h
-# requires special compiler flags (e.g. on Tru64 or Sequent).
-# It gets checked for in the link test anyway.
-
-# First of all, check if the user has set any of the PTHREAD_LIBS,
-# etcetera environment variables, and if threads linking works using
-# them:
-if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then
-        ax_pthread_save_CC="$CC"
-        ax_pthread_save_CFLAGS="$CFLAGS"
-        ax_pthread_save_LIBS="$LIBS"
-        AS_IF([test "x$PTHREAD_CC" != "x"], [CC="$PTHREAD_CC"])
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        AC_MSG_CHECKING([for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS])
-        AC_LINK_IFELSE([AC_LANG_CALL([], [pthread_join])], [ax_pthread_ok=yes])
-        AC_MSG_RESULT([$ax_pthread_ok])
-        if test "x$ax_pthread_ok" = "xno"; then
-                PTHREAD_LIBS=""
-                PTHREAD_CFLAGS=""
-        fi
-        CC="$ax_pthread_save_CC"
-        CFLAGS="$ax_pthread_save_CFLAGS"
-        LIBS="$ax_pthread_save_LIBS"
-fi
-
-# We must check for the threads library under a number of different
-# names; the ordering is very important because some systems
-# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
-# libraries is broken (non-POSIX).
-
-# Create a list of thread flags to try.  Items starting with a "-" are
-# C compiler flags, and other items are library names, except for "none"
-# which indicates that we try without any flags at all, and "pthread-config"
-# which is a program returning the flags for the Pth emulation library.
-
-ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
-
-# The ordering *is* (sometimes) important.  Some notes on the
-# individual items follow:
-
-# pthreads: AIX (must check this before -lpthread)
-# none: in case threads are in libc; should be tried before -Kthread and
-#       other compiler flags to prevent continual compiler warnings
-# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
-# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads), Tru64
-#           (Note: HP C rejects this with "bad form for `-t' option")
-# -pthreads: Solaris/gcc (Note: HP C also rejects)
-# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
-#      doesn't hurt to check since this sometimes defines pthreads and
-#      -D_REENTRANT too), HP C (must be checked before -lpthread, which
-#      is present but should not be used directly; and before -mthreads,
-#      because the compiler interprets this as "-mt" + "-hreads")
-# -mthreads: Mingw32/gcc, Lynx/gcc
-# pthread: Linux, etcetera
-# --thread-safe: KAI C++
-# pthread-config: use pthread-config program (for GNU Pth library)
-
-case $host_os in
-
-        freebsd*)
-
-        # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
-        # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
-
-        ax_pthread_flags="-kthread lthread $ax_pthread_flags"
-        ;;
-
-        hpux*)
-
-        # From the cc(1) man page: "[-mt] Sets various -D flags to enable
-        # multi-threading and also sets -lpthread."
-
-        ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags"
-        ;;
-
-        openedition*)
-
-        # IBM z/OS requires a feature-test macro to be defined in order to
-        # enable POSIX threads at all, so give the user a hint if this is
-        # not set. (We don't define these ourselves, as they can affect
-        # other portions of the system API in unpredictable ways.)
-
-        AC_EGREP_CPP([AX_PTHREAD_ZOS_MISSING],
-            [
-#            if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS)
-             AX_PTHREAD_ZOS_MISSING
-#            endif
-            ],
-            [AC_MSG_WARN([IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support.])])
-        ;;
-
-        solaris*)
-
-        # On Solaris (at least, for some versions), libc contains stubbed
-        # (non-functional) versions of the pthreads routines, so link-based
-        # tests will erroneously succeed. (N.B.: The stubs are missing
-        # pthread_cleanup_push, or rather a function called by this macro,
-        # so we could check for that, but who knows whether they'll stub
-        # that too in a future libc.)  So we'll check first for the
-        # standard Solaris way of linking pthreads (-mt -lpthread).
-
-        ax_pthread_flags="-mt,pthread pthread $ax_pthread_flags"
-        ;;
-esac
-
-# GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC)
-
-AS_IF([test "x$GCC" = "xyes"],
-      [ax_pthread_flags="-pthread -pthreads $ax_pthread_flags"])
-
-# The presence of a feature test macro requesting re-entrant function
-# definitions is, on some systems, a strong hint that pthreads support is
-# correctly enabled
-
-case $host_os in
-        darwin* | hpux* | linux* | osf* | solaris*)
-        ax_pthread_check_macro="_REENTRANT"
-        ;;
-
-        aix*)
-        ax_pthread_check_macro="_THREAD_SAFE"
-        ;;
-
-        *)
-        ax_pthread_check_macro="--"
-        ;;
-esac
-AS_IF([test "x$ax_pthread_check_macro" = "x--"],
-      [ax_pthread_check_cond=0],
-      [ax_pthread_check_cond="!defined($ax_pthread_check_macro)"])
-
-# Are we compiling with Clang?
-
-AC_CACHE_CHECK([whether $CC is Clang],
-    [ax_cv_PTHREAD_CLANG],
-    [ax_cv_PTHREAD_CLANG=no
-     # Note that Autoconf sets GCC=yes for Clang as well as GCC
-     if test "x$GCC" = "xyes"; then
-        AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG],
-            [/* Note: Clang 2.7 lacks __clang_[a-z]+__ */
-#            if defined(__clang__) && defined(__llvm__)
-             AX_PTHREAD_CC_IS_CLANG
-#            endif
-            ],
-            [ax_cv_PTHREAD_CLANG=yes])
-     fi
-    ])
-ax_pthread_clang="$ax_cv_PTHREAD_CLANG"
-
-ax_pthread_clang_warning=no
-
-# Clang needs special handling, because older versions handle the -pthread
-# option in a rather... idiosyncratic way
-
-if test "x$ax_pthread_clang" = "xyes"; then
-
-        # Clang takes -pthread; it has never supported any other flag
-
-        # (Note 1: This will need to be revisited if a system that Clang
-        # supports has POSIX threads in a separate library.  This tends not
-        # to be the way of modern systems, but it's conceivable.)
-
-        # (Note 2: On some systems, notably Darwin, -pthread is not needed
-        # to get POSIX threads support; the API is always present and
-        # active.  We could reasonably leave PTHREAD_CFLAGS empty.  But
-        # -pthread does define _REENTRANT, and while the Darwin headers
-        # ignore this macro, third-party headers might not.)
-
-        PTHREAD_CFLAGS="-pthread"
-        PTHREAD_LIBS=
-
-        ax_pthread_ok=yes
-
-        # However, older versions of Clang make a point of warning the user
-        # that, in an invocation where only linking and no compilation is
-        # taking place, the -pthread option has no effect ("argument unused
-        # during compilation").  They expect -pthread to be passed in only
-        # when source code is being compiled.
-        #
-        # Problem is, this is at odds with the way Automake and most other
-        # C build frameworks function, which is that the same flags used in
-        # compilation (CFLAGS) are also used in linking.  Many systems
-        # supported by AX_PTHREAD require exactly this for POSIX threads
-        # support, and in fact it is often not straightforward to specify a
-        # flag that is used only in the compilation phase and not in
-        # linking.  Such a scenario is extremely rare in practice.
-        #
-        # Even though use of the -pthread flag in linking would only print
-        # a warning, this can be a nuisance for well-run software projects
-        # that build with -Werror.  So if the active version of Clang has
-        # this misfeature, we search for an option to squash it.
-
-        AC_CACHE_CHECK([whether Clang needs flag to prevent "argument unused" warning when linking with -pthread],
-            [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG],
-            [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown
-             # Create an alternate version of $ac_link that compiles and
-             # links in two steps (.c -> .o, .o -> exe) instead of one
-             # (.c -> exe), because the warning occurs only in the second
-             # step
-             ax_pthread_save_ac_link="$ac_link"
-             ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g'
-             ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"`
-             ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)"
-             ax_pthread_save_CFLAGS="$CFLAGS"
-             for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do
-                AS_IF([test "x$ax_pthread_try" = "xunknown"], [break])
-                CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS"
-                ac_link="$ax_pthread_save_ac_link"
-                AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
-                    [ac_link="$ax_pthread_2step_ac_link"
-                     AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
-                         [break])
-                    ])
-             done
-             ac_link="$ax_pthread_save_ac_link"
-             CFLAGS="$ax_pthread_save_CFLAGS"
-             AS_IF([test "x$ax_pthread_try" = "x"], [ax_pthread_try=no])
-             ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try"
-            ])
-
-        case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in
-                no | unknown) ;;
-                *) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;;
-        esac
-
-fi # $ax_pthread_clang = yes
-
-if test "x$ax_pthread_ok" = "xno"; then
-for ax_pthread_try_flag in $ax_pthread_flags; do
-
-        case $ax_pthread_try_flag in
-                none)
-                AC_MSG_CHECKING([whether pthreads work without any flags])
-                ;;
-
-                -mt,pthread)
-                AC_MSG_CHECKING([whether pthreads work with -mt -lpthread])
-                PTHREAD_CFLAGS="-mt"
-                PTHREAD_LIBS="-lpthread"
-                ;;
-
-                -*)
-                AC_MSG_CHECKING([whether pthreads work with $ax_pthread_try_flag])
-                PTHREAD_CFLAGS="$ax_pthread_try_flag"
-                ;;
-
-                pthread-config)
-                AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
-                AS_IF([test "x$ax_pthread_config" = "xno"], [continue])
-                PTHREAD_CFLAGS="`pthread-config --cflags`"
-                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
-                ;;
-
-                *)
-                AC_MSG_CHECKING([for the pthreads library -l$ax_pthread_try_flag])
-                PTHREAD_LIBS="-l$ax_pthread_try_flag"
-                ;;
-        esac
-
-        ax_pthread_save_CFLAGS="$CFLAGS"
-        ax_pthread_save_LIBS="$LIBS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-
-        # Check for various functions.  We must include pthread.h,
-        # since some functions may be macros.  (On the Sequent, we
-        # need a special flag -Kthread to make this header compile.)
-        # We check for pthread_join because it is in -lpthread on IRIX
-        # while pthread_create is in libc.  We check for pthread_attr_init
-        # due to DEC craziness with -lpthreads.  We check for
-        # pthread_cleanup_push because it is one of the few pthread
-        # functions on Solaris that doesn't have a non-functional libc stub.
-        # We try pthread_create on general principles.
-
-        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
-#                       if $ax_pthread_check_cond
-#                        error "$ax_pthread_check_macro must be defined"
-#                       endif
-                        static void routine(void *a) { a = 0; }
-                        static void *start_routine(void *a) { return a; }],
-                       [pthread_t th; pthread_attr_t attr;
-                        pthread_create(&th, 0, start_routine, 0);
-                        pthread_join(th, 0);
-                        pthread_attr_init(&attr);
-                        pthread_cleanup_push(routine, 0);
-                        pthread_cleanup_pop(0) /* ; */])],
-            [ax_pthread_ok=yes],
-            [])
-
-        CFLAGS="$ax_pthread_save_CFLAGS"
-        LIBS="$ax_pthread_save_LIBS"
-
-        AC_MSG_RESULT([$ax_pthread_ok])
-        AS_IF([test "x$ax_pthread_ok" = "xyes"], [break])
-
-        PTHREAD_LIBS=""
-        PTHREAD_CFLAGS=""
-done
-fi
-
-# Various other checks:
-if test "x$ax_pthread_ok" = "xyes"; then
-        ax_pthread_save_CFLAGS="$CFLAGS"
-        ax_pthread_save_LIBS="$LIBS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-
-        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
-        AC_CACHE_CHECK([for joinable pthread attribute],
-            [ax_cv_PTHREAD_JOINABLE_ATTR],
-            [ax_cv_PTHREAD_JOINABLE_ATTR=unknown
-             for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
-                 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
-                                                 [int attr = $ax_pthread_attr; return attr /* ; */])],
-                                [ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break],
-                                [])
-             done
-            ])
-        AS_IF([test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \
-               test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \
-               test "x$ax_pthread_joinable_attr_defined" != "xyes"],
-              [AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE],
-                                  [$ax_cv_PTHREAD_JOINABLE_ATTR],
-                                  [Define to necessary symbol if this constant
-                                   uses a non-standard name on your system.])
-               ax_pthread_joinable_attr_defined=yes
-              ])
-
-        AC_CACHE_CHECK([whether more special flags are required for pthreads],
-            [ax_cv_PTHREAD_SPECIAL_FLAGS],
-            [ax_cv_PTHREAD_SPECIAL_FLAGS=no
-             case $host_os in
-             solaris*)
-             ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS"
-             ;;
-             esac
-            ])
-        AS_IF([test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \
-               test "x$ax_pthread_special_flags_added" != "xyes"],
-              [PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS"
-               ax_pthread_special_flags_added=yes])
-
-        AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
-            [ax_cv_PTHREAD_PRIO_INHERIT],
-            [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
-                                             [[int i = PTHREAD_PRIO_INHERIT;]])],
-                            [ax_cv_PTHREAD_PRIO_INHERIT=yes],
-                            [ax_cv_PTHREAD_PRIO_INHERIT=no])
-            ])
-        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \
-               test "x$ax_pthread_prio_inherit_defined" != "xyes"],
-              [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])
-               ax_pthread_prio_inherit_defined=yes
-              ])
-
-        CFLAGS="$ax_pthread_save_CFLAGS"
-        LIBS="$ax_pthread_save_LIBS"
-
-        # More AIX lossage: compile with *_r variant
-        if test "x$GCC" != "xyes"; then
-            case $host_os in
-                aix*)
-                AS_CASE(["x/$CC"],
-                    [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
-                    [#handle absolute path differently from PATH based program lookup
-                     AS_CASE(["x$CC"],
-                         [x/*],
-                         [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
-                         [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
-                ;;
-            esac
-        fi
-fi
-
-test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
-
-AC_SUBST([PTHREAD_LIBS])
-AC_SUBST([PTHREAD_CFLAGS])
-AC_SUBST([PTHREAD_CC])
-
-# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-if test "x$ax_pthread_ok" = "xyes"; then
-        ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
-        :
-else
-        ax_pthread_ok=no
-        $2
-fi
-AC_LANG_POP
-])dnl AX_PTHREAD
diff --git a/nxcomp/m4/ax_pthread.m4 b/nxcomp/m4/ax_pthread.m4
new file mode 120000
index 000000000..156af3df3
--- /dev/null
+++ b/nxcomp/m4/ax_pthread.m4
@@ -0,0 +1 @@
+../../m4/ax_pthread.m4
\ No newline at end of file
-- 
cgit v1.2.3


From bd25453bd41957079c7516adf407b8785ef22f1f Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Fri, 3 Nov 2017 12:30:12 +0100
Subject: nxcomp/src/Auth.cpp: handle launchd sockets in DISPLAY variable
 correctly when fetching X cookie.

---
 nxcomp/src/Auth.cpp | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Auth.cpp b/nxcomp/src/Auth.cpp
index d42c0556d..d398f5f85 100644
--- a/nxcomp/src/Auth.cpp
+++ b/nxcomp/src/Auth.cpp
@@ -279,11 +279,33 @@ int Auth::getCookie()
   //
   
   char line[DEFAULT_STRING_LIMIT];
+  FILE *data = NULL;
+  int result = -1;
 
   if (strncmp(display_, "localhost:", 10) == 0)
   {
     snprintf(line, DEFAULT_STRING_LIMIT, "unix:%s", display_ + 10);
   }
+  else if ((0 == strncasecmp(display_, "/tmp/launch", 11)) || (0 == strncasecmp(display_, "/private/tmp/com.apple.launchd", 30)))
+  {
+    /*
+     * Launchd socket support, mostly for OS X, but maybe also other BSD derivates.
+     */
+    const char *separator = strrchr(display_, ':');
+
+    if ((NULL == separator) || (!isdigit(*(separator + 1))))
+    {
+      #ifdef PANIC
+      *logofs << "Auth: PANIC! Unable to find separating colon character '"
+              << "in launchd socket path '" << display_
+              << "'.\n" << logofs_flush;
+      #endif
+
+      goto AuthGetCookieResult;
+    }
+
+    snprintf(line, DEFAULT_STRING_LIMIT, "unix:%s", separator + 1);
+  }
   else
   {
     snprintf(line, DEFAULT_STRING_LIMIT, "%.200s", display_);
@@ -316,9 +338,7 @@ int Auth::getCookie()
   // implementation.
   //
 
-  FILE *data = Popen((char *const *) parameters, "r");
-
-  int result = -1;
+  data = Popen((char *const *) parameters, "r");
 
   if (data == NULL)
   {
-- 
cgit v1.2.3


From 79257eed051e2a880ed0930cd139bf2f84f75901 Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Fri, 3 Nov 2017 12:57:25 +0100
Subject: nxcomp/src/Loop.cpp: hardcode X11 and (legacy/xfs) font UNIX paths.

Fixes: ArcticaProject/nx-libs#536

Allowing overrides via NX_TEMP and TEMP breaks system using
pam_tmpdir.so and most server infrastructure expects the location to be
fixed anyway.
---
 nxcomp/src/Loop.cpp | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index 72e46f773..197167380 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -3750,21 +3750,14 @@ int SetupUnixSocket()
   // Open UNIX domain socket for display.
   //
 
-  if (!control->TempPath) {
-    nxfatal << "Loop: PANIC! Temporal path is null.\n" << std::flush;
-
-    cerr << "Error" << ": Temporal path is null.\n";
-    HandleCleanup();
-  }
-
-  unsigned int required = snprintf(unixSocketName, DEFAULT_STRING_LENGTH, "%s/.X11-unix", control->TempPath);
+  unsigned int required = snprintf(unixSocketName, DEFAULT_STRING_LENGTH, "/tmp/.X11-unix");
   if (required < sizeof(unixSocketName)) {
 
     // No need to execute the following actions conditionally
     mkdir(unixSocketName, (0777 | S_ISVTX));
     chmod(unixSocketName, (0777 | S_ISVTX));
 
-    required = snprintf(unixSocketName, DEFAULT_STRING_LENGTH, "%s/.X11-unix/X%d", control->TempPath, proxyPort);
+    required = snprintf(unixSocketName, DEFAULT_STRING_LENGTH, "/tmp/.X11-unix/X%d", proxyPort);
     if (required < sizeof(unixSocketName)) {
 
       unixFD = ListenConnectionUnix(unixSocketName, "x11");
@@ -3968,8 +3961,7 @@ int SetupDisplaySocket(int &addr_family, sockaddr *&addr,
 
     char unixSocketDir[DEFAULT_STRING_LENGTH];
 
-    snprintf(unixSocketDir, DEFAULT_STRING_LENGTH - 1, "%s/.X11-unix",
-                 control -> TempPath);
+    snprintf(unixSocketDir, DEFAULT_STRING_LENGTH - 1, "/tmp/.X11-unix");
 
     #ifdef __APPLE__
 
@@ -12778,14 +12770,14 @@ int ParseFontPath(char *path)
 
   //
   // Let's assume that a port specification "unix/:7100"
-  // corresponds to "$TEMP/.font-unix/fs7100" and a port
-  // "unix/:-1" corresponds to "$TEMP/.font-unix/fs-1".
+  // corresponds to "/tmp/.font-unix/fs7100" and a port
+  // "unix/:-1" corresponds to "/tmp/.font-unix/fs-1".
   //
 
   if (strncmp("unix/:", path, 6) == 0)
   {
-    snprintf(path, DEFAULT_STRING_LENGTH - 1, "%s/.font-unix/fs%s",
-                 control -> TempPath, oldPath + 6);
+    snprintf(path, DEFAULT_STRING_LENGTH - 1, "/tmp/.font-unix/fs%s",
+                 oldPath + 6);
 
     *(path + DEFAULT_STRING_LENGTH - 1) = '\0';
 
-- 
cgit v1.2.3


From 2e724702e004abf5df1061dd799c9349edc2b099 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 22 Nov 2017 11:09:38 +0100
Subject: nxcomp/src/Misc.cpp: Update explanation for the NX_TEMP env variable.

---
 nxcomp/src/Misc.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Misc.cpp b/nxcomp/src/Misc.cpp
index b40e6409e..6d9ce08b7 100644
--- a/nxcomp/src/Misc.cpp
+++ b/nxcomp/src/Misc.cpp
@@ -351,8 +351,7 @@ tolerancechecks=s\n\
   NX_HOME      The NX user's home directory. If NX_ROOT is not set\n\
                or invalid, the user's NX directory is created here.\n\
 \n\
-  NX_TEMP      The directory where the X11 Unix Domain Sockets and\n\
-               all temporary files are to be created.\n\
+  NX_TEMP      The directory where all temporary files are to be created.\n\
 \n\
   NX_CLIENT    The full path to the nxclient executable. If the va-\n\
                riable is not set, the nxclient executable will be\n\
-- 
cgit v1.2.3


From 82e893ef22b5d8fd1b6158c5122e31eebbb1fce9 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Sat, 2 Dec 2017 01:03:29 +0100
Subject: nxcomp: Fix setting of global tcpFD

This corrects a flaw that stayed undetected for 2.5 years, introduced via
c5a2cf82f6baf7a9e64ec2328a5bac0dfee453ef

Fixes ArcticaProject/nx-libs#573
---
 nxcomp/src/Loop.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index 197167380..2930baf92 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -3741,7 +3741,8 @@ int SetupTcpSocket()
   // Open TCP socket emulating local display.
   //
 
-  return ListenConnectionTCP((loopbackBind ? "localhost" : "*"), X_TCP_PORT + proxyPort, "X11");
+  tcpFD =  ListenConnectionTCP((loopbackBind ? "localhost" : "*"), X_TCP_PORT + proxyPort, "X11");
+  return 1;
 }
 
 int SetupUnixSocket()
-- 
cgit v1.2.3


From 3bd7e03e1adb653b4a914fe0334498c604ea6369 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Sat, 2 Dec 2017 01:07:03 +0100
Subject: nxcomp: remove unused return values

Some functions' return values are never used anywhere, so drop them.
---
 nxcomp/src/Loop.cpp | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index 2930baf92..99ec83ec5 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -391,7 +391,7 @@ static int CheckProcess(int pid, const char *label);
 // Start or restart the house-keeper process.
 //
 
-static int StartKeeper();
+static void StartKeeper();
 
 //
 // Cleanup functions.
@@ -425,10 +425,10 @@ static int SetupProxyInstance();
 static int SetupAuthInstance();
 static int SetupAgentInstance();
 
-static int SetupTcpSocket();
-static int SetupUnixSocket();
-static int SetupServiceSockets();
-static int SetupDisplaySocket(int &addr_family, sockaddr *&addr,
+static void SetupTcpSocket();
+static void SetupUnixSocket();
+static void SetupServiceSockets();
+static void SetupDisplaySocket(int &addr_family, sockaddr *&addr,
                                   unsigned int &addr_length);
 
 //
@@ -3735,17 +3735,16 @@ int SetupAgentInstance()
   return 1;
 }
 
-int SetupTcpSocket()
+void SetupTcpSocket()
 {
   //
   // Open TCP socket emulating local display.
   //
 
   tcpFD =  ListenConnectionTCP((loopbackBind ? "localhost" : "*"), X_TCP_PORT + proxyPort, "X11");
-  return 1;
 }
 
-int SetupUnixSocket()
+void SetupUnixSocket()
 {
   //
   // Open UNIX domain socket for display.
@@ -3764,7 +3763,7 @@ int SetupUnixSocket()
       unixFD = ListenConnectionUnix(unixSocketName, "x11");
       if (unixFD >= 0)
         chmod(unixSocketName, 0777);
-      return unixFD;
+      return;
     }
   }
 
@@ -3782,7 +3781,7 @@ int SetupUnixSocket()
 // implementation.
 //
 
-int SetupDisplaySocket(int &addr_family, sockaddr *&addr,
+void SetupDisplaySocket(int &addr_family, sockaddr *&addr,
                            unsigned int &addr_length)
 {
   addr_family = AF_INET;
@@ -3949,7 +3948,7 @@ int SetupDisplaySocket(int &addr_family, sockaddr *&addr,
 
         close(testSocketFD);
         addr = (sockaddr *) xServerAddrABSTRACT;
-        return 1;
+        return;
 
     } else {
 
@@ -4062,11 +4061,9 @@ int SetupDisplaySocket(int &addr_family, sockaddr *&addr,
   }
 
   delete [] display;
-
-  return 1;
 }
 
-int SetupServiceSockets()
+void SetupServiceSockets()
 {
   if (control -> ProxyMode == proxy_client)
   {
@@ -4149,8 +4146,6 @@ int SetupServiceSockets()
       useSlaveSocket = 0;
     }
   }
-
-  return 1;
 }
 
 int ListenConnectionAny(sockaddr *addr, socklen_t addrlen, const char *label)
@@ -4454,7 +4449,7 @@ int CheckProcess(int pid, const char *label)
   return 1;
 }
 
-int StartKeeper()
+void StartKeeper()
 {
 
   if (IsRunning(lastKeeper) == 1 ||
@@ -4512,8 +4507,6 @@ int StartKeeper()
            << "with persistent cache not enabled.\n"
            << std::flush;
   }
-
-  return 1;
 }
 
 void HandleCleanupForReconnect()
-- 
cgit v1.2.3


From b8c929773fac19dad8af05d0bc64b1b3fed88309 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Sat, 2 Dec 2017 01:32:35 +0100
Subject: nxcomp: use lowercase abbreviations for seconds and milliseconds

---
 nxcomp/src/Channel.cpp       |  4 +--
 nxcomp/src/Children.cpp      |  8 +++---
 nxcomp/src/ClientChannel.cpp |  2 +-
 nxcomp/src/Loop.cpp          | 60 ++++++++++++++++++++++----------------------
 nxcomp/src/Proxy.cpp         | 38 ++++++++++++++--------------
 nxcomp/src/ServerChannel.cpp | 14 +++++------
 nxcomp/src/Statistics.cpp    |  6 ++---
 nxcomp/src/Timestamp.h       |  4 +--
 nxcomp/src/Transport.cpp     |  6 ++---
 9 files changed, 71 insertions(+), 71 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Channel.cpp b/nxcomp/src/Channel.cpp
index 24a422e37..e575a9e6b 100644
--- a/nxcomp/src/Channel.cpp
+++ b/nxcomp/src/Channel.cpp
@@ -1238,7 +1238,7 @@ int Channel::handleWait(int timeout)
     }
 
     #ifdef TEST
-    *logofs << "handleWait: Waiting " << remaining << " Ms "
+    *logofs << "handleWait: Waiting " << remaining << " ms "
             << "for a new message on  FD#" << fd_
             << ".\n" << logofs_flush;
     #endif
@@ -1306,7 +1306,7 @@ int Channel::handleDrain(int limit, int timeout)
 
     #ifdef TEST
     *logofs << "handleDrain: Trying to write to FD#"
-            << fd_ << " with " << remaining << " Ms "
+            << fd_ << " with " << remaining << " ms "
             << "remaining.\n" << logofs_flush;
     #endif
 
diff --git a/nxcomp/src/Children.cpp b/nxcomp/src/Children.cpp
index e77d1defd..9486f189a 100644
--- a/nxcomp/src/Children.cpp
+++ b/nxcomp/src/Children.cpp
@@ -628,7 +628,7 @@ int NXTransWatchdog(int timeout)
       {
         #ifdef TEST
         *logofs << "NXTransWatchdog: Timeout of " << timeout
-                << " Ms raised in watchdog.\n" << logofs_flush;
+                << " ms raised in watchdog.\n" << logofs_flush;
         #endif
 
         //
@@ -645,7 +645,7 @@ int NXTransWatchdog(int timeout)
     {
       #ifdef TEST
       *logofs << "NXTransWatchdog: Waiting for the timeout "
-              << "with " << timeout - diffTs << " Ms to run.\n"
+              << "with " << timeout - diffTs << " ms to run.\n"
               << logofs_flush;
       #endif
 
@@ -847,7 +847,7 @@ int NXTransKeeper(int caches, int images, const char *root)
 
   #ifdef TEST
   *logofs << "NXTransKeeper: Going to sleep for "
-          << timeout / 20 << " Ms.\n" << logofs_flush;
+          << timeout / 20 << " ms.\n" << logofs_flush;
   #endif
 
   usleep(timeout / 20 * 1000);
@@ -937,7 +937,7 @@ int NXTransKeeper(int caches, int images, const char *root)
 
     #ifdef TEST
     *logofs << "NXTransKeeper: Going to sleep for " << timeout
-            << " Ms.\n" << logofs_flush;
+            << " ms.\n" << logofs_flush;
     #endif
 
     usleep(timeout * 1000);
diff --git a/nxcomp/src/ClientChannel.cpp b/nxcomp/src/ClientChannel.cpp
index f01ad6d7b..1c6354897 100644
--- a/nxcomp/src/ClientChannel.cpp
+++ b/nxcomp/src/ClientChannel.cpp
@@ -5782,7 +5782,7 @@ int ClientChannel::handleSplitEvent(DecodeBuffer &decodeBuffer)
 
         #if defined(TEST) || defined(SPLIT)
         *logofs << "handleSplitEvent: SPLIT! Spent "
-                << diffTimestamp(startTs, getTimestamp()) << " Ms "
+                << diffTimestamp(startTs, getTimestamp()) << " ms "
                 << "handling abort split events for FD#" << fd_
                 << ".\n" << logofs_flush;
         #endif
diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index 99ec83ec5..b51d7e7e3 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -2578,15 +2578,15 @@ int NXTransPrepare(int *setFDs, fd_set *readSet,
     if (isTimestamp(*selectTs) == 0)
     {
       nxinfo << "Loop: WARNING! Preparing the select with requested "
-             << "timeout of " << selectTs -> tv_sec << " S and "
-             << (double) selectTs -> tv_usec / 1000 << " Ms.\n"
+             << "timeout of " << selectTs -> tv_sec << " s and "
+             << (double) selectTs -> tv_usec / 1000 << " ms.\n"
              << std::flush;
     }
     else
     {
       nxinfo << "Loop: Preparing the select with requested "
-             << "timeout of " << selectTs -> tv_sec << " S and "
-             << (double) selectTs -> tv_usec / 1000 << " Ms.\n"
+             << "timeout of " << selectTs -> tv_sec << " s and "
+             << (double) selectTs -> tv_usec / 1000 << " ms.\n"
              << std::flush;
     }
 
@@ -2632,7 +2632,7 @@ int NXTransPrepare(int *setFDs, fd_set *readSet,
   int diffTs = diffTimestamp(startTs, nowTs);
 
   nxinfo << "Loop: Mark - 0 - at " << strMsTimestamp()
-         << " with " << diffTs << " Ms elapsed.\n"
+         << " with " << diffTs << " ms elapsed.\n"
          << std::flush;
 
   //
@@ -2701,7 +2701,7 @@ int NXTransSelect(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
   if (diffTs > 20)
   {
     nxdbg << "Loop: TIME! Spent " << diffTs
-          << " Ms handling messages for proxy FD#"
+          << " ms handling messages for proxy FD#"
           << proxyFD << ".\n" << std::flush;
   }
 
@@ -2711,8 +2711,8 @@ int NXTransSelect(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
   if (isTimestamp(*selectTs) == 0)
   {
     nxinfo << "Loop: WARNING! Executing the select with requested "
-           << "timeout of " << selectTs -> tv_sec << " S and "
-           << (double) selectTs -> tv_usec / 1000 << " Ms.\n"
+           << "timeout of " << selectTs -> tv_sec << " s and "
+           << (double) selectTs -> tv_usec / 1000 << " ms.\n"
            << std::flush;
   }
   else if (proxy != NULL && proxy -> getFlushable(proxyFD) > 0)
@@ -2720,8 +2720,8 @@ int NXTransSelect(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
     nxinfo << "Loop: WARNING! Proxy FD#" << proxyFD
            << " has " << proxy -> getFlushable(proxyFD)
            << " bytes to write but timeout is "
-           << selectTs -> tv_sec << " S and "
-           << selectTs -> tv_usec / 1000 << " Ms.\n"
+           << selectTs -> tv_sec << " s and "
+           << selectTs -> tv_usec / 1000 << " ms.\n"
            << std::flush;
   }
 
@@ -2742,7 +2742,7 @@ int NXTransSelect(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
   if (diffTs > 100)
   {
     nxdbg << "Loop: TIME! Spent " << diffTs
-          << " Ms waiting for new data for proxy FD#"
+          << " ms waiting for new data for proxy FD#"
           << proxyFD << ".\n" << std::flush;
   }
 
@@ -2767,7 +2767,7 @@ int NXTransSelect(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
 
   diffTs = diffTimestamp(startTs, nowTs);
 
-  nxinfo << "Loop: Out of select after " << diffTs << " Ms "
+  nxinfo << "Loop: Out of select after " << diffTs << " ms "
          << "at " << strMsTimestamp(nowTs) << " with result "
          << *resultFDs << ".\n" << std::flush;
 
@@ -2874,7 +2874,7 @@ int NXTransExecute(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
 
     nxinfo << "Loop: Mark - 1 - at " << strMsTimestamp()
            << " with " << diffTimestamp(startTs, getTimestamp())
-           << " Ms elapsed.\n" << std::flush;
+           << " ms elapsed.\n" << std::flush;
 
     //
     // Rotate the channel that will be handled
@@ -2891,7 +2891,7 @@ int NXTransExecute(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
 
     nxinfo << "Loop: Mark - 2 - at " << strMsTimestamp()
            << " with " << diffTimestamp(startTs, getTimestamp())
-           << " Ms elapsed.\n" << std::flush;
+           << " ms elapsed.\n" << std::flush;
 
     //
     // Check if any socket has become readable.
@@ -2901,7 +2901,7 @@ int NXTransExecute(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
 
     nxinfo << "Loop: Mark - 3 - at " << strMsTimestamp()
            << " with " << diffTimestamp(startTs, getTimestamp())
-           << " Ms elapsed.\n" << std::flush;
+           << " ms elapsed.\n" << std::flush;
 
     //
     // Handle the scheduled events on channels.
@@ -2923,7 +2923,7 @@ int NXTransExecute(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
 
     nxinfo << "Loop: Mark - 4 - at " << strMsTimestamp()
            << " with " << diffTimestamp(startTs, getTimestamp())
-           << " Ms elapsed.\n" << std::flush;
+           << " ms elapsed.\n" << std::flush;
 
     //
     // Check if user sent a signal to produce
@@ -2946,7 +2946,7 @@ int NXTransExecute(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
 
     nxinfo << "Loop: Mark - 5 - at " << strMsTimestamp()
            << " with " << diffTimestamp(startTs, getTimestamp())
-           << " Ms elapsed.\n" << std::flush;
+           << " ms elapsed.\n" << std::flush;
 
     //
     // Check if there is any data to flush.
@@ -2958,7 +2958,7 @@ int NXTransExecute(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
 
     nxinfo << "Loop: Mark - 6 - at " << strMsTimestamp()
            << " with " << diffTimestamp(startTs, getTimestamp())
-           << " Ms elapsed.\n" << std::flush;
+           << " ms elapsed.\n" << std::flush;
   }
 
   //
@@ -2991,7 +2991,7 @@ int NXTransExecute(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
 
     nxinfo << "Loop: Mark - 7 - at " << strMsTimestamp()
            << " with " << diffTimestamp(startTs, getTimestamp())
-           << " Ms elapsed.\n" << std::flush;
+           << " ms elapsed.\n" << std::flush;
   }
 
   //
@@ -3360,7 +3360,7 @@ int InitAfterNegotiation()
 
   nxinfo << "Loop: INIT! Completed initialization at "
          << strMsTimestamp(nowTs) << " with "
-         << diffTimestamp(initTs, nowTs) << " Ms "
+         << diffTimestamp(initTs, nowTs) << " ms "
          << "since the init mark.\n" << std::flush;
 
   initTs = getNewTimestamp();
@@ -6077,8 +6077,8 @@ void SetTimer(int value)
   timer.it_value    = lastTimer.next;
 
   nxinfo << "Loop: Timer set to " << lastTimer.next.tv_sec
-         << " S and " << lastTimer.next.tv_usec / 1000
-         << " Ms at " << strMsTimestamp() << " in process "
+         << " s and " << lastTimer.next.tv_usec / 1000
+         << " ms at " << strMsTimestamp() << " in process "
          << "with pid '" << getpid() << "'.\n"
          << std::flush;
 
@@ -6600,7 +6600,7 @@ int ConnectToRemote(ChannelEndPoint &socketAddress)
   {
 
     nxdbg << "Loop: Timer set to " << connectTimeout / 1000
-          << " S " << "with retry set to " << retryConnect
+          << " s " << "with retry set to " << retryConnect
           << " in process with pid '" << getpid()
           << "'.\n" << std::flush;
 
@@ -13799,7 +13799,7 @@ static void handleCheckSessionInLoop()
         }
 
         nxinfo << "Loop: Starting watchdog process with timeout "
-               << "of " << timeout << " Ms.\n"
+               << "of " << timeout << " ms.\n"
                << std::flush;
       }
       else
@@ -14064,9 +14064,9 @@ static void handleCheckSelectInLoop(int &setFDs, fd_set &readSet,
   }
 
   nxinfo << "Loop: Select timeout is "
-         << selectTs.tv_sec << " S and "
+         << selectTs.tv_sec << " s and "
          << (double) selectTs.tv_usec / 1000
-         << " Ms.\n" << std::flush;
+         << " ms.\n" << std::flush;
 }
 
 static void handleCheckResultInLoop(int &resultFDs, int &errorFDs, int &setFDs, fd_set &readSet,
@@ -14082,14 +14082,14 @@ static void handleCheckResultInLoop(int &resultFDs, int &errorFDs, int &setFDs,
     nxinfo << "Loop: Select result is [" << resultFDs
            << "] at " << strMsTimestamp() << " with no "
            << "communication within " << diffTs
-           << " Ms.\n" << std::flush;
+           << " ms.\n" << std::flush;
   }
   else
   {
     nxinfo << "Loop: Select result is [" << resultFDs
            << "] error is [" << errorFDs << "] at "
            << strMsTimestamp() << " after " << diffTs
-           << " Ms.\n" << std::flush;
+           << " ms.\n" << std::flush;
   }
 
 
@@ -14524,8 +14524,8 @@ static void handleNegotiationInLoop(int &setFDs, fd_set &readSet,
   setMinTimestamp(selectTs, control -> PingTimeout);
 
   nxinfo << "Loop: Selected proxy FD#" << proxyFD << " in negotiation "
-         << "phase with timeout of " << selectTs.tv_sec << " S and "
-         << selectTs.tv_usec << " Ms.\n" << std::flush;
+         << "phase with timeout of " << selectTs.tv_sec << " s and "
+         << selectTs.tv_usec << " ms.\n" << std::flush;
 
   return;
 
diff --git a/nxcomp/src/Proxy.cpp b/nxcomp/src/Proxy.cpp
index dabf7532e..437296f60 100644
--- a/nxcomp/src/Proxy.cpp
+++ b/nxcomp/src/Proxy.cpp
@@ -410,8 +410,8 @@ int Proxy::setReadDescriptors(fd_set *fdSet, int &fdMax, T_timestamp &tsMax)
 
     #ifdef TEST
     *logofs << "Proxy: Initial timeout is " << tsMax.tv_sec
-            << " S and " << (double) tsMax.tv_usec /
-               1000 << " Ms with congestion "
+            << " s and " << (double) tsMax.tv_usec /
+               1000 << " ms with congestion "
             << statistics -> getCongestionInFrame()
             << ".\n" << logofs_flush;
     #endif
@@ -422,8 +422,8 @@ int Proxy::setReadDescriptors(fd_set *fdSet, int &fdMax, T_timestamp &tsMax)
 
     #ifdef TEST
     *logofs << "Proxy: Initial timeout is " << tsMax.tv_sec
-            << " S and " << (double) tsMax.tv_usec /
-               1000 << " Ms.\n" << logofs_flush;
+            << " s and " << (double) tsMax.tv_usec /
+               1000 << " ms.\n" << logofs_flush;
     #endif
   }
 
@@ -449,12 +449,12 @@ int Proxy::setReadDescriptors(fd_set *fdSet, int &fdMax, T_timestamp &tsMax)
       {
         *logofs << "Proxy: FLUSH! SPLIT! WARNING! Running with "
                 << diffTimestamp(timeouts_.splitTs, getTimestamp())
-                << " Ms elapsed since the last split.\n"
+                << " ms elapsed since the last split.\n"
                 << logofs_flush;
       }
 
       *logofs << "Proxy: FLUSH! SPLIT! Requesting timeout of "
-              << diffTs << " Ms as there are splits to send.\n"
+              << diffTs << " ms as there are splits to send.\n"
               << logofs_flush;
 
       #endif
@@ -525,12 +525,12 @@ int Proxy::setReadDescriptors(fd_set *fdSet, int &fdMax, T_timestamp &tsMax)
           {
             *logofs << "Proxy: FLUSH! WARNING! Running with "
                     << diffTimestamp(timeouts_.motionTs, getTimestamp())
-                    << " Ms elapsed since the last motion.\n"
+                    << " ms elapsed since the last motion.\n"
                     << logofs_flush;
           }
 
           *logofs << "Proxy: FLUSH! Requesting timeout of "
-                  << diffTs << " Ms as FD#" << fd << " has motion "
+                  << diffTs << " ms as FD#" << fd << " has motion "
                   << "events to send.\n" << logofs_flush;
 
           #endif
@@ -1946,7 +1946,7 @@ int Proxy::handleEvents()
 
         *logofs << "Proxy: FLUSH! Motion timeout expired after "
                 << diffTimestamp(timeouts_.motionTs, getTimestamp())
-                << " Ms.\n" << logofs_flush;
+                << " ms.\n" << logofs_flush;
 
         #endif
 
@@ -1972,7 +1972,7 @@ int Proxy::handleEvents()
       {
         *logofs << "Proxy: Running with "
                 << diffTimestamp(timeouts_.motionTs, getTimestamp())
-                << " Ms elapsed since the last motion.\n"
+                << " ms elapsed since the last motion.\n"
                 << logofs_flush;
       }
       #endif
@@ -1990,7 +1990,7 @@ int Proxy::handleEvents()
         #if defined(TEST) || defined(INFO) || defined(SPLIT)
         *logofs << "Proxy: SPLIT! Split timeout expired after "
                 << diffTimestamp(timeouts_.splitTs, getTimestamp())
-                << " Ms.\n" << logofs_flush;
+                << " ms.\n" << logofs_flush;
         #endif
 
         #if defined(TEST) || defined(INFO) || defined(SPLIT)
@@ -2033,7 +2033,7 @@ int Proxy::handleEvents()
       {
         *logofs << "Proxy: SPLIT! Running with "
                 << diffTimestamp(timeouts_.splitTs, getTimestamp())
-                << " Ms elapsed since the last split.\n"
+                << " ms elapsed since the last split.\n"
                 << logofs_flush;
       }
       #endif
@@ -2252,7 +2252,7 @@ int Proxy::handleFrame(T_frame_type type)
           << " new " << outputLength << " flushable " << transport_ ->
              flushable() << " tokens " << tokens_[token_control].remaining
           << " after " << diffTimestamp(timeouts_.writeTs, nowTs)
-          << " Ms.\n" << logofs_flush;
+          << " ms.\n" << logofs_flush;
 
   *logofs << "Proxy: FLUSH! Immediate flush to proxy FD#" << fd_
           << " of " << outputLength << " bytes at " << strMsTimestamp()
@@ -2276,7 +2276,7 @@ int Proxy::handleFrame(T_frame_type type)
     *logofs << "Proxy: WARNING! TIME! Data written to proxy FD#"
             << fd_ << " at " << strMsTimestamp() << " after "
             << diffTimestamp(timeouts_.writeTs, nowTs)
-            << " Ms.\n" << logofs_flush;
+            << " ms.\n" << logofs_flush;
   }
 
   #endif
@@ -2533,7 +2533,7 @@ int Proxy::handleDrain()
       *logofs << "Proxy: Timeout raised while draining "
               << "FD#" << fd_ << " at " << strMsTimestamp()
               << " after " << diffTimestamp(startTs, nowTs)
-              << " Ms.\n" << logofs_flush;
+              << " ms.\n" << logofs_flush;
       #endif
 
       result = 0;
@@ -2547,7 +2547,7 @@ int Proxy::handleDrain()
       *logofs << "Proxy: Trying to write to FD#" << fd_
               << " at " << strMsTimestamp() << " with length "
               << transport_ -> length() << " and "
-              << remaining << " Ms remaining.\n"
+              << remaining << " ms remaining.\n"
               << logofs_flush;
       #endif
 
@@ -2590,7 +2590,7 @@ int Proxy::handleDrain()
       #if defined(TEST) || defined(INFO)
       *logofs << "Proxy: Waiting for more data from proxy "
               << "FD#" << fd_ << " at " << strMsTimestamp()
-              << " with " << remaining << " Ms remaining.\n"
+              << " with " << remaining << " ms remaining.\n"
               << logofs_flush;
       #endif
 
@@ -2633,7 +2633,7 @@ int Proxy::handleDrain()
       *logofs << "Proxy: Got decongestion for proxy FD#"
               << fd_ << " at " << strMsTimestamp() << " after "
               << diffTimestamp(startTs, getTimestamp())
-              << " Ms.\n" << logofs_flush;
+              << " ms.\n" << logofs_flush;
       #endif
 
       result = 1;
@@ -3599,7 +3599,7 @@ int Proxy::handlePing()
       #if defined(TEST) || defined(INFO)
       *logofs << "Proxy: WARNING! No data received from "
               << "remote proxy on FD#" << fd_ << " since "
-              << diffIn << " Ms.\n" << logofs_flush;
+              << diffIn << " ms.\n" << logofs_flush;
       #endif
 
       if (control -> ProxyTimeout > 0 &&
diff --git a/nxcomp/src/ServerChannel.cpp b/nxcomp/src/ServerChannel.cpp
index 830985295..0c99c9d33 100644
--- a/nxcomp/src/ServerChannel.cpp
+++ b/nxcomp/src/ServerChannel.cpp
@@ -4628,7 +4628,7 @@ int ServerChannel::handleSplit(DecodeBuffer &decodeBuffer, MessageStore *store,
   #if defined(TEST) || defined(SPLIT)
 
   *logofs << "handleSplit: SPLIT! Spent "
-          << diffTimestamp(startTs, getTimestamp()) << " Ms "
+          << diffTimestamp(startTs, getTimestamp()) << " ms "
           << "handling abort split events for FD#" << fd_
           << ".\n" << logofs_flush;
 
@@ -4790,7 +4790,7 @@ int ServerChannel::handleSplit(DecodeBuffer &decodeBuffer)
         #if defined(TEST) || defined(SPLIT)
 
         *logofs << "handleSplit: WARNING! SPLIT! Spent "
-                << diffTimestamp(startTs, getTimestamp()) << " Ms "
+                << diffTimestamp(startTs, getTimestamp()) << " ms "
                 << "handling asynchronous abort split events for "
                 << "FD#" << fd_ << ".\n" << logofs_flush;
 
@@ -5835,7 +5835,7 @@ int ServerChannel::handleAsyncEvents()
 
     #if defined(TEST) || defined(INFO)
     *logofs << "handleAsyncEvents: Spent " << diffTimestamp(startTs,
-               getTimestamp()) << " Ms handling events for FD#"
+               getTimestamp()) << " ms handling events for FD#"
             << fd_ << ".\n" << logofs_flush;
     #endif
 
@@ -7268,7 +7268,7 @@ int ServerChannel::handleShmem(unsigned char &opcode, unsigned char *&buffer,
       #if defined(TEST) || defined(INFO)
       *logofs << "handleShmem: WARNING! Missing completion "
               << "after " << diffTimestamp(shmemState_ -> last,
-                 getTimestamp()) << " Ms for shared memory "
+                 getTimestamp()) << " ms for shared memory "
               << "for FD#" << fd_ << ".\n" << logofs_flush;
       #endif
 
@@ -7402,7 +7402,7 @@ int ServerChannel::handleShmemEvent()
   {
     #if defined(TEST) || defined(INFO)
     *logofs << "handleShmemEvent: Spent "
-            << diffTimestamp(startTs, getTimestamp()) << " Ms "
+            << diffTimestamp(startTs, getTimestamp()) << " ms "
             << "waiting for shared memory sequence for FD#"
             << fd_ << ".\n" << logofs_flush;
     #endif
@@ -7414,7 +7414,7 @@ int ServerChannel::handleShmemEvent()
   *logofs << "handleShmemEvent: WARNING! Can't reset shared "
           << "memory sequence for FD#" << fd_ << " after "
           << diffTimestamp(shmemState_ -> last, getTimestamp())
-          << " Ms.\n" << logofs_flush;
+          << " ms.\n" << logofs_flush;
   #endif
 
   return 0;
@@ -7430,7 +7430,7 @@ int ServerChannel::checkShmemEvent(unsigned char event, unsigned short sequence,
     *logofs << "checkShmemEvent: Reset shared memory sequence "
             << shmemState_ -> sequence << " for FD#" << fd_
             << " after " << diffTimestamp(shmemState_ -> last,
-               getTimestamp()) << " Ms.\n" << logofs_flush;
+               getTimestamp()) << " ms.\n" << logofs_flush;
     #endif
 
     shmemState_ -> sequence = 0;
diff --git a/nxcomp/src/Statistics.cpp b/nxcomp/src/Statistics.cpp
index ab8fd74dc..68673ffc1 100644
--- a/nxcomp/src/Statistics.cpp
+++ b/nxcomp/src/Statistics.cpp
@@ -361,14 +361,14 @@ void Statistics::updateBitrate(int bytes)
 
   #ifdef DEBUG
   *logofs << "Statistics: Difference since previous timestamp is "
-          << diffFramesInMs << " Ms.\n" << logofs_flush;
+          << diffFramesInMs << " ms.\n" << logofs_flush;
   #endif
 
   if (diffFramesInMs > 0)
   {
     #ifdef DEBUG
     *logofs << "Statistics: Removing " << diffFramesInMs
-            << " Ms in short and long time frame.\n"
+            << " ms in short and long time frame.\n"
             << logofs_flush;
     #endif
 
@@ -1751,7 +1751,7 @@ int Statistics::getTimeStats(int type, char *&buffer)
 
   char format[FORMAT_LENGTH];
 
-  sprintf(format, "\ntime: %.0f Ms idle, %.0f Ms (%.0f Ms in read, %.0f Ms in write) running.\n\n",
+  sprintf(format, "\ntime: %.0f ms idle, %.0fms (%.0f ms in read, %.0f ms in write) running.\n\n",
               transportData -> idleTime_, transportData -> readTime_,
                   transportData -> readTime_ - transportData -> writeTime_,
                       transportData -> writeTime_);
diff --git a/nxcomp/src/Timestamp.h b/nxcomp/src/Timestamp.h
index 604f5a3bc..bb9b243db 100644
--- a/nxcomp/src/Timestamp.h
+++ b/nxcomp/src/Timestamp.h
@@ -135,7 +135,7 @@ inline T_timestamp getTimestamp()
   if (diffTs > DRIFT_TIMESTAMP)
   {
     *logofs << "Timestamp: WARNING! Time difference since the "
-            << "current timestamp is " << diffTs << " Ms.\n"
+            << "current timestamp is " << diffTs << "ms.\n"
             << logofs_flush;
   }
 
@@ -293,7 +293,7 @@ inline T_timestamp getNewTimestamp()
   if (diffTs > DRIFT_TIMESTAMP)
   {
     *logofs << "Timestamp: WARNING! Time difference since the "
-            << "old timestamp is " << diffTs << " Ms.\n"
+            << "old timestamp is " << diffTs << "ms.\n"
             << logofs_flush;
   }
 
diff --git a/nxcomp/src/Transport.cpp b/nxcomp/src/Transport.cpp
index 897bf32f1..63e26bae6 100644
--- a/nxcomp/src/Transport.cpp
+++ b/nxcomp/src/Transport.cpp
@@ -868,7 +868,7 @@ int Transport::wait(int timeout) const
       #ifdef TEST
       *logofs << "Transport: There are " << available
               << " bytes on FD#" << fd_ << " after "
-              << diffTs << " Ms.\n" << logofs_flush;
+              << diffTs << " ms.\n" << logofs_flush;
       #endif
 
       return available;
@@ -933,13 +933,13 @@ int Transport::wait(int timeout) const
     {
       *logofs << "Transport: No data available on FD#" << fd_
               << " after " << diffTimestamp(startTs, nowTs)
-              << " Ms.\n" << logofs_flush;
+              << " ms.\n" << logofs_flush;
     }
     else
     {
       *logofs << "Transport: Data became available on FD#" << fd_
               << " after " << diffTimestamp(startTs, nowTs)
-              << " Ms.\n" << logofs_flush;
+              << " ms.\n" << logofs_flush;
     }
     #endif
   }
-- 
cgit v1.2.3


From f51194fb15e2d701991cc7cabfff12e521067b48 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Mon, 27 Nov 2017 23:35:04 +0100
Subject: nxcomp/nxproxy: add missing hint for keyconv option

---
 nxcomp/src/Misc.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Misc.cpp b/nxcomp/src/Misc.cpp
index 6d9ce08b7..238e01787 100644
--- a/nxcomp/src/Misc.cpp
+++ b/nxcomp/src/Misc.cpp
@@ -331,6 +331,7 @@ tile=s\n\
 menu=n\n\
 sleep=n\n\
 tolerancechecks=s\n\
+keyconv=s\n\
                These options are interpreted by the NX agent. They\n\
                are ignored by the proxy.\n\
 \n\
-- 
cgit v1.2.3


From 3fcb8e4eef391fe7effe3809eec092a36091fc08 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Mon, 27 Nov 2017 23:37:58 +0100
Subject: nxcomp/nxproxy: slightly improve the usage message of nxproxy

---
 nxcomp/src/Misc.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Misc.cpp b/nxcomp/src/Misc.cpp
index 238e01787..947026c82 100644
--- a/nxcomp/src/Misc.cpp
+++ b/nxcomp/src/Misc.cpp
@@ -165,7 +165,7 @@ static const char UsageInfo[] =
 \n\
   port=n       Remote port used for the connection.\n\
 \n\
-  retry=n      Number of connection atempts.\n\
+  retry=n      Number of connection attempts.\n\
 \n\
   root=s       The root directory for the session. Usually is the\n\
                C-* or S-* in the .nx directory in the user's home,\n\
@@ -177,8 +177,8 @@ static const char UsageInfo[] =
   errors=s     Name of the log file used by the proxy. The default\n\
                is the name 'errors' in the session directory.\n\
 \n\
-  stats=s      Name of the file where are written the proxy stat-\n\
-               istics. The default is a file 'stats' in the session\n\
+  stats=s      Name of the file where the proxy statistics are writ-\n\
+               ten to. The default is a file 'stats' in the session\n\
                directory. The proxy replaces the data in the file\n\
                whenever it receives a SIGUSR1 or SIGUSR2 signal:\n\
 \n\
@@ -226,8 +226,8 @@ static const char UsageInfo[] =
 \n\
   limit=n      Specify a bitrate limit allowed for this session.\n\
 \n\
-  memory=n     Trigger memory optimizations used to keep small the\n\
-               size of X buffers. This is useful on embedded plat-\n\
+  memory=n     Trigger memory optimizations used to keep the size\n\
+               of X buffers small. This is useful on embedded plat-\n\
                forms, or where memory is scarce.\n\
 \n\
   cache=n      Size of the in-memory X message cache. Setting the\n\
@@ -361,6 +361,8 @@ keyconv=s\n\
                Mac where nxclient is located in a different direct-\n\
                ory compared to the other programs, to make easier\n\
                for the user to execute the program from the shell.\n\
+               The nxclient executable will be used for displaying\n\
+               the menu and request windows to the user.\n\
 \n\
   NX_SLAVE_CMD The full path to the slave channel handler. When the\n\
                slave channel is enabled, the agent will listen on a\n\
@@ -378,7 +380,7 @@ keyconv=s\n\
                ory is not set, null or invalid.\n\
 \n\
   PATH         The path where all executables are searched, except\n\
-               nxclient. If NX_CLIENT is not set, also the client\n\
+               nxclient. If NX_CLIENT is not set, also the nxclient\n\
                executable is searched in the system path.\n\
 \n\
   LD_LIBRARY_PATH\n\
-- 
cgit v1.2.3


From 9e3381cc858e249b13777e31cfc40a87f8d10bb7 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Wed, 29 Nov 2017 00:02:01 +0100
Subject: nxproxy/nxcomp: document logging options

---
 nxcomp/src/Misc.cpp   | 14 ++++++++++++++
 nxproxy/man/nxproxy.1 | 28 ++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Misc.cpp b/nxcomp/src/Misc.cpp
index 947026c82..7e468f1e2 100644
--- a/nxcomp/src/Misc.cpp
+++ b/nxcomp/src/Misc.cpp
@@ -131,6 +131,20 @@ static const char UsageInfo[] =
   -h           Print this message.\n\
 \n\
   -v           Print version information.\n\
+\n\
+  -d <n>       Set log level (0=FATAL, 1=ERROR, 2=WARNING, 3=INFO,\n\
+               4=DEBUG). Default is 0.\n\
+\n\
+  -o <file>    Name of the logfile. Default is stderr.\n\
+\n\
+  -f <string>  Specify log format. The characters in <string> define\n\
+               how the loglines are formatted. The following characters\n\
+               are supported, default is 0:\n\
+               0       only the plain text without any additions\n\
+               u       include time\n\
+               l       include loglevel\n\
+               T       include thread ids\n\
+               L       include the source code location of the log\n\
 \n\
   host:port    Put at the end, specifies the host and port of the\n\
                listening proxy.\n\
diff --git a/nxproxy/man/nxproxy.1 b/nxproxy/man/nxproxy.1
index ecfe3b0d6..702c7a606 100644
--- a/nxproxy/man/nxproxy.1
+++ b/nxproxy/man/nxproxy.1
@@ -36,6 +36,34 @@ Print this message.
 .B -v
 Print version information.
 .TP 8
+.B -d <int>
+Set log level (0 for FATAL, 1 for ERROR, 2 for WARNING, 3 for INFO, 4 for
+DEBUG). The default is 0.
+.TP 8
+.B -o <string>
+Name of the log file. Default is stderr.
+.TP 8
+.B -f <string>
+Specify log format. The characters in <string> define how the loglines
+are formatted. The following characters are supported, default is '0':
+.RS 8
+.TP 8
+.I 0
+only the plain text without any additions. This is the default.
+.TP 8
+.I u
+include time
+.TP 8
+.I l
+include loglevel
+.TP 8
+.I T
+include thread ids
+.TP 8
+.I L
+include the location of the log call in the source code
+.RE
+.TP 8
 .B <host>:<port>
 Put at the end, specifies the host and port of the listening proxy.
 
-- 
cgit v1.2.3


From 513aa23a714d2ccba388bca41262610c571dcf43 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Mon, 27 Nov 2017 23:30:50 +0100
Subject: nxcomp: fix double free

Fixes ArcticaProject/nx-libs#569
---
 nxcomp/src/ChannelEndPoint.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'nxcomp')

diff --git a/nxcomp/src/ChannelEndPoint.cpp b/nxcomp/src/ChannelEndPoint.cpp
index 4fdf0fad4..1504046c1 100644
--- a/nxcomp/src/ChannelEndPoint.cpp
+++ b/nxcomp/src/ChannelEndPoint.cpp
@@ -91,6 +91,8 @@ ChannelEndPoint::setSpec(const char *hostName, long port) {
   int length;
 
   if (spec_) free(spec_);
+  spec_ = NULL;
+
   isUnix_ = false;
   isTCP_ = false;
 
-- 
cgit v1.2.3


From 21c742d25361e7ae2dc40f635890f60e6eb0e1d6 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Mon, 27 Nov 2017 23:31:35 +0100
Subject: nxcomp: simplify free calls

free() can handle NULL itself
---
 nxcomp/src/ChannelEndPoint.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/ChannelEndPoint.cpp b/nxcomp/src/ChannelEndPoint.cpp
index 1504046c1..8cc0c1d41 100644
--- a/nxcomp/src/ChannelEndPoint.cpp
+++ b/nxcomp/src/ChannelEndPoint.cpp
@@ -58,7 +58,7 @@ ChannelEndPoint::~ChannelEndPoint()
 
 void
 ChannelEndPoint::setSpec(const char *spec) {
-  if (spec_) free(spec_);
+  free(spec_);
 
   if (spec && strlen(spec))
   {
@@ -90,7 +90,7 @@ void
 ChannelEndPoint::setSpec(const char *hostName, long port) {
   int length;
 
-  if (spec_) free(spec_);
+  free(spec_);
   spec_ = NULL;
 
   isUnix_ = false;
@@ -162,7 +162,7 @@ ChannelEndPoint::setDefaultTCPInterface(int publicInterface) {
 
 void
 ChannelEndPoint::setDefaultUnixPath(char *path) {
-  if (defaultUnixPath_) free(defaultUnixPath_);
+  free(defaultUnixPath_);
 
   if (path && strlen(path))
     defaultUnixPath_ = strdup(path);
-- 
cgit v1.2.3


From c4660e109aabc78abda4b80d637312385223537f Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Tue, 28 Nov 2017 20:43:44 +0100
Subject: ChannelEndPoint.cpp: fix two memleaks

---
 nxcomp/src/ChannelEndPoint.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/ChannelEndPoint.cpp b/nxcomp/src/ChannelEndPoint.cpp
index 8cc0c1d41..843bf2b35 100644
--- a/nxcomp/src/ChannelEndPoint.cpp
+++ b/nxcomp/src/ChannelEndPoint.cpp
@@ -54,6 +54,12 @@ ChannelEndPoint::~ChannelEndPoint()
     if(S_ISSOCK(st.st_mode))
       unlink(unixPath);
   }
+  free(unixPath);
+  unixPath = NULL;
+  free(defaultUnixPath_);
+  defaultUnixPath_ = NULL;
+  free(spec_);
+  spec_ = NULL;
 }
 
 void
@@ -90,12 +96,12 @@ void
 ChannelEndPoint::setSpec(const char *hostName, long port) {
   int length;
 
-  free(spec_);
-  spec_ = NULL;
-
   isUnix_ = false;
   isTCP_ = false;
 
+  free(spec_);
+  spec_ = NULL;
+
   if (hostName && strlen(hostName) && port >= 1)
   {
     length = snprintf(NULL, 0, "tcp:%s:%ld", hostName, port);
@@ -195,7 +201,7 @@ ChannelEndPoint::getPort(long *port) const {
 bool
 ChannelEndPoint::getUnixPath(char **unixPath) const {
 
-  if (unixPath) *unixPath = 0;
+  if (unixPath) *unixPath = NULL;
 
   long p;
   char *path = NULL;
-- 
cgit v1.2.3


From 1c09eab703de18430241a11abec0526512d851b9 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Tue, 28 Nov 2017 21:18:48 +0100
Subject: Loop.cpp: fix two memleaks

---
 nxcomp/src/Loop.cpp | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index b51d7e7e3..ca9e5ed08 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -4278,15 +4278,20 @@ int ListenConnectionTCP(const char *host, long port, const char *label)
 
 int ListenConnection(ChannelEndPoint &endpoint, const char *label)
 {
-  char *unixPath, *host;
+  char *unixPath = NULL, *host = NULL;
   long port;
+  int result = -1;
   if (endpoint.getUnixPath(&unixPath)) {
-    return ListenConnectionUnix(unixPath, label);
+    result = ListenConnectionUnix(unixPath, label);
   }
   else if (endpoint.getTCPHostAndPort(&host, &port)) {
-    return ListenConnectionTCP(host, port, label);
+    result = ListenConnectionTCP(host, port, label);
   }
-  return -1;
+  free(unixPath);
+  unixPath = NULL;
+  free(host);
+  host = NULL;
+  return result;
 }
 
 static int AcceptConnection(int fd, int domain, const char *label)
@@ -6739,10 +6744,20 @@ int ConnectToRemote(ChannelEndPoint &socketAddress)
     }
   }
 
+  free(unixPath);
+  unixPath = NULL;
+  free(hostName);
+  hostName = NULL;
+
   return pFD;
 
 ConnectToRemoteError:
 
+  free(unixPath);
+  unixPath = NULL;
+  free(hostName);
+  hostName = NULL;
+
   if (pFD != -1)
   {
     close(pFD);
-- 
cgit v1.2.3


From 2814677a7e2b259669708c89ed55b55dc1c46f9c Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Tue, 28 Nov 2017 21:58:07 +0100
Subject: Loop.cpp: fix more memory leaks

The thread specific stringstream objects on the stack need to be
deleted, not just pop()ed.

Fixes ArcticaProject/nx-libs#573 (partially)
---
 nxcomp/src/Log.h | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Log.h b/nxcomp/src/Log.h
index aed929b31..3e355a951 100644
--- a/nxcomp/src/Log.h
+++ b/nxcomp/src/Log.h
@@ -168,7 +168,13 @@ class NXLog
         delete pdt->thread_name;
 
         while (!pdt->buffer.empty()) {
+            /*
+             * get the stringstream object created in new_stack_entry()
+             * from the stack and delete it after pop()
+             */
+            std::stringstream* tmp = pdt->buffer.top();
             (void) pdt->buffer.pop ();
+            delete tmp;
         }
 
         delete pdt;
@@ -240,7 +246,12 @@ class NXLog
         pthread_sigmask(SIG_BLOCK, &tmp_signal_mask, &orig_signal_mask);
 
         if (!pdt->buffer.empty ()) {
-            const std::string str = pdt->buffer.top()->str();
+            /*
+             * get the stringstream object created in new_stack_entry()
+             * from the stack and delete it after pop()
+             */
+            std::stringstream *tmp = pdt->buffer.top();
+            const std::string str = tmp->str();
 
             if (!str.empty())
             {
@@ -251,6 +262,9 @@ class NXLog
 
             /* Remove from stack. */
             pdt->buffer.pop();
+
+            /* free memory */
+            delete tmp;
         }
 
         /* Restore old signal mask. */
-- 
cgit v1.2.3


From 4dbee3a3f13657577f283bca22b281d7273c19e5 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Thu, 7 Dec 2017 22:35:59 +0100
Subject: nxcomp: use new macro SAFE_FREE(ptr)

Should be used instead of free() calls and will clear the pointer after
calling free(). This can prevent double-free or use-after-free errors.
---
 nxcomp/src/ChannelEndPoint.cpp | 30 ++++++++++++++----------------
 nxcomp/src/Loop.cpp            | 33 +++++++++++++--------------------
 nxcomp/src/Misc.h              |  3 +++
 nxcomp/src/Pipe.cpp            |  6 +++---
 4 files changed, 33 insertions(+), 39 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/ChannelEndPoint.cpp b/nxcomp/src/ChannelEndPoint.cpp
index 843bf2b35..fb8549f6a 100644
--- a/nxcomp/src/ChannelEndPoint.cpp
+++ b/nxcomp/src/ChannelEndPoint.cpp
@@ -37,6 +37,8 @@
 
 #include "NXalert.h"
 
+#include "Misc.h"
+
 ChannelEndPoint::ChannelEndPoint(const char *spec)
   : defaultTCPPort_(0), defaultTCPInterface_(0),
     defaultUnixPath_(NULL), spec_(NULL) {
@@ -54,17 +56,14 @@ ChannelEndPoint::~ChannelEndPoint()
     if(S_ISSOCK(st.st_mode))
       unlink(unixPath);
   }
-  free(unixPath);
-  unixPath = NULL;
-  free(defaultUnixPath_);
-  defaultUnixPath_ = NULL;
-  free(spec_);
-  spec_ = NULL;
+  SAFE_FREE(unixPath);
+  SAFE_FREE(defaultUnixPath_);
+  SAFE_FREE(spec_);
 }
 
 void
 ChannelEndPoint::setSpec(const char *spec) {
-  free(spec_);
+  SAFE_FREE(spec_);
 
   if (spec && strlen(spec))
   {
@@ -99,8 +98,7 @@ ChannelEndPoint::setSpec(const char *hostName, long port) {
   isUnix_ = false;
   isTCP_ = false;
 
-  free(spec_);
-  spec_ = NULL;
+  SAFE_FREE(spec_);
 
   if (hostName && strlen(hostName) && port >= 1)
   {
@@ -145,9 +143,9 @@ ChannelEndPoint::getSpec(char **socketUri) const {
       *socketUri = strdup(newSocketUri);
   }
 
-  free(newSocketUri);
-  free(unixPath);
-  free(hostName);
+  SAFE_FREE(newSocketUri);
+  SAFE_FREE(unixPath);
+  SAFE_FREE(hostName);
 
   if (NULL != *socketUri)
     return true;
@@ -168,7 +166,7 @@ ChannelEndPoint::setDefaultTCPInterface(int publicInterface) {
 
 void
 ChannelEndPoint::setDefaultUnixPath(char *path) {
-  free(defaultUnixPath_);
+  SAFE_FREE(defaultUnixPath_);
 
   if (path && strlen(path))
     defaultUnixPath_ = strdup(path);
@@ -337,10 +335,10 @@ ChannelEndPoint &ChannelEndPoint::operator=(const ChannelEndPoint &other) {
   defaultTCPInterface_ = other.defaultTCPInterface_;
   old = defaultUnixPath_;
   defaultUnixPath_ = (other.defaultUnixPath_ ? strdup(other.defaultUnixPath_) : NULL);
-  free(old);
+  SAFE_FREE(old);
   old = spec_;
   spec_ = (other.spec_ ? strdup(other.spec_) : NULL);
-  free(old);
+  SAFE_FREE(old);
   isUnix_ = getUnixPath();
   isTCP_ = getTCPHostAndPort();
   return *this;
@@ -352,7 +350,7 @@ std::ostream& operator<<(std::ostream& os, const ChannelEndPoint& endPoint) {
     if (endPoint.getSpec(&endPointSpec))
     {
       os << endPointSpec;
-      free(endPointSpec);
+      SAFE_FREE(endPointSpec);
     }
     else
       os << "(invalid)";
diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index ca9e5ed08..baad17699 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -3187,8 +3187,7 @@ int SetupProxyConnection()
     nxinfo << "Loop: listenSocket is "<< ( listenSocket.enabled() ? "enabled" : "disabled") << ". "
            << "The socket URI is '"<< ( socketUri != NULL ? socketUri : "<unset>") << "'.\n" << std::flush;
 
-    free(socketUri);
-    socketUri = NULL;
+    SAFE_FREE(socketUri);
 
     if (WE_INITIATE_CONNECTION)
     {
@@ -3196,7 +3195,7 @@ int SetupProxyConnection()
       {
         nxinfo << "Loop: Going to connect to '" << socketUri
                << "'.\n" << std::flush;
-        free(socketUri);
+        SAFE_FREE(socketUri);
 
         proxyFD = ConnectToRemote(connectSocket);
 
@@ -3219,7 +3218,7 @@ int SetupProxyConnection()
       {
         nxinfo << "Loop: Going to wait for connection at '"
                << socketUri << "'.\n" << std::flush;
-        free(socketUri);
+        SAFE_FREE(socketUri);
 
         proxyFD = WaitForRemote(listenSocket);
 
@@ -4287,10 +4286,8 @@ int ListenConnection(ChannelEndPoint &endpoint, const char *label)
   else if (endpoint.getTCPHostAndPort(&host, &port)) {
     result = ListenConnectionTCP(host, port, label);
   }
-  free(unixPath);
-  unixPath = NULL;
-  free(host);
-  host = NULL;
+  SAFE_FREE(unixPath);
+  SAFE_FREE(host);
   return result;
 }
 
@@ -6222,7 +6219,7 @@ int WaitForRemote(ChannelEndPoint &socketAddress)
   cerr << "Info" << ": Waiting for connection from "
        << hostLabel << " on socket '" << socketUri
        << "'.\n";
-  free(socketUri);
+  SAFE_FREE(socketUri);
 
   //
   // How many times to loop waiting for connections
@@ -6311,7 +6308,7 @@ int WaitForRemote(ChannelEndPoint &socketAddress)
 
         cerr << "Info" << ": Accepted connection from this host on Unix file socket '"
              << unixPath << "'.\n";
-        free(unixPath);
+        SAFE_FREE(unixPath);
 
         break;
       }
@@ -6744,19 +6741,15 @@ int ConnectToRemote(ChannelEndPoint &socketAddress)
     }
   }
 
-  free(unixPath);
-  unixPath = NULL;
-  free(hostName);
-  hostName = NULL;
+  SAFE_FREE(unixPath);
+  SAFE_FREE(hostName);
 
   return pFD;
 
 ConnectToRemoteError:
 
-  free(unixPath);
-  unixPath = NULL;
-  free(hostName);
-  hostName = NULL;
+  SAFE_FREE(unixPath);
+  SAFE_FREE(hostName);
 
   if (pFD != -1)
   {
@@ -7953,7 +7946,7 @@ int ParseEnvironmentOptions(const char *env, int force)
         cerr << "Error" << ": Refusing 'listen' parameter with 'connect' being '"
              << socketUri << "'.\n";
 
-        free(socketUri);
+        SAFE_FREE(socketUri);
         return -1;
       }
 
@@ -7981,7 +7974,7 @@ int ParseEnvironmentOptions(const char *env, int force)
         cerr << "Error" << ": Refusing 'accept' parameter with 'connect' being '"
              << socketUri << "'.\n";
 
-	free(socketUri);
+        SAFE_FREE(socketUri);
         return -1;
       }
 
diff --git a/nxcomp/src/Misc.h b/nxcomp/src/Misc.h
index 997630137..7808c34c2 100644
--- a/nxcomp/src/Misc.h
+++ b/nxcomp/src/Misc.h
@@ -54,6 +54,9 @@ using namespace std;
 #define EGET()   (errno)
 #define ESTR()   strerror(errno)
 
+// a free() macro that clears the ptr after free
+#define SAFE_FREE(ptr) do { free(ptr); ptr = NULL; } while (0)
+
 //
 // TCP port offset applied to NX port specification.
 //
diff --git a/nxcomp/src/Pipe.cpp b/nxcomp/src/Pipe.cpp
index 4fa149412..228c556ae 100644
--- a/nxcomp/src/Pipe.cpp
+++ b/nxcomp/src/Pipe.cpp
@@ -203,7 +203,7 @@ FILE *Popen(char * const parameters[], const char *type)
 
   if (pipe(pdes) < 0)
   {
-    free(cur);
+    SAFE_FREE(cur);
 
     return NULL;
   }
@@ -237,7 +237,7 @@ FILE *Popen(char * const parameters[], const char *type)
       close(pdes[0]);
       close(pdes[1]);
 
-      free(cur);
+      SAFE_FREE(cur);
 
       return NULL;
     }
@@ -420,7 +420,7 @@ int Pclose(FILE *iop)
     last -> next = cur -> next;
   }
 
-  free(cur);
+  SAFE_FREE(cur);
 
   //
   // Child has finished and we called the
-- 
cgit v1.2.3


From d5c3e75b3b4d451b33daa0f7c07c3e7a16a88d7c Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Sun, 10 Dec 2017 16:23:03 +0100
Subject: nxcomp: fix shadow warning

Fixes this:

CXX      Loop.lo
Loop.cpp: In function 'void handleCheckResultInLoop(int&, int&, int&, fd_set&, fd_set&, timeval&, timeval&)':
Loop.cpp:14080:68: warning: declaration of 'startTs' shadows a global declaration [-Wshadow]
                                             struct timeval &startTs)
                                                                    ^
Loop.cpp:1020:13: note: shadowed declaration is here
T_timestamp startTs;

Fixes ArcticaProject/nx-libs#545
---
 nxcomp/src/Loop.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index baad17699..bb6d18531 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -14079,9 +14079,9 @@ static void handleCheckSelectInLoop(int &setFDs, fd_set &readSet,
 
 static void handleCheckResultInLoop(int &resultFDs, int &errorFDs, int &setFDs, fd_set &readSet,
                                         fd_set &writeSet, struct timeval &selectTs,
-                                            struct timeval &startTs)
+                                            struct timeval &pstartTs)
 {
-  int diffTs = diffTimestamp(startTs, getNewTimestamp());
+  int diffTs = diffTimestamp(pstartTs, getNewTimestamp());
 
 
   if (diffTs >= (control -> PingTimeout -
-- 
cgit v1.2.3


From 018c557c454ffe62696c4d113c7fe3794845dc2a Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Sun, 10 Dec 2017 18:00:15 +0100
Subject: Silence warning: "ar: 'u' modifier ignored since 'D' is the default"

Fixes ArcticaProject/nx-libs#530
---
 nx-X11/lib/configure.ac | 3 +++
 nxcomp/configure.ac     | 3 +++
 nxcompshad/configure.ac | 3 +++
 3 files changed, 9 insertions(+)

(limited to 'nxcomp')

diff --git a/nx-X11/lib/configure.ac b/nx-X11/lib/configure.ac
index 1eebf329f..a4da04592 100644
--- a/nx-X11/lib/configure.ac
+++ b/nx-X11/lib/configure.ac
@@ -44,6 +44,9 @@ X11_EXTRA_DEPS=""
 
 AC_SUBST(X11_EXTRA_DEPS)
 
+# Silence warning: ar: 'u' modifier ignored since 'D' is the default
+AC_SUBST(AR_FLAGS, [cr])
+
 # Issue an error if nx-xtrans.m4 was not found and NX_XTRANS_CONNECTION_FLAGS macro
 # was not expanded, since libNX_X11 with no transport types is rather useless.
 m4_pattern_forbid([^NX_XTRANS_CONNECTION_FLAGS$])
diff --git a/nxcomp/configure.ac b/nxcomp/configure.ac
index 3ae81f0d1..8037250e7 100644
--- a/nxcomp/configure.ac
+++ b/nxcomp/configure.ac
@@ -25,6 +25,9 @@ AC_SUBST([COMP_VERSION])
 LT_COMP_VERSION=[`echo $COMP_VERSION | sed -r -e 's/^([0-9]+\.[0-9]+\.[0-9]+).*$/\1/' -e 's/\./:/g'`] 
 AC_SUBST([LT_COMP_VERSION])
 
+# Silence warning: ar: 'u' modifier ignored since 'D' is the default
+AC_SUBST(AR_FLAGS, [cr])
+
 # Upstream's pkg.m4 (since 0.27) offers this now, but define our own
 # compatible version in case the local version of pkgconfig isn't new enough.
 # https://bugs.freedesktop.org/show_bug.cgi?id=48743
diff --git a/nxcompshad/configure.ac b/nxcompshad/configure.ac
index 966add584..b8e359f5d 100644
--- a/nxcompshad/configure.ac
+++ b/nxcompshad/configure.ac
@@ -25,6 +25,9 @@ AC_SUBST([COMPSHAD_VERSION])
 LT_COMPSHAD_VERSION=[`echo $COMPSHAD_VERSION | sed -r -e 's/^([0-9]+\.[0-9]+\.[0-9]+).*$/\1/' -e 's/\./:/g'`] 
 AC_SUBST([LT_COMPSHAD_VERSION])
 
+# Silence warning: ar: 'u' modifier ignored since 'D' is the default
+AC_SUBST(AR_FLAGS, [cr])
+
 PKG_CHECK_MODULES(Xext, xext)
 PKG_CHECK_MODULES(Xdamage, xdamage)
 PKG_CHECK_MODULES(Xrandr, xrandr)
-- 
cgit v1.2.3


From 3731a996dce9adf1c6f398cc1cdec2909588a7ee Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Mon, 11 Dec 2017 13:38:59 +0100
Subject: nxcomp/src/Log.cpp: only create a new queue entry if we actually
 intend to write it out later.

Fixes: ArcticaProject/nx-libs#596
---
 nxcomp/src/Log.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/src/Log.cpp b/nxcomp/src/Log.cpp
index 951c10a04..24f660507 100644
--- a/nxcomp/src/Log.cpp
+++ b/nxcomp/src/Log.cpp
@@ -110,9 +110,9 @@ NXLog& operator<< (NXLog& out, const NXLogStamp& value)
     out.current_file( value.file() );
 
     // Writing an NXLogStamp to the stream indicates the start of a new entry.
-    // If there's any content in the buffer, create a new entry in the output
-    // queue.
-    if ( out.synchronized() )
+    // If there's any content in the buffer and we actually intend to keep that line,
+    // create a new entry in the output queue.
+    if ( out.synchronized() && out.will_log() )
         out.new_stack_entry();
 
     out << out.stamp_to_string(value);
-- 
cgit v1.2.3